diff --git a/dao/src/main/java/org/thingsboard/server/dao/user/UserServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/user/UserServiceImpl.java
index f2b9e476b5..bdcac80d4a 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/user/UserServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/user/UserServiceImpl.java
@@ -361,7 +361,7 @@ public class UserServiceImpl extends AbstractCachedEntityService<UserCacheKey, U
 
         try {
             userCredentialsDao.removeById(tenantId, oldCredentialsUuid);
-
+            userCredentials.setId(null);
             if (userCredentials.getPassword() != null) {
                 updatePasswordHistory(userCredentials);
             }