diff --git a/console/src/app/modules/nav/nav.component.html b/console/src/app/modules/nav/nav.component.html
index 04c6c26716..f0fedc0636 100644
--- a/console/src/app/modules/nav/nav.component.html
+++ b/console/src/app/modules/nav/nav.component.html
@@ -167,7 +167,7 @@
                   <a
                     class="nav-item"
                     [routerLinkActive]="['active']"
-                    [routerLinkActiveOptions]="{ exact: true }"
+                    [routerLinkActiveOptions]="{ exact: false }"
                     [routerLink]="['/org-settings']"
                   >
                     <span class="label">{{ 'MENU.SETTINGS' | translate }}</span>
diff --git a/console/src/app/pages/projects/owned-projects/owned-project-detail/owned-project-detail.component.ts b/console/src/app/pages/projects/owned-projects/owned-project-detail/owned-project-detail.component.ts
index 0c336580d7..ef085b459c 100644
--- a/console/src/app/pages/projects/owned-projects/owned-project-detail/owned-project-detail.component.ts
+++ b/console/src/app/pages/projects/owned-projects/owned-project-detail/owned-project-detail.component.ts
@@ -78,6 +78,8 @@ export class OwnedProjectDetailComponent implements OnInit {
       const { id } = params;
       if (id) {
         this.currentSetting = id;
+      } else {
+        this.currentSetting = 'general';
       }
     });
   }
diff --git a/console/src/app/services/authentication.service.ts b/console/src/app/services/authentication.service.ts
index 35d6e084cc..b4b24c30fd 100644
--- a/console/src/app/services/authentication.service.ts
+++ b/console/src/app/services/authentication.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { AuthConfig, OAuthService } from 'angular-oauth2-oidc';
-import { BehaviorSubject, from, Observable } from 'rxjs';
+import { BehaviorSubject, from, lastValueFrom, Observable } from 'rxjs';
 
 import { StatehandlerService } from './statehandler/statehandler.service';
 
@@ -41,7 +41,7 @@ export class AuthenticationService {
 
     this._authenticated = this.oauthService.hasValidAccessToken();
     if (!this.oauthService.hasValidIdToken() || !this.authenticated || partialConfig || force) {
-      const newState = await this.statehandler.createState().toPromise();
+      const newState = await lastValueFrom(this.statehandler.createState());
       this.oauthService.initCodeFlow(newState);
     }
     this._authenticationChanged.next(this.authenticated);
diff --git a/console/src/app/services/statehandler/statehandler-processor.service.ts b/console/src/app/services/statehandler/statehandler-processor.service.ts
index 8d63707d2b..6c07685cda 100644
--- a/console/src/app/services/statehandler/statehandler-processor.service.ts
+++ b/console/src/app/services/statehandler/statehandler-processor.service.ts
@@ -16,9 +16,7 @@ export class StatehandlerProcessorServiceImpl implements StatehandlerProcessorSe
     const externalUrl = this.location.prepareExternalUrl(url);
     const urlId = uuidv4();
 
-    if (externalUrl.includes('login_hint=')) {
-      sessionStorage.setItem(urlId, externalUrl);
-    }
+    sessionStorage.setItem(urlId, externalUrl);
 
     return of(urlId);
   }