diff --git a/app/components/header/AvatarButton.vue b/app/components/header/AvatarButton.vue
index d89e9c7..3e090cd 100644
--- a/app/components/header/AvatarButton.vue
+++ b/app/components/header/AvatarButton.vue
@@ -17,22 +17,17 @@ const idpProvider = config.public.idpProvider;
 
 const isAuthenticated = computed(() => authStatus.value === "authenticated");
 
-const userActionLabel = isAuthenticated.value ? "Logout" : "Login";
-const userActionIcon = isAuthenticated.value
-  ? "pi pi-sign-in"
-  : "pi pi-sign-out";
-
 const toggle = (event) => {
   menu.value.toggle(event);
 };
 
-const menuItems = ref([
+const menuItems = computed(() => [
   {
     label: "Options",
     items: [
       {
-        label: userActionLabel,
-        icon: userActionIcon,
+        label: isAuthenticated.value ? "Logout" : "Login",
+        icon: isAuthenticated.value ? "pi pi-sign-out" : "pi pi-sign-in",
         command: () => {
           // eslint-disable-next-line @typescript-eslint/no-unused-expressions
           isAuthenticated.value ? signOut() : signIn(`${idpProvider}`);
@@ -84,6 +79,7 @@ const menuItems = ref([
         @click="toggle"
       />
     </div>
+    <div v-else-if="authStatus === 'loading'" class="avatar-container" />
     <div v-else>
       <Button
         aria-controls="overlay_menu"
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 9d8ad16..dd3b9e1 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -4,7 +4,7 @@ import { Flame } from "./app/assets/primevue/flame-preset";
 import tailwindcss from "@tailwindcss/vite";
 
 export default defineNuxtConfig({
-  ssr: false,
+  ssr: process.env.NODE_ENV !== "development",
   devtools: { enabled: false },
   modules: ["@primevue/nuxt-module", "@sidebase/nuxt-auth", "@pinia/nuxt"],
 
@@ -31,7 +31,7 @@ export default defineNuxtConfig({
     originEnvKey: "NUXT_PUBLIC_ORIGIN",
     baseURL:
       process.env.NUXT_PUBLIC_ORIGIN || "http://localhost:3000/flame/api/auth",
-    disableServerSideAuth: false,
+    disableServerSideAuth: true, // Not needed since globalAppMiddleware is enabled
     globalAppMiddleware: true,
     provider: {
       type: "authjs",