diff --git a/src/main/frontend/app/mfa/index.tsx b/src/main/frontend/app/mfa/index.tsx
index b44a2218..61d07bc7 100644
--- a/src/main/frontend/app/mfa/index.tsx
+++ b/src/main/frontend/app/mfa/index.tsx
@@ -75,6 +75,7 @@ const MfaChallengePage: React.FC<MfaChallengePageProps> = ({ rawI18nMessages,raw
 
                 {<form action="mfa-challenge" method="post">
                     <Box>
+                        <input name="mfa-method" type="hidden" value="EMAIL_MFA_METHOD"/>
                         <input name={csrfName} type="hidden" value={csrfToken}/>
 
                         <FormInputTextField id="mfa-code"
diff --git a/src/main/kotlin/com/vauthenticator/server/mfa/web/MfaController.kt b/src/main/kotlin/com/vauthenticator/server/mfa/web/MfaController.kt
index 0b49cde3..46061127 100644
--- a/src/main/kotlin/com/vauthenticator/server/mfa/web/MfaController.kt
+++ b/src/main/kotlin/com/vauthenticator/server/mfa/web/MfaController.kt
@@ -15,6 +15,7 @@ import org.springframework.ui.Model
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RequestParam
+import java.util.*
 
 @Controller
 class MfaController(
@@ -49,13 +50,14 @@ class MfaController(
     fun processSecondFactor(
         @RequestParam("mfa-code") mfaCode: String,
         @RequestParam("mfa-method") mfaMethod: MfaMethod,
-        @RequestParam("mfa-channel") mfaChannel: String,
+        @RequestParam("mfa-channel", required = false) mfaChannel: Optional<String>,
         authentication: Authentication,
         request: HttpServletRequest,
         response: HttpServletResponse
     ) {
         try {
-            otpMfaVerifier.verifyMfaChallengeFor(authentication.name, mfaMethod, mfaChannel, MfaChallenge(mfaCode))
+            val mfaChannel2 = mfaChannel.orElseGet { authentication.name }
+            otpMfaVerifier.verifyMfaChallengeFor(authentication.name, mfaMethod, mfaChannel2, MfaChallenge(mfaCode))
             publisher.publishEvent(MfaSuccessEvent(authentication))
             nextHopeLoginWorkflowSuccessHandler.onAuthenticationSuccess(request, response, authentication)
         } catch (e: Exception) {