diff --git a/structures-frontend-next/.config/structures.config.json b/structures-frontend-next/.config/structures.config.json
new file mode 100644
index 000000000..dc458d2c5
--- /dev/null
+++ b/structures-frontend-next/.config/structures.config.json
@@ -0,0 +1,5 @@
+{
+  "applicationId": "ecommerce",
+  "entityDirectory": "src/domain",
+  "serverUrl": "http://127.0.0.1:9090"
+}
diff --git a/structures-frontend-next/src/IContinuumUI.ts b/structures-frontend-next/src/IContinuumUI.ts
index b2e22a570..290b33879 100644
--- a/structures-frontend-next/src/IContinuumUI.ts
+++ b/structures-frontend-next/src/IContinuumUI.ts
@@ -2,13 +2,11 @@ import { type Router } from 'vue-router';
 import { reactive } from 'vue';
 import { StructuresStates } from './states';
 
-// Interface for ContinuumUI
 export interface IContinuumUI {
     initialize(router: Router): void;
     navigate(path: string): Promise<any>;
 }
 
-// Class for ContinuumUI
 class ContinuumUI implements IContinuumUI {
 
     private router!: Router;
@@ -17,20 +15,6 @@ class ContinuumUI implements IContinuumUI {
 
     public initialize(router: Router): void {
         this.router = router;
-        
-        // Add navigation guard to the existing router
-        this.router.beforeEach((to, _from, next) => {
-            const { authenticationRequired } = to.meta as { authenticationRequired?: boolean };
-        
-            if ((authenticationRequired === undefined || authenticationRequired)
-                && !StructuresStates.getUserState().isAuthenticated()) {
-                
-                next({ path: '/login', query: { referer: to.path } });
-        
-            } else {
-                next();
-            }
-        });
     }
 
     public navigate(path: string): Promise<any> {
@@ -39,5 +23,4 @@ class ContinuumUI implements IContinuumUI {
     }
 }
 
-// Export a reactive singleton
 export const CONTINUUM_UI: IContinuumUI = reactive(new ContinuumUI());
\ No newline at end of file
diff --git a/structures-frontend-next/src/layouts/Header.vue b/structures-frontend-next/src/layouts/Header.vue
index 286371e10..a1a00eaca 100644
--- a/structures-frontend-next/src/layouts/Header.vue
+++ b/structures-frontend-next/src/layouts/Header.vue
@@ -2,11 +2,11 @@
   <div ref="headerRef" class="px-6 py-4 bg-surface-950 flex justify-between items-center sticky top-0 left-0 z-50">
     <div class="flex items-center gap-2 text-white relative">
       <RouterLink to="/applications" class="flex items-center gap-2">
-        <img v-if="!isApplicationDetailsPage && !isProjectStructuresPage" src="@/assets/logo.svg" class="h-8" />
+        <img v-if="!isApplicationDetailsPage && !isProjectStructuresPage && !isApplicationSettingsPage" src="@/assets/logo.svg" class="h-8" />
         <img v-else src="@/assets/sidebar-logo.svg" class="!h-8 !w-8" />
       </RouterLink>
 
-      <template v-if="isApplicationDetailsPage || isProjectStructuresPage">
+      <template v-if="isApplicationDetailsPage || isProjectStructuresPage || isApplicationSettingsPage">
         <span class="text-surface-400 text-lg">/</span>
 
         <div ref="appDropdownRef" class="relative inline-block mr-8">
@@ -119,6 +119,7 @@ export default class Header extends Vue {
 
   isApplicationDetailsPage = false;
   isProjectStructuresPage = false;
+  isApplicationSettingsPage = false;
 
   projectsForCurrentApp: Project[] = [];
   currentApp: Application | null = null;
@@ -163,7 +164,6 @@ export default class Header extends Vue {
 
   @Watch('$route.fullPath', { immediate: true })
   onRouteChange() {
-    console.log('Header: Route changed to:', this.$route.fullPath);
     this.updateRouteState();
     if (!APPLICATION_STATE.currentApplication) {
       this.tryAutoSelectAppAndProject();
@@ -182,24 +182,19 @@ export default class Header extends Vue {
     const path = this.$route.path;
     this.isApplicationDetailsPage = /^\/application\/[^/]+$/.test(path);
     this.isProjectStructuresPage = /^\/application\/[^/]+\/project\/[^/]+\/structures$/.test(path);
-    
-    console.log('Header: updateRouteState - path:', path);
-    console.log('Header: isApplicationDetailsPage:', this.isApplicationDetailsPage);
-    console.log('Header: isProjectStructuresPage:', this.isProjectStructuresPage);
-    
+    this.isApplicationSettingsPage = /^\/application\/[^/]+\/settings$/.test(path);
     if (this.isApplicationDetailsPage && !this.isProjectStructuresPage) {
-      console.log('Header: On ApplicationDetails page - clearing project selection');
       this.currentProject = null;
     }
     else if (this.isProjectStructuresPage) {
       const projectId = this.$route.params.projectId as string;
-      console.log('Header: ProjectStructures page - projectId:', projectId);
-      console.log('Header: Current project:', this.currentProject?.id);
       if (projectId && this.currentProject?.id !== projectId) {
-        console.log('Header: Detected project ID from URL:', projectId);
         this.setCurrentProjectById(projectId);
       }
     }
+    else if (this.isApplicationSettingsPage) {
+      this.currentProject = null;
+    }
   }
 
   loadApplicationsIfNeeded() {
@@ -236,7 +231,6 @@ export default class Header extends Vue {
       await USER_STATE.logout();
       this.$router.push('/login');
     } catch (error) {
-      console.error('Logout error:', error);
       this.$router.push('/login');
     }
   }
@@ -251,7 +245,6 @@ export default class Header extends Vue {
       if (this.isProjectStructuresPage) {
         const projectId = this.$route.params.projectId as string;
         if (projectId && this.currentProject?.id !== projectId) {
-          console.log('Header: Setting current project from URL after loading projects:', projectId);
           this.setCurrentProjectById(projectId);
         }
       }
@@ -261,17 +254,13 @@ export default class Header extends Vue {
   }
 
   async selectApp(app: Application) {
-    console.log('Header: Selecting application:', app.id)
     this.currentApp = app;
     APPLICATION_STATE.currentApplication = app;
-    console.log('Header: Set global application state:', APPLICATION_STATE.currentApplication?.id)
     this.appDropdownOpen = false;
     this.currentProject = null;
     this.searchTextApp = '';
 
     await this.loadProjectsForCurrentApp();
-
-    console.log('Header: Redirecting to application details page for:', app.id);
     await this.$router.push(`/application/${encodeURIComponent(app.id)}`);
 
     this.$emit('application-changed', app);
@@ -310,38 +299,21 @@ export default class Header extends Vue {
         const proj = this.projectsForCurrentApp.find(p => p.id === projectId);
         if (proj) {
           this.currentProject = proj;
-          console.log('Header: Set active project to:', proj.name, 'ID:', proj.id);
-          console.log('Header: Current project after setting:', this.currentProject);
-        } else {
-          console.warn('Header: Project not found:', projectId);
-          console.log('Header: Available projects:', this.projectsForCurrentApp.map(p => ({ id: p.id, name: p.name })));
         }
-      } else {
-        console.warn('Header: Application not found:', applicationId);
       }
     } catch (error) {
-      console.error('Header: Error setting active project:', error);
     }
   }
 
   setCurrentProjectById(projectId: string): void {
-    console.log('Header: setCurrentProjectById called with projectId:', projectId);
-    console.log('Header: projectsForCurrentApp length:', this.projectsForCurrentApp.length);
     
     if (this.projectsForCurrentApp.length > 0) {
       const proj = this.projectsForCurrentApp.find(p => p.id === projectId);
       if (proj) {
         this.currentProject = proj;
-        console.log('Header: Set current project from URL to:', proj.name, 'ID:', proj.id);
-        console.log('Header: Current project after setting:', this.currentProject);
-      } else {
-        console.warn('Header: Project not found in current projects:', projectId);
-        console.log('Header: Available projects:', this.projectsForCurrentApp.map(p => ({ id: p.id, name: p.name })));
       }
     } else {
-      console.warn('Header: No projects loaded yet, cannot set current project');
       this.loadProjectsForCurrentApp().then(() => {
-        console.log('Header: Projects loaded, retrying setCurrentProjectById');
         this.setCurrentProjectById(projectId);
       });
     }
@@ -356,7 +328,7 @@ export default class Header extends Vue {
       const applicationId = this.$route.params.applicationId as string;
       const projectId = this.$route.params.projectId as string;
       await this.setActiveProjectById(applicationId, projectId);
-    } else if (this.isApplicationDetailsPage) {
+    } else if (this.isApplicationDetailsPage || this.isApplicationSettingsPage) {
       const path = this.$route.path;
       const match = path.match(/^\/application\/([^/]+)/);
       if (match) {
diff --git a/structures-frontend-next/src/pages/ApplicationList.vue b/structures-frontend-next/src/pages/ApplicationList.vue
index cf1c42787..a00d0f16e 100644
--- a/structures-frontend-next/src/pages/ApplicationList.vue
+++ b/structures-frontend-next/src/pages/ApplicationList.vue
@@ -230,4 +230,19 @@ export default class NamespaceList extends Vue {
 .p-row-odd {
   cursor: pointer;
 }
+
+:deep(.p-datatable .p-datatable-tbody > tr) {
+  height: 64px;
+}
+
+:deep(.p-datatable .p-datatable-tbody > tr > td) {
+  vertical-align: middle;
+}
+
+:deep(.p-datatable .p-datatable-tbody > tr > td:last-child) {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 64px;
+}
 </style>
diff --git a/structures-frontend-next/src/pages/CliSessionUpgrade.vue b/structures-frontend-next/src/pages/CliSessionUpgrade.vue
new file mode 100644
index 000000000..aa8988e06
--- /dev/null
+++ b/structures-frontend-next/src/pages/CliSessionUpgrade.vue
@@ -0,0 +1,96 @@
+<template>
+  <div class="flex w-full justify-center items-center h-screen mx-auto">
+    <div class="relative w-1/2 h-full bg-gradient-to-br from-[#0A0A0B] from-0% via-[#0A0A0B] via-70% to-[#293A9E] to-100% hidden md:block">
+      <img src="@/assets/login-page-symbol-new.svg" class="absolute right-0 bottom-0 h-screen"/>
+      <img src="@/assets/login-page-logo-new.svg" class="absolute left-[75px] bottom-[56px] h-[63px] w-auto  xl:h-[63px] lg:h-[52px] md:max-w-[200px] md:h-[42px] sm:max-w-[150px] sm:h-[32px]"/>
+    </div>
+    
+    <div class="w-1/2 h-full flex flex-col justify-center items-center bg-center bg-cover relative">
+      <div class="flex flex-col items-center">
+        <img src="@/assets/login-page-logo.svg" class="w-[218px] h-[45px] mb-[53px]" />
+
+        <div class="text-center">
+          <div class="w-[64px] h-[64px] mx-auto mb-6 flex items-center justify-center bg-green-50 border-2 border-green-200 rounded-full">
+            <svg v-if="authenticated" class="w-6 text-green-600" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+              <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 13l4 4L19 7"></path>
+            </svg>
+            <svg v-else class="w-16 h-16 text-red-600" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+              <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"></path>
+            </svg>
+          </div>
+          <h2 class="text-4xl font-semibold text-gray-800 mb-4">{{ title }}</h2>
+          <p class="text-base text-gray-600">{{ message }}</p>
+        </div>
+
+        <div v-if="loading" class="absolute inset-0 flex items-center justify-center bg-white bg-opacity-75">
+          <div class="animate-spin rounded-full h-16 w-16 border-b-2 border-blue-600"></div>
+        </div>
+      </div>
+      
+      <div class="flex gap-2 absolute bottom-8 left-0 right-0 justify-center"> 
+        <a href="#" class="text-[#0568FD] border-b-1">
+          Terms of use
+        </a>
+        <span class="text-gray-400">
+          |
+        </span>
+        <span class="text-[#0568FD] border-b-1">
+          Privacy policy
+        </span>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import { Component, Prop, Vue } from 'vue-facing-decorator'
+import { USER_STATE } from '@/states/IUserState'
+import { SESSION_UPGRADE_SERVICE } from '@/services/SessionUpgradeService'
+import { Continuum } from '@kinotic/continuum-client'
+
+@Component({
+  components: {}
+})
+export default class CliSessionUpgrade extends Vue {
+  @Prop({ type: String, required: false, default: null })
+  public id!: string | null
+
+  private loading: boolean = false
+  private authenticated: boolean = false
+  private title: string = 'Authenticating'
+  private message: string = 'Connecting CLI to Continuum...'
+
+  public async mounted() {
+    const id = this.$route.params.id as string
+    
+    if (id) {
+      if (USER_STATE.connectedInfo?.sessionId) {
+        this.loading = true
+        try {
+          const decodedId = decodeURIComponent(id)
+          await SESSION_UPGRADE_SERVICE.upgradeSession(decodedId, USER_STATE.connectedInfo.sessionId)
+          
+        } catch (e) {
+          this.setStatus('Error connecting CLI to Continuum: ' + e, false, false)
+        } finally {
+          this.setStatus('You can close this tab and return to your command line.', true, false)
+          await Continuum.disconnect(true)
+          this.loading = false
+        }
+      } else {
+        this.setStatus('Error connecting CLI to Continuum: No session found.', false, false)
+      }
+    } else {
+      this.setStatus('Error connecting CLI to Continuum: No upgrade id provided.', false, false)
+    }
+  }
+
+  private setStatus(message: string, authenticated: boolean, loading: boolean) {
+    this.title = (loading ? 'Authenticating' : (authenticated ? 'Authentication Successful' : 'Authentication Failed'))
+    this.message = message
+    this.authenticated = authenticated
+    this.loading = loading
+  }
+}
+</script>
+
diff --git a/structures-frontend-next/src/pages/login/Login.vue b/structures-frontend-next/src/pages/login/Login.vue
index 0efc28e5e..5a4f1f4c4 100644
--- a/structures-frontend-next/src/pages/login/Login.vue
+++ b/structures-frontend-next/src/pages/login/Login.vue
@@ -7,6 +7,7 @@
         <p class="text-gray-600">Please wait while we complete your authentication.</p>
       </div>
     </div>
+
          <div class="relative w-1/2 h-full bg-gradient-to-br from-[#0A0A0B] from-0% via-[#0A0A0B] via-70% to-[#293A9E] to-100% hidden md:block">
        <img src="@/assets/login-page-symbol-new.svg" class="absolute right-0 bottom-0 h-screen"/>
        <img src="@/assets/login-page-logo-new.svg" class="absolute left-[75px] bottom-[56px] max-w-[300px] h-[63px] w-auto xl:max-w-[300px] xl:h-[63px] lg:max-w-[250px] lg:h-[52px] md:max-w-[200px] md:h-[42px] sm:max-w-[150px] sm:h-[32px]"/>
@@ -525,40 +526,21 @@ export default class Login extends Vue {
   }
 
   private async handleOidcLogin(provider: string) {
-    console.log('handleOidcLogin called with provider:', provider);
-    console.log('Current loading state:', this.state.loading);
-  
-
-    console.log('Starting OIDC flow (loading already set)...');
-    
     try {
-      console.log('Creating user manager for provider:', provider);
       const userManager = await createUserManager(provider);
-      console.log('User manager created successfully');
-      
-      console.log('Creating OIDC state...');
       const state = await this.auth.createOidcState(this.referer, provider);
-      console.log('OIDC state created:', state);
-      
       const signinOptions: any = { state };
       
       if (this.login) {
         signinOptions.login_hint = this.login;
-        console.log('Added login_hint:', this.login);
-        
         const emailDomain = this.login.split('@')[1];
         if (emailDomain) {
           signinOptions.domain_hint = emailDomain;
-          console.log('Added domain_hint:', emailDomain);
         }
       }
-      
-      console.log('Calling signinRedirect with options:', signinOptions);
       await userManager.signinRedirect(signinOptions);
-      console.log('signinRedirect completed successfully');
       
     } catch (error) {
-      console.error('OIDC login failed:', error);
       this.displayAlert(`OIDC login failed: ${error instanceof Error ? error.message : 'Unknown error'}`);
       
       this.auth.resetToEmail();
diff --git a/structures-frontend-next/src/pages/routes.ts b/structures-frontend-next/src/pages/routes.ts
index 9876fe45d..6746527aa 100644
--- a/structures-frontend-next/src/pages/routes.ts
+++ b/structures-frontend-next/src/pages/routes.ts
@@ -32,16 +32,6 @@ const pageRoutes: RouteRecordRaw[] = [
           icon: 'pi-objects-column',
           path: `/application/${route.params.applicationId}`
         },
-        {
-          label: 'Data Insights',
-          icon: 'pi pi-chart-line',
-          path: `/application/${route.params.applicationId}/data-insights`
-        },
-        {
-          label: 'Dashboards',
-          icon: 'pi pi-th-large',
-          path: `/application/${route.params.applicationId}/dashboards`
-        },
         // {
         //   label: 'Authentication',
         //   icon: 'pi pi-key',
@@ -61,18 +51,6 @@ const pageRoutes: RouteRecordRaw[] = [
         component: () => import('@/pages/ApplicationDetails.vue'),
         props: (route) => ({ applicationId: route.params.applicationId })
       },
-      {
-        name: 'data-insights',
-        path: 'data-insights',
-        component: () => import('@/pages/DataInsights.vue'),
-        props: (route) => ({ applicationId: route.params.applicationId })
-      },
-      {
-        name: 'dashboards',
-        path: 'dashboards',
-        component: () => import('@/pages/Dashboards.vue'),
-        props: (route) => ({ applicationId: route.params.applicationId })
-      },
       {
         name: 'application-settings',
         path: 'settings',
@@ -177,6 +155,14 @@ const pageRoutes: RouteRecordRaw[] = [
       authenticationRequired: false
     } as RouteMeta,
   },
+  {
+    path: '/sessionUpgrade/:id',
+    meta: {
+      authenticationRequired: true
+    },
+    component: () => import('@/pages/CliSessionUpgrade.vue'),
+    props: true
+  },
   {
     path: '/graphql',
     component: () => import('@/layouts/MainLayout.vue'),
diff --git a/structures-frontend-next/src/plugins/StructuresUI.ts b/structures-frontend-next/src/plugins/StructuresUI.ts
index 6e03f146e..7bf655179 100644
--- a/structures-frontend-next/src/plugins/StructuresUI.ts
+++ b/structures-frontend-next/src/plugins/StructuresUI.ts
@@ -10,7 +10,7 @@ export function createStructuresUI(): Plugin {
                 const { authenticationRequired } = to.meta
                 if ((authenticationRequired === undefined || authenticationRequired)
                     && !StructuresStates.getUserState().isAuthenticated()){
-                    next({ path: '/login' })
+                    next({ path: '/login', query: { referer: to.fullPath } })
                 } else {
                     next()
                 }
diff --git a/structures-frontend-next/src/router.ts b/structures-frontend-next/src/router.ts
index 6cc0c94a8..fa77014eb 100644
--- a/structures-frontend-next/src/router.ts
+++ b/structures-frontend-next/src/router.ts
@@ -1,4 +1,4 @@
-import {createRouter, createWebHistory, type RouteRecordRaw} from 'vue-router'
+import {createRouter, createWebHashHistory, type RouteRecordRaw} from 'vue-router'
 import pagesRoutes from '@/pages/routes'
 
 const routes: RouteRecordRaw[] = [
@@ -24,7 +24,7 @@ const routes: RouteRecordRaw[] = [
 
 
 const router = createRouter({
-    history: createWebHistory(),
+    history: createWebHashHistory(),
     routes,
 })
 
diff --git a/structures-frontend-next/src/services/SessionUpgradeService.ts b/structures-frontend-next/src/services/SessionUpgradeService.ts
new file mode 100644
index 000000000..7c1d6acc6
--- /dev/null
+++ b/structures-frontend-next/src/services/SessionUpgradeService.ts
@@ -0,0 +1,23 @@
+import {Continuum, type IServiceProxy} from '@kinotic/continuum-client'
+
+export interface ISessionUpgradeService {
+
+    upgradeSession(upgradeId: string, sessionId: string): Promise<void>
+
+}
+
+export class SessionUpgradeService implements ISessionUpgradeService {
+
+    protected serviceProxy: IServiceProxy
+
+    constructor() {
+        this.serviceProxy = Continuum.serviceProxy('continuum.cli.SessionUpgradeService')
+    }
+
+    public async upgradeSession(upgradeId: string, sessionId: string): Promise<void> {
+        await this.serviceProxy.invoke('upgradeSession', [sessionId], upgradeId)
+    }
+}
+
+
+export const SESSION_UPGRADE_SERVICE: ISessionUpgradeService = new SessionUpgradeService()
diff --git a/structures-frontend-next/src/util/AuthenticationManager.ts b/structures-frontend-next/src/util/AuthenticationManager.ts
index 6865d1c6c..2dc2d209a 100644
--- a/structures-frontend-next/src/util/AuthenticationManager.ts
+++ b/structures-frontend-next/src/util/AuthenticationManager.ts
@@ -15,6 +15,7 @@ export interface AuthenticationState {
   loading: boolean;
   oidcCallbackLoading: boolean;
   password: string;
+  authenticationSuccess: boolean;
 }
 
 export interface ProviderConfig {
@@ -49,7 +50,6 @@ export class AuthenticationManager {
       this.configLoaded = true;
     } catch (error) {
       console.error('Failed to load configuration:', error);
-      // Set defaults if configuration loading fails
       this.basicAuthEnabled = true;
       this.configLoaded = true;
     }
@@ -222,7 +222,8 @@ export class AuthenticationManager {
       showErrorDetails: false,
       loading: false,
       oidcCallbackLoading: false,
-      password: ''
+      password: '',
+      authenticationSuccess: false
     };
   }
 
@@ -238,7 +239,8 @@ export class AuthenticationManager {
       providerDisplayName: '',
       showRetryOption: false,
       showErrorDetails: false,
-      password: ''
+      password: '',
+      authenticationSuccess: false
     };
   }
 
diff --git a/structures-frontend-next/src/util/AuthenticationService.ts b/structures-frontend-next/src/util/AuthenticationService.ts
index fba498151..ae0a318d5 100644
--- a/structures-frontend-next/src/util/AuthenticationService.ts
+++ b/structures-frontend-next/src/util/AuthenticationService.ts
@@ -9,7 +9,6 @@ export class AuthenticationService {
   private _currentOidcError: OidcError | null = null;
 
   constructor() {
-    // Don't initialize AuthManager immediately - just create basic state
     this._state = {
       emailEntered: false,
       showPassword: false,
@@ -19,21 +18,19 @@ export class AuthenticationService {
       showErrorDetails: false,
       loading: false,
       oidcCallbackLoading: false,
-      password: ''
+      password: '',
+      authenticationSuccess: false
     };
   }
 
-  // Lazy initialize the AuthManager only when needed
   private async getAuthManager(): Promise<AuthenticationManager> {
     if (!this.authManager) {
       this.authManager = new AuthenticationManager();
-      // Wait for it to initialize
       await this.authManager.loadConfiguration();
     }
     return this.authManager;
   }
 
-  // State getters
   get state(): AuthenticationState {
     return this._state;
   }
@@ -58,7 +55,6 @@ export class AuthenticationService {
     return this._currentOidcError;
   }
 
-  // Simple computed properties that don't require AuthManager
   get shouldShowLoginForm(): boolean {
     return !this._state.oidcCallbackLoading;
   }
@@ -71,7 +67,6 @@ export class AuthenticationService {
     return !!this._password;
   }
 
-  // These require AuthManager but are only called after email submission
   async isConfigLoaded(): Promise<boolean> {
     try {
       const authManager = await this.getAuthManager();
@@ -88,7 +83,7 @@ export class AuthenticationService {
       return authManager.isBasicAuthEnabled();
     } catch (error) {
       console.error('Failed to check basic auth:', error);
-      return true; // Default to true
+      return true;
     }
   }
 
@@ -102,7 +97,6 @@ export class AuthenticationService {
     }
   }
 
-  // State management methods
   updateState(newState: Partial<AuthenticationState>): void {
     console.log('updateState called with:', newState);
     console.log('Previous state:', this._state);
@@ -115,14 +109,14 @@ export class AuthenticationService {
       const newState = this.authManager.resetToEmail(this._state);
       this.updateState(newState);
     } else {
-      // Fallback without AuthManager
       this.updateState({
         emailEntered: false,
         showPassword: false,
         matchedProvider: null,
         providerDisplayName: '',
         showRetryOption: false,
-        showErrorDetails: false
+        showErrorDetails: false,
+        authenticationSuccess: false
       });
     }
     this._password = '';
@@ -136,7 +130,6 @@ export class AuthenticationService {
       const newState = this.authManager.resetToPassword(this._state, matchedProvider, providerDisplayName);
       this.updateState(newState);
     } else {
-      // Fallback without AuthManager
       this.updateState({
         emailEntered: true,
         showPassword: true,
@@ -155,7 +148,6 @@ export class AuthenticationService {
       const newState = this.authManager.showProviderSelection(this._state, matchedProvider, providerDisplayName);
       this.updateState(newState);
     } else {
-      // Fallback without AuthManager
       this.updateState({
         emailEntered: true,
         showPassword: false,
@@ -172,7 +164,6 @@ export class AuthenticationService {
       const newState = this.authManager.showRetryOption(this._state);
       this.updateState(newState);
     } else {
-      // Fallback without AuthManager
       this.updateState({
         showRetryOption: true,
         showErrorDetails: false,
@@ -188,7 +179,6 @@ export class AuthenticationService {
       const newState = this.authManager.clearRetryOption(this._state);
       this.updateState(newState);
     } else {
-      // Fallback without AuthManager
       this.updateState({
         showRetryOption: false,
         showErrorDetails: false
@@ -202,7 +192,6 @@ export class AuthenticationService {
       const newState = this.authManager.toggleErrorDetails(this._state);
       this.updateState(newState);
     } else {
-      // Fallback without AuthManager
       this.updateState({
         showErrorDetails: !this._state.showErrorDetails
       });
@@ -214,7 +203,6 @@ export class AuthenticationService {
       const newState = this.authManager.setLoading(this._state, loading);
       this.updateState(newState);
     } else {
-      // Fallback without AuthManager
       this.updateState({ loading });
     }
   }
@@ -224,12 +212,10 @@ export class AuthenticationService {
       const newState = this.authManager.setOidcCallbackLoading(this._state, loading);
       this.updateState(newState);
     } else {
-      // Fallback without AuthManager
       this.updateState({ oidcCallbackLoading: loading });
     }
   }
 
-  // Authentication logic methods - these initialize AuthManager if needed
   async determineAuthMethod(email: string) {
     const authManager = await this.getAuthManager();
     return await authManager.determineAuthMethod(email);
@@ -249,7 +235,6 @@ export class AuthenticationService {
     if (this.authManager) {
       return this.authManager.getProviderIcon(provider);
     } else {
-      // Fallback icon mapping without AuthManager
       const iconMap: Record<string, string> = {
         okta: '@/assets/okta-icon.svg',
         keycloak: '@/assets/keycloak-icon.svg',
@@ -268,12 +253,10 @@ export class AuthenticationService {
     return authManager.parseOidcError(error, errorDescription);
   }
 
-  // OIDC state management
   clearOidcState(): void {
     if (this.authManager) {
       this.authManager.clearOidcState();
     } else {
-      // Fallback without AuthManager
       const keysToRemove: string[] = [];
       for (let i = 0; i < localStorage.length; i++) {
         const key = localStorage.key(i);
@@ -295,7 +278,6 @@ export class AuthenticationService {
     return authManager.parseOidcState(state);
   }
 
-  // Create initial state
   createInitialState(): AuthenticationState {
     return {
       emailEntered: false,
@@ -306,11 +288,11 @@ export class AuthenticationService {
       showErrorDetails: false,
       loading: false,
       oidcCallbackLoading: false,
-      password: ''
+      password: '',
+      authenticationSuccess: false
     };
   }
 
-  // Utility methods
   clearForm(): void {
     this._login = '';
     this._password = '';
@@ -323,13 +305,12 @@ export class AuthenticationService {
     this.clearOidcState();
   }
 
-  // Direct config service methods for immediate use
   async checkBasicAuthEnabled(): Promise<boolean> {
     try {
       return await configService.isBasicAuthEnabled();
     } catch (error) {
       console.error('Failed to check basic auth:', error);
-      return true; // Default to enabled
+      return true;
     }
   }
 
@@ -338,7 +319,7 @@ export class AuthenticationService {
       return await configService.isOidcEnabled();
     } catch (error) {
       console.error('Failed to check OIDC:', error);
-      return false; // Default to disabled
+      return false;
     }
   }
 }