diff --git a/authentik/stages/authenticator_validate/stage.py b/authentik/stages/authenticator_validate/stage.py
index c83cc190b..15c8aa434 100644
--- a/authentik/stages/authenticator_validate/stage.py
+++ b/authentik/stages/authenticator_validate/stage.py
@@ -34,15 +34,13 @@ class AuthenticatorChallenge(WithUserInfoChallenge):
     device_challenges = ListField(child=DeviceChallenge())
 
 
-class AuthenticatorChallengeResponse(ChallengeResponse):
+class AuthenticatorChallengeResponse(ChallengeResponse, DeviceChallenge):
     """Challenge used for Code-based authenticators"""
 
-    response = DeviceChallenge()
-
     request: HttpRequest
     user: User
 
-    def validate_response(self, value: DeviceChallenge):
+    def validate_challenge(self, value: dict):
         """Validate response"""
         return validate_challenge(value, self.request, self.user)
 
diff --git a/web/src/elements/stages/authenticator_validate/AuthenticatorValidateStageCode.ts b/web/src/elements/stages/authenticator_validate/AuthenticatorValidateStageCode.ts
index 7d1ad13ba..3bc5101fc 100644
--- a/web/src/elements/stages/authenticator_validate/AuthenticatorValidateStageCode.ts
+++ b/web/src/elements/stages/authenticator_validate/AuthenticatorValidateStageCode.ts
@@ -33,6 +33,8 @@ export class AuthenticatorValidateStageWebCode extends BaseStage {
                             </div>
                         </div>
                     </div>
+                    <input type="hidden" name="device_class" value=${this.deviceChallenge?.device_class}>
+                    <input type="hidden" name="device_uid" value=${this.deviceChallenge?.device_uid}>
 
                     <ak-form-element
                         label="${gettext("Code")}"
@@ -41,7 +43,7 @@ export class AuthenticatorValidateStageWebCode extends BaseStage {
                         .errors=${(this.challenge?.response_errors || {})["code"]}>
                         <!-- @ts-ignore -->
                         <input type="text"
-                            name="code"
+                            name="challenge"
                             inputmode="numeric"
                             pattern="[0-9]*"
                             placeholder="${gettext("Please enter your TOTP Code")}"