diff --git a/backend/src/server/lib/schemas.ts b/backend/src/server/lib/schemas.ts
index 72ee8eb4f..7edc98db3 100644
--- a/backend/src/server/lib/schemas.ts
+++ b/backend/src/server/lib/schemas.ts
@@ -50,8 +50,7 @@ export const SecretNameSchema = BaseSecretNameSchema.refine(
   .refine((el) => !el.includes("/"), "Secret name cannot contain forward slash.");
 
 const DefaultOrgSchema = z.object({
-  useDefaultOrg: z.literal(true),
-  organizationName: z.string().trim().optional()
+  useDefaultOrg: z.literal(true)
 });
 
 const CustomOrgSchema = z.object({
diff --git a/backend/src/services/auth/auth-login-service.ts b/backend/src/services/auth/auth-login-service.ts
index 6e45ba7e1..14663ced6 100644
--- a/backend/src/services/auth/auth-login-service.ts
+++ b/backend/src/services/auth/auth-login-service.ts
@@ -727,7 +727,11 @@ export const authLoginServiceFactory = ({
       if (authMethod === AuthMethod.GITHUB && serverCfg.defaultAuthOrgId) {
         let orgId = "";
         const defaultOrg = await orgDAL.findOrgById(serverCfg.defaultAuthOrgId);
-        if (!defaultOrg) throw new BadRequestError({ message: "Failed to find default organization" });
+        if (!defaultOrg) {
+          throw new BadRequestError({
+            message: `Failed to find default organization with ID ${serverCfg.defaultAuthOrgId}`
+          });
+        }
         orgId = defaultOrg.id;
         const [orgMembership] = await orgDAL.findMembership({
           [`${TableName.OrgMembership}.userId` as "userId"]: user.id,