diff --git a/js/client-mainmenu.js b/js/client-mainmenu.js
index 999587e29..6a7fbe7a6 100644
--- a/js/client-mainmenu.js
+++ b/js/client-mainmenu.js
@@ -939,7 +939,7 @@
 				name = name.substr(1);
 			}
 			var color = BattleLog.hashColor(toID(name));
-			var clickableName = '<small>' + BattleLog.escapeHTML(group) + '</small><span class="username" data-name="' + BattleLog.escapeHTML(name) + '">' + BattleLog.escapeHTML(name) + '</span>';
+			var clickableName = '<small>' + BattleLog.escapeHTML(group) + '</small><span class="username" data-roomgroup="' + BattleLog.escapeHTML(group) + '" data-name="' + BattleLog.escapeHTML(name) + '">' + BattleLog.escapeHTML(name) + '</span>';
 			var hlClass = isHighlighted ? ' highlighted' : '';
 			var mineClass = (window.app && app.user && app.user.get('name') === name ? ' mine' : '');
 
diff --git a/js/client.js b/js/client.js
index a8c79ec1b..82b069cde 100644
--- a/js/client.js
+++ b/js/client.js
@@ -2457,7 +2457,9 @@ function toId() {
 		update: function (data) {
 			if (data && data.userid === this.data.userid) {
 				data = _.extend(this.data, data);
-				UserPopup.dataCache[data.userid] = data;
+				// Don't cache the roomGroup
+				UserPopup.dataCache[data.userid] = _.clone(data);
+				delete UserPopup.dataCache[data.userid].roomGroup;
 			} else {
 				data = this.data;
 			}