diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserForm.tsx b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserForm.tsx
index 8e6d868997..3805d79396 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserForm.tsx
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserForm.tsx
@@ -121,8 +121,9 @@ export const UserForm = observer<Props>(function UserForm({ user, editing = fals
         </connection-top-bar>
         <content-box>
           <SubmittingForm ref={focusedRef}>
-            <TabPanelList style={style} />
-            <Loader loading={controller.isLoading} overlay />
+            <Loader loading={controller.isLoading || !controller.configured}>
+              <TabPanelList style={style} />
+            </Loader>
           </SubmittingForm>
         </content-box>
       </box>
diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserFormController.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserFormController.ts
index 04f7838006..acb81bb6c9 100644
--- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserFormController.ts
+++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UserForm/UserFormController.ts
@@ -52,6 +52,7 @@ export class UserFormController implements IInitializableController, IDestructib
   enabled: boolean;
   statusMessage: IStatusMessage | null;
   partsState: MetadataMap<string, any>;
+  configured: boolean;
 
   get connections(): DatabaseConnection[] {
     return this.connectionInfoResource.values
@@ -108,6 +109,7 @@ export class UserFormController implements IInitializableController, IDestructib
     this.connectionAccessChanged = false;
     this.connectionAccessLoaded = false;
     this.statusMessage = null;
+    this.configured = false;
 
     makeObservable(this, {
       selectedConnections: observable,
@@ -116,23 +118,25 @@ export class UserFormController implements IInitializableController, IDestructib
       isLoading: observable,
       credentials: observable,
       enabled: observable.ref,
+      configured: observable.ref,
       statusMessage: observable,
       connections: computed,
       teams: computed,
     });
   }
 
-  init(): void {
-    this.userFormService.onFormInit.execute();
+  async init(): Promise<void> {
+    await this.userFormService.onFormInit.execute();
+    this.configured = true;
   }
 
-  update(user: AdminUserInfo, editing: boolean, collapse: () => void): void {
+  async update(user: AdminUserInfo, editing: boolean, collapse: () => void): Promise<void> {
     const prevUser = this.user;
     this.user = user;
     this.editing = editing;
     this.collapse = collapse;
     if (prevUser !== this.user) {
-      this.loadTeams();
+      await this.loadTeams();
     }
   }
 
@@ -348,6 +352,7 @@ export class UserFormController implements IInitializableController, IDestructib
 
   private async loadTeams() {
     try {
+      this.isLoading = true;
       await this.teamsResource.load(CachedMapAllKey);
       await this.loadUser();
     } catch (exception: any) {