diff --git a/src/engine/InterestManagement/InterestManager.java b/src/engine/InterestManagement/InterestManager.java
index 1dceb7c6..78d048c6 100644
--- a/src/engine/InterestManagement/InterestManager.java
+++ b/src/engine/InterestManagement/InterestManager.java
@@ -521,6 +521,7 @@ public enum InterestManager implements Runnable {
 
         // Update loaded upbjects lists
 
+        player.isBoxed = PlayerCharacter.checkIfBoxed(player);
         player.setDirtyLoad(true);
         updateStaticList(player, origin);
         updateMobileList(player, origin);
diff --git a/src/engine/net/client/msg/VendorDialogMsg.java b/src/engine/net/client/msg/VendorDialogMsg.java
index 0336a275..5f11037f 100644
--- a/src/engine/net/client/msg/VendorDialogMsg.java
+++ b/src/engine/net/client/msg/VendorDialogMsg.java
@@ -98,15 +98,7 @@ public class VendorDialogMsg extends ClientNetMsg {
 
 
         if(npc.contractUUID == 1502040){ //enrollment officer
-            if(!playerCharacter.getTimestamps().containsKey("lastBoxFlag"))
-                playerCharacter.getTimestamps().put("lastBoxFlag",System.currentTimeMillis() - 1000);
-
-            if(playerCharacter.getTimestamps().get("lastBoxFlag") + 10000 > System.currentTimeMillis()) {
-                PlayerCharacter.unboxPlayer(playerCharacter);
-            }else{
-                ErrorPopupMsg.sendErrorPopup(playerCharacter, 49);
-                return;
-            }
+            PlayerCharacter.unboxPlayer(playerCharacter);
         }
 
         // Restrict disc trainers to only characters who have