diff --git a/sql/characters.sql b/sql/characters.sql
index e26bff136..f5fa4217b 100644
--- a/sql/characters.sql
+++ b/sql/characters.sql
@@ -938,7 +938,7 @@ CREATE TABLE `guild_member` (
   `BankRemSlotsTab5` int(11) unsigned NOT NULL default '0',
   KEY `guildid_key` (`guildid`),
   KEY `guildid_rank_key` (`guildid`,`rank`),
-  KEY `guid_key` (`guid`)
+  UNIQUE KEY `guid_key` (`guid`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Guild System';
 
 --
diff --git a/sql/updates/2008_12_03_01_character_guild_member.sql b/sql/updates/2008_12_03_01_character_guild_member.sql
new file mode 100644
index 000000000..483b991e1
--- /dev/null
+++ b/sql/updates/2008_12_03_01_character_guild_member.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `guild_member` DROP INDEX `guid_key` ,
+ADD UNIQUE `guid_key` ( `guid` );
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index b43a4db2d..5c5d8cc55 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 "6871"
+ #define REVISION_NR "6872"
 #endif // __REVISION_NR_H__