diff --git a/Client/environments/environment.ts b/Client/environments/environment.ts
index d066a11b..ba7db5bb 100644
--- a/Client/environments/environment.ts
+++ b/Client/environments/environment.ts
@@ -3,8 +3,8 @@ export const environment = {
   redirect: 'https://module.aet.cit.tum.de',
   serverUrl: 'https://module.aet.cit.tum.de',
   keycloak: {
-    url: 'https://keycloak.ase.in.tum.de',
-    realm: 'tum',
-    clientId: 'module-management'
+    url: 'https://ba-pahle.aet.cit.tum.de/keycloak',
+    realm: 'demo',
+    clientId: 'demo-app'
   }
 };
diff --git a/Client/src/app/core/security/security-store.service.ts b/Client/src/app/core/security/security-store.service.ts
index 0adb1bc7..47d309fb 100644
--- a/Client/src/app/core/security/security-store.service.ts
+++ b/Client/src/app/core/security/security-store.service.ts
@@ -42,14 +42,15 @@ export class SecurityStore {
       try {
         const user = await firstValueFrom(this.userControllerService.getCurrentUser());
         this.user.set(user);
+        this.evaluatePasskeyDialogAfterTumLogin();
       } catch (error) {
         this.messageService.add({ severity: 'error', summary: 'Sign-in', detail: 'Something went wrong' });
         console.error('error fetching user details', error);
         this.user.set(undefined);
+      } finally {
+        this.isLoading.set(false);
       }
-      this.evaluatePasskeyDialogAfterTumLogin();
     }
-    this.isLoading.set(false);
   }
 
   closePasskeyDialog(dontShowAgain: boolean): void {