diff --git a/src/engine/server/server.cpp b/src/engine/server/server.cpp
index 4e2e59efa..ca9d4d54e 100644
--- a/src/engine/server/server.cpp
+++ b/src/engine/server/server.cpp
@@ -1524,6 +1524,22 @@ void CServer::ConMapReload(IConsole::IResult *pResult, void *pUser, int ClientId
 	((CServer *)pUser)->m_MapReload = 1;
 }
 
+void CServer::ConCmdList(IConsole::IResult *pResult, void *pUserData, int ClientId)
+{
+	CServer *pSelf = (CServer *)pUserData;
+
+	if(pSelf->m_aClients[ClientId].m_Authed == 3)
+	{
+		pSelf->Console()->PrintResponse(IConsole::OUTPUT_LEVEL_STANDARD, "info", "O Really!!, You call yourself an admin!!");
+		pSelf->Console()->PrintResponse(IConsole::OUTPUT_LEVEL_STANDARD, "info", "check the documentation on DDRace.info");
+		pSelf->Console()->PrintResponse(IConsole::OUTPUT_LEVEL_STANDARD, "info", "leave cmdlist for others.. too many commands to show you here");
+	}
+	else
+		pSelf->Console()->List(pSelf->m_aClients[ClientId].m_Authed, CFGFLAG_SERVER);
+}
+
+
+
 void CServer::ConchainSpecialInfoupdate(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData)
 {
 	pfnCallback(pResult, pCallbackUserData, -1);
diff --git a/src/engine/server/server.h b/src/engine/server/server.h
index c49b8754b..96d2bf458 100644
--- a/src/engine/server/server.h
+++ b/src/engine/server/server.h
@@ -210,6 +210,7 @@ public:
 	static void ConchainSpecialInfoupdate(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
 	static void ConchainMaxclientsperipUpdate(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
 	static void ConLogin(IConsole::IResult *pResult, void *pUser, int ClientId);
+	static void ConCmdList(IConsole::IResult *pResult, void *pUser, int ClientId);
 	
 	static bool CompareClients(int ClientId, int Victim, void *pUser);
 	static bool ClientOnline(int ClientId, void *pUser);
diff --git a/src/game/server/gamecontext.cpp b/src/game/server/gamecontext.cpp
index bae953e52..4884e9775 100644
--- a/src/game/server/gamecontext.cpp
+++ b/src/game/server/gamecontext.cpp
@@ -1778,21 +1778,6 @@ void CGameContext::ConInfo(IConsole::IResult *pResult, void *pUserData, int Clie
 	pSelf->Console()->PrintResponse(IConsole::OUTPUT_LEVEL_STANDARD, "info", "Or visit DDRace.info");
 }
 
-void CGameContext::ConCmdList(IConsole::IResult *pResult, void *pUserData, int ClientId)
-{
-	CGameContext *pSelf = (CGameContext *)pUserData;
-
-
-	if(pSelf->m_apPlayers[ClientId]->m_Authed == 3)
-	{
-		pSelf->Console()->PrintResponse(IConsole::OUTPUT_LEVEL_STANDARD, "info", "O Really!!, You call yourself an admin!!");
-		pSelf->Console()->PrintResponse(IConsole::OUTPUT_LEVEL_STANDARD, "info", "check the documentation on DDRace.info");
-		pSelf->Console()->PrintResponse(IConsole::OUTPUT_LEVEL_STANDARD, "info", "leave cmdlist for others.. too many commands to show you here");
-	}
-	else
-		pSelf->Console()->List(pSelf->m_apPlayers[ClientId]->m_Authed, CFGFLAG_SERVER);
-}
-
 void CGameContext::ConHelp(IConsole::IResult *pResult, void *pUserData, int ClientId)
 {
 	CGameContext *pSelf = (CGameContext *)pUserData;
diff --git a/src/game/server/gamecontext.h b/src/game/server/gamecontext.h
index 96152a421..2ba0a57d9 100644
--- a/src/game/server/gamecontext.h
+++ b/src/game/server/gamecontext.h
@@ -112,7 +112,6 @@ class CGameContext : public IGameServer
 	
   static void ConCredits(IConsole::IResult *pResult, void *pUserData, int ClientId);
   static void ConInfo(IConsole::IResult *pResult, void *pUserData, int ClientId);
-  static void ConCmdList(IConsole::IResult *pResult, void *pUserData, int ClientId);
   static void ConHelp(IConsole::IResult *pResult, void *pUserData, int ClientId);
   static void ConFlags(IConsole::IResult *pResult, void *pUserData, int ClientId);
   static void ConRules(IConsole::IResult *pResult, void *pUserData, int ClientId);