diff --git a/cosmic-settings/src/pages/system/users/mod.rs b/cosmic-settings/src/pages/system/users/mod.rs
index f75405a..3acc9cb 100644
--- a/cosmic-settings/src/pages/system/users/mod.rs
+++ b/cosmic-settings/src/pages/system/users/mod.rs
@@ -745,7 +745,11 @@ fn user_list() -> Section<crate::pages::Message> {
                     .on_input(move |name| Message::Edit(idx, EditorField::FullName, name))
                     .on_submit(move |_| Message::ApplyEdit(idx, EditorField::FullName));
 
-                    let fullname_text = text::body(&user.full_name);
+                    let fullname_text = text::body(if &user.full_name != "" {
+                        &user.full_name
+                    } else {
+                        &user.username
+                    });
 
                     let account_type = text::caption(if user.is_admin {
                         &descriptions[user_type_admin]