diff --git a/source/shared_lib/sources/platform/posix/ircclient.cpp b/source/shared_lib/sources/platform/posix/ircclient.cpp
index d949c8c8..50181232 100644
--- a/source/shared_lib/sources/platform/posix/ircclient.cpp
+++ b/source/shared_lib/sources/platform/posix/ircclient.cpp
@@ -328,7 +328,10 @@ void event_numeric(irc_session_t * session, unsigned int event, const char * ori
                                 get_nickname(tokens[j].c_str(),realNick,127);
                                 if(SystemFlags::VERBOSE_MODE_ENABLED) printf ("===> IRC: user joined channel realNick [%s] tokens[j] [%s]\n", realNick,tokens[j].c_str());
 
-                                nickList.push_back(realNick);
+                                // Only show Megaglest users in the user list
+                                if(strncmp(&realNick[0],"MG_",3) == 0) {
+                                	nickList.push_back(realNick);
+                                }
                             }
                         }
                     }