diff --git a/src/engine/net/client/msg/VendorDialogMsg.java b/src/engine/net/client/msg/VendorDialogMsg.java
index c8d65742..e2e2c8f0 100644
--- a/src/engine/net/client/msg/VendorDialogMsg.java
+++ b/src/engine/net/client/msg/VendorDialogMsg.java
@@ -119,9 +119,7 @@ public class VendorDialogMsg extends ClientNetMsg {
             //PlayerCharacter.unboxPlayer(playerCharacter);
             vd = Contract.HandleEnrollmentOfficer(msg.unknown03,npc,playerCharacter);
             msg.updateMessage(3, vd);
-        }
-
-        if(contract.getContractID() == 1502042){
+        }else if(contract.getContractID() == 1502042){
            vd = Contract.HandleBaneCommanderOptions(msg.unknown03, npc, playerCharacter);
            msg.updateMessage(3, vd);
         }else {
diff --git a/src/engine/objects/Contract.java b/src/engine/objects/Contract.java
index 2929daa3..8764cfdd 100644
--- a/src/engine/objects/Contract.java
+++ b/src/engine/objects/Contract.java
@@ -200,7 +200,8 @@ public class Contract extends AbstractGameObject {
 
     public static VendorDialog HandleEnrollmentOfficer(int optionId, NPC npc, PlayerCharacter pc){
         pc.setLastNPCDialog(npc);
-        VendorDialog vd = new VendorDialog(VendorDialog.getHostileVendorDialog().getDialogType(),VendorDialog.getHostileVendorDialog().getIntro(),-1);//VendorDialog.getHostileVendorDialog();
+        //VendorDialog vd = new VendorDialog(npc.contract.getVendorDialog().getDialogType(),npc.contract.getVendorDialog().getIntro(),-1);//VendorDialog.getHostileVendorDialog();
+        VendorDialog vd = new VendorDialog(npc.contract.getVendorDialog().getDialogType(),npc.contract.getVendorDialog().getIntro(),-1);//VendorDialog.getHostileVendorDialog();
         vd.getOptions().clear();
         switch(optionId) {
             default:
@@ -211,6 +212,7 @@ public class Contract extends AbstractGameObject {
             break;
             case 15020401:
                 PlayerCharacter.unboxPlayer(pc);
+                vd.getOptions().clear();
                 break;
         }
         return vd;