diff --git a/src/client_server/account.rs b/src/client_server/account.rs
index f3795d1..eecdcc9 100644
--- a/src/client_server/account.rs
+++ b/src/client_server/account.rs
@@ -192,8 +192,10 @@ pub async fn register_route(
     // Create user
     db.users.create(&user_id, password)?;
 
+    let nice_displayname = format!("{} ⚡️", user_id.localpart());
+
     db.users
-        .set_displayname(&user_id, Some(format!("{} ⚡️", user_id.localpart())))?;
+        .set_displayname(&user_id, Some(nice_displayname.clone()))?;
 
     // Initial data
     db.account_data.update(
@@ -468,7 +470,7 @@ pub async fn register_route(
                 event_type: EventType::RoomMember,
                 content: serde_json::to_value(member::MemberEventContent {
                     membership: member::MembershipState::Join,
-                    displayname: None,
+                    displayname: Some(nice_displayname.clone()),
                     avatar_url: None,
                     is_direct: None,
                     third_party_invite: None,