Index: java/net/sf/l2j/gameserver/model/entity/Castle.java
===================================================================
--- java/net/sf/l2j/gameserver/model/entity/Castle.java	(revision 1240)
+++ java/net/sf/l2j/gameserver/model/entity/Castle.java	(working copy)
@@ -25,6 +25,7 @@
 import java.util.logging.Logger;
 
 import javolution.util.FastList;
+import net.sf.l2j.Config;
 import net.sf.l2j.L2DatabaseFactory;
 import net.sf.l2j.gameserver.Announcements;
 import net.sf.l2j.gameserver.CastleUpdater;
@@ -238,6 +239,10 @@
 			{
 				if (_formerOwner == null)
                     _formerOwner = oldOwner;
+				if (Config.REMOVE_CASTLE_CIRCLETS)
+				{
+					CastleManager.getInstance().removeCirclets(oldOwner,oldOwner.getHasCastle());
+				}
 				oldOwner.setHasCastle(0);												// Unset has castle flag for old owner
         		new Announcements().announceToAll(oldOwner.getName() + " has lost " + getName() + " castle!");
 			}							
@@ -256,6 +261,10 @@
 		if (clan != null)
 		{	
 			_formerOwner = clan;
+			if (Config.REMOVE_CASTLE_CIRCLETS)
+			{
+				CastleManager.getInstance().removeCirclets(clan,clan.getHasCastle());
+			}
 			clan.setHasCastle(0);
 			new Announcements().announceToAll(clan.getName() + " has lost " +getName() + " castle");
 			clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
@@ -264,7 +273,6 @@
 		updateOwnerInDB(null);
 		if (getSiege().getIsInProgress())
 			getSiege().midVictory();
-		
 		updateClansReputation();
 	}