diff --git a/jams-server/src/main/java/net/jami/jams/server/Server.java b/jams-server/src/main/java/net/jami/jams/server/Server.java
index 47d94a235d678eeb2b182848626786a08d4f1a81..fab5ed81e307cbe03c99fc6752d946edc2aedcc7 100644
--- a/jams-server/src/main/java/net/jami/jams/server/Server.java
+++ b/jams-server/src/main/java/net/jami/jams/server/Server.java
@@ -74,9 +74,9 @@ public class Server {
                 if(serverSettings.getLocalDirectoryConfiguration() != null){
                     LocalAuthSettings settings = JsonIterator.deserialize(serverSettings.getActiveDirectoryConfiguration(), LocalAuthSettings.class);
                     if(settings.getPublicNames()) nameServer = new PublicNameServer(settings.getPublicNameServer());
-                    else nameServer = new LocalNameServer(dataStore,serverSettings.getServerPublicURI());
+                    else nameServer = new LocalNameServer(dataStore,userAuthenticationModule,serverSettings.getServerPublicURI());
                 }
-                else nameServer = new LocalNameServer(dataStore,serverSettings.getServerPublicURI());
+                else nameServer = new LocalNameServer(dataStore,userAuthenticationModule,serverSettings.getServerPublicURI());
             }
             catch (Exception e){
                 log.error("Could not load configuration file or initialize some components - this is critical");
diff --git a/jams-server/src/main/java/net/jami/jams/server/core/workflows/InstallationFinalizer.java b/jams-server/src/main/java/net/jami/jams/server/core/workflows/InstallationFinalizer.java
index 51300469854ad7bcfaa92c82fd6ea5e8a371d3c2..a0a6848714ec35815c83525bf16ba7672e8e593f 100644
--- a/jams-server/src/main/java/net/jami/jams/server/core/workflows/InstallationFinalizer.java
+++ b/jams-server/src/main/java/net/jami/jams/server/core/workflows/InstallationFinalizer.java
@@ -32,12 +32,12 @@ public class InstallationFinalizer {
             serverSettings.setServerPublicURI(CachedObjects.certificateAuthorityConfig.getServerDomain());
             if (CachedObjects.activeDirectorySettings != null) {
                 serverSettings.setActiveDirectoryConfiguration(JsonStream.serialize(CachedObjects.activeDirectorySettings));
-                nameServer = new LocalNameServer(dataStore,serverSettings.getServerPublicURI());
+                nameServer = new LocalNameServer(dataStore,userAuthenticationModule,serverSettings.getServerPublicURI());
                 log.info("Server configured to use Active Directory as the authentication backend!");
             }
             if (CachedObjects.ldapSettings != null) {
                 serverSettings.setLdapConfiguration(JsonStream.serialize(CachedObjects.ldapSettings));
-                nameServer = new LocalNameServer(dataStore,serverSettings.getServerPublicURI());
+                nameServer = new LocalNameServer(dataStore,userAuthenticationModule,serverSettings.getServerPublicURI());
                 log.info("Server configured to use LDAP as the authentication backend!");
             }
             if (CachedObjects.localAuthSettings != null) {
@@ -46,7 +46,7 @@ public class InstallationFinalizer {
                     nameServer = new PublicNameServer(CachedObjects.localAuthSettings.getPublicNameServer());
                     log.warn("Server configured to use {} as the nameserver for Jami clients !",CachedObjects.localAuthSettings.getPublicNameServer());
                 }
-                else nameServer = new LocalNameServer(dataStore,serverSettings.getServerPublicURI());
+                else nameServer = new LocalNameServer(dataStore,userAuthenticationModule,serverSettings.getServerPublicURI());
                 log.info("Server is configured to use local authentication engine");
             }
             //Now flush the server settings.