diff --git a/app/auth/templates/auth/fido.html b/app/auth/templates/auth/fido.html
index 35f8b257..b2d2ea75 100644
--- a/app/auth/templates/auth/fido.html
+++ b/app/auth/templates/auth/fido.html
@@ -22,10 +22,12 @@
       <form id="formRegisterKey" method="post">
         {{ fido_token_form.csrf_token }}
         {{ fido_token_form.sk_assertion(class="form-control", placeholder="") }}
+
+        <div class="text-center">
+          <button id="btnVerifyKey" class="btn btn-success mt-2" onclick="verifyKey();">Use your security key</button>
+        </div>
       </form>
-      <div class="text-center">
-        <button id="btnVerifyKey" class="btn btn-success mt-2">Use your security key</button>
-      </div>
+
 
       {% if enable_otp %}
         <hr>
@@ -68,7 +70,6 @@
           $('#formRegisterKey').submit();
         }
 
-        $("#btnVerifyKey").click(verifyKey);
       </script>
 
       {% if auto_activate %}
diff --git a/app/dashboard/templates/dashboard/fido_setup.html b/app/dashboard/templates/dashboard/fido_setup.html
index 198591f8..3a4c16aa 100644
--- a/app/dashboard/templates/dashboard/fido_setup.html
+++ b/app/dashboard/templates/dashboard/fido_setup.html
@@ -22,10 +22,11 @@
 
         {{ fido_token_form.key_name(class="form-control", placeholder="Name of your key (Required)") }}
         {{ render_field_errors(fido_token_form.key_name) }}
+
+        <div class="text-center">
+          <button id="btnRegisterKey" class="btn btn-lg btn-primary mt-2" onclick="registerKey();">Register Key</button>
+        </div>
       </form>
-      <div class="text-center">
-        <button id="btnRegisterKey" class="btn btn-lg btn-primary mt-2">Register Key</button>
-      </div>
 
       <script>
         async function registerKey() {
@@ -55,14 +56,6 @@
           $('#formRegisterKey').submit();
         }
 
-        $("#btnRegisterKey").click(registerKey);
-
-        document.getElementById("key_name").addEventListener("keydown", event => {
-          if (event.keyCode === 13) {
-            event.preventDefault();
-            document.getElementById("btnRegisterKey").click();
-          }
-        });
       </script>
 
     </div>