diff --git a/include/aoclient.h b/include/aoclient.h
index 2a549d5..b912eee 100644
--- a/include/aoclient.h
+++ b/include/aoclient.h
@@ -68,6 +68,10 @@ class AOClient : public QObject {
         {"SUPER", ~0ULL}
     };
 
+    bool is_shaken;
+    bool is_disemvoweled;
+    bool is_gimped;
+
   public slots:
     void clientDisconnected();
     void clientData();
diff --git a/src/commands.cpp b/src/commands.cpp
index 6abee2f..50fa0cb 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -40,10 +40,12 @@ void AOClient::cmdLogin(int argc, QStringList argv)
     // TODO: tell the user if no modpass is set
     if (auth_type == "simple") {
         if(argv[0] == modpass) {
-            sendServerMessage("Logged in as a moderator."); // This string has to be exactly this, because it is hardcoded in the client
+            //sendServerMessage("Logged in as a moderator."); // This string has to be exactly this, because it is hardcoded in the client
+            sendPacket("AUTH", {"1"});
             authenticated = true;
         } else {
             sendServerMessage("Incorrect password.");
+            sendPacket("AUTH", {"0"});
         }
         server->areas.value(current_area)->logger->logLogin(this, authenticated, "moderator");
     }
@@ -57,11 +59,12 @@ void AOClient::cmdLogin(int argc, QStringList argv)
         if (server->db_manager->authenticate(username, password)) {
             moderator_name = username;
             authenticated = true;
-            sendServerMessage("Logged in as a moderator.");
+            sendPacket("AUTH", {"1"});
             sendServerMessage("Welcome, " + username);
         }
         else {
             sendServerMessage("Incorrect password.");
+            sendPacket("AUTH", {"0"});
         }
         server->areas.value(current_area)->logger->logLogin(this, authenticated, username);
     }
@@ -359,6 +362,7 @@ void AOClient::cmdLogout(int argc, QStringList argv)
     authenticated = false;
     moderator_name = "";
     sendServerMessage("You have been logged out.");
+    sendPacket("AUTH", {"-1"});
 }
 
 void AOClient::cmdPos(int argc, QStringList argv)
diff --git a/src/packets.cpp b/src/packets.cpp
index 619849d..feaa203 100644
--- a/src/packets.cpp
+++ b/src/packets.cpp
@@ -46,12 +46,12 @@ void AOClient::pktSoftwareId(AreaData* area, int argc, QStringList argv, AOPacke
     // The only ones that are critical to ensuring the server works are
     // "noencryption" and "fastloading"
     QStringList feature_list = {
-        "noencryption", "yellowtext",       "prezoom",
-        "flipping",     "customobjections", "fastloading",
-        "deskmod",      "evidence",         "cccc_ic_support",
-        "arup",         "casing_alerts",    "modcall_reason",
-        "looping_sfx",  "additive",         "effects",
-        "y_offset"
+        "noencryption", "yellowtext",         "prezoom",
+        "flipping",     "customobjections",   "fastloading",
+        "deskmod",      "evidence",           "cccc_ic_support",
+        "arup",         "casing_alerts",      "modcall_reason",
+        "looping_sfx",  "additive",           "effects",
+        "y_offset",     "expanded_desk_mods", "auth_packet"
     };
 
     sendPacket("PN", {QString::number(server->player_count), max_players});
@@ -345,15 +345,13 @@ AOPacket AOClient::validateIcPacket(AOPacket packet)
         incoming_args.append(QVariant(arg));
     }
 
-    // message type
-    if (incoming_args[0].toInt() == 1)
-        args.append("1");
-    else if (incoming_args[0].toInt() == 0) {
-        if (incoming_args[0].toString() == "chat")
-            args.append("chat");
-        else
-            args.append("0");
+    // desk modifier
+    QStringList allowed_desk_mods = ["chat", "0", "1", "2", "3", "4", "5"];
+    if (allowed_desk_mods.contains(incoming_args[0])) {
+        args.append(incoming_args[0]);
     }
+    else
+        return invalid;
 
     // preanim
     args.append(incoming_args[1].toString());