diff --git a/internal/ui/webauthn.go b/internal/ui/webauthn.go
index c67c01da..7525d3f3 100644
--- a/internal/ui/webauthn.go
+++ b/internal/ui/webauthn.go
@@ -105,6 +105,8 @@ func (h *handler) beginRegistration(w http.ResponseWriter, r *http.Request) {
 			nil,
 		},
 		webauthn.WithExclusions(credsDescriptors),
+		webauthn.WithResidentKeyRequirement(protocol.ResidentKeyRequirementPreferred),
+		webauthn.WithExtensions(protocol.AuthenticationExtensions{"credProps": true}),
 	)
 
 	if err != nil {