diff --git a/packages/ui-default/pages/user_verify.page.ts b/packages/ui-default/pages/user_verify.page.ts
index d9092c739..ac39d2808 100644
--- a/packages/ui-default/pages/user_verify.page.ts
+++ b/packages/ui-default/pages/user_verify.page.ts
@@ -50,7 +50,7 @@ async function chooseAction(authn?: boolean) {
         <div>
           <label>${i18n('6-Digit Code')}  
             <div class="textbox-container">
-              <input class="textbox" type="text" name="tfa_code" autocomplete="off" autofocus>
+              <input class="textbox" type="number" name="tfa_code" autocomplete="off" autofocus>
             </div>
           </label>
           <input value="${i18n('Use TFA Code')}" class="expanded rounded primary button" data-action="tfa">
@@ -60,7 +60,7 @@ async function chooseAction(authn?: boolean) {
     $action: [],
     canCancel: false,
     onDispatch(action) {
-      if (action === 'tfa' && $('[name="tfa_code"]').val() === null) {
+      if (action === 'tfa' && $('[name="tfa_code"]').val() === '') {
         $('[name="tfa_code"]').focus();
         return false;
       }