diff --git a/internal/ui/login/static/resources/scripts/webauthn.js b/internal/ui/login/static/resources/scripts/webauthn.js
index 716c61f8dc..e333c819c9 100644
--- a/internal/ui/login/static/resources/scripts/webauthn.js
+++ b/internal/ui/login/static/resources/scripts/webauthn.js
@@ -1,7 +1,7 @@
 function checkWebauthnSupported(button, func) {
     let support = document.getElementsByClassName("wa-support");
     let noSupport = document.getElementsByClassName("wa-no-support");
-    if (typeof (PublicKeyCredential) === undefined) {
+    if (!window.PublicKeyCredential) {
         for (let item of noSupport) {
             item.classList.remove('hidden');
         }
diff --git a/internal/ui/login/static/templates/mfa_init_u2f.html b/internal/ui/login/static/templates/mfa_init_u2f.html
index 5e47d8f2ba..7d6013d113 100644
--- a/internal/ui/login/static/templates/mfa_init_u2f.html
+++ b/internal/ui/login/static/templates/mfa_init_u2f.html
@@ -18,7 +18,7 @@
 
     <div class="fields">
         <p class="wa-no-support lgn-error hidden">{{t "InitMFAU2F.NotSupported"}}</p>
-        <div class="field">
+        <div class="field wa-support">
             <label class="lgn-label" for="name">{{t "InitMFAU2F.TokenNameLabel"}}</label>
             <input class="lgn-input" type="text" id="name" name="name" autocomplete="off" autofocus>
         </div>
@@ -46,4 +46,3 @@
 <script src="{{ resourceUrl "scripts/webauthn_register.js" }}"></script>
 
 {{template "main-bottom" .}}
- 
\ No newline at end of file
diff --git a/internal/ui/login/static/templates/mfa_verification_u2f.html b/internal/ui/login/static/templates/mfa_verification_u2f.html
index 9e3041e436..e0f2ba8433 100644
--- a/internal/ui/login/static/templates/mfa_verification_u2f.html
+++ b/internal/ui/login/static/templates/mfa_verification_u2f.html
@@ -16,7 +16,7 @@
     <input type="hidden" name="credentialAssertionData" value="{{ .CredentialCreationData }}"/>
     <input type="hidden" name="credentialData"/>
 
-    <p class="wa-no-support error hidden">{{t "VerifyMFAU2F.NotSupported"}}</p>
+    <p class="wa-no-support lgn-error hidden">{{t "VerifyMFAU2F.NotSupported"}}</p>
 
     <div id="wa-error" class="error hidden">
         <span class="cause"></span>
diff --git a/internal/ui/login/static/templates/passwordless.html b/internal/ui/login/static/templates/passwordless.html
index 9d8cc7599a..0cf47cef65 100644
--- a/internal/ui/login/static/templates/passwordless.html
+++ b/internal/ui/login/static/templates/passwordless.html
@@ -15,7 +15,7 @@
     <input type="hidden" name="credentialAssertionData" value="{{ .CredentialCreationData }}"/>
     <input type="hidden" name="credentialData"/>
 
-    <p class="wa-no-support error hidden">{{t "Passwordless.NotSupported"}}</p>
+    <p class="wa-no-support lgn-error hidden">{{t "Passwordless.NotSupported"}}</p>
     <div id="wa-error" class="error hidden">
         <span class="cause"></span>
         <span>{{t "Passwordless.ErrorRetry"}}</span>
diff --git a/internal/ui/login/static/templates/passwordless_registration.html b/internal/ui/login/static/templates/passwordless_registration.html
index 1d0320846f..05bd3b6fdc 100644
--- a/internal/ui/login/static/templates/passwordless_registration.html
+++ b/internal/ui/login/static/templates/passwordless_registration.html
@@ -23,7 +23,7 @@
     <div class="fields">
         <p class="wa-no-support lgn-error hidden">{{t "PasswordlessRegistration.NotSupported"}}</p>
         {{if not .Disabled}}
-        <div class="field">
+        <div class="field wa-support">
             <label class="lgn-label" for="name" disabled="false">{{t "PasswordlessRegistration.TokenNameLabel"}}</label>
             <input class="lgn-input" type="text" id="name" name="name" autocomplete="off" autofocus>
         </div>
@@ -49,4 +49,3 @@
 <script src="{{ resourceUrl "scripts/webauthn_register.js" }}"></script>
 
 {{template "main-bottom" .}}
- 
\ No newline at end of file