diff --git a/source/glest_game/menu/menu_state_masterserver.cpp b/source/glest_game/menu/menu_state_masterserver.cpp
index 26d3043e1..c153312d7 100644
--- a/source/glest_game/menu/menu_state_masterserver.cpp
+++ b/source/glest_game/menu/menu_state_masterserver.cpp
@@ -1278,7 +1278,13 @@ namespace Glest
             button->setFont (CoreData::getInstance ().getDisplayFontSmall ());
             button->setFont3D (CoreData::getInstance ().
                                getDisplayFontSmall3D ());
-            button->setText (nickList[i]);
+            
+            if (strncmp (&nickList[i][0], "ZG_", 3) == 0) {
+                button->setText (nickList[i].substr(3,nickList[i].length()-7));
+            } else {
+                button->setText (nickList[i]);
+            }
+            
             if (strncmp (&nickList[i][0], "ZG_", 3) != 0
                 || &nickList[i][0] == currentIrcNick)
             {