diff --git a/src/neochatroom.cpp b/src/neochatroom.cpp
index f28bf0232..0cbb9a5ba 100644
--- a/src/neochatroom.cpp
+++ b/src/neochatroom.cpp
@@ -489,6 +489,8 @@ QString NeoChatRoom::eventToString(const RoomEvent &evt, Qt::TextFormat format,
 #endif
                 }
             }
+            subjectName = QStringLiteral("<a href=\"https://matrix.to/#/%1\" style=\"color: %2\">%3</a>")
+                              .arg(e.userId(), static_cast<NeoChatUser *>(user(e.userId()))->color().name(), subjectName);
 
             // The below code assumes senderName output in AuthorRole
             switch (e.membership()) {
diff --git a/src/qml/Component/Timeline/StateDelegate.qml b/src/qml/Component/Timeline/StateDelegate.qml
index 3309b96d9..240409819 100644
--- a/src/qml/Component/Timeline/StateDelegate.qml
+++ b/src/qml/Component/Timeline/StateDelegate.qml
@@ -99,7 +99,7 @@ Control {
                 wrapMode: Text.WordWrap
                 textFormat: Text.RichText
                 text: `<style>a {text-decoration: none;}</style><a href="https://matrix.to/#/${author.id}" style="color: ${author.color}">${currentRoom.htmlSafeMemberName(author.id)}</a> ${aggregateDisplay}`
-                onLinkActivated: userDetailDialog.createObject(ApplicationWindow.overlay, {room: currentRoom, user: author.object, displayName: author.displayName, avatarMediaId: author.avatarMediaId, avatarUrl: author.avatarUrl}).open()
+                onLinkActivated: RoomManager.openResource(link)
             }
         }
     }