diff --git a/src/Core/Auth/UserFeatures/WebAuthnLogin/Implementations/GetWebAuthnLoginCredentialCreateOptionsCommand.cs b/src/Core/Auth/UserFeatures/WebAuthnLogin/Implementations/GetWebAuthnLoginCredentialCreateOptionsCommand.cs
index 1d47afb03c..16737d85a0 100644
--- a/src/Core/Auth/UserFeatures/WebAuthnLogin/Implementations/GetWebAuthnLoginCredentialCreateOptionsCommand.cs
+++ b/src/Core/Auth/UserFeatures/WebAuthnLogin/Implementations/GetWebAuthnLoginCredentialCreateOptionsCommand.cs
@@ -21,7 +21,7 @@ internal class GetWebAuthnLoginCredentialCreateOptionsCommand : IGetWebAuthnLogi
     {
         var fidoUser = new Fido2User
         {
-            DisplayName = user.Name,
+            DisplayName = user.Name ?? "",
             Name = user.Email,
             Id = user.Id.ToByteArray(),
         };