diff --git a/src/game/Server/Opcodes.cpp b/src/game/Server/Opcodes.cpp
index de863b972..d35c0c957 100644
--- a/src/game/Server/Opcodes.cpp
+++ b/src/game/Server/Opcodes.cpp
@@ -291,7 +291,7 @@ void InitializeOpcodes()
     //OPCODE(MSG_MOVE_SET_TURN_RATE_CHEAT,                 STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     OPCODE(SMSG_MOVE_SET_TURN_RATE,                      STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
     //OPCODE(MSG_MOVE_TOGGLE_COLLISION_CHEAT,              STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_NULL                     );
-    OPCODE(CMSG_MOVE_SET_FACING,                         STATUS_LOGGEDIN, PROCESS_THREADSAFE,   &WorldSession::HandleMovementOpcodes           );
+    OPCODE(MSG_MOVE_SET_FACING,                          STATUS_LOGGEDIN, PROCESS_THREADSAFE,   &WorldSession::HandleMovementOpcodes           );
     OPCODE(CMSG_MOVE_SET_PITCH,                          STATUS_LOGGEDIN, PROCESS_THREADSAFE,   &WorldSession::HandleMovementOpcodes           );
     OPCODE(MSG_MOVE_WORLDPORT_ACK,                       STATUS_TRANSFER, PROCESS_THREADUNSAFE, &WorldSession::HandleMoveWorldportAckOpcode    );
     OPCODE(SMSG_MONSTER_MOVE,                            STATUS_NEVER,    PROCESS_INPLACE,      &WorldSession::Handle_ServerSide               );
diff --git a/src/game/Server/Opcodes.h b/src/game/Server/Opcodes.h
index 5ef8065aa..54524b595 100644
--- a/src/game/Server/Opcodes.h
+++ b/src/game/Server/Opcodes.h
@@ -284,7 +284,7 @@ enum Opcodes
     MSG_MOVE_SET_TURN_RATE_CHEAT                          = 0x10D8,
     SMSG_MOVE_SET_TURN_RATE                               = 0x30A5, // 4.3.4 15595
     MSG_MOVE_TOGGLE_COLLISION_CHEAT                       = 0x0BC8, // 5.4.1 17538
-    CMSG_MOVE_SET_FACING                                  = 0x7914, // 4.3.4 15595
+    MSG_MOVE_SET_FACING                                   = 0x1050, // 5.4.8 18414
     CMSG_MOVE_SET_PITCH                                   = 0x0261, // 5.4.1 17538
     MSG_MOVE_WORLDPORT_ACK                                = 0x00e0, // 5.4.1 17538
     SMSG_MONSTER_MOVE                                     = 0x0216, // 5.4.1 17538
diff --git a/src/game/movement/MovementStructures.h b/src/game/movement/MovementStructures.h
index 212a17bb6..4eec30566 100644
--- a/src/game/movement/MovementStructures.h
+++ b/src/game/movement/MovementStructures.h
@@ -409,72 +409,76 @@ MovementStatusElements MovementJumpSequence[] =
 
 MovementStatusElements MovementSetFacingSequence[] =
 {
-    MSEPositionX,
     MSEPositionY,
+    MSEPositionX,
     MSEPositionZ,
-    MSEGuidBit6,
-    MSEHasTransportData,
-    MSEGuidBit4,
-    MSEHasSpline,
+    MSEGuidBit5,
+    MSEHasMovementFlags2,
+    MSEGuidBit3,
+    MSEGuidBit2,
+    MSECounterCount,
+    MSEHasUnknownBit,
+    MSEHasPitch,
     MSEGuidBit0,
     MSEHasOrientation,
     MSEHasTimestamp,
-    MSEHasPitch,
-    MSEHasMovementFlags2,
-    MSEGuidBit5,
-    MSEGuidBit7,
-    MSEGuidBit2,
-    MSEHasFallData,
-    MSEHasSplineElevation,
-    MSEHasMovementFlags,
-    MSEGuidBit3,
+    MSEHasUnknownBit,
+    MSEHasUnkTime,
+    MSEGuidBit4,
     MSEHasUnknownBit,
     MSEGuidBit1,
-    MSEHasTransportTime3,
-    MSETransportGuidBit3,
-    MSETransportGuidBit7,
-    MSETransportGuidBit5,
-    MSETransportGuidBit2,
-    MSETransportGuidBit6,
+    MSEGuidBit6,
+    MSEHasFallData,
+    MSEHasMovementFlags,
+    MSEHasSplineElevation,
+    MSEHasTransportData,
+    MSEGuidBit7,
     MSETransportGuidBit0,
+    MSETransportGuidBit7,
     MSEHasTransportTime2,
-    MSETransportGuidBit4,
+    MSETransportGuidBit3,
+    MSETransportGuidBit6,
+    MSEHasTransportTime3,
+    MSETransportGuidBit2,
+    MSETransportGuidBit5,
     MSETransportGuidBit1,
+    MSETransportGuidBit4,
     MSEHasFallDirection,
     MSEFlags2,
     MSEFlags,
-    MSEGuidByte6,
-    MSEGuidByte7,
-    MSEGuidByte2,
+    MSEMovementCounter,
     MSEGuidByte0,
-    MSEGuidByte4,
-    MSEGuidByte1,
-    MSEGuidByte5,
+    MSEGuidByte6,
     MSEGuidByte3,
+    MSEGuidByte1,
+    MSEGuidByte2,
+    MSEGuidByte7,
+    MSEGuidByte4,
+    MSEGuidByte5,
     MSETransportGuidByte0,
-    MSETransportPositionX,
-    MSETransportGuidByte1,
-    MSETransportTime2,
-    MSETransportGuidByte4,
-    MSETransportPositionZ,
-    MSETransportPositionO,
     MSETransportGuidByte2,
-    MSETransportTime3,
-    MSETransportGuidByte3,
-    MSETransportSeat,
-    MSETransportPositionY,
-    MSETransportGuidByte5,
-    MSETransportGuidByte6,
-    MSETransportTime,
+    MSETransportPositionO,
     MSETransportGuidByte7,
+    MSETransportTime3,
+    MSETransportGuidByte5,
+    MSETransportTime,
+    MSETransportPositionX,
+    MSETransportTime2,
+    MSETransportPositionZ,
+    MSETransportPositionY,
+    MSETransportGuidByte4,
+    MSETransportGuidByte3,
+    MSETransportGuidByte6,
+    MSETransportGuidByte1,
+    MSEFallTime,
+    MSEFallVerticalSpeed,
     MSEFallHorizontalSpeed,
     MSEFallSinAngle,
     MSEFallCosAngle,
-    MSEFallTime,
-    MSEFallVerticalSpeed,
+    MSEUnkTime,
+    MSETimestamp,
     MSESplineElevation,
     MSEPositionO,
-    MSETimestamp,
     MSEPitch,
     MSEEnd,
 };
@@ -2599,7 +2603,7 @@ MovementStatusElements* GetMovementStatusElementsSequence(uint16 opcode)
             return MovementJumpSequence;
         case CMSG_MOVE_SET_CAN_FLY_ACK:
             return MovementSetCanFlyAckSequence;
-        case CMSG_MOVE_SET_FACING:
+        case MSG_MOVE_SET_FACING:
             return MovementSetFacingSequence;
         case CMSG_MOVE_SET_PITCH:
             return MovementSetPitchSequence;