diff --git a/web/static/js/BareRTC.js b/web/static/js/BareRTC.js
index 3449975..8cc4722 100644
--- a/web/static/js/BareRTC.js
+++ b/web/static/js/BareRTC.js
@@ -872,6 +872,9 @@ const app = Vue.createApp({
             }
             return "";
         },
+        isUsernameOnline(username) {
+            return this.whoMap[username] != undefined;
+        },
         avatarForUsername(username) {
             if (this.whoMap[username] != undefined && this.whoMap[username].avatar) {
                 return this.avatarURL(this.whoMap[username]);
diff --git a/web/templates/chat.html b/web/templates/chat.html
index b367714..69367fa 100644
--- a/web/templates/chat.html
+++ b/web/templates/chat.html
@@ -747,7 +747,9 @@
                                     </figure>
                                 </div>
                                 <div class="column">
-                                    <strong>[[ msg.username ]]</strong> [[msg.message]]
+                                    <strong>[[ nicknameForUsername(msg.username) ]]</strong>
+                                    <small v-if="isUsernameOnline(msg.username)" class="ml-1">(@[[msg.username]])</small>
+                                    [[msg.message]]
                                 </div>
                             </div>