diff --git a/email.php b/email.php
index 15a39e9e..926afe9e 100644
--- a/email.php
+++ b/email.php
@@ -202,19 +202,15 @@ if (isset($_POST['firstname']))
 		    }
 
 
-		$sql = "SELECT stg_value
-			FROM " . LIME_PREFIX . "settings_global
-			WHERE stg_name LIKE 'siteadminemail'";
+		$sql = "SELECT admin,adminemail
+			FROM " . LIME_PREFIX . "surveys
+			WHERE sid = $lime_sid";
 
-		$fromemail = $db->GetOne($sql);
+		$from = $db->GetRow($sql);
 
-		$sql = "SELECT stg_value
-			FROM " . LIME_PREFIX . "settings_global
-			WHERE stg_name LIKE 'siteadminname'";
+		$mail->SetFrom($from['adminemail'],$from['admin']);
+		$mail->Sender = $from['adminemail'];
 
-		$fromname = $db->GetOne($sql);
-
-		$mail->SetFrom($fromemail,$fromname);
 		$mail->AddAddress($_POST['email']);
 		foreach ($customheaders as $key=>$val) 
 		{
diff --git a/include/limesurvey/qanda.php b/include/limesurvey/qanda.php
index 6d9c22f0..80df951c 100644
--- a/include/limesurvey/qanda.php
+++ b/include/limesurvey/qanda.php
@@ -64,7 +64,17 @@ function quexs_submit_on_click($do = true)
 
 	$r = "; $('.submit').css('display', ''); ";
 
-	if (LIME_AUTO_ADVANCE && $do)
+	$interviewer=returnglobal('interviewer');
+	if (!empty($interviewer) || (isset($_SESSION['interviewer']) && $_SESSION['interviewer'] == true))
+	{
+		$interviewer = true;
+	}
+	else
+	{
+		$interviewer = false;
+	}
+
+	if (LIME_AUTO_ADVANCE && $do && $interviewer)
 	{
 		$r .= " document.limesurvey.move.value = '";
 		if (isset($_SESSION['step']) && $_SESSION['step'] && ($_SESSION['step'] == $_SESSION['totalsteps']))