diff --git a/app/auth/views/fido.py b/app/auth/views/fido.py
index 24c4428d..d145f916 100644
--- a/app/auth/views/fido.py
+++ b/app/auth/views/fido.py
@@ -42,7 +42,7 @@ def fido():
     webauthn_user = webauthn.WebAuthnUser(
         user.fido_uuid,
         user.email,
-        user.name,
+        user.name if user.name else user.email,
         False,
         user.fido_credential_id,
         user.fido_pk,
diff --git a/app/dashboard/views/fido_setup.py b/app/dashboard/views/fido_setup.py
index eec252e1..5b7fedfe 100644
--- a/app/dashboard/views/fido_setup.py
+++ b/app/dashboard/views/fido_setup.py
@@ -81,9 +81,10 @@ def fido_setup():
         RP_ID,
         fido_uuid,
         current_user.email,
-        current_user.name,
+        current_user.name if current_user.name else current_user.email,
         False,
         attestation="none",
+        user_verification="discouraged",
     )
 
     # Don't think this one should be used, but it's not configurable by arguments