diff --git a/binaries/data/mods/public/gui/lobby/lobby.js b/binaries/data/mods/public/gui/lobby/lobby.js
index 583d1df445..e7d032669b 100644
--- a/binaries/data/mods/public/gui/lobby/lobby.js
+++ b/binaries/data/mods/public/gui/lobby/lobby.js
@@ -256,7 +256,13 @@ function updateGameList()
 		if(!filterGame(g))
 		{
 			// Highlight games 'waiting' for this player, otherwise display as green
-			var name = (g.state != 'waiting') ? '[color="0 125 0"]' + g.name + '[/color]' : '[color="orange"]' + g.name + '[/color]';
+			var name;
+			if (g.state == 'init')
+				name = '[color="0 125 0"]' + g.name + '[/color]';
+			else if (g.state == 'waiting')
+				name = '[color="255 127 0"]' + g.name + '[/color]';
+			else
+				name = '[color="255 0 0"]' + g.name + '[/color]';
 			list_name.push(name);
 			list_ip.push(g.ip);
 			list_mapName.push(g.niceMapName);
diff --git a/source/tools/XpartaMuPP/XpartaMuPP.py b/source/tools/XpartaMuPP/XpartaMuPP.py
index 30bf48c9bb..c58751c026 100644
--- a/source/tools/XpartaMuPP/XpartaMuPP.py
+++ b/source/tools/XpartaMuPP/XpartaMuPP.py
@@ -637,11 +637,7 @@ class XpartaMuPP(sleekxmpp.ClientXMPP):
         ## Pull games and add each to the stanza        
         for JIDs in games:
           g = games[JIDs]
-          # Only send the games that are in the 'init' state and games
-          # that are in the 'waiting' state which the receiving player is in. TODO
-          # Split the rating off
-          if g['state'] == 'init' or (g['state'] == 'waiting' and self.nicks[str(JID)] in (formattedPlayer.split()[0] for formattedPlayer in g['players-init'])):
-            stz.addGame(g)
+          stz.addGame(g)
 
         ## Set additional IQ attributes
         iq = self.Iq()