diff --git a/apps/login/ui/PasswordForm.tsx b/apps/login/ui/PasswordForm.tsx
index 1d37d9d0a4a..67201e26557 100644
--- a/apps/login/ui/PasswordForm.tsx
+++ b/apps/login/ui/PasswordForm.tsx
@@ -73,16 +73,13 @@ export default function PasswordForm({
       // if mfa is forced -> /mfa/set
       // if no passwordless -> /passkey/add
       if (resp.authFactors?.length >= 1) {
-        const params = new URLSearchParams(
-          authRequestId
-            ? {
-                loginName: resp.factors.user.loginName,
-                authRequestId,
-              }
-            : {
-                loginName: resp.factors.user.loginName,
-              }
-        );
+        const params = new URLSearchParams({
+          loginName: resp.factors.user.loginName,
+        });
+
+        if (authRequestId) {
+          params.append("authRequest", authRequestId);
+        }
 
         if (organization) {
           params.append("organization", organization);
@@ -100,6 +97,10 @@ export default function PasswordForm({
           promptPasswordless: "true",
         });
 
+        if (authRequestId) {
+          params.append("authRequest", authRequestId);
+        }
+
         if (organization) {
           params.append("organization", organization);
         }