diff --git a/html/src/app.js b/html/src/app.js
index 9d2d66fd..2812b75a 100644
--- a/html/src/app.js
+++ b/html/src/app.js
@@ -7446,15 +7446,25 @@ speechSynthesis.getVoices();
             users.push((typeof ref === 'undefined')
                 ? API.currentUser
                 : ref);
-            var playersInInstance = this.lastLocation.friendList;
-            for (var i = 0; i < playersInInstance.length; i++) {
-                var player = playersInInstance[i];
-                for (var ref of API.cachedUsers.values()) {
-                    if (ref.displayName === player) {
-                        users.push(ref);
+            var friendsInInstance = this.lastLocation.friendList;
+            for (var i = 0; i < friendsInInstance.length; i++) {
+                var addUser = true;
+                var player = friendsInInstance[i];
+                for (var k = 0; k < D.users.length; k++) {
+                    var user = D.users[k];
+                    if (user.displayName === player) {
+                        addUser = false;
                         break;
                     }
                 }
+                if (addUser) {
+                    for (var ref of API.cachedUsers.values()) {
+                        if (ref.displayName === player) {
+                            users.push(ref);
+                        break;
+                    }
+                    }
+                }
             }
         }
         users.sort(compareByDisplayName);