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 6c8a79a26dfcd37d06db3fc31f17ab9d506608b2..8a9613779b2cf9d850cb863773c447e4d69df8af 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
@@ -70,6 +70,8 @@ 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);
             }