diff --git a/internal/ui/login/handler/renderer.go b/internal/ui/login/handler/renderer.go
index 1ecf59232..d618c21ea 100644
--- a/internal/ui/login/handler/renderer.go
+++ b/internal/ui/login/handler/renderer.go
@@ -42,9 +42,9 @@ func CreateRenderer(pathPrefix string, staticDir http.FileSystem, staticStorage
 		tmplUserSelection:            "select_user.html",
 		tmplPassword:                 "password.html",
 		tmplPasswordlessVerification: "passwordless.html",
-		tmplMFAVerify:                "mfa_verify.html",
+		tmplMFAVerify:                "mfa_verify_otp.html",
 		tmplMFAPrompt:                "mfa_prompt.html",
-		tmplMFAInitVerify:            "mfa_init_verify.html",
+		tmplMFAInitVerify:            "mfa_init_otp.html",
 		tmplMFAU2FInit:               "mfa_init_u2f.html",
 		tmplU2FVerification:          "mfa_verification_u2f.html",
 		tmplMFAInitDone:              "mfa_init_done.html",
diff --git a/internal/ui/login/static/templates/error.html b/internal/ui/login/static/templates/error.html
index ce0eb444d..8594137dd 100644
--- a/internal/ui/login/static/templates/error.html
+++ b/internal/ui/login/static/templates/error.html
@@ -4,7 +4,7 @@
     <div class="lgn-error">
         <i class="lgn-icon-exclamation-circle-solid lgn-warn"></i>
         <p class="lgn-error-message">
-            {{ if .ErrType }}{{ .ErrType }} - {{end}}{{ .ErrMessage }}
+            {{ .ErrMessage }}{{ if .ID }} ({{ .ID }}){{end}}
         </p>
     </div>
 </div>