diff --git a/apps/login/src/lib/server/idp-intent.test.ts b/apps/login/src/lib/server/idp-intent.test.ts
index 90de236a0..9f4822a01 100644
--- a/apps/login/src/lib/server/idp-intent.test.ts
+++ b/apps/login/src/lib/server/idp-intent.test.ts
@@ -736,6 +736,121 @@ describe("processIDPCallback", () => {
 
       expect(result.error).toBe("Session error");
     });
+
+    test("should redirect to complete registration when givenName is missing", async () => {
+      mockRetrieveIDPIntent.mockResolvedValue({
+        ...defaultIntent,
+        userId: undefined,
+        addHumanUser: {
+          ...defaultIntent.addHumanUser,
+          profile: {
+            givenName: "",
+            familyName: "User",
+            displayName: "User",
+          },
+        },
+      });
+
+      const result = await processIDPCallback(defaultParams);
+
+      expect(mockAddHuman).not.toHaveBeenCalled();
+      expect(result.redirect).toContain("/idp/google/complete-registration");
+      expect(result.redirect).toContain("id=intent123");
+      expect(result.redirect).toContain("token=token123");
+      expect(result.redirect).toContain("organization=org123");
+      expect(result.redirect).toContain("familyName=User");
+    });
+
+    test("should redirect to complete registration when familyName is missing", async () => {
+      mockRetrieveIDPIntent.mockResolvedValue({
+        ...defaultIntent,
+        userId: undefined,
+        addHumanUser: {
+          ...defaultIntent.addHumanUser,
+          profile: {
+            givenName: "Test",
+            familyName: "",
+            displayName: "Test",
+          },
+        },
+      });
+
+      const result = await processIDPCallback(defaultParams);
+
+      expect(mockAddHuman).not.toHaveBeenCalled();
+      expect(result.redirect).toContain("/idp/google/complete-registration");
+      expect(result.redirect).toContain("id=intent123");
+      expect(result.redirect).toContain("token=token123");
+      expect(result.redirect).toContain("organization=org123");
+      expect(result.redirect).toContain("givenName=Test");
+    });
+
+    test("should redirect to complete registration when both givenName and familyName are missing", async () => {
+      mockRetrieveIDPIntent.mockResolvedValue({
+        ...defaultIntent,
+        userId: undefined,
+        addHumanUser: {
+          ...defaultIntent.addHumanUser,
+          profile: {
+            givenName: "",
+            familyName: "",
+            displayName: "",
+          },
+        },
+      });
+
+      const result = await processIDPCallback(defaultParams);
+
+      expect(mockAddHuman).not.toHaveBeenCalled();
+      expect(result.redirect).toContain("/idp/google/complete-registration");
+      expect(result.redirect).toContain("id=intent123");
+      expect(result.redirect).toContain("token=token123");
+      expect(result.redirect).toContain("organization=org123");
+    });
+
+    test("should redirect to complete registration when profile is undefined", async () => {
+      mockRetrieveIDPIntent.mockResolvedValue({
+        ...defaultIntent,
+        userId: undefined,
+        addHumanUser: {
+          ...defaultIntent.addHumanUser,
+          profile: undefined,
+        },
+      });
+
+      const result = await processIDPCallback(defaultParams);
+
+      expect(mockAddHuman).not.toHaveBeenCalled();
+      expect(result.redirect).toContain("/idp/google/complete-registration");
+      expect(result.redirect).toContain("id=intent123");
+      expect(result.redirect).toContain("token=token123");
+    });
+
+    test("should use fallback organization when required fields missing and no org provided", async () => {
+      mockRetrieveIDPIntent.mockResolvedValue({
+        ...defaultIntent,
+        userId: undefined,
+        addHumanUser: {
+          ...defaultIntent.addHumanUser,
+          profile: {
+            givenName: "",
+            familyName: "User",
+            displayName: "User",
+          },
+        },
+      });
+      mockGetDefaultOrg.mockResolvedValue({ id: "default-org" });
+
+      const result = await processIDPCallback({
+        ...defaultParams,
+        organization: undefined,
+      });
+
+      expect(mockGetDefaultOrg).toHaveBeenCalled();
+      expect(mockAddHuman).not.toHaveBeenCalled();
+      expect(result.redirect).toContain("/idp/google/complete-registration");
+      expect(result.redirect).toContain("organization=default-org");
+    });
   });
 
   describe("CASE 5: Manual user creation allowed", () => {
diff --git a/apps/login/src/lib/server/idp-intent.ts b/apps/login/src/lib/server/idp-intent.ts
index 763914c2b..f1ef5178f 100644
--- a/apps/login/src/lib/server/idp-intent.ts
+++ b/apps/login/src/lib/server/idp-intent.ts
@@ -452,7 +452,7 @@ async function handleAutoLinking(ctx: IDPHandlerContext): Promise<IDPHandlerResu
  */
 async function handleAutoCreation(ctx: IDPHandlerContext): Promise<IDPHandlerResult> {
   const { options, intent, serviceConfig, buildRedirectParams, t } = ctx;
-  const { addHumanUser } = intent;
+  const { addHumanUser, idpInformation } = intent;
   const { organization, provider } = ctx.params;
 
   if (options?.isAutoCreation && addHumanUser) {
@@ -468,6 +468,32 @@ async function handleAutoCreation(ctx: IDPHandlerContext): Promise<IDPHandlerRes
       return { redirect: `/idp/${provider}/failure?${params}&error=no_organization_context` };
     }
 
+    // Check if required profile fields are present
+    if (!addHumanUser.profile?.givenName || !addHumanUser.profile?.familyName) {
+      logger.info("Missing required profile fields (givenName or familyName), redirecting to complete registration");
+
+      if (!idpInformation!.userId) {
+        logger.error("IDP intent missing userId, cannot redirect to complete registration");
+        const params = buildRedirectParams();
+        return { redirect: `/idp/${provider}/failure?${params}&error=missing_idp_user_info` };
+      }
+
+      const params = buildRedirectParams(
+        {
+          organization: orgToRegisterOn,
+          idpId: idpInformation!.idpId,
+          idpUserId: idpInformation!.userId,
+          idpUserName: idpInformation!.userName || "",
+          // User data for pre-filling form
+          givenName: addHumanUser.profile?.givenName || "",
+          familyName: addHumanUser.profile?.familyName || "",
+          email: addHumanUser.email?.email || "",
+        },
+        true,
+      );
+      return { redirect: `/idp/${provider}/complete-registration?${params}` };
+    }
+
     const organizationSchema = create(OrganizationSchema, {
       org: { case: "orgId", value: orgToRegisterOn },
     });
@@ -542,11 +568,17 @@ async function handleManualCreation(ctx: IDPHandlerContext): Promise<IDPHandlerR
     // Store user data for manual registration form
     // Note: includeToken=true because the session hasn't been created yet
     // The token will be needed when registerUserAndLinkToIDP creates the session
+    if (!idpInformation!.userId) {
+      logger.error("IDP intent missing userId, cannot redirect to complete registration");
+      const params = buildRedirectParams();
+      return { redirect: `/idp/${provider}/failure?${params}&error=missing_idp_user_info` };
+    }
+
     const params = buildRedirectParams(
       {
         organization: orgToRegisterOn,
         idpId: idpInformation!.idpId,
-        idpUserId: idpInformation!.userId || "",
+        idpUserId: idpInformation!.userId,
         idpUserName: idpInformation!.userName || "",
         // User data for pre-filling form
         givenName: addHumanUser.profile?.givenName || "",