diff --git a/src/components/mobile_post_status_button/mobile_post_status_button.js b/src/components/mobile_post_status_button/mobile_post_status_button.js
index d137331c9..b42af3fa0 100644
--- a/src/components/mobile_post_status_button/mobile_post_status_button.js
+++ b/src/components/mobile_post_status_button/mobile_post_status_button.js
@@ -34,9 +34,6 @@ const MobilePostStatusButton = {
     window.removeEventListener('resize', this.handleOSK)
   },
   computed: {
-    isLoggedIn() {
-      return useUsersStore().loggedIn
-    },
     isHidden() {
       if (HIDDEN_FOR_PAGES.has(this.$route.name)) {
         return true
@@ -52,6 +49,7 @@ const MobilePostStatusButton = {
     autohideFloatingPostButton() {
       return !!useMergedConfigStore().mergedConfig.autohideFloatingPostButton
     },
+    ...mapState(useUsersStore, ['loggedIn']),
   },
   watch: {
     autohideFloatingPostButton: function (isEnabled) {
diff --git a/src/components/mobile_post_status_button/mobile_post_status_button.vue b/src/components/mobile_post_status_button/mobile_post_status_button.vue
index 32079c298..8b11f12d4 100644
--- a/src/components/mobile_post_status_button/mobile_post_status_button.vue
+++ b/src/components/mobile_post_status_button/mobile_post_status_button.vue
@@ -1,6 +1,6 @@
 <template>
   <button
-    v-if="isLoggedIn"
+    v-if="loggedIn"
     class="MobilePostButton button-default new-status-button"
     :class="{ 'hidden': isHidden, 'always-show': isPersistent }"
     :title="$t('post_status.new_status')"
diff --git a/src/components/settings_modal/settings_modal_admin_content.js b/src/components/settings_modal/settings_modal_admin_content.js
index f6b67c7c6..b9403c8e0 100644
--- a/src/components/settings_modal/settings_modal_admin_content.js
+++ b/src/components/settings_modal/settings_modal_admin_content.js
@@ -100,9 +100,6 @@ const SettingsModalAdminContent = {
     user() {
       return useUsersStore().currentUser
     },
-    isLoggedIn() {
-      return !!useUsersStore().currentUser
-    },
     open() {
       return useInterfaceStore().settingsModalState !== 'hidden'
     },
diff --git a/src/components/settings_modal/settings_modal_user_content.js b/src/components/settings_modal/settings_modal_user_content.js
index 0b6f2a385..f070e1e03 100644
--- a/src/components/settings_modal/settings_modal_user_content.js
+++ b/src/components/settings_modal/settings_modal_user_content.js
@@ -75,9 +75,6 @@ const SettingsModalContent = {
     OldThemeTab,
   },
   computed: {
-    isLoggedIn() {
-      return !!useUsersStore().currentUser
-    },
     open() {
       return useInterfaceStore().settingsModalState !== 'hidden'
     },
@@ -87,6 +84,7 @@ const SettingsModalContent = {
     expertLevel() {
       return useMergedConfigStore().mergedConfig.expertLevel
     },
+    ...mapState(useUsersStore, ['loggedIn']),
   },
   data() {
     return {
diff --git a/src/components/settings_modal/settings_modal_user_content.vue b/src/components/settings_modal/settings_modal_user_content.vue
index c958b9435..521750eca 100644
--- a/src/components/settings_modal/settings_modal_user_content.vue
+++ b/src/components/settings_modal/settings_modal_user_content.vue
@@ -14,7 +14,7 @@
       <GeneralTab />
     </div>
     <div
-      v-if="isLoggedIn"
+      v-if="loggedIn"
       :label="$t('settings.profile_tab')"
       icon="user"
       data-tab-name="profile"
@@ -23,7 +23,7 @@
       <ProfileTab />
     </div>
     <div
-      v-if="isLoggedIn"
+      v-if="loggedIn"
       :label="$t('settings.composing')"
       icon="pen-alt"
       data-tab-name="composing"
@@ -57,7 +57,7 @@
       <LayoutTab />
     </div>
     <div
-      v-if="isLoggedIn"
+      v-if="loggedIn"
       :full-width="true"
       :label="$t('settings.notifications')"
       icon="bell"
@@ -73,7 +73,7 @@
       <FilteringTab />
     </div>
     <div
-      v-if="isLoggedIn"
+      v-if="loggedIn"
       :label="$t('settings.mutes_and_blocks')"
       icon="eye-slash"
       data-tab-name="mutesAndBlocks"
@@ -90,7 +90,7 @@
       <ClutterTab />
     </div>
     <div
-      v-if="isLoggedIn"
+      v-if="loggedIn"
       :label="$t('settings.security_tab')"
       icon="lock"
       data-tab-name="security"
@@ -98,7 +98,7 @@
       <SecurityTab />
     </div>
     <div
-      v-if="isLoggedIn"
+      v-if="loggedIn"
       :label="$t('settings.data_import_export_tab')"
       icon="download"
       data-tab-name="dataImportExport"