diff --git a/app/destinations/app_config.php b/app/destinations/app_config.php
index a549082ea1..93855d50e8 100644
--- a/app/destinations/app_config.php
+++ b/app/destinations/app_config.php
@@ -26,7 +26,7 @@
 		$apps[$x]['destinations'][$y]['label'] = "destinations";
 		$apps[$x]['destinations'][$y]['name'] = "destinations";
 		$apps[$x]['destinations'][$y]['sql'] = "select destination_number as destination, destination_context as context, destination_description as description from v_destinations ";
-		$apps[$x]['destinations'][$y]['where'] = "where domain_uuid = '\${domain_uuid}' and destination_type = 'outbound' and destination_enabled = 'true' ";
+		$apps[$x]['destinations'][$y]['where'] = "where (domain_uuid = '\${domain_uuid}' or domain_uuid is null) and destination_type = 'outbound' and destination_enabled = 'true' ";
 		$apps[$x]['destinations'][$y]['order_by'] = "destination_number asc";
 		$apps[$x]['destinations'][$y]['field']['uuid'] = "destination_uuid";
 		$apps[$x]['destinations'][$y]['field']['context'] = "destination_context";
diff --git a/app/destinations/destination_delete.php b/app/destinations/destination_delete.php
index 1dd17b38f6..d4120b937c 100644
--- a/app/destinations/destination_delete.php
+++ b/app/destinations/destination_delete.php
@@ -17,7 +17,7 @@
 
 	The Initial Developer of the Original Code is
 	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2016
+	Portions created by the Initial Developer are Copyright (C) 2008-2017
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -43,12 +43,12 @@
 	$text = $language->get();
 
 //get the ID
-	if (count($_GET) > 0) {
+	if (is_array($_GET)) {
 		$id = check_str($_GET["id"]);
 	}
 
 //if the ID is not set then exit
-	if (!isset($id)) {
+	if (!is_uuid($id)) {
 		echo "ID is required.";
 		exit;
 	}
@@ -82,22 +82,22 @@
 //delete the dialplan
 	if (isset($dialplan_uuid)) {
 		$sql = "delete from v_dialplan_details ";
-		$sql .= "where domain_uuid = '".$domain_uuid."' ";
-		$sql .= "and dialplan_uuid = '".$dialplan_uuid."' ";
+		$sql .= "where dialplan_uuid = '".$dialplan_uuid."' ";
+		//echo $sql."<br />\n";
 		$db->exec(check_sql($sql));
 		unset($sql);
 
 		$sql = "delete from v_dialplans ";
-		$sql .= "where domain_uuid = '".$domain_uuid."' ";
-		$sql .= "and dialplan_uuid = '".$dialplan_uuid."' ";
+		$sql .= "where dialplan_uuid = '".$dialplan_uuid."' ";
+		//echo $sql."<br />\n";
 		$db->exec(check_sql($sql));
 		unset($sql);
 	 }
 
 //delete the destination
 	$sql = "delete from v_destinations ";
-	$sql .= "where domain_uuid = '".$domain_uuid."' ";
-	$sql .= "and destination_uuid = '".$id."' ";
+	$sql .= "where destination_uuid = '".$id."' ";
+	echo $sql."<br />\n";
 	$db->exec(check_sql($sql));
 	unset($sql);
 
diff --git a/app/destinations/destination_edit.php b/app/destinations/destination_edit.php
index 2a2bf30703..6c700c55b3 100644
--- a/app/destinations/destination_edit.php
+++ b/app/destinations/destination_edit.php
@@ -17,7 +17,7 @@
 
 	The Initial Developer of the Original Code is
 	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2016
+	Portions created by the Initial Developer are Copyright (C) 2008-2017
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -114,6 +114,9 @@
 				$_POST["destination_uuid"] = $destination_uuid;
 			}
 
+		//set the default context
+			if ($destination_type =="outbound" && strlen($destination_context) == 0) { $destination_context = $_SESSION['domain_name']; }
+	
 		//check for all required data
 			$msg = '';
 			if (strlen($destination_type) == 0) { $msg .= $text['message-required']." ".$text['label-destination_type']."<br>\n"; }
@@ -274,7 +277,7 @@
 
 				//delete previous fax detection settings
 					$sql = "delete from v_dialplan_details ";
-					$sql .= "where domain_uuid = '".$domain_uuid."' ";
+					$sql .= "where (domain_uuid = '".$domain_uuid."' or domain_uuid is null) ";
 					$sql .= "and dialplan_uuid = '".$dialplan_uuid."' ";
 					$sql .= "and (";
 					$sql .= "	dialplan_detail_data like '%tone_detect%' ";
@@ -351,7 +354,7 @@
 				$sql = "delete from v_dialplan_details ";
 				$sql .= "where dialplan_uuid = '".$dialplan_uuid."' ";
 				if (!permission_exists('destination_domain')) {
-					$sql .= "and domain_uuid = '".$domain_uuid."' ";
+					$sql .= "where (domain_uuid = '".$domain_uuid."' or domain_uuid is null) ";
 				}
 				//echo $sql."<br><br>";
 				$db->exec(check_sql($sql));
@@ -502,6 +505,8 @@
 //set the defaults
 	if (strlen($destination_type) == 0) { $destination_type = 'inbound'; }
 	if (strlen($destination_context) == 0) { $destination_context = 'public'; }
+	if ($destination_type =="outbound" && $destination_context == "public") { $destination_context = $_SESSION['domain_name']; }
+	if ($destination_type =="outbound" && strlen($destination_context) == 0) { $destination_context = $_SESSION['domain_name']; }
 
 //show the header
 	require_once "resources/header.php";
@@ -525,7 +530,6 @@
 	echo "			if (document.getElementById('tr_buy')) { document.getElementById('tr_buy').style.display = 'none'; }\n";
 	echo "			if (document.getElementById('tr_carrier')) { document.getElementById('tr_carrier').style.display = 'none'; }\n";
 	echo "			document.getElementById('tr_account_code').style.display = 'none';\n";
-	echo "			document.getElementById('destination_context').value = '".$_SESSION['domain_name']."'";
 	echo "		}\n";
 	echo "		else if (dir == 'inbound') {\n";
 	echo "			if (document.getElementById('tr_caller_id_name')) { document.getElementById('tr_caller_id_name').style.display = ''; }\n";
diff --git a/app/destinations/destinations.php b/app/destinations/destinations.php
index ed537cce92..21597e9a11 100644
--- a/app/destinations/destinations.php
+++ b/app/destinations/destinations.php
@@ -17,22 +17,26 @@
 
 	The Initial Developer of the Original Code is
 	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2015
+	Portions created by the Initial Developer are Copyright (C) 2008-2017
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
 	Mark J Crane <markjcrane@fusionpbx.com>
 */
-require_once "root.php";
-require_once "resources/require.php";
-require_once "resources/check_auth.php";
-if (permission_exists('destination_view')) {
-	//access granted
-}
-else {
-	echo "access denied";
-	exit;
-}
+
+//includes
+	require_once "root.php";
+	require_once "resources/require.php";
+	require_once "resources/check_auth.php";
+
+//check permissions
+	if (permission_exists('destination_view')) {
+		//access granted
+	}
+	else {
+		echo "access denied";
+		exit;
+	}
 
 //add multi-lingual support
 	$language = new text;
@@ -55,7 +59,7 @@ else {
 			$sql .= "where ";
 		}
 	} else {
-		$sql .= "where domain_uuid = '".$domain_uuid."' ";
+		$sql .= "where (domain_uuid = '".$domain_uuid."' or domain_uuid is null) ";
 		if (strlen($search) > 0) {
 			$sql .= "and ";
 		}
@@ -97,7 +101,7 @@ else {
 			$sql .= " where ";
 		}
 	} else {
-		$sql .= "where domain_uuid = '$domain_uuid' ";
+		$sql .= "where (domain_uuid = '".$domain_uuid."' or domain_uuid is null) ";
 		if (strlen($search) > 0) {
 			$sql .= " and ";
 		}
@@ -225,4 +229,5 @@ else {
 
 //include the footer
 	require_once "resources/footer.php";
-?>
\ No newline at end of file
+
+?>
diff --git a/app/provision/app_config.php b/app/provision/app_config.php
index eb2bcc4dc0..18d08e93b3 100644
--- a/app/provision/app_config.php
+++ b/app/provision/app_config.php
@@ -361,5 +361,13 @@
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = '(*xxxxxxx|*xxxxxx|*xxxxx|*xxxx|*xxx|*xx*|*x|**xxxxx|**xxxx|**xxx|**xx|[3469]11|0|00|[2-9]xxxxxx|1xxx[2-9]xxxxxxS0|xxxxxxxxxxxx.)';
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = 'true';
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = '';
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = 'bf122bc9-c9bf-497c-9dda-95d125293eaf';
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = 'provision';
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = 'yealink_srtp_encryption';
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = 'text';
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = '0';
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = 'true';
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = '';
 
 ?>
diff --git a/app/system/app_languages.php b/app/system/app_languages.php
index 34aa9b8926..d91c386113 100644
--- a/app/system/app_languages.php
+++ b/app/system/app_languages.php
@@ -143,7 +143,7 @@ $text['label-switch']['uk'] = "перемикач";
 $text['label-switch']['de-at'] = "Schalter";
 $text['label-switch']['it-it'] = "Switch";
 
-$text['label-git_branch']['en-us'] = "Branch:";
+$text['label-git_branch']['en-us'] = "Branch";
 $text['label-git_branch']['es-cl'] = "Rama";
 $text['label-git_branch']['pt-pt'] = "Ramo";
 $text['label-git_branch']['fr-fr'] = "Une succursale";
@@ -152,9 +152,9 @@ $text['label-git_branch']['pl'] = "Gałąź";
 $text['label-git_branch']['sv-se'] = "Gren";
 $text['label-git_branch']['uk'] = "філія";
 $text['label-git_branch']['de-at'] = "Ast";
-$text['label-git_branch']['it-it'] = "Branch:";
+$text['label-git_branch']['it-it'] = "Branch";
 
-$text['label-git_commit']['en-us'] = "Commit:";
+$text['label-git_commit']['en-us'] = "Commit";
 $text['label-git_commit']['es-cl'] = "Cometer";
 $text['label-git_commit']['pt-pt'] = "cometer";
 $text['label-git_commit']['fr-fr'] = "Commettre";
@@ -163,9 +163,9 @@ $text['label-git_commit']['pl'] = "Popełnić";
 $text['label-git_commit']['sv-se'] = "Begå";
 $text['label-git_commit']['uk'] = "здійснити";
 $text['label-git_commit']['de-at'] = "Verpflichten";
-$text['label-git_commit']['it-it'] = "Commit:";
+$text['label-git_commit']['it-it'] = "Commit";
 
-$text['label-git_origin']['en-us'] = "Origin:";
+$text['label-git_origin']['en-us'] = "Origin";
 $text['label-git_origin']['es-cl'] = "Origen";
 $text['label-git_origin']['pt-pt'] = "Origem";
 $text['label-git_origin']['fr-fr'] = "Origine";
@@ -174,7 +174,18 @@ $text['label-git_origin']['pl'] = "Pochodzenie";
 $text['label-git_origin']['sv-se'] = "Ursprung";
 $text['label-git_origin']['uk'] = "походження";
 $text['label-git_origin']['de-at'] = "Herkunft";
-$text['label-git_origin']['it-it'] = "Origine:";
+$text['label-git_origin']['it-it'] = "Origine";
+
+$text['label-git_status']['en-us'] = "Status";
+$text['label-git_status']['es-cl'] = "Estado de";
+$text['label-git_status']['pt-pt'] = "Status do";
+$text['label-git_status']['fr-fr'] = "Statut";
+$text['label-git_status']['pt-br'] = "Status do";
+$text['label-git_status']['pl'] = "Status";
+$text['label-git_status']['sv-se'] = "Status";
+$text['label-git_status']['uk'] = "Статус";
+$text['label-git_status']['de-at'] = "Status";
+$text['label-git_status']['it-it'] = "Stato";
 
 $text['label-memcache_status']['en-us'] = "Memcache Status";
 $text['label-memcache_status']['es-cl'] = "Estado de Memcache";
diff --git a/app/system/system.php b/app/system/system.php
index 075ae9096c..96738976a8 100644
--- a/app/system/system.php
+++ b/app/system/system.php
@@ -89,20 +89,29 @@ $document['title'] = $text['title-sys-status'];
 		if(file_exists($git_path)){
 			$git_exe = 'git';
 			if (strtoupper(substr(PHP_OS, 0, 3)) === 'SUN') { $git_exe = shell_exec('which git'); }
+			shell_exec($git_exe.' --git-dir='.$git_path.' fetch');
 			$git_branch = shell_exec($git_exe.' --git-dir='.$git_path.' name-rev --name-only HEAD');
 			rtrim($git_branch);
 			$git_commit = shell_exec($git_exe.' --git-dir='.$git_path.' rev-parse HEAD');
 			rtrim($git_commit);
 			$git_origin = shell_exec($git_exe.' --git-dir='.$git_path.' config --get remote.origin.url');
-			rtrim($git_commit);
+			rtrim($git_origin);
+			$git_origin = preg_replace('/\.git$/','',$git_origin);
+			$git_status = shell_exec($git_exe.' --git-dir='.$git_path.' status | grep "Your branch"');
+			rtrim($git_status);
+			$git_age = shell_exec($git_exe.' --git-dir='.$git_path.' log --pretty=format:%at HEAD^!');
+			rtrim($git_age);
+			$git_date = DateTime::createFromFormat('U', $git_age);
+			$git_age = $git_date->diff(new DateTime('now'));
 			echo "<tr>\n";
 			echo "	<td width='20%' class=\"vncell\" style='text-align: left;'>\n";
 			echo "		".$text['label-git_info']."\n";
 			echo "	</td>\n";
 			echo "	<td class=\"row_style1\">\n";
-			echo "		".$text['label-git_branch']." ".$git_branch."<br>\n";
-			echo "		".$text['label-git_commit']." ".$git_commit."<br>\n";
-			echo "		".$text['label-git_origin']." ".$git_origin."<br>\n";
+			echo "		".$text['label-git_branch'].": ".$git_branch."<br>\n";
+			echo "		".$text['label-git_commit'].": <a href='$git_origin/commit/$git_commit'>".$git_commit."</a><br>\n";
+			echo "		".$text['label-git_origin'].": ".$git_origin."<br>\n";
+			echo "		".$text['label-git_status'].": ".$git_status.$git_age->format(' %R%a days ago')."<br>\n";
 			echo "	</td>\n";
 			echo "</tr>\n";
 		}
diff --git a/core/authentication/resources/classes/plugins/ldap.php b/core/authentication/resources/classes/plugins/ldap.php
index bcedd23153..aa69901f63 100644
--- a/core/authentication/resources/classes/plugins/ldap.php
+++ b/core/authentication/resources/classes/plugins/ldap.php
@@ -67,7 +67,7 @@ class plugin_ldap {
 					if ($bind) {
 						//connected and authorized
 						$user_authorized = true;
-						break;
+						exit;
 					}
 					else {
 						//connection failed
diff --git a/resources/install/scripts/app/ring_groups/index.lua b/resources/install/scripts/app/ring_groups/index.lua
index 6d2d7cda0d..760c1da47f 100644
--- a/resources/install/scripts/app/ring_groups/index.lua
+++ b/resources/install/scripts/app/ring_groups/index.lua
@@ -132,10 +132,10 @@ local log = require "resources.functions.log".ring_group
 --set the caller id
 	if (session:ready()) then
 		if (string.len(ring_group_cid_name_prefix) > 0) then
-			session:execute("set", "effective_caller_id_name="..ring_group_cid_name_prefix.."#"..caller_id_name);
+			session:execute("export", "effective_caller_id_name="..ring_group_cid_name_prefix.."#"..caller_id_name);
 		end
 		if (string.len(ring_group_cid_number_prefix) > 0) then
-			session:execute("set", "effective_caller_id_number="..ring_group_cid_number_prefix..caller_id_number);
+			session:execute("export", "effective_caller_id_number="..ring_group_cid_number_prefix..caller_id_number);
 		end
 	end
 
diff --git a/resources/install/scripts/app/voicemail/index.lua b/resources/install/scripts/app/voicemail/index.lua
index 98c1e98d0b..f0f1b61a34 100644
--- a/resources/install/scripts/app/voicemail/index.lua
+++ b/resources/install/scripts/app/voicemail/index.lua
@@ -423,7 +423,7 @@
 								if (storage_type == "base64") then
 									table.insert(sql, "message_base64, ");
 								end
-								if (transcribe_enabled == "true") then
+								if (transcribe_enabled == "true") and (voicemail_transcription_enabled == "true") then
 									table.insert(sql, "message_transcription, ");
 								end
 								table.insert(sql, "message_length ");
@@ -441,7 +441,7 @@
 								if (storage_type == "base64") then
 									table.insert(sql, ":message_base64, ");
 								end
-								if (transcribe_enabled == "true") then
+								if (transcribe_enabled == "true") and (voicemail_transcription_enabled == "true") then
 									table.insert(sql,  ":transcription, ");
 								end
 								table.insert(sql, ":message_length ");
diff --git a/resources/templates/provision/yealink/cp860/{$mac}.cfg b/resources/templates/provision/yealink/cp860/{$mac}.cfg
index f33b23f105..10a6b53e33 100644
--- a/resources/templates/provision/yealink/cp860/{$mac}.cfg
+++ b/resources/templates/provision/yealink/cp860/{$mac}.cfg
@@ -293,7 +293,7 @@ account.1.codec.12.rtpmap = 3
 ##                            Audio Advanced                                         ##
 #######################################################################################
 #Specify whether to encrypt the SIP messages; 0-Disabled (default), 1-Forced, 2-Negotiated;
-account.1.srtp_encryption =
+account.1.srtp_encryption = {$yealink_srtp_encryption}
 
 #Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60.
 account.1.ptime =
diff --git a/resources/templates/provision/yealink/t20p/{$mac}.cfg b/resources/templates/provision/yealink/t20p/{$mac}.cfg
index e80899b591..d35a1d197d 100644
--- a/resources/templates/provision/yealink/t20p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t20p/{$mac}.cfg
@@ -139,7 +139,7 @@ account.1.session_timer.refresher =
 account.1.enable_user_equal_phone =
 
 #Specify whether to encrypt the SIP messages; 0-Disabled, 1-Forced, 2-Negotiated;
-account.1.srtp_encryption =
+account.1.srtp_encryption = {$yealink_srtp_encryption}
 
 #Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60.
 account.1.ptime =
diff --git a/resources/templates/provision/yealink/t21p/{$mac}.cfg b/resources/templates/provision/yealink/t21p/{$mac}.cfg
index 964bcedf88..c394793340 100644
--- a/resources/templates/provision/yealink/t21p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t21p/{$mac}.cfg
@@ -293,7 +293,7 @@ account.1.codec.12.rtpmap = 3
 ##                            Audio Advanced                                         ##
 #######################################################################################
 #Specify whether to encrypt the SIP messages; 0-Disabled (default), 1-Forced, 2-Negotiated;
-account.1.srtp_encryption =
+account.1.srtp_encryption = {$yealink_srtp_encryption}
 
 #Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60.
 account.1.ptime =
diff --git a/resources/templates/provision/yealink/t22p/{$mac}.cfg b/resources/templates/provision/yealink/t22p/{$mac}.cfg
index 3e73c4b5ab..b2af609db7 100644
--- a/resources/templates/provision/yealink/t22p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t22p/{$mac}.cfg
@@ -140,7 +140,7 @@ account.1.session_timer.refresher =
 account.1.enable_user_equal_phone =
 
 #Specify whether to encrypt the SIP messages; 0-Disabled, 1-Forced, 2-Negotiated;
-account.1.srtp_encryption =
+account.1.srtp_encryption = {$yealink_srtp_encryption}
 
 #Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60.
 account.1.ptime =
diff --git a/resources/templates/provision/yealink/t23g/{$mac}.cfg b/resources/templates/provision/yealink/t23g/{$mac}.cfg
index 099384149c..30ed9d151f 100644
--- a/resources/templates/provision/yealink/t23g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t23g/{$mac}.cfg
@@ -291,7 +291,7 @@ account.1.codec.12.rtpmap = 3
 ##                            Audio Advanced                                         ##
 #######################################################################################
 #Specify whether to encrypt the SIP messages; 0-Disabled (default), 1-Forced, 2-Negotiated;
-account.1.srtp_encryption =
+account.1.srtp_encryption = {$yealink_srtp_encryption}
 
 #Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60.
 account.1.ptime =
diff --git a/resources/templates/provision/yealink/t23p/{$mac}.cfg b/resources/templates/provision/yealink/t23p/{$mac}.cfg
index 0dc960abec..de2cd6d32b 100644
--- a/resources/templates/provision/yealink/t23p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t23p/{$mac}.cfg
@@ -291,7 +291,7 @@ account.1.codec.12.rtpmap = 3
 ##                            Audio Advanced                                         ##
 #######################################################################################
 #Specify whether to encrypt the SIP messages; 0-Disabled (default), 1-Forced, 2-Negotiated;
-account.1.srtp_encryption =
+account.1.srtp_encryption = {$yealink_srtp_encryption}
 
 #Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60.
 account.1.ptime =
diff --git a/resources/templates/provision/yealink/t26p/{$mac}.cfg b/resources/templates/provision/yealink/t26p/{$mac}.cfg
index 6e6d0a8104..898937e8b5 100644
--- a/resources/templates/provision/yealink/t26p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t26p/{$mac}.cfg
@@ -139,7 +139,7 @@ account.1.session_timer.refresher =
 account.1.enable_user_equal_phone =
 
 #Specify whether to encrypt the SIP messages; 0-Disabled, 1-Forced, 2-Negotiated;
-account.1.srtp_encryption =
+account.1.srtp_encryption = {$yealink_srtp_encryption}
 
 #Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60.
 account.1.ptime =
diff --git a/resources/templates/provision/yealink/t27g/{$mac}.cfg b/resources/templates/provision/yealink/t27g/{$mac}.cfg
index d1765d6c67..a6c7cb4324 100644
--- a/resources/templates/provision/yealink/t27g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t27g/{$mac}.cfg
@@ -291,7 +291,7 @@ account.1.codec.12.rtpmap = 3
 ##                            Audio Advanced                                         ##
 #######################################################################################
 #Specify whether to encrypt the SIP messages; 0-Disabled (default), 1-Forced, 2-Negotiated;
-account.1.srtp_encryption =
+account.1.srtp_encryption = {$yealink_srtp_encryption}
 
 #Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60.
 account.1.ptime =
diff --git a/resources/templates/provision/yealink/t27p/{$mac}.cfg b/resources/templates/provision/yealink/t27p/{$mac}.cfg
index 099384149c..30ed9d151f 100644
--- a/resources/templates/provision/yealink/t27p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t27p/{$mac}.cfg
@@ -291,7 +291,7 @@ account.1.codec.12.rtpmap = 3
 ##                            Audio Advanced                                         ##
 #######################################################################################
 #Specify whether to encrypt the SIP messages; 0-Disabled (default), 1-Forced, 2-Negotiated;
-account.1.srtp_encryption =
+account.1.srtp_encryption = {$yealink_srtp_encryption}
 
 #Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60.
 account.1.ptime =
diff --git a/resources/templates/provision/yealink/t28p/{$mac}.cfg b/resources/templates/provision/yealink/t28p/{$mac}.cfg
index 7f9f2d4050..d34d1b04e0 100644
--- a/resources/templates/provision/yealink/t28p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t28p/{$mac}.cfg
@@ -140,7 +140,7 @@ account.1.session_timer.refresher =
 account.1.enable_user_equal_phone =
 
 #Specify whether to encrypt the SIP messages; 0-Disabled, 1-Forced, 2-Negotiated;
-account.1.srtp_encryption =
+account.1.srtp_encryption = {$yealink_srtp_encryption}
 
 #Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60.
 account.1.ptime =
diff --git a/resources/templates/provision/yealink/t29g/{$mac}.cfg b/resources/templates/provision/yealink/t29g/{$mac}.cfg
index b62071f0b4..f924db84ba 100644
--- a/resources/templates/provision/yealink/t29g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t29g/{$mac}.cfg
@@ -287,7 +287,7 @@ account.1.codec.12.rtpmap = 3
 ##                            Audio Advanced                                         ##
 #######################################################################################
 #Specify whether to encrypt the SIP messages; 0-Disabled (default), 1-Forced, 2-Negotiated;
-account.1.srtp_encryption =
+account.1.srtp_encryption = {$yealink_srtp_encryption}
 
 #Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60.
 account.1.ptime =
diff --git a/resources/templates/provision/yealink/t32g/{$mac}.cfg b/resources/templates/provision/yealink/t32g/{$mac}.cfg
index f0846e8723..a255847172 100644
--- a/resources/templates/provision/yealink/t32g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t32g/{$mac}.cfg
@@ -125,7 +125,7 @@ account.1.session_timer.refresher =
 account.1.enable_user_equal_phone =
 
 #Specify whether to encrypt the SIP messages; 0-Disabled, 1-Forced, 2-Negotiated;
-account.1.srtp_encryption =
+account.1.srtp_encryption = {$yealink_srtp_encryption}
 
 #Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60.
 account.1.ptime =
diff --git a/resources/templates/provision/yealink/t38g/{$mac}.cfg b/resources/templates/provision/yealink/t38g/{$mac}.cfg
index 9c0905082b..16f3ca5b9d 100644
--- a/resources/templates/provision/yealink/t38g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t38g/{$mac}.cfg
@@ -125,7 +125,7 @@ account.1.session_timer.refresher =
 account.1.enable_user_equal_phone =
 
 #Specify whether to encrypt the SIP messages; 0-Disabled, 1-Forced, 2-Negotiated;
-account.1.srtp_encryption =
+account.1.srtp_encryption = {$yealink_srtp_encryption}
 
 #Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60.
 account.1.ptime =
diff --git a/resources/templates/provision/yealink/t40p/{$mac}.cfg b/resources/templates/provision/yealink/t40p/{$mac}.cfg
index d1765d6c67..a6c7cb4324 100644
--- a/resources/templates/provision/yealink/t40p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t40p/{$mac}.cfg
@@ -291,7 +291,7 @@ account.1.codec.12.rtpmap = 3
 ##                            Audio Advanced                                         ##
 #######################################################################################
 #Specify whether to encrypt the SIP messages; 0-Disabled (default), 1-Forced, 2-Negotiated;
-account.1.srtp_encryption =
+account.1.srtp_encryption = {$yealink_srtp_encryption}
 
 #Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60.
 account.1.ptime =
diff --git a/resources/templates/provision/yealink/t41p/{$mac}.cfg b/resources/templates/provision/yealink/t41p/{$mac}.cfg
index 099384149c..30ed9d151f 100644
--- a/resources/templates/provision/yealink/t41p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t41p/{$mac}.cfg
@@ -291,7 +291,7 @@ account.1.codec.12.rtpmap = 3
 ##                            Audio Advanced                                         ##
 #######################################################################################
 #Specify whether to encrypt the SIP messages; 0-Disabled (default), 1-Forced, 2-Negotiated;
-account.1.srtp_encryption =
+account.1.srtp_encryption = {$yealink_srtp_encryption}
 
 #Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60.
 account.1.ptime =
diff --git a/resources/templates/provision/yealink/t42g/{$mac}.cfg b/resources/templates/provision/yealink/t42g/{$mac}.cfg
index 099384149c..30ed9d151f 100644
--- a/resources/templates/provision/yealink/t42g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t42g/{$mac}.cfg
@@ -291,7 +291,7 @@ account.1.codec.12.rtpmap = 3
 ##                            Audio Advanced                                         ##
 #######################################################################################
 #Specify whether to encrypt the SIP messages; 0-Disabled (default), 1-Forced, 2-Negotiated;
-account.1.srtp_encryption =
+account.1.srtp_encryption = {$yealink_srtp_encryption}
 
 #Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60.
 account.1.ptime =
diff --git a/resources/templates/provision/yealink/t46g/{$mac}.cfg b/resources/templates/provision/yealink/t46g/{$mac}.cfg
index 099384149c..30ed9d151f 100644
--- a/resources/templates/provision/yealink/t46g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t46g/{$mac}.cfg
@@ -291,7 +291,7 @@ account.1.codec.12.rtpmap = 3
 ##                            Audio Advanced                                         ##
 #######################################################################################
 #Specify whether to encrypt the SIP messages; 0-Disabled (default), 1-Forced, 2-Negotiated;
-account.1.srtp_encryption =
+account.1.srtp_encryption = {$yealink_srtp_encryption}
 
 #Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60.
 account.1.ptime =
diff --git a/resources/templates/provision/yealink/t46s/{$mac}.cfg b/resources/templates/provision/yealink/t46s/{$mac}.cfg
index d1765d6c67..a6c7cb4324 100644
--- a/resources/templates/provision/yealink/t46s/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t46s/{$mac}.cfg
@@ -291,7 +291,7 @@ account.1.codec.12.rtpmap = 3
 ##                            Audio Advanced                                         ##
 #######################################################################################
 #Specify whether to encrypt the SIP messages; 0-Disabled (default), 1-Forced, 2-Negotiated;
-account.1.srtp_encryption =
+account.1.srtp_encryption = {$yealink_srtp_encryption}
 
 #Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60.
 account.1.ptime =
diff --git a/resources/templates/provision/yealink/t48g/{$mac}.cfg b/resources/templates/provision/yealink/t48g/{$mac}.cfg
index 099384149c..30ed9d151f 100644
--- a/resources/templates/provision/yealink/t48g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t48g/{$mac}.cfg
@@ -291,7 +291,7 @@ account.1.codec.12.rtpmap = 3
 ##                            Audio Advanced                                         ##
 #######################################################################################
 #Specify whether to encrypt the SIP messages; 0-Disabled (default), 1-Forced, 2-Negotiated;
-account.1.srtp_encryption =
+account.1.srtp_encryption = {$yealink_srtp_encryption}
 
 #Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60.
 account.1.ptime =
diff --git a/resources/templates/provision/yealink/t48s/{$mac}.cfg b/resources/templates/provision/yealink/t48s/{$mac}.cfg
index d1765d6c67..a6c7cb4324 100644
--- a/resources/templates/provision/yealink/t48s/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t48s/{$mac}.cfg
@@ -291,7 +291,7 @@ account.1.codec.12.rtpmap = 3
 ##                            Audio Advanced                                         ##
 #######################################################################################
 #Specify whether to encrypt the SIP messages; 0-Disabled (default), 1-Forced, 2-Negotiated;
-account.1.srtp_encryption =
+account.1.srtp_encryption = {$yealink_srtp_encryption}
 
 #Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60.
 account.1.ptime =
diff --git a/resources/templates/provision/yealink/t49g/{$mac}.cfg b/resources/templates/provision/yealink/t49g/{$mac}.cfg
index c9ca1e84a5..5ef564ac8e 100644
--- a/resources/templates/provision/yealink/t49g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t49g/{$mac}.cfg
@@ -291,7 +291,7 @@ account.1.codec.12.rtpmap = 3
 ##                            Audio Advanced                                         ##
 #######################################################################################
 #Specify whether to encrypt the SIP messages; 0-Disabled (default), 1-Forced, 2-Negotiated;
-account.1.srtp_encryption =
+account.1.srtp_encryption = {$yealink_srtp_encryption}
 
 #Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60.
 account.1.ptime =
diff --git a/resources/templates/provision/yealink/vp530/{$mac}.cfg b/resources/templates/provision/yealink/vp530/{$mac}.cfg
index b6e2fd1e18..49f0c51b74 100644
--- a/resources/templates/provision/yealink/vp530/{$mac}.cfg
+++ b/resources/templates/provision/yealink/vp530/{$mac}.cfg
@@ -291,7 +291,7 @@ account.1.codec.12.rtpmap = 3
 ##                            Audio Advanced                                         ##
 #######################################################################################
 #Specify whether to encrypt the SIP messages; 0-Disabled (default), 1-Forced, 2-Negotiated;
-account.1.srtp_encryption =
+account.1.srtp_encryption = {$yealink_srtp_encryption}
 
 #Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60.
 account.1.ptime =
diff --git a/resources/templates/provision/yealink/w52p/{$mac}.cfg b/resources/templates/provision/yealink/w52p/{$mac}.cfg
index 290f16773e..73b2b0e8ec 100644
--- a/resources/templates/provision/yealink/w52p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/w52p/{$mac}.cfg
@@ -116,7 +116,7 @@ account.1.session_timer.refresher =
 account.1.enable_user_equal_phone =
 
 #Configure the way of encrypting the message; 0-Disabled (default), 1-Forced, 2-Negotiated;
-account.1.srtp_encryption =
+account.1.srtp_encryption = {$yealink_srtp_encryption}
 
 #Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60.
 account.1.ptime =