Merge pull request #10782 from Ascathor/master

Core/Commands: Fixing some problems with .account email

1 files changed, 4 insertions, 2 deletions

diff --git a/src/server/scripts/Commands/cs_account.cpp b/src/server/scripts/Commands/cs_account.cpp
index ada26e69c14..c48eba50f72 100644
--- a/src/server/scripts/Commands/cs_account.cpp
+++ b/src/server/scripts/Commands/cs_account.cpp
@@ -362,9 +362,9 @@ public:
             return false;
         }
 
-        char* oldEmail = strtok(NULL, " ");
+        char* oldEmail = strtok((char*)args, " ");
         char* password = strtok(NULL, " ");
-        char* email = strtok((char*)args, " ");
+        char* email = strtok(NULL, " ");
         char* emailConfirmation = strtok(NULL, " ");
 
         if (!oldEmail || !password || !email || !emailConfirmation)
@@ -467,6 +467,7 @@ public:
                 handler->GetSession()->GetAccountId(), handler->GetSession()->GetRemoteAddress().c_str(),
                 handler->GetSession()->GetPlayer()->GetName().c_str(), handler->GetSession()->GetPlayer()->GetGUIDLow(),
                 handler->HasPermission(RBAC_PERM_EMAIL_CONFIRM_FOR_PASS_CHANGE) ? "Yes" : "No");
+            return false;
         }
 
         if (!AccountMgr::CheckPassword(handler->GetSession()->GetAccountId(), std::string(oldPassword)))
@@ -488,6 +489,7 @@ public:
                 handler->GetSession()->GetAccountId(), handler->GetSession()->GetRemoteAddress().c_str(),
                 handler->GetSession()->GetPlayer()->GetName().c_str(), handler->GetSession()->GetPlayer()->GetGUIDLow(),
                 emailConfirmation);
+            return false;
         }
 
         if (strcmp(newPassword, passwordConfirmation) != 0)