diff --git a/src/game/BattleGroundMgr.cpp b/src/game/BattleGroundMgr.cpp
index 408280664..c967da1c4 100644
--- a/src/game/BattleGroundMgr.cpp
+++ b/src/game/BattleGroundMgr.cpp
@@ -1306,7 +1306,8 @@ void BattleGroundMgr::BuildPvpLogDataPacket(WorldPacket *data, BattleGround *bg)
         for(int i = 1; i >= 0; --i)
         {
             *data << uint32(bg->m_ArenaTeamRatingChanges[i]);
-            *data << uint32(3999);  // huge thanks for TOM_RUS for this!
+            *data << uint32(3999);                          // huge thanks for TOM_RUS for this!
+            *data << uint32(0);                             // added again in 3.1
             sLog.outDebug("rating change: %d", bg->m_ArenaTeamRatingChanges[i]);
         }
         for(int i = 1; i >= 0; --i)
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 19a96e370..2c79e46aa 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -17059,8 +17059,8 @@ void Player::UpdateHomebindTime(uint32 time)
     {
         if (time >= m_HomebindTimer)
         {
-            // teleport to homebind location
-            TeleportTo(m_homebindMapId, m_homebindX, m_homebindY, m_homebindZ, GetOrientation());
+            // teleport to nearest graveyard
+            RepopAtGraveyard();
         }
         else
             m_HomebindTimer -= time;