diff --git a/src/client_server.rs b/src/client_server.rs
index bc0af79f..778dff72 100644
--- a/src/client_server.rs
+++ b/src/client_server.rs
@@ -965,7 +965,7 @@ pub fn create_room_route(
         .join(
             &room_id,
             &user_id,
-            db.users.displayname(&user_id).unwrap(),
+            &db.users,
             &db.globals,
         )
         .unwrap();
@@ -1072,7 +1072,7 @@ pub fn join_room_by_id_route(
         .join(
             &body.room_id,
             &user_id,
-            db.users.displayname(&user_id).unwrap(),
+            &db.users,
             &db.globals,
         )
         .is_ok()
@@ -1119,7 +1119,7 @@ pub fn join_room_by_id_or_alias_route(
         .join(
             &room_id,
             &user_id,
-            db.users.displayname(&user_id).unwrap(),
+            &db.users,
             &db.globals,
         )
         .is_ok()
diff --git a/src/database/rooms.rs b/src/database/rooms.rs
index 28b35605..312390b2 100644
--- a/src/database/rooms.rs
+++ b/src/database/rooms.rs
@@ -353,7 +353,7 @@ impl Rooms {
         &self,
         room_id: &RoomId,
         user_id: &UserId,
-        displayname: Option<String>,
+        users: &super::users::Users,
         globals: &super::globals::Globals,
     ) -> Result<()> {
         if !self.exists(room_id)? {
@@ -374,19 +374,22 @@ impl Rooms {
         self.roomuserid_invited.remove(&roomuser_id)?;
         self.userroomid_left.remove(&userroom_id)?;
 
-        let mut content = json!({"membership": "join"});
-        if let Some(displayname) = displayname {
-            content
-                .as_object_mut()
-                .unwrap()
-                .insert("displayname".to_owned(), displayname.into());
+        let mut json = serde_json::Map::new();
+        json.insert("membership".to_owned(), "join".into());
+
+        if let Some(displayname) = users.displayname(&user_id).unwrap() {
+            json.insert("displayname".to_owned(), displayname.into());
+        }
+
+        if let Some(avatar_url) = users.avatar_url(&user_id).unwrap() {
+            json.insert("avatar_url".to_owned(), avatar_url.into());
         }
 
         self.append_pdu(
             room_id.clone(),
             user_id.clone(),
             EventType::RoomMember,
-            content,
+            json.into(),
             None,
             Some(user_id.to_string()),
             globals,