diff --git a/wise-webapp/src/main/java/com/wisemapping/dao/UserManagerImpl.java b/wise-webapp/src/main/java/com/wisemapping/dao/UserManagerImpl.java
index 109ae75e..47107441 100644
--- a/wise-webapp/src/main/java/com/wisemapping/dao/UserManagerImpl.java
+++ b/wise-webapp/src/main/java/com/wisemapping/dao/UserManagerImpl.java
@@ -125,9 +125,8 @@ public class UserManagerImpl
         template.delete(collaborator);
 
         // Save all new...
-        user.setPassword(passwordEncoder.encode(user.getPassword()));
-        template.save(user);
-        newCollabs.forEach(c -> template.save(c));
+        this.createUser(user);
+        newCollabs.forEach(c -> template.saveOrUpdate(c));
 
         return user;
     }