diff --git a/authentication-module/src/main/java/net/jami/jams/authmodule/RegisterUserFlow.java b/authentication-module/src/main/java/net/jami/jams/authmodule/RegisterUserFlow.java
index 1efd2de164e6f128adbbd6ca38ebef5bd461e474..284770f7c79f388e191d07dcdd451a551293bfb8 100644
--- a/authentication-module/src/main/java/net/jami/jams/authmodule/RegisterUserFlow.java
+++ b/authentication-module/src/main/java/net/jami/jams/authmodule/RegisterUserFlow.java
@@ -50,7 +50,7 @@ public class RegisterUserFlow {
         user.setEthKey(ethKeyPair[1]);
         user.setJamiId(DeviceReceiptGenerator.generateJamiId(user));
         //Didn't exactly plan on this happening here, but this is the only place we actually need it.
-        //Given an interface of NameServer, we need to enroll the user or decline the enrollement before
+        //Given an interface of NameServer, we need to enroll the user or decline the enrollment before
         //storing him
         NameRegistrationRequest nameRegistrationRequest = new NameRegistrationRequest();
         nameRegistrationRequest.setOwner(ethKeyPair[0]);
diff --git a/jams-server/src/main/java/net/jami/jams/server/core/workflows/RegisterDeviceFlow.java b/jams-server/src/main/java/net/jami/jams/server/core/workflows/RegisterDeviceFlow.java
index 8a9613779b2cf9d850cb863773c447e4d69df8af..ed08abbf32802ced6af534b5bd05a1e2b6f457bf 100644
--- a/jams-server/src/main/java/net/jami/jams/server/core/workflows/RegisterDeviceFlow.java
+++ b/jams-server/src/main/java/net/jami/jams/server/core/workflows/RegisterDeviceFlow.java
@@ -69,11 +69,9 @@ public class RegisterDeviceFlow {
             }
 
             // Renew user certificate if expired with same private key
-            if(!user.getCertificate().getNotAfter().after(new Date())) {
-                user.setX509Fields(new X509Fields());
-                user.getX509Fields().setCommonName(user.getUsername());
-                user = UserAuthenticationModule.certificateAuthority.getSignedCertificate(user);
-                datastore.getUserDao().storeObject(user);
+            if(user.getCertificate().getNotAfter().after(new Date())) {
+                user = UserAuthenticationModule.certificateAuthority.getRefreshedCertificate(user);
+                datastore.updateUserCertificate(user);
             }
 
             Device device = new Device();