diff --git a/html/src/app.js b/html/src/app.js
index 5aef1cc3..a1a14a72 100644
--- a/html/src/app.js
+++ b/html/src/app.js
@@ -5903,7 +5903,8 @@ CefSharp.BindObjectAsync(
         }
         if (this.isGameRunning &&
             this.lastLocation === L.tag) {
-            users.push(API.currentUser);
+            var ref = API.cachedUsers.get(API.currentUser.id);
+            users.push((ref === undefined) ? API.currentUser : ref);
         }
         users.sort(compareByDisplayName);
         D.users = users;
@@ -6402,7 +6403,8 @@ CefSharp.BindObjectAsync(
                     };
                     instances[instance.id] = instance;
                 }
-                instance.users.push(API.currentUser);
+                var ref = API.cachedUsers.get(API.currentUser.id);
+                instance.users.push((ref === undefined) ? API.currentUser : ref);
             }
         }
         var rooms = [];