diff --git a/src/CNLoginServer.cpp b/src/CNLoginServer.cpp
index 60788bd..0def10e 100644
--- a/src/CNLoginServer.cpp
+++ b/src/CNLoginServer.cpp
@@ -192,14 +192,15 @@ void CNLoginServer::handlePacket(CNSocket* sock, CNPacketData* data) {
             
             int64_t UID = character->PCStyle.iPC_UID;
             
-            bool BecomeGM;
+            // commented and disabled for now
+            //bool BecomeGM;
             
-            if (U16toU8(character->PCStyle.szFirstName) == settings::GMPASS) {
-                BecomeGM = true;
-                U8toU16("GM",character->PCStyle.szFirstName);
-            } else {
-                BecomeGM = false;
-            }
+            //if (U16toU8(character->PCStyle.szFirstName) == settings::GMPASS) {
+            //    BecomeGM = true;
+            //    U8toU16("GM",character->PCStyle.szFirstName);
+            //} else {
+            //    BecomeGM = false;
+            //}
 
             character->PCStyle.iNameCheck = 1;
             response->sPC_Style = character->PCStyle;
@@ -225,7 +226,7 @@ void CNLoginServer::handlePacket(CNSocket* sock, CNPacketData* data) {
             loginSessions[sock].characters[UID].Equip[2].iType = 2;
             loginSessions[sock].characters[UID].Equip[3].iID = character->sOn_Item.iEquipFootID; // foot!
             loginSessions[sock].characters[UID].Equip[3].iType = 3; 
-            loginSessions[sock].characters[UID].IsGM = BecomeGM;
+            loginSessions[sock].characters[UID].IsGM = false;
 
             sock->sendPacket(new CNPacketData((void*)response, P_LS2CL_REP_CHAR_CREATE_SUCC, sizeof(sP_LS2CL_REP_CHAR_CREATE_SUCC), sock->getEKey()));
             break;
diff --git a/src/ItemManager.cpp b/src/ItemManager.cpp
index 09119c2..0525e1f 100644
--- a/src/ItemManager.cpp
+++ b/src/ItemManager.cpp
@@ -98,10 +98,11 @@ void ItemManager::itemGMGiveHandler(CNSocket* sock, CNPacketData* data) {
     sP_CL2FE_REQ_PC_GIVE_ITEM* itemreq = (sP_CL2FE_REQ_PC_GIVE_ITEM*)data->buf;
     PlayerView& plr = PlayerManager::players[sock];
 
-    if (!plr.plr.IsGM) {
+    // Commented and disabled for future use
+    //if (!plr.plr.IsGM) {
     	// TODO: send fail packet
-        return;
-    }
+    //    return;
+    //}
 
     if (itemreq->eIL == 2) {
         // Quest item, not a real item, handle this later, stubbed for now