diff --git a/src/components/Login/Login.vue b/src/components/Login/Login.vue
index c38a1cafa..cac0d4571 100644
--- a/src/components/Login/Login.vue
+++ b/src/components/Login/Login.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
 import { computed, ref } from 'vue';
 
-import { useUserStore } from '@/stores/UserStore';
+import { useAuthStore } from '@/stores/AuthStore';
 import { osimRuntime } from '@/stores/osimRuntime';
 
 // const router = useRouter();
-const userStore = useUserStore();
+const userStore = useAuthStore();
 // const route = useRoute();
 
 const username = ref('');
diff --git a/src/components/Navbar/Navbar.vue b/src/components/Navbar/Navbar.vue
index 729fea8e7..c46668cf6 100644
--- a/src/components/Navbar/Navbar.vue
+++ b/src/components/Navbar/Navbar.vue
@@ -8,6 +8,7 @@ import { useElementBounding } from '@vueuse/core';
 import { useSearchParams } from '@/composables/useSearchParams';
 
 import { useUserStore } from '@/stores/UserStore';
+import { useAuthStore } from '@/stores/AuthStore';
 import router from '@/router';
 import { useSettingsStore } from '@/stores/SettingsStore';
 import { useToastStore } from '@/stores/ToastStore';
@@ -17,6 +18,7 @@ import { cveRegex } from '@/utils/helpers';
 import RedHatIconSvg from '@/assets/Logo-Red_Hat-Hat_icon-Standard-RGB.svg';
 
 const userStore = useUserStore();
+const authStore = useAuthStore();
 const { settings } = useSettingsStore();
 const { toasts } = useToastStore();
 const elHeader = ref<HTMLElement | null>(null);
@@ -166,7 +168,7 @@ const usernameDisplay = computed(() => {
             <hr class="dropdown-divider">
           </li>
           <li>
-            <button class="dropdown-item" type="button" @click.prevent="userStore.logout">
+            <button class="dropdown-item" type="button" @click.prevent="authStore.logout">
               Logout
             </button>
           </li>
diff --git a/src/composables/__tests__/useSessionWarning.spec.ts b/src/composables/__tests__/useSessionWarning.spec.ts
index 6e76f68ef..3116c7078 100644
--- a/src/composables/__tests__/useSessionWarning.spec.ts
+++ b/src/composables/__tests__/useSessionWarning.spec.ts
@@ -3,7 +3,7 @@ import { createPinia, setActivePinia } from 'pinia';
 import { DateTime } from 'luxon';
 
 import { encodeJWT } from '@/__tests__/helpers';
-import { useUserStore } from '@/stores/UserStore';
+import { useAuthStore } from '@/stores/AuthStore';
 
 import { useSessionWarning } from '../useSessionWarning';
 
@@ -29,9 +29,9 @@ const mockSessionData = {
 // Create a shared login spy that can be accessed in tests
 const mockLogin = vi.fn().mockResolvedValue(true);
 
-vi.mock('@/stores/UserStore', () => ({
-  useUserStore: vi.fn(() => ({
-    get refreshToken() { return mockSessionData.refresh; },
+vi.mock('@/stores/AuthStore', () => ({
+  useAuthStore: vi.fn(() => ({
+    get refreshToken() { return mockSessionData.refresh as any; },
     set refreshToken(value: string) { mockSessionData.refresh = value; },
     login: mockLogin,
     logout: vi.fn(),
@@ -39,7 +39,7 @@ vi.mock('@/stores/UserStore', () => ({
 }));
 
 describe('useSessionWarning', () => {
-  let _userStore: any;
+  let _authStore: any;
 
   beforeEach(() => {
     setActivePinia(createPinia());
@@ -53,7 +53,7 @@ describe('useSessionWarning', () => {
     mockSessionData.whoami = null;
     mockSessionData.jiraUsername = '';
 
-    _userStore = useUserStore();
+    _authStore = useAuthStore();
     vi.clearAllMocks();
     mockLogin.mockClear();
   });
diff --git a/src/composables/useSessionWarning.ts b/src/composables/useSessionWarning.ts
index aaf800eda..12b0e63ba 100644
--- a/src/composables/useSessionWarning.ts
+++ b/src/composables/useSessionWarning.ts
@@ -4,15 +4,15 @@ import jwtDecode from 'jwt-decode';
 import type { JwtPayload } from 'jwt-decode';
 import { DateTime } from 'luxon';
 
-import { useUserStore } from '@/stores/UserStore';
+import { useAuthStore } from '@/stores/AuthStore';
 
 export function useSessionWarning() {
-  const userStore = useUserStore();
+  const authStore = useAuthStore();
   const isReauthenticating = ref(false);
 
   const isRefreshTokenExpiringInOneHour = computed(() => {
     try {
-      const refreshToken = userStore.refreshToken;
+      const refreshToken = authStore.refreshToken;
       if (!refreshToken) return false;
 
       const decoded = jwtDecode<JwtPayload>(refreshToken);
@@ -31,7 +31,7 @@ export function useSessionWarning() {
 
   const timeUntilExpiration = computed(() => {
     try {
-      const refreshToken = userStore.refreshToken;
+      const refreshToken = authStore.refreshToken;
       if (!refreshToken) return null;
 
       const decoded = jwtDecode<JwtPayload>(refreshToken);
@@ -55,9 +55,9 @@ export function useSessionWarning() {
 
     try {
       isReauthenticating.value = true;
-      await userStore.login();
+      await authStore.login();
     } catch (error) {
-      userStore.logout();
+      authStore.logout();
       throw error;
     } finally {
       isReauthenticating.value = false;
diff --git a/src/router/index.ts b/src/router/index.ts
index 56bc83514..546e9c042 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -7,7 +7,7 @@ import {
   type RouteLocationNormalized,
 } from 'vue-router';
 
-import { useUserStore } from '@/stores/UserStore';
+import { useAuthStore } from '@/stores/AuthStore';
 import { useSettingsStore } from '@/stores/SettingsStore';
 import { notifyApiKeyUnset } from '@/services/ApiKeyService';
 import FlawCreateView from '@/views/FlawCreateView.vue';
@@ -79,8 +79,8 @@ export const routes = [
       hideNavbar: true,
     },
     beforeEnter() {
-      const userStore = useUserStore();
-      if (userStore.isAuthenticated) {
+      const authStore = useAuthStore();
+      if (authStore.isAuthenticated) {
         return { name: 'index' };
       }
     },
@@ -155,14 +155,14 @@ router.beforeEach(async (to, from) => {
 
   // await workerReady;
 
-  const userStore = useUserStore();
-  const isAuthenticated = userStore.isAuthenticated;
+  const authStore = useAuthStore();
+  const isAuthenticated = authStore.isAuthenticated;
 
   const { canVisitWithoutAuth } = to.meta;
   const manualLocationNavigation = from.name === undefined;
 
   if (
-    userStore.isLoggedIn
+    authStore.isLoggedIn
     && to.name !== 'logout'
     && to.name !== 'login'
   ) {
@@ -176,12 +176,12 @@ router.beforeEach(async (to, from) => {
 
   if (!canVisitWithoutAuth && !isAuthenticated) {
     // If user is logged in but token is expired/missing, try to refresh first
-    if (userStore.isLoggedIn) {
+    if (authStore.isLoggedIn) {
       try {
         console.debug('Router: Attempting token refresh for authenticated user');
         await getNextAccessToken();
         // If refresh succeeds, continue with navigation
-        if (userStore.isAuthenticated) {
+        if (authStore.isAuthenticated) {
           return;
         }
       } catch (error) {
diff --git a/src/services/OsidbAuthService.ts b/src/services/OsidbAuthService.ts
index c59e13be2..c55843e25 100644
--- a/src/services/OsidbAuthService.ts
+++ b/src/services/OsidbAuthService.ts
@@ -2,8 +2,7 @@ import { z } from 'zod';
 
 import { osimRuntime } from '@/stores/osimRuntime';
 import { useToastStore } from '@/stores/ToastStore';
-
-import { useUserStore } from '../stores/UserStore';
+import { useAuthStore } from '@/stores/AuthStore';
 
 const RefreshResponse = z.object({
   access: z.string(),
@@ -133,16 +132,16 @@ export async function getNextAccessToken(forceRefresh: boolean = false) {
   // Moving this to module scope results in "cannot access before initialization" -
   // probably a vite or typescript bug
   const url = `${osimRuntime.value.backends.osidb}/auth/token/refresh`;
-  const userStore = useUserStore();
+  const authStore = useAuthStore();
   let response;
-  if (!forceRefresh && userStore.accessToken && !userStore.isAccessTokenExpired()) {
-    return userStore.accessToken;
+  if (!forceRefresh && authStore.accessToken && !authStore.isAccessTokenExpired()) {
+    return authStore.accessToken;
   }
 
   try {
     if (osimRuntime.value.env === 'dev') {
       // For local development: Use POST with refresh token from localStorage
-      const refreshToken = userStore.getDevRefreshToken();
+      const refreshToken = authStore.getDevRefreshToken();
       if (!refreshToken) {
         throw new Error('No refresh token available in localStorage for dev environment');
       }
@@ -173,18 +172,18 @@ export async function getNextAccessToken(forceRefresh: boolean = false) {
     const parsedResponse = RefreshResponse.parse(responseData);
 
     // Update the access token in the store
-    userStore.accessToken = parsedResponse.access;
-    userStore.isLoggedIn = true;
+    authStore.accessToken = parsedResponse.access;
+    authStore.isLoggedIn = true;
 
     // For dev environments, update the refresh token if provided
     if (osimRuntime.value.env === 'dev' && parsedResponse.refresh) {
-      userStore.setDevRefreshToken(parsedResponse.refresh);
+      authStore.setDevRefreshToken(parsedResponse.refresh);
     }
 
     return parsedResponse.access;
   } catch (e) {
     console.error('OsidbAuthService::getNextAccessToken() Error refreshing access token', e);
-    return userStore.logout()
+    return authStore.logout()
       .finally(() => {
         throw new Error('Unable to refresh access token');
       });
diff --git a/src/services/__tests__/OsidbAuthService.spec.ts b/src/services/__tests__/OsidbAuthService.spec.ts
index 85ce7dd7f..899279b01 100644
--- a/src/services/__tests__/OsidbAuthService.spec.ts
+++ b/src/services/__tests__/OsidbAuthService.spec.ts
@@ -2,7 +2,7 @@ import { http, HttpResponse } from 'msw';
 import { createPinia, setActivePinia } from 'pinia';
 import { DateTime } from 'luxon';
 
-import { useUserStore } from '@/stores/UserStore';
+import { useAuthStore } from '@/stores/AuthStore';
 import { encodeJWT } from '@/__tests__/helpers';
 import { server } from '@/__tests__/setup';
 
@@ -52,8 +52,8 @@ describe('osidbAuthService', () => {
       jti: '1111',
       user_id: 1337,
     });
-    const userStore = useUserStore();
-    userStore.accessToken = accessToken;
+    const authStore = useAuthStore();
+    authStore.accessToken = accessToken;
 
     const token = await getNextAccessToken();
 
@@ -68,8 +68,8 @@ describe('osidbAuthService', () => {
       jti: '0000',
       user_id: 1337,
     });
-    const userStore = useUserStore();
-    userStore.accessToken = expiredAccessJWT;
+    const authStore = useAuthStore();
+    authStore.accessToken = expiredAccessJWT;
 
     vi.advanceTimersByTime(4 * 60 * 1000);
     const token = await getNextAccessToken();
diff --git a/src/stores/AuthStore.ts b/src/stores/AuthStore.ts
new file mode 100644
index 000000000..f7d5897b3
--- /dev/null
+++ b/src/stores/AuthStore.ts
@@ -0,0 +1,197 @@
+import { computed, ref, watch } from 'vue';
+
+import { defineStore } from 'pinia';
+import { z } from 'zod';
+import jwtDecode from 'jwt-decode';
+import type { JwtPayload } from 'jwt-decode';
+import { useLocalStorage } from '@vueuse/core';
+import { DateTime } from 'luxon';
+
+import router from '@/router';
+import { osimRuntime } from '@/stores/osimRuntime';
+
+function getDevRefreshToken(): null | string {
+  return osimRuntime.value.env === 'dev' ? (localStorage.getItem('AuthStore::refresh') || null) : null;
+}
+
+function setDevRefreshToken(token: string) {
+  if (osimRuntime.value.env === 'dev') {
+    localStorage.setItem('AuthStore::refresh', token);
+  }
+}
+
+const loginResponse = z.object({
+  access: z.string(),
+  refresh: z.string().optional(),
+  env: z.string(),
+  detail: z.string().optional(),
+});
+
+export const useAuthStore = defineStore('AuthStore', () => {
+  const accessToken = ref<null | string>();
+  const refreshToken = ref<null | string>();
+
+  // Persist only login state; tokens remain in-memory except dev refresh token (handled separately)
+  const isLoggedIn = useLocalStorage('AuthStore::isLoggedIn', false);
+
+  function $reset() {
+    accessToken.value = null;
+    refreshToken.value = null;
+    isLoggedIn.value = false;
+    // Clear dev refresh token storage
+    localStorage.removeItem('AuthStore::refresh');
+  }
+
+  function isAccessTokenExpired() {
+    try {
+      const exp = accessToken.value ? jwtDecode<JwtPayload>(accessToken.value)?.exp : null;
+      return !exp || DateTime.now().toSeconds() >= exp - 60;
+    } catch (e) {
+      console.debug('AuthStore: access token not a valid JWT', accessToken.value, e);
+      return true;
+    }
+  }
+
+  async function login(username: string = '', password: string = '') {
+    const requestMetadata: { [key: string]: any } = {};
+    if (osimRuntime.value.backends.osidbAuth == 'kerberos') {
+      requestMetadata['method'] = 'GET';
+    } else if (osimRuntime.value.backends.osidbAuth == 'credentials') {
+      requestMetadata['method'] = 'POST';
+      requestMetadata['body'] = JSON.stringify({ username: username, password: password });
+      requestMetadata['headers'] = {
+        'Content-Type': 'application/json',
+      };
+    }
+
+    return fetch(`${osimRuntime.value.backends.osidb}/auth/token`, {
+      credentials: 'include',
+      cache: 'no-cache',
+      ...requestMetadata,
+    })
+      .then(async (response) => {
+        if (!response.ok) {
+          const text = await response.text();
+          throw new Error(text);
+        }
+        const json = await response.json();
+        const parsedLoginResponse = loginResponse.passthrough().parse(json);
+        if (parsedLoginResponse.detail) {
+          throw new Error(parsedLoginResponse.detail);
+        }
+        // Store refresh token policy: dev in localStorage, non-dev in memory
+        if (parsedLoginResponse.refresh) {
+          if (osimRuntime.value.env === 'dev') {
+            setDevRefreshToken(parsedLoginResponse.refresh);
+            refreshToken.value = null;
+          } else {
+            refreshToken.value = parsedLoginResponse.refresh;
+          }
+        } else {
+          refreshToken.value = null;
+        }
+        accessToken.value = parsedLoginResponse.access;
+        isLoggedIn.value = true;
+        // expose env to UserStore for persistence/compatibility
+        const { useUserStore } = await import('./UserStore');
+        useUserStore().setEnv(parsedLoginResponse.env);
+        return parsedLoginResponse.access;
+      })
+      .then((access) => {
+        // Fetch whoami and update user store without creating a static import cycle
+        return fetch(`${osimRuntime.value.backends.osidb}/osidb/whoami`, {
+          credentials: 'include',
+          cache: 'no-cache',
+          headers: {
+            Authorization: `Bearer ${access}`,
+          },
+        });
+      })
+      .then(response => response.json())
+      .then(async (json) => {
+        const { whoamiResponse } = await import('./UserStore');
+        const parsedWhoamiResponse = whoamiResponse.parse(json);
+        const { useUserStore } = await import('./UserStore');
+        const userStore = useUserStore();
+        userStore.setWhoami(parsedWhoamiResponse);
+      })
+      .then(async () => {
+        const { useUserStore } = await import('./UserStore');
+        const userStore = useUserStore();
+        await userStore.updateJiraUsername();
+      })
+      .catch((e) => {
+        $reset();
+        console.error('AuthStore::login() unsuccessful login request', e);
+        throw e;
+      });
+  }
+
+  function logout() {
+    $reset();
+    return router.push({ name: 'login' });
+  }
+
+  const isAuthenticated = computed<boolean>(() => {
+    if (!accessToken.value) {
+      return false;
+    }
+    try {
+      const decoded = jwtDecode<JwtPayload>(accessToken.value);
+      const now = Date.now() / 1000;
+      return decoded.exp != null && now < decoded.exp;
+    } catch (e) {
+      return false;
+    }
+  });
+
+  // React to authentication changes similarly to previous UserStore behavior
+  watch(isAuthenticated, async () => {
+    if (isAuthenticated.value) {
+      if (router.currentRoute.value.name === 'login') {
+        try {
+          const { queryRedirect } = await import('./UserStore');
+          const maybeRedirect = queryRedirect.parse(router.currentRoute.value);
+          const redirect = maybeRedirect.query.redirect;
+          if (redirect.startsWith('/')) {
+            router.push(redirect);
+            return;
+          } else {
+            console.debug('AuthStore::isAuthenticated() Refusing to redirect to', redirect);
+          }
+        } catch (e) {
+          // do nothing
+        }
+        router.push({ name: 'index' });
+        return;
+      }
+    } else {
+      // Clear on unauthenticated and redirect to login
+      $reset();
+      if (router.currentRoute.value.name !== 'login') {
+        const currentPath = router.currentRoute.value.fullPath;
+        if (currentPath !== '/') {
+          const query: any = {};
+          query.redirect = currentPath;
+          router.push({ name: 'login', query });
+          return;
+        }
+        router.push({ name: 'login' });
+        return;
+      }
+    }
+  });
+
+  return {
+    isLoggedIn,
+    accessToken,
+    refreshToken,
+    isAccessTokenExpired,
+    isAuthenticated,
+    getDevRefreshToken,
+    setDevRefreshToken,
+    login,
+    logout,
+    $reset,
+  };
+});
diff --git a/src/stores/SettingsStore.ts b/src/stores/SettingsStore.ts
index 5267d245f..a38d6c3c7 100644
--- a/src/stores/SettingsStore.ts
+++ b/src/stores/SettingsStore.ts
@@ -148,19 +148,19 @@ export const useSettingsStore = defineStore('SettingsStore', () => {
   const isApiKeysInitialized = ref(false);
 
   async function initializeApiKeys() {
-    console.debug('SettingsStore: Setting up API keys initialization...');
+    console.debug('SettingsStore: Initializing API keys...');
 
-    // Import UserStore dynamically to avoid circular dependencies
-    const { useUserStore } = await import('./UserStore');
-    const userStore = useUserStore();
+    // Import AuthStore dynamically to avoid circular dependencies
+    const { useAuthStore } = await import('./AuthStore');
+    const authStore = useAuthStore();
 
     // Watch for authentication changes and load API keys when authenticated
     // Watch both isAuthenticated (computed from token) and isLoggedIn (boolean flag)
     // to handle any potential timing edge cases
     watch(
       () => ({
-        isAuthenticated: userStore.isAuthenticated,
-        isLoggedIn: userStore.isLoggedIn,
+        isAuthenticated: authStore.isAuthenticated,
+        isLoggedIn: authStore.isLoggedIn,
       }),
       async ({ isAuthenticated, isLoggedIn }) => {
         if (isAuthenticated && !isApiKeysInitialized.value) {
diff --git a/src/stores/UserStore.ts b/src/stores/UserStore.ts
index 0b3dadaae..f32ec522b 100644
--- a/src/stores/UserStore.ts
+++ b/src/stores/UserStore.ts
@@ -1,17 +1,16 @@
-import { computed, ref, watch } from 'vue';
+import { computed } from 'vue';
 
 import { defineStore } from 'pinia';
 import { z } from 'zod';
-import jwtDecode from 'jwt-decode';
-import type { JwtPayload } from 'jwt-decode';
 import { useLocalStorage } from '@vueuse/core';
-import { DateTime } from 'luxon';
 
-// const router = useRouter();
-import router from '@/router';
 import { osimRuntime } from '@/stores/osimRuntime';
 import { getJiraUsername } from '@/services/JiraService';
 
+function setEnv(value: string) {
+  _userStoreSession.value.env = value;
+}
+
 export const queryRedirect = z.object({
   query: z.object({
     redirect: z.string(),
@@ -41,13 +40,7 @@ function migrateUserStore() {
 // Run migration before useLocalStorage initialization
 migrateUserStore();
 
-const loginResponse = z.object({
-  access: z.string(),
-  refresh: z.string().optional(), // Include refresh token for dev environments
-  env: z.string(),
-  detail: z.string().optional(), // detail error message
-});
-const whoamiResponse = z.object({
+export const whoamiResponse = z.object({
   email: z.string(),
   groups: z.array(z.string()),
   profile: z.object({
@@ -81,61 +74,26 @@ async function updateJiraUsername() {
   }
 }
 
-export const useUserStore = defineStore('UserStore', () => {
-  const accessToken = ref<null | string>();
-  const refreshToken = ref<null | string>();
-
-  function setRefreshToken(env_: string, refresh_?: string) {
-    _userStoreSession.value.env = env_;
-    // Only store refresh token in localStorage for dev environments
-    if (osimRuntime.value.env === 'dev' && refresh_) {
-      _userStoreSession.value.refresh = refresh_;
-      refreshToken.value = null; // Clear in-memory token for dev
-    } else {
-      delete _userStoreSession.value.refresh;
-      refreshToken.value = refresh_ || null;
-    }
-  }
-
-  function $reset() {
-    _userStoreSession.value.env = '';
-    _userStoreSession.value.whoami = null;
-    _userStoreSession.value.jiraUsername = '';
-    delete _userStoreSession.value.refresh;
-    refreshToken.value = null;
-  }
+function resetUserStore() {
+  _userStoreSession.value.env = '';
+  _userStoreSession.value.whoami = null;
+  _userStoreSession.value.jiraUsername = '';
+  delete _userStoreSession.value.refresh;
+}
 
-  const isAccessTokenExpired = () => {
-    try {
-      const exp = accessToken.value ? jwtDecode<JwtPayload>(accessToken.value)?.exp : null;
-      return !exp || DateTime.now().toSeconds() >= exp - 60;
-    } catch (e) {
-      console.debug('UserStore: access token not a valid JWT', accessToken.value, e);
-      return true;
-    }
-  };
+export const useUserStore = defineStore('UserStore', () => {
+  const $reset = resetUserStore;
 
   const whoami = computed<null | WhoamiType>(() => {
     return _userStoreSession.value.whoami || null;
   });
   const userName = computed(() => {
-    if (!accessToken.value) {
-      return 'Not Logged In';
-    }
     if (_userStoreSession.value.whoami != null) {
       return _userStoreSession.value.whoami.email ?? _userStoreSession.value.whoami.username;
     }
-    try {
-      const decoded = jwtDecode<JwtPayload>(accessToken.value);
-      return decoded.sub ?? 'Current User';
-    } catch (e) {
-      return 'Current User';
-    }
+    return 'Current User';
   });
   const userEmail = computed(() => {
-    if (!accessToken.value) {
-      return '';
-    }
     return _userStoreSession.value.whoami?.email ?? '';
   });
 
@@ -147,162 +105,21 @@ export const useUserStore = defineStore('UserStore', () => {
     return _userStoreSession.value.jiraUsername ?? '';
   });
 
-  async function login(username: string = '', password: string = '') {
-    const requestMetadata: { [key: string]: any } = {};
-    if (osimRuntime.value.backends.osidbAuth == 'kerberos') {
-      requestMetadata['method'] = 'GET';
-    } else if (osimRuntime.value.backends.osidbAuth == 'credentials') {
-      requestMetadata['method'] = 'POST';
-      requestMetadata['body'] = JSON.stringify({ username: username, password: password });
-      requestMetadata['headers'] = {
-        'Content-Type': 'application/json',
-      };
-    }
-
-    return fetch(`${osimRuntime.value.backends.osidb}/auth/token`, {
-      // credentials: 'same-origin',
-      credentials: 'include',
-      cache: 'no-cache',
-      ...requestMetadata,
-    })
-      .then(async (response) => {
-        if (!response.ok) {
-          const text = await response.text();
-          // console.log('UserStore: login not ok', response.status, text);
-          throw new Error(text);
-        }
-        const json = await response.json();
-        const parsedLoginResponse = loginResponse.passthrough().parse(json);
-        if (parsedLoginResponse.detail) {
-          throw new Error(parsedLoginResponse.detail);
-        }
-        setRefreshToken(parsedLoginResponse.env, parsedLoginResponse.refresh);
-        accessToken.value = parsedLoginResponse.access;
-        _userStoreSession.value.isLoggedIn = true;
-        return parsedLoginResponse.access;
-      })
-      .then((access) => {
-        return fetch(`${osimRuntime.value.backends.osidb}/osidb/whoami`, {
-          credentials: 'include',
-          cache: 'no-cache',
-          headers: {
-            Authorization: `Bearer ${access}`,
-          },
-        });
-      })
-      .then(response => response.json())
-      .then((json) => {
-        const parsedWhoamiResponse = whoamiResponse.parse(json);
-        _userStoreSession.value.whoami = parsedWhoamiResponse;
-      })
-      .then(async () => {
-        await updateJiraUsername();
-      })
-      .catch((e) => {
-        $reset();
-        console.error('UserStore::login() unsuccessful login request', e);
-        throw e;
-      });
-  }
-
-  function logout() {
-    // clearInterval(refreshInterval);
-    $reset();
-    accessToken.value = null;
-    _userStoreSession.value.isLoggedIn = false;
-
-    // router.push({name: 'login'});
-    // return Promise.resolve()
-    //     .then(() => {
-    //       jwt.value.user = undefined;
-    //     })
-    //     .then(() => {
-    //       router.push({name: 'login'})
-    //     })
-    return router.push({ name: 'login' });
-  }
-
-  const isAuthenticated = computed<boolean>(() => {
-    if (!accessToken.value) {
-      return false;
-    }
-    try {
-      const decoded = jwtDecode<JwtPayload>(accessToken.value);
-      const now = Date.now() / 1000; // Convert to seconds
-      return decoded.exp != null && now < decoded.exp;
-    } catch (e) {
-      return false;
-    }
-  });
-
-  // Watch authentication changes from other tabs
-  watch(isAuthenticated, () => {
-    if (isAuthenticated.value) {
-      if (router.currentRoute.value.name === 'login') {
-        try {
-          const maybeRedirect = queryRedirect.parse(router.currentRoute.value);
-          const redirect = maybeRedirect.query.redirect;
-          if (redirect.startsWith('/')) { // avoid possible third-party redirection
-            router.push(redirect);
-            return;
-          } else {
-            console.debug('UserStore::isAuthenticated() Refusing to redirect to', redirect);
-          }
-        } catch (e) {
-          // do nothing
-        }
-        router.push({
-          name: 'index',
-        });
-        return;
-      }
-    } else {
-      $reset();   // wipes tokens if tokens are expired
-      if (router.currentRoute.value.name !== 'login') {
-        // Preserve destination
-        const currentPath = router.currentRoute.value.fullPath;
-        if (currentPath !== '/') {
-          const query: any = {};
-          query.redirect = currentPath;
-          router.push({ name: 'login', query });
-          return;
-        }
-        router.push({
-          name: 'login',
-        });
-        return;
-      }
-    }
-  });
-
-  // Helper method to get refresh token for dev environments
-  function getDevRefreshToken() {
-    return osimRuntime.value.env === 'dev' ? _userStoreSession.value.refresh : null;
+  function setWhoami(data: WhoamiType) {
+    _userStoreSession.value.whoami = data;
   }
 
-  // Helper method to set refresh token for dev environments
-  function setDevRefreshToken(refresh: string) {
-    if (osimRuntime.value.env === 'dev') {
-      _userStoreSession.value.refresh = refresh;
-    }
-  }
+  // For compatibility, keep a lightweight reset used by AuthStore
 
   return {
-    isLoggedIn: _userStoreSession.value.isLoggedIn,
-    accessToken,
-    isAccessTokenExpired,
     whoami,
     userName,
     userEmail,
     jiraUsername,
     updateJiraUsername,
     env,
-    refreshToken,
-    login,
-    logout,
-    isAuthenticated,
-    getDevRefreshToken,
-    setDevRefreshToken,
+    setEnv,
+    setWhoami,
     $reset,
   };
 });
diff --git a/src/stores/__tests__/UserStore.spec.ts b/src/stores/__tests__/UserStore.spec.ts
index e0ee4f87d..14096287e 100644
--- a/src/stores/__tests__/UserStore.spec.ts
+++ b/src/stores/__tests__/UserStore.spec.ts
@@ -8,6 +8,7 @@ import { encodeJWT } from '@/__tests__/helpers';
 import { server } from '@/__tests__/setup';
 
 import { useUserStore } from '../UserStore';
+import { useAuthStore } from '../AuthStore';
 import { osimRuntime } from '../osimRuntime';
 
 describe('userStore', () => {
@@ -55,14 +56,14 @@ describe('userStore', () => {
   });
 
   it('should set `isAccessTokenExpired` to true when access token is undefined', () => {
-    const userStore = useUserStore();
-    userStore.accessToken = undefined;
-    expect(userStore.isAccessTokenExpired()).toBe(true);
+    const authStore = useAuthStore();
+    authStore.accessToken = undefined as any;
+    expect(authStore.isAccessTokenExpired()).toBe(true);
   });
 
   it('should set `isAccessTokenExpired` to true when access token is about to expire', () => {
-    const userStore = useUserStore();
-    userStore.accessToken = encodeJWT({
+    const authStore = useAuthStore();
+    authStore.accessToken = encodeJWT({
       token_type: 'access',
       exp: Math.floor(DateTime.now().minus({ minutes: 1 }).toSeconds()),
       iat: Math.floor(DateTime.now().toSeconds()),
@@ -70,12 +71,12 @@ describe('userStore', () => {
       user_id: 1337,
     });
 
-    expect(userStore.isAccessTokenExpired()).toBe(true);
+    expect(authStore.isAccessTokenExpired()).toBe(true);
   });
 
   it('should set `isAccessTokenExpired` to false when access token is active', () => {
-    const userStore = useUserStore();
-    userStore.accessToken = encodeJWT({
+    const authStore = useAuthStore();
+    authStore.accessToken = encodeJWT({
       token_type: 'access',
       exp: Math.floor(DateTime.now().plus({ minutes: 5 }).toSeconds()),
       iat: Math.floor(DateTime.now().toSeconds()),
@@ -83,17 +84,17 @@ describe('userStore', () => {
       user_id: 1337,
     });
 
-    expect(userStore.isAccessTokenExpired()).toBe(false);
+    expect(authStore.isAccessTokenExpired()).toBe(false);
   });
 
   it('should not throw when access token is invalid', () => {
     vi.spyOn(console, 'debug').mockImplementation(() => void 0);
-    const userStore = useUserStore();
+    const authStore = useAuthStore();
 
     expect(() => {
-      userStore.accessToken = 'invalid';
+      authStore.accessToken = 'invalid' as any;
 
-      expect(userStore.isAccessTokenExpired()).toBe(true);
+      expect(authStore.isAccessTokenExpired()).toBe(true);
     }).not.toThrow();
   });
 
@@ -118,8 +119,9 @@ describe('userStore', () => {
       http.get(`${osimRuntime.value.backends.osidb}/osidb/whoami`, () => HttpResponse.json(whoami)),
     );
 
-    const userStore = useUserStore();
-    await userStore.login('skynet', 'terminator');
+    const { useAuthStore } = await import('../AuthStore');
+    const authStore = useAuthStore();
+    await authStore.login('skynet', 'terminator');
 
     const storage = JSON.parse(localStorage.getItem('UserStore') || '');
     expect(storage).toBeInstanceOf(Object);
diff --git a/src/views/LogoutView.vue b/src/views/LogoutView.vue
index 8424a18b3..a28adf098 100644
--- a/src/views/LogoutView.vue
+++ b/src/views/LogoutView.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import { useUserStore } from '@/stores/UserStore';
+import { useAuthStore } from '@/stores/AuthStore';
 
-const userStore = useUserStore();
-userStore.logout();
+const authStore = useAuthStore();
+authStore.logout();
 </script>
 
 <template>