From 7d4ced15c63b7fd46dfeb86a015ada9cd4d73d73 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 10 Aug 2026 15:00:59 +0300
Subject: [PATCH] migration

---
 src/App.js                                    |   5 +-
 src/App.vue                                   |   2 +-
 src/boot/after_store.js                       |   3 +-
 src/boot/routes.js                            |   5 +-
 .../account_actions/account_actions.js        |   3 +-
 src/components/announcement/announcement.js   |   7 +-
 .../announcements_page/announcements_page.js  |   7 +-
 src/components/block_card/block_card.js       |   5 +-
 src/components/chat_list/chat_list.js         |  10 +-
 .../chat_list_item/chat_list_item.js          |   8 +-
 src/components/chat_message/chat_message.js   |  24 +-
 src/components/chat_new/chat_new.js           |   8 +-
 src/components/chat_view/chat_view.js         |   5 +-
 src/components/confirm_modal/mute_confirm.js  |   5 +-
 src/components/desktop_nav/desktop_nav.js     |   5 +-
 .../domain_mute_card/domain_mute_card.js      |   4 +-
 .../edit_status_modal/edit_status_modal.js    |   3 +-
 .../emoji_reactions/emoji_reactions.js        |   3 +-
 .../extra_notifications.js                    |   3 +-
 src/components/follow_card/follow_card.js     |   6 +-
 src/components/interactions/interactions.js   |   7 +-
 src/components/lists_edit/lists_edit.js       |  11 +-
 .../lists_menu/lists_menu_content.js          |  10 +-
 src/components/mention_link/mention_link.js   |  14 +-
 src/components/mobile_nav/mobile_nav.js       |   3 +-
 .../mobile_post_status_button.js              |   3 +-
 .../moderation_tools/moderation_tools.js      |   5 +-
 src/components/mute_card/mute_card.js         |   6 +-
 src/components/nav_panel/nav_panel.js         |   3 +-
 src/components/navigation/navigation_entry.js |  10 +-
 src/components/navigation/navigation_pins.js  |   3 +-
 src/components/notification/notification.js   |  13 +-
 src/components/notifications/notifications.js |   3 +-
 .../oauth_callback/oauth_callback.js          |   4 +-
 .../password_reset/password_reset.js          |  12 +-
 src/components/poll/poll.js                   |   3 +-
 .../post_status_form/post_status_form.js      |   3 +-
 .../post_status_modal/post_status_modal.js    |   3 +-
 .../quick_filter_settings.js                  |   3 +-
 .../quick_view_settings.js                    |   3 +-
 src/components/search/search.js               |   4 +-
 .../admin_tabs/admin_user_card.js             |   4 +-
 .../helpers/shared_computed_object.js         |  14 +-
 .../settings_modal_admin_content.js           |   5 +-
 .../settings_modal_user_content.js            |   3 +-
 .../settings_modal/tabs/appearance_tab.js     |  10 +-
 .../settings_modal/tabs/composing_tab.js      |   8 +-
 .../tabs/data_import_export_tab.js            |   7 +-
 .../settings_modal/tabs/general_tab.js        |   8 +-
 .../tabs/mutes_and_blocks_tab.js              |  13 +-
 .../settings_modal/tabs/notifications_tab.js  |   6 +-
 .../settings_modal/tabs/profile_tab.js        |  10 +-
 .../tabs/security_tab/security_tab.js         |   3 +-
 src/components/side_drawer/side_drawer.js     |   3 +-
 src/components/status/status.js               |   7 +-
 .../status_action_buttons/action_button.js    |   3 +-
 .../action_button_container.js                |   7 +-
 .../status_action_buttons.js                  |   5 +-
 .../status_content/status_content.js          |  10 +-
 .../still-image/still-image-emoji-popover.js  |   3 +-
 src/components/timeline/timeline.js           |   5 +-
 src/components/timeline_menu/timeline_menu.js |  12 +-
 .../update_notification.js                    |   3 +-
 src/components/user_card/user_card.js         |  30 +-
 src/components/user_panel/user_panel.js       |   9 +-
 src/components/user_panel/user_panel.vue      |   4 +-
 src/components/user_profile/user_profile.js   |  27 +-
 .../user_profile/user_profile_admin_view.js   |   3 +-
 .../user_reporting_modal.js                   |   5 +-
 .../who_to_follow_panel.js                    |   5 +-
 src/lib/persisted_state.js                    |  12 +-
 src/lib/push_notifications_plugin.js          |   4 +-
 src/modules/index.js                          |   2 -
 src/modules/notifications.js                  |   5 +-
 src/modules/profileConfig.js                  |   6 +-
 src/modules/statuses.js                       |  27 +-
 src/modules/users.js                          | 870 ------------------
 src/services/chat_utils/chat_utils.js         |   5 +-
 .../entity_normalizer.service.js              |   1 +
 .../status_poster/status_poster.service.js    |  10 +-
 .../timeline_fetcher.service.js               |   3 +-
 src/stores/announcements.js                   |   5 +-
 src/stores/auth_flow.js                       |   3 +-
 src/stores/emoji.js                           |   3 +-
 src/stores/instance.js                        |   3 +-
 src/stores/interface.js                       |   3 +-
 src/stores/sync_config.js                     |   3 +-
 src/stores/user_highlight.js                  |   3 +-
 src/stores/users.js                           |  26 +-
 .../specs/components/post_status_form.spec.js |   3 +-
 90 files changed, 311 insertions(+), 1165 deletions(-)
 delete mode 100644 src/modules/users.js

diff --git a/src/App.js b/src/App.js
index d7a63bd8a..2854f7dfc 100644
--- a/src/App.js
+++ b/src/App.js
@@ -21,6 +21,7 @@ import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.j
 import { useInterfaceStore } from 'src/stores/interface.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
 import { useShoutStore } from 'src/stores/shout.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 // Helper to unwrap reactive proxies
 window.toValue = (x) => JSON.parse(JSON.stringify(x))
@@ -153,9 +154,6 @@ export default {
         ...(navbarColumnStretch ? ['-column-stretch'] : []),
       ]
     },
-    currentUser() {
-      return this.$store.state.users.currentUser
-    },
     userBackground() {
       return this.currentUser.background_image
     },
@@ -246,6 +244,7 @@ export default {
       'styleDataUsed',
       'layoutType',
     ]),
+    ...mapState(useUsersStore, ['currentUser']),
     ...mapState(useInstanceStore, ['styleDataUsed']),
     ...mapState(useInstanceCapabilitiesStore, [
       'suggestionsEnabled',
diff --git a/src/App.vue b/src/App.vue
index 84a6f7d3d..bd19c5c10 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -26,7 +26,7 @@
         class="column -scrollable"
         :class="{ '-show-scrollbar': showScrollbars }"
       >
-        <user-panel />
+        <UserPanel />
         <template v-if="layoutType !== 'mobile'">
           <NavPanel />
           <InstanceSpecificPanel v-if="showInstanceSpecificPanel" />
diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index 986586a80..bece8e000 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -39,6 +39,7 @@ import { useMergedConfigStore } from 'src/stores/merged_config.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
 import { useUserHighlightStore } from 'src/stores/user_highlight.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 import VBodyScrollLock from 'src/directives/body_scroll_lock'
 import {
@@ -454,7 +455,7 @@ const setConfig = async ({ store }) => {
 const checkOAuthToken = async ({ store }) => {
   const oauth = useOAuthStore()
   if (oauth.userToken) {
-    return store.dispatch('loginUser', oauth.userToken)
+    return useUsersStore().loginUser(oauth.userToken)
   }
   return
 }
diff --git a/src/boot/routes.js b/src/boot/routes.js
index 5897fad92..6956d0140 100644
--- a/src/boot/routes.js
+++ b/src/boot/routes.js
@@ -13,10 +13,11 @@ import TagTimeline from 'src/components/tag_timeline/tag_timeline.vue'
 
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 export default (store) => {
   const validateAuthenticatedRoute = (to, from, next) => {
-    if (store.state.users.currentUser) {
+    if (useUsersStore().currentUser) {
       next()
     } else {
       next(
@@ -31,7 +32,7 @@ export default (store) => {
       path: '/',
       redirect: () => {
         return (
-          (store.state.users.currentUser
+          (useUsersStore().currentUser
             ? useInstanceStore().instanceIdentity.redirectRootLogin
             : useInstanceStore().instanceIdentity.redirectRootNoLogin) ||
           '/main/all'
diff --git a/src/components/account_actions/account_actions.js b/src/components/account_actions/account_actions.js
index 9b4775b97..ab87d8b8a 100644
--- a/src/components/account_actions/account_actions.js
+++ b/src/components/account_actions/account_actions.js
@@ -8,6 +8,7 @@ import UserListMenu from 'src/components/user_list_menu/user_list_menu.vue'
 import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
 import { useReportsStore } from 'src/stores/reports'
+import { useUsersStore } from 'src/stores/users.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faEllipsisV } from '@fortawesome/free-solid-svg-icons'
@@ -88,7 +89,7 @@ const AccountActions = {
       this.$router.push({
         name: 'chat',
         params: {
-          username: this.$store.state.users.currentUser.screen_name,
+          username: useUsersStore().currentUser.screen_name,
           recipient_id: this.user.id,
         },
       })
diff --git a/src/components/announcement/announcement.js b/src/components/announcement/announcement.js
index 6b45b2b90..e7d3d62cf 100644
--- a/src/components/announcement/announcement.js
+++ b/src/components/announcement/announcement.js
@@ -1,9 +1,10 @@
-import { mapState } from 'vuex'
+import { mapState } from 'pinia'
 
 import AnnouncementEditor from 'src/components/announcement_editor/announcement_editor.vue'
 import localeService from '../../services/locale/locale.service.js'
 
 import { useAnnouncementsStore } from 'src/stores/announcements.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 const Announcement = {
   components: {
@@ -25,9 +26,7 @@ const Announcement = {
     announcement: Object,
   },
   computed: {
-    ...mapState({
-      currentUser: (state) => state.users.currentUser,
-    }),
+    ...mapState(useUsersStore, ['currentUser']),
     canEditAnnouncement() {
       return this.currentUser?.privileges.has(
         'announcements_manage_announcements',
diff --git a/src/components/announcements_page/announcements_page.js b/src/components/announcements_page/announcements_page.js
index 802e90cf6..1d4966df3 100644
--- a/src/components/announcements_page/announcements_page.js
+++ b/src/components/announcements_page/announcements_page.js
@@ -1,9 +1,10 @@
-import { mapState } from 'vuex'
+import { mapState } from 'pinia'
 
 import Announcement from 'src/components/announcement/announcement.vue'
 import AnnouncementEditor from 'src/components/announcement_editor/announcement_editor.vue'
 
 import { useAnnouncementsStore } from 'src/stores/announcements.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 const AnnouncementsPage = {
   components: {
@@ -26,9 +27,7 @@ const AnnouncementsPage = {
     useAnnouncementsStore().fetchAnnouncements()
   },
   computed: {
-    ...mapState({
-      currentUser: (state) => state.users.currentUser,
-    }),
+    ...mapState(useUsersStore, ['currentUser']),
     announcements() {
       return useAnnouncementsStore().announcements
     },
diff --git a/src/components/block_card/block_card.js b/src/components/block_card/block_card.js
index 6484accff..11120574b 100644
--- a/src/components/block_card/block_card.js
+++ b/src/components/block_card/block_card.js
@@ -4,15 +4,16 @@ import BasicUserCard from 'src/components/basic_user_card/basic_user_card.vue'
 import UserTimedFilterModal from 'src/components/user_timed_filter_modal/user_timed_filter_modal.vue'
 
 import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 const BlockCard = {
   props: ['userId'],
   computed: {
     user() {
-      return this.$store.getters.findUser(this.userId)
+      return useUsersStore().findUser(this.userId)
     },
     relationship() {
-      return this.$store.getters.relationship(this.userId)
+      return useUsersStore().relationship(this.userId)
     },
     blocked() {
       return this.relationship.blocking
diff --git a/src/components/chat_list/chat_list.js b/src/components/chat_list/chat_list.js
index 446ccb70a..0b0c241e8 100644
--- a/src/components/chat_list/chat_list.js
+++ b/src/components/chat_list/chat_list.js
@@ -1,11 +1,11 @@
-import { mapState as mapPiniaState } from 'pinia'
-import { mapState } from 'vuex'
+import { mapState } from 'pinia'
 
 import ChatListItem from 'src/components/chat_list_item/chat_list_item.vue'
 import ChatNew from 'src/components/chat_new/chat_new.vue'
 import List from 'src/components/list/list.vue'
 
 import { useChatsStore } from 'src/stores/chats.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 const ChatList = {
   components: {
@@ -14,10 +14,8 @@ const ChatList = {
     ChatNew,
   },
   computed: {
-    ...mapState({
-      currentUser: (state) => state.users.currentUser,
-    }),
-    ...mapPiniaState(useChatsStore, ['sortedChatList']),
+    ...mapState(useUsersStore, ['currentUser']),
+    ...mapState(useChatsStore, ['sortedChatList']),
   },
   data() {
     return {
diff --git a/src/components/chat_list_item/chat_list_item.js b/src/components/chat_list_item/chat_list_item.js
index 8bb2afd93..09d5290a9 100644
--- a/src/components/chat_list_item/chat_list_item.js
+++ b/src/components/chat_list_item/chat_list_item.js
@@ -1,4 +1,4 @@
-import { mapState } from 'vuex'
+import { mapState } from 'pinia'
 
 import AvatarList from 'src/components/avatar_list/avatar_list.vue'
 import ChatTitle from 'src/components/chat_title/chat_title.vue'
@@ -6,6 +6,8 @@ import StatusBody from 'src/components/status_content/status_content.vue'
 import Timeago from 'src/components/timeago/timeago.vue'
 import UserAvatar from 'src/components/user_avatar/user_avatar.vue'
 
+import { useUsersStore } from 'src/stores/users.js'
+
 const ChatListItem = {
   name: 'ChatListItem',
   props: ['chat'],
@@ -17,9 +19,7 @@ const ChatListItem = {
     StatusBody,
   },
   computed: {
-    ...mapState({
-      currentUser: (state) => state.users.currentUser,
-    }),
+    ...mapState(useUsersStore, ['currentUser']),
     attachmentInfo() {
       if (this.chat.lastMessage.attachments.length === 0) {
         return
diff --git a/src/components/chat_message/chat_message.js b/src/components/chat_message/chat_message.js
index aabdec31f..0428b404e 100644
--- a/src/components/chat_message/chat_message.js
+++ b/src/components/chat_message/chat_message.js
@@ -1,6 +1,5 @@
-import { mapState as mapPiniaState } from 'pinia'
+import { mapState } from 'pinia'
 import { defineAsyncComponent } from 'vue'
-import { mapState } from 'vuex'
 
 import Attachment from 'src/components/attachment/attachment.vue'
 import ChatMessageDate from 'src/components/chat_message_date/chat_message_date.vue'
@@ -20,6 +19,7 @@ import UserPopover from 'src/components/user_popover/user_popover.vue'
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useInterfaceStore } from 'src/stores/interface'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
@@ -79,7 +79,7 @@ const ChatMessage = {
       return this.isStatus ? this.message.user.id : this.message.account_id
     },
     author() {
-      return this.$store.getters.findUser(this.authorId)
+      return useUsersStore().findUser(this.authorId)
     },
     isCurrentUser() {
       // mini-hack/optimizaiton:
@@ -108,17 +108,13 @@ const ChatMessage = {
       if (this.message.in_reply_to_screen_name) {
         return this.message.in_reply_to_screen_name
       } else {
-        const user = this.$store.getters.findUser(
-          this.message.in_reply_to_user_id,
-        )
+        const user = useUsersStore().findUser(this.message.in_reply_to_user_id)
         return user?.screen_name_ui
       }
     },
     replyProfileLink() {
       if (this.isCustomReply) {
-        const user = this.$store.getters.findUser(
-          this.message.in_reply_to_user_id,
-        )
+        const user = useUsersStore().findUser(this.message.in_reply_to_user_id)
         // FIXME Why user not found sometimes???
         return user ? user.statusnet_profile_url : 'NOT_FOUND'
       }
@@ -167,14 +163,12 @@ const ChatMessage = {
     },
 
     // Global stuff
-    ...mapPiniaState(useInterfaceStore, {
+    ...mapState(useInterfaceStore, {
       betterShadow: (store) => store.browserSupport.cssFilter,
     }),
-    ...mapState({
-      currentUser: (state) => state.users.currentUser,
-      restrictedNicknames: (state) => useInstanceStore().restrictedNicknames,
-    }),
-    ...mapPiniaState(useMergedConfigStore, ['mergedConfig']),
+    ...mapState(useUsersStore, ['currentUser']),
+    ...mapState(useInstanceStore, ['restrictedNicknames']),
+    ...mapState(useMergedConfigStore, ['mergedConfig']),
   },
   data() {
     return {
diff --git a/src/components/chat_new/chat_new.js b/src/components/chat_new/chat_new.js
index 00826ce66..23193c169 100644
--- a/src/components/chat_new/chat_new.js
+++ b/src/components/chat_new/chat_new.js
@@ -1,9 +1,10 @@
-import { mapGetters, mapState } from 'vuex'
+import { mapState } from 'pinia'
 
 import BasicUserCard from 'src/components/basic_user_card/basic_user_card.vue'
 import UserAvatar from 'src/components/user_avatar/user_avatar.vue'
 
 import { useOAuthStore } from 'src/stores/oauth.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 import { chats } from 'src/api/chats.js'
 
@@ -42,10 +43,7 @@ const chatNew = {
         return this.suggestions
       }
     },
-    ...mapState({
-      currentUser: (state) => state.users.currentUser,
-    }),
-    ...mapGetters(['findUser']),
+    ...mapState(useUsersStore, ['currentUser', 'findUser']),
   },
   methods: {
     goBack() {
diff --git a/src/components/chat_view/chat_view.js b/src/components/chat_view/chat_view.js
index 16b2ae1d7..9ae5c1d09 100644
--- a/src/components/chat_view/chat_view.js
+++ b/src/components/chat_view/chat_view.js
@@ -19,6 +19,7 @@ import { useChatsStore } from 'src/stores/chats.js'
 import { useInterfaceStore } from 'src/stores/interface.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 import {
   chatMessages,
@@ -164,9 +165,9 @@ const Chat = {
       mobileLayout: (store) => store.layoutType === 'mobile',
     }),
     ...mapPiniaState(useMergedConfigStore, ['mergedConfig']),
+    ...mapPiniaState(useUsersStore, ['currentUser']),
     ...mapState({
       mastoUserSocketStatus: (state) => state.api.mastoUserSocketStatus,
-      currentUser: (state) => state.users.currentUser,
     }),
   },
   watch: {
@@ -374,7 +375,7 @@ const Chat = {
             credentials: useOAuthStore().token,
           })
           this.$store.commit('addNewUsers', [data.account])
-          data.account = this.$store.getters.findUser(data.account.id)
+          data.account = useUsersStore().findUser(data.account.id)
           this.chat = data
         } catch (e) {
           console.error('Error creating or getting a chat', e)
diff --git a/src/components/confirm_modal/mute_confirm.js b/src/components/confirm_modal/mute_confirm.js
index c2f5ff888..862405a8e 100644
--- a/src/components/confirm_modal/mute_confirm.js
+++ b/src/components/confirm_modal/mute_confirm.js
@@ -4,6 +4,7 @@ import { defineAsyncComponent } from 'vue'
 import Select from 'src/components/select/select.vue'
 
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 export default {
   props: ['type', 'user', 'status'],
@@ -33,9 +34,7 @@ export default {
       return this.status.conversation_muted
     },
     domainIsMuted() {
-      return new Set(this.$store.state.users.currentUser.domainMutes).has(
-        this.domain,
-      )
+      return new Set(useUsersStore().currentUser.domainMutes).has(this.domain)
     },
     shouldConfirm() {
       switch (this.type) {
diff --git a/src/components/desktop_nav/desktop_nav.js b/src/components/desktop_nav/desktop_nav.js
index cc2c5aca9..85625105f 100644
--- a/src/components/desktop_nav/desktop_nav.js
+++ b/src/components/desktop_nav/desktop_nav.js
@@ -5,6 +5,7 @@ import { defineAsyncComponent } from 'vue'
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useInterfaceStore } from 'src/stores/interface'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
@@ -91,9 +92,7 @@ export default {
       sitename: (store) => store.instanceIdentity.name,
       hideSitename: (store) => store.instanceIdentity.hideSitename,
     }),
-    currentUser() {
-      return this.$store.state.users.currentUser
-    },
+    ...mapState(useUsersStore, ['currentUser']),
     shouldConfirmLogout() {
       return useMergedConfigStore().mergedConfig.modalOnLogout
     },
diff --git a/src/components/domain_mute_card/domain_mute_card.js b/src/components/domain_mute_card/domain_mute_card.js
index d83896618..a0442a706 100644
--- a/src/components/domain_mute_card/domain_mute_card.js
+++ b/src/components/domain_mute_card/domain_mute_card.js
@@ -1,5 +1,7 @@
 import ProgressButton from 'src/components/progress_button/progress_button.vue'
 
+import { useUsersStore } from 'src/stores/users.js'
+
 const DomainMuteCard = {
   props: ['domain'],
   components: {
@@ -7,7 +9,7 @@ const DomainMuteCard = {
   },
   computed: {
     user() {
-      return this.$store.state.users.currentUser
+      return useUsersStore().currentUser
     },
     muted() {
       return this.user.domainMutes.includes(this.domain)
diff --git a/src/components/edit_status_modal/edit_status_modal.js b/src/components/edit_status_modal/edit_status_modal.js
index 59c142d08..12072d7a2 100644
--- a/src/components/edit_status_modal/edit_status_modal.js
+++ b/src/components/edit_status_modal/edit_status_modal.js
@@ -4,6 +4,7 @@ import { defineAsyncComponent } from 'vue'
 import Modal from 'src/components/modal/modal.vue'
 
 import { useEditStatusStore } from 'src/stores/editStatus.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 const EditStatusModal = {
   components: {
@@ -19,7 +20,7 @@ const EditStatusModal = {
   },
   computed: {
     isLoggedIn() {
-      return !!this.$store.state.users.currentUser
+      return !!useUsersStore().currentUser
     },
     modalActivated() {
       return useEditStatusStore().modalActivated
diff --git a/src/components/emoji_reactions/emoji_reactions.js b/src/components/emoji_reactions/emoji_reactions.js
index acb5404c0..b3b538a9a 100644
--- a/src/components/emoji_reactions/emoji_reactions.js
+++ b/src/components/emoji_reactions/emoji_reactions.js
@@ -3,6 +3,7 @@ import UserListPopover from 'src/components/user_list_popover/user_list_popover.
 
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faCheck, faMinus, faPlus } from '@fortawesome/free-solid-svg-icons'
@@ -40,7 +41,7 @@ const EmojiReactions = {
       }, {})
     },
     loggedIn() {
-      return !!this.$store.state.users.currentUser
+      return !!useUsersStore().currentUser
     },
     remoteInteractionLink() {
       return useInstanceStore().getRemoteInteractionLink({
diff --git a/src/components/extra_notifications/extra_notifications.js b/src/components/extra_notifications/extra_notifications.js
index 24ed074af..851656ae5 100644
--- a/src/components/extra_notifications/extra_notifications.js
+++ b/src/components/extra_notifications/extra_notifications.js
@@ -6,6 +6,7 @@ import { useChatsStore } from 'src/stores/chats.js'
 import { useInterfaceStore } from 'src/stores/interface.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
@@ -52,7 +53,7 @@ const ExtraNotifications = {
       )
     },
     currentUser() {
-      return this.$store.state.users.currentUser
+      return useUsersStore().currentUser
     },
     ...mapGetters(['followRequestCount']),
     ...mapState(useAnnouncementsStore, {
diff --git a/src/components/follow_card/follow_card.js b/src/components/follow_card/follow_card.js
index 8fffbf730..228d15776 100644
--- a/src/components/follow_card/follow_card.js
+++ b/src/components/follow_card/follow_card.js
@@ -3,6 +3,8 @@ import FollowButton from 'src/components/follow_button/follow_button.vue'
 import RemoteFollow from 'src/components/remote_follow/remote_follow.vue'
 import RemoveFollowerButton from 'src/components/remove_follower_button/remove_follower_button.vue'
 
+import { useUsersStore } from 'src/stores/users.js'
+
 const FollowCard = {
   props: ['user', 'noFollowsYou'],
   components: {
@@ -13,10 +15,10 @@ const FollowCard = {
   },
   computed: {
     isMe() {
-      return this.$store.state.users.currentUser.id === this.user.id
+      return useUsersStore().currentUser.id === this.user.id
     },
     loggedIn() {
-      return this.$store.state.users.currentUser
+      return useUsersStore().currentUser
     },
     relationship() {
       return this.$store.getters.relationship(this.user.id)
diff --git a/src/components/interactions/interactions.js b/src/components/interactions/interactions.js
index d008c4b30..37873605f 100644
--- a/src/components/interactions/interactions.js
+++ b/src/components/interactions/interactions.js
@@ -1,6 +1,8 @@
 import Notifications from 'src/components/notifications/notifications.vue'
 import TabSwitcher from 'src/components/tab_switcher/tab_switcher.jsx'
 
+import { useUsersStore } from 'src/stores/users.js'
+
 const tabModeDict = {
   mentions: ['mention'],
   statuses: ['status'],
@@ -14,10 +16,9 @@ const tabModeDict = {
 const Interactions = {
   data() {
     return {
-      allowFollowingMove:
-        this.$store.state.users.currentUser.allow_following_move,
+      allowFollowingMove: useUsersStore().currentUser.allow_following_move,
       filterMode: tabModeDict.mentions,
-      canSeeReports: this.$store.state.users.currentUser.privileges.has(
+      canSeeReports: useUsersStore().currentUser.privileges.has(
         'reports_manage_reports',
       ),
     }
diff --git a/src/components/lists_edit/lists_edit.js b/src/components/lists_edit/lists_edit.js
index 7eb035091..ec4cd1fa7 100644
--- a/src/components/lists_edit/lists_edit.js
+++ b/src/components/lists_edit/lists_edit.js
@@ -1,5 +1,4 @@
-import { mapState as mapPiniaState } from 'pinia'
-import { mapGetters, mapState } from 'vuex'
+import { mapState } from 'pinia'
 
 import BasicUserCard from 'src/components/basic_user_card/basic_user_card.vue'
 import ListsUserSearch from 'src/components/lists_user_search/lists_user_search.vue'
@@ -9,6 +8,7 @@ import UserAvatar from 'src/components/user_avatar/user_avatar.vue'
 
 import { useInterfaceStore } from 'src/stores/interface.js'
 import { useListsStore } from 'src/stores/lists.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faChevronLeft, faSearch } from '@fortawesome/free-solid-svg-icons'
@@ -66,11 +66,8 @@ const ListsNew = {
         .map((userId) => this.findUser(userId))
         .filter(Boolean)
     },
-    ...mapState({
-      currentUser: (state) => state.users.currentUser,
-    }),
-    ...mapPiniaState(useListsStore, ['findListTitle', 'findListAccounts']),
-    ...mapGetters(['findUser']),
+    ...mapState(useUsersStore, ['currentUser', 'findUser']),
+    ...mapState(useListsStore, ['findListTitle', 'findListAccounts']),
   },
   methods: {
     onInput() {
diff --git a/src/components/lists_menu/lists_menu_content.js b/src/components/lists_menu/lists_menu_content.js
index 337ee4d4f..7c422d033 100644
--- a/src/components/lists_menu/lists_menu_content.js
+++ b/src/components/lists_menu/lists_menu_content.js
@@ -1,10 +1,10 @@
-import { mapState as mapPiniaState } from 'pinia'
-import { mapState } from 'vuex'
+import { mapState } from 'pinia'
 
 import { getListEntries } from 'src/components/navigation/filter.js'
 import NavigationEntry from 'src/components/navigation/navigation_entry.vue'
 
 import { useListsStore } from 'src/stores/lists.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 export const ListsMenuContent = {
   props: ['showPin'],
@@ -12,12 +12,10 @@ export const ListsMenuContent = {
     NavigationEntry,
   },
   computed: {
-    ...mapPiniaState(useListsStore, {
+    ...mapState(useListsStore, {
       lists: getListEntries,
     }),
-    ...mapState({
-      currentUser: (state) => state.users.currentUser,
-    }),
+    ...mapState(useUsersStore, ['currentUser']),
   },
 }
 
diff --git a/src/components/mention_link/mention_link.js b/src/components/mention_link/mention_link.js
index 0309079e8..374e62259 100644
--- a/src/components/mention_link/mention_link.js
+++ b/src/components/mention_link/mention_link.js
@@ -1,5 +1,4 @@
-import { mapState as mapPiniaState } from 'pinia'
-import { mapState } from 'vuex'
+import { mapState } from 'pinia'
 
 import UnicodeDomainIndicator from 'src/components/unicode_domain_indicator/unicode_domain_indicator.vue'
 import UserAvatar from 'src/components/user_avatar/user_avatar.vue'
@@ -12,6 +11,7 @@ import {
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
 import { useUserHighlightStore } from 'src/stores/user_highlight.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
 
@@ -75,7 +75,7 @@ const MentionLink = {
   },
   computed: {
     user() {
-      return this.url && this.$store?.getters.findUserByUrl(this.url)
+      return this.url && useUsersStore().findUserByUrl(this.url)
     },
     isYou() {
       // FIXME why user !== currentUser???
@@ -156,11 +156,9 @@ const MentionLink = {
     shouldFadeDomain() {
       return this.mergedConfig.mentionLinkFadeDomain
     },
-    ...mapPiniaState(useMergedConfigStore, ['mergedConfig']),
-    ...mapPiniaState(useUserHighlightStore, ['highlight']),
-    ...mapState({
-      currentUser: (state) => state.users.currentUser,
-    }),
+    ...mapState(useMergedConfigStore, ['mergedConfig']),
+    ...mapState(useUserHighlightStore, ['highlight']),
+    ...mapState(useUsersStore, ['currentUser']),
   },
 }
 
diff --git a/src/components/mobile_nav/mobile_nav.js b/src/components/mobile_nav/mobile_nav.js
index 4eb956f64..0c8f987c1 100644
--- a/src/components/mobile_nav/mobile_nav.js
+++ b/src/components/mobile_nav/mobile_nav.js
@@ -12,6 +12,7 @@ import { useAnnouncementsStore } from 'src/stores/announcements.js'
 import { useChatsStore } from 'src/stores/chats.js'
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
@@ -53,7 +54,7 @@ const MobileNav = {
   },
   computed: {
     currentUser() {
-      return this.$store.state.users.currentUser
+      return useUsersStore().currentUser
     },
     unseenNotifications() {
       return unseenNotificationsFromStore(
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 4969352f6..d137331c9 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
@@ -2,6 +2,7 @@ import { debounce } from 'lodash'
 
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
 import { usePostStatusStore } from 'src/stores/post_status.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faPen } from '@fortawesome/free-solid-svg-icons'
@@ -34,7 +35,7 @@ const MobilePostStatusButton = {
   },
   computed: {
     isLoggedIn() {
-      return !!this.$store.state.users.currentUser
+      return useUsersStore().loggedIn
     },
     isHidden() {
       if (HIDDEN_FOR_PAGES.has(this.$route.name)) {
diff --git a/src/components/moderation_tools/moderation_tools.js b/src/components/moderation_tools/moderation_tools.js
index ba13afc8b..de213632c 100644
--- a/src/components/moderation_tools/moderation_tools.js
+++ b/src/components/moderation_tools/moderation_tools.js
@@ -5,6 +5,7 @@ import Popover from 'src/components/popover/popover.vue'
 
 import { useAdminSettingsStore } from 'src/stores/admin_settings.js'
 import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faChevronDown } from '@fortawesome/free-solid-svg-icons'
@@ -405,7 +406,7 @@ const ModerationTools = {
       )
     },
     isAdmin() {
-      return this.$store.state.users.currentUser.role === 'admin'
+      return useUsersStore().currentUser.role === 'admin'
     },
   },
   methods: {
@@ -452,7 +453,7 @@ const ModerationTools = {
     },
     privileged(privilege) {
       if (this.isAdmin) return true
-      return this.$store.state.users.currentUser.privileges.has(privilege)
+      return useUsersStore().currentUser.privileges.has(privilege)
     },
     setTag(tag, value) {
       useAdminSettingsStore().setUsersTags({
diff --git a/src/components/mute_card/mute_card.js b/src/components/mute_card/mute_card.js
index 0d247930a..441c28f1c 100644
--- a/src/components/mute_card/mute_card.js
+++ b/src/components/mute_card/mute_card.js
@@ -1,14 +1,16 @@
 import BasicUserCard from 'src/components/basic_user_card/basic_user_card.vue'
 import UserTimedFilterModal from 'src/components/user_timed_filter_modal/user_timed_filter_modal.vue'
 
+import { useUsersStore } from 'src/stores/users.js'
+
 const MuteCard = {
   props: ['userId'],
   computed: {
     user() {
-      return this.$store.getters.findUser(this.userId)
+      return useUsersStore().findUser(this.userId)
     },
     relationship() {
-      return this.$store.getters.relationship(this.userId)
+      return useUsersStore().relationship(this.userId)
     },
     muted() {
       return this.relationship.muting
diff --git a/src/components/nav_panel/nav_panel.js b/src/components/nav_panel/nav_panel.js
index 5a4a78ec4..3e88ea564 100644
--- a/src/components/nav_panel/nav_panel.js
+++ b/src/components/nav_panel/nav_panel.js
@@ -14,6 +14,7 @@ import { useChatsStore } from 'src/stores/chats.js'
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
@@ -128,8 +129,8 @@ const NavPanel = {
       pinnedItems: (store) =>
         new Set(store.prefsStorage.collections.pinnedNavItems),
     }),
+    ...mapPiniaState(useUsersStore, ['currentUser']),
     ...mapState({
-      currentUser: (state) => state.users.currentUser,
       followRequestCount: (state) => state.api.followRequests.length,
     }),
     ...mapPiniaState(useChatsStore, ['unreadChatsCount']),
diff --git a/src/components/navigation/navigation_entry.js b/src/components/navigation/navigation_entry.js
index 7a43000ce..31bc28eb5 100644
--- a/src/components/navigation/navigation_entry.js
+++ b/src/components/navigation/navigation_entry.js
@@ -1,11 +1,11 @@
-import { mapState as mapPiniaState, mapStores } from 'pinia'
-import { mapState } from 'vuex'
+import { mapState, mapStores } from 'pinia'
 
 import { routeTo } from 'src/components/navigation/navigation.js'
 import OptionalRouterLink from 'src/components/optional_router_link/optional_router_link.vue'
 
 import { useAnnouncementsStore } from 'src/stores/announcements.js'
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faThumbtack } from '@fortawesome/free-solid-svg-icons'
@@ -44,10 +44,8 @@ const NavigationEntry = {
       return this.$store.getters
     },
     ...mapStores(useAnnouncementsStore),
-    ...mapState({
-      currentUser: (state) => state.users.currentUser,
-    }),
-    ...mapPiniaState(useSyncConfigStore, {
+    ...mapState(useUsersStore, ['currentUser']),
+    ...mapState(useSyncConfigStore, {
       pinnedItems: (store) =>
         new Set(store.prefsStorage.collections.pinnedNavItems),
     }),
diff --git a/src/components/navigation/navigation_pins.js b/src/components/navigation/navigation_pins.js
index c3649e4b3..d1be73819 100644
--- a/src/components/navigation/navigation_pins.js
+++ b/src/components/navigation/navigation_pins.js
@@ -18,6 +18,7 @@ import { useInstanceStore } from 'src/stores/instance.js'
 import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
 import { useListsStore } from 'src/stores/lists'
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
@@ -76,8 +77,8 @@ const NavPanel = {
       'pleromaChatMessagesAvailable',
       'localBubble',
     ]),
+    ...mapPiniaState(useUsersStore, ['currentUser']),
     ...mapState({
-      currentUser: (state) => state.users.currentUser,
       followRequestCount: (state) => state.api.followRequests.length,
     }),
     pinnedList() {
diff --git a/src/components/notification/notification.js b/src/components/notification/notification.js
index 1bfe540a0..b641600ef 100644
--- a/src/components/notification/notification.js
+++ b/src/components/notification/notification.js
@@ -1,5 +1,5 @@
+import { mapState } from 'pinia'
 import { defineAsyncComponent } from 'vue'
-import { mapState } from 'vuex'
 
 import Report from 'src/components/report/report.vue'
 import StatusContent from 'src/components/status_content/status_content.vue'
@@ -17,6 +17,7 @@ import { useInstanceStore } from 'src/stores/instance.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
 import { useUserHighlightStore } from 'src/stores/user_highlight.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 import { approveUser, denyUser } from 'src/api/user.js'
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
@@ -194,19 +195,19 @@ const Notification = {
       )
     },
     user() {
-      return this.$store.getters.findUser(this.notification.from_profile.id)
+      return useUsersStore().findUser(this.notification.from_profile.id)
     },
     userProfileLink() {
       return this.generateUserProfileLink(this.user)
     },
     targetUser() {
-      return this.$store.getters.findUser(this.notification.target.id)
+      return useUsersStore().findUser(this.notification.target.id)
     },
     targetUserProfileLink() {
       return this.generateUserProfileLink(this.targetUser)
     },
     needMute() {
-      return this.$store.getters.relationship(this.user.id).muting
+      return useUsersStore().relationship(this.user.id).muting
     },
     isStatusNotification() {
       return isStatusNotification(this.notification.type)
@@ -229,9 +230,7 @@ const Notification = {
     shouldConfirmDeny() {
       return this.mergedConfig.modalOnDenyFollow
     },
-    ...mapState({
-      currentUser: (state) => state.users.currentUser,
-    }),
+    ...mapState(useUsersStore, ['currentUser']),
   },
 }
 
diff --git a/src/components/notifications/notifications.js b/src/components/notifications/notifications.js
index feb59857e..4eadb1657 100644
--- a/src/components/notifications/notifications.js
+++ b/src/components/notifications/notifications.js
@@ -18,6 +18,7 @@ import { useAnnouncementsStore } from 'src/stores/announcements.js'
 import { useChatsStore } from 'src/stores/chats.js'
 import { useInterfaceStore } from 'src/stores/interface.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
@@ -251,7 +252,7 @@ const Notifications = {
       }
 
       const store = this.$store
-      const credentials = store.state.users.currentUser.credentials
+      const credentials = useUsersStore().currentUser.credentials
       store.commit('setNotificationsLoading', { value: true })
       notificationsFetcher
         .fetchAndUpdate({
diff --git a/src/components/oauth_callback/oauth_callback.js b/src/components/oauth_callback/oauth_callback.js
index 04f79425e..bf6e03c9e 100644
--- a/src/components/oauth_callback/oauth_callback.js
+++ b/src/components/oauth_callback/oauth_callback.js
@@ -1,5 +1,6 @@
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 import { getToken } from 'src/api/oauth.js'
 
@@ -17,7 +18,8 @@ const oac = {
         code: this.code,
       }).then(({ data: result }) => {
         oauthStore.setToken(result.access_token)
-        this.$store.dispatch('loginUser', result.access_token)
+
+        useUsersStore().loginUser(result.access_token)
         this.$router.push({ name: 'friends' })
       })
     }
diff --git a/src/components/password_reset/password_reset.js b/src/components/password_reset/password_reset.js
index b2e6e1093..54ad5c194 100644
--- a/src/components/password_reset/password_reset.js
+++ b/src/components/password_reset/password_reset.js
@@ -1,7 +1,7 @@
-import { mapState as mapPiniaState } from 'pinia'
-import { mapState } from 'vuex'
+import { mapState } from 'pinia'
 
 import { useInstanceStore } from 'src/stores/instance.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 import { resetPassword } from 'src/api/public.js'
 
@@ -21,13 +21,11 @@ const passwordReset = {
     error: null,
   }),
   computed: {
-    ...mapState({
-      signedIn: (state) => !!state.users.currentUser,
-    }),
-    ...mapPiniaState(useInstanceStore, ['mailerEnabled']),
+    ...mapState(useUsersStore, ['loggedIn']),
+    ...mapState(useInstanceStore, ['mailerEnabled']),
   },
   created() {
-    if (this.signedIn) {
+    if (this.loggedIn) {
       this.$router.push({ name: 'root' })
     }
   },
diff --git a/src/components/poll/poll.js b/src/components/poll/poll.js
index 0ce304a0a..ace31e8b8 100644
--- a/src/components/poll/poll.js
+++ b/src/components/poll/poll.js
@@ -5,6 +5,7 @@ import genRandomSeed from '../../services/random_seed/random_seed.service.js'
 
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
 import { usePollsStore } from 'src/stores/polls.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 export default {
   name: 'Poll',
@@ -64,7 +65,7 @@ export default {
       return useMergedConfigStore().mergedConfig.scaleMfm
     },
     loggedIn() {
-      return this.$store.state.users.currentUser
+      return useUsersStore().currentUser
     },
     showResults() {
       return this.poll.voted || this.expired || !this.loggedIn
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index f36987efb..6dc00a1e2 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -31,6 +31,7 @@ import { useInterfaceStore } from 'src/stores/interface.js'
 import { useMediaViewerStore } from 'src/stores/media_viewer.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 import { pollFormToMasto } from 'src/services/poll/poll.service.js'
 
@@ -571,7 +572,7 @@ const PostStatusForm = {
 
     // Global stuff
     currentUser() {
-      return this.$store.state.users.currentUser
+      return useUsersStore().currentUser
     },
     ...mapState(useMergedConfigStore, ['mergedConfig']),
     ...mapState(useInterfaceStore, {
diff --git a/src/components/post_status_modal/post_status_modal.js b/src/components/post_status_modal/post_status_modal.js
index e7001db9a..9be1df4a4 100644
--- a/src/components/post_status_modal/post_status_modal.js
+++ b/src/components/post_status_modal/post_status_modal.js
@@ -4,6 +4,7 @@ import Modal from 'src/components/modal/modal.vue'
 import PostStatusForm from 'src/components/post_status_form/post_status_form.vue'
 
 import { usePostStatusStore } from 'src/stores/post_status.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 const PostStatusModal = {
   components: {
@@ -17,7 +18,7 @@ const PostStatusModal = {
   },
   computed: {
     isLoggedIn() {
-      return !!this.$store.state.users.currentUser
+      return !!useUsersStore().currentUser
     },
     modalActivated() {
       return usePostStatusStore().modalActivated
diff --git a/src/components/quick_filter_settings/quick_filter_settings.js b/src/components/quick_filter_settings/quick_filter_settings.js
index 6c27f7e0a..533d19313 100644
--- a/src/components/quick_filter_settings/quick_filter_settings.js
+++ b/src/components/quick_filter_settings/quick_filter_settings.js
@@ -6,6 +6,7 @@ import { useInterfaceStore } from 'src/stores/interface.js'
 import { useLocalConfigStore } from 'src/stores/local_config.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faFilter, faFont, faWrench } from '@fortawesome/free-solid-svg-icons'
@@ -54,7 +55,7 @@ const QuickFilterSettings = {
       }
     },
     loggedIn() {
-      return !!this.$store.state.users.currentUser
+      return !!useUsersStore().currentUser
     },
     replyVisibilitySelf: {
       get() {
diff --git a/src/components/quick_view_settings/quick_view_settings.js b/src/components/quick_view_settings/quick_view_settings.js
index f809d241c..b0fc9610b 100644
--- a/src/components/quick_view_settings/quick_view_settings.js
+++ b/src/components/quick_view_settings/quick_view_settings.js
@@ -6,6 +6,7 @@ import QuickFilterSettings from 'src/components/quick_filter_settings/quick_filt
 import { useInterfaceStore } from 'src/stores/interface.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
@@ -36,7 +37,7 @@ const QuickViewSettings = {
       mobileLayout: (state) => state.layoutType === 'mobile',
     }),
     loggedIn() {
-      return !!this.$store.state.users.currentUser
+      return !!useUsersStore().currentUser
     },
     conversationDisplay: {
       get() {
diff --git a/src/components/search/search.js b/src/components/search/search.js
index 1a5f8b51d..2a6ed5c3e 100644
--- a/src/components/search/search.js
+++ b/src/components/search/search.js
@@ -4,6 +4,8 @@ import Conversation from 'src/components/conversation/conversation.vue'
 import FollowCard from 'src/components/follow_card/follow_card.vue'
 import TabSwitcher from 'src/components/tab_switcher/tab_switcher.jsx'
 
+import { useUsersStore } from 'src/stores/users.js'
+
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faCircleNotch, faSearch } from '@fortawesome/free-solid-svg-icons'
 
@@ -34,7 +36,7 @@ const Search = {
   },
   computed: {
     users() {
-      return this.userIds.map((userId) => this.$store.getters.findUser(userId))
+      return this.userIds.map((userId) => useUsersStore().findUser(userId))
     },
     visibleStatuses() {
       const allStatusesObject = this.$store.state.statuses.allStatusesObject
diff --git a/src/components/settings_modal/admin_tabs/admin_user_card.js b/src/components/settings_modal/admin_tabs/admin_user_card.js
index ba0f0e9f7..ae20d4cfe 100644
--- a/src/components/settings_modal/admin_tabs/admin_user_card.js
+++ b/src/components/settings_modal/admin_tabs/admin_user_card.js
@@ -1,6 +1,8 @@
 import BasicUserCard from 'src/components/basic_user_card/basic_user_card.vue'
 import ModerationTools from 'src/components/moderation_tools/moderation_tools.vue'
 
+import { useUsersStore } from 'src/stores/users.js'
+
 const AdminUserCard = {
   props: {
     userId: {
@@ -13,7 +15,7 @@ const AdminUserCard = {
   },
   computed: {
     user() {
-      return this.$store.getters.findUser(this.userId)
+      return useUsersStore().findUser(this.userId)
     },
     isAdmin() {
       return this.user.rights.admin
diff --git a/src/components/settings_modal/helpers/shared_computed_object.js b/src/components/settings_modal/helpers/shared_computed_object.js
index 4a3b9d4f8..123e77879 100644
--- a/src/components/settings_modal/helpers/shared_computed_object.js
+++ b/src/components/settings_modal/helpers/shared_computed_object.js
@@ -1,20 +1,20 @@
-import { mapState as mapPiniaState } from 'pinia'
-import { mapState } from 'vuex'
+import { mapState } from 'pinia'
 
 import { useAdminSettingsStore } from 'src/stores/admin_settings.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 const SharedComputedObject = () => ({
-  ...mapPiniaState(useMergedConfigStore, ['mergedConfig']),
-  ...mapPiniaState(useMergedConfigStore, {
+  ...mapState(useMergedConfigStore, ['mergedConfig']),
+  ...mapState(useMergedConfigStore, {
     expertLevel: (store) => store.mergedConfig.expertLevel,
   }),
-  ...mapPiniaState(useAdminSettingsStore, {
+  ...mapState(useAdminSettingsStore, {
     adminConfig: (store) => store.config,
     adminDraft: (store) => store.draft,
   }),
-  ...mapState({
-    user: (state) => state.users.currentUser,
+  ...mapState(useUsersStore, {
+    user: (store) => store.currentUser,
   }),
 })
 
diff --git a/src/components/settings_modal/settings_modal_admin_content.js b/src/components/settings_modal/settings_modal_admin_content.js
index 22ba0e16c..f6b67c7c6 100644
--- a/src/components/settings_modal/settings_modal_admin_content.js
+++ b/src/components/settings_modal/settings_modal_admin_content.js
@@ -20,6 +20,7 @@ import VerticalTabSwitcher from './helpers/vertical_tab_switcher.jsx'
 
 import { useAdminSettingsStore } from 'src/stores/admin_settings.js'
 import { useInterfaceStore } from 'src/stores/interface.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
@@ -97,10 +98,10 @@ const SettingsModalAdminContent = {
   },
   computed: {
     user() {
-      return this.$store.state.users.currentUser
+      return useUsersStore().currentUser
     },
     isLoggedIn() {
-      return !!this.$store.state.users.currentUser
+      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 6e5d2addc..0b6f2a385 100644
--- a/src/components/settings_modal/settings_modal_user_content.js
+++ b/src/components/settings_modal/settings_modal_user_content.js
@@ -17,6 +17,7 @@ import StyleTab from './tabs/style_tab/style_tab.vue'
 
 import { useInterfaceStore } from 'src/stores/interface.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
@@ -75,7 +76,7 @@ const SettingsModalContent = {
   },
   computed: {
     isLoggedIn() {
-      return !!this.$store.state.users.currentUser
+      return !!useUsersStore().currentUser
     },
     open() {
       return useInterfaceStore().settingsModalState !== 'hidden'
diff --git a/src/components/settings_modal/tabs/appearance_tab.js b/src/components/settings_modal/tabs/appearance_tab.js
index 647c90c47..68c498624 100644
--- a/src/components/settings_modal/tabs/appearance_tab.js
+++ b/src/components/settings_modal/tabs/appearance_tab.js
@@ -13,6 +13,7 @@ import Preview from './old_theme_tab/theme_preview.vue'
 import { useInstanceStore } from 'src/stores/instance.js'
 import { normalizeThemeData, useInterfaceStore } from 'src/stores/interface.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 import { updateProfileImages } from 'src/api/user.js'
 import { newImporter } from 'src/services/export_import/export_import.js'
@@ -220,7 +221,7 @@ const AppearanceTab = {
   },
   computed: {
     isDefaultBackground() {
-      return !this.$store.state.users.currentUser.background_image
+      return !useUsersStore().currentUser.background_image
     },
     switchInProgress() {
       return useInterfaceStore().themeChangeInProgress
@@ -282,7 +283,7 @@ const AppearanceTab = {
     instanceWallpaperUsed() {
       return (
         useInstanceStore().instanceIdentity.background &&
-        !this.$store.state.users.currentUser.background_image
+        !useUsersStore().currentUser.background_image
       )
     },
     customThemeVersion() {
@@ -490,9 +491,8 @@ const AppearanceTab = {
         background,
         credentials: useOAuthStore().token,
       })
-        .then(({ data }) => {
-          this.$store.commit('addNewUsers', [data])
-          this.$store.commit('setCurrentUser', data)
+        .then((result) => {
+          useUsersStore().addNewUsers(result)
           this.backgroundPreview = null
           this.backgroundError = null
         })
diff --git a/src/components/settings_modal/tabs/composing_tab.js b/src/components/settings_modal/tabs/composing_tab.js
index 1586c87bf..dadb2498f 100644
--- a/src/components/settings_modal/tabs/composing_tab.js
+++ b/src/components/settings_modal/tabs/composing_tab.js
@@ -16,6 +16,7 @@ import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.j
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 import { updateProfile } from 'src/api/user.js'
 import localeService from 'src/services/locale/locale.service.js'
@@ -92,7 +93,7 @@ const ComposingTab = {
           HTMLMediaElement.prototype,
           'audioTracks',
         ),
-      emailLanguage: this.$store.state.users.currentUser.language || [''],
+      emailLanguage: useUsersStore().currentUser.language || [''],
     }
   },
   components: {
@@ -169,9 +170,8 @@ const ComposingTab = {
       updateProfile({
         params,
         credentials: useOAuthStore().token,
-      }).then(({ data: user }) => {
-        this.$store.commit('addNewUsers', [user])
-        this.$store.commit('setCurrentUser', user)
+      }).then((result) => {
+        useUsersStore().addNewUsers(result)
       })
     },
     updateFont(key, value) {
diff --git a/src/components/settings_modal/tabs/data_import_export_tab.js b/src/components/settings_modal/tabs/data_import_export_tab.js
index 7fc6adefd..243ff5888 100644
--- a/src/components/settings_modal/tabs/data_import_export_tab.js
+++ b/src/components/settings_modal/tabs/data_import_export_tab.js
@@ -1,4 +1,4 @@
-import { mapState } from 'vuex'
+import { mapState } from 'pinia'
 
 import Checkbox from 'src/components/checkbox/checkbox.vue'
 import Exporter from 'src/components/exporter/exporter.vue'
@@ -6,6 +6,7 @@ import Importer from 'src/components/importer/importer.vue'
 
 import { useOAuthStore } from 'src/stores/oauth.js'
 import { useOAuthTokensStore } from 'src/stores/oauth_tokens.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 import {
   addBackup,
@@ -39,9 +40,7 @@ const DataImportExportTab = {
     Checkbox,
   },
   computed: {
-    ...mapState({
-      user: (state) => state.users.currentUser,
-    }),
+    ...mapState(useUsersStore, ['currentUser']),
   },
   methods: {
     getFollowsContent() {
diff --git a/src/components/settings_modal/tabs/general_tab.js b/src/components/settings_modal/tabs/general_tab.js
index 3ab3846d2..bfc350aad 100644
--- a/src/components/settings_modal/tabs/general_tab.js
+++ b/src/components/settings_modal/tabs/general_tab.js
@@ -13,6 +13,7 @@ import { useLocalConfigStore } from 'src/stores/local_config.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 import { updateProfile } from 'src/api/user.js'
 import localeService from 'src/services/locale/locale.service.js'
@@ -25,7 +26,7 @@ const GeneralTab = {
         value: mode,
         label: this.$t(`settings.absolute_time_format_12h_${mode}`),
       })),
-      emailLanguage: this.$store.state.users.currentUser.language || [''],
+      emailLanguage: useUsersStore().currentUser.language || [''],
     }
   },
   components: {
@@ -62,9 +63,8 @@ const GeneralTab = {
       updateProfile({
         params,
         credentials: useOAuthStore().token,
-      }).then(({ data: user }) => {
-        this.$store.commit('addNewUsers', [user])
-        this.$store.commit('setCurrentUser', user)
+      }).then((result) => {
+        useUsersStore().addNewUsers(result)
       })
     },
     updateFont(path, value) {
diff --git a/src/components/settings_modal/tabs/mutes_and_blocks_tab.js b/src/components/settings_modal/tabs/mutes_and_blocks_tab.js
index 61d3e42f7..9158d8a1d 100644
--- a/src/components/settings_modal/tabs/mutes_and_blocks_tab.js
+++ b/src/components/settings_modal/tabs/mutes_and_blocks_tab.js
@@ -12,6 +12,7 @@ import TabSwitcher from 'src/components/tab_switcher/tab_switcher.jsx'
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
 import { useOAuthTokensStore } from 'src/stores/oauth_tokens.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 import { importBlocks, importFollows } from 'src/api/user.js'
 
@@ -40,16 +41,16 @@ const MutesAndBlocks = {
       return useInstanceStore().knownDomains
     },
     user() {
-      return this.$store.state.users.currentUser
+      return useUsersStore().currentUser
     },
     blocks() {
-      return get(this.$store.state.users.currentUser, 'blockIds', [])
+      return get(useUsersStore().currentUser, 'blockIds', [])
     },
     mutes() {
-      return get(this.$store.state.users.currentUser, 'muteIds', [])
+      return get(useUsersStore().currentUser, 'muteIds', [])
     },
     domains() {
-      return get(this.$store.state.users.currentUser, 'domainMutes', [])
+      return get(useUsersStore().currentUser, 'domainMutes', [])
     },
   },
   methods: {
@@ -94,13 +95,13 @@ const MutesAndBlocks = {
     },
     filterUnblockedUsers(userIds) {
       return reject(userIds, (userId) => {
-        const relationship = this.$store.getters.relationship(this.userId)
+        const relationship = useUsersStore().relationship(this.userId)
         return relationship.blocking || userId === this.user.id
       })
     },
     filterUnMutedUsers(userIds) {
       return reject(userIds, (userId) => {
-        const relationship = this.$store.getters.relationship(this.userId)
+        const relationship = useUsersStore().relationship(this.userId)
         return relationship.muting || userId === this.user.id
       })
     },
diff --git a/src/components/settings_modal/tabs/notifications_tab.js b/src/components/settings_modal/tabs/notifications_tab.js
index a666d42e3..468ede0ce 100644
--- a/src/components/settings_modal/tabs/notifications_tab.js
+++ b/src/components/settings_modal/tabs/notifications_tab.js
@@ -2,6 +2,7 @@ import BooleanSetting from '../helpers/boolean_setting.vue'
 import SharedComputedObject from '../helpers/shared_computed_object.js'
 
 import { useOAuthStore } from 'src/stores/oauth.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 import { updateNotificationSettings } from 'src/api/user.js'
 
@@ -9,8 +10,7 @@ const NotificationsTab = {
   data() {
     return {
       activeTab: 'profile',
-      notificationSettings:
-        this.$store.state.users.currentUser.notification_settings,
+      notificationSettings: useUsersStore().currentUser.notification_settings,
       newDomainToMute: '',
     }
   },
@@ -19,7 +19,7 @@ const NotificationsTab = {
   },
   computed: {
     user() {
-      return this.$store.state.users.currentUser
+      return useUsersStore().currentUser
     },
     canReceiveReports() {
       if (!this.user) {
diff --git a/src/components/settings_modal/tabs/profile_tab.js b/src/components/settings_modal/tabs/profile_tab.js
index 844e223c9..07a77f308 100644
--- a/src/components/settings_modal/tabs/profile_tab.js
+++ b/src/components/settings_modal/tabs/profile_tab.js
@@ -4,6 +4,7 @@ import BooleanSetting from '../helpers/boolean_setting.vue'
 import SharedComputedObject from '../helpers/shared_computed_object.js'
 
 import { useOAuthStore } from 'src/stores/oauth.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 import { updateProfile } from 'src/api/user.js'
 
@@ -20,7 +21,7 @@ const ProfileTab = {
   data() {
     return {
       // Whether user is locked or not
-      locked: this.$store.state.users.currentUser.locked,
+      locked: useUsersStore().currentUser.locked,
     }
   },
   components: {
@@ -30,7 +31,7 @@ const ProfileTab = {
   },
   computed: {
     user() {
-      return this.$store.state.users.currentUser
+      return useUsersStore().currentUser
     },
     ...SharedComputedObject(),
   },
@@ -43,9 +44,8 @@ const ProfileTab = {
         params,
         credentials: useOAuthStore().token,
       })
-        .then(({ data: user }) => {
-          this.$store.commit('addNewUsers', [user])
-          this.$store.commit('setCurrentUser', user)
+        .then((result) => {
+          useUsersStore().addNewUsers(result)
         })
         .catch((error) => {
           this.displayUploadError(error)
diff --git a/src/components/settings_modal/tabs/security_tab/security_tab.js b/src/components/settings_modal/tabs/security_tab/security_tab.js
index a2571bd54..b30cd2f13 100644
--- a/src/components/settings_modal/tabs/security_tab/security_tab.js
+++ b/src/components/settings_modal/tabs/security_tab/security_tab.js
@@ -5,6 +5,7 @@ import Mfa from './mfa.vue'
 import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
 import { useOAuthTokensStore } from 'src/stores/oauth_tokens'
+import { useUsersStore } from 'src/stores/users.js'
 
 import {
   addAlias,
@@ -52,7 +53,7 @@ const SecurityTab = {
   },
   computed: {
     user() {
-      return this.$store.state.users.currentUser
+      return useUsersStore().currentUser
     },
     pleromaExtensionsAvailable() {
       return useInstanceCapabilitiesStore().pleromaExtensionsAvailable
diff --git a/src/components/side_drawer/side_drawer.js b/src/components/side_drawer/side_drawer.js
index a1dca8161..3a4885792 100644
--- a/src/components/side_drawer/side_drawer.js
+++ b/src/components/side_drawer/side_drawer.js
@@ -13,6 +13,7 @@ import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.j
 import { useInterfaceStore } from 'src/stores/interface'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
 import { useShoutStore } from 'src/stores/shout'
+import { useUsersStore } from 'src/stores/users.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
@@ -70,7 +71,7 @@ const SideDrawer = {
   },
   computed: {
     currentUser() {
-      return this.$store.state.users.currentUser
+      return useUsersStore().currentUser
     },
     shout() {
       return useShoutStore().joined
diff --git a/src/components/status/status.js b/src/components/status/status.js
index a33d29525..60411eead 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -25,6 +25,7 @@ import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.j
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
 import { useUserHighlightStore } from 'src/stores/user_highlight.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
 
@@ -309,9 +310,9 @@ const Status = {
       if (this.statusoid.user.id === this.currentUser.id) return false
       const { status } = this
       const { reblog } = status
-      const relationship = this.$store.getters.relationship(status.user.id)
+      const relationship = useUsersStore().relationship(status.user.id)
       const relationshipReblog =
-        reblog && this.$store.getters.relationship(reblog.user.id)
+        reblog && useUsersStore().relationship(reblog.user.id)
       return (
         (status.muted && !status.thread_muted) ||
         // Reprööt of a muted post according to BE
@@ -411,7 +412,7 @@ const Status = {
       return this.mergedConfig.hideBotIndication
     },
     currentUser() {
-      return this.$store.state.users.currentUser
+      return useUsersStore().currentUser
     },
     mergedConfig() {
       return useMergedConfigStore().mergedConfig
diff --git a/src/components/status_action_buttons/action_button.js b/src/components/status_action_buttons/action_button.js
index 1a5b85301..dfea736a2 100644
--- a/src/components/status_action_buttons/action_button.js
+++ b/src/components/status_action_buttons/action_button.js
@@ -5,6 +5,7 @@ import EmojiPicker from '../emoji_picker/emoji_picker.vue'
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
@@ -98,7 +99,7 @@ export default {
       ]
     },
     userIsMuted() {
-      return this.$store.getters.relationship(this.status.user.id).muting
+      return useUsersStore().relationship(this.status.user.id).muting
     },
     threadIsMuted() {
       return this.status.thread_muted
diff --git a/src/components/status_action_buttons/action_button_container.js b/src/components/status_action_buttons/action_button_container.js
index d031bd6e9..3c371ac74 100644
--- a/src/components/status_action_buttons/action_button_container.js
+++ b/src/components/status_action_buttons/action_button_container.js
@@ -4,6 +4,7 @@ import Popover from 'src/components/popover/popover.vue'
 import ActionButton from './action_button.vue'
 
 import { useAdminSettingsStore } from 'src/stores/admin_settings.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 import genRandomSeed from 'src/services/random_seed/random_seed.service.js'
 
@@ -71,7 +72,7 @@ export default {
       return this.status.user
     },
     userIsMuted() {
-      return this.$store.getters.relationship(this.user.id).muting
+      return useUsersStore().relationship(this.user.id).muting
     },
     conversationIsMuted() {
       return this.status.thread_muted
@@ -80,9 +81,7 @@ export default {
       return this.user.fqn.split('@')[1]
     },
     domainIsMuted() {
-      return new Set(this.$store.state.users.currentUser.domainMutes).has(
-        this.domain,
-      )
+      return new Set(useUsersStore().currentUser.domainMutes).has(this.domain)
     },
     availableScopes() {
       return ['private', 'unlisted', 'direct', 'public'].filter((scope) => {
diff --git a/src/components/status_action_buttons/status_action_buttons.js b/src/components/status_action_buttons/status_action_buttons.js
index 73ac6ff7e..bbbdb79e5 100644
--- a/src/components/status_action_buttons/status_action_buttons.js
+++ b/src/components/status_action_buttons/status_action_buttons.js
@@ -6,6 +6,7 @@ import ActionButtonContainer from './action_button_container.vue'
 import { BUTTONS } from './buttons_definitions.js'
 
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 import genRandomSeed from 'src/services/random_seed/random_seed.service.js'
 
@@ -88,7 +89,7 @@ const StatusActionButtons = {
       return this.buttons.filter((x) => !this.pinnedItems.has(x.name))
     },
     currentUser() {
-      return this.$store.state.users.currentUser
+      return useUsersStore().currentUser
     },
     funcArg() {
       return {
@@ -168,7 +169,7 @@ const StatusActionButtons = {
       useSyncConfigStore().pushSyncConfig()
     },
     getComponent(button) {
-      if (!this.$store.state.users.currentUser && button.anonLink) {
+      if (!useUsersStore().currentUser && button.anonLink) {
         return 'a'
       } else if (button.action == null && button.link != null) {
         return 'a'
diff --git a/src/components/status_content/status_content.js b/src/components/status_content/status_content.js
index 209abee99..60e2f8522 100644
--- a/src/components/status_content/status_content.js
+++ b/src/components/status_content/status_content.js
@@ -1,5 +1,4 @@
-import { mapState as mapPiniaState } from 'pinia'
-import { mapState } from 'vuex'
+import { mapState } from 'pinia'
 
 import Attachment from 'src/components/attachment/attachment.vue'
 import Gallery from 'src/components/gallery/gallery.vue'
@@ -9,6 +8,7 @@ import StatusBody from 'src/components/status_body/status_body.vue'
 
 import { useMediaViewerStore } from 'src/stores/media_viewer.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
@@ -84,10 +84,8 @@ const StatusContent = {
     maxThumbnails() {
       return this.mergedConfig.maxThumbnails
     },
-    ...mapPiniaState(useMergedConfigStore, ['mergedConfig']),
-    ...mapState({
-      currentUser: (state) => state.users.currentUser,
-    }),
+    ...mapState(useMergedConfigStore, ['mergedConfig']),
+    ...mapState(useUsersStore, ['currentUser']),
   },
   components: {
     Attachment,
diff --git a/src/components/still-image/still-image-emoji-popover.js b/src/components/still-image/still-image-emoji-popover.js
index 6db72c49f..fc3f3bc0a 100644
--- a/src/components/still-image/still-image-emoji-popover.js
+++ b/src/components/still-image/still-image-emoji-popover.js
@@ -5,6 +5,7 @@ import { mapState } from 'pinia'
 import { useAdminSettingsStore } from 'src/stores/admin_settings'
 import { useEmojiStore } from 'src/stores/emoji'
 import { useInterfaceStore } from 'src/stores/interface'
+import { useUsersStore } from 'src/stores/users.js'
 
 export default {
   components: { Popover, SelectComponent },
@@ -25,7 +26,7 @@ export default {
   },
   computed: {
     isUserAdmin() {
-      return this.$store.state.users.currentUser?.rights.admin
+      return useUsersStore().currentUser?.rights.admin
     },
     ...mapState(useEmojiStore, ['adminPacksLocal', 'adminPacksLocalLoading']),
   },
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index 17065a9ef..de025a253 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -9,6 +9,7 @@ import TimelineMenu from 'src/components/timeline_menu/timeline_menu.vue'
 
 import { useInterfaceStore } from 'src/stores/interface.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 import timelineFetcher from 'src/services/timeline_fetcher/timeline_fetcher.service.js'
 
@@ -132,7 +133,7 @@ const Timeline = {
   },
   created() {
     const store = this.$store
-    const credentials = store.state.users.currentUser.credentials
+    const credentials = useUsersStore().currentUser.credentials
     const showImmediately = this.timeline.visibleStatuses.length === 0
 
     window.addEventListener('scroll', this.handleScroll)
@@ -215,7 +216,7 @@ const Timeline = {
     fetchOlderStatuses: throttle(
       function () {
         const store = this.$store
-        const credentials = store.state.users.currentUser.credentials
+        const credentials = useUsersStore().currentUser.credentials
         store.commit('setLoading', { timeline: this.timelineName, value: true })
         timelineFetcher
           .fetchAndUpdate({
diff --git a/src/components/timeline_menu/timeline_menu.js b/src/components/timeline_menu/timeline_menu.js
index ee6fa8f20..6b93f0af0 100644
--- a/src/components/timeline_menu/timeline_menu.js
+++ b/src/components/timeline_menu/timeline_menu.js
@@ -1,5 +1,4 @@
-import { mapState as mapPiniaState } from 'pinia'
-import { mapState } from 'vuex'
+import { mapState } from 'pinia'
 
 import BookmarkFoldersMenuContent from 'src/components/bookmark_folders_menu/bookmark_folders_menu_content.vue'
 import ListsMenuContent from 'src/components/lists_menu/lists_menu_content.vue'
@@ -13,6 +12,7 @@ import { useInstanceStore } from 'src/stores/instance.js'
 import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
 import { useInterfaceStore } from 'src/stores/interface'
 import { useListsStore } from 'src/stores/lists'
+import { useUsersStore } from 'src/stores/users.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faChevronDown } from '@fortawesome/free-solid-svg-icons'
@@ -62,16 +62,14 @@ const TimelineMenu = {
         (route === 'bookmark-folder' || route === 'bookmarks')
       )
     },
-    ...mapPiniaState(useInstanceCapabilitiesStore, [
+    ...mapState(useInstanceCapabilitiesStore, [
       'pleromaChatMessagesAvailable',
       'pleromaBookmarkFoldersAvailable',
       'bookmarkFolders',
       'localBubble',
     ]),
-    ...mapPiniaState(useInstanceStore, ['privateMode', 'federating']),
-    ...mapState({
-      currentUser: (state) => state.users.currentUser,
-    }),
+    ...mapState(useInstanceStore, ['privateMode', 'federating']),
+    ...mapState(useUsersStore, ['currentUser']),
     timelinesList() {
       return filterNavigation(
         Object.entries(TIMELINES).map(([k, v]) => ({ ...v, name: k })),
diff --git a/src/components/update_notification/update_notification.js b/src/components/update_notification/update_notification.js
index 2a9fb7f60..6e60a6457 100644
--- a/src/components/update_notification/update_notification.js
+++ b/src/components/update_notification/update_notification.js
@@ -3,6 +3,7 @@ import Modal from 'src/components/modal/modal.vue'
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 import pleromaTanFoxMask from 'src/assets/pleromatan_apology_fox_mask.png'
 import pleromaTanMask from 'src/assets/pleromatan_apology_mask.png'
@@ -41,7 +42,7 @@ const UpdateNotification = {
     shouldShow() {
       return (
         !useInstanceStore().disableUpdateNotification &&
-        this.$store.state.users.currentUser &&
+        useUsersStore().currentUser &&
         useSyncConfigStore().flagStorage.updateCounter <
           CURRENT_UPDATE_COUNTER &&
         !useMergedConfigStore().mergedConfig.dontShowUpdateNotifs
diff --git a/src/components/user_card/user_card.js b/src/components/user_card/user_card.js
index b6e720c6f..f4b1123e2 100644
--- a/src/components/user_card/user_card.js
+++ b/src/components/user_card/user_card.js
@@ -25,6 +25,7 @@ import { useMediaViewerStore } from 'src/stores/media_viewer'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
 import { usePostStatusStore } from 'src/stores/post_status'
 import { useUserHighlightStore } from 'src/stores/user_highlight.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 import { updateProfile } from 'src/api/user.js'
 import { propsToNative } from 'src/services/attributes_helper/attributes_helper.service.js'
@@ -158,7 +159,7 @@ export default {
     ),
   },
   data() {
-    const user = this.$store.getters.findUser(this.userId)
+    const user = useUsersStore().findUser(this.userId)
 
     return {
       followRequestInProgress: false,
@@ -192,7 +193,7 @@ export default {
     }
   },
   created() {
-    this.$store.dispatch('fetchUserRelationship', this.user.id)
+    useUsersStore().fetchUserRelationship(this.user.id)
   },
   computed: {
     escapedNewBio() {
@@ -228,23 +229,23 @@ export default {
         : ['Person', 'Service']
     },
     user() {
-      return this.$store.getters.findUser(this.userId)
+      return useUsersStore().findUser(this.userId)
     },
     role() {
       return this.user.role
     },
     relationship() {
-      return this.$store.getters.relationship(this.userId)
+      return useUsersStore().relationship(this.userId)
     },
     isOtherUser() {
-      return this.user.id !== this.$store.state.users.currentUser.id
+      return this.user.id !== useUsersStore().currentUser.id
     },
     subscribeUrl() {
       const serverUrl = new URL(this.user.statusnet_profile_url)
       return `${serverUrl.protocol}//${serverUrl.host}/main/ostatus`
     },
     loggedIn() {
-      return this.$store.state.users.currentUser
+      return useUsersStore().currentUser
     },
     dailyAvg() {
       const days = Math.ceil(
@@ -394,17 +395,15 @@ export default {
     isDefaultAvatar() {
       const baseAvatar = useInstanceStore().instanceIdenitity.defaultAvatar
       return (
-        !this.$store.state.users.currentUser.profile_image_url ||
-        this.$store.state.users.currentUser.profile_image_url.includes(
-          baseAvatar,
-        )
+        !useUsersStore().currentUser.profile_image_url ||
+        useUsersStore().currentUser.profile_image_url.includes(baseAvatar)
       )
     },
     isDefaultBanner() {
       const baseBanner = useInstanceStore().instanceIdentity.defaultBanner
       return (
-        !this.$store.state.users.currentUser.cover_photo ||
-        this.$store.state.users.currentUser.cover_photo.includes(baseBanner)
+        !useUsersStore().currentUser.cover_photo ||
+        useUsersStore().currentUser.cover_photo.includes(baseBanner)
       )
     },
     fieldsLimits() {
@@ -557,7 +556,7 @@ export default {
       return
     },
     resetState() {
-      const user = this.$store.state.users.currentUser
+      const user = useUsersStore().currentUser
 
       this.newName = user.name_unescaped
       this.newBio = ldUnescape(user.description)
@@ -603,11 +602,10 @@ export default {
       }
 
       updateProfile({ params })
-        .then(({ data: user }) => {
+        .then(({ data: user, ...rest }) => {
           this.newFields.splice(this.newFields.length)
           merge(this.newFields, user.fields)
-          this.$store.commit('addNewUsers', [user])
-          this.$store.commit('setCurrentUser', user)
+          useUsersStore().addNewUsers({ data: user, ...rest })
           this.resetState()
         })
         .catch((error) => {
diff --git a/src/components/user_panel/user_panel.js b/src/components/user_panel/user_panel.js
index 08270a1c6..ed74c86c7 100644
--- a/src/components/user_panel/user_panel.js
+++ b/src/components/user_panel/user_panel.js
@@ -1,15 +1,14 @@
-import { mapState } from 'vuex'
+import { mapState } from 'pinia'
 
 import AuthForm from 'src/components/auth_form/auth_form.js'
 import PostStatusForm from 'src/components/post_status_form/post_status_form.vue'
 import UserCard from 'src/components/user_card/user_card.vue'
 
+import { useUsersStore } from 'src/stores/users.js'
+
 const UserPanel = {
   computed: {
-    signedIn() {
-      return this.user
-    },
-    ...mapState({ user: (state) => state.users.currentUser }),
+    ...mapState(useUsersStore, ['currentUser', 'loggedIn']),
   },
   components: {
     PostStatusForm,
diff --git a/src/components/user_panel/user_panel.vue b/src/components/user_panel/user_panel.vue
index 0f9260c4a..3dc1ef933 100644
--- a/src/components/user_panel/user_panel.vue
+++ b/src/components/user_panel/user_panel.vue
@@ -1,12 +1,12 @@
 <template>
   <aside class="user-panel">
     <div
-      v-if="signedIn"
+      v-if="loggedIn"
       key="user-panel-signed"
       class="panel panel-default signed-in"
     >
       <UserCard
-        :user-id="user.id"
+        :user-id="currentUser.id"
         :hide-bio="true"
       />
       <PostStatusForm />
diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js
index eb1d8e068..310d66d1d 100644
--- a/src/components/user_profile/user_profile.js
+++ b/src/components/user_profile/user_profile.js
@@ -9,6 +9,7 @@ import UserCard from 'src/components/user_card/user_card.vue'
 import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
 import { useInterfaceStore } from 'src/stores/interface.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faCircleNotch } from '@fortawesome/free-solid-svg-icons'
@@ -54,12 +55,12 @@ const UserProfile = {
     isUs() {
       return (
         this.userId &&
-        this.$store.state.users.currentUser.id &&
-        this.userId === this.$store.state.users.currentUser.id
+        useUsersStore().currentUser.id &&
+        this.userId === useUsersStore().currentUser.id
       )
     },
     user() {
-      return this.$store.getters.findUser(this.userId)
+      return useUsersStore().findUser(this.userId)
     },
     isExternal() {
       return this.$route.name === 'external-user-profile'
@@ -81,18 +82,14 @@ const UserProfile = {
       return useMergedConfigStore().mergedConfig.compactProfiles
     },
     friends() {
-      return get(
-        this.$store.getters.findUser(this.userId),
-        'friendIds',
-        [],
-      ).map((id) => this.$store.getters.findUser(id))
+      return get(useUsersStore().findUser(this.userId), 'friendIds', []).map(
+        (id) => useUsersStore().findUser(id),
+      )
     },
     followers() {
-      return get(
-        this.$store.getters.findUser(this.userId),
-        'followerIds',
-        [],
-      ).map((id) => this.$store.getters.findUser(id))
+      return get(useUsersStore().findUser(this.userId), 'followerIds', []).map(
+        (id) => useUsersStore().findUser(id),
+      )
     },
   },
   methods: {
@@ -136,8 +133,8 @@ const UserProfile = {
 
       // Check if user data is already loaded in store
       const user = maybeId
-        ? this.$store.getters.findUser(maybeId)
-        : this.$store.getters.findUserByName(maybeName)
+        ? useUsersStore().findUser(maybeId)
+        : useUsersStore().findUserByName(maybeName)
       if (user) {
         loadById(user.id)
       } else {
diff --git a/src/components/user_profile/user_profile_admin_view.js b/src/components/user_profile/user_profile_admin_view.js
index da2c6c322..342ca1109 100644
--- a/src/components/user_profile/user_profile_admin_view.js
+++ b/src/components/user_profile/user_profile_admin_view.js
@@ -5,6 +5,7 @@ import UserCard from 'src/components/user_card/user_card.vue'
 
 import { useAdminSettingsStore } from 'src/stores/admin_settings.js'
 import { useInterfaceStore } from 'src/stores/interface.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faCircleNotch } from '@fortawesome/free-solid-svg-icons'
@@ -38,7 +39,7 @@ const UserProfileAdminView = {
       }
     },
     user() {
-      return this.$store.getters.findUser(this.userId)
+      return useUsersStore().findUser(this.userId)
     },
     userId() {
       return this.$route.params.id
diff --git a/src/components/user_reporting_modal/user_reporting_modal.js b/src/components/user_reporting_modal/user_reporting_modal.js
index 017a17efa..232305415 100644
--- a/src/components/user_reporting_modal/user_reporting_modal.js
+++ b/src/components/user_reporting_modal/user_reporting_modal.js
@@ -7,6 +7,7 @@ import UserLink from 'src/components/user_link/user_link.vue'
 
 import { useOAuthStore } from 'src/stores/oauth.js'
 import { useReportsStore } from 'src/stores/reports.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 import { reportUser } from 'src/api/user.js'
 
@@ -28,7 +29,7 @@ const UserReportingModal = {
   },
   computed: {
     isLoggedIn() {
-      return !!this.$store.state.users.currentUser
+      return !!useUsersStore().currentUser
     },
     isOpen() {
       return this.isLoggedIn && this.reportModal.activated
@@ -37,7 +38,7 @@ const UserReportingModal = {
       return this.reportModal.userId
     },
     user() {
-      return this.$store.getters.findUser(this.userId)
+      return useUsersStore().findUser(this.userId)
     },
     remoteInstance() {
       return (
diff --git a/src/components/who_to_follow_panel/who_to_follow_panel.js b/src/components/who_to_follow_panel/who_to_follow_panel.js
index 7a65ba39d..7e241d6eb 100644
--- a/src/components/who_to_follow_panel/who_to_follow_panel.js
+++ b/src/components/who_to_follow_panel/who_to_follow_panel.js
@@ -3,6 +3,7 @@ import { shuffle } from 'lodash'
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 import { fetchUser, suggestions } from 'src/api/public.js'
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
@@ -31,7 +32,7 @@ function showWhoToFollow(panel, reply) {
 }
 
 function getWhoToFollow(panel) {
-  const credentials = panel.$store.state.users.currentUser.credentials
+  const credentials = panel.$useUsersStore().currentUser.credentials
   if (credentials) {
     panel.usersToFollow.forEach((toFollow) => {
       toFollow.name = 'Loading...'
@@ -48,7 +49,7 @@ const WhoToFollowPanel = {
   }),
   computed: {
     user: function () {
-      return this.$store.state.users.currentUser.screen_name
+      return useUsersStore().currentUser.screen_name
     },
     suggestionsEnabled() {
       return useInstanceCapabilitiesStore().suggestionsEnabled
diff --git a/src/lib/persisted_state.js b/src/lib/persisted_state.js
index 5fcf259aa..a4dfe7d00 100644
--- a/src/lib/persisted_state.js
+++ b/src/lib/persisted_state.js
@@ -16,8 +16,6 @@ const defaultReducer = (state, paths) =>
 
 const saveImmedeatelyActions = [
   'markNotificationsAsSeen',
-  'clearCurrentUser',
-  'setCurrentUser',
   'setHighlight',
   'setOption',
   'setClientData',
@@ -75,19 +73,13 @@ export default function createPersistedState({
             setState(key, reducer(cloneDeep(state), paths), storage).then(
               (success) => {
                 if (success !== undefined) {
-                  if (
-                    mutation.type === 'setOption' ||
-                    mutation.type === 'setCurrentUser'
-                  ) {
+                  if (mutation.type === 'setOption') {
                     useInterfaceStore().settingsSaved({ success })
                   }
                 }
               },
               (error) => {
-                if (
-                  mutation.type === 'setOption' ||
-                  mutation.type === 'setCurrentUser'
-                ) {
+                if (mutation.type === 'setOption') {
                   useInterfaceStore().settingsSaved({ error })
                 }
               },
diff --git a/src/lib/push_notifications_plugin.js b/src/lib/push_notifications_plugin.js
index f4dcb1dbc..5f8d65aba 100644
--- a/src/lib/push_notifications_plugin.js
+++ b/src/lib/push_notifications_plugin.js
@@ -1,6 +1,7 @@
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useInterfaceStore } from 'src/stores/interface.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 export const piniaPushNotificationsPlugin = ({ store }) => {
   if (
@@ -25,7 +26,7 @@ export const piniaPushNotificationsPlugin = ({ store }) => {
       useInterfaceStore().notificationPermission === 'granted'
     let permissionPresent =
       useInterfaceStore().notificationPermission !== undefined
-    let user = !!window.vuex.state.users.currentUser
+    let user = !!useUsersStore().currentUser
 
     if (store.$id === 'instance') {
       if (actionName === 'set' && args[0].path === 'vapidPublicKey') {
@@ -66,6 +67,7 @@ export const piniaPushNotificationsPlugin = ({ store }) => {
   })
 }
 
+// TODO make it work with pinia
 export const vuexPushNotificationsPlugin = (store) => {
   store.subscribe((mutation, state) => {
     // Initial state
diff --git a/src/modules/index.js b/src/modules/index.js
index c8f3dce39..9b469c6df 100644
--- a/src/modules/index.js
+++ b/src/modules/index.js
@@ -3,12 +3,10 @@ import drafts from './drafts.js'
 import notifications from './notifications.js'
 import profileConfig from './profileConfig.js'
 import statuses from './statuses.js'
-import users from './users.js'
 
 export default {
   statuses,
   notifications,
-  users,
   api,
   profileConfig,
   drafts,
diff --git a/src/modules/notifications.js b/src/modules/notifications.js
index b77683811..100de3974 100644
--- a/src/modules/notifications.js
+++ b/src/modules/notifications.js
@@ -13,6 +13,7 @@ import { useMergedConfigStore } from 'src/stores/merged_config.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
 import { useReportsStore } from 'src/stores/reports.js'
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 import { dismissNotification, markNotificationsAsSeen } from 'src/api/user.js'
 
@@ -158,7 +159,7 @@ export const notifications = {
       commit('markNotificationsAsSeen')
       markNotificationsAsSeen({
         id: state.maxId,
-        credentials: rootState.users.currentUser.credentials,
+        credentials: useUsersStore().currentUser.credentials,
       }).then(() => {
         closeAllDesktopNotifications(rootState)
       })
@@ -168,7 +169,7 @@ export const notifications = {
       markNotificationsAsSeen({
         single: true,
         id,
-        credentials: rootState.users.currentUser.credentials,
+        credentials: useUsersStore().currentUser.credentials,
       }).then(() => {
         closeDesktopNotification(rootState, { id })
       })
diff --git a/src/modules/profileConfig.js b/src/modules/profileConfig.js
index 3fca7d6a8..8b9c77425 100644
--- a/src/modules/profileConfig.js
+++ b/src/modules/profileConfig.js
@@ -1,6 +1,7 @@
 import { get, set } from 'lodash'
 
 import { useOAuthStore } from 'src/stores/oauth.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 import { updateNotificationSettings, updateProfile } from 'src/api/user.js'
 
@@ -10,9 +11,8 @@ const defaultApi = ({ rootState, commit }, { path, value }) => {
   return updateProfile({
     params,
     credentials: useOAuthStore().token,
-  }).then(({ data: result }) => {
-    commit('addNewUsers', [result])
-    commit('setCurrentUser', result)
+  }).then((result) => {
+    useUsersStore().addNewUsers(result)
   })
 }
 
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index f39da5b3f..bcef660a0 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -14,6 +14,7 @@ import {
 import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
 import { useInterfaceStore } from 'src/stores/interface.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 import {
   fetchEmojiReactions,
@@ -619,7 +620,7 @@ const statuses = {
         showImmediately,
         timeline,
         noIdUpdate,
-        user: rootState.users.currentUser,
+        user: useUsersStore().currentUser,
         userId,
         pagination,
       })
@@ -671,7 +672,7 @@ const statuses = {
       }).then(({ data: status }) =>
         commit('setFavoritedConfirm', {
           status,
-          user: rootState.users.currentUser,
+          user: useUsersStore().currentUser,
         }),
       )
     },
@@ -684,7 +685,7 @@ const statuses = {
       }).then(({ data: status }) =>
         commit('setFavoritedConfirm', {
           status,
-          user: rootState.users.currentUser,
+          user: useUsersStore().currentUser,
         }),
       )
     },
@@ -739,7 +740,7 @@ const statuses = {
       }).then(({ data: status }) =>
         commit('setRetweetedConfirm', {
           status: status.retweeted_status,
-          user: rootState.users.currentUser,
+          user: useUsersStore().currentUser,
         }),
       )
     },
@@ -752,7 +753,7 @@ const statuses = {
       }).then(({ data: status }) =>
         commit('setRetweetedConfirm', {
           status,
-          user: rootState.users.currentUser,
+          user: useUsersStore().currentUser,
         }),
       )
     },
@@ -795,17 +796,17 @@ const statuses = {
         commit('addFavs', {
           id,
           favoritedByUsers,
-          currentUser: rootState.users.currentUser,
+          currentUser: useUsersStore().currentUser,
         })
         commit('addRepeats', {
           id,
           rebloggedByUsers,
-          currentUser: rootState.users.currentUser,
+          currentUser: useUsersStore().currentUser,
         })
       })
     },
     reactWithEmoji({ rootState, dispatch, commit }, { id, emoji }) {
-      const currentUser = rootState.users.currentUser
+      const currentUser = useUsersStore().currentUser
       if (!currentUser) return
 
       commit('addOwnReaction', { id, emoji, currentUser })
@@ -818,14 +819,14 @@ const statuses = {
       })
     },
     unreactWithEmoji({ rootState, dispatch, commit }, { id, emoji }) {
-      const currentUser = rootState.users.currentUser
+      const currentUser = useUsersStore().currentUser
       if (!currentUser) return
 
       commit('removeOwnReaction', { id, emoji, currentUser })
       unreactWithEmoji({
         id,
         emoji,
-        currentUser: rootState.users.currentUser,
+        currentUser: useUsersStore().currentUser,
       }).then(() => {
         dispatch('fetchEmojiReactionsBy', id)
       })
@@ -838,7 +839,7 @@ const statuses = {
         commit('addEmojiReactionsBy', {
           id,
           emojiReactions,
-          currentUser: rootState.users.currentUser,
+          currentUser: useUsersStore().currentUser,
         })
       })
     },
@@ -850,7 +851,7 @@ const statuses = {
         commit('addFavs', {
           id,
           favoritedByUsers,
-          currentUser: rootState.users.currentUser,
+          currentUser: useUsersStore().currentUser,
         }),
       )
     },
@@ -862,7 +863,7 @@ const statuses = {
         commit('addRepeats', {
           id,
           rebloggedByUsers,
-          currentUser: rootState.users.currentUser,
+          currentUser: useUsersStore().currentUser,
         }),
       )
     },
diff --git a/src/modules/users.js b/src/modules/users.js
deleted file mode 100644
index 9e24c1bdd..000000000
--- a/src/modules/users.js
+++ /dev/null
@@ -1,870 +0,0 @@
-import Cookies from 'js-cookie'
-import { compact, each, last, map, mergeWith } from 'lodash'
-
-import {
-  registerPushNotifications,
-  unregisterPushNotifications,
-} from '../services/sw/sw.js'
-import {
-  windowHeight,
-  windowWidth,
-} from '../services/window_utils/window_utils'
-
-import { useAnnouncementsStore } from 'src/stores/announcements.js'
-import { useBookmarkFoldersStore } from 'src/stores/bookmark_folders.js'
-import { useChatsStore } from 'src/stores/chats.js'
-import { useEmojiStore } from 'src/stores/emoji.js'
-import { useInstanceStore } from 'src/stores/instance.js'
-import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
-import { useInterfaceStore } from 'src/stores/interface.js'
-import { useListsStore } from 'src/stores/lists.js'
-import { useMergedConfigStore } from 'src/stores/merged_config.js'
-import { useOAuthStore } from 'src/stores/oauth.js'
-import { useSyncConfigStore } from 'src/stores/sync_config.js'
-import { useUserHighlightStore } from 'src/stores/user_highlight.js'
-
-import { revokeToken } from 'src/api/oauth.js'
-import {
-  fetchFollowers,
-  fetchFriends,
-  fetchUser,
-  fetchUserByName,
-  getCaptcha,
-  register,
-  searchUsers,
-  verifyCredentials,
-} from 'src/api/public.js'
-import {
-  blockUser as apiBlockUser,
-  editUserNote as apiEditUserNote,
-  muteUser as apiMuteUser,
-  unblockUser as apiUnblockUser,
-  unmuteUser as apiUnmuteUser,
-  fetchBlocks,
-  fetchDomainMutes,
-  fetchMutes,
-  fetchUserInLists,
-  fetchUserRelationship,
-  followUser,
-} from 'src/api/user.js'
-
-// TODO: Unify with mergeOrAdd in statuses.js
-export const mergeOrAdd = (arr, obj, item) => {
-  if (!item) {
-    return false
-  }
-  const oldItem = obj[item.id]
-  if (oldItem) {
-    // We already have this, so only merge the new info.
-    mergeWith(oldItem, item, mergeArrayLength)
-    return { item: oldItem, new: false }
-  } else {
-    // This is a new item, prepare it
-    arr.push(item)
-    obj[item.id] = item
-    return { item, new: true }
-  }
-}
-
-const mergeArrayLength = (oldValue, newValue) => {
-  if (Array.isArray(oldValue) && Array.isArray(newValue)) {
-    oldValue.length = newValue.length
-    return mergeWith(oldValue, newValue, mergeArrayLength)
-  }
-}
-
-const getNotificationPermission = async () => {
-  const Notification = window.Notification
-
-  if (!Notification) return null
-  if (Notification.permission === 'default')
-    return Notification.requestPermission()
-  return Notification.permission
-}
-
-const blockUser = (store, args) => {
-  const id = args.id
-  const expiresIn = typeof args === 'object' ? args.expiresIn : 0
-
-  const predictedRelationship = store.state.relationships[id] || { id }
-  store.commit('updateUserRelationship', [predictedRelationship])
-  store.commit('addBlockId', id)
-
-  return apiBlockUser({ id, expiresIn }).then(({ data: relationship }) => {
-    store.commit('updateUserRelationship', [relationship])
-    store.commit('addBlockId', id)
-
-    store.commit('removeStatus', { timeline: 'friends', userId: id })
-    store.commit('removeStatus', { timeline: 'public', userId: id })
-    store.commit('removeStatus', {
-      timeline: 'publicAndExternal',
-      userId: id,
-    })
-  })
-}
-
-const unblockUser = (store, id) => {
-  return apiUnblockUser({ id }).then(({ data: relationship }) =>
-    store.commit('updateUserRelationship', [relationship]),
-  )
-}
-
-const removeUserFromFollowers = (store, id) => {
-  return removeUserFromFollowers({ id }).then((relationship) =>
-    store.commit('updateUserRelationship', [relationship]),
-  )
-}
-
-const editUserNote = (store, { id, comment }) => {
-  return apiEditUserNote({ id, comment }).then((relationship) =>
-    store.commit('updateUserRelationship', [relationship]),
-  )
-}
-
-const muteUser = (store, args) => {
-  const id = typeof args === 'object' ? args.id : args
-  const expiresIn = typeof args === 'object' ? args.expiresIn : 0
-
-  const predictedRelationship = store.state.relationships[id] || { id }
-  store.commit('updateUserRelationship', [predictedRelationship])
-  store.commit('addMuteId', id)
-
-  return apiMuteUser({
-    id,
-    expiresIn,
-    credentials: useOAuthStore().token,
-  }).then(({ data: relationship }) => {
-    store.commit('updateUserRelationship', [relationship])
-    store.commit('addMuteId', id)
-  })
-}
-
-const unmuteUser = (store, id) => {
-  const predictedRelationship = store.state.relationships[id] || { id }
-  predictedRelationship.muting = false
-  store.commit('updateUserRelationship', [predictedRelationship])
-
-  return apiUnmuteUser({ id }).then(({ data: relationship }) =>
-    store.commit('updateUserRelationship', [relationship]),
-  )
-}
-
-const hideReblogs = (store, userId) => {
-  return followUser({
-    id: userId,
-    reblogs: false,
-    credentials: useOAuthStore().token,
-  }).then(({ data: relationship }) =>
-    store.commit('updateUserRelationship', [relationship]),
-  )
-}
-
-const showReblogs = (store, userId) => {
-  return followUser({
-    id: userId,
-    reblogs: true,
-    credentials: useOAuthStore().token,
-  }).then(({ data: relationship }) =>
-    store.commit('updateUserRelationship', [relationship]),
-  )
-}
-
-const muteDomain = (store, domain) => {
-  return muteDomain({
-    domain,
-    credentials: useOAuthStore().token,
-  }).then(() => store.commit('addDomainMute', domain))
-}
-
-const unmuteDomain = (store, domain) => {
-  return unmuteDomain({
-    domain,
-    credentials: useOAuthStore().token,
-  }).then(() => store.commit('removeDomainMute', domain))
-}
-
-export const mutations = {
-  tagUser(state, { user: { id }, tag }) {
-    const user = state.usersObject[id]
-    user.tags.add(tag)
-  },
-  untagUser(state, { user: { id }, tag }) {
-    const user = state.usersObject[id]
-    user.tags.delete(tag)
-  },
-  updateRight(state, { user: { id }, right, value }) {
-    const user = state.usersObject[id]
-    const newRights = user.rights
-    newRights[right] = value
-    user.rights = newRights
-  },
-  updateUserAdminData(state, { user }) {
-    const { id } = user
-    const localUser = state.usersObject[id]
-    localUser.adminData = user
-    localUser.deactivated = !user.is_active
-    localUser.tags = new Set(user.tags)
-  },
-  setCurrentUser(state, user) {
-    state.lastLoginName = user.screen_name
-    state.currentUser = mergeWith(
-      state.currentUser || {},
-      user,
-      mergeArrayLength,
-    )
-  },
-  clearCurrentUser(state) {
-    state.currentUser = false
-    state.lastLoginName = false
-  },
-  beginLogin(state) {
-    state.loggingIn = true
-  },
-  endLogin(state) {
-    state.loggingIn = false
-  },
-  saveFriendIds(state, { id, friendIds }) {
-    const user = state.usersObject[id]
-    user.friendIds = [...new Set([...(user.friendIds || []), ...friendIds])]
-  },
-  saveFollowerIds(state, { id, followerIds }) {
-    const user = state.usersObject[id]
-    user.followerIds = [...new Set([user.followerIds || [], ...followerIds])]
-  },
-  // Because frontend doesn't have a reason to keep these stuff in memory
-  // outside of viewing someones user profile.
-  clearFriends(state, userId) {
-    const user = state.usersObject[userId]
-    if (user) {
-      user.friendIds = []
-    }
-  },
-  clearFollowers(state, userId) {
-    const user = state.usersObject[userId]
-    if (user) {
-      user.followerIds = []
-    }
-  },
-  addNewUsers(state, users) {
-    each(users, (user) => {
-      if (user.relationship) {
-        state.relationships[user.relationship.id] = user.relationship
-      }
-      const res = mergeOrAdd(state.users, state.usersObject, user)
-      const item = res.item
-      if (res.new && item.screen_name && !item.screen_name.includes('@')) {
-        state.usersByNameObject[item.screen_name.toLowerCase()] = item
-      }
-    })
-  },
-  updateUserRelationship(state, relationships) {
-    relationships.forEach((relationship) => {
-      state.relationships[relationship.id] = relationship
-    })
-  },
-  updateUserInLists(state, { id, inLists }) {
-    state.usersObject[id].inLists = inLists
-  },
-  saveBlockIds(state, blockIds) {
-    state.currentUser.blockIds = blockIds
-  },
-  addBlockId(state, blockId) {
-    if (state.currentUser.blockIds.includes(blockId)) {
-      state.currentUser.blockIds.push(blockId)
-    }
-  },
-  setBlockIdsMaxId(state, blockIdsMaxId) {
-    state.currentUser.blockIdsMaxId = blockIdsMaxId
-  },
-  saveMuteIds(state, muteIds) {
-    state.currentUser.muteIds = muteIds
-  },
-  setMuteIdsMaxId(state, muteIdsMaxId) {
-    state.currentUser.muteIdsMaxId = muteIdsMaxId
-  },
-  addMuteId(state, muteId) {
-    if (state.currentUser.muteIds.includes(muteId)) {
-      state.currentUser.muteIds.push(muteId)
-    }
-  },
-  saveDomainMutes(state, domainMutes) {
-    state.currentUser.domainMutes = domainMutes
-  },
-  addDomainMute(state, domain) {
-    if (state.currentUser.domainMutes.includes(domain)) {
-      state.currentUser.domainMutes.push(domain)
-    }
-  },
-  removeDomainMute(state, domain) {
-    const index = state.currentUser.domainMutes.indexOf(domain)
-    if (index !== -1) {
-      state.currentUser.domainMutes.splice(index, 1)
-    }
-  },
-  setPinnedToUser(state, status) {
-    const user = state.usersObject[status.user.id]
-    user.pinnedStatusIds = user.pinnedStatusIds || []
-    const index = user.pinnedStatusIds.indexOf(status.id)
-
-    if (status.pinned && index === -1) {
-      user.pinnedStatusIds.push(status.id)
-    } else if (!status.pinned && index !== -1) {
-      user.pinnedStatusIds.splice(index, 1)
-    }
-  },
-  setUserForStatus(state, status) {
-    status.user = state.usersObject[status.user.id]
-  },
-  setUserForNotification(state, notification) {
-    if (notification.type !== 'follow') {
-      notification.action.user = state.usersObject[notification.action.user.id]
-    }
-    notification.from_profile = state.usersObject[notification.from_profile.id]
-  },
-  setColor(state, { user: { id }, highlighted }) {
-    const user = state.usersObject[id]
-    user.highlight = highlighted
-  },
-  signUpPending(state) {
-    state.signUpPending = true
-    state.signUpErrors = []
-    state.signUpNotice = {}
-  },
-  signUpSuccess(state) {
-    state.signUpPending = false
-  },
-  signUpFailure(state, errors) {
-    state.signUpPending = false
-    state.signUpErrors = errors
-    state.signUpNotice = {}
-  },
-  signUpNotice(state, notice) {
-    state.signUpPending = false
-    state.signUpErrors = []
-    state.signUpNotice = notice
-  },
-}
-
-export const getters = {
-  findUser: (state) => (query) => {
-    return state.usersObject[query]
-  },
-  findUserByName: (state) => (query) => {
-    return state.usersByNameObject[query.toLowerCase()]
-  },
-  findUserByUrl: (state) => (query) => {
-    return state.users.find(
-      (u) =>
-        u.statusnet_profile_url &&
-        u.statusnet_profile_url.toLowerCase() === query.toLowerCase(),
-    )
-  },
-  relationship: (state) => (id) => {
-    const rel = id && state.relationships[id]
-    return rel || { id, loading: true }
-  },
-}
-
-export const defaultState = {
-  loggingIn: false,
-  lastLoginName: false,
-  currentUser: false,
-  users: [],
-  usersObject: {},
-  usersByNameObject: {},
-  signUpPending: false,
-  signUpErrors: [],
-  signUpNotice: {},
-  relationships: {},
-}
-
-const users = {
-  state: defaultState,
-  mutations,
-  getters,
-  actions: {
-    async fetchUserIfMissing(store, id) {
-      const user = store.getters.findUser(id)
-      if (!user) {
-        return store.dispatch('fetchUser', id)
-      } else {
-        return user
-      }
-    },
-    updateUserAdminData(store, { userAdminData }) {
-      return store
-        .dispatch('fetchUserIfMissing', userAdminData.id)
-        .then((user) => {
-          user.adminData = userAdminData
-          store.commit('addNewUsers', [user])
-          return user
-        })
-    },
-    fetchUser(store, id) {
-      return fetchUser({
-        id,
-        credentials: useOAuthStore().token,
-      })
-        .then(({ data: user }) => {
-          store.commit('addNewUsers', [user])
-          return user
-        })
-        .catch((error) => {
-          if (error.statusCode === 404) {
-            console.warn(`User ${id} not found`)
-          } else {
-            throw error
-          }
-        })
-    },
-    fetchUserByName(store, name) {
-      return fetchUserByName({
-        name,
-        credentials: useOAuthStore().token,
-      }).then(({ data: user }) => {
-        store.commit('addNewUsers', [user])
-        return user
-      })
-    },
-    fetchUserRelationship(store, id) {
-      if (store.state.currentUser) {
-        fetchUserRelationship({
-          id,
-          credentials: useOAuthStore().token,
-        }).then(({ data: relationships }) =>
-          store.commit('updateUserRelationship', relationships),
-        )
-      }
-    },
-    fetchUserInLists(store, id) {
-      if (store.state.currentUser) {
-        fetchUserInLists({
-          id,
-          credentials: useOAuthStore().token,
-        }).then(({ data: inLists }) =>
-          store.commit('updateUserInLists', { id, inLists }),
-        )
-      }
-    },
-    fetchBlocks(store, args) {
-      const { reset } = args || {}
-
-      const maxId = store.state.currentUser.blockIdsMaxId
-      return fetchBlocks({
-        maxId,
-        credentials: useOAuthStore().token,
-      }).then(({ data: blocks }) => {
-        if (reset) {
-          store.commit('saveBlockIds', map(blocks, 'id'))
-        } else {
-          map(blocks, 'id').map((id) => store.commit('addBlockId', id))
-        }
-        if (blocks.length) {
-          store.commit('setBlockIdsMaxId', last(blocks).id)
-        }
-        store.commit('addNewUsers', blocks)
-        return blocks
-      })
-    },
-    blockUser(store, data) {
-      return blockUser(store, data)
-    },
-    unblockUser(store, data) {
-      return unblockUser(store, data)
-    },
-    removeUserFromFollowers(store, id) {
-      return removeUserFromFollowers(store, id)
-    },
-    blockUsers(store, data = []) {
-      return Promise.all(data.map((d) => blockUser(store, d)))
-    },
-    unblockUsers(store, data = []) {
-      return Promise.all(data.map((d) => unblockUser(store, d)))
-    },
-    editUserNote(store, args) {
-      return editUserNote(store, args)
-    },
-    fetchMutes(store, args) {
-      const { reset } = args || {}
-
-      const maxId = store.state.currentUser.muteIdsMaxId
-      return fetchMutes({
-        maxId,
-        credentials: useOAuthStore().token,
-      }).then(({ data: mutes }) => {
-        if (reset) {
-          store.commit('saveMuteIds', map(mutes, 'id'))
-        } else {
-          map(mutes, 'id').map((id) => store.commit('addMuteId', id))
-        }
-        if (mutes.length) {
-          store.commit('setMuteIdsMaxId', last(mutes).id)
-        }
-        store.commit('addNewUsers', mutes)
-        return mutes
-      })
-    },
-    muteUser(store, data) {
-      return muteUser(store, data)
-    },
-    unmuteUser(store, id) {
-      return unmuteUser(store, id)
-    },
-    hideReblogs(store, id) {
-      return hideReblogs(store, id)
-    },
-    showReblogs(store, id) {
-      return showReblogs(store, id)
-    },
-    muteUsers(store, data = []) {
-      return Promise.all(data.map((d) => muteUser(store, d)))
-    },
-    unmuteUsers(store, ids = []) {
-      return Promise.all(ids.map((d) => unmuteUser(store, d)))
-    },
-    fetchDomainMutes(store) {
-      return fetchDomainMutes({
-        credentials: useOAuthStore().token,
-      }).then(({ data: domainMutes }) => {
-        store.commit('saveDomainMutes', domainMutes)
-        return domainMutes
-      })
-    },
-    muteDomain(store, domain) {
-      return muteDomain(store, domain)
-    },
-    unmuteDomain(store, domain) {
-      return unmuteDomain(store, domain)
-    },
-    muteDomains(store, domains = []) {
-      return Promise.all(domains.map((domain) => muteDomain(store, domain)))
-    },
-    unmuteDomains(store, domain = []) {
-      return Promise.all(domain.map((domain) => unmuteDomain(store, domain)))
-    },
-    fetchFriends({ rootState, commit }, id) {
-      const user = rootState.users.usersObject[id]
-      const maxId = last(user.friendIds)
-      return fetchFriends({
-        id,
-        maxId,
-        credentials: useOAuthStore().token,
-      }).then(({ data: friends }) => {
-        commit('addNewUsers', friends)
-        commit('saveFriendIds', { id, friendIds: map(friends, 'id') })
-        return friends
-      })
-    },
-    fetchFollowers({ rootState, commit }, id) {
-      const user = rootState.users.usersObject[id]
-      const maxId = last(user.followerIds)
-      return fetchFollowers({
-        id,
-        maxId,
-        credentials: useOAuthStore().token,
-      }).then(({ data: followers }) => {
-        commit('addNewUsers', followers)
-        commit('saveFollowerIds', { id, followerIds: map(followers, 'id') })
-        return followers
-      })
-    },
-    clearFriends({ commit }, userId) {
-      commit('clearFriends', userId)
-    },
-    clearFollowers({ commit }, userId) {
-      commit('clearFollowers', userId)
-    },
-    subscribeUser({ rootState, commit }, id) {
-      return followUser({
-        id,
-        notify: true,
-        credentials: useOAuthStore().token,
-      }).then(({ data: relationship }) =>
-        commit('updateUserRelationship', [relationship]),
-      )
-    },
-    unsubscribeUser({ rootState, commit }, id) {
-      return followUser({
-        id,
-        notify: false,
-        credentials: useOAuthStore().token,
-      }).then(({ data: relationship }) =>
-        commit('updateUserRelationship', [relationship]),
-      )
-    },
-    registerPushNotifications(store) {
-      const token = store.state.currentUser.credentials
-      const vapidPublicKey = useInstanceStore().vapidPublicKey
-      const isEnabled = useMergedConfigStore().mergedConfig.webPushNotifications
-      const notificationVisibility =
-        useMergedConfigStore().mergedConfig.notificationVisibility
-
-      registerPushNotifications(
-        isEnabled,
-        vapidPublicKey,
-        token,
-        notificationVisibility,
-      )
-    },
-    unregisterPushNotifications(store) {
-      const token = store.state.currentUser.credentials
-
-      unregisterPushNotifications(token)
-    },
-    addNewUsers({ commit }, users) {
-      commit('addNewUsers', users)
-    },
-    addNewStatuses(store, { statuses }) {
-      const users = map(statuses, 'user')
-      const retweetedUsers = compact(map(statuses, 'retweeted_status.user'))
-      store.commit('addNewUsers', users)
-      store.commit('addNewUsers', retweetedUsers)
-
-      each(statuses, (status) => {
-        // Reconnect users to statuses
-        store.commit('setUserForStatus', status)
-        // Set pinned statuses to user
-        store.commit('setPinnedToUser', status)
-      })
-      each(compact(map(statuses, 'retweeted_status')), (status) => {
-        // Reconnect users to retweets
-        store.commit('setUserForStatus', status)
-        // Set pinned retweets to user
-        store.commit('setPinnedToUser', status)
-      })
-    },
-    addNewNotifications(store, { notifications }) {
-      const users = map(notifications, 'from_profile')
-      const targetUsers = map(notifications, 'target').filter(Boolean)
-      const notificationIds = notifications.map((_) => _.id)
-      store.commit('addNewUsers', users)
-      store.commit('addNewUsers', targetUsers)
-
-      const notificationsObject = store.rootState.notifications.idStore
-      const relevantNotifications = Object.entries(notificationsObject)
-        .filter(([k]) => notificationIds.includes(k))
-        .map(([, val]) => val)
-
-      // Reconnect users to notifications
-      each(relevantNotifications, (notification) => {
-        store.commit('setUserForNotification', notification)
-      })
-    },
-    searchUsers({ rootState, commit }, { query }) {
-      return searchUsers({
-        query,
-        credentials: useOAuthStore().token,
-      }).then(({ data: users }) => {
-        commit('addNewUsers', users)
-        return users
-      })
-    },
-    async signUp(store, userInfo) {
-      const oauthStore = useOAuthStore()
-      store.commit('signUpPending')
-
-      try {
-        const token = await oauthStore.ensureAppToken()
-        const { data } = await register({
-          credentials: token,
-          params: { ...userInfo },
-        })
-
-        if (data.access_token) {
-          store.commit('signUpSuccess')
-          oauthStore.setToken(data.access_token)
-          await store.dispatch('loginUser', data.access_token)
-          return 'ok'
-        } else {
-          // Request succeeded, but user cannot login yet.
-          store.commit('signUpNotice', data)
-          return 'request_sent'
-        }
-      } catch (e) {
-        const errors = e.message
-        store.commit('signUpFailure', errors)
-        throw e
-      }
-    },
-    getCaptcha(store) {
-      return getCaptcha({
-        credentials: useOAuthStore().token,
-      }).then(({ data }) => data)
-    },
-
-    logout(store) {
-      const oauth = useOAuthStore()
-
-      // NOTE: No need to verify the app still exists, because if it doesn't,
-      // the token will be invalid too
-      return oauth
-        .ensureApp()
-        .then((app) => {
-          const params = {
-            app,
-            instance: useInstanceStore().server,
-            token: oauth.userToken,
-          }
-
-          return revokeToken(params)
-        })
-        .then(() => {
-          store.commit('clearCurrentUser')
-          store.dispatch('disconnectFromSocket')
-          store.dispatch('stopFetchingTimeline', 'friends')
-          store.dispatch('stopFetchingNotifications')
-          useListsStore().stopFetching()
-          useBookmarkFoldersStore().stopFetching()
-          store.dispatch('stopFetchingFollowRequests')
-          store.commit('clearNotifications')
-          store.commit('resetStatuses')
-          useChatsStore().resetChats()
-          oauth.clearToken()
-          Cookies.remove('__Host-pleroma_key', { path: '/' })
-          useInterfaceStore().setLastTimeline('public-timeline')
-          useInterfaceStore().setLayoutWidth(windowWidth())
-          useInterfaceStore().setLayoutHeight(windowHeight())
-        })
-    },
-    loginUser(store, accessToken) {
-      return new Promise((resolve, reject) => {
-        const commit = store.commit
-        const dispatch = store.dispatch
-
-        commit('beginLogin')
-
-        verifyCredentials({
-          credentials: useOAuthStore().token,
-        })
-          .then(({ data: user }) => {
-            // user.credentials = userCredentials
-            user.credentials = accessToken
-            user.blockIds = []
-            user.muteIds = []
-            user.domainMutes = []
-            commit('setCurrentUser', user)
-
-            useSyncConfigStore()
-              .initSyncConfig(user)
-              .then(() => {
-                useInterfaceStore()
-                  .applyTheme()
-                  .catch((e) => {
-                    console.error('Error setting theme', e)
-                  })
-              })
-            useUserHighlightStore().initUserHighlight(user)
-            commit('addNewUsers', [user])
-
-            useEmojiStore().fetchEmoji()
-
-            getNotificationPermission().then((permission) =>
-              useInterfaceStore().setNotificationPermission(permission),
-            )
-
-            // Do server-side storage migrations
-
-            // Debug snippet to clean up storage and reset migrations
-            /*
-            // Reset wordfilter
-            Object.keys(
-              useSyncConfigStore().prefsStorage.simple.muteFilters
-            ).forEach(key => {
-              useSyncConfigStore().unsetSimplePrefAndSave({ path: 'muteFilters.' + key, value: null })
-            })
-
-            // Reset flag to 0 to re-run migrations
-            useSyncConfigStore().setFlag({ flag: 'configMigration', value: 0 })
-            /**/
-
-            if (user.token) {
-              dispatch('setWsToken', user.token)
-
-              // Initialize the shout socket.
-              dispatch('initializeSocket')
-            }
-
-            const startPolling = () => {
-              // Start getting fresh posts.
-              dispatch('startFetchingTimeline', { timeline: 'friends' })
-
-              // Start fetching notifications
-              dispatch('startFetchingNotifications')
-
-              if (useInstanceCapabilitiesStore().pleromaChatMessagesAvailable) {
-                // Start fetching chats
-                dispatch('startFetchingChats')
-              }
-            }
-
-            useListsStore().startFetching()
-            useBookmarkFoldersStore().startFetching()
-
-            if (user.locked) {
-              dispatch('startFetchingFollowRequests')
-            }
-
-            if (useMergedConfigStore().mergedConfig.useStreamingApi) {
-              dispatch('fetchTimeline', {
-                timeline: 'friends',
-                sinceId: null,
-              })
-              dispatch('fetchNotifications', { sinceId: null })
-              dispatch('enableMastoSockets', true)
-                .catch((error) => {
-                  console.error(
-                    'Failed initializing MastoAPI Streaming socket',
-                    error,
-                  )
-                })
-                .then(() => {
-                  dispatch('fetchChats', { latest: true })
-                  setTimeout(
-                    () => dispatch('setNotificationsSilence', false),
-                    10000,
-                  )
-                })
-            } else {
-              startPolling()
-            }
-
-            // Start fetching things that don't need to block the UI
-            useAnnouncementsStore().startFetchingAnnouncements()
-
-            dispatch('fetchMutes')
-            dispatch('loadDrafts')
-
-            useInterfaceStore().setLayoutWidth(windowWidth())
-            useInterfaceStore().setLayoutHeight(windowHeight())
-
-            // Fetch our friends
-            fetchFriends({ id: user.id }).then(({ data: friends }) =>
-              commit('addNewUsers', friends),
-            )
-            commit('endLogin')
-            resolve()
-          })
-          .catch((error) => {
-            console.error(error)
-
-            // Authentication failed
-            commit('endLogin')
-
-            // remove authentication token on client/authentication errors
-            if ([400, 401, 403, 422].includes(error.statusCode)) {
-              useOAuthStore().clearToken()
-            }
-
-            commit('endLogin')
-            if (error.tatusCode === 401) {
-              throw new Error('Wrong username or password', error)
-            } else {
-              throw new Error('An error occurred, please try again', error)
-            }
-          })
-      })
-    },
-  },
-}
-
-export default users
diff --git a/src/services/chat_utils/chat_utils.js b/src/services/chat_utils/chat_utils.js
index bc02981cd..d99c17ed8 100644
--- a/src/services/chat_utils/chat_utils.js
+++ b/src/services/chat_utils/chat_utils.js
@@ -1,9 +1,10 @@
 import { showDesktopNotification } from '../desktop_notification_utils/desktop_notification_utils.js'
 
+import { useUsersStore } from 'src/stores/users.js'
+
 export const maybeShowChatNotification = (chat) => {
   if (!chat.lastMessage) return
-  if (window.vuex.state.users.currentUser.id === chat.lastMessage.account_id)
-    return
+  if (useUsersStore().currentUser.id === chat.lastMessage.account_id) return
 
   const opts = {
     tag: chat.lastMessage.id,
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index 5b8fa5b57..5d35b9699 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -27,6 +27,7 @@ export const parseUser = (data) => {
 
   output.screen_name = data.acct
   output.fqn = data.fqn
+  output.url = data.url
   output.statusnet_profile_url = data.url
 
   if (Object.hasOwn(data, 'mute_expires_at')) {
diff --git a/src/services/status_poster/status_poster.service.js b/src/services/status_poster/status_poster.service.js
index 9a26bd12f..af000a40e 100644
--- a/src/services/status_poster/status_poster.service.js
+++ b/src/services/status_poster/status_poster.service.js
@@ -1,5 +1,7 @@
 import { map } from 'lodash'
 
+import { useUsersStore } from 'src/stores/users.js'
+
 import {
   editStatus as apiEditStatus,
   postStatus as apiPostStatus,
@@ -24,7 +26,7 @@ const postStatus = ({
   const mediaIds = map(media, 'id')
 
   return apiPostStatus({
-    credentials: store.state.users.currentUser.credentials,
+    credentials: useUsersStore().currentUser.credentials,
     status,
     spoilerText,
     visibility,
@@ -63,7 +65,7 @@ const editStatus = ({
 
   return apiEditStatus({
     id: statusId,
-    credentials: store.state.users.currentUser.credentials,
+    credentials: useUsersStore().currentUser.credentials,
     status,
     spoilerText,
     sensitive,
@@ -90,12 +92,12 @@ const editStatus = ({
 }
 
 const uploadMedia = ({ store, formData }) => {
-  const credentials = store.state.users.currentUser.credentials
+  const credentials = useUsersStore().currentUser.credentials
   return apiUploadMedia({ credentials, formData }).then(({ data }) => data)
 }
 
 const setMediaDescription = ({ store, id, description }) => {
-  const credentials = store.state.users.currentUser.credentials
+  const credentials = useUsersStore().currentUser.credentials
   return apiSetMediaDescription({ credentials, id, description }).then(
     ({ data }) => data,
   )
diff --git a/src/services/timeline_fetcher/timeline_fetcher.service.js b/src/services/timeline_fetcher/timeline_fetcher.service.js
index 80dbc75d0..647ed90ef 100644
--- a/src/services/timeline_fetcher/timeline_fetcher.service.js
+++ b/src/services/timeline_fetcher/timeline_fetcher.service.js
@@ -5,6 +5,7 @@ import { promiseInterval } from '../promise_interval/promise_interval.js'
 import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
 import { useInterfaceStore } from 'src/stores/interface.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 import { fetchTimeline } from 'src/api/timelines.js'
 
@@ -48,7 +49,7 @@ const fetchAndUpdate = ({
   const timelineData = rootState.statuses.timelines[camelCase(timeline)]
   const { hideMutedPosts, replyVisibility } =
     useMergedConfigStore().mergedConfig
-  const loggedIn = !!rootState.users.currentUser
+  const loggedIn = !!useUsersStore().currentUser
 
   if (older) {
     // When minId = 0 we need to fetch without maxId param
diff --git a/src/stores/announcements.js b/src/stores/announcements.js
index b09655755..5110bd565 100644
--- a/src/stores/announcements.js
+++ b/src/stores/announcements.js
@@ -1,6 +1,7 @@
 import { defineStore } from 'pinia'
 
 import { useOAuthStore } from 'src/stores/oauth.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 import { dismissAnnouncement, getAnnouncements } from 'src/api/user.js'
 
@@ -16,7 +17,7 @@ export const useAnnouncementsStore = defineStore('announcements', {
   }),
   getters: {
     unreadAnnouncementCount() {
-      if (!window.vuex.state.users.currentUser) {
+      if (!useUsersStore().currentUser) {
         return 0
       }
 
@@ -30,7 +31,7 @@ export const useAnnouncementsStore = defineStore('announcements', {
     async fetchAnnouncements() {
       if (!this.supportsAnnouncements) return
 
-      const currentUser = window.vuex.state.users.currentUser
+      const currentUser = useUsersStore().currentUser
       const isAdmin =
         currentUser &&
         currentUser.privileges.has('announcements_manage_announcements')
diff --git a/src/stores/auth_flow.js b/src/stores/auth_flow.js
index 64df30f2a..0841dc558 100644
--- a/src/stores/auth_flow.js
+++ b/src/stores/auth_flow.js
@@ -1,6 +1,7 @@
 import { defineStore } from 'pinia'
 
 import { useOAuthStore } from 'src/stores/oauth.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 const PASSWORD_STRATEGY = 'password'
 const TOKEN_STRATEGY = 'token'
@@ -63,7 +64,7 @@ export const useAuthFlowStore = defineStore('authFlow', {
     },
     async login({ access_token: accessToken }) {
       useOAuthStore().setToken(accessToken)
-      await window.vuex.dispatch('loginUser', accessToken, { root: true })
+      useUsersStore().loginUser(accessToken, { root: true })
       this.resetState()
     },
   },
diff --git a/src/stores/emoji.js b/src/stores/emoji.js
index 8135a483e..1471f3dfb 100644
--- a/src/stores/emoji.js
+++ b/src/stores/emoji.js
@@ -3,6 +3,7 @@ import { defineStore } from 'pinia'
 
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 import { listEmojiPacks } from 'src/api/public.js'
 import { ensureFinalFallback } from 'src/i18n/languages.js'
@@ -194,7 +195,7 @@ export const useEmojiStore = defineStore('emoji', {
     },
 
     async getAdminPacks(instance, listFunction) {
-      const currentUser = window.vuex.state.users.currentUser
+      const currentUser = useUsersStore().currentUser
 
       if (!currentUser.rights.admin) return
 
diff --git a/src/stores/instance.js b/src/stores/instance.js
index 02edd1235..123f0b819 100644
--- a/src/stores/instance.js
+++ b/src/stores/instance.js
@@ -13,6 +13,7 @@ import {
 } from '../modules/default_config_state.js'
 
 import { useInterfaceStore } from 'src/stores/interface.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 import { fetchKnownDomains } from 'src/api/public.js'
 
@@ -212,7 +213,7 @@ export const useInstanceStore = defineStore('instance', {
     async getKnownDomains() {
       try {
         const { data } = await fetchKnownDomains({
-          credentials: window.vuex.state.users.currentUser.credentials,
+          credentials: useUsersStore().currentUser.credentials,
         })
         this.knownDomains = data
       } catch (e) {
diff --git a/src/stores/interface.js b/src/stores/interface.js
index 7be72a8d2..6eede1d3a 100644
--- a/src/stores/interface.js
+++ b/src/stores/interface.js
@@ -10,6 +10,7 @@ import { deserialize } from '../services/theme_data/iss_deserializer.js'
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
 import { useSyncConfigStore } from 'src/stores/sync_config.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 import {
   CURRENT_VERSION,
@@ -245,7 +246,7 @@ export const useInterfaceStore = defineStore('interface', {
       const mobileLayout = width <= 800
       const normalOrMobile = mobileLayout ? 'mobile' : 'normal'
       const { thirdColumnMode } = useMergedConfigStore().mergedConfig
-      if (thirdColumnMode === 'none' || !window.vuex.state.users.currentUser) {
+      if (thirdColumnMode === 'none' || !useUsersStore().currentUser) {
         this.layoutType = normalOrMobile
       } else {
         const wideLayout = width >= 1300
diff --git a/src/stores/sync_config.js b/src/stores/sync_config.js
index 9464ffb68..17a60d3ef 100644
--- a/src/stores/sync_config.js
+++ b/src/stores/sync_config.js
@@ -21,6 +21,7 @@ import { CURRENT_UPDATE_COUNTER } from 'src/components/update_notification/updat
 
 import { useLocalConfigStore } from 'src/stores/local_config.js'
 import { useOAuthStore } from 'src/stores/oauth.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 import { updateProfileJSON } from 'src/api/user.js'
 import { storage } from 'src/lib/storage.js'
@@ -807,7 +808,7 @@ export const useSyncConfigStore = defineStore('sync_config', {
     pushSyncConfig({ force = false } = {}) {
       const needPush = this.dirty || force
       if (!needPush) return
-      this.updateCache({ username: window.vuex.state.users.currentUser.fqn })
+      this.updateCache({ username: useUsersStore().currentUser.fqn })
       const params = { pleroma_settings_store: { 'pleroma-fe': this.cache } }
       updateProfileJSON({
         params,
diff --git a/src/stores/user_highlight.js b/src/stores/user_highlight.js
index 3cd3bfe7d..a4cbacd6e 100644
--- a/src/stores/user_highlight.js
+++ b/src/stores/user_highlight.js
@@ -10,6 +10,7 @@ import { defineStore } from 'pinia'
 import { toRaw } from 'vue'
 
 import { useOAuthStore } from 'src/stores/oauth.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 import { updateProfileJSON } from 'src/api/user.js'
 import { storage } from 'src/lib/storage.js'
@@ -328,7 +329,7 @@ export const useUserHighlightStore = defineStore('user_highlight', {
     pushHighlight({ force = false } = {}) {
       const needPush = this.dirty || force
       if (!needPush) return
-      this.updateCache({ username: window.vuex.state.users.currentUser.fqn })
+      this.updateCache({ username: useUsersStore().currentUser.fqn })
       const params = {
         pleroma_settings_store: { user_highlight: this.cache },
       }
diff --git a/src/stores/users.js b/src/stores/users.js
index 7d1255569..d03348bcb 100644
--- a/src/stores/users.js
+++ b/src/stores/users.js
@@ -59,18 +59,16 @@ const getNotificationPermission = async () => {
   return Notification.permission
 }
 
-export const defaultState = {
-  loggingIn: false,
-  lastLoginName: null,
-  currentUser: null,
-  users: new Map(),
-  usersByName: new Map(),
-  usersByURL: new Map(),
-  relationships: new Map(),
-}
-
 export const useUsersStore = defineStore('users', {
-  state: defaultState,
+  state: () => ({
+    loggingIn: false,
+    lastLoginName: null,
+    currentUser: null,
+    users: new Map(),
+    usersByName: new Map(),
+    usersByURL: new Map(),
+    relationships: new Map(),
+  }),
   getters: {
     loggedIn: (state) => !!state.currentUser,
     findUser: (state) => (query) => {
@@ -141,7 +139,7 @@ export const useUsersStore = defineStore('users', {
     },
     addNewUsers(users, timestamp) {
       users.forEach((user) => {
-        const existing = users.get(user.id) ?? {}
+        const existing = this.users.get(user.id) ?? {}
 
         const { relationship, ...old } = existing
         const { relationshop, ...neu } = user
@@ -150,6 +148,10 @@ export const useUsersStore = defineStore('users', {
         this.users.set(user.id, newUser)
         this.usersByName.set(user.screen_name.toLowerCase(), newUser)
         this.usersByURL.set(user.url.toLowerCase(), newUser)
+
+        if (user.id === this.currentUser.id) {
+          this.currentUser = newUser
+        }
       })
     },
     updateUserRelationship(relationships) {
diff --git a/test/unit/specs/components/post_status_form.spec.js b/test/unit/specs/components/post_status_form.spec.js
index f89102504..50b7471f2 100644
--- a/test/unit/specs/components/post_status_form.spec.js
+++ b/test/unit/specs/components/post_status_form.spec.js
@@ -6,6 +6,7 @@ import { mountOpts } from '../../../fixtures/setup_test'
 
 import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
 import { useMergedConfigStore } from 'src/stores/merged_config.js'
+import { useUsersStore } from 'src/stores/users.js'
 
 const currentUser = {
   id: 'current-user',
@@ -35,7 +36,7 @@ const replyMountOpts = (props) =>
   mountOpts({
     props,
     afterStore(store) {
-      store.state.users.currentUser = currentUser
+      useUsersStore().currentUser = currentUser
       store.state.statuses.allStatusesObject = {
         [repliedStatus.id]: repliedStatus,
       }