diff --git a/src/game/Opcodes.cpp b/src/game/Opcodes.cpp
index b7de837c2..eedeafb15 100644
--- a/src/game/Opcodes.cpp
+++ b/src/game/Opcodes.cpp
@@ -123,8 +123,8 @@ void InitializeOpcodes()
     OPCODE(CMSG_LOGOUT_REQUEST,                          STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleLogoutRequestOpcode       );
     OPCODE(SMSG_LOGOUT_RESPONSE,                         STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
     OPCODE(SMSG_LOGOUT_COMPLETE,                         STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
-    //OPCODE(CMSG_LOGOUT_CANCEL,                           STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleLogoutCancelOpcode        );
-    //OPCODE(SMSG_LOGOUT_CANCEL_ACK,                       STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
+    OPCODE(CMSG_LOGOUT_CANCEL,                           STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleLogoutCancelOpcode        );
+    OPCODE(SMSG_LOGOUT_CANCEL_ACK,                       STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
     OPCODE(CMSG_NAME_QUERY,                              STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleNameQueryOpcode           );
     OPCODE(SMSG_NAME_QUERY_RESPONSE,                     STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
     //OPCODE(CMSG_PET_NAME_QUERY,                          STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandlePetNameQueryOpcode        );
diff --git a/src/game/Opcodes.h b/src/game/Opcodes.h
index f8ef5187d..fc1ca2e5f 100644
--- a/src/game/Opcodes.h
+++ b/src/game/Opcodes.h
@@ -117,8 +117,8 @@ enum Opcodes
     CMSG_LOGOUT_REQUEST                                   = 0x0A25,
     SMSG_LOGOUT_RESPONSE                                  = 0x0524,
     SMSG_LOGOUT_COMPLETE                                  = 0x2137,
-    CMSG_LOGOUT_CANCEL                                    = 0x104F,
-    SMSG_LOGOUT_CANCEL_ACK                                = 0x1050,
+    CMSG_LOGOUT_CANCEL                                    = 0x2324,
+    SMSG_LOGOUT_CANCEL_ACK                                = 0x6514,
     CMSG_NAME_QUERY                                       = 0x2224,
     SMSG_NAME_QUERY_RESPONSE                              = 0x6E04,
     CMSG_PET_NAME_QUERY                                   = 0x1053,