diff --git a/web/apps/photos/src/pages/index.tsx b/web/apps/photos/src/pages/index.tsx
index 9aa3500ec..fc888af83 100644
--- a/web/apps/photos/src/pages/index.tsx
+++ b/web/apps/photos/src/pages/index.tsx
@@ -17,6 +17,7 @@ import ElectronAPIs from "@ente/shared/electron";
 import { getAlbumsURL } from "@ente/shared/network/api";
 import { logError } from "@ente/shared/sentry";
 import localForage from "@ente/shared/storage/localForage";
+import { getToken } from "@ente/shared/storage/localStorage/helpers";
 import { getKey, SESSION_KEYS } from "@ente/shared/storage/sessionStorage";
 import isElectron from "is-electron";
 import { Trans } from "react-i18next";
@@ -145,18 +146,11 @@ export default function LandingPage() {
                 );
             }
         }
-        if (key) {
-            // if (appName === APPS.AUTH) {
-            //     await router.push(PAGES.AUTH);
-            // } else {
+        const token = getToken();
+        if (key && token) {
             await router.push(PAGES.GALLERY);
-            // }
         } else if (user?.email) {
             await router.push(PAGES.VERIFY);
-        } else {
-            // if (appName === APPS.AUTH) {
-            //     await router.push(PAGES.LOGIN);
-            // }
         }
         await initLocalForage();
         setLoading(false);
diff --git a/web/packages/accounts/pages/credentials.tsx b/web/packages/accounts/pages/credentials.tsx
index 50cbc02ca..d553eef53 100644
--- a/web/packages/accounts/pages/credentials.tsx
+++ b/web/packages/accounts/pages/credentials.tsx
@@ -35,6 +35,7 @@ import VerifyMasterPasswordForm, {
 } from "@ente/shared/components/VerifyMasterPasswordForm";
 import { getAccountsURL } from "@ente/shared/network/api";
 import {
+    getToken,
     isFirstLogin,
     setIsFirstLogin,
 } from "@ente/shared/storage/localStorage/helpers";
@@ -86,7 +87,8 @@ export default function Credentials({
                     );
                 }
             }
-            if (key) {
+            const token = getToken();
+            if (key && token) {
                 router.push(APP_HOMES.get(appName));
                 return;
             }