diff --git a/management/server/account.go b/management/server/account.go
index af112c25b..26fb079f3 100644
--- a/management/server/account.go
+++ b/management/server/account.go
@@ -1402,22 +1402,7 @@ func (am *DefaultAccountManager) SyncUserJWTGroups(ctx context.Context, userAuth
 			return fmt.Errorf("error saving groups: %w", err)
 		}
 
-		addNewGroups = util.Difference(updatedAutoGroups, user.AutoGroups)
-		for _, group := range addNewGroups {
-			err = transaction.AddUserToGroup(ctx, userAuth.AccountId, user.Id, group)
-			if err != nil {
-				return fmt.Errorf("error adding user to group: %w", err)
-			}
-		}
-		removeOldGroups = util.Difference(user.AutoGroups, updatedAutoGroups)
-		for _, group := range removeOldGroups {
-			err = transaction.RemoveUserFromGroup(ctx, user.Id, group)
-			if err != nil {
-				return fmt.Errorf("error removing user from group: %w", err)
-			}
-		}
 		user.AutoGroups = updatedAutoGroups
-
 		if err = transaction.SaveUser(ctx, user); err != nil {
 			return fmt.Errorf("error saving user: %w", err)
 		}
diff --git a/management/server/store/sql_store.go b/management/server/store/sql_store.go
index 957960236..d1fc2f1eb 100644
--- a/management/server/store/sql_store.go
+++ b/management/server/store/sql_store.go
@@ -511,7 +511,7 @@ func (s *SqlStore) SaveUser(ctx context.Context, user *types.User) error {
 			return status.Errorf(status.Internal, "failed to delete user groups from store: %v", result.Error)
 		}
 
-		if len(user.Groups) != 0 {
+		if len(userCopy.Groups) != 0 {
 			result = tx.Save(userCopy.Groups)
 			if result.Error != nil {
 				return status.Errorf(status.Internal, "failed to save user groups to store: %v", result.Error)