diff --git a/webapp/packages/core-root/src/ServerConfigResource.ts b/webapp/packages/core-root/src/ServerConfigResource.ts
index 57b0bef6a9..3476c6aeb3 100644
--- a/webapp/packages/core-root/src/ServerConfigResource.ts
+++ b/webapp/packages/core-root/src/ServerConfigResource.ts
@@ -149,6 +149,12 @@ export class ServerConfigResource extends CachedDataResource<ServerConfig | null
     this.navigatorSettingsUpdate = update;
   }
 
+  resetUpdate(): void {
+    if (this.data) {
+      this.syncUpdateData(this.data);
+    }
+  }
+
   unlinkUpdate(): void {
     this.update = {};
 
diff --git a/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationService.ts b/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationService.ts
index 1a3c000811..5a491b040a 100644
--- a/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationService.ts
+++ b/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationService.ts
@@ -78,6 +78,7 @@ export class ServerConfigurationService {
 
     this.loadConfigTask
       .next(this.validationTask, () => this.getSaveData(false))
+      .addHandler(ExecutorInterrupter.interrupter(() => this.loading))
       .addHandler(() => { this.loading = true; })
       .addHandler(this.loadServerConfig)
       .addPostHandler(() => {
@@ -134,6 +135,10 @@ export class ServerConfigurationService {
         this.serverConfigResource.setDataUpdate(this.state.serverConfig);
         this.serverConfigResource.setNavigatorSettingsUpdate(this.state.navigatorConfig);
 
+        if (reset) {
+          this.serverConfigResource.resetUpdate();
+        }
+
         this.stateLinked = true;
       }
 
@@ -263,6 +268,7 @@ export class ServerConfigurationService {
 
     if (
       close
+      || !this.stateLinked
       || this.unSaveNotification
       || this.administrationScreenService.isConfigurationMode
       // || !this.administrationScreenService.isAdministrationPageActive
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/ServerConfiguration/ServerConfigurationAuthenticationBootstrap.ts b/webapp/packages/plugin-authentication-administration/src/Administration/ServerConfiguration/ServerConfigurationAuthenticationBootstrap.ts
index 6484bb8089..d56fd863cb 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/ServerConfiguration/ServerConfigurationAuthenticationBootstrap.ts
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/ServerConfiguration/ServerConfigurationAuthenticationBootstrap.ts
@@ -37,7 +37,6 @@ export class ServerConfigurationAuthenticationBootstrap extends Bootstrap {
     }
 
     try {
-      await this.authProvidersResource.loadAll();
       const config = await this.serverConfigResource.load();
 
       if (!config) {
@@ -45,6 +44,7 @@ export class ServerConfigurationAuthenticationBootstrap extends Bootstrap {
       }
 
       if (config.configurationMode) {
+        await this.authProvidersResource.loadAll();
         if (this.authProvidersResource.has(AUTH_PROVIDER_LOCAL_ID)) {
           data.state.serverConfig.adminName = 'cbadmin';
           data.state.serverConfig.adminPassword = '';