diff --git a/TurnIn.lua b/TurnIn.lua
index bb9b9ed..4abb473 100755
--- a/TurnIn.lua
+++ b/TurnIn.lua
@@ -148,7 +148,7 @@ end
 
 function TI_EventHandlers:QUEST_COMPLETE ()
 	TI_debug("Quest Complete");
-	if(TI_IsNPCOn(UnitName("npc"), "activequest")) then
+	if(TI_ShouldTakeAction() and TI_IsNPCOn(UnitName("npc"), "activequest")) then
 		if(not (GetNumQuestChoices() > 1)) then
 			GetQuestReward(1);
 		end
@@ -233,7 +233,8 @@ local TI_GossipDefaults = {
 	battlemaster = "Battlemaster",
 	binder = "Hearthstone Binder",
 	healer = "Spirit Healer",
-	banker = "Bank"
+	banker = "Bank",
+	workorder = "Work Order"
 };
 
 function TI_OptionsInit()