diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index 220014c5c..6046d2863 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -257,7 +257,7 @@ const checkOAuthToken = async ({ store }) => {
   return new Promise(async (resolve, reject) => {
     if (store.state.oauth.userToken) {
       try {
-        await store.dispatch('loginUser', store.state.oauth.userToken)
+        await store.dispatch('loginUser', store.getters.getUserToken())
       } catch (e) {
         console.log(e)
       }
diff --git a/src/modules/oauth.js b/src/modules/oauth.js
index 77ad2fa85..c87e4777e 100644
--- a/src/modules/oauth.js
+++ b/src/modules/oauth.js
@@ -29,6 +29,11 @@ const oauth = {
       // state.token is userToken with older name, coming from persistent state
       // added here for smoother transition, otherwise user will be logged out
       return state.userToken || state.token || state.appToken
+    },
+    getUserToken: state => () => {
+      // state.token is userToken with older name, coming from persistent state
+      // added here for smoother transition, otherwise user will be logged out
+      return state.userToken || state.token
     }
   }
 }