diff --git a/apps/login/src/ui/LoginPasskey.tsx b/apps/login/src/ui/LoginPasskey.tsx
index 3c94feecdb0..448d0a8220a 100644
--- a/apps/login/src/ui/LoginPasskey.tsx
+++ b/apps/login/src/ui/LoginPasskey.tsx
@@ -76,6 +76,7 @@ export default function LoginPasskey({
       ? UserVerificationRequirement.REQUIRED
       : UserVerificationRequirement.DISCOURAGED,
   ) {
+    setError("");
     setLoading(true);
     const session = await updateSession({
       loginName,
diff --git a/apps/login/src/ui/UsernameForm.tsx b/apps/login/src/ui/UsernameForm.tsx
index 335b949abeb..7d95226d139 100644
--- a/apps/login/src/ui/UsernameForm.tsx
+++ b/apps/login/src/ui/UsernameForm.tsx
@@ -205,7 +205,17 @@ export default function UsernameForm({
         {allowRegister && (
           <button
             className="transition-all text-sm hover:text-primary-light-500 dark:hover:text-primary-dark-500"
-            onClick={() => router.push("/register")}
+            onClick={() => {
+              const registerParams = new URLSearchParams();
+              if (organization) {
+                registerParams.append("organization", organization);
+              }
+              if (authRequestId) {
+                registerParams.append("authRequestId", authRequestId);
+              }
+
+              router.push("/register?" + registerParams);
+            }}
             type="button"
             disabled={loading}
           >