1 files changed, 6 insertions, 4 deletions
diff --git a/lib/user.cpp b/lib/user.cpp
index eec08ad9..bfd23ae2 100644
--- a/lib/user.cpp
+++ b/lib/user.cpp
@@ -321,14 +321,16 @@ void User::Private::setAvatarOnServer(QString contentUri, User* q)
 
 QString User::displayname(const Room* room) const
 {
-    auto name = d->nameForRoom(room);
-    return name.isEmpty() ? d->userId :
-           room ? room->roomMembername(this) : name;
+    if (room)
+        return room->roomMembername(this);
+
+    const auto name = d->nameForRoom(nullptr);
+    return name.isEmpty() ? d->userId : name;
 }
 
 QString User::fullName(const Room* room) const
 {
-    auto name = d->nameForRoom(room);
+    const auto name = d->nameForRoom(room);
     return name.isEmpty() ? d->userId : name % " (" % d->userId % ')';
 }