diff --git a/changelog.txt b/changelog.txt
index cb580d283..53d02d02d 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -3,6 +3,7 @@ EQEMu Changelog (Started on Sept 24, 2003 15:50)
 == 01/07/2015 ==
 Uleat: Excluded text link body from message scrambling in Client::GarbleMessage()
 Trevius: Mercenaries now load directly from tables only.  The vwMercNpcTypes view is no longer required and can be deleted.
+Trevius: Query fix for group_leaders table.  This may resolve some crashes/bugs related to Mercs/Bots and Groups.
 
 == 01/06/2015 ==
 Trevius: Changed the pet command #defines to be based on RoF2 list of pet commands and added decodes to Titanium, SoF and SoD.
diff --git a/common/database.cpp b/common/database.cpp
index 3de2a308b..85ee258a2 100644
--- a/common/database.cpp
+++ b/common/database.cpp
@@ -3303,7 +3303,7 @@ void Database::SetGroupLeaderName(uint32 gid, const char* name) {
 		return;
 	}
 
-	query = StringFormat("INSERT INTO group_leaders(gid, leadername, marknpc, leadershipaa, maintank, assist, puller, mentoree, mentor_percent) VALUES(%u, '%s', '', '', '', '', '', '', '0')",
+	query = StringFormat("REPLACE INTO group_leaders(gid, leadername, marknpc, leadershipaa, maintank, assist, puller, mentoree, mentor_percent) VALUES(%u, '%s', '', '', '', '', '', '', '0')",
 						 gid, EscapeString(name).c_str());
 	result = QueryDatabase(query);