diff --git a/components/account/AccountHeader.vue b/components/account/AccountHeader.vue
index 6ec29559..436fb0bb 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(() => checkUser(currentUser.value) && currentUser.value.account.id === account.id)
 </script>
 
 <template>
diff --git a/components/notification/NotificationEnablePushNotification.client.vue b/components/notification/NotificationEnablePushNotification.client.vue
index 4bedd0b9..097957f3 100644
--- a/components/notification/NotificationEnablePushNotification.client.vue
+++ b/components/notification/NotificationEnablePushNotification.client.vue
@@ -12,7 +12,7 @@ defineSlots<{
   error: {}
 }>()
 
-const isLegacyAccount = computed(() => !currentUser.value?.vapidKey)
+const isLegacyAccount = computed(() => !currentUser.value.vapidKey)
 </script>
 
 <template>
diff --git a/components/notification/NotificationPreferences.client.vue b/components/notification/NotificationPreferences.client.vue
index c608bc35..3084bdc3 100644
--- a/components/notification/NotificationPreferences.client.vue
+++ b/components/notification/NotificationPreferences.client.vue
@@ -28,7 +28,7 @@ let subscribeError = $ref<string>('')
 let showSubscribeError = $ref<boolean>(false)
 
 const hideNotification = () => {
-  const key = currentUser.value?.account?.acct
+  const key = currentUser.value.account?.acct
   if (key)
     hiddenNotification.value[key] = true
 }
@@ -39,7 +39,7 @@ const showWarning = $computed(() => {
 
   return isSupported
       && (!isSubscribed.value || !notificationPermission.value || notificationPermission.value === 'prompt')
-      && !(hiddenNotification.value[currentUser.value?.account?.acct ?? ''] === true)
+      && !(hiddenNotification.value[currentUser.value.account?.acct ?? ''] === true)
 })
 
 const saveSettings = async () => {
diff --git a/components/status/StatusActionsMore.vue b/components/status/StatusActionsMore.vue
index f25adbf5..b6a430d0 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(() => checkUser(currentUser.value) && status.account.id === currentUser.value.account.id)
 
 const {
   toggle: _toggleTranslation,
diff --git a/components/status/StatusNotFound.vue b/components/status/StatusNotFound.vue
index b1b4e530..6562e341 100644
--- a/components/status/StatusNotFound.vue
+++ b/components/status/StatusNotFound.vue
@@ -6,7 +6,7 @@ const { account, status } = defineProps<{
 
 const originalUrl = computed(() => {
   const [handle, _server] = account.split('@')
-  const server = _server || currentUser.value?.server
+  const server = _server || currentUser.value.server
   if (!server)
     return null
 
diff --git a/components/timeline/TimelinePinned.vue b/components/timeline/TimelinePinned.vue
index 705542a8..0354bf1c 100644
--- a/components/timeline/TimelinePinned.vue
+++ b/components/timeline/TimelinePinned.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-const paginator = useMasto().accounts.iterateStatuses(currentUser.value!.account!.id, { pinned: true })
+const paginator = useMasto().accounts.iterateStatuses(currentUser.value.account!.id, { pinned: true })
 </script>
 
 <template>
diff --git a/composables/push-notifications/usePushManager.ts b/composables/push-notifications/usePushManager.ts
index a7ac0134..55c6fff8 100644
--- a/composables/push-notifications/usePushManager.ts
+++ b/composables/push-notifications/usePushManager.ts
@@ -29,12 +29,12 @@ export const usePushManager = () => {
   const hiddenNotification = useLocalStorage<PushNotificationRequest>(STORAGE_KEY_NOTIFICATION, {})
   const configuredPolicy = useLocalStorage<PushNotificationPolicy>(STORAGE_KEY_NOTIFICATION_POLICY, {})
   const pushNotificationData = ref({
-    follow: currentUser.value?.pushSubscription?.alerts.follow ?? true,
-    favourite: currentUser.value?.pushSubscription?.alerts.favourite ?? true,
-    reblog: currentUser.value?.pushSubscription?.alerts.reblog ?? true,
-    mention: currentUser.value?.pushSubscription?.alerts.mention ?? true,
-    poll: currentUser.value?.pushSubscription?.alerts.poll ?? true,
-    policy: configuredPolicy.value[currentUser.value?.account?.acct ?? ''] ?? 'all',
+    follow: currentUser.value.pushSubscription?.alerts.follow ?? true,
+    favourite: currentUser.value.pushSubscription?.alerts.favourite ?? true,
+    reblog: currentUser.value.pushSubscription?.alerts.reblog ?? true,
+    mention: currentUser.value.pushSubscription?.alerts.mention ?? true,
+    poll: currentUser.value.pushSubscription?.alerts.poll ?? true,
+    policy: configuredPolicy.value[currentUser.value.account?.acct ?? ''] ?? 'all',
   })
   // don't clone, we're using indexeddb
   const { history, commit, clear } = useManualRefHistory(pushNotificationData)
@@ -49,7 +49,7 @@ export const usePushManager = () => {
       || current.policy !== previous.policy
   })
 
-  watch(() => currentUser.value?.pushSubscription, (subscription) => {
+  watch(() => currentUser.value.pushSubscription, (subscription) => {
     isSubscribed.value = !!subscription
     pushNotificationData.value = {
       follow: subscription?.alerts.follow ?? false,
@@ -57,7 +57,7 @@ export const usePushManager = () => {
       reblog: subscription?.alerts.reblog ?? false,
       mention: subscription?.alerts.mention ?? false,
       poll: subscription?.alerts.poll ?? false,
-      policy: configuredPolicy.value[currentUser.value?.account?.acct ?? ''] ?? 'all',
+      policy: configuredPolicy.value[currentUser.value.account?.acct ?? ''] ?? 'all',
     }
   }, { immediate: true, flush: 'post' })
 
@@ -87,7 +87,7 @@ export const usePushManager = () => {
       return 'notification-denied'
     }
 
-    currentUser.value!.pushSubscription = await createPushSubscription(
+    currentUser.value.pushSubscription = await createPushSubscription(
       { pushSubscription, server, token, vapidKey },
       notificationData ?? {
         alerts: {
@@ -126,9 +126,9 @@ export const usePushManager = () => {
     commit()
 
     if (policy)
-      configuredPolicy.value[currentUser.value!.account.acct ?? ''] = policy
+      configuredPolicy.value[currentUser.value.account.acct ?? ''] = policy
     else
-      configuredPolicy.value[currentUser.value!.account.acct ?? ''] = pushNotificationData.value.policy
+      configuredPolicy.value[currentUser.value.account.acct ?? ''] = pushNotificationData.value.policy
 
     await nextTick()
     clear()
@@ -147,7 +147,7 @@ export const usePushManager = () => {
     current.follow = previous.follow
     current.poll = previous.poll
     current.policy = previous.policy
-    configuredPolicy.value[currentUser.value!.account.acct ?? ''] = previous.policy
+    configuredPolicy.value[currentUser.value.account.acct ?? ''] = previous.policy
     commit()
     clear()
   }
diff --git a/composables/statusDrafts.ts b/composables/statusDrafts.ts
index f7e4508a..1cf310d4 100644
--- a/composables/statusDrafts.ts
+++ b/composables/statusDrafts.ts
@@ -51,7 +51,7 @@ function mentionHTML(acct: string) {
 
 export function getReplyDraft(status: Status) {
   const accountsToMention: string[] = []
-  const userId = currentUser.value!.account!.id
+  const userId = currentUser.value.account!.id
   if (status.account.id !== userId)
     accountsToMention.push(status.account.acct)
   accountsToMention.push(...(status.mentions.filter(mention => mention.id !== userId).map(mention => mention.acct)))
diff --git a/composables/users.ts b/composables/users.ts
index 04853b70..68de6dec 100644
--- a/composables/users.ts
+++ b/composables/users.ts
@@ -261,7 +261,7 @@ export async function signout() {
   if (index !== -1) {
     // Clear stale data
     clearUserLocalStorage()
-    if (!users.value.some((u, i) => u.server === currentUser.value!.server && i !== index))
+    if (!users.value.some((u, i) => u.server === currentUser.value.server && i !== index))
       delete instances.value[currentUser.value.server]
 
     if (checkUser(currentUser.value)) {
@@ -284,7 +284,7 @@ export async function signout() {
 const notifications = reactive<Record<string, undefined | [Promise<WsEvents>, number]>>({})
 
 export const useNotifications = () => {
-  const id = $computed(() => currentUser.value?.account?.id)
+  const id = $computed(() => currentUser.value.account?.id)
   const masto = useMasto()
 
   const clearNotifications = () => {
@@ -294,7 +294,7 @@ export const useNotifications = () => {
   }
 
   async function connect(): Promise<void> {
-    if (!isMastoInitialised.value || !id || notifications[id] || !currentUser.value?.token)
+    if (!isMastoInitialised.value || !id || notifications[id] || !currentUser.value.token)
       return
 
     const stream = masto.stream.streamUser()
@@ -344,7 +344,7 @@ export function useUserLocalStorage<T extends object>(key: string, initial: () =
   return computed(() => {
     const id = currentUser.value.guest
       ? GUEST_ID
-      : currentUser.value!.account!.acct
+      : currentUser.value.account!.acct
     all.value[id] = Object.assign(initial(), all.value[id] || {})
     return all.value[id]
   })
@@ -355,7 +355,7 @@ export function useUserLocalStorage<T extends object>(key: string, initial: () =
  */
 export function clearUserLocalStorage(account?: Account) {
   if (!account)
-    account = currentUser.value?.account
+    account = currentUser.value.account
   if (!account)
     return
 
diff --git a/pages/settings/profile/appearance.vue b/pages/settings/profile/appearance.vue
index 9e85233f..9ea098b1 100644
--- a/pages/settings/profile/appearance.vue
+++ b/pages/settings/profile/appearance.vue
@@ -15,7 +15,7 @@ useHeadFixed({
   title: () => `${t('settings.profile.appearance.title')} | ${t('nav.settings')}`,
 })
 
-const account = $computed(() => currentUser.value?.account)
+const account = $computed(() => currentUser.value.account)
 
 const onlineSrc = $computed(() => ({
   avatar: account?.avatar || '',