diff --git a/frontend/src/components/MenuBar.vue b/frontend/src/components/MenuBar.vue
index 847dca84..0954707f 100644
--- a/frontend/src/components/MenuBar.vue
+++ b/frontend/src/components/MenuBar.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
     import { ref } from "vue";
     import { useI18n } from "vue-i18n";
+    import { useRouter } from "vue-router";
 
     import auth from "@/services/auth/auth-service.ts";
 
@@ -10,6 +11,7 @@
     const { t, locale } = useI18n();
 
     const role = auth.authState.activeRole;
+    const router = useRouter();
 
     const name: string = auth.authState.user!.profile.name!;
     const initials: string = name
diff --git a/frontend/src/services/auth/auth-service.ts b/frontend/src/services/auth/auth-service.ts
index 1b80456c..51493a0c 100644
--- a/frontend/src/services/auth/auth-service.ts
+++ b/frontend/src/services/auth/auth-service.ts
@@ -61,10 +61,6 @@ function clearAuthState(): void {
 function setUserAuthInfo(newUser: User | null): void {
     authState.user = newUser;
     authState.accessToken = newUser?.access_token ?? null;
-
-    if (newUser === null) {
-        authStorage.deleteActiveRole();
-    }
 }
 
 /**
@@ -121,10 +117,14 @@ async function renewToken(): Promise<User | null> {
  * End the session of the current user.
  */
 async function logout(): Promise<void> {
+    console.log("LOGOUT");
     const activeRole = authStorage.getActiveRole();
     if (activeRole) {
         await (await getUserManagers())[activeRole].signoutRedirect();
         authStorage.deleteActiveRole();
+        clearAuthState();
+    } else {
+        console.log("No active role!!");
     }
 }