diff --git a/ui/admin/src/main.ts b/ui/admin/src/main.ts
index 0601ef93b51..00da373beb0 100644
--- a/ui/admin/src/main.ts
+++ b/ui/admin/src/main.ts
@@ -1,11 +1,14 @@
 import { createApp } from "vue";
 import vuetify from "@ui/plugins/vuetify";
+import * as Globals from "@global/components/index";
+import { createPinia } from "pinia";
 import App from "./App.vue";
 import { loadFonts } from "./plugins/webfontloader";
 import { key, store } from "./store";
 import router from "./router";
 import SnackbarComponent from "./components/Snackbar/Snackbar.vue";
 
+const pinia = createPinia();
 const app = createApp(App);
 
 loadFonts();
@@ -13,5 +16,11 @@ loadFonts();
 app.use(vuetify);
 app.use(router);
 app.use(store, key);
+app.use(pinia);
+
+Object.entries(Globals).forEach(([name, component]) => {
+  app.component(name, component);
+});
+
 app.component("SnackbarComponent", SnackbarComponent);
 app.mount("#app");
diff --git a/ui/admin/src/views/Login.vue b/ui/admin/src/views/Login.vue
index c958f210a4c..641a8506031 100644
--- a/ui/admin/src/views/Login.vue
+++ b/ui/admin/src/views/Login.vue
@@ -4,12 +4,48 @@
       <v-container class="full-height d-flex justify-center align-center" fluid>
         <v-row align="center" justify="center">
           <v-col cols="12" sm="8" md="4">
+            <v-alert
+              v-if="!isEnterprise"
+              type="success"
+              variant="tonal"
+              class="paywall-banner mb-4"
+            >
+              <template v-slot:prepend>
+                <div class="circle-one shadow d-flex justify-center align-center">
+                  <div class="circle-two shadow d-flex justify-center align-center">
+                    <v-icon color="success" class="green-inner-shadow" size="50">
+                      mdi-crown-circle
+                    </v-icon>
+                  </div>
+                </div>
+              </template>
+              <template v-slot:text>
+                <strong>Unlock Advanced Features with ShellHub Enterprise!</strong>
+                <p class="mb-0 text-body-2">
+                  Gain access to real-time session recording, role-based access control (RBAC), audit logs,
+                  and priority support. Take your infrastructure to the next level!
+                </p>
+              </template>
+            </v-alert>
+
+            <v-btn
+              v-if="!isEnterprise"
+              color="success"
+              block
+              class="mb-4"
+              variant="tonal"
+              href="https://www.shellhub.io/pricing"
+              rel="noopener noreferrer"
+              target="_blank"
+            >
+              Upgrade to Enterprise Now
+            </v-btn>
             <v-card theme="dark" class="pa-6" rounded="lg">
               <v-card-title class="d-flex justify-center align-center mt-4">
                 <v-img
                   :src="Logo"
                   max-width="220"
-                  alt="logo do ShellHub, uma nuvem de com a escrita ShellHub Admin ao lado"
+                  alt="ShellHub Logo"
                 />
                 <span class="mt-6 text-overline">Admin</span>
               </v-card-title>
@@ -26,6 +62,7 @@
                       label="Username"
                       variant="underlined"
                       data-test="username-text"
+                      :disabled="!isEnterprise"
                     />
 
                     <v-text-field
@@ -40,6 +77,8 @@
                       data-test="password-text"
                       :type="showPassword ? 'text' : 'password'"
                       @click:append-inner="showPassword = !showPassword"
+                      :disabled="!isEnterprise"
+
                     />
                     <v-card-actions class="justify-center">
                       <v-btn
@@ -49,6 +88,7 @@
                         variant="tonal"
                         block
                         @click="login"
+                        :disabled="!isEnterprise"
                       >
                         LOGIN
                       </v-btn>
@@ -62,6 +102,15 @@
       </v-container>
     </v-main>
   </v-app>
+
+  <PaywallDialog
+    v-model="isEnterprise"
+    filter="enterprise"
+    title="Unlock Full Managing with ShellHub Enterprise!"
+    subtitle="Upgrade to ShellHub Enterprise (Managed or On-Premises)
+    and gain full control over your infrastructure with advanced security,
+    management and priority support."
+  />
 </template>
 
 <script setup lang="ts">
@@ -69,14 +118,17 @@ import { ref } from "vue";
 import { useField } from "vee-validate";
 import * as yup from "yup";
 import { useRoute, useRouter } from "vue-router";
+import PaywallDialog from "@global/components/User/PaywallDialog.vue";
 import { useStore } from "../store";
 import Logo from "../assets/logo-inverted.png";
 import { createNewClient } from "../api/http";
+import { envVariables } from "@/envVariables";
 
 const showPassword = ref(false);
 const store = useStore();
 const route = useRoute();
 const router = useRouter();
+const isEnterprise = ref(!envVariables.isEnterprise);
 
 const { value: username, errorMessage: usernameError } = useField<string | undefined>(
   "name",
diff --git a/ui/admin/tests/unit/views/Login/__snapshots__/index.spec.ts.snap b/ui/admin/tests/unit/views/Login/__snapshots__/index.spec.ts.snap
index 40face85ad3..b963802fa2b 100644
--- a/ui/admin/tests/unit/views/Login/__snapshots__/index.spec.ts.snap
+++ b/ui/admin/tests/unit/views/Login/__snapshots__/index.spec.ts.snap
@@ -1,3 +1,8 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`Login > Renders the component 1`] = `"<v-app-stub overlaps="" fullheight="true"></v-app-stub>"`;
+exports[`Login > Renders the component 1`] = `
+"<v-app-stub overlaps="" fullheight="true"></v-app-stub>
+<paywall-dialog-stub filter="enterprise" title="Unlock Full Managing with ShellHub Enterprise!" subtitle="Upgrade to ShellHub Enterprise (Managed or On-Premises)
+    and gain full control over your infrastructure with advanced security,
+    management and priority support." modelvalue="true"></paywall-dialog-stub>"
+`;
diff --git a/ui/src/components/User/PaywallDialog.vue b/ui/global/components/User/PaywallDialog.vue
similarity index 74%
rename from ui/src/components/User/PaywallDialog.vue
rename to ui/global/components/User/PaywallDialog.vue
index a7c8055da02..f07926afe9b 100644
--- a/ui/src/components/User/PaywallDialog.vue
+++ b/ui/global/components/User/PaywallDialog.vue
@@ -3,7 +3,7 @@
     v-model="dialog"
     transition="dialog-bottom-transition"
     max-width="650"
-    height="800"
+    max-height="800"
     @click:outside="close"
     @keydown.esc="close"
   >
@@ -23,20 +23,18 @@
         <v-row>
           <v-col class="pb-0">
             <h1 class="d-flex justify-center align-center text-center" data-test="upgrade-heading">
-              Upgrade to have access to all features!
+              {{ title }}
             </h1>
           </v-col>
         </v-row>
         <v-row>
           <v-col class="pt-1 pb-6">
             <p class="d-flex justify-center align-center text-grey text-center" data-test="upgrade-description">
-              To use this feature, upgrade from the ShellHub Community Edition to one of our premium editions.
-              Each edition of ShellHub offers its own set of features and benefits, making it easy to find the
-              right solution for your needs.
+              {{ subtitle }}
             </p>
           </v-col>
         </v-row>
-        <div v-if="items.length === 0">
+        <div v-if="filteredItems.length === 0">
           <v-row>
             <v-col class="d-flex align-center justify-center">
               <v-btn
@@ -52,7 +50,7 @@
           </v-row>
         </div>
         <v-row v-else data-test="items-row">
-          <v-col v-for="(item, i) in items" :key="i" :data-test="'item-' + i">
+          <v-col v-for="(item, i) in filteredItems" :key="i" :data-test="'item-' + i">
             <v-card class="bg-v-theme-surface border d-flex flex-column justify-space-between" height="100%" :data-test="'item-card-' + i">
               <v-card-title class="d-flex justify-center" :data-test="'item-title-' + i">
                 <b>{{ item.title }}</b>
@@ -80,34 +78,57 @@
             </v-card>
           </v-col>
         </v-row>
-        <v-card-actions data-test="card-actions">
-          <v-spacer />
-          <v-btn @click="close" class="mt-4" variant="text" data-test="close-btn">
-            Close
-          </v-btn>
-        </v-card-actions>
       </v-container>
+      <v-card-actions data-test="card-actions">
+        <v-spacer />
+        <v-btn @click="close" class="mt-4" variant="text" data-test="close-btn">
+          Close
+        </v-btn>
+      </v-card-actions>
     </v-card>
   </v-dialog>
 </template>
 
 <script setup lang="ts">
-import { computed, onMounted, ref } from "vue";
-import { useStore } from "@/store";
+import { computed, onMounted } from "vue";
+import { storeToRefs } from "pinia";
+import useGlobalStore from "@global/store/modules/global";
+
+const props = defineProps<{
+  filter?: "cloud" | "enterprise" | "all";
+  title?: string;
+  subtitle?: string;
+}>();
+
+const emit = defineEmits(["close"]);
+const dialog = defineModel({ default: false });
 
-const store = useStore();
-const dialog = ref(false);
 const close = () => {
   dialog.value = false;
-  store.commit("users/setShowPaywall", false);
+  emit("close");
 };
-const items = computed(() => store.getters["users/getPremiumContent"]);
+
+const store = useGlobalStore();
+const { premiumContent } = storeToRefs(store);
+
+const filteredItems = computed(() => {
+  const filter = props.filter || "all";
+
+  if (filter === "cloud") {
+    return premiumContent.value.filter((item) => item.title.includes("Cloud"));
+  }
+  if (filter === "enterprise") {
+    return premiumContent.value.filter((item) => item.title.includes("Enterprise"));
+  }
+  return premiumContent.value;
+});
 
 onMounted(() => {
-  store.dispatch("users/getPremiumContent");
+  store.getPaywallPremiumContent();
 });
 
 defineExpose({ dialog });
+
 </script>
 
 <style scoped>
diff --git a/ui/global/components/index.ts b/ui/global/components/index.ts
new file mode 100644
index 00000000000..8c6ffd920bb
--- /dev/null
+++ b/ui/global/components/index.ts
@@ -0,0 +1,3 @@
+import PaywallDialog from "./User/PaywallDialog.vue";
+
+export default { PaywallDialog };
diff --git a/ui/global/store/api/global.ts b/ui/global/store/api/global.ts
new file mode 100644
index 00000000000..c18a5ef2c46
--- /dev/null
+++ b/ui/global/store/api/global.ts
@@ -0,0 +1,7 @@
+const premiumContent = async () => {
+  const response = await fetch("https://static.shellhub.io/premium-features.v1.json");
+  const data = await response.json();
+  return data;
+};
+
+export default premiumContent;
diff --git a/ui/global/store/modules/global.ts b/ui/global/store/modules/global.ts
new file mode 100644
index 00000000000..25147a95f51
--- /dev/null
+++ b/ui/global/store/modules/global.ts
@@ -0,0 +1,30 @@
+import { defineStore } from "pinia";
+import premiumContent from "../api/global";
+
+type PremiumItem = {
+  title: string;
+  features: string[];
+  button: {
+    label: string;
+    link: string;
+  };
+};
+
+const useGlobalStore = defineStore("global", {
+  state: () => ({
+    premiumContent: [] as PremiumItem[],
+  }),
+  actions: {
+    async getPaywallPremiumContent() {
+      try {
+        const res = await premiumContent();
+        this.premiumContent = res;
+      } catch (error) {
+        console.error(error);
+        throw error;
+      }
+    },
+  },
+});
+
+export default useGlobalStore;
diff --git a/ui/tests/components/Users/PaywallDialog.spec.ts b/ui/global/tests/components/User/PaywallDialog.spec.ts
similarity index 97%
rename from ui/tests/components/Users/PaywallDialog.spec.ts
rename to ui/global/tests/components/User/PaywallDialog.spec.ts
index f6804f718ba..9c04e0cf9c5 100644
--- a/ui/tests/components/Users/PaywallDialog.spec.ts
+++ b/ui/global/tests/components/User/PaywallDialog.spec.ts
@@ -3,8 +3,9 @@ import { createVuetify } from "vuetify";
 import MockAdapter from "axios-mock-adapter";
 import { expect, describe, it, beforeEach, vi } from "vitest";
 import { nextTick } from "vue";
+import PaywallDialog from "@global/components/User/PaywallDialog.vue";
+import { createPinia, setActivePinia } from "pinia";
 import { store, key } from "@/store";
-import PaywallDialog from "@/components/User/PaywallDialog.vue";
 import { router } from "@/router";
 import { namespacesApi, devicesApi } from "@/api/http";
 import { SnackbarPlugin } from "@/plugins/snackbar";
@@ -92,6 +93,7 @@ describe("PaywallDialog", async () => {
   })));
 
   beforeEach(async () => {
+    setActivePinia(createPinia());
     const el = document.createElement("div");
     document.body.appendChild(el);
 
diff --git a/ui/global/tests/components/User/__snapshots__/PaywallDialog.spec.ts.snap b/ui/global/tests/components/User/__snapshots__/PaywallDialog.spec.ts.snap
new file mode 100755
index 00000000000..804a4cd3ed7
--- /dev/null
+++ b/ui/global/tests/components/User/__snapshots__/PaywallDialog.spec.ts.snap
@@ -0,0 +1,3 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`PaywallDialog > Renders the component 1`] = `""`;
diff --git a/ui/package-lock.json b/ui/package-lock.json
index b59cc776687..ca080be5381 100644
--- a/ui/package-lock.json
+++ b/ui/package-lock.json
@@ -37,6 +37,7 @@
         "markdown-it": "^13.0.2",
         "moment": "^2.29.4",
         "node-rsa": "^1.1.1",
+        "pinia": "^3.0.1",
         "qrcode.vue": "^3.4.1",
         "sass": "^1.83.0",
         "sshpk": "^1.17.0",
@@ -2645,11 +2646,11 @@
       "integrity": "sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g=="
     },
     "node_modules/@vue/devtools-kit": {
-      "version": "7.5.2",
-      "resolved": "https://registry.npmjs.org/@vue/devtools-kit/-/devtools-kit-7.5.2.tgz",
-      "integrity": "sha512-0leUOE2HBfl8sHf9ePKzxqnCFskkU22tWWqd9OfeSlslAKE30/TViYvWcF4vgQmPlJnAAdHU0WfW5dYlCeOiuw==",
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/@vue/devtools-kit/-/devtools-kit-7.7.2.tgz",
+      "integrity": "sha512-CY0I1JH3Z8PECbn6k3TqM1Bk9ASWxeMtTCvZr7vb+CHi+X/QwQm5F1/fPagraamKMAHVfuuCbdcnNg1A4CYVWQ==",
       "dependencies": {
-        "@vue/devtools-shared": "^7.5.2",
+        "@vue/devtools-shared": "^7.7.2",
         "birpc": "^0.2.19",
         "hookable": "^5.5.3",
         "mitt": "^3.0.1",
@@ -2659,9 +2660,9 @@
       }
     },
     "node_modules/@vue/devtools-shared": {
-      "version": "7.5.2",
-      "resolved": "https://registry.npmjs.org/@vue/devtools-shared/-/devtools-shared-7.5.2.tgz",
-      "integrity": "sha512-+zmcixnD6TAo+zwm30YuwZckhL9iIi4u+gFwbq9C8zpm3SMndTlEYZtNhAHUhOXB+bCkzyunxw80KQ/T0trF4w==",
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/@vue/devtools-shared/-/devtools-shared-7.7.2.tgz",
+      "integrity": "sha512-uBFxnp8gwW2vD6FrJB8JZLUzVb6PNRG0B0jBnHsOH8uKyva2qINY8PTF5Te4QlTbMDqU5K6qtJDr6cNsKWhbOA==",
       "dependencies": {
         "rfdc": "^1.4.1"
       }
@@ -8149,6 +8150,34 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
+    "node_modules/pinia": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/pinia/-/pinia-3.0.1.tgz",
+      "integrity": "sha512-WXglsDzztOTH6IfcJ99ltYZin2mY8XZCXujkYWVIJlBjqsP6ST7zw+Aarh63E1cDVYeyUcPCxPHzJpEOmzB6Wg==",
+      "dependencies": {
+        "@vue/devtools-api": "^7.7.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/posva"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.4.4",
+        "vue": "^2.7.0 || ^3.5.11"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/pinia/node_modules/@vue/devtools-api": {
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-7.7.2.tgz",
+      "integrity": "sha512-1syn558KhyN+chO5SjlZIwJ8bV/bQ1nOVTG66t2RbG66ZGekyiYNmRO7X9BJCXQqPsFHlnksqvPhce2qpzxFnA==",
+      "dependencies": {
+        "@vue/devtools-kit": "^7.7.2"
+      }
+    },
     "node_modules/pkg-dir": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-5.0.0.tgz",
diff --git a/ui/package.json b/ui/package.json
index 840035d70b3..f9b9dfdb405 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -45,6 +45,7 @@
     "markdown-it": "^13.0.2",
     "moment": "^2.29.4",
     "node-rsa": "^1.1.1",
+    "pinia": "^3.0.1",
     "qrcode.vue": "^3.4.1",
     "sass": "^1.83.0",
     "sshpk": "^1.17.0",
diff --git a/ui/src/components/User/UserWarning.vue b/ui/src/components/User/UserWarning.vue
index ac22ecaf77f..567239c8144 100644
--- a/ui/src/components/User/UserWarning.vue
+++ b/ui/src/components/User/UserWarning.vue
@@ -47,6 +47,11 @@
 
   <PaywallDialog
     v-model="showPaywall"
+    @close="closePaywall"
+    title="Upgrade to have access to all features!"
+    subtitle="To use this feature, upgrade from the ShellHub Community Edition to one of our premium editions.
+              Each edition of ShellHub offers its own set of features and benefits, making it easy to find the
+              right solution for your needs."
     data-test="PaywallDialog-component"
   />
 </template>
@@ -54,6 +59,7 @@
 <script setup lang="ts">
 import { ref, computed, onMounted } from "vue";
 import { useRouter } from "vue-router";
+import PaywallDialog from "@global/components/User/PaywallDialog.vue";
 import Welcome from "../Welcome/Welcome.vue";
 import NamespaceInstructions from "../Namespace/NamespaceInstructions.vue";
 import { INotificationsError } from "@/interfaces/INotifications";
@@ -66,7 +72,6 @@ import handleError from "@/utils/handleError";
 import DeviceAcceptWarning from "../Devices/DeviceAcceptWarning.vue";
 import RecoveryHelper from "../AuthMFA/RecoveryHelper.vue";
 import MfaForceRecoveryMail from "../AuthMFA/MfaForceRecoveryMail.vue";
-import PaywallDialog from "./PaywallDialog.vue";
 
 defineOptions({
   inheritAttrs: false,
@@ -103,6 +108,10 @@ const statusWarning = async () => {
   );
 };
 
+const closePaywall = () => {
+  store.commit("users/setShowPaywall", false);
+};
+
 const billingWarning = async () => {
   const status = await statusWarning();
   await store.dispatch("devices/setDeviceChooserStatus", status);
diff --git a/ui/src/main.ts b/ui/src/main.ts
index 87cfafe06a9..24d80d81bc0 100755
--- a/ui/src/main.ts
+++ b/ui/src/main.ts
@@ -3,17 +3,19 @@ import * as Sentry from "@sentry/vue";
 import { BrowserTracing } from "@sentry/vue";
 import VueGtag from "vue-gtag";
 import { createChatWoot } from "@productdevbook/chatwoot/vue";
+import * as Globals from "@global/components/index";
+import { createPinia } from "pinia";
 import { envVariables } from "./envVariables";
 import vuetify from "./plugins/vuetify";
 import { key, store } from "./store";
 import { router } from "./router";
 import App from "./App.vue";
-
 import { loadFonts } from "./plugins/webfontloader";
 
 import SnackbarComponent from "./components/Snackbar/Snackbar.vue";
 import { SnackbarPlugin } from "./plugins/snackbar";
 
+const pinia = createPinia();
 const app = createApp(App);
 
 Sentry.init({
@@ -36,6 +38,7 @@ loadFonts();
 app.use(vuetify);
 app.use(router);
 app.use(store, key);
+app.use(pinia);
 app.use(VueGtag, {
   config: { id: envVariables.googleAnalyticsID || "" },
 });
@@ -57,6 +60,10 @@ if ((envVariables.isCloud) && (envVariables.chatWootWebsiteToken && envVariables
   );
 }
 
+Object.entries(Globals).forEach(([name, component]) => {
+  app.component(name, component);
+});
+
 app.use(SnackbarPlugin);
 app.component("SnackbarComponent", SnackbarComponent);
 app.mount("#app");
diff --git a/ui/src/store/api/users.ts b/ui/src/store/api/users.ts
index bb5c33a83f9..6abdd4968f7 100755
--- a/ui/src/store/api/users.ts
+++ b/ui/src/store/api/users.ts
@@ -41,12 +41,6 @@ export const patchUserPassword = async (data: IUser) => usersApi.updateUser({
   password: data.newPassword,
 });
 
-export const premiumContent = async () => {
-  const response = await fetch("https://static.shellhub.io/premium-features.v1.json");
-  const data = await response.json();
-  return data;
-};
-
 export const getSamlLink = async () => usersApi.getSamlAuthUrl();
 
 export const setup = async (data: IUserSetup) => systemApi.setup(data.sign, {
diff --git a/ui/src/store/modules/users.ts b/ui/src/store/modules/users.ts
index a17e9d1760f..7f9c0b1e269 100755
--- a/ui/src/store/modules/users.ts
+++ b/ui/src/store/modules/users.ts
@@ -8,7 +8,6 @@ export interface UsersState {
   statusUpdateAccountDialogByDeviceAction: boolean;
   deviceDuplicationError: boolean,
   showPaywall: boolean,
-  premiumContent: Array<object>,
   signUpToken: string | undefined,
   info: {
     version: string;
@@ -32,7 +31,6 @@ export const users: Module<UsersState, State> = {
     statusUpdateAccountDialogByDeviceAction: false,
     deviceDuplicationError: false,
     showPaywall: false,
-    premiumContent: [],
     signUpToken: undefined,
     info: {
       version: "",
@@ -56,7 +54,6 @@ export const users: Module<UsersState, State> = {
     },
     deviceDuplicationError: (state) => state.deviceDuplicationError,
     showPaywall: (state) => state.showPaywall,
-    getPremiumContent: (state) => state.premiumContent,
     getSignToken: (state) => state.signUpToken,
     getSystemInfo: (state) => state.info,
     getSamlURL: (state) => state.samlUrl,
@@ -82,10 +79,6 @@ export const users: Module<UsersState, State> = {
       state.showPaywall = status;
     },
 
-    setPremiumContent(state, data) {
-      state.premiumContent = data;
-    },
-
     setSystemInfo(state, data) {
       state.info = data;
     },
@@ -181,16 +174,6 @@ export const users: Module<UsersState, State> = {
       }
     },
 
-    async getPremiumContent(context) {
-      try {
-        const res = await apiUser.premiumContent();
-        context.commit("setPremiumContent", res);
-      } catch (error) {
-        console.error(error);
-        throw error;
-      }
-    },
-
     async fetchSystemInfo({ commit }) {
       try {
         const response = await apiUser.getInfo();
diff --git a/ui/tests/layouts/AppLayout.spec.ts b/ui/tests/layouts/AppLayout.spec.ts
index 44734e3babd..0ef0a2dfaf1 100644
--- a/ui/tests/layouts/AppLayout.spec.ts
+++ b/ui/tests/layouts/AppLayout.spec.ts
@@ -2,6 +2,7 @@ import { createVuetify } from "vuetify";
 import { flushPromises, mount, VueWrapper } from "@vue/test-utils";
 import { beforeEach, afterEach, describe, expect, it, vi } from "vitest";
 import { nextTick } from "vue";
+import { createPinia, setActivePinia } from "pinia";
 import AppLayout from "@/layouts/AppLayout.vue";
 import { store, key } from "@/store";
 import { router } from "@/router";
@@ -14,6 +15,8 @@ describe("App Layout Component", () => {
   const vuetify = createVuetify();
 
   beforeEach(() => {
+    setActivePinia(createPinia());
+
     vi.useFakeTimers();
 
     wrapper = mount(AppLayout, {
diff --git a/ui/tsconfig.json b/ui/tsconfig.json
index 1d20d1e06b6..d0659238ae8 100755
--- a/ui/tsconfig.json
+++ b/ui/tsconfig.json
@@ -18,6 +18,7 @@
       "@/*": ["src/*"],
       "@ui/*": ["src/*"],
       "@admin/*": ["admin/src/*"],
+      "@global/*": ["global/*"],
     },
     "noImplicitAny": false,
     "sourceRoot": "/",
@@ -38,7 +39,10 @@
     "src/sshpk.Js",
     "admin/**/*.ts",
     "admin/**/*.d.ts",
-    "admin/**/*.vue",
+    "admin/**/*.vue", 
+    "global/**/*.ts",
+    "global/**/*.d.ts",
+    "global/**/*.vue", 
   ],
   "extensions": [
     ".vue"
diff --git a/ui/tsconfig.vitest.json b/ui/tsconfig.vitest.json
index cc619b5e79d..0a16dadf833 100644
--- a/ui/tsconfig.vitest.json
+++ b/ui/tsconfig.vitest.json
@@ -7,7 +7,9 @@
     "composite": true,
     "baseUrl": ".",
     "paths": {
-      "@/*": ["./src/*"]
+      "@/*": ["./src/*"],
+      "@admin/*": ["./admin/src/*"],
+      "@global/*": ["./global/*"]
     },
     "lib": ["ESNext", "DOM", "DOM.Iterable"],
     "types": ["vuetify", "node", "jsdom"]
diff --git a/ui/vite.config.ts b/ui/vite.config.ts
index fb49ab38929..ce4dc3ecb4d 100755
--- a/ui/vite.config.ts
+++ b/ui/vite.config.ts
@@ -82,6 +82,7 @@ export default defineConfig({
       "@": path.resolve(__dirname, "src"),
       "@ui": path.resolve(__dirname, "src"),
       "@admin": path.resolve(__dirname, "admin/src"),
+      "@global": path.resolve(__dirname, "global"),
     },
   },
   define: {
diff --git a/ui/vitest.config.ts b/ui/vitest.config.ts
index fce31c88939..ccd87ab2aec 100644
--- a/ui/vitest.config.ts
+++ b/ui/vitest.config.ts
@@ -10,6 +10,7 @@ export default defineConfig({
     alias: {
       "@": fileURLToPath(new URL("./src", import.meta.url)),
       "@admin": fileURLToPath(new URL("./admin/src", import.meta.url)),
+      "@global": fileURLToPath(new URL("./global", import.meta.url)),
     },
   },
   css: {
@@ -50,6 +51,9 @@ export default defineConfig({
       },
     },
     exclude: ["**/node_modules/**"],
+    alias: {
+      "@global": fileURLToPath(new URL("./global", import.meta.url)),
+    },
     update: false,
   },
 });
diff --git a/ui/vitest/setup.ts b/ui/vitest/setup.ts
index 4d468b8d6de..065623793a8 100644
--- a/ui/vitest/setup.ts
+++ b/ui/vitest/setup.ts
@@ -10,7 +10,6 @@ export async function setup() {
 
 // FAIL LOUDLY on unhandled promise rejections / errors
 process.on("unhandledRejection", (reason) => {
-  // eslint-disable-next-line no-console
   console.log("FAILED TO HANDLE PROMISE REJECTION");
   throw reason;
 });