diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index 67747c6..6fa27eb 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -232,6 +232,12 @@ button:disabled {
 	color: gray;
 }
 
+.totp_code::-webkit-inner-spin-button,
+.totp_code::-webkit-outer-spin-button {
+  -webkit-appearance: none;
+  margin: 0;
+}
+
 
 /* outliners */
 
diff --git a/app/views/login/twofa.html.erb b/app/views/login/twofa.html.erb
index 07cc840..4161258 100644
--- a/app/views/login/twofa.html.erb
+++ b/app/views/login/twofa.html.erb
@@ -10,8 +10,8 @@
 
     <p>
     <%= label_tag :totp_code, t('.totpcode') %>
-    <%= text_field_tag :totp_code, "", :size => 10, :type => "number",
-      :autofocus => "autofocus" %>
+    <%= number_field_tag :totp_code, "", :size => 10, :autocomplete => "off",
+        :autofocus => true, :class => "totp_code" %>
     <br />
     </p>
 
diff --git a/app/views/settings/twofa_verify.html.erb b/app/views/settings/twofa_verify.html.erb
index 4e45f17..d281e3e 100644
--- a/app/views/settings/twofa_verify.html.erb
+++ b/app/views/settings/twofa_verify.html.erb
@@ -13,8 +13,8 @@
 
     <div class="boxline">
       <%= label_tag :totp_code, "TOTP Code:", :class => "required" %>
-      <%= text_field_tag :totp_code, "", :size => 10, :autocomplete => "off",
-        :type => "number", :autofocus => "autofocus" %>
+      <%= number_field_tag :totp_code, "", :size => 10, :autocomplete => "off",
+          :autofocus => true, :class => "totp_code" %>
     </div>
 
     <p>