From 1315733d1e2db20c1f904dbd5db1a120eddefd45 Mon Sep 17 00:00:00 2001
From: Nikita Mazurenko <nikitamazurenko42@gmail.com>
Date: Mon, 24 Nov 2025 12:11:41 +0200
Subject: [PATCH] Revert userCredentials.setId(null); in
 UserServiceImpl#replaceUserCredentialsInternal

---
 .../java/org/thingsboard/server/dao/user/UserServiceImpl.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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);
             }