diff --git a/frontend/src/pages/_app.tsx b/frontend/src/pages/_app.tsx
index b26968109..5c9b63b75 100644
--- a/frontend/src/pages/_app.tsx
+++ b/frontend/src/pages/_app.tsx
@@ -102,29 +102,29 @@ const App = ({ Component, pageProps, ...appProps }: NextAppProp): JSX.Element =>
 
   return (
     <QueryClientProvider client={queryClient}>
-      <UserProvider>
-        <TooltipProvider>
-          <NotificationProvider>
-            <ServerConfigProvider>
-              <AuthProvider>
-                <OrgProvider>
-                  <OrgPermissionProvider>
-                    <WorkspaceProvider>
-                      <ProjectPermissionProvider>
-                        <SubscriptionProvider>
+      <TooltipProvider>
+        <NotificationProvider>
+          <ServerConfigProvider>
+            <AuthProvider>
+              <OrgProvider>
+                <OrgPermissionProvider>
+                  <WorkspaceProvider>
+                    <ProjectPermissionProvider>
+                      <SubscriptionProvider>
+                        <UserProvider>
                           <Layout>
                             <Component {...pageProps} />
                           </Layout>
-                        </SubscriptionProvider>
-                      </ProjectPermissionProvider>
-                    </WorkspaceProvider>
-                  </OrgPermissionProvider>
-                </OrgProvider>
-              </AuthProvider>
-            </ServerConfigProvider>
-          </NotificationProvider>
-        </TooltipProvider>
-      </UserProvider>
+                        </UserProvider>
+                      </SubscriptionProvider>
+                    </ProjectPermissionProvider>
+                  </WorkspaceProvider>
+                </OrgPermissionProvider>
+              </OrgProvider>
+            </AuthProvider>
+          </ServerConfigProvider>
+        </NotificationProvider>
+      </TooltipProvider>
     </QueryClientProvider>
   );
 };
diff --git a/frontend/src/pages/signupinvite.tsx b/frontend/src/pages/signupinvite.tsx
index 01668d314..95f0770cf 100644
--- a/frontend/src/pages/signupinvite.tsx
+++ b/frontend/src/pages/signupinvite.tsx
@@ -25,7 +25,7 @@ import SecurityClient from "@app/components/utilities/SecurityClient";
 import { useServerConfig } from "@app/context";
 import {
   completeAccountSignupInvite,
-  selectOrganization,
+  useSelectOrganization,
   verifySignupInvite
 } from "@app/hooks/api/auth/queries";
 import { fetchOrganizations } from "@app/hooks/api/organization/queries";
@@ -63,6 +63,8 @@ export default function SignupInvite() {
   const email = (parsedUrl.to as string)?.replace(" ", "+").trim();
   const { config } = useServerConfig();
 
+  const { mutateAsync: selectOrganization } = useSelectOrganization();
+
   useEffect(() => {
     if (!config.allowSignUp) {
       router.push("/login");
@@ -175,8 +177,9 @@ export default function SignupInvite() {
 
               const orgId = userOrgs[0].id;
 
-              const { token: newJwtToken } = await selectOrganization({ organizationId: orgId });
-              SecurityClient.setToken(newJwtToken);
+              if (!orgId) throw new Error("You are not part of any organization");
+
+              await selectOrganization({ organizationId: orgId });
 
               localStorage.setItem("orgData.id", orgId);
 
diff --git a/frontend/src/views/Login/Login.tsx b/frontend/src/views/Login/Login.tsx
index 307ef2e71..ac56c28c3 100644
--- a/frontend/src/views/Login/Login.tsx
+++ b/frontend/src/views/Login/Login.tsx
@@ -17,7 +17,6 @@ export const Login = () => {
   useEffect(() => {
     // TODO(akhilmhdh): workspace will be controlled by a workspace context
     const handleRedirects = async () => {
-      // TODO(daniel): Move this to select-organization page.
       try {
         const callbackPort = queryParams?.get("callback_port");
         // case: a callback port is set, meaning it's a cli login request: redirect to select org with callback port