diff --git a/functions/functions.display.php b/functions/functions.display.php
index 99cc0dcb..c8f1ec51 100644
--- a/functions/functions.display.php
+++ b/functions/functions.display.php
@@ -61,7 +61,8 @@ function display_questionnaire_chooser($questionnaire_id = false)
 
 
 	$sql = "SELECT questionnaire_id,description,CASE WHEN questionnaire_id = '$questionnaire_id' THEN 'selected=\'selected\'' ELSE '' END AS selected
-		FROM questionnaire";
+		FROM questionnaire
+		WHERE enabled = 1";
 		
 	$rs = $db->GetAll($sql);
 
diff --git a/functions/functions.operator.php b/functions/functions.operator.php
index 92c514b2..b82d0a4b 100644
--- a/functions/functions.operator.php
+++ b/functions/functions.operator.php
@@ -1581,6 +1581,7 @@ function end_case($operator_id)
 					FROM `call` as c
 					JOIN outcome AS o ON ( c.outcome_id = o.outcome_id)
 					WHERE c.case_id = '$case_id'
+					AND o.outcome_id != 18
 					ORDER BY o.contacted DESC,c.call_id DESC
 					LIMIT 1";