diff --git a/Classic/prefs/serverPrefs.cs b/Classic/prefs/serverPrefs.cs
index ea76cf8..dc435f9 100644
--- a/Classic/prefs/serverPrefs.cs
+++ b/Classic/prefs/serverPrefs.cs
@@ -1,6 +1,7 @@
 $Host::AdminPassword = "changethis";
 $Host::AllowAdmin2Admin = 0;
 $Host::AllowAdminBan = 0;
+$Host::AllowAdminKick = 1;
 $Host::AllowAdminPassVote = 1;
 $Host::allowAdminPlayerVotes = "0";
 $Host::AllowAdminStopVote = 1;
diff --git a/Classic/scripts/autoexec/VoteMenu.cs b/Classic/scripts/autoexec/VoteMenu.cs
index 4c2e1e9..2ac11ba 100644
--- a/Classic/scripts/autoexec/VoteMenu.cs
+++ b/Classic/scripts/autoexec/VoteMenu.cs
@@ -1,5 +1,6 @@
 //$Host::AllowAdmin2Admin = 0;
 //$Host::AllowAdminBan = 0;
+//$Host::AllowAdminKick = 1;
 //$Host::AllowAdminVotes = 1;
 //$Host::AllowAdminStopVote = 1;
 //$Host::AllowAdminPassVote = 1;
@@ -1148,12 +1149,13 @@ function DefaultGame::sendGamePlayerPopupMenu( %game, %client, %targetClient, %k
    // Admin only options on players:
    else if ( %isAdmin ) // z0dd - ZOD, 9/29/02. Removed T2 demo code from here
    {
-      if ( !%isTargetBot && !%isTargetAdmin )
+      if ( !%isTargetBot && !%isTargetAdmin && (%isSuperAdmin || %isAdmin && $Host::AllowAdmin2Admin))
          messageClient( %client, 'MsgPlayerPopupItem', "", %key, "AdminPlayer", "", 'Make Admin', 2 );
 
       if ( !%isTargetSelf && %outrankTarget )
       {
-         messageClient( %client, 'MsgPlayerPopupItem', "", %key, "KickPlayer", "", 'Kick', 3 );
+         if(%isSuperAdmin || %isAdmin && $Host::AllowAdminKick)
+			   messageClient( %client, 'MsgPlayerPopupItem', "", %key, "KickPlayer", "", 'Kick', 3 );
 
          if ( !%isTargetBot )
          {
@@ -1164,11 +1166,11 @@ function DefaultGame::sendGamePlayerPopupMenu( %game, %client, %targetClient, %k
                messageClient( %client, 'MsgPlayerPopupItem', "", %key, "StripAdmin", "", 'Strip admin', 14 );
 
             messageClient( %client, 'MsgPlayerPopupItem', "", %key, "SendMessage", "", 'Send Private Message', 15 );
-            messageClient( %client, 'MsgPlayerPopupItem', "", %key, "PrintClientInfo", "", 'Client Info', 16 ); // z0dd - ZOD - MeBad, 7/13/03. Send client information.
 
             if( %client.isSuperAdmin )
             {
-               messageClient( %client, 'MsgPlayerPopupItem', "", %key, "BanPlayer", "", 'Ban', 4 );
+               messageClient( %client, 'MsgPlayerPopupItem', "", %key, "PrintClientInfo", "", 'Client Info', 16 ); // z0dd - ZOD - MeBad, 7/13/03. Send client information.
+			   messageClient( %client, 'MsgPlayerPopupItem', "", %key, "BanPlayer", "", 'Ban', 4 );
 
                if ( %targetClient.isGagged )
                   messageClient( %client, 'MsgPlayerPopupItem', "", %key, "UnGagPlayer", "", 'UnGag Player', 17);
diff --git a/Classic/scripts/serverDefaults.cs b/Classic/scripts/serverDefaults.cs
index c70b52f..77e45e3 100644
--- a/Classic/scripts/serverDefaults.cs
+++ b/Classic/scripts/serverDefaults.cs
@@ -179,8 +179,9 @@ $Host::ServerRules4 = "    \c1try2HaveFun\c4(\c2%client, %attitude\c4); \c1thisI
 $Host::AnimateWithTransitions = 1;													//????????????? T1 engine var may or may not help timescale ?????????????
 $Host::AllowAdmin2Admin = 0;
 $Host::AllowAdminBan = 0;
+$Host::AllowAdminKick = 1;
 $Host::AllowAdminPassVote = 1;
-$Host::AllowAdminStopVotes = 1;
+$Host::AllowAdminStopVote = 1;
 $Host::AllowAdminVotes = 1;
 $Host::AllowPlayerVoteChangeMission = 1;
 $Host::AllowPlayerVoteSkipMission = 1;