diff --git a/rs_intro.php b/rs_intro.php
index ad32e0d4..2b82a170 100644
--- a/rs_intro.php
+++ b/rs_intro.php
@@ -65,7 +65,7 @@ $case_id = get_case_id($operator_id);
 $questionnaire_id = get_questionnaire_id($operator_id);
 
 //display introduction text
-$sql = "SELECT rs_intro
+$sql = "SELECT rs_intro,rs_project_intro,rs_callback
 	FROM questionnaire
 	WHERE questionnaire_id = '$questionnaire_id'";
 
@@ -78,13 +78,33 @@ print "<p class='rstext'>". template_replace($r['rs_intro'],$operator_id,$case_i
 
 if (limesurvey_percent_complete($case_id) == false)
 {
-	?>
-	<p class='rsoption'><a href="rs_project_intro.php"><? echo T_("Yes - Continue"); ?></a></p>
-	<?
+	if(empty($r['rs_project_intro']))
+	{
+		//If nothing is specified as a project introduction, skip straight to questionnaire
+		?>
+		<p class='rsoption'><a href="<? print(get_limesurvey_url($operator_id)); ?>"><? echo T_("Yes - Continue"); ?></a></p>
+		<?
+	}
+	else
+	{
+		?>
+		<p class='rsoption'><a href="rs_project_intro.php"><? echo T_("Yes - Continue"); ?></a></p>
+		<?
+	}
 } else {
-	?>
-	<p class='rsoption'><a href="rs_callback.php"><? echo T_("Yes - Continue"); ?></a></p>
-	<?
+	if(empty($r['rs_callback']))
+	{
+		//If nothing is specified as a callback screen, skip straight to questionnaire
+		?>
+		<p class='rsoption'><a href="<? print(get_limesurvey_url($operator_id)); ?>"><? echo T_("Yes - Continue"); ?></a></p>
+		<?
+	}
+	else
+	{
+		?>
+		<p class='rsoption'><a href="rs_callback.php"><? echo T_("Yes - Continue"); ?></a></p>
+		<?
+	}
 }
 ?>
 <p class='rsoption'><a href="rs_business.php"><? echo T_("Business number"); ?></a></p>
diff --git a/rs_project_end.php b/rs_project_end.php
index 6b8cfe5d..aeaded8e 100644
--- a/rs_project_end.php
+++ b/rs_project_end.php
@@ -65,10 +65,17 @@ $r = $db->GetRow($sql);
 
 print "<p class='rstext'>" . template_replace($r['rs_project_end'],$operator_id,$case_id) . "</p>";
 
-?>
-<p class='rsoption'><a href="javascript:parent.poptastic('call.php?defaultoutcome=10');"><? echo T_("End call with outcome: Complete"); ?></a></p>
-<?
-
+if (!is_voip_enabled($operator_id) && AUTO_COMPLETE_OUTCOME)
+{
+	end_call($operator_id,10);
+	print "<p class='rsoption'>" . T_("Call automatically ended with outcome: Complete") . "</p>";
+}
+else
+{
+	?>
+	<p class='rsoption'><a href="javascript:parent.poptastic('call.php?defaultoutcome=10');"><? echo T_("End call with outcome: Complete"); ?></a></p>
+	<?
+}
 xhtml_foot();
 
 ?>