From c39f1b4e6db81a59ede0e068e0829c041a095985 Mon Sep 17 00:00:00 2001
From: Max Peintner <peintnerm@gmail.com>
Date: Fri, 27 Dec 2024 08:42:31 +0100
Subject: [PATCH] fix org context for accounts page - new user

---
 apps/login/src/app/(login)/accounts/page.tsx | 21 ++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/apps/login/src/app/(login)/accounts/page.tsx b/apps/login/src/app/(login)/accounts/page.tsx
index 9d2e6a0b9f..49fbad6202 100644
--- a/apps/login/src/app/(login)/accounts/page.tsx
+++ b/apps/login/src/app/(login)/accounts/page.tsx
@@ -49,6 +49,16 @@ export default async function Page(props: {
     organization ?? defaultOrganization,
   );
 
+  const params = new URLSearchParams();
+
+  if (authRequestId) {
+    params.append("authRequestId", authRequestId);
+  }
+
+  if (organization) {
+    params.append("organization", organization);
+  }
+
   return (
     <DynamicTheme branding={branding}>
       <div className="flex flex-col items-center space-y-4">
@@ -57,16 +67,7 @@ export default async function Page(props: {
 
         <div className="flex flex-col w-full space-y-2">
           <SessionsList sessions={sessions} authRequestId={authRequestId} />
-          <Link
-            href={
-              authRequestId
-                ? `/loginname?` +
-                  new URLSearchParams({
-                    authRequestId,
-                  })
-                : "/loginname"
-            }
-          >
+          <Link href={`/loginname?` + params}>
             <div className="flex flex-row items-center py-3 px-4 hover:bg-black/10 dark:hover:bg-white/10 rounded-md transition-all">
               <div className="w-8 h-8 mr-4 flex flex-row justify-center items-center rounded-full bg-black/5 dark:bg-white/5">
                 <UserPlusIcon className="h-5 w-5" />