diff --git a/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.cpp b/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.cpp
index 70c413c0..a9669cef 100644
--- a/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.cpp
+++ b/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.cpp
@@ -182,13 +182,6 @@ void Core::DebugCommandHandler::set( char * data, Core::Entity::PlayerPtr pPlaye
 
       pPlayer->teleport( aetheryteId );
    }
-
-   else if( ( subCommand == "unlockaetheryte" ) && ( params != "" ) )
-   {
-      for( uint8_t i = 0; i < 255; i++ )
-         pPlayer->registerAetheryte( i );
-   }
-
    else if( ( subCommand == "discovery" ) && ( params != "" ) )
    {
       int32_t map_id;
diff --git a/src/servers/Server_Zone/Network/Handlers/GMCommandHandlers.cpp b/src/servers/Server_Zone/Network/Handlers/GMCommandHandlers.cpp
index 36c1949a..93577a2a 100644
--- a/src/servers/Server_Zone/Network/Handlers/GMCommandHandlers.cpp
+++ b/src/servers/Server_Zone/Network/Handlers/GMCommandHandlers.cpp
@@ -84,6 +84,7 @@ enum GmCommand
    QuestInspect = 0x0131,
    GC = 0x0154,
    GCRank = 0x0155,
+   Aetheryte = 0x015E,
    Teri = 0x0258,
    TeriInfo = 0x025D,
    Jump = 0x025E,
@@ -364,6 +365,28 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac
          " was switched." );
       break;
    }
+   case GmCommand::Aetheryte:
+   {
+      if( param1 == 0 )
+      {
+         if( param2 == 0 )
+         {
+            for( uint8_t i = 0; i < 255; i++ )
+               targetActor->getAsPlayer()->registerAetheryte( i );
+               pPlayer->sendNotice( "All Aetherytes for " + targetPlayer->getName() +
+                  " were turned on." );
+         }
+         else
+         {
+            targetActor->getAsPlayer()->registerAetheryte( param2 );
+            pPlayer->sendNotice( "Aetheryte " + std::to_string( param2 ) + " for " + targetPlayer->getName() +
+               " was turned on." );
+         }
+      }
+
+      
+      break;
+   }
 
    default:
       pPlayer->sendUrgent( "GM1 Command not implemented: " + std::to_string( commandId ) );