diff --git a/internal/api/mfa.go b/internal/api/mfa.go
index 5caf780b1..fdfd19841 100644
--- a/internal/api/mfa.go
+++ b/internal/api/mfa.go
@@ -909,6 +909,7 @@ func (a *API) verifyWebAuthnFactor(w http.ResponseWriter, r *http.Request, param
 
 	var webAuthn *webauthn.WebAuthn
 	var credential *webauthn.Credential
+	var err error
 
 	switch {
 	case params.WebAuthn == nil:
diff --git a/internal/models/user.go b/internal/models/user.go
index 1abee0c34..228e6e962 100644
--- a/internal/models/user.go
+++ b/internal/models/user.go
@@ -935,23 +935,14 @@ func (u *User) FindOwnedFactorByID(tx *storage.Connection, factorID uuid.UUID) (
 }
 
 func (user *User) WebAuthnID() []byte {
-	if webAuthnID, ok := user.UserMetaData["web_authn_id"].(string); ok && webAuthnID != "" {
-		return []byte(webAuthnID)
-	}
 	return []byte(user.ID.String())
 }
 
 func (user *User) WebAuthnName() string {
-	if webAuthnName, ok := user.UserMetaData["web_authn_name"].(string); ok && webAuthnName != "" {
-		return webAuthnName
-	}
 	return user.Email.String()
 }
 
 func (user *User) WebAuthnDisplayName() string {
-	if webAuthnDisplayName, ok := user.UserMetaData["web_authn_display_name"].(string); ok && webAuthnDisplayName != "" {
-		return webAuthnDisplayName
-	}
 	return user.Email.String()
 }