diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 9becf7d49f..628b85744c 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -146,7 +146,7 @@ export default {
         }
     },
     mounted () {
-        this.$store.dispatch('account/checkState')
+        useAccountAuthStore().checkState()
         useProductBrokersStore().checkFlags()
     },
     methods: {
diff --git a/frontend/src/api/client.js b/frontend/src/api/client.js
index 9ab80915d5..ca1f7687e0 100644
--- a/frontend/src/api/client.js
+++ b/frontend/src/api/client.js
@@ -2,6 +2,9 @@ import axios from 'axios'
 
 import Alerts from '../services/alerts.js'
 
+import { useAccountAuthStore } from '@/stores/account-auth.js'
+import { useUxLoadingStore } from '@/stores/ux-loading.js'
+
 const client = axios.create({
     headers: {
         'Content-Type': 'application/json'
@@ -12,24 +15,18 @@ const client = axios.create({
 // Common error handler
 client.interceptors.response.use(function (response) {
     return response
-}, function (error) {
+}, async function (error) {
     if (/^http/.test(error.config.url)) {
         // This request is to an external URL. Allow this error to pass back to the caller
         return Promise.reject(error)
     }
 
-    // This is an error response from our own API (or failure to reach it)
-    // Lazy require to avoid circular dependency:
-    // api/client.js → stores/account-auth.js → api/user.js → api/client.js
-    const { useAccountAuthStore } = require('../stores/account-auth.js')
-    const { useUxLoadingStore } = require('../stores/ux-loading.js')
-    const store = require('../store/index.js').default
     if (error.code === 'ERR_NETWORK') {
         // Backend failed to respond
         useUxLoadingStore().setOffline(true)
     } else if (error.response && error.response.status === 401 && !useUxLoadingStore().appLoader && !useAccountAuthStore().loginInflight) {
         // 401 when !pending && !loginInflight means the session has expired
-        store.dispatch('account/logout')
+        useAccountAuthStore().logout()
     } else if (error.response && error.response.status === 500) {
         // show toast notification
         Alerts.emit(error.response.data.error + ': ' + error.response.data.message, 'warning', 7500)
diff --git a/frontend/src/components/Offline.vue b/frontend/src/components/Offline.vue
index b49e40d05a..da8205e7fb 100644
--- a/frontend/src/components/Offline.vue
+++ b/frontend/src/components/Offline.vue
@@ -10,11 +10,13 @@
     </div>
 </template>
 <script>
+import { useAccountAuthStore } from '@/stores/account-auth.js'
+
 export default {
     name: 'OfflineMessage',
     methods: {
         reload () {
-            this.$store.dispatch('account/checkState')
+            useAccountAuthStore().checkState()
         }
     }
 }
diff --git a/frontend/src/components/auth/UpdateExpiredPassword.vue b/frontend/src/components/auth/UpdateExpiredPassword.vue
index bcfbf596e4..d5bf54ce52 100644
--- a/frontend/src/components/auth/UpdateExpiredPassword.vue
+++ b/frontend/src/components/auth/UpdateExpiredPassword.vue
@@ -43,7 +43,6 @@
 import { mapState } from 'pinia'
 
 import userApi from '../../api/user.js'
-import store from '../../store/index.js'
 import FormRow from '../FormRow.vue'
 
 import { useAccountAuthStore } from '@/stores/account-auth.js'
@@ -89,7 +88,7 @@ export default {
                 return false
             }
             userApi.changePassword(this.input.old_password, this.input.password).then(() => {
-                this.$store.dispatch('account/checkState')
+                useAccountAuthStore().checkState()
                 this.$router.go()
             }).catch(e => {
                 this.errors.password_change = 'Password change failed'
@@ -106,7 +105,7 @@ export default {
             this.$refs['row-confirm'].focus()
         },
         logout () {
-            store.dispatch('account/logout')
+            useAccountAuthStore().logout()
         }
     },
     mounted () {
diff --git a/frontend/src/main.js b/frontend/src/main.js
index 80c2e666d3..3576fa15ce 100644
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -20,7 +20,6 @@ import router from './routes.js'
 import Alerts from './services/alerts.js'
 import { setupSentry } from './services/error-tracking.js'
 import { getServiceFactory } from './services/service.factory.js'
-import store from './store/index.js'
 import { skipResetPlugin } from './stores/plugins/skip-reset.plugin.js'
 
 import './index.css'
@@ -28,8 +27,6 @@ import 'highlight.js/styles/github.css'
 
 import ForgeUIComponents from './ui-components/index.js'
 
-store.commit('initializeStore')
-
 const pinia = createPinia()
 pinia.use(piniaPluginPersistedstate)
 pinia.use(skipResetPlugin)
@@ -37,7 +34,6 @@ pinia.use(skipResetPlugin)
 const app = createApp(App)
     .use(ForgeUIComponents)
     .use(pinia)
-    .use(store)
     .use(router)
     .use(VueShepherdPlugin)
 
@@ -47,7 +43,7 @@ const serviceFactory = getServiceFactory()
 setupSentry(app, router)
 
 // Boot all services before mounting
-serviceFactory.bootAllServices(app, store, router)
+serviceFactory.bootAllServices(app, router)
     .then((services) => services.bootstrap.init())
     .catch((error) => {
         console.error('Bootstrap initialization failed:', error)
diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue
index 98cc650c21..1faf48c09f 100644
--- a/frontend/src/pages/Login.vue
+++ b/frontend/src/pages/Login.vue
@@ -220,7 +220,7 @@ export default {
             }
             if (valid) {
                 this.loggingIn = true
-                this.$store.dispatch('account/login', {
+                useAccountAuthStore().loginWithCredentials({
                     username: this.input.username,
                     password: this.input.password
                 })
@@ -228,7 +228,7 @@ export default {
         },
         submitMFAToken () {
             this.loggingIn = true
-            this.$store.dispatch('account/login', {
+            useAccountAuthStore().loginWithCredentials({
                 token: this.input.token
             })
         },
diff --git a/frontend/src/pages/TermsAndConditions.vue b/frontend/src/pages/TermsAndConditions.vue
index 38e45c64e7..d5f0ac7843 100644
--- a/frontend/src/pages/TermsAndConditions.vue
+++ b/frontend/src/pages/TermsAndConditions.vue
@@ -21,7 +21,6 @@ import { mapState } from 'pinia'
 
 import userApi from '../api/user.js'
 import FFLayoutBox from '../layouts/Box.vue'
-import store from '../store/index.js'
 
 import { useAccountAuthStore } from '@/stores/account-auth.js'
 import { useAccountSettingsStore } from '@/stores/account-settings.js'
@@ -43,7 +42,7 @@ export default {
     },
     methods: {
         logout () {
-            store.dispatch('account/logout')
+            useAccountAuthStore().logout()
         },
         async acceptAction () {
             const options = {}
@@ -51,7 +50,7 @@ export default {
                 options.tcs_accepted = this.accept
                 this.loading = true
                 await userApi.updateUser(options)
-                this.$store.dispatch('account/checkState')
+                useAccountAuthStore().checkState()
             } catch (error) {
                 console.warn(error)
             } finally {
diff --git a/frontend/src/pages/UnverifiedEmail.vue b/frontend/src/pages/UnverifiedEmail.vue
index 21e7705d49..3525b095fd 100644
--- a/frontend/src/pages/UnverifiedEmail.vue
+++ b/frontend/src/pages/UnverifiedEmail.vue
@@ -32,7 +32,6 @@ import { mapActions, mapState } from 'pinia'
 
 import userApi from '../api/user.js'
 import FFLayoutBox from '../layouts/Box.vue'
-import store from '../store/index.js'
 
 import { useAccountAuthStore } from '@/stores/account-auth.js'
 import { useUxToursStore } from '@/stores/ux-tours.js'
@@ -89,7 +88,7 @@ export default {
             tick()
         },
         logout () {
-            store.dispatch('account/logout')
+            useAccountAuthStore().logout()
         }
     }
 }
diff --git a/frontend/src/pages/account/Settings.vue b/frontend/src/pages/account/Settings.vue
index 0f02ded4c6..d649e825c4 100644
--- a/frontend/src/pages/account/Settings.vue
+++ b/frontend/src/pages/account/Settings.vue
@@ -277,7 +277,7 @@ export default {
                         if (this.settings['user:offboarding-required']) {
                             window.location.href = this.settings['user:offboarding-url']
                         } else {
-                            this.$store.dispatch('account/checkState')
+                            useAccountAuthStore().checkState()
                         }
                     })
                     .catch(error => {
diff --git a/frontend/src/pages/account/VerifyPendingEmailChange.vue b/frontend/src/pages/account/VerifyPendingEmailChange.vue
index b7012bd242..7a5375a42c 100644
--- a/frontend/src/pages/account/VerifyPendingEmailChange.vue
+++ b/frontend/src/pages/account/VerifyPendingEmailChange.vue
@@ -1,5 +1,5 @@
 <template>
-    <form v-if="!pending" class="px-4 sm:px-6 lg:px-8 mt-8 space-y-6">
+    <form v-if="!appLoader" class="px-4 sm:px-6 lg:px-8 mt-8 space-y-6">
         <div>
             <ff-button class="m-auto" @click="verify()">Click here to verify your change of email address</ff-button>
         </div>
@@ -8,18 +8,20 @@
 
 <script>
 
-import { mapState } from 'vuex'
+import { mapState } from 'pinia'
 
 import userApi from '../../api/user.js'
 import alerts from '../../services/alerts.js'
 
+import { useUxLoadingStore } from '@/stores/ux-loading.js'
+
 export default {
     name: 'VerifyPendingEmailChange',
     props: {
         token: { type: String, required: true }
     },
     computed: {
-        ...mapState(['pending'])
+        ...mapState(useUxLoadingStore, ['appLoader'])
     },
     methods: {
         async verify () {
diff --git a/frontend/src/pages/account/routes.js b/frontend/src/pages/account/routes.js
index 4f79094d43..f30771ca4f 100644
--- a/frontend/src/pages/account/routes.js
+++ b/frontend/src/pages/account/routes.js
@@ -1,7 +1,5 @@
 import { CogIcon } from '@heroicons/vue/outline'
 
-import store from '../../store/index.js'
-
 import AccessRequest from './AccessRequest.vue'
 import AccessRequestEditor from './AccessRequestEditor.vue'
 import AccountCreate from './Create.vue'
@@ -20,6 +18,8 @@ import VerifyPendingEmailChange from './VerifyPendingEmailChange.vue'
 
 import Account from './index.vue'
 
+import { useAccountAuthStore } from '@/stores/account-auth.js'
+
 export default [
     {
         // This is the editor being authenticated. This component bounces the user
@@ -114,7 +114,7 @@ export default [
         path: '/account/logout',
         name: 'Sign out',
         redirect: function () {
-            store.dispatch('account/logout')
+            useAccountAuthStore().logout()
             return { path: '/' }
         }
     },
diff --git a/frontend/src/pages/team/Settings/Danger.vue b/frontend/src/pages/team/Settings/Danger.vue
index ae73cc5c4d..7dc4a9461e 100644
--- a/frontend/src/pages/team/Settings/Danger.vue
+++ b/frontend/src/pages/team/Settings/Danger.vue
@@ -105,7 +105,7 @@ export default {
         deleteTeam () {
             teamApi.deleteTeam(this.team.id).then(() => {
                 alerts.emit('Team successfully deleted', 'confirmation')
-                this.$store.dispatch('account/checkState', '/')
+                useAccountAuthStore().checkState('/')
             }).catch(err => {
                 alerts.emit('Problem deleting team', 'warning')
                 console.warn(err)
diff --git a/frontend/src/services/bootstrap.service.js b/frontend/src/services/bootstrap.service.js
index 5d35a9e4c4..91441ae308 100644
--- a/frontend/src/services/bootstrap.service.js
+++ b/frontend/src/services/bootstrap.service.js
@@ -1,5 +1,9 @@
 import { nextTick } from 'vue'
 
+import { useAccountAuthStore } from '@/stores/account-auth.js'
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
+import { useContextStore } from '@/stores/context.js'
+
 /**
  * Bootstrap Service - Handles application lifecycle and readiness detection
  * @class
@@ -10,11 +14,6 @@ class BootstrapService {
      */
     $app
 
-    /**
-     * @type {import('vuex').Store} - Vuex store instance
-     */
-    $store
-
     /**
      * @type {import('vue-router').Router} - Vue router instance
      */
@@ -26,16 +25,14 @@ class BootstrapService {
     $services
 
     /**
-     * @param {{app: import('vue').App, store: import('vuex').Store, router: import('vue-router').Router, services?: Object}} options - Constructor options
+     * @param {{app: import('vue').App, router: import('vue-router').Router, services?: Object}} options - Constructor options
      */
     constructor ({
         app,
-        store,
         router,
         services = {}
     }) {
         this.$app = app
-        this.$store = store
         this.$router = router
         this.$services = services
 
@@ -57,7 +54,12 @@ class BootstrapService {
      */
     async init () {
         return this.waitForAppMount()
-            .then(() => this.waitForStoreHydration())
+            .then(() => {
+                // Eagerly create account & context stores — restores persisted state from localStorage instantly
+                useAccountAuthStore()
+                useContextStore()
+                useAccountSettingsStore()
+            })
             .then(() => this.checkUser())
             .then(() => this.mountApp())
             .then(() => this.waitForRouterReady())
@@ -76,31 +78,13 @@ class BootstrapService {
         })
     }
 
-    async waitForStoreHydration () {
-        if (this.$store.state.initialized || this.$store.state._hydrated) {
-            return Promise.resolve()
-        }
-
-        // Wait for store hydration
-        return new Promise((resolve) => {
-            const unsubscribe = this.$store.subscribe((mutation) => {
-                if (mutation.type === 'initializeStore' ||
-                    mutation.type === 'HYDRATE_COMPLETE' ||
-                    this.$store.state._hydrated) {
-                    unsubscribe()
-                    resolve()
-                }
-            })
-        })
-    }
-
     async waitForRouterReady () {
         await this.$router.isReady()
     }
 
     async checkUser () {
         if (window.opener) {
-            return this.$store.dispatch('account/checkIfAuthenticated').catch(e => e)
+            return useAccountAuthStore().checkIfAuthenticated().catch(e => e)
         }
 
         return Promise.resolve()
@@ -133,19 +117,17 @@ class BootstrapService {
 let BootstrapServiceInstance = null
 
 /**
- * @param {{app: import('vue').App, store: import('vuex').Store, router: import('vue-router').Router, services?: Object}} options - Constructor options
+ * @param {{app: import('vue').App, router: import('vue-router').Router, services?: Object}} options - Constructor options
  * @returns {BootstrapService}
  */
 export function createBootstrapService ({
     app,
-    store,
     router,
     services = {}
 } = {}) {
     if (!BootstrapServiceInstance) {
         BootstrapServiceInstance = new BootstrapService({
             app,
-            store,
             router,
             services
         })
diff --git a/frontend/src/services/messaging.service.js b/frontend/src/services/messaging.service.js
index 9e7e1d8fcc..2d499ff887 100644
--- a/frontend/src/services/messaging.service.js
+++ b/frontend/src/services/messaging.service.js
@@ -34,11 +34,6 @@ class MessagingService {
      */
     $app
 
-    /**
-     * @type {import('vuex').Store} - Vuex store instance
-     */
-    $store
-
     /**
      * @type {import('vue-router').Router} - Vue router instance
      */
@@ -50,16 +45,14 @@ class MessagingService {
     $services
 
     /**
-     * @param {{app: import('vue').App, store: import('vuex').Store, router: import('vue-router').Router, services?: Object}} options - Constructor options
+     * @param {{app: import('vue').App, router: import('vue-router').Router, services?: Object}} options - Constructor options
      */
     constructor ({
         app,
-        store,
         router,
         services = {}
     }) {
         this.$app = app
-        this.$store = store
         this.$router = router
         this.$services = services
 
@@ -224,19 +217,17 @@ let MessagingServiceInstance = null
 
 /**
  * Get or create the MessagingService singleton instance
- * @param {{app: import('vue').App, store: import('vuex').Store, router: import('vue-router').Router, services?: Object}} options - Constructor options
+ * @param {{app: import('vue').App, router: import('vue-router').Router, services?: Object}} options - Constructor options
  * @returns {MessagingService}
  */
 export function createMessagingService ({
     app,
-    store,
     router,
     services = {}
 } = {}) {
     if (!MessagingServiceInstance) {
         MessagingServiceInstance = new MessagingService({
             app,
-            store,
             router,
             services
         })
diff --git a/frontend/src/services/service.factory.js b/frontend/src/services/service.factory.js
index 1ccd908259..3dc5d353e6 100644
--- a/frontend/src/services/service.factory.js
+++ b/frontend/src/services/service.factory.js
@@ -24,21 +24,18 @@ class ServiceFactory {
     /**
      * Create all services, create bootstrap service, and boot all services sequentially
      * @param {import('vue').App} app - Vue app instance
-     * @param {import('vuex').Store} store - Vuex store instance
      * @param {import('vue-router').Router} router - Vue router instance
      * @returns {Promise<ServiceInstances>} Promise that resolves when all services are booted
      */
-    async bootAllServices (app, store, router) {
+    async bootAllServices (app, router) {
         this.$serviceInstances.bootstrap = createBootstrapService({
             app,
-            store,
             router,
             services: this.$serviceInstances
         })
 
         this.$serviceInstances.messaging = createMessagingService({
             app,
-            store,
             router,
             services: this.$serviceInstances
         })
diff --git a/frontend/src/store/common/actions.js b/frontend/src/store/common/actions.js
deleted file mode 100644
index 01d7e4ab0a..0000000000
--- a/frontend/src/store/common/actions.js
+++ /dev/null
@@ -1,44 +0,0 @@
-export default {
-    $resetState ({ commit }) {
-        function resetStore (module, storePath) {
-            const hasInitialState = Object.prototype.hasOwnProperty.call(module, 'initialState') &&
-                typeof module.initialState === 'object'
-            const hasPersistence = Object.prototype.hasOwnProperty.call(module.meta ?? {}, 'persistence') &&
-                typeof module.meta.persistence === 'object'
-
-            if (hasInitialState && hasPersistence) {
-                // remove keys from the initial state that should be ignored while clearing state
-                Object.entries(module.meta.persistence ?? {})
-                    .forEach(([key, value]) => {
-                        if (value.clearOnLogout === false) {
-                            delete module.initialState[key]
-                        }
-                    })
-
-                // reset nestedModules
-                if (Object.prototype.hasOwnProperty.call(module, 'modules')) {
-                    Object.keys(module.modules)
-                        .filter(m => m)
-                        .forEach(nestedModule => {
-                            const nestedPath = `${storePath}.${nestedModule}`
-                            resetStore(module.modules[nestedModule], nestedPath)
-                        })
-                }
-
-                commit('$resetState', {
-                    initialState: module.initialState,
-                    storePath
-                })
-            }
-        }
-
-        // We need to use the rawModule because it contains any additional keys stored in the module (e.g., initialState, persistence)
-        const rawModules = this._modules?.root?._rawModule?.modules ?? null
-
-        if (rawModules) {
-            Object.keys(rawModules)
-                .filter(m => m)
-                .forEach(store => resetStore(rawModules[store], store))
-        }
-    }
-}
diff --git a/frontend/src/store/common/mutations.js b/frontend/src/store/common/mutations.js
deleted file mode 100644
index 1401978077..0000000000
--- a/frontend/src/store/common/mutations.js
+++ /dev/null
@@ -1,31 +0,0 @@
-export default {
-    $resetState (state, { initialState, storePath }) {
-        /*
-         * State in this context refers to the rootState
-         *
-         * Because we're dealing with the rootState, we need to traverse the state to get to the targeted store.
-         *
-         * Resetting current state with given state (by this stage, the given initial state should be pruned to only
-         * override required keys)
-         */
-        const keys = storePath.split('.')
-        let current = state
-
-        for (let i = 0; i < keys.length; i++) {
-            current = current[keys[i]]
-        }
-
-        Object.keys(initialState)
-            .forEach(property => {
-                current[property] = initialState[property]
-            })
-    },
-    initializeStore (state) {
-        // Mark store as hydrated after initialization
-        state._hydrated = true
-    },
-
-    HYDRATE_COMPLETE (state) {
-        state._hydrated = true
-    }
-}
diff --git a/frontend/src/store/index.js b/frontend/src/store/index.js
deleted file mode 100644
index 7a11b6f26c..0000000000
--- a/frontend/src/store/index.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import { createStore } from 'vuex'
-
-import commonActions from './common/actions.js'
-import commonMutations from './common/mutations.js'
-import account from './modules/account/index.js'
-import product from './modules/product/index.js'
-import storagePlugin from './plugins/storage.plugin.js'
-
-export default createStore({
-    modules: {
-        account,
-        product
-    },
-    actions: {
-        ...commonActions
-    },
-    mutations: {
-        ...commonMutations
-    },
-    plugins: [storagePlugin]
-})
diff --git a/frontend/src/store/modules/account/index.js b/frontend/src/store/modules/account/index.js
deleted file mode 100644
index 8ad5c9b513..0000000000
--- a/frontend/src/store/modules/account/index.js
+++ /dev/null
@@ -1,199 +0,0 @@
-import { getActivePinia } from 'pinia'
-import { nextTick } from 'vue'
-
-import settingsApi from '../../../api/settings.js'
-import teamApi from '../../../api/team.js'
-import userApi from '../../../api/user.js'
-import router from '../../../routes.js'
-
-import { useAccountAuthStore } from '@/stores/account-auth.js'
-import { useAccountSettingsStore } from '@/stores/account-settings.js'
-import { useAccountStore } from '@/stores/account.js'
-import { useContextStore } from '@/stores/context.js'
-import { useProductAssistantStore } from '@/stores/product-assistant.js'
-import { useProductBrokersStore } from '@/stores/product-brokers.js'
-import { useProductExpertInsightsAgentStore } from '@/stores/product-expert-insights-agent.js'
-import { useProductExpertSupportAgentStore } from '@/stores/product-expert-support-agent.js'
-
-import { useProductExpertStore } from '@/stores/product-expert.js'
-import { useProductTablesStore } from '@/stores/product-tables.js'
-import { useUxDialogStore } from '@/stores/ux-dialog.js'
-import { useUxDrawersStore } from '@/stores/ux-drawers.js'
-import { useUxLoadingStore } from '@/stores/ux-loading.js'
-import { useUxNavigationStore } from '@/stores/ux-navigation.js'
-import { useUxToursStore } from '@/stores/ux-tours.js'
-import { useUxStore } from '@/stores/ux.js'
-
-// mutations
-const mutations = {}
-
-// actions
-const actions = {
-    async checkState (_, redirectUrlAfterLogin) {
-        try {
-            const settings = await settingsApi.getSettings()
-            useAccountSettingsStore().setSettings(settings)
-
-            useUxLoadingStore().setOffline(false)
-
-            const user = await userApi.getUser()
-            useAccountAuthStore().login(user)
-            useUxStore().checkIfIsNewlyCreatedUser(user)
-
-            // User is logged in
-            if (router.currentRoute.value.meta.requiresLogin === false) {
-                // This is only for logged-out users
-                window.location = '/'
-                return
-            } else if (user.email_verified === false || user.password_expired) {
-                useUxLoadingStore().clearAppLoader()
-                router.push({ name: 'Home' })
-                return
-            }
-
-            // check notifications count
-            await useAccountStore().getNotifications()
-            // check notifications count
-            await useAccountStore().getInvitations()
-
-            const teams = await teamApi.getTeams()
-            useAccountStore().setTeams(teams.teams)
-
-            if (teams.count === 0) {
-                useUxLoadingStore().clearAppLoader()
-                useAccountStore().setTeam(null)
-                if (/^\/team\//.test(router.currentRoute.value.path)) {
-                    router.push({ name: 'Home' })
-                }
-
-                return
-            }
-
-            try {
-                // We now check to see if we know what team the user is currently
-                // accessing and load it.
-                // Some routes handle this for themselves in their setup based
-                // on the object the user is trying to access:
-                //  - /application/XYZ/
-                //  - /device/XYZ/
-                //  - /instance/XYZ
-                // They call `setTeam` once they have identified the owning team
-                // of the object being accessed.
-                if (!/^\/(application|device|instance)\//.test(redirectUrlAfterLogin || router.currentRoute.value.path)) {
-                    // Assume we'll load the users default team, or the first in their team list
-                    // if no default has been set
-                    let teamId = user.defaultTeam || teams.teams[0].id
-                    let teamSlug = null
-
-                    // Check the url to see if it is a /team/XYZ path - which
-                    // identifies the team we should try to load instead
-                    const teamIdMatch = /^\/team\/([^/]+)($|\/)/.exec(redirectUrlAfterLogin || router.currentRoute.value.path)
-                    if (teamIdMatch && teamIdMatch[1] !== 'create') {
-                        teamId = null
-                        teamSlug = teamIdMatch[1]
-                    }
-                    const team = await teamApi.getTeam(teamId || { slug: teamSlug })
-                    await useAccountStore().setTeam(team)
-                }
-                useUxLoadingStore().clearAppLoader()
-                if (redirectUrlAfterLogin) {
-                    // If this is a user-driven login, take them to the profile page
-                    router.push(redirectUrlAfterLogin)
-                    // Clear the redirectUrl on nextTick
-                    nextTick(() => { useAccountAuthStore().setRedirectUrl(null) })
-                }
-            } catch (teamLoadErr) {
-                useUxLoadingStore().clearAppLoader()
-                // This means the team doesn't exist, or the user doesn't have access
-                router.push({
-                    name: 'page-not-found',
-                    params: { pathMatch: router.currentRoute.value.path.substring(1).split('/') },
-                    // preserve existing query and hash if any
-                    query: router.currentRoute.value.query,
-                    hash: router.currentRoute.value.hash
-                })
-            }
-        } catch (err) {
-            // Not logged in
-            useUxLoadingStore().clearAppLoader()
-            // do we have a user session to clear?
-            if (useAccountAuthStore().user) {
-                try {
-                    window.posthog?.reset()
-                } catch (err) {
-                    console.error('posthog error resetting user')
-                }
-            }
-
-            if (router.currentRoute.value.meta.requiresLogin !== false) {
-                if (router.currentRoute.value.path !== '/') {
-                    // Only remember the url if it isn't the default / path
-                    useAccountAuthStore().setRedirectUrl(router.currentRoute.value.fullPath)
-                }
-                router.push({ name: 'Home' })
-            }
-        }
-    },
-    async login ({ dispatch }, credentials) {
-        try {
-            useAccountAuthStore().setLoginInflight()
-            if (credentials.username) {
-                await userApi.login(credentials.username, credentials.password)
-            } else if (credentials.token) {
-                await userApi.verifyMFAToken(credentials.token)
-            }
-            useUxLoadingStore().setAppLoader(true)
-            dispatch('checkState', useAccountAuthStore().redirectUrlAfterLogin)
-        } catch (err) {
-            if (err.response?.status >= 401) {
-                useAccountAuthStore().loginFailed(err.response.data)
-            } else {
-                console.error(err)
-            }
-        }
-    },
-    async logout ({ dispatch }) {
-        return userApi.logout()
-            .then(() => {
-                // Reset Vuex state (existing behaviour)
-                dispatch('$resetState', null, { root: true })
-
-                // Reset migrated Pinia stores — uncomment each line as its store is migrated
-                const pinia = getActivePinia()
-                if (pinia) {
-                    useAccountAuthStore().$reset()
-                    useAccountStore().$reset()
-                    useAccountSettingsStore().$reset()
-                    useUxDialogStore().$reset()
-                    useUxLoadingStore().$reset()
-                    useUxToursStore().$reset()
-                    useUxNavigationStore().$reset()
-                    useUxDrawersStore().$reset()
-                    useUxStore().$reset()
-                    useContextStore().$reset()
-                    useProductTablesStore().$reset()
-                    useProductBrokersStore().$reset()
-                    useProductAssistantStore().$reset()
-                    useProductExpertSupportAgentStore().$reset()
-                    useProductExpertInsightsAgentStore().$reset()
-                    useProductExpertStore().$reset()
-                }
-            })
-            .catch(_ => {})
-            .finally(() => {
-                if (window._hsq) {
-                    window._hsq.push(['revokeCookieConsent'])
-                }
-                window.location = '/'
-            })
-    },
-    checkIfAuthenticated () {
-        return useAccountAuthStore().checkIfAuthenticated()
-    }
-}
-
-export default {
-    namespaced: true,
-    actions,
-    mutations
-}
diff --git a/frontend/src/store/modules/product/index.js b/frontend/src/store/modules/product/index.js
deleted file mode 100644
index 39b639d58c..0000000000
--- a/frontend/src/store/modules/product/index.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// TODO: Remove this module shell once product-expert (PR 12) is merged.
-// All state/actions have been migrated to Pinia stores.
-
-const initialState = () => ({})
-
-const state = initialState
-
-const getters = {}
-
-const mutations = {}
-
-const actions = {}
-
-export default {
-    namespaced: true,
-    modules: {},
-    state,
-    initialState: initialState(),
-    getters,
-    actions,
-    mutations
-}
diff --git a/frontend/src/store/plugins/storage.plugin.js b/frontend/src/store/plugins/storage.plugin.js
deleted file mode 100644
index b05de95e58..0000000000
--- a/frontend/src/store/plugins/storage.plugin.js
+++ /dev/null
@@ -1,133 +0,0 @@
-import LocalStorageService from '../../services/storage/local-storage.service.js'
-import SessionStorageService from '../../services/storage/session-storage.service.js'
-
-const STORE_KEY = 'store'
-
-/**
- * Filters state by storage type (localStorage or sessionStorage)
- * Iterates through the state object and retains only the keys that match the specified storage type.
- */
-const filterByStorageType = (obj, storageType) => {
-    return Object.keys(obj).reduce((acc, key) => {
-        const item = obj[key]
-
-        // Check if the item has a persistence rule matching the specified storage type
-        if (item && item.rules && item.rules.storage === storageType) {
-            acc[key] = item.payload
-        } else if (typeof item === 'object' && item !== null && !Array.isArray(item)) {
-            // Recursively filter nested objects
-            const filteredSubItem = filterByStorageType(item, storageType)
-            if (Object.keys(filteredSubItem).length > 0) {
-                acc[key] = filteredSubItem
-            }
-        }
-
-        return acc
-    }, {})
-}
-
-/**
- * Recursively traverses Vuex modules to extract persistence rules for each module.
- * This allows each module (including nested ones) to have independent persistence settings.
- */
-const traverseModules = (modules, path = '') => {
-    return Object.keys(modules).reduce((acc, key) => {
-        const fullPath = path ? `${path}/${key}` : key
-        acc[fullPath] = modules[key]._rawModule.meta?.persistence ?? {}
-
-        // Recursively traverse child modules
-        if (modules[key]._children) {
-            Object.assign(acc, traverseModules(modules[key]._children, fullPath))
-        }
-        return acc
-    }, {})
-}
-
-/**
- * Restores Vuex state from storage while merging nested states.
- * Ensures that nested modules stored in different storage types are not overridden by their parent modules.
- */
-function updateVuexFromStorageDriver (store, storageDriver) {
-    if (storageDriver.getItem(STORE_KEY)) {
-        const currentState = store.state
-        const storedState = JSON.parse(storageDriver.getItem(STORE_KEY))
-
-        Object.keys(storedState).forEach(storeKey => {
-            const keys = storeKey.split('/')
-            let targetState = currentState
-
-            // Traverse through nested modules, ensuring that parent modules exist
-            for (let i = 0; i < keys.length - 1; i++) {
-                if (!targetState[keys[i]]) targetState[keys[i]] = {}
-                targetState = targetState[keys[i]]
-            }
-
-            if (Object.prototype.hasOwnProperty.call(targetState, keys[keys.length - 1])) {
-            // Merge stored state into the existing module state instead of replacing it
-                Object.assign(targetState[keys[keys.length - 1]], storedState[storeKey])
-            }
-        })
-    }
-}
-
-export default (store) => {
-    // Extract persistence rules for all Vuex modules, including nested ones
-    const modulePersistenceRules = traverseModules(store._modules.root._children)
-
-    // Register an initialization mutation to restore persisted state on startup
-    store.registerModule('', {
-        mutations: {
-            initializeStore: () => {
-                updateVuexFromStorageDriver(store, LocalStorageService)
-                updateVuexFromStorageDriver(store, SessionStorageService)
-            }
-        }
-    })
-
-    // Subscribe to Vuex mutations to persist state whenever a mutation occurs
-    store.subscribe((mutation, state) => {
-        const result = {}
-
-        Object.keys(modulePersistenceRules).forEach(modulePath => {
-            const keys = modulePath.split('/')
-            let targetState = state
-
-            // Traverse through nested state modules
-            for (const key of keys) {
-                if (!targetState[key]) return
-                targetState = targetState[key]
-            }
-
-            const statePersistenceRules = modulePersistenceRules[modulePath]
-            const persistentKeys = Object.keys(statePersistenceRules)
-
-            // Reduce state to include only the keys that should be persisted
-            result[modulePath] = persistentKeys.reduce((acc, key) => {
-                if (Object.prototype.hasOwnProperty.call(targetState, key)) {
-                    // Default to localStorage if no storage type is set
-                    if (!statePersistenceRules[key].storage) {
-                        statePersistenceRules[key].storage = 'localStorage'
-                    }
-
-                    acc[key] = {
-                        payload: targetState[key],
-                        rules: statePersistenceRules[key]
-                    }
-                }
-                return acc
-            }, {})
-        })
-
-        // Persist state to localStorage
-        LocalStorageService.setItem(
-            STORE_KEY,
-            JSON.stringify(filterByStorageType(result, 'localStorage'))
-        )
-
-        // Persist state to sessionStorage
-        SessionStorageService.setItem(
-            STORE_KEY,
-            JSON.stringify(filterByStorageType(result, 'sessionStorage'))
-        )
-    })
-}
diff --git a/frontend/src/stores/_account_bridge.js b/frontend/src/stores/_account_bridge.js
deleted file mode 100644
index 2797a2ea23..0000000000
--- a/frontend/src/stores/_account_bridge.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// Temporary bridge — reads account data from Pinia during migration.
-// Delete this file after the account stores are migrated to Pinia (Task 15).
-
-import { useAccountAuthStore } from '@/stores/account-auth.js'
-import { useAccountSettingsStore } from '@/stores/account-settings.js'
-
-export function useAccountBridge () {
-    // Use require() instead of top-level imports to avoid circular module dependencies.
-    // context.js imports _account_bridge.js statically; requiring context.js lazily here avoids a cycle.
-    const { useContextStore } = require('@/stores/context.js')
-    const authStore = useAccountAuthStore()
-    const contextStore = useContextStore()
-    const accountSettingsStore = useAccountSettingsStore()
-    return {
-        user: authStore.user,
-        userId: authStore.user?.id || null,
-        team: contextStore.team,
-        teamId: contextStore.team?.id || null,
-        teamSlug: contextStore.team?.slug || null,
-        features: accountSettingsStore.features,
-        teamMembership: contextStore.teamMembership ?? { role: 0 },
-        featuresCheck: accountSettingsStore.featuresCheck,
-        requiresBilling: accountSettingsStore.requiresBilling,
-        isTrialAccount: contextStore.isTrialAccount,
-        isTrialAccountExpired: contextStore.isTrialAccountExpired
-    }
-}
diff --git a/frontend/src/stores/account-auth.js b/frontend/src/stores/account-auth.js
index c0ba384065..b7917f3853 100644
--- a/frontend/src/stores/account-auth.js
+++ b/frontend/src/stores/account-auth.js
@@ -1,7 +1,26 @@
 import { defineStore } from 'pinia'
+import { nextTick } from 'vue'
 
+import settingsApi from '../api/settings.js'
+import teamApi from '../api/team.js'
 import userApi from '../api/user.js'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
+import { useAccountStore } from '@/stores/account.js'
+import { useContextStore } from '@/stores/context.js'
+import { useProductAssistantStore } from '@/stores/product-assistant.js'
+import { useProductBrokersStore } from '@/stores/product-brokers.js'
+import { useProductExpertInsightsAgentStore } from '@/stores/product-expert-insights-agent.js'
+import { useProductExpertSupportAgentStore } from '@/stores/product-expert-support-agent.js'
+import { useProductExpertStore } from '@/stores/product-expert.js'
+import { useProductTablesStore } from '@/stores/product-tables.js'
+import { useUxDialogStore } from '@/stores/ux-dialog.js'
+import { useUxDrawersStore } from '@/stores/ux-drawers.js'
+import { useUxLoadingStore } from '@/stores/ux-loading.js'
+import { useUxNavigationStore } from '@/stores/ux-navigation.js'
+import { useUxToursStore } from '@/stores/ux-tours.js'
+import { useUxStore } from '@/stores/ux.js'
+
 export const useAccountAuthStore = defineStore('account-auth', {
     state: () => ({
         user: null,
@@ -36,6 +55,158 @@ export const useAccountAuthStore = defineStore('account-auth', {
         async checkIfAuthenticated () {
             const user = await userApi.getUser()
             this.user = user
+        },
+        async checkState (redirectUrlAfterLogin) {
+            // Lazy require to break circular: account-auth.js → routes.js → Home.vue → ... → account-auth.js
+            const router = require('../routes.js').default
+            try {
+                const settings = await settingsApi.getSettings()
+                useAccountSettingsStore().setSettings(settings)
+
+                useUxLoadingStore().setOffline(false)
+
+                const user = await userApi.getUser()
+                this.login(user)
+                useUxStore().checkIfIsNewlyCreatedUser(user)
+
+                // User is logged in
+                if (router.currentRoute.value.meta.requiresLogin === false) {
+                    // This is only for logged-out users
+                    window.location = '/'
+                    return
+                } else if (user.email_verified === false || user.password_expired) {
+                    useUxLoadingStore().clearAppLoader()
+                    router.push({ name: 'Home' })
+                    return
+                }
+
+                // check notifications count
+                await useAccountStore().getNotifications()
+                // check notifications count
+                await useAccountStore().getInvitations()
+
+                const teams = await teamApi.getTeams()
+                useAccountStore().setTeams(teams.teams)
+
+                if (teams.count === 0) {
+                    useUxLoadingStore().clearAppLoader()
+                    useAccountStore().setTeam(null)
+                    if (/^\/team\//.test(router.currentRoute.value.path)) {
+                        router.push({ name: 'Home' })
+                    }
+                    return
+                }
+
+                try {
+                    // We now check to see if we know what team the user is currently
+                    // accessing and load it.
+                    // Some routes handle this for themselves in their setup based
+                    // on the object the user is trying to access:
+                    //  - /application/XYZ/
+                    //  - /device/XYZ/
+                    //  - /instance/XYZ
+                    // They call `setTeam` once they have identified the owning team
+                    // of the object being accessed.
+                    if (!/^\/(application|device|instance)\//.test(redirectUrlAfterLogin || router.currentRoute.value.path)) {
+                        // Assume we'll load the users default team, or the first in their team list
+                        // if no default has been set
+                        let teamId = user.defaultTeam || teams.teams[0].id
+                        let teamSlug = null
+
+                        // Check the url to see if it is a /team/XYZ path - which
+                        // identifies the team we should try to load instead
+                        const teamIdMatch = /^\/team\/([^/]+)($|\/)/.exec(redirectUrlAfterLogin || router.currentRoute.value.path)
+                        if (teamIdMatch && teamIdMatch[1] !== 'create') {
+                            teamId = null
+                            teamSlug = teamIdMatch[1]
+                        }
+                        const team = await teamApi.getTeam(teamId || { slug: teamSlug })
+                        await useAccountStore().setTeam(team)
+                    }
+                    useUxLoadingStore().clearAppLoader()
+                    if (redirectUrlAfterLogin) {
+                        // If this is a user-driven login, take them to the profile page
+                        router.push(redirectUrlAfterLogin)
+                        // Clear the redirectUrl on nextTick
+                        nextTick(() => { this.setRedirectUrl(null) })
+                    }
+                } catch (teamLoadErr) {
+                    useUxLoadingStore().clearAppLoader()
+                    // This means the team doesn't exist, or the user doesn't have access
+                    router.push({
+                        name: 'page-not-found',
+                        params: { pathMatch: router.currentRoute.value.path.substring(1).split('/') },
+                        // preserve existing query and hash if any
+                        query: router.currentRoute.value.query,
+                        hash: router.currentRoute.value.hash
+                    })
+                }
+            } catch (err) {
+                // Not logged in
+                useUxLoadingStore().clearAppLoader()
+                // do we have a user session to clear?
+                if (this.user) {
+                    try {
+                        window.posthog?.reset()
+                    } catch (err) {
+                        console.error('posthog error resetting user')
+                    }
+                }
+
+                if (router.currentRoute.value.meta.requiresLogin !== false) {
+                    if (router.currentRoute.value.path !== '/') {
+                        // Only remember the url if it isn't the default / path
+                        this.setRedirectUrl(router.currentRoute.value.fullPath)
+                    }
+                    router.push({ name: 'Home' })
+                }
+            }
+        },
+        async loginWithCredentials (credentials) {
+            try {
+                this.setLoginInflight()
+                if (credentials.username) {
+                    await userApi.login(credentials.username, credentials.password)
+                } else if (credentials.token) {
+                    await userApi.verifyMFAToken(credentials.token)
+                }
+                useUxLoadingStore().setAppLoader(true)
+                this.checkState(this.redirectUrlAfterLogin)
+            } catch (err) {
+                if (err.response?.status >= 401) {
+                    this.loginFailed(err.response.data)
+                } else {
+                    console.error(err)
+                }
+            }
+        },
+        async logout () {
+            return userApi.logout()
+                .then(() => {
+                    useAccountAuthStore().$reset()
+                    useAccountStore().$reset()
+                    useUxLoadingStore().$reset()
+                    useAccountSettingsStore().$reset()
+                    useUxDialogStore().$reset()
+                    useUxToursStore().$reset()
+                    useUxNavigationStore().$reset()
+                    useUxDrawersStore().$reset()
+                    useUxStore().$reset()
+                    useContextStore().$reset()
+                    useProductTablesStore().$reset()
+                    useProductBrokersStore().$reset()
+                    useProductAssistantStore().$reset()
+                    useProductExpertSupportAgentStore().$reset()
+                    useProductExpertInsightsAgentStore().$reset()
+                    useProductExpertStore().$reset()
+                })
+                .catch(_ => {})
+                .finally(() => {
+                    if (window._hsq) {
+                        window._hsq.push(['revokeCookieConsent'])
+                    }
+                    window.location = '/'
+                })
         }
     },
     persist: {
diff --git a/frontend/src/stores/context.js b/frontend/src/stores/context.js
index 99ec4d18b8..42095144a6 100644
--- a/frontend/src/stores/context.js
+++ b/frontend/src/stores/context.js
@@ -3,8 +3,9 @@ import { defineStore } from 'pinia'
 import teamApi from '../api/team.js'
 import product from '../services/product.js'
 
-import { useAccountBridge } from './_account_bridge.js'
+import { useAccountAuthStore } from './account-auth.js'
 import { useProductAssistantStore } from './product-assistant.js'
+import { useProductExpertStore } from './product-expert.js'
 
 export const useContextStore = defineStore('context', {
     state: () => ({
@@ -25,23 +26,23 @@ export const useContextStore = defineStore('context', {
             return this.isTrialAccount && state.team?.billing?.trialEnded
         },
         expert (state) {
-            const account = useAccountBridge()
-            const assistant = useProductAssistantStore()
+            const authStore = useAccountAuthStore()
+            const assistantStore = useProductAssistantStore()
 
             if (!state.route) {
                 return {
-                    assistantVersion: assistant.version,
-                    assistantFeatures: assistant.assistantFeatures,
+                    assistantVersion: assistantStore.version,
+                    assistantFeatures: assistantStore.assistantFeatures,
                     palette: null,
                     debugLog: null,
-                    userId: account.userId,
+                    userId: authStore.user?.id || null,
                     teamId: state.team?.id || null,
                     teamSlug: state.team?.slug || null,
                     instanceId: null,
                     deviceId: null,
                     applicationId: null,
                     isTrialAccount: this.isTrialAccount,
-                    nodeRedVersion: assistant.nodeRedVersion,
+                    nodeRedVersion: assistantStore.nodeRedVersion,
                     pageName: null,
                     rawRoute: {},
                     selectedNodes: null,
@@ -67,26 +68,23 @@ export const useContextStore = defineStore('context', {
             const { matched, redirectedFrom, ...rawRoute } = state.route ?? {}
             let selectedNodes = null
 
-            if (scope === 'immersive' && assistant.selectedNodes.length > 0) {
-                // Lazy require to avoid circular dependency:
-                // context.js → product-expert.js → product-assistant.js → context.js
-                const { useProductExpertStore } = require('./product-expert.js')
+            if (scope === 'immersive' && assistantStore.selectedNodes.length > 0) {
                 if (useProductExpertStore().isSupportAgent) {
-                    selectedNodes = assistant.selectedNodes
+                    selectedNodes = assistantStore.selectedNodes
                 }
             }
 
             let palette = null
-            if (assistant.selectedContext?.some(e => e.value === 'palette')) {
-                palette = assistant.paletteContribOnly
+            if (assistantStore.selectedContext?.some(e => e.value === 'palette')) {
+                palette = assistantStore.paletteContribOnly
             }
 
             return {
-                assistantVersion: assistant.version,
-                assistantFeatures: assistant.assistantFeatures,
+                assistantVersion: assistantStore.version,
+                assistantFeatures: assistantStore.assistantFeatures,
                 palette,
-                debugLog: assistant.debugLog,
-                userId: account.userId,
+                debugLog: assistantStore.debugLog,
+                userId: authStore.user?.id || null,
                 teamId: state.team?.id || null,
                 teamSlug: state.team?.slug || null,
                 instanceId: instanceId ?? null,
@@ -94,7 +92,7 @@ export const useContextStore = defineStore('context', {
                 applicationId: applicationId ?? null,
                 isTrialAccount: this.isTrialAccount,
                 pageName: state.route.name,
-                nodeRedVersion: assistant.nodeRedVersion,
+                nodeRedVersion: assistantStore.nodeRedVersion,
                 rawRoute,
                 selectedNodes,
                 scope
diff --git a/frontend/src/stores/product-brokers.js b/frontend/src/stores/product-brokers.js
index 390a392faa..134df870a1 100644
--- a/frontend/src/stores/product-brokers.js
+++ b/frontend/src/stores/product-brokers.js
@@ -2,7 +2,7 @@ import { defineStore } from 'pinia'
 
 import brokerApi from '../api/broker.js'
 
-import { useAccountBridge } from './_account_bridge.js'
+import { useContextStore } from './context.js'
 
 export const useProductBrokersStore = defineStore('product-brokers', {
     state: () => ({
@@ -15,7 +15,7 @@ export const useProductBrokersStore = defineStore('product-brokers', {
         hasFfUnsClients: (state) => state.UNS.clients.length > 0,
         hasBrokers: (state) => state.UNS.brokers.length > 0,
         brokerExpandedTopics: (state) => (brokerId) => {
-            const { team } = useAccountBridge()
+            const team = useContextStore().team
             if (!team || !brokerId) return {}
             return state.brokers.expandedTopics?.[team.slug]?.[brokerId] ?? {}
         }
@@ -42,31 +42,31 @@ export const useProductBrokersStore = defineStore('product-brokers', {
             }
         },
         async fetchUnsClients () {
-            const { team } = useAccountBridge()
+            const team = useContextStore().team
             const response = await brokerApi.getClients(team.id)
             this.UNS.clients = response.clients
         },
         async getBrokers () {
-            const { team } = useAccountBridge()
+            const team = useContextStore().team
             const response = await brokerApi.getBrokers(team.id)
             this.UNS.brokers = response.brokers
             this.addFfBroker()
         },
         async createBroker (payload) {
-            const { team } = useAccountBridge()
+            const team = useContextStore().team
             const broker = await brokerApi.createBroker(team.id, payload).catch(e => e)
             this.UNS.brokers.push(broker)
             return broker
         },
         async updateBroker ({ payload, brokerId }) {
-            const { team } = useAccountBridge()
+            const team = useContextStore().team
             const broker = await brokerApi.updateBroker(team.id, brokerId, payload).catch(e => e)
             const i = this.UNS.brokers.findIndex(b => b.id === broker.id)
             if (i !== -1) this.UNS.brokers[i] = { ...this.UNS.brokers[i], ...broker }
             return broker
         },
         deleteBroker (brokerId) {
-            const { team } = useAccountBridge()
+            const team = useContextStore().team
             return brokerApi.deleteBroker(team.id, brokerId).then(() => {
                 const i = this.UNS.brokers.findIndex(b => b.id === brokerId)
                 if (i !== -1) this.UNS.brokers.splice(i, 1)
@@ -80,7 +80,7 @@ export const useProductBrokersStore = defineStore('product-brokers', {
         removeFfBroker () { this.UNS.brokers = this.UNS.brokers.filter(b => !b.local) },
         clearUns () { this.UNS.brokers = []; this.UNS.clients = [] },
         handleBrokerTopicState ({ topic, brokerId }) {
-            const { team } = useAccountBridge()
+            const team = useContextStore().team
             if (!this.brokers.expandedTopics[team.slug]) this.brokers.expandedTopics[team.slug] = {}
             if (!this.brokers.expandedTopics[team.slug][brokerId]) {
                 this.brokers.expandedTopics[team.slug][brokerId] = {}
diff --git a/frontend/src/stores/product-expert-insights-agent.js b/frontend/src/stores/product-expert-insights-agent.js
index 277eb69903..4df5237a46 100644
--- a/frontend/src/stores/product-expert-insights-agent.js
+++ b/frontend/src/stores/product-expert-insights-agent.js
@@ -4,7 +4,7 @@ import { markRaw } from 'vue'
 import expertApi from '../api/expert.js'
 import useTimerHelper from '../composables/TimerHelper.js'
 
-import { useAccountBridge } from './_account_bridge.js'
+import { useContextStore } from './context.js'
 
 export const useProductExpertInsightsAgentStore = defineStore('product-expert-insights-agent', {
     state: () => ({
@@ -36,9 +36,9 @@ export const useProductExpertInsightsAgentStore = defineStore('product-expert-in
             //  https://github.com/FlowFuse/flowfuse/issues/6519 as it's a hacky workaround to the expert drawer opening up
             //  before we have a team loaded
             const { waitWhile } = useTimerHelper()
-            await waitWhile(() => !useAccountBridge().team, { cutoffTries: 60 })
+            await waitWhile(() => !useContextStore().team, { cutoffTries: 60 })
 
-            const { team } = useAccountBridge()
+            const team = useContextStore().team
             const data = await expertApi.getCapabilities({ context: { teamId: team.id } })
             this.capabilityServers = data.servers || []
         }
diff --git a/frontend/src/stores/product-expert.js b/frontend/src/stores/product-expert.js
index 756d09727e..c94a0e2840 100644
--- a/frontend/src/stores/product-expert.js
+++ b/frontend/src/stores/product-expert.js
@@ -5,7 +5,7 @@ import { markRaw } from 'vue'
 import expertApi from '../api/expert.js'
 import useTimerHelper from '../composables/TimerHelper.js'
 
-import { useAccountBridge } from './_account_bridge.js'
+import { useAccountSettingsStore } from './account-settings.js'
 import { useContextStore } from './context.js'
 import { useProductAssistantStore } from './product-assistant.js'
 import { INSIGHTS_AGENT, SUPPORT_AGENT } from './product-expert-agents.js'
@@ -46,7 +46,7 @@ export const useProductExpertStore = defineStore('product-expert', {
     },
     actions: {
         setContext ({ data, sessionId }) {
-            const { featuresCheck } = useAccountBridge()
+            const featuresCheck = useAccountSettingsStore().featuresCheck
             if (featuresCheck.isExpertAssistantFeatureEnabled === false) {
                 return
             }
@@ -64,7 +64,7 @@ export const useProductExpertStore = defineStore('product-expert', {
             this.shouldWakeUpAssistant = false
         },
         async hydrateClient () {
-            const { featuresCheck } = useAccountBridge()
+            const featuresCheck = useAccountSettingsStore().featuresCheck
             if (featuresCheck.isExpertAssistantFeatureEnabled === false) {
                 return
             }
@@ -73,10 +73,10 @@ export const useProductExpertStore = defineStore('product-expert', {
             //  https://github.com/FlowFuse/flowfuse/issues/6519 as it's a hacky workaround to the expert drawer opening up
             //  before we have a team loaded
             const { waitWhile } = useTimerHelper()
-            await waitWhile(() => !useAccountBridge().team, { cutoffTries: 60 })
+            await waitWhile(() => !useContextStore().team, { cutoffTries: 60 })
 
             const agentStore = this._agentStore
-            const { team } = useAccountBridge()
+            const team = useContextStore().team
 
             return expertApi
                 .chat({
@@ -93,7 +93,7 @@ export const useProductExpertStore = defineStore('product-expert', {
         },
 
         openAssistantDrawer (options = {}) {
-            const { featuresCheck } = useAccountBridge()
+            const featuresCheck = useAccountSettingsStore().featuresCheck
             if (featuresCheck.isExpertAssistantFeatureEnabled === false) return
 
             useProductExpertInsightsAgentStore().getCapabilities()
@@ -108,7 +108,7 @@ export const useProductExpertStore = defineStore('product-expert', {
 
         wakeUpAssistant ({ shouldHydrateMessages = false } = {}) {
             if (this.shouldWakeUpAssistant) {
-                const { featuresCheck } = useAccountBridge()
+                const featuresCheck = useAccountSettingsStore().featuresCheck
                 if (featuresCheck.isExpertAssistantFeatureEnabled === false) return
 
                 this.clearWakeUp()
diff --git a/frontend/src/stores/product-tables.js b/frontend/src/stores/product-tables.js
index f100c0a8d3..5a58a98ef4 100644
--- a/frontend/src/stores/product-tables.js
+++ b/frontend/src/stores/product-tables.js
@@ -3,7 +3,7 @@ import { defineStore } from 'pinia'
 import tablesApi from '../api/tables.js'
 import { hashString } from '../composables/strings/String.js'
 
-import { useAccountBridge } from './_account_bridge.js'
+import { useContextStore } from './context.js'
 
 const emptyColumn = {
     name: '',
@@ -50,13 +50,13 @@ export const useProductTablesStore = defineStore('product-tables', {
             return database
         },
         async getDatabases () {
-            const { team } = useAccountBridge()
+            const team = useContextStore().team
             const databases = await tablesApi.getDataBases(team.id)
             databases.forEach(db => { this.databases[db.id] = db })
             return databases
         },
         async getTables (databaseId) {
-            const { team } = useAccountBridge()
+            const team = useContextStore().team
             let tables = await tablesApi.getTables(team.id, databaseId)
             tables = [...tables].sort((a, b) => a.name.localeCompare(b.name, undefined, { numeric: true, sensitivity: 'base' }))
             this.tables[databaseId] = tables
@@ -88,7 +88,7 @@ export const useProductTablesStore = defineStore('product-tables', {
             })
         },
         async createTable ({ databaseId }) {
-            const { team } = useAccountBridge()
+            const team = useContextStore().team
             const sanitizedColumns = this.newTable.columns.map(col => {
                 const c = { ...col }
                 if (!c.hasDefault) delete c.default
diff --git a/frontend/src/stores/ux-navigation.js b/frontend/src/stores/ux-navigation.js
index 93a3686972..c1fbabaaff 100644
--- a/frontend/src/stores/ux-navigation.js
+++ b/frontend/src/stores/ux-navigation.js
@@ -13,7 +13,8 @@ import QueueIcon from '../components/icons/Queue.js'
 import { hasALowerOrEqualTeamRoleThan, hasAMinimumTeamRoleOf, hasPermission } from '../composables/Permissions.js'
 import { Roles } from '../utils/roles.js'
 
-import { useAccountBridge } from './_account_bridge.js'
+import { useAccountSettingsStore } from './account-settings.js'
+import { useContextStore } from './context.js'
 import { useUxStore } from './ux.js'
 
 export const useUxNavigationStore = defineStore('ux-navigation', {
@@ -25,16 +26,19 @@ export const useUxNavigationStore = defineStore('ux-navigation', {
     }),
     getters: {
         mainNavContexts (state) {
-            const {
-                team,
-                features: accountFeatures,
-                teamMembership,
-                featuresCheck: features,
-                requiresBilling,
-                isTrialAccountExpired
-            } = useAccountBridge()
+            const contextStore = useContextStore()
+            const team = contextStore.team
+            const teamMembership = contextStore.teamMembership
+            const isTrialAccountExpired = contextStore.isTrialAccountExpired
 
-            const { isNewlyCreatedUser, userActions } = useUxStore()
+            const accountSettingsStore = useAccountSettingsStore()
+            const accountFeatures = accountSettingsStore.features
+            const features = accountSettingsStore.featuresCheck
+            const requiresBilling = accountSettingsStore.requiresBilling
+
+            const uxStore = useUxStore()
+            const isNewlyCreatedUser = uxStore.isNewlyCreatedUser
+            const userActions = uxStore.userActions
 
             const adminContext = [
                 {
@@ -415,7 +419,9 @@ export const useUxNavigationStore = defineStore('ux-navigation', {
             }
         },
         mainNavContext (state) {
-            const { team, teamMembership } = useAccountBridge()
+            const contextStore = useContextStore()
+            const team = contextStore.team
+            const teamMembership = contextStore.teamMembership
 
             if (!team && !['admin', 'user'].includes(state.mainNav.context)) {
                 // todo this compensates for a brief moment after logging in where we don't have a team loaded and can't properly
diff --git a/package-lock.json b/package-lock.json
index 5fa012ed83..6afd88c4a5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -78,7 +78,6 @@
                 "vue-router": "^4.2.5",
                 "vue-shepherd": "^3.0.0",
                 "vue3-google-login": "^2.0.33",
-                "vuex": "^4.1.0",
                 "yaml": "^2.3.1",
                 "zxcvbn": "^4.4.2"
             },
@@ -10583,6 +10582,8 @@
             "version": "8.18.0",
             "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz",
             "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==",
+            "optional": true,
+            "peer": true,
             "dependencies": {
                 "fast-deep-equal": "^3.1.3",
                 "fast-uri": "^3.0.1",
@@ -10597,7 +10598,9 @@
         "node_modules/ajv-formats/node_modules/json-schema-traverse": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-            "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
+            "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+            "optional": true,
+            "peer": true
         },
         "node_modules/ajv-keywords": {
             "version": "3.5.2",
@@ -27902,17 +27905,6 @@
                 "vue": "^3.0.3"
             }
         },
-        "node_modules/vuex": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/vuex/-/vuex-4.1.0.tgz",
-            "integrity": "sha512-hmV6UerDrPcgbSy9ORAtNXDr9M4wlNP4pEFKye4ujJF8oqgFFuxDCdOLS3eNoRTtq5O3hoBDh9Doj1bQMYHRbQ==",
-            "dependencies": {
-                "@vue/devtools-api": "^6.0.0-beta.11"
-            },
-            "peerDependencies": {
-                "vue": "^3.2.0"
-            }
-        },
         "node_modules/w3c-xmlserializer": {
             "version": "5.0.0",
             "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz",
@@ -31269,9 +31261,7 @@
                     "version": "3.0.1",
                     "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-3.0.1.tgz",
                     "integrity": "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==",
-                    "requires": {
-                        "ajv": "^8.0.0"
-                    }
+                    "requires": {}
                 },
                 "json-schema-traverse": {
                     "version": "1.0.0",
@@ -32425,7 +32415,6 @@
                 "json-schema-typed": "^8.0.2",
                 "pkce-challenge": "^5.0.0",
                 "raw-body": "^3.0.0",
-                "zod": "^3.25 || ^4.0",
                 "zod-to-json-schema": "^3.25.1"
             },
             "dependencies": {
@@ -32453,9 +32442,7 @@
                     "version": "3.0.1",
                     "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-3.0.1.tgz",
                     "integrity": "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==",
-                    "requires": {
-                        "ajv": "^8.0.0"
-                    }
+                    "requires": {}
                 },
                 "body-parser": {
                     "version": "2.2.2",
@@ -35655,14 +35642,13 @@
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
             "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
-            "requires": {
-                "ajv": "^8.0.0"
-            },
+            "requires": {},
             "dependencies": {
                 "ajv": {
-                    "version": "8.18.0",
-                    "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz",
+                    "version": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz",
                     "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==",
+                    "optional": true,
+                    "peer": true,
                     "requires": {
                         "fast-deep-equal": "^3.1.3",
                         "fast-uri": "^3.0.1",
@@ -35673,7 +35659,9 @@
                 "json-schema-traverse": {
                     "version": "1.0.0",
                     "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-                    "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
+                    "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+                    "optional": true,
+                    "peer": true
                 }
             }
         },
@@ -38853,9 +38841,7 @@
                     "version": "3.0.1",
                     "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-3.0.1.tgz",
                     "integrity": "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==",
-                    "requires": {
-                        "ajv": "^8.0.0"
-                    }
+                    "requires": {}
                 },
                 "json-schema-traverse": {
                     "version": "1.0.0",
@@ -47845,14 +47831,6 @@
             "integrity": "sha512-Hx3JJUREXWCFOOB4AzZKy/x7C+X18kxmT0AquBekm0TRubp11nrWijOLEgmhuij48dQPNumyaAi5IQAeDKk7yw==",
             "requires": {}
         },
-        "vuex": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/vuex/-/vuex-4.1.0.tgz",
-            "integrity": "sha512-hmV6UerDrPcgbSy9ORAtNXDr9M4wlNP4pEFKye4ujJF8oqgFFuxDCdOLS3eNoRTtq5O3hoBDh9Doj1bQMYHRbQ==",
-            "requires": {
-                "@vue/devtools-api": "^6.0.0-beta.11"
-            }
-        },
         "w3c-xmlserializer": {
             "version": "5.0.0",
             "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz",
diff --git a/package.json b/package.json
index 3efe39faa0..5888d0e219 100644
--- a/package.json
+++ b/package.json
@@ -122,7 +122,6 @@
         "vue-router": "^4.2.5",
         "vue-shepherd": "^3.0.0",
         "vue3-google-login": "^2.0.33",
-        "vuex": "^4.1.0",
         "yaml": "^2.3.1",
         "zxcvbn": "^4.4.2"
     },
diff --git a/test/e2e/frontend/cypress/tests-ee/landing/deploy-blueprint.js b/test/e2e/frontend/cypress/tests-ee/landing/deploy-blueprint.js
index 7a532072de..b7d1be6602 100644
--- a/test/e2e/frontend/cypress/tests-ee/landing/deploy-blueprint.js
+++ b/test/e2e/frontend/cypress/tests-ee/landing/deploy-blueprint.js
@@ -15,10 +15,8 @@ function checkIfLandedOnLoginPage () {
     cy.intercept('GET', '/api/*/user/').as('getUser')
     cy.wait('@getUser')
 
-    cy.window()
-        .then((win) => {
-            expect(win.location.href).to.match(/^[a-zA-Z]+:\/\/localhost:\d+\/?$/)
-        })
+    // Assert that the login form is visible
+    cy.get('[data-form="login"]').should('be.visible')
 }
 
 function interceptAndSetDefaultBlueprint () {
diff --git a/test/unit/frontend/stores/account-auth.spec.js b/test/unit/frontend/stores/account-auth.spec.js
index 4f93f6a1cc..f2e5720d31 100644
--- a/test/unit/frontend/stores/account-auth.spec.js
+++ b/test/unit/frontend/stores/account-auth.spec.js
@@ -1,9 +1,21 @@
 import { createPinia, setActivePinia } from 'pinia'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
+// routes.js loads the full Vue component tree (including AssetDetailDialog.vue →
+// @flowfuse/flow-renderer which has a CJS/ESM conflict). Mock it to avoid the error.
+vi.mock('@/routes.js', () => ({
+    default: {
+        push: vi.fn(),
+        currentRoute: { value: { meta: {}, path: '/', fullPath: '/', query: {}, hash: '' } }
+    }
+}))
+
 vi.mock('@/api/user.js', () => ({
     default: {
-        getUser: vi.fn()
+        getUser: vi.fn(),
+        login: vi.fn(),
+        logout: vi.fn(),
+        verifyMFAToken: vi.fn()
     }
 }))
 
diff --git a/test/unit/frontend/stores/context.spec.js b/test/unit/frontend/stores/context.spec.js
index a2e90e5700..495d0312af 100644
--- a/test/unit/frontend/stores/context.spec.js
+++ b/test/unit/frontend/stores/context.spec.js
@@ -3,21 +3,19 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 import { useContextStore } from '@/stores/context.js'
 
+// account-auth.js imports routes.js which loads the full Vue component tree
+// (including components that pull in @flowfuse/flow-renderer — a CJS/ESM conflict).
+// Mock it to keep the test environment clean.
+vi.mock('@/stores/account-auth.js', () => ({
+    useAccountAuthStore: vi.fn(() => ({ user: null }))
+}))
+
 // product-expert.js imports ExpertDrawer.vue which pulls in @flowfuse/flow-renderer
 // (CJS/ESM conflict). Mock it to keep the test environment clean.
 vi.mock('@/stores/product-expert.js', () => ({
     useProductExpertStore: vi.fn(() => ({ isSupportAgent: true }))
 }))
 
-vi.mock('@/stores/_account_bridge.js', () => ({
-    useAccountBridge: () => ({
-        userId: null,
-        teamId: null,
-        teamSlug: null,
-        isTrialAccount: false
-    })
-}))
-
 vi.mock('@/api/team.js', () => ({
     default: {
         getTeam: vi.fn(),
diff --git a/test/unit/frontend/stores/product-assistant.spec.js b/test/unit/frontend/stores/product-assistant.spec.js
index ab7f0edc9c..f0ab9d63ac 100644
--- a/test/unit/frontend/stores/product-assistant.spec.js
+++ b/test/unit/frontend/stores/product-assistant.spec.js
@@ -10,6 +10,13 @@ vi.mock('@/services/messaging.service.js', () => ({
     })
 }))
 
+// account-auth.js imports routes.js which loads the full Vue component tree
+// (including AssetDetailDialog.vue → @flowfuse/flow-renderer CJS/ESM conflict).
+// context.js imports account-auth.js, so mock it here to avoid the error.
+vi.mock('@/stores/account-auth.js', () => ({
+    useAccountAuthStore: vi.fn(() => ({ user: null, pending: false }))
+}))
+
 // product-expert.js imports ExpertDrawer.vue which pulls in @flowfuse/flow-renderer
 // (CJS/ESM conflict). Mock it to keep the test environment clean.
 vi.mock('@/stores/product-expert.js', () => ({
diff --git a/test/unit/frontend/stores/product-brokers.spec.js b/test/unit/frontend/stores/product-brokers.spec.js
index 9352ba5550..780b871af0 100644
--- a/test/unit/frontend/stores/product-brokers.spec.js
+++ b/test/unit/frontend/stores/product-brokers.spec.js
@@ -1,17 +1,17 @@
 import { createPinia, setActivePinia } from 'pinia'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
-import * as bridge from '@/stores/_account_bridge.js'
+import { useContextStore } from '@/stores/context.js'
 import { useProductBrokersStore } from '@/stores/product-brokers.js'
 
-vi.mock('@/stores/_account_bridge.js', () => ({
-    useAccountBridge: vi.fn()
+vi.mock('@/stores/context.js', () => ({
+    useContextStore: vi.fn(() => ({ team: { id: 'team-1', slug: 'my-team' } }))
 }))
 
 describe('product-brokers store', () => {
     beforeEach(() => {
         setActivePinia(createPinia())
-        vi.spyOn(bridge, 'useAccountBridge').mockReturnValue({ team: { id: 'team-1', slug: 'my-team' } })
+        vi.mocked(useContextStore).mockReturnValue({ team: { id: 'team-1', slug: 'my-team' } })
     })
 
     describe('initial state', () => {
@@ -57,7 +57,7 @@ describe('product-brokers store', () => {
         })
 
         it('brokerExpandedTopics returns empty object when no team', () => {
-            vi.spyOn(bridge, 'useAccountBridge').mockReturnValue({ team: null })
+            vi.mocked(useContextStore).mockReturnValue({ team: null })
             const store = useProductBrokersStore()
             expect(store.brokerExpandedTopics('broker-1')).toEqual({})
         })
diff --git a/test/unit/frontend/stores/product-expert-insights-agent.spec.js b/test/unit/frontend/stores/product-expert-insights-agent.spec.js
index 09c68514ba..f51a50f698 100644
--- a/test/unit/frontend/stores/product-expert-insights-agent.spec.js
+++ b/test/unit/frontend/stores/product-expert-insights-agent.spec.js
@@ -3,8 +3,8 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 import { useProductExpertInsightsAgentStore } from '@/stores/product-expert-insights-agent.js'
 
-vi.mock('@/stores/_account_bridge.js', () => ({
-    useAccountBridge: vi.fn(() => ({ team: { id: 'team-1' } }))
+vi.mock('@/stores/context.js', () => ({
+    useContextStore: vi.fn(() => ({ team: { id: 'team-1' } }))
 }))
 
 vi.mock('@/api/expert.js', () => ({
diff --git a/test/unit/frontend/stores/product-expert.spec.js b/test/unit/frontend/stores/product-expert.spec.js
index 7a3be5a58c..3ccae5fa9a 100644
--- a/test/unit/frontend/stores/product-expert.spec.js
+++ b/test/unit/frontend/stores/product-expert.spec.js
@@ -3,12 +3,12 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 import { INSIGHTS_AGENT, SUPPORT_AGENT } from '@/stores/product-expert-agents.js'
 
-vi.mock('@/stores/_account_bridge.js', () => ({
-    useAccountBridge: vi.fn(() => ({ featuresCheck: { isExpertAssistantFeatureEnabled: true } }))
+vi.mock('@/stores/account-settings.js', () => ({
+    useAccountSettingsStore: vi.fn(() => ({ featuresCheck: { isExpertAssistantFeatureEnabled: true } }))
 }))
 
 vi.mock('@/stores/context.js', () => ({
-    useContextStore: vi.fn(() => ({ expert: {} }))
+    useContextStore: vi.fn(() => ({ team: null, expert: {} }))
 }))
 
 vi.mock('@/stores/product-assistant.js', () => ({
@@ -37,8 +37,6 @@ vi.mock('@/stores/ux-drawers.js', () => ({
 const { useProductExpertStore } = await import('@/stores/product-expert.js')
 const { useProductExpertSupportAgentStore } = await import('@/stores/product-expert-support-agent.js')
 const { useProductExpertInsightsAgentStore } = await import('@/stores/product-expert-insights-agent.js')
-const { useAccountBridge } = await import('@/stores/_account_bridge.js')
-
 describe('product-expert store', () => {
     beforeEach(() => {
         setActivePinia(createPinia())
@@ -290,8 +288,9 @@ describe('product-expert store', () => {
             expect(supportAgent.sessionId).toBeNull()
         })
 
-        it('setContext does nothing when feature is disabled', () => {
-            vi.mocked(useAccountBridge).mockReturnValueOnce({ featuresCheck: { isExpertAssistantFeatureEnabled: false } })
+        it('setContext does nothing when feature is disabled', async () => {
+            const { useAccountSettingsStore } = await import('@/stores/account-settings.js')
+            vi.mocked(useAccountSettingsStore).mockReturnValueOnce({ featuresCheck: { isExpertAssistantFeatureEnabled: false } })
             const store = useProductExpertStore()
             store.setContext({ data: { history: [] } })
             expect(store.shouldWakeUpAssistant).toBe(false)
diff --git a/test/unit/frontend/stores/product-tables.spec.js b/test/unit/frontend/stores/product-tables.spec.js
index 4f6bea5fa2..ab7710f055 100644
--- a/test/unit/frontend/stores/product-tables.spec.js
+++ b/test/unit/frontend/stores/product-tables.spec.js
@@ -1,8 +1,8 @@
 import { createPinia, setActivePinia } from 'pinia'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
-vi.mock('@/stores/_account_bridge.js', () => ({
-    useAccountBridge: vi.fn(() => ({ team: { id: 'team-1' } }))
+vi.mock('@/stores/context.js', () => ({
+    useContextStore: vi.fn(() => ({ team: { id: 'team-1' } }))
 }))
 
 vi.mock('@/api/tables.js', () => ({
diff --git a/test/unit/frontend/stores/ux-navigation.spec.js b/test/unit/frontend/stores/ux-navigation.spec.js
index ca6f0640b5..c3ab51146f 100644
--- a/test/unit/frontend/stores/ux-navigation.spec.js
+++ b/test/unit/frontend/stores/ux-navigation.spec.js
@@ -3,12 +3,17 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 import { useUxNavigationStore } from '@/stores/ux-navigation.js'
 
-// Prevent _account_bridge from importing the real Vuex store
-vi.mock('@/stores/_account_bridge.js', () => ({
-    useAccountBridge: vi.fn(() => ({
+vi.mock('@/stores/context.js', () => ({
+    useContextStore: vi.fn(() => ({
         team: null,
-        features: {},
         teamMembership: { role: 0 },
+        isTrialAccountExpired: false
+    }))
+}))
+
+vi.mock('@/stores/account-settings.js', () => ({
+    useAccountSettingsStore: vi.fn(() => ({
+        features: {},
         featuresCheck: {
             isBlueprintsFeatureEnabledForPlatform: true,
             isCertifiedNodesFeatureEnabledForPlatform: false,
@@ -25,8 +30,7 @@ vi.mock('@/stores/_account_bridge.js', () => ({
             isSharedLibraryFeatureEnabledForPlatform: true,
             isSharedLibraryFeatureEnabledForTeam: true
         },
-        requiresBilling: false,
-        isTrialAccountExpired: false
+        requiresBilling: false
     }))
 }))
 
@@ -127,15 +131,18 @@ describe('ux-navigation store', () => {
         })
 
         it('returns team entries when bridge provides a team', async () => {
-            const { useAccountBridge } = await import('@/stores/_account_bridge.js')
-            useAccountBridge.mockReturnValue({
+            const { useContextStore } = await import('@/stores/context.js')
+            const { useAccountSettingsStore } = await import('@/stores/account-settings.js')
+            vi.mocked(useContextStore).mockReturnValue({
                 team: TEAM_STUB,
-                features: {},
                 teamMembership: { role: 50 }, // Owner
-                featuresCheck: FEATURES_STUB,
-                requiresBilling: false,
                 isTrialAccountExpired: false
             })
+            vi.mocked(useAccountSettingsStore).mockReturnValue({
+                features: {},
+                featuresCheck: FEATURES_STUB,
+                requiresBilling: false
+            })
 
             const store = useUxNavigationStore()
             store.setMainNavContext('team')