diff --git a/apps/login/src/app/(login)/loginname/page.tsx b/apps/login/src/app/(login)/loginname/page.tsx
index b71ff468412..47e3245cc91 100644
--- a/apps/login/src/app/(login)/loginname/page.tsx
+++ b/apps/login/src/app/(login)/loginname/page.tsx
@@ -34,10 +34,11 @@ export default async function Page({
 
   let defaultOrganization;
   if (!organization) {
-    const org: Organization | null = await getDefaultOrg().catch((error) => {
-      console.warn(error);
-      return null;
-    });
+    const org: Organization | null = await getDefaultOrg();
+    // .catch((error) => {
+    //   console.warn(error);
+    //   return null;
+    // });
     if (org) {
       defaultOrganization = org.id;
     }
diff --git a/apps/login/src/app/(login)/page.tsx b/apps/login/src/app/(login)/page.tsx
index f1fce50f90d..9a530bc59d4 100644
--- a/apps/login/src/app/(login)/page.tsx
+++ b/apps/login/src/app/(login)/page.tsx
@@ -2,7 +2,7 @@ import { redirect } from "next/navigation";
 
 export default function Page() {
   // automatically redirect to loginname
-  if (process.env.DEBUG !== "true") {
-    redirect("/loginname");
-  }
+  //   if (process.env.DEBUG !== "true") {
+  redirect("/loginname");
+  //   }
 }
diff --git a/apps/login/src/app/(login)/password/page.tsx b/apps/login/src/app/(login)/password/page.tsx
index 9fe93dcb612..4fc1e544575 100644
--- a/apps/login/src/app/(login)/password/page.tsx
+++ b/apps/login/src/app/(login)/password/page.tsx
@@ -25,10 +25,11 @@ export default async function Page({
 
   let defaultOrganization;
   if (!organization) {
-    const org: Organization | null = await getDefaultOrg().catch((error) => {
-      console.warn(error);
-      return null;
-    });
+    const org: Organization | null = await getDefaultOrg();
+    // .catch((error) => {
+    //   console.warn(error);
+    //   return null;
+    // });
     if (org) {
       defaultOrganization = org.id;
     }