diff --git a/src/engine/net/client/handlers/AcceptSubInviteHandler.java b/src/engine/net/client/handlers/AcceptSubInviteHandler.java
index 08a99d36..30e69ca9 100644
--- a/src/engine/net/client/handlers/AcceptSubInviteHandler.java
+++ b/src/engine/net/client/handlers/AcceptSubInviteHandler.java
@@ -15,6 +15,7 @@ import engine.Enum.GuildState;
 import engine.exception.MsgSendException;
 import engine.gameManager.ChatManager;
 import engine.gameManager.DbManager;
+import engine.gameManager.GuildManager;
 import engine.gameManager.SessionManager;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
@@ -26,8 +27,6 @@ import engine.objects.Guild;
 import engine.objects.GuildStatusController;
 import engine.objects.PlayerCharacter;
 
-import java.util.ArrayList;
-
 public class AcceptSubInviteHandler extends AbstractClientMsgHandler {
 
     public AcceptSubInviteHandler() {
@@ -89,16 +88,14 @@ public class AcceptSubInviteHandler extends AbstractClientMsgHandler {
             return true;
         }
 
-        //Update Target Guild State.
+        //update Guild states.
 
+        protectorate.setNation(nation);
+        GuildManager.updateAllGuildTags(protectorate);
         protectorate.upgradeGuildState(false);
 
-        //Add sub so GuildMaster can Swear in.
-
-        ArrayList<Guild> subs = nation.getSubGuildList();
-        subs.add(protectorate);
-
-        nation.setGuildState(GuildState.Nation);
+        if (nation.getGuildState() == GuildState.Sovereign)
+            nation.upgradeGuildState(true);
 
         //Let's send the message back.