diff --git a/frontend/src/components/Settings/SettingsModal.vue b/frontend/src/components/Settings/SettingsModal.vue
index a7b78ae2..ef90a91e 100644
--- a/frontend/src/components/Settings/SettingsModal.vue
+++ b/frontend/src/components/Settings/SettingsModal.vue
@@ -92,10 +92,14 @@ const tabs = computed(() => {
     },
   ]
 
-  return _tabs.filter((tab) => {
-    return tab.items.some((item) => {
-      return item.condition ? item.condition() : true
+  return _tabs.map((tab) => {
+    tab.items = tab.items.filter((item) => {
+      if (item.condition) {
+        return item.condition()
+      }
+      return true
     })
+    return tab
   })
 })
 
diff --git a/frontend/src/components/UserDropdown.vue b/frontend/src/components/UserDropdown.vue
index 969cbbfd..8ec7ca2f 100644
--- a/frontend/src/components/UserDropdown.vue
+++ b/frontend/src/components/UserDropdown.vue
@@ -7,8 +7,8 @@
           isCollapsed
             ? 'w-auto px-0'
             : open
-            ? 'w-52 bg-white px-2 shadow-sm'
-            : 'w-52 px-2 hover:bg-gray-200'
+              ? 'w-52 bg-white px-2 shadow-sm'
+              : 'w-52 px-2 hover:bg-gray-200'
         "
       >
         <CRMLogo class="size-8 flex-shrink-0 rounded" />
@@ -44,7 +44,7 @@
       </button>
     </template>
   </Dropdown>
-  <SettingsModal v-model="showSettingsModal" />
+  <SettingsModal v-if="showSettingsModal" v-model="showSettingsModal" />
 </template>
 
 <script setup>