diff --git a/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala b/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala
index 7332f4444..c2d8f3331 100644
--- a/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala
+++ b/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala
@@ -1386,15 +1386,14 @@ def restoreSomeSessions(): Unit = {
   def scrambleAuthUser(userPrimaryKey: UserPrimaryKey): Box[Boolean] = tryo {
     AuthUser.find(By(AuthUser.user, userPrimaryKey.value)) match {
       case Full(user) =>
-        val newUser = user.firstName(Helpers.randomString(user.firstName.get.length))
+        val scrambledUser = user.firstName(Helpers.randomString(16))
           .email(Helpers.randomString(10) + "@example.com")
-          .username(Helpers.randomString(user.username.get.length))
-          .firstName(Helpers.randomString(user.firstName.get.length))
-          .lastName(Helpers.randomString(user.lastName.get.length))
-          .password(Helpers.randomString(40))
+          .username("DELETED-" + Helpers.randomString(16))
+          .firstName(Helpers.randomString(16))
+          .lastName(Helpers.randomString(16))
           .password(Helpers.randomString(40))
           .validated(false)
-        newUser.save()
+        scrambledUser.save()
       case _ => false
     }
   }
diff --git a/obp-api/src/main/scala/code/model/dataAccess/ResourceUser.scala b/obp-api/src/main/scala/code/model/dataAccess/ResourceUser.scala
index e46386b1e..5bfb22fc9 100644
--- a/obp-api/src/main/scala/code/model/dataAccess/ResourceUser.scala
+++ b/obp-api/src/main/scala/code/model/dataAccess/ResourceUser.scala
@@ -78,6 +78,9 @@ class ResourceUser extends LongKeyedMapper[ResourceUser] with User with ManyToMa
   object Company extends MappedString(this, 50)
   object CreatedByConsentId extends MappedString(this, 100)
   object CreatedByUserInvitationId extends MappedString(this, 100)
+  object Deleted extends MappedBoolean(this) {
+    override def defaultValue = false
+  }
   
   def emailAddress = {
     val e = email.get
@@ -105,6 +108,7 @@ class ResourceUser extends LongKeyedMapper[ResourceUser] with User with ManyToMa
   
   override def createdByConsentId = if(CreatedByConsentId.get == null) None else if (CreatedByConsentId.get.isEmpty) None else Some(CreatedByConsentId.get) //null --> None
   override def createdByUserInvitationId = if(CreatedByUserInvitationId.get == null) None else if (CreatedByUserInvitationId.get.isEmpty) None else Some(CreatedByUserInvitationId.get) //null --> None
+  def deleted: Boolean = if(Deleted.get == null) false else Deleted.get // null --> false
 }
 
 object ResourceUser extends ResourceUser with LongKeyedMetaMapper[ResourceUser]{
diff --git a/obp-api/src/main/scala/code/users/LiftUsers.scala b/obp-api/src/main/scala/code/users/LiftUsers.scala
index bd0ba1852..d6cd99b05 100644
--- a/obp-api/src/main/scala/code/users/LiftUsers.scala
+++ b/obp-api/src/main/scala/code/users/LiftUsers.scala
@@ -260,9 +260,8 @@ object LiftUsers extends Users with MdcLoggable{
       u <- ResourceUser.find(By(ResourceUser.id, userPrimaryKey.value))
     } yield {
       u
-        .name_(Helpers.randomString(u.name.length))
-        .Company(Helpers.randomString(u.company.length))
-        .email(Helpers.randomString(10) + "@example.com")
+        .Company(Helpers.randomString(16))
+        .Deleted(true)
         .save()
     }
   }