1 files changed, 7 insertions, 2 deletions
diff --git a/src/game/BattleGround.cpp b/src/game/BattleGround.cpp
index cdaeb5546ae..1cc510a35f2 100644
--- a/src/game/BattleGround.cpp
+++ b/src/game/BattleGround.cpp
@@ -1167,10 +1167,15 @@ void BattleGround::AddOrSetPlayerToCorrectBgGroup(Player *plr, uint64 plr_guid,
         if(group->IsMember(plr_guid))
         {
             uint8 subgroup = group->GetMemberGroup(plr_guid);
-            plr->SetGroup(group, subgroup);
+            plr->SetBattleGroundRaid(group, subgroup);
         }
         else
-            GetBgRaid(team)->AddMember(plr_guid, plr->GetName());
+        {
+            group->AddMember(plr_guid, plr->GetName());
+            if( Group* originalGroup = plr->GetOriginalGroup() )
+                if( originalGroup->IsLeader(plr_guid) )
+                    group->ChangeLeader(plr_guid);
+        }
     }
 }