diff --git a/includes/lib_switch.php b/includes/lib_switch.php
index 8684e04cec..415d79c370 100644
--- a/includes/lib_switch.php
+++ b/includes/lib_switch.php
@@ -1528,42 +1528,13 @@ function switch_select_destination($select_type, $select_label, $select_name, $s
 
 function save_setting_xml() {
 	global $db, $domain_uuid, $host, $config;
- 
+
 	$sql = "select * from v_settings ";
 	$prep_statement = $db->prepare(check_sql($sql));
 	if ($prep_statement) {
 		$prep_statement->execute();
 		$result = $prep_statement->fetchAll(PDO::FETCH_ASSOC);
 		foreach ($result as &$row) {
-			$fout = fopen($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/secure/v_config_cli.php","w");
-			$xml = "<?php\n";
-			$xml .= "\n";
-			$xml .= "error_reporting(E_ALL ^ E_NOTICE ^ E_WARNING ^ E_DEPRECATED ); //hide notices and warnings\n";
-			$xml .= "\n";
-			$xml .= "//set the email variables\n";
-			$xml .= "	\$v_smtp_host = \"".$row["smtp_host"]."\";\n";
-			if ($row["smtp_secure"] == "none") {
-				$xml .= "	\$v_smtp_secure = \"\";\n";
-			}
-			else {
-				$xml .= "	\$v_smtp_secure = \"".$row["smtp_secure"]."\";\n";
-			}
-			$xml .= "	\$v_smtp_auth = \"".$row["smtp_auth"]."\";\n";
-			$xml .= "	\$v_smtp_username = \"".$row["smtp_username"]."\";\n";
-			$xml .= "	\$v_smtp_password = \"".$row["smtp_password"]."\";\n";
-			$xml .= "	\$v_smtp_from = \"".$row["smtp_from"]."\";\n";
-			$xml .= "	\$v_smtp_from_name = \"".$row["smtp_from_name"]."\";\n";
-			$xml .= "\n";
-			$xml .= "//set system dir variables\n";
-			$xml .= "	\$switch_storage_dir = \"".$_SESSION['switch']['storage']['dir']."\";\n";
-			$xml .= "	\$tmp_dir = \"".$_SESSION['server']['temp']['dir']."\";\n";
-			$xml .= "	\$v_secure = \"".$_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/secure"."\";\n";
-			$xml .= "\n";
-			$xml .= "?>";
-			fwrite($fout, $xml);
-			unset($xml);
-			fclose($fout);
-
 			$fout = fopen($_SESSION['switch']['conf']['dir']."/directory/default/default.xml","w");
 			$xml = "<include>\n";
 			$xml .= "  <user id=\"default\"> <!--if id is numeric mailbox param is not necessary-->\n";
diff --git a/secure/fax_to_email.php b/secure/fax_to_email.php
index b1b1fb145e..341d6190fd 100644
--- a/secure/fax_to_email.php
+++ b/secure/fax_to_email.php
@@ -23,7 +23,7 @@
 	Contributor(s):
 	Mark J Crane <markjcrane@fusionpbx.com>
 */
-include "v_config_cli.php";
+
 if (defined('STDIN')) {
 	//get the document root php file must be executed with the full path
 		$document_root = str_replace("\\", "/", $_SERVER["PHP_SELF"]);
@@ -227,20 +227,23 @@ if (defined('STDIN')) {
 		//prepare the mail object
 			$mail = new PHPMailer();
 			$mail->IsSMTP(); // set mailer to use SMTP
-			if ($v_smtp_auth == "true") {
-				$mail->SMTPAuth = $v_smtp_auth; // turn on/off SMTP authentication
+			if ($_SESSION['email']['smtp_auth']['var'] == "true") {
+				$mail->SMTPAuth = $_SESSION['email']['smtp_auth']['var']; // turn on/off SMTP authentication
 			}
-			$mail->Host   = $v_smtp_host;
-			if (strlen($v_smtp_secure)>0) {
-				$mail->SMTPSecure = $v_smtp_secure;
+			$mail->Host = $_SESSION['email']['smtp_host']['var'];
+			if ($_SESSION['email']['smtp_secure']['var'] == "none") {
+				$_SESSION['email']['smtp_secure']['var'] = '';
 			}
-			if ($v_smtp_username) {
-				$mail->Username = $v_smtp_username;
-				$mail->Password = $v_smtp_password;
+			if (strlen($_SESSION['email']['smtp_secure']['var']) > 0) {
+				$mail->SMTPSecure = $_SESSION['email']['smtp_secure']['var'];
+			}
+			if ($_SESSION['email']['smtp_username']['var']) {
+				$mail->Username = $_SESSION['email']['smtp_username']['var'];
+				$mail->Password = $_SESSION['email']['smtp_password']['var'];
 			}
 			$mail->SMTPDebug  = 2;
-			$mail->From       = $v_smtp_from;
-			$mail->FromName   = $v_smtp_from_name;
+			$mail->From       = $_SESSION['email']['smtp_from']['var'];
+			$mail->FromName   = $_SESSION['email']['smtp_from_name']['var'];
 			$mail->Subject    = $tmp_subject;
 			$mail->AltBody    = $tmp_text_plain;
 			$mail->MsgHTML($tmp_text_html);
@@ -256,8 +259,8 @@ if (defined('STDIN')) {
 			}
 
 		//output to the log
-			echo "v_smtp_from: $v_smtp_from\n";
-			echo "v_smtp_from_name: $v_smtp_from_name\n";
+			echo "smtp_from: ".$_SESSION['email']['smtp_from']['var']."\n";
+			echo "smtp_from_name: ".$_SESSION['email']['smtp_from_name']['var']."\n";
 			echo "tmp_subject: $tmp_subject\n";
 
 		//add teh attachments
@@ -309,24 +312,24 @@ if (defined('STDIN')) {
 			} else {
 				// create an instruction log to email messages once the connection to the mail server has been restored
 					$fp = fopen($fax_to_email_queue_dir."/failed_fax_emails.log", "a");
-					fwrite($fp, PHP_BINDIR."/php ".$v_secure."/fax_to_email.php email=$fax_email extension=$fax_extension name=$fax_name messages='$fax_messages' retry=yes\n");
+					fwrite($fp, PHP_BINDIR."/php ".$_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/secure/fax_to_email.php email=$fax_email extension=$fax_extension name=$fax_name messages='$fax_messages' retry=yes\n");
 					fclose($fp);
 				// create a script to do the delayed mailing
-					$fp = fopen($tmp_dir."/failed_fax_emails.sh", "w");
-					fwrite($fp, "rm ".$tmp_dir."/fax_email_retry.sh\n");
-					fwrite($fp, "mv ".$fax_to_email_queue_dir."/failed_fax_emails.log ".$tmp_dir."/fax_email_retry.sh\n");
-					fwrite($fp, "chmod 777 ".$tmp_dir."/fax_email_retry.sh\n");
-					fwrite($fp, $tmp_dir."/fax_email_retry.sh\n");
+					$fp = fopen($_SESSION['server']['temp']['dir']."/failed_fax_emails.sh", "w");
+					fwrite($fp, "rm ".$_SESSION['server']['temp']['dir']."/fax_email_retry.sh\n");
+					fwrite($fp, "mv ".$fax_to_email_queue_dir."/failed_fax_emails.log ".$_SESSION['server']['temp']['dir']."/fax_email_retry.sh\n");
+					fwrite($fp, "chmod 777 ".$_SESSION['server']['temp']['dir']."/fax_email_retry.sh\n");
+					fwrite($fp, $_SESSION['server']['temp']['dir']."/fax_email_retry.sh\n");
 					fclose($fp);
-					$tmp_response = exec("chmod 777 ".$tmp_dir."/failed_fax_emails.sh");
+					$tmp_response = exec("chmod 777 ".$_SESSION['server']['temp']['dir']."/failed_fax_emails.sh");
 				// note we use batch in order to execute when system load is low.  Alternatively this could be replaced with AT.
-					$tmp_response = exec("batch -f ".$tmp_dir."/failed_fax_emails.sh now + 3 minutes");
+					$tmp_response = exec("batch -f ".$_SESSION['server']['temp']['dir']."/failed_fax_emails.sh now + 3 minutes");
 			}
 		}
 	}
 
 //open the file for writing
-	$fp = fopen($tmp_dir."/fax_to_email.log", "w");
+	$fp = fopen($_SESSION['server']['temp']['dir']."/fax_to_email.log", "w");
 //get the output from the buffer
 	$content = ob_get_contents();
 //clean the buffer
diff --git a/secure/v_mailto.php b/secure/v_mailto.php
index ec939232da..3275e49c12 100644
--- a/secure/v_mailto.php
+++ b/secure/v_mailto.php
@@ -24,18 +24,20 @@
 	Contributor(s):
 	Mark J Crane <markjcrane@fusionpbx.com>
 */
-include "v_config_cli.php";
 
 //set the include path
-	if(defined('STDIN')) {
+	if (defined('STDIN')) {
 		$document_root = str_replace("\\", "/", $_SERVER["PHP_SELF"]);
 		preg_match("/^(.*)\/secure\/.*$/", $document_root, $matches);
 		$document_root = $matches[1];
 		set_include_path($document_root);
-		//require_once "includes/require.php";
 		$_SERVER["DOCUMENT_ROOT"] = $document_root;
 	}
 
+//includes
+	if (!defined('STDIN')) { include "root.php"; }
+	require_once "includes/require.php";
+
 //set init settings
 	ini_set('max_execution_time',1800); //30 minutes
 	ini_set('memory_limit', '128M');
@@ -117,16 +119,19 @@ include "v_config_cli.php";
 	$mail = new PHPMailer();
 
 	$mail->IsSMTP();						// set mailer to use SMTP
-	if ($v_smtp_auth == "true") {
-		$mail->SMTPAuth = $v_smtp_auth;		// turn on/off SMTP authentication
+	if ($_SESSION['email']['smtp_auth']['var'] == "true") {
+		$mail->SMTPAuth = $_SESSION['email']['smtp_auth']['var'];		// turn on/off SMTP authentication
 	}
-	$mail->Host   = $v_smtp_host;
-	if (strlen($v_smtp_secure)>0) {
-		$mail->SMTPSecure = $v_smtp_secure;
+	$mail->Host   = $_SESSION['email']['smtp_host']['var'];
+	if ($_SESSION['email']['smtp_secure']['var'] == "none") {
+		$_SESSION['email']['smtp_secure']['var'] = '';
 	}
-	if ($v_smtp_username) {
-		$mail->Username = $v_smtp_username;
-		$mail->Password = $v_smtp_password;
+	if (strlen($_SESSION['email']['smtp_secure']['var']) > 0) {
+		$mail->SMTPSecure = $_SESSION['email']['smtp_secure']['var'];
+	}
+	if ($_SESSION['email']['smtp_username']['var']) {
+		$mail->Username = $_SESSION['email']['smtp_username']['var'];
+		$mail->Password = $_SESSION['email']['smtp_password']['var'];
 	}
 	$mail->SMTPDebug  = 2;
 
@@ -139,8 +144,8 @@ include "v_config_cli.php";
 	//echo "Body: ".$body."\n";
 
 //add to, from, fromname, and subject to the email
-	$mail->From       = $v_smtp_from;
-	$mail->FromName   = $v_smtp_from_name;
+	$mail->From       = $_SESSION['email']['smtp_from']['var'] ;
+	$mail->FromName   = $_SESSION['email']['smtp_from_name']['var'];
 	$mail->Subject    = $subject;
 
 	$to = trim($to, "<> ");