From 7763a151070333d2b4817051797f2635dbcfa1a7 Mon Sep 17 00:00:00 2001
From: EphemeralFog <mohammad87115@gmail.com>
Date: Wed, 24 Jun 2026 16:44:44 +0330
Subject: [PATCH 1/3] fix: keep addAccount=1 param while moving between auth
 pages

---
 src/app/pages/auth/login/Login.tsx       | 8 +++++++-
 src/app/pages/auth/register/Register.tsx | 9 +++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/app/pages/auth/login/Login.tsx b/src/app/pages/auth/login/Login.tsx
index 7f53af090..2aa6fc8a5 100644
--- a/src/app/pages/auth/login/Login.tsx
+++ b/src/app/pages/auth/login/Login.tsx
@@ -55,6 +55,12 @@ export function Login() {
 
   const parsedFlows = useParsedLoginFlows(loginFlows.flows);
 
+  const isAddingAccount = searchParams.get('addAccount') === '1';
+
+  const registerUrl = isAddingAccount
+    ? withSearchParam(getRegisterPath(server), { addAccount: '1' })
+    : getRegisterPath(server);
+
   return (
     <Box direction="Column" gap="500">
       <Text size="H2" priority="400">
@@ -93,7 +99,7 @@ export function Login() {
         </>
       )}
       <Text align="Center">
-        Do not have an account? <Link to={getRegisterPath(server)}>Register</Link>
+        Do not have an account? <Link to={registerUrl}>Register</Link>
       </Text>
     </Box>
   );
diff --git a/src/app/pages/auth/register/Register.tsx b/src/app/pages/auth/register/Register.tsx
index 73497255e..df9aa123e 100644
--- a/src/app/pages/auth/register/Register.tsx
+++ b/src/app/pages/auth/register/Register.tsx
@@ -6,7 +6,7 @@ import { useAuthServer } from '$hooks/useAuthServer';
 import { RegisterFlowStatus, useAuthFlows } from '$hooks/useAuthFlows';
 import { useParsedLoginFlows } from '$hooks/useParsedLoginFlows';
 import { SupportedUIAFlowsLoader } from '$components/SupportedUIAFlowsLoader';
-import { getLoginPath } from '$pages/pathUtils';
+import { getLoginPath, withSearchParam } from '$pages/pathUtils';
 import { usePathWithOrigin } from '$hooks/usePathWithOrigin';
 import type { RegisterPathSearchParams } from '$pages/paths';
 import { SSOLogin } from '$pages/auth/SSOLogin';
@@ -33,6 +33,11 @@ export function Register() {
   // redirect to /login because only that path handle m.login.token
   const ssoRedirectUrl = usePathWithOrigin(getLoginPath(server));
 
+  const isAddingAccount = searchParams.get('addAccount') === '1';
+  const loginUrl = isAddingAccount
+    ? withSearchParam(getLoginPath(server), { addAccount: '1' })
+    : getLoginPath(server);
+
   return (
     <Box direction="Column" gap="500">
       <Text size="H2" priority="400">
@@ -91,7 +96,7 @@ export function Register() {
         </>
       )}
       <Text align="Center">
-        Already have an account? <Link to={getLoginPath(server)}>Login</Link>
+        Already have an account? <Link to={loginUrl}>Login</Link>
       </Text>
     </Box>
   );

From ddd646c9813f26e4d915fa8757080eeff74945c7 Mon Sep 17 00:00:00 2001
From: EphemeralFog <mohammad87115@gmail.com>
Date: Wed, 24 Jun 2026 16:55:14 +0330
Subject: [PATCH 2/3] chore: add changesets

---
 .changeset/fix-preserve-add-account-param.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/fix-preserve-add-account-param.md

diff --git a/.changeset/fix-preserve-add-account-param.md b/.changeset/fix-preserve-add-account-param.md
new file mode 100644
index 000000000..f05e3b7ee
--- /dev/null
+++ b/.changeset/fix-preserve-add-account-param.md
@@ -0,0 +1,5 @@
+---
+default: patch
+---
+
+Fix registration not working when accessed from add account button
\ No newline at end of file

From 23886e33c308b29b8a0d491947a21ea3abe93a0b Mon Sep 17 00:00:00 2001
From: EphemeralFog <mohammad87115@gmail.com>
Date: Wed, 24 Jun 2026 17:18:56 +0330
Subject: [PATCH 3/3] style: fix formatting for the changeset file

---
 .changeset/fix-preserve-add-account-param.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/fix-preserve-add-account-param.md b/.changeset/fix-preserve-add-account-param.md
index f05e3b7ee..1b78177c7 100644
--- a/.changeset/fix-preserve-add-account-param.md
+++ b/.changeset/fix-preserve-add-account-param.md
@@ -2,4 +2,4 @@
 default: patch
 ---
 
-Fix registration not working when accessed from add account button
\ No newline at end of file
+Fix registration not working when accessed from add account button