diff --git a/src/Document/UserManager.php b/src/Document/UserManager.php
index 83583e910..cea65c2bf 100644
--- a/src/Document/UserManager.php
+++ b/src/Document/UserManager.php
@@ -50,7 +50,6 @@ public function updatePassword(UserInterface $user): void
         $password = $this->userPasswordHasher->hashPassword($user, $plainPassword);
 
         $user->setPassword($password);
-        $user->eraseCredentials();
     }
 
     public function findUserByUsername(string $username): ?UserInterface
diff --git a/src/Entity/UserManager.php b/src/Entity/UserManager.php
index 76c03e921..d1eeb620c 100644
--- a/src/Entity/UserManager.php
+++ b/src/Entity/UserManager.php
@@ -50,7 +50,6 @@ public function updatePassword(UserInterface $user): void
         $password = $this->userPasswordHasher->hashPassword($user, $plainPassword);
 
         $user->setPassword($password);
-        $user->eraseCredentials();
     }
 
     public function findUserByUsername(string $username): ?UserInterface
diff --git a/src/Model/User.php b/src/Model/User.php
index 53b95f977..083afefe2 100644
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -64,6 +64,8 @@ public function __toString(): string
      */
     public function __serialize(): array
     {
+        $this->plainPassword = null;
+
         return [
             $this->password,
             $this->salt,
@@ -106,9 +108,9 @@ public function addRole(string $role): void
         }
     }
 
+    #[\Deprecated]
     public function eraseCredentials(): void
     {
-        $this->plainPassword = null;
     }
 
     public function getId()
@@ -252,6 +254,7 @@ public function setEnabled(bool $enabled): void
     public function setPassword(?string $password): void
     {
         $this->password = $password;
+        $this->plainPassword = null;
     }
 
     public function setSuperAdmin(bool $boolean): void