diff --git a/app.vue b/app.vue
index 1465984c..e7e62612 100644
--- a/app.vue
+++ b/app.vue
@@ -3,7 +3,7 @@ setupPageHeader()
 provideGlobalCommands()
 
 // We want to trigger rerendering the page when account changes
-const key = computed(() => currentUser.value ? getUniqueUserId(currentUser.value) : '')
+const key = computed(() => getUniqueUserId(currentUser.value))
 </script>
 
 <template>
diff --git a/components/account/AccountFollowButton.vue b/components/account/AccountFollowButton.vue
index 6a0c7aa8..c26355ce 100644
--- a/components/account/AccountFollowButton.vue
+++ b/components/account/AccountFollowButton.vue
@@ -7,7 +7,7 @@ const { account, command, ...props } = defineProps<{
   command?: boolean
 }>()
 
-const isSelf = $computed(() => checkUser(currentUser.value) && currentUser.value.account.id === account.id)
+const isSelf = $computed(() => checkAuth(currentUser.value) && currentUser.value.account.id === account.id)
 const enable = $computed(() => !isSelf && !isGuest.value)
 const relationship = $computed(() => props.relationship || useRelationship(account).value)
 
diff --git a/components/account/AccountHeader.vue b/components/account/AccountHeader.vue
index 436fb0bb..17c21f36 100644
--- a/components/account/AccountHeader.vue
+++ b/components/account/AccountHeader.vue
@@ -60,7 +60,7 @@ watchEffect(() => {
   iconFields.value = icons
 })
 
-const isSelf = $computed(() => checkUser(currentUser.value) && currentUser.value.account.id === account.id)
+const isSelf = $computed(() => checkAuth(currentUser.value) && currentUser.value.account.id === account.id)
 </script>
 
 <template>
diff --git a/components/account/AccountMoreButton.vue b/components/account/AccountMoreButton.vue
index 5d158cce..4d81ab76 100644
--- a/components/account/AccountMoreButton.vue
+++ b/components/account/AccountMoreButton.vue
@@ -7,7 +7,7 @@ const { account } = defineProps<{
 }>()
 let relationship = $(useRelationship(account))
 
-const isSelf = $computed(() => checkUser(currentUser.value) && currentUser.value.account.id === account.id)
+const isSelf = $computed(() => checkAuth(currentUser.value) && currentUser.value.account.id === account.id)
 
 const masto = useMasto()
 const toggleMute = async () => {
diff --git a/components/status/StatusActionsMore.vue b/components/status/StatusActionsMore.vue
index b6a430d0..5788d1cb 100644
--- a/components/status/StatusActionsMore.vue
+++ b/components/status/StatusActionsMore.vue
@@ -23,7 +23,7 @@ const clipboard = useClipboard()
 const router = useRouter()
 const route = useRoute()
 
-const isAuthor = $computed(() => checkUser(currentUser.value) && status.account.id === currentUser.value.account.id)
+const isAuthor = $computed(() => checkAuth(currentUser.value) && status.account.id === currentUser.value.account.id)
 
 const {
   toggle: _toggleTranslation,
diff --git a/components/status/StatusReplyingTo.vue b/components/status/StatusReplyingTo.vue
index b39f1564..d8ad148b 100644
--- a/components/status/StatusReplyingTo.vue
+++ b/components/status/StatusReplyingTo.vue
@@ -24,7 +24,7 @@ const account = isSelf ? computed(() => status.account) : useAccountById(status.
         <template v-if="!collapsed">
           <AccountAvatar
             v-if="isSelf || simplified
-              || (checkUser(currentUser) && status.inReplyToAccountId === currentUser?.account.id)"
+              || (checkAuth(currentUser) && status.inReplyToAccountId === currentUser?.account.id)"
             :account="account" :link="false" w-5 h-5 mx-0.5
           />
           <AccountInlineInfo v-else :account="account" :link="false" mx-0.5 />
diff --git a/composables/push-notifications/createPushSubscription.ts b/composables/push-notifications/createPushSubscription.ts
index 30ca1774..1bfb83ec 100644
--- a/composables/push-notifications/createPushSubscription.ts
+++ b/composables/push-notifications/createPushSubscription.ts
@@ -97,7 +97,7 @@ async function subscribe(
 
 async function unsubscribeFromBackend(fromSWPushManager: boolean, removePushNotification = true) {
   const cu = currentUser.value
-  if (checkUser(cu)) {
+  if (checkAuth(cu)) {
     await removePushNotifications(cu)
     removePushNotification && await removePushNotificationData(cu, fromSWPushManager)
   }
@@ -105,7 +105,7 @@ async function unsubscribeFromBackend(fromSWPushManager: boolean, removePushNoti
 
 async function removePushNotificationDataOnError(e: Error) {
   const cu = currentUser.value
-  if (checkUser(cu))
+  if (checkAuth(cu))
     await removePushNotificationData(cu, true)
 
   throw e
diff --git a/composables/push-notifications/usePushManager.ts b/composables/push-notifications/usePushManager.ts
index 55c6fff8..a7899613 100644
--- a/composables/push-notifications/usePushManager.ts
+++ b/composables/push-notifications/usePushManager.ts
@@ -109,7 +109,7 @@ export const usePushManager = () => {
   }
 
   const unsubscribe = async () => {
-    if (!isSupported || !isSubscribed || !checkUser(currentUser.value))
+    if (!isSupported || !isSubscribed || !checkAuth(currentUser.value))
       return false
 
     await removePushNotifications(currentUser.value)
@@ -117,7 +117,7 @@ export const usePushManager = () => {
   }
 
   const saveSettings = async (policy?: SubscriptionPolicy) => {
-    if (!checkUser(currentUser.value))
+    if (!checkAuth(currentUser.value))
       return
 
     if (policy)
@@ -136,7 +136,7 @@ export const usePushManager = () => {
   }
 
   const undoChanges = () => {
-    if (!checkUser(currentUser.value))
+    if (!checkAuth(currentUser.value))
       return
 
     const current = pushNotificationData.value
diff --git a/composables/users.ts b/composables/users.ts
index 68de6dec..4aaf3431 100644
--- a/composables/users.ts
+++ b/composables/users.ts
@@ -70,8 +70,8 @@ export const currentServer = computed<string>(() => currentUser.value.server)
 export const currentInstance = computed<null | Instance>(() => {
   return instances.value[currentServer.value] ?? null
 })
-export const checkUser = (val: UserLogin | undefined): val is UserLogin<true> => !!(val && !val.guest)
-export const isGuest = computed(() => !checkUser(currentUser.value))
+export const checkAuth = (val: UserLogin | undefined): val is UserLogin<true> => !!(val && !val.guest)
+export const isGuest = computed(() => !checkAuth(currentUser.value))
 export const getUniqueUserId = (user: UserLogin) =>
   user.guest ? `${GUEST_ID}@${user.server}` : user.account.id
 export const isSameUser = (a: UserLogin | undefined, b: UserLogin | undefined) =>
@@ -264,7 +264,7 @@ export async function signout() {
     if (!users.value.some((u, i) => u.server === currentUser.value.server && i !== index))
       delete instances.value[currentUser.value.server]
 
-    if (checkUser(currentUser.value)) {
+    if (checkAuth(currentUser.value)) {
       await removePushNotifications(currentUser.value)
       await removePushNotificationData(currentUser.value)
     }
diff --git a/layouts/default.vue b/layouts/default.vue
index 43d1d4b3..5554bf17 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -24,7 +24,7 @@ const wideLayout = computed(() => route.meta.wideLayout ?? false)
                     <UserPicker v-if="showUserPicker" />
                     <div v-else flex="~" items-center justify-between>
                       <NuxtLink
-                        v-if="checkUser(currentUser)"
+                        v-if="checkAuth(currentUser)"
                         hidden xl:block
                         rounded-full text-start w-full
                         hover:bg-active cursor-pointer transition-100