diff --git a/af/investigatethefactions.af b/af/investigatethefactions.af
index 2fad1c7..104d7ee 100644
--- a/af/investigatethefactions.af
+++ b/af/investigatethefactions.af
@@ -18,7 +18,10 @@ STATE: {Default}
 	IF: Death
 		DO: SetState {Death}
 	IF: Always
-		DO: SetState {GoToJondor}
+		DO: DoAll
+				Chat {/vt opt set enablecombat false}
+				Chat {/vt opt set lootrarecorpsesonly false}
+				SetState {GoToJondor}
 
 ~~ Step 1: Travel to Zaikhal and talk to Jondor Torgren
 STATE: {GoToJondor}
@@ -63,9 +66,12 @@ STATE: {HuntLictor}
 	IF: Death
 		DO: SetState {Death}
 	IF: ItemCountGE 1 {Blight Lictor's Head}
-		DO: SetState {GiveHead}
+		DO: DoAll
+				Chat {/vt opt set enablecombat false}
+				SetState {GiveHead}
 	IF: Always
 		DO: DoAll
+				Chat {/vt opt set enablecombat true}
 				Chat {/vt nav load nav_lictorhead}
 				SetWatchdog 10.0 600.0 {Stuck}
 
diff --git a/met/investigatethefactions.met b/met/investigatethefactions.met
index 944b8e8..b11d243 100644
--- a/met/investigatethefactions.met
+++ b/met/investigatethefactions.met
@@ -25,9 +25,26 @@ Default
 i
 1
 i
-1
+3
 i
 0
+TABLE
+2
+K
+V
+n
+n
+3
+i
+2
+s
+/vt opt set enablecombat false
+i
+2
+s
+/vt opt set lootrarecorpsesonly false
+i
+1
 s
 GoToJondor
 s
@@ -282,7 +299,7 @@ HuntLictor
 i
 12
 i
-1
+3
 TABLE
 2
 k
@@ -298,6 +315,19 @@ s
 c
 i
 1
+TABLE
+2
+K
+V
+n
+n
+2
+i
+2
+s
+/vt opt set enablecombat false
+i
+1
 s
 GiveHead
 s
@@ -314,7 +344,11 @@ K
 V
 n
 n
+3
+i
 2
+s
+/vt opt set enablecombat true
 i
 2
 s