diff --git a/crates/bitwarden-fido/src/types.rs b/crates/bitwarden-fido/src/types.rs
index d6eaa4752..79777d24c 100644
--- a/crates/bitwarden-fido/src/types.rs
+++ b/crates/bitwarden-fido/src/types.rs
@@ -77,6 +77,10 @@ impl Fido2CredentialAutofillView {
                             .user_name
                             .none_whitespace()
                             .or(c.user_display_name.none_whitespace())
+                            .or(cipher
+                                .login
+                                .as_ref()
+                                .and_then(|l| l.username.none_whitespace()))
                             .or(cipher.name.none_whitespace()),
                     })
                 })