diff --git a/src/game/Opcodes.cpp b/src/game/Opcodes.cpp
index a9460198e..92f810915 100644
--- a/src/game/Opcodes.cpp
+++ b/src/game/Opcodes.cpp
@@ -143,10 +143,10 @@ void InitializeOpcodes()
     //OPCODE(SMSG_GAMEOBJECT_QUERY_RESPONSE,               STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
     //OPCODE(CMSG_CREATURE_QUERY,                          STATUS_LOGGEDIN, PROCESS_INPLACE,      &WorldSession::HandleCreatureQueryOpcode       );
     //OPCODE(SMSG_CREATURE_QUERY_RESPONSE,                 STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
-    //OPCODE(CMSG_WHO,                                     STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleWhoOpcode                 );
-    //OPCODE(SMSG_WHO,                                     STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
-    //OPCODE(CMSG_WHOIS,                                   STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleWhoisOpcode               );
-    //OPCODE(SMSG_WHOIS,                                   STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
+    OPCODE(CMSG_WHO,                                     STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleWhoOpcode                 );
+    OPCODE(SMSG_WHO,                                     STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
+    OPCODE(CMSG_WHOIS,                                   STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleWhoisOpcode               );
+    OPCODE(SMSG_WHOIS,                                   STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
     //OPCODE(CMSG_CONTACT_LIST,                            STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleContactListOpcode         );
     //OPCODE(SMSG_CONTACT_LIST,                            STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
     //OPCODE(SMSG_FRIEND_STATUS,                           STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
diff --git a/src/game/Opcodes.h b/src/game/Opcodes.h
index 3fa288ae5..a9cf91c12 100644
--- a/src/game/Opcodes.h
+++ b/src/game/Opcodes.h
@@ -137,10 +137,10 @@ enum Opcodes
     SMSG_GAMEOBJECT_QUERY_RESPONSE                        = 0x1060,
     CMSG_CREATURE_QUERY                                   = 0x1061,
     SMSG_CREATURE_QUERY_RESPONSE                          = 0x1062,
-    CMSG_WHO                                              = 0x1063,
-    SMSG_WHO                                              = 0x1064,
-    CMSG_WHOIS                                            = 0x1065,
-    SMSG_WHOIS                                            = 0x1066,
+    CMSG_WHO                                              = 0x6C15,
+    SMSG_WHO                                              = 0x6907,
+    CMSG_WHOIS                                            = 0x6B05,
+    SMSG_WHOIS                                            = 0x6917,
     CMSG_CONTACT_LIST                                     = 0x1067,
     SMSG_CONTACT_LIST                                     = 0x1068,
     SMSG_FRIEND_STATUS                                    = 0x1069,