diff --git a/server/configurations/local.yaml b/server/configurations/local.yaml
index fe29b92485..967652eb5d 100644
--- a/server/configurations/local.yaml
+++ b/server/configurations/local.yaml
@@ -233,11 +233,15 @@ stripe:
         success: ?status=success&session_id={CHECKOUT_SESSION_ID}
         cancel: ?status=fail&reason=canceled
 
-# Passkey support (WIP)
+# Passkey support (optional)
+# Use case: MFA
 webauthn:
-    rpid: "example.com"
-    rporigins:
-        - "https://example.com:3005"
+    # Our "Relying Party" ID. This scopes the generated credentials.
+    # See: https://www.w3.org/TR/webauthn-3/#rp-id
+    rpid:
+    # Whitelist of origins from where we will accept WebAuthn requests.
+    # See: https://github.com/go-webauthn/webauthn
+    rporigins: []
 
 # Roadmap SSO (optional)
 #
diff --git a/server/pkg/repo/passkey/passkey.go b/server/pkg/repo/passkey/passkey.go
index 1627ab77d0..ba4208e1c0 100644
--- a/server/pkg/repo/passkey/passkey.go
+++ b/server/pkg/repo/passkey/passkey.go
@@ -60,9 +60,6 @@ func NewRepository(
 	db *sql.DB,
 ) (repo *Repository, err error) {
 	rpId := viper.GetString("webauthn.rpid")
-	if rpId == "" {
-		rpId = "accounts.ente.io"
-	}
 	rpOrigins := viper.GetStringSlice("webauthn.rporigins")
 
 	wconfig := &webauthn.Config{