diff --git a/src/main/resources/theme-resources/templates/email-code-form.ftl b/src/main/resources/theme-resources/templates/email-code-form.ftl
index 154f91f..849dc35 100644
--- a/src/main/resources/theme-resources/templates/email-code-form.ftl
+++ b/src/main/resources/theme-resources/templates/email-code-form.ftl
@@ -1,27 +1,43 @@
 <#import "template.ftl" as layout>
-<@layout.registrationLayout displayInfo=true; section>
-    <#if section = "title">
-        Access Code Form
-    <#elseif section = "header">
-        Access Code Form
-    <#elseif section = "form">
-        <p>Enter access code</p>
-        <form action="${url.loginAction}" class="${properties.kcFormClass!}" id="kc-u2f-login-form" method="post">
+<@layout.registrationLayout displayMessage=!messagesPerField.existsError('emailCode'); section>
+    <#if section="header">
+        ${msg("doLogIn")}
+    <#elseif section="form">
+        <form id="kc-otp-login-form" class="${properties.kcFormClass!}" action="${url.loginAction}"
+            method="post">
+
             <div class="${properties.kcFormGroupClass!}">
-                <label for="emailCode">Access Code</label>
-                <input id="emailCode" name="emailCode" type="text" inputmode="numeric" pattern="[0-9]*"/>
-            </div>
+                <div class="${properties.kcLabelWrapperClass!}">
+                    <label for="emailCode" class="${properties.kcLabelClass!}">${msg("loginOtpOneTime")}</label>
+                </div>
+
+            <div class="${properties.kcInputWrapperClass!}">
+                <input id="emailCode" name="emailCode" autocomplete="off" type="text" class="${properties.kcInputClass!}"
+                       autofocus aria-invalid="<#if messagesPerField.existsError('emailCode')>true</#if>"/>
 
-            <input class="${properties.kcButtonClass!} ${properties.kcButtonPrimaryClass!} ${properties.kcButtonLargeClass!}"
-                   type="submit" value="${msg("doSubmit")}"/>
+                <#if messagesPerField.existsError('emailCode')>
+                    <span id="input-error-otp-code" class="${properties.kcInputErrorMessageClass!}"
+                          aria-live="polite">
+                        ${kcSanitize(messagesPerField.get('emailCode'))?no_esc}
+                    </span>
+                </#if>
+            </div>
+        </div>
 
-            <input name="resend"
-                   class="${properties.kcButtonClass!} ${properties.kcButtonPrimaryClass!} ${properties.kcButtonLargeClass!}"
-                   type="submit" value="${msg("resendCode")}"/>
+            <div class="${properties.kcFormGroupClass!}">
+                <div id="kc-form-options" class="${properties.kcFormOptionsClass!}">
+                    <div class="${properties.kcFormOptionsWrapperClass!}">
+                    </div>
+                </div>
 
-            <input name="cancel"
-                   class="${properties.kcButtonClass!} ${properties.kcButtonPrimaryClass!} ${properties.kcButtonLargeClass!}"
-                   type="submit" value="${msg("doCancel")}"/>
+                <div id="kc-form-buttons">
+                    <div class="${properties.kcFormButtonsWrapperClass!}">
+                        <input class="${properties.kcButtonClass!} ${properties.kcButtonPrimaryClass!} ${properties.kcButtonLargeClass!}" name="login" type="submit" value="${msg("doSubmit")}" />
+                        <input class="${properties.kcButtonClass!} ${properties.kcButtonDefaultClass!} ${properties.kcButtonLargeClass!}" name="resend" type="submit" value="${msg("resendCode")}"/>
+                        <input class="${properties.kcButtonClass!} ${properties.kcButtonDefaultClass!} ${properties.kcButtonLargeClass!}" name="cancel" type="submit" value="${msg("doCancel")}"/>
+                    </div>
+                </div>
+            </div>
         </form>
     </#if>
-</@layout.registrationLayout>
\ No newline at end of file
+</@layout.registrationLayout>