diff --git a/app/javascript/submission_form/phone_step.vue b/app/javascript/submission_form/phone_step.vue
index 8a2dfe13..d3e95bed 100644
--- a/app/javascript/submission_form/phone_step.vue
+++ b/app/javascript/submission_form/phone_step.vue
@@ -39,7 +39,7 @@
           required
           maxlength="6"
           autofocus
-          inputmode="decimal"
+          inputmode="numeric"
           @input="onInputCode"
         >
         <div class="flex justify-between mt-2 -mb-2 md:-mb-4">
diff --git a/app/views/devise/sessions/_otp_form.html.erb b/app/views/devise/sessions/_otp_form.html.erb
index bf1959bf..aee78e63 100644
--- a/app/views/devise/sessions/_otp_form.html.erb
+++ b/app/views/devise/sessions/_otp_form.html.erb
@@ -1,4 +1,4 @@
 <div class="form-control">
   <%= label_tag 'user[otp_attempt]', t('two_factor_code_from_authenticator_app'), class: 'label' %>
-  <%= text_field_tag 'user[otp_attempt]', nil, autofocus: true, autocomplete: 'off', placeholder: 'XXX-XXX', required: true, class: 'base-input' %>
+  <%= text_field_tag 'user[otp_attempt]', nil, autofocus: true, autocomplete: 'off', inputmode: 'numeric', placeholder: 'XXXXXX', required: true, class: 'base-input' %>
 </div>
diff --git a/app/views/mfa_setup/_form.html.erb b/app/views/mfa_setup/_form.html.erb
index c931b48e..52b463a3 100644
--- a/app/views/mfa_setup/_form.html.erb
+++ b/app/views/mfa_setup/_form.html.erb
@@ -6,7 +6,7 @@
     <%== RQRCode::QRCode.new(@provision_url).as_svg(viewbox: true, svg_attributes: { class: 'md:w-80 md:h-80 my-4 mx-auto' }).sub(/\A<\?xml[^>]*\?>/, '') %>
   </div>
   <div class="form-control my-6 space-y-2">
-    <%= f.text_field :otp_attempt, required: true, placeholder: 'XXX-XXX', class: 'base-input text-center' %>
+    <%= f.text_field :otp_attempt, required: true, inputmode: 'numeric', placeholder: 'XXXXXX', class: 'base-input text-center' %>
     <span>
       <%= @error_message %>
     </span>
diff --git a/app/views/mfa_setup/edit.html.erb b/app/views/mfa_setup/edit.html.erb
index d551185d..ec7b410c 100644
--- a/app/views/mfa_setup/edit.html.erb
+++ b/app/views/mfa_setup/edit.html.erb
@@ -1,7 +1,7 @@
 <%= render 'shared/turbo_modal', title: t('remove_2fa') do %>
   <%= form_for '', url: mfa_setup_path, method: :delete, data: { turbo_frame: :_top } do |f| %>
     <div class="form-control my-6 space-y-2">
-      <%= f.text_field :otp_attempt, required: true, placeholder: 'XXX-XXX', class: 'base-input text-center' %>
+      <%= f.text_field :otp_attempt, required: true, inputmode: 'numeric', placeholder: 'XXXXXX', class: 'base-input text-center' %>
       <span>
         <%= @error_message %>
       </span>
diff --git a/app/views/start_form/email_verification.html.erb b/app/views/start_form/email_verification.html.erb
index 248278c5..68e54986 100644
--- a/app/views/start_form/email_verification.html.erb
+++ b/app/views/start_form/email_verification.html.erb
@@ -29,7 +29,7 @@
         <%= f.hidden_field 'submitter[name]', value: params[:name] || @submitter&.name %>
         <%= f.hidden_field 'submitter[email]', value: params[:email] || @submitter&.email %>
         <%= f.hidden_field 'submitter[phone]', value: params[:phone] || @submitter&.phone %>
-        <%= f.text_field :one_time_code, required: true, class: 'base-input text-center', placeholder: 'XXX-XXX' %>
+        <%= f.text_field :one_time_code, required: true, inputmode: 'numeric', class: 'base-input text-center', placeholder: 'XXXXXX' %>
         <div class="flex justify-between items-center mt-1">
           <span>
             <% if flash[:alert] %>
diff --git a/app/views/submit_form/email_2fa.html.erb b/app/views/submit_form/email_2fa.html.erb
index 216c82b8..0d16d2b0 100644
--- a/app/views/submit_form/email_2fa.html.erb
+++ b/app/views/submit_form/email_2fa.html.erb
@@ -33,7 +33,7 @@
         <%= form_for '', url: submit_form_email_2fa_path, method: :post, html: { class: 'space-y-4', id: 'code_form' } do |f| %>
           <div dir="auto" class="form-control !mt-0">
             <%= f.hidden_field :submitter_slug, value: @submitter.slug %>
-            <%= f.text_field :one_time_code, required: true, class: 'base-input text-center', placeholder: 'XXX-XXX' %>
+            <%= f.text_field :one_time_code, required: true, inputmode: 'numeric', class: 'base-input text-center', placeholder: 'XXXXXX' %>
             <div class="flex justify-between items-center mt-1">
               <span>
                 <% if flash[:alert] %>