diff --git a/cmd/passless/src/authenticator.rs b/cmd/passless/src/authenticator.rs
index 43b25c2..adea30b 100644
--- a/cmd/passless/src/authenticator.rs
+++ b/cmd/passless/src/authenticator.rs
@@ -301,17 +301,17 @@ impl<S: CredentialStorage + 'static> AuthenticatorService<S> {
     /// Create a new authenticator service
     pub fn new(storage: S, security_config: SecurityConfig) -> Result<Self> {
         let options = AuthenticatorOptions {
-            rk: true,                      // Resident keys (passkeys)
-            up: true,                      // User presence
-            uv: Some(true),                // User verification
-            plat: true,                    // Platform authenticator
-            client_pin: None,              // Client PIN support
-            pin_uv_auth_token: Some(true), // PIN UV auth token
-            cred_mgmt: Some(true),         // Credential management enabled
+            rk: true,
+            up: true,
+            uv: None,
+            plat: true,
+            client_pin: Some(false),
+            pin_uv_auth_token: Some(true),
+            cred_mgmt: Some(true),
             bio_enroll: None,
             large_blobs: None,
             ep: None,
-            always_uv: Some(true),
+            always_uv: None,
             make_cred_uv_not_required: Some(true),
         };