diff --git a/src/game/ArenaTeam.cpp b/src/game/ArenaTeam.cpp
index ffd667d3a..b35ce1e36 100644
--- a/src/game/ArenaTeam.cpp
+++ b/src/game/ArenaTeam.cpp
@@ -138,19 +138,23 @@ bool ArenaTeam::AddMember(uint64 PlayerGuid)
     {
         pl->SetInArenaTeam(Id, GetSlot());
         pl->SetArenaTeamIdInvited(0);
+
+        // hide promote/remove buttons
+        if(CaptainGuid != PlayerGuid)
+            pl->SetUInt32Value(PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + 1 + (GetSlot() * 6), 1);
     }
     else
     {
-        Player::SetUInt32ValueInDB(PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + (GetSlot() * 6), Id, PlayerGuid);
-    }
+        Tokens tokens;
+        if(Player::LoadValuesArrayFromDB(tokens,PlayerGuid))
+        {
+            Player::SetUInt32ValueInArray(tokens,PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + (GetSlot() * 6), Id);
+            // hide promote/remove buttons
+            if(CaptainGuid != PlayerGuid)
+                Player::SetUInt32ValueInArray(tokens,PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + 1 + (GetSlot() * 6), 1);
 
-    // hide promote/remove buttons
-    if(CaptainGuid != PlayerGuid)
-    {
-        if(pl)
-            pl->SetUInt32Value(PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + 1 + (GetSlot() * 6), 1);
-        else
-            Player::SetUInt32ValueInDB(PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + 1 + (GetSlot() * 6), 1, PlayerGuid);
+            Player::SaveValuesArrayInDB(tokens,PlayerGuid);
+        }
     }
     return true;
 }
diff --git a/src/game/CharacterHandler.cpp b/src/game/CharacterHandler.cpp
index 4f4f2db94..5d8885e5c 100644
--- a/src/game/CharacterHandler.cpp
+++ b/src/game/CharacterHandler.cpp
@@ -596,8 +596,7 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder * holder)
         {
             // remove wrong guild data
             sLog.outError("Player %s (GUID: %u) marked as member not existed guild (id: %u), removing guild membership for player.",pCurrChar->GetName(),pCurrChar->GetGUIDLow(),pCurrChar->GetGuildId());
-            pCurrChar->SetUInt32Value(PLAYER_GUILDID,0);
-            pCurrChar->SetUInt32ValueInDB(PLAYER_GUILDID,0,pCurrChar->GetGUID());
+            pCurrChar->SetInGuild(0);
         }
     }
 
diff --git a/src/game/Guild.cpp b/src/game/Guild.cpp
index 0dbcda15e..e98894a2f 100644
--- a/src/game/Guild.cpp
+++ b/src/game/Guild.cpp
@@ -151,8 +151,13 @@ bool Guild::AddMember(uint64 plGuid, uint32 plRank)
     }
     else
     {
-        Player::SetUInt32ValueInDB(PLAYER_GUILDID, Id, plGuid);
-        Player::SetUInt32ValueInDB(PLAYER_GUILDRANK, newmember.RankId, plGuid);
+        Tokens tokens;
+        if(Player::LoadValuesArrayFromDB(tokens,plGuid))
+        {
+            Player::SetUInt32ValueInArray(tokens, PLAYER_GUILDID, Id);
+            Player::SetUInt32ValueInArray(tokens, PLAYER_GUILDRANK, newmember.RankId);
+            Player::SaveValuesArrayInDB(tokens, plGuid);
+        }
     }
     return true;
 }
@@ -481,8 +486,13 @@ void Guild::DelMember(uint64 guid, bool isDisbanding)
     }
     else
     {
-        Player::SetUInt32ValueInDB(PLAYER_GUILDID, 0, guid);
-        Player::SetUInt32ValueInDB(PLAYER_GUILDRANK, GR_GUILDMASTER, guid);
+        Tokens tokens;
+        if(Player::LoadValuesArrayFromDB(tokens,guid))
+        {
+            Player::SetUInt32ValueInArray(tokens, PLAYER_GUILDID, 0);
+            Player::SetUInt32ValueInArray(tokens, PLAYER_GUILDRANK, GR_GUILDMASTER);
+            Player::SaveValuesArrayInDB(tokens, guid);
+        }
     }
 
     CharacterDatabase.PExecute("DELETE FROM guild_member WHERE guid = '%u'", GUID_LOPART(guid));
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 756b89053..00be33fd6 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "6864"
+ #define REVISION_NR "6865"
 #endif // __REVISION_NR_H__