diff --git a/apps/login/ui/LoginPasskey.tsx b/apps/login/ui/LoginPasskey.tsx
index e36b9bda2f3..88b3f924bb0 100644
--- a/apps/login/ui/LoginPasskey.tsx
+++ b/apps/login/ui/LoginPasskey.tsx
@@ -152,19 +152,29 @@ export default function LoginPasskey({
             },
           };
           return submitLogin(data).then((resp) => {
-            return router.push(
-              `/signedin?` +
-                new URLSearchParams(
-                  authRequestId
-                    ? {
-                        loginName: resp.factors.user.loginName,
-                        authRequestId,
-                      }
-                    : {
-                        loginName: resp.factors.user.loginName,
-                      }
-                )
-            );
+            if (authRequestId && resp && resp.sessionId) {
+              return router.push(
+                `/login?` +
+                  new URLSearchParams({
+                    sessionId: resp.sessionId,
+                    authRequest: authRequestId,
+                  })
+              );
+            } else {
+              return router.push(
+                `/signedin?` +
+                  new URLSearchParams(
+                    authRequestId
+                      ? {
+                          loginName: resp.factors.user.loginName,
+                          authRequestId,
+                        }
+                      : {
+                          loginName: resp.factors.user.loginName,
+                        }
+                  )
+              );
+            }
           });
         } else {
           setLoading(false);
diff --git a/apps/login/ui/PasswordForm.tsx b/apps/login/ui/PasswordForm.tsx
index 52a1169d8ec..e5fd02534ac 100644
--- a/apps/login/ui/PasswordForm.tsx
+++ b/apps/login/ui/PasswordForm.tsx
@@ -76,19 +76,29 @@ export default function PasswordForm({
             })
         );
       } else {
-        return router.push(
-          `/signedin?` +
-            new URLSearchParams(
-              authRequestId
-                ? {
-                    loginName: resp.factors.user.loginName,
-                    authRequestId,
-                  }
-                : {
-                    loginName: resp.factors.user.loginName,
-                  }
-            )
-        );
+        if (authRequestId && resp && resp.sessionId) {
+          return router.push(
+            `/login?` +
+              new URLSearchParams({
+                sessionId: resp.sessionId,
+                authRequest: authRequestId,
+              })
+          );
+        } else {
+          return router.push(
+            `/signedin?` +
+              new URLSearchParams(
+                authRequestId
+                  ? {
+                      loginName: resp.factors.user.loginName,
+                      authRequestId,
+                    }
+                  : {
+                      loginName: resp.factors.user.loginName,
+                    }
+              )
+          );
+        }
       }
     });
   }