diff --git a/src/react-components/ory/sections/auth-code-section.tsx b/src/react-components/ory/sections/auth-code-section.tsx
index 35fb2c0b4..f8f383bb9 100644
--- a/src/react-components/ory/sections/auth-code-section.tsx
+++ b/src/react-components/ory/sections/auth-code-section.tsx
@@ -16,7 +16,11 @@ export const AuthCodeSection = ({
       <FilterFlowNodes
         filter={{
           nodes: nodes,
-          groups: "code",
+          groups: ["code"],
+          // we don't want to map the default group twice
+          // the form already maps hidden fields under the default group
+          // we are only interested in hidden fields that are under the code group
+          withoutDefaultGroup: true,
           withoutDefaultAttributes: true,
           attributes: ["hidden"],
         }}
diff --git a/src/react-components/ory/user-auth-card.spec.tsx b/src/react-components/ory/user-auth-card.spec.tsx
index 6ce6fc5be..ff679469f 100644
--- a/src/react-components/ory/user-auth-card.spec.tsx
+++ b/src/react-components/ory/user-auth-card.spec.tsx
@@ -7,6 +7,7 @@ import {
   recoveryFixture,
   registrationFixture,
   registrationCodeFixture,
+  registrationCodeStepTwoFixture,
   verificationFixture,
   loginCodeFixture,
 } from "../../test"
@@ -100,7 +101,7 @@ test("ory auth card registration code flow", async ({ mount }) => {
       title="Sign up"
       flowType="registration"
       additionalProps={{
-        loginURL: "/registration",
+        loginURL: "/login",
       }}
       flow={registrationCodeFixture}
     />,
@@ -121,6 +122,36 @@ test("ory auth card registration code flow", async ({ mount }) => {
   )
 })
 
+test("ory auth card registration step 2 of code flow", async ({ mount }) => {
+  const component = await mount(
+    <UserAuthCard
+      title="Sign up"
+      flowType="registration"
+      additionalProps={{
+        loginURL: "/login",
+      }}
+      flow={registrationCodeStepTwoFixture}
+    />,
+  )
+
+  const registrationComponent = new AuthPage(
+    registrationCodeStepTwoFixture.ui.nodes,
+    component,
+  )
+  await registrationComponent.expectTraitFields()
+
+  await expect(component).toContainText("Sign up", { ignoreCase: true })
+  await expect(component).toContainText("Already have an account?", {
+    ignoreCase: true,
+  })
+  await expect(
+    component.locator('button[type="submit"][name="method"]'),
+  ).toHaveText("Submit")
+  await expect(
+    component.locator('button[type="submit"][name="resend"]'),
+  ).toHaveText("Resend code")
+})
+
 test("ory auth card verification flow", async ({ mount }) => {
   const component = await mount(
     <UserAuthCard
diff --git a/src/test/fixtures/registration.ts b/src/test/fixtures/registration.ts
index 1409771b4..bf36cfe94 100644
--- a/src/test/fixtures/registration.ts
+++ b/src/test/fixtures/registration.ts
@@ -539,7 +539,7 @@ export const registrationCodeFixture: RegistrationFlow = {
       },
       {
         type: "input",
-        group: "code",
+        group: "default",
         attributes: {
           name: "traits.email",
           type: "email",
@@ -558,7 +558,7 @@ export const registrationCodeFixture: RegistrationFlow = {
       },
       {
         type: "input",
-        group: "code",
+        group: "default",
         attributes: {
           name: "traits.firstName",
           type: "text",
@@ -596,4 +596,162 @@ export const registrationCodeFixture: RegistrationFlow = {
       },
     ],
   },
+  state: "choose_method",
+}
+
+export const registrationCodeStepTwoFixture: RegistrationFlow = {
+  id: "28554fd0-cbf5-4ff3-a1f7-c033e5ad459c",
+  type: "browser",
+  expires_at: "2023-09-28T06:38:36.109217Z",
+  issued_at: "2023-09-28T06:08:36.109217Z",
+  request_url:
+    "https://auth.terblanche.eu/self-service/registration/browser?return_to=",
+  active: "code",
+  ui: {
+    action:
+      "https://auth.terblanche.eu/self-service/registration?flow=28554fd0-cbf5-4ff3-a1f7-c033e5ad459c",
+    method: "POST",
+    nodes: [
+      {
+        type: "input",
+        group: "default",
+        attributes: {
+          name: "traits.email",
+          type: "hidden",
+          value: "alano@ory.sh",
+          required: true,
+          autocomplete: "email",
+          disabled: false,
+          node_type: "input",
+        },
+        messages: [],
+        meta: {
+          label: {
+            id: 1070002,
+            text: "E-Mail",
+            type: "info",
+            context: {
+              title: "E-Mail",
+            },
+          },
+        },
+      },
+      {
+        type: "input",
+        group: "default",
+        attributes: {
+          name: "traits.tos",
+          type: "hidden",
+          value: true,
+          required: true,
+          disabled: false,
+          node_type: "input",
+        },
+        messages: [],
+        meta: {
+          label: {
+            id: 1070002,
+            text: "Accept Tos",
+            type: "info",
+            context: {
+              title: "Accept Tos",
+            },
+          },
+        },
+      },
+      {
+        type: "input",
+        group: "default",
+        attributes: {
+          name: "csrf_token",
+          type: "hidden",
+          value:
+            "RWrc7sJjlrv2xAdtlvlFmRg/vExgYOiXjdReeIYQ8uyptoPfF5vCqPdBmKW76qq6ZE6YjINL5yRPNO4ycAAHFQ==",
+          required: true,
+          disabled: false,
+          node_type: "input",
+        },
+        messages: [],
+        meta: {},
+      },
+      {
+        type: "input",
+        group: "code",
+        attributes: {
+          name: "method",
+          type: "hidden",
+          value: "code",
+          disabled: false,
+          node_type: "input",
+        },
+        messages: [],
+        meta: {},
+      },
+      {
+        type: "input",
+        group: "code",
+        attributes: {
+          name: "code",
+          type: "text",
+          required: true,
+          disabled: false,
+          node_type: "input",
+        },
+        messages: [],
+        meta: {
+          label: {
+            id: 1070012,
+            text: "Registration code",
+            type: "info",
+          },
+        },
+      },
+      {
+        type: "input",
+        group: "code",
+        attributes: {
+          name: "method",
+          type: "submit",
+          value: "code",
+          disabled: false,
+          node_type: "input",
+        },
+        messages: [],
+        meta: {
+          label: {
+            id: 1070005,
+            text: "Submit",
+            type: "info",
+          },
+        },
+      },
+      {
+        type: "input",
+        group: "code",
+        attributes: {
+          name: "resend",
+          type: "submit",
+          value: "code",
+          disabled: false,
+          node_type: "input",
+        },
+        messages: [],
+        meta: {
+          label: {
+            id: 1070008,
+            text: "Resend code",
+            type: "info",
+          },
+        },
+      },
+    ],
+    messages: [
+      {
+        id: 1040005,
+        text: "An email containing a code has been sent to the email address you provided. If you have not received an email, check the spelling of the address and retry the registration.",
+        type: "info",
+      },
+    ],
+  },
+  state: "sent_email",
 }
diff --git a/src/test/models/AuthPage.ts b/src/test/models/AuthPage.ts
index 4a52a2a24..c0b056dbe 100644
--- a/src/test/models/AuthPage.ts
+++ b/src/test/models/AuthPage.ts
@@ -37,10 +37,12 @@ export class AuthPage {
     const t = traits || this.traits
     for (const key in t) {
       if (t[key].type === "hidden") {
-        await expect(this.locator.locator(`*[name="${key}"]`)).toBeHidden()
+        await expect(this.locator.locator(`*[name="${key}"]`)).toBeAttached()
       } else {
         await expect(
-          this.locator.locator(`*[name="${t[key].name || key}"]`),
+          this.locator.locator(
+            `*[name="${t[key].name || key}"][type="${t[key].type}"]`,
+          ),
         ).toBeVisible()
       }
     }