diff --git a/frontend/app/Router.tsx b/frontend/app/Router.tsx
index 8448f824b..57a019118 100644
--- a/frontend/app/Router.tsx
+++ b/frontend/app/Router.tsx
@@ -170,15 +170,19 @@ const Router: React.FC<RouterProps> = (props) => {
 
   useEffect(() => {
     if (prevIsLoggedIn !== isLoggedIn && isLoggedIn) {
-      handleUserLogin();
-      if (scopeSetup) {
-        history.push(routes.scopeSetup())
-      } else if (spotCb) {
+      void handleUserLogin();
+      if (spotCb) {
         history.push(spotsList())
         localStorage.setItem(SPOT_ONBOARDING, 'true')
       }
     }
-  }, [isLoggedIn, scopeSetup]);
+  }, [isLoggedIn]);
+
+  useEffect(() => {
+    if (scopeSetup) {
+      history.push(routes.scopeSetup())
+    }
+  }, [scopeSetup])
 
   useEffect(() => {
     if (isLoggedIn && location.pathname.includes('login') && localSpotJwt) {
diff --git a/frontend/app/store.js b/frontend/app/store.js
index 7bfb615d7..371c82a1f 100644
--- a/frontend/app/store.js
+++ b/frontend/app/store.js
@@ -64,7 +64,7 @@ window.getJWT = () => {
   }
 }
 window.setJWT = (jwt) => {
-  store.dispatch({ type: UPDATE_JWT, data: jwt })
+  store.dispatch({ type: UPDATE_JWT, data: { jwt } })
 }
 
 export default store;