4 files changed, 14 insertions, 8 deletions

diff --git a/app/views/elevations/new.html.erb b/app/views/elevations/new.html.erb
index 8dd64e78..8e1b59c2 100644
--- a/app/views/elevations/new.html.erb
+++ b/app/views/elevations/new.html.erb
@@ -10,7 +10,8 @@
         <div class="layout_row_label"><%= t(".code") %></div>
         <div class="layout_row_content">
           <%= text_field_tag :code, nil, :autocomplete => "one-time-code",
-                :inputmode => "numeric", :autofocus => true %>
+                :inputmode => "numeric", :autofocus => true, :maxlength => 6,
+                :pattern => "[0-9]{6}", :class => "otp_code" %>
         </div>
       </div>
 
diff --git a/app/views/otp_challenges/new.html.erb b/app/views/otp_challenges/new.html.erb
index 8247b262..ff7df222 100644
--- a/app/views/otp_challenges/new.html.erb
+++ b/app/views/otp_challenges/new.html.erb
@@ -6,10 +6,13 @@
     <div class="layout_row_content">
       <%= form_tag otp_challenge_path, :method => :post, :class => "otp_form" do %>
         <%= text_field_tag :code, nil, :autofocus => true,
-              :autocomplete => "one-time-code", :inputmode => "numeric" %>
-        <%= submit_tag t(".log_in") %>
+              :autocomplete => "one-time-code", :inputmode => "numeric",
+              :maxlength => 6, :pattern => "[0-9]{6}", :class => "otp_code" %>
+        <span class="field_hint"> <%= t(".hint") %> </span>
+        <%= button_tag :type => "submit", :class => "action_button" do %>
+          <%= icon("shield-check", library: "tabler", "aria-hidden": true) %> <%= t(".log_in") %>
+        <% end %>
       <% end %>
-      <span class="field_hint"> <%= t(".hint") %> </span>
     </div>
   </div>
 </div>
diff --git a/app/views/otp_enrollments/show.html.erb b/app/views/otp_enrollments/show.html.erb
index 16addb5b..a7604dd2 100644
--- a/app/views/otp_enrollments/show.html.erb
+++ b/app/views/otp_enrollments/show.html.erb
@@ -18,12 +18,13 @@
     <div class="layout_row_content">
       <%= form_tag otp_enrollment_path, :method => :put, :class => "otp_form" do %>
         <%= text_field_tag :code, nil, :autofocus => true,
-              :autocomplete => "one-time-code", :inputmode => "numeric" %>
+              :autocomplete => "one-time-code", :inputmode => "numeric",
+              :maxlength => 6, :pattern => "[0-9]{6}", :class => "otp_code" %>
+        <span class="field_hint"> <%= t(".app_hint", :issuer => OTP_ISSUER) %></span>
         <%= button_tag :type => "submit", :class => "action_button" do %>
           <%= icon("shield-check", library: "tabler", "aria-hidden": true) %> <%= t(".confirm") %>
         <% end %>
       <% end %>
-      <span class="field_hint"> <%= t(".app_hint", :issuer => OTP_ISSUER) %></span>
     </div>
   </div>
 </div>
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
index 2cf5a07c..14e19e39 100644
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -59,8 +59,9 @@
           <p><%= t(".enabled") %></p>
           <%= form_tag otp_enrollment_path, :method => :delete, :class => "otp_form" do %>
             <%= password_field_tag :current_password, nil, :placeholder => t(".current_password"), :autocomplete => "current-password" %>
-            <%= text_field_tag :code, nil, :placeholder => t(".current_code"),
-                  :autocomplete => "one-time-code", :inputmode => "numeric" %>
+            <%= text_field_tag :code, nil, :autocomplete => "one-time-code", :inputmode => "numeric",
+                  :maxlength => 6, :pattern => "[0-9]{6}", :class => "otp_code" %>
+            <span class="field_hint"> <%= t(".reset_hint") %> </span>
             <%= button_tag :type => "submit", :class => "action_button" do %>
               <%= icon("shield-off", library: "tabler", "aria-hidden": true) %> <%= t(".disable_second_factor") %>
             <% end %>