Index: src/server/authentserver.cpp
===================================================================
--- src/server/authentserver.cpp	(revision 1298)
+++ src/server/authentserver.cpp	(working copy)
@@ -526,6 +526,11 @@
     client->SetAdvisorPoints(acctinfo->advisorPoints);
     client->SetSecurityLevel(acctinfo->securitylevel);
 
+    if (acctinfo->securitylevel > 0)
+    {
+        psserver->GetAdminManager()->Admin(client->GetPlayerID(), me->clientnum, client);
+    }
+
     psserver->GetWeatherManager()->SendClientGameTime(me->clientnum);
 
     if(csGetTicks() - start > 500)
Index: src/client/cmdadmin.cpp
===================================================================
--- src/client/cmdadmin.cpp	(revision 1298)
+++ src/client/cmdadmin.cpp	(working copy)
@@ -92,16 +92,24 @@
     {        
         psAdminCmdMessage msg(me);
 
-        if( !msg.cmd)
+        pawsChatWindow* chat = static_cast<pawsChatWindow*>(PawsManager::GetSingleton().FindWidget("ChatWindow"));
+
+        if( !msg.cmd )
         {
-            psSystemMessage sysMsg( 0, MSG_INFO, "You lack administrator access" );
-            msgqueue->Publish( sysMsg.msg );
+            if ( chat )
+            {
+                psSystemMessage sysMsg( 0, MSG_INFO, "You lack administrator access" );
+                msgqueue->Publish( sysMsg.msg );
+            }
+
             return;
         }
 
-        psSystemMessage sysMsg( 0, MSG_INFO, "You now have the following admin commands available:" );
-        msgqueue->Publish( sysMsg.msg );
-
+        if ( chat )
+        {
+            psSystemMessage sysMsg( 0, MSG_INFO, "You now have the following admin commands available:" );
+            msgqueue->Publish( sysMsg.msg );
+        }
         
         iDocumentSystem* xml = psengine->GetXMLParser ();
         csRef<iDocument> doc = xml->CreateDocument();
@@ -125,12 +133,14 @@
                 cmdsource->Subscribe( cmdString, this );
             }
             
-            psSystemMessage commandMsg( 0, MSG_INFO, commands.GetData() );
-            msgqueue->Publish( commandMsg.msg );
+            if ( chat )
+            {
+                psSystemMessage commandMsg( 0, MSG_INFO, commands.GetData() );
+                msgqueue->Publish( commandMsg.msg );
 
-            // Update the auto-complete list
-            pawsChatWindow* chat = static_cast<pawsChatWindow*>(PawsManager::GetSingleton().FindWidget("ChatWindow"));
-            chat->RefreshCommandList();
+                // Update the auto-complete list
+                chat->RefreshCommandList();
+            }
         }            
     }
 }