diff --git a/src/game/Opcodes.cpp b/src/game/Opcodes.cpp
index 2d168b958..7c4da1895 100644
--- a/src/game/Opcodes.cpp
+++ b/src/game/Opcodes.cpp
@@ -53,8 +53,8 @@ void InitializeOpcodes()
     //OPCODE(SMSG_QUERY_OBJECT_POSITION,                   STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
     //OPCODE(CMSG_QUERY_OBJECT_ROTATION,                   STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     //OPCODE(SMSG_QUERY_OBJECT_ROTATION,                   STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
-    //OPCODE(CMSG_WORLD_TELEPORT,                          STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleWorldTeleportOpcode       );
-    //OPCODE(CMSG_TELEPORT_TO_UNIT,                        STATUS_LOGGEDIN, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
+    OPCODE(CMSG_WORLD_TELEPORT,                            STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleWorldTeleportOpcode       );
+    OPCODE(CMSG_TELEPORT_TO_UNIT,                          STATUS_LOGGEDIN, PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     //OPCODE(CMSG_ZONE_MAP,                                STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     //OPCODE(SMSG_ZONE_MAP,                                STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
     //OPCODE(CMSG_DEBUG_CHANGECELLZONE,                    STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
diff --git a/src/game/Opcodes.h b/src/game/Opcodes.h
index 6b479abf4..54ff0f69d 100644
--- a/src/game/Opcodes.h
+++ b/src/game/Opcodes.h
@@ -47,8 +47,8 @@ enum Opcodes
     SMSG_QUERY_OBJECT_POSITION                            = 0x1006,
     CMSG_QUERY_OBJECT_ROTATION                            = 0x1007,
     SMSG_QUERY_OBJECT_ROTATION                            = 0x1008,
-    CMSG_WORLD_TELEPORT                                   = 0x1009,
-    CMSG_TELEPORT_TO_UNIT                                 = 0x100A,
+    CMSG_WORLD_TELEPORT                                   = 0x24B2, // 4.3.4 15595
+    CMSG_TELEPORT_TO_UNIT                                 = 0x4206, // 4.3.4 15595
     CMSG_ZONE_MAP                                         = 0x100B,
     SMSG_ZONE_MAP                                         = 0x100C,
     CMSG_DEBUG_CHANGECELLZONE                             = 0x100D,