diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/user/DBUser.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/user/DBUser.java
index 10910d38a0f03937eb9e4c3f61219937d04ad324..c2b072cfc476696ef55fe6111bdd1cf0d2903149 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/user/DBUser.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/user/DBUser.java
@@ -102,7 +102,6 @@ public class DBUser extends BaseEntity {
     @ColumnDescription(comment = "DomiSMP settings: locale for the user")
     private String smpLocale;
 
-
     @OneToMany(
             mappedBy = "user",
             cascade = CascadeType.ALL,
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIUserService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIUserService.java
index ce65b7b2676acca34ccb7c94c9ed76faf9b6dfcf..a4b5de9b5bede8676f0886918f5c96466f1e06c1 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIUserService.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIUserService.java
@@ -266,6 +266,10 @@ public class UIUserService extends UIServiceBase<DBUser, UserRO> {
         dbCredential.setExpireOn(adminUpdate ? null :
                 currentTime.plusDays(configurationService.getPasswordPolicyValidDays()));
 
+        // if the credentials are not managed by the session , e.g. new  - the parsist it
+        if (dbCredential.getId()==null) {
+            credentialDao.persist(dbCredential);
+        }
         return dbCredential.getUser();
     }