diff --git a/src/game/Object/Player.cpp b/src/game/Object/Player.cpp
index ae2722ce4..f9a65732b 100644
--- a/src/game/Object/Player.cpp
+++ b/src/game/Object/Player.cpp
@@ -21690,12 +21690,13 @@ void Player::SendInitialPacketsBeforeAddToMap()
     // guild bank list wtf?
 
     // Homebind
-    WorldPacket data(SMSG_BINDPOINTUPDATE, 5*4);
-    data << m_homebindZ;
+    WorldPacket data(SMSG_BINDPOINTUPDATE,  4 + 4 + 4 + 4 + 4);
     data << m_homebindX;
-    data << (uint32) m_homebindMapId;
+    data << m_homebindZ;
     data << m_homebindY;
     data << (uint32) m_homebindAreaId;
+    data << (uint32) m_homebindMapId;
+
     GetSession()->SendPacket(&data);
 
     // SMSG_SET_PROFICIENCY
diff --git a/src/game/Server/Opcodes.h b/src/game/Server/Opcodes.h
index 920389650..72f05c216 100644
--- a/src/game/Server/Opcodes.h
+++ b/src/game/Server/Opcodes.h
@@ -407,7 +407,7 @@ enum Opcodes
     SMSG_BREAK_TARGET                                     = 0x0105, // 4.3.4 15595
     CMSG_SAVE_PLAYER                                      = 0x1154,
     CMSG_SETDEATHBINDPOINT                                = 0x1155,
-    SMSG_BINDPOINTUPDATE                                  = 0x04CC, // 5.3.0 17128
+    SMSG_BINDPOINTUPDATE                                  = 0x0E3B, // 5.4.8 18414
     CMSG_GETDEATHBINDZONE                                 = 0x1157,
     SMSG_BINDZONEREPLY                                    = 0x1158,
     SMSG_PLAYERBOUND                                      = 0x12DD, // 5.3.0 17128
diff --git a/src/game/WorldHandlers/SpellEffects.cpp b/src/game/WorldHandlers/SpellEffects.cpp
index 09150cbb2..e08cd12ec 100644
--- a/src/game/WorldHandlers/SpellEffects.cpp
+++ b/src/game/WorldHandlers/SpellEffects.cpp
@@ -12998,10 +12998,11 @@ void Spell::EffectBind(SpellEffectEntry const* effect)
     player->SetHomebindToLocation(loc, area_id);
 
     // binding
-    WorldPacket data(SMSG_BINDPOINTUPDATE, (4 + 4 + 4 + 4 + 4));
+    WorldPacket data(SMSG_BINDPOINTUPDATE, 4 + 4 + 4 + 4 + 4);
     data << float(loc.coord_x);
     data << float(loc.coord_y);
     data << float(loc.coord_z);
+    data << uint32(area_id);
     data << uint32(loc.mapid);
     data << uint32(area_id);
     player->SendDirectMessage(&data);