diff --git a/core/src/commands/authentication.cpp b/core/src/commands/authentication.cpp
index fb33158..4c2a0ce 100644
--- a/core/src/commands/authentication.cpp
+++ b/core/src/commands/authentication.cpp
@@ -234,8 +234,7 @@ void AOClient::cmdChangePassword(int argc, QStringList argv)
         l_username = m_moderator_name;
     }
     else if (argc == 2 && checkPermission(ACLRole::SUPER)) {
-        l_username = argv[0];
-        l_password = argv[1];
+        l_username = argv[1];
     }
     else {
         sendServerMessage("Invalid command syntax.");
diff --git a/core/src/commands/messaging.cpp b/core/src/commands/messaging.cpp
index 6438e8c..0fb9d96 100644
--- a/core/src/commands/messaging.cpp
+++ b/core/src/commands/messaging.cpp
@@ -76,7 +76,7 @@ void AOClient::cmdG(int argc, QStringList argv)
     QString l_sender_name = m_ooc_name;
     QString l_sender_area = server->getAreaName(m_current_area);
     QString l_sender_message = argv.join(" ");
-    //Slightly better readability
+    // Better readability thanks to AwesomeAim.
     AOPacket l_mod_packet = AOPacket("CT", {"[G][" + m_ipid + "][" + l_sender_area + "]" + l_sender_name, l_sender_message});
     AOPacket l_user_packet = AOPacket("CT", {"[G][" + l_sender_area + "]" + l_sender_name, l_sender_message});
     server->broadcast(l_user_packet, l_mod_packet, Server::TARGET_TYPE::AUTHENTICATED);