diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 8bcbec0dae..9becf7d49f 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -63,7 +63,6 @@
 
 <script>
 import { mapActions, mapState } from 'pinia'
-import { mapState as mapVuexState } from 'vuex'
 
 import Loading from './components/Loading.vue'
 import Offline from './components/Offline.vue'
@@ -79,6 +78,7 @@ import TermsAndConditions from './pages/TermsAndConditions.vue'
 import UnverifiedEmail from './pages/UnverifiedEmail.vue'
 
 import { useAccountAuthStore } from '@/stores/account-auth.js'
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useContextStore } from '@/stores/context.js'
 import { useProductBrokersStore } from '@/stores/product-brokers.js'
 import { useUxDrawersStore } from '@/stores/ux-drawers.js'
@@ -104,7 +104,7 @@ export default {
         ...mapState(useUxDrawersStore, ['hiddenLeftDrawer']),
         ...mapState(useAccountAuthStore, ['user']),
         ...mapState(useUxLoadingStore, ['appLoader', 'offline']),
-        ...mapVuexState('account', ['settings']),
+        ...mapState(useAccountSettingsStore, ['settings']),
         loginRequired () {
             return this.$route.meta.requiresLogin !== false
         },
diff --git a/frontend/src/components/DevicesBrowser.vue b/frontend/src/components/DevicesBrowser.vue
index 4b96ce4e39..24d98e87ed 100644
--- a/frontend/src/components/DevicesBrowser.vue
+++ b/frontend/src/components/DevicesBrowser.vue
@@ -348,7 +348,6 @@ import { CogIcon, PlusSmIcon } from '@heroicons/vue/solid'
 
 import { mapActions, mapState } from 'pinia'
 import { markRaw } from 'vue'
-import { mapGetters } from 'vuex'
 
 import deviceApi from '../api/devices.js'
 import teamApi from '../api/team.js'
@@ -386,6 +385,7 @@ import DevicesStatusBar from './charts/DeviceStatusBar.vue'
 import AddDeviceToGroupDialog from './dialogs/device-group-management/AddDeviceToGroupDialog.vue'
 import RemoveDeviceFromGroupDialog from './dialogs/device-group-management/RemoveDeviceFromGroupDialog.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useContextStore } from '@/stores/context.js'
 import { useUxDialogStore } from '@/stores/ux-dialog.js'
 import { useUxToursStore } from '@/stores/ux-tours.js'
@@ -463,7 +463,7 @@ export default {
     },
     computed: {
         ...mapState(useContextStore, ['team']),
-        ...mapGetters('account', ['featuresCheck']),
+        ...mapState(useAccountSettingsStore, ['featuresCheck']),
         ...mapState(useUxDialogStore, ['dialog']),
         ...mapState(useUxToursStore, ['tours']),
         columns () {
diff --git a/frontend/src/components/PageHeader.vue b/frontend/src/components/PageHeader.vue
index 189c73a0e4..9acde41a33 100644
--- a/frontend/src/components/PageHeader.vue
+++ b/frontend/src/components/PageHeader.vue
@@ -104,7 +104,6 @@
 import { AcademicCapIcon, AdjustmentsIcon, CogIcon, CursorClickIcon, LogoutIcon, MenuIcon, PlusIcon, QuestionMarkCircleIcon, XIcon } from '@heroicons/vue/solid'
 import { mapActions, mapState } from 'pinia'
 import { ref } from 'vue'
-import { mapGetters } from 'vuex'
 
 import usePermissions from '../composables/Permissions.js'
 
@@ -120,6 +119,7 @@ import TeamSelection from './TeamSelection.vue'
 import GlobalSearch from './global-search/GlobalSearch.vue'
 
 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 { useUxDrawersStore } from '@/stores/ux-drawers.js'
@@ -136,7 +136,7 @@ export default {
         ...mapState(useAccountAuthStore, ['user']),
         ...mapState(useContextStore, ['team']),
         ...mapState(useAccountStore, ['teams', 'notifications', 'hasAvailableTeams', 'defaultUserTeam']),
-        ...mapGetters('account', ['canCreateTeam', 'featuresCheck']),
+        ...mapState(useAccountSettingsStore, ['canCreateTeam', 'featuresCheck']),
         navigationOptions () {
             return [
                 {
diff --git a/frontend/src/components/TeamSelection.vue b/frontend/src/components/TeamSelection.vue
index 2b7159e97b..33bcf11c26 100644
--- a/frontend/src/components/TeamSelection.vue
+++ b/frontend/src/components/TeamSelection.vue
@@ -43,12 +43,12 @@ import {
 } from '@headlessui/vue'
 import { PlusIcon, UserAddIcon } from '@heroicons/vue/solid'
 import { mapState } from 'pinia'
-import { mapGetters, mapState as mapVuexState } from 'vuex'
 
 import usePermissions from '../composables/Permissions.js'
 
 import NavItem from './NavItem.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useAccountStore } from '@/stores/account.js'
 import { useContextStore } from '@/stores/context.js'
 
@@ -67,8 +67,7 @@ export default {
     computed: {
         ...mapState(useContextStore, ['team']),
         ...mapState(useAccountStore, ['teams', 'hasAvailableTeams']),
-        ...mapVuexState('account', ['settings']),
-        ...mapGetters('account', ['canCreateTeam']),
+        ...mapState(useAccountSettingsStore, ['canCreateTeam']),
         teamOptions () {
             return [
                 ...this.teams.map(team => {
diff --git a/frontend/src/components/TeamTypeSelection.vue b/frontend/src/components/TeamTypeSelection.vue
index 423d986331..f4a3651cd1 100644
--- a/frontend/src/components/TeamTypeSelection.vue
+++ b/frontend/src/components/TeamTypeSelection.vue
@@ -20,12 +20,14 @@
 
 <script>
 
-import { mapGetters } from 'vuex'
+import { mapState } from 'pinia'
 
 import teamTypesApi from '../api/teamTypes.js'
 
 import TeamTypeTile from './TeamTypeTile.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
+
 export default {
     name: 'TeamTypeSelection',
     components: {
@@ -39,7 +41,7 @@ export default {
         }
     },
     computed: {
-        ...mapGetters('account', ['isBillingEnabled'])
+        ...mapState(useAccountSettingsStore, ['isBillingEnabled'])
     },
     async created () {
         const { types } = await teamTypesApi.getTeamTypes()
diff --git a/frontend/src/components/banners/LicenseBanner.vue b/frontend/src/components/banners/LicenseBanner.vue
index 706d5ac4d7..d991cded37 100644
--- a/frontend/src/components/banners/LicenseBanner.vue
+++ b/frontend/src/components/banners/LicenseBanner.vue
@@ -18,9 +18,9 @@
 import { ChevronRightIcon, ExclamationCircleIcon } from '@heroicons/vue/outline'
 
 import { mapState } from 'pinia'
-import { mapState as mapVuexState } from 'vuex'
 
 import { useAccountAuthStore } from '@/stores/account-auth.js'
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 
 export default {
     name: 'LicenseBanner',
@@ -29,7 +29,7 @@ export default {
         ChevronRightIcon
     },
     computed: {
-        ...mapVuexState('account', ['settings']),
+        ...mapState(useAccountSettingsStore, ['settings']),
         ...mapState(useAccountAuthStore, ['user']),
         license () {
             return this.settings.license || {}
diff --git a/frontend/src/components/drawers/expert/ExpertDrawer.vue b/frontend/src/components/drawers/expert/ExpertDrawer.vue
index 0903af7e8d..a7332f276d 100644
--- a/frontend/src/components/drawers/expert/ExpertDrawer.vue
+++ b/frontend/src/components/drawers/expert/ExpertDrawer.vue
@@ -43,11 +43,11 @@
 import { LockClosedIcon, LockOpenIcon, XIcon } from '@heroicons/vue/solid'
 
 import { mapActions, mapState } from 'pinia'
-import { mapState as mapVuexState } from 'vuex'
 
 import ToggleButtonGroup from '../../elements/ToggleButtonGroup.vue'
 import ExpertPanel from '../../expert/Expert.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useProductExpertStore } from '@/stores/product-expert.js'
 import { useUxDrawersStore } from '@/stores/ux-drawers.js'
 
@@ -64,7 +64,7 @@ export default {
     computed: {
         ...mapState(useUxDrawersStore, ['rightDrawer']),
         ...mapState(useProductExpertStore, ['agentMode']),
-        ...mapVuexState('account', ['features']),
+        ...mapState(useAccountSettingsStore, ['features']),
         agentModeButtons () {
             return [
                 { title: 'Support', value: 'support-agent' },
diff --git a/frontend/src/components/drawers/navigation/MainNav.vue b/frontend/src/components/drawers/navigation/MainNav.vue
index f381810deb..411a0eb922 100644
--- a/frontend/src/components/drawers/navigation/MainNav.vue
+++ b/frontend/src/components/drawers/navigation/MainNav.vue
@@ -30,7 +30,6 @@
 <script>
 import { ChevronLeftIcon } from '@heroicons/vue/outline'
 import { mapActions, mapState } from 'pinia'
-import { mapGetters, mapState as mapVuexState } from 'vuex'
 
 import NavItem from '../../NavItem.vue'
 
@@ -45,8 +44,6 @@ export default {
     computed: {
         ...mapState(useUxNavigationStore, ['mainNav', 'mainNavContext']),
         ...mapState(useContextStore, ['team']),
-        ...mapVuexState('account', ['features']),
-        ...mapGetters('account', ['requiresBilling']),
         nearestMetaMenu () {
             if (this.$route?.meta?.menu) {
                 return this.$route.meta.menu
diff --git a/frontend/src/components/expert/Expert.vue b/frontend/src/components/expert/Expert.vue
index ccf1d7b2c7..f40c17ab36 100644
--- a/frontend/src/components/expert/Expert.vue
+++ b/frontend/src/components/expert/Expert.vue
@@ -24,7 +24,6 @@
 
 <script>
 import { mapActions, mapState } from 'pinia'
-import { mapState as mapVuexState } from 'vuex'
 
 import ExpertChatInput from './components/ExpertChatInput.vue'
 import ExpertMessages from './components/ExpertMessages.vue'
@@ -32,6 +31,7 @@ import ExpertModeSwitcher from './components/ExpertModeSwitcher.vue'
 import InfoBanner from './components/InfoBanner.vue'
 import UpdateBanner from './components/UpdateBanner.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useProductAssistantStore } from '@/stores/product-assistant.js'
 import { useProductExpertInsightsAgentStore } from '@/stores/product-expert-insights-agent.js'
 import { useProductExpertStore } from '@/stores/product-expert.js'
@@ -80,7 +80,7 @@ export default {
         ...mapState(useUxDrawersStore, {
             isPinned: state => state.rightDrawer.fixed
         }),
-        ...mapVuexState('account', ['features']),
+        ...mapState(useAccountSettingsStore, ['features']),
         isEditorContext () {
             // In editor context, the route name includes 'editor'
             return this.$route?.name?.includes('editor') || false
diff --git a/frontend/src/components/multi-step-forms/instance/steps/DuplicationStep.vue b/frontend/src/components/multi-step-forms/instance/steps/DuplicationStep.vue
index ecdedc3e0c..abc5b60a0f 100644
--- a/frontend/src/components/multi-step-forms/instance/steps/DuplicationStep.vue
+++ b/frontend/src/components/multi-step-forms/instance/steps/DuplicationStep.vue
@@ -100,7 +100,6 @@
 <script>
 import { PencilIcon, RefreshIcon } from '@heroicons/vue/outline'
 import { mapState } from 'pinia'
-import { mapState as mapVuexState } from 'vuex'
 
 import billingApi from '../../../../api/billing.js'
 import instanceTypesApi from '../../../../api/instanceTypes.js'
@@ -118,6 +117,7 @@ import NameGenerator from '../../../../utils/name-generator/index.js'
 
 import FfLoading from '../../../Loading.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useContextStore } from '@/stores/context.js'
 
 export default {
@@ -178,7 +178,7 @@ export default {
         }
     },
     computed: {
-        ...mapVuexState('account', ['features']),
+        ...mapState(useAccountSettingsStore, ['features']),
         ...mapState(useContextStore, ['team']),
         isTrialProjectSelected () {
             //  - Team is in trial mode, and
diff --git a/frontend/src/components/multi-step-forms/instance/steps/InstanceStep.vue b/frontend/src/components/multi-step-forms/instance/steps/InstanceStep.vue
index 5bedcaa031..021ae2221d 100644
--- a/frontend/src/components/multi-step-forms/instance/steps/InstanceStep.vue
+++ b/frontend/src/components/multi-step-forms/instance/steps/InstanceStep.vue
@@ -127,7 +127,6 @@
 <script>
 import { CheckCircleIcon, RefreshIcon } from '@heroicons/vue/outline'
 import { mapState } from 'pinia'
-import { mapState as mapVuexState } from 'vuex'
 
 import billingApi from '../../../../api/billing.js'
 import instanceTypesApi from '../../../../api/instanceTypes.js'
@@ -147,6 +146,7 @@ import NameGenerator from '../../../../utils/name-generator/index.js'
 import Loading from '../../../Loading.vue'
 import FeatureUnavailableToTeam from '../../../banners/FeatureUnavailableToTeam.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useContextStore } from '@/stores/context.js'
 
 export default {
@@ -211,7 +211,7 @@ export default {
         }
     },
     computed: {
-        ...mapVuexState('account', ['features']),
+        ...mapState(useAccountSettingsStore, ['features']),
         ...mapState(useContextStore, ['team']),
         activeInstanceTypeCount () {
             return this.decoratedInstanceTypes.filter(instance => !instance.disabled).length
diff --git a/frontend/src/composables/Components/multi-step-forms/instance/InstanceFormHelper.js b/frontend/src/composables/Components/multi-step-forms/instance/InstanceFormHelper.js
index cf18b2fc33..7198fe2d87 100644
--- a/frontend/src/composables/Components/multi-step-forms/instance/InstanceFormHelper.js
+++ b/frontend/src/composables/Components/multi-step-forms/instance/InstanceFormHelper.js
@@ -1,16 +1,11 @@
-import { storeToRefs } from 'pinia'
-
-import store from '../../../../store/index.js'
 import { getTeamProperty } from '../../../TeamProperties.js'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useContextStore } from '@/stores/context.js'
 
 export function useInstanceFormHelper () {
-    const _store = store
-
     const teamRuntimeLimitReached = () => {
-        const { team: teamRef } = storeToRefs(useContextStore())
-        const team = teamRef.value
+        const team = useContextStore().team
         let teamTypeRuntimeLimit = getTeamProperty(team, 'runtimes.limit')
         const currentRuntimeCount = (team?.deviceCount ?? 0) + (team?.instanceCount ?? 0)
         if (team?.billing?.trial && !team?.billing?.active && getTeamProperty(team, 'trial.runtimesLimit')) {
@@ -20,8 +15,8 @@ export function useInstanceFormHelper () {
     }
 
     const decorateInstanceTypes = (instanceTypes) => {
-        const { team: teamRef } = storeToRefs(useContextStore())
-        const team = teamRef.value
+        const team = useContextStore().team
+        const features = useAccountSettingsStore().features
         // Do a first pass of the instance types to disable any not allowed for this team
         instanceTypes = instanceTypes.map(instanceType => {
             // Need to combine the projectType billing info with any overrides
@@ -51,8 +46,7 @@ export function useInstanceFormHelper () {
 
             return instanceType
         })
-
-        if (_store.state.account.features.billing) {
+        if (features.billing) {
         // With billing enabled, do a second pass through the instance types
         // to populate their billing info
             instanceTypes = instanceTypes.map(instanceType => {
diff --git a/frontend/src/layouts/Platform.vue b/frontend/src/layouts/Platform.vue
index 8938a4d778..05d614a960 100644
--- a/frontend/src/layouts/Platform.vue
+++ b/frontend/src/layouts/Platform.vue
@@ -63,7 +63,6 @@
 
 <script>
 import { mapActions, mapState } from 'pinia'
-import { mapGetters } from 'vuex'
 
 import InterviewPopup from '../components/InterviewPopup.vue'
 import PageHeader from '../components/PageHeader.vue'
@@ -73,6 +72,7 @@ import NoticeBanner from '../components/notices/NoticeBanner.vue'
 import AlertsMixin from '../mixins/Alerts.js'
 import dialogService from '../services/dialog.js'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useProductBrokersStore } from '@/stores/product-brokers.js'
 import { useUxDialogStore } from '@/stores/ux-dialog.js'
 import { useUxStore } from '@/stores/ux.js'
@@ -91,7 +91,7 @@ export default {
         ...mapState(useUxDialogStore, ['dialog']),
         ...mapState(useUxStore, ['overlay']),
         ...mapState(useProductBrokersStore, ['interview']),
-        ...mapGetters('account', ['hasAvailableTeams'])
+        ...mapState(useAccountSettingsStore, ['hasAvailableTeams'])
     },
     watch: {
         $route: function () {
diff --git a/frontend/src/mixins/Features.js b/frontend/src/mixins/Features.js
deleted file mode 100644
index a5eb720ee9..0000000000
--- a/frontend/src/mixins/Features.js
+++ /dev/null
@@ -1,91 +0,0 @@
-import { mapGetters, mapState } from 'vuex'
-
-export default {
-    // todo The account store's featuresCheck getter should be used instead of this mixin
-    //  Currently keeping it for backwards compat, as all permissions checks should use the accounts featuresCheck getter
-    computed: {
-        ...mapState('account', ['features']),
-        ...mapGetters('account', ['featuresCheck']),
-        isSharedLibraryFeatureEnabledForTeam () {
-            return this.featuresCheck.isSharedLibraryFeatureEnabledForTeam
-        },
-        isSharedLibraryFeatureEnabledForPlatform () {
-            return this.featuresCheck.isSharedLibraryFeatureEnabledForPlatform
-        },
-        isSharedLibraryFeatureEnabled () {
-            return this.featuresCheck.isSharedLibraryFeatureEnabled
-        },
-        isBlueprintsFeatureEnabledForTeam () {
-            return this.featuresCheck.isBlueprintsFeatureEnabledForTeam
-        },
-        isBlueprintsFeatureEnabledForPlatform () {
-            return this.featuresCheck.isBlueprintsFeatureEnabledForPlatform
-        },
-        isBlueprintsFeatureEnabled () {
-            return this.featuresCheck.isBlueprintsFeatureEnabled
-        },
-        isCustomCatalogsFeatureEnabledForPlatform () {
-            return this.featuresCheck.isCustomCatalogsFeatureEnabledForPlatform
-        },
-        isCustomCatalogsFeatureEnabledForTeam () {
-            return this.featuresCheck.isCustomCatalogsFeatureEnabledForTeam
-        },
-        isCustomCatalogsFeatureEnabled () {
-            return this.featuresCheck.isCustomCatalogsFeatureEnabled
-        },
-        isStaticAssetFeatureEnabledForPlatform () {
-            return this.featuresCheck.isStaticAssetFeatureEnabledForPlatform
-        },
-        isStaticAssetsFeatureEnabledForTeam () {
-            return this.featuresCheck.isStaticAssetsFeatureEnabledForTeam
-        },
-        isStaticAssetFeatureEnabled () {
-            return this.featuresCheck.isStaticAssetFeatureEnabled
-        },
-        isHTTPBearerTokensFeatureEnabledForPlatform () {
-            return this.featuresCheck.isHTTPBearerTokensFeatureEnabledForPlatform
-        },
-        isHTTPBearerTokensFeatureEnabledForTeam () {
-            return this.featuresCheck.isHTTPBearerTokensFeatureEnabledForTeam
-        },
-        isHTTPBearerTokensFeatureEnabled () {
-            return this.featuresCheck.isHTTPBearerTokensFeatureEnabled
-        },
-        isBOMFeatureEnabledForPlatform () {
-            return this.featuresCheck.isBOMFeatureEnabledForPlatform
-        },
-        isBOMFeatureEnabledForTeam () {
-            return this.featuresCheck.isBOMFeatureEnabledForTeam
-        },
-        isBOMFeatureEnabled () {
-            return this.featuresCheck.isBOMFeatureEnabled
-        },
-        isTimelineFeatureEnabledForPlatform () {
-            return this.featuresCheck.isTimelineFeatureEnabledForPlatform
-        },
-        isTimelineFeatureEnabledForTeam () {
-            return this.featuresCheck.isTimelineFeatureEnabledForTeam
-        },
-        isTimelineFeatureEnabled () {
-            return this.featuresCheck.isTimelineFeatureEnabled
-        },
-        isMqttBrokerFeatureEnabledForPlatform () {
-            return this.featuresCheck.isMqttBrokerFeatureEnabledForPlatform
-        },
-        isMqttBrokerFeatureEnabledForTeam () {
-            return this.featuresCheck.isMqttBrokerFeatureEnabledForTeam
-        },
-        isMqttBrokerFeatureEnabled () {
-            return this.featuresCheck.isMqttBrokerFeatureEnabled
-        },
-        isInstanceResourcesFeatureEnabledForPlatform () {
-            return this.featuresCheck.isInstanceResourcesFeatureEnabledForPlatform
-        },
-        isInstanceResourcesFeatureEnabledForTeam () {
-            return this.featuresCheck.isInstanceResourcesFeatureEnabledForTeam
-        },
-        isInstanceAutoStackUpdateFeatureEnabledForPlatform () {
-            return this.featuresCheck.isInstanceAutoStackUpdateFeatureEnabledForPlatform
-        }
-    }
-}
diff --git a/frontend/src/pages/Home.vue b/frontend/src/pages/Home.vue
index 0b8aaba147..e10b44c90a 100644
--- a/frontend/src/pages/Home.vue
+++ b/frontend/src/pages/Home.vue
@@ -38,7 +38,6 @@
 <script>
 
 import { mapState } from 'pinia'
-import { mapState as mapVuexState } from 'vuex'
 
 import EmptyState from '../components/EmptyState.vue'
 
@@ -47,6 +46,7 @@ import FlowFuseLogo from '../components/Logo.vue'
 import TeamTypeSelection from '../components/TeamTypeSelection.vue'
 
 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 { useUxLoadingStore } from '@/stores/ux-loading.js'
@@ -66,7 +66,7 @@ export default {
     computed: {
         ...mapState(useContextStore, ['team']),
         ...mapState(useAccountStore, ['teams', 'defaultUserTeam']),
-        ...mapVuexState('account', ['settings']),
+        ...mapState(useAccountSettingsStore, ['settings']),
         ...mapState(useAccountAuthStore, ['user', 'redirectUrlAfterLogin']),
         ...mapState(useUxLoadingStore, ['appLoader']),
         canCreateTeam () {
diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue
index bc6b30951f..98cc650c21 100644
--- a/frontend/src/pages/Login.vue
+++ b/frontend/src/pages/Login.vue
@@ -89,8 +89,6 @@
 import { mapState } from 'pinia'
 import { GoogleLogin } from 'vue3-google-login'
 
-import { mapState as mapVuexState } from 'vuex'
-
 import SSOApi from '../api/sso.js'
 import Logo from '../components/Logo.vue'
 import SpinnerIcon from '../components/icons/Spinner.js'
@@ -98,6 +96,7 @@ import SpinnerIcon from '../components/icons/Spinner.js'
 import FFLayoutBox from '../layouts/Box.vue'
 
 import { useAccountAuthStore } from '@/stores/account-auth.js'
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useUxLoadingStore } from '@/stores/ux-loading.js'
 
 export default {
@@ -128,9 +127,9 @@ export default {
         }
     },
     computed: {
-        ...mapVuexState('account', ['settings']),
-        ...mapState(useAccountAuthStore, ['loginError', 'redirectUrlAfterLogin']),
+        ...mapState(useAccountSettingsStore, ['settings']),
         ...mapState(useUxLoadingStore, ['appLoader']),
+        ...mapState(useAccountAuthStore, ['loginError', 'redirectUrlAfterLogin']),
         tokenInvalid () {
             return this.mfaRequired && !/^\d{6}$/.test(this.input.token)
         },
diff --git a/frontend/src/pages/TermsAndConditions.vue b/frontend/src/pages/TermsAndConditions.vue
index 4fef191e99..38e45c64e7 100644
--- a/frontend/src/pages/TermsAndConditions.vue
+++ b/frontend/src/pages/TermsAndConditions.vue
@@ -18,13 +18,13 @@
 
 <script>
 import { mapState } from 'pinia'
-import { mapState as mapVuexState } from 'vuex'
 
 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'
 
 export default {
     name: 'TermsAndConditions',
@@ -38,7 +38,7 @@ export default {
         }
     },
     computed: {
-        ...mapVuexState('account', ['settings']),
+        ...mapState(useAccountSettingsStore, ['settings']),
         ...mapState(useAccountAuthStore, ['user'])
     },
     methods: {
diff --git a/frontend/src/pages/account/Create.vue b/frontend/src/pages/account/Create.vue
index abde020c3a..21e5f6da4a 100644
--- a/frontend/src/pages/account/Create.vue
+++ b/frontend/src/pages/account/Create.vue
@@ -65,8 +65,8 @@
 
 <script>
 
+import { mapState } from 'pinia'
 import { useRoute } from 'vue-router'
-import { mapState as mapVuexState } from 'vuex'
 
 import userApi from '../../api/user.js'
 
@@ -74,6 +74,7 @@ import SpinnerIcon from '../../components/icons/Spinner.js'
 import FFLayoutBox from '../../layouts/Box.vue'
 
 import { useAccountAuthStore } from '@/stores/account-auth.js'
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 
 let zxcvbn
 
@@ -123,7 +124,7 @@ export default {
         }
     },
     computed: {
-        ...mapVuexState('account', ['settings']),
+        ...mapState(useAccountSettingsStore, ['settings']),
         splash () {
             return this.settings['branding:account:signUpLeftBanner']
         },
diff --git a/frontend/src/pages/account/ForgotPassword.vue b/frontend/src/pages/account/ForgotPassword.vue
index ccd55de6a8..d596666561 100644
--- a/frontend/src/pages/account/ForgotPassword.vue
+++ b/frontend/src/pages/account/ForgotPassword.vue
@@ -17,7 +17,6 @@
 
 <script>
 import { mapState } from 'pinia'
-import { mapState as mapVuexState } from 'vuex'
 
 import userApi from '../../api/user.js'
 import FormRow from '../../components/FormRow.vue'
@@ -47,7 +46,6 @@ export default {
         }
     },
     computed: {
-        ...mapVuexState('account', ['settings']),
         ...mapState(useUxLoadingStore, ['appLoader'])
     },
     methods: {
diff --git a/frontend/src/pages/account/PasswordReset.vue b/frontend/src/pages/account/PasswordReset.vue
index 72ea3def14..68da8873d4 100644
--- a/frontend/src/pages/account/PasswordReset.vue
+++ b/frontend/src/pages/account/PasswordReset.vue
@@ -18,7 +18,6 @@
 
 <script>
 import { mapState } from 'pinia'
-import { mapState as mapVuexState } from 'vuex'
 
 import userApi from '../../api/user.js'
 import FormRow from '../../components/FormRow.vue'
@@ -50,7 +49,6 @@ export default {
         }
     },
     computed: {
-        ...mapVuexState('account', ['settings']),
         ...mapState(useUxLoadingStore, ['appLoader']),
         formValid () {
             return this.input.password &&
diff --git a/frontend/src/pages/account/Security.vue b/frontend/src/pages/account/Security.vue
index 4788235002..8be35c2a39 100644
--- a/frontend/src/pages/account/Security.vue
+++ b/frontend/src/pages/account/Security.vue
@@ -9,18 +9,19 @@
 
 <script>
 
-import { mapState as mapVuexState } from 'vuex'
+import { mapState } from 'pinia'
 
 import SectionSideMenu from '../../components/SectionSideMenu.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
+
 export default {
     name: 'AccountSecurity',
     components: {
         SectionSideMenu
     },
     computed: {
-        ...mapVuexState('account', ['features']),
-
+        ...mapState(useAccountSettingsStore, ['features']),
         sideNavigation () {
             const navigation = [
                 { name: 'Password', path: '/account/security/password' },
diff --git a/frontend/src/pages/account/Security/MultiFactorAuth.vue b/frontend/src/pages/account/Security/MultiFactorAuth.vue
index 3cfbc180ab..123187b222 100644
--- a/frontend/src/pages/account/Security/MultiFactorAuth.vue
+++ b/frontend/src/pages/account/Security/MultiFactorAuth.vue
@@ -23,7 +23,6 @@
 
 <script>
 import { mapState } from 'pinia'
-import { mapState as mapVuexState } from 'vuex'
 
 import userApi from '../../../api/user.js'
 import FormHeading from '../../../components/FormHeading.vue'
@@ -46,7 +45,6 @@ export default {
         }
     },
     computed: {
-        ...mapVuexState('account', ['features']),
         ...mapState(useAccountAuthStore, ['user'])
     },
     methods: {
diff --git a/frontend/src/pages/account/Settings.vue b/frontend/src/pages/account/Settings.vue
index 1a92eb49ff..0f02ded4c6 100644
--- a/frontend/src/pages/account/Settings.vue
+++ b/frontend/src/pages/account/Settings.vue
@@ -51,8 +51,7 @@
 </template>
 
 <script>
-import { mapState, storeToRefs } from 'pinia'
-import { mapState as mapVuexState } from 'vuex'
+import { mapState } from 'pinia'
 
 import teamApi from '../../api/team.js'
 import userApi from '../../api/user.js'
@@ -64,6 +63,7 @@ import dialog from '../../services/dialog.js'
 import { RoleNames, Roles } from '../../utils/roles.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'
 
@@ -94,7 +94,7 @@ export default {
         }
     },
     computed: {
-        ...mapVuexState('account', ['settings']),
+        ...mapState(useAccountSettingsStore, ['settings']),
         ...mapState(useAccountStore, { storeTeams: 'teams' }),
         formValid () {
             return (this.changed.name || this.changed.username || this.changed.email || this.changed.defaultTeam) &&
@@ -299,13 +299,13 @@ export default {
                         // refresh teams
                         return useAccountStore().refreshTeams()
                     }).then(() => {
-                        const { teams } = storeToRefs(useAccountStore())
+                        const teams = useAccountStore().teams
                         const team = useContextStore().team
                         // check if the active team is one deleted
                         if (team?.id === teamId) {
-                            if (teams.value.length > 0) {
+                            if (teams.length > 0) {
                                 // get another team
-                                useAccountStore().setTeam(teams.value[0].slug)
+                                useAccountStore().setTeam(teams[0].slug)
                             }
                         }
                     }).catch(err => {
diff --git a/frontend/src/pages/account/Teams/Teams.vue b/frontend/src/pages/account/Teams/Teams.vue
index 6a55fc0682..b90dc7f55b 100644
--- a/frontend/src/pages/account/Teams/Teams.vue
+++ b/frontend/src/pages/account/Teams/Teams.vue
@@ -12,8 +12,6 @@
 import { mapState } from 'pinia'
 import { markRaw } from 'vue'
 
-import { mapState as mapVuexState } from 'vuex'
-
 import teamApi from '../../../api/team.js'
 
 import TeamCell from '../../../components/tables/cells/TeamCell.vue'
@@ -22,6 +20,7 @@ import Dialog from '../../../services/dialog.js'
 import CreateTeamButton from '../components/CreateTeamButton.vue'
 
 import { useAccountAuthStore } from '@/stores/account-auth.js'
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useAccountStore } from '@/stores/account.js'
 
 export default {
@@ -41,7 +40,7 @@ export default {
     },
     computed: {
         ...mapState(useAccountStore, ['teams']),
-        ...mapVuexState('account', ['settings']),
+        ...mapState(useAccountSettingsStore, ['settings']),
         ...mapState(useAccountAuthStore, ['user']),
         teamCount () {
             return this.teams ? this.teams.length : 0
diff --git a/frontend/src/pages/admin/CertifiedNodes/index.vue b/frontend/src/pages/admin/CertifiedNodes/index.vue
index 4121fdc157..ed8fe35199 100644
--- a/frontend/src/pages/admin/CertifiedNodes/index.vue
+++ b/frontend/src/pages/admin/CertifiedNodes/index.vue
@@ -20,12 +20,14 @@
 </template>
 
 <script>
-import { mapActions, mapState } from 'vuex'
+import { mapActions, mapState } from 'pinia'
 
 import settingsApi from '../../../api/settings.js'
 import FormRow from '../../../components/FormRow.vue'
 import Alerts from '../../../services/alerts.js'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
+
 export default {
     name: 'AdminCertifiedNodes',
     components: {
@@ -44,7 +46,7 @@ export default {
         }
     },
     computed: {
-        ...mapState('account', ['features', 'settings']),
+        ...mapState(useAccountSettingsStore, ['settings']),
         sideNavigation () {
             return []
         },
@@ -61,7 +63,7 @@ export default {
         }
     },
     methods: {
-        ...mapActions('account', ['refreshSettings']),
+        ...mapActions(useAccountSettingsStore, ['refreshSettings']),
         async saveChanges () {
             this.loading = true
             const options = {
diff --git a/frontend/src/pages/admin/FlowBlueprints/index.vue b/frontend/src/pages/admin/FlowBlueprints/index.vue
index 90546d230e..b5a1d0e767 100644
--- a/frontend/src/pages/admin/FlowBlueprints/index.vue
+++ b/frontend/src/pages/admin/FlowBlueprints/index.vue
@@ -63,9 +63,9 @@
 
 <script>
 import { DownloadIcon, PlusSmIcon, UploadIcon } from '@heroicons/vue/outline'
-import { markRaw } from 'vue'
 
-import { mapState } from 'vuex'
+import { mapState } from 'pinia'
+import { markRaw } from 'vue'
 
 import FlowBlueprintsApi from '../../../api/flowBlueprints.js'
 import teamTypesApi from '../../../api/teamTypes.js'
@@ -82,6 +82,8 @@ import Dialog from '../../../services/dialog.js'
 import FlowBlueprintFormDialog from './dialogs/FlowBlueprintFormDialog.vue'
 import ImportFlowBlueprintsDialog from './dialogs/ImportFlowBlueprintsDialog.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
+
 const marked = require('marked')
 
 export default {
@@ -109,7 +111,7 @@ export default {
         }
     },
     computed: {
-        ...mapState('account', ['features', 'settings']),
+        ...mapState(useAccountSettingsStore, ['features']),
         flowBlueprintsArray () {
             return Array.from(this.flowBlueprints.values()).map((fb) => {
                 fb.htmlDescription = marked.parse(fb.description)
diff --git a/frontend/src/pages/admin/InstanceTypes/dialogs/InstanceTypeEditDialog.vue b/frontend/src/pages/admin/InstanceTypes/dialogs/InstanceTypeEditDialog.vue
index ee09df7d9f..f32f06653f 100644
--- a/frontend/src/pages/admin/InstanceTypes/dialogs/InstanceTypeEditDialog.vue
+++ b/frontend/src/pages/admin/InstanceTypes/dialogs/InstanceTypeEditDialog.vue
@@ -38,7 +38,7 @@
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import { mapState } from 'pinia'
 
 import instanceTypesApi from '../../../../api/instanceTypes.js'
 import stacksApi from '../../../../api/stacks.js'
@@ -46,6 +46,8 @@ import stacksApi from '../../../../api/stacks.js'
 import FormHeading from '../../../../components/FormHeading.vue'
 import FormRow from '../../../../components/FormRow.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
+
 export default {
     name: 'AdminInstanceTypeCreateDialog',
     components: {
@@ -102,7 +104,7 @@ export default {
         }
     },
     computed: {
-        ...mapState('account', ['features']),
+        ...mapState(useAccountSettingsStore, ['features']),
         formValid () {
             return (this.input.name)
         },
diff --git a/frontend/src/pages/admin/InstanceTypes/index.vue b/frontend/src/pages/admin/InstanceTypes/index.vue
index 2427a820a4..fe033e938f 100644
--- a/frontend/src/pages/admin/InstanceTypes/index.vue
+++ b/frontend/src/pages/admin/InstanceTypes/index.vue
@@ -50,8 +50,6 @@
 import { PlusSmIcon } from '@heroicons/vue/outline'
 import { markRaw } from 'vue'
 
-import { mapState } from 'vuex'
-
 import instanceTypesApi from '../../../api/instanceTypes.js'
 import SectionTopMenu from '../../../components/SectionTopMenu.vue'
 
@@ -85,7 +83,6 @@ export default {
         }
     },
     computed: {
-        ...mapState('account', ['settings']),
         activeInstanceTypes () {
             const types = this.instanceTypes.filter(pt => pt.active)
             return types
diff --git a/frontend/src/pages/admin/NotificationsHub.vue b/frontend/src/pages/admin/NotificationsHub.vue
index 0cc431f9f4..51cec01a39 100644
--- a/frontend/src/pages/admin/NotificationsHub.vue
+++ b/frontend/src/pages/admin/NotificationsHub.vue
@@ -80,7 +80,7 @@
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import { mapState } from 'pinia'
 
 import adminApi from '../../api/admin.js'
 import teamTypesApi from '../../api/teamTypes.js'
@@ -92,6 +92,9 @@ import alerts from '../../services/alerts.js'
 import Dialog from '../../services/dialog.js'
 import FfButton from '../../ui-components/components/Button.vue'
 import { RoleNames, Roles } from '../../utils/roles.js'
+
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
+
 export default {
     name: 'NotificationsHub',
     components: { FfButton, FormRow, FormHeading },
@@ -119,7 +122,7 @@ export default {
         }
     },
     computed: {
-        ...mapState('account', ['features']),
+        ...mapState(useAccountSettingsStore, ['features']),
         roleIds () {
             return Object.values(RoleNames).filter(r => r !== 'none').reverse().map(r => r[0].toUpperCase() + r.substring(1))
         },
diff --git a/frontend/src/pages/admin/Settings/Email.vue b/frontend/src/pages/admin/Settings/Email.vue
index 026da35fca..a00fdd193e 100644
--- a/frontend/src/pages/admin/Settings/Email.vue
+++ b/frontend/src/pages/admin/Settings/Email.vue
@@ -17,16 +17,19 @@
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import { mapState } from 'pinia'
 
 import FormHeading from '../../../components/FormHeading.vue'
+
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
+
 export default {
     name: 'AdminSettingsEmail',
     components: {
         FormHeading
     },
     computed: {
-        ...mapState('account', ['settings'])
+        ...mapState(useAccountSettingsStore, ['settings'])
     }
 }
 </script>
diff --git a/frontend/src/pages/admin/Settings/General.vue b/frontend/src/pages/admin/Settings/General.vue
index 7a84f10b4f..7b1cd110db 100644
--- a/frontend/src/pages/admin/Settings/General.vue
+++ b/frontend/src/pages/admin/Settings/General.vue
@@ -209,7 +209,7 @@
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import { mapActions, mapState } from 'pinia'
 
 import adminApi from '../../../api/admin.js'
 import instanceTypesApi from '../../../api/instanceTypes.js'
@@ -221,6 +221,8 @@ import { isValidURL } from '../../../composables/strings/String.js'
 import Alerts from '../../../services/alerts.js'
 import Dialog from '../../../services/dialog.js'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
+
 const validSettings = [
     'user:signup',
     'user:reset-password',
@@ -270,7 +272,7 @@ export default {
         }
     },
     computed: {
-        ...mapState('account', ['features', 'settings']),
+        ...mapState(useAccountSettingsStore, ['features', 'settings']),
         isLicensed () {
             return !!this.settings['platform:licensed']
         },
@@ -393,6 +395,7 @@ export default {
         }
     },
     methods: {
+        ...mapActions(useAccountSettingsStore, ['refreshSettings']),
         validate () {
             if (this.input['user:tcs-required']) {
                 const url = this.input['user:tcs-url'] || ''
@@ -451,7 +454,7 @@ export default {
             }
             settingsApi.updateSettings(options)
                 .then(() => {
-                    this.$store.dispatch('account/refreshSettings')
+                    this.refreshSettings()
                     this.input['user:tcs-date'] = this.settings['user:tcs-date']
                     Alerts.emit('Settings changed successfully.', 'confirmation')
                 })
@@ -480,7 +483,7 @@ export default {
                 options['user:tcs-updated'] = true
                 try {
                     await settingsApi.updateSettings(options)
-                    this.$store.dispatch('account/refreshSettings')
+                    this.refreshSettings()
                     Alerts.emit('Terms and Conditions update success', 'info', 5000)
                 } catch (error) {
                     console.warn(error)
diff --git a/frontend/src/pages/admin/Settings/License.vue b/frontend/src/pages/admin/Settings/License.vue
index 8277a79a59..57a518909a 100644
--- a/frontend/src/pages/admin/Settings/License.vue
+++ b/frontend/src/pages/admin/Settings/License.vue
@@ -59,10 +59,14 @@
 </template>
 
 <script>
+import { mapActions } from 'pinia'
+
 import adminApi from '../../../api/admin.js'
 import FormHeading from '../../../components/FormHeading.vue'
 import FormRow from '../../../components/FormRow.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
+
 export default {
     name: 'AdminSettingsLicense',
     components: {
@@ -105,6 +109,7 @@ export default {
         this.license = await adminApi.getLicenseDetails()
     },
     methods: {
+        ...mapActions(useAccountSettingsStore, ['refreshSettings']),
         editLicense () {
             this.input.license = ''
             this.editing.license = true
@@ -136,7 +141,7 @@ export default {
                     license: this.input.license,
                     action: 'apply'
                 })
-                this.$store.dispatch('account/refreshSettings')
+                this.refreshSettings()
                 this.cancelEditLicense()
                 this.loading.updating = false
             } catch (err) {
diff --git a/frontend/src/pages/admin/Settings/SSO/createEditProvider.vue b/frontend/src/pages/admin/Settings/SSO/createEditProvider.vue
index ccdbf265dd..05cd349f68 100644
--- a/frontend/src/pages/admin/Settings/SSO/createEditProvider.vue
+++ b/frontend/src/pages/admin/Settings/SSO/createEditProvider.vue
@@ -152,13 +152,15 @@
 
 <script>
 import { ChevronLeftIcon } from '@heroicons/vue/solid'
-import { mapState } from 'vuex'
+import { mapState } from 'pinia'
 
 import ssoApi from '../../../../api/sso.js'
 import FormHeading from '../../../../components/FormHeading.vue'
 import FormRow from '../../../../components/FormRow.vue'
 import Alerts from '../../../../services/alerts.js'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
+
 export default {
     name: 'AdminEditSSOProvider',
     components: {
@@ -197,7 +199,7 @@ export default {
         }
     },
     computed: {
-        ...mapState('account', ['features', 'settings']),
+        ...mapState(useAccountSettingsStore, ['features', 'settings']),
         isCreate () {
             return this.$route.params.id === 'create'
         },
diff --git a/frontend/src/pages/admin/Settings/SSO/index.vue b/frontend/src/pages/admin/Settings/SSO/index.vue
index ec58c1e02b..30c6a8e674 100644
--- a/frontend/src/pages/admin/Settings/SSO/index.vue
+++ b/frontend/src/pages/admin/Settings/SSO/index.vue
@@ -25,7 +25,7 @@
 
 <script>
 import { PlusSmIcon } from '@heroicons/vue/outline'
-import { mapState } from 'vuex'
+import { mapState } from 'pinia'
 
 import ssoApi from '../../../../api/sso.js'
 import FormHeading from '../../../../components/FormHeading.vue'
@@ -33,6 +33,8 @@ import FormHeading from '../../../../components/FormHeading.vue'
 import Alerts from '../../../../services/alerts.js'
 import Dialog from '../../../../services/dialog.js'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
+
 export default {
     name: 'AdminSettingsSSO',
     components: {
@@ -47,7 +49,7 @@ export default {
         }
     },
     computed: {
-        ...mapState('account', ['features', 'settings']),
+        ...mapState(useAccountSettingsStore, ['features']),
         providerColumns () {
             return [
                 { label: 'Active', key: 'active', class: ['w-16'] },
diff --git a/frontend/src/pages/admin/Settings/index.vue b/frontend/src/pages/admin/Settings/index.vue
index 83a1c2b0f8..0fab23a455 100644
--- a/frontend/src/pages/admin/Settings/index.vue
+++ b/frontend/src/pages/admin/Settings/index.vue
@@ -10,12 +10,14 @@
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import { mapState } from 'pinia'
+
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 
 export default {
     name: 'AdminSettings',
     computed: {
-        ...mapState('account', ['features']),
+        ...mapState(useAccountSettingsStore, ['features']),
         sideNavigation () {
             return [
                 { label: 'General', to: { name: 'admin-settings-general' }, tag: 'general' },
diff --git a/frontend/src/pages/admin/Stacks/components/StackPropertiesCell.vue b/frontend/src/pages/admin/Stacks/components/StackPropertiesCell.vue
index df7966dfc9..a4d553286b 100644
--- a/frontend/src/pages/admin/Stacks/components/StackPropertiesCell.vue
+++ b/frontend/src/pages/admin/Stacks/components/StackPropertiesCell.vue
@@ -8,7 +8,9 @@
 </template>
 <script>
 
-import { mapState } from 'vuex'
+import { mapState } from 'pinia'
+
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 
 export default {
     name: 'StackPropertiesCell',
@@ -19,7 +21,7 @@ export default {
         }
     },
     computed: {
-        ...mapState('account', ['settings'])
+        ...mapState(useAccountSettingsStore, ['settings'])
     }
 }
 </script>
diff --git a/frontend/src/pages/admin/Stacks/dialogs/AdminStackEditDialog.vue b/frontend/src/pages/admin/Stacks/dialogs/AdminStackEditDialog.vue
index a210406b99..b85394d82c 100644
--- a/frontend/src/pages/admin/Stacks/dialogs/AdminStackEditDialog.vue
+++ b/frontend/src/pages/admin/Stacks/dialogs/AdminStackEditDialog.vue
@@ -42,7 +42,7 @@
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import { mapState } from 'pinia'
 
 import instanceTypesApi from '../../../../api/instanceTypes.js'
 import stacksApi from '../../../../api/stacks.js'
@@ -51,6 +51,8 @@ import FormRow from '../../../../components/FormRow.vue'
 
 import Alerts from '../../../../services/alerts.js'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
+
 export default {
     name: 'AdminStackCreateDialog',
     components: {
@@ -131,7 +133,7 @@ export default {
         }
     },
     computed: {
-        ...mapState('account', ['settings']),
+        ...mapState(useAccountSettingsStore, ['settings']),
         dialogTitle () {
             if (this.stack) {
                 return 'Update stack'
diff --git a/frontend/src/pages/admin/Stacks/index.vue b/frontend/src/pages/admin/Stacks/index.vue
index 5edd907259..da33d06a0b 100644
--- a/frontend/src/pages/admin/Stacks/index.vue
+++ b/frontend/src/pages/admin/Stacks/index.vue
@@ -61,8 +61,6 @@
 import { DesktopComputerIcon, PlusSmIcon } from '@heroicons/vue/outline'
 import { markRaw } from 'vue'
 
-import { mapState } from 'vuex'
-
 import instanceTypesApi from '../../../api/instanceTypes.js'
 import stacksApi from '../../../api/stacks.js'
 
@@ -130,7 +128,6 @@ export default {
         }
     },
     computed: {
-        ...mapState('account', ['settings']),
         stacksArray () {
             return Array.from(this.allStacks.values())
         },
diff --git a/frontend/src/pages/admin/TeamTypes/dialogs/TeamTypeEditDialog.vue b/frontend/src/pages/admin/TeamTypes/dialogs/TeamTypeEditDialog.vue
index 1bd1bb18f5..6842974da5 100644
--- a/frontend/src/pages/admin/TeamTypes/dialogs/TeamTypeEditDialog.vue
+++ b/frontend/src/pages/admin/TeamTypes/dialogs/TeamTypeEditDialog.vue
@@ -196,7 +196,7 @@
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import { mapState } from 'pinia'
 
 import { featureList, featureNames } from '../../../../../../forge/lib/features.js'
 import instanceTypesApi from '../../../../api/instanceTypes.js'
@@ -205,6 +205,8 @@ import teamTypesApi from '../../../../api/teamTypes.js'
 import FormHeading from '../../../../components/FormHeading.vue'
 import FormRow from '../../../../components/FormRow.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
+
 const days = ['sun', 'mon', 'tue', 'wed', 'thur', 'fri', 'sat']
 const hours = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23]
 
@@ -416,7 +418,7 @@ export default {
         }
     },
     computed: {
-        ...mapState('account', ['features']),
+        ...mapState(useAccountSettingsStore, ['features']),
         formValid () {
             return (this.input.name)
         },
diff --git a/frontend/src/pages/admin/Teams.vue b/frontend/src/pages/admin/Teams.vue
index 42aca6efb0..9fcb5e12d6 100644
--- a/frontend/src/pages/admin/Teams.vue
+++ b/frontend/src/pages/admin/Teams.vue
@@ -61,8 +61,8 @@
 </template>
 
 <script>
+import { mapState } from 'pinia'
 import { markRaw } from 'vue'
-import { mapState } from 'vuex'
 
 import teamTypesApi from '../../api/teamTypes.js'
 import teamsApi from '../../api/teams.js'
@@ -74,6 +74,7 @@ import SectionTopMenu from '../../components/SectionTopMenu.vue'
 import TeamCell from '../../components/tables/cells/TeamCell.vue'
 import TeamTypeCell from '../../components/tables/cells/TeamTypeCell.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useAccountStore } from '@/stores/account.js'
 
 export default {
@@ -112,7 +113,7 @@ export default {
         }
     },
     computed: {
-        ...mapState('account', ['features'])
+        ...mapState(useAccountSettingsStore, ['features'])
     },
     watch: {
         teamSearch (v) {
diff --git a/frontend/src/pages/admin/Template/Palette.vue b/frontend/src/pages/admin/Template/Palette.vue
index ab4f3f898a..c60a77af98 100644
--- a/frontend/src/pages/admin/Template/Palette.vue
+++ b/frontend/src/pages/admin/Template/Palette.vue
@@ -12,13 +12,15 @@
 
 <script>
 
-import { mapState } from 'vuex'
+import { mapState } from 'pinia'
 
 import TemplateSectionCatalogue from './sections/Catalogues.vue'
 import TemplateSectionNPM from './sections/NPMRegistry.vue'
 import TemplateSectionPalette from './sections/Palette.vue'
 import TemplateSectionPaletteModules from './sections/PaletteModules.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
+
 export default {
     name: 'AdminTemplatePalette',
     components: {
@@ -41,7 +43,7 @@ export default {
     },
     emits: ['update:modelValue'],
     computed: {
-        ...mapState('account', ['features']),
+        ...mapState(useAccountSettingsStore, ['features']),
         catalogFeatureAvailable () {
             return !!this.features.customCatalogs
         },
diff --git a/frontend/src/pages/admin/Template/index.vue b/frontend/src/pages/admin/Template/index.vue
index a39e85801f..468442e10e 100644
--- a/frontend/src/pages/admin/Template/index.vue
+++ b/frontend/src/pages/admin/Template/index.vue
@@ -29,7 +29,7 @@
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import { mapState } from 'pinia'
 
 import templateApi from '../../../api/templates.js'
 import SectionSideMenu from '../../../components/SectionSideMenu.vue'
@@ -45,6 +45,8 @@ import {
     templateValidators
 } from './utils.js'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
+
 export default {
     name: 'AdminTemplate',
     components: {
@@ -84,7 +86,7 @@ export default {
         }
     },
     computed: {
-        ...mapState('account', ['features', 'settings']),
+        ...mapState(useAccountSettingsStore, ['features', 'settings']),
         sideNavigation: function () {
             const nav = [
                 { name: 'Settings', path: './settings' },
diff --git a/frontend/src/pages/admin/Template/sections/Catalogues.vue b/frontend/src/pages/admin/Template/sections/Catalogues.vue
index d2ad45d0d3..daa8439c43 100644
--- a/frontend/src/pages/admin/Template/sections/Catalogues.vue
+++ b/frontend/src/pages/admin/Template/sections/Catalogues.vue
@@ -5,9 +5,9 @@
             <ChangeIndicator class="!inline-block ml-4 mt-0" :value="editable.changed.settings.palette_catalogue" />
         </FormHeading>
 
-        <FeatureUnavailable v-if="!isCustomCatalogsFeatureEnabledForPlatform" :minimal="true" class="!my-5 !mx-0 !p-0 !justify-start" />
+        <FeatureUnavailable v-if="!featuresCheck.isCustomCatalogsFeatureEnabledForPlatform" :minimal="true" class="!my-5 !mx-0 !p-0 !justify-start" />
 
-        <FeatureUnavailableToTeam v-if="!isCustomCatalogsFeatureEnabledForTeam" :minimal="true" class="!my-5 !mx-0 !p-0 !justify-start" />
+        <FeatureUnavailableToTeam v-if="!featuresCheck.isCustomCatalogsFeatureEnabledForTeam" :minimal="true" class="!my-5 !mx-0 !p-0 !justify-start" />
 
         <form class="space-y-4 max-w-2xl" @submit.prevent>
             <div v-if="!projectLauncherCompatible" class="text-red-400 space-y-1">
@@ -91,6 +91,7 @@
 
 <script>
 import { PlusSmIcon, XIcon } from '@heroicons/vue/outline'
+import { mapState } from 'pinia'
 
 import SemVer from 'semver'
 
@@ -99,10 +100,11 @@ import FormRow from '../../../../components/FormRow.vue'
 import FeatureUnavailable from '../../../../components/banners/FeatureUnavailable.vue'
 import FeatureUnavailableToTeam from '../../../../components/banners/FeatureUnavailableToTeam.vue'
 import UndoIcon from '../../../../components/icons/Undo.js'
-import featuresMixin from '../../../../mixins/Features.js'
 import ChangeIndicator from '../components/ChangeIndicator.vue'
 import LockSetting from '../components/LockSetting.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
+
 export default {
     name: 'TemplateCatalogueEditor',
     components: {
@@ -116,7 +118,6 @@ export default {
         XIcon,
         UndoIcon
     },
-    mixins: [featuresMixin],
     props: {
         editTemplate: {
             type: Boolean,
@@ -148,6 +149,7 @@ export default {
         }
     },
     computed: {
+        ...mapState(useAccountSettingsStore, ['featuresCheck']),
         editable: {
             get () {
                 return this.modelValue
@@ -189,7 +191,7 @@ export default {
             return this.urls.filter(url => url !== this.defaultCatalogue)
         },
         isDisabled () {
-            if (!this.isCustomCatalogsFeatureEnabled) {
+            if (!this.featuresCheck.isCustomCatalogsFeatureEnabled) {
                 return true
             } else return this.readOnly
         }
diff --git a/frontend/src/pages/admin/Template/sections/Editor.vue b/frontend/src/pages/admin/Template/sections/Editor.vue
index 24b4626f58..f304189d9c 100644
--- a/frontend/src/pages/admin/Template/sections/Editor.vue
+++ b/frontend/src/pages/admin/Template/sections/Editor.vue
@@ -199,16 +199,18 @@
 </template>
 
 <script>
+import { mapState } from 'pinia'
 import SemVer from 'semver'
 
-import { mapState } from 'vuex'
-
 import FormHeading from '../../../../components/FormHeading.vue'
 import FormRow from '../../../../components/FormRow.vue'
 import FeatureUnavailableToTeam from '../../../../components/banners/FeatureUnavailableToTeam.vue'
 import timezonesData from '../../../../data/timezones.json'
 import ChangeIndicator from '../components/ChangeIndicator.vue'
 import LockSetting from '../components/LockSetting.vue'
+
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
+
 export default {
     name: 'TemplateSettingsEditor',
     components: {
@@ -248,7 +250,7 @@ export default {
         }
     },
     computed: {
-        ...mapState('account', ['features']),
+        ...mapState(useAccountSettingsStore, ['features']),
         editable: {
             get () {
                 return this.modelValue
diff --git a/frontend/src/pages/admin/Template/sections/NPMRegistry.vue b/frontend/src/pages/admin/Template/sections/NPMRegistry.vue
index f36d5c729f..e9007c4db5 100644
--- a/frontend/src/pages/admin/Template/sections/NPMRegistry.vue
+++ b/frontend/src/pages/admin/Template/sections/NPMRegistry.vue
@@ -5,9 +5,9 @@
             <ChangeIndicator class="!inline-block ml-4 mt-0" :value="editable.changed.settings.palette_npmrc" />
         </FormHeading>
 
-        <FeatureUnavailable v-if="!isCustomCatalogsFeatureEnabledForPlatform" :minimal="true" class="!my-5 !mx-0 !p-0 !justify-start" />
+        <FeatureUnavailable v-if="!featuresCheck.isCustomCatalogsFeatureEnabledForPlatform" :minimal="true" class="!my-5 !mx-0 !p-0 !justify-start" />
 
-        <FeatureUnavailableToTeam v-if="!isCustomCatalogsFeatureEnabledForTeam" :minimal="true" class="!my-5 !mx-0 !p-0 !justify-start" />
+        <FeatureUnavailableToTeam v-if="!featuresCheck.isCustomCatalogsFeatureEnabledForTeam" :minimal="true" class="!my-5 !mx-0 !p-0 !justify-start" />
 
         <form class="space-y-4 max-w-2xl" @submit.prevent>
             <div v-if="!projectLauncherCompatible" class="text-red-400 space-y-1">
@@ -23,7 +23,7 @@
                             <template #input>
                                 <textarea
                                     v-model="editable.settings.palette_npmrc"
-                                    :disabled="!isCustomCatalogsFeatureEnabled"
+                                    :disabled="!featuresCheck.isCustomCatalogsFeatureEnabled"
                                     class="font-mono w-full"
                                     placeholder=".npmrc"
                                     rows="8"
@@ -43,7 +43,7 @@
                             <template #input>
                                 <textarea
                                     v-model="editable.settings.palette_npmrc"
-                                    :disabled="!isCustomCatalogsFeatureEnabled ? true : readOnly"
+                                    :disabled="!featuresCheck.isCustomCatalogsFeatureEnabled ? true : readOnly"
                                     class="font-mono w-full"
                                     placeholder=".npmrc"
                                     rows="8"
@@ -63,16 +63,18 @@
 </template>
 
 <script>
+import { mapState } from 'pinia'
 import SemVer from 'semver'
 
 import FormHeading from '../../../../components/FormHeading.vue'
 import FormRow from '../../../../components/FormRow.vue'
 import FeatureUnavailable from '../../../../components/banners/FeatureUnavailable.vue'
 import FeatureUnavailableToTeam from '../../../../components/banners/FeatureUnavailableToTeam.vue'
-import featuresMixin from '../../../../mixins/Features.js'
 import ChangeIndicator from '../components/ChangeIndicator.vue'
 import LockSetting from '../components/LockSetting.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
+
 export default {
     name: 'TemplateNPMEditor',
     components: {
@@ -83,7 +85,6 @@ export default {
         ChangeIndicator,
         LockSetting
     },
-    mixins: [featuresMixin],
     props: {
         editTemplate: {
             type: Boolean,
@@ -110,6 +111,7 @@ export default {
         }
     },
     computed: {
+        ...mapState(useAccountSettingsStore, ['featuresCheck']),
         editable: {
             get () {
                 return this.modelValue
diff --git a/frontend/src/pages/admin/Templates/index.vue b/frontend/src/pages/admin/Templates/index.vue
index d06fb15969..5d51858871 100644
--- a/frontend/src/pages/admin/Templates/index.vue
+++ b/frontend/src/pages/admin/Templates/index.vue
@@ -42,8 +42,6 @@
 import { PlusSmIcon } from '@heroicons/vue/outline'
 import { markRaw } from 'vue'
 
-import { mapState } from 'vuex'
-
 import templatesApi from '../../../api/templates.js'
 
 import UserCell from '../../../components/tables/cells/UserCell.vue'
@@ -82,7 +80,6 @@ export default {
         }
     },
     computed: {
-        ...mapState('account', ['settings'])
     },
     async created () {
         await this.loadItems()
diff --git a/frontend/src/pages/admin/Users/General.vue b/frontend/src/pages/admin/Users/General.vue
index 29a03f8bf6..468ff38aa1 100644
--- a/frontend/src/pages/admin/Users/General.vue
+++ b/frontend/src/pages/admin/Users/General.vue
@@ -33,15 +33,16 @@
 
 import { UserAddIcon } from '@heroicons/vue/outline'
 
+import { mapState } from 'pinia'
 import { markRaw } from 'vue'
 
-import { mapState } from 'vuex'
-
 import usersApi from '../../../api/users.js'
 import UserCell from '../../../components/tables/cells/UserCell.vue'
 
 import AdminUserEditDialog from './dialogs/AdminUserEditDialog.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
+
 export default {
     name: 'AdminUsers',
     components: {
@@ -66,7 +67,7 @@ export default {
         }
     },
     computed: {
-        ...mapState('account', ['features'])
+        ...mapState(useAccountSettingsStore, ['features'])
     },
     watch: {
         userSearch (v) {
diff --git a/frontend/src/pages/admin/Users/UserDetails.vue b/frontend/src/pages/admin/Users/UserDetails.vue
index 0a725283b1..87aa6f37fb 100644
--- a/frontend/src/pages/admin/Users/UserDetails.vue
+++ b/frontend/src/pages/admin/Users/UserDetails.vue
@@ -70,7 +70,6 @@
 import { ChevronRightIcon } from '@heroicons/vue/solid'
 
 import { markRaw } from 'vue'
-import { mapState } from 'vuex'
 
 import usersApi from '../../../api/users.js'
 
@@ -107,7 +106,6 @@ export default {
         }
     },
     computed: {
-        ...mapState('account', ['features'])
     },
     watch: {
     },
diff --git a/frontend/src/pages/admin/Users/createUser.vue b/frontend/src/pages/admin/Users/createUser.vue
index 64fef0aa97..a72ba2ad06 100644
--- a/frontend/src/pages/admin/Users/createUser.vue
+++ b/frontend/src/pages/admin/Users/createUser.vue
@@ -38,7 +38,6 @@
 
 <script>
 import { ChevronLeftIcon, ChevronRightIcon } from '@heroicons/vue/solid'
-import { mapState } from 'vuex'
 
 import usersApi from '../../../api/users.js'
 
@@ -77,7 +76,6 @@ export default {
         }
     },
     computed: {
-        ...mapState('account', ['settings']),
         formValid () {
             return this.input.email &&
                    (this.input.username && !this.errors.username) &&
diff --git a/frontend/src/pages/admin/Users/dialogs/AdminUserEditDialog.vue b/frontend/src/pages/admin/Users/dialogs/AdminUserEditDialog.vue
index 42d72cbb33..a39f3402b4 100644
--- a/frontend/src/pages/admin/Users/dialogs/AdminUserEditDialog.vue
+++ b/frontend/src/pages/admin/Users/dialogs/AdminUserEditDialog.vue
@@ -94,13 +94,15 @@
 <script>
 
 import { LockClosedIcon } from '@heroicons/vue/outline'
-import { mapState } from 'vuex'
+import { mapState } from 'pinia'
 
 import usersApi from '../../../../api/users.js'
 import FormHeading from '../../../../components/FormHeading.vue'
 import FormRow from '../../../../components/FormRow.vue'
 import Alerts from '../../../../services/alerts.js'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
+
 export default {
     name: 'AdminUserEditDialog',
 
@@ -145,7 +147,7 @@ export default {
         }
     },
     computed: {
-        ...mapState('account', ['features']),
+        ...mapState(useAccountSettingsStore, ['features']),
         disableSave () {
             const { isChanged, isValid } = this.getChanges()
             return !isValid || !isChanged
diff --git a/frontend/src/pages/admin/index.vue b/frontend/src/pages/admin/index.vue
index fc226d2af5..fc87643108 100644
--- a/frontend/src/pages/admin/index.vue
+++ b/frontend/src/pages/admin/index.vue
@@ -4,8 +4,6 @@
 
 <script>
 
-import { mapState as mapVuexState } from 'vuex'
-
 import adminApi from '../../api/admin.js'
 
 export default {
@@ -16,7 +14,6 @@ export default {
         }
     },
     computed: {
-        ...mapVuexState('account', ['features'])
     },
     async mounted () {
         try {
diff --git a/frontend/src/pages/application/CreateInstanceMultiStep.vue b/frontend/src/pages/application/CreateInstanceMultiStep.vue
index fe14ea4277..505c67723c 100644
--- a/frontend/src/pages/application/CreateInstanceMultiStep.vue
+++ b/frontend/src/pages/application/CreateInstanceMultiStep.vue
@@ -41,13 +41,13 @@
 
 <script>
 import { mapState } from 'pinia'
-import { mapState as mapVuexState } from 'vuex'
 
 import MultiStepInstanceForm from '../../components/multi-step-forms/instance/MultiStepInstanceForm.vue'
 
 import { getTeamProperty } from '../../composables/TeamProperties.js'
 import applicationMixin from '../../mixins/Application.js'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useContextStore } from '@/stores/context.js'
 
 export default {
@@ -73,7 +73,7 @@ export default {
     },
     computed: {
         ...mapState(useContextStore, ['team']),
-        ...mapVuexState('account', ['features']),
+        ...mapState(useAccountSettingsStore, ['features']),
         isLoading () {
             return this.loading || !this.team
         }
diff --git a/frontend/src/pages/application/Dependencies/Dependencies.vue b/frontend/src/pages/application/Dependencies/Dependencies.vue
index 1409320b4e..2604b235f9 100644
--- a/frontend/src/pages/application/Dependencies/Dependencies.vue
+++ b/frontend/src/pages/application/Dependencies/Dependencies.vue
@@ -11,8 +11,8 @@
 
         <div class="space-y-6">
             <div class="banner-wrapper mt-5">
-                <FeatureUnavailable v-if="!isBOMFeatureEnabledForPlatform" />
-                <FeatureUnavailableToTeam v-else-if="!isBOMFeatureEnabledForTeam" />
+                <FeatureUnavailable v-if="!featuresCheck.isBOMFeatureEnabledForPlatform" />
+                <FeatureUnavailableToTeam v-else-if="!featuresCheck.isBOMFeatureEnabledForTeam" />
             </div>
 
             <ff-loading v-if="loading" message="Loading Snapshots..." />
@@ -38,7 +38,7 @@
                     <p>
                         Applications in FlowFuse are used to manage groups of Node-RED Instances and Devices.
                     </p>
-                    <p v-if="!isBOMFeatureEnabled">
+                    <p v-if="!featuresCheck.isBOMFeatureEnabled">
                         Once you assign an Instance or Device to this application, you'll be able to view a complete list of their dependencies.
                     </p>
                 </template>
@@ -49,6 +49,7 @@
 
 <script>
 import { SearchIcon } from '@heroicons/vue/outline'
+import { mapState } from 'pinia'
 
 import ApplicationsApi from '../../../api/application.js'
 import EmptyState from '../../../components/EmptyState.vue'
@@ -58,7 +59,7 @@ import FeatureUnavailableToTeam from '../../../components/banners/FeatureUnavail
 import BomDependencies from '../../../components/bill-of-materials/BomDependencies.vue'
 import usePermissions from '../../../composables/Permissions.js'
 
-import featuresMixin from '../../../mixins/Features.js'
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 
 export default {
     name: 'ApplicationDependencies',
@@ -70,7 +71,6 @@ export default {
         SectionTopMenu,
         SearchIcon
     },
-    mixins: [featuresMixin],
     inheritAttrs: false,
     props: {
         application: {
@@ -91,6 +91,7 @@ export default {
         }
     },
     computed: {
+        ...mapState(useAccountSettingsStore, ['featuresCheck']),
         hasTeamPermission () {
             return this.hasPermission('application:bom', { application: this.application })
         },
@@ -106,7 +107,7 @@ export default {
     },
     methods: {
         getDependencies () {
-            if (this.isBOMFeatureEnabled) {
+            if (this.featuresCheck.isBOMFeatureEnabled) {
                 this.loading = true
                 ApplicationsApi.getDependencies(this.application.id)
                     .then(res => {
diff --git a/frontend/src/pages/application/DeviceGroups.vue b/frontend/src/pages/application/DeviceGroups.vue
index e402e7b06b..b0d47c2795 100644
--- a/frontend/src/pages/application/DeviceGroups.vue
+++ b/frontend/src/pages/application/DeviceGroups.vue
@@ -74,7 +74,6 @@
 import { PlusSmIcon } from '@heroicons/vue/outline'
 import { mapState } from 'pinia'
 import { markRaw } from 'vue'
-import { mapState as mapVuexState } from 'vuex'
 
 import ApplicationAPI from '../../api/application.js'
 
@@ -87,6 +86,7 @@ import Alerts from '../../services/alerts.js'
 
 import TargetSnapshotCell from './components/cells/TargetSnapshot.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useContextStore } from '@/stores/context.js'
 
 export default {
@@ -155,7 +155,7 @@ export default {
     },
     computed: {
         ...mapState(useContextStore, ['team', 'teamMembership']),
-        ...mapVuexState('account', ['features']),
+        ...mapState(useAccountSettingsStore, ['features']),
         featureEnabledForTeam () {
             return !!this.team?.type?.properties?.features?.deviceGroups
         },
diff --git a/frontend/src/pages/application/Overview.vue b/frontend/src/pages/application/Overview.vue
index 1b302bd48c..d5be54363b 100644
--- a/frontend/src/pages/application/Overview.vue
+++ b/frontend/src/pages/application/Overview.vue
@@ -113,8 +113,8 @@
 <script>
 
 import { PlusSmIcon } from '@heroicons/vue/outline'
+import { mapState } from 'pinia'
 import { markRaw } from 'vue'
-import { mapGetters } from 'vuex'
 
 import EmptyState from '../../components/EmptyState.vue'
 import SectionTopMenu from '../../components/SectionTopMenu.vue'
@@ -129,6 +129,8 @@ import InstanceEditorLinkCell from '../instance/components/cells/InstanceEditorL
 import DeploymentName from './components/cells/DeploymentName.vue'
 import LastSeen from './components/cells/LastSeen.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
+
 export default {
     name: 'ProjectOverview',
     components: {
@@ -165,7 +167,7 @@ export default {
         }
     },
     computed: {
-        ...mapGetters('account', ['featuresCheck']),
+        ...mapState(useAccountSettingsStore, ['featuresCheck']),
         cloudColumns () {
             return [
                 { label: 'Name', class: ['w-1/2'], component: { is: markRaw(DeploymentName), map: { url: 'url' } } },
diff --git a/frontend/src/pages/application/PipelineStage/form.vue b/frontend/src/pages/application/PipelineStage/form.vue
index dfe5deffb1..2d3e167590 100644
--- a/frontend/src/pages/application/PipelineStage/form.vue
+++ b/frontend/src/pages/application/PipelineStage/form.vue
@@ -343,7 +343,6 @@
 import { InformationCircleIcon } from '@heroicons/vue/outline'
 
 import { mapState } from 'pinia'
-import { mapGetters, mapState as mapVuexState } from 'vuex'
 
 import { StageAction, StageType } from '../../../api/pipeline.js'
 import teamApi from '../../../api/team.js'
@@ -356,6 +355,7 @@ import IconDeviceSolid from '../../../components/icons/DeviceSolid.js'
 import IconGit from '../../../components/icons/Git.js'
 import IconNodeRedSolid from '../../../components/icons/NodeRedSolid.js'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useContextStore } from '@/stores/context.js'
 
 export default {
@@ -441,8 +441,7 @@ export default {
     },
     computed: {
         ...mapState(useContextStore, ['team']),
-        ...mapVuexState('account', ['features']),
-        ...mapGetters('account', ['featuresCheck']),
+        ...mapState(useAccountSettingsStore, ['features', 'featuresCheck']),
         isEdit () {
             return !!this.stage.id
         },
diff --git a/frontend/src/pages/application/Pipelines.vue b/frontend/src/pages/application/Pipelines.vue
index 977f64187a..35856b8bb4 100644
--- a/frontend/src/pages/application/Pipelines.vue
+++ b/frontend/src/pages/application/Pipelines.vue
@@ -98,7 +98,6 @@
 <script>
 import { PlusSmIcon } from '@heroicons/vue/outline'
 import { mapState } from 'pinia'
-import { mapState as mapVuexState } from 'vuex'
 
 import ApplicationAPI from '../../api/application.js'
 import PipelineAPI from '../../api/pipeline.js'
@@ -110,6 +109,7 @@ import usePermissions from '../../composables/Permissions.js'
 
 import Alerts from '../../services/alerts.js'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useContextStore } from '@/stores/context.js'
 
 export default {
@@ -156,7 +156,7 @@ export default {
     },
     computed: {
         ...mapState(useContextStore, ['teamMembership']),
-        ...mapVuexState('account', ['features']),
+        ...mapState(useAccountSettingsStore, ['features']),
         featureEnabled () {
             return this.features['devops-pipelines']
         }
diff --git a/frontend/src/pages/application/Settings/UserAccess.vue b/frontend/src/pages/application/Settings/UserAccess.vue
index 5b1be6e425..d4d1da2dff 100644
--- a/frontend/src/pages/application/Settings/UserAccess.vue
+++ b/frontend/src/pages/application/Settings/UserAccess.vue
@@ -17,7 +17,6 @@
 
 import { mapState } from 'pinia'
 import { defineComponent, markRaw } from 'vue'
-import { mapGetters } from 'vuex'
 
 import teamClient from '../../../api/team.js'
 import EditApplicationPermissionsDialog from '../../../components/dialogs/EditApplicationPermissionsDialog.vue'
@@ -27,6 +26,7 @@ import usePermissions from '../../../composables/Permissions.js'
 import RoleRow from './components/RoleRow.vue'
 
 import { useAccountAuthStore } from '@/stores/account-auth.js'
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useContextStore } from '@/stores/context.js'
 
 export default defineComponent({
@@ -51,7 +51,7 @@ export default defineComponent({
     },
     computed: {
         ...mapState(useContextStore, ['team']),
-        ...mapGetters('account', ['featuresCheck']),
+        ...mapState(useAccountSettingsStore, ['featuresCheck']),
         ...mapState(useAccountAuthStore, ['isAdminUser']),
         columns () {
             return [
diff --git a/frontend/src/pages/application/Settings/index.vue b/frontend/src/pages/application/Settings/index.vue
index 098705dd3f..afb5a74d01 100644
--- a/frontend/src/pages/application/Settings/index.vue
+++ b/frontend/src/pages/application/Settings/index.vue
@@ -16,13 +16,13 @@
 <script>
 
 import { mapState } from 'pinia'
-import { mapGetters } from 'vuex'
 
 import SectionSideMenu from '../../../components/SectionSideMenu.vue'
 import SectionTopMenu from '../../../components/SectionTopMenu.vue'
 import usePermissions from '../../../composables/Permissions.js'
 
 import { useAccountAuthStore } from '@/stores/account-auth.js'
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 
 export default {
     name: 'ApplicationSettings',
@@ -44,7 +44,7 @@ export default {
         return { hasPermission }
     },
     computed: {
-        ...mapGetters('account', ['featuresCheck']),
+        ...mapState(useAccountSettingsStore, ['featuresCheck']),
         ...mapState(useAccountAuthStore, ['isAdminUser']),
         sideNavigation () {
             return [
diff --git a/frontend/src/pages/application/createInstance.vue b/frontend/src/pages/application/createInstance.vue
index b7d0ae4bd8..b117f6f40e 100644
--- a/frontend/src/pages/application/createInstance.vue
+++ b/frontend/src/pages/application/createInstance.vue
@@ -37,7 +37,6 @@
 <script>
 import { ChevronLeftIcon } from '@heroicons/vue/solid/index.js'
 import { mapState } from 'pinia'
-import { mapState as mapVuexState } from 'vuex'
 
 import instanceApi from '../../api/instances.js'
 
@@ -45,6 +44,7 @@ import applicationMixin from '../../mixins/Application.js'
 import Alerts from '../../services/alerts.js'
 import InstanceForm from '../instance/components/InstanceForm.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useContextStore } from '@/stores/context.js'
 
 export default {
@@ -77,7 +77,7 @@ export default {
     },
     computed: {
         ...mapState(useContextStore, ['team']),
-        ...mapVuexState('account', ['features']),
+        ...mapState(useAccountSettingsStore, ['features']),
         isLoading () {
             return this.loading || !this.team
         }
diff --git a/frontend/src/pages/application/index.vue b/frontend/src/pages/application/index.vue
index 0345ba53b9..3b5b649626 100644
--- a/frontend/src/pages/application/index.vue
+++ b/frontend/src/pages/application/index.vue
@@ -34,7 +34,6 @@
 // import { ChipIcon, ClockIcon, CogIcon, TerminalIcon, ViewListIcon } from '@heroicons/vue/solid'
 
 import { mapState } from 'pinia'
-import { mapState as mapVuexState } from 'vuex'
 
 import InstanceStatusPolling from '../../components/InstanceStatusPolling.vue'
 // import PipelinesIcon from '../../components/icons/Pipelines.js'
@@ -48,6 +47,7 @@ import ConfirmInstanceDeleteDialog from '../instance/Settings/dialogs/ConfirmIns
 
 import ConfirmApplicationDeleteDialog from './Settings/dialogs/ConfirmApplicationDeleteDialog.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useContextStore } from '@/stores/context.js'
 
 export default {
@@ -65,7 +65,7 @@ export default {
     },
     computed: {
         ...mapState(useContextStore, ['team']),
-        ...mapVuexState('account', ['features']),
+        ...mapState(useAccountSettingsStore, ['features']),
         navigation () {
             const routes = [
                 {
diff --git a/frontend/src/pages/application/routes.js b/frontend/src/pages/application/routes.js
index a912d21490..94615c8aef 100644
--- a/frontend/src/pages/application/routes.js
+++ b/frontend/src/pages/application/routes.js
@@ -1,5 +1,3 @@
-import store from '../../store/index.js'
-
 import ApplicationActivity from './Activity.vue'
 import ApplicationCreateInstanceMultiStep from './CreateInstanceMultiStep.vue'
 import Dependencies from './Dependencies/Dependencies.vue'
@@ -23,11 +21,13 @@ import ApplicationSettings from './Settings/index.vue'
 import ApplicationSnapshots from './Snapshots.vue'
 import ApplicationIndex from './index.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
+
 export default [
     {
         path: ':id',
         redirect: function () {
-            const features = store.getters['account/featuresCheck']
+            const features = useAccountSettingsStore().featuresCheck
             if (features.isHostedInstancesEnabledForTeam) {
                 return { name: 'ApplicationInstances' }
             } else {
diff --git a/frontend/src/pages/device/DeveloperMode/index.vue b/frontend/src/pages/device/DeveloperMode/index.vue
index 30fa47fc6b..6ece4d37de 100644
--- a/frontend/src/pages/device/DeveloperMode/index.vue
+++ b/frontend/src/pages/device/DeveloperMode/index.vue
@@ -105,7 +105,6 @@
 import { BeakerIcon } from '@heroicons/vue/outline'
 import { mapState } from 'pinia'
 import semver from 'semver'
-import { mapState as mapVuexState } from 'vuex'
 
 import deviceApi from '../../../api/devices.js'
 
@@ -115,6 +114,7 @@ import InfoCardRow from '../../../components/InfoCardRow.vue'
 import alerts from '../../../services/alerts.js'
 import SnapshotCreateDialog from '../dialogs/SnapshotCreateDialog.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useContextStore } from '@/stores/context.js'
 
 export default {
@@ -150,7 +150,7 @@ export default {
     },
     computed: {
         ...mapState(useContextStore, ['team']),
-        ...mapVuexState('account', ['features']),
+        ...mapState(useAccountSettingsStore, ['features']),
         developerMode: function () {
             return this.device?.mode === 'developer'
         },
diff --git a/frontend/src/pages/device/Editor/index.vue b/frontend/src/pages/device/Editor/index.vue
index aeee90148c..3dac2e6147 100644
--- a/frontend/src/pages/device/Editor/index.vue
+++ b/frontend/src/pages/device/Editor/index.vue
@@ -69,8 +69,7 @@
 
 import { CogIcon, HomeIcon, XIcon } from '@heroicons/vue/solid/index.js'
 
-import { mapActions } from 'pinia'
-import { mapGetters, mapState } from 'vuex'
+import { mapActions, mapState } from 'pinia'
 
 import DropdownMenu from '../../../components/DropdownMenu.vue'
 import ResizeBar from '../../../components/ResizeBar.vue'
@@ -83,6 +82,7 @@ import usePermissions from '../../../composables/Permissions.js'
 import { useResizingHelper } from '../../../composables/ResizingHelper.js'
 import Alerts from '../../../services/alerts.js'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useAccountStore } from '@/stores/account.js'
 import { useContextStore } from '@/stores/context.js'
 
@@ -168,8 +168,7 @@ export default {
         }
     },
     computed: {
-        ...mapState('account', ['features']),
-        ...mapGetters('account', ['featuresCheck']),
+        ...mapState(useAccountSettingsStore, ['features', 'featuresCheck']),
         isExpertRoute () {
             return this.$route.name === 'device-editor-expert'
         },
diff --git a/frontend/src/pages/device/Editor/routes.js b/frontend/src/pages/device/Editor/routes.js
index 34c0f642dd..9521f26ea5 100644
--- a/frontend/src/pages/device/Editor/routes.js
+++ b/frontend/src/pages/device/Editor/routes.js
@@ -1,8 +1,9 @@
-import store from '../../../store/index.js'
 import { children } from '../routes.js'
 
 import DeviceEditor from './index.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
+
 const renameRoute = (child) => {
     return {
         ...child,
@@ -21,7 +22,7 @@ export default [
             layout: 'plain'
         },
         redirect: to => {
-            const name = store.getters['account/featuresCheck'].isExpertAssistantFeatureEnabled
+            const name = useAccountSettingsStore().featuresCheck.isExpertAssistantFeatureEnabled
                 ? 'device-editor-expert'
                 : 'device-editor-overview'
             return { name, params: { id: to.params.id } }
diff --git a/frontend/src/pages/device/Overview.vue b/frontend/src/pages/device/Overview.vue
index 9b00018af1..7e3227656e 100644
--- a/frontend/src/pages/device/Overview.vue
+++ b/frontend/src/pages/device/Overview.vue
@@ -177,7 +177,6 @@ import { CheckCircleIcon, CogIcon, ExclamationIcon, PencilAltIcon, TemplateIcon,
 
 // api
 import semver from 'semver'
-import { mapState } from 'vuex'
 
 // components
 import DeviceAPI from '../../api/devices.js'
@@ -223,7 +222,6 @@ export default {
         }
     },
     computed: {
-        ...mapState('account', ['settings', 'features']),
         targetSnapshotDeployed: function () {
             return this.device.activeSnapshot?.id === this.device.targetSnapshot?.id
         },
diff --git a/frontend/src/pages/device/Settings/Editor.vue b/frontend/src/pages/device/Settings/Editor.vue
index e02a84c002..65ec022c76 100644
--- a/frontend/src/pages/device/Settings/Editor.vue
+++ b/frontend/src/pages/device/Settings/Editor.vue
@@ -32,7 +32,6 @@
 
 import { mapState } from 'pinia'
 import semver from 'semver'
-import { mapState as mapVuexState } from 'vuex'
 
 import deviceApi from '../../../api/devices.js'
 import FormHeading from '../../../components/FormHeading.vue'
@@ -45,6 +44,7 @@ import Alerts from '../../../services/alerts.js'
 
 import ChangeIndicator from '../../admin/Template/components/ChangeIndicator.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useContextStore } from '@/stores/context.js'
 
 export default {
@@ -87,7 +87,7 @@ export default {
     },
     computed: {
         ...mapState(useContextStore, ['team']),
-        ...mapVuexState('account', ['features']),
+        ...mapState(useAccountSettingsStore, ['features']),
         limitsLauncherEnabled () {
             if (!this.device.agentVersion) {
                 // Device has not called home yet - so we don't know what agent
diff --git a/frontend/src/pages/device/VersionHistory/Snapshots/index.vue b/frontend/src/pages/device/VersionHistory/Snapshots/index.vue
index f7234e33d9..9e9429e31d 100644
--- a/frontend/src/pages/device/VersionHistory/Snapshots/index.vue
+++ b/frontend/src/pages/device/VersionHistory/Snapshots/index.vue
@@ -114,7 +114,6 @@ import { FilterIcon, PlusSmIcon, UploadIcon } from '@heroicons/vue/outline'
 import { mapActions, mapState } from 'pinia'
 import SemVer from 'semver'
 import { markRaw } from 'vue'
-import { mapState as mapVuexState } from 'vuex'
 
 import ApplicationApi from '../../../../api/application.js'
 import DropdownMenu from '../../../../components/DropdownMenu.vue'
@@ -130,6 +129,7 @@ import DaysSince from '../../../application/Snapshots/components/cells/DaysSince
 import SnapshotName from '../../../application/Snapshots/components/cells/SnapshotName.vue'
 import SnapshotSource from '../../../application/Snapshots/components/cells/SnapshotSource.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useContextStore } from '@/stores/context.js'
 
 import { useUxDrawersStore } from '@/stores/ux-drawers.js'
@@ -213,7 +213,7 @@ export default {
     },
     computed: {
         ...mapState(useContextStore, ['team']),
-        ...mapVuexState('account', ['features']),
+        ...mapState(useAccountSettingsStore, ['features']),
         canCreateSnapshot () {
             if (!this.developerMode || this.busy) {
                 return false
diff --git a/frontend/src/pages/device/VersionHistory/Timeline/index.vue b/frontend/src/pages/device/VersionHistory/Timeline/index.vue
index 855769a2d6..d229e6b3ee 100644
--- a/frontend/src/pages/device/VersionHistory/Timeline/index.vue
+++ b/frontend/src/pages/device/VersionHistory/Timeline/index.vue
@@ -1,8 +1,8 @@
 <template>
     <div id="timeline" class="flex-1 flex flex-col overflow-auto">
-        <FeatureUnavailable v-if="!isTimelineFeatureEnabledForPlatform" />
-        <FeatureUnavailableToTeam v-else-if="!isTimelineFeatureEnabledForTeam" />
-        <section v-if="isTimelineFeatureEnabled" id="visual-timeline" class="relative flex-1 flex flex-col overflow-auto">
+        <FeatureUnavailable v-if="!featuresCheck.isTimelineFeatureEnabledForPlatform" />
+        <FeatureUnavailableToTeam v-else-if="!featuresCheck.isTimelineFeatureEnabledForTeam" />
+        <section v-if="featuresCheck.isTimelineFeatureEnabled" id="visual-timeline" class="relative flex-1 flex flex-col overflow-auto">
             <transition name="fade" mode="out-in">
                 <ff-loading v-if="loading" message="Loading Timeline..." class="absolute top-0" />
                 <ul v-else-if="activeTimeline.length" ref="timeline" data-el="timeline-list" class="timeline">
@@ -61,6 +61,8 @@
 </template>
 
 <script>
+import { mapState } from 'pinia'
+
 import DevicesAPI from '../../../../api/devices.js'
 import versionHistoryAPI from '../../../../api/versionHistory.js'
 import EmptyState from '../../../../components/EmptyState.vue'
@@ -70,12 +72,13 @@ import AssetDetailDialog from '../../../../components/dialogs/AssetDetailDialog.
 import SnapshotEditDialog from '../../../../components/dialogs/SnapshotEditDialog.vue'
 import TimelineEvent from '../../../../components/version-history/timeline/TimelineEvent.vue'
 import { scrollTo } from '../../../../composables/Ux.js'
-import featuresMixin from '../../../../mixins/Features.js'
 import snapshotsMixin from '../../../../mixins/Snapshots.js'
 import Alerts from '../../../../services/alerts.js'
 import Dialog from '../../../../services/dialog.js'
 import SnapshotExportDialog from '../../../application/Snapshots/components/dialogs/SnapshotExportDialog.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
+
 export default {
     name: 'HistoryTimeline',
     components: {
@@ -87,7 +90,7 @@ export default {
         FeatureUnavailable,
         TimelineEvent
     },
-    mixins: [snapshotsMixin, featuresMixin],
+    mixins: [snapshotsMixin],
     inheritAttrs: false,
     props: {
         device: {
@@ -108,6 +111,7 @@ export default {
         }
     },
     computed: {
+        ...mapState(useAccountSettingsStore, ['featuresCheck']),
         canLoadMore () {
             return this.next_cursor !== undefined
         },
@@ -134,7 +138,7 @@ export default {
     },
     methods: {
         async fetchData (loadMore = false) {
-            if (this.isTimelineFeatureEnabled) {
+            if (this.featuresCheck.isTimelineFeatureEnabled) {
                 if (!loadMore) {
                     this.loading = true
                 }
diff --git a/frontend/src/pages/device/components/DevicePerformance.vue b/frontend/src/pages/device/components/DevicePerformance.vue
index 1068329ecd..9467fecd68 100644
--- a/frontend/src/pages/device/components/DevicePerformance.vue
+++ b/frontend/src/pages/device/components/DevicePerformance.vue
@@ -1,8 +1,8 @@
 <template>
     <div id="device-performance" class="flex-1 flex flex-col overflow-auto">
         <div class="banner-wrapper">
-            <FeatureUnavailable v-if="!isInstanceResourcesFeatureEnabledForPlatform" />
-            <FeatureUnavailableToTeam v-else-if="!isInstanceResourcesFeatureEnabledForTeam" />
+            <FeatureUnavailable v-if="!featuresCheck.isInstanceResourcesFeatureEnabledForPlatform" />
+            <FeatureUnavailableToTeam v-else-if="!featuresCheck.isInstanceResourcesFeatureEnabledForTeam" />
             <FeatureUnavailable
                 v-if="!agentSatisfiesVersion"
                 message="Update your device agent to the latest version to enable this feature"
@@ -73,8 +73,8 @@ import CpuChart from '../../../components/charts/performance/CpuChart.vue'
 import MemoryChart from '../../../components/charts/performance/MemoryChart.vue'
 import InformationWell from '../../../components/wells/InformationWell.vue'
 import usePermissions from '../../../composables/Permissions.js'
-import featuresMixin from '../../../mixins/Features.js'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useContextStore } from '@/stores/context.js'
 
 let mqtt
@@ -92,7 +92,6 @@ export default {
         FeatureUnavailable,
         FeatureUnavailableToTeam
     },
-    mixins: [featuresMixin],
     inheritAttrs: false,
     props: {
         device: {
@@ -117,6 +116,7 @@ export default {
         }
     },
     computed: {
+        ...mapState(useAccountSettingsStore, ['featuresCheck']),
         ...mapState(useContextStore, ['team']),
         deviceOnline () {
             const offline = ['stopped', 'offline', 'error']
@@ -126,8 +126,8 @@ export default {
             return this.device && this.device.agentVersion && SemVer.satisfies(this.device.agentVersion, '>=3.5.1', { includePrerelease: true })
         },
         featureAvailable () {
-            return this.isInstanceResourcesFeatureEnabledForPlatform &&
-                this.isInstanceResourcesFeatureEnabledForTeam &&
+            return this.featuresCheck.isInstanceResourcesFeatureEnabledForPlatform &&
+                this.featuresCheck.isInstanceResourcesFeatureEnabledForTeam &&
                 this.agentSatisfiesVersion && this.deviceOnline
         }
     },
diff --git a/frontend/src/pages/device/dialogs/SnapshotCreateDialog.vue b/frontend/src/pages/device/dialogs/SnapshotCreateDialog.vue
index 7cb1961ea2..06a02d3fe5 100644
--- a/frontend/src/pages/device/dialogs/SnapshotCreateDialog.vue
+++ b/frontend/src/pages/device/dialogs/SnapshotCreateDialog.vue
@@ -106,7 +106,7 @@
 
 import { ClockIcon, CubeTransparentIcon } from '@heroicons/vue/outline'
 import { ChevronRightIcon, QuestionMarkCircleIcon } from '@heroicons/vue/solid'
-import { mapGetters } from 'vuex'
+import { mapState } from 'pinia'
 
 import applicationApi from '../../../api/application.js'
 import deviceApi from '../../../api/devices.js'
@@ -116,6 +116,8 @@ import FormRow from '../../../components/FormRow.vue'
 import alerts from '../../../services/alerts.js'
 import PopoverItem from '../../../ui-components/components/PopoverItem.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
+
 export default {
     name: 'SnapshotCreateDialog',
     components: {
@@ -167,7 +169,7 @@ export default {
         }
     },
     computed: {
-        ...mapGetters('account', ['featuresCheck']),
+        ...mapState(useAccountSettingsStore, ['featuresCheck']),
         formValid () {
             return !this.submitted && !!(this.input.name)
         },
diff --git a/frontend/src/pages/device/index.vue b/frontend/src/pages/device/index.vue
index bf27ddf210..db9f4bbb9b 100644
--- a/frontend/src/pages/device/index.vue
+++ b/frontend/src/pages/device/index.vue
@@ -138,7 +138,6 @@
 import { CogIcon } from '@heroicons/vue/solid/index.js'
 import { mapActions, mapState } from 'pinia'
 import semver from 'semver'
-import { mapState as mapVuexState } from 'vuex'
 
 import deviceApi from '../../api/devices.js'
 import DropdownMenu from '../../components/DropdownMenu.vue'
@@ -167,6 +166,7 @@ import DeviceEditorLink from './components/DeviceEditorLink.vue'
 import DeviceLastSeenBadge from './components/DeviceLastSeenBadge.vue'
 import DeviceModeBadge from './components/DeviceModeBadge.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useAccountStore } from '@/stores/account.js'
 import { useContextStore } from '@/stores/context.js'
 
@@ -226,7 +226,7 @@ export default {
     },
     computed: {
         ...mapState(useContextStore, ['team']),
-        ...mapVuexState('account', ['features', 'settings']),
+        ...mapState(useAccountSettingsStore, ['features']),
         actionsButtonKind () {
             switch (true) {
             case this.neverConnected:
diff --git a/frontend/src/pages/device/routes.js b/frontend/src/pages/device/routes.js
index 31922fa07f..7ae801cdb7 100644
--- a/frontend/src/pages/device/routes.js
+++ b/frontend/src/pages/device/routes.js
@@ -1,6 +1,3 @@
-// import { useStore } from 'vuex'
-import store from '../../store/index.js'
-
 import DeviceAuditLog from './AuditLog.vue'
 import DeviceDeveloperMode from './DeveloperMode/index.vue'
 import DeviceLogs from './Logs.vue'
@@ -18,6 +15,8 @@ import VersionHistoryRoutes from './VersionHistory/routes.js'
 
 import Device from './index.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
+
 const children = [
     {
         name: 'device-overview',
@@ -99,7 +98,7 @@ const children = [
             title: 'Device - Version History'
         },
         redirect: to => {
-            const features = store.getters['account/featuresCheck']
+            const features = useAccountSettingsStore().featuresCheck
             let name = features.isTimelineFeatureEnabled ? 'device-version-history-timeline' : 'device-snapshots'
 
             if (to.name.startsWith('device-editor-')) { // redirect to immersive mode when needed
diff --git a/frontend/src/pages/instance/Assets.vue b/frontend/src/pages/instance/Assets.vue
index 6dc7b25bcb..a71d001ef9 100644
--- a/frontend/src/pages/instance/Assets.vue
+++ b/frontend/src/pages/instance/Assets.vue
@@ -1,8 +1,8 @@
 <template>
     <div class="ff-instance-assets flex-1 flex flex-col overflow-auto">
         <div class="banner-wrapper">
-            <FeatureUnavailable v-if="!isStaticAssetFeatureEnabledForPlatform" />
-            <FeatureUnavailableToTeam v-else-if="!isStaticAssetsFeatureEnabledForTeam" />
+            <FeatureUnavailable v-if="!featuresCheck.isStaticAssetFeatureEnabledForPlatform" />
+            <FeatureUnavailableToTeam v-else-if="!featuresCheck.isStaticAssetsFeatureEnabledForTeam" />
             <FeatureUnavailable
                 v-else-if="!launcherSatisfiesVersion"
                 :message="launcherVersionMessage"
@@ -45,11 +45,11 @@ import FeatureUnavailable from '../../components/banners/FeatureUnavailable.vue'
 import FeatureUnavailableToTeam from '../../components/banners/FeatureUnavailableToTeam.vue'
 import FileBrowser from '../../components/file-browser/FileBrowser.vue'
 import usePermissions from '../../composables/Permissions.js'
-import featuresMixin from '../../mixins/Features.js'
 import Alerts from '../../services/alerts.js'
 
 import FolderBreadcrumbs from './components/FolderBreadcrumbs.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useContextStore } from '@/stores/context.js'
 
 export default {
@@ -60,7 +60,6 @@ export default {
         FeatureUnavailableToTeam,
         FileBrowser
     },
-    mixins: [featuresMixin],
     inheritAttrs: false,
     props: {
         instance: {
@@ -84,6 +83,7 @@ export default {
         }
     },
     computed: {
+        ...mapState(useAccountSettingsStore, ['featuresCheck']),
         ...mapState(useContextStore, ['teamMembership', 'team']),
         currentDirectory () {
             if (this.breadcrumbs.length) {
@@ -100,8 +100,8 @@ export default {
             return SemVer.satisfies(nrLauncherVersion, '>=2.8.0')
         },
         isFeatureEnabled () {
-            return this.isStaticAssetFeatureEnabledForPlatform &&
-                this.isStaticAssetsFeatureEnabledForTeam &&
+            return this.featuresCheck.isStaticAssetFeatureEnabledForPlatform &&
+                this.featuresCheck.isStaticAssetsFeatureEnabledForTeam &&
                 this.launcherSatisfiesVersion &&
                 this.isInstanceRunning
         },
diff --git a/frontend/src/pages/instance/Editor/index.vue b/frontend/src/pages/instance/Editor/index.vue
index 9fa0d68b60..fa0d5e1a34 100644
--- a/frontend/src/pages/instance/Editor/index.vue
+++ b/frontend/src/pages/instance/Editor/index.vue
@@ -71,8 +71,7 @@
 <script>
 import { HomeIcon, XIcon } from '@heroicons/vue/solid'
 
-import { mapActions } from 'pinia'
-import { mapGetters } from 'vuex'
+import { mapActions, mapState } from 'pinia'
 
 import InstanceStatusPolling from '../../../components/InstanceStatusPolling.vue'
 import ResizeBar from '../../../components/ResizeBar.vue'
@@ -85,12 +84,12 @@ import usePermissions from '../../../composables/Permissions.js'
 import { useResizingHelper } from '../../../composables/ResizingHelper.js'
 
 import FfPage from '../../../layouts/Page.vue'
-import featuresMixin from '../../../mixins/Features.js'
 import instanceMixin from '../../../mixins/Instance.js'
 import { Roles } from '../../../utils/roles.js'
 import ConfirmInstanceDeleteDialog from '../Settings/dialogs/ConfirmInstanceDeleteDialog.vue'
 import DashboardLink from '../components/DashboardLink.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useContextStore } from '@/stores/context.js'
 
 // Drawer size constraints
@@ -113,7 +112,7 @@ export default {
         FfPage,
         ResizeBar
     },
-    mixins: [instanceMixin, featuresMixin],
+    mixins: [instanceMixin],
     setup () {
         const { hasAMinimumTeamRoleOf, isVisitingAdmin } = usePermissions()
         const {
@@ -154,11 +153,11 @@ export default {
         }
     },
     computed: {
-        ...mapGetters('account', ['featuresCheck']),
+        ...mapState(useAccountSettingsStore, ['featuresCheck']),
         navigation () {
             if (!this.instance.id) return []
             let versionHistoryRoute
-            if (!this.isTimelineFeatureEnabled) {
+            if (!this.featuresCheck.isTimelineFeatureEnabled) {
                 versionHistoryRoute = {
                     name: 'instance-editor-snapshots',
                     params: { id: this.instance.id }
diff --git a/frontend/src/pages/instance/Editor/routes.js b/frontend/src/pages/instance/Editor/routes.js
index b5d6eca7c4..d847516a8a 100644
--- a/frontend/src/pages/instance/Editor/routes.js
+++ b/frontend/src/pages/instance/Editor/routes.js
@@ -1,4 +1,3 @@
-import store from '../../../store/index.js'
 import InstanceSettings from '../Settings/index.vue'
 import InstanceSettingsRoutes from '../Settings/routes.js'
 import VersionHistory from '../VersionHistory/index.vue'
@@ -7,6 +6,8 @@ import { children } from '../routes.js'
 
 import InstanceEditor from './index.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
+
 export default [
     {
         path: '/instance/:id/editor',
@@ -17,7 +18,7 @@ export default [
             layout: 'plain'
         },
         redirect: to => {
-            const name = store.getters['account/featuresCheck'].isExpertAssistantFeatureEnabled
+            const name = useAccountSettingsStore().featuresCheck.isExpertAssistantFeatureEnabled
                 ? 'instance-editor-expert'
                 : 'instance-editor-overview'
             return { name, params: { id: to.params.id } }
diff --git a/frontend/src/pages/instance/Overview.vue b/frontend/src/pages/instance/Overview.vue
index 65ff61eae0..4e871c0ca6 100644
--- a/frontend/src/pages/instance/Overview.vue
+++ b/frontend/src/pages/instance/Overview.vue
@@ -166,7 +166,7 @@
 
 <script>
 import { ArrowRightIcon, ExternalLinkIcon, ServerIcon, TemplateIcon, TrendingUpIcon } from '@heroicons/vue/outline'
-import { mapState } from 'vuex'
+import { mapState } from 'pinia'
 
 import InstanceApi from '../../api/instances.js'
 import FormHeading from '../../components/FormHeading.vue'
@@ -178,6 +178,8 @@ import usePermissions from '../../composables/Permissions.js'
 
 import InstanceStatusBadge from './components/InstanceStatusBadge.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
+
 export default {
     name: 'InstanceOverview',
     components: {
@@ -217,7 +219,7 @@ export default {
         }
     },
     computed: {
-        ...mapState('account', ['features']),
+        ...mapState(useAccountSettingsStore, ['features']),
         instanceRunning () {
             return this.instance?.meta?.state === 'running'
         },
diff --git a/frontend/src/pages/instance/Performance/index.vue b/frontend/src/pages/instance/Performance/index.vue
index 63ab148a27..ddfb88c9de 100644
--- a/frontend/src/pages/instance/Performance/index.vue
+++ b/frontend/src/pages/instance/Performance/index.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="banner-wrapper">
-        <FeatureUnavailable v-if="!isInstanceResourcesFeatureEnabledForPlatform" />
-        <FeatureUnavailableToTeam v-else-if="!isInstanceResourcesFeatureEnabledForTeam" />
+        <FeatureUnavailable v-if="!featuresCheck.isInstanceResourcesFeatureEnabledForPlatform" />
+        <FeatureUnavailableToTeam v-else-if="!featuresCheck.isInstanceResourcesFeatureEnabledForTeam" />
         <FeatureUnavailable
             v-else-if="!launcherSatisfiesVersion"
             message="Update your instance to the latest version to enable this feature"
@@ -102,6 +102,7 @@
 
 <script>
 import { ChipIcon, RefreshIcon } from '@heroicons/vue/outline'
+import { mapState } from 'pinia'
 import SemVer from 'semver'
 
 import instancesApi from '../../../api/instances.js'
@@ -115,7 +116,8 @@ import CpuChart from '../../../components/charts/performance/CpuChart.vue'
 import MemoryChart from '../../../components/charts/performance/MemoryChart.vue'
 import InformationWell from '../../../components/wells/InformationWell.vue'
 import usePermissions from '../../../composables/Permissions.js'
-import featuresMixin from '../../../mixins/Features.js'
+
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 
 export default {
     name: 'InstancePerformance',
@@ -131,7 +133,6 @@ export default {
         FeatureUnavailable,
         FeatureUnavailableToTeam
     },
-    mixins: [featuresMixin],
     inheritAttrs: false,
     props: {
         instance: {
@@ -156,6 +157,7 @@ export default {
         }
     },
     computed: {
+        ...mapState(useAccountSettingsStore, ['featuresCheck']),
         isInstanceRunning () {
             return this.instance.meta.state === 'running'
         },
@@ -174,8 +176,8 @@ export default {
             return SemVer.satisfies(nrLauncherVersion, minVersion)
         },
         featureAvailable () {
-            return this.isInstanceResourcesFeatureEnabledForPlatform &&
-                this.isInstanceResourcesFeatureEnabledForTeam &&
+            return this.featuresCheck.isInstanceResourcesFeatureEnabledForPlatform &&
+                this.featuresCheck.isInstanceResourcesFeatureEnabledForTeam &&
                 this.launcherSatisfiesVersion
         }
     },
diff --git a/frontend/src/pages/instance/Settings/ChangeInstanceType.vue b/frontend/src/pages/instance/Settings/ChangeInstanceType.vue
index 2342feb1f6..e1d6ba9110 100644
--- a/frontend/src/pages/instance/Settings/ChangeInstanceType.vue
+++ b/frontend/src/pages/instance/Settings/ChangeInstanceType.vue
@@ -13,7 +13,6 @@
 
 <script>
 import { mapState } from 'pinia'
-import { mapState as mapVuexState } from 'vuex'
 
 import InstanceApi from '../../../api/instances.js'
 import usePermissions from '../../../composables/Permissions.js'
@@ -21,6 +20,7 @@ import usePermissions from '../../../composables/Permissions.js'
 import Alerts from '../../../services/alerts.js'
 import InstanceForm from '../components/InstanceForm.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useContextStore } from '@/stores/context.js'
 
 export default {
@@ -49,7 +49,7 @@ export default {
     },
     computed: {
         ...mapState(useContextStore, ['team']),
-        ...mapVuexState('account', ['features'])
+        ...mapState(useAccountSettingsStore, ['features'])
     },
     mounted () {
         this.checkAccess()
diff --git a/frontend/src/pages/instance/Settings/Danger.vue b/frontend/src/pages/instance/Settings/Danger.vue
index cf92d83f8c..02cae55528 100644
--- a/frontend/src/pages/instance/Settings/Danger.vue
+++ b/frontend/src/pages/instance/Settings/Danger.vue
@@ -135,7 +135,6 @@
 
 import { mapState } from 'pinia'
 import { useRouter } from 'vue-router'
-import { mapState as mapVuexState } from 'vuex'
 
 import InstanceApi from '../../../api/instances.js'
 
@@ -147,6 +146,7 @@ import alerts from '../../../services/alerts.js'
 import ChangeStackDialog from './dialogs/ChangeStackDialog.vue'
 import ImportInstanceDialog from './dialogs/ImportInstanceDialog.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useContextStore } from '@/stores/context.js'
 
 export default {
@@ -183,7 +183,7 @@ export default {
     },
     computed: {
         ...mapState(useContextStore, ['team']),
-        ...mapVuexState('account', ['features']),
+        ...mapState(useAccountSettingsStore, ['features']),
         isLoading () {
             return this.loading.deleting || this.loading.suspend || this.loading.changingStack || this.loading.duplicating || this.loading.settingType
         }
diff --git a/frontend/src/pages/instance/Settings/General.vue b/frontend/src/pages/instance/Settings/General.vue
index 138bce179a..795acbfb8d 100644
--- a/frontend/src/pages/instance/Settings/General.vue
+++ b/frontend/src/pages/instance/Settings/General.vue
@@ -97,7 +97,6 @@ import { BadgeCheckIcon, ExclamationIcon, RefreshIcon } from '@heroicons/vue/sol
 
 import { mapState } from 'pinia'
 import SemVer from 'semver'
-import { mapState as mapVuexState } from 'vuex'
 
 import instanceAPI from '../../../api/instances.js'
 
@@ -110,6 +109,7 @@ import Dialog from '../../../services/dialog.js'
 
 import DangerSettings from './Danger.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useContextStore } from '@/stores/context.js'
 
 export default {
@@ -167,7 +167,7 @@ export default {
     },
     computed: {
         ...mapState(useContextStore, ['team']),
-        ...mapVuexState('account', ['features', 'settings']),
+        ...mapState(useAccountSettingsStore, ['features', 'settings']),
         isHA () {
             return !!this.instance?.ha
         },
diff --git a/frontend/src/pages/instance/Settings/HighAvailability.vue b/frontend/src/pages/instance/Settings/HighAvailability.vue
index 889a88b255..1642c8e136 100644
--- a/frontend/src/pages/instance/Settings/HighAvailability.vue
+++ b/frontend/src/pages/instance/Settings/HighAvailability.vue
@@ -40,7 +40,6 @@
 
 <script>
 import { mapState } from 'pinia'
-import { mapState as mapVuexState } from 'vuex'
 
 import InstanceApi from '../../../api/instances.js'
 
@@ -84,7 +83,6 @@ export default {
     },
     computed: {
         ...mapState(useContextStore, ['team']),
-        ...mapVuexState('account', ['features']),
         isHA () {
             return this.instance?.ha?.replicas !== undefined
         },
diff --git a/frontend/src/pages/instance/Settings/Maintenance.vue b/frontend/src/pages/instance/Settings/Maintenance.vue
index 7191d4b966..a10d11013d 100644
--- a/frontend/src/pages/instance/Settings/Maintenance.vue
+++ b/frontend/src/pages/instance/Settings/Maintenance.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="maintenance">
         <section data-el="scheduled-upgrade" class="scheduled-upgrade">
-            <FeatureUnavailable v-if="!isInstanceAutoStackUpdateFeatureEnabledForPlatform" />
+            <FeatureUnavailable v-if="!featuresCheck.isInstanceAutoStackUpdateFeatureEnabledForPlatform" />
             <FormHeading>Scheduled Restarts/Upgrades</FormHeading>
             <FormRow v-model="scheduledUpgrade.enabled" :disabled="!allowDisable" type="checkbox" class="mt-5" container-class="max-w-xl">
                 Enabled
@@ -58,16 +58,15 @@
 
 <script>
 import { mapState } from 'pinia'
-import { mapState as mapVuexState } from 'vuex'
 
 import instanceApi from '../../../api/instances.js'
 import FormHeading from '../../../components/FormHeading.vue'
 import FormRow from '../../../components/FormRow.vue'
 import FeatureUnavailable from '../../../components/banners/FeatureUnavailable.vue'
-import featuresMixin from '../../../mixins/Features.js'
 import Alerts from '../../../services/alerts.js'
 import DateTimePicker from '../../../ui-components/components/form/DateTime.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useContextStore } from '@/stores/context.js'
 
 export default {
@@ -78,7 +77,6 @@ export default {
         FormRow,
         FormHeading
     },
-    mixins: [featuresMixin],
     props: {
         project: {
             type: Object,
@@ -138,8 +136,8 @@ export default {
         }
     },
     computed: {
+        ...mapState(useAccountSettingsStore, ['featuresCheck']),
         ...mapState(useContextStore, ['team']),
-        ...mapVuexState('account', ['features', 'settings']),
         saveButton () {
             return {
                 visible: true,
diff --git a/frontend/src/pages/instance/Settings/Palette.vue b/frontend/src/pages/instance/Settings/Palette.vue
index 9e871c95fa..8a276f1479 100644
--- a/frontend/src/pages/instance/Settings/Palette.vue
+++ b/frontend/src/pages/instance/Settings/Palette.vue
@@ -11,7 +11,6 @@
 
 import { mapState } from 'pinia'
 import { useRouter } from 'vue-router'
-import { mapState as mapVuexState } from 'vuex'
 
 import InstanceApi from '../../../api/instances.js'
 import usePermissions from '../../../composables/Permissions.js'
@@ -29,6 +28,7 @@ import {
     templateFields
 } from '../../admin/Template/utils.js'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useContextStore } from '@/stores/context.js'
 
 export default {
@@ -74,7 +74,7 @@ export default {
     },
     computed: {
         ...mapState(useContextStore, ['team']),
-        ...mapVuexState('account', ['features']),
+        ...mapState(useAccountSettingsStore, ['features']),
         catalogFeatureEnabledForTeam () {
             if (!this.features.customCatalogs) {
                 return false
diff --git a/frontend/src/pages/instance/Settings/ProtectInstance.vue b/frontend/src/pages/instance/Settings/ProtectInstance.vue
index 60b4efca1f..f96c5bf122 100644
--- a/frontend/src/pages/instance/Settings/ProtectInstance.vue
+++ b/frontend/src/pages/instance/Settings/ProtectInstance.vue
@@ -24,7 +24,6 @@
 
 <script>
 import { mapState } from 'pinia'
-import { mapState as mapVuexState } from 'vuex'
 
 import InstanceApi from '../../../api/instances.js'
 
@@ -67,7 +66,6 @@ export default {
     },
     computed: {
         ...mapState(useContextStore, ['team', 'teamMembership']),
-        ...mapVuexState('account', ['features']),
         isProtected () {
             return this.instance?.protected?.enabled
         },
diff --git a/frontend/src/pages/instance/Settings/Security.vue b/frontend/src/pages/instance/Settings/Security.vue
index ffc7dd2f2c..a186a12ecc 100644
--- a/frontend/src/pages/instance/Settings/Security.vue
+++ b/frontend/src/pages/instance/Settings/Security.vue
@@ -44,12 +44,10 @@ import { mapState } from 'pinia'
 import SemVer from 'semver'
 import { markRaw } from 'vue'
 import { useRouter } from 'vue-router'
-import { mapState as mapVuexState } from 'vuex'
 
 import InstanceApi from '../../../api/instances.js'
 import FormHeading from '../../../components/FormHeading.vue'
 import usePermissions from '../../../composables/Permissions.js'
-import featuresMixin from '../../../mixins/Features.js'
 import Dialog from '../../../services/dialog.js'
 import TokenCreated from '../../account/Security/dialogs/TokenCreated.vue'
 import ExpiryCell from '../../account/components/ExpiryCell.vue'
@@ -66,6 +64,7 @@ import {
 
 import TokenDialog from './dialogs/TokenDialog.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useContextStore } from '@/stores/context.js'
 
 export default {
@@ -77,7 +76,6 @@ export default {
         TokenCreated,
         TokenDialog
     },
-    mixins: [featuresMixin],
     inheritAttrs: false,
     props: {
         project: {
@@ -122,8 +120,8 @@ export default {
         }
     },
     computed: {
+        ...mapState(useAccountSettingsStore, ['featuresCheck', 'settings']),
         ...mapState(useContextStore, ['team']),
-        ...mapVuexState('account', ['settings']),
         projectLauncherCompatible () {
             const launcherVersion = this.project?.meta?.versions?.launcher
             if (!launcherVersion) {
@@ -174,24 +172,26 @@ export default {
         },
         'editable.settings.httpNodeAuth_type': {
             handler (v) {
-                if (v === 'flowforge-user') {
+                if (v === 'flowforge-user' && this.hasPermission('project:edit', { application: this.project.application })) {
                     this.getTokens()
                 }
             }
         }
     },
     mounted () {
-        this.checkAccess()
+        if (!this.checkAccess()) return
         this.getSettings()
-        if (this.isHTTPBearerTokensFeatureEnabled()) {
+        if (this.featuresCheck.isHTTPBearerTokensFeatureEnabled) {
             this.getTokens()
         }
     },
     methods: {
-        checkAccess: async function () {
+        checkAccess: function () {
             if (!this.hasPermission('project:edit', { application: this.project.application })) {
                 useRouter().push({ replace: true, path: 'general' })
+                return false
             }
+            return true
         },
         getSettings: function () {
             if (this.project.template) {
@@ -263,8 +263,13 @@ export default {
             }
         },
         async getTokens () {
-            const response = await InstanceApi.getHTTPTokens(this.project.id)
-            this.tokens = response.tokens
+            try {
+                const response = await InstanceApi.getHTTPTokens(this.project.id)
+                this.tokens = response.tokens
+            } catch (_) {
+                // 403 can occur when the user is an application-level owner but only a team-level
+                // viewer/member — the server checks team membership for this endpoint
+            }
         },
         newToken () {
             this.$refs.tokenDialog.showCreate()
diff --git a/frontend/src/pages/instance/Settings/index.vue b/frontend/src/pages/instance/Settings/index.vue
index 8d9beaffe8..8d3cb83b19 100644
--- a/frontend/src/pages/instance/Settings/index.vue
+++ b/frontend/src/pages/instance/Settings/index.vue
@@ -39,13 +39,13 @@
 
 <script>
 import { mapState } from 'pinia'
-import { mapState as mapVuexState } from 'vuex'
 
 import SectionSideMenu from '../../../components/SectionSideMenu.vue'
 import SectionTopMenu from '../../../components/SectionTopMenu.vue'
 import usePermissions from '../../../composables/Permissions.js'
 import instanceActionsMixin from '../../../mixins/InstanceActions.js'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useContextStore } from '@/stores/context.js'
 
 export default {
@@ -84,7 +84,7 @@ export default {
     },
     computed: {
         ...mapState(useContextStore, ['team']),
-        ...mapVuexState('account', ['features', 'settings']),
+        ...mapState(useAccountSettingsStore, ['features', 'settings']),
         navigation () {
             const canEditProject = this.hasPermission('project:edit', { application: this.instance.application })
 
diff --git a/frontend/src/pages/instance/VersionHistory/Snapshots/dialogs/SnapshotCreateDialog.vue b/frontend/src/pages/instance/VersionHistory/Snapshots/dialogs/SnapshotCreateDialog.vue
index 2108418625..2c81757033 100644
--- a/frontend/src/pages/instance/VersionHistory/Snapshots/dialogs/SnapshotCreateDialog.vue
+++ b/frontend/src/pages/instance/VersionHistory/Snapshots/dialogs/SnapshotCreateDialog.vue
@@ -104,7 +104,7 @@
 
 import { ClockIcon, CubeTransparentIcon } from '@heroicons/vue/outline'
 import { ChevronRightIcon, QuestionMarkCircleIcon } from '@heroicons/vue/solid'
-import { mapGetters } from 'vuex'
+import { mapState } from 'pinia'
 
 import instanceApi from '../../../../../api/instances.js'
 import snapshotApi from '../../../../../api/projectSnapshots.js'
@@ -114,6 +114,8 @@ import PipelineIcon from '../../../../../components/icons/Pipelines.js'
 import alerts from '../../../../../services/alerts.js'
 import PopoverItem from '../../../../../ui-components/components/PopoverItem.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
+
 export default {
     name: 'SnapshotCreateDialog',
     components: {
@@ -158,7 +160,7 @@ export default {
         }
     },
     computed: {
-        ...mapGetters('account', ['featuresCheck']),
+        ...mapState(useAccountSettingsStore, ['featuresCheck']),
         formValid () {
             return !this.submitted && !!(this.input.name)
         }
diff --git a/frontend/src/pages/instance/VersionHistory/Timeline/index.vue b/frontend/src/pages/instance/VersionHistory/Timeline/index.vue
index 44e5cb2370..8523cb4bc8 100644
--- a/frontend/src/pages/instance/VersionHistory/Timeline/index.vue
+++ b/frontend/src/pages/instance/VersionHistory/Timeline/index.vue
@@ -1,8 +1,8 @@
 <template>
     <div id="hosted-instance-timeline" class="flex-1 flex flex-col overflow-auto">
-        <FeatureUnavailable v-if="!isTimelineFeatureEnabledForPlatform" />
-        <FeatureUnavailableToTeam v-else-if="!isTimelineFeatureEnabledForTeam" />
-        <section v-if="isTimelineFeatureEnabled" id="visual-timeline" class="relative flex-1 flex flex-col overflow-auto">
+        <FeatureUnavailable v-if="!featuresCheck.isTimelineFeatureEnabledForPlatform" />
+        <FeatureUnavailableToTeam v-else-if="!featuresCheck.isTimelineFeatureEnabledForTeam" />
+        <section v-if="featuresCheck.isTimelineFeatureEnabled" id="visual-timeline" class="relative flex-1 flex flex-col overflow-auto">
             <transition-group name="fade">
                 <ff-loading v-if="loading" message="Loading Timeline..." class="absolute top-0" />
                 <ul v-else ref="timeline" data-el="timeline-list" class="timeline overflow-auto">
@@ -47,6 +47,8 @@
 </template>
 
 <script>
+import { mapState } from 'pinia'
+
 import versionHistoryAPI from '../../../../api/versionHistory.js'
 import EmptyState from '../../../../components/EmptyState.vue'
 import FeatureUnavailable from '../../../../components/banners/FeatureUnavailable.vue'
@@ -55,10 +57,11 @@ import AssetDetailDialog from '../../../../components/dialogs/AssetDetailDialog.
 import SnapshotEditDialog from '../../../../components/dialogs/SnapshotEditDialog.vue'
 import TimelineEvent from '../../../../components/version-history/timeline/TimelineEvent.vue'
 import { scrollTo } from '../../../../composables/Ux.js'
-import featuresMixin from '../../../../mixins/Features.js'
 import snapshotsMixin from '../../../../mixins/Snapshots.js'
 import SnapshotExportDialog from '../../../application/Snapshots/components/dialogs/SnapshotExportDialog.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
+
 export default {
     name: 'HistoryTimeline',
     components: {
@@ -70,7 +73,7 @@ export default {
         AssetDetailDialog,
         TimelineEvent
     },
-    mixins: [snapshotsMixin, featuresMixin],
+    mixins: [snapshotsMixin],
     inheritAttrs: false,
     props: {
         instance: {
@@ -91,6 +94,7 @@ export default {
         }
     },
     computed: {
+        ...mapState(useAccountSettingsStore, ['featuresCheck']),
         canLoadMore () {
             return this.next_cursor !== undefined
         },
@@ -117,7 +121,7 @@ export default {
     },
     methods: {
         async fetchData (loadMore = false) {
-            if (this.isTimelineFeatureEnabled) {
+            if (this.featuresCheck.isTimelineFeatureEnabled) {
                 if (!loadMore) {
                     this.loading = true
                 }
diff --git a/frontend/src/pages/instance/VersionHistory/index.vue b/frontend/src/pages/instance/VersionHistory/index.vue
index 2d37768605..c60ca82ed8 100644
--- a/frontend/src/pages/instance/VersionHistory/index.vue
+++ b/frontend/src/pages/instance/VersionHistory/index.vue
@@ -82,7 +82,6 @@ import SectionTopMenu from '../../../components/SectionTopMenu.vue'
 import SnapshotImportDialog from '../../../components/dialogs/SnapshotImportDialog.vue'
 import ToggleButtonGroup from '../../../components/elements/ToggleButtonGroup.vue'
 import usePermissions from '../../../composables/Permissions.js'
-import featuresMixin from '../../../mixins/Features.js'
 
 import Alerts from '../../../services/alerts.js'
 
@@ -98,7 +97,6 @@ export default {
         UploadIcon,
         SectionTopMenu
     },
-    mixins: [featuresMixin],
     inheritAttrs: false,
     props: {
         instance: {
diff --git a/frontend/src/pages/instance/components/InstanceForm.vue b/frontend/src/pages/instance/components/InstanceForm.vue
index 9af1d9e6d0..80aa3f97d8 100644
--- a/frontend/src/pages/instance/components/InstanceForm.vue
+++ b/frontend/src/pages/instance/components/InstanceForm.vue
@@ -237,7 +237,6 @@
 <script>
 import { CheckCircleIcon, FolderIcon, RefreshIcon } from '@heroicons/vue/outline'
 import { mapActions, mapState } from 'pinia'
-import { mapGetters, mapState as mapVuexState } from 'vuex'
 
 import billingApi from '../../../api/billing.js'
 import instanceTypesApi from '../../../api/instanceTypes.js'
@@ -261,6 +260,7 @@ import ExportInstanceComponents from './ExportImportComponents.vue'
 import InstanceChargesTable from './InstanceChargesTable.vue'
 import InstanceCreditBanner from './InstanceCreditBanner.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useAccountStore } from '@/stores/account.js'
 
 export default {
@@ -388,8 +388,7 @@ export default {
     },
     computed: {
         ...mapState(useAccountStore, ['blueprints', 'defaultBlueprint']),
-        ...mapVuexState('account', ['settings']),
-        ...mapGetters('account', ['featuresCheck']),
+        ...mapState(useAccountSettingsStore, ['settings', 'featuresCheck']),
         creatingApplication () {
             return (this.applicationSelection && !this.applications.length) || (this.creatingNew && this.applicationFieldsVisible)
         },
diff --git a/frontend/src/pages/instance/index.vue b/frontend/src/pages/instance/index.vue
index 3d2927fef1..82e1e25491 100644
--- a/frontend/src/pages/instance/index.vue
+++ b/frontend/src/pages/instance/index.vue
@@ -86,7 +86,6 @@ import TeamTrialBanner from '../../components/banners/TeamTrial.vue'
 import InstanceActionsButton from '../../components/instance/ActionButton.vue'
 import usePermissions from '../../composables/Permissions.js'
 
-import featuresMixin from '../../mixins/Features.js'
 import instanceMixin from '../../mixins/Instance.js'
 
 import ConfirmInstanceDeleteDialog from './Settings/dialogs/ConfirmInstanceDeleteDialog.vue'
@@ -94,6 +93,7 @@ import DashboardLink from './components/DashboardLink.vue'
 import InstanceEditorLink from './components/EditorLink.vue'
 import InstanceStatusBadge from './components/InstanceStatusBadge.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useContextStore } from '@/stores/context.js'
 
 export default {
@@ -110,7 +110,7 @@ export default {
         InstanceEditorLink,
         LockClosedIcon
     },
-    mixins: [instanceMixin, featuresMixin],
+    mixins: [instanceMixin],
     setup () {
         const { hasPermission, isVisitingAdmin } = usePermissions()
 
@@ -128,11 +128,12 @@ export default {
         }
     },
     computed: {
+        ...mapState(useAccountSettingsStore, ['featuresCheck']),
         ...mapState(useContextStore, ['team']),
         navigation () {
             if (!this.instance.id) return []
             let versionHistoryRoute
-            if (!this.isTimelineFeatureEnabled) {
+            if (!this.featuresCheck.isTimelineFeatureEnabled) {
                 versionHistoryRoute = {
                     name: 'instance-snapshots',
                     params: { id: this.instance.id }
diff --git a/frontend/src/pages/team/Applications/index.vue b/frontend/src/pages/team/Applications/index.vue
index e60997d9bc..ad4b4c992b 100644
--- a/frontend/src/pages/team/Applications/index.vue
+++ b/frontend/src/pages/team/Applications/index.vue
@@ -104,7 +104,6 @@
 import { PlusSmIcon, SearchIcon } from '@heroicons/vue/outline'
 
 import { mapState } from 'pinia'
-import { mapGetters } from 'vuex'
 
 import teamApi from '../../../api/team.js'
 import EmptyState from '../../../components/EmptyState.vue'
@@ -140,7 +139,6 @@ export default {
     },
     computed: {
         ...mapState(useContextStore, ['team']),
-        ...mapGetters('account', ['featuresCheck']),
         applicationsList () {
             return Array.from(this.applications.values())
         },
diff --git a/frontend/src/pages/team/BOM/index.vue b/frontend/src/pages/team/BOM/index.vue
index a33cce66d5..ca89290e16 100644
--- a/frontend/src/pages/team/BOM/index.vue
+++ b/frontend/src/pages/team/BOM/index.vue
@@ -73,7 +73,6 @@
 <script>
 import { SearchIcon } from '@heroicons/vue/outline'
 import { mapState } from 'pinia'
-import { mapGetters } from 'vuex'
 
 import teamApi from '../../../api/team.js'
 
@@ -83,6 +82,7 @@ import FeatureUnavailableToTeam from '../../../components/banners/FeatureUnavail
 import BomDependencies from '../../../components/bill-of-materials/BomDependencies.vue'
 import usePermissions from '../../../composables/Permissions.js'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useContextStore } from '@/stores/context.js'
 
 export default {
@@ -109,7 +109,7 @@ export default {
     },
     computed: {
         ...mapState(useContextStore, ['team']),
-        ...mapGetters('account', ['featuresCheck']),
+        ...mapState(useAccountSettingsStore, ['featuresCheck']),
         payload () {
             const payload = { children: [] }
             this.intermediaryPayload.forEach(app => {
diff --git a/frontend/src/pages/team/Brokers/ChooseBroker.vue b/frontend/src/pages/team/Brokers/ChooseBroker.vue
index 8acb0c28c7..9c1ad7fc7a 100644
--- a/frontend/src/pages/team/Brokers/ChooseBroker.vue
+++ b/frontend/src/pages/team/Brokers/ChooseBroker.vue
@@ -49,10 +49,10 @@
 
 import { CheckIcon, MinusIcon } from '@heroicons/vue/outline'
 import { mapState } from 'pinia'
-import { mapGetters } from 'vuex'
 
 import MediumTile from '../../../components/tiles/MediumTile.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useProductBrokersStore } from '@/stores/product-brokers.js'
 
 export default {
@@ -64,7 +64,7 @@ export default {
     },
     computed: {
         ...mapState(useProductBrokersStore, ['hasFfUnsClients', 'hasBrokers']),
-        ...mapGetters('account', ['featuresCheck']),
+        ...mapState(useAccountSettingsStore, ['featuresCheck']),
         options () {
             return [
                 {
diff --git a/frontend/src/pages/team/Brokers/Clients/index.vue b/frontend/src/pages/team/Brokers/Clients/index.vue
index 60d1d1fd40..f8de83d60e 100644
--- a/frontend/src/pages/team/Brokers/Clients/index.vue
+++ b/frontend/src/pages/team/Brokers/Clients/index.vue
@@ -95,7 +95,6 @@
 <script>
 import { PlusSmIcon, RssIcon, SearchIcon } from '@heroicons/vue/outline'
 import { mapActions, mapState } from 'pinia'
-import { mapState as mapVuexState } from 'vuex'
 
 import brokerApi from '../../../../api/broker.js'
 import EmptyState from '../../../../components/EmptyState.vue'
@@ -104,7 +103,6 @@ import usePermissions from '../../../../composables/Permissions.js'
 import { getTeamProperty } from '../../../../composables/TeamProperties.js'
 import { slugify } from '../../../../composables/strings/String.js'
 import clipboardMixin from '../../../../mixins/Clipboard.js'
-import featuresMixin from '../../../../mixins/Features.js'
 import Alerts from '../../../../services/alerts.js'
 import Dialog from '../../../../services/dialog.js'
 import { Roles } from '../../../../utils/roles.js'
@@ -127,7 +125,7 @@ export default {
         EmptyState,
         ClientDialog
     },
-    mixins: [featuresMixin, clipboardMixin],
+    mixins: [clipboardMixin],
     setup () {
         const { hasPermission, hasAMinimumTeamRoleOf } = usePermissions()
 
@@ -144,7 +142,6 @@ export default {
             return Roles
         },
         ...mapState(useContextStore, ['team']),
-        ...mapVuexState('account', ['features']),
         ...mapState(useProductBrokersStore, {
             clients: state => state.UNS.clients
         }),
diff --git a/frontend/src/pages/team/Brokers/Hierarchy/TopicHierarchy/index.vue b/frontend/src/pages/team/Brokers/Hierarchy/TopicHierarchy/index.vue
index 56d7abbc13..8c6c13c445 100644
--- a/frontend/src/pages/team/Brokers/Hierarchy/TopicHierarchy/index.vue
+++ b/frontend/src/pages/team/Brokers/Hierarchy/TopicHierarchy/index.vue
@@ -81,7 +81,6 @@
 import { SearchIcon, StatusOnlineIcon, XIcon } from '@heroicons/vue/outline'
 import { RefreshIcon } from '@heroicons/vue/solid'
 import { mapActions, mapState } from 'pinia'
-import { mapGetters } from 'vuex'
 
 import EmptyState from '../../../../../components/EmptyState.vue'
 
@@ -89,6 +88,7 @@ import MainTitle from '../components/MainTitle.vue'
 
 import TopicSegment from '../components/TopicSegment.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useProductBrokersStore } from '@/stores/product-brokers.js'
 
 export default {
@@ -127,7 +127,7 @@ export default {
         }
     },
     computed: {
-        ...mapGetters('account', ['featuresCheck']),
+        ...mapState(useAccountSettingsStore, ['featuresCheck']),
         ...mapState(useProductBrokersStore, ['brokerExpandedTopics']),
         brokerId () {
             return this.$route.params.brokerId
diff --git a/frontend/src/pages/team/Brokers/NewBroker.vue b/frontend/src/pages/team/Brokers/NewBroker.vue
index be3d515b98..9af100afb2 100644
--- a/frontend/src/pages/team/Brokers/NewBroker.vue
+++ b/frontend/src/pages/team/Brokers/NewBroker.vue
@@ -4,18 +4,19 @@
 
 <script>
 
-import { mapActions } from 'pinia'
-import { mapGetters } from 'vuex'
+import { mapActions, mapState } from 'pinia'
 
 import BrokerForm from './components/BrokerForm.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
+
 import { useProductBrokersStore } from '@/stores/product-brokers.js'
 
 export default {
     name: 'NewBroker',
     components: { BrokerForm },
     computed: {
-        ...mapGetters('account', ['featuresCheck'])
+        ...mapState(useAccountSettingsStore, ['featuresCheck'])
     },
     mounted () {
         if (!this.featuresCheck.isExternalMqttBrokerFeatureEnabled) {
diff --git a/frontend/src/pages/team/Brokers/index.vue b/frontend/src/pages/team/Brokers/index.vue
index 0ad47f6160..75168a4bdc 100644
--- a/frontend/src/pages/team/Brokers/index.vue
+++ b/frontend/src/pages/team/Brokers/index.vue
@@ -78,7 +78,6 @@
 
 import { PlusIcon } from '@heroicons/vue/outline'
 import { mapActions, mapState } from 'pinia'
-import { mapGetters } from 'vuex'
 
 import brokerAPI from '../../../api/broker.js'
 
@@ -90,6 +89,7 @@ import { Roles } from '../../../utils/roles.js'
 
 import BrokerStatusBadge from './components/BrokerStatusBadge.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useAccountStore } from '@/stores/account.js'
 import { useContextStore } from '@/stores/context.js'
 import { useProductBrokersStore } from '@/stores/product-brokers.js'
@@ -118,7 +118,7 @@ export default {
     computed: {
         ...mapState(useContextStore, ['team']),
         ...mapState(useAccountStore, ['pendingTeamChange']),
-        ...mapGetters('account', ['featuresCheck']),
+        ...mapState(useAccountSettingsStore, ['featuresCheck']),
         ...mapState(useProductBrokersStore, ['hasFfUnsClients', 'hasBrokers']),
         ...mapState(useProductBrokersStore, {
             brokers: state => state.UNS.brokers
diff --git a/frontend/src/pages/team/DeviceGroups/index.vue b/frontend/src/pages/team/DeviceGroups/index.vue
index ed61fdbfe7..8cd2e766de 100644
--- a/frontend/src/pages/team/DeviceGroups/index.vue
+++ b/frontend/src/pages/team/DeviceGroups/index.vue
@@ -118,7 +118,6 @@
 import { PlusSmIcon } from '@heroicons/vue/outline'
 import { mapState } from 'pinia'
 import { markRaw } from 'vue'
-import { mapGetters } from 'vuex'
 
 import ApplicationAPI from '../../../api/application.js'
 
@@ -132,6 +131,7 @@ import FfButton from '../../../ui-components/components/Button.vue'
 import FfListbox from '../../../ui-components/components/form/ListBox.vue'
 import TargetSnapshotCell from '../../application/components/cells/TargetSnapshot.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useContextStore } from '@/stores/context.js'
 
 export default {
@@ -195,7 +195,7 @@ export default {
     },
     computed: {
         ...mapState(useContextStore, ['team']),
-        ...mapGetters('account', ['featuresCheck']),
+        ...mapState(useAccountSettingsStore, ['featuresCheck']),
         applicationOptions () {
             return this.applications
                 .filter(application => this.hasPermission('device:create', { application }))
diff --git a/frontend/src/pages/team/Devices/dialogs/ProvisioningCredentialsDialog.vue b/frontend/src/pages/team/Devices/dialogs/ProvisioningCredentialsDialog.vue
index f3c2eacd81..be6b107463 100644
--- a/frontend/src/pages/team/Devices/dialogs/ProvisioningCredentialsDialog.vue
+++ b/frontend/src/pages/team/Devices/dialogs/ProvisioningCredentialsDialog.vue
@@ -20,12 +20,14 @@
 <script>
 
 import { DocumentDownloadIcon } from '@heroicons/vue/outline'
-import { mapState } from 'vuex'
+import { mapState } from 'pinia'
 
 import { downloadData } from '../../../../composables/Download.js'
 import clipboardMixin from '../../../../mixins/Clipboard.js'
 import Alerts from '../../../../services/alerts.js'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
+
 export default {
     name: 'ProvisioningCredentialsDialog',
     components: {
@@ -56,7 +58,7 @@ export default {
         }
     },
     computed: {
-        ...mapState('account', ['settings']),
+        ...mapState(useAccountSettingsStore, ['settings']),
         hasCredentials: function () {
             return !!this.token?.token
         },
diff --git a/frontend/src/pages/team/Devices/dialogs/TeamDeviceCreateDialog.vue b/frontend/src/pages/team/Devices/dialogs/TeamDeviceCreateDialog.vue
index 5738a1bb9f..7d7b3b7ec7 100644
--- a/frontend/src/pages/team/Devices/dialogs/TeamDeviceCreateDialog.vue
+++ b/frontend/src/pages/team/Devices/dialogs/TeamDeviceCreateDialog.vue
@@ -43,7 +43,6 @@
 
 <script>
 import { mapState } from 'pinia'
-import { mapState as mapVuexState } from 'vuex'
 
 import billingApi from '../../../../api/billing.js'
 import devicesApi from '../../../../api/devices.js'
@@ -57,6 +56,7 @@ import alerts from '../../../../services/alerts.js'
 
 import InstanceChargesTable from '../../../instance/components/InstanceChargesTable.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useContextStore } from '@/stores/context.js'
 
 export default {
@@ -121,7 +121,7 @@ export default {
     },
     computed: {
         ...mapState(useContextStore, ['team']),
-        ...mapVuexState('account', ['features']),
+        ...mapState(useAccountSettingsStore, ['features']),
         deviceIsBillable () {
             let freeAllocation = getTeamProperty(this.team, 'devices.free') || 0
             let deviceCount = this.teamDeviceCount
diff --git a/frontend/src/pages/team/Devices/dialogs/components/DeviceCredentialsDialog/ManualInstall.vue b/frontend/src/pages/team/Devices/dialogs/components/DeviceCredentialsDialog/ManualInstall.vue
index 3b08f5c6b6..554aff0c75 100644
--- a/frontend/src/pages/team/Devices/dialogs/components/DeviceCredentialsDialog/ManualInstall.vue
+++ b/frontend/src/pages/team/Devices/dialogs/components/DeviceCredentialsDialog/ManualInstall.vue
@@ -20,12 +20,14 @@
 
 <script>
 import { ClipboardCopyIcon, DocumentDownloadIcon } from '@heroicons/vue/outline'
-import { mapState } from 'vuex'
+import { mapState } from 'pinia'
 
 import { downloadData } from '../../../../../../composables/Download.js'
 import clipboardMixin from '../../../../../../mixins/Clipboard.js'
 import Alerts from '../../../../../../services/alerts.js'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
+
 export default {
     name: 'ManualInstall',
     components: {
@@ -40,7 +42,7 @@ export default {
         }
     },
     computed: {
-        ...mapState('account', ['settings']),
+        ...mapState(useAccountSettingsStore, ['settings']),
         credentials () {
             let result = `deviceId: ${this.device.id}
 token: ${this.device.credentials.token}
diff --git a/frontend/src/pages/team/Devices/dialogs/components/DeviceCredentialsDialog/NpmInstallContent.vue b/frontend/src/pages/team/Devices/dialogs/components/DeviceCredentialsDialog/NpmInstallContent.vue
index 75e5ae7569..4d05c266f3 100644
--- a/frontend/src/pages/team/Devices/dialogs/components/DeviceCredentialsDialog/NpmInstallContent.vue
+++ b/frontend/src/pages/team/Devices/dialogs/components/DeviceCredentialsDialog/NpmInstallContent.vue
@@ -32,11 +32,13 @@
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import { mapState } from 'pinia'
 
 import ManualInstall from './ManualInstall.vue'
 import TerminalCommandSection from './TerminalCommandSection.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
+
 const OS_CONFIG = {
     windows: {
         installTitle: 'Open Command Prompt or PowerShell as administrator and run:',
@@ -67,7 +69,7 @@ export default {
         }
     },
     computed: {
-        ...mapState('account', ['settings']),
+        ...mapState(useAccountSettingsStore, ['settings']),
         installTitle () {
             return OS_CONFIG[this.os]?.installTitle ?? ''
         },
diff --git a/frontend/src/pages/team/Devices/dialogs/components/DeviceCredentialsDialog/ScriptInstallContent.vue b/frontend/src/pages/team/Devices/dialogs/components/DeviceCredentialsDialog/ScriptInstallContent.vue
index ab17c4ba9b..edb9bf2f50 100644
--- a/frontend/src/pages/team/Devices/dialogs/components/DeviceCredentialsDialog/ScriptInstallContent.vue
+++ b/frontend/src/pages/team/Devices/dialogs/components/DeviceCredentialsDialog/ScriptInstallContent.vue
@@ -13,10 +13,12 @@
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import { mapState } from 'pinia'
 
 import TerminalCommandSection from './TerminalCommandSection.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
+
 const OS_CONFIG = {
     windows: {
         title: 'Open an elevated Command Prompt and run:',
@@ -47,7 +49,7 @@ export default {
         }
     },
     computed: {
-        ...mapState('account', ['settings']),
+        ...mapState(useAccountSettingsStore, ['settings']),
         title () {
             return OS_CONFIG[this.os]?.title ?? ''
         },
diff --git a/frontend/src/pages/team/Home/index.vue b/frontend/src/pages/team/Home/index.vue
index 4afef64adb..e58d463230 100644
--- a/frontend/src/pages/team/Home/index.vue
+++ b/frontend/src/pages/team/Home/index.vue
@@ -132,7 +132,6 @@
 import { ChipIcon, DatabaseIcon, PlusIcon } from '@heroicons/vue/outline'
 
 import { mapState } from 'pinia'
-import { mapGetters } from 'vuex'
 
 import TeamAPI from '../../../api/team.js'
 import AuditLog from '../../../components/audit-log/AuditLog.vue'
@@ -149,6 +148,7 @@ import DashboardSection from './components/DashboardSection.vue'
 import RecentlyModifiedDevices from './components/RecentlyModifiedDevices.vue'
 import RecentlyModifiedInstances from './components/RecentlyModifiedInstances.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useAccountStore } from '@/stores/account.js'
 import { useContextStore } from '@/stores/context.js'
 import { useUxToursStore } from '@/stores/ux-tours.js'
@@ -197,7 +197,7 @@ export default {
         ...mapState(useUxToursStore, ['tours']),
         ...mapState(useContextStore, ['team']),
         ...mapState(useAccountStore, ['pendingTeamChange']),
-        ...mapGetters('account', ['featuresCheck']),
+        ...mapState(useAccountSettingsStore, ['featuresCheck']),
         instanceStats () {
             return this.groupBySimplifiedStates(this.instanceStateCounts)
         },
diff --git a/frontend/src/pages/team/Instances.vue b/frontend/src/pages/team/Instances.vue
index 337673106a..1b3a3c9deb 100644
--- a/frontend/src/pages/team/Instances.vue
+++ b/frontend/src/pages/team/Instances.vue
@@ -160,7 +160,6 @@
 import { PlusSmIcon } from '@heroicons/vue/outline'
 import { mapState } from 'pinia'
 import { markRaw } from 'vue'
-import { mapGetters } from 'vuex'
 
 import instanceApi from '../../api/instances.js'
 import teamApi from '../../api/team.js'
@@ -180,6 +179,7 @@ import DashboardLink from '../instance/components/DashboardLink.vue'
 import InstanceEditorLink from '../instance/components/EditorLink.vue'
 import InstanceStatusBadge from '../instance/components/InstanceStatusBadge.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useContextStore } from '@/stores/context.js'
 
 export default {
@@ -259,7 +259,7 @@ export default {
     },
     computed: {
         ...mapState(useContextStore, ['team']),
-        ...mapGetters('account', ['featuresCheck']),
+        ...mapState(useAccountSettingsStore, ['featuresCheck']),
         instances () {
             return Array.from(this.instancesMap.values())
         },
diff --git a/frontend/src/pages/team/Library/Blueprints.vue b/frontend/src/pages/team/Library/Blueprints.vue
index fc13ac84ba..a91ae40f99 100644
--- a/frontend/src/pages/team/Library/Blueprints.vue
+++ b/frontend/src/pages/team/Library/Blueprints.vue
@@ -15,7 +15,7 @@
             </div>
         </li>
     </ul>
-    <EmptyState v-else :featureUnavailable="!isBlueprintsFeatureEnabled" :featureUnavailableToTeam="!isBlueprintsFeatureEnabledForTeam">
+    <EmptyState v-else :featureUnavailable="!featuresCheck.isBlueprintsFeatureEnabled" :featureUnavailableToTeam="!featuresCheck.isBlueprintsFeatureEnabledForTeam">
         <template #img>
             <img src="../../../images/empty-states/team-library.png" alt="team-logo">
         </template>
@@ -31,7 +31,7 @@
             </p>
         </template>
         <template v-if="isAdminUser" #actions>
-            <ff-button v-if="isSharedLibraryFeatureEnabled" :to="{name: 'admin-flow-blueprints'}" data-el="go-to-blueprints">
+            <ff-button v-if="featuresCheck.isSharedLibraryFeatureEnabled" :to="{name: 'admin-flow-blueprints'}" data-el="go-to-blueprints">
                 Go To Blueprints
             </ff-button>
             <ff-button v-else :to="{name: 'admin-templates-template'}" :disabled="true">
@@ -49,9 +49,9 @@ import { mapState } from 'pinia'
 import flowBlueprintsApi from '../../../api/flowBlueprints.js'
 import EmptyState from '../../../components/EmptyState.vue'
 import BlueprintTile from '../../../components/blueprints/BlueprintTile.vue'
-import featuresMixin from '../../../mixins/Features.js'
 
 import { useAccountAuthStore } from '@/stores/account-auth.js'
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useContextStore } from '@/stores/context.js'
 
 export default {
@@ -61,13 +61,13 @@ export default {
         EmptyState,
         BlueprintTile
     },
-    mixins: [featuresMixin],
     data () {
         return {
             blueprints: []
         }
     },
     computed: {
+        ...mapState(useAccountSettingsStore, ['featuresCheck']),
         ...mapState(useContextStore, ['team']),
         ...mapState(useAccountAuthStore, ['isAdminUser']),
         blueprintsByCategory () {
@@ -85,7 +85,7 @@ export default {
     },
     methods: {
         async loadBlueprints () {
-            if (this.isBlueprintsFeatureEnabled && this.isBlueprintsFeatureEnabledForTeam) {
+            if (this.featuresCheck.isBlueprintsFeatureEnabled && this.featuresCheck.isBlueprintsFeatureEnabledForTeam) {
                 const res = await flowBlueprintsApi.getFlowBlueprintsForTeam(this.team.id)
                 if (Object.hasOwnProperty.call(res, 'blueprints')) {
                     this.blueprints = res.blueprints
diff --git a/frontend/src/pages/team/Library/Registry/Index.vue b/frontend/src/pages/team/Library/Registry/Index.vue
index 255b050865..039f3dfdc4 100644
--- a/frontend/src/pages/team/Library/Registry/Index.vue
+++ b/frontend/src/pages/team/Library/Registry/Index.vue
@@ -87,7 +87,6 @@
 <script>
 import { ArrowCircleUpIcon, RefreshIcon } from '@heroicons/vue/outline'
 import { mapState } from 'pinia'
-import { mapGetters, mapState as mapVuexState } from 'vuex'
 
 import TeamAPI from '../../../../api/team.js'
 
@@ -100,6 +99,7 @@ import RegistryEntry from './components/RegistryEntry.vue'
 
 import PublishNodeDialog from './dialogs/PublishNode.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useContextStore } from '@/stores/context.js'
 
 export default {
@@ -122,8 +122,7 @@ export default {
     },
     computed: {
         ...mapState(useContextStore, ['team']),
-        ...mapVuexState('account', ['settings']),
-        ...mapGetters('account', ['featuresCheck']),
+        ...mapState(useAccountSettingsStore, ['featuresCheck']),
         enabled () {
             return this.featuresCheck?.isPrivateRegistryFeatureEnabledForPlatform && this.featuresCheck?.isPrivateRegistryFeatureEnabledForTeam
         },
diff --git a/frontend/src/pages/team/Library/Registry/dialogs/PublishNode.vue b/frontend/src/pages/team/Library/Registry/dialogs/PublishNode.vue
index 56275343c0..977f99c0a8 100644
--- a/frontend/src/pages/team/Library/Registry/dialogs/PublishNode.vue
+++ b/frontend/src/pages/team/Library/Registry/dialogs/PublishNode.vue
@@ -66,13 +66,13 @@
 
 <script>
 import { mapState } from 'pinia'
-import { mapState as mapVuexState } from 'vuex'
 
 import TeamAPI from '../../../../../api/team.js'
 import CodeSnippet from '../../../../../components/CodeSnippet.vue'
 import CopySnippet from '../../../../../components/CopySnippet.vue'
 import Alerts from '../../../../instance/Settings/Alerts.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useContextStore } from '@/stores/context.js'
 
 export default {
@@ -101,7 +101,7 @@ export default {
     },
     computed: {
         ...mapState(useContextStore, ['team']),
-        ...mapVuexState('account', ['settings']),
+        ...mapState(useAccountSettingsStore, ['settings']),
         registryHost () {
             return this.settings ? this.settings['team:npm:registry'] : ''
         },
diff --git a/frontend/src/pages/team/Library/TeamLibrary.vue b/frontend/src/pages/team/Library/TeamLibrary.vue
index 4330a8a378..7a9deaf159 100644
--- a/frontend/src/pages/team/Library/TeamLibrary.vue
+++ b/frontend/src/pages/team/Library/TeamLibrary.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="ff-team-library overflow-auto flex flex-col">
         <SectionTopMenu hero="Team Library" info="Centralized management of common Javascript functions and Node-RED flows for your team." />
-        <div v-if="isSharedLibraryFeatureEnabled" class="breadcrumbs-wrapper">
+        <div v-if="featuresCheck.isSharedLibraryFeatureEnabled" class="breadcrumbs-wrapper">
             <div :class="{'ff-breadcrumbs': true, 'disable-last': !viewingFile}">
                 <span v-for="(crumb, $index) in breadcrumbs" :key="$index" class="flex items-center">
                     <label @click="entrySelected(crumb)">{{ crumb.name }}</label>
@@ -25,7 +25,7 @@
         <!-- file viewer -->
         <ff-flow-viewer v-else-if="viewingFile && file.meta.type === 'flows'" :flow="file?.contents" />
         <ff-code-previewer v-else-if="viewingFile && file.meta.type === 'functions'" ref="code-preview" :snippet="file?.contents" />
-        <EmptyState v-else :featureUnavailable="!isSharedLibraryFeatureEnabledForPlatform" :featureUnavailableToTeam="!isSharedLibraryFeatureEnabledForTeam">
+        <EmptyState v-else :featureUnavailable="!featuresCheck.isSharedLibraryFeatureEnabledForPlatform" :featureUnavailableToTeam="!featuresCheck.isSharedLibraryFeatureEnabledForTeam">
             <template #img>
                 <img src="../../../images/empty-states/team-library.png" alt="team-logo">
             </template>
@@ -39,7 +39,7 @@
                 </p>
             </template>
             <template #actions>
-                <ff-button v-if="isSharedLibraryFeatureEnabled" :to="{name: 'Instances'}" data-el="go-to-instances">Go To Instances</ff-button>
+                <ff-button v-if="featuresCheck.isSharedLibraryFeatureEnabled" :to="{name: 'Instances'}" data-el="go-to-instances">Go To Instances</ff-button>
                 <ff-button v-else :to="{name: 'Instances'}" :disabled="true">
                     Add To Library
                     <template #icon-right><PlusIcon /></template>
@@ -66,11 +66,11 @@ import SectionTopMenu from '../../../components/SectionTopMenu.vue'
 import FlowViewer from '../../../components/flow-viewer/FlowViewer.vue'
 import usePermissions from '../../../composables/Permissions.js'
 import formatDateMixin from '../../../mixins/DateTime.js'
-import featuresMixin from '../../../mixins/Features.js'
 import Alerts from '../../../services/alerts.js'
 import Dialog from '../../../services/dialog.js'
 import TypeIcon from '../components/LibraryEntryTypeIcon.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useContextStore } from '@/stores/context.js'
 
 export default {
@@ -84,7 +84,7 @@ export default {
         PlusIcon,
         SectionTopMenu
     },
-    mixins: [formatDateMixin, featuresMixin],
+    mixins: [formatDateMixin],
     setup () {
         const { hasPermission } = usePermissions()
 
@@ -116,6 +116,7 @@ export default {
         }
     },
     computed: {
+        ...mapState(useAccountSettingsStore, ['featuresCheck']),
         ...mapState(useContextStore, ['team'])
     },
     watch: {
@@ -158,7 +159,7 @@ export default {
             this.loadEntry(pathArray.filter((entry) => entry))
         },
         async loadEntry (entryPathArray) {
-            if (!this.isSharedLibraryFeatureEnabled || !this.hasPermission('library:entry:list')) {
+            if (!this.featuresCheck.isSharedLibraryFeatureEnabled || !this.hasPermission('library:entry:list')) {
                 return
             }
 
diff --git a/frontend/src/pages/team/Library/index.vue b/frontend/src/pages/team/Library/index.vue
index d0f8f7cf5c..9a6cafabd7 100644
--- a/frontend/src/pages/team/Library/index.vue
+++ b/frontend/src/pages/team/Library/index.vue
@@ -21,12 +21,14 @@
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
+import { mapState } from 'pinia'
+
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 
 export default {
     name: 'SharedLibrary',
     computed: {
-        ...mapGetters('account', ['featuresCheck']),
+        ...mapState(useAccountSettingsStore, ['featuresCheck']),
         navigation () {
             const list = [
                 {
diff --git a/frontend/src/pages/team/Members/General.vue b/frontend/src/pages/team/Members/General.vue
index a0cf4fadaf..6f281a39b7 100644
--- a/frontend/src/pages/team/Members/General.vue
+++ b/frontend/src/pages/team/Members/General.vue
@@ -56,8 +56,6 @@ import { UserAddIcon } from '@heroicons/vue/solid'
 import { mapActions, mapState } from 'pinia'
 import { markRaw } from 'vue'
 
-import { mapGetters } from 'vuex'
-
 import teamApi from '../../../api/team.js'
 import FeatureUnavailableToTeam from '../../../components/banners/FeatureUnavailableToTeam.vue'
 import EditApplicationPermissionsDialog from '../../../components/dialogs/EditApplicationPermissionsDialog.vue'
@@ -76,6 +74,7 @@ import ApplicationPermissionOverride from './components/ApplicationPermissionOve
 import ApplicationPermissionRow from './components/ApplicationPermissionsRow.vue'
 
 import { useAccountAuthStore } from '@/stores/account-auth.js'
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useContextStore } from '@/stores/context.js'
 
 export default {
@@ -112,7 +111,7 @@ export default {
     },
     computed: {
         ...mapState(useContextStore, ['team']),
-        ...mapGetters('account', ['requiresBilling', 'featuresCheck']),
+        ...mapState(useAccountSettingsStore, ['requiresBilling', 'featuresCheck']),
         ...mapState(useAccountAuthStore, ['user', 'isAdminUser']),
         canEditUser: function () {
             return this.hasPermission('team:user:remove') || this.hasPermission('team:user:change-role') || this.isAdminUser
diff --git a/frontend/src/pages/team/Members/Invitations.vue b/frontend/src/pages/team/Members/Invitations.vue
index 26f4d07a63..b5e176689d 100644
--- a/frontend/src/pages/team/Members/Invitations.vue
+++ b/frontend/src/pages/team/Members/Invitations.vue
@@ -34,7 +34,6 @@ import { RefreshIcon, TrashIcon } from '@heroicons/vue/outline'
 import { mapState } from 'pinia'
 import { markRaw } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
-import { mapState as mapVuexState } from 'vuex'
 
 import teamApi from '../../../api/team.js'
 import InviteUserCell from '../../../components/tables/cells/InviteUserCell.vue'
@@ -43,6 +42,7 @@ import usePermissions from '../../../composables/Permissions.js'
 import Alerts from '../../../services/alerts.js'
 import Dialog from '../../../services/dialog.js'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useContextStore } from '@/stores/context.js'
 
 export default {
@@ -73,7 +73,7 @@ export default {
     },
     computed: {
         ...mapState(useContextStore, ['team', 'teamMembership']),
-        ...mapVuexState('account', ['settings'])
+        ...mapState(useAccountSettingsStore, ['settings'])
     },
     watch: {
         teamMembership: 'fetchData',
diff --git a/frontend/src/pages/team/Members/components/ApplicationPermissionOverride.vue b/frontend/src/pages/team/Members/components/ApplicationPermissionOverride.vue
index b0113bdeaf..6c775f3069 100644
--- a/frontend/src/pages/team/Members/components/ApplicationPermissionOverride.vue
+++ b/frontend/src/pages/team/Members/components/ApplicationPermissionOverride.vue
@@ -6,11 +6,14 @@
 </template>
 
 <script>
+import { mapState } from 'pinia'
+
 import { defineComponent } from 'vue'
-import { mapGetters } from 'vuex'
 
 import { pluralize } from '../../../../composables/strings/String.js'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
+
 export default defineComponent({
     name: 'ApplicationPermissionOverride',
     props: {
@@ -25,7 +28,7 @@ export default defineComponent({
     },
     setup () { return { pluralize } },
     computed: {
-        ...mapGetters('account', ['featuresCheck']),
+        ...mapState(useAccountSettingsStore, ['featuresCheck']),
         alteredPermissions () {
             let counter = 0
             Object.keys((this.permissions?.applications || {})).forEach(key => {
diff --git a/frontend/src/pages/team/Performance/index.vue b/frontend/src/pages/team/Performance/index.vue
index ea7188ec0e..c5a8d501e9 100644
--- a/frontend/src/pages/team/Performance/index.vue
+++ b/frontend/src/pages/team/Performance/index.vue
@@ -62,7 +62,6 @@
 <script>
 import { mapState } from 'pinia'
 import { markRaw } from 'vue'
-import { mapGetters } from 'vuex'
 
 import teamApi from '../../../api/team.js'
 
@@ -75,6 +74,7 @@ import InstanceStatusBadge from '../../instance/components/InstanceStatusBadge.v
 
 import CPUUtilizationCell from './components/CPUUtilizationCell.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useContextStore } from '@/stores/context.js'
 
 export default {
@@ -128,7 +128,7 @@ export default {
     },
     computed: {
         ...mapState(useContextStore, ['team']),
-        ...mapGetters('account', ['featuresCheck']),
+        ...mapState(useAccountSettingsStore, ['featuresCheck']),
         rows () {
             return this.instances.map(instance => ({
                 instanceId: instance.id,
diff --git a/frontend/src/pages/team/Pipelines/index.vue b/frontend/src/pages/team/Pipelines/index.vue
index 3c09878213..3e8140bf1f 100644
--- a/frontend/src/pages/team/Pipelines/index.vue
+++ b/frontend/src/pages/team/Pipelines/index.vue
@@ -89,7 +89,6 @@
 <script>
 import { SearchIcon } from '@heroicons/vue/outline'
 import { mapState } from 'pinia'
-import { mapGetters } from 'vuex'
 
 import pipelineAPI from '../../../api/pipeline.js'
 import EmptyState from '../../../components/EmptyState.vue'
@@ -97,6 +96,7 @@ import usePermissions from '../../../composables/Permissions.js'
 
 import TeamPipeline from './components/TeamPipeline.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useContextStore } from '@/stores/context.js'
 
 export default {
@@ -120,7 +120,7 @@ export default {
     },
     computed: {
         ...mapState(useContextStore, ['team']),
-        ...mapGetters('account', ['featuresCheck']),
+        ...mapState(useAccountSettingsStore, ['featuresCheck']),
         filteredPipelines () {
             if (this.filterTerm) {
                 return this.pipelines
diff --git a/frontend/src/pages/team/Settings/Danger.vue b/frontend/src/pages/team/Settings/Danger.vue
index 4522403217..ae73cc5c4d 100644
--- a/frontend/src/pages/team/Settings/Danger.vue
+++ b/frontend/src/pages/team/Settings/Danger.vue
@@ -52,7 +52,6 @@
 
 <script>
 import { mapState } from 'pinia'
-import { mapState as mapVuexState } from 'vuex'
 
 import teamApi from '../../../api/team.js'
 import teamTypesApi from '../../../api/teamTypes.js'
@@ -67,6 +66,7 @@ import ConfirmTeamSuspendDialog from '../dialogs/ConfirmTeamSuspendDialog.vue'
 import TeamAdminTools from './TeamAdminTools.vue'
 
 import { useAccountAuthStore } from '@/stores/account-auth.js'
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useContextStore } from '@/stores/context.js'
 
 export default {
@@ -84,7 +84,7 @@ export default {
     },
     computed: {
         ...mapState(useContextStore, ['team']),
-        ...mapVuexState('account', ['features']),
+        ...mapState(useAccountSettingsStore, ['features']),
         ...mapState(useAccountAuthStore, ['user']),
         isAdmin: function () {
             return this.user.admin
diff --git a/frontend/src/pages/team/Settings/General.vue b/frontend/src/pages/team/Settings/General.vue
index a08c7f7a08..b6bb389ee5 100644
--- a/frontend/src/pages/team/Settings/General.vue
+++ b/frontend/src/pages/team/Settings/General.vue
@@ -74,7 +74,6 @@
 
 import { SparklesIcon, TemplateIcon } from '@heroicons/vue/outline'
 import { mapState } from 'pinia'
-import { mapState as mapVuexState } from 'vuex'
 
 import teamApi from '../../../api/team.js'
 import teamsApi from '../../../api/teams.js'
@@ -83,6 +82,7 @@ import FormRow from '../../../components/FormRow.vue'
 import alerts from '../../../services/alerts.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'
 
@@ -111,7 +111,7 @@ export default {
     },
     computed: {
         ...mapState(useContextStore, ['team']),
-        ...mapVuexState('account', ['features']),
+        ...mapState(useAccountSettingsStore, ['features']),
         ...mapState(useAccountAuthStore, ['user']),
         formValid () {
             return this.input.teamName && !this.pendingSlugCheck && !this.errors.slug && !this.errors.teamName
diff --git a/frontend/src/pages/team/Settings/Integrations.vue b/frontend/src/pages/team/Settings/Integrations.vue
index caf141886e..086a8e49ce 100644
--- a/frontend/src/pages/team/Settings/Integrations.vue
+++ b/frontend/src/pages/team/Settings/Integrations.vue
@@ -82,7 +82,6 @@
 <script>
 import { PlusSmIcon } from '@heroicons/vue/outline'
 import { mapState } from 'pinia'
-import { mapGetters, mapState as mapVuexState } from 'vuex'
 
 import teamApi from '../../../api/team.js'
 import EmptyState from '../../../components/EmptyState.vue'
@@ -93,6 +92,7 @@ import Dialog from '../../../services/dialog.js'
 
 import CreateGitTokenDialog from './dialogs/CreateGitTokenDialog.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useContextStore } from '@/stores/context.js'
 
 export default {
@@ -119,8 +119,7 @@ export default {
     },
     computed: {
         ...mapState(useContextStore, ['team']),
-        ...mapVuexState('account', ['features']),
-        ...mapGetters('account', ['featuresCheck']),
+        ...mapState(useAccountSettingsStore, ['features', 'featuresCheck']),
         addEnabled: function () {
             return this.hasPermission('team:git:tokens:create')
         },
diff --git a/frontend/src/pages/team/Settings/TeamAdminTools.vue b/frontend/src/pages/team/Settings/TeamAdminTools.vue
index 0333d31bec..2deb6b3d31 100644
--- a/frontend/src/pages/team/Settings/TeamAdminTools.vue
+++ b/frontend/src/pages/team/Settings/TeamAdminTools.vue
@@ -188,7 +188,7 @@
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import { mapState } from 'pinia'
 
 import { featureList, featureNames } from '../../../../../forge/lib/features.js'
 import billingApi from '../../../api/billing.js'
@@ -206,6 +206,7 @@ import { getObjectValue } from '../../admin/Template/utils.js'
 import ConfirmTeamManualBillingDialog from '../dialogs/ConfirmTeamManualBillingDialog.vue'
 import ExtendTeamTrialDialog from '../dialogs/ExtendTeamTrialDialog.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useAccountStore } from '@/stores/account.js'
 import { useContextStore } from '@/stores/context.js'
 
@@ -238,7 +239,7 @@ export default {
         }
     },
     computed: {
-        ...mapState('account', ['features']),
+        ...mapState(useAccountSettingsStore, ['features']),
         billingSetUp () {
             return this.team.billing?.active
         },
diff --git a/frontend/src/pages/team/Settings/index.vue b/frontend/src/pages/team/Settings/index.vue
index 616f425d35..9f3d52cbe1 100644
--- a/frontend/src/pages/team/Settings/index.vue
+++ b/frontend/src/pages/team/Settings/index.vue
@@ -18,7 +18,6 @@
 <script>
 import { mapState } from 'pinia'
 import { useRouter } from 'vue-router'
-import { mapState as mapVuexState } from 'vuex'
 
 import usePermissions from '../../../composables/Permissions.js'
 
@@ -42,8 +41,7 @@ export default {
         }
     },
     computed: {
-        ...mapState(useContextStore, ['team', 'teamMembership']),
-        ...mapVuexState('account', ['features'])
+        ...mapState(useContextStore, ['team', 'teamMembership'])
     },
     watch: {
         teamMembership: 'checkAccess'
diff --git a/frontend/src/pages/team/Tables/index.vue b/frontend/src/pages/team/Tables/index.vue
index d81f805d07..d45b1bda98 100644
--- a/frontend/src/pages/team/Tables/index.vue
+++ b/frontend/src/pages/team/Tables/index.vue
@@ -47,12 +47,12 @@
 <script>
 import { mapActions, mapState } from 'pinia'
 import { defineComponent } from 'vue'
-import { mapGetters } from 'vuex'
 
 import EmptyState from '../../../components/EmptyState.vue'
 import FeatureUnavailable from '../../../components/banners/FeatureUnavailable.vue'
 import FeatureUnavailableToTeam from '../../../components/banners/FeatureUnavailableToTeam.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useAccountStore } from '@/stores/account.js'
 import { useProductTablesStore } from '@/stores/product-tables.js'
 
@@ -71,7 +71,7 @@ export default defineComponent({
     },
     computed: {
         ...mapState(useAccountStore, ['pendingTeamChange']),
-        ...mapGetters('account', ['featuresCheck']),
+        ...mapState(useAccountSettingsStore, ['featuresCheck']),
         ...mapState(useProductTablesStore, ['databases'])
     },
     watch: {
diff --git a/frontend/src/pages/team/changeType.vue b/frontend/src/pages/team/changeType.vue
index fd68483f5b..545098cadf 100644
--- a/frontend/src/pages/team/changeType.vue
+++ b/frontend/src/pages/team/changeType.vue
@@ -94,7 +94,6 @@
 <script>
 import { ChevronLeftIcon } from '@heroicons/vue/outline'
 import { mapState } from 'pinia'
-import { mapState as mapVuexState } from 'vuex'
 
 import billingApi from '../../api/billing.js'
 import instanceTypesApi from '../../api/instanceTypes.js'
@@ -107,6 +106,7 @@ import Alerts from '../../services/alerts.js'
 import Product from '../../services/product.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'
 
@@ -144,7 +144,7 @@ export default {
     },
     computed: {
         ...mapState(useContextStore, ['team']),
-        ...mapVuexState('account', ['features']),
+        ...mapState(useAccountSettingsStore, ['features']),
         ...mapState(useAccountAuthStore, ['user']),
         formValid () {
             const isChangingTeamType = this.input.teamTypeId !== this.team.type.id
diff --git a/frontend/src/pages/team/components/ProjectTypeSummary.vue b/frontend/src/pages/team/components/ProjectTypeSummary.vue
index 5afcc13131..8a096a5df0 100644
--- a/frontend/src/pages/team/components/ProjectTypeSummary.vue
+++ b/frontend/src/pages/team/components/ProjectTypeSummary.vue
@@ -14,13 +14,15 @@
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import { mapState } from 'pinia'
+
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 
 export default {
     name: 'ProjectTypeSummary',
     props: ['projectType'],
     computed: {
-        ...mapState('account', ['features'])
+        ...mapState(useAccountSettingsStore, ['features'])
     }
 }
 </script>
diff --git a/frontend/src/pages/team/create.vue b/frontend/src/pages/team/create.vue
index 3fd3a4e57d..0715747f85 100644
--- a/frontend/src/pages/team/create.vue
+++ b/frontend/src/pages/team/create.vue
@@ -86,7 +86,6 @@
 <script>
 import { ChevronLeftIcon, ExternalLinkIcon } from '@heroicons/vue/solid'
 import { mapState } from 'pinia'
-import { mapState as mapVuexState } from 'vuex'
 
 import teamApi from '../../api/team.js'
 import teamTypesApi from '../../api/teamTypes.js'
@@ -98,6 +97,7 @@ import { useHubspotHelper } from '../../composables/Hubspot.js'
 import slugify from '../../utils/slugify.js'
 
 import { useAccountAuthStore } from '@/stores/account-auth.js'
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 import { useAccountStore } from '@/stores/account.js'
 
 export default {
@@ -172,7 +172,7 @@ export default {
     },
     computed: {
         ...mapState(useAccountStore, ['teams']),
-        ...mapVuexState('account', ['features']),
+        ...mapState(useAccountSettingsStore, ['features']),
         ...mapState(useAccountAuthStore, ['user']),
         formValid () {
             return this.input.teamTypeId && this.input.name && this.input.slug && !this.pendingSlugCheck && !this.input.slugError && !this.errors.name
diff --git a/frontend/src/pages/team/createApplication.vue b/frontend/src/pages/team/createApplication.vue
index 84065699ae..70127cbc44 100644
--- a/frontend/src/pages/team/createApplication.vue
+++ b/frontend/src/pages/team/createApplication.vue
@@ -43,7 +43,6 @@
 
 <script>
 import { mapState } from 'pinia'
-import { mapState as mapVuexState } from 'vuex'
 
 import MultiStepApplicationsInstanceForm
     from '../../components/multi-step-forms/instance/MultiStepApplicationsInstanceForm.vue'
@@ -69,8 +68,7 @@ export default {
         }
     },
     computed: {
-        ...mapState(useContextStore, ['isFreeTeamType']),
-        ...mapVuexState('account', ['features'])
+        ...mapState(useContextStore, ['isFreeTeamType'])
     },
     methods: {
         onApplicationCreated (payload) {
diff --git a/frontend/src/pages/team/createInstance.vue b/frontend/src/pages/team/createInstance.vue
index c8276d313a..8b0ba6d99c 100644
--- a/frontend/src/pages/team/createInstance.vue
+++ b/frontend/src/pages/team/createInstance.vue
@@ -47,7 +47,6 @@
 
 <script>
 import { mapState } from 'pinia'
-import { mapState as mapVuexState } from 'vuex'
 
 import teamApi from '../../api/team.js'
 import MultiStepApplicationsInstanceForm from '../../components/multi-step-forms/instance/MultiStepApplicationsInstanceForm.vue'
@@ -93,7 +92,6 @@ export default {
     },
     computed: {
         ...mapState(useContextStore, ['team']),
-        ...mapVuexState('account', ['features']),
         isLandingFromExternalLink () {
             return this.$route.name === 'DeployBlueprint'
         },
diff --git a/frontend/src/pages/team/dialogs/ConfirmTeamDeleteDialog.vue b/frontend/src/pages/team/dialogs/ConfirmTeamDeleteDialog.vue
index 8b12cc4d67..32becf4e69 100644
--- a/frontend/src/pages/team/dialogs/ConfirmTeamDeleteDialog.vue
+++ b/frontend/src/pages/team/dialogs/ConfirmTeamDeleteDialog.vue
@@ -29,10 +29,12 @@
 </template>
 
 <script>
-import { mapGetters, mapState } from 'vuex'
+import { mapState } from 'pinia'
 
 import FormRow from '../../../components/FormRow.vue'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
+
 export default {
     name: 'ConfirmTeamDeleteDialog',
     components: {
@@ -54,8 +56,7 @@ export default {
         }
     },
     computed: {
-        ...mapState('account', ['features']),
-        ...mapGetters('account', ['featuresCheck']),
+        ...mapState(useAccountSettingsStore, ['features', 'featuresCheck']),
         enabledFeatures () {
             // hosted instances?
             const features = {
diff --git a/frontend/src/pages/team/dialogs/InviteMemberDialog.vue b/frontend/src/pages/team/dialogs/InviteMemberDialog.vue
index e3753f2943..ad4d3a6bb7 100644
--- a/frontend/src/pages/team/dialogs/InviteMemberDialog.vue
+++ b/frontend/src/pages/team/dialogs/InviteMemberDialog.vue
@@ -24,7 +24,7 @@
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import { mapState } from 'pinia'
 
 import teamApi from '../../../api/team.js'
 import FormRow from '../../../components/FormRow.vue'
@@ -33,6 +33,8 @@ import { getTeamProperty } from '../../../composables/TeamProperties.js'
 import alerts from '../../../services/alerts.js'
 import { Roles } from '../../../utils/roles.js'
 
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
+
 export default {
     name: 'InviteMemberDialog',
     components: {
@@ -94,7 +96,7 @@ export default {
         }
     },
     computed: {
-        ...mapState('account', ['settings']),
+        ...mapState(useAccountSettingsStore, ['settings']),
         externalEnabled () {
             return this.settings.email && this.settings['team:user:invite:external']
         },
diff --git a/frontend/src/pages/team/index.vue b/frontend/src/pages/team/index.vue
index 4c52e1b621..e0f08c07c4 100644
--- a/frontend/src/pages/team/index.vue
+++ b/frontend/src/pages/team/index.vue
@@ -18,7 +18,6 @@
 
 <script>
 import { mapActions, mapState } from 'pinia'
-import { mapGetters, mapState as mapVuexState } from 'vuex'
 
 import SubscriptionExpiredBanner from '../../components/banners/SubscriptionExpired.vue'
 import TeamSuspendedBanner from '../../components/banners/TeamSuspended.vue'
@@ -28,6 +27,7 @@ import { Roles } from '../../utils/roles.js'
 import TeamInstances from './Instances.vue'
 
 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 { useProductExpertStore } from '@/stores/product-expert.js'
@@ -54,8 +54,7 @@ export default {
     },
     computed: {
         ...mapState(useContextStore, ['team', 'teamMembership']),
-        ...mapVuexState('account', ['features']),
-        ...mapGetters('account', ['requiresBilling']),
+        ...mapState(useAccountSettingsStore, ['requiresBilling']),
         ...mapState(useAccountAuthStore, ['user', 'isAdminUser']),
         ...mapState(useUxToursStore, ['shouldPresentTour']),
         ...mapState(useProductExpertStore, ['shouldWakeUpAssistant']),
diff --git a/frontend/src/store/modules/account/index.js b/frontend/src/store/modules/account/index.js
index dd04eb5c2c..8ad5c9b513 100644
--- a/frontend/src/store/modules/account/index.js
+++ b/frontend/src/store/modules/account/index.js
@@ -1,13 +1,13 @@
-import { getActivePinia, storeToRefs } from 'pinia'
+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 { getTeamProperty } from '../../../composables/TeamProperties.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'
@@ -24,210 +24,15 @@ import { useUxNavigationStore } from '@/stores/ux-navigation.js'
 import { useUxToursStore } from '@/stores/ux-tours.js'
 import { useUxStore } from '@/stores/ux.js'
 
-// initial state
-const initialState = () => ({
-    // Runtime settings
-    settings: null,
-    // Feature flags
-    features: {}
-})
-
-const meta = {
-    persistence: {
-        settings: {
-            storage: 'localStorage',
-            clearOnLogout: false
-        },
-        features: {
-            storage: 'localStorage',
-            clearOnLogout: false
-        }
-    }
-}
-
-const state = initialState
-
-// getters
-const getters = {
-    settings (state) {
-        return state.settings
-    },
-    requiresBilling (state, getters) {
-        const { user: userRef } = storeToRefs(useAccountAuthStore())
-        const { team: teamRef, isTrialAccount: isTrialAccountRef } = storeToRefs(useContextStore())
-        const user = userRef.value
-        const team = teamRef.value
-        const isTrialAccount = isTrialAccountRef.value
-        const isNotAdmin = (user && !user.admin)
-
-        return isNotAdmin &&
-        state.features.billing &&
-        (!team?.billing?.unmanaged) &&
-        (!isTrialAccount || team?.billing?.trialEnded) &&
-        !team?.type?.properties?.billing?.disabled &&
-        !team?.billing?.active
-    },
-    isBillingEnabled (state) {
-        return !!state.features.billing
-    },
-    canCreateTeam (state, getters) {
-        if (useAccountAuthStore().isAdminUser) {
-            return true
-        }
-
-        return Object.prototype.hasOwnProperty.call(getters.settings, 'team:create') &&
-            getters.settings['team:create']
-    },
-    featuresCheck: (state) => {
-        const { teamMembership: teamMembershipRef, team: teamRef } = storeToRefs(useContextStore())
-        const teamMembership = teamMembershipRef.value
-        const team = teamRef.value
-
-        const preCheck = {
-            // Instances
-            // deprecated, use the isFreeTeamType getter
-            isHostedInstancesEnabledForTeam: (() => {
-                if (!team) {
-                    return false
-                }
-
-                // // dashboard users don't receive the team.type in the response payload
-                if (teamMembership?.role === 5 && !team?.type?.properties) {
-                    return true
-                }
-
-                let available = false
-
-                // loop over the different instance types. Reference the team type properties to get the list
-                // of instance types, but use getTeamProperty to check the individual types to take into account
-                // any team level overrides
-                for (const instanceType of Object.keys(team.type.properties?.instances) || []) {
-                    if (getTeamProperty(team, `instances.${instanceType}.active`)) {
-                        available = true
-                        break
-                    }
-                }
-                return available
-            })(state),
-
-            // Shared Library
-            isSharedLibraryFeatureEnabledForTeam: (() => {
-                const flag = team?.type?.properties?.features?.['shared-library']
-                return (flag === undefined || flag) || team?.type?.properties?.enableAllFeatures
-            })(state),
-            isSharedLibraryFeatureEnabledForPlatform: state.features?.['shared-library'],
-
-            // Blueprints
-            isBlueprintsFeatureEnabledForTeam: (() => {
-                const flag = team?.type?.properties?.features?.flowBlueprints
-                return (flag === undefined || flag) || team?.type?.properties?.enableAllFeatures
-            })(state),
-            isBlueprintsFeatureEnabledForPlatform: !!state.features?.flowBlueprints,
-
-            // Custom Catalogs
-            isCustomCatalogsFeatureEnabledForPlatform: !!state.features?.customCatalogs,
-            isCustomCatalogsFeatureEnabledForTeam: (() => {
-                const flag = team?.type?.properties.features?.customCatalogs
-                return (flag === undefined || flag) || team?.type?.properties?.enableAllFeatures
-            })(state),
-
-            // Private NPM Registry (Custom Nodes)
-            isPrivateRegistryFeatureEnabledForPlatform: !!state.features?.npm,
-            isPrivateRegistryFeatureEnabledForTeam: !!team?.type?.properties?.features?.npm || team?.type?.properties?.enableAllFeatures,
-
-            // Certified Nodes
-            isCertifiedNodesFeatureEnabledForPlatform: !!state.features?.certifiedNodes,
-            // FlowFuse Nodes
-            isFlowFuseNodesFeatureEnabledForPlatform: !!state.features?.ffNodes,
-
-            // Static Assets
-            isStaticAssetFeatureEnabledForPlatform: !!state.features?.staticAssets,
-            isStaticAssetsFeatureEnabledForTeam: !!team?.type?.properties?.features?.staticAssets || team?.type?.properties?.enableAllFeatures,
-
-            // HTTP BearerTokens
-            isHTTPBearerTokensFeatureEnabledForPlatform: !!state.settings?.features.httpBearerTokens,
-            isHTTPBearerTokensFeatureEnabledForTeam: !!team?.type?.properties.features.teamHttpSecurity || team?.type?.properties?.enableAllFeatures,
-
-            // BOM
-            isBOMFeatureEnabledForPlatform: !!state.features?.bom,
-            isBOMFeatureEnabledForTeam: !!team?.type?.properties?.features?.bom || team?.type?.properties?.enableAllFeatures,
-
-            // Timeline
-            isTimelineFeatureEnabledForPlatform: !!state.features?.projectHistory,
-            isTimelineFeatureEnabledForTeam: !!team?.type?.properties?.features?.projectHistory || team?.type?.properties?.enableAllFeatures,
-
-            // Mqtt Broker
-            isMqttBrokerFeatureEnabledForPlatform: !!state.features?.teamBroker,
-            isMqttBrokerFeatureEnabledForTeam: !!team?.type?.properties?.features?.teamBroker || team?.type?.properties?.enableAllFeatures,
-
-            isExternalMqttBrokerFeatureEnabledForPlatform: !!state.features?.externalBroker,
-
-            // DevOps Pipelines
-            devOpsPipelinesFeatureEnabledForPlatform: !!state.features?.['devops-pipelines'],
-
-            isGitIntegrationFeatureEnabledForPlatform: !!state.features?.gitIntegration,
-            isGitIntegrationFeatureEnabledForTeam: !!team?.type?.properties?.features?.gitIntegration || team?.type?.properties?.enableAllFeatures,
-
-            // Instance Resources
-            isInstanceResourcesFeatureEnabledForPlatform: !!state.features?.instanceResources,
-            isInstanceResourcesFeatureEnabledForTeam: !!team?.type?.properties?.features?.instanceResources || team?.type?.properties?.enableAllFeatures,
-
-            // Tables
-            isTablesFeatureEnabledForPlatform: !!state.features.tables,
-            isTablesFeatureEnabledForTeam: !!team?.type?.properties?.features?.tables || team?.type?.properties?.enableAllFeatures,
-
-            // Generate Snapshot Descriptions with AI
-            isGeneratedSnapshotDescriptionFeatureEnabledForPlatform: !!state.features.generatedSnapshotDescription,
-            isGeneratedSnapshotDescriptionFeatureEnabledForTeam: !!team?.type?.properties?.features?.generatedSnapshotDescription || team?.type?.properties?.enableAllFeatures,
-
-            // Applications Role Based Access Control
-            isApplicationsRBACFeatureEnabledForPlatform: !!state.features.rbacApplication,
-            isApplicationsRBACFeatureEnabledForTeam: !!team?.type?.properties?.features?.rbacApplication || team?.type?.properties?.enableAllFeatures,
-
-            // Expert Assistant
-            isExpertAssistantFeatureEnabledForPlatform: !!state.features.expertAssistant,
-
-            // Instance Maintenance
-            isInstanceAutoStackUpdateFeatureEnabledForPlatform: !!state.features.autoStackUpdate
-        }
-        return {
-            ...preCheck,
-            isSharedLibraryFeatureEnabled: preCheck.isSharedLibraryFeatureEnabledForTeam && preCheck.isSharedLibraryFeatureEnabledForPlatform,
-            isBlueprintsFeatureEnabled: preCheck.isBlueprintsFeatureEnabledForTeam && preCheck.isBlueprintsFeatureEnabledForPlatform,
-            isCustomCatalogsFeatureEnabled: preCheck.isCustomCatalogsFeatureEnabledForPlatform && preCheck.isCustomCatalogsFeatureEnabledForTeam,
-            isStaticAssetFeatureEnabled: preCheck.isStaticAssetFeatureEnabledForPlatform && preCheck.isStaticAssetsFeatureEnabledForTeam,
-            isHTTPBearerTokensFeatureEnabled: preCheck.isHTTPBearerTokensFeatureEnabledForPlatform && preCheck.isHTTPBearerTokensFeatureEnabledForTeam,
-            isBOMFeatureEnabled: preCheck.isBOMFeatureEnabledForPlatform && preCheck.isBOMFeatureEnabledForTeam,
-            isTimelineFeatureEnabled: preCheck.isTimelineFeatureEnabledForPlatform && preCheck.isTimelineFeatureEnabledForTeam,
-            isMqttBrokerFeatureEnabled: preCheck.isMqttBrokerFeatureEnabledForPlatform && preCheck.isMqttBrokerFeatureEnabledForTeam,
-            // external broker must be enabled for platform, and share the same team-level feature flag as the team broker
-            isExternalMqttBrokerFeatureEnabled: preCheck.isExternalMqttBrokerFeatureEnabledForPlatform && preCheck.isMqttBrokerFeatureEnabledForTeam,
-            devOpsPipelinesFeatureEnabled: preCheck.devOpsPipelinesFeatureEnabledForPlatform,
-            isDeviceGroupsFeatureEnabled: !!team?.type?.properties?.features?.deviceGroups || !!team?.type?.properties?.enableAllFeatures,
-            isGitIntegrationFeatureEnabled: preCheck.isGitIntegrationFeatureEnabledForPlatform && preCheck.isGitIntegrationFeatureEnabledForTeam,
-            isInstanceResourcesFeatureEnabled: preCheck.isInstanceResourcesFeatureEnabledForPlatform && preCheck.isInstanceResourcesFeatureEnabledForTeam,
-            isTablesFeatureEnabled: preCheck.isTablesFeatureEnabledForPlatform && preCheck.isTablesFeatureEnabledForTeam,
-            isGeneratedSnapshotDescriptionEnabled: preCheck.isGeneratedSnapshotDescriptionFeatureEnabledForPlatform && preCheck.isGeneratedSnapshotDescriptionFeatureEnabledForTeam,
-            isRBACApplicationFeatureEnabled: preCheck.isApplicationsRBACFeatureEnabledForPlatform && preCheck.isApplicationsRBACFeatureEnabledForTeam,
-            isExpertAssistantFeatureEnabled: preCheck.isExpertAssistantFeatureEnabledForPlatform
-        }
-    }
-}
-
 // mutations
-const mutations = {
-    setSettings (state, settings) {
-        state.settings = settings
-        state.features = settings.features || {}
-    }
-}
+const mutations = {}
 
 // actions
 const actions = {
-    async checkState ({ commit }, redirectUrlAfterLogin) {
+    async checkState (_, redirectUrlAfterLogin) {
         try {
             const settings = await settingsApi.getSettings()
-            commit('setSettings', settings)
+            useAccountSettingsStore().setSettings(settings)
 
             useUxLoadingStore().setOffline(false)
 
@@ -358,6 +163,7 @@ const actions = {
                 if (pinia) {
                     useAccountAuthStore().$reset()
                     useAccountStore().$reset()
+                    useAccountSettingsStore().$reset()
                     useUxDialogStore().$reset()
                     useUxLoadingStore().$reset()
                     useUxToursStore().$reset()
@@ -381,10 +187,6 @@ const actions = {
                 window.location = '/'
             })
     },
-    async refreshSettings (state) {
-        const settings = await settingsApi.getSettings()
-        state.commit('setSettings', settings)
-    },
     checkIfAuthenticated () {
         return useAccountAuthStore().checkIfAuthenticated()
     }
@@ -392,10 +194,6 @@ const actions = {
 
 export default {
     namespaced: true,
-    state,
-    initialState: initialState(),
-    getters,
     actions,
-    mutations,
-    meta
+    mutations
 }
diff --git a/frontend/src/stores/_account_bridge.js b/frontend/src/stores/_account_bridge.js
index c29d442566..2797a2ea23 100644
--- a/frontend/src/stores/_account_bridge.js
+++ b/frontend/src/stores/_account_bridge.js
@@ -1,30 +1,27 @@
-// Temporary bridge — reads account data from Vuex/Pinia during migration.
-// Delete this file after the account stores are migrated to Pinia.
-
-import { storeToRefs } from 'pinia'
+// 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.
-    // Static imports of store/index.js here would create a cycle:
-    // ux-drawers.js → ux-navigation.js → _account_bridge.js → store/index.js → account/index.js → ux-navigation.js
     // context.js imports _account_bridge.js statically; requiring context.js lazily here avoids a cycle.
-    const store = require('../store/index.js').default
     const { useContextStore } = require('@/stores/context.js')
-    const { user } = storeToRefs(useAccountAuthStore())
-    const { team, teamMembership, isTrialAccount, isTrialAccountExpired } = storeToRefs(useContextStore())
+    const authStore = useAccountAuthStore()
+    const contextStore = useContextStore()
+    const accountSettingsStore = useAccountSettingsStore()
     return {
-        user: user.value,
-        userId: user.value?.id || null,
-        team: team.value,
-        teamId: team.value?.id || null,
-        teamSlug: team.value?.slug || null,
-        features: store.state.account.features,
-        teamMembership: teamMembership.value ?? { role: 0 },
-        featuresCheck: store.getters['account/featuresCheck'],
-        requiresBilling: store.getters['account/requiresBilling'],
-        isTrialAccount: isTrialAccount.value,
-        isTrialAccountExpired: isTrialAccountExpired.value
+        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-settings.js b/frontend/src/stores/account-settings.js
new file mode 100644
index 0000000000..c4be9bd83d
--- /dev/null
+++ b/frontend/src/stores/account-settings.js
@@ -0,0 +1,182 @@
+import { defineStore } from 'pinia'
+
+import settingsApi from '@/api/settings.js'
+import { getTeamProperty } from '@/composables/TeamProperties.js'
+import { useAccountAuthStore } from '@/stores/account-auth.js'
+import { useContextStore } from '@/stores/context.js'
+
+export const useAccountSettingsStore = defineStore('account-settings', {
+    state: () => ({
+        settings: null,
+        features: {}
+    }),
+    getters: {
+        isBillingEnabled: state => !!state.features.billing,
+        requiresBilling (state) {
+            const authStore = useAccountAuthStore()
+            const contextStore = useContextStore()
+            const isNotAdmin = authStore.user && !authStore.user.admin
+            return isNotAdmin &&
+                state.features.billing &&
+                !contextStore.team?.billing?.unmanaged &&
+                (!contextStore.isTrialAccount || contextStore.team?.billing?.trialEnded) &&
+                !contextStore.team?.type?.properties?.billing?.disabled &&
+                !contextStore.team?.billing?.active
+        },
+        canCreateTeam (state) {
+            if (useAccountAuthStore().isAdminUser) {
+                return true
+            }
+            return Object.prototype.hasOwnProperty.call(state.settings, 'team:create') &&
+                state.settings['team:create']
+        },
+        featuresCheck (state) {
+            const contextStore = useContextStore()
+            const team = contextStore.team
+            const teamMembership = contextStore.teamMembership
+
+            const preCheck = {
+                // Instances
+                // deprecated, use the isFreeTeamType getter
+                isHostedInstancesEnabledForTeam: (() => {
+                    if (!team) {
+                        return false
+                    }
+
+                    // dashboard users don't receive the team.type in the response payload
+                    if (teamMembership?.role === 5 && !team?.type?.properties) {
+                        return true
+                    }
+
+                    let available = false
+
+                    // loop over the different instance types. Reference the team type properties to get the list
+                    // of instance types, but use getTeamProperty to check the individual types to take into account
+                    // any team level overrides
+                    for (const instanceType of Object.keys(team.type.properties?.instances) || []) {
+                        if (getTeamProperty(team, `instances.${instanceType}.active`)) {
+                            available = true
+                            break
+                        }
+                    }
+                    return available
+                })(),
+
+                // Shared Library
+                isSharedLibraryFeatureEnabledForTeam: (() => {
+                    const flag = team?.type?.properties?.features?.['shared-library']
+                    return (flag === undefined || flag) || team?.type?.properties?.enableAllFeatures
+                })(),
+                isSharedLibraryFeatureEnabledForPlatform: state.features?.['shared-library'],
+
+                // Blueprints
+                isBlueprintsFeatureEnabledForTeam: (() => {
+                    const flag = team?.type?.properties?.features?.flowBlueprints
+                    return (flag === undefined || flag) || team?.type?.properties?.enableAllFeatures
+                })(),
+                isBlueprintsFeatureEnabledForPlatform: !!state.features?.flowBlueprints,
+
+                // Custom Catalogs
+                isCustomCatalogsFeatureEnabledForPlatform: !!state.features?.customCatalogs,
+                isCustomCatalogsFeatureEnabledForTeam: (() => {
+                    const flag = team?.type?.properties?.features?.customCatalogs
+                    return (flag === undefined || flag) || team?.type?.properties?.enableAllFeatures
+                })(),
+
+                // Private NPM Registry (Custom Nodes)
+                isPrivateRegistryFeatureEnabledForPlatform: !!state.features?.npm,
+                isPrivateRegistryFeatureEnabledForTeam: !!team?.type?.properties?.features?.npm || team?.type?.properties?.enableAllFeatures,
+
+                // Certified Nodes
+                isCertifiedNodesFeatureEnabledForPlatform: !!state.features?.certifiedNodes,
+                // FlowFuse Nodes
+                isFlowFuseNodesFeatureEnabledForPlatform: !!state.features?.ffNodes,
+
+                // Static Assets
+                isStaticAssetFeatureEnabledForPlatform: !!state.features?.staticAssets,
+                isStaticAssetsFeatureEnabledForTeam: !!team?.type?.properties?.features?.staticAssets || team?.type?.properties?.enableAllFeatures,
+
+                // HTTP BearerTokens
+                isHTTPBearerTokensFeatureEnabledForPlatform: !!state.settings?.features?.httpBearerTokens,
+                isHTTPBearerTokensFeatureEnabledForTeam: !!team?.type?.properties?.features?.teamHttpSecurity || team?.type?.properties?.enableAllFeatures,
+
+                // BOM
+                isBOMFeatureEnabledForPlatform: !!state.features?.bom,
+                isBOMFeatureEnabledForTeam: !!team?.type?.properties?.features?.bom || team?.type?.properties?.enableAllFeatures,
+
+                // Timeline
+                isTimelineFeatureEnabledForPlatform: !!state.features?.projectHistory,
+                isTimelineFeatureEnabledForTeam: !!team?.type?.properties?.features?.projectHistory || team?.type?.properties?.enableAllFeatures,
+
+                // Mqtt Broker
+                isMqttBrokerFeatureEnabledForPlatform: !!state.features?.teamBroker,
+                isMqttBrokerFeatureEnabledForTeam: !!team?.type?.properties?.features?.teamBroker || team?.type?.properties?.enableAllFeatures,
+
+                isExternalMqttBrokerFeatureEnabledForPlatform: !!state.features?.externalBroker,
+
+                // DevOps Pipelines
+                devOpsPipelinesFeatureEnabledForPlatform: !!state.features?.['devops-pipelines'],
+
+                isGitIntegrationFeatureEnabledForPlatform: !!state.features?.gitIntegration,
+                isGitIntegrationFeatureEnabledForTeam: !!team?.type?.properties?.features?.gitIntegration || team?.type?.properties?.enableAllFeatures,
+
+                // Instance Resources
+                isInstanceResourcesFeatureEnabledForPlatform: !!state.features?.instanceResources,
+                isInstanceResourcesFeatureEnabledForTeam: !!team?.type?.properties?.features?.instanceResources || team?.type?.properties?.enableAllFeatures,
+
+                // Tables
+                isTablesFeatureEnabledForPlatform: !!state.features?.tables,
+                isTablesFeatureEnabledForTeam: !!team?.type?.properties?.features?.tables || team?.type?.properties?.enableAllFeatures,
+
+                // Generate Snapshot Descriptions with AI
+                isGeneratedSnapshotDescriptionFeatureEnabledForPlatform: !!state.features?.generatedSnapshotDescription,
+                isGeneratedSnapshotDescriptionFeatureEnabledForTeam: !!team?.type?.properties?.features?.generatedSnapshotDescription || team?.type?.properties?.enableAllFeatures,
+
+                // Applications Role Based Access Control
+                isApplicationsRBACFeatureEnabledForPlatform: !!state.features?.rbacApplication,
+                isApplicationsRBACFeatureEnabledForTeam: !!team?.type?.properties?.features?.rbacApplication || team?.type?.properties?.enableAllFeatures,
+
+                // Expert Assistant
+                isExpertAssistantFeatureEnabledForPlatform: !!state.features?.expertAssistant,
+
+                // Instance Maintenance
+                isInstanceAutoStackUpdateFeatureEnabledForPlatform: !!state.features?.autoStackUpdate
+            }
+            return {
+                ...preCheck,
+                isSharedLibraryFeatureEnabled: preCheck.isSharedLibraryFeatureEnabledForTeam && preCheck.isSharedLibraryFeatureEnabledForPlatform,
+                isBlueprintsFeatureEnabled: preCheck.isBlueprintsFeatureEnabledForTeam && preCheck.isBlueprintsFeatureEnabledForPlatform,
+                isCustomCatalogsFeatureEnabled: preCheck.isCustomCatalogsFeatureEnabledForPlatform && preCheck.isCustomCatalogsFeatureEnabledForTeam,
+                isStaticAssetFeatureEnabled: preCheck.isStaticAssetFeatureEnabledForPlatform && preCheck.isStaticAssetsFeatureEnabledForTeam,
+                isHTTPBearerTokensFeatureEnabled: preCheck.isHTTPBearerTokensFeatureEnabledForPlatform && preCheck.isHTTPBearerTokensFeatureEnabledForTeam,
+                isBOMFeatureEnabled: preCheck.isBOMFeatureEnabledForPlatform && preCheck.isBOMFeatureEnabledForTeam,
+                isTimelineFeatureEnabled: preCheck.isTimelineFeatureEnabledForPlatform && preCheck.isTimelineFeatureEnabledForTeam,
+                isMqttBrokerFeatureEnabled: preCheck.isMqttBrokerFeatureEnabledForPlatform && preCheck.isMqttBrokerFeatureEnabledForTeam,
+                // external broker must be enabled for platform, and share the same team-level feature flag as the team broker
+                isExternalMqttBrokerFeatureEnabled: preCheck.isExternalMqttBrokerFeatureEnabledForPlatform && preCheck.isMqttBrokerFeatureEnabledForTeam,
+                devOpsPipelinesFeatureEnabled: preCheck.devOpsPipelinesFeatureEnabledForPlatform,
+                isDeviceGroupsFeatureEnabled: !!team?.type?.properties?.features?.deviceGroups || !!team?.type?.properties?.enableAllFeatures,
+                isGitIntegrationFeatureEnabled: preCheck.isGitIntegrationFeatureEnabledForPlatform && preCheck.isGitIntegrationFeatureEnabledForTeam,
+                isInstanceResourcesFeatureEnabled: preCheck.isInstanceResourcesFeatureEnabledForPlatform && preCheck.isInstanceResourcesFeatureEnabledForTeam,
+                isTablesFeatureEnabled: preCheck.isTablesFeatureEnabledForPlatform && preCheck.isTablesFeatureEnabledForTeam,
+                isGeneratedSnapshotDescriptionEnabled: preCheck.isGeneratedSnapshotDescriptionFeatureEnabledForPlatform && preCheck.isGeneratedSnapshotDescriptionFeatureEnabledForTeam,
+                isRBACApplicationFeatureEnabled: preCheck.isApplicationsRBACFeatureEnabledForPlatform && preCheck.isApplicationsRBACFeatureEnabledForTeam,
+                isExpertAssistantFeatureEnabled: preCheck.isExpertAssistantFeatureEnabledForPlatform
+            }
+        }
+    },
+    actions: {
+        setSettings (settings) {
+            this.settings = settings
+            this.features = settings.features || {}
+        },
+        async refreshSettings () {
+            const settings = await settingsApi.getSettings()
+            this.setSettings(settings)
+        }
+    },
+    persist: {
+        pick: ['settings', 'features'],
+        storage: localStorage
+    }
+})
diff --git a/frontend/src/stores/index.js b/frontend/src/stores/index.js
index 291c78bea8..f99a6acd04 100644
--- a/frontend/src/stores/index.js
+++ b/frontend/src/stores/index.js
@@ -1,5 +1,5 @@
-// Barrel export — add store exports here as each task is merged
 export { useAccountAuthStore } from './account-auth.js'
+export { useAccountSettingsStore } from './account-settings.js'
 export { useContextStore } from './context.js'
 export { useProductBrokersStore } from './product-brokers.js'
 export { useProductTablesStore } from './product-tables.js'
diff --git a/frontend/src/utils/ensurePermission.js b/frontend/src/utils/ensurePermission.js
index 82cef0eaef..d2d23a071a 100644
--- a/frontend/src/utils/ensurePermission.js
+++ b/frontend/src/utils/ensurePermission.js
@@ -1,8 +1,7 @@
 import { watch } from 'vue'
 
-import store from '../store/index.js'
-
 import { useAccountAuthStore } from '@/stores/account-auth.js'
+import { useAccountSettingsStore } from '@/stores/account-settings.js'
 
 /**
  * A 'beforeEnter' router function that ensures the user has a particular permission
@@ -11,6 +10,7 @@ import { useAccountAuthStore } from '@/stores/account-auth.js'
 export default function (scope) {
     return function (to, from, next) {
         const authStore = useAccountAuthStore()
+        const settingsStore = useAccountSettingsStore()
         let settingsWatcher
         let userWatcher
 
@@ -18,7 +18,7 @@ export default function (scope) {
             if (settingsWatcher) {
                 settingsWatcher()
             }
-            if (authStore.user?.admin || store.state.account.settings[scope]) {
+            if (authStore.user?.admin || settingsStore.settings[scope]) {
                 next()
             } else {
                 next('/')
@@ -39,9 +39,9 @@ export default function (scope) {
             }
         }
         function waitForSettings () {
-            if (!store.state.account.settings) {
-                settingsWatcher = store.watch(
-                    (state) => state.account.settings,
+            if (!settingsStore.settings) {
+                settingsWatcher = watch(
+                    () => settingsStore.settings,
                     (_) => { proceed() }
                 )
             } else {
diff --git a/test/unit/frontend/stores/account-settings.spec.js b/test/unit/frontend/stores/account-settings.spec.js
new file mode 100644
index 0000000000..85cbdb62d4
--- /dev/null
+++ b/test/unit/frontend/stores/account-settings.spec.js
@@ -0,0 +1,221 @@
+import { createPinia, setActivePinia } from 'pinia'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+vi.mock('@/api/settings.js', () => ({
+    default: {
+        getSettings: vi.fn()
+    }
+}))
+
+vi.mock('@/stores/account-auth.js', () => ({
+    useAccountAuthStore: vi.fn()
+}))
+
+vi.mock('@/stores/context.js', () => ({
+    useContextStore: vi.fn()
+}))
+
+// Imported after mocks so vi.mock hoisting resolves correctly
+const { useAccountSettingsStore } = await import('@/stores/account-settings.js')
+const settingsApi = (await import('@/api/settings.js')).default
+const { useAccountAuthStore } = await import('@/stores/account-auth.js')
+const { useContextStore } = await import('@/stores/context.js')
+
+function mockAuth ({ admin = false, isAdminUser = false } = {}) {
+    useAccountAuthStore.mockReturnValue({ user: { id: 'u1', admin }, isAdminUser })
+}
+
+function mockTeam (overrides = {}) {
+    useContextStore.mockReturnValue({
+        team: {
+            id: 'team-1',
+            billing: {},
+            type: { properties: { billing: {}, features: {}, instances: {} } },
+            ...overrides.team
+        },
+        isTrialAccount: false,
+        teamMembership: { role: 1 },
+        ...overrides
+    })
+}
+
+describe('account-settings store', () => {
+    beforeEach(() => {
+        setActivePinia(createPinia())
+        vi.clearAllMocks()
+        mockAuth()
+        mockTeam()
+    })
+
+    describe('initial state', () => {
+        it('initializes with null settings and empty features', () => {
+            const store = useAccountSettingsStore()
+            expect(store.settings).toBeNull()
+            expect(store.features).toEqual({})
+        })
+    })
+
+    describe('actions', () => {
+        describe('setSettings', () => {
+            it('sets settings and extracts features', () => {
+                const store = useAccountSettingsStore()
+                const settings = { features: { billing: true }, 'team:create': true }
+                store.setSettings(settings)
+                expect(store.settings).toEqual(settings)
+                expect(store.features).toEqual({ billing: true })
+            })
+
+            it('sets features to empty object when features key is absent', () => {
+                const store = useAccountSettingsStore()
+                store.setSettings({ 'team:create': true })
+                expect(store.features).toEqual({})
+            })
+        })
+
+        describe('refreshSettings', () => {
+            it('fetches settings from API and stores them', async () => {
+                const store = useAccountSettingsStore()
+                const settings = { features: { billing: true } }
+                settingsApi.getSettings.mockResolvedValue(settings)
+                await store.refreshSettings()
+                expect(settingsApi.getSettings).toHaveBeenCalledOnce()
+                expect(store.settings).toEqual(settings)
+                expect(store.features).toEqual({ billing: true })
+            })
+        })
+    })
+
+    describe('getters', () => {
+        describe('isBillingEnabled', () => {
+            it('returns false when billing feature is not set', () => {
+                const store = useAccountSettingsStore()
+                expect(store.isBillingEnabled).toBe(false)
+            })
+
+            it('returns true when billing feature is enabled', () => {
+                const store = useAccountSettingsStore()
+                store.setSettings({ features: { billing: true } })
+                expect(store.isBillingEnabled).toBe(true)
+            })
+        })
+
+        describe('requiresBilling', () => {
+            it('returns false when billing feature is not enabled', () => {
+                const store = useAccountSettingsStore()
+                store.setSettings({ features: {} })
+                expect(store.requiresBilling).toBeFalsy()
+            })
+
+            it('returns false when user is admin', () => {
+                mockAuth({ admin: true, isAdminUser: true })
+                const store = useAccountSettingsStore()
+                store.setSettings({ features: { billing: true } })
+                expect(store.requiresBilling).toBeFalsy()
+            })
+
+            it('returns true when non-admin user has billing enabled and no active subscription', () => {
+                mockAuth({ admin: false })
+                mockTeam({ team: { id: 'team-1', billing: { active: false }, type: { properties: { billing: {}, features: {}, instances: {} } } } })
+                const store = useAccountSettingsStore()
+                store.setSettings({ features: { billing: true } })
+                expect(store.requiresBilling).toBe(true)
+            })
+
+            it('returns false when team has an active subscription', () => {
+                mockAuth({ admin: false })
+                mockTeam({ team: { id: 'team-1', billing: { active: true }, type: { properties: { billing: {}, features: {}, instances: {} } } } })
+                const store = useAccountSettingsStore()
+                store.setSettings({ features: { billing: true } })
+                expect(store.requiresBilling).toBeFalsy()
+            })
+
+            it('returns false when team billing is unmanaged', () => {
+                mockAuth({ admin: false })
+                mockTeam({ team: { id: 'team-1', billing: { unmanaged: true }, type: { properties: { billing: {}, features: {}, instances: {} } } } })
+                const store = useAccountSettingsStore()
+                store.setSettings({ features: { billing: true } })
+                expect(store.requiresBilling).toBeFalsy()
+            })
+        })
+
+        describe('canCreateTeam', () => {
+            it('returns true when user is admin regardless of settings', () => {
+                mockAuth({ admin: true, isAdminUser: true })
+                const store = useAccountSettingsStore()
+                store.setSettings({ features: {} })
+                expect(store.canCreateTeam).toBe(true)
+            })
+
+            it('returns true when settings allow team creation', () => {
+                const store = useAccountSettingsStore()
+                store.setSettings({ 'team:create': true, features: {} })
+                expect(store.canCreateTeam).toBe(true)
+            })
+
+            it('returns false when settings disallow team creation', () => {
+                const store = useAccountSettingsStore()
+                store.setSettings({ 'team:create': false, features: {} })
+                expect(store.canCreateTeam).toBe(false)
+            })
+
+            it('returns false when team:create is not in settings', () => {
+                const store = useAccountSettingsStore()
+                store.setSettings({ features: {} })
+                expect(store.canCreateTeam).toBe(false)
+            })
+        })
+
+        describe('featuresCheck', () => {
+            it('returns false for isHostedInstancesEnabledForTeam when team is null', () => {
+                useContextStore.mockReturnValue({ team: null, teamMembership: { role: 1 }, isTrialAccount: false })
+                const store = useAccountSettingsStore()
+                expect(store.featuresCheck.isHostedInstancesEnabledForTeam).toBe(false)
+            })
+
+            it('isBlueprintsFeatureEnabled is true when enabled on both platform and team', () => {
+                mockTeam({ team: { id: 'team-1', billing: {}, type: { properties: { features: { flowBlueprints: true }, billing: {}, instances: {} } } } })
+                const store = useAccountSettingsStore()
+                store.setSettings({ features: { flowBlueprints: true } })
+                expect(store.featuresCheck.isBlueprintsFeatureEnabledForPlatform).toBe(true)
+                expect(store.featuresCheck.isBlueprintsFeatureEnabledForTeam).toBe(true)
+                expect(store.featuresCheck.isBlueprintsFeatureEnabled).toBe(true)
+            })
+
+            it('isBlueprintsFeatureEnabled is false when disabled on platform', () => {
+                const store = useAccountSettingsStore()
+                store.setSettings({ features: { flowBlueprints: false } })
+                expect(store.featuresCheck.isBlueprintsFeatureEnabledForPlatform).toBe(false)
+                expect(store.featuresCheck.isBlueprintsFeatureEnabled).toBe(false)
+            })
+
+            it('isMqttBrokerFeatureEnabled is true when enabled on both platform and team', () => {
+                mockTeam({ team: { id: 'team-1', billing: {}, type: { properties: { features: { teamBroker: true }, billing: {}, instances: {} } } } })
+                const store = useAccountSettingsStore()
+                store.setSettings({ features: { teamBroker: true } })
+                expect(store.featuresCheck.isMqttBrokerFeatureEnabled).toBe(true)
+            })
+
+            it('isTablesFeatureEnabled is false when disabled on platform', () => {
+                const store = useAccountSettingsStore()
+                store.setSettings({ features: { tables: false } })
+                expect(store.featuresCheck.isTablesFeatureEnabled).toBe(false)
+            })
+
+            it('enableAllFeatures on team type enables all team-level flags', () => {
+                mockTeam({ team: { id: 'team-1', billing: {}, type: { properties: { enableAllFeatures: true, billing: {}, instances: {} } } } })
+                const store = useAccountSettingsStore()
+                store.setSettings({ features: { flowBlueprints: true, teamBroker: true, tables: true } })
+                expect(store.featuresCheck.isBlueprintsFeatureEnabledForTeam).toBe(true)
+                expect(store.featuresCheck.isMqttBrokerFeatureEnabledForTeam).toBe(true)
+                expect(store.featuresCheck.isTablesFeatureEnabledForTeam).toBe(true)
+            })
+
+            it('isSharedLibraryFeatureEnabledForTeam defaults to true when flag is absent', () => {
+                const store = useAccountSettingsStore()
+                store.setSettings({ features: {} })
+                // flag undefined on team type → defaults to enabled
+                expect(store.featuresCheck.isSharedLibraryFeatureEnabledForTeam).toBe(true)
+            })
+        })
+    })
+})