diff --git a/src/Api/Vault/Models/CipherFido2CredentialModel.cs b/src/Api/Vault/Models/CipherFido2CredentialModel.cs
index 32f6104a9a..09d66a22e5 100644
--- a/src/Api/Vault/Models/CipherFido2CredentialModel.cs
+++ b/src/Api/Vault/Models/CipherFido2CredentialModel.cs
@@ -18,6 +18,7 @@ public class CipherFido2CredentialModel
         RpId = data.RpId;
         RpName = data.RpName;
         UserHandle = data.UserHandle;
+        UserName = data.UserName;
         UserDisplayName = data.UserDisplayName;
         Counter = data.Counter;
         Discoverable = data.Discoverable;
@@ -50,6 +51,9 @@ public class CipherFido2CredentialModel
     public string UserHandle { get; set; }
     [EncryptedString]
     [EncryptedStringLength(1000)]
+    public string UserName { get; set; }
+    [EncryptedString]
+    [EncryptedStringLength(1000)]
     public string UserDisplayName { get; set; }
     [EncryptedString]
     [EncryptedStringLength(1000)]
@@ -72,6 +76,7 @@ public class CipherFido2CredentialModel
             RpId = RpId,
             RpName = RpName,
             UserHandle = UserHandle,
+            UserName = UserName,
             UserDisplayName = UserDisplayName,
             Counter = Counter,
             Discoverable = Discoverable,
diff --git a/src/Core/Vault/Models/Data/CipherLoginFido2CredentialData.cs b/src/Core/Vault/Models/Data/CipherLoginFido2CredentialData.cs
index c0801d2a6c..eefb7ec6ad 100644
--- a/src/Core/Vault/Models/Data/CipherLoginFido2CredentialData.cs
+++ b/src/Core/Vault/Models/Data/CipherLoginFido2CredentialData.cs
@@ -12,6 +12,7 @@ public class CipherLoginFido2CredentialData
     public string RpId { get; set; }
     public string RpName { get; set; }
     public string UserHandle { get; set; }
+    public string UserName { get; set; }
     public string UserDisplayName { get; set; }
     public string Counter { get; set; }
     public string Discoverable { get; set; }