diff --git a/changelog.txt b/changelog.txt
index c71b72c38..3b30d17e3 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,5 +1,8 @@
 EQEMu Changelog (Started on Sept 24, 2003 15:50)
 -------------------------------------------------------
+== 12/13/2014 ==
+demonstar55: Fix guild rank spam on zone (needed to be in OP_PP)
+
 == 12/12/2014 ==
 demonstar55: Add special attack 42, Ignore Root Aggro Rules. This allows you to root a mob and have them still use the normal aggro rules (so they will attack the one with most hate, not closest)
 
diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp
index c68434109..574220e97 100644
--- a/zone/client_packet.cpp
+++ b/zone/client_packet.cpp
@@ -1483,9 +1483,28 @@ void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app)
 		m_pp.gm = 0;
 
 	/* Load Guild */
-	if (!IsInAGuild()) { m_pp.guild_id = GUILD_NONE; }
-	else {
+	if (!IsInAGuild()) {
+		m_pp.guild_id = GUILD_NONE;
+	} else {
 		m_pp.guild_id = GuildID();
+		uint8 rank = guild_mgr.GetDisplayedRank(GuildID(), GuildRank(), CharacterID());
+		// FIXME: RoF guild rank
+		if (GetClientVersion() >= EQClientRoF) {
+			switch (rank) {
+			case 0:
+				rank = 5;
+				break;
+			case 1:
+				rank = 3;
+				break;
+			case 2:
+				rank = 1;
+				break;
+			default:
+				break;
+			}
+		}
+		m_pp.guildrank = rank;
 		if (zone->GetZoneID() == RuleI(World, GuildBankZoneID))
 			GuildBanker = (guild_mgr.IsGuildLeader(GuildID(), CharacterID()) || guild_mgr.GetBankerFlag(CharacterID()));
 	}