diff --git a/app/basic_operator_panel/app_config.php b/app/basic_operator_panel/app_config.php
index dba39c97a0..ab1473f8ab 100644
--- a/app/basic_operator_panel/app_config.php
+++ b/app/basic_operator_panel/app_config.php
@@ -57,4 +57,15 @@
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "operator_panel_on_demand";
 
-?>
+	//default settings
+		$y=0;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "569280f2-a433-4eaf-9c08-945efdc6cf8f";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "operator_panel";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "refresh";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "1500";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the refresh rate in seconds (<=120) or milliseconds (>=500).";
+		$y++;
+
+?>
\ No newline at end of file
diff --git a/app/basic_operator_panel/index.php b/app/basic_operator_panel/index.php
index a163b0ca26..49804a2186 100644
--- a/app/basic_operator_panel/index.php
+++ b/app/basic_operator_panel/index.php
@@ -64,7 +64,12 @@
 			}
 
 		//update the status
-			if (permission_exists("user_account_setting_edit")) {
+			if (permission_exists("user_setting_edit")) {
+				//add the user_edit permission
+				$p = new permissions;
+				$p->add("user_edit", "temp");
+
+				//update the database user_status
 				$array['users'][0]['user_uuid'] = $_SESSION['user']['user_uuid'];
 				$array['users'][0]['domain_uuid'] = $_SESSION['user']['domain_uuid'];
 				$array['users'][0]['user_status'] = $user_status;
@@ -72,6 +77,10 @@
 				$database->app_name = 'operator_panel';
 				$database->app_uuid = 'dd3d173a-5d51-4231-ab22-b18c5b712bb2';
 				$database->save($array);
+
+				//remove the temporary permission
+				$p->delete("user_edit", "temp");
+
 				unset($array);
 			}
 
@@ -185,8 +194,24 @@
 <script language="JavaScript" type="text/javascript" src="<?php echo PROJECT_PATH; ?>/resources/jquery/jquery-ui.min.js"></script>
 <script type="text/javascript">
 
+<?php
+//determine refresh rate
+$refresh_default = 1500; //milliseconds
+$refresh = is_numeric($_SESSION['operator_panel']['refresh']['numeric']) ? $_SESSION['operator_panel']['refresh']['numeric'] : $refresh_default;
+if ($refresh >= 0.5 && $refresh <= 120) { //convert seconds to milliseconds
+	$refresh = $refresh * 1000;
+}
+else if ($refresh < 0.5 || ($refresh > 120 && $refresh < 500)) {
+	$refresh = $refresh_default; //use default
+}
+else {
+	//>= 500, must be milliseconds
+}
+unset($refresh_default);
+?>
+
 //ajax refresh
-	var refresh = 1500;
+	var refresh = <?php echo $refresh; ?>;
 	var source_url = 'resources/content.php?' <?php if (isset($_GET['debug'])) { echo " + '&debug'"; } ?>;
 	var interval_timer_id;
 
diff --git a/app/basic_operator_panel/resources/content.php b/app/basic_operator_panel/resources/content.php
index 397bce9a88..e71a5d7492 100644
--- a/app/basic_operator_panel/resources/content.php
+++ b/app/basic_operator_panel/resources/content.php
@@ -82,7 +82,7 @@ echo "			<b>".$text['title-operator_panel']."</b>";
 echo "		</td>";
 echo "		<td valign='top' align='center' nowrap>";
 
-if (sizeof($_SESSION['user']['extensions']) > 0) {
+if (permission_exists("user_setting_edit") && sizeof($_SESSION['user']['extensions']) > 0) {
 	$status_options[1]['status'] = "Available";
 	$status_options[1]['label'] = $text['label-status_available'];
 	$status_options[1]['style'] = "op_btn_status_available";
@@ -377,7 +377,7 @@ if (is_array($activity)) foreach ($activity as $extension => $ext) {
 		//record
 		if (permission_exists('operator_panel_record') && $ext_state == 'active') {
 			$call_identifier_record = $ext['call_uuid'];
-			$rec_file = $_SESSION['switch']['recordings']['dir']."/archive/".date("Y")."/".date("M")."/".date("d")."/".escape($call_identifier_record).".wav";
+			$rec_file = $_SESSION['switch']['recordings']['dir']."/".$_SESSION['domain_name']."/archive/".date("Y")."/".date("M")."/".date("d")."/".escape($call_identifier_record).".wav";
 			if (file_exists($rec_file)) {
 				$block .= 		"<img src='resources/images/recording.png' style='width: 12px; height: 12px; border: none; margin: 4px 0px 0px 5px; cursor: help;' title=\"".$text['label-recording']."\" ".$onhover_pause_refresh.">";
 			}
diff --git a/app/bridges/bridge_edit.php b/app/bridges/bridge_edit.php
index a3e2b89218..49f2a7483d 100644
--- a/app/bridges/bridge_edit.php
+++ b/app/bridges/bridge_edit.php
@@ -124,6 +124,11 @@
 			$database->save($array);
 			$message = $database->message;
 
+		//clear the destinations session array
+			if (isset($_SESSION['destinations']['array'])) {
+				unset($_SESSION['destinations']['array']);
+			}
+
 		//redirect the user
 			if (isset($action)) {
 				if ($action == "add") {
diff --git a/app/bridges/resources/classes/bridges.php b/app/bridges/resources/classes/bridges.php
index 5254fe7d7b..f7797092e6 100644
--- a/app/bridges/resources/classes/bridges.php
+++ b/app/bridges/resources/classes/bridges.php
@@ -106,6 +106,11 @@ if (!class_exists('bridges')) {
 									$database->delete($array);
 									unset($array);
 
+								//clear the destinations session array
+									if (isset($_SESSION['destinations']['array'])) {
+										unset($_SESSION['destinations']['array']);
+									}
+
 								//set message
 									message::add($text['message-delete']);
 							}
@@ -174,6 +179,11 @@ if (!class_exists('bridges')) {
 									$database->save($array);
 									unset($array);
 
+								//clear the destinations session array
+									if (isset($_SESSION['destinations']['array'])) {
+										unset($_SESSION['destinations']['array']);
+									}
+
 								//set message
 									message::add($text['message-toggle']);
 							}
diff --git a/app/call_block/app_config.php b/app/call_block/app_config.php
index 66240bd553..4d5af2cadc 100644
--- a/app/call_block/app_config.php
+++ b/app/call_block/app_config.php
@@ -99,6 +99,10 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
 		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "primary";
 		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "call_block_direction";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Select the direction of the calls to block.";
+		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "extension_uuid";
 		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
 		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
@@ -113,11 +117,15 @@
 		$apps[$x]['db'][$y]['fields'][$z]['search'] = 'true';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the name.";
 		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "call_block_country_code";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "numeric";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the country code.";
+		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "call_block_number";
 		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "blocked_caller_number";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['search'] = 'true';
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the full phone number.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the phone number.";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "call_block_count";
 		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "blocked_call_count";
diff --git a/app/call_block/app_defaults.php b/app/call_block/app_defaults.php
index ad9a9495fb..a5ea0a330a 100644
--- a/app/call_block/app_defaults.php
+++ b/app/call_block/app_defaults.php
@@ -26,12 +26,12 @@
 
 if ($domains_processed == 1) {
 
-	  //create a view for call block
+	//create a view for call block
 		$database = new database;
 		$database->execute("DROP VIEW view_call_block;", null);
 		$sql = "CREATE VIEW view_call_block AS ( \n";
-		$sql .= "	select c.domain_uuid, call_block_uuid, c.extension_uuid, call_block_name, \n";
-		$sql .= "	call_block_number, extension, number_alias, call_block_count, call_block_app, call_block_data, date_added, call_block_enabled, call_block_description \n";
+		$sql .= "	select c.domain_uuid, call_block_uuid, c.call_block_direction, c.extension_uuid, c.call_block_name, c.call_block_country_code, \n";
+		$sql .= "	c.call_block_number, e.extension, e.number_alias, c.call_block_count, c.call_block_app, c.call_block_data, c.date_added, c.call_block_enabled, c.call_block_description \n";
 		$sql .= "	from v_call_block as c \n";
 		$sql .= " left join v_extensions as e \n";
 		$sql .= "	on c.extension_uuid = e.extension_uuid \n";
@@ -40,6 +40,12 @@ if ($domains_processed == 1) {
 		$database->execute($sql, null);
 		unset($sql);
 
+	//set call blocks to inbound if no direction defined
+		$sql = "update v_call_block set call_block_direction = 'inbound' where call_block_direction is null ";
+		$database = new database;
+		$database->execute($sql, null);
+		unset($sql);
+
 }
 
 ?>
diff --git a/app/call_block/app_languages.php b/app/call_block/app_languages.php
index 69c914bac4..264857a12a 100644
--- a/app/call_block/app_languages.php
+++ b/app/call_block/app_languages.php
@@ -120,7 +120,7 @@ $text['label-provide-number']['de-de'] = "Bitte geben Sie die Nummer an";
 $text['label-provide-number']['el-gr'] = "Εισάγετε: Αριθμό";
 $text['label-provide-number']['es-cl'] = "Por favor agregue: Número";
 $text['label-provide-number']['es-mx'] = "Por favor agregue: Número"; //copied from es-cl
-$text['label-provide-number']['fr-ca'] = "Merci d'indiquer: Numéro"; //copied from fr-fr
+$text['label-provide-number']['fr-ca'] = "S'il vous plaît indiquer: Numéro"; 
 $text['label-provide-number']['fr-fr'] = "Merci d'indiquer: Numéro";
 $text['label-provide-number']['he-il'] = "אנא הכנס מספר";
 $text['label-provide-number']['it-it'] = "Prego fornire: Numero";
@@ -142,7 +142,7 @@ $text['label-provide-name']['de-de'] = "Bitte geben Sie den Namen an";
 $text['label-provide-name']['el-gr'] = "Εισάγετε: Όνομα";
 $text['label-provide-name']['es-cl'] = "Por favor agregue: Nombre";
 $text['label-provide-name']['es-mx'] = "Por favor agregue: Nombre"; //copied from es-cl
-$text['label-provide-name']['fr-ca'] = "Merci d'indiquer: Nom"; //copied from fr-fr
+$text['label-provide-name']['fr-ca'] = "S'il vous plaît indiquer: Nom"; //copied from fr-fr
 $text['label-provide-name']['fr-fr'] = "Merci d'indiquer: Nom";
 $text['label-provide-name']['he-il'] = "אנא הכנס שם";
 $text['label-provide-name']['it-it'] = "Prego fornire: Nome";
@@ -164,7 +164,7 @@ $text['label-provide-enabled']['de-de'] = "Bitte geben Sie folgendes an: Aktiv";
 $text['label-provide-enabled']['el-gr'] = "Εισάγετε: Ενεργοποιημένο";
 $text['label-provide-enabled']['es-cl'] = "Por favor agregue: Activo";
 $text['label-provide-enabled']['es-mx'] = "Por favor agregue: Activo"; //copied from es-cl
-$text['label-provide-enabled']['fr-ca'] = "Merci d'indiquer: Actif"; //copied from fr-fr
+$text['label-provide-enabled']['fr-ca'] = "S'il vous plaît indiquer: Actif"; //copied from fr-fr
 $text['label-provide-enabled']['fr-fr'] = "Merci d'indiquer: Actif";
 $text['label-provide-enabled']['he-il'] = "";
 $text['label-provide-enabled']['it-it'] = "Prego fornire: Abilitazione";
@@ -177,6 +177,27 @@ $text['label-provide-enabled']['ru-ru'] = "Пожалуйста, введите:
 $text['label-provide-enabled']['sv-se'] = "Ange: Aktiverad";
 $text['label-provide-enabled']['uk-ua'] = "Включити/відключити";
 
+$text['label-country_code']['en-us'] = "Country Code";
+$text['label-country_code']['en-gb'] = "Country Code";
+$text['label-country_code']['ar-eg'] = "";
+$text['label-country_code']['de-at'] = ""; //copied from de-de
+$text['label-country_code']['de-ch'] = ""; //copied from de-de
+$text['label-country_code']['de-de'] = "";
+$text['label-country_code']['es-cl'] = "";
+$text['label-country_code']['es-mx'] = ""; //copied from es-cl
+$text['label-country_code']['fr-ca'] = "Préfixe"; //copied from fr-fr
+$text['label-country_code']['fr-fr'] = "Préfixe";
+$text['label-country_code']['he-il'] = "";
+$text['label-country_code']['it-it'] = "";
+$text['label-country_code']['nl-nl'] = "Voorloop";
+$text['label-country_code']['pl-pl'] = "";
+$text['label-country_code']['pt-br'] = "Prefixo"; //copied from pt-pt
+$text['label-country_code']['pt-pt'] = "";
+$text['label-country_code']['ro-ro'] = "";
+$text['label-country_code']['ru-ru'] = "";
+$text['label-country_code']['sv-se'] = "";
+$text['label-country_code']['uk-ua'] = "";
+
 $text['label-number']['en-us'] = "Number";
 $text['label-number']['en-gb'] = "Number";
 $text['label-number']['ar-eg'] = "رقم";
@@ -265,6 +286,48 @@ $text['label-inbound']['ru-ru'] = "Входящий";
 $text['label-inbound']['sv-se'] = "Inkommande";
 $text['label-inbound']['uk-ua'] = "Вихідний";
 
+$text['label-outbound']['en-us'] = "Outbound";
+$text['label-outbound']['en-gb'] = "Outbound";
+$text['label-outbound']['ar-eg'] = "";
+$text['label-outbound']['de-at'] = "Ausgehend"; //copied from de-de
+$text['label-outbound']['de-ch'] = "Ausgehend"; //copied from de-de
+$text['label-outbound']['de-de'] = "Ausgehend";
+$text['label-outbound']['es-cl'] = "Salida";
+$text['label-outbound']['es-mx'] = "Salida"; //copied from es-cl
+$text['label-outbound']['fr-ca'] = "Sortant"; //copied from fr-fr
+$text['label-outbound']['fr-fr'] = "Sortant";
+$text['label-outbound']['he-il'] = "";
+$text['label-outbound']['it-it'] = "In Uscita";
+$text['label-outbound']['nl-nl'] = "";
+$text['label-outbound']['pl-pl'] = "Wychodzące";
+$text['label-outbound']['pt-br'] = "Saída"; //copied from pt-pt
+$text['label-outbound']['pt-pt'] = "Saída";
+$text['label-outbound']['ro-ro'] = "";
+$text['label-outbound']['ru-ru'] = "Исходящие";
+$text['label-outbound']['sv-se'] = "Utgående";
+$text['label-outbound']['uk-ua'] = "";
+
+$text['label-destination']['en-us'] = "Destination";
+$text['label-destination']['en-gb'] = "Destination";
+$text['label-destination']['ar-eg'] = "";
+$text['label-destination']['de-at'] = "Ziel"; //copied from de-de
+$text['label-destination']['de-ch'] = "Ziel"; //copied from de-de
+$text['label-destination']['de-de'] = "Ziel";
+$text['label-destination']['es-cl'] = "Destino";
+$text['label-destination']['es-mx'] = "Destino"; //copied from es-cl
+$text['label-destination']['fr-ca'] = "Destination"; //copied from fr-fr
+$text['label-destination']['fr-fr'] = "Destination";
+$text['label-destination']['he-il'] = "";
+$text['label-destination']['it-it'] = "Destinazione";
+$text['label-destination']['nl-nl'] = "";
+$text['label-destination']['pl-pl'] = "Numer docelowy";
+$text['label-destination']['pt-br'] = "Número de destino";
+$text['label-destination']['pt-pt'] = "Destino";
+$text['label-destination']['ro-ro'] = "";
+$text['label-destination']['ru-ru'] = "Назначение";
+$text['label-destination']['sv-se'] = "Destination";
+$text['label-destination']['uk-ua'] = "Номер";
+
 $text['label-edit-note']['en-us'] = "Block calls from a number. Edit the name and enable/disable below.";
 $text['label-edit-note']['en-gb'] = "Block calls from a number. Edit the name and enable/disable below.";
 $text['label-edit-note']['ar-eg'] = "";
@@ -318,7 +381,7 @@ $text['label-edit-add']['de-de'] = "Sperrlisten";
 $text['label-edit-add']['el-gr'] = "Λίστα Απόρριψης";
 $text['label-edit-add']['es-cl'] = "Agregar bloqueo de llamada";
 $text['label-edit-add']['es-mx'] = "Agregar bloqueo de llamada"; //copied from es-cl
-$text['label-edit-add']['fr-ca'] = "Ajouter filtrage d'appel"; //copied from fr-fr
+$text['label-edit-add']['fr-ca'] = "Ajouter au filtrage d'appels"; //copied from fr-fr
 $text['label-edit-add']['fr-fr'] = "Ajouter filtrage d'appel";
 $text['label-edit-add']['he-il'] = "חסימת שיחה";
 $text['label-edit-add']['it-it'] = "Blocco Chiamate";
@@ -419,27 +482,27 @@ $text['label-count']['ru-ru'] = "Количество";
 $text['label-count']['sv-se'] = "Räkna";
 $text['label-count']['uk-ua'] = "Кількість";
 
-$text['label-called-on']['en-us'] = "Called on";
-$text['label-called-on']['en-gb'] = "Called on";
-$text['label-called-on']['ar-eg'] = "تم الأتصال علي";
-$text['label-called-on']['de-at'] = "Anruf am"; //copied from de-de
-$text['label-called-on']['de-ch'] = "Anruf am"; //copied from de-de
-$text['label-called-on']['de-de'] = "Anruf am";
-$text['label-called-on']['el-gr'] = "Η κλήση πραγματοποιήθηκε";
-$text['label-called-on']['es-cl'] = "Llamó en";
-$text['label-called-on']['es-mx'] = "Llamó en"; //copied from es-cl
-$text['label-called-on']['fr-ca'] = "Appelé le"; //copied from fr-fr
-$text['label-called-on']['fr-fr'] = "Appelé le";
-$text['label-called-on']['he-il'] = "Opgeroepen op";
-$text['label-called-on']['it-it'] = "Chiamato il";
-$text['label-called-on']['nl-nl'] = "Aangeroepen op";
-$text['label-called-on']['pl-pl'] = "Zadzwoniono na";
-$text['label-called-on']['pt-br'] = "Chamada em ";
-$text['label-called-on']['pt-pt'] = "Chamado em";
-$text['label-called-on']['ro-ro'] = "Sunat pe";
-$text['label-called-on']['ru-ru'] = "Направление";
-$text['label-called-on']['sv-se'] = "Ringdes på";
-$text['label-called-on']['uk-ua'] = "Дзвінок здійснено";
+$text['label-called']['en-us'] = "Called";
+$text['label-called']['en-gb'] = "Called";
+$text['label-called']['ar-eg'] = "تم الأتصال علي";
+$text['label-called']['de-at'] = "Anruf"; //copied from de-de
+$text['label-called']['de-ch'] = "Anruf"; //copied from de-de
+$text['label-called']['de-de'] = "Anruf";
+$text['label-called']['el-gr'] = "Η κλήση πραγματοποιήθηκε";
+$text['label-called']['es-cl'] = "Llamó";
+$text['label-called']['es-mx'] = "Llamó"; //copied from es-cl
+$text['label-called']['fr-ca'] = "Appelé"; //copied from fr-fr
+$text['label-called']['fr-fr'] = "Appelé";
+$text['label-called']['he-il'] = "Opgeroepen";
+$text['label-called']['it-it'] = "Chiamato";
+$text['label-called']['nl-nl'] = "Aangeroepen";
+$text['label-called']['pl-pl'] = "Zadzwoniono";
+$text['label-called']['pt-br'] = "Chamada";
+$text['label-called']['pt-pt'] = "Chamado";
+$text['label-called']['ro-ro'] = "Sunat";
+$text['label-called']['ru-ru'] = "Направление";
+$text['label-called']['sv-se'] = "Ringdes";
+$text['label-called']['uk-ua'] = "Дзвінок здійснено";
 
 $text['label-busy']['en-us'] = "Busy";
 $text['label-busy']['en-gb'] = "Busy";
@@ -573,6 +636,49 @@ $text['label-action']['ru-ru'] = "Действие";
 $text['label-action']['sv-se'] = "Åtgärd";
 $text['label-action']['uk-ua'] = "Дія";
 
+$text['label-direction']['en-us'] = "Direction";
+$text['label-direction']['en-gb'] = "Direction";
+$text['label-direction']['ar-eg'] = "";
+$text['label-direction']['de-at'] = "Richtung"; //copied from de-de
+$text['label-direction']['de-ch'] = "Richtung"; //copied from de-de
+$text['label-direction']['de-de'] = "Richtung";
+$text['label-direction']['es-cl'] = "Dirección";
+$text['label-direction']['es-mx'] = "Dirección"; //copied from es-cl
+$text['label-direction']['fr-ca'] = "Direction"; //copied from fr-fr
+$text['label-direction']['fr-fr'] = "Direction";
+$text['label-direction']['he-il'] = "";
+$text['label-direction']['it-it'] = "Direzione";
+$text['label-direction']['nl-nl'] = "";
+$text['label-direction']['pl-pl'] = "Kierunek";
+$text['label-direction']['pt-br'] = "Direção";
+$text['label-direction']['pt-pt'] = "Direcção";
+$text['label-direction']['ro-ro'] = "";
+$text['label-direction']['ru-ru'] = "Направление";
+$text['label-direction']['sv-se'] = "Riktning";
+$text['label-direction']['uk-ua'] = "Напрям";
+
+$text['description-direction']['en-us'] = "Select the direction of the calls to block.";
+$text['description-direction']['en-gb'] = "Select the direction of the calls to block.";
+$text['description-direction']['ar-eg'] = "Select the direction of the calls to block.";
+$text['description-direction']['de-at'] = "Select the direction of the calls to block.";
+$text['description-direction']['de-ch'] = "Select the direction of the calls to block.";
+$text['description-direction']['de-de'] = "Select the direction of the calls to block.";
+$text['description-direction']['el-gr'] = "Select the direction of the calls to block.";
+$text['description-direction']['es-cl'] = "Select the direction of the calls to block.";
+$text['description-direction']['es-mx'] = "Select the direction of the calls to block.";
+$text['description-direction']['fr-ca'] = "Sélectionnez la direction des appels à bloquer.";
+$text['description-direction']['fr-fr'] = "Sélectionnez la direction des appels à bloquer.";
+$text['description-direction']['he-il'] = "Select the direction of the calls to block.";
+$text['description-direction']['it-it'] = "Select the direction of the calls to block.";
+$text['description-direction']['nl-nl'] = "Select the direction of the calls to block.";
+$text['description-direction']['pl-pl'] = "Select the direction of the calls to block.";
+$text['description-direction']['pt-br'] = "Select the direction of the calls to block.";
+$text['description-direction']['pt-pt'] = "Select the direction of the calls to block.";
+$text['description-direction']['ro-ro'] = "Select the direction of the calls to block.";
+$text['description-direction']['ru-ru'] = "Select the direction of the calls to block.";
+$text['description-direction']['sv-se'] = "Select the direction of the calls to block.";
+$text['description-direction']['uk-ua'] = "Select the direction of the calls to block.";
+
 $text['description-call_block_name']['en-us'] = "Enter the Caller ID Name to block.";
 $text['description-call_block_name']['en-gb'] = "Enter the Caller ID Name to block.";
 $text['description-call_block_name']['ar-eg'] = "";
@@ -595,8 +701,29 @@ $text['description-call_block_name']['ru-ru'] = "";
 $text['description-call_block_name']['sv-se'] = "";
 $text['description-call_block_name']['uk-ua'] = "";
 
-$text['description-call_block_number']['en-us'] = "Enter the Caller ID Number to block.";
-$text['description-call_block_number']['en-gb'] = "Enter the Caller ID Number to block.";
+$text['description-country_code']['en-us'] = "Enter the Country Code prefix.";
+$text['description-country_code']['en-gb'] = "Enter the Country Code prefix.";
+$text['description-country_code']['ar-eg'] = "";
+$text['description-country_code']['de-at'] = ""; //copied from de-de
+$text['description-country_code']['de-ch'] = ""; //copied from de-de
+$text['description-country_code']['de-de'] = "";
+$text['description-country_code']['es-cl'] = "";
+$text['description-country_code']['es-mx'] = ""; //copied from es-cl
+$text['description-country_code']['fr-ca'] = "Entrez le préfixe de destination."; //copied from fr-fr
+$text['description-country_code']['fr-fr'] = "Entrez le préfixe de destination.";
+$text['description-country_code']['he-il'] = "";
+$text['description-country_code']['it-it'] = "";
+$text['description-country_code']['nl-nl'] = "Voer de bestemming prefix in.";
+$text['description-country_code']['pl-pl'] = "";
+$text['description-country_code']['pt-br'] = "Insira o prefixo do destino.";
+$text['description-country_code']['pt-pt'] = "";
+$text['description-country_code']['ro-ro'] = "";
+$text['description-country_code']['ru-ru'] = "";
+$text['description-country_code']['sv-se'] = "";
+$text['description-country_code']['uk-ua'] = "";
+
+$text['description-call_block_number']['en-us'] = "Enter the Country Code and Caller ID Number to block.";
+$text['description-call_block_number']['en-gb'] = "Enter the Country Code and Caller ID Number to block.";
 $text['description-call_block_number']['ar-eg'] = "";
 $text['description-call_block_number']['de-at'] = "";
 $text['description-call_block_number']['de-ch'] = "";
@@ -617,8 +744,8 @@ $text['description-call_block_number']['ru-ru'] = "";
 $text['description-call_block_number']['sv-se'] = "";
 $text['description-call_block_number']['uk-ua'] = "";
 
-$text['description-extension']['en-us'] = "Select the extension to block.";
-$text['description-extension']['en-gb'] = "Select the extension to block.";
+$text['description-extension']['en-us'] = "Select the extension to be affected.";
+$text['description-extension']['en-gb'] = "Select the extension to be affected.";
 $text['description-extension']['ar-eg'] = "";
 $text['description-extension']['de-at'] = "";
 $text['description-extension']['de-ch'] = "";
@@ -670,7 +797,7 @@ $text['description-call-block']['de-de'] = "Eine Liste von Nummern die gesperrt
 $text['description-call-block']['el-gr'] = "Μια λίστα από αριθμούς προς απόρριψη εισερχομένων κλήσεων.";
 $text['description-call-block']['es-cl'] = "Un listado de números desde los cuales se bloquean las llamadas";
 $text['description-call-block']['es-mx'] = "Un listado de números desde los cuales se bloquean las llamadas"; //copied from es-cl
-$text['description-call-block']['fr-ca'] = "Une liste de numéros depuis lesquels vous pouvez bloquer les appels"; //copied from fr-fr
+$text['description-call-block']['fr-ca'] = "Une liste de numéros à partir de laquelle vous pouvez bloquer les appels."; //copied from fr-fr
 $text['description-call-block']['fr-fr'] = "Une liste de numéros depuis lesquels vous pouvez bloquer les appels";
 $text['description-call-block']['he-il'] = "";
 $text['description-call-block']['it-it'] = "Una lista di numeri per cui è possibile bloccare le chiamate.";
@@ -714,8 +841,8 @@ $text['confirm-block']['de-de'] = "Do you really want to block this?";
 $text['confirm-block']['el-gr'] = "Do you really want to block this?";
 $text['confirm-block']['es-cl'] = "Do you really want to block this?";
 $text['confirm-block']['es-mx'] = "Do you really want to block this?";
-$text['confirm-block']['fr-ca'] = "Do you really want to block this?";
-$text['confirm-block']['fr-fr'] = "Do you really want to block this?";
+$text['confirm-block']['fr-ca'] = "Voulez-vous vraiment bloquer ceci?";
+$text['confirm-block']['fr-fr'] = "Voulez-vous vraiment bloquer ceci?";
 $text['confirm-block']['he-il'] = "Do you really want to block this?";
 $text['confirm-block']['it-it'] = "Do you really want to block this?";
 $text['confirm-block']['nl-nl'] = "Do you really want to block this?";
@@ -737,8 +864,8 @@ $text['button-block']['de-de'] = "Block";
 $text['button-block']['el-gr'] = "Block";
 $text['button-block']['es-cl'] = "Block";
 $text['button-block']['es-mx'] = "Block";
-$text['button-block']['fr-ca'] = "Block";
-$text['button-block']['fr-fr'] = "Block";
+$text['button-block']['fr-ca'] = "Bloquer";
+$text['button-block']['fr-fr'] = "Bloquer";
 $text['button-block']['he-il'] = "Block";
 $text['button-block']['it-it'] = "Block";
 $text['button-block']['nl-nl'] = "Block";
@@ -751,4 +878,4 @@ $text['button-block']['sv-se'] = "Block";
 $text['button-block']['uk-ua'] = "Block";
 $text['button-block']['tr-tr'] = "Block";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/call_block/call_block.php b/app/call_block/call_block.php
index bba27639d1..567b4dcdcb 100644
--- a/app/call_block/call_block.php
+++ b/app/call_block/call_block.php
@@ -23,8 +23,10 @@
 	Contributor(s):
 	Mark J Crane <markjcrane@fusionpbx.com>
 
-	Call Block is written by Gerrit Visser <gerrit308@gmail.com>
+	The original Call Block was written by Gerrit Visser <gerrit308@gmail.com> 
+	All of it has been rewritten over years.
 */
+
 //includes
 	require_once "root.php";
 	require_once "resources/require.php";
@@ -83,6 +85,7 @@
 	if (strlen($search) > 0) {
 		$sql_search = " (";
 		$sql_search .= "lower(call_block_name) like :search ";
+		$sql_search .= "or call_block_country_code like :search ";
 		$sql_search .= "or lower(call_block_number) like :search ";
 		$sql_search .= "or lower(call_block_description) like :search ";
 		$sql_search .= ") ";
@@ -91,7 +94,15 @@
 
 //prepare to page the results
 	$sql = "select count(*) from view_call_block ";
-	$sql .= "where domain_uuid = :domain_uuid ";
+	$sql .= "where true ";
+	if ($_GET['show'] == "all" && permission_exists('call_forward_all')) {
+		$sql .= "and (domain_uuid = :domain_uuid or domain_uuid is null) ";
+		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+	}
+	else {
+		$sql .= "and (domain_uuid = :domain_uuid) ";
+		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+	}
 	if (!permission_exists('call_block_all') && is_array($_SESSION['user']['extension']) && count($_SESSION['user']['extension']) > 0) {
 		$sql .= "and extension_uuid in (";
 		$x = 0;
@@ -106,13 +117,16 @@
 	if (isset($sql_search)) {
 		$sql .= "and ".$sql_search;
 	}
-	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 	$database = new database;
 	$num_rows = $database->select($sql, $parameters, 'column');
+	unset($parameters);
 
 //prepare to page the results
 	$rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50;
 	$param = "&search=".$search;
+	if ($_GET['show'] == "all" && permission_exists('call_forward_all')) {
+		$param .= "&show=all";
+	}
 	$page = $_GET['page'];
 	if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; }
 	list($paging_controls, $rows_per_page) = paging($num_rows, $param, $rows_per_page);
@@ -121,7 +135,15 @@
 
 //get the list
 	$sql = "select * from view_call_block ";
-	$sql .= "where domain_uuid = :domain_uuid ";
+	$sql .= "where true ";
+	if ($_GET['show'] == "all" && permission_exists('call_forward_all')) {
+		$sql .= "and (domain_uuid = :domain_uuid or domain_uuid is null) ";
+		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+	}
+	else {
+		$sql .= "and (domain_uuid = :domain_uuid) ";
+		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+	}
 	if (!permission_exists('call_block_all') && is_array($_SESSION['user']['extension']) && count($_SESSION['user']['extension']) > 0) {
 		$sql .= "and extension_uuid in (";
 		$x = 0;
@@ -136,7 +158,7 @@
 	if (isset($sql_search)) {
 		$sql .= "and ".$sql_search;
 	}
-	$sql .= order_by($order_by, $order, 'call_block_number');
+	$sql .= order_by($order_by, $order, ['call_block_country_code','call_block_number']);
 	$sql .= limit_offset($rows_per_page, $offset);
 	$database = new database;
 	$result = $database->select($sql, $parameters, 'all');
@@ -167,6 +189,14 @@
 		echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'name'=>'btn_delete','onclick'=>"modal_open('modal-delete','btn_delete');"]);
 	}
 	echo 		"<form id='form_search' class='inline' method='get'>\n";
+	if (permission_exists('call_forward_all')) {
+		if ($_GET['show'] == 'all') {
+			echo "		<input type='hidden' name='show' value='all'>";
+		}
+		else {
+			echo button::create(['type'=>'button','label'=>$text['button-show_all'],'icon'=>$_SESSION['theme']['button_icon_all'],'link'=>'?type='.urlencode($destination_type).'&show=all'.($search != '' ? "&search=".urlencode($search) : null)]);
+		}
+	}
 	echo 		"<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown='list_search_reset();'>";
 	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search','style'=>($search != '' ? 'display: none;' : null)]);
 	echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'call_block.php','style'=>($search == '' ? 'display: none;' : null)]);
@@ -202,8 +232,13 @@
 		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle();' ".($result ?: "style='visibility: hidden;'").">\n";
 		echo "	</th>\n";
 	}
-	echo th_order_by('extension', $text['label-extension'], $order_by, $order);
+	if ($_GET['show'] == 'all' && permission_exists('domain_all')) {
+		echo th_order_by('domain_name', $text['label-domain'], $order_by, $order);
+	}
+	echo th_order_by('call_block_direction', $text['label-direction'], $order_by, $order, null, "style='width: 1%;' class='center'");
+	echo th_order_by('extension', $text['label-extension'], $order_by, $order, null, "class='center'");
 	echo th_order_by('call_block_name', $text['label-name'], $order_by, $order);
+	echo th_order_by('call_block_country_code', $text['label-country_code'], $order_by, $order);
 	echo th_order_by('call_block_number', $text['label-number'], $order_by, $order);
 	echo th_order_by('call_block_count', $text['label-count'], $order_by, $order, '', "class='center hide-sm-dn'");
 	echo th_order_by('call_block_action', $text['label-action'], $order_by, $order);
@@ -228,7 +263,16 @@
 				echo "		<input type='hidden' name='call_blocks[".$x."][uuid]' value='".escape($row['call_block_uuid'])."' />\n";
 				echo "	</td>\n";
 			}
-			echo "	<td>";
+			if ($_GET['show'] == 'all' && permission_exists('domain_all')) {
+				echo "	<td>".escape($_SESSION['domains'][$row['domain_uuid']]['domain_name'])."</td>\n";
+			}
+			echo "	<td class='center'>";
+			switch ($row['call_block_direction']) {
+				case "inbound": echo "<img src='/themes/".$_SESSION['domain']['template']['name']."/images/icon_cdr_inbound_answered.png' style='border: none;' title='".$text['label-inbound']."'>\n"; break;
+				case "outbound": echo "<img src='/themes/".$_SESSION['domain']['template']['name']."/images/icon_cdr_outbound_answered.png' style='border: none;' title='".$text['label-outbound']."'>\n"; break;
+			}
+			echo "	</td>\n";
+			echo "	<td class='center'>";
 			if (strlen($row['extension']) == 0) {
 				echo $text['label-all'];
 			}
@@ -238,6 +282,14 @@
 			echo "	</td>\n";
 			echo "	<td>".escape($row['call_block_name'])."</td>\n";
 			echo "	<td>";
+			if (permission_exists('call_block_edit')) {
+				echo "<a href='".$list_row_url."'>".escape($row['call_block_country_code'])."</a>";
+			}
+			else {
+				echo escape($row['call_block_country_code']);
+			}
+			echo "	</td>\n";
+			echo "	<td>";
 			if (permission_exists('call_block_edit')) {
 				echo "<a href='".$list_row_url."'>".escape(format_phone($row['call_block_number']))."</a>";
 			}
diff --git a/app/call_block/call_block_edit.php b/app/call_block/call_block_edit.php
index 33e6581b43..29f43c779c 100644
--- a/app/call_block/call_block_edit.php
+++ b/app/call_block/call_block_edit.php
@@ -52,8 +52,10 @@
 
 //get http post variables and set them to php variables
 	if (count($_POST) > 0) {
+		$call_block_direction = $_POST["call_block_direction"];
 		$extension_uuid = $_POST["extension_uuid"];
 		$call_block_name = $_POST["call_block_name"];
+		$call_block_country_code = $_POST["call_block_country_code"];
 		$call_block_number = $_POST["call_block_number"];
 		$call_block_enabled = $_POST["call_block_enabled"];
 		$call_block_description = $_POST["call_block_description"];
@@ -83,6 +85,7 @@
 						$xml_cdrs = $_POST['xml_cdrs'];
 						if (permission_exists('call_block_add') && is_array($xml_cdrs) && @sizeof($xml_cdrs) != 0) {
 							$obj = new call_block;
+							$obj->call_block_direction = $call_block_direction;
 							$obj->extension_uuid = $extension_uuid;
 							$obj->call_block_app = $call_block_app;
 							$obj->call_block_data = $call_block_data;
@@ -160,10 +163,12 @@
 					if ($action == "add") {
 						$array['call_block'][0]['call_block_uuid'] = uuid();
 						$array['call_block'][0]['domain_uuid'] = $_SESSION['domain_uuid'];
+						$array['call_block'][0]['call_block_direction'] = $call_block_direction;
 						if (is_uuid($extension_uuid)) {
 							$array['call_block'][0]['extension_uuid'] = $extension_uuid;
 						}
 						$array['call_block'][0]['call_block_name'] = $call_block_name;
+						$array['call_block'][0]['call_block_country_code'] = $call_block_country_code;
 						$array['call_block'][0]['call_block_number'] = $call_block_number;
 						$array['call_block'][0]['call_block_count'] = 0;
 						$array['call_block'][0]['call_block_app'] = $call_block_app;
@@ -184,7 +189,7 @@
 						return;
 					}
 					if ($action == "update") {
-						$sql = "select c.call_block_number, d.domain_name ";
+						$sql = "select c.call_block_country_code, c.call_block_number, d.domain_name ";
 						$sql .= "from v_call_block as c ";
 						$sql .= "join v_domains as d on c.domain_uuid = d.domain_uuid ";
 						$sql .= "where c.domain_uuid = :domain_uuid ";
@@ -199,16 +204,18 @@
 
 							//clear the cache
 							$cache = new cache;
-							$cache->delete("app:call_block:".$domain_name.":".$call_block_number);
+							$cache->delete("app:call_block:".$domain_name.":".$call_block_country_code.$call_block_number);
 						}
 						unset($sql, $parameters);
 
 						$array['call_block'][0]['call_block_uuid'] = $call_block_uuid;
 						$array['call_block'][0]['domain_uuid'] = $_SESSION['domain_uuid'];
+						$array['call_block'][0]['call_block_direction'] = $call_block_direction;
 						if (is_uuid($extension_uuid)) {
 							$array['call_block'][0]['extension_uuid'] = $extension_uuid;
 						}
 						$array['call_block'][0]['call_block_name'] = $call_block_name;
+						$array['call_block'][0]['call_block_country_code'] = $call_block_country_code;
 						$array['call_block'][0]['call_block_number'] = $call_block_number;
 						$array['call_block'][0]['call_block_app'] = $call_block_app;
 						$array['call_block'][0]['call_block_data'] = $call_block_data;
@@ -241,8 +248,10 @@
 		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (is_array($row) && sizeof($row) != 0) {
+			$call_block_direction = $row["call_block_direction"];
 			$extension_uuid = $row["extension_uuid"];
 			$call_block_name = $row["call_block_name"];
+			$call_block_country_code = $row["call_block_country_code"];
 			$call_block_number = $row["call_block_number"];
 			$call_block_app = $row["call_block_app"];
 			$call_block_data = $row["call_block_data"];
@@ -318,6 +327,21 @@
 
 	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 
+	echo "<tr>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-direction']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' align='left'>\n";
+	echo "	<select class='formfld' name='call_block_direction'>\n";
+	echo "		<option value='inbound'>".$text['label-inbound']."</option>\n";
+	echo "		<option value='outbound' ".($call_block_direction == "outbound" ? "selected" : null).">".$text['label-outbound']."</option>\n";
+	echo "	</select>\n";
+	echo "<br />\n";
+	echo $text['description-direction']."\n";
+	echo "\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
 	if (permission_exists('call_block_all')) {
 		echo "<tr>\n";
 		echo "<td width='30%' class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
@@ -356,6 +380,7 @@
 	echo "	".$text['label-number']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
+	echo "	<input class='formfld' type='text' name='call_block_country_code' maxlength='6' style='width: 60px;' value=\"".escape($call_block_country_code)."\">\n";
 	echo "	<input class='formfld' type='text' name='call_block_number' maxlength='255' value=\"".escape($call_block_number)."\">\n";
 	echo "<br />\n";
 	echo $text['description-call_block_number']."\n";
@@ -460,57 +485,49 @@
 //get recent calls from the db (if not editing an existing call block record)
 	if (!is_uuid($_REQUEST["id"])) {
 
-		if (permission_exists('call_block_all')) {
-			$sql = "select caller_id_number, caller_id_name, caller_id_number, start_epoch, direction, hangup_cause, duration, billsec, xml_cdr_uuid ";
-			$sql .= "from v_xml_cdr where true ";
-			$sql .= "and domain_uuid = :domain_uuid ";
-			$sql .= "and direction != 'outbound' ";
-			$sql .= "order by start_stamp desc ";
-			$sql .= limit_offset($_SESSION['call_block']['recent_call_limit']['text']);
-			$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
-			$database = new database;
-			$result = $database->select($sql, $parameters);
-			unset($sql, $parameters);
-		}
-
+		//without block all permission, limit to assigned extension(s)
 		if (!permission_exists('call_block_all') && is_array($_SESSION['user']['extension'])) {
 			foreach ($_SESSION['user']['extension'] as $assigned_extension) {
 				$assigned_extensions[$assigned_extension['extension_uuid']] = $assigned_extension['user'];
 			}
-
-			$sql = "select caller_id_number, caller_id_name, caller_id_number, start_epoch, direction, hangup_cause, duration, billsec, xml_cdr_uuid ";
-			$sql .= "from v_xml_cdr ";
-			$sql .= "where domain_uuid = :domain_uuid ";
-				if (is_array($assigned_extensions) && sizeof($assigned_extensions) != 0) {
-					$x = 0;
-					foreach ($assigned_extensions as $assigned_extension_uuid => $assigned_extension) {
-						$sql_where_array[] = "extension_uuid = :extension_uuid_".$x;
-						//$sql_where_array[] = "caller_id_number = :caller_id_number_".$x;
-						//$sql_where_array[] = "destination_number = :destination_number_1_".$x;
-						//$sql_where_array[] = "destination_number = :destination_number_2_".$x;
-						$parameters['extension_uuid_'.$x] = $assigned_extension_uuid;
-						//$parameters['caller_id_number_'.$x] = $assigned_extension;
-						//$parameters['destination_number_1_'.$x] = $assigned_extension;
-						//$parameters['destination_number_2_'.$x] = '*99'.$assigned_extension;
-						$x++;
-					}
-					if (is_array($sql_where_array) && sizeof($sql_where_array) != 0) {
-						$sql .= "and (".implode(' or ', $sql_where_array).") ";
-					}
-					unset($sql_where_array);
+			if (is_array($assigned_extensions) && sizeof($assigned_extensions) != 0) {
+				$x = 0;
+				foreach ($assigned_extensions as $assigned_extension_uuid => $assigned_extension) {
+					$sql_where_array[] = "extension_uuid = :extension_uuid_".$x;
+					$parameters['extension_uuid_'.$x] = $assigned_extension_uuid;
+					$x++;
 				}
-			$sql .= "order by start_stamp desc";
-			$sql .= limit_offset($_SESSION['call_block']['recent_call_limit']['text']);
-			$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
-			$database = new database;
-			$result = $database->select($sql, $parameters, 'all');
+				if (is_array($sql_where_array) && sizeof($sql_where_array) != 0) {
+					$sql_where .= "and (".implode(' or ', $sql_where_array).") ";
+				}
+				unset($sql_where_array);
+			}
 		}
 
+		//get recent calls
+		$sql = "select caller_id_name, caller_id_number, caller_destination, start_epoch, direction, hangup_cause, duration, billsec, xml_cdr_uuid ";
+		$sql .= "from v_xml_cdr where domain_uuid = :domain_uuid ";
+		$sql .= "and direction <> 'local' ";
+		$sql .= $sql_where;
+		$sql .= "order by start_stamp desc ";
+		$sql .= limit_offset($_SESSION['call_block']['recent_call_limit']['text']);
+		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+		$database = new database;
+		$result = $database->select($sql, $parameters);
+		unset($sql, $parameters);
+
 		echo "<form id='form_list' method='post'>\n";
 		echo "<input type='hidden' id='action' name='action' value='add'>\n";
 
 		echo "<div class='action_bar' id='action_bar_sub'>\n";
-		echo "	<div class='heading'><b id='heading_sub'>".$text['heading-recent_calls']."</b></div>\n";
+		echo "	<div class='heading'>";
+		echo "		<b id='heading_sub'>".$text['heading-recent_calls']."</b>";
+		echo "		<select class='formfld' name='call_block_direction' style='margin-bottom: 6px; margin-left: 15px;' onchange=\"show_direction(this.options[this.selectedIndex].value);\">\n";
+		echo "			<option value='' disabled='disabled'>".$text['label-direction']."</option>\n";
+		echo "			<option value='inbound'>".$text['label-inbound']."</option>\n";
+		echo "			<option value='outbound'>".$text['label-outbound']."</option>\n";
+		echo "		</select>\n";
+		echo "	</div>\n";
 		echo "	<div class='actions'>\n";
 		echo button::create(['type'=>'button','id'=>'action_bar_sub_button_back','label'=>$text['button-back'],'icon'=>$_SESSION['theme']['button_icon_back'],'collapse'=>'hide-xs','style'=>'display: none;','link'=>'call_block.php']);
 		if ($result) {
@@ -539,83 +556,112 @@
 			echo modal::create(['id'=>'modal-block','type'=>'general','message'=>$text['confirm-block'],'actions'=>button::create(['type'=>'button','label'=>$text['button-continue'],'icon'=>'check','id'=>'btn_block','style'=>'float: right; margin-left: 15px;','collapse'=>'never','onclick'=>"modal_close(); list_form_submit('form_list');"])]);
 		}
 
-		echo "<table class='list'>\n";
-		echo "<tr class='list-header'>\n";
-		echo "	<th class='checkbox'>\n";
-		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle();' ".($result ?: "style='visibility: hidden;'").">\n";
-		echo "	</th>\n";
-		echo "<th style='width: 1%;'>&nbsp;</th>\n";
-		echo th_order_by('caller_id_name', $text['label-name'], $order_by, $order);
-		echo th_order_by('caller_id_number', $text['label-number'], $order_by, $order);
-		echo th_order_by('start_stamp', $text['label-called-on'], $order_by, $order);
-		echo th_order_by('duration', $text['label-duration'], $order_by, $order, null, "class='right hide-sm-dn'");
-		echo "</tr>";
+		foreach (['inbound','outbound'] as $direction) {
+			echo "<table class='list' id='list_".$direction."' ".($direction == 'outbound' ? "style='display: none;'" : null).">\n";
+			echo "<tr class='list-header'>\n";
+			echo "	<th class='checkbox'>\n";
+			echo "		<input type='checkbox' id='checkbox_all_".$direction."' name='checkbox_all' onclick=\"list_all_toggle('".$direction."');\" ".($result ?: "style='visibility: hidden;'").">\n";
+			echo "	</th>\n";
+			echo "<th style='width: 1%;'>&nbsp;</th>\n";
+			echo th_order_by('caller_id_name', $text['label-name'], $order_by, $order);
+			echo th_order_by('caller_id_number', $text['label-number'], $order_by, $order);
+			echo th_order_by('caller_id_number', $text['label-destination'], $order_by, $order);
+			echo th_order_by('start_stamp', $text['label-called'], $order_by, $order);
+			echo th_order_by('duration', $text['label-duration'], $order_by, $order, null, "class='right hide-sm-dn'");
+			echo "</tr>";
 
-		if (is_array($result) && @sizeof($result) != 0) {
-			$x = 0;
-			foreach ($result as $row) {
-				$list_row_onclick_uncheck = "if (!this.checked) { document.getElementById('checkbox_all').checked = false; }";
-				$list_row_onclick_toggle = "onclick=\"document.getElementById('checkbox_".$x."').checked = document.getElementById('checkbox_".$x."').checked ? false : true; ".$list_row_onclick_uncheck."\"";
-				if (strlen($row['caller_id_number']) >= 7) {
-					if ($_SESSION['domain']['time_format']['text'] == '24h') {
-						$tmp_start_epoch = date('j M Y', $row['start_epoch'])." <span class='hide-sm-dn'>".date('H:i:s', $row['start_epoch']).'</span>';
-					}
-					else {
-						$tmp_start_epoch = date('j M Y', $row['start_epoch'])." <span class='hide-sm-dn'>".date('h:i:s a', $row['start_epoch']).'</span>';
-					}
-					echo "<tr class='list-row' href='".$list_row_url."'>\n";
-					echo "	<td class='checkbox'>\n";
-					echo "		<input type='checkbox' name='xml_cdrs[$x][checked]' id='checkbox_".$x."' value='true' onclick=\"".$list_row_onclick_uncheck."\">\n";
-					echo "		<input type='hidden' name='xml_cdrs[$x][uuid]' value='".escape($row['xml_cdr_uuid'])."' />\n";
-					echo "	</td>\n";
-					if (
-						file_exists($_SERVER["DOCUMENT_ROOT"]."/themes/".$_SESSION['domain']['template']['name']."/images/icon_cdr_inbound_voicemail.png") &&
-						file_exists($_SERVER["DOCUMENT_ROOT"]."/themes/".$_SESSION['domain']['template']['name']."/images/icon_cdr_inbound_answered.png") &&
-						file_exists($_SERVER["DOCUMENT_ROOT"]."/themes/".$_SESSION['domain']['template']['name']."/images/icon_cdr_local_failed.png") &&
-						file_exists($_SERVER["DOCUMENT_ROOT"]."/themes/".$_SESSION['domain']['template']['name']."/images/icon_cdr_local_answered.png")
-						) {
-						echo "	<td class='center' ".$list_row_onclick_toggle.">";
-						switch ($row['direction']) {
-							case "inbound" :
-								if ($row['billsec'] == 0) {
-									echo "<img src='/themes/".$_SESSION['domain']['template']['name']."/images/icon_cdr_inbound_voicemail.png' style='border: none;' alt='".$text['label-inbound']." ".$text['label-missed']."'>\n";
+			if (is_array($result) && @sizeof($result) != 0) {
+				foreach ($result as $x => $row) {
+					if ($row['direction'] == $direction) {
+						$list_row_onclick_uncheck = "if (!this.checked) { document.getElementById('checkbox_all_".$direction."').checked = false; }";
+						$list_row_onclick_toggle = "onclick=\"document.getElementById('checkbox_".$x."').checked = document.getElementById('checkbox_".$x."').checked ? false : true; ".$list_row_onclick_uncheck."\"";
+						if (strlen($row['caller_id_number']) >= 7) {
+							if ($_SESSION['domain']['time_format']['text'] == '24h') {
+								$tmp_start_epoch = date('j M Y', $row['start_epoch'])." <span class='hide-sm-dn'>".date('H:i:s', $row['start_epoch']).'</span>';
+							}
+							else {
+								$tmp_start_epoch = date('j M Y', $row['start_epoch'])." <span class='hide-sm-dn'>".date('h:i:s a', $row['start_epoch']).'</span>';
+							}
+							echo "<tr class='list-row row_".$row['direction']."' href='".$list_row_url."'>\n";
+							echo "	<td class='checkbox'>\n";
+							echo "		<input type='checkbox' class='checkbox_".$row['direction']."' name='xml_cdrs[$x][checked]' id='checkbox_".$x."' value='true' onclick=\"".$list_row_onclick_uncheck."\">\n";
+							echo "		<input type='hidden' name='xml_cdrs[$x][uuid]' value='".escape($row['xml_cdr_uuid'])."' />\n";
+							echo "	</td>\n";
+							if (
+								file_exists($_SERVER["DOCUMENT_ROOT"]."/themes/".$_SESSION['domain']['template']['name']."/images/icon_cdr_inbound_voicemail.png") &&
+								file_exists($_SERVER["DOCUMENT_ROOT"]."/themes/".$_SESSION['domain']['template']['name']."/images/icon_cdr_inbound_answered.png") &&
+								file_exists($_SERVER["DOCUMENT_ROOT"]."/themes/".$_SESSION['domain']['template']['name']."/images/icon_cdr_outbound_failed.png") &&
+								file_exists($_SERVER["DOCUMENT_ROOT"]."/themes/".$_SESSION['domain']['template']['name']."/images/icon_cdr_outbound_answered.png")
+								) {
+								echo "	<td class='center' ".$list_row_onclick_toggle.">";
+								switch ($row['direction']) {
+									case "inbound":
+										if ($row['billsec'] == 0) {
+											$title_mod = " ".$text['label-missed'];
+											$file_mod = "_voicemail";
+										}
+										else {
+											$file_mod = "_answered";
+										}
+										echo "<img src='/themes/".$_SESSION['domain']['template']['name']."/images/icon_cdr_inbound".$file_mod.".png' style='border: none;' title='".$text['label-inbound'].$title_mod."'>\n";
+										break;
+									case "outbound":
+										if ($row['billsec'] == 0) {
+											$title_mod = " ".$text['label-failed'];
+											$file_mod = "_failed";
+										}
+										else {
+											$file_mod = "_answered";
+										}
+										echo "<img src='/themes/".$_SESSION['domain']['template']['name']."/images/icon_cdr_outbound".$file_mod.".png' style='border: none;' title='".$text['label-outbound'].$title_mod."'>\n";
+										break;
 								}
-								else {
-									echo "<img src='/themes/".$_SESSION['domain']['template']['name']."/images/icon_cdr_inbound_answered.png' style='border: none;' alt='".$text['label-inbound']."'>\n";
-								}
-								break;
-							case "local" :
-								if ($row['billsec'] == 0) {
-									echo "<img src='/themes/".$_SESSION['domain']['template']['name']."/images/icon_cdr_local_failed.png' style='border: none;' alt='".$text['label-local']." ".$text['label-failed']."'>\n";
-								}
-								else {
-									echo "<img src='/themes/".$_SESSION['domain']['template']['name']."/images/icon_cdr_local_answered.png' style='border: none;' alt='".$text['label-local']."'>\n";
-								}
-								break;
+								echo "	</td>\n";
+							}
+							else {
+								echo "	<td ".$list_row_onclick_toggle.">&nbsp;</td>";
+							}
+							echo "	<td ".$list_row_onclick_toggle.">".$row['caller_id_name']." </td>\n";
+							echo "	<td ".$list_row_onclick_toggle.">".format_phone($row['caller_id_number'])."</td>\n";
+							echo "	<td ".$list_row_onclick_toggle.">".format_phone($row['caller_destination'])."</td>\n";
+							echo "	<td class='no-wrap' ".$list_row_onclick_toggle.">".$tmp_start_epoch."</td>\n";
+							$seconds = ($row['hangup_cause'] == "ORIGINATOR_CANCEL") ? $row['duration'] : $row['billsec'];  //if they cancelled, show the ring time, not the bill time.
+							echo "	<td class='right hide-sm-dn' ".$list_row_onclick_toggle.">".gmdate("G:i:s", $seconds)."</td>\n";
+							echo "</tr>\n";
 						}
-						echo "	</td>\n";
 					}
-					else {
-						echo "	<td ".$list_row_onclick_toggle.">&nbsp;</td>";
-					}
-					echo "	<td ".$list_row_onclick_toggle.">".$row['caller_id_name']." </td>\n";
-					echo "	<td ".$list_row_onclick_toggle.">".format_phone($row['caller_id_number'])."</td>\n";
-					echo "	<td class='no-wrap' ".$list_row_onclick_toggle.">".$tmp_start_epoch."</td>\n";
-					$seconds = ($row['hangup_cause'] == "ORIGINATOR_CANCEL") ? $row['duration'] : $row['billsec'];  //if they cancelled, show the ring time, not the bill time.
-					echo "	<td class='right hide-sm-dn' ".$list_row_onclick_toggle.">".gmdate("G:i:s", $seconds)."</td>\n";
-					echo "</tr>\n";
-					$x++;
 				}
 			}
-			unset($result);
-
+			echo "</table>\n";
 		}
+		unset($result);
 
-		echo "</table>\n";
 		echo "<br />\n";
 		echo "<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
 		echo "</form>\n";
 
+		//handle hiding and showing of direction recent calls
+		echo "<script>\n";
+		echo "	function show_direction(direction) {\n";
+		echo "		//determine other direction\n";
+		echo "		direction_other = direction == 'inbound' ? 'outbound' : 'inbound';\n";
+
+		echo "		//hide other direction list\n";
+		echo "		document.getElementById('list_' + direction_other).style.display='none';\n";
+
+		echo "		//uncheck all checkboxes\n";
+		echo "		var checkboxes = document.querySelectorAll(\"input[type='checkbox']\")\n";
+		echo "		if (checkboxes.length > 0) {\n";
+		echo "			for (var i = 0; i < checkboxes.length; ++i) {\n";
+		echo "				checkboxes[i].checked = false;\n";
+		echo "			}\n";
+		echo "		}\n";
+
+		echo "		//show direction list\n";
+		echo "		document.getElementById('list_' + direction).style.display='inline';\n";
+		echo "	}\n";
+		echo "</script>\n";
+
 	}
 
 //make sub action bar sticky
@@ -639,4 +685,4 @@
 //include the footer
 	require_once "resources/footer.php";
 
-?>
+?>
\ No newline at end of file
diff --git a/app/call_block/resources/classes/call_block.php b/app/call_block/resources/classes/call_block.php
index fcb61a6555..947f123f65 100644
--- a/app/call_block/resources/classes/call_block.php
+++ b/app/call_block/resources/classes/call_block.php
@@ -23,6 +23,7 @@ if (!class_exists('call_block')) {
 		/**
 		 * declare public variables
 		 */
+		public $call_block_direction;
 		public $extension_uuid;
 		public $call_block_app;
 		public $call_block_data;
@@ -307,7 +308,7 @@ if (!class_exists('call_block')) {
 
 						//get the caller id info from cdrs
 							if (is_array($uuids) && @sizeof($uuids) != 0) {
-								$sql = "select caller_id_name, caller_id_number from v_xml_cdr ";
+								$sql = "select caller_id_name, caller_id_number, caller_destination from v_xml_cdr ";
 								$sql .= "where xml_cdr_uuid in (".implode(', ', $uuids).") ";
 								$database = new database;
 								$rows = $database->select($sql, $parameters, 'all');
@@ -322,11 +323,17 @@ if (!class_exists('call_block')) {
 										if (permission_exists('call_block_all')) {
 											$array['call_block'][$x]['call_block_uuid'] = uuid();
 											$array['call_block'][$x]['domain_uuid'] = $_SESSION['domain_uuid'];
+											$array['call_block'][$x]['call_block_direction'] = $this->call_block_direction;
 											if (is_uuid($this->extension_uuid)) {
 												$array['call_block'][$x]['extension_uuid'] = $this->extension_uuid;
 											}
-											$array['call_block'][$x]['call_block_name'] = trim($row["caller_id_name"]);
-											$array['call_block'][$x]['call_block_number'] = trim($row["caller_id_number"]);
+											if ($this->call_block_direction == 'inbound') {
+												$array['call_block'][$x]['call_block_name'] = trim($row["caller_id_name"]);
+												$array['call_block'][$x]['call_block_number'] = trim($row["caller_id_number"]);
+											}
+											if ($this->call_block_direction == 'outbound') {
+												$array['call_block'][$x]['call_block_number'] = trim($row["caller_destination"]);
+											}
 											$array['call_block'][$x]['call_block_count'] = 0;
 											$array['call_block'][$x]['call_block_app'] = $this->call_block_app;
 											$array['call_block'][$x]['call_block_data'] = $this->call_block_data;
@@ -340,9 +347,15 @@ if (!class_exists('call_block')) {
 													if (is_uuid($field['extension_uuid'])) {
 														$array['call_block'][$x]['call_block_uuid'] = uuid();
 														$array['call_block'][$x]['domain_uuid'] = $_SESSION['domain_uuid'];
+														$array['call_block'][$x]['call_block_direction'] = $this->call_block_direction;
 														$array['call_block'][$x]['extension_uuid'] = $field['extension_uuid'];
-														$array['call_block'][$x]['call_block_name'] = trim($row["caller_id_name"]);
-														$array['call_block'][$x]['call_block_number'] = trim($row["caller_id_number"]);
+														if ($this->call_block_direction == 'inbound') {
+															$array['call_block'][$x]['call_block_name'] = trim($row["caller_id_name"]);
+															$array['call_block'][$x]['call_block_number'] = trim($row["caller_id_number"]);
+														}
+														if ($this->call_block_direction == 'outbound') {
+															$array['call_block'][$x]['call_block_number'] = trim($row["caller_destination"]);
+														}
 														$array['call_block'][$x]['call_block_count'] = 0;
 														$array['call_block'][$x]['call_block_app'] = $this->call_block_app;
 														$array['call_block'][$x]['call_block_data'] = $this->call_block_data;
diff --git a/app/call_broadcast/app_config.php b/app/call_broadcast/app_config.php
index 315f60ae70..58f4dfe9be 100644
--- a/app/call_broadcast/app_config.php
+++ b/app/call_broadcast/app_config.php
@@ -155,5 +155,9 @@
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "broadcast_accountcode";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "broadcast_toll_allow";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
+		$z++;
 ?>
diff --git a/app/call_broadcast/call_broadcast_edit.php b/app/call_broadcast/call_broadcast_edit.php
index 43ce0b19a5..f224f243f9 100644
--- a/app/call_broadcast/call_broadcast_edit.php
+++ b/app/call_broadcast/call_broadcast_edit.php
@@ -103,6 +103,7 @@
 		$broadcast_avmd = $_POST["broadcast_avmd"];
 		$broadcast_destination_data = $_POST["broadcast_destination_data"];
 		$broadcast_description = $_POST["broadcast_description"];
+		$broadcast_toll_allow = $_POST["broadcast_toll_allow"];
 
 		if (if_group("superadmin")) {
 			$broadcast_accountcode = $_POST["broadcast_accountcode"];
@@ -234,6 +235,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 					$array['call_broadcasts'][0]['broadcast_destination_data'] = $broadcast_destination_data;
 					$array['call_broadcasts'][0]['broadcast_accountcode'] = $broadcast_accountcode;
 					$array['call_broadcasts'][0]['broadcast_description'] = $broadcast_description;
+					$array['call_broadcasts'][0]['broadcast_toll_allow'] = $broadcast_toll_allow;
 
 				//execute
 					$database = new database;
@@ -274,6 +276,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 			$broadcast_destination_data = $row["broadcast_destination_data"];
 			$broadcast_accountcode = $row["broadcast_accountcode"];
 			$broadcast_description = $row["broadcast_description"];
+			$broadcast_toll_allow = $row["broadcast_toll_allow"];
 		}
 		unset($sql, $parameters, $row);
 	}
@@ -493,6 +496,17 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</td>\n";
 	echo "</tr>\n";
 
+	echo "<tr>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-broadcast_toll_allow']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' align='left'>\n";
+	echo "	<input class='formfld' type='text' name='broadcast_toll_allow' maxlength='255' value=".escape($broadcast_toll_allow).">\n";
+	echo "<br />\n";
+	echo $text['description-broadcast_toll_allow']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+		
 	echo "<tr>\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap>\n";
 	echo "	".$text['label-description']."\n";
diff --git a/app/call_broadcast/call_broadcast_send.php b/app/call_broadcast/call_broadcast_send.php
index 51786bbcd0..8fdb40ee05 100644
--- a/app/call_broadcast/call_broadcast_send.php
+++ b/app/call_broadcast/call_broadcast_send.php
@@ -182,6 +182,7 @@
 							$channel_variables .= ",domain=".$_SESSION['domain_name'];
 							$channel_variables .= ",domain_name=".$_SESSION['domain_name'];
 							$channel_variables .= ",accountcode='$broadcast_accountcode'";
+							$channel_variables .= ",toll_allow='$broadcast_toll_allow'";
 							if ($broadcast_avmd == "true") {
 								$channel_variables .= ",execute_on_answer='avmd start'";
 							}
diff --git a/app/call_centers/app_config.php b/app/call_centers/app_config.php
index 2a0ebe4438..4cb5dc14a9 100644
--- a/app/call_centers/app_config.php
+++ b/app/call_centers/app_config.php
@@ -35,7 +35,7 @@
 		$apps[$x]['destinations'][$y]['type'] = "sql";
 		$apps[$x]['destinations'][$y]['label'] = "call_centers";
 		$apps[$x]['destinations'][$y]['name'] = "call_centers";
-		$apps[$x]['destinations'][$y]['sql'] = "select queue_extension as destination, queue_extension as extension, queue_description as  description from v_call_center_queues";
+		$apps[$x]['destinations'][$y]['sql'] = "select queue_name as name, queue_extension as destination, queue_extension as extension, queue_description as  description from v_call_center_queues";
 		$apps[$x]['destinations'][$y]['where'] = "where domain_uuid = '\${domain_uuid}' ";
 		$apps[$x]['destinations'][$y]['order_by'] = "queue_name asc";
 		$apps[$x]['destinations'][$y]['field']['name'] = "queue_name";
@@ -121,7 +121,6 @@
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
-		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "call_center_outbound_caller_id_name";
 		//$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		//$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
@@ -156,6 +155,14 @@
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = "1";
 		$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'] = "bc73c8eb-f3eb-4182-adc0-9ac5aeedae2a";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "call_center";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "agent_contact_method";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "user";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Options: user (default)";
 
 	//cache details
 		$apps[$x]['cache']['key'] = "dialplan.\${domain_name}";
@@ -254,6 +261,10 @@
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "agent_no_answer_delay_time";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "agent_record";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 
 		$y++;
 		$apps[$x]['db'][$y]['table']['name'] = "v_call_center_queues";
@@ -326,6 +337,10 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "queue_time_base_score_sec";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "numeric";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Used to set the time base score of the Call Center to prioritize one call center over another.";
+		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "queue_max_wait_time";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "numeric";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
diff --git a/app/call_centers/app_languages.php b/app/call_centers/app_languages.php
index b69d2c6f0a..c87041aea5 100644
--- a/app/call_centers/app_languages.php
+++ b/app/call_centers/app_languages.php
@@ -30,8 +30,8 @@ $text['title-call_center_tier_edit']['de-ch'] = "Callcenter Ebene"; //copied fro
 $text['title-call_center_tier_edit']['de-de'] = "Callcenter Ebene";
 $text['title-call_center_tier_edit']['es-cl'] = "Editar Nivel de Centro de Llamados";
 $text['title-call_center_tier_edit']['es-mx'] = "Editar Nivel de Centro de Llamados"; //copied from es-cl
-$text['title-call_center_tier_edit']['fr-ca'] = "Editer un Niveau du Centre d'Appel"; //copied from fr-fr
-$text['title-call_center_tier_edit']['fr-fr'] = "Editer un Niveau du Centre d'Appel";
+$text['title-call_center_tier_edit']['fr-ca'] = "Editer un niveau du centre d'appel";
+$text['title-call_center_tier_edit']['fr-fr'] = "Editer un niveau du Centre d'appel";
 $text['title-call_center_tier_edit']['he-il'] = "";
 $text['title-call_center_tier_edit']['it-it'] = "Tier del Call Center";
 $text['title-call_center_tier_edit']['nl-nl'] = "Call-center vergelijking";
@@ -177,8 +177,8 @@ $text['title-call_center_agent_status']['de-ch'] = "Callcenter Agenten Status";
 $text['title-call_center_agent_status']['de-de'] = "Callcenter Agenten Status";
 $text['title-call_center_agent_status']['es-cl'] = "Estado de Agente de Centro de Llamados";
 $text['title-call_center_agent_status']['es-mx'] = "Estado de Agente de Centro de Llamados"; //copied from es-cl
-$text['title-call_center_agent_status']['fr-ca'] = "Etat de l'Agent"; //copied from fr-fr
-$text['title-call_center_agent_status']['fr-fr'] = "Etat de l'Agent";
+$text['title-call_center_agent_status']['fr-ca'] = "État de l'agent"; 
+$text['title-call_center_agent_status']['fr-fr'] = "Etat de l'agent";
 $text['title-call_center_agent_status']['he-il'] = "";
 $text['title-call_center_agent_status']['it-it'] = "Stato Agenti Call Center";
 $text['title-call_center_agent_status']['nl-nl'] = "Call-Center agent status";
@@ -198,8 +198,8 @@ $text['title-call_center_agent_edit']['de-ch'] = "Callcenter Agenten"; //copied
 $text['title-call_center_agent_edit']['de-de'] = "Callcenter Agenten";
 $text['title-call_center_agent_edit']['es-cl'] = "Editar Agente de Centro de Llamados";
 $text['title-call_center_agent_edit']['es-mx'] = "Editar Agente de Centro de Llamados"; //copied from es-cl
-$text['title-call_center_agent_edit']['fr-ca'] = "Agent de centre d'appel"; //copied from fr-fr
-$text['title-call_center_agent_edit']['fr-fr'] = "Agent de centre d'appel";
+$text['title-call_center_agent_edit']['fr-ca'] = "Agent du centre d'appel"; 
+$text['title-call_center_agent_edit']['fr-fr'] = "Agent du centre d'appel";
 $text['title-call_center_agent_edit']['he-il'] = "";
 $text['title-call_center_agent_edit']['it-it'] = "Agente Call Center";
 $text['title-call_center_agent_edit']['nl-nl'] = "Call-Center Agent";
@@ -324,8 +324,8 @@ $text['option-top_down']['de-ch'] = "Absteigend"; //copied from de-de
 $text['option-top_down']['de-de'] = "Absteigend";
 $text['option-top_down']['es-cl'] = "Top Down";
 $text['option-top_down']['es-mx'] = "Top Down"; //copied from es-cl
-$text['option-top_down']['fr-ca'] = "Haut bas"; //copied from fr-fr
-$text['option-top_down']['fr-fr'] = "Haut bas";
+$text['option-top_down']['fr-ca'] = "Du haut vers le bas"; 
+$text['option-top_down']['fr-fr'] = "Du haut vers le bas";
 $text['option-top_down']['he-il'] = "";
 $text['option-top_down']['it-it'] = "Dall'alto al basso";
 $text['option-top_down']['nl-nl'] = "Hoog->Laag";
@@ -450,8 +450,8 @@ $text['option-ring_all']['de-ch'] = "Alle läuten"; //copied from de-de
 $text['option-ring_all']['de-de'] = "Alle läuten";
 $text['option-ring_all']['es-cl'] = "Sonar todos";
 $text['option-ring_all']['es-mx'] = "Sonar todos"; //copied from es-cl
-$text['option-ring_all']['fr-ca'] = "Sonner tous"; //copied from fr-fr
-$text['option-ring_all']['fr-fr'] = "Sonner tous";
+$text['option-ring_all']['fr-ca'] = "Sonner partout"; //copied from fr-fr
+$text['option-ring_all']['fr-fr'] = "Sonner partout";
 $text['option-ring_all']['he-il'] = "";
 $text['option-ring_all']['it-it'] = "Squillano tutti";
 $text['option-ring_all']['nl-nl'] = "Allen gelijktijdig";
@@ -534,7 +534,7 @@ $text['option-on_break']['de-ch'] = "In Pause"; //copied from de-de
 $text['option-on_break']['de-de'] = "In Pause";
 $text['option-on_break']['es-cl'] = "En Pausa";
 $text['option-on_break']['es-mx'] = "En Pausa"; //copied from es-cl
-$text['option-on_break']['fr-ca'] = "En Pause"; //copied from fr-fr
+$text['option-on_break']['fr-ca'] = "En pause"; 
 $text['option-on_break']['fr-fr'] = "En Pause";
 $text['option-on_break']['he-il'] = "";
 $text['option-on_break']['it-it'] = "In Pausa";
@@ -555,7 +555,7 @@ $text['option-no_change']['de-ch'] = "Keine Änderung"; //copied from de-de
 $text['option-no_change']['de-de'] = "Keine Änderung";
 $text['option-no_change']['es-cl'] = "Sin Cambios";
 $text['option-no_change']['es-mx'] = "Sin Cambios"; //copied from es-cl
-$text['option-no_change']['fr-ca'] = "Pas de Changement"; //copied from fr-fr
+$text['option-no_change']['fr-ca'] = "Pas de changement"; 
 $text['option-no_change']['fr-fr'] = "Pas de Changement";
 $text['option-no_change']['he-il'] = "";
 $text['option-no_change']['it-it'] = "Nessun Cambiamento";
@@ -576,8 +576,8 @@ $text['option-longest_idle_agent']['de-ch'] = "Agent mit der höchsten Wartezeit
 $text['option-longest_idle_agent']['de-de'] = "Agent mit der höchsten Wartezeit";
 $text['option-longest_idle_agent']['es-cl'] = "Agente desocupado por más tiempo";
 $text['option-longest_idle_agent']['es-mx'] = "Agente desocupado por más tiempo"; //copied from es-cl
-$text['option-longest_idle_agent']['fr-ca'] = "Agent logué depuis le plus lontemps"; //copied from fr-fr
-$text['option-longest_idle_agent']['fr-fr'] = "Agent logué depuis le plus lontemps";
+$text['option-longest_idle_agent']['fr-ca'] = "Agent inactif le plus longtemps";
+$text['option-longest_idle_agent']['fr-fr'] = "Agent inactif le plus longtemps";
 $text['option-longest_idle_agent']['he-il'] = "";
 $text['option-longest_idle_agent']['it-it'] = "Da più tempo libero";
 $text['option-longest_idle_agent']['nl-nl'] = "Langst wachtende agent";
@@ -702,8 +702,8 @@ $text['option-do_not_disturb']['de-ch'] = "Bitte nicht stören"; //copied from d
 $text['option-do_not_disturb']['de-de'] = "Bitte nicht stören";
 $text['option-do_not_disturb']['es-cl'] = "No Molestar";
 $text['option-do_not_disturb']['es-mx'] = "No Molestar"; //copied from es-cl
-$text['option-do_not_disturb']['fr-ca'] = "Ne Pas Derranger"; //copied from fr-fr
-$text['option-do_not_disturb']['fr-fr'] = "Ne Pas Derranger";
+$text['option-do_not_disturb']['fr-ca'] = "Ne pas déranger"; //copied from fr-fr
+$text['option-do_not_disturb']['fr-fr'] = "Ne pas déranger";
 $text['option-do_not_disturb']['he-il'] = "";
 $text['option-do_not_disturb']['it-it'] = "Non Disturbare";
 $text['option-do_not_disturb']['nl-nl'] = "Niet Storen";
@@ -723,8 +723,8 @@ $text['option-available_on_demand']['de-ch'] = "Verfügbar (auf Anfrage)"; //cop
 $text['option-available_on_demand']['de-de'] = "Verfügbar (auf Anfrage)";
 $text['option-available_on_demand']['es-cl'] = "Disponible (Bajo Demanda)";
 $text['option-available_on_demand']['es-mx'] = "Disponible (Bajo Demanda)"; //copied from es-cl
-$text['option-available_on_demand']['fr-ca'] = "Disponible (Sur Demande)"; //copied from fr-fr
-$text['option-available_on_demand']['fr-fr'] = "Disponible (Sur Demande)";
+$text['option-available_on_demand']['fr-ca'] = "Disponible (sur demande)";
+$text['option-available_on_demand']['fr-fr'] = "Disponible (sur demande)";
 $text['option-available_on_demand']['he-il'] = "";
 $text['option-available_on_demand']['it-it'] = "Disponibile (Su Richiesta)";
 $text['option-available_on_demand']['nl-nl'] = "beschikbaar (op aanvraag)";
@@ -765,8 +765,8 @@ $text['option-agent_with_least_talk_time']['de-ch'] = "Agent mit geringster Spre
 $text['option-agent_with_least_talk_time']['de-de'] = "Agent mit geringster Sprechzeit";
 $text['option-agent_with_least_talk_time']['es-cl'] = "Agente con el menor tiempo de comunicación";
 $text['option-agent_with_least_talk_time']['es-mx'] = "Agente con el menor tiempo de comunicación"; //copied from es-cl
-$text['option-agent_with_least_talk_time']['fr-ca'] = "Agent ayant le plus petit temps de parole"; //copied from fr-fr
-$text['option-agent_with_least_talk_time']['fr-fr'] = "Agent ayant le plus petit temps de parole";
+$text['option-agent_with_least_talk_time']['fr-ca'] = "Agent avec le moins de temps de conversation";
+$text['option-agent_with_least_talk_time']['fr-fr'] = "Agent avec le moins de temps de conversation";
 $text['option-agent_with_least_talk_time']['he-il'] = "";
 $text['option-agent_with_least_talk_time']['it-it'] = "Agent che ha parlato di meno";
 $text['option-agent_with_least_talk_time']['nl-nl'] = "Agent met kostste gesprekstijd";
@@ -807,7 +807,7 @@ $text['message-maximum_queues']['de-ch'] = "Maximale Anzahl Warteschlangen:"; //
 $text['message-maximum_queues']['de-de'] = "Maximale Anzahl Warteschlangen:";
 $text['message-maximum_queues']['es-cl'] = "Colas Máximo Permitido:";
 $text['message-maximum_queues']['es-mx'] = "Colas Máximo Permitido:"; //copied from es-cl
-$text['message-maximum_queues']['fr-ca'] = "Files d'attente Maximum Autorisé:"; //copied from fr-fr
+$text['message-maximum_queues']['fr-ca'] = "Files d'attente maximum autorisé:";
 $text['message-maximum_queues']['fr-fr'] = "Files d'attente Maximum Autorisé:";
 $text['message-maximum_queues']['he-il'] = "";
 $text['message-maximum_queues']['it-it'] = "Massimo Code:";
@@ -828,8 +828,8 @@ $text['message-duplicate_agent_id']['de-ch'] = "Agenten ID bereits vorhanden"; /
 $text['message-duplicate_agent_id']['de-de'] = "Agenten ID bereits vorhanden";
 $text['message-duplicate_agent_id']['es-cl'] = "Duplicar ID de Agente detectada";
 $text['message-duplicate_agent_id']['es-mx'] = "Duplicar ID de Agente detectada"; //copied from es-cl
-$text['message-duplicate_agent_id']['fr-ca'] = "Dupliquer Agent ID détecté"; //copied from fr-fr
-$text['message-duplicate_agent_id']['fr-fr'] = "Dupliquer Agent ID détecté";
+$text['message-duplicate_agent_id']['fr-ca'] = "ID d'agent duplicat détecté"; 
+$text['message-duplicate_agent_id']['fr-fr'] = "ID d'agent duplicat détecté";
 $text['message-duplicate_agent_id']['he-il'] = "";
 $text['message-duplicate_agent_id']['it-it'] = "Rilevato ID Agente Duplicato";
 $text['message-duplicate_agent_id']['nl-nl'] = "Duplicaat Agent ID ontdekt";
@@ -849,8 +849,8 @@ $text['label-wrap_up_time']['de-ch'] = "Nachbereitungszeit"; //copied from de-de
 $text['label-wrap_up_time']['de-de'] = "Nachbereitungszeit";
 $text['label-wrap_up_time']['es-cl'] = "Tiempo de Preparación";
 $text['label-wrap_up_time']['es-mx'] = "Tiempo de Preparación"; //copied from es-cl
-$text['label-wrap_up_time']['fr-ca'] = "temps de Wrap Up"; //copied from fr-fr
-$text['label-wrap_up_time']['fr-fr'] = "temps de Wrap Up";
+$text['label-wrap_up_time']['fr-ca'] = "Temps de clôture";
+$text['label-wrap_up_time']['fr-fr'] = "Temps de clôture";
 $text['label-wrap_up_time']['he-il'] = "";
 $text['label-wrap_up_time']['it-it'] = "Wrap Up Time";
 $text['label-wrap_up_time']['nl-nl'] = "Afrondtijd";
@@ -870,8 +870,8 @@ $text['label-type']['de-ch'] = "Typ"; //copied from de-de
 $text['label-type']['de-de'] = "Typ";
 $text['label-type']['es-cl'] = "Tipo";
 $text['label-type']['es-mx'] = "Tipo"; //copied from es-cl
-$text['label-type']['fr-ca'] = "Type"; //copied from fr-fr
-$text['label-type']['fr-fr'] = "Type";
+$text['label-type']['fr-ca'] = "Genre";
+$text['label-type']['fr-fr'] = "Genre";
 $text['label-type']['he-il'] = "";
 $text['label-type']['it-it'] = "Tipo";
 $text['label-type']['nl-nl'] = "Type";
@@ -891,7 +891,7 @@ $text['label-timeout_action']['de-ch'] = "Aktion bei Zeitüberschreitung"; //cop
 $text['label-timeout_action']['de-de'] = "Aktion bei Zeitüberschreitung";
 $text['label-timeout_action']['es-cl'] = "Acción de Timeout";
 $text['label-timeout_action']['es-mx'] = "Acción de Timeout"; //copied from es-cl
-$text['label-timeout_action']['fr-ca'] = "Action sur Timeout"; //copied from fr-fr
+$text['label-timeout_action']['fr-ca'] = "Action si délai d'attente excédé";
 $text['label-timeout_action']['fr-fr'] = "Action sur Timeout";
 $text['label-timeout_action']['he-il'] = "";
 $text['label-timeout_action']['it-it'] = "Azione al Timeout";
@@ -912,8 +912,8 @@ $text['label-time_base_score']['de-ch'] = "Zeitgeber für Klassifikation"; //cop
 $text['label-time_base_score']['de-de'] = "Zeitgeber für Klassifikation";
 $text['label-time_base_score']['es-cl'] = "Puntuación basada en tiempo";
 $text['label-time_base_score']['es-mx'] = "Puntuación basada en tiempo"; //copied from es-cl
-$text['label-time_base_score']['fr-ca'] = "Score Basé sur le Temps"; //copied from fr-fr
-$text['label-time_base_score']['fr-fr'] = "Score Basé sur le Temps";
+$text['label-time_base_score']['fr-ca'] = "Score basé sur le temps";
+$text['label-time_base_score']['fr-fr'] = "Score Basé sur le temps";
 $text['label-time_base_score']['he-il'] = "";
 $text['label-time_base_score']['it-it'] = "Punteggio su Base Tempo";
 $text['label-time_base_score']['nl-nl'] = "Tijd basis score";
@@ -925,6 +925,27 @@ $text['label-time_base_score']['ru-ru'] = "Оценка по времени";
 $text['label-time_base_score']['sv-se'] = "Tidsbaserat Resultat";
 $text['label-time_base_score']['uk-ua'] = "";
 
+$text['label-time_base_score_sec']['en-us'] = "Time Base Score Seconds";
+$text['label-time_base_score_sec']['en-gb'] = "Time Base Score Seconds";
+$text['label-time_base_score_sec']['ar-eg'] = "";
+$text['label-time_base_score_sec']['de-at'] = "Zeitgeber für Klassifikation Seconden"; //copied from de-de
+$text['label-time_base_score_sec']['de-ch'] = "Zeitgeber für Klassifikation Seconden"; //copied from de-de
+$text['label-time_base_score_sec']['de-de'] = "Zeitgeber für Klassifikation Seconden";
+$text['label-time_base_score_sec']['es-cl'] = "Puntuación basada en tiempo Segundos";
+$text['label-time_base_score_sec']['es-mx'] = "Puntuación basada en tiempo Segundos"; //copied from es-cl
+$text['label-time_base_score_sec']['fr-ca'] = "Score basé sur le temps Seconds";
+$text['label-time_base_score_sec']['fr-fr'] = "Score Basé sur le temps Seconds";
+$text['label-time_base_score_sec']['he-il'] = "";
+$text['label-time_base_score_sec']['it-it'] = "Punteggio su Base Tempo Secondi";
+$text['label-time_base_score_sec']['nl-nl'] = "Tijd basis score";
+$text['label-time_base_score_sec']['pl-pl'] = "Wynik oparty na czasie Sekundy";
+$text['label-time_base_score_sec']['pt-br'] = "Pontuação baseada no tempo Segundos"; //copied from pt-pt
+$text['label-time_base_score_sec']['pt-pt'] = "Pontuação baseada no tempo Segundos";
+$text['label-time_base_score_sec']['ro-ro'] = "";
+$text['label-time_base_score_sec']['ru-ru'] = "Оценка по времени секунды";
+$text['label-time_base_score_sec']['sv-se'] = "Tidsbaserat Resultat Sekunder";
+$text['label-time_base_score_sec']['uk-ua'] = "";
+
 $text['label-tiers']['en-us'] = "Tiers";
 $text['label-tiers']['en-gb'] = "Tiers";
 $text['label-tiers']['ar-eg'] = "";
@@ -933,8 +954,8 @@ $text['label-tiers']['de-ch'] = "Ebenen"; //copied from de-de
 $text['label-tiers']['de-de'] = "Ebenen";
 $text['label-tiers']['es-cl'] = "Niveles de Centro de Llamados";
 $text['label-tiers']['es-mx'] = "Niveles de Centro de Llamados"; //copied from es-cl
-$text['label-tiers']['fr-ca'] = "Niveaux du Centre d'Appel"; //copied from fr-fr
-$text['label-tiers']['fr-fr'] = "Niveaux du Centre d'Appel";
+$text['label-tiers']['fr-ca'] = "Niveaux du centre d'appel";
+$text['label-tiers']['fr-fr'] = "Niveaux du Centre d'appel";
 $text['label-tiers']['he-il'] = "";
 $text['label-tiers']['it-it'] = "Tiers";
 $text['label-tiers']['nl-nl'] = "Vergelijkingen";
@@ -954,8 +975,8 @@ $text['label-tier_rules_apply']['de-ch'] = "Ebenen-Regeln werden angewendet"; //
 $text['label-tier_rules_apply']['de-de'] = "Ebenen-Regeln werden angewendet";
 $text['label-tier_rules_apply']['es-cl'] = "Aplicar Reglas de Nivel";
 $text['label-tier_rules_apply']['es-mx'] = "Aplicar Reglas de Nivel"; //copied from es-cl
-$text['label-tier_rules_apply']['fr-ca'] = "Appliquer la Règle du Niveau"; //copied from fr-fr
-$text['label-tier_rules_apply']['fr-fr'] = "Appliquer la Règle du Niveau";
+$text['label-tier_rules_apply']['fr-ca'] = "Appliquer les règles du niveau";
+$text['label-tier_rules_apply']['fr-fr'] = "Appliquer les règles du niveau";
 $text['label-tier_rules_apply']['he-il'] = "";
 $text['label-tier_rules_apply']['it-it'] = "Applica regole del Tier";
 $text['label-tier_rules_apply']['nl-nl'] = "Vergelijkingsregels zijn van toepassing";
@@ -975,8 +996,8 @@ $text['label-tier_rule_wait_second']['de-ch'] = "Ebenen-Regel Wartezeit"; //copi
 $text['label-tier_rule_wait_second']['de-de'] = "Ebenen-Regel Wartezeit";
 $text['label-tier_rule_wait_second']['es-cl'] = "Regla de nível segundo de espera";
 $text['label-tier_rule_wait_second']['es-mx'] = "Regla de nível segundo de espera"; //copied from es-cl
-$text['label-tier_rule_wait_second']['fr-ca'] = "Attente, en seconde, de la Règle du Tier"; //copied from fr-fr
-$text['label-tier_rule_wait_second']['fr-fr'] = "Attente, en seconde, de la Règle du Tier";
+$text['label-tier_rule_wait_second']['fr-ca'] = "Délai d'attente, en secondes, de la règle du niveau";
+$text['label-tier_rule_wait_second']['fr-fr'] = "Délai d'attente, en secondes, de la règle du niveau";
 $text['label-tier_rule_wait_second']['he-il'] = "";
 $text['label-tier_rule_wait_second']['it-it'] = "Regola Tier Attesa Secondi";
 $text['label-tier_rule_wait_second']['nl-nl'] = "Vergelijkigsregels wachttijd";
@@ -996,8 +1017,8 @@ $text['label-tier_rule_wait_multiply_level']['de-ch'] = "Multiplikator für die
 $text['label-tier_rule_wait_multiply_level']['de-de'] = "Multiplikator für die Ebenen-Regel Wartezeit";
 $text['label-tier_rule_wait_multiply_level']['es-cl'] = "Regla de nivel multiplicar nivel de espera";
 $text['label-tier_rule_wait_multiply_level']['es-mx'] = "Regla de nivel multiplicar nivel de espera"; //copied from es-cl
-$text['label-tier_rule_wait_multiply_level']['fr-ca'] = "Règle d'Attente du Niveau Multipliée par Niveau"; //copied from fr-fr
-$text['label-tier_rule_wait_multiply_level']['fr-fr'] = "Règle d'Attente du Niveau Multipliée par Niveau";
+$text['label-tier_rule_wait_multiply_level']['fr-ca'] = "Règle d'attente du niveau multipliée par niveau";
+$text['label-tier_rule_wait_multiply_level']['fr-fr'] = "Règle d'attente du niveau multipliée par niveau";
 $text['label-tier_rule_wait_multiply_level']['he-il'] = "";
 $text['label-tier_rule_wait_multiply_level']['it-it'] = "Regola Tier Attesa Moltiplica Livello";
 $text['label-tier_rule_wait_multiply_level']['nl-nl'] = "Vergelijkingsregels Vermenigvuldigingsfactor";
@@ -1017,8 +1038,8 @@ $text['label-tier_rule_no_agent_no_wait']['de-ch'] = "Ebenen-Regel kein Agent ni
 $text['label-tier_rule_no_agent_no_wait']['de-de'] = "Ebenen-Regel kein Agent nicht warten";
 $text['label-tier_rule_no_agent_no_wait']['es-cl'] = "Regla de nivel No espera Sin Agente";
 $text['label-tier_rule_no_agent_no_wait']['es-mx'] = "Regla de nivel No espera Sin Agente"; //copied from es-cl
-$text['label-tier_rule_no_agent_no_wait']['fr-ca'] = "Règle du Niveau Pas d'Agent, Pas d'attente"; //copied from fr-fr
-$text['label-tier_rule_no_agent_no_wait']['fr-fr'] = "Règle du Niveau Pas d'Agent, Pas d'attente";
+$text['label-tier_rule_no_agent_no_wait']['fr-ca'] = "Règle du niveau pas d'agent, pas d'attente"; 
+$text['label-tier_rule_no_agent_no_wait']['fr-fr'] = "Règle du niveau pas d'agent, pas d'attente";
 $text['label-tier_rule_no_agent_no_wait']['he-il'] = "";
 $text['label-tier_rule_no_agent_no_wait']['it-it'] = "Regola Tier No Agente No Attesa";
 $text['label-tier_rule_no_agent_no_wait']['nl-nl'] = "Vergelijkingsregel Geen agent niet wachten";
@@ -1101,8 +1122,8 @@ $text['label-status']['de-ch'] = "Status"; //copied from de-de
 $text['label-status']['de-de'] = "Status";
 $text['label-status']['es-cl'] = "Estado";
 $text['label-status']['es-mx'] = "Estado"; //copied from es-cl
-$text['label-status']['fr-ca'] = "Etat"; //copied from fr-fr
-$text['label-status']['fr-fr'] = "Etat";
+$text['label-status']['fr-ca'] = "État";
+$text['label-status']['fr-fr'] = "État";
 $text['label-status']['he-il'] = "";
 $text['label-status']['it-it'] = "Status";
 $text['label-status']['nl-nl'] = "Status";
@@ -1122,8 +1143,8 @@ $text['label-reject_delay_time']['de-ch'] = "Zeitverzögerung für Zeitüberschr
 $text['label-reject_delay_time']['de-de'] = "Zeitverzögerung für Zeitüberschreitung";
 $text['label-reject_delay_time']['es-cl'] = "Tiempo de Espera para Rechazar";
 $text['label-reject_delay_time']['es-mx'] = "Tiempo de Espera para Rechazar"; //copied from es-cl
-$text['label-reject_delay_time']['fr-ca'] = "Délais pour le Rejet"; //copied from fr-fr
-$text['label-reject_delay_time']['fr-fr'] = "Délais pour le Rejet";
+$text['label-reject_delay_time']['fr-ca'] = "Délai avant de rejeter"; 
+$text['label-reject_delay_time']['fr-fr'] = "Délai avant de rejeter";
 $text['label-reject_delay_time']['he-il'] = "";
 $text['label-reject_delay_time']['it-it'] = "Tempo Ritardo Rifiuto";
 $text['label-reject_delay_time']['nl-nl'] = "Afwijzings vertragingstijd";
@@ -1143,8 +1164,8 @@ $text['label-record_template']['de-ch'] = "Aufnehmen"; //copied from de-de
 $text['label-record_template']['de-de'] = "Aufnehmen";
 $text['label-record_template']['es-cl'] = "Guardar";
 $text['label-record_template']['es-mx'] = "Guardar"; //copied from es-cl
-$text['label-record_template']['fr-ca'] = "Enregistrement"; //copied from fr-fr
-$text['label-record_template']['fr-fr'] = "Enregistrement";
+$text['label-record_template']['fr-ca'] = "Enregistrer"; 
+$text['label-record_template']['fr-fr'] = "Enregistrer";
 $text['label-record_template']['he-il'] = "";
 $text['label-record_template']['it-it'] = "Registra";
 $text['label-record_template']['nl-nl'] = "Opnemen";
@@ -1248,8 +1269,8 @@ $text['label-no_answer_delay_time']['de-ch'] = "Verzögerung für keine Antwort"
 $text['label-no_answer_delay_time']['de-de'] = "Verzögerung für keine Antwort";
 $text['label-no_answer_delay_time']['es-cl'] = "Tiempo de Espera sin Respuesta";
 $text['label-no_answer_delay_time']['es-mx'] = "Tiempo de Espera sin Respuesta"; //copied from es-cl
-$text['label-no_answer_delay_time']['fr-ca'] = "Delais de Non Réponse"; //copied from fr-fr
-$text['label-no_answer_delay_time']['fr-fr'] = "Delais de Non Réponse";
+$text['label-no_answer_delay_time']['fr-ca'] = "Délai de non réponse";
+$text['label-no_answer_delay_time']['fr-fr'] = "Délai de non réponse";
 $text['label-no_answer_delay_time']['he-il'] = "";
 $text['label-no_answer_delay_time']['it-it'] = "Tempo Ritardo Mancata Risposta";
 $text['label-no_answer_delay_time']['nl-nl'] = "Geen antwoord vertragingstijd";
@@ -1269,8 +1290,8 @@ $text['label-music_on_hold']['de-ch'] = "Wartemusik"; //copied from de-de
 $text['label-music_on_hold']['de-de'] = "Wartemusik";
 $text['label-music_on_hold']['es-cl'] = "Música en Espera";
 $text['label-music_on_hold']['es-mx'] = "Música en Espera"; //copied from es-cl
-$text['label-music_on_hold']['fr-ca'] = "Musique en attente"; //copied from fr-fr
-$text['label-music_on_hold']['fr-fr'] = "Musique en attente";
+$text['label-music_on_hold']['fr-ca'] = "Musique d'attente"; 
+$text['label-music_on_hold']['fr-fr'] = "Musique d'attente";
 $text['label-music_on_hold']['he-il'] = "";
 $text['label-music_on_hold']['it-it'] = "Musica d'Attesa";
 $text['label-music_on_hold']['nl-nl'] = "Wachtmuziek";
@@ -1290,8 +1311,8 @@ $text['label-max_wait_time_with_no_agent_time_reached']['de-ch'] = "Maximale War
 $text['label-max_wait_time_with_no_agent_time_reached']['de-de'] = "Maximale Wartezeit ohne Agent erreicht";
 $text['label-max_wait_time_with_no_agent_time_reached']['es-cl'] = "Tiempo máximo de espera sin agente obtenido";
 $text['label-max_wait_time_with_no_agent_time_reached']['es-mx'] = "Tiempo máximo de espera sin agente obtenido"; //copied from es-cl
-$text['label-max_wait_time_with_no_agent_time_reached']['fr-ca'] = "Max Attente Sans Agent Atteinte"; //copied from fr-fr
-$text['label-max_wait_time_with_no_agent_time_reached']['fr-fr'] = "Max Attente Sans Agent Atteinte";
+$text['label-max_wait_time_with_no_agent_time_reached']['fr-ca'] = "Temps d'attente maximum sans temps d'agent atteint";
+$text['label-max_wait_time_with_no_agent_time_reached']['fr-fr'] = "Temps d'attente maximum sans temps d'agent atteint";
 $text['label-max_wait_time_with_no_agent_time_reached']['he-il'] = "";
 $text['label-max_wait_time_with_no_agent_time_reached']['it-it'] = "Max Tempo Attesa Raggiungimento Tempo No Agenti";
 $text['label-max_wait_time_with_no_agent_time_reached']['nl-nl'] = "Maximale wachttijd zonder agent bereikt";
@@ -1311,8 +1332,8 @@ $text['label-max_wait_time_with_no_agent']['de-ch'] = "Maximale Wartezeit ohne A
 $text['label-max_wait_time_with_no_agent']['de-de'] = "Maximale Wartezeit ohne Agent";
 $text['label-max_wait_time_with_no_agent']['es-cl'] = "Tiempo máximo de espera sin agente";
 $text['label-max_wait_time_with_no_agent']['es-mx'] = "Tiempo máximo de espera sin agente"; //copied from es-cl
-$text['label-max_wait_time_with_no_agent']['fr-ca'] = "Temps d'attente maximal Sans Agent"; //copied from fr-fr
-$text['label-max_wait_time_with_no_agent']['fr-fr'] = "Temps d'attente maximal Sans Agent";
+$text['label-max_wait_time_with_no_agent']['fr-ca'] = "Temps d'attente maximum sans agent";
+$text['label-max_wait_time_with_no_agent']['fr-fr'] = "Temps d'attente maximum sans agent";
 $text['label-max_wait_time_with_no_agent']['he-il'] = "";
 $text['label-max_wait_time_with_no_agent']['it-it'] = "Max Tempo Attesa No Agenti";
 $text['label-max_wait_time_with_no_agent']['nl-nl'] = "Maximale wachttijd zonder agent";
@@ -1395,8 +1416,8 @@ $text['label-discard_abandoned_after']['de-ch'] = "Zurückweisen nach Zeitübers
 $text['label-discard_abandoned_after']['de-de'] = "Zurückweisen nach Zeitüberschreitung";
 $text['label-discard_abandoned_after']['es-cl'] = "Descartar Abandono Despues de";
 $text['label-discard_abandoned_after']['es-mx'] = "Descartar Abandono Despues de"; //copied from es-cl
-$text['label-discard_abandoned_after']['fr-ca'] = "Ecarter les Abandons fait Après"; //copied from fr-fr
-$text['label-discard_abandoned_after']['fr-fr'] = "Ecarter les Abandons fait Après";
+$text['label-discard_abandoned_after']['fr-ca'] = "Écarter les abandons après";
+$text['label-discard_abandoned_after']['fr-fr'] = "Écarter les abandons après";
 $text['label-discard_abandoned_after']['he-il'] = "";
 $text['label-discard_abandoned_after']['it-it'] = "Scarta chi Abbandona Dopo";
 $text['label-discard_abandoned_after']['nl-nl'] = "Afbreken na tijdsoverschreiding";
@@ -1416,8 +1437,8 @@ $text['label-default_status']['de-ch'] = "Standardzustand"; //copied from de-de
 $text['label-default_status']['de-de'] = "Standardzustand";
 $text['label-default_status']['es-cl'] = "Estado Predeterminado";
 $text['label-default_status']['es-mx'] = "Estado Predeterminado"; //copied from es-cl
-$text['label-default_status']['fr-ca'] = "Statut Prédéterminée"; //copied from fr-fr
-$text['label-default_status']['fr-fr'] = "Statut Prédéterminée";
+$text['label-default_status']['fr-ca'] = "État par défaut";
+$text['label-default_status']['fr-fr'] = "État par défaut";
 $text['label-default_status']['he-il'] = "";
 $text['label-default_status']['it-it'] = "Status di Default";
 $text['label-default_status']['nl-nl'] = "Standaard status";
@@ -1458,8 +1479,8 @@ $text['label-caller_id_name_prefix']['de-ch'] = "Anruferkennung (Name) Prefix";
 $text['label-caller_id_name_prefix']['de-de'] = "Anruferkennung (Name) Prefix";
 $text['label-caller_id_name_prefix']['es-cl'] = "Prefijo de nombre de quien llama";
 $text['label-caller_id_name_prefix']['es-mx'] = "Prefijo de nombre de quien llama"; //copied from es-cl
-$text['label-caller_id_name_prefix']['fr-ca'] = "Préfixe du Nom d'Appelant"; //copied from fr-fr
-$text['label-caller_id_name_prefix']['fr-fr'] = "Préfixe du Nom d'Appelant";
+$text['label-caller_id_name_prefix']['fr-ca'] = "Préfixe du nom de l'identification de l'appelant";
+$text['label-caller_id_name_prefix']['fr-fr'] = "Préfixe du nom de l'identification de l'appelant";
 $text['label-caller_id_name_prefix']['he-il'] = "";
 $text['label-caller_id_name_prefix']['it-it'] = "Prefisso Nome Chiamante";
 $text['label-caller_id_name_prefix']['nl-nl'] = "CID Naam prefix";
@@ -1479,7 +1500,7 @@ $text['label-outbound_caller_id_name']['de-ch'] = "Ausgehende Anruferkennung (Na
 $text['label-outbound_caller_id_name']['de-de'] = "Ausgehende Anruferkennung (Name)";
 $text['label-outbound_caller_id_name']['es-cl'] = "Nombre de Caller ID Saliente";
 $text['label-outbound_caller_id_name']['es-mx'] = "Nombre de Caller ID Saliente"; //copied from es-cl
-$text['label-outbound_caller_id_name']['fr-ca'] = "Nom de l'appelant sortant"; //copied from fr-fr
+$text['label-outbound_caller_id_name']['fr-ca'] = "Nom de l'appelant sortant";
 $text['label-outbound_caller_id_name']['fr-fr'] = "Nom de l'appelant sortant";
 $text['label-outbound_caller_id_name']['he-il'] = "";
 $text['label-outbound_caller_id_name']['it-it'] = "ID Nome Chiamante Esterno";
@@ -1521,8 +1542,8 @@ $text['label-caller_announce_sound']['de-ch'] = "Ton für Ankündigung"; //copie
 $text['label-caller_announce_sound']['de-de'] = "Ton für Ankündigung";
 $text['label-caller_announce_sound']['es-cl'] = "El sonido anuncian";
 $text['label-caller_announce_sound']['es-mx'] = "El sonido anuncian"; //copied from es-cl
-$text['label-caller_announce_sound']['fr-ca'] = "Annoncer Sonore"; //copied from fr-fr
-$text['label-caller_announce_sound']['fr-fr'] = "Annoncer Sonore";
+$text['label-caller_announce_sound']['fr-ca'] = "Son d'annonce"; 
+$text['label-caller_announce_sound']['fr-fr'] = "Son d'annonce";
 $text['label-caller_announce_sound']['he-il'] = "";
 $text['label-caller_announce_sound']['it-it'] = "Audio Annuncio";
 $text['label-caller_announce_sound']['nl-nl'] = "Aankondigingsgeluid";
@@ -1542,8 +1563,8 @@ $text['label-caller_announce_frequency']['de-ch'] = "Häufigkeit der Ankündigun
 $text['label-caller_announce_frequency']['de-de'] = "Häufigkeit der Ankündigung";
 $text['label-caller_announce_frequency']['es-cl'] = "La frecuencia anuncian";
 $text['label-caller_announce_frequency']['es-mx'] = "La frecuencia anuncian"; //copied from es-cl
-$text['label-caller_announce_frequency']['fr-ca'] = "Annoncer Fréquence"; //copied from fr-fr
-$text['label-caller_announce_frequency']['fr-fr'] = "Annoncer Fréquence";
+$text['label-caller_announce_frequency']['fr-ca'] = "Fréquence d'annonce";
+$text['label-caller_announce_frequency']['fr-fr'] = "Fréquence d'annonce";
 $text['label-caller_announce_frequency']['he-il'] = "";
 $text['label-caller_announce_frequency']['it-it'] = "Frequenza Annuncio";
 $text['label-caller_announce_frequency']['nl-nl'] = "Aantal aankondigingen";
@@ -1563,8 +1584,8 @@ $text['label-exit_keys']['de-ch'] = "Abbruch Taste"; //copied from de-de
 $text['label-exit_keys']['de-de'] = "Abbruch Taste";
 $text['label-exit_keys']['es-cl'] = "Tecla de salida";
 $text['label-exit_keys']['es-mx'] = "Tecla de salida"; //copied from es-cl
-$text['label-exit_keys']['fr-ca'] = "Clé pour sortir la queue"; //copied from fr-fr
-$text['label-exit_keys']['fr-fr'] = "Clé pour sortir la queue";
+$text['label-exit_keys']['fr-ca'] = "Touche pour sortir de la file d'attente";
+$text['label-exit_keys']['fr-fr'] = "Touche pour sortir de la file d'attente";
 $text['label-exit_keys']['he-il'] = "";
 $text['label-exit_keys']['it-it'] = "";
 $text['label-exit_keys']['nl-nl'] = "Verlaat toets";
@@ -1584,8 +1605,8 @@ $text['description-exit_keys']['de-ch'] = "Tasten um die aktuelle Warteschlange
 $text['description-exit_keys']['de-de'] = "Tasten um die aktuelle Warteschlange zu verlassen.";
 $text['description-exit_keys']['es-cl'] = "Teclas para salir de la espera de la cola.";
 $text['description-exit_keys']['es-mx'] = "Teclas para salir de la espera de la cola."; //copied from es-cl
-$text['description-exit_keys']['fr-ca'] = "Clés pour sortir de l'attendance de la queue."; //copied from fr-fr
-$text['description-exit_keys']['fr-fr'] = "Clés pour sortir de l'attendance de la queue.";
+$text['description-exit_keys']['fr-ca'] = "Touches pour quitter la file d'attente actuelle.";
+$text['description-exit_keys']['fr-fr'] = "Touches pour quitter la file d'attente actuelle";
 $text['description-exit_keys']['he-il'] = "";
 $text['description-exit_keys']['it-it'] = "";
 $text['description-exit_keys']['nl-nl'] = "Toetsen om de huidige wachtrij te verlaten.";
@@ -1605,8 +1626,8 @@ $text['label-call_timeout']['de-ch'] = "Zeitüberschreitung"; //copied from de-d
 $text['label-call_timeout']['de-de'] = "Zeitüberschreitung";
 $text['label-call_timeout']['es-cl'] = "Timeout de Llamada";
 $text['label-call_timeout']['es-mx'] = "Timeout de Llamada"; //copied from es-cl
-$text['label-call_timeout']['fr-ca'] = "Timeout d'appel"; //copied from fr-fr
-$text['label-call_timeout']['fr-fr'] = "Timeout d'appel";
+$text['label-call_timeout']['fr-ca'] = "Délai d'expiration de l'appel";
+$text['label-call_timeout']['fr-fr'] = "Délai d'expiration de l'appel";
 $text['label-call_timeout']['he-il'] = "";
 $text['label-call_timeout']['it-it'] = "Timeout di Chiamata";
 $text['label-call_timeout']['nl-nl'] = "Oproep tijdsoverschrijding";
@@ -1626,8 +1647,8 @@ $text['label-busy_delay_time']['de-ch'] = "Verzögerungszeit für Besetzt"; //co
 $text['label-busy_delay_time']['de-de'] = "Verzögerungszeit für Besetzt";
 $text['label-busy_delay_time']['es-cl'] = "Tiempo de espera para ocupado";
 $text['label-busy_delay_time']['es-mx'] = "Tiempo de espera para ocupado"; //copied from es-cl
-$text['label-busy_delay_time']['fr-ca'] = "Délais d'occupation"; //copied from fr-fr
-$text['label-busy_delay_time']['fr-fr'] = "Délais d'occupation";
+$text['label-busy_delay_time']['fr-ca'] = "Délai de temps occupé";
+$text['label-busy_delay_time']['fr-fr'] = "Délai de temps occupé";
 $text['label-busy_delay_time']['he-il'] = "";
 $text['label-busy_delay_time']['it-it'] = "Tempo ritardo su Occupato";
 $text['label-busy_delay_time']['nl-nl'] = "Bezet wachttijd";
@@ -1647,8 +1668,8 @@ $text['label-agent_password']['de-ch'] = "Agenten Passwort"; //copied from de-de
 $text['label-agent_password']['de-de'] = "Agenten Passwort";
 $text['label-agent_password']['es-cl'] = "Agente de Password";
 $text['label-agent_password']['es-mx'] = "Agente de Password"; //copied from es-cl
-$text['label-agent_password']['fr-ca'] = "Agent Mot de passe"; //copied from fr-fr
-$text['label-agent_password']['fr-fr'] = "Agent Mot de passe";
+$text['label-agent_password']['fr-ca'] = "Mot de passe d'agent";
+$text['label-agent_password']['fr-fr'] = "Mot de passe d'agent";
 $text['label-agent_password']['he-il'] = "";
 $text['label-agent_password']['it-it'] = "Password Agente";
 $text['label-agent_password']['nl-nl'] = "Agent wachtwoord";
@@ -1710,8 +1731,8 @@ $text['label-agent_id']['de-ch'] = "Agenten ID"; //copied from de-de
 $text['label-agent_id']['de-de'] = "Agenten ID";
 $text['label-agent_id']['es-cl'] = "Agente de identidad";
 $text['label-agent_id']['es-mx'] = "Agente de identidad"; //copied from es-cl
-$text['label-agent_id']['fr-ca'] = "Identification Agent"; //copied from fr-fr
-$text['label-agent_id']['fr-fr'] = "Identification Agent";
+$text['label-agent_id']['fr-ca'] = "Identification d'agent";
+$text['label-agent_id']['fr-fr'] = "Identification d'agent";
 $text['label-agent_id']['he-il'] = "";
 $text['label-agent_id']['it-it'] = "ID Agente";
 $text['label-agent_id']['nl-nl'] = "Agent ID";
@@ -1773,8 +1794,8 @@ $text['label-abandoned_resume_allowed']['de-ch'] = "Wiederaufnahme nach Zurückw
 $text['label-abandoned_resume_allowed']['de-de'] = "Wiederaufnahme nach Zurückweisung erlaubt";
 $text['label-abandoned_resume_allowed']['es-cl'] = "Permitir Reanudación de Abandono";
 $text['label-abandoned_resume_allowed']['es-mx'] = "Permitir Reanudación de Abandono"; //copied from es-cl
-$text['label-abandoned_resume_allowed']['fr-ca'] = "Recupération Permise des Abandons"; //copied from fr-fr
-$text['label-abandoned_resume_allowed']['fr-fr'] = "Recupération Permise des Abandons";
+$text['label-abandoned_resume_allowed']['fr-ca'] = "Récupération des abandons permis";
+$text['label-abandoned_resume_allowed']['fr-fr'] = "Récupération des abandons permis";
 $text['label-abandoned_resume_allowed']['he-il'] = "";
 $text['label-abandoned_resume_allowed']['it-it'] = "Permetti ripristino chi Abbandona";
 $text['label-abandoned_resume_allowed']['nl-nl'] = "Verlaten oproep voortzetten toestaan";
@@ -1794,8 +1815,8 @@ $text['header-call_center_tier_edit']['de-ch'] = "Callcenter Ebene"; //copied fr
 $text['header-call_center_tier_edit']['de-de'] = "Callcenter Ebene";
 $text['header-call_center_tier_edit']['es-cl'] = "Editar Nivel de Centro de Llamados";
 $text['header-call_center_tier_edit']['es-mx'] = "Editar Nivel de Centro de Llamados"; //copied from es-cl
-$text['header-call_center_tier_edit']['fr-ca'] = "Niveau du Centre d'Appel"; //copied from fr-fr
-$text['header-call_center_tier_edit']['fr-fr'] = "Niveau du Centre d'Appel";
+$text['header-call_center_tier_edit']['fr-ca'] = "Niveau du centre d'appel";
+$text['header-call_center_tier_edit']['fr-fr'] = "Niveau du centre d'appel";
 $text['header-call_center_tier_edit']['he-il'] = "";
 $text['header-call_center_tier_edit']['it-it'] = "Tier del Call Center";
 $text['header-call_center_tier_edit']['nl-nl'] = "Call-Center vergelijking";
@@ -1899,7 +1920,7 @@ $text['header-call_center_agent_status']['de-ch'] = "Callcenter Agenten-Status";
 $text['header-call_center_agent_status']['de-de'] = "Callcenter Agenten-Status";
 $text['header-call_center_agent_status']['es-cl'] = "Estado de Agente de Centro de Llamados";
 $text['header-call_center_agent_status']['es-mx'] = "Estado de Agente de Centro de Llamados"; //copied from es-cl
-$text['header-call_center_agent_status']['fr-ca'] = "Etat de l'agent du Centre d'Appel"; //copied from fr-fr
+$text['header-call_center_agent_status']['fr-ca'] = "État de l'agent du Centre d'appel";
 $text['header-call_center_agent_status']['fr-fr'] = "Etat de l'agent du Centre d'Appel";
 $text['header-call_center_agent_status']['he-il'] = "";
 $text['header-call_center_agent_status']['it-it'] = "Stato Agente Call Center";
@@ -1920,7 +1941,7 @@ $text['header-call_center_agent_edit']['de-ch'] = "Callcenter Agent"; //copied f
 $text['header-call_center_agent_edit']['de-de'] = "Callcenter Agent";
 $text['header-call_center_agent_edit']['es-cl'] = "Editar Agente de Centro de Llamados";
 $text['header-call_center_agent_edit']['es-mx'] = "Editar Agente de Centro de Llamados"; //copied from es-cl
-$text['header-call_center_agent_edit']['fr-ca'] = "Agent du Centre d'Appel"; //copied from fr-fr
+$text['header-call_center_agent_edit']['fr-ca'] = "Agent du Centre d'appel";
 $text['header-call_center_agent_edit']['fr-fr'] = "Agent du Centre d'Appel";
 $text['header-call_center_agent_edit']['he-il'] = "";
 $text['header-call_center_agent_edit']['it-it'] = "Agente Call Center";
@@ -1941,8 +1962,8 @@ $text['header-call_center_agent_add']['de-ch'] = "Callcenter Agenten"; //copied
 $text['header-call_center_agent_add']['de-de'] = "Callcenter Agenten";
 $text['header-call_center_agent_add']['es-cl'] = "Agregar Agente de Centro de Llamados";
 $text['header-call_center_agent_add']['es-mx'] = "Agregar Agente de Centro de Llamados"; //copied from es-cl
-$text['header-call_center_agent_add']['fr-ca'] = "Agent du Centre d'Appel"; //copied from fr-fr
-$text['header-call_center_agent_add']['fr-fr'] = "Agent du Centre d'Appel";
+$text['header-call_center_agent_add']['fr-ca'] = "Agents du centre d'appel"; 
+$text['header-call_center_agent_add']['fr-fr'] = "Agents du centre d'appel";
 $text['header-call_center_agent_add']['he-il'] = "";
 $text['header-call_center_agent_add']['it-it'] = "Agenti Call Center";
 $text['header-call_center_agent_add']['nl-nl'] = "Call-Center agenten";
@@ -1962,8 +1983,8 @@ $text['description-wrap_up_time']['de-ch'] = "Geben Sie die Nachbereitungszeit e
 $text['description-wrap_up_time']['de-de'] = "Geben Sie die Nachbereitungszeit ein.";
 $text['description-wrap_up_time']['es-cl'] = "Introduzca el tiempo de preparación.";
 $text['description-wrap_up_time']['es-mx'] = "Introduzca el tiempo de preparación."; //copied from es-cl
-$text['description-wrap_up_time']['fr-ca'] = "choisir le temps de wrap up."; //copied from fr-fr
-$text['description-wrap_up_time']['fr-fr'] = "choisir le temps de wrap up.";
+$text['description-wrap_up_time']['fr-ca'] = "Choisir le temps de clôture.";
+$text['description-wrap_up_time']['fr-fr'] = "Choisir le temps de clôture.";
 $text['description-wrap_up_time']['he-il'] = "";
 $text['description-wrap_up_time']['it-it'] = "Inserire Tempo di wrap up.";
 $text['description-wrap_up_time']['nl-nl'] = "Voer de afwikkeltijd in.";
@@ -2004,8 +2025,8 @@ $text['description-timeout_action']['de-ch'] = "Aktion, wenn die maximale Wartez
 $text['description-timeout_action']['de-de'] = "Aktion, wenn die maximale Wartezeit erreicht wurde.";
 $text['description-timeout_action']['es-cl'] = "Defina una acción a realizar cuando el tiempo máximo es alcanzado.";
 $text['description-timeout_action']['es-mx'] = "Defina una acción a realizar cuando el tiempo máximo es alcanzado."; //copied from es-cl
-$text['description-timeout_action']['fr-ca'] = "Choisir l'action à faire quand le temps max d'attente est atteint."; //copied from fr-fr
-$text['description-timeout_action']['fr-fr'] = "Choisir l'action à faire quand le temps max d'attente est atteint.";
+$text['description-timeout_action']['fr-ca'] = "Définir l'action à exécuter lorsque le temps d'attente maximal est atteint.";
+$text['description-timeout_action']['fr-fr'] = "Définir l'action à exécuter lorsque le temps d'attente maximal est atteint.";
 $text['description-timeout_action']['he-il'] = "";
 $text['description-timeout_action']['it-it'] = "Seleziona l'azione da eseguire quando il tempo di attesa max viene superato.";
 $text['description-timeout_action']['nl-nl'] = "Aktie als de maximale wachttijd bereikt wordt";
@@ -2025,8 +2046,8 @@ $text['description-time_base_score']['de-ch'] = "Wählen Sie die Zeitgeber für
 $text['description-time_base_score']['de-de'] = "Wählen Sie die Zeitgeber für Klassifikation";
 $text['description-time_base_score']['es-cl'] = "Seleccione el tiempo base";
 $text['description-time_base_score']['es-mx'] = "Seleccione el tiempo base"; //copied from es-cl
-$text['description-time_base_score']['fr-ca'] = "Sélection du score sur base de temps."; //copied from fr-fr
-$text['description-time_base_score']['fr-fr'] = "Sélection du score sur base de temps.";
+$text['description-time_base_score']['fr-ca'] = "Sélection du score basé sur le temps.";
+$text['description-time_base_score']['fr-fr'] = "Sélection du score basé sur le temps.";
 $text['description-time_base_score']['he-il'] = "";
 $text['description-time_base_score']['it-it'] = "Seleziona il punteggio su base tempo.";
 $text['description-time_base_score']['nl-nl'] = "Select de tijdsbasis score.";
@@ -2038,6 +2059,28 @@ $text['description-time_base_score']['ru-ru'] = "Выберие оценку п
 $text['description-time_base_score']['sv-se'] = "Ange tids-baserad poäng.";
 $text['description-time_base_score']['uk-ua'] = "";
 
+
+$text['description-time_base_score_sec']['en-us'] = "Set the time base score in seconds. Higher numbers mean higher priority over other call centers.";
+$text['description-time_base_score_sec']['en-gb'] = "Set the time base score in seconds. Higher numbers mean higher priority over other call centers.";
+$text['description-time_base_score_sec']['ar-eg'] = "";
+$text['description-time_base_score_sec']['de-at'] = "";
+$text['description-time_base_score_sec']['de-ch'] = "";
+$text['description-time_base_score_sec']['de-de'] = "";
+$text['description-time_base_score_sec']['es-cl'] = "";
+$text['description-time_base_score_sec']['es-mx'] = "";
+$text['description-time_base_score_sec']['fr-ca'] = "";
+$text['description-time_base_score_sec']['fr-fr'] = "";
+$text['description-time_base_score_sec']['he-il'] = "";
+$text['description-time_base_score_sec']['it-it'] = "";
+$text['description-time_base_score_sec']['nl-nl'] = "";
+$text['description-time_base_score_sec']['pl-pl'] = "";
+$text['description-time_base_score_sec']['pt-br'] = "";
+$text['description-time_base_score_sec']['pt-pt'] = "";
+$text['description-time_base_score_sec']['ro-ro'] = "";
+$text['description-time_base_score_sec']['ru-ru'] = "";
+$text['description-time_base_score_sec']['sv-se'] = "";
+$text['description-time_base_score_sec']['uk-ua'] = "";
+
 $text['description-tiers']['en-us'] = "Tiers assign agents to queues.";
 $text['description-tiers']['en-gb'] = "Tiers assign agents to queues.";
 $text['description-tiers']['ar-eg'] = "";
@@ -2046,8 +2089,8 @@ $text['description-tiers']['de-ch'] = "Agenten einer Warteschlange pro Ebene zuw
 $text['description-tiers']['de-de'] = "Agenten einer Warteschlange pro Ebene zuweisen.";
 $text['description-tiers']['es-cl'] = "Lista todos los niveles. Los niveles asignan agentes a las colas.";
 $text['description-tiers']['es-mx'] = "Lista todos los niveles. Los niveles asignan agentes a las colas."; //copied from es-cl
-$text['description-tiers']['fr-ca'] = "Liste tous les Niveaux. Les Niveaux permettent d'affecter les agents aux queues."; //copied from fr-fr
-$text['description-tiers']['fr-fr'] = "Liste tous les Niveaux. Les Niveaux permettent d'affecter les agents aux queues.";
+$text['description-tiers']['fr-ca'] = "Liste tous les niveaux. Les niveaux permettent d'affecter les agents aux files d'attente.";
+$text['description-tiers']['fr-fr'] = "Liste tous les niveaux. Les niveaux permettent d'affecter les agents aux files d'attente.";
 $text['description-tiers']['he-il'] = "";
 $text['description-tiers']['it-it'] = "I tiers assegnano gli agenti alle code.";
 $text['description-tiers']['nl-nl'] = "Vergelijkingen towijzen van agenten aan wachtrij";
@@ -2067,8 +2110,8 @@ $text['description-tier_rules_apply']['de-ch'] = "Setzen Sie die Ebenen-Regel. R
 $text['description-tier_rules_apply']['de-de'] = "Setzen Sie die Ebenen-Regel. Regeln sind Ein oder Aus";
 $text['description-tier_rules_apply']['es-cl'] = "Defina las reglas de nivel como verdaero o falso.";
 $text['description-tier_rules_apply']['es-mx'] = "Defina las reglas de nivel como verdaero o falso."; //copied from es-cl
-$text['description-tier_rules_apply']['fr-ca'] = "Choisir l'activation de la règle du Niveau à oui ou non."; //copied from fr-fr
-$text['description-tier_rules_apply']['fr-fr'] = "Choisir l'activation de la règle du Niveau à oui ou non.";
+$text['description-tier_rules_apply']['fr-ca'] = "Définir l'activation de la règle du niveau à oui ou non."; 
+$text['description-tier_rules_apply']['fr-fr'] = "Définir l'activation de la règle du niveau à oui ou non.";
 $text['description-tier_rules_apply']['he-il'] = "";
 $text['description-tier_rules_apply']['it-it'] = "Imposta a vero o falso se si vogliono applicare le regole di tier.";
 $text['description-tier_rules_apply']['nl-nl'] = "Kies de vergelijkingsregels, Regels staan aan of uit";
@@ -2109,8 +2152,8 @@ $text['description-tier_rule_wait_multiply_level']['de-ch'] = "Setzen Sie den Mu
 $text['description-tier_rule_wait_multiply_level']['de-de'] = "Setzen Sie den Multiplikator für die Ebenen-Regel Wartezeit auf Ein oder Aus.";
 $text['description-tier_rule_wait_multiply_level']['es-cl'] = "Ajuste el nidenvel de espera multiplicar regla de nivel de verdadero o falso.";
 $text['description-tier_rule_wait_multiply_level']['es-mx'] = "Ajuste el nidenvel de espera multiplicar regla de nivel de verdadero o falso."; //copied from es-cl
-$text['description-tier_rule_wait_multiply_level']['fr-ca'] = "Choisir la multiplication du temps d'attente par niveau à oui ou non."; //copied from fr-fr
-$text['description-tier_rule_wait_multiply_level']['fr-fr'] = "Choisir la multiplication du temps d'attente par niveau à oui ou non.";
+$text['description-tier_rule_wait_multiply_level']['fr-ca'] = "Définir la multiplication du temps d'attente par niveau à oui ou non.";
+$text['description-tier_rule_wait_multiply_level']['fr-fr'] = "Définir la multiplication du temps d'attente par niveau à oui ou non.";
 $text['description-tier_rule_wait_multiply_level']['he-il'] = "";
 $text['description-tier_rule_wait_multiply_level']['it-it'] = "Imposta a vero o falso il tempo attesa moltiplica livello come regola tier.";
 $text['description-tier_rule_wait_multiply_level']['nl-nl'] = "Kies vergelijkingsregel vemenigvuldiging aan of uit ";
@@ -2235,8 +2278,8 @@ $text['description-reject_delay_time']['de-ch'] = "Geben Sie die Verzögerung bi
 $text['description-reject_delay_time']['de-de'] = "Geben Sie die Verzögerung bis zur Zurückweisung an.";
 $text['description-reject_delay_time']['es-cl'] = "Introduzca el tiempo de espera de rechazo.";
 $text['description-reject_delay_time']['es-mx'] = "Introduzca el tiempo de espera de rechazo."; //copied from es-cl
-$text['description-reject_delay_time']['fr-ca'] = "Choisir le délais de rejet."; //copied from fr-fr
-$text['description-reject_delay_time']['fr-fr'] = "Choisir le délais de rejet.";
+$text['description-reject_delay_time']['fr-ca'] = "Choisir le délai avant de rejeter.";
+$text['description-reject_delay_time']['fr-fr'] = "Choisir le délai avant de rejeter.";
 $text['description-reject_delay_time']['he-il'] = "";
 $text['description-reject_delay_time']['it-it'] = "Inserire Tempo Ritardo Rifiuto.";
 $text['description-reject_delay_time']['nl-nl'] = "Kies afwijzingsvertragingstijd";
@@ -2319,8 +2362,8 @@ $text['description-no_answer_delay_time']['de-ch'] = "Geben Sie die Zeit in Seku
 $text['description-no_answer_delay_time']['de-de'] = "Geben Sie die Zeit in Sekunden an, die gewartet werden soll bis ein Agent annimmt.";
 $text['description-no_answer_delay_time']['es-cl'] = "Introduzca el tiempo de espera sin responder del agente en segundos.";
 $text['description-no_answer_delay_time']['es-mx'] = "Introduzca el tiempo de espera sin responder del agente en segundos."; //copied from es-cl
-$text['description-no_answer_delay_time']['fr-ca'] = "Choisir le delais de non réponse de l'agent."; //copied from fr-fr
-$text['description-no_answer_delay_time']['fr-fr'] = "Choisir le delais de non réponse de l'agent.";
+$text['description-no_answer_delay_time']['fr-ca'] = "Définir le délai maximum sans réponse de l'agent en secondes.";
+$text['description-no_answer_delay_time']['fr-fr'] = "Définir le délai maximum sans réponse de l'agent en secondes.";
 $text['description-no_answer_delay_time']['he-il'] = "";
 $text['description-no_answer_delay_time']['it-it'] = "Inserire il tempo ritardo agente non risponde in secondi.";
 $text['description-no_answer_delay_time']['nl-nl'] = "Voer de agent geen antwoord vertragingstijd in (seconden)";
@@ -2340,8 +2383,8 @@ $text['description-music_on_hold']['de-ch'] = "Wählen Sie die gewünschte Warte
 $text['description-music_on_hold']['de-de'] = "Wählen Sie die gewünschte Wartemusik.";
 $text['description-music_on_hold']['es-cl'] = "Seleccione una música de espera.";
 $text['description-music_on_hold']['es-mx'] = "Seleccione una música de espera."; //copied from es-cl
-$text['description-music_on_hold']['fr-ca'] = "Sélection de la musique en attente."; //copied from fr-fr
-$text['description-music_on_hold']['fr-fr'] = "Sélection de la musique en attente.";
+$text['description-music_on_hold']['fr-ca'] = "Sélection de la musique d'attente."; 
+$text['description-music_on_hold']['fr-fr'] = "Sélection de la musique d'attente.";
 $text['description-music_on_hold']['he-il'] = "";
 $text['description-music_on_hold']['it-it'] = "Selezionare la musica di attesa desiderata.";
 $text['description-music_on_hold']['nl-nl'] = "Kies de gewenste wachtmuziek.";
@@ -2361,8 +2404,8 @@ $text['description-max_wait_time_with_no_agent_time_reached']['de-ch'] = "Geben
 $text['description-max_wait_time_with_no_agent_time_reached']['de-de'] = "Geben Sie die maximale Wartezeit in Sekunden an, die ohne Agent gewartet werden soll.";
 $text['description-max_wait_time_with_no_agent_time_reached']['es-cl'] = "Introduzca el tiempo máximo de espera sin agente alcanzado.";
 $text['description-max_wait_time_with_no_agent_time_reached']['es-mx'] = "Introduzca el tiempo máximo de espera sin agente alcanzado."; //copied from es-cl
-$text['description-max_wait_time_with_no_agent_time_reached']['fr-ca'] = " Entrez le temps d'attente maximum avec un rien de temps de l'agent atteint."; //copied from fr-fr
-$text['description-max_wait_time_with_no_agent_time_reached']['fr-fr'] = " Entrez le temps d'attente maximum avec un rien de temps de l'agent atteint.";
+$text['description-max_wait_time_with_no_agent_time_reached']['fr-ca'] = "Entrer le temps d'attente maximal atteint sans agent."; 
+$text['description-max_wait_time_with_no_agent_time_reached']['fr-fr'] = "Entrer le temps d'attente maximal atteint sans agent.";
 $text['description-max_wait_time_with_no_agent_time_reached']['he-il'] = "";
 $text['description-max_wait_time_with_no_agent_time_reached']['it-it'] = "Inserire Max Tempo Attesa Raggiungimento Tempo No Agenti.";
 $text['description-max_wait_time_with_no_agent_time_reached']['nl-nl'] = "Voer de maximale wachttijd voor 'geen agent' beschikbaar.";
@@ -2382,7 +2425,7 @@ $text['description-max_wait_time_with_no_agent']['de-ch'] = "Geben Sie die maxim
 $text['description-max_wait_time_with_no_agent']['de-de'] = "Geben Sie die maximale Wartezeit ohne Agent an.";
 $text['description-max_wait_time_with_no_agent']['es-cl'] = "Introduzca el tiempo máximo de espera sin agente.";
 $text['description-max_wait_time_with_no_agent']['es-mx'] = "Introduzca el tiempo máximo de espera sin agente."; //copied from es-cl
-$text['description-max_wait_time_with_no_agent']['fr-ca'] = "Entrer le temps max d'attente sans agent."; //copied from fr-fr
+$text['description-max_wait_time_with_no_agent']['fr-ca'] = "Entrer le temps maximal d'attente sans agent.";
 $text['description-max_wait_time_with_no_agent']['fr-fr'] = "Entrer le temps max d'attente sans agent.";
 $text['description-max_wait_time_with_no_agent']['he-il'] = "";
 $text['description-max_wait_time_with_no_agent']['it-it'] = "Inserire max tempo attesa senza agenti.";
@@ -2416,16 +2459,16 @@ $text['description-max_wait_time']['ru-ru'] = "Введите максималь
 $text['description-max_wait_time']['sv-se'] = "Ange max vänt-tid.";
 $text['description-max_wait_time']['uk-ua'] = "";
 
-$text['description-max_no_answer']['en-us'] = "Enter max no answer.";
-$text['description-max_no_answer']['en-gb'] = "Enter max no answer.";
+$text['description-max_no_answer']['en-us'] = "At max no answer, the agent will be logged out.";
+$text['description-max_no_answer']['en-gb'] = "At max no answer, the agent will be logged out.";
 $text['description-max_no_answer']['ar-eg'] = "";
 $text['description-max_no_answer']['de-at'] = "Geben Sie Max keine Antwort an."; //copied from de-de
 $text['description-max_no_answer']['de-ch'] = "Geben Sie Max keine Antwort an."; //copied from de-de
 $text['description-max_no_answer']['de-de'] = "Geben Sie Max keine Antwort an.";
-$text['description-max_no_answer']['es-cl'] = "Introduza el máximo de no respuestas.";
-$text['description-max_no_answer']['es-mx'] = "Introduza el máximo de no respuestas."; //copied from es-cl
-$text['description-max_no_answer']['fr-ca'] = "Choisir le maximum pas de réponse."; //copied from fr-fr
-$text['description-max_no_answer']['fr-fr'] = "Choisir le maximum pas de réponse.";
+$text['description-max_no_answer']['es-cl'] = "Si no hay respuesta como máximo, se cerrará la sesión del agente.";
+$text['description-max_no_answer']['es-mx'] = "Si no hay respuesta como máximo, se cerrará la sesión del agente.";
+$text['description-max_no_answer']['fr-ca'] = "Au maximum sans réponse, l'agent sera déconnecté";
+$text['description-max_no_answer']['fr-fr'] = "Au maximum sans réponse, l'agent sera déconnecté";
 $text['description-max_no_answer']['he-il'] = "";
 $text['description-max_no_answer']['it-it'] = "Inserire max mancata risposta.";
 $text['description-max_no_answer']['nl-nl'] = "Voer maximale geen antwoord tijd in.";
@@ -2445,8 +2488,8 @@ $text['description-extension']['de-ch'] = "Geben Sie die Nebenstelle an."; //cop
 $text['description-extension']['de-de'] = "Geben Sie die Nebenstelle an.";
 $text['description-extension']['es-cl'] = "Introduzca el número de extensión.";
 $text['description-extension']['es-mx'] = "Introduzca el número de extensión."; //copied from es-cl
-$text['description-extension']['fr-ca'] = "Entrer un numéro d'extension"; //copied from fr-fr
-$text['description-extension']['fr-fr'] = "Entrer un numéro d'extension";
+$text['description-extension']['fr-ca'] = "Entrer un numéro de poste";
+$text['description-extension']['fr-fr'] = "Entrer un numéro de poste";
 $text['description-extension']['he-il'] = "";
 $text['description-extension']['it-it'] = "Inserire numero di interno.";
 $text['description-extension']['nl-nl'] = "Voer toestelnummer in.";
@@ -2466,8 +2509,8 @@ $text['description-discard_abandoned_after']['de-ch'] = "Setzen Sie die Zeit in
 $text['description-discard_abandoned_after']['de-de'] = "Setzen Sie die Zeit in Sekunden, nach der ein Anrufer nicht wieder in die Warteschlange eingereiht wird.";
 $text['description-discard_abandoned_after']['es-cl'] = "Defina la cantidad de segundos para el abandono de descarte.";
 $text['description-discard_abandoned_after']['es-mx'] = "Defina la cantidad de segundos para el abandono de descarte."; //copied from es-cl
-$text['description-discard_abandoned_after']['fr-ca'] = "Choisir d'écartrer les abandons après un nombre de secondes."; //copied from fr-fr
-$text['description-discard_abandoned_after']['fr-fr'] = "Choisir d'écartrer les abandons après un nombre de secondes.";
+$text['description-discard_abandoned_after']['fr-ca'] = "Définir le nombre de secondes avant écarter les appels abandonnés.";
+$text['description-discard_abandoned_after']['fr-fr'] = "Définir le nombre de secondes avant écarter les appels abandonnés.";
 $text['description-discard_abandoned_after']['he-il'] = "";
 $text['description-discard_abandoned_after']['it-it'] = "Imposta Scarta chi Abbandona Dopo secondi.";
 $text['description-discard_abandoned_after']['nl-nl'] = "Stel afwijzings tijd (seconden) in waarna de oproeper wer in de wachtrij gezet wordt.";
@@ -2611,10 +2654,10 @@ $text['description-caller_announce_sound']['ar-eg'] = "";
 $text['description-caller_announce_sound']['de-at'] = "Eine Datei, die regelmäßig dem Anrufer vorgespielt werden soll. Benötigt den kompletten Pfad zur wav Datei."; //copied from de-de
 $text['description-caller_announce_sound']['de-ch'] = "Eine Datei, die regelmäßig dem Anrufer vorgespielt werden soll. Benötigt den kompletten Pfad zur wav Datei."; //copied from de-de
 $text['description-caller_announce_sound']['de-de'] = "Eine Datei, die regelmäßig dem Anrufer vorgespielt werden soll. Benötigt den kompletten Pfad zur wav Datei.";
-$text['description-caller_announce_sound']['es-cl'] = " Translate from: English Un sonido jugar a un cada persona que llama anunciar segundos de sonido. Necesita la ruta completa al archivo wav.";
-$text['description-caller_announce_sound']['es-mx'] = " Translate from: English Un sonido jugar a un cada persona que llama anunciar segundos de sonido. Necesita la ruta completa al archivo wav."; //copied from es-cl
-$text['description-caller_announce_sound']['fr-ca'] = " Un son à jouer à un appelant chaque annoncer secondes sonores. Besoins le chemin complet vers le fichier wav."; //copied from fr-fr
-$text['description-caller_announce_sound']['fr-fr'] = " Un son à jouer à un appelant chaque annoncer secondes sonores. Besoins le chemin complet vers le fichier wav.";
+$text['description-caller_announce_sound']['es-cl'] = "Translate from: English Un sonido jugar a un cada persona que llama anunciar segundos de sonido. Necesita la ruta completa al archivo wav.";
+$text['description-caller_announce_sound']['es-mx'] = "Translate from: English Un sonido jugar a un cada persona que llama anunciar segundos de sonido. Necesita la ruta completa al archivo wav."; //copied from es-cl
+$text['description-caller_announce_sound']['fr-ca'] = "Un son à jouer à un appelant à chaque fréquence de son d'annonce. Nécessite le chemin complet du fichier wav."; 
+$text['description-caller_announce_sound']['fr-fr'] = "Un son à jouer à un appelant à chaque fréquence de son d'annonce. Nécessite le chemin complet du fichier wav.";
 $text['description-caller_announce_sound']['he-il'] = "";
 $text['description-caller_announce_sound']['it-it'] = "Un audio da suonare al chiamante ogni intervallo in secondi per l'annuncio. E' necessario il percorso completo al file wav.";
 $text['description-caller_announce_sound']['nl-nl'] = "Stel geluid in de oproeper hoort om de aankondigings tijd(seconden), volledige pad naar de .wav file.";
@@ -2634,8 +2677,8 @@ $text['description-caller_announce_frequency']['de-ch'] = "Wie häufig soll der
 $text['description-caller_announce_frequency']['de-de'] = "Wie häufig soll der Anmeldeton abgespielt werden. Geben Sie eine Zahl in Sekunden an.";
 $text['description-caller_announce_frequency']['es-cl'] = "¿Con qué frecuencia deberíamos reproducir el sonido anunciar. Introduzca un número en segundos.";
 $text['description-caller_announce_frequency']['es-mx'] = "¿Con qué frecuencia deberíamos reproducir el sonido anunciar. Introduzca un número en segundos."; //copied from es-cl
-$text['description-caller_announce_frequency']['fr-ca'] = " Combien de fois devrions-nous jouer le son annonce. Entrez un nombre dans secondes."; //copied from fr-fr
-$text['description-caller_announce_frequency']['fr-fr'] = " Combien de fois devrions-nous jouer le son annonce. Entrez un nombre dans secondes.";
+$text['description-caller_announce_frequency']['fr-ca'] = "Fréquence auquel le son d'annonce joue. Entrer un nombre en secondes."; 
+$text['description-caller_announce_frequency']['fr-fr'] = "Fréquence auquel le son d'annonce joue. Entrer un nombre en secondes.";
 $text['description-caller_announce_frequency']['he-il'] = "";
 $text['description-caller_announce_frequency']['it-it'] = "Quanto spesso deve essere suonato l'annuncio, in secondi.";
 $text['description-caller_announce_frequency']['nl-nl'] = "Hoe vaak wordt de annoncering afgespeeld";
@@ -2655,8 +2698,8 @@ $text['description-call_timeout']['de-ch'] = "Geben Sie den Wert für die Zeitü
 $text['description-call_timeout']['de-de'] = "Geben Sie den Wert für die Zeitüberschreitung an.";
 $text['description-call_timeout']['es-cl'] = "Introduzca el timeout de la llamada.";
 $text['description-call_timeout']['es-mx'] = "Introduzca el timeout de la llamada."; //copied from es-cl
-$text['description-call_timeout']['fr-ca'] = "Choisir le timeout de l'appel."; //copied from fr-fr
-$text['description-call_timeout']['fr-fr'] = "Choisir le timeout de l'appel.";
+$text['description-call_timeout']['fr-ca'] = "Définir le délai d'expiration de l'appel.";
+$text['description-call_timeout']['fr-fr'] = "Définir le délai d'expiration de l'appel";
 $text['description-call_timeout']['he-il'] = "";
 $text['description-call_timeout']['it-it'] = "Inserire timeout di chiamata.";
 $text['description-call_timeout']['nl-nl'] = "Voer oproep overscheidingstijd in.";
@@ -2739,8 +2782,8 @@ $text['description-busy_delay_time']['de-ch'] = "Geben Sie eine Wartezeit für d
 $text['description-busy_delay_time']['de-de'] = "Geben Sie eine Wartezeit für den Agenten an.";
 $text['description-busy_delay_time']['es-cl'] = "Introduzca el tiempo de espera de agente ocupado.";
 $text['description-busy_delay_time']['es-mx'] = "Introduzca el tiempo de espera de agente ocupado."; //copied from es-cl
-$text['description-busy_delay_time']['fr-ca'] = "Choisir le temps d'attente quand l'agent est occupé."; //copied from fr-fr
-$text['description-busy_delay_time']['fr-fr'] = "Choisir le temps d'attente quand l'agent est occupé.";
+$text['description-busy_delay_time']['fr-ca'] = "Choisir le délai d'attente lorsque l'agent est occupé.";
+$text['description-busy_delay_time']['fr-fr'] = "Choisir le délai d'attente lorsque l'agent est occupé.";
 $text['description-busy_delay_time']['he-il'] = "";
 $text['description-busy_delay_time']['it-it'] = "Inserire il tempo di ritardo su agente occupato.";
 $text['description-busy_delay_time']['nl-nl'] = "Voer de agent bezet wachttijd in";
@@ -2865,8 +2908,8 @@ $text['description-abandoned_resume_allowed']['de-ch'] = "Schalten Sie die Wider
 $text['description-abandoned_resume_allowed']['de-de'] = "Schalten Sie die Wideraufnahme von Anrufern in der Warteschlange Ein oder Aus.";
 $text['description-abandoned_resume_allowed']['es-cl'] = "Defina el permiso para permitir la continuación de abandono a verdadero o falso.";
 $text['description-abandoned_resume_allowed']['es-mx'] = "Defina el permiso para permitir la continuación de abandono a verdadero o falso."; //copied from es-cl
-$text['description-abandoned_resume_allowed']['fr-ca'] = "choisir l'autorisation de reprise d'abandon à oui ou non."; //copied from fr-fr
-$text['description-abandoned_resume_allowed']['fr-fr'] = "choisir l'autorisation de reprise d'abandon à oui ou non.";
+$text['description-abandoned_resume_allowed']['fr-ca'] = "Définir l'autorisation de reprise d'abandon à oui ou non.";
+$text['description-abandoned_resume_allowed']['fr-fr'] = "Définir l'autorisation de reprise d'abandon à oui ou non.";
 $text['description-abandoned_resume_allowed']['he-il'] = "";
 $text['description-abandoned_resume_allowed']['it-it'] = "Imposta a vero o falso il permesso di ripristinare chi ha abbandonato.";
 $text['description-abandoned_resume_allowed']['nl-nl'] = "Kies de afgebroken vervolgen toestaan aan of uit.";
@@ -2886,8 +2929,8 @@ $text['confirm-copy']['de-ch'] = "Wollen Sie das wirklich kopieren?"; //copied f
 $text['confirm-copy']['de-de'] = "Wollen Sie das wirklich kopieren?";
 $text['confirm-copy']['es-cl'] = "¿Realmente desea copiar esto?";
 $text['confirm-copy']['es-mx'] = "¿Realmente desea copiar esto?"; //copied from es-cl
-$text['confirm-copy']['fr-ca'] = "Voulez-vous vraiment copier cela?"; //copied from fr-fr
-$text['confirm-copy']['fr-fr'] = "Voulez-vous vraiment copier cela?";
+$text['confirm-copy']['fr-ca'] = "Voulez-vous vraiment créer une copie?";
+$text['confirm-copy']['fr-fr'] = "Voulez-vous vraiment créer une copie?";
 $text['confirm-copy']['he-il'] = "";
 $text['confirm-copy']['it-it'] = "Vuoi veramente farne una copia?";
 $text['confirm-copy']['nl-nl'] = "Wil je dit werkelijk overnemen?";
@@ -2907,8 +2950,8 @@ $text['button-update_status']['de-ch'] = "Status Aktualisieren"; //copied from d
 $text['button-update_status']['de-de'] = "Status Aktualisieren";
 $text['button-update_status']['es-cl'] = "Actualizar Estado";
 $text['button-update_status']['es-mx'] = "Actualizar Estado"; //copied from es-cl
-$text['button-update_status']['fr-ca'] = "Mis à jour état"; //copied from fr-fr
-$text['button-update_status']['fr-fr'] = "Mis à jour état";
+$text['button-update_status']['fr-ca'] = "Mettre à jour l'état"; 
+$text['button-update_status']['fr-fr'] = "Mettre à jour l'état";
 $text['button-update_status']['he-il'] = "";
 $text['button-update_status']['it-it'] = "Stato Aggiornato";
 $text['button-update_status']['nl-nl'] = "Bijwerk status";
@@ -2928,8 +2971,8 @@ $text['button-tiers']['de-ch'] = "Ebenen"; //copied from de-de
 $text['button-tiers']['de-de'] = "Ebenen";
 $text['button-tiers']['es-cl'] = "Niveles";
 $text['button-tiers']['es-mx'] = "Niveles"; //copied from es-cl
-$text['button-tiers']['fr-ca'] = "Tiers"; //copied from fr-fr
-$text['button-tiers']['fr-fr'] = "Tiers";
+$text['button-tiers']['fr-ca'] = "Niveaux";
+$text['button-tiers']['fr-fr'] = "Niveaux";
 $text['button-tiers']['he-il'] = "";
 $text['button-tiers']['it-it'] = "Tiers";
 $text['button-tiers']['nl-nl'] = "Vergelijkingen";
diff --git a/app/call_centers/call_center_agent_dashboard.php b/app/call_centers/call_center_agent_dashboard.php
index 6c35982456..95b24cb3d4 100644
--- a/app/call_centers/call_center_agent_dashboard.php
+++ b/app/call_centers/call_center_agent_dashboard.php
@@ -212,7 +212,4 @@
 	echo "<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
 	echo "</form>\n";
 
-//include footer
-	require_once "resources/footer.php";
-
-?>
\ No newline at end of file
+?>
diff --git a/app/call_centers/call_center_agent_edit.php b/app/call_centers/call_center_agent_edit.php
index 1cb143ee77..f2d404663b 100644
--- a/app/call_centers/call_center_agent_edit.php
+++ b/app/call_centers/call_center_agent_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-2019
+	Portions created by the Initial Developer are Copyright (C) 2008-2020
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -93,6 +93,7 @@
 		$agent_wrap_up_time = $_POST["agent_wrap_up_time"];
 		$agent_reject_delay_time = $_POST["agent_reject_delay_time"];
 		$agent_busy_delay_time = $_POST["agent_busy_delay_time"];
+		$agent_record = $_POST["agent_record"];
 		//$agent_logout = $_POST["agent_logout"];
 	}
 
@@ -152,6 +153,12 @@
 			$users = $database->select($sql, $parameters, 'all');
 			unset($sql, $parameters);
 
+		//change the contact string to loopback - Not recommended added for backwards comptability causes multiple problems
+			if ($_SESSION['call_center']['agent_contact_method']['text'] == 'loopback') {
+				$agent_contact = str_replace("user/", "loopback/", $agent_contact);
+				$agent_contact = str_replace("@", "/", $agent_contact);
+			}
+
 		//prepare the array
 			$array['call_center_agents'][0]['domain_uuid'] = $_SESSION['domain_uuid'];
 			$array['call_center_agents'][0]['call_center_agent_uuid'] = $call_center_agent_uuid;
@@ -168,6 +175,7 @@
 			$array['call_center_agents'][0]['agent_wrap_up_time'] = $agent_wrap_up_time;
 			$array['call_center_agents'][0]['agent_reject_delay_time'] = $agent_reject_delay_time;
 			$array['call_center_agents'][0]['agent_busy_delay_time'] = $agent_busy_delay_time;
+			$array['call_center_agents'][0]['agent_record'] = $agent_record;
 			if (is_uuid($user_uuid)) {
 				$array['users'][0]['domain_uuid'] = $_SESSION['domain_uuid'];
 				$array['users'][0]['user_uuid'] = $user_uuid;
@@ -295,6 +303,7 @@
 			$agent_wrap_up_time = $row["agent_wrap_up_time"];
 			$agent_reject_delay_time = $row["agent_reject_delay_time"];
 			$agent_busy_delay_time = $row["agent_busy_delay_time"];
+			$agent_record = $row["agent_record"];
 			//$agent_logout = $row["agent_logout"];
 		}
 		unset($sql, $parameters, $row);
@@ -573,6 +582,20 @@
 	echo "</td>\n";
 	echo "</tr>\n";
 
+	echo "<tr>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap>\n";
+	echo "	".$text['label-record_template']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' align='left'>\n";
+	echo "	<select class='formfld' name='agent_record'>\n";
+	echo "	<option value='true' ".($agent_record == "true" ?  "selected='selected'" : '')." >".$text['option-true']."</option>\n";
+	echo "	<option value='false' ".($agent_record != "true" ?  "selected='selected'" : '').">".$text['option-false']."</option>\n";
+	echo "	</select>\n";
+	echo "<br />\n";
+	echo $text['description-record_template']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
 	/*
 	echo "<tr>\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
@@ -599,4 +622,4 @@
 //include the footer
 	require_once "resources/footer.php";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/call_centers/call_center_agents.php b/app/call_centers/call_center_agents.php
index 5542f2fe77..69d9d7ad38 100644
--- a/app/call_centers/call_center_agents.php
+++ b/app/call_centers/call_center_agents.php
@@ -119,6 +119,9 @@
 	echo "	<div class='heading'><b>".$text['header-call_center_agents']." (".$num_rows.")</b></div>\n";
 	echo "	<div class='actions'>\n";
 	echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$_SESSION['theme']['button_icon_back'],'id'=>'btn_back','link'=>'call_center_queues.php','style'=>'margin-right: 15px;']);
+	if (permission_exists('call_center_imports')) {
+		echo button::create(['type'=>'button','label'=>$text['button-import'],'icon'=>$_SESSION['theme']['button_icon_import'],'link'=>PROJECT_PATH.'/app/call_center_imports/call_center_imports.php?import_type=call_center_agents']);
+	}
 	if ($num_rows) {
 		echo button::create(['type'=>'button','label'=>$text['button-status'],'icon'=>'user-clock','style'=>'margin-right: 15px;','link'=>'call_center_agent_status.php']);
 	}
@@ -242,4 +245,4 @@
 //show the footer
 	require_once "resources/footer.php";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/call_centers/call_center_queue_edit.php b/app/call_centers/call_center_queue_edit.php
index 8652d49f82..622f5cc86d 100644
--- a/app/call_centers/call_center_queue_edit.php
+++ b/app/call_centers/call_center_queue_edit.php
@@ -86,6 +86,7 @@
 			$queue_moh_sound = $_POST["queue_moh_sound"];
 			$queue_record_template = $_POST["queue_record_template"];
 			$queue_time_base_score = $_POST["queue_time_base_score"];
+			$queue_time_base_score_sec = $_POST["queue_time_base_score_sec"];
 			$queue_max_wait_time = $_POST["queue_max_wait_time"];
 			$queue_max_wait_time_with_no_agent = $_POST["queue_max_wait_time_with_no_agent"];
 			$queue_max_wait_time_with_no_agent_time_reached = $_POST["queue_max_wait_time_with_no_agent_time_reached"];
@@ -188,6 +189,7 @@
 			//if (strlen($queue_moh_sound) == 0) { $msg .= $text['message-required'].$text['label-music_on_hold']."<br>\n"; }
 			//if (strlen($queue_record_template) == 0) { $msg .= $text['message-required'].$text['label-record_template']."<br>\n"; }
 			//if (strlen($queue_time_base_score) == 0) { $msg .= $text['message-required'].$text['label-time_base_score']."<br>\n"; }
+			//if (strlen($queue_time_base_score_sec) == 0) { $msg .= $text['message-required'].$text['label-time_base_score_sec']."<br>\n"; }
 			//if (strlen($queue_max_wait_time) == 0) { $msg .= $text['message-required'].$text['label-max_wait_time']."<br>\n"; }
 			//if (strlen($queue_max_wait_time_with_no_agent) == 0) { $msg .= $text['message-required'].$text['label-max_wait_time_with_no_agent']."<br>\n"; }
 			//if (strlen($queue_max_wait_time_with_no_agent_time_reached) == 0) { $msg .= $text['message-required'].$text['label-max_wait_time_with_no_agent_time_reached']."<br>\n"; }
@@ -269,6 +271,7 @@
 			$array['call_center_queues'][0]['queue_moh_sound'] = $queue_moh_sound;
 			$array['call_center_queues'][0]['queue_record_template'] = $queue_record_template;
 			$array['call_center_queues'][0]['queue_time_base_score'] = $queue_time_base_score;
+			$array['call_center_queues'][0]['queue_time_base_score_sec'] = $queue_time_base_score_sec;
 			$array['call_center_queues'][0]['queue_max_wait_time'] = $queue_max_wait_time;
 			$array['call_center_queues'][0]['queue_max_wait_time_with_no_agent'] = $queue_max_wait_time_with_no_agent;
 			$array['call_center_queues'][0]['queue_max_wait_time_with_no_agent_time_reached'] = $queue_max_wait_time_with_no_agent_time_reached;
@@ -324,8 +327,19 @@
 			$dialplan_xml .= "	<condition field=\"destination_number\" expression=\"^".$queue_extension."$\">\n";
 			$dialplan_xml .= "		<action application=\"answer\" data=\"\"/>\n";
 			$dialplan_xml .= "		<action application=\"set\" data=\"hangup_after_bridge=true\"/>\n";
+			if ($queue_time_base_score_sec != '') {
+				$dialplan_xml .= "		<action application=\"set\" data=\"cc_base_score=".$queue_time_base_score_sec."\"/>\n";
+			}
 			if ($queue_greeting_path != '') {
-				$dialplan_xml .= "		<action application=\"playback\" data=\"".$queue_greeting_path."\"/>\n";
+				$greeting_array = explode(':', $queue_greeting_path);
+				if (count($greeting_array) == 1) {
+					$dialplan_xml .= "		<action application=\"playback\" data=\"".$queue_greeting_path."\"/>\n";
+				}
+				else {
+					if ($greeting_array[0] == 'say' || $greeting_array[0] == 'tone_stream' || $greeting_array[0] == 'phrase') {
+						$dialplan_xml .= "		<action application=\"".$greeting_array[0]."\" data=\"".$greeting_array[1]."\"/>\n";
+					}
+				}
 			}
 			if (strlen($queue_cid_prefix) > 0) {
 				$dialplan_xml .= "		<action application=\"set\" data=\"effective_caller_id_name=".$queue_cid_prefix."#\${caller_id_name}\"/>\n";
@@ -345,7 +359,7 @@
 			$array['dialplans'][0]["dialplan_uuid"] = $dialplan_uuid;
 			$array['dialplans'][0]["dialplan_name"] = $queue_name;
 			$array['dialplans'][0]["dialplan_number"] = $queue_extension;
-			$array['dialplans'][0]["dialplan_context"] = $_SESSION['context'];
+			$array['dialplans'][0]["dialplan_context"] = $_SESSION['domain_name'];
 			$array['dialplans'][0]["dialplan_continue"] = "false";
 			$array['dialplans'][0]["dialplan_xml"] = $dialplan_xml;
 			$array['dialplans'][0]["dialplan_order"] = "230";
@@ -377,7 +391,12 @@
 
 		//clear the cache
 			$cache = new cache;
-			$cache->delete("dialplan:".$_SESSION["context"]);
+			$cache->delete("dialplan:".$_SESSION["domain_name"]);
+
+		//clear the destinations session array
+			if (isset($_SESSION['destinations']['array'])) {
+				unset($_SESSION['destinations']['array']);
+			}
 
 		//redirect the user
 			if (isset($action)) {
@@ -468,6 +487,7 @@
 				$queue_moh_sound = $row["queue_moh_sound"];
 				$queue_record_template = $row["queue_record_template"];
 				$queue_time_base_score = $row["queue_time_base_score"];
+				$queue_time_base_score_sec = $row["queue_time_base_score_sec"];
 				$queue_max_wait_time = $row["queue_max_wait_time"];
 				$queue_max_wait_time_with_no_agent = $row["queue_max_wait_time_with_no_agent"];
 				$queue_max_wait_time_with_no_agent_time_reached = $row["queue_max_wait_time_with_no_agent_time_reached"];
@@ -538,6 +558,7 @@
 	if (strlen($queue_strategy) == 0) { $queue_strategy = "longest-idle-agent"; }
 	if (strlen($queue_moh_sound) == 0) { $queue_moh_sound = "\$\${hold_music}"; }
 	if (strlen($queue_time_base_score) == 0) { $queue_time_base_score = "system"; }
+	if (strlen($queue_time_base_score) == 0) { $queue_time_base_score = ""; }
 	if (strlen($queue_max_wait_time) == 0) { $queue_max_wait_time = "0"; }
 	if (strlen($queue_max_wait_time_with_no_agent) == 0) { $queue_max_wait_time_with_no_agent = "90"; }
 	if (strlen($queue_max_wait_time_with_no_agent_time_reached) == 0) { $queue_max_wait_time_with_no_agent_time_reached = "30"; }
@@ -768,16 +789,17 @@
 				echo "	<tr>\n";
 				echo "		<td class=''>";
 				if (strlen($field['call_center_tier_uuid']) > 0) {
-					echo "		<input name='call_center_tiers[".$x."][call_center_tier_uuid]' type='hidden' value=\"".escape($field['call_center_tier_uuid'])."\">\n";
+					echo "				<input name='call_center_tiers[".$x."][call_center_tier_uuid]' type='hidden' value=\"".escape($field['call_center_tier_uuid'])."\">\n";
 				}
-				echo "				<select name=\"call_center_tiers[$x][call_center_agent_uuid]\" class=\"formfld\">\n";
-				echo "					<option value=\"\"></option>\n";
-				foreach($agents as $row) {
-					$selected = '';
-					if ($row['call_center_agent_uuid'] == $field['call_center_agent_uuid']) {
-						$selected = "selected=\"selected\"";
+				echo "				<select name=\"call_center_tiers[$x][call_center_agent_uuid]\" class=\"formfld\" style=\"width: 200px\">\n";
+				if (is_uuid($field['call_center_agent_uuid'])) {
+					echo "				<option value=\"".escape($field['call_center_agent_uuid'])."\">".escape($field['agent_name'])."</option>\n";
+				}
+				else {
+					echo "					<option value=\"\"></option>\n";
+					foreach($agents as $row) {
+						echo "				<option value=\"".escape($row['call_center_agent_uuid'])."\">".escape($row['agent_name'])."</option>\n";
 					}
-					echo "				<option value=\"".escape($row['call_center_agent_uuid'])."\" $selected>".escape($row['agent_name'])."</option>\n";
 				}
 				echo "				</select>";
 				echo "		</td>\n";
@@ -884,6 +906,17 @@
 	echo "</td>\n";
 	echo "</tr>\n";
 
+	echo "<tr>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap>\n";
+	echo "	".$text['label-time_base_score_sec']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' align='left'>\n";
+	echo "  <input class='formfld' type='number' name='queue_time_base_score_sec' maxlength='255' min='0' step='1' value='".escape($queue_time_base_score_sec)."'>\n";
+	echo "<br />\n";
+	echo $text['description-time_base_score_sec']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
 	echo "<tr>\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap>\n";
 	echo "	".$text['label-max_wait_time']."\n";
diff --git a/app/call_centers/call_center_queues.php b/app/call_centers/call_center_queues.php
index 86a8ed46c4..f56991567e 100644
--- a/app/call_centers/call_center_queues.php
+++ b/app/call_centers/call_center_queues.php
@@ -124,6 +124,9 @@
 	echo "<div class='action_bar' id='action_bar'>\n";
 	echo "	<div class='heading'><b>".$text['header-call_center_queues']." (".$num_rows.")</b></div>\n";
 	echo "	<div class='actions'>\n";
+	if (permission_exists('call_center_imports')) {
+		echo button::create(['type'=>'button','label'=>$text['button-import'],'icon'=>$_SESSION['theme']['button_icon_import'],'link'=>PROJECT_PATH.'/app/call_center_imports/call_center_imports.php?import_type=call_center_queues']);
+	}
 	if (permission_exists('call_center_agent_view')) {
 		echo button::create(['type'=>'button','label'=>$text['button-agents'],'icon'=>'users','link'=>'call_center_agents.php']);
 	}
@@ -182,6 +185,7 @@
 	//echo th_order_by('queue_moh_sound', $text['label-music_on_hold'], $order_by, $order);
 	//echo th_order_by('queue_record_template', $text['label-record_template'], $order_by, $order);
 	//echo th_order_by('queue_time_base_score', $text['label-time_base_score'], $order_by, $order);
+	//echo th_order_by('queue_time_base_score_sec', $text['label-time_base_score_sec'], $order_by, $order);
 	//echo th_order_by('queue_max_wait_time', $text['label-max_wait_time'], $order_by, $order);
 	//echo th_order_by('queue_max_wait_time_with_no_agent', $text['label-max_wait_time_with_no_agent'], $order_by, $order);
 	echo th_order_by('queue_tier_rules_apply', $text['label-tier_rules_apply'], $order_by, $order);
@@ -222,6 +226,7 @@
 			//echo "	<td>".escape($row[queue_moh_sound])."&nbsp;</td>\n";
 			//echo "	<td>".escape($row[queue_record_template])."&nbsp;</td>\n";
 			//echo "	<td>".escape($row[queue_time_base_score])."&nbsp;</td>\n";
+			//echo "	<td>".escape($row[queue_time_base_score_sec])."&nbsp;</td>\n";
 			//echo "	<td>".escape($row[queue_max_wait_time])."&nbsp;</td>\n";
 			//echo "	<td>".escape($row[queue_max_wait_time_with_no_agent])."&nbsp;</td>\n";
 			echo "	<td>".ucwords(escape($row['queue_tier_rules_apply']))."</td>\n";
@@ -253,4 +258,4 @@
 //show the footer
 	require_once "resources/footer.php";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/call_centers/resources/classes/call_center.php b/app/call_centers/resources/classes/call_center.php
index c5e8f59d69..53b08e0065 100644
--- a/app/call_centers/resources/classes/call_center.php
+++ b/app/call_centers/resources/classes/call_center.php
@@ -109,7 +109,7 @@
 					$dialplan["domain_uuid"] = $this->domain_uuid;
 					$dialplan["dialplan_name"] = ($this->queue_name != '') ? $this->queue_name : format_phone($this->destination_number);
 					$dialplan["dialplan_number"] = $this->destination_number;
-					$dialplan["dialplan_context"] = $_SESSION['context'];
+					$dialplan["dialplan_context"] = $_SESSION['domain_name'];
 					$dialplan["dialplan_continue"] = "false";
 					$dialplan["dialplan_order"] = "210";
 					$dialplan["dialplan_enabled"] = "true";
@@ -267,7 +267,7 @@
 
 				//clear the cache
 					$cache = new cache;
-					$cache->delete("dialplan:".$_SESSION['context']);
+					$cache->delete("dialplan:".$_SESSION['domain_name']);
 
 				//return the dialplan_uuid
 					return $dialplan_response;
@@ -346,6 +346,17 @@
 							//delete the checked rows
 								if (is_array($array) && @sizeof($array) != 0) {
 
+									//setup the event socket connection
+										$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+
+									//delete the queue in the switch
+										if ($fp) {
+											foreach ($uuids as $uuid) {
+												$cmd = "api callcenter_config queue unload ".$uuid;
+												$response = event_socket_request($fp, $cmd);
+											}
+										}
+
 									//grant temporary permissions
 										$p = new permissions;
 										$p->add('call_center_tier_delete', 'temp');
@@ -366,9 +377,14 @@
 
 									//clear the cache
 										$cache = new cache;
-										$cache->delete("dialplan:".$_SESSION["context"]);
+										$cache->delete("dialplan:".$_SESSION["domain_name"]);
 										remove_config_from_cache('configuration:callcenter.conf');
 
+									//clear the destinations session array
+										if (isset($_SESSION['destinations']['array'])) {
+											unset($_SESSION['destinations']['array']);
+										}
+
 									//synchronize configuration
 										save_call_center_xml();
 
@@ -417,7 +433,7 @@
 
 							//build the delete array
 								if (is_array($uuids) && @sizeof($uuids) != 0) {
-									foreach ($uuids as $uuid) {
+									foreach ($uuids as $x => $uuid) {
 										$array[$this->table][$x][$this->uuid_prefix.'uuid'] = $uuid;
 										$array[$this->table][$x]['domain_uuid'] = $_SESSION['domain_uuid'];
 										$array['call_center_tiers'][$x]['call_center_agent_uuid'] = $uuid;
@@ -592,7 +608,7 @@
 
 									//clear the cache
 										$cache = new cache;
-										$cache->delete("dialplan:".$_SESSION["context"]);
+										$cache->delete("dialplan:".$_SESSION["domain_name"]);
 
 									//set message
 										message::add($text['message-copy']);
diff --git a/app/call_flows/call_flow_edit.php b/app/call_flows/call_flow_edit.php
index c507527df7..d7b4cc6f21 100644
--- a/app/call_flows/call_flow_edit.php
+++ b/app/call_flows/call_flow_edit.php
@@ -255,6 +255,11 @@
 			$cache = new cache;
 			$cache->delete("dialplan:".$call_flow_context);
 
+		//clear the destinations session array
+			if (isset($_SESSION['destinations']['array'])) {
+				unset($_SESSION['destinations']['array']);
+			}
+
 		//redirect the user
 			if (isset($action)) {
 				if ($action == "add") {
diff --git a/app/call_flows/resources/classes/call_flows.php b/app/call_flows/resources/classes/call_flows.php
index 2bb4d87647..cff8c934f0 100644
--- a/app/call_flows/resources/classes/call_flows.php
+++ b/app/call_flows/resources/classes/call_flows.php
@@ -158,6 +158,11 @@ if (!class_exists('call_flows')) {
 										}
 									}
 
+								//clear the destinations session array
+									if (isset($_SESSION['destinations']['array'])) {
+										unset($_SESSION['destinations']['array']);
+									}
+
 								//set message
 									message::add($text['message-delete']);
 							}
@@ -250,6 +255,11 @@ if (!class_exists('call_flows')) {
 										}
 									}
 
+								//clear the destinations session array
+									if (isset($_SESSION['destinations']['array'])) {
+										unset($_SESSION['destinations']['array']);
+									}
+
 								//set message
 									message::add($text['message-toggle']);
 							}
diff --git a/app/calls/app_config.php b/app/calls/app_config.php
index 157c972801..ec3f393e8e 100644
--- a/app/calls/app_config.php
+++ b/app/calls/app_config.php
@@ -51,8 +51,6 @@
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "call_forward_all";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = "call_forward_caller_id";
 
 	//default settings
 		$y=0;
diff --git a/app/calls/call_edit.php b/app/calls/call_edit.php
index 167c836259..56ec9d6c84 100644
--- a/app/calls/call_edit.php
+++ b/app/calls/call_edit.php
@@ -101,7 +101,6 @@
 		$forward_user_not_registered_destination = $row["forward_user_not_registered_destination"];
 		$forward_user_not_registered_enabled = $row["forward_user_not_registered_enabled"];
 		$follow_me_uuid = $row["follow_me_uuid"];
-		$forward_caller_id_uuid = $row["forward_caller_id_uuid"];
 	}
 	else {
 		echo "access denied";
@@ -123,11 +122,9 @@
 				$forward_user_not_registered_enabled = $_POST["forward_user_not_registered_enabled"];
 				$forward_user_not_registered_destination = $_POST["forward_user_not_registered_destination"];
 
-				$forward_caller_id_uuid = $_POST["forward_caller_id_uuid"];
 				$cid_name_prefix = $_POST["cid_name_prefix"];
 				$cid_number_prefix = $_POST["cid_number_prefix"];
 				$follow_me_enabled = $_POST["follow_me_enabled"];
-				$follow_me_caller_id_uuid = $_POST["follow_me_caller_id_uuid"];
 				$follow_me_ignore_busy = $_POST["follow_me_ignore_busy"];
 
 				$n = 0;
@@ -194,7 +191,6 @@
 				$array['extensions'][0]['forward_no_answer_destination'] = $forward_no_answer_destination;
 				$array['extensions'][0]['forward_user_not_registered_enabled'] = $forward_user_not_registered_enabled;
 				$array['extensions'][0]['forward_user_not_registered_destination'] = $forward_user_not_registered_destination;
-				$array['extensions'][0]['forward_caller_id_uuid'] = $forward_caller_id_uuid;
 			}
 
 		//do not disturb (dnd) config
@@ -226,7 +222,6 @@
 					$array['follow_me'][0]['follow_me_uuid'] = $follow_me_uuid;
 					$array['follow_me'][0]['cid_name_prefix'] = $cid_name_prefix;
 					$array['follow_me'][0]['cid_number_prefix'] = $cid_number_prefix;
-					$array['follow_me'][0]['follow_me_caller_id_uuid'] = $follow_me_caller_id_uuid;
 					$array['follow_me'][0]['follow_me_ignore_busy'] = $follow_me_ignore_busy;
 					if ($destination_found) {
 						$array['follow_me'][0]['follow_me_enabled'] = $follow_me_enabled;
@@ -297,7 +292,6 @@
 				$call_forward->extension_uuid = $extension_uuid;
 				$call_forward->forward_all_destination = $forward_all_destination;
 				$call_forward->forward_all_enabled = $forward_all_enabled;
-				$call_forward->forward_caller_id_uuid = $forward_caller_id_uuid;
 			}
 
 		//do not disturb (dnd) config
@@ -328,7 +322,6 @@
 				$follow_me->extension_uuid = $extension_uuid;
 				$follow_me->follow_me_uuid = $follow_me_uuid;
 				$follow_me->follow_me_ignore_busy = $follow_me_ignore_busy;
-				$follow_me->follow_me_caller_id_uuid = $follow_me_caller_id_uuid;
 				$follow_me->follow_me_enabled = $follow_me_enabled;
 				$follow_me->set();
 				unset($follow_me);
@@ -431,7 +424,6 @@
 			$cid_name_prefix = $row["cid_name_prefix"];
 			$cid_number_prefix = $row["cid_number_prefix"];
 			$follow_me_enabled = $row["follow_me_enabled"];
-			$follow_me_caller_id_uuid = $row["follow_me_caller_id_uuid"];
 			$follow_me_ignore_busy = $row["follow_me_ignore_busy"];
 			unset($row);
 
@@ -441,6 +433,8 @@
 			$parameters['follow_me_uuid'] = $follow_me_uuid;
 			$database = new database;
 			$result = $database->select($sql, $parameters, 'all');
+
+			unset($destinations);
 			foreach ($result as $x => &$row) {
 				$destinations[$x]['uuid'] = $row["follow_me_destination_uuid"];
 				$destinations[$x]['destination'] = $row["follow_me_destination"];
@@ -493,6 +487,7 @@
 	echo "});\n";
 	echo "</script>\n";
 	}
+
 //create token
 	$object = new token;
 	$token = $object->create($_SERVER['PHP_SELF']);
@@ -579,43 +574,6 @@
 	echo "</td>\n";
 	echo "</tr>\n";
 
-	if (permission_exists('call_forward_caller_id')) {
-		$sql = "select destination_uuid, destination_number, destination_description, destination_caller_id_number, destination_caller_id_name ";
-		$sql .= "from v_destinations ";
-		$sql .= "where domain_uuid = :domain_uuid ";
-		$sql .= "and destination_type = 'inbound' ";
-		$sql .= "order by destination_number asc ";
-		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
-		$database = new database;
-		$result = $database->select($sql, $parameters, 'all');
-		if (is_array($result) && sizeof($result) != 0) {
-			echo "<tr>\n";
-			echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>";
-			echo 	$text['label-cid-number'];
-			echo "</td>\n";
-			echo "<td class='vtable' align='left'>\n";
-			echo "	<select name='forward_caller_id_uuid' id='forward_caller_id_uuid' class='formfld' >\n";
-			echo "		<option value=''></option>\n";
-			foreach ($result as &$row) {
-				$selected = $row["destination_uuid"] == $forward_caller_id_uuid ? "selected='selected' " : '';
-				$caller_id_number = $row['destination_caller_id_number'];
-				if(strlen($caller_id_number) == 0){
-					$caller_id_number = $row['destination_number'];
-				}
-				$caller_id_name = $row['destination_caller_id_name'];
-				if(strlen($caller_id_name) == 0){
-					$caller_id_name = $row['destination_description'];
-				}
-				echo "		<option value='".escape($row["destination_uuid"])."' ".$selected.">".format_phone(escape($caller_id_number))." : ".escape($caller_id_name)."</option>\n";
-			}
-			echo "	</select><br />\n";
-			echo $text['description-cid-number']."\n";
-			echo "</td>\n";
-			echo "</tr>\n";
-		}
-		unset($sql, $parameters, $result, $row);
-	}
-
 	echo "<tr><td colspan='2'><br /></td></tr>\n";
 
 	echo "<tr>\n";
@@ -625,9 +583,6 @@
 	echo "<td class='vtable' align='left'>\n";
 	$on_click = "document.getElementById('forward_all_disabled').checked=true; ";
 	$on_click .= "document.getElementById('dnd_disabled').checked=true; ";
-	if (permission_exists('follow_me_caller_id')) {
-		$on_click .= "document.getElementById('follow_me_caller_id_uuid').focus(); ";
-	}
 	echo "	<label for='follow_me_disabled'><input type='radio' name='follow_me_enabled' id='follow_me_disabled' onclick=\"$('#tr_follow_me_settings').slideUp('fast');\" value='false' ".(($follow_me_enabled == "false" || $follow_me_enabled == "") ? "checked='checked'" : null)." /> ".$text['label-disabled']."</label> \n";
 	echo "	<label for='follow_me_enabled'><input type='radio' name='follow_me_enabled' id='follow_me_enabled' onclick=\"$('#tr_follow_me_settings').slideDown('fast'); $on_click\" value='true' ".(($follow_me_enabled == "true") ? "checked='checked'" : null)."/> ".$text['label-enabled']."</label> \n";
 	unset($on_click);
@@ -696,45 +651,6 @@
 		echo "		</tr>\n";
 	}
 
-	if (permission_exists('follow_me_caller_id')) {
-		$sql = "select destination_uuid, destination_number, destination_description, destination_caller_id_number, destination_caller_id_name ";
-		$sql .= "from v_destinations ";
-		$sql .= "where domain_uuid = :domain_uuid ";
-		$sql .= "and destination_type = 'inbound' ";
-		$sql .= "order by destination_number asc ";
-		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
-		$database = new database;
-		$result = $database->select($sql, $parameters, 'all');
-		if (is_array($result) && sizeof($result) != 0) {
-			echo "<tr>\n";
-			echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>";
-			echo 	$text['label-cid-number'];
-			echo "</td>\n";
-			echo "<td class='vtable' align='left'>\n";
-			echo "	<select name='follow_me_caller_id_uuid' id='follow_me_caller_id_uuid' class='formfld' >\n";
-			echo "		<option value=''></option>\n";
-			foreach ($result as &$row) {
-				$selected = $row["destination_uuid"] == $follow_me_caller_id_uuid ? "selected='selected'" : null;
-
-				$caller_id_number = $row['destination_caller_id_number'];
-				if(strlen($caller_id_number) == 0){
-					$caller_id_number = $row['destination_number'];
-				}
-				$caller_id_name = $row['destination_caller_id_name'];
-				if(strlen($caller_id_name) == 0){
-					$caller_id_name = $row['destination_description'];
-				}
-
-				echo "		<option value='".escape($row["destination_uuid"])."' ".$selected.">".format_phone(escape($caller_id_number))." : ".escape($caller_id_name)."</option>\n";
-			}
-			echo "	</select><br />\n";
-			echo $text['description-cid-number']."\n";
-			echo "</td>\n";
-			echo "</tr>\n";
-		}
-		unset($sql, $parameters, $result, $row);
-	}
-
 	if (permission_exists('follow_me_cid_name_prefix')) {
 		echo "<tr>\n";
 		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
diff --git a/app/calls/calls.php b/app/calls/calls.php
index cbfe56b6df..ff66f5bcbf 100644
--- a/app/calls/calls.php
+++ b/app/calls/calls.php
@@ -194,16 +194,6 @@
 	}
 	require_once "resources/header.php";
 
-//javascript for toggle select box
-	echo "<script language='javascript' type='text/javascript'>\n";
-	echo "	function toggle_select() {\n";
-	echo "		$('#call_control_feature').fadeToggle(400, function() {\n";
-	echo "			document.getElementById('call_control_feature').selectedIndex = 0;\n";
-	echo "			document.getElementById('call_control_feature').focus();\n";
-	echo "		});\n";
-	echo "	}\n";
-	echo "</script>\n";
-
 //show the content
 	if ($is_included) {
 		echo "<div class='action_bar sub'>\n";
@@ -222,21 +212,17 @@
 		echo "	<div class='actions'>\n";
 
 		if ($extensions) {
-			echo button::create(['type'=>'button','label'=>$text['button-toggle'],'icon'=>$_SESSION['theme']['button_icon_toggle'],'name'=>'btn_toggle','onclick'=>"toggle_select(); this.blur();"]);
+			if (permission_exists('call_forward')) {
+				echo button::create(['type' => 'button', 'label' => $text['label-call_forward'], 'icon' => $_SESSION['theme']['button_icon_toggle'], 'collapse' => false, 'name' => 'btn_toggle_cfwd', 'onclick' => "list_action_set('toggle_call_forward'); modal_open('modal-toggle','btn_toggle');"]);
+			}
+			if (permission_exists('follow_me')) {
+				echo button::create(['type' => 'button', 'label' => $text['label-follow_me'], 'icon' => $_SESSION['theme']['button_icon_toggle'], 'collapse' => false, 'name' => 'btn_toggle_follow', 'onclick' => "list_action_set('toggle_follow_me'); modal_open('modal-toggle','btn_toggle');"]);
+			}
+			if (permission_exists('do_not_disturb')) {
+				echo button::create(['type' => 'button', 'label' => $text['label-dnd'], 'icon' => $_SESSION['theme']['button_icon_toggle'], 'collapse' => false, 'name' => 'btn_toggle_dnd', 'onclick' => "list_action_set('toggle_do_not_disturb'); modal_open('modal-toggle','btn_toggle');"]);
+			}
 		}
-		echo 		"<select class='formfld' style='display: none; width: auto;' id='call_control_feature' onchange=\"if (this.selectedIndex != 0) { modal_open('modal-toggle','btn_toggle'); }\">";
-		echo "			<option value='' selected='selected'>".$text['label-select']."</option>";
-		if (permission_exists('call_forward')) {
-			echo "		<option value='call_forward'>".$text['label-call_forward']."</option>";
-		}
-		if (permission_exists('follow_me')) {
-			echo "		<option value='follow_me'>".$text['label-follow_me']."</option>";
-		}
-		if (permission_exists('do_not_disturb')) {
-			echo "		<option value='do_not_disturb'>".$text['label-dnd']."</option>";
-		}
-		echo "		</select>";
-		if ($_GET['show'] !== 'all' && permission_exists('call_forward_all')) {	
+		if ($_GET['show'] !== 'all' && permission_exists('call_forward_all')) {
 			echo button::create(['type'=>'button','label'=>$text['button-show_all'],'icon'=>$_SESSION['theme']['button_icon_all'],'link'=>'?show=all'.($params ? '&'.implode('&', $params) : null)]);
 		}
 		echo 		"<form id='form_search' class='inline' method='get'>\n";
@@ -255,7 +241,7 @@
 		echo "</div>\n";
 
 		if ($extensions) {
-			echo modal::create(['id'=>'modal-toggle','type'=>'toggle','actions'=>button::create(['type'=>'button','label'=>$text['button-continue'],'icon'=>'check','id'=>'btn_toggle','style'=>'float: right; margin-left: 15px;','collapse'=>'never','onclick'=>"modal_close(); list_action_set('toggle_' + document.getElementById('call_control_feature').options[document.getElementById('call_control_feature').selectedIndex].value); list_form_submit('form_list');"])]);
+			echo modal::create(['id'=>'modal-toggle','type'=>'toggle','actions'=>button::create(['type'=>'button','label'=>$text['button-continue'],'icon'=>'check','id'=>'btn_toggle','style'=>'float: right; margin-left: 15px;','collapse'=>'never','onclick'=>"modal_close(); list_form_submit('form_list');"])]);
 		}
 
 		echo $text['description-call_routing']."\n";
diff --git a/app/calls/resources/classes/call_forward.php b/app/calls/resources/classes/call_forward.php
index 31517b5c65..e03f1d9daf 100644
--- a/app/calls/resources/classes/call_forward.php
+++ b/app/calls/resources/classes/call_forward.php
@@ -42,7 +42,6 @@ include "root.php";
 		private $dial_string;
 		private $toll_allow;
 		public $accountcode;
-		public $forward_caller_id_uuid;
 		public $outbound_caller_id_name;
 		public $outbound_caller_id_number;
 
@@ -280,4 +279,4 @@ include "root.php";
 
 	}// class
 
-?>
\ No newline at end of file
+?>
diff --git a/app/calls/resources/classes/feature_event_notify.php b/app/calls/resources/classes/feature_event_notify.php
index 28e0791011..b7efff6196 100644
--- a/app/calls/resources/classes/feature_event_notify.php
+++ b/app/calls/resources/classes/feature_event_notify.php
@@ -43,38 +43,40 @@ include "root.php";
 
 	//feature_event method		
 		public function send_notify() {
-
-				$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
-				if ($fp) {
-					//get the sip profile name
-						$command = "sofia_contact */".$this->extension."@".$this->domain_name;
-						$contact_string = event_socket_request($fp, "api ".$command);
-						if (substr($contact_string, 0, 5) == "sofia") {
-							$contact_array = explode("/", $contact_string);
-							$sip_profile_name = $contact_array[1];
-						}
-						else {
-							$sip_profile_name = 'internal';
-						}
-					//send the event
-						$event = "sendevent SWITCH_EVENT_PHONE_FEATURE\n";
-						$event .= "profile: ".$sip_profile_name."\n";
-						$event .= "user: ".$this->extension."\n";
-						$event .= "host: ".$this->domain_name."\n";
-						$event .= "device: \n";
-						$event .= "Feature-Event: init\n";
-						$event .= "forward_immediate_enabled: ".$this->forward_all_enabled."\n";
-						$event .= "forward_immediate: ".$this->forward_all_destination."\n";
-						$event .= "forward_busy_enabled: ".$this->forward_busy_enabled."\n";
-						$event .= "forward_busy: ".$this->forward_busy_destination."\n";
-						$event .= "forward_no_answer_enabled: ".$this->forward_no_answer_enabled."\n";
-						$event .= "forward_no_answer: ".$this->forward_no_answer_destination."\n";
-						$event .= "doNotDisturbOn: ".$this->do_not_disturb."\n";
-						$event .= "ringCount: ".$this->ring_count."\n";
-						event_socket_request($fp, $event);
-	
-					fclose($fp);	
+			$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+			if ($fp) {
+				// Get the SIP profiles for the extension
+				$command = "sofia_contact */{$this->extension}@{$this->domain_name}";
+				$contact_string = event_socket_request($fp, "api ".$command);
+				// The first value in the array will be full matching text, the second one will be the array of profile matches
+				preg_match_all('/sofia\/([^,]+)\/(?:[^,]+)/', $contact_string, $matches);
+				if (sizeof($matches) != 2 || sizeof($matches[1]) < 1) {
+					$profiles = array("internal");
+				} else {
+					// We have at least one profile, get all of the unique profiles
+					$profiles = array_unique($matches[1]);
 				}
+
+				foreach ($profiles as $profile) {
+					//send the event
+					$event = "sendevent SWITCH_EVENT_PHONE_FEATURE\n";
+					$event .= "profile: " . $profile . "\n";
+					$event .= "user: " . $this->extension . "\n";
+					$event .= "host: " . $this->domain_name . "\n";
+					$event .= "device: \n";
+					$event .= "Feature-Event: init\n";
+					$event .= "forward_immediate_enabled: " . $this->forward_all_enabled . "\n";
+					$event .= "forward_immediate: " . $this->forward_all_destination . "\n";
+					$event .= "forward_busy_enabled: " . $this->forward_busy_enabled . "\n";
+					$event .= "forward_busy: " . $this->forward_busy_destination . "\n";
+					$event .= "forward_no_answer_enabled: " . $this->forward_no_answer_enabled . "\n";
+					$event .= "forward_no_answer: " . $this->forward_no_answer_destination . "\n";
+					$event .= "doNotDisturbOn: " . $this->do_not_disturb . "\n";
+					$event .= "ringCount: " . $this->ring_count . "\n";
+					event_socket_request($fp, $event);
+				}
+				fclose($fp);
+			}
 		} //function
 	
 	} //class
diff --git a/app/calls/resources/classes/follow_me.php b/app/calls/resources/classes/follow_me.php
index fa6df03d8a..fa602d9654 100644
--- a/app/calls/resources/classes/follow_me.php
+++ b/app/calls/resources/classes/follow_me.php
@@ -39,7 +39,6 @@ include "root.php";
 		public $cid_number_prefix;
 		public $accountcode;
 		public $follow_me_enabled;
-		public $follow_me_caller_id_uuid;
 		public $follow_me_ignore_busy;
 		public $outbound_caller_id_name;
 		public $outbound_caller_id_number;
@@ -89,7 +88,7 @@ include "root.php";
 				if (strlen($this->cid_number_prefix) > 0) {
 					$array['follow_me'][0]['cid_number_prefix'] = $this->cid_number_prefix;
 				}
-				$array['follow_me'][0]['follow_me_caller_id_uuid'] = is_uuid($this->follow_me_caller_id_uuid) ? $this->follow_me_caller_id_uuid : null;
+
 				$array['follow_me'][0]['follow_me_enabled'] = $this->follow_me_enabled;
 				$array['follow_me'][0]['follow_me_ignore_busy'] = $this->follow_me_ignore_busy;
 			//grant temporary permissions
@@ -114,7 +113,6 @@ include "root.php";
 				$array['follow_me'][0]['follow_me_uuid'] = $this->follow_me_uuid;
 				$array['follow_me'][0]['cid_name_prefix'] = $this->cid_name_prefix;
 				$array['follow_me'][0]['cid_number_prefix'] = $this->cid_number_prefix;
-				$array['follow_me'][0]['follow_me_caller_id_uuid'] = is_uuid($this->follow_me_caller_id_uuid) ? $this->follow_me_caller_id_uuid : null;
 				$array['follow_me'][0]['follow_me_enabled'] = $this->follow_me_enabled;
 				$array['follow_me'][0]['follow_me_ignore_busy'] = $this->follow_me_ignore_busy;
 			//grant temporary permissions
@@ -459,4 +457,4 @@ include "root.php";
 
 	} //class
 
-?>
\ No newline at end of file
+?>
diff --git a/app/click_to_call/app_languages.php b/app/click_to_call/app_languages.php
index 4fd199f41d..25bc633844 100644
--- a/app/click_to_call/app_languages.php
+++ b/app/click_to_call/app_languages.php
@@ -450,8 +450,8 @@ $text['desc-ringback']['de-ch'] = "Geben Sie an, was Sie hören möchten, währe
 $text['desc-ringback']['de-de'] = "Geben Sie an, was Sie hören möchten, während die Verbindung aufgebaut wird. Zur Auswahl stehen musik (Wartemusik) oder Rufton";
 $text['desc-ringback']['es-cl'] = "Defina qué desea escuchar mientras se llama al destinatario. Las opciones son música (música en espera) o tono de marcado";
 $text['desc-ringback']['es-mx'] = "Defina qué desea escuchar mientras se llama al destinatario. Las opciones son música (música en espera) o tono de marcado"; //copied from es-cl
-$text['desc-ringback']['fr-ca'] = "Défini ce vous entendrez pendant que la destination sera appelée. Les choix sont musique (musique de garde) sonnerie."; //copied from fr-fr
-$text['desc-ringback']['fr-fr'] = "Défini ce vous entendrez pendant que la destination sera appelée. Les choix sont musique (musique de garde) sonnerie.";
+$text['desc-ringback']['fr-ca'] = "Défini ce vous entendrez pendant que la destination sera appelée. Les choix sont musique (musique d'attente) sonnerie."; //copied from fr-fr
+$text['desc-ringback']['fr-fr'] = "Défini ce vous entendrez pendant que la destination sera appelée. Les choix sont musique (musique d'attente) sonnerie.";
 $text['desc-ringback']['he-il'] = "";
 $text['desc-ringback']['it-it'] = "Definisce cosa sentirai mentre il destinatario è chiamato. Le scelte sono musica (music on hold) o tono (ring tone).";
 $text['desc-ringback']['nl-nl'] = "Kies wachtmuziek terwijl de bestemming gebeld wordt. De keuze is wachtmuziek of beltoon.";
diff --git a/app/click_to_call/click_to_call.php b/app/click_to_call/click_to_call.php
index 7a953f7b97..50a7ff3f5b 100644
--- a/app/click_to_call/click_to_call.php
+++ b/app/click_to_call/click_to_call.php
@@ -2,7 +2,7 @@
 /* $Id$ */
 /*
 	click_to_call.php
-	Copyright (C) 2008, 2018 Mark J Crane
+	Copyright (C) 2008, 2021 Mark J Crane
 	All rights reserved.
 
 	Redistribution and use in source and binary forms, with or without
@@ -66,7 +66,7 @@
 			$auto_answer = check_str($_GET['auto_answer']); //true,false
 			$rec = check_str($_GET['rec']); //true,false
 			$ringback = check_str($_GET['ringback']);
-			$context = $_SESSION['context'];
+			$context = $_SESSION['domain_name'];
 
 		//clean up variable values
 			$src = str_replace(array('.','(',')','-',' '), '', $src);
@@ -209,7 +209,7 @@
 			else {
 				//display the last command
 					$switch_cmd = "api originate ".$source.$switch_cmd;
-					echo "<div align='center'>".$switch_cmd."<br /><br /><strong>".$src." has called ".$dest."</strong></div>\n";
+					echo "<div align='center'><strong>".escape($src)." has called ".escape($dest)."</strong></div>\n";
 				//show the command result
 				$result = trim(event_socket_request($fp, $switch_cmd));
 				if (substr($result, 0,3) == "+OK") {
@@ -218,11 +218,13 @@
 						//use the server's time zone to ensure it matches the time zone used by freeswitch
 							date_default_timezone_set($_SESSION['time_zone']['system']);
 						//create the api record command and send it over event socket
-							$switch_cmd = "api uuid_record ".$origination_uuid." start ".$record_path."/".$record_name;
+							if (is_uuid($origination_uuid) && file_exists($record_path)) {
+								$switch_cmd = "api uuid_record ".$origination_uuid." start ".$record_path."/".$record_name;
+							}
 							$result2 = trim(event_socket_request($fp, $switch_cmd));
 					}
 				}
-				echo "<div align='center'><br />".$result."<br /><br /></div>\n";
+				echo "<div align='center'><br />".escape($result)."<br /><br /></div>\n";
 			}
 	}
 
@@ -291,7 +293,7 @@
 	echo "<tr>\n";
 	echo "	<td class='vncellreq'>".$text['label-src-num']."</td>\n";
 	echo "	<td class='vtable' align='left'>\n";
-	echo "		<input name=\"src\" value='$src' class='formfld'>\n";
+	echo "		<input name=\"src\" value='".escape($src)."' class='formfld'>\n";
 	echo "		<br />\n";
 	echo "		".$text['desc-src-num']."\n";
 	echo "	</td>\n";
@@ -300,7 +302,7 @@
 	echo "<tr>\n";
 	echo "	<td class='vncellreq'>".$text['label-dest-num']."</td>\n";
 	echo "	<td class='vtable' align='left'>\n";
-	echo "		<input name=\"dest\" value='$dest' class='formfld'>\n";
+	echo "		<input name=\"dest\" value='".escape($dest)."' class='formfld'>\n";
 	echo "		<br />\n";
 	echo "		".$text['desc-dest-num']."\n";
 	echo "	</td>\n";
diff --git a/app/conference_centers/conference_center_edit.php b/app/conference_centers/conference_center_edit.php
index 0d2ba8c3b1..fe8b29769e 100644
--- a/app/conference_centers/conference_center_edit.php
+++ b/app/conference_centers/conference_center_edit.php
@@ -147,7 +147,7 @@
 			$array['dialplans'][0]["dialplan_uuid"] = $dialplan_uuid;
 			$array['dialplans'][0]["dialplan_name"] = $conference_center_name;
 			$array['dialplans'][0]["dialplan_number"] = $conference_center_extension;
-			$array['dialplans'][0]["dialplan_context"] = $_SESSION['context'];
+			$array['dialplans'][0]["dialplan_context"] = $_SESSION['domain_name'];
 			$array['dialplans'][0]["dialplan_continue"] = "false";
 			$array['dialplans'][0]["dialplan_xml"] = $dialplan_xml;
 			$array['dialplans'][0]["dialplan_order"] = "333";
@@ -183,7 +183,12 @@
 
 		//clear the cache
 			$cache = new cache;
-			$cache->delete("dialplan:".$_SESSION["context"]);
+			$cache->delete("dialplan:".$_SESSION["domain_name"]);
+
+		//clear the destinations session array
+			if (isset($_SESSION['destinations']['array'])) {
+				unset($_SESSION['destinations']['array']);
+			}
 
 		//redirect the user
 			if (isset($action)) {
diff --git a/app/conference_centers/conference_sessions.php b/app/conference_centers/conference_sessions.php
index efb14e0e7f..eca8b8fc25 100644
--- a/app/conference_centers/conference_sessions.php
+++ b/app/conference_centers/conference_sessions.php
@@ -89,12 +89,11 @@
 //prepare to page the results
 	$rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50;
 	$param = '';
-	if (isset($_GET['page'])) {
-		$page = is_numeric($_GET['page']) ? $_GET['page'] : 0;
-		list($paging_controls, $rows_per_page) = paging($num_rows, $param, $rows_per_page);
-		list($paging_controls_mini, $rows_per_page) = paging($num_rows, $param, $rows_per_page, true);
-		$offset = $rows_per_page * $page;
-	}
+	$page = is_numeric($_GET['page']) ? $_GET['page'] : 0;
+	list($paging_controls, $rows_per_page) = paging($num_rows, $param, $rows_per_page);
+	list($paging_controls_mini, $rows_per_page) = paging($num_rows, $param, $rows_per_page, true);
+	$offset = $rows_per_page * $page;
+	
 
 //get the list
 	$sql = "select * from v_conference_sessions ";
diff --git a/app/conference_centers/resources/classes/conference_centers.php b/app/conference_centers/resources/classes/conference_centers.php
index d98b76715d..ed6b316039 100644
--- a/app/conference_centers/resources/classes/conference_centers.php
+++ b/app/conference_centers/resources/classes/conference_centers.php
@@ -89,7 +89,7 @@ if (!class_exists('conference_centers')) {
 				}
 				$sql = "select count(*) from v_conference_rooms as r, v_meetings as p ";
 				if ($not_admin) {
-					$sql .= "v_meeting_users as u, ";
+					$sql .= ",v_meeting_users as u ";
 				}
 				$sql .= "where r.domain_uuid = :domain_uuid ";
 				$sql .= "and r.meeting_uuid = p.meeting_uuid ";
@@ -373,7 +373,12 @@ if (!class_exists('conference_centers')) {
 
 								//clear the cache
 									$cache = new cache;
-									$cache->delete("dialplan:".$_SESSION["context"]);
+									$cache->delete("dialplan:".$_SESSION["domain_name"]);
+
+								//clear the destinations session array
+									if (isset($_SESSION['destinations']['array'])) {
+										unset($_SESSION['destinations']['array']);
+									}
 
 								//apply settings reminder
 									$_SESSION["reload_xml"] = true;
@@ -604,7 +609,12 @@ if (!class_exists('conference_centers')) {
 
 								//clear the cache
 									$cache = new cache;
-									$cache->delete("dialplan:".$_SESSION["context"]);
+									$cache->delete("dialplan:".$_SESSION["domain_name"]);
+
+								//clear the destinations session array
+									if (isset($_SESSION['destinations']['array'])) {
+										unset($_SESSION['destinations']['array']);
+									}
 
 								//set message
 									message::add($text['message-toggle']);
diff --git a/app/conferences/conference_edit.php b/app/conferences/conference_edit.php
index 45d60e7d59..0e12346361 100644
--- a/app/conferences/conference_edit.php
+++ b/app/conferences/conference_edit.php
@@ -205,7 +205,7 @@
 					$array['dialplans'][0]['app_uuid'] = 'b81412e8-7253-91f4-e48e-42fc2c9a38d9';
 					$array['dialplans'][0]['dialplan_xml'] = $dialplan_xml;
 					$array['dialplans'][0]['dialplan_order'] = '333';
-					$array['dialplans'][0]['dialplan_context'] = $_SESSION['context'];
+					$array['dialplans'][0]['dialplan_context'] = $_SESSION['domain_name'];
 					$array['dialplans'][0]['dialplan_enabled'] = $conference_enabled;
 					$array['dialplans'][0]['dialplan_description'] = $conference_description;
 
@@ -241,7 +241,12 @@
 
 				//clear the cache
 					$cache = new cache;
-					$cache->delete("dialplan:".$_SESSION["context"]);
+					$cache->delete("dialplan:".$_SESSION["domain_name"]);
+
+				//clear the destinations session array
+					if (isset($_SESSION['destinations']['array'])) {
+						unset($_SESSION['destinations']['array']);
+					}
 
 				//redirect the browser
 					header("Location: conferences.php");
diff --git a/app/conferences/resources/classes/conferences.php b/app/conferences/resources/classes/conferences.php
index d2e68865bb..38ce49cd9e 100644
--- a/app/conferences/resources/classes/conferences.php
+++ b/app/conferences/resources/classes/conferences.php
@@ -141,7 +141,12 @@ if (!class_exists('conferences')) {
 
 								//clear the cache
 									$cache = new cache;
-									$cache->delete("dialplan:".$_SESSION["context"]);
+									$cache->delete("dialplan:".$_SESSION["domain_name"]);
+
+								//clear the destinations session array
+									if (isset($_SESSION['destinations']['array'])) {
+										unset($_SESSION['destinations']['array']);
+									}
 
 								//set message
 									message::add($text['message-delete']);
@@ -227,7 +232,12 @@ if (!class_exists('conferences')) {
 
 								//clear the cache
 									$cache = new cache;
-									$cache->delete("dialplan:".$_SESSION["context"]);
+									$cache->delete("dialplan:".$_SESSION["domain_name"]);
+
+								//clear the destinations session array
+									if (isset($_SESSION['destinations']['array'])) {
+										unset($_SESSION['destinations']['array']);
+									}
 
 								//set message
 									message::add($text['message-toggle']);
@@ -362,7 +372,7 @@ if (!class_exists('conferences')) {
 
 								//clear the cache
 									$cache = new cache;
-									$cache->delete("dialplan:".$_SESSION["context"]);
+									$cache->delete("dialplan:".$_SESSION["domain_name"]);
 
 								//set message
 									message::add($text['message-copy']);
diff --git a/app/contacts/app_languages.php b/app/contacts/app_languages.php
index b6bb1dc152..a739bae454 100644
--- a/app/contacts/app_languages.php
+++ b/app/contacts/app_languages.php
@@ -4753,8 +4753,8 @@ $text['description-contacts_import_google']['ru-ru'] = "Выберите нуж
 $text['description-contacts_import_google']['sv-se'] = "Välj de kontakter som skall importeras.";
 $text['description-contacts_import_google']['uk-ua'] = "";
 
-$text['description-contacts_import']['en-us'] = "Export your contacts from outlook to a comma delimitted csv file. Then use this tool to upload and add the contacts from that file.";
-$text['description-contacts_import']['en-gb'] = "Export your contacts from outlook to a comma delimitted csv file. Then use this tool to upload and add the contacts from that file.";
+$text['description-contacts_import']['en-us'] = "Submit or upload delimited data to add multiple records.";
+$text['description-contacts_import']['en-gb'] = "Submit or upload delimited data to add multiple records.";
 $text['description-contacts_import']['ar-eg'] = "";
 $text['description-contacts_import']['de-at'] = "Exportieren Sie Ihre Kontakte aus Outlook in eine CSV Datei und benützen Sie diese Funktion um Ihre Kontakte zu importieren."; //copied from de-de
 $text['description-contacts_import']['de-ch'] = "Exportieren Sie Ihre Kontakte aus Outlook in eine CSV Datei und benützen Sie diese Funktion um Ihre Kontakte zu importieren."; //copied from de-de
diff --git a/app/contacts/contact_import.php b/app/contacts/contact_import.php
index 3dae4e74fb..dfb92964fc 100644
--- a/app/contacts/contact_import.php
+++ b/app/contacts/contact_import.php
@@ -143,7 +143,7 @@
 			$token = new token;
 			if (!$token->validate($_SERVER['PHP_SELF'])) {
 				message::add($text['message-invalid_token'],'negative');
-				header('Location: extension_imports.php');
+				header('Location: contact_import.php');
 				exit;
 			}
 
@@ -172,21 +172,44 @@
 
 			echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 
+			//define phone label options
+			if (is_array($_SESSION["contact"]["phone_label"]) && @sizeof($_SESSION["contact"]["phone_label"]) != 0) {
+				sort($_SESSION["contact"]["phone_label"]);
+				foreach($_SESSION["contact"]["phone_label"] as $row) {
+					$label_options[] = "<option value='".$row.">".$row."</option>";
+				}
+			}
+			else {
+				$default_labels[] = $text['option-work'];
+				$default_labels[] = $text['option-home'];
+				$default_labels[] = $text['option-mobile'];
+				$default_labels[] = $text['option-main'];
+				$default_labels[] = $text['option-fax'];
+				$default_labels[] = $text['option-pager'];
+				$default_labels[] = $text['option-voicemail'];
+				$default_labels[] = $text['option-text'];
+				$default_labels[] = $text['option-other'];
+				foreach ($default_labels as $default_label) {
+					$label_options[] = "<option value='".$default_label."'>".$default_label."</option>";
+				}
+			}
+
 			//loop through user columns
 			$x = 0;
 			foreach ($line_fields as $line_field) {
 				$line_field = trim(trim($line_field), $enclosure);
 				echo "<tr>\n";
 				echo "	<td width='30%' class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-				//echo "    ".$text['label-zzz']."\n";
 				echo $line_field;
 				echo "	</td>\n";
 				echo "	<td width='70%' class='vtable' align='left'>\n";
-				echo "		<select class='formfld' style='' name='fields[$x]'>\n";
+				echo "		<select class='formfld' style='' name='fields[$x]' onchange=\"document.getElementById('labels_$x').style.display = this.options[this.selectedIndex].value == 'contact_phones.phone_number' ? 'inline' : 'none';\">\n";
 				echo "			<option value=''></option>\n";
 				foreach($schema as $row) {
 					echo "			<optgroup label='".$row['table']."'>\n";
 					foreach($row['fields'] as $field) {
+						if ($field == 'phone_label') { continue; }
+ 						if ($field == 'contact_url') { continue; } // can remove this after field is removed from the table
 						$selected = '';
 						if ($field == $line_field) {
 							$selected = "selected='selected'";
@@ -198,8 +221,9 @@
 					echo "			</optgroup>\n";
 				}
 				echo "		</select>\n";
-				//echo "<br />\n";
-				//echo $text['description-zzz']."\n";
+				echo "		<select class='formfld' style='display: none;' id='labels_$x' name='labels[$x]'>\n";
+				echo 			is_array($label_options) ? implode("\n", $label_options) : null;
+				echo "		</select>\n";
 				echo "	</td>\n";
 				echo "</tr>\n";
 				$x++;
@@ -247,12 +271,13 @@
 			$token = new token;
 			if (!$token->validate($_SERVER['PHP_SELF'])) {
 				message::add($text['message-invalid_token'],'negative');
-				header('Location: extension_imports.php');
+				header('Location: contact_import.php');
 				exit;
 			}
 
-		//user selected fields
+		//user selected fields, labels
 			$fields = $_POST['fields'];
+			$labels = $_POST['labels'];
 			
 		//set the domain_uuid
 			$domain_uuid = $_SESSION['domain_uuid'];
@@ -312,6 +337,9 @@
 											if ($field_name != "username" && $field_name != "group_name") {
 												$array[$parent][$row_id][$table_name][$y]['domain_uuid'] = $domain_uuid;
 												$array[$parent][$row_id][$table_name][$y][$field_name] = $result[$key];
+												if ($field_name == 'phone_number') {
+													$array[$parent][$row_id][$table_name][$y]['phone_label'] = $labels[$key];
+												}
 											}
 										}
 	
@@ -337,11 +365,12 @@
 											}
 										}
 									}
+									if (is_array($array[$parent][$row_id])) { $y++; }
 								}
 	
 							//process a chunk of the array
 								if ($row_id === 1000) {
-	
+
 									//save to the data
 										$database = new database;
 										$database->app_name = 'contacts';
@@ -349,8 +378,8 @@
 										$database->save($array);
 
 									//clear the array
-										unset($array);
-										
+ 										unset($array);
+
 									//set the row id back to 0
 										$row_id = 0;
 								}
@@ -359,6 +388,7 @@
 						$row_number++;
 						$row_id++;
 					} //end while
+
 					fclose($handle);
 
 				//save to the data
diff --git a/app/database_transactions/app_languages.php b/app/database_transactions/app_languages.php
index 66adb0fe7d..2fb88996e0 100644
--- a/app/database_transactions/app_languages.php
+++ b/app/database_transactions/app_languages.php
@@ -64,6 +64,27 @@ $text['description-database_transactions']['ru-ru'] = "Изменения в б
 $text['description-database_transactions']['sv-se'] = "Databas Transaktioner";
 $text['description-database_transactions']['uk-ua'] = "";
 
+$text['label-user']['en-us'] = "User";
+$text['label-user']['en-gb'] = "User";
+$text['label-user']['ar-eg'] = "";
+$text['label-user']['de-at'] = "Benutzer"; //copied from de-de
+$text['label-user']['de-ch'] = "Benutzer"; //copied from de-de
+$text['label-user']['de-de'] = "Benutzer";
+$text['label-user']['es-cl'] = "";
+$text['label-user']['es-mx'] = "";
+$text['label-user']['fr-ca'] = "Utilisateur";
+$text['label-user']['fr-fr'] = "Utilisateur";
+$text['label-user']['he-il'] = "";
+$text['label-user']['it-it'] = "";
+$text['label-user']['nl-nl'] = "Gebruiker";
+$text['label-user']['pl-pl'] = "";
+$text['label-user']['pt-br'] = "";
+$text['label-user']['pt-pt'] = "";
+$text['label-user']['ro-ro'] = "";
+$text['label-user']['ru-ru'] = "Пользователь";
+$text['label-user']['sv-se'] = "Användare";
+$text['label-user']['uk-ua'] = "";
+
 $text['label-user_uuid']['en-us'] = "User";
 $text['label-user_uuid']['en-gb'] = "User";
 $text['label-user_uuid']['ar-eg'] = "";
diff --git a/app/database_transactions/database_transactions.php b/app/database_transactions/database_transactions.php
index 6970dae29b..4cbdb8932a 100644
--- a/app/database_transactions/database_transactions.php
+++ b/app/database_transactions/database_transactions.php
@@ -47,7 +47,8 @@
 	$order_by = $_GET["order_by"];
 	$order = $_GET["order"];
 
-//add the search term
+//add the user filter and search term
+	$user_uuid = $_GET['user_uuid'];
 	$search = strtolower($_GET["search"]);
 	if ($search != '') {
 		$sql_search = "and (";
@@ -62,10 +63,14 @@
 	}
 
 //prepare to page the results
-	$sql = "select count(*) from v_database_transactions as t ";
+	$sql = "select count(t.database_transaction_uuid) from v_database_transactions as t ";
 	$sql .= "left outer join v_domains as d using (domain_uuid) ";
 	$sql .= "left outer join v_users as u using (user_uuid) ";
 	$sql .= "where t.domain_uuid = :domain_uuid ";
+	if (is_uuid($user_uuid)) {
+		$sql .= "and t.user_uuid = :user_uuid ";
+		$parameters['user_uuid'] = $user_uuid;
+	}
 	$sql .= $sql_search;
 	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 	$database = new database;
@@ -81,12 +86,26 @@
 	$offset = $rows_per_page * $page;
 
 //get the list
-	$sql = str_replace('count(*)','t.database_transaction_uuid, d.domain_name, u.username, t.user_uuid, t.app_name, t.app_uuid, t.transaction_code, t.transaction_address, t.transaction_type, t.transaction_date', $sql);
+	$sql = str_replace('count(t.database_transaction_uuid)','t.database_transaction_uuid, d.domain_name, u.username, t.user_uuid, t.app_name, t.app_uuid, t.transaction_code, t.transaction_address, t.transaction_type, t.transaction_date', $sql);
 	$sql .= order_by($order_by, $order, 't.transaction_date', 'desc');
 	$sql .= limit_offset($rows_per_page, $offset);
 	$database = new database;
 	$result = $database->select($sql, $parameters, 'all');
-	unset($sql);
+	unset($sql, $parameters);
+
+//get users
+	$sql = "select user_uuid, username from v_users ";
+	$sql .= "where domain_uuid = :domain_uuid ";
+	$sql .= "order by username ";
+	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+	$database = new database;
+	$rows = $database->select($sql, $parameters, 'all');
+	if (is_array($rows) && @sizeof($rows) != 0) {
+		foreach ($rows as $row) {
+			$users[$row['user_uuid']] = $row['username'];
+		}
+	}
+	unset($sql, $parameters, $rows, $row);
 
 //additional includes
 	$document['title'] = $text['title-database_transactions'];
@@ -97,9 +116,19 @@
 	echo "	<div class='heading'><b>".$text['title-database_transactions']." (".$num_rows.")</b></div>\n";
 	echo "	<div class='actions'>\n";
 	echo 		"<form id='form_search' class='inline' method='get'>\n";
+	if (is_array($users) && @sizeof($users) != 0) {
+		echo 	"<select class='formfld' name='user_uuid' onchange=\"document.getElementById('form_search').submit();\">\n";
+		echo "		<option value=''>".$text['label-user']."...</option>\n";
+		echo "		<option value=''>".$text['label-all']."</option>\n";
+		foreach ($users as $uuid => $username) {
+			$selected = $user_uuid == $uuid ? "selected='selected'" : null;
+			echo "	<option value='".escape($uuid)."' ".$selected.">".escape($username)."</option>\n";
+		}
+		echo "	</select>";
+	}
 	echo 		"<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown='list_search_reset();'>";
 	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search','style'=>($search != '' ? 'display: none;' : null)]);
-	echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'database_transactions.php','style'=>($search == '' ? 'display: none;' : null)]);
+	echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','onclick'=>"document.getElementById('search').value = ''; document.getElementById('form_search').submit();",'style'=>(!$search ? 'display: none;' : null)]);
 	if ($paging_controls_mini != '') {
 		echo 	"<span style='margin-left: 15px;'>".$paging_controls_mini."</span>";
 	}
diff --git a/app/destinations/app_config.php b/app/destinations/app_config.php
index bb7129e58a..334e241324 100644
--- a/app/destinations/app_config.php
+++ b/app/destinations/app_config.php
@@ -45,6 +45,29 @@
 		$apps[$x]['destinations'][$y]['select_value']['ivr'] = "menu-exec-app:transfer \${destination_number} XML \${destination_context}";
 		$apps[$x]['destinations'][$y]['select_value']['user_contact'] = "loopback/\${destination_number}";
 		$apps[$x]['destinations'][$y]['select_label'] = "\${destination_number} \${destination_description}";
+		/*
+		$y++;
+		$apps[$x]['destinations'][$y]['type'] = 'array';
+		$apps[$x]['destinations'][$y]['label'] = 'other';
+		$apps[$x]['destinations'][$y]['name'] = 'dialplans';
+		$apps[$x]['destinations'][$y]['field']['name']  = 'name';
+		$apps[$x]['destinations'][$y]['field']['destination'] = 'destination';
+		$apps[$x]['destinations'][$y]['select_value']['dialplan'] = "transfer:\${destination}";
+		$apps[$x]['destinations'][$y]['select_value']['ivr'] = "menu-exec-app:transfer \${destination}";
+		$apps[$x]['destinations'][$y]['select_label'] = "\${name}";
+		$z=0;
+		$apps[$x]['destinations'][$y]['result']['data'][$z]['name'] = 'check_voicemail';
+		$apps[$x]['destinations'][$y]['result']['data'][$z]['destination'] = '*98 XML ${context}';
+		$z++;
+		$apps[$x]['destinations'][$y]['result']['data'][$z]['name'] = 'company_directory';
+		$apps[$x]['destinations'][$y]['result']['data'][$z]['destination'] = '*411 XML ${context}';
+		$z++;
+		$apps[$x]['destinations'][$y]['result']['data'][$z]['name'] = 'hangup';
+		$apps[$x]['destinations'][$y]['result']['data'][$z]['destination'] = 'hangup';
+		$z++;
+		$apps[$x]['destinations'][$y]['result']['data'][$z]['name'] = 'company_directory';
+		$apps[$x]['destinations'][$y]['result']['data'][$z]['destination'] = '*732 XML ${context}';
+		*/
 
 	//permission details
 		$y=0;
@@ -97,13 +120,24 @@
 		$apps[$x]['permissions'][$y]['name'] = "destination_context";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "destination_accountcode";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
+		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "destination_fax";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "destination_emergency";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "destination_destinations";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "other_destinations";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
+		$y++;
 
 	//default settings
 		$y = 0;
@@ -129,7 +163,24 @@
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = "multiple";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = "";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Options: multiple, single";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "b132ff5a-da8d-4846-b46d-2f0bfa9ae96b";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "destinations";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "unique";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "boolean";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Require destinations to be unique true or false.";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "d6cf39aa-edc0-4682-9868-5f8198b3383c";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "destinations";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "select_mode";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "default";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Options: default, dynamic";
+		$y++;
 
 	//cache details
 		$apps[$x]['cache']['key'] = "dialplan.\${destination_context}";
@@ -243,6 +294,10 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "numeric";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Number is used for fax calls.";
 		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "destination_type_emergency";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "numeric";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Number is used to place emergency calls.";
+		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "destination_type_text";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "numeric";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Number is used for text messages.";
@@ -264,6 +319,10 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the alternate data.";
 		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "destination_order";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "numeric";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Set the destination order.";
+		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "destination_enabled";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
diff --git a/app/destinations/app_defaults.php b/app/destinations/app_defaults.php
index 6b69b9c1f4..fbde451a8c 100644
--- a/app/destinations/app_defaults.php
+++ b/app/destinations/app_defaults.php
@@ -39,8 +39,7 @@
 		if (is_array($extensions) && @sizeof($extensions) != 0) {
 			foreach($extensions as $row) {
 				$sql = "update v_destinations ";
-				$sql .= "set destination_app = :destination_app ";
-				$sql .= "destination_data = :destination_data ";
+				$sql .= "set destination_app = :destination_app, destination_data = :destination_data ";
 				$sql .= "where dialplan_uuid = :dialplan_uuid ";
 				$parameters['destination_app'] = $row['destination_app'];
 				$parameters['destination_data'] = $row['destination_data'];
diff --git a/app/destinations/app_languages.php b/app/destinations/app_languages.php
index 8b7c0c73b0..0e18def489 100644
--- a/app/destinations/app_languages.php
+++ b/app/destinations/app_languages.php
@@ -723,8 +723,8 @@ $text['label-destination_hold_music']['de-ch'] = "Wartemusik"; //copied from de-
 $text['label-destination_hold_music']['de-de'] = "Wartemusik";
 $text['label-destination_hold_music']['es-cl'] = "Música en Espera";
 $text['label-destination_hold_music']['es-mx'] = "Música en Espera"; //copied from es-cl
-$text['label-destination_hold_music']['fr-ca'] = "Musique de Garde"; //copied from fr-fr
-$text['label-destination_hold_music']['fr-fr'] = "Musique de Garde";
+$text['label-destination_hold_music']['fr-ca'] = "Musique d'attente"; //copied from fr-fr
+$text['label-destination_hold_music']['fr-fr'] = "Musique d'attente";
 $text['label-destination_hold_music']['he-il'] = "מוסיקה בהמתנה";
 $text['label-destination_hold_music']['it-it'] = "Musica di Attesa";
 $text['label-destination_hold_music']['nl-nl'] = "Wachtmuziek";
@@ -883,6 +883,27 @@ $text['label-text']['ru-ru'] = "Текст";
 $text['label-text']['sv-se'] = "Text";
 $text['label-text']['uk-ua'] = "Текст";
 
+$text['label-emergency']['en-us'] = "Emergency";
+$text['label-emergency']['en-gb'] = "Emergency";
+$text['label-emergency']['ar-eg'] = "";
+$text['label-emergency']['de-at'] = "Anruferkennung"; //copied from de-de
+$text['label-emergency']['de-ch'] = "Anruferkennung";
+$text['label-emergency']['de-de'] = "Notruf Anruferkennung";
+$text['label-emergency']['es-cl'] = "Emergencia";
+$text['label-emergency']['es-mx'] = "Emergencia"; //copied from es-cl
+$text['label-emergency']['fr-ca'] = "Urgence"; //copied from fr-fr
+$text['label-emergency']['fr-fr'] = "Urgence";
+$text['label-emergency']['he-il'] = "";
+$text['label-emergency']['it-it'] = "Emergenze";
+$text['label-emergency']['nl-nl'] = "Noodnummer";
+$text['label-emergency']['pl-pl'] = "Prezentacja nazwy dzwoniącego (emergency)";
+$text['label-emergency']['pt-br'] = "Emergência";
+$text['label-emergency']['pt-pt'] = "Emergência";
+$text['label-emergency']['ro-ro'] = "";
+$text['label-emergency']['ru-ru'] = "Идентификатор (Caller ID) имени экстренного вызова";
+$text['label-emergency']['sv-se'] = "Nöd Namnpresentation";
+$text['label-emergency']['uk-ua'] = "";
+
 $text['header-destinations']['en-us'] = "Destinations";
 $text['header-destinations']['en-gb'] = "Destinations";
 $text['header-destinations']['ar-eg'] = "جهات الأتصال";
diff --git a/app/destinations/destination_edit.php b/app/destinations/destination_edit.php
index 5c440194fd..7231204d62 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-2020
+	Portions created by the Initial Developer are Copyright (C) 2008-2021
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -95,6 +95,7 @@
 			$destination_cid_name_prefix = trim($_POST["destination_cid_name_prefix"]);
 			$destination_context = trim($_POST["destination_context"]);
 			$fax_uuid = trim($_POST["fax_uuid"]);
+			$destination_order= trim($_POST["destination_order"]);
 			$destination_enabled = trim($_POST["destination_enabled"]);
 			$destination_description = trim($_POST["destination_description"]);
 			$destination_sell = check_float($_POST["destination_sell"]);
@@ -107,6 +108,7 @@
 			$destination_type_voice = $_POST["destination_type_voice"];
 			$destination_type_fax = $_POST["destination_type_fax"];
 			$destination_type_text = $_POST["destination_type_text"];
+			$destination_type_emergency = $_POST["destination_type_emergency"];
 			$destination_carrier = trim($_POST["destination_carrier"]);
 
 		//get the destination app and data
@@ -161,7 +163,7 @@
 			if (strlen($destination_enabled) == 0) { $msg .= $text['message-required']." ".$text['label-destination_enabled']."<br>\n"; }
 
 		//check for duplicates
-			if ($destination_type == 'inbound' && $destination_number != $db_destination_number) {
+			if ($destination_type == 'inbound' && $destination_number != $db_destination_number && $_SESSION['destinations']['unique']['boolean'] == 'true') {
 				$sql = "select count(*) from v_destinations ";
 				$sql .= "where (destination_number = :destination_number or destination_prefix || destination_number = :destination_number) ";
 				$sql .= "and destination_type = 'inbound' ";
@@ -195,12 +197,12 @@
 
 				//array cleanup
 					if (is_array($dialplan_details)) {
-							foreach ($dialplan_details as $index => $row) {
-								//unset the empty row
-									if (strlen($row["dialplan_detail_data"]) == 0) {
-										unset($dialplan_details[$index]);
-									}
+						foreach ($dialplan_details as $index => $row) {
+							//unset the empty row
+							if (strlen($row["dialplan_detail_data"]) == 0) {
+								unset($dialplan_details[$index]);
 							}
+						}
 					}
 
 				//get the fax information
@@ -258,7 +260,21 @@
 					}
 
 				//convert the number to a regular expression
-					$destination_number_regex = string_to_regex($destination_area_code.$destination_number, $destination_prefix);
+					if (isset($destination_prefix) && strlen($destination_prefix) > 0) {
+						$destination_numbers['destination_prefix'] = $destination_prefix;
+					}
+					if (isset($destination_trunk_prefix) && strlen($destination_trunk_prefix) > 0) {
+						$destination_numbers['destination_trunk_prefix'] = $destination_trunk_prefix;
+					}
+					if (isset($destination_area_code) && strlen($destination_area_code) > 0) {
+						$destination_numbers['destination_area_code'] = $destination_area_code;
+					}
+					if (isset($destination_number) && strlen($destination_number) > 0) {
+						$destination_numbers['destination_number'] = $destination_number;
+					}
+					$destination = new destinations;
+					$destination_number_regex = $destination->to_regex($destination_numbers);
+					unset($destination_numbers);
 
 				//if empty then get new uuid
 					if (!is_uuid($dialplan_uuid)) {
@@ -281,7 +297,7 @@
 					$dialplan["dialplan_number"] = $destination_area_code.$destination_number;
 					$dialplan["dialplan_context"] = $destination_context;
 					$dialplan["dialplan_continue"] = "false";
-					$dialplan["dialplan_order"] = "100";
+					$dialplan["dialplan_order"] = $destination_order;
 					$dialplan["dialplan_enabled"] = $destination_enabled;
 					$dialplan["dialplan_description"] = ($dialplan_description != '') ? $dialplan_description : $destination_description;
 					$dialplan_detail_order = 10;
@@ -321,7 +337,7 @@
 							$dialplan["dialplan_xml"] .= "		<action application=\"set\" data=\"hold_music=".$destination_hold_music."\" inline=\"true\"/>\n";
 						}
 						if (strlen($destination_accountcode) > 0) {
-							$dialplan["dialplan_xml"] .= "		<action application=\"set\" data=\"accountcode=".$destination_accountcode."\" inline=\"true\"/>\n";
+							$dialplan["dialplan_xml"] .= "		<action application=\"export\" data=\"accountcode=".$destination_accountcode."\" inline=\"true\"/>\n";
 						}
 						if (strlen($destination_carrier) > 0) {
 							$dialplan["dialplan_xml"] .= "		<action application=\"set\" data=\"carrier=".$destination_carrier."\" inline=\"true\"/>\n";
@@ -425,7 +441,7 @@
 							if (strlen($destination_accountcode) > 0) {
 								$dialplan["dialplan_details"][$y]["domain_uuid"] = $domain_uuid;
 								$dialplan["dialplan_details"][$y]["dialplan_detail_tag"] = "action";
-								$dialplan["dialplan_details"][$y]["dialplan_detail_type"] = "set";
+								$dialplan["dialplan_details"][$y]["dialplan_detail_type"] = "export";
 								$dialplan["dialplan_details"][$y]["dialplan_detail_data"] = "accountcode=".$destination_accountcode;
 								$dialplan["dialplan_details"][$y]["dialplan_detail_inline"] = "true";
 								$dialplan["dialplan_details"][$y]["dialplan_detail_order"] = $dialplan_detail_order;
@@ -657,6 +673,9 @@
 					$array['destinations'][0]["destination_type_voice"] = $destination_type_voice ? 1 : null;
 					$array['destinations'][0]["destination_type_fax"] = $destination_type_fax ? 1 : null;
 					$array['destinations'][0]["destination_type_text"] = $destination_type_text ? 1 : null;
+					if (permission_exists('destination_emergency')){
+						$array['destinations'][0]["destination_type_emergency"] = $destination_type_emergency ? 1 : null;
+					}
 					if ($destination->valid($destination_app.':'.$destination_data)) {
 						$array['destinations'][0]["destination_app"] = $destination_app;
 						$array['destinations'][0]["destination_data"] = $destination_data;
@@ -665,8 +684,10 @@
 						$array['destinations'][0]["destination_alternate_app"] = $destination_alternate_app;
 						$array['destinations'][0]["destination_alternate_data"] = $destination_alternate_data;
 					}
+					$array['destinations'][0]["destination_order"] = $destination_order;
 					$array['destinations'][0]["destination_enabled"] = $destination_enabled;
 					$array['destinations'][0]["destination_description"] = $destination_description;
+
 				//prepare the array
 					$array['dialplans'][] = $dialplan;
 					unset($dialplan);
@@ -731,6 +752,12 @@
 					$database->app_uuid = '5ec89622-b19c-3559-64f0-afde802ab139';
 					$database->save($array);
 					$dialplan_response = $database->message;
+
+				//clear the destinations session array
+					if (isset($_SESSION['destinations']['array'])) {
+						unset($_SESSION['destinations']['array']);
+					}
+
 			}
 
 		//redirect the user
@@ -746,7 +773,7 @@
 	}
 
 //pre-populate the form
-	if (count($_GET) > 0 && $_POST["persistformvar"] != "true") {
+	if (is_array($_GET) > 0 && $_POST["persistformvar"] != "true") {
 	 	if (is_uuid($_GET["id"])) {
 	 		$destination_uuid = $_GET["id"];
 			$sql = "select * from v_destinations ";
@@ -772,19 +799,21 @@
 				$destination_type_voice = $row["destination_type_voice"];
 				$destination_type_fax = $row["destination_type_fax"];
 				$destination_type_text = $row["destination_type_text"];
+				$destination_type_emergency = $row["destination_type_emergency"];
 				$destination_context = $row["destination_context"];
 				$destination_app = $row["destination_app"];
 				$destination_data = $row["destination_data"];
 				$destination_alternate_app = $row["destination_alternate_app"];
 				$destination_alternate_data = $row["destination_alternate_data"];
 				$fax_uuid = $row["fax_uuid"];
-				$destination_enabled = $row["destination_enabled"];
-				$destination_description = $row["destination_description"];
 				$currency = $row["currency"];
 				$destination_sell = $row["destination_sell"];
 				$destination_buy = $row["destination_buy"];
 				$currency_buy = $row["currency_buy"];
 				$destination_carrier = $row["destination_carrier"];
+				$destination_order = $row["destination_order"];
+				$destination_enabled = $row["destination_enabled"];
+				$destination_description = $row["destination_description"];
 			}
 			unset($sql, $parameters, $row);
 		}
@@ -802,7 +831,7 @@
 	unset($sql, $parameters);
 
 //add an empty row to the array
-	$x = count($dialplan_details);
+	$x = (is_array($dialplan_details)) ? count($dialplan_details) : $x = 0;
 	$limit = $x + 1;
 	while($x < $limit) {
 		$dialplan_details[$x]['domain_uuid'] = $domain_uuid;
@@ -840,6 +869,7 @@
 	}
 
 //set the defaults
+	if (strlen($destination_order) == 0) { $destination_order = '100'; }
 	if (strlen($destination_type) == 0) { $destination_type = 'inbound'; }
 	if (strlen($destination_context) == 0) { $destination_context = 'public'; }
 	if ($destination_type =="outbound") { $destination_context = $_SESSION['domain_name']; }
@@ -1098,7 +1128,7 @@
 		if (is_array($dialplan_details) && @sizeof($dialplan_details) != 0) {
 			foreach($dialplan_details as $row) {
 				if ($row["dialplan_detail_tag"] != "condition") {
-					if ($row["dialplan_detail_tag"] == "action" && $row["dialplan_detail_type"] == "set" && strpos($row["dialplan_detail_data"], "accountcode") == 0) { continue; } //exclude set:accountcode actions
+					if ($row["dialplan_detail_tag"] == "action" && ($row["dialplan_detail_type"] == "set" || $row["dialplan_detail_type"] == "export") && strpos($row["dialplan_detail_data"], "accountcode") == 0) { continue; } //exclude set:accountcode actions
 					if (strlen($row['dialplan_detail_uuid']) > 0) {
 						echo "	<input name='dialplan_details[".$x."][dialplan_detail_uuid]' type='hidden' value=\"".escape($row['dialplan_detail_uuid'])."\">\n";
 					}
@@ -1201,15 +1231,17 @@
 		echo "</tr>\n";
 	}
 
-	echo "<tr id='tr_account_code'>\n";
-	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-	echo "	".$text['label-account_code']."\n";
-	echo "</td>\n";
-	echo "<td class='vtable' align='left'>\n";
-	echo "	<input class='formfld' type='text' name='destination_accountcode' maxlength='255' value=\"".escape($destination_accountcode)."\">\n";
-	echo "<br />\n";
-	echo $text['description-account_code']."\n";
-	echo "</td>\n";
+	if (permission_exists("destination_accountcode")) {
+		echo "<tr id='tr_account_code'>\n";
+		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+		echo "	".$text['label-account_code']."\n";
+		echo "</td>\n";
+		echo "<td class='vtable' align='left'>\n";
+		echo "	<input class='formfld' type='text' name='destination_accountcode' maxlength='255' value=\"".escape($destination_accountcode)."\">\n";
+		echo "<br />\n";
+		echo $text['description-account_code']."\n";
+		echo "</td>\n";
+	}
 
 	echo "<tr>\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
@@ -1218,7 +1250,10 @@
 	echo "<td class='vtable' align='left'>\n";
 	echo "	<label><input type='checkbox' name='destination_type_voice' id='destination_type_voice' value='1' ".($destination_type_voice ? "checked='checked'" : null)."> ".$text['label-voice']."</label>&nbsp;\n";
 	echo "	<label><input type='checkbox' name='destination_type_fax' id='destination_type_fax' value='1' ".($destination_type_fax ? "checked='checked'" : null)."> ".$text['label-fax']."</label>&nbsp;\n";
-	echo "	<label><input type='checkbox' name='destination_type_text' id='destination_type_text' value='1' ".($destination_type_text ? "checked='checked'" : null)."> ".$text['label-text']."</label>\n";
+	echo "	<label><input type='checkbox' name='destination_type_text' id='destination_type_text' value='1' ".($destination_type_text ? "checked='checked'" : null)."> ".$text['label-text']."</label>&nbsp;\n";
+	if (permission_exists('destination_emergency')){
+		echo "	<label><input type='checkbox' name='destination_type_emergency' id='destination_type_emergency' value='1' ".($destination_type_emergency ? "checked='checked'" : null)."> ".$text['label-emergency']."</label>\n";
+	}
 	echo "<br />\n";
 	echo $text['description-usage']."\n";
 	echo "</td>\n";
@@ -1255,6 +1290,31 @@
 		echo "<input type='hidden' name='domain_uuid' value='".escape($domain_uuid)."'>\n";
 	}
 
+	echo "	<tr>\n";
+	echo "	<td class='vncellreq' valign='top' align='left' nowrap='nowrap' width='30%'>\n";
+	echo "		".$text['label-order']."\n";
+	echo "	</td>\n";
+	echo "	<td class='vtable' align='left' width='70%'>\n";
+	echo "		<select name='destination_order' class='formfld'>\n";
+	$i=0;
+	while($i<=999) {
+		$selected = ($i == $destination_order) ? "selected" : null;
+		if (strlen($i) == 1) {
+			echo "			<option value='00$i' ".$selected.">00$i</option>\n";
+		}
+		if (strlen($i) == 2) {
+			echo "			<option value='0$i' ".$selected.">0$i</option>\n";
+		}
+		if (strlen($i) == 3) {
+			echo "			<option value='$i' ".$selected.">$i</option>\n";
+		}
+		$i++;
+	}
+	echo "		</select>\n";
+	echo "		<br />\n";
+	echo "	</td>\n";
+	echo "	</tr>\n";
+
 	echo "<tr>\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
 	echo "	".$text['label-destination_enabled']."\n";
diff --git a/app/destinations/destinations.php b/app/destinations/destinations.php
index fb67cd79d9..7784278e7a 100644
--- a/app/destinations/destinations.php
+++ b/app/destinations/destinations.php
@@ -110,22 +110,6 @@
 
 //add the search term
 	$search = strtolower($_GET["search"]);
-	if (strlen($search) > 0) {
-		$sql_search = "and (";
-		$sql_search .= "lower(destination_type) like :search ";
-		$sql_search .= "or lower(destination_number) like :search ";
-		$sql_search .= "or lower(destination_context) like :search ";
-		$sql_search .= "or lower(destination_accountcode) like :search ";
-		if (permission_exists('outbound_caller_id_select')) {
-			$sql_search .= "or lower(destination_caller_id_name) like :search ";
-			$sql_search .= "or destination_caller_id_number like :search ";
-		}
-		$sql_search .= "or lower(destination_enabled) like :search ";
-		$sql_search .= "or lower(destination_description) like :search ";
-		$sql_search .= "or lower(destination_data) like :search ";
-		$sql_search .= ") ";
-		$parameters['search'] = '%'.$search.'%';
-	}
 
 //prepare to page the results
 	$sql = "select count(*) from v_destinations ";
@@ -134,7 +118,22 @@
 		$sql .= "and (domain_uuid = :domain_uuid or domain_uuid is null) ";
 		$parameters['domain_uuid'] = $domain_uuid;
 	}
-	$sql .= $sql_search;
+	if (strlen($search) > 0) {
+		$sql .= "and (";
+		$sql .= "lower(destination_type) like :search ";
+		$sql .= "or lower(destination_number) like :search ";
+		$sql .= "or lower(destination_context) like :search ";
+		$sql .= "or lower(destination_accountcode) like :search ";
+		if (permission_exists('outbound_caller_id_select')) {
+			$sql .= "or lower(destination_caller_id_name) like :search ";
+			$sql .= "or destination_caller_id_number like :search ";
+		}
+		$sql .= "or lower(destination_enabled) like :search ";
+		$sql .= "or lower(destination_description) like :search ";
+		$sql .= "or lower(destination_data) like :search ";
+		$sql .= ") ";
+		$parameters['search'] = '%'.$search.'%';
+	}
 	$parameters['destination_type'] = $destination_type;
 	$database = new database;
 	$num_rows = $database->select($sql, $parameters, 'column');
@@ -152,8 +151,29 @@
 	$offset = $rows_per_page * $page;
 
 //get the list
-	$sql = str_replace('count(*)', '*', $sql);
-	$sql .= order_by($order_by, $order, 'destination_number', 'asc');
+	$sql = "select * from v_destinations ";
+	$sql .= "where destination_type = :destination_type ";
+	if ($_GET['show'] != "all" || !permission_exists('destination_all')) {
+		$sql .= "and (domain_uuid = :domain_uuid or domain_uuid is null) ";
+		$parameters['domain_uuid'] = $domain_uuid;
+	}
+	if (strlen($search) > 0) {
+		$sql .= "and (";
+		$sql .= "lower(destination_type) like :search ";
+		$sql .= "or lower(destination_number) like :search ";
+		$sql .= "or lower(destination_context) like :search ";
+		$sql .= "or lower(destination_accountcode) like :search ";
+		if (permission_exists('outbound_caller_id_select')) {
+			$sql .= "or lower(destination_caller_id_name) like :search ";
+			$sql .= "or destination_caller_id_number like :search ";
+		}
+		$sql .= "or lower(destination_enabled) like :search ";
+		$sql .= "or lower(destination_description) like :search ";
+		$sql .= "or lower(destination_data) like :search ";
+		$sql .= ") ";
+		$parameters['search'] = '%'.$search.'%';
+	}
+	$sql .= order_by($order_by, $order, 'destination_number, destination_order ', 'asc');
 	$sql .= limit_offset($rows_per_page, $offset);
 	$database = new database;
 	$destinations = $database->select($sql, $parameters, 'all');
diff --git a/app/destinations/resources/classes/destinations.php b/app/destinations/resources/classes/destinations.php
index 10ca9ddab0..38db669146 100644
--- a/app/destinations/resources/classes/destinations.php
+++ b/app/destinations/resources/classes/destinations.php
@@ -78,6 +78,84 @@ if (!class_exists('destinations')) {
 			}
 		}
 
+		/**
+		* Convert destination number to a regular expression
+		* @var string $array destination_prefix, destination_trunk_prefix, destination_area_code, destination_number
+		*/
+		public function to_regex($array) {
+
+				if (isset($array['destination_prefix']) && isset($array['destination_trunk_prefix']) && isset($array['destination_area_code']) && isset($array['destination_number'])) {
+					$destination_regex = "(\+?".$array['destination_prefix'].$array['destination_area_code'].$array['destination_number']."\$|";
+					$destination_regex .= "^".$array['destination_trunk_prefix'].$array['destination_area_code'].$array['destination_number']."\$|";
+					$destination_regex .= "^".$array['destination_area_code'].$array['destination_number']."\$|";
+					$destination_regex .= "^".$array['destination_number']."\$)";
+				}
+				elseif (isset($array['destination_prefix']) && isset($array['destination_area_code']) && isset($array['destination_number'])) {
+					$destination_regex = "(\+?".$array['destination_prefix'].$array['destination_area_code'].$array['destination_number']."\$|";
+					$destination_regex .= "^".$array['destination_area_code'].$array['destination_number']."\$|";
+					$destination_regex .= "^".$array['destination_number']."\$)";
+				}
+				elseif ((isset($array['destination_prefix']) && isset($array['destination_number'])) || isset($array['destination_number'])) {
+
+					//set the variables
+						$destination_prefix = $array['destination_prefix'];
+						$destination_number = $array['destination_number'];
+						$destination_regex = $array['destination_number'];
+
+					//escape the plus
+						if (substr($destination_number, 0, 1) == "+") {
+							$destination_regex = "^\\+(".substr($destination_number, 1).")$";
+						}
+
+					//add prefix
+						if (strlen($destination_prefix) > 0) {
+							if (strlen($destination_prefix) > 0 && strlen($destination_prefix) < 4) {
+								$plus = (substr($destination_prefix, 0, 1) == "+") ? '' : '\+?';
+								$destination_prefix = $plus.$destination_prefix.'?';
+							}
+							else {
+								$destination_prefix = '(?:'.$destination_prefix.')?';
+							}
+						}
+
+					//convert N,X,Z syntax to regex
+						$destination_regex = str_ireplace("N", "[2-9]", $destination_regex);
+						$destination_regex = str_ireplace("X", "[0-9]", $destination_regex);
+						$destination_regex = str_ireplace("Z", "[1-9]", $destination_regex);
+
+					//add ^ to the start of the string if missing
+						if (substr($destination_regex, 0, 1) != "^") {
+							$destination_regex = "^".$destination_regex;
+						}
+
+					//add $ to the end of the string if missing
+						if (substr($destination_regex, -1) != "$") {
+							$destination_regex = $destination_regex."$";
+						}
+
+					//add the round brackets
+						if (!strstr($destination_regex, '(')) {
+							if (strstr($destination_regex, '^')) {
+								$destination_regex = str_replace("^", "^".$destination_prefix."(", $destination_regex);
+							}
+							else {
+								$destination_regex = '^('.$destination_regex;
+							}
+							if (strstr($destination_regex, '$')) {
+								$destination_regex = str_replace("$", ")$", $destination_regex);
+							}
+							else {
+								$destination_regex = $destination_regex.')$';
+							}
+						}
+
+				}
+
+				return $destination_regex;
+
+		}
+
+
 		/**
 		* Build the destination select list
 		* @var string $destination_type can be ivr, dialplan, call_center_contact or bridge
@@ -96,247 +174,358 @@ if (!class_exists('destinations')) {
 			$database = new database;
 			$this->domain_name = $database->select($sql, $parameters, 'column');
 
-			//get the destinations
-			if (!is_array($this->destinations)) {
+			//create a single destination select list
+			if ($_SESSION['destinations']['select_mode']['text'] == 'default') {
+				//get the destinations
+				if (!is_array($this->destinations)) {
 
-				//get the array from the app_config.php files
-				$config_list = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/*/*/app_config.php");
-				$x = 0;
-				foreach ($config_list as &$config_path) {
-					include($config_path);
-					$x++;
-				}
-				$i = 0;
-				foreach ($apps as $x => &$app) {
-					if (isset($app['destinations'])) foreach ($app['destinations'] as &$row) {
-						if (permission_exists($this->singular($row["name"])."_destinations")) {
-							$this->destinations[] = $row;
-						}
-					}
-				}
-				//put the array in order
-				if ($this->destinations !== null && is_array($this->destinations)) {
-					foreach ($this->destinations as $row) {
-						$option_groups[] = $row['label'];
-					}
-					array_multisort($option_groups, SORT_ASC, $this->destinations);
-				}
-				//add the sql and data to the array
-				if ($this->destinations !== null && is_array($this->destinations)) {
+					//get the array from the app_config.php files
+					$config_list = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/*/*/app_config.php");
 					$x = 0;
-					foreach ($this->destinations as $row) {
-						if ($row['type'] === 'sql') {
-							$table_name = preg_replace('#[^a-zA-Z0-9_]#', '', $row['name']);
-							if (isset($row['sql'])) {
-								if (is_array($row['sql'])) {
-									$sql = trim($row['sql'][$db_type])." ";
-								}
-								else {
-									$sql = trim($row['sql'])." ";
-								}
-							}
-							else {
-								$field_count = count($row['field']);
-								$fields = '';
-								$c = 1;
-								foreach ($row['field'] as $key => $value) {
-									$key = preg_replace('#[^a-zA-Z0-9_]#', '', $key);
-									$value = preg_replace('#[^a-zA-Z0-9_]#', '', $value);
-									if ($field_count != $c) { $delimiter = ','; } else { $delimiter = ''; }
-									$fields .= $value." as ".$key.$delimiter." ";
-									$c++;
-								}
-								$sql = "select ".$fields;
-								$sql .= " from v_".$table_name." ";
-							}
-							if (isset($row['where'])) {
-								$sql .= trim($row['where'])." ";
-							}
-							$sql .= "order by ".trim($row['order_by']);
-							$sql = str_replace("\${domain_uuid}", $this->domain_uuid, $sql);
-							$database = new database;
-							$result = $database->select($sql, null, 'all');
-
-							$this->destinations[$x]['result']['sql'] = $sql;
-							$this->destinations[$x]['result']['data'] = $result;
+					foreach ($config_list as &$config_path) {
+						try {
+						    include($config_path);
 						}
-						if ($row['type'] === 'array') {
-							$this->destinations[$x] = $row;
+						catch (Exception $e) {
+						    //echo 'Caught exception: ',  $e->getMessage(), "\n";
 						}
 						$x++;
 					}
-				}
-
-				$this->destinations[$x]['type'] = 'array';
-				$this->destinations[$x]['label'] = 'other';
-				$this->destinations[$x]['name'] = 'dialplans';
-				$this->destinations[$x]['field']['name'] = "name";
-				$this->destinations[$x]['field']['destination'] = "destination";
-				$this->destinations[$x]['select_value']['dialplan'] = "transfer:\${destination}";
-				$this->destinations[$x]['select_value']['ivr'] = "menu-exec-app:transfer \${destination}";
-				$this->destinations[$x]['select_label'] = "\${name}";
-				$y = 0;
-				$this->destinations[$x]['result']['data'][$y]['label'] = 'check_voicemail';
-				$this->destinations[$x]['result']['data'][$y]['name'] = '*98';
-				$this->destinations[$x]['result']['data'][$y]['destination'] = '*98 XML ${context}';
-				$y++;
-				$this->destinations[$x]['result']['data'][$y]['label'] = 'company_directory';
-				$this->destinations[$x]['result']['data'][$y]['name'] = '*411';
-				$this->destinations[$x]['result']['data'][$y]['destination'] = '*411 XML ${context}';
-				$y++;
-				$this->destinations[$x]['result']['data'][$y]['label'] = 'hangup';
-				$this->destinations[$x]['result']['data'][$y]['name'] = 'hangup';
-				$this->destinations[$x]['result']['data'][$y]['application'] = 'hangup';
-				$this->destinations[$x]['result']['data'][$y]['destination'] = '';
-				$y++;
-				$this->destinations[$x]['result']['data'][$y]['label'] = 'record';
-				$this->destinations[$x]['result']['data'][$y]['name'] = '*732';
-				$this->destinations[$x]['result']['data'][$y]['destination'] = '*732 XML ${context}';
-				$y++;
-			}
-
-			//remove special characters from the name
-			$destination_id = str_replace("]", "", $destination_name);
-			$destination_id = str_replace("[", "_", $destination_id);
-
-			//set the css style
-			$select_style = 'width: 200px;';
-
-			//add additional
-			if (if_group("superadmin")) {
-				$response = "<script>\n";
-				$response .= "var Objs;\n";
-				$response .= "\n";
-				$response .= "function changeToInput".$destination_id."(obj){\n";
-				$response .= "	tb=document.createElement('INPUT');\n";
-				$response .= "	tb.type='text';\n";
-				$response .= "	tb.name=obj.name;\n";
-				$response .= "	tb.className='formfld';\n";
-				$response .= "	tb.setAttribute('id', '".$destination_id."');\n";
-				$response .= "	tb.setAttribute('style', '".$select_style."');\n";
-				if ($onchange != '') {
-					$response .= "	tb.setAttribute('onchange', \"".$onchange."\");\n";
-					$response .= "	tb.setAttribute('onkeyup', \"".$onchange."\");\n";
-				}
-				$response .= "	tb.value=obj.options[obj.selectedIndex].value;\n";
-				$response .= "	document.getElementById('btn_select_to_input_".$destination_id."').style.visibility = 'hidden';\n";
-				$response .= "	tbb=document.createElement('INPUT');\n";
-				$response .= "	tbb.setAttribute('class', 'btn');\n";
-				$response .= "	tbb.setAttribute('style', 'margin-left: 4px;');\n";
-				$response .= "	tbb.type='button';\n";
-				$response .= "	tbb.value=$('<div />').html('&#9665;').text();\n";
-				$response .= "	tbb.objs=[obj,tb,tbb];\n";
-				$response .= "	tbb.onclick=function(){ Replace".$destination_id."(this.objs); }\n";
-				$response .= "	obj.parentNode.insertBefore(tb,obj);\n";
-				$response .= "	obj.parentNode.insertBefore(tbb,obj);\n";
-				$response .= "	obj.parentNode.removeChild(obj);\n";
-				$response .= "	Replace".$destination_id."(this.objs);\n";
-				$response .= "}\n";
-				$response .= "\n";
-				$response .= "function Replace".$destination_id."(obj){\n";
-				$response .= "	obj[2].parentNode.insertBefore(obj[0],obj[2]);\n";
-				$response .= "	obj[0].parentNode.removeChild(obj[1]);\n";
-				$response .= "	obj[0].parentNode.removeChild(obj[2]);\n";
-				$response .= "	document.getElementById('btn_select_to_input_".$destination_id."').style.visibility = 'visible';\n";
-				if ($onchange != '') {
-					$response .= "	".$onchange.";\n";
-				}
-				$response .= "}\n";
-				$response .= "</script>\n";
-				$response .= "\n";
-			}
-
-			//set default to false
-			$select_found = false;
-
-			$response .= "	<select name='".$destination_name."' id='".$destination_id."' class='formfld' style='".$select_style."' onchange=\"".$onchange."\">\n";
-			$response .= "			<option value=''></option>\n";
-			foreach ($this->destinations as $row) {
-
-				$name = $row['name'];
-				$label = $row['label'];
-				$destination = $row['field']['destination'];
-
-				//add multi-lingual support
-				if (file_exists($_SERVER["PROJECT_ROOT"]."/app/".$name."/app_languages.php")) {
-					$language2 = new text;
-					$text2 = $language2->get($_SESSION['domain']['language']['code'], 'app/'.$name);
-				}
-
-				if (is_array($row['result']['data']) && count($row['result']['data']) > 0 and strlen($row['select_value'][$destination_type]) > 0) {
-					$response .= "		<optgroup label='".$text2['title-'.$label]."'>\n";
-					$label2 = $label;
-					foreach ($row['result']['data'] as $data) {
-						$select_value = $row['select_value'][$destination_type];
-						$select_label = $row['select_label'];
-						foreach ($row['field'] as $key => $value) {
-							if ($key == 'destination' and is_array($value)){
-								if ($value['type'] === 'csv') {
-									$array = explode($value['delimiter'], $data[$key]);
-									$select_value = str_replace("\${destination}", $array[0], $select_value);
-									$select_label = str_replace("\${destination}", $array[0], $select_label);
-								}
+					$i = 0;
+					foreach ($apps as $x => &$app) {
+						if (isset($app['destinations'])) foreach ($app['destinations'] as &$row) {
+							if (permission_exists($this->singular($row["name"])."_destinations")) {
+								$this->destinations[] = $row;
 							}
-							else {
-								if (strpos($value,',') !== false) {
-									$keys = explode(",", $value);
-									foreach ($keys as $k) {
-										if (strlen($data[$k]) > 0) {
-											$select_value = str_replace("\${".$key."}", $data[$k], $select_value);
-											if (strlen($data['label']) == 0) {
-												$select_label = str_replace("\${".$key."}", $data[$k], $select_label);
-											}
-											else {
-												$label = $data['label'];
-												$select_label = str_replace("\${".$key."}", $text2['option-'.$label], $select_label);
-											}
-										}
+						}
+					}
+					//put the array in order
+					if ($this->destinations !== null && is_array($this->destinations)) {
+						foreach ($this->destinations as $row) {
+							$option_groups[] = $row['label'];
+						}
+						array_multisort($option_groups, SORT_ASC, $this->destinations);
+					}
+
+					//add the sql and data to the array
+					if ($this->destinations !== null && is_array($this->destinations)) {
+						$x = 0;
+						foreach ($this->destinations as $row) {
+							if ($row['type'] === 'sql') {
+								$table_name = preg_replace('#[^a-zA-Z0-9_]#', '', $row['name']);
+								if (isset($row['sql'])) {
+									if (is_array($row['sql'])) {
+										$sql = trim($row['sql'][$db_type])." ";
+									}
+									else {
+										$sql = trim($row['sql'])." ";
 									}
 								}
 								else {
-									$select_value = str_replace("\${".$key."}", $data[$key], $select_value);
-									if (strlen($data['label']) == 0) {
-										$select_label = str_replace("\${".$key."}", $data[$key], $select_label);
+									$field_count = count($row['field']);
+									$fields = '';
+									$c = 1;
+									foreach ($row['field'] as $key => $value) {
+										$key = preg_replace('#[^a-zA-Z0-9_]#', '', $key);
+										$value = preg_replace('#[^a-zA-Z0-9_]#', '', $value);
+										if ($field_count != $c) { $delimiter = ','; } else { $delimiter = ''; }
+										$fields .= $value." as ".$key.$delimiter." ";
+										$c++;
+									}
+									$sql = "select ".$fields;
+									$sql .= " from v_".$table_name." ";
+								}
+								if (isset($row['where'])) {
+									$sql .= trim($row['where'])." ";
+								}
+								$sql .= "order by ".trim($row['order_by']);
+								$sql = str_replace("\${domain_uuid}", $this->domain_uuid, $sql);
+								$database = new database;
+								$result = $database->select($sql, null, 'all');
+
+								$this->destinations[$x]['result']['sql'] = $sql;
+								$this->destinations[$x]['result']['data'] = $result;
+							}
+							if ($row['type'] === 'array') {
+								$this->destinations[$x] = $row;
+							}
+							$x++;
+						}
+					}
+
+					$this->destinations[$x]['type'] = 'array';
+					$this->destinations[$x]['label'] = 'other';
+					$this->destinations[$x]['name'] = 'dialplans';
+					$this->destinations[$x]['field']['name'] = "name";
+					$this->destinations[$x]['field']['destination'] = "destination";
+					$this->destinations[$x]['select_value']['dialplan'] = "transfer:\${destination}";
+					$this->destinations[$x]['select_value']['ivr'] = "menu-exec-app:transfer \${destination}";
+					$this->destinations[$x]['select_label'] = "\${name}";
+					$y = 0;
+					$this->destinations[$x]['result']['data'][$y]['label'] = 'check_voicemail';
+					$this->destinations[$x]['result']['data'][$y]['name'] = '*98';
+					$this->destinations[$x]['result']['data'][$y]['destination'] = '*98 XML ${context}';
+					$y++;
+					$this->destinations[$x]['result']['data'][$y]['label'] = 'company_directory';
+					$this->destinations[$x]['result']['data'][$y]['name'] = '*411';
+					$this->destinations[$x]['result']['data'][$y]['destination'] = '*411 XML ${context}';
+					$y++;
+					$this->destinations[$x]['result']['data'][$y]['label'] = 'hangup';
+					$this->destinations[$x]['result']['data'][$y]['name'] = 'hangup';
+					$this->destinations[$x]['result']['data'][$y]['application'] = 'hangup';
+					$this->destinations[$x]['result']['data'][$y]['destination'] = '';
+					$y++;
+					$this->destinations[$x]['result']['data'][$y]['label'] = 'record';
+					$this->destinations[$x]['result']['data'][$y]['name'] = '*732';
+					$this->destinations[$x]['result']['data'][$y]['destination'] = '*732 XML ${context}';
+					$y++;
+				}
+
+				//remove special characters from the name
+				$destination_id = str_replace("]", "", $destination_name);
+				$destination_id = str_replace("[", "_", $destination_id);
+
+				//set the css style
+				$select_style = 'width: 200px;';
+
+				//add additional
+				if (if_group("superadmin")) {
+					$response = "<script>\n";
+					$response .= "var Objs;\n";
+					$response .= "\n";
+					$response .= "function changeToInput".$destination_id."(obj){\n";
+					$response .= "	tb=document.createElement('INPUT');\n";
+					$response .= "	tb.type='text';\n";
+					$response .= "	tb.name=obj.name;\n";
+					$response .= "	tb.className='formfld';\n";
+					$response .= "	tb.setAttribute('id', '".$destination_id."');\n";
+					$response .= "	tb.setAttribute('style', '".$select_style."');\n";
+					if ($onchange != '') {
+						$response .= "	tb.setAttribute('onchange', \"".$onchange."\");\n";
+						$response .= "	tb.setAttribute('onkeyup', \"".$onchange."\");\n";
+					}
+					$response .= "	tb.value=obj.options[obj.selectedIndex].value;\n";
+					$response .= "	document.getElementById('btn_select_to_input_".$destination_id."').style.visibility = 'hidden';\n";
+					$response .= "	tbb=document.createElement('INPUT');\n";
+					$response .= "	tbb.setAttribute('class', 'btn');\n";
+					$response .= "	tbb.setAttribute('style', 'margin-left: 4px;');\n";
+					$response .= "	tbb.type='button';\n";
+					$response .= "	tbb.value=$('<div />').html('&#9665;').text();\n";
+					$response .= "	tbb.objs=[obj,tb,tbb];\n";
+					$response .= "	tbb.onclick=function(){ Replace".$destination_id."(this.objs); }\n";
+					$response .= "	obj.parentNode.insertBefore(tb,obj);\n";
+					$response .= "	obj.parentNode.insertBefore(tbb,obj);\n";
+					$response .= "	obj.parentNode.removeChild(obj);\n";
+					$response .= "	Replace".$destination_id."(this.objs);\n";
+					$response .= "}\n";
+					$response .= "\n";
+					$response .= "function Replace".$destination_id."(obj){\n";
+					$response .= "	obj[2].parentNode.insertBefore(obj[0],obj[2]);\n";
+					$response .= "	obj[0].parentNode.removeChild(obj[1]);\n";
+					$response .= "	obj[0].parentNode.removeChild(obj[2]);\n";
+					$response .= "	document.getElementById('btn_select_to_input_".$destination_id."').style.visibility = 'visible';\n";
+					if ($onchange != '') {
+						$response .= "	".$onchange.";\n";
+					}
+					$response .= "}\n";
+					$response .= "</script>\n";
+					$response .= "\n";
+				}
+
+				//set default to false
+				$select_found = false;
+
+				$response .= "	<select name='".$destination_name."' id='".$destination_id."' class='formfld' style='".$select_style."' onchange=\"".$onchange."\">\n";
+				$response .= "			<option value=''></option>\n";
+				foreach ($this->destinations as $row) {
+
+					$name = $row['name'];
+					$label = $row['label'];
+					$destination = $row['field']['destination'];
+
+					//add multi-lingual support
+					if (file_exists($_SERVER["PROJECT_ROOT"]."/app/".$name."/app_languages.php")) {
+						$language2 = new text;
+						$text2 = $language2->get($_SESSION['domain']['language']['code'], 'app/'.$name);
+					}
+
+					if (is_array($row['result']['data']) && count($row['result']['data']) > 0 and strlen($row['select_value'][$destination_type]) > 0) {
+						$response .= "		<optgroup label='".$text2['title-'.$label]."'>\n";
+						$label2 = $label;
+						foreach ($row['result']['data'] as $data) {
+							$select_value = $row['select_value'][$destination_type];
+							$select_label = $row['select_label'];
+							foreach ($row['field'] as $key => $value) {
+								if ($key == 'destination' and is_array($value)){
+									if ($value['type'] === 'csv') {
+										$array = explode($value['delimiter'], $data[$key]);
+										$select_value = str_replace("\${destination}", $array[0], $select_value);
+										$select_label = str_replace("\${destination}", $array[0], $select_label);
+									}
+								}
+								else {
+									if (strpos($value,',') !== false) {
+										$keys = explode(",", $value);
+										foreach ($keys as $k) {
+											if (strlen($data[$k]) > 0) {
+												$select_value = str_replace("\${".$key."}", $data[$k], $select_value);
+												if (strlen($data['label']) == 0) {
+													$select_label = str_replace("\${".$key."}", $data[$k], $select_label);
+												}
+												else {
+													$label = $data['label'];
+													$select_label = str_replace("\${".$key."}", $text2['option-'.$label], $select_label);
+												}
+											}
+										}
 									}
 									else {
-										$label = $data['label'];
-										$select_label = str_replace("\${".$key."}", $text2['option-'.$label], $select_label);
+										$select_value = str_replace("\${".$key."}", $data[$key], $select_value);
+										if (strlen($data['label']) == 0) {
+											$select_label = str_replace("\${".$key."}", $data[$key], $select_label);
+										}
+										else {
+											$label = $data['label'];
+											$select_label = str_replace("\${".$key."}", $text2['option-'.$label], $select_label);
+										}
+									}
+									//application: hangup
+									if (strlen($data['application']) > 0) {
+										$select_value = str_replace("transfer", $data['application'], $select_value);
 									}
 								}
-								//application: hangup
-								if (strlen($data['application']) > 0) {
-									$select_value = str_replace("transfer", $data['application'], $select_value);
-								}
 							}
-						}
 
-						$select_value = str_replace("\${domain_name}", $this->domain_name, $select_value);
-						$select_value = str_replace("\${context}", $this->domain_name, $select_value);
-						$select_label = str_replace("\${domain_name}", $this->domain_name, $select_label);
-						$select_label = str_replace("\${context}", $this->domain_name, $select_label);
-						$select_label = str_replace("&#9993", 'email-icon', $select_label);
-						$select_label = escape(trim($select_label));
-						$select_label = str_replace('email-icon', '&#9993', $select_label);
-						if ($select_value == $destination_value) { $selected = "selected='selected' "; $select_found = true; } else { $selected = ''; }
-						if ($label2 == 'destinations') { $select_label = format_phone($select_label); }
-						$response .= "			<option value='".escape($select_value)."' ".$selected.">".$select_label."</option>\n";
+							$select_value = str_replace("\${domain_name}", $this->domain_name, $select_value);
+							$select_value = str_replace("\${context}", $this->domain_name, $select_value);
+							$select_label = str_replace("\${domain_name}", $this->domain_name, $select_label);
+							$select_label = str_replace("\${context}", $this->domain_name, $select_label);
+							$select_label = str_replace("&#9993", 'email-icon', $select_label);
+							$select_label = escape(trim($select_label));
+							$select_label = str_replace('email-icon', '&#9993', $select_label);
+							if ($select_value == $destination_value) { $selected = "selected='selected' "; $select_found = true; } else { $selected = ''; }
+							if ($label2 == 'destinations') { $select_label = format_phone($select_label); }
+							$response .= "			<option value='".escape($select_value)."' ".$selected.">".$select_label."</option>\n";
+						}
+						$response .= "		</optgroup>\n";
+						unset($text);
 					}
-					$response .= "		</optgroup>\n";
-					unset($text);
+				}
+				if (!$select_found) {
+					$destination_label = str_replace(":", " ", $destination_value);
+					$destination_label = str_replace("menu-exec-app", "", $destination_label);
+					$destination_label = str_replace("transfer", "", $destination_label);
+					$destination_label = str_replace("XML ".$this->domain_name, "", $destination_label);
+					if ($destination_value != '' || $destination_label != '') {
+						$response .= "			<option value='".escape($destination_value)."' selected='selected'>".trim($destination_label)."</option>\n";
+					}
+				}
+				$response .= "	</select>\n";
+				if (if_group("superadmin")) {
+					$response .= "<input type='button' id='btn_select_to_input_".$destination_id."' class='btn' name='' alt='back' onclick='changeToInput".$destination_id."(document.getElementById(\"".$destination_id."\"));this.style.visibility = \"hidden\";' value='&#9665;'>";
 				}
 			}
-			if (!$select_found) {
-				$destination_label = str_replace(":", " ", $destination_value);
-				$destination_label = str_replace("menu-exec-app", "", $destination_label);
-				$destination_label = str_replace("transfer", "", $destination_label);
-				$destination_label = str_replace("XML ".$this->domain_name, "", $destination_label);
-				if ($destination_value != '' || $destination_label != '') {
-					$response .= "			<option value='".escape($destination_value)."' selected='selected'>".trim($destination_label)."</option>\n";
+
+			//create a dynamic destination select list
+			if ($_SESSION['destinations']['select_mode']['text'] == 'dynamic') {
+
+				//remove special characters from the name
+				$destination_id = str_replace("]", "", $destination_name);
+				$destination_id = str_replace("[", "_", $destination_id);
+				//$destination_id = preg_replace('/[^a-zA-Z_,.]/', '', $destination_name);
+	
+				?>
+				<script type="text/javascript">
+					function get_destinations(id, destination_type, action, search) {
+						//alert(action);
+						var xhttp = new XMLHttpRequest();
+						xhttp.onreadystatechange = function() {
+							if (this.readyState == 4 && this.status == 200) {
+								document.getElementById(id).innerHTML = this.responseText;
+							}
+						};
+						if (action) {
+							xhttp.open("GET", "/app/destinations/resources/destinations.php?destination_type="+destination_type+"&action="+action, true);
+						}
+						else {
+							xhttp.open("GET", "/app/destinations/resources/destinations.php?destination_type="+destination_type, true);
+						}
+						xhttp.send();
+					}
+				</script>
+				<?php
+
+				//get the destinations
+				$destination = new destinations;
+				if (!isset($_SESSION['destinations']['array'][$destination_type])) {
+					$_SESSION['destinations']['array'][$destination_type] = $destination->get($destination_type);
 				}
-			}
-			$response .= "	</select>\n";
-			if (if_group("superadmin")) {
-				$response .= "<input type='button' id='btn_select_to_input_".$destination_id."' class='btn' name='' alt='back' onclick='changeToInput".$destination_id."(document.getElementById(\"".$destination_id."\"));this.style.visibility = \"hidden\";' value='&#9665;'>";
+
+				//get the destination label
+				foreach($_SESSION['destinations']['array'][$destination_type] as $key => $value) {
+					foreach($value as $k => $row) {
+						if ($destination_value == $row['destination']) {
+							$destination_key = $key;
+							$destination_label = $row['label'];
+							break;
+						}
+					}
+				}
+
+				//add the language object
+				$language2 = new text;
+
+				//build the destination select list in html
+				$response .= "	<select id='{$destination_id}_type' class='formfld' style='".$select_style."' onchange=\"get_destinations('".$destination_id."', '".$destination_type."', this.value);\">\n";
+				$response .= " 		<option value=''></option>\n";
+				foreach($_SESSION['destinations']['array'][$destination_type] as $key => $value) {
+					$singular = $this->singular($key);
+					if (permission_exists("{$singular}_destinations")) {
+						//determine if selected
+						$selected = ($key == $destination_key) ? "selected='selected'" : ''; 
+
+						//add multi-lingual support
+						if (file_exists($_SERVER["PROJECT_ROOT"]."/app/".$key."/app_languages.php")) {
+							$language2 = new text;
+							$text2 = $language2->get($_SESSION['domain']['language']['code'], 'app/'.$key);
+							$found = 'true';
+						}
+						if ($key == 'other') {
+							$text2 = $language2->get($_SESSION['domain']['language']['code'], 'app/dialplans');
+						}
+						//add the application to the select list
+						$response .= "		<option id='{$singular}' class='{$key}' value='".$key."' $selected>".$text2['title-'.$key]."</option>\n";
+					}
+				}
+				$response .= "	</select>\n";
+				$response .= "	<select id='".$destination_id."' name='".$destination_name."' class='formfld' style='".$select_style."'>\n";
+				foreach($_SESSION['destinations']['array'][$destination_type] as $key => $value) {
+					if ($key == $destination_key) {
+						foreach($value as $k => $row) {
+							$selected = ($row['destination'] == $destination_value) ? "selected='selected'" : '';
+							$uuid = isset($row[$this->singular($key).'_uuid']) ? $row[$this->singular($key).'_uuid'] : $row['uuid'];
+							$response .= "		<option id='{$uuid}' value='".$row['destination']."' $selected>".$row['label']."</option>\n";
+						}
+					}
+				}
+				$response .= "	</select>";
+				$response .= button::create([
+					'type'=>'button',
+					'icon'=>'external-link-alt',
+					'id'=>'btn_dest_go',
+					'title'=>$text['label-edit'],
+					'onclick'=>"let types = document.getElementById('{$destination_id}_type').options; let opts = document.getElementById('{$destination_id}').options; if(opts[opts.selectedIndex].id && opts[opts.selectedIndex].id.length > 0) {window.open('/app/'+types[types.selectedIndex].className+'/'+types[types.selectedIndex].id+'_edit.php?id='+opts[opts.selectedIndex].id, '_blank');}"
+				])."\n";
+
+				//debug information
+				//echo $response;
+				//echo "destination_key $destination_key\n";
+				//echo "destination_id $destination_id\n";
+				//echo "destination_type $destination_type\n";
+				//echo "destination_name $destination_name\n";
+				//echo "destination_value $destination_value\n";
+				//exit;
+
 			}
 
 			//return the formatted destinations
@@ -366,7 +555,12 @@ if (!class_exists('destinations')) {
 				$config_list = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/*/*/app_config.php");
 				$x = 0;
 				foreach ($config_list as &$config_path) {
-					include($config_path);
+					try {
+					    include($config_path);
+					}
+					catch (Exception $e) {
+					    //echo 'Caught exception: ',  $e->getMessage(), "\n";
+					}
 					$x++;
 				}
 				$i = 0;
@@ -436,22 +630,18 @@ if (!class_exists('destinations')) {
 				$this->destinations[$x]['select_value']['dialplan'] = "transfer:\${destination}";
 				$this->destinations[$x]['select_value']['ivr'] = "menu-exec-app:transfer \${destination}";
 				$this->destinations[$x]['select_label'] = "\${name}";
-				$y = 0;
-				$this->destinations[$x]['result']['data'][$y]['label'] = 'check_voicemail';
-				$this->destinations[$x]['result']['data'][$y]['name'] = '*98';
+				$y=0;
+				$this->destinations[$x]['result']['data'][$y]['name'] = 'check_voicemail';
 				$this->destinations[$x]['result']['data'][$y]['destination'] = '*98 XML ${context}';
 				$y++;
-				$this->destinations[$x]['result']['data'][$y]['label'] = 'company_directory';
-				$this->destinations[$x]['result']['data'][$y]['name'] = '*411';
+				$this->destinations[$x]['result']['data'][$y]['name'] = 'company_directory';
 				$this->destinations[$x]['result']['data'][$y]['destination'] = '*411 XML ${context}';
 				$y++;
-				$this->destinations[$x]['result']['data'][$y]['label'] = 'hangup';
 				$this->destinations[$x]['result']['data'][$y]['name'] = 'hangup';
 				$this->destinations[$x]['result']['data'][$y]['application'] = 'hangup';
 				$this->destinations[$x]['result']['data'][$y]['destination'] = '';
 				$y++;
-				$this->destinations[$x]['result']['data'][$y]['label'] = 'record';
-				$this->destinations[$x]['result']['data'][$y]['name'] = '*732';
+				$this->destinations[$x]['result']['data'][$y]['name'] = 'record';
 				$this->destinations[$x]['result']['data'][$y]['destination'] = '*732 XML ${context}';
 				$y++;
 			}
@@ -570,7 +760,12 @@ if (!class_exists('destinations')) {
 				$config_list = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/*/*/app_config.php");
 				$x = 0;
 				foreach ($config_list as &$config_path) {
-					include($config_path);
+					try {
+						include($config_path);
+					}
+					catch (Exception $e) {
+						//echo 'Caught exception: ',  $e->getMessage(), "\n";
+					}
 					$x++;
 				}
 				$i = 0;
@@ -628,40 +823,39 @@ if (!class_exists('destinations')) {
 						$this->destinations[$x]['result']['data'] = $result;
 					}
 					if ($row['type'] === 'array') {
-						$this->destinations[$x] = $row['result']['data'];
+						$this->destinations[$x] = $row;
 					}
 					$x++;
 				}
 
 				$this->destinations[$x]['type'] = 'array';
 				$this->destinations[$x]['label'] = 'other';
-				$this->destinations[$x]['name'] = 'dialplans';
+				$this->destinations[$x]['name'] = 'other';
+				$this->destinations[$x]['field']['label'] = "label";
 				$this->destinations[$x]['field']['name'] = "name";
+				$this->destinations[$x]['field']['extension'] = "extension";
 				$this->destinations[$x]['field']['destination'] = "destination";
 				$this->destinations[$x]['select_value']['dialplan'] = "transfer:\${destination}";
 				$this->destinations[$x]['select_value']['ivr'] = "menu-exec-app:transfer \${destination}";
 				$this->destinations[$x]['select_label'] = "\${name}";
 				$y = 0;
-				$this->destinations[$x]['result']['data'][$y]['label'] = 'check_voicemail';
-				$this->destinations[$x]['result']['data'][$y]['name'] = '*98';
+				$this->destinations[$x]['result']['data'][$y]['name'] = 'check_voicemail';
 				$this->destinations[$x]['result']['data'][$y]['extension'] = '*98';
 				$this->destinations[$x]['result']['data'][$y]['destination'] = '*98 XML ${context}';
 				$y++;
-				$this->destinations[$x]['result']['data'][$y]['label'] = 'company_directory';
-				$this->destinations[$x]['result']['data'][$y]['name'] = '*411';
+				$this->destinations[$x]['result']['data'][$y]['name'] = 'company_directory';
 				$this->destinations[$x]['result']['data'][$y]['extension'] = '*411';
 				$this->destinations[$x]['result']['data'][$y]['destination'] = '*411 XML ${context}';
 				$y++;
-				$this->destinations[$x]['result']['data'][$y]['label'] = 'hangup';
 				$this->destinations[$x]['result']['data'][$y]['name'] = 'hangup';
 				$this->destinations[$x]['result']['data'][$y]['application'] = 'hangup';
 				$this->destinations[$x]['result']['data'][$y]['destination'] = '';
 				$y++;
-				$this->destinations[$x]['result']['data'][$y]['label'] = 'record';
-				$this->destinations[$x]['result']['data'][$y]['name'] = '*732';
+				$this->destinations[$x]['result']['data'][$y]['name'] = 'record';
 				$this->destinations[$x]['result']['data'][$y]['extension'] = '*732';
 				$this->destinations[$x]['result']['data'][$y]['destination'] = '*732 XML ${context}';
 				$y++;
+
 			}
 
 			//remove special characters from the name
@@ -684,11 +878,12 @@ if (!class_exists('destinations')) {
 					$text2 = $language2->get($_SESSION['domain']['language']['code'], 'app/'.$name);
 				}
 
-				if (count($row['result']['data']) > 0 and strlen($row['select_value'][$destination_type]) > 0) {
+				if (is_array($row['result']['data']) && strlen($row['select_value'][$destination_type]) > 0) {
 					$label2 = $label;
 					foreach ($row['result']['data'] as $data) {
 						$select_value = $row['select_value'][$destination_type];
 						$select_label = $row['select_label'];
+						//echo $select_label." ".__line__." ".$name."<br />\n";
 						foreach ($row['field'] as $key => $value) {
 							if ($key == 'destination' and is_array($value)) {
 								if ($value['type'] == 'csv') {
@@ -730,6 +925,12 @@ if (!class_exists('destinations')) {
 							}
 						}
 
+						//view_array($data, false);
+						//echo "name ".$name."\n";
+						//echo "select_value ".$select_value."\n";
+						//echo "select_label ".$select_label."\n";
+						//echo "\n";
+
 						$select_value = str_replace("\${domain_name}", $this->domain_name, $select_value);
 						$select_value = str_replace("\${context}", $this->domain_name, $select_value);
 						$select_label = str_replace("\${domain_name}", $this->domain_name, $select_label);
@@ -751,10 +952,12 @@ if (!class_exists('destinations')) {
 						
 						$i++;
 					}
+
 					$i = 0;
 					unset($text);
 				}
 			}
+
 			if (!$selected) {
 				$destination_label = str_replace(":", " ", $destination_value);
 				$destination_label = str_replace("menu-exec-app", "", $destination_label);
@@ -767,7 +970,7 @@ if (!class_exists('destinations')) {
 				//$array[$name][$i]['select_name'] = $select_name;
 				//$array[$name][$i]['select_value'] = $select_value;
 				$array[$name][$i]['destination'] = $destination_value;
-				
+
 				$i++;
 			}
 
@@ -869,6 +1072,11 @@ if (!class_exists('destinations')) {
 										}
 									}
 
+								//clear the destinations session array
+									if (isset($_SESSION['destinations']['array'])) {
+										unset($_SESSION['destinations']['array']);
+									}
+
 								//set message
 									message::add($text['message-delete']);
 
diff --git a/app/destinations/resources/destinations.php b/app/destinations/resources/destinations.php
new file mode 100644
index 0000000000..ae026b5e6e
--- /dev/null
+++ b/app/destinations/resources/destinations.php
@@ -0,0 +1,62 @@
+<?php
+
+//includes
+	include_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;
+	}
+
+//get the action
+	$action = $_REQUEST['action'];
+	$destination_type = $_REQUEST['destination_type'];
+
+//sanitize the variables
+	$action = preg_replace('#[^a-zA-Z0-9_\-]#', '', $action);
+	$destination_type = preg_replace('#[^a-zA-Z0-9_\-]#', '', $destination_type);
+
+//get the destinations
+	$destination = new destinations;
+	$destinations = $destination->get($destination_type);
+
+//show the select
+	echo "	<select name='subaction' id='action' class='formfld' style='".$select_style."'>\n";
+	echo "	<option value=''></option>\n";
+	foreach($destinations as $key => $rows) {
+		$singular = $destination->singular($key);
+		if ($key == $action && permission_exists("{$singular}_destinations")) {
+			if (is_array($rows)) {
+				foreach($rows as $row) {
+
+					//set the variables
+					$select_label = $row['label'];
+					$select_value = $row['destination'];
+
+					//update the select values
+					$select_value = str_replace("\${domain_name}", $_SESSION['domain_name'], $select_value);
+					$select_value = str_replace("\${context}", $_SESSION['domain_name'], $select_value);
+					$select_label = str_replace("\${domain_name}", $_SESSION['domain_name'], $select_label);
+					$select_label = str_replace("\${context}", $_SESSION['domain_name'], $select_label);
+
+					$select_label = str_replace('&low_bar;', '_', $select_label);
+					$select_label = str_replace("&#9993", 'email-icon', $select_label);
+					//$select_label = escape(trim($select_label));
+					$select_label = str_replace('email-icon', '&#9993', $select_label);
+
+					//add the select option
+					$uuid = isset($row[$singular.'_uuid']) ? $row[$singular.'_uuid'] : $row['uuid'];
+					echo "		<option id='{$uuid}' value='".$select_value."'>".$select_label."</option>\n";
+				}
+			}
+		}
+	}
+	echo "	</select>\n";
+
+?>
diff --git a/app/destinations/resources/root.php b/app/destinations/resources/root.php
new file mode 100644
index 0000000000..22735436d0
--- /dev/null
+++ b/app/destinations/resources/root.php
@@ -0,0 +1,90 @@
+<?php
+/*
+	FusionPBX
+	Version: MPL 1.1
+
+	The contents of this file are subject to the Mozilla Public License Version
+	1.1 (the "License"); you may not use this file except in compliance with
+	the License. You may obtain a copy of the License at
+	http://www.mozilla.org/MPL/
+
+	Software distributed under the License is distributed on an "AS IS" basis,
+	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+	for the specific language governing rights and limitations under the
+	License.
+
+	The Original Code is FusionPBX
+
+	The Initial Developer of the Original Code is
+	Mark J Crane <markjcrane@fusionpbx.com>
+	Portions created by the Initial Developer are Copyright (C) 2008-2012
+	the Initial Developer. All Rights Reserved.
+
+	Contributor(s):
+	Mark J Crane <markjcrane@fusionpbx.com>
+*/
+
+// make sure the PATH_SEPARATOR is defined
+	umask(2);
+	if (!defined("PATH_SEPARATOR")) {
+		if (strpos($_ENV["OS"], "Win") !== false) {
+			define("PATH_SEPARATOR", ";");
+		} else {
+			define("PATH_SEPARATOR", ":");
+		}
+	}
+
+	if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
+
+	// make sure the document_root is set
+	$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);
+	if(PHP_SAPI == 'cli'){
+		chdir(pathinfo(realpath($_SERVER["PHP_SELF"]), PATHINFO_DIRNAME));
+		$script_full_path = str_replace("\\", '/', getcwd() . '/' . $_SERVER["SCRIPT_FILENAME"]);
+		$dirs = explode('/', pathinfo($script_full_path, PATHINFO_DIRNAME));
+		if (file_exists('/project_root.php')) {
+			$path = '/';
+		} else {
+			$i    = 1;
+			$path = '';
+			while ($i < count($dirs)) {
+				$path .= '/' . $dirs[$i];
+				if (file_exists($path. '/project_root.php')) {
+					break;
+				}
+				$i++;
+			}
+		}
+		$_SERVER["DOCUMENT_ROOT"] = $path;
+	}else{
+		$_SERVER["DOCUMENT_ROOT"]   = str_replace($_SERVER["PHP_SELF"], "", $_SERVER["SCRIPT_FILENAME"]);
+	}
+	$_SERVER["DOCUMENT_ROOT"]   = realpath($_SERVER["DOCUMENT_ROOT"]);
+// try to detect if a project path is being used
+	if (!defined('PROJECT_PATH')) {
+		if (is_dir($_SERVER["DOCUMENT_ROOT"]. '/fusionpbx')) {
+			define('PROJECT_PATH', '/fusionpbx');
+		} elseif (file_exists($_SERVER["DOCUMENT_ROOT"]. '/project_root.php')) {
+			define('PROJECT_PATH', '');
+		} else {
+			$dirs = explode('/', str_replace('\\', '/', pathinfo($_SERVER["PHP_SELF"], PATHINFO_DIRNAME)));
+			$i    = 1;
+			$path = $_SERVER["DOCUMENT_ROOT"];
+			while ($i < count($dirs)) {
+				$path .= '/' . $dirs[$i];
+				if (file_exists($path. '/project_root.php')) {
+					break;
+				}
+				$i++;
+			}
+			if(!file_exists($path. '/project_root.php')){
+				die("Failed to locate the Project Root by searching for project_root.php please contact support for assistance");
+			}
+			$project_path = str_replace($_SERVER["DOCUMENT_ROOT"], "", $path);
+			define('PROJECT_PATH', $project_path);
+		}
+		$_SERVER["PROJECT_ROOT"] = realpath($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH);
+		set_include_path(get_include_path() . PATH_SEPARATOR . $_SERVER["PROJECT_ROOT"]);
+	}
+
+?>
diff --git a/app/devices/app_config.php b/app/devices/app_config.php
index f6c613c9e5..b75dda8590 100644
--- a/app/devices/app_config.php
+++ b/app/devices/app_config.php
@@ -2152,6 +2152,13 @@
 		$vendors[$y]['functions'][$z]['value'] = "none";
 		$vendors[$y]['functions'][$z]['groups'][] = "superadmin";
 		$vendors[$y]['functions'][$z]['groups'][] = "admin";
+		$z++;
+		$vendors[$y]['functions'][$z]['uuid'] = "5fab2239-b72c-404a-a392-251e22770ec5";
+		$vendors[$y]['functions'][$z]['label'] = "label-phonebook";
+		$vendors[$y]['functions'][$z]['name'] = "phonebook";
+		$vendors[$y]['functions'][$z]['value'] = "phonebook";
+		$vendors[$y]['functions'][$z]['groups'][] = "superadmin";
+		$vendors[$y]['functions'][$z]['groups'][] = "admin";
 //mitel
 		$y++;
 		$vendors[$y]['uuid'] = "03931359-917e-455b-b4fc-f875c530b79c";
diff --git a/app/devices/app_languages.php b/app/devices/app_languages.php
index fdb0516c8c..1358639e2f 100644
--- a/app/devices/app_languages.php
+++ b/app/devices/app_languages.php
@@ -1650,8 +1650,8 @@ $text['label-keys']['de-ch'] = "Tasten"; //copied from de-de
 $text['label-keys']['de-de'] = "Tasten";
 $text['label-keys']['es-cl'] = "Claves";
 $text['label-keys']['es-mx'] = "Claves"; //copied from es-cl
-$text['label-keys']['fr-ca'] = "Clés"; //copied from fr-fr
-$text['label-keys']['fr-fr'] = "Clés";
+$text['label-keys']['fr-ca'] = "Touches"; //copied from fr-fr
+$text['label-keys']['fr-fr'] = "Touches";
 $text['label-keys']['he-il'] = "";
 $text['label-keys']['it-it'] = "Tasti";
 $text['label-keys']['nl-nl'] = "Toetsen";
@@ -4583,6 +4583,27 @@ $text['label-custom']['ru-ru'] = "";
 $text['label-custom']['sv-se'] = "";
 $text['label-custom']['uk-ua'] = "";
 
+$text['label-fields']['en-us'] = "Fields";
+$text['label-fields']['en-gb'] = "Fields";
+$text['label-fields']['ar-eg'] = "Fields";
+$text['label-fields']['de-at'] = "Fields";
+$text['label-fields']['de-ch'] = "Fields";
+$text['label-fields']['de-de'] = "Fields";
+$text['label-fields']['es-cl'] = "Fields";
+$text['label-fields']['es-mx'] = "Fields";
+$text['label-fields']['fr-ca'] = "Fields";
+$text['label-fields']['fr-fr'] = "Fields";
+$text['label-fields']['he-il'] = "Fields";
+$text['label-fields']['it-it'] = "Fields";
+$text['label-fields']['nl-nl'] = "Fields";
+$text['label-fields']['pl-pl'] = "Fields";
+$text['label-fields']['pt-br'] = "Fields";
+$text['label-fields']['pt-pt'] = "Fields";
+$text['label-fields']['ro-ro'] = "Fields";
+$text['label-fields']['ru-ru'] = "Fields";
+$text['label-fields']['sv-se'] = "Fields";
+$text['label-fields']['uk-ua'] = "Fields";
+
 $text['header-device_import']['en-us'] = "Device Import";
 $text['header-device_import']['en-gb'] = "Device Import";
 $text['header-device_import']['ar-eg'] = "";
@@ -4713,6 +4734,29 @@ $text['header-device']['ru-ru'] = "Устройство";
 $text['header-device']['sv-se'] = "Enhet";
 $text['header-device']['uk-ua'] = "";
 
+$text['description-device_export']['en-us'] = "Select the fields you wish to include in the export.";
+$text['description-device_export']['en-gb'] = "Select the fields you wish to include in the export.";
+$text['description-device_export']['ar-eg'] = "Select the fields you wish to include in the export.";
+$text['description-device_export']['de-at'] = "Select the fields you wish to include in the export.";
+$text['description-device_export']['de-ch'] = "Select the fields you wish to include in the export.";
+$text['description-device_export']['de-de'] = "Select the fields you wish to include in the export.";
+$text['description-device_export']['ek-gr'] = "Select the fields you wish to include in the export.";
+$text['description-device_export']['es-cl'] = "Select the fields you wish to include in the export.";
+$text['description-device_export']['es-mx'] = "Select the fields you wish to include in the export.";
+$text['description-device_export']['fr-ca'] = "Select the fields you wish to include in the export.";
+$text['description-device_export']['fr-fr'] = "Select the fields you wish to include in the export.";
+$text['description-device_export']['he-il'] = "Select the fields you wish to include in the export.";
+$text['description-device_export']['it-it'] = "Select the fields you wish to include in the export.";
+$text['description-device_export']['nl-nl'] = "Select the fields you wish to include in the export.";
+$text['description-device_export']['pl-pl'] = "Select the fields you wish to include in the export.";
+$text['description-device_export']['pt-br'] = "Select the fields you wish to include in the export.";
+$text['description-device_export']['pt-pt'] = "Select the fields you wish to include in the export.";
+$text['description-device_export']['ro-ro'] = "Select the fields you wish to include in the export.";
+$text['description-device_export']['ru-ru'] = "Select the fields you wish to include in the export.";
+$text['description-device_export']['sv-se'] = "Select the fields you wish to include in the export.";
+$text['description-device_export']['uk-ua'] = "Select the fields you wish to include in the export.";
+$text['description-device_export']['tr-tr'] = "Select the fields you wish to include in the export.";
+
 $text['description-user']['en-us'] = "Assign a user to this device.";
 $text['description-user']['en-gb'] = "Assign a user to this device.";
 $text['description-user']['ar-eg'] = "";
diff --git a/app/devices/cmd.php b/app/devices/cmd.php
index 132001f441..7faeea7ffd 100644
--- a/app/devices/cmd.php
+++ b/app/devices/cmd.php
@@ -41,7 +41,6 @@ else {
 //set the variables
 	$cmd = check_str($_GET['cmd']);
 	$rdr = check_str($_GET['rdr']);
-	$profile = check_str($_GET['profile']);
 	$domain = check_str($_GET['domain']);
 	$show = check_str($_GET['show']);
 	$user = check_str($_GET['user']);
@@ -51,26 +50,39 @@ else {
 //create the event socket connection
 	$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
 	if ($fp) {
+		// Get the SIP profiles for the user
+		$command = "sofia_contact */{$user}";
+		$contact_string = event_socket_request($fp, "api ".$command);
+		// The first value in the array will be full matching text, the second one will be the array of profile matches
+		preg_match_all('/sofia\/([^,]+)\/(?:[^,]+)/', $contact_string, $matches);
+		if (sizeof($matches) != 2 || sizeof($matches[1]) < 1) {
+			$profiles = array("internal");
+		} else {
+			// We have at least one profile, get all of the unique profiles
+			$profiles = array_unique($matches[1]);
+		}
 
-		//prepare the command
+		foreach ($profiles as $profile) {
+			//prepare the command
 			if ($cmd == "unregister") {
-				$command = "sofia profile ".$profile." flush_inbound_reg ".$user." reboot";
+				$command = "sofia profile {$profile} flush_inbound_reg {$user} reboot";
 			}
 			else {
-				$command = "lua app.lua event_notify ".$profile." ".$cmd." ".$user." ".$vendor;
+				$command = "lua app.lua event_notify {$profile} {$cmd} {$user} {$vendor}";
 				//if ($cmd == "check_sync") {
 				//	$command = "sofia profile ".$profile." check_sync ".$user;
 				//}
 			}
-		//send the command
-			$response = event_socket_request($fp, "api ".$command);
-			$response = event_socket_request($fp, "api log notice ".$command);
+			//send the command
+			$response = event_socket_request($fp, "api {$command}");
+			event_socket_request($fp, "api log notice {$command}");
 
-		//show the response
+			//show the response
 			message::add($text['label-event']." ".ucwords($cmd)."&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;".$text['label-response'].htmlentities($response));
+		}
 
 		//close the connection
-			fclose($fp);
+		fclose($fp);
 	}
 
 //redirect the user
diff --git a/app/devices/device_download.php b/app/devices/device_download.php
index ae70f8464b..f3569ae1be 100644
--- a/app/devices/device_download.php
+++ b/app/devices/device_download.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-2020
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -28,7 +28,6 @@
 	require_once "root.php";
 	require_once "resources/require.php";
 	require_once "resources/check_auth.php";
-	require_once "resources/paging.php";
 
 //check permissions
 	if (permission_exists('device_export')) {
@@ -75,14 +74,40 @@
 		header("Content-Transfer-Encoding: binary");
 	}
 
-
 //define possible columns in the array
-	$available_columns[] = 'device_uuid';
-	$available_columns[] = 'domain_uuid';
-	$available_columns[] = 'device_mac_address';
-	$available_columns[] = 'device_label';
-	$available_columns[] = 'device_template';
-	$available_columns[] = 'device_description';
+	$available_columns['devices'][] = 'device_uuid';
+	$available_columns['devices'][] = 'device_profile_uuid';
+	$available_columns['devices'][] = 'device_mac_address';
+	$available_columns['devices'][] = 'device_label';
+	$available_columns['devices'][] = 'device_vendor';
+	$available_columns['devices'][] = 'device_template';
+	$available_columns['devices'][] = 'device_enabled_date';
+	$available_columns['devices'][] = 'device_username';
+	$available_columns['devices'][] = 'device_password';
+	$available_columns['devices'][] = 'device_uuid_alternate';
+	$available_columns['devices'][] = 'device_provisioned_date';
+	$available_columns['devices'][] = 'device_provisioned_method';
+	$available_columns['devices'][] = 'device_provisioned_ip';
+	$available_columns['devices'][] = 'device_enabled';
+	$available_columns['devices'][] = 'device_description';
+
+	$available_columns['device_lines'][] = 'device_line_uuid';
+	$available_columns['device_lines'][] = 'device_uuid';
+	$available_columns['device_lines'][] = 'line_number';
+	$available_columns['device_lines'][] = 'server_address';
+	$available_columns['device_lines'][] = 'server_address_primary';
+	$available_columns['device_lines'][] = 'server_address_secondary';
+	$available_columns['device_lines'][] = 'outbound_proxy_primary';
+	$available_columns['device_lines'][] = 'outbound_proxy_secondary';
+	$available_columns['device_lines'][] = 'display_name';
+	$available_columns['device_lines'][] = 'user_id';
+	$available_columns['device_lines'][] = 'auth_id';
+	$available_columns['device_lines'][] = 'password';
+	$available_columns['device_lines'][] = 'sip_port';
+	$available_columns['device_lines'][] = 'sip_transport';
+	$available_columns['device_lines'][] = 'register_expires';
+	$available_columns['device_lines'][] = 'shared_line';
+	$available_columns['device_lines'][] = 'enabled';
 
 //get the devices and send them as output
 	$column_group = $_REQUEST["column_group"];
@@ -96,23 +121,56 @@
 				exit;
 			}
 
+		//validate table names
+			foreach($column_group as $table_name => $columns) {
+				if (!isset($available_columns[$table_name])) {
+					unset($column_group[$table_name]);
+				}
+			}
+
 		//validate columns
-			foreach ($column_group as $index => $column_name) {
-				if (!in_array($column_name, $available_columns)) {
-					unset($column_group[$index]);
+			foreach($column_group as $table_name => $columns) {
+				foreach ($columns as $column_name) {
+					if (!in_array($column_name, $available_columns[$table_name])) {
+						unset($column_group[$table_name][$column_name]);
+					}
 				}
 			}
 
 		//iterate columns
 			if (is_array($column_group) && @sizeof($column_group) != 0) {
-				$column_names = implode(", ", $column_group);
+
+				$column_names = implode(", ", $column_group['devices']);
 				$sql = "select ".$column_names." from v_devices ";
 				$sql .= " where domain_uuid = :domain_uuid ";
 				$parameters['domain_uuid'] = $domain_uuid;
 				$database = new database;
 				$devices = $database->select($sql, $parameters, 'all');
 				unset($sql, $parameters, $column_names);
-				//print_r($extensions);
+
+				foreach($column_group as $table_name => $columns) {
+					if ($table_name !== 'devices') {
+						$column_names = implode(", ", $columns);
+						$sql = "select ".$column_names." from v_".$table_name." ";
+						$sql .= " where domain_uuid = :domain_uuid ";
+						$parameters['domain_uuid'] = $domain_uuid;
+						$database = new database;
+						$$table_name = $database->select($sql, $parameters, 'all');
+						$x = 0;
+						foreach($devices as $device) {
+							foreach($$table_name as $row) {
+								if ($device['device_uuid'] == $row['device_uuid']) {
+									foreach($row as $key => $value) {
+										$devices[$x][$key] = $value;
+									}
+									break;
+								}
+							}
+							$x++;
+						}
+						unset($sql, $parameters, $column_names);
+					}
+				}
 
 				if (is_array($devices) && @sizeof($devices) != 0) {
 					download_send_headers("device_export_".date("Y-m-d").".csv");
@@ -143,30 +201,44 @@
 	echo "	<div style='clear: both;'></div>\n";
 	echo "</div>\n";
 
-	echo "<table class='list'>\n";
-	echo "<tr class='list-header'>\n";
-	echo "	<th class='checkbox'>\n";
-	echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle();' ".($available_columns ?: "style='visibility: hidden;'").">\n";
-	echo "	</th>\n";
-	echo "	<th>".$text['label-column_name']."</th>\n";
-	echo "</tr>\n";
+	echo $text['description-device_export'];
+	echo "<br /><br />\n";
 
 	if (is_array($available_columns) && @sizeof($available_columns) != 0) {
 		$x = 0;
-		foreach ($available_columns as $column_name) {
-			$list_row_onclick = "if (!this.checked) { document.getElementById('checkbox_all').checked = false; }";
-			echo "<tr class='list-row' href='".$list_row_url."'>\n";
-			echo "	<td class='checkbox'>\n";
-			echo "		<input type='checkbox' name='column_group[]' id='checkbox_".$x."' value=\"".$column_name."\" onclick=\"".$list_row_onclick."\">\n";
-			echo "	</td>\n";
-			echo "	<td onclick=\"document.getElementById('checkbox_".$x."').checked = document.getElementById('checkbox_".$x."').checked ? false : true; ".$list_row_onclick."\">".$column_name."</td>";
-			echo "</tr>";
-			$x++;
+		foreach ($available_columns as $table_name => $columns) {
+			$table_name_label = ucwords(str_replace(['-','_',],' ', $table_name));
+			echo "<div class='category'>\n";
+			echo "<b>".$table_name_label."</b>\n";
+			echo "<br>\n";
+			echo "<table class='list'>\n";
+			echo "<tr class='list-header'>\n";
+			echo "	<th class='checkbox'>\n";
+			echo "		<input type='checkbox' id='checkbox_all_".$table_name."' name='checkbox_all' onclick=\"list_all_toggle('".$table_name."');\" ".($available_columns ?: "style='visibility: hidden;'").">\n";
+			echo "	</th>\n";
+			echo "	<th>".$text['label-column_name']."</th>\n";
+			echo "</tr>\n";
+			foreach ($columns as $column_name) {
+				$list_row_onclick = "if (!this.checked) { document.getElementById('checkbox_all').checked = false; }";
+				echo "<tr class='list-row' href='".$list_row_url."'>\n";
+				echo "	<td class='checkbox'>\n";
+				echo "		<input type='checkbox' class='checkbox_".$table_name."' name='column_group[".$table_name."][".$column_name."]' id='checkbox_".$x."' value=\"".$column_name."\" onclick=\"".$list_row_onclick."\">\n";
+				echo "	</td>\n";
+				echo "	<td onclick=\"document.getElementById('checkbox_".$x."').checked = document.getElementById('checkbox_".$x."').checked ? false : true; ".$list_row_onclick."\">".$column_name."</td>";
+				echo "</tr>";
+				$x++;
+			}
+			echo "</table>\n";
+			echo "<br>\n";
+			echo "</div>\n";
 		}
 	}
+	
+	//test the validation
+	//echo "		<input type='hidden' name='column_group[devices][xxx]'  value=\"xxx\">\n";
+	//echo "		<input type='hidden' name='column_group[device_lines][yyy]' value=\"yyy\">\n";
+	//echo "		<input type='hidden' name='column_group[device_zzz][zzz]' value=\"zzz\">\n";
 
-	echo "</table>\n";
-	echo "<br />\n";
 	echo "<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
 	echo "</form>\n";
 
diff --git a/app/devices/device_edit.php b/app/devices/device_edit.php
index b9adc6d69d..f45281c94e 100644
--- a/app/devices/device_edit.php
+++ b/app/devices/device_edit.php
@@ -120,7 +120,6 @@
 			$device_firmware_version = $_POST["device_firmware_version"];
 			$device_enabled = $_POST["device_enabled"];
 			$device_template = $_POST["device_template"];
-			$device_profile_uuid = $_POST["device_profile_uuid"];
 			$device_description = $_POST["device_description"];
 		//lines
 			$device_lines = $_POST["device_lines"];
@@ -273,8 +272,8 @@
 					if (permission_exists('device_template')) {
 						$array['devices'][0]['device_template'] = $device_template;
 					}
-					if (permission_exists('device_profile_edit') && is_uuid($device_profile_uuid)) {
-						$array['devices'][0]['device_profile_uuid'] = $device_profile_uuid;
+					if (permission_exists('device_profile_edit')) {
+						$array['devices'][0]['device_profile_uuid'] = is_uuid($device_profile_uuid) ? $device_profile_uuid : null;
 					}
 					if (permission_exists('device_description')) {
 						$array['devices'][0]['device_description'] = $device_description;
@@ -284,11 +283,13 @@
 						$y = 0;
 						foreach ($device_lines as $row) {
 							if (strlen($row['line_number']) > 0) {
+								$new_line = false;
 								if (is_uuid($row["device_line_uuid"])) {
 									$device_line_uuid = $row["device_line_uuid"];
 								}
 								else {
 									$device_line_uuid = uuid();
+									$new_line = true;
 								}
 								$array['devices'][0]['device_lines'][$y]['domain_uuid'] = $domain_uuid;
 								$array['devices'][0]['device_lines'][$y]['device_uuid'] = $device_uuid;
@@ -297,15 +298,23 @@
 								$array['devices'][0]['device_lines'][$y]['server_address'] = $row["server_address"];
 								if (permission_exists('device_line_outbound_proxy_primary')) {
 									$array['devices'][0]['device_lines'][$y]['outbound_proxy_primary'] = $row["outbound_proxy_primary"];
+								} else if ($new_line && isset($_SESSION['provision']['outbound_proxy_primary'])) {
+									$array['devices'][0]['device_lines'][$y]['outbound_proxy_primary'] = $_SESSION['provision']['outbound_proxy_primary']['text'];
 								}
 								if (permission_exists('device_line_outbound_proxy_secondary')) {
 									$array['devices'][0]['device_lines'][$y]['outbound_proxy_secondary'] = $row["outbound_proxy_secondary"];
+								} else if ($new_line && isset($_SESSION['provision']['outbound_proxy_secondary'])) {
+									$array['devices'][0]['device_lines'][$y]['outbound_proxy_secondary'] = $_SESSION['provision']['outbound_proxy_secondary']['text'];
 								}
 								if (permission_exists('device_line_server_address_primary')) {
 									$array['devices'][0]['device_lines'][$y]['server_address_primary'] = $row["server_address_primary"];
+								} else if ($new_line && isset($_SESSION['provision']['server_address_primary'])) {
+									$array['devices'][0]['device_lines'][$y]['server_address_primary'] = $_SESSION['provision']['server_address_primary']['text'];
 								}
 								if (permission_exists('device_line_server_address_secondary')) {
 									$array['devices'][0]['device_lines'][$y]['server_address_secondary'] = $row["server_address_secondary"];
+								} else if ($new_line && isset($_SESSION['provision']['server_address_secondary'])) {
+									$array['devices'][0]['device_lines'][$y]['server_address_secondary'] = $_SESSION['provision']['server_address_secondary']['text'];
 								}
 								$array['devices'][0]['device_lines'][$y]['display_name'] = $row["display_name"];
 								$array['devices'][0]['device_lines'][$y]['user_id'] = $row["user_id"];
@@ -616,20 +625,6 @@
 		}
 	}
 
-//get the sip profile name
-	$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
-	if ($fp) {
-		$command = "sofia_contact */".$user_id."@".$server_address;
-		$contact_string = event_socket_request($fp, "api ".$command);
-		if (substr($contact_string, 0, 5) == "sofia") {
-			$contact_array = explode("/", $contact_string);
-			$sip_profile_name = $contact_array[1];
-		}
-		else {
-			$sip_profile_name = 'internal';
-		}
-	}
-
 //create token
 	$object = new token;
 	$token = $object->create($_SERVER['PHP_SELF']);
@@ -807,7 +802,7 @@
 			echo button::create(['type'=>'button','label'=>$text['button-qr_code'],'icon'=>'qrcode','style'=>$button_margin,'onclick'=>"$('#qr_code_container').fadeIn(400);"]);
 			unset($button_margin);
 		}
-		echo button::create(['type'=>'button','label'=>$text['button-provision'],'icon'=>'fax','style'=>$button_margin,'link'=>PROJECT_PATH."/app/devices/cmd.php?cmd=check_sync&profile=".urlencode($sip_profile_name)."&user=".urlencode($user_id)."@".urlencode($server_address)."&domain=".urlencode($server_address)."&agent=".urlencode($device_vendor)]);
+		echo button::create(['type'=>'button','label'=>$text['button-provision'],'icon'=>'fax','style'=>$button_margin,'link'=>PROJECT_PATH."/app/devices/cmd.php?cmd=check_sync"."&user=".urlencode($user_id)."@".urlencode($server_address)."&domain=".urlencode($server_address)."&agent=".urlencode($device_vendor)]);
 		unset($button_margin);
 		if (permission_exists("device_files")) {
 			//get the template directory
@@ -1020,10 +1015,12 @@
 					$element['hidden'] = true;
 					$element['visibility'] = "visibility:hidden;";
 				}
+
 			//add the primary key uuid
 				if (is_uuid($row['device_line_uuid'])) {
 					echo "	<input name='device_lines[".$x."][device_line_uuid]' type='hidden' value=\"".escape($row['device_line_uuid'])."\"/>\n";
 				}
+
 			//show each row in the array
 				echo "			<tr>\n";
 				echo "			<td valign='top' align='left' nowrap='nowrap'>\n";
@@ -1047,10 +1044,7 @@
 
 				if (permission_exists('device_line_server_address_primary')) {
 					echo "			<td valign='top' align='left' nowrap='nowrap'>\n";
-					if (is_uuid($_SESSION['provision']['server_address_primary']['uuid'])) {
-						echo "				<input class='formfld' style='width: 100px; width: 100%;' type='text' name='device_lines[".$x."][server_address_primary]' maxlength='255' value=\"".escape($row['server_address_primary'])."\"/>\n";
-					}
-					else {
+					if (isset($_SESSION['provision']['server_address_primary']) && !isset($_SESSION['provision']['server_address_primary']['text'])) {
 						echo "				<select class='formfld' style='width: 75px;' name='device_lines[".$x."][server_address_primary]'>\n";
 						echo "					<option value=''></option>\n";
 						foreach($_SESSION['provision']['server_address_primary'] as $field) {
@@ -1058,15 +1052,15 @@
 						}
 						echo "				</select>\n";
 					}
+					else {
+						echo "				<input class='formfld' style='width: 100px; width: 100%;' type='text' name='device_lines[".$x."][server_address_primary]' maxlength='255' value=\"".escape($row['server_address_primary'])."\"/>\n";
+					}
 					echo "			</td>\n";
 				}
 
 				if (permission_exists('device_line_server_address_secondary')) {
 					echo "			<td valign='top' align='left' nowrap='nowrap'>\n";
-					if (isset($_SESSION['provision']['server_address_secondary']['text'])) {
-						echo "				<input class='formfld' style='width: 100px; width: 100%;' type='text' name='device_lines[".$x."][server_address_secondary]' maxlength='255' value=\"".escape($row['server_address_secondary'])."\"/>\n";
-					}
-					else {
+					if (isset($_SESSION['provision']['server_address_secondary']) && !isset($_SESSION['provision']['server_address_secondary']['text'])) {
 						echo "				<select class='formfld' style='width: 75px;' name='device_lines[".$x."][server_address_secondary]'>\n";
 						echo "					<option value=''></option>\n";
 						foreach($_SESSION['provision']['server_address_secondary'] as $field) {
@@ -1074,15 +1068,15 @@
 						}
 						echo "				</select>\n";
 					}
+					else {
+						echo "				<input class='formfld' style='width: 100px; width: 100%;' type='text' name='device_lines[".$x."][server_address_secondary]' maxlength='255' value=\"".escape($row['server_address_secondary'])."\"/>\n";
+					}
 					echo "			</td>\n";
 				}
 
 				if (permission_exists('device_line_outbound_proxy_primary')) {
 					echo "			<td align='left'>\n";
-					if (isset($_SESSION['provision']['outbound_proxy_primary']['text'])) {
-						echo "				<input class='formfld' style='width: 65px;' type='text' name='device_lines[".$x."][outbound_proxy_primary]' placeholder=\"".escape($text['label-primary'])."\" maxlength='255' value=\"".escape($row['outbound_proxy_primary'])."\"/>\n";
-					}
-					else {
+					if (isset($_SESSION['provision']['outbound_proxy_primary']) && !isset($_SESSION['provision']['outbound_proxy_primary']['text'])) {
 						echo "				<select class='formfld' style='width: 75px;' name='device_lines[".$x."][outbound_proxy_primary]'>\n";
 						echo "					<option value=''></option>\n";
 						foreach($_SESSION['provision']['outbound_proxy_primary'] as $field) {
@@ -1090,15 +1084,15 @@
 						}
 						echo "				</select>\n";	
 					}
+					else {
+						echo "				<input class='formfld' style='width: 65px;' type='text' name='device_lines[".$x."][outbound_proxy_primary]' placeholder=\"".escape($text['label-primary'])."\" maxlength='255' value=\"".escape($row['outbound_proxy_primary'])."\"/>\n";
+					}
 					echo "			</td>\n";
 				}
-				
+
 				if (permission_exists('device_line_outbound_proxy_secondary')) {
 					echo "			<td align='left'>\n";
-					if (isset($_SESSION['provision']['outbound_proxy_secondary']['text'])) {
-						echo "				<input class='formfld' style='width: 65px;' type='text' name='device_lines[".$x."][outbound_proxy_secondary]' placeholder=\"".escape($text['label-secondary'])."\" maxlength='255' value=\"".escape($row['outbound_proxy_secondary'])."\"/>\n";
-					}
-					else {
+					if (isset($_SESSION['provision']['outbound_proxy_secondary']) && !isset($_SESSION['provision']['outbound_proxy_secondary']['text'])) {
 						echo "				<select class='formfld' style='width: 75px;' name='device_lines[".$x."][outbound_proxy_secondary]'>\n";
 						echo "					<option value=''></option>\n";
 						foreach($_SESSION['provision']['outbound_proxy_secondary'] as $field) {
@@ -1106,6 +1100,9 @@
 						}
 						echo "				</select>\n";	
 					}
+					else {
+						echo "				<input class='formfld' style='width: 65px;' type='text' name='device_lines[".$x."][outbound_proxy_secondary]' placeholder=\"".escape($text['label-secondary'])."\" maxlength='255' value=\"".escape($row['outbound_proxy_secondary'])."\"/>\n";
+					}
 					echo "			</td>\n";
 				}
 
@@ -1174,16 +1171,11 @@
 				echo "				</select>\n";
 				echo "			</td>\n";
 
-				if (is_array($device_lines) && @sizeof($device_lines) > 1 && permission_exists('device_line_delete')) {
-					if (is_uuid($row['device_line_uuid'])) {
-						echo "			<td class='vtable' style='text-align: center; padding-bottom: 3px;'>\n";
-						echo "				<input type='checkbox' name='device_lines_delete[".$x."][checked]' value='true' class='chk_delete checkbox_lines' onclick=\"edit_delete_action('lines');\">\n";
-						echo "				<input type='hidden' name='device_lines_delete[".$x."][uuid]' value='".escape($row['device_line_uuid'])."' />\n";
-					}
-					else {
-						echo "			<td>\n";
-					}
-					echo "			</td>\n";
+				if (is_array($device_lines) && @sizeof($device_lines) > 1 && permission_exists('device_line_delete') && is_uuid($row['device_line_uuid'])) {
+					echo "			<td class='vtable' style='text-align: center; padding-bottom: 3px;'>\n";
+					echo "				<input type='checkbox' name='device_lines_delete[".$x."][checked]' value='true' class='chk_delete checkbox_lines' onclick=\"edit_delete_action('lines');\">\n";
+					echo "				<input type='hidden' name='device_lines_delete[".$x."][uuid]' value='".escape($row['device_line_uuid'])."' />\n";
+					echo "			<td>\n";
 				}
 
 				echo "</tr>\n";
diff --git a/app/devices/device_imports.php b/app/devices/device_imports.php
index 07fee12cc1..72c7441986 100644
--- a/app/devices/device_imports.php
+++ b/app/devices/device_imports.php
@@ -66,25 +66,24 @@
 //save the data to the csv file
 	if (isset($_POST['data'])) {
 		$file = $_SESSION['server']['temp']['dir']."/devices-".$_SESSION['domain_name'].".csv";
-		file_put_contents($file, $_POST['data']);
-		$_SESSION['file'] = $file;
-	}
-
-//copy the csv file
-	//$_POST['submit'] == "Upload" &&
-	if ( is_uploaded_file($_FILES['ulfile']['tmp_name']) && permission_exists('device_imports')) {
-		if ($_POST['type'] == 'csv') {
-			move_uploaded_file($_FILES['ulfile']['tmp_name'], $_SESSION['server']['temp']['dir'].'/'.$_FILES['ulfile']['name']);
-			$save_msg = "Uploaded file to ".$_SESSION['server']['temp']['dir']."/". htmlentities($_FILES['ulfile']['name']);
-			//system('chmod -R 744 '.$_SESSION['server']['temp']['dir'].'*');
-			unset($_POST['txtCommand']);
-			$file = $_SESSION['server']['temp']['dir'].'/'.$_FILES['ulfile']['name'];
+		if (file_put_contents($file, $_POST['data'])) {
 			$_SESSION['file'] = $file;
 		}
 	}
 
+//copy the csv file
+	//$_POST['submit'] == "Upload" &&
+	if ( is_uploaded_file($_FILES['ulfile']['tmp_name']) && permission_exists('device_import')) {
+		if ($_POST['type'] == 'csv') {
+			$file = $_SESSION['server']['temp']['dir']."/devices-".$_SESSION['domain_name'].".csv";
+			if (move_uploaded_file($_FILES['ulfile']['tmp_name'], $file)) {
+				$_SESSION['file'] = $file;
+			}
+		}
+	}
+
 //get the schema
-	if (strlen($delimiter) > 0) {
+	if (strlen($delimiter) > 0 && file_exists($_SESSION['file'])) {
 		//get the first line
 			$line = fgets(fopen($_SESSION['file'], 'r'));
 			$line_fields = explode($delimiter, $line);
@@ -292,6 +291,12 @@
 										$result[$key] = preg_replace('{\D}', '', $result[$key]);
 									}
 
+									//normalize the MAC address
+									if ($field_name == "device_mac_address") {
+										$result[$key] = strtolower($result[$key]);
+										$result[$key] = preg_replace('#[^a-fA-F0-9./]#', '', $result[$key]);
+									}
+
 									//build the data array
 									if (strlen($table_name) > 0) {
 										if (strlen($parent) == 0) {
@@ -352,6 +357,12 @@
 						$database->save($array);
 						//$message = $database->message;
 					}
+				
+					if (strlen($_SESSION['provision']['path']['text']) > 0) {
+						$prov = new provision;
+						$prov->domain_uuid = $domain_uuid;
+						$response = $prov->write();
+					}
 
 				//send the redirect header
 					header("Location: devices.php");
diff --git a/app/devices/device_profiles.php b/app/devices/device_profiles.php
index 700de11edd..023983e145 100644
--- a/app/devices/device_profiles.php
+++ b/app/devices/device_profiles.php
@@ -49,6 +49,10 @@
 		$profiles = $_POST['profiles'];
 	}
 
+//get the search
+	$search = strtolower($_REQUEST["search"]);
+	$fields = strtolower($_REQUEST["fields"]);
+
 //process the http post data by action
 	if ($action != '' && is_array($profiles) && @sizeof($profiles) != 0) {
 		switch ($action) {
@@ -72,7 +76,7 @@
 				break;
 		}
 
-		header('Location: device_profiles.php'.($search != '' ? '?search='.urlencode($search) : null));
+		header('Location: device_profiles.php'.($search != '' ? '?search='.urlencode($search).'&fields='.urlencode($fields) : null));
 		exit;
 	}
 
@@ -81,11 +85,25 @@
 	$order = $_GET["order"];
 
 //add the search term
-	$search = strtolower($_GET["search"]);
 	if (strlen($search) > 0) {
 		$sql_search = "and (";
 		$sql_search .= "	lower(device_profile_name) like :search ";
 		$sql_search .= "	or lower(device_profile_description) like :search ";
+		if ($fields == 'all' || $fields == 'keys') {
+			$sql_search .= "	or device_profile_uuid in ( ";
+			$sql_search .= "		select dpk.device_profile_uuid from v_device_profile_keys as dpk ";
+			$sql_search .= "		where dpk.profile_key_value like :search ";
+			$sql_search .= "		or dpk.profile_key_label like :search ";
+			$sql_search .= "	) ";
+		}
+		if ($fields == 'all' || $fields == 'settings') {
+			$sql_search .= "	or device_profile_uuid in ( ";
+			$sql_search .= "		select dps.device_profile_uuid from v_device_profile_settings as dps ";
+			$sql_search .= "		where dps.profile_setting_name like :search ";
+			$sql_search .= "		or dps.profile_setting_value like :search ";
+			$sql_search .= "		or dps.profile_setting_description like :search ";
+			$sql_search .= "	) ";
+		}
 		$sql_search .= ") ";
 		$parameters['search'] = '%'.$search.'%';
 	}
@@ -103,7 +121,10 @@
 
 //prepare to page the results
 	$rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50;
-	$param = "&search=".$search;
+	if ($search) {
+		$param = "&search=".$search;
+		$param .= "&fields=".$fields;
+	}
 	if ($_GET['show'] == "all" && permission_exists('device_profile_all')) {
 		$param .= "&show=all";
 	}
@@ -155,7 +176,15 @@
 			echo button::create(['type'=>'button','label'=>$text['button-show_all'],'icon'=>$_SESSION['theme']['button_icon_all'],'link'=>'?show=all']);
 		}
 	}
-	echo 		"<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown='list_search_reset();'>";
+
+	echo 		"<select class='formfld' name='fields' id='select_fields' style='width: auto; margin-left: 15px;' onchange=\"if (document.getElementById('search').value != '') { this.form.submit(); }\">\n";
+	echo "			<option value=''>".$text['label-fields']."...</option>\n";
+	echo "			<option value=''>".$text['label-default']."</option>\n";
+	echo "			<option value='keys' ".($fields == 'keys' ? " selected='selected'" : null).">".$text['label-keys']."</option>\n";
+	echo "			<option value='settings' ".($fields == 'settings' ? " selected='selected'" : null).">".$text['label-settings']."</option>\n";
+	echo "			<option value='all' ".($fields == 'all' ? " selected='selected'" : null).">".$text['label-all']."</option>\n";
+	echo "		</select>";
+	echo 		"<input type='text' class='txt list-search' name='search' id='search' style='margin-left: 0 !important;' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown='list_search_reset();'>";
 	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search','style'=>($search != '' ? 'display: none;' : null)]);
 	echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'device_profiles.php','style'=>($search == '' ? 'display: none;' : null)]);
 	if ($paging_controls_mini != '') {
@@ -182,6 +211,7 @@
 	echo "<form id='form_list' method='post'>\n";
 	echo "<input type='hidden' id='action' name='action' value=''>\n";
 	echo "<input type='hidden' name='search' value=\"".escape($search)."\">\n";
+	echo "<input type='hidden' name='fields' value=\"".escape($fields)."\">\n";
 
 	echo "<table class='list'>\n";
 	echo "<tr class='list-header'>\n";
diff --git a/app/devices/devices.php b/app/devices/devices.php
index ed9adcceb5..669585080e 100644
--- a/app/devices/devices.php
+++ b/app/devices/devices.php
@@ -51,6 +51,7 @@
 
 //get the search
 	$search = strtolower($_REQUEST["search"]);
+	$fields = strtolower($_REQUEST["fields"]);
 
 //process the http post data by action
 	if ($action != '' && is_array($devices) && @sizeof($devices) != 0) {
@@ -69,7 +70,7 @@
 				break;
 		}
 
-		header('Location: devices.php'.($search != '' ? '?search='.urlencode($search) : null));
+		header('Location: devices.php'.($search != '' ? '?search='.urlencode($search).'&fields='.urlencode($fields) : null));
 		exit;
 	}
 
@@ -126,6 +127,29 @@
 		$sql .= "	or lower(d.device_description) like :search ";
 		$sql .= "	or lower(d.device_provisioned_method) like :search ";
 		$sql .= "	or lower(d.device_provisioned_ip) like :search ";
+		if ($fields == 'all' || $fields == 'lines') {
+			$sql .= "	or d.device_uuid in ( ";
+			$sql .= "		select dl.device_uuid from v_device_lines as dl ";
+			$sql .= "		where dl.display_name like :search ";
+			$sql .= "		or dl.user_id like :search ";
+			$sql .= "		or dl.auth_id like :search ";
+			$sql .= "	) ";
+		}
+		if ($fields == 'all' || $fields == 'keys') {
+			$sql .= "	or d.device_uuid in ( ";
+			$sql .= "		select dk.device_uuid from v_device_keys as dk ";
+			$sql .= "		where dk.device_key_value like :search ";
+			$sql .= "		or dk.device_key_label like :search ";
+			$sql .= "	) ";
+		}
+		if ($fields == 'all' || $fields == 'settings') {
+			$sql .= "	or d.device_uuid in ( ";
+			$sql .= "		select ds.device_uuid from v_device_settings as ds ";
+			$sql .= "		where ds.device_setting_subcategory like :search ";
+			$sql .= "		or ds.device_setting_value like :search ";
+			$sql .= "		or ds.device_setting_description like :search ";
+			$sql .= "	) ";
+		}
 		$sql .= ") ";
 		$parameters['search'] = '%'.strtolower($search).'%';
 	}
@@ -135,11 +159,12 @@
 
 //prepare to page the results
 	$rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50;
-	if (isset($_GET['show']) && $_GET['show'] == "all" && permission_exists('device_all')) {
-		$param = "&search=".$search."&show=all";
-	}
-	else {
+	if ($search) {
 		$param = "&search=".$search;
+		$param .= "&fields=".$fields;
+	}
+	if ($_GET['show'] == "all" && permission_exists('device_all')) {
+		$param .= "&show=all";
 	}
 	$page = $_GET['page'];
 	if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; }
@@ -155,7 +180,10 @@
 	}
 	$sql .= "where ( ";
 	$sql .= "	d.device_uuid_alternate = d2.device_uuid  ";
-	$sql .= "	or d.device_uuid_alternate is null and d.device_uuid = d2.device_uuid ";
+	$sql .= "	or ( ";
+	$sql .= "		d.device_uuid_alternate is null and ";
+	$sql .= "		d.device_uuid = d2.device_uuid ";
+	$sql .= "	) ";
 	$sql .= ") ";
 	if (isset($_GET['show']) && $_GET['show'] == "all" && permission_exists('device_all')) {
 		$sql .= " and d.domain_uuid = d3.domain_uuid ";
@@ -183,6 +211,29 @@
 		$sql .= "	or lower(d.device_description) like :search ";
 		$sql .= "	or lower(d.device_provisioned_method) like :search ";
 		$sql .= "	or lower(d.device_provisioned_ip) like :search ";
+		if ($fields == 'all' || $fields == 'lines') {
+			$sql .= "	or d.device_uuid in ( ";
+			$sql .= "		select dl.device_uuid from v_device_lines as dl ";
+			$sql .= "		where dl.display_name like :search ";
+			$sql .= "		or dl.user_id like :search ";
+			$sql .= "		or dl.auth_id like :search ";
+			$sql .= "	) ";
+		}
+		if ($fields == 'all' || $fields == 'keys') {
+			$sql .= "	or d.device_uuid in ( ";
+			$sql .= "		select dk.device_uuid from v_device_keys as dk ";
+			$sql .= "		where dk.device_key_value like :search ";
+			$sql .= "		or dk.device_key_label like :search ";
+			$sql .= "	) ";
+		}
+		if ($fields == 'all' || $fields == 'settings') {
+			$sql .= "	or d.device_uuid in ( ";
+			$sql .= "		select ds.device_uuid from v_device_settings as ds ";
+			$sql .= "		where ds.device_setting_subcategory like :search ";
+			$sql .= "		or ds.device_setting_value like :search ";
+			$sql .= "		or ds.device_setting_description like :search ";
+			$sql .= "	) ";
+		}
 		$sql .= ") ";
 		$parameters['search'] = '%'.strtolower($search).'%';
 	}
@@ -255,7 +306,15 @@
 		}
 	}
 
-	echo 		"<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown='list_search_reset();'>";
+	echo 		"<select class='formfld' name='fields' id='select_fields' style='width: auto; margin-left: 15px;' onchange=\"if (document.getElementById('search').value != '') { this.form.submit(); }\">\n";
+	echo "			<option value=''>".$text['label-fields']."...</option>\n";
+	echo "			<option value=''>".$text['label-default']."</option>\n";
+	echo "			<option value='lines' ".($fields == 'lines' ? " selected='selected'" : null).">".$text['label-lines']."</option>\n";
+	echo "			<option value='keys' ".($fields == 'keys' ? " selected='selected'" : null).">".$text['label-keys']."</option>\n";
+	echo "			<option value='settings' ".($fields == 'settings' ? " selected='selected'" : null).">".$text['label-settings']."</option>\n";
+	echo "			<option value='all' ".($fields == 'all' ? " selected='selected'" : null).">".$text['label-all']."</option>\n";
+	echo "		</select>";
+	echo 		"<input type='text' class='txt list-search' name='search' id='search' style='margin-left: 0 !important;' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown='list_search_reset();'>";
 	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search','style'=>($search != '' ? 'display: none;' : null)]);
 	echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'devices.php','style'=>($search == '' ? 'display: none;' : null)]);
 	if ($paging_controls_mini != '') {
@@ -279,6 +338,7 @@
 	echo "<form id='form_list' method='post'>\n";
 	echo "<input type='hidden' id='action' name='action' value=''>\n";
 	echo "<input type='hidden' name='search' value=\"".escape($search)."\">\n";
+	echo "<input type='hidden' name='fields' value=\"".escape($fields)."\">\n";
 
 	echo "<table class='list'>\n";
 	echo "<tr class='list-header'>\n";
diff --git a/app/devices/resources/classes/device.php b/app/devices/resources/classes/device.php
index 3629450c0b..de813176cc 100644
--- a/app/devices/resources/classes/device.php
+++ b/app/devices/resources/classes/device.php
@@ -311,6 +311,12 @@ include "root.php";
 						//build the delete array
 							foreach ($records as $x => $record) {
 								if ($record['checked'] == 'true' && is_uuid($record['uuid'])) {
+									$sql = "update v_devices set device_uuid_alternate = null where device_uuid_alternate = :device_uuid_alternate; ";
+									$parameters['device_uuid_alternate'] = $record['uuid'];
+									$database = new database;
+									$database->execute($sql, $parameters);
+									unset($sql, $parameters);
+
 									$array[$this->table][$x][$this->uuid_prefix.'uuid'] = $record['uuid'];
 									$array['device_settings'][$x]['device_uuid'] = $record['uuid'];
 									$array['device_lines'][$x]['device_uuid'] = $record['uuid'];
diff --git a/app/dialplan_outbound/dialplan_outbound_add.php b/app/dialplan_outbound/dialplan_outbound_add.php
index 58d0864f91..1274d864e8 100644
--- a/app/dialplan_outbound/dialplan_outbound_add.php
+++ b/app/dialplan_outbound/dialplan_outbound_add.php
@@ -392,7 +392,7 @@
 						if (strlen($dialplan_order) == 0) {
 							$dialplan_order ='333';
 						}
-						$dialplan_context = $_SESSION['context'];
+						$dialplan_context = $_SESSION['domain_name'];
 						$dialplan_continue = 'false';
 						$app_uuid = '8c914ec3-9fc0-8ab5-4cda-6c9288bdc9a3';
 
@@ -684,6 +684,11 @@
 				} //end foreach
 			}
 
+		//add the dialplan permission
+			$p = new permissions;
+			$p->add("dialplan_add", "temp");
+			$p->add("dialplan_detail_add", "temp");
+
 		//save to the data
 			$database = new database;
 			$database->app_name = 'outbound_routes';
@@ -699,6 +704,10 @@
 			$dialplans->uuid = $dialplan_uuid;
 			$dialplans->xml();
 
+		//remove the temporary permission
+			$p->delete("dialplan_add", "temp");
+			$p->delete("dialplan_detail_add", "temp");
+
 		//clear the cache
 			$cache = new cache;
 			$cache->delete("dialplan:".$dialplan_context);
@@ -720,12 +729,13 @@
 	$sql = "select * from v_gateways ";
 	$sql .= "where enabled = 'true' ";
 	if (permission_exists('outbound_route_any_gateway')) {
-		$sql .= "order by domain_uuid, gateway ";
+		$sql .= "order by domain_uuid = :domain_uuid DESC, gateway ";
 	}
 	else {
 		$sql .= "and domain_uuid = :domain_uuid ";
-		$parameters['domain_uuid'] = $domain_uuid;
+		
 	}
+	$parameters['domain_uuid'] = $domain_uuid;
 	$database = new database;
 	$gateways = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
@@ -806,50 +816,49 @@ function type_onchange(dialplan_detail_type) {
 	echo "</td>\n";
 	echo "<td width='70%' class='vtable' align='left'>\n";
 
-	if (if_group("superadmin")) {
-		echo "<script>\n";
-		echo "var Objs;\n";
-		echo "\n";
-		echo "function changeToInput(obj){\n";
-		echo "	tb=document.createElement('INPUT');\n";
-		echo "	tb.type='text';\n";
-		echo "	tb.name=obj.name;\n";
-		echo "	tb.setAttribute('class', 'formfld');\n";
-		echo "	tb.setAttribute('style', 'width: 400px;');\n";
-		echo "	tb.value=obj.options[obj.selectedIndex].value;\n";
-		echo "	tbb=document.createElement('INPUT');\n";
-		echo "	tbb.setAttribute('class', 'btn');\n";
-		echo "	tbb.setAttribute('style', 'margin-left: 4px;');\n";
-		echo "	tbb.type='button';\n";
-		echo "	tbb.value=$('<div />').html('&#9665;').text();\n";
-		echo "	tbb.objs=[obj,tb,tbb];\n";
-		echo "	tbb.onclick=function(){ Replace(this.objs); }\n";
-		echo "	obj.parentNode.insertBefore(tb,obj);\n";
-		echo "	obj.parentNode.insertBefore(tbb,obj);\n";
-		echo "	obj.parentNode.removeChild(obj);\n";
-		echo "}\n";
-		echo "\n";
-		echo "function Replace(obj){\n";
-		echo "	obj[2].parentNode.insertBefore(obj[0],obj[2]);\n";
-		echo "	obj[0].parentNode.removeChild(obj[1]);\n";
-		echo "	obj[0].parentNode.removeChild(obj[2]);\n";
-		echo "}\n";
-		echo "function update_dialplan_expression() {\n";
-		echo "	if ( document.getElementById('dialplan_expression_select').value == 'CUSTOM_PREFIX' ) {\n";
-		echo "		document.getElementById('outbound_prefix').value = '';\n";
-		echo "		$('#enter_custom_outbound_prefix_box').slideDown();\n";
-		echo "	} else { \n";
-		echo "		document.getElementById('dialplan_expression').value += document.getElementById('dialplan_expression_select').value + '\\n';\n";
-		echo "		document.getElementById('outbound_prefix').value = '';\n";
-		echo "		$('#enter_custom_outbound_prefix_box').slideUp();\n";
-		echo "	}\n";
-		echo "}\n";
-		echo "function update_outbound_prefix() {\n";
-		echo "	document.getElementById('dialplan_expression').value += '^' + document.getElementById('outbound_prefix').value + '(\\\d*)\$' + '\\n';\n";
-		echo "}\n";
-		echo "</script>\n";
-		echo "\n";
-	}
+	echo "<script>\n";
+	echo "var Objs;\n";
+	echo "\n";
+	echo "function changeToInput(obj){\n";
+	echo "	tb=document.createElement('INPUT');\n";
+	echo "	tb.type='text';\n";
+	echo "	tb.name=obj.name;\n";
+	echo "	tb.setAttribute('class', 'formfld');\n";
+	echo "	tb.setAttribute('style', 'width: 400px;');\n";
+	echo "	tb.value=obj.options[obj.selectedIndex].value;\n";
+	echo "	tbb=document.createElement('INPUT');\n";
+	echo "	tbb.setAttribute('class', 'btn');\n";
+	echo "	tbb.setAttribute('style', 'margin-left: 4px;');\n";
+	echo "	tbb.type='button';\n";
+	echo "	tbb.value=$('<div />').html('&#9665;').text();\n";
+	echo "	tbb.objs=[obj,tb,tbb];\n";
+	echo "	tbb.onclick=function(){ Replace(this.objs); }\n";
+	echo "	obj.parentNode.insertBefore(tb,obj);\n";
+	echo "	obj.parentNode.insertBefore(tbb,obj);\n";
+	echo "	obj.parentNode.removeChild(obj);\n";
+	echo "}\n";
+	echo "\n";
+	echo "function Replace(obj){\n";
+	echo "	obj[2].parentNode.insertBefore(obj[0],obj[2]);\n";
+	echo "	obj[0].parentNode.removeChild(obj[1]);\n";
+	echo "	obj[0].parentNode.removeChild(obj[2]);\n";
+	echo "}\n";
+	echo "function update_dialplan_expression() {\n";
+	echo "	if ( document.getElementById('dialplan_expression_select').value == 'CUSTOM_PREFIX' ) {\n";
+	echo "		document.getElementById('outbound_prefix').value = '';\n";
+	echo "		$('#enter_custom_outbound_prefix_box').slideDown();\n";
+	echo "	} else { \n";
+	echo "		document.getElementById('dialplan_expression').value += document.getElementById('dialplan_expression_select').value + '\\n';\n";
+	echo "		document.getElementById('outbound_prefix').value = '';\n";
+	echo "		$('#enter_custom_outbound_prefix_box').slideUp();\n";
+	echo "	}\n";
+	echo "}\n";
+	echo "function update_outbound_prefix() {\n";
+	echo "	document.getElementById('dialplan_expression').value += '^' + document.getElementById('outbound_prefix').value + '(\\\d*)\$' + '\\n';\n";
+	echo "}\n";
+	echo "</script>\n";
+	echo "\n";
+
 
 	//set the onchange
 	$onchange = '';
diff --git a/app/dialplans/app_config.php b/app/dialplans/app_config.php
index e2eac554ec..9b71212293 100644
--- a/app/dialplans/app_config.php
+++ b/app/dialplans/app_config.php
@@ -226,5 +226,9 @@
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "dialplan_detail_order";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "numeric";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "dialplan_detail_enabled";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "boolean";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 
 ?>
diff --git a/app/dialplans/dialplan_add.php b/app/dialplans/dialplan_add.php
index 57e3f957ea..6076daaf49 100644
--- a/app/dialplans/dialplan_add.php
+++ b/app/dialplans/dialplan_add.php
@@ -80,7 +80,7 @@
 	}
 
 //set the default
-	if (strlen($dialplan_context) == 0) { $dialplan_context = $_SESSION['context']; }
+	if (strlen($dialplan_context) == 0) { $dialplan_context = $_SESSION['domain_name']; }
 
 //add or update data from http post
 	if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
diff --git a/app/dialplans/dialplan_edit.php b/app/dialplans/dialplan_edit.php
index 3fc41d263a..2f9812ae9d 100644
--- a/app/dialplans/dialplan_edit.php
+++ b/app/dialplans/dialplan_edit.php
@@ -232,6 +232,7 @@
 						$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_inline'] = $row["dialplan_detail_inline"];
 						$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_group'] = ($row["dialplan_detail_group"] != '') ? $row["dialplan_detail_group"] : '0';
 						$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_order'] = $row["dialplan_detail_order"];
+						$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_enabled'] = $row["dialplan_detail_enabled"];
 					}
 					$y++;
 				}
@@ -267,8 +268,16 @@
 
 		//clear the cache
 			$cache = new cache;
+			if ($dialplan_context == "\${domain_name}" or $dialplan_context == "global") {
+				$dialplan_context = "*";
+			}
 			$cache->delete("dialplan:".$dialplan_context);
 
+		//clear the destinations session array
+			if (isset($_SESSION['destinations']['array'])) {
+				unset($_SESSION['destinations']['array']);
+			}
+
 		//set the message
 			if ($action == "add") {
 				message::add($text['message-add']);
@@ -315,7 +324,10 @@
 	}
 
 //get the dialplan details in an array
-	$sql = "select * from v_dialplan_details ";
+	$sql = "select ";
+	$sql .= "domain_uuid, dialplan_uuid, dialplan_detail_uuid, dialplan_detail_tag, dialplan_detail_type, dialplan_detail_data, ";
+	$sql .= "dialplan_detail_break, dialplan_detail_inline, dialplan_detail_group, dialplan_detail_order, cast(dialplan_detail_enabled as text) ";
+	$sql .= "from v_dialplan_details ";
 	$sql .= "where dialplan_uuid = :dialplan_uuid ";
 	$sql .= "order by dialplan_detail_group asc, dialplan_detail_order asc";
 	$parameters['dialplan_uuid'] = $dialplan_uuid;
@@ -403,6 +415,8 @@
 					$details[$group][$x]['dialplan_detail_inline'] = '';
 					$details[$group][$x]['dialplan_detail_group'] = $group;
 					$details[$group][$x]['dialplan_detail_order'] = $dialplan_detail_order;
+					$details[$group][$x]['dialplan_detail_enabled'] = 'true';
+					
 			}
 		}
 	//sort the details array by group number
@@ -740,6 +754,7 @@
 					echo "<td class='vncellcol' style='text-align: center;'>".$text['label-inline']."</td>\n";
 					echo "<td class='vncellcolreq' style='text-align: center;'>".$text['label-group']."</td>\n";
 					echo "<td class='vncellcolreq' style='text-align: center;'>".$text['label-order']."</td>\n";
+					echo "<td class='vncellcolreq' style='text-align: center;'>".$text['label-enabled']."</td>\n";
 					if (permission_exists('dialplan_detail_delete')) {
 						echo "<td class='vncellcol edit_delete_checkbox_all' onmouseover=\"swap_display('delete_label_group_".$g."', 'delete_toggle_group_".$g."');\" onmouseout=\"swap_display('delete_label_group_".$g."', 'delete_toggle_group_".$g."');\">\n";
 						echo "	<span id='delete_label_group_".$g."'>".$text['label-delete']."</span>\n";
@@ -760,6 +775,12 @@
 								$dialplan_detail_inline = $row['dialplan_detail_inline'];
 								$dialplan_detail_group = $row['dialplan_detail_group'];
 								$dialplan_detail_order = $row['dialplan_detail_order'];
+								$dialplan_detail_enabled = $row['dialplan_detail_enabled'];
+
+							//default to enabled true
+								if (strlen($dialplan_detail_enabled) == 0) {
+									$dialplan_detail_enabled = 'true';
+								}
 
 							//no border on last row
 								$no_border = ($index == 999) ? "border: none;" : null;
@@ -959,6 +980,17 @@
 								echo "	</select>\n";
 								*/
 								echo "</td>\n";
+							//enabled
+								echo "<td class='vtablerow' style='".$no_border." text-align: center;' onclick=\"label_to_form('label_dialplan_detail_enabled_".$x."','dialplan_detail_enabled_".$x."');\" nowrap='nowrap'>\n";
+								if ($element['hidden']) {
+									echo "	<label id=\"label_dialplan_detail_enabled_".$x."\">".escape($dialplan_detail_enabled)."</label>\n";
+								}
+								echo "	<select id='dialplan_detail_enabled_".$x."' name='dialplan_details[".$x."][dialplan_detail_enabled]' class='formfld' style='width: auto; ".$element['visibility']."'>\n";
+								echo "	<option></option>\n";
+								echo "	<option value='true' ".($dialplan_detail_enabled == "true" ? $selected : null).">".$text['option-true']."</option>\n";
+								echo "	<option value='false' ".($dialplan_detail_enabled == "false" ? $selected : null).">".$text['option-false']."</option>\n";
+								echo "	</select>\n";
+								echo "</td>\n";
 							//tools
 								if (permission_exists('dialplan_detail_delete')) {
 									if (is_uuid($dialplan_detail_uuid)) {
diff --git a/app/dialplans/dialplan_xml.php b/app/dialplans/dialplan_xml.php
index 233561211e..2fea100426 100644
--- a/app/dialplans/dialplan_xml.php
+++ b/app/dialplans/dialplan_xml.php
@@ -92,8 +92,11 @@
 			$database->save($array);
 			unset($array);
 
-			//clear the cache
+		//clear the cache
 			$cache = new cache;
+			if ($dialplan_context == "\${domain_name}" or $dialplan_context == "global") {
+				$dialplan_context = "*";
+			}
 			$cache->delete("dialplan:".$dialplan_context);
 
 		//save the message to a session variable
@@ -320,4 +323,4 @@
 //show the footer
 	require_once "resources/footer.php";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/dialplans/dialplans.php b/app/dialplans/dialplans.php
index 010cf6f179..576f9ec1db 100644
--- a/app/dialplans/dialplans.php
+++ b/app/dialplans/dialplans.php
@@ -148,7 +148,7 @@
 			$sql .= "and app_uuid <> 'c03b422e-13a8-bd1b-e42b-b6b9b4d27ce4' ";
 			$sql .= "and dialplan_context <> 'public' ";
 		//hide outbound routes
-			$sql .= "and app_uuid <> '8c914ec3-9fc0-8ab5-4cda-6c9288bdc9a3' ";
+			//$sql .= "and app_uuid <> '8c914ec3-9fc0-8ab5-4cda-6c9288bdc9a3' ";
 	}
 	else {
 		if ($app_uuid == 'c03b422e-13a8-bd1b-e42b-b6b9b4d27ce4') {
diff --git a/app/dialplans/resources/classes/dialplan.php b/app/dialplans/resources/classes/dialplan.php
index b93c3f6049..8e480d9e91 100644
--- a/app/dialplans/resources/classes/dialplan.php
+++ b/app/dialplans/resources/classes/dialplan.php
@@ -1,3 +1,4 @@
+ 
 <?php
 /*
 	FusionPBX
@@ -118,6 +119,10 @@
 					$database->app_uuid = '742714e5-8cdf-32fd-462c-cbe7e3d655db';
 					$database->save($array);
 					unset($array);
+				//clear the destinations session array
+					if (isset($_SESSION['destinations']['array'])) {
+						unset($_SESSION['destinations']['array']);
+					}
 				//revoke temporary permissions
 					$p->delete('dialplan_add', 'temp');
 			}
@@ -342,6 +347,12 @@
 																	$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_inline'] = null;
 																}
 																$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_group'] = $group;
+																if (isset($row2['@attributes']['enabled'])) {
+																	$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_enabled'] = $row2['@attributes']['enabled'];
+																}
+																else {
+																	$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_enabled'] = 'true';
+																}
 																$y++;
 
 																//increase the order number
@@ -363,6 +374,12 @@
 																	$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_inline'] = null;
 																}
 																$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_group'] = $group;
+																if (isset($row2['@attributes']['enabled'])) {
+																	$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_enabled'] = $row2['@attributes']['enabled'];
+																}
+																else {
+																	$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_enabled'] = 'true';
+																}
 																$y++;
 
 																//increase the order number
@@ -414,6 +431,14 @@
 							$p->delete('dialplan_edit', 'temp');
 							$p->delete('dialplan_detail_add', 'temp');
 							$p->delete('dialplan_detail_edit', 'temp');
+
+						//add dialplan xml when the dialplan_xml is null
+							$this->source = 'details';
+							$this->destination = 'database';
+							$this->context = $domain['domain_name'];
+							$this->is_empty = 'dialplan_xml';
+							$this->xml();
+
 					} //foreach domains
 			}
 
@@ -575,7 +600,7 @@
 							$sql .= "dialplan_order asc ";
 							$database = new database;
 							$results = $database->select($sql, $parameters, 'all');
-							if (is_array($result) && @sizeof($result) != 0) {
+							if (is_array($results) && @sizeof($results) != 0) {
 								foreach ($results as $row) {
 									$dialplans[$row["dialplan_uuid"]] = $row["dialplan_xml"];
 								}
@@ -587,42 +612,43 @@
 					if ($this->source == "details") {
 
 						//get the data using a join between the dialplans and dialplan details tables
-							$sql = "select ";
-							$sql .= "p.domain_uuid, p.dialplan_uuid, p.app_uuid, p.dialplan_context, p.dialplan_name, p.dialplan_number, ";
-							$sql .= "p.dialplan_continue, p.dialplan_order, p.dialplan_enabled, p.dialplan_description, ";
-							$sql .= "s.dialplan_detail_uuid, s.dialplan_detail_tag, s.dialplan_detail_type, s.dialplan_detail_data, ";
-							$sql .= "s.dialplan_detail_break, s.dialplan_detail_inline, s.dialplan_detail_group, s.dialplan_detail_order ";
-							$sql .= "from v_dialplans as p, v_dialplan_details as s ";
-							$sql .= "where p.dialplan_uuid = s.dialplan_uuid ";
+							$sql = "select \n";
+							$sql .= "p.domain_uuid, p.dialplan_uuid, p.app_uuid, p.dialplan_context, p.dialplan_name, p.dialplan_number, \n";
+							$sql .= "p.dialplan_continue, p.dialplan_order, p.dialplan_enabled, p.dialplan_description, \n";
+							$sql .= "s.dialplan_detail_uuid, s.dialplan_detail_tag, s.dialplan_detail_type, s.dialplan_detail_data, \n";
+							$sql .= "s.dialplan_detail_break, s.dialplan_detail_inline, s.dialplan_detail_group, s.dialplan_detail_order, s.dialplan_detail_enabled \n";
+							$sql .= "from v_dialplans as p, v_dialplan_details as s \n";
+							$sql .= "where p.dialplan_uuid = s.dialplan_uuid \n";
 							if ($this->is_empty == "dialplan_xml") {
-								$sql .= "and p.dialplan_xml is null ";
+								$sql .= "and p.dialplan_xml is null \n";
 							}
 							if (isset($this->context)) {
 								if ($this->context == "public" || substr($this->context, 0, 7) == "public@" || substr($this->context, -7) == ".public") {
-									$sql .= "and p.dialplan_context = :dialplan_context ";
+									$sql .= "and p.dialplan_context = :dialplan_context \n";
 								}
 								else {
-									$sql .= "and (p.dialplan_context = :dialplan_context or p.dialplan_context = '\${domain_name}') ";
+									$sql .= "and (p.dialplan_context = :dialplan_context or p.dialplan_context = '\${domain_name}') \n";
 								}
-								$sql .= "and p.dialplan_enabled = 'true' ";
+								$sql .= "and p.dialplan_enabled = 'true' \n";
 								$parameters['dialplan_context'] = $this->context;
 							}
 							if (is_uuid($this->uuid)) {
-								$sql .= "and p.dialplan_uuid = :dialplan_uuid ";
-								$sql .= "and s.dialplan_uuid = :dialplan_uuid ";
+								$sql .= "and p.dialplan_uuid = :dialplan_uuid \n";
+								$sql .= "and s.dialplan_uuid = :dialplan_uuid \n";
 								$parameters['dialplan_uuid'] = $this->uuid;
 							}
-							$sql .= "order by ";
-							$sql .= "p.dialplan_order asc, ";
-							$sql .= "p.dialplan_name asc, ";
-							$sql .= "p.dialplan_uuid asc, ";
-							$sql .= "s.dialplan_detail_group asc, ";
-							$sql .= "case s.dialplan_detail_tag ";
-							$sql .= "when 'condition' then 1 ";
-							$sql .= "when 'action' then 2 ";
-							$sql .= "when 'anti-action' then 3 ";
-							$sql .= "else 100 end, ";
-							$sql .= "s.dialplan_detail_order asc ";
+							$sql .= "and (s.dialplan_detail_enabled = 'true' or s.dialplan_detail_enabled is null) \n";
+							$sql .= "order by \n";
+							$sql .= "p.dialplan_order asc, \n";
+							$sql .= "p.dialplan_name asc, \n";
+							$sql .= "p.dialplan_uuid asc, \n";
+							$sql .= "s.dialplan_detail_group asc, \n";
+							$sql .= "case s.dialplan_detail_tag \n";
+							$sql .= "when 'condition' then 1 \n";
+							$sql .= "when 'action' then 2 \n";
+							$sql .= "when 'anti-action' then 3 \n";
+							$sql .= "else 100 end, \n";
+							$sql .= "s.dialplan_detail_order asc \n";
 							$database = new database;
 							$results = $database->select($sql, $parameters, 'all');
 							unset($sql, $parameters);
@@ -1054,6 +1080,11 @@
 											}
 										}
 
+									//clear the destinations session array
+										if (isset($_SESSION['destinations']['array'])) {
+											unset($_SESSION['destinations']['array']);
+										}
+
 									//set message
 										message::add($text['message-delete'].': '.@sizeof($array[$this->table]));
 
@@ -1209,9 +1240,11 @@
 								}
 								if (is_array($uuids) && @sizeof($uuids) != 0) {
 									$sql = "select ".$this->uuid_prefix."uuid as uuid, ".$this->toggle_field." as toggle, dialplan_context from v_".$this->table." ";
-									$sql .= "where (domain_uuid = :domain_uuid or domain_uuid is null) ";
-									$sql .= "and ".$this->uuid_prefix."uuid in (".implode(', ', $uuids).") ";
-									$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+									$sql .= "where ".$this->uuid_prefix."uuid in (".implode(', ', $uuids).") ";
+									if (!permission_exists('dialplan_all')) {
+										$sql .= "and (domain_uuid = :domain_uuid or domain_uuid is null) ";
+										$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+									}
 									$database = new database;
 									$rows = $database->select($sql, $parameters, 'all');
 									if (is_array($rows) && @sizeof($rows) != 0) {
@@ -1257,6 +1290,11 @@
 											}
 										}
 
+									//clear the destinations session array
+										if (isset($_SESSION['destinations']['array'])) {
+											unset($_SESSION['destinations']['array']);
+										}
+
 									//set message
 										message::add($text['message-toggle']);
 								}
diff --git a/app/dialplans/resources/switch/conf/dialplan/040_call_block.xml b/app/dialplans/resources/switch/conf/dialplan/040_call_block.xml
index 6d144d73bb..a73a790960 100644
--- a/app/dialplans/resources/switch/conf/dialplan/040_call_block.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/040_call_block.xml
@@ -1,6 +1,6 @@
 <context name="{v_context}">
 	<extension name="call_block" number="" continue="true" app_uuid="b1b31930-d0ee-4395-a891-04df94599f1f" enabled="false" order="40">
-		<condition field="${call_direction}" expression="^inbound$" >
+		<condition field="${call_direction}" expression="^(inbound|outbound)$" >
 			<action application="lua" data="app.lua call_block"/>
 		</condition>
 	</extension>
diff --git a/app/dialplans/resources/switch/conf/dialplan/050_user_record.xml b/app/dialplans/resources/switch/conf/dialplan/050_user_record.xml
index 0c3234a51c..cf3c9f8fb7 100644
--- a/app/dialplans/resources/switch/conf/dialplan/050_user_record.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/050_user_record.xml
@@ -41,7 +41,8 @@
 		<condition field="${from_user_record}" expression="^local$" break="never">
 			<action application="set" data="record_session=true" inline="true"/>
 		</condition>
-		<condition field="${record_session}" expression="^true$">
+		<condition field="${record_session}" expression="^true$"/>
+		<condition field="destination_number" expression="^(?:(?!\*).|\*59|\*\*|\*8|\*67|\*69)+$">
 			<action application="set" data="record_path=${recordings_dir}/${domain_name}/archive/${strftime(%Y)}/${strftime(%b)}/${strftime(%d)}" inline="true"/>
 			<action application="set" data="record_name=${uuid}.${record_ext}" inline="true"/>
 			<!--<action application="set" data="record_name=${destination_number}-${caller_id_number}_${strftime(%Y-%m-%d %H:%M)}.${record_ext}" inline="true"/>-->
diff --git a/app/dialplans/resources/switch/conf/dialplan/055_rtp_has_crypto.xml b/app/dialplans/resources/switch/conf/dialplan/055_rtp_has_crypto.xml
new file mode 100644
index 0000000000..b1ec3070f8
--- /dev/null
+++ b/app/dialplans/resources/switch/conf/dialplan/055_rtp_has_crypto.xml
@@ -0,0 +1,8 @@
+<context name="${domain_name}">
+	<extension name="rtp_has_crypto" number="" continue="true" app_uuid="e23d96cc-20db-4fa5-98a0-a75c402fa291" global="true" order="55">
+		<condition field="${rtp_has_crypto}" expression="^(AEAD_AES_256_GCM_8|AEAD_AES_128_GCM_8|AES_CM_256_HMAC_SHA1_80|AES_CM_192_HMAC_SHA1_80|AES_CM_128_HMAC_SHA1_80|AES_CM_256_HMAC_SHA1_32|AES_CM_192_HMAC_SHA1_32|AES_CM_128_HMAC_SHA1_32|AES_CM_128_NULL_AUTH)$">
+			<action application="set" data="rtp_secure_media=optional" inline="true"/>
+			<action application="export" data="rtp_secure_media=optional" inline="true"/>
+		</condition>
+	</extension>
+</context>
diff --git a/app/dialplans/resources/switch/conf/dialplan/080_default_caller_id.xml b/app/dialplans/resources/switch/conf/dialplan/080_default_caller_id.xml
index c110bbad89..3a892a44ed 100644
--- a/app/dialplans/resources/switch/conf/dialplan/080_default_caller_id.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/080_default_caller_id.xml
@@ -1,11 +1,15 @@
 <context name="{v_context}">
 	<extension name="default_caller_id" number="" continue="true" app_uuid="9660e536-976d-47cb-872e-85957c51bd3d" order="80">
-		<condition field="${emergency_caller_id_number}" expression="^$" break="never">
+		<condition field="${emergency_caller_id_name}" expression="^$" break="never">
 			<action application="set" data="emergency_caller_id_name=${default_emergency_caller_id_name}" inline="true"/>
+		</condition>
+		<condition field="${emergency_caller_id_number}" expression="^$" break="never">
 			<action application="set" data="emergency_caller_id_number=${default_emergency_caller_id_number}" inline="true"/>
 		</condition>
-		<condition field="${outbound_caller_id_number}" expression="^$" break="never">
+		<condition field="${outbound_caller_id_name}" expression="^$" break="never">
 			<action application="set" data="outbound_caller_id_name=${default_outbound_caller_id_name}" inline="true"/>
+		</condition>
+		<condition field="${outbound_caller_id_number}" expression="^$" break="never">
 			<action application="set" data="outbound_caller_id_number=${default_outbound_caller_id_number}" inline="true"/>
 		</condition>
 	</extension>
diff --git a/app/dialplans/resources/switch/conf/dialplan/470_valet_park_in.xml b/app/dialplans/resources/switch/conf/dialplan/470_valet_park_in.xml
index e4fef5114b..128ea0074d 100644
--- a/app/dialplans/resources/switch/conf/dialplan/470_valet_park_in.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/470_valet_park_in.xml
@@ -1,7 +1,7 @@
 <context name="{v_context}">
 	<extension name="valet_park_in" number="park+*5900" continue="false" app_uuid="c192ee50-084d-40d8-8d9a-6959369382c8" enabled="false" order="470">
-		<condition field="destination_number" expression="^(park\+)?(\*5900)$">
+		<condition field="destination_number" expression="^(?:(?:park\+\*?)|(?:\*))(5900)$">
 			<action application="valet_park" data="park@${domain_name} auto in 5901 5999"/>
 		</condition>
- </extension>
+	</extension>
 </context>
diff --git a/app/dialplans/resources/switch/conf/dialplan/475_valet_park_out.xml b/app/dialplans/resources/switch/conf/dialplan/475_valet_park_out.xml
index a21095f58c..b51390a82c 100644
--- a/app/dialplans/resources/switch/conf/dialplan/475_valet_park_out.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/475_valet_park_out.xml
@@ -1,8 +1,8 @@
 <context name="{v_context}">
 	<extension name="valet_park_out" number="park+*5901-*5999" continue="false" app_uuid="242130d4-61d6-4daf-9dd1-b139a2b3b166" enabled="false" order="475">
-		<condition field="destination_number" expression="^(park\+)?\*(59[0-9][0-9])$">
+		<condition field="destination_number" expression="^(?:(?:park\+\*?)|(?:\*))(59[0-9][0-9])$">
 			<action application="answer"/>
-			<action application="valet_park" data="park@${domain_name} $2"/>
+			<action application="valet_park" data="park@${domain_name} $1"/>
 		</condition>
- </extension>
+	</extension>
 </context>
diff --git a/app/dialplans/resources/switch/conf/dialplan/500_follow-me-destinations.xml b/app/dialplans/resources/switch/conf/dialplan/500_follow-me-destinations.xml
index 26a9ddfa08..4bb6730aa2 100644
--- a/app/dialplans/resources/switch/conf/dialplan/500_follow-me-destinations.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/500_follow-me-destinations.xml
@@ -2,6 +2,8 @@
 <extension name="follow-me-destinations" continue="false" app_uuid="846bbc43-683b-49e9-b697-c4714b17c528" global="true" order="500">
 	<condition field="${user_exists}" expression="^true$"/>
 	<condition field="${follow_me_enabled}" expression="^true$">
+		<action application="set" data="outbound_caller_id_name=${user_data ${destination_number}@${domain_name} var outbound_caller_id_name}" inline="true" enabled="false"/>
+		<action application="set" data="outbound_caller_id_number=${user_data ${destination_number}@${domain_name} var outbound_caller_id_number}" inline="true" enabled="false"/>
 		<action application="unset" data="call_timeout" inline="true"/>
 		<action application="lua" data="app.lua follow_me"/>
 	</condition>
diff --git a/app/dialplans/resources/switch/conf/dialplan/505_call-forward-all.xml b/app/dialplans/resources/switch/conf/dialplan/505_call-forward-all.xml
index 23d6998112..d509a919a2 100644
--- a/app/dialplans/resources/switch/conf/dialplan/505_call-forward-all.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/505_call-forward-all.xml
@@ -1,9 +1,11 @@
 <context name="${domain_name}">
-  <extension name="call-forward-all" number="" app_uuid="57cf8f1f-9a2e-4996-bd80-d9300249b1ca" global="true" order="505">
-    <condition field="${user_exists}" expression="true"/>
-    <condition field="${forward_all_enabled}" expression="true">
-      <action application="export" data="sip_h_Diversion=&lt;sip:${caller_destination}@${external_sip_ip}:5060&gt;;reason=unconditional"/>
-      <action application="transfer" data="${forward_all_destination} XML ${domain_name}"/>
-    </condition>
-  </extension>
+	<extension name="call-forward-all" number="" app_uuid="57cf8f1f-9a2e-4996-bd80-d9300249b1ca" global="true" order="505">
+	<condition field="${user_exists}" expression="true"/>
+	<condition field="${forward_all_enabled}" expression="true">
+		<action application="export" data="sip_h_Diversion=&lt;sip:${caller_destination}@${external_sip_ip}:5060&gt;;reason=unconditional" inline="true" enabled="true"/>
+		<action application="set" data="outbound_caller_id_name=${user_data ${destination_number}@${domain_name} var outbound_caller_id_name}" inline="true" enabled="false"/>
+		<action application="set" data="outbound_caller_id_number=${user_data ${destination_number}@${domain_name} var outbound_caller_id_number}" inline="true" enabled="false"/>
+		<action application="transfer" data="${forward_all_destination} XML ${domain_name}"/>
+	</condition>
+	</extension>
 </context>
diff --git a/app/email_logs/email_test.php b/app/email_logs/email_test.php
index e5431dc1f6..76187f2e00 100644
--- a/app/email_logs/email_test.php
+++ b/app/email_logs/email_test.php
@@ -35,63 +35,58 @@
 	$text = $language->get();
 
 //send email
-	if (valid_email($_POST['to'])) {
 
-		//validate the token
-			$token = new token;
-			if (!$token->validate('/app/email_logs/email_logs.php')) {
-				//message::add($text['message-invalid_token'],'negative');
-				echo "<script>display_message('".$text['message-invalid_token']."', 'negative');</script>";
-				echo "<center>\n";
-				echo 	$text['message-invalid_token'];
-				echo "	<br><br>\n";
-				echo "	<input type='button' class='btn' style='margin-top: 15px;' value='".$text['button-close']."' onclick=\"$('#test_result_layer').fadeOut(200);\">\n";
-				echo "</center>\n";
-				exit;
+	//validate the token
+		$token = new token;
+		if (!$token->validate('/app/email_logs/email_logs.php')) {
+			//message::add($text['message-invalid_token'],'negative');
+			echo "<script>display_message('".$text['message-invalid_token']."', 'negative');</script>";
+			echo "<center>\n";
+			echo 	$text['message-invalid_token'];
+			echo "	<br><br>\n";
+			echo "	<input type='button' class='btn' style='margin-top: 15px;' value='".$text['button-close']."' onclick=\"$('#test_result_layer').fadeOut(200);\">\n";
+			echo "</center>\n";
+			exit;
+		}
+
+	$recipient = check_str($_POST['to']);
+
+	echo "<b>".$text['header-settings']."</b>\n";
+	echo "<br><br>\n";
+	ksort($_SESSION['email']);
+	foreach ($_SESSION['email'] as $name => $setting) {
+		foreach ($setting as $type => $value) {
+			if ($type == 'uuid') { $uuid = $value; continue; }
+			if ($name == 'smtp_password') { $value = '[REDACTED]'; }
+			if (permission_exists('default_setting_edit')) {
+				echo "<a href='../../core/default_settings/default_setting_edit.php?id=".$uuid."' target='_blank'>".$name.'</a>: '.$value."<br>\n";
 			}
-
-		$recipient = check_str($_POST['to']);
-
-		echo "<b>".$text['header-settings']."</b>\n";
-		echo "<br><br>\n";
-		ksort($_SESSION['email']);
-		foreach ($_SESSION['email'] as $name => $setting) {
-			foreach ($setting as $type => $value) {
-				if ($type == 'uuid') { $uuid = $value; continue; }
-				if ($name == 'smtp_password') { $value = '[REDACTED]'; }
-				if (permission_exists('default_setting_edit')) {
-					echo "<a href='../../core/default_settings/default_setting_edit.php?id=".$uuid."' target='_blank'>".$name.'</a>: '.$value."<br>\n";
-				}
-				else {
-					echo $name.': '.$value."<br>\n";
-				}
+			else {
+				echo $name.': '.$value."<br>\n";
 			}
 		}
-		echo "<br><br>\n";
-
-		echo "<b>".$text['header-connection']."</b>\n";
-		echo "<br><br>\n";
-
-		$eml_body = "<b>Test Message</b><br /><br />\n";
-		$eml_body .= "This message is a test of the SMTP settings configured within your PBX.<br />\n";
-		$eml_body .= "If you received this message, your current SMTP settings are valid.<br /><br />\n";
-
-		ob_start();
-		$sent = !send_email($recipient, 'Test Message', $eml_body, $eml_error, null, null, 3, 3) ? false : true;
-		$response = ob_get_clean();
-
-		echo $response;
-
-		echo "<br><br>\n";
-
-		echo "<b>".$text['header-result']."</b>\n";
-		echo "<br><br>\n";
-		echo $sent ? "Message Sent Successfully<br>Receipient: <a href='mailto:".$recipient."'>".$recipient."</a>" : "Message Failed...<br>".$eml_error;
-
-	}
-	else {
-		echo "Error: Invalid Recipient Address";
 	}
+	echo "<br><br>\n";
+
+	echo "<b>".$text['header-connection']."</b>\n";
+	echo "<br><br>\n";
+
+	$eml_body = "<b>Test Message</b><br /><br />\n";
+	$eml_body .= "This message is a test of the SMTP settings configured within your PBX.<br />\n";
+	$eml_body .= "If you received this message, your current SMTP settings are valid.<br /><br />\n";
+
+	ob_start();
+	$sent = !send_email($recipient, 'Test Message', $eml_body, $eml_error, null, null, 3, 3) ? false : true;
+	$response = ob_get_clean();
+
+	echo $response;
+
+	echo "<br><br>\n";
+
+	echo "<b>".$text['header-result']."</b>\n";
+	echo "<br><br>\n";
+	echo $sent ? "Message Sent Successfully<br>Receipient: <a href='mailto:".$recipient."'>".$recipient."</a>" : "Message Failed...<br>".$eml_error;
+
 
 	echo "<br>\n";
 	echo "<center>\n";
diff --git a/app/email_templates/email_template_edit.php b/app/email_templates/email_template_edit.php
index 1efcb8be4c..0e395deee7 100644
--- a/app/email_templates/email_template_edit.php
+++ b/app/email_templates/email_template_edit.php
@@ -165,6 +165,13 @@
 		unset($sql, $parameters, $row);
 	}
 
+//load editor preferences/defaults
+	$setting_size = $_SESSION["editor"]["font_size"]["text"] != '' ? $_SESSION["editor"]["font_size"]["text"] : '12px';
+	$setting_theme = $_SESSION["editor"]["theme"]["text"] != '' ? $_SESSION["editor"]["theme"]["text"] : 'cobalt';
+	$setting_invisibles = $_SESSION["editor"]["invisibles"]["boolean"] != '' ? $_SESSION["editor"]["invisibles"]["boolean"] : 'false';
+	$setting_indenting = $_SESSION["editor"]["indent_guides"]["boolean"] != '' ? $_SESSION["editor"]["indent_guides"]["boolean"] : 'false';
+	$setting_numbering = $_SESSION["editor"]["line_numbers"]["boolean"] != '' ? $_SESSION["editor"]["line_numbers"]["boolean"] : 'true';
+
 //create token
 	$object = new token;
 	$token = $object->create($_SERVER['PHP_SELF']);
@@ -173,6 +180,69 @@
 	$document['title'] = $text['title-email_template'];
 	require_once "resources/header.php";
 
+	echo "<script language='JavaScript' type='text/javascript'>\n";
+
+	echo "	function toggle_option(opt) {\n";
+	echo "		switch (opt) {\n";
+	echo "			case 'numbering':\n";
+	echo "				toggle_option_do('showLineNumbers');\n";
+	echo "				toggle_option_do('fadeFoldWidgets');\n";
+	echo "				break;\n";
+	echo "			case 'invisibles':\n";
+	echo "				toggle_option_do('showInvisibles');\n";
+	echo "				break;\n";
+	echo "			case 'indenting':\n";
+	echo "				toggle_option_do('displayIndentGuides');\n";
+	echo "				break;\n";
+	echo "		}\n";
+	echo "		focus_editor();\n";
+	echo "	}\n";
+
+	echo "	function toggle_option_do(opt_name) {\n";
+	echo "		var opt_val = editor.getOption(opt_name);\n";
+	echo "		editor.setOption(opt_name, ((opt_val) ? false : true));\n";
+	echo "	}\n";
+
+	echo "	function focus_editor() {\n";
+	echo "		editor.focus();\n";
+	echo "	}\n";
+
+	//copy the value from the editor on submit
+	echo "	function set_value() {\n";
+	echo "		$('#template_body').val(editor.session.getValue());\n";
+	echo "	}\n";
+
+	//load editor value from hidden textarea
+	echo "	function load_value() {\n";
+	echo "		editor.session.setValue($('#template_body').val());";
+	echo "	}\n";
+
+	echo "</script>\n";
+
+	echo "<style>\n";
+
+	echo "	img.control {\n";
+	echo "		cursor: pointer;\n";
+	echo "		width: auto;\n";
+	echo "		height: 23px;\n";
+	echo "		border: none;\n";
+	echo "		opacity: 0.5;\n";
+	echo "		}\n";
+
+	echo "	img.control:hover {\n";
+	echo "		opacity: 1.0;\n";
+	echo "		}\n";
+
+	echo "	div#editor {\n";
+	//echo "	box-shadow: 0 3px 10px #333;\n";
+	echo "		text-align: left;\n";
+	echo "		width: 100%;\n";
+	echo "		height: 600px;\n";
+	echo "		font-size: 12px;\n";
+	echo "		}\n";
+
+	echo "</style>\n";
+
 //show the content
 	echo "<form name='frm' id='frm' method='post'>\n";
 
@@ -180,7 +250,7 @@
 	echo "	<div class='heading'><b>".$text['title-email_template']."</b></div>\n";
 	echo "	<div class='actions'>\n";
 	echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$_SESSION['theme']['button_icon_back'],'id'=>'btn_back','style'=>'margin-right: 15px;','link'=>'email_templates.php']);
-	echo button::create(['type'=>'submit','label'=>$text['button-save'],'icon'=>$_SESSION['theme']['button_icon_save'],'id'=>'btn_save']);
+	echo button::create(['type'=>'button','label'=>$text['button-save'],'icon'=>$_SESSION['theme']['button_icon_save'],'id'=>'btn_save','onclick'=>"set_value(); $('#frm').submit();"]);
 	echo "	</div>\n";
 	echo "	<div style='clear: both;'></div>\n";
 	echo "</div>\n";
@@ -236,7 +306,77 @@
 	echo "	".$text['label-template_body']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' style='position: relative;' align='left'>\n";
-	echo "	<textarea class='formfld' name='template_body' style='min-width: 100%; height: 350px; font-family: monospace;'>".$template_body."</textarea>\n";
+	echo "	<textarea class='formfld' name='template_body' id='template_body' style='display: none;'>".$template_body."</textarea>\n";
+	echo "	<div id='editor'></div>\n";
+	echo "	<table cellpadding='0' cellspacing='0' border='0' style='float: right; padding-top: 5px;'>\n";
+	echo "		<tr>\n";
+	echo "			<td valign='middle' style='padding-left: 6px;'><img src='resources/images/icon_numbering.png' title='Toggle Line Numbers' class='control' onclick=\"toggle_option('numbering');\"></td>\n";
+	echo "			<td valign='middle' style='padding-left: 6px;'><img src='resources/images/icon_invisibles.png' title='Toggle Invisibles' class='control' onclick=\"toggle_option('invisibles');\"></td>\n";
+	echo "			<td valign='middle' style='padding-left: 6px;'><img src='resources/images/icon_indenting.png' title='Toggle Indent Guides' class='control' onclick=\"toggle_option('indenting');\"></td>\n";
+ 	echo "			<td valign='middle' style='padding-left: 6px;'><img src='resources/images/icon_replace.png' title='Show Find/Replace [Ctrl+H]' class='control' onclick=\"editor.execCommand('replace');\"></td>\n";
+	echo "			<td valign='middle' style='padding-left: 6px;'><img src='resources/images/icon_goto.png' title='Show Go To Line' class='control' onclick=\"editor.execCommand('gotoline');\"></td>\n";
+	echo "			<td valign='middle' style='padding-left: 4px;'>\n";
+	echo "				<select id='size' class='formfld' onchange=\"document.getElementById('editor').style.fontSize = this.options[this.selectedIndex].value; focus_editor();\">\n";
+	$sizes = explode(',','9px,10px,11px,12px,14px,16px,18px,20px');
+	if (!in_array($setting_size, $sizes)) {
+		echo "				<option value='".$setting_size."'>".escape($setting_size)."</option>\n";
+		echo "				<option value='' disabled='disabled'></option>\n";
+	}
+	foreach ($sizes as $size) {
+		$selected = $size == $setting_size ? 'selected' : null;
+		echo "				<option value='".$size."' ".$selected.">".escape($size)."</option>\n";
+	}
+	echo "				</select>\n";
+	echo "			</td>\n";
+	echo "			<td valign='middle' style='padding-left: 4px; padding-right: 0px;'>\n";
+	echo "				<select id='theme' class='formfld' onchange=\"editor.setTheme('ace/theme/' + this.options[this.selectedIndex].value); focus_editor();\">\n";
+	$themes['Light']['chrome']= 'Chrome';
+	$themes['Light']['clouds']= 'Clouds';
+	$themes['Light']['crimson_editor']= 'Crimson Editor';
+	$themes['Light']['dawn']= 'Dawn';
+	$themes['Light']['dreamweaver']= 'Dreamweaver';
+	$themes['Light']['eclipse']= 'Eclipse';
+	$themes['Light']['github']= 'GitHub';
+	$themes['Light']['iplastic']= 'IPlastic';
+	$themes['Light']['solarized_light']= 'Solarized Light';
+	$themes['Light']['textmate']= 'TextMate';
+	$themes['Light']['tomorrow']= 'Tomorrow';
+	$themes['Light']['xcode']= 'XCode';
+	$themes['Light']['kuroir']= 'Kuroir';
+	$themes['Light']['katzenmilch']= 'KatzenMilch';
+	$themes['Light']['sqlserver']= 'SQL Server';
+	$themes['Dark']['ambiance']= 'Ambiance';
+	$themes['Dark']['chaos']= 'Chaos';
+	$themes['Dark']['clouds_midnight']= 'Clouds Midnight';
+	$themes['Dark']['cobalt']= 'Cobalt';
+	$themes['Dark']['idle_fingers']= 'idle Fingers';
+	$themes['Dark']['kr_theme']= 'krTheme';
+	$themes['Dark']['merbivore']= 'Merbivore';
+	$themes['Dark']['merbivore_soft']= 'Merbivore Soft';
+	$themes['Dark']['mono_industrial']= 'Mono Industrial';
+	$themes['Dark']['monokai']= 'Monokai';
+	$themes['Dark']['pastel_on_dark']= 'Pastel on dark';
+	$themes['Dark']['solarized_dark']= 'Solarized Dark';
+	$themes['Dark']['terminal']= 'Terminal';
+	$themes['Dark']['tomorrow_night']= 'Tomorrow Night';
+	$themes['Dark']['tomorrow_night_blue']= 'Tomorrow Night Blue';
+	$themes['Dark']['tomorrow_night_bright']= 'Tomorrow Night Bright';
+	$themes['Dark']['tomorrow_night_eighties']= 'Tomorrow Night 80s';
+	$themes['Dark']['twilight']= 'Twilight';
+	$themes['Dark']['vibrant_ink']= 'Vibrant Ink';
+	foreach ($themes as $optgroup => $theme) {
+		echo "<optgroup label='".$optgroup."'>\n";
+		foreach ($theme as $value => $label) {
+			$selected = strtolower($label) == strtolower($setting_theme) ? 'selected' : null;
+			echo "<option value='".$value."' ".$selected.">".escape($label)."</option>\n";
+		}
+		echo "</optgroup>\n";
+	}
+
+	echo "				</select>\n";
+	echo "			</td>\n";
+	echo "		</tr>\n";
+	echo "	</table>\n";
 	echo "<br />\n";
 	echo $text['description-template_body']."\n";
 	echo "</td>\n";
@@ -327,6 +467,39 @@
 
 	echo "</form>";
 
+	echo "<script type='text/javascript' src='".PROJECT_PATH."/resources/ace/ace.js' charset='utf-8'></script>\n";
+	echo "<script type='text/javascript'>\n";
+
+	//load editor
+		echo "	var editor = ace.edit('editor');\n";
+		echo "	editor.setOptions({\n";
+		echo "		mode: 'ace/mode/html',\n";
+		echo "		theme: 'ace/theme/'+document.getElementById('theme').options[document.getElementById('theme').selectedIndex].value,\n";
+		echo "		selectionStyle: 'text',\n";
+		echo "		cursorStyle: 'smooth',\n";
+		echo "		showInvisibles: ".$setting_invisibles.",\n";
+		echo "		displayIndentGuides: ".$setting_indenting.",\n";
+		echo "		showLineNumbers: ".$setting_numbering.",\n";
+		echo "		showGutter: true,\n";
+		echo "		scrollPastEnd: true,\n";
+		echo "		fadeFoldWidgets: ".$setting_numbering.",\n";
+		echo "		showPrintMargin: false,\n";
+		echo "		highlightGutterLine: false,\n";
+		echo "		useSoftTabs: false\n";
+		echo "		});\n";
+		echo "	document.getElementById('editor').style.fontSize='".$setting_size."';\n";
+		echo "	focus_editor();\n";
+
+	//load value into editor
+		echo "	load_value();\n";
+
+	//remove certain keyboard shortcuts
+		echo "	editor.commands.bindKey('Ctrl-T', null);\n"; //disable transpose letters - prefer new browser tab
+		echo "	editor.commands.bindKey('Ctrl-F', null);\n"; //disable find - control broken with bootstrap
+		echo "	editor.commands.bindKey('Ctrl-H', null);\n"; //disable replace - control broken with bootstrap
+
+	echo "</script>\n";
+
 //include the footer
 	require_once "resources/footer.php";
 
diff --git a/app/email_templates/resources/images/icon_file.png b/app/email_templates/resources/images/icon_file.png
new file mode 100644
index 0000000000..c8d71de0c4
Binary files /dev/null and b/app/email_templates/resources/images/icon_file.png differ
diff --git a/app/email_templates/resources/images/icon_folder.png b/app/email_templates/resources/images/icon_folder.png
new file mode 100644
index 0000000000..7efc21fe2e
Binary files /dev/null and b/app/email_templates/resources/images/icon_folder.png differ
diff --git a/app/email_templates/resources/images/icon_gear.png b/app/email_templates/resources/images/icon_gear.png
new file mode 100644
index 0000000000..0fde59125d
Binary files /dev/null and b/app/email_templates/resources/images/icon_gear.png differ
diff --git a/app/email_templates/resources/images/icon_goto.png b/app/email_templates/resources/images/icon_goto.png
new file mode 100644
index 0000000000..89f5d28531
Binary files /dev/null and b/app/email_templates/resources/images/icon_goto.png differ
diff --git a/app/email_templates/resources/images/icon_indenting.png b/app/email_templates/resources/images/icon_indenting.png
new file mode 100644
index 0000000000..c6d4c733f1
Binary files /dev/null and b/app/email_templates/resources/images/icon_indenting.png differ
diff --git a/app/email_templates/resources/images/icon_invisibles.png b/app/email_templates/resources/images/icon_invisibles.png
new file mode 100644
index 0000000000..9e2973bb6e
Binary files /dev/null and b/app/email_templates/resources/images/icon_invisibles.png differ
diff --git a/app/email_templates/resources/images/icon_numbering.png b/app/email_templates/resources/images/icon_numbering.png
new file mode 100644
index 0000000000..305144c8d4
Binary files /dev/null and b/app/email_templates/resources/images/icon_numbering.png differ
diff --git a/app/email_templates/resources/images/icon_replace.png b/app/email_templates/resources/images/icon_replace.png
new file mode 100644
index 0000000000..4b2ec21788
Binary files /dev/null and b/app/email_templates/resources/images/icon_replace.png differ
diff --git a/app/errors/app_config.php b/app/errors/app_config.php
index 9382292f0d..928fe43483 100644
--- a/app/errors/app_config.php
+++ b/app/errors/app_config.php
@@ -46,4 +46,5 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Path to web server error log file.";
 		$y++;
-?>
+
+?>
\ No newline at end of file
diff --git a/app/errors/app_languages.php b/app/errors/app_languages.php
index f3e6f204c6..aed6e8ef69 100644
--- a/app/errors/app_languages.php
+++ b/app/errors/app_languages.php
@@ -295,4 +295,4 @@ $text['error-open_file']['ru-ru'] = "Невозможно открыть фай
 $text['error-open_file']['sv-se'] = "Kan inte öppna fil!";
 $text['error-open_file']['uk-ua'] = "Неможливо відкрити файл!";
 
-?>
+?>
\ No newline at end of file
diff --git a/app/errors/app_menu.php b/app/errors/app_menu.php
index e8aab7123f..c475a2758c 100644
--- a/app/errors/app_menu.php
+++ b/app/errors/app_menu.php
@@ -26,4 +26,4 @@
 	$apps[$x]['menu'][$y]['path'] = "/app/errors/errors.php";
 	$apps[$x]['menu'][$y]['groups'][] = "superadmin";
 
-?>
+?>
\ No newline at end of file
diff --git a/app/extension_settings/app_config.php b/app/extension_settings/app_config.php
new file mode 100755
index 0000000000..f73635a368
--- /dev/null
+++ b/app/extension_settings/app_config.php
@@ -0,0 +1,87 @@
+<?php
+
+	//application details
+		$apps[$x]['name'] = 'Extension Settings';
+		$apps[$x]['uuid'] = '1416a250-f6e1-4edc-91a6-5c9b883638fd';
+		$apps[$x]['category'] = '';
+		$apps[$x]['subcategory'] = '';
+		$apps[$x]['version'] = '';
+		$apps[$x]['license'] = 'Mozilla Public License 1.1';
+		$apps[$x]['url'] = 'http://www.fusionpbx.com';
+		$apps[$x]['description']['en-us'] = '';
+
+	//permission details
+		$y = 0;
+		$apps[$x]['permissions'][$y]['name'] = 'extension_setting_view';
+		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = 'extension_setting_add';
+		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = 'extension_setting_edit';
+		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = 'extension_setting_delete';
+		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = 'extension_setting_all';
+		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$y++;
+
+	//Extension Settings
+		$y = 0;
+		$apps[$x]['db'][$y]['table']['name'] = 'v_extension_settings';
+		$apps[$x]['db'][$y]['table']['parent'] = '';
+		$z = 0;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'extension_setting_uuid';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
+		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'primary';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'domain_uuid';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
+		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'foreign';
+		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = 'v_domains';
+		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = 'domain_uuid';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'extension_uuid';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
+		$apps[$x]['db'][$y]['fields'][$z]['search_by'] = 'false';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = '';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'extension_setting_type';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['search_by'] = 'true';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the extension subcategory.';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'extension_setting_name';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['search_by'] = 'true';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the extension name.';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'extension_setting_value';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['search_by'] = 'false';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the extension value.';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'extension_setting_enabled';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'boolean';
+		$apps[$x]['db'][$y]['fields'][$z]['toggle'] = ['true','false'];
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the extension enabled.';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'extension_setting_description';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['search_by'] = 'true';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the extension description.';
+		$z++;
+
+?>
\ No newline at end of file
diff --git a/app/extension_settings/app_defaults.php b/app/extension_settings/app_defaults.php
new file mode 100755
index 0000000000..adadacce42
--- /dev/null
+++ b/app/extension_settings/app_defaults.php
@@ -0,0 +1,7 @@
+<?php
+
+if ($domains_processed == 1) {
+
+}
+
+?>
diff --git a/app/extension_settings/app_languages.php b/app/extension_settings/app_languages.php
new file mode 100755
index 0000000000..24625e19ea
--- /dev/null
+++ b/app/extension_settings/app_languages.php
@@ -0,0 +1,302 @@
+<?php
+
+	//Extension Settings
+		$text['title-extension_settings']['en-us'] = 'Extension Settings';
+		$text['title-extension_settings']['ar-eg'] = '';
+		$text['title-extension_settings']['de-at'] = '';
+		$text['title-extension_settings']['de-ch'] = '';
+		$text['title-extension_settings']['de-de'] = '';
+		$text['title-extension_settings']['es-cl'] = '';
+		$text['title-extension_settings']['es-mx'] = '';
+		$text['title-extension_settings']['fr-ca'] = '';
+		$text['title-extension_settings']['fr-fr'] = '';
+		$text['title-extension_settings']['he-il'] = '';
+		$text['title-extension_settings']['it-it'] = '';
+		$text['title-extension_settings']['nl-nl'] = '';
+		$text['title-extension_settings']['pl-pl'] = '';
+		$text['title-extension_settings']['pt-br'] = '';
+		$text['title-extension_settings']['pt-pt'] = '';
+		$text['title-extension_settings']['ro-ro'] = '';
+		$text['title-extension_settings']['ru-ru'] = '';
+		$text['title-extension_settings']['sv-se'] = '';
+		$text['title-extension_settings']['uk-ua'] = '';
+
+		$text['title-extension_setting']['en-us'] = 'Extension Setting';
+		$text['title-extension_setting']['ar-eg'] = '';
+		$text['title-extension_setting']['de-at'] = '';
+		$text['title-extension_setting']['de-ch'] = '';
+		$text['title-extension_setting']['de-de'] = '';
+		$text['title-extension_setting']['es-cl'] = '';
+		$text['title-extension_setting']['es-mx'] = '';
+		$text['title-extension_setting']['fr-ca'] = '';
+		$text['title-extension_setting']['fr-fr'] = '';
+		$text['title-extension_setting']['he-il'] = '';
+		$text['title-extension_setting']['it-it'] = '';
+		$text['title-extension_setting']['nl-nl'] = '';
+		$text['title-extension_setting']['pl-pl'] = '';
+		$text['title-extension_setting']['pt-br'] = '';
+		$text['title-extension_setting']['pt-pt'] = '';
+		$text['title-extension_setting']['ro-ro'] = '';
+		$text['title-extension_setting']['ru-ru'] = '';
+		$text['title-extension_setting']['sv-se'] = '';
+		$text['title-extension_setting']['uk-ua'] = '';
+
+		$text['title_description-extension_settings']['en-us'] = 'Assign variables and parameters to this extension.';
+		$text['title_description-extension_settings']['ar-eg'] = '';
+		$text['title_description-extension_settings']['de-at'] = '';
+		$text['title_description-extension_settings']['de-ch'] = '';
+		$text['title_description-extension_settings']['de-de'] = '';
+		$text['title_description-extension_settings']['es-cl'] = '';
+		$text['title_description-extension_settings']['es-mx'] = '';
+		$text['title_description-extension_settings']['fr-ca'] = '';
+		$text['title_description-extension_settings']['fr-fr'] = '';
+		$text['title_description-extension_settings']['he-il'] = '';
+		$text['title_description-extension_settings']['it-it'] = '';
+		$text['title_description-extension_settings']['nl-nl'] = '';
+		$text['title_description-extension_settings']['pl-pl'] = '';
+		$text['title_description-extension_settings']['pt-br'] = '';
+		$text['title_description-extension_settings']['pt-pt'] = '';
+		$text['title_description-extension_settings']['ro-ro'] = '';
+		$text['title_description-extension_settings']['ru-ru'] = '';
+		$text['title_description-extension_settings']['sv-se'] = '';
+		$text['title_description-extension_settings']['uk-ua'] = '';
+
+		$text['label-extension_setting_type']['en-us'] = 'Type';
+		$text['label-extension_setting_type']['ar-eg'] = '';
+		$text['label-extension_setting_type']['de-at'] = '';
+		$text['label-extension_setting_type']['de-ch'] = '';
+		$text['label-extension_setting_type']['de-de'] = '';
+		$text['label-extension_setting_type']['es-cl'] = '';
+		$text['label-extension_setting_type']['es-mx'] = '';
+		$text['label-extension_setting_type']['fr-ca'] = '';
+		$text['label-extension_setting_type']['fr-fr'] = '';
+		$text['label-extension_setting_type']['he-il'] = '';
+		$text['label-extension_setting_type']['it-it'] = '';
+		$text['label-extension_setting_type']['nl-nl'] = '';
+		$text['label-extension_setting_type']['pl-pl'] = '';
+		$text['label-extension_setting_type']['pt-br'] = '';
+		$text['label-extension_setting_type']['pt-pt'] = '';
+		$text['label-extension_setting_type']['ro-ro'] = '';
+		$text['label-extension_setting_type']['ru-ru'] = '';
+		$text['label-extension_setting_type']['sv-se'] = '';
+		$text['label-extension_setting_type']['uk-ua'] = '';
+
+		$text['description-extension_setting_type']['en-us'] = 'Enter the extension subcategory.';
+		$text['description-extension_setting_type']['ar-eg'] = '';
+		$text['description-extension_setting_type']['de-at'] = '';
+		$text['description-extension_setting_type']['de-ch'] = '';
+		$text['description-extension_setting_type']['de-de'] = '';
+		$text['description-extension_setting_type']['es-cl'] = '';
+		$text['description-extension_setting_type']['es-mx'] = '';
+		$text['description-extension_setting_type']['fr-ca'] = '';
+		$text['description-extension_setting_type']['fr-fr'] = '';
+		$text['description-extension_setting_type']['he-il'] = '';
+		$text['description-extension_setting_type']['it-it'] = '';
+		$text['description-extension_setting_type']['nl-nl'] = '';
+		$text['description-extension_setting_type']['pl-pl'] = '';
+		$text['description-extension_setting_type']['pt-br'] = '';
+		$text['description-extension_setting_type']['pt-pt'] = '';
+		$text['description-extension_setting_type']['ro-ro'] = '';
+		$text['description-extension_setting_type']['ru-ru'] = '';
+		$text['description-extension_setting_type']['sv-se'] = '';
+		$text['description-extension_setting_type']['uk-ua'] = '';
+
+		$text['label-param']['en-us'] = 'param';
+		$text['label-param']['ar-eg'] = '';
+		$text['label-param']['de-at'] = '';
+		$text['label-param']['de-ch'] = '';
+		$text['label-param']['de-de'] = '';
+		$text['label-param']['es-mx'] = '';
+		$text['label-param']['fr-ca'] = '';
+		$text['label-param']['fr-fr'] = '';
+		$text['label-param']['he-il'] = '';
+		$text['label-param']['it-it'] = '';
+		$text['label-param']['nl-nl'] = '';
+		$text['label-param']['pl-pl'] = '';
+		$text['label-param']['pt-br'] = '';
+		$text['label-param']['pt-pt'] = '';
+		$text['label-param']['ro-ro'] = '';
+		$text['label-param']['ru-ru'] = '';
+		$text['label-param']['sv-se'] = '';
+		$text['label-param']['uk-ua'] = '';
+
+		$text['label-variable']['en-us'] = 'variable';
+		$text['label-variable']['ar-eg'] = '';
+		$text['label-variable']['de-at'] = '';
+		$text['label-variable']['de-ch'] = '';
+		$text['label-variable']['de-de'] = '';
+		$text['label-variable']['es-mx'] = '';
+		$text['label-variable']['fr-ca'] = '';
+		$text['label-variable']['fr-fr'] = '';
+		$text['label-variable']['he-il'] = '';
+		$text['label-variable']['it-it'] = '';
+		$text['label-variable']['nl-nl'] = '';
+		$text['label-variable']['pl-pl'] = '';
+		$text['label-variable']['pt-br'] = '';
+		$text['label-variable']['pt-pt'] = '';
+		$text['label-variable']['ro-ro'] = '';
+		$text['label-variable']['ru-ru'] = '';
+		$text['label-variable']['sv-se'] = '';
+		$text['label-variable']['uk-ua'] = '';
+
+		$text['label-extension_setting_name']['en-us'] = 'Name';
+		$text['label-extension_setting_name']['ar-eg'] = '';
+		$text['label-extension_setting_name']['de-at'] = '';
+		$text['label-extension_setting_name']['de-ch'] = '';
+		$text['label-extension_setting_name']['de-de'] = '';
+		$text['label-extension_setting_name']['es-cl'] = '';
+		$text['label-extension_setting_name']['es-mx'] = '';
+		$text['label-extension_setting_name']['fr-ca'] = '';
+		$text['label-extension_setting_name']['fr-fr'] = '';
+		$text['label-extension_setting_name']['he-il'] = '';
+		$text['label-extension_setting_name']['it-it'] = '';
+		$text['label-extension_setting_name']['nl-nl'] = '';
+		$text['label-extension_setting_name']['pl-pl'] = '';
+		$text['label-extension_setting_name']['pt-br'] = '';
+		$text['label-extension_setting_name']['pt-pt'] = '';
+		$text['label-extension_setting_name']['ro-ro'] = '';
+		$text['label-extension_setting_name']['ru-ru'] = '';
+		$text['label-extension_setting_name']['sv-se'] = '';
+		$text['label-extension_setting_name']['uk-ua'] = '';
+
+		$text['description-extension_setting_name']['en-us'] = 'Enter the extension name.';
+		$text['description-extension_setting_name']['ar-eg'] = '';
+		$text['description-extension_setting_name']['de-at'] = '';
+		$text['description-extension_setting_name']['de-ch'] = '';
+		$text['description-extension_setting_name']['de-de'] = '';
+		$text['description-extension_setting_name']['es-cl'] = '';
+		$text['description-extension_setting_name']['es-mx'] = '';
+		$text['description-extension_setting_name']['fr-ca'] = '';
+		$text['description-extension_setting_name']['fr-fr'] = '';
+		$text['description-extension_setting_name']['he-il'] = '';
+		$text['description-extension_setting_name']['it-it'] = '';
+		$text['description-extension_setting_name']['nl-nl'] = '';
+		$text['description-extension_setting_name']['pl-pl'] = '';
+		$text['description-extension_setting_name']['pt-br'] = '';
+		$text['description-extension_setting_name']['pt-pt'] = '';
+		$text['description-extension_setting_name']['ro-ro'] = '';
+		$text['description-extension_setting_name']['ru-ru'] = '';
+		$text['description-extension_setting_name']['sv-se'] = '';
+		$text['description-extension_setting_name']['uk-ua'] = '';
+
+		$text['label-extension_setting_value']['en-us'] = 'Value';
+		$text['label-extension_setting_value']['ar-eg'] = '';
+		$text['label-extension_setting_value']['de-at'] = '';
+		$text['label-extension_setting_value']['de-ch'] = '';
+		$text['label-extension_setting_value']['de-de'] = '';
+		$text['label-extension_setting_value']['es-cl'] = '';
+		$text['label-extension_setting_value']['es-mx'] = '';
+		$text['label-extension_setting_value']['fr-ca'] = '';
+		$text['label-extension_setting_value']['fr-fr'] = '';
+		$text['label-extension_setting_value']['he-il'] = '';
+		$text['label-extension_setting_value']['it-it'] = '';
+		$text['label-extension_setting_value']['nl-nl'] = '';
+		$text['label-extension_setting_value']['pl-pl'] = '';
+		$text['label-extension_setting_value']['pt-br'] = '';
+		$text['label-extension_setting_value']['pt-pt'] = '';
+		$text['label-extension_setting_value']['ro-ro'] = '';
+		$text['label-extension_setting_value']['ru-ru'] = '';
+		$text['label-extension_setting_value']['sv-se'] = '';
+		$text['label-extension_setting_value']['uk-ua'] = '';
+
+		$text['description-extension_setting_value']['en-us'] = 'Enter the extension value.';
+		$text['description-extension_setting_value']['ar-eg'] = '';
+		$text['description-extension_setting_value']['de-at'] = '';
+		$text['description-extension_setting_value']['de-ch'] = '';
+		$text['description-extension_setting_value']['de-de'] = '';
+		$text['description-extension_setting_value']['es-cl'] = '';
+		$text['description-extension_setting_value']['es-mx'] = '';
+		$text['description-extension_setting_value']['fr-ca'] = '';
+		$text['description-extension_setting_value']['fr-fr'] = '';
+		$text['description-extension_setting_value']['he-il'] = '';
+		$text['description-extension_setting_value']['it-it'] = '';
+		$text['description-extension_setting_value']['nl-nl'] = '';
+		$text['description-extension_setting_value']['pl-pl'] = '';
+		$text['description-extension_setting_value']['pt-br'] = '';
+		$text['description-extension_setting_value']['pt-pt'] = '';
+		$text['description-extension_setting_value']['ro-ro'] = '';
+		$text['description-extension_setting_value']['ru-ru'] = '';
+		$text['description-extension_setting_value']['sv-se'] = '';
+		$text['description-extension_setting_value']['uk-ua'] = '';
+
+		$text['label-extension_setting_enabled']['en-us'] = 'Enabled';
+		$text['label-extension_setting_enabled']['ar-eg'] = '';
+		$text['label-extension_setting_enabled']['de-at'] = '';
+		$text['label-extension_setting_enabled']['de-ch'] = '';
+		$text['label-extension_setting_enabled']['de-de'] = '';
+		$text['label-extension_setting_enabled']['es-cl'] = '';
+		$text['label-extension_setting_enabled']['es-mx'] = '';
+		$text['label-extension_setting_enabled']['fr-ca'] = '';
+		$text['label-extension_setting_enabled']['fr-fr'] = '';
+		$text['label-extension_setting_enabled']['he-il'] = '';
+		$text['label-extension_setting_enabled']['it-it'] = '';
+		$text['label-extension_setting_enabled']['nl-nl'] = '';
+		$text['label-extension_setting_enabled']['pl-pl'] = '';
+		$text['label-extension_setting_enabled']['pt-br'] = '';
+		$text['label-extension_setting_enabled']['pt-pt'] = '';
+		$text['label-extension_setting_enabled']['ro-ro'] = '';
+		$text['label-extension_setting_enabled']['ru-ru'] = '';
+		$text['label-extension_setting_enabled']['sv-se'] = '';
+		$text['label-extension_setting_enabled']['uk-ua'] = '';
+
+		$text['description-extension_setting_enabled']['en-us'] = 'Enter the extension enabled.';
+		$text['description-extension_setting_enabled']['ar-eg'] = '';
+		$text['description-extension_setting_enabled']['de-at'] = '';
+		$text['description-extension_setting_enabled']['de-ch'] = '';
+		$text['description-extension_setting_enabled']['de-de'] = '';
+		$text['description-extension_setting_enabled']['es-cl'] = '';
+		$text['description-extension_setting_enabled']['es-mx'] = '';
+		$text['description-extension_setting_enabled']['fr-ca'] = '';
+		$text['description-extension_setting_enabled']['fr-fr'] = '';
+		$text['description-extension_setting_enabled']['he-il'] = '';
+		$text['description-extension_setting_enabled']['it-it'] = '';
+		$text['description-extension_setting_enabled']['nl-nl'] = '';
+		$text['description-extension_setting_enabled']['pl-pl'] = '';
+		$text['description-extension_setting_enabled']['pt-br'] = '';
+		$text['description-extension_setting_enabled']['pt-pt'] = '';
+		$text['description-extension_setting_enabled']['ro-ro'] = '';
+		$text['description-extension_setting_enabled']['ru-ru'] = '';
+		$text['description-extension_setting_enabled']['sv-se'] = '';
+		$text['description-extension_setting_enabled']['uk-ua'] = '';
+
+		$text['label-extension_setting_description']['en-us'] = 'Description';
+		$text['label-extension_setting_description']['ar-eg'] = '';
+		$text['label-extension_setting_description']['de-at'] = '';
+		$text['label-extension_setting_description']['de-ch'] = '';
+		$text['label-extension_setting_description']['de-de'] = '';
+		$text['label-extension_setting_description']['es-cl'] = '';
+		$text['label-extension_setting_description']['es-mx'] = '';
+		$text['label-extension_setting_description']['fr-ca'] = '';
+		$text['label-extension_setting_description']['fr-fr'] = '';
+		$text['label-extension_setting_description']['he-il'] = '';
+		$text['label-extension_setting_description']['it-it'] = '';
+		$text['label-extension_setting_description']['nl-nl'] = '';
+		$text['label-extension_setting_description']['pl-pl'] = '';
+		$text['label-extension_setting_description']['pt-br'] = '';
+		$text['label-extension_setting_description']['pt-pt'] = '';
+		$text['label-extension_setting_description']['ro-ro'] = '';
+		$text['label-extension_setting_description']['ru-ru'] = '';
+		$text['label-extension_setting_description']['sv-se'] = '';
+		$text['label-extension_setting_description']['uk-ua'] = '';
+
+		$text['description-extension_setting_description']['en-us'] = 'Enter the extension description.';
+		$text['description-extension_setting_description']['ar-eg'] = '';
+		$text['description-extension_setting_description']['de-at'] = '';
+		$text['description-extension_setting_description']['de-ch'] = '';
+		$text['description-extension_setting_description']['de-de'] = '';
+		$text['description-extension_setting_description']['es-cl'] = '';
+		$text['description-extension_setting_description']['es-mx'] = '';
+		$text['description-extension_setting_description']['fr-ca'] = '';
+		$text['description-extension_setting_description']['fr-fr'] = '';
+		$text['description-extension_setting_description']['he-il'] = '';
+		$text['description-extension_setting_description']['it-it'] = '';
+		$text['description-extension_setting_description']['nl-nl'] = '';
+		$text['description-extension_setting_description']['pl-pl'] = '';
+		$text['description-extension_setting_description']['pt-br'] = '';
+		$text['description-extension_setting_description']['pt-pt'] = '';
+		$text['description-extension_setting_description']['ro-ro'] = '';
+		$text['description-extension_setting_description']['ru-ru'] = '';
+		$text['description-extension_setting_description']['sv-se'] = '';
+		$text['description-extension_setting_description']['uk-ua'] = '';
+
+?>
\ No newline at end of file
diff --git a/app/extension_settings/extension_setting_edit.php b/app/extension_settings/extension_setting_edit.php
new file mode 100755
index 0000000000..6254870e53
--- /dev/null
+++ b/app/extension_settings/extension_setting_edit.php
@@ -0,0 +1,375 @@
+<?php
+/*
+	FusionPBX
+	Version: MPL 1.1
+
+	The contents of this file are subject to the Mozilla Public License Version
+	1.1 (the "License"); you may not use this file except in compliance with
+	the License. You may obtain a copy of the License at
+	http://www.mozilla.org/MPL/
+
+	Software distributed under the License is distributed on an "AS IS" basis,
+	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+	for the specific language governing rights and limitations under the
+	License.
+
+	The Original Code is FusionPBX
+
+	The Initial Developer of the Original Code is
+	Mark J Crane <markjcrane@fusionpbx.com>
+	Portions created by the Initial Developer are Copyright (C) 2021
+	the Initial Developer. All Rights Reserved.
+*/
+
+//includes
+	require_once "root.php";
+	require_once "resources/require.php";
+	require_once "resources/check_auth.php";
+
+//check permissions
+	if (permission_exists('extension_setting_add') || permission_exists('extension_setting_edit')) {
+		//access granted
+	}
+	else {
+		echo "access denied";
+		exit;
+	}
+
+//add multi-lingual support
+	$language = new text;
+	$text = $language->get();
+
+//action add or update
+	if (is_uuid($_REQUEST["id"])) {
+		$action = "update";
+		$extension_setting_uuid = $_REQUEST["id"];
+		$id = $_REQUEST["id"];
+	}
+	else {
+		$action = "add";
+	}
+
+//get the extension id
+	if (is_uuid($_REQUEST["extension_setting_uuid"])) {
+		$extension_setting_uuid = $_REQUEST["extension_setting_uuid"];
+	}
+	if (is_uuid($_REQUEST["extension_uuid"])) {
+		$extension_uuid = $_REQUEST["extension_uuid"];
+	}
+
+//get http post variables and set them to php variables
+	if (is_array($_POST)) {
+		$domain_uuid = $_POST["domain_uuid"];
+		$extension_setting_type = $_POST["extension_setting_type"];
+		$extension_setting_name = $_POST["extension_setting_name"];
+		$extension_setting_value = $_POST["extension_setting_value"];
+		$extension_setting_enabled = $_POST["extension_setting_enabled"];
+		$extension_setting_description = $_POST["extension_setting_description"];
+	}
+
+//process the user data and save it to the database
+	if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
+
+		//validate the token
+			$token = new token;
+			if (!$token->validate($_SERVER['PHP_SELF'])) {
+				message::add($text['message-invalid_token'],'negative');
+				header('Location: extension_settings.php?id='.$extension_uuid);
+				exit;
+			}
+
+		//process the http post data by submitted action
+			if ($_POST['action'] != '' && strlen($_POST['action']) > 0) {
+
+				//prepare the array(s)
+				//send the array to the database class
+				switch ($_POST['action']) {
+					case 'copy':
+						if (permission_exists('extension_setting_add')) {
+							$obj = new database;
+							$obj->copy($array);
+						}
+						break;
+					case 'delete':
+						if (permission_exists('extension_setting_delete')) {
+							$obj = new database;
+							$obj->delete($array);
+						}
+						break;
+					case 'toggle':
+						if (permission_exists('extension_setting_update')) {
+							$obj = new database;
+							$obj->toggle($array);
+						}
+						break;
+				}
+
+				//redirect the user
+				if (in_array($_POST['action'], array('copy', 'delete', 'toggle')) && is_uuid($id) && is_uuid($extension_uuid)) {
+					header('Location: extension_setting_edit.php?id='.$id.'&extension_uuid='.$extension_uuid);
+					exit;
+				}
+			}
+
+		//check for all required data
+			$msg = '';
+			//if (strlen($domain_uuid) == 0) { $msg .= $text['message-required']." ".$text['label-domain_uuid']."<br>\n"; }
+			if (strlen($extension_setting_type) == 0) { $msg .= $text['message-required']." ".$text['label-extension_setting_type']."<br>\n"; }
+			if (strlen($extension_setting_name) == 0) { $msg .= $text['message-required']." ".$text['label-extension_setting_name']."<br>\n"; }
+			//if (strlen($extension_setting_value) == 0) { $msg .= $text['message-required']." ".$text['label-extension_setting_value']."<br>\n"; }
+			if (strlen($extension_setting_enabled) == 0) { $msg .= $text['message-required']." ".$text['label-extension_setting_enabled']."<br>\n"; }
+			//if (strlen($extension_setting_description) == 0) { $msg .= $text['message-required']." ".$text['label-extension_setting_description']."<br>\n"; }
+			if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
+				require_once "resources/header.php";
+				require_once "resources/persist_form_var.php";
+				echo "<div align='center'>\n";
+				echo "<table><tr><td>\n";
+				echo $msg."<br />";
+				echo "</td></tr></table>\n";
+				persistformvar($_POST);
+				echo "</div>\n";
+				require_once "resources/footer.php";
+				return;
+			}
+
+		//add the extension_setting_uuid
+			if (!is_uuid($extension_setting_uuid)) {
+				$extension_setting_uuid = uuid();
+			}
+
+		//prepare the array
+			$array['extension_settings'][0]['extension_setting_uuid'] = $extension_setting_uuid;
+			$array['extension_settings'][0]['extension_uuid'] = $extension_uuid;
+			$array['extension_settings'][0]['domain_uuid'] = $_SESSION['domain_uuid'];
+			//$array['extension_settings'][0]['domain_uuid'] = $domain_uuid;
+			$array['extension_settings'][0]['extension_setting_type'] = $extension_setting_type;
+			$array['extension_settings'][0]['extension_setting_name'] = $extension_setting_name;
+			$array['extension_settings'][0]['extension_setting_value'] = $extension_setting_value;
+			$array['extension_settings'][0]['extension_setting_enabled'] = $extension_setting_enabled;
+			$array['extension_settings'][0]['extension_setting_description'] = $extension_setting_description;
+
+		//save the data
+			$database = new database;
+			$database->app_name = 'extension settings';
+			$database->app_uuid = '1416a250-f6e1-4edc-91a6-5c9b883638fd';
+			$database->save($array);
+		
+		//clear the cache	
+			$sql = "select extension, number_alias, user_context from v_extensions ";
+			$sql .= "where extension_uuid = :extension_uuid ";
+			$parameters['extension_uuid'] = $extension_uuid;
+			$database = new database;
+			$extension = $database->select($sql, $parameters, 'row');
+			$cache = new cache;
+			$cache->delete("directory:".$extension["extension"]."@".$extension["user_context"]);
+			$cache->delete("directory:".$extension["number_alias"]."@".$extension["user_context"]);
+		
+		//redirect the user
+			if (isset($action)) {
+				if ($action == "add") {
+					$_SESSION["message"] = $text['message-add'];
+				}
+				if ($action == "update") {
+					$_SESSION["message"] = $text['message-update'];
+				}
+				//header('Location: extension_settings.php');
+				header('Location: extension_setting_edit.php?id='.urlencode($extension_setting_uuid).'&extension_uuid='.$extension_uuid);
+				return;
+			}
+	}
+
+//pre-populate the form
+	if (is_array($_GET) && $_POST["persistformvar"] != "true") {
+		$sql = "select ";
+		//$sql .= "extension_uuid, ";
+		//$sql .= "domain_uuid, ";
+		$sql .= "extension_setting_uuid, ";
+		$sql .= "extension_setting_type, ";
+		$sql .= "extension_setting_name, ";
+		$sql .= "extension_setting_value, ";
+		$sql .= "cast(extension_setting_enabled as text), ";
+		$sql .= "extension_setting_description ";
+		$sql .= "from v_extension_settings ";
+		$sql .= "where extension_setting_uuid = :extension_setting_uuid ";
+		//$sql .= "and domain_uuid = :domain_uuid ";
+		//$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+		$parameters['extension_setting_uuid'] = $extension_setting_uuid;
+		$database = new database;
+		$row = $database->select($sql, $parameters, 'row');
+		if (is_array($row) && @sizeof($row) != 0) {
+			if (is_uuid($row["extension_uuid"])) {
+				$extension_uuid = $row["extension_uuid"];
+			}
+			//$domain_uuid = $row["domain_uuid"];
+			$extension_setting_type = $row["extension_setting_type"];
+			$extension_setting_name = $row["extension_setting_name"];
+			$extension_setting_value = $row["extension_setting_value"];
+			$extension_setting_enabled = $row["extension_setting_enabled"];
+			$extension_setting_description = $row["extension_setting_description"];
+		}
+		unset($sql, $parameters, $row);
+	}
+
+//create token
+	$object = new token;
+	$token = $object->create($_SERVER['PHP_SELF']);
+
+//show the header
+	$document['title'] = $text['title-extension_setting'];
+	require_once "resources/header.php";
+
+//show the content
+	echo "<form name='frm' id='frm' method='post' action=''>\n";
+	echo "<input class='formfld' type='hidden' name='extension_setting_uuid' value='".escape($extension_setting_uuid)."'>\n";
+
+	echo "<div class='action_bar' id='action_bar'>\n";
+	echo "	<div class='heading'><b>".$text['title-extension_setting']."</b></div>\n";
+	echo "	<div class='actions'>\n";
+	echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$_SESSION['theme']['button_icon_back'],'id'=>'btn_back','collapse'=>'hide-xs','style'=>'margin-right: 15px;','link'=>'extension_settings.php?id='.$extension_uuid]);
+	if ($action == 'update') {
+		if (permission_exists('_add')) {
+			echo button::create(['type'=>'button','label'=>$text['button-copy'],'icon'=>$_SESSION['theme']['button_icon_copy'],'id'=>'btn_copy','name'=>'btn_copy','style'=>'display: none;','onclick'=>"modal_open('modal-copy','btn_copy');"]);
+		}
+		if (permission_exists('_delete')) {
+			echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'id'=>'btn_delete','name'=>'btn_delete','style'=>'display: none; margin-right: 15px;','onclick'=>"modal_open('modal-delete','btn_delete');"]);
+		}
+	}
+	echo button::create(['type'=>'submit','label'=>$text['button-save'],'icon'=>$_SESSION['theme']['button_icon_save'],'id'=>'btn_save','collapse'=>'hide-xs']);
+	echo "	</div>\n";
+	echo "	<div style='clear: both;'></div>\n";
+	echo "</div>\n";
+
+	echo $text['title_description-extension_settings']."\n";
+	echo "<br /><br />\n";
+
+	if ($action == 'update') {
+		if (permission_exists('extension_setting_add')) {
+			echo modal::create(['id'=>'modal-copy','type'=>'copy','actions'=>button::create(['type'=>'submit','label'=>$text['button-continue'],'icon'=>'check','id'=>'btn_copy','style'=>'float: right; margin-left: 15px;','collapse'=>'never','name'=>'action','value'=>'copy','onclick'=>"modal_close();"])]);
+		}
+		if (permission_exists('extension_setting_delete')) {
+			echo modal::create(['id'=>'modal-delete','type'=>'delete','actions'=>button::create(['type'=>'submit','label'=>$text['button-continue'],'icon'=>'check','id'=>'btn_delete','style'=>'float: right; margin-left: 15px;','collapse'=>'never','name'=>'action','value'=>'delete','onclick'=>"modal_close();"])]);
+		}
+	}
+
+	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
+
+	//echo "<tr>\n";
+	//echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	//echo "	".$text['label-domain_uuid']."\n";
+	//echo "</td>\n";
+	//echo "<td class='vtable' style='position: relative;' align='left'>\n";
+	//echo "	<select class='formfld' name='domain_uuid'>\n";
+	//if (strlen($domain_uuid) == 0) {
+	//	echo "		<option value='' selected='selected'>".$text['select-global']."</option>\n";
+	//}
+	//else {
+	//	echo "		<option value=''>".$text['label-global']."</option>\n";
+	//}
+	//foreach ($_SESSION['domains'] as $row) {
+	//	if ($row['domain_uuid'] == $domain_uuid) {
+	//		echo "		<option value='".$row['domain_uuid']."' selected='selected'>".escape($row['domain_name'])."</option>\n";
+	//	}
+	//	else {
+	//		echo "		<option value='".$row['domain_uuid']."'>".$row['domain_name']."</option>\n";
+	//	}
+	//}
+	//echo "	</select>\n";
+	//echo "<br />\n";
+	//echo $text['description-domain_uuid']."\n";
+	//echo "</td>\n";
+	//echo "</tr>\n";
+
+	echo "<tr>\n";
+	echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-extension_setting_type']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' style='position: relative;' align='left'>\n";
+	echo "	<select class='formfld' name='extension_setting_type'>\n";
+	echo "		<option value=''></option>\n";
+	if ($extension_setting_type == "param") {
+		echo "		<option value='param' selected='selected'>".$text['label-param']."</option>\n";
+	}
+	else {
+		echo "		<option value='param'>".$text['label-param']."</option>\n";
+	}
+	if ($extension_setting_type == "variable") {
+		echo "		<option value='variable' selected='selected'>".$text['label-variable']."</option>\n";
+	}
+	else {
+		echo "		<option value='variable'>".$text['label-variable']."</option>\n";
+	}
+	echo "	</select>\n";
+	echo "<br />\n";
+	echo $text['description-extension_setting_type']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
+	echo "<tr>\n";
+	echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-extension_setting_name']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' style='position: relative;' align='left'>\n";
+	echo "	<input class='formfld' type='text' name='extension_setting_name' maxlength='255' value='".escape($extension_setting_name)."'>\n";
+	echo "<br />\n";
+	echo $text['description-extension_setting_name']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
+	echo "<tr>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-extension_setting_value']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' style='position: relative;' align='left'>\n";
+	echo "	<input class='formfld' type='text' name='extension_setting_value' maxlength='255' value='".escape($extension_setting_value)."'>\n";
+	echo "<br />\n";
+	echo $text['description-extension_setting_value']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
+	echo "<tr>\n";
+	echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-extension_setting_enabled']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' style='position: relative;' align='left'>\n";
+	echo "	<select class='formfld' name='extension_setting_enabled'>\n";
+	if ($extension_setting_enabled == "true") {
+		echo "		<option value='true' selected='selected'>".$text['label-true']."</option>\n";
+	}
+	else {
+		echo "		<option value='true'>".$text['label-true']."</option>\n";
+	}
+	if ($extension_setting_enabled == "false") {
+		echo "		<option value='false' selected='selected'>".$text['label-false']."</option>\n";
+	}
+	else {
+		echo "		<option value='false'>".$text['label-false']."</option>\n";
+	}
+	echo "	</select>\n";
+	echo "<br />\n";
+	echo $text['description-extension_setting_enabled']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
+	echo "<tr>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-extension_setting_description']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' style='position: relative;' align='left'>\n";
+	echo "	<input class='formfld' type='text' name='extension_setting_description' maxlength='255' value='".escape($extension_setting_description)."'>\n";
+	echo "<br />\n";
+	echo $text['description-extension_setting_description']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
+	echo "</table>\n";
+	echo "<br /><br />\n";
+
+	echo "<input type='hidden' name='extension_uuid' value='".$extension_uuid."'>\n";
+	echo "<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
+
+	echo "</form>";
+
+//include the footer
+	require_once "resources/footer.php";
+
+?>
diff --git a/app/extension_settings/extension_settings.php b/app/extension_settings/extension_settings.php
new file mode 100755
index 0000000000..a2cd197a80
--- /dev/null
+++ b/app/extension_settings/extension_settings.php
@@ -0,0 +1,327 @@
+<?php
+/*
+	FusionPBX
+	Version: MPL 1.1
+
+	The contents of this file are subject to the Mozilla Public License Version
+	1.1 (the "License"); you may not use this file except in compliance with
+	the License. You may obtain a copy of the License at
+	http://www.mozilla.org/MPL/
+
+	Software distributed under the License is distributed on an "AS IS" basis,
+	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+	for the specific language governing rights and limitations under the
+	License.
+
+	The Original Code is FusionPBX
+
+	The Initial Developer of the Original Code is
+	Mark J Crane <markjcrane@fusionpbx.com>
+	Portions created by the Initial Developer are Copyright (C) 2021
+	the Initial Developer. All Rights Reserved.
+*/
+
+//includes
+	require_once "root.php";
+	require_once "resources/require.php";
+	require_once "resources/check_auth.php";
+
+//check permissions
+	if (permission_exists('extension_setting_view')) {
+		//access granted
+	}
+	else {
+		echo "access denied";
+		exit;
+	}
+
+//add multi-lingual support
+	$language = new text;
+	$text = $language->get();
+
+//get the http post data
+	if (is_array($_POST['extension_settings'])) {
+		$action = $_POST['action'];
+		$search = $_POST['search'];
+		$extension_settings = $_POST['extension_settings'];
+	}
+
+//action add or update
+	if (is_uuid($_REQUEST["id"])) {
+		$extension_uuid = $_REQUEST["id"];
+	}
+
+//process the http post data by action
+	if ($action != '' && is_array($extension_settings) && @sizeof($extension_settings) != 0) {
+
+		//validate the token
+		$token = new token;
+		if (!$token->validate($_SERVER['PHP_SELF'])) {
+			message::add($text['message-invalid_token'],'negative');
+			header('Location: extension_settings.php');
+			exit;
+		}
+
+		//prepare the array
+		foreach($extension_settings as $row) {
+			$array['extension_settings'][$x]['checked'] = $row['checked'];
+			$array['extension_settings'][$x]['extension_setting_uuid'] = $row['extension_setting_uuid'];
+			$array['extension_settings'][$x]['extension_setting_enabled'] = $row['extension_setting_enabled'];
+			$x++;
+		}
+
+		//prepare the database object
+		$database = new database;
+		$database->app_name = 'extension_settings';
+		$database->app_uuid = '1416a250-f6e1-4edc-91a6-5c9b883638fd';
+
+		//send the array to the database class
+		switch ($action) {
+			case 'copy':
+				if (permission_exists('extension_setting_add')) {
+					$database->copy($array);
+				}
+				break;
+			case 'toggle':
+				if (permission_exists('extension_setting_edit')) {
+					$database->toggle($array);
+				}
+				break;
+			case 'delete':
+				if (permission_exists('extension_setting_delete')) {
+					$database->delete($array);
+				}
+				break;
+		}
+
+		//redirect the user
+		header('Location: extension_settings.php?id='.urlencode($extension_uuid).'&'.($search != '' ? '?search='.urlencode($search) : null));
+		exit;
+	}
+
+//get order and order by
+	$order_by = $_GET["order_by"];
+	$order = $_GET["order"];
+
+//add the search
+	if (isset($_GET["search"])) {
+		$search = strtolower($_GET["search"]);
+	}
+
+//get the count
+	$sql = "select count(extension_setting_uuid) ";
+	$sql .= "from v_extension_settings ";
+	$sql .= "where extension_uuid = :extension_uuid ";
+	if (isset($search)) {
+		$sql .= "and (";
+		$sql .= "	lower(extension_setting_type) like :search ";
+		$sql .= "	or lower(extension_setting_name) like :search ";
+		$sql .= "	or lower(extension_setting_description) like :search ";
+		$sql .= ") ";
+		$parameters['search'] = '%'.$search.'%';
+	}
+	else {
+		$sql .= "and (domain_uuid = :domain_uuid or domain_uuid is null) ";
+		if (isset($sql_search)) {
+			$sql .= "and ".$sql_search;
+		}
+		$parameters['domain_uuid'] = $domain_uuid;
+	}
+	$parameters['extension_uuid'] = $extension_uuid;
+	$database = new database;
+	$num_rows = $database->select($sql, $parameters, 'column');
+	unset($sql, $parameters);
+
+//get the list
+	$sql = "select ";
+	//$sql .= "d.domain_name, ";
+	$sql .= "extension_setting_uuid, ";
+	$sql .= "extension_setting_type, ";
+	$sql .= "extension_setting_name, ";
+	$sql .= "extension_setting_value, ";
+	$sql .= "cast(extension_setting_enabled as text), ";
+	$sql .= "extension_setting_description ";
+	$sql .= "from v_extension_settings as e ";
+	//$sql .= ",v_domains as d ";
+	$sql .= "where extension_uuid = :extension_uuid ";
+	$sql .= "and (e.domain_uuid = :domain_uuid or e.domain_uuid is null) ";
+	//$sql .= "and d.domain_uuid = e.domain_uuid ";
+	if (isset($_GET["search"])) {
+		$sql .= "and (";
+		$sql .= "	lower(extension_setting_type) like :search ";
+		$sql .= "	or lower(extension_setting_name) like :search ";
+		$sql .= "	or lower(extension_setting_description) like :search ";
+		$sql .= ") ";
+		$parameters['search'] = '%'.$search.'%';
+	}
+
+	$sql .= order_by($order_by, $order, 'extension_setting_type', 'asc');
+	$sql .= limit_offset($rows_per_page, $offset);
+	$parameters['extension_uuid'] = $extension_uuid;
+	$parameters['domain_uuid'] = $domain_uuid;
+	$database = new database;
+	$extension_settings = $database->select($sql, $parameters, 'all');
+	unset($sql, $parameters);
+
+//create token
+	$object = new token;
+	$token = $object->create($_SERVER['PHP_SELF']);
+
+//additional includes
+	$document['title'] = $text['title-extension_settings'];
+	require_once "resources/header.php";
+
+//show the content
+	echo "<div class='action_bar' id='action_bar'>\n";
+	echo "	<div class='heading'><b>".$text['title-extension_settings']." (".$num_rows.")</b></div>\n";
+	echo "	<div class='actions'>\n";
+
+	echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$_SESSION['theme']['button_icon_back'],'id'=>'btn_add','name'=>'btn_add','link'=>'/app/extensions/extension_edit.php?id='.$extension_uuid]);
+
+	if (permission_exists('extension_setting_add')) {
+		echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add'],'id'=>'btn_add','name'=>'btn_add','link'=>'extension_setting_edit.php?extension_uuid='.$extension_uuid]);
+	}
+	if (permission_exists('extension_setting_add') && $extension_settings) {
+		echo button::create(['type'=>'button','label'=>$text['button-copy'],'icon'=>$_SESSION['theme']['button_icon_copy'],'id'=>'btn_copy','name'=>'btn_copy','style'=>'display:none;','onclick'=>"modal_open('modal-copy','btn_copy');"]);
+	}
+	if (permission_exists('extension_setting_edit') && $extension_settings) {
+		echo button::create(['type'=>'button','label'=>$text['button-toggle'],'icon'=>$_SESSION['theme']['button_icon_toggle'],'id'=>'btn_toggle','name'=>'btn_toggle','style'=>'display:none;','onclick'=>"modal_open('modal-toggle','btn_toggle');"]);
+	}
+	if (permission_exists('extension_setting_delete') && $extension_settings) {
+		echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'id'=>'btn_delete','name'=>'btn_delete','style'=>'display:none;','onclick'=>"modal_open('modal-delete','btn_delete');"]);
+	}
+	echo 		"<form id='form_search' class='inline' method='get'>\n";
+	//if (permission_exists('extension_setting_all')) {
+	//	if ($_GET['show'] == 'all') {
+	//		echo "		<input type='hidden' name='show' value='all'>\n";
+	//	}
+	//	else {
+	//		echo button::create(['type'=>'button','label'=>$text['button-show_all'],'icon'=>$_SESSION['theme']['button_icon_all'],'link'=>'?show=all&id='.$extension_uuid]);
+	//	}
+	//}
+	echo 		"<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown='list_search_reset();'>";
+	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search','style'=>($search != '' ? 'display: none;' : null)]);
+	echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'extension_settings.php?id='.$extension_uuid,'style'=>($search == '' ? 'display: none;' : null)]);
+	if ($paging_controls_mini != '') {
+		echo 	"<span style='margin-left: 15px;'>".$paging_controls_mini."</span>\n";
+	}
+	echo "		<input type='hidden' name='id' value='".$extension_uuid."'>\n";
+	echo "		</form>\n";
+	echo "	</div>\n";
+	echo "	<div style='clear: both;'></div>\n";
+	echo "</div>\n";
+
+	if (permission_exists('extension_setting_add') && $extension_settings) {
+		echo modal::create(['id'=>'modal-copy','type'=>'copy','actions'=>button::create(['type'=>'button','label'=>$text['button-continue'],'icon'=>'check','id'=>'btn_copy','style'=>'float: right; margin-left: 15px;','collapse'=>'never','onclick'=>"modal_close(); list_action_set('copy'); list_form_submit('form_list');"])]);
+	}
+	if (permission_exists('extension_setting_edit') && $extension_settings) {
+		echo modal::create(['id'=>'modal-toggle','type'=>'toggle','actions'=>button::create(['type'=>'button','label'=>$text['button-continue'],'icon'=>'check','id'=>'btn_toggle','style'=>'float: right; margin-left: 15px;','collapse'=>'never','onclick'=>"modal_close(); list_action_set('toggle'); list_form_submit('form_list');"])]);
+	}
+	if (permission_exists('extension_setting_delete') && $extension_settings) {
+		echo modal::create(['id'=>'modal-delete','type'=>'delete','actions'=>button::create(['type'=>'button','label'=>$text['button-continue'],'icon'=>'check','id'=>'btn_delete','style'=>'float: right; margin-left: 15px;','collapse'=>'never','onclick'=>"modal_close(); list_action_set('delete'); list_form_submit('form_list');"])]);
+	}
+
+	echo $text['title_description-extension_settings']."\n";
+	echo "<br /><br />\n";
+
+	echo "<form id='form_list' method='post'>\n";
+	echo "<input type='hidden' id='action' name='action' value=''>\n";
+	echo "<input type='hidden' name='search' value=\"".escape($search)."\">\n";
+
+	echo "<table class='list'>\n";
+	if (is_array($extension_settings) && @sizeof($extension_settings) != 0) {
+		$x = 0;
+		foreach ($extension_settings as $row) {
+			$extension_setting_type = $row['extension_setting_type'];
+			$extension_setting_type = strtolower($extension_setting_type);
+
+			$label_extension_setting_type = $row['extension_setting_type'];
+			$label_extension_setting_type = str_replace("_", " ", $label_extension_setting_type);
+			$label_extension_setting_type = str_replace("-", " ", $label_extension_setting_type);
+			$label_extension_setting_type = ucwords($label_extension_setting_type);
+
+			if ($previous_extension_setting_type !== $row['extension_setting_type']) {
+				echo "		<tr>";
+				echo "			<td align='left' colspan='999'>&nbsp;</td>\n";
+				echo "		</tr>";
+				echo "		<tr>";
+				echo "			<td align='left' colspan='999' nowrap='nowrap'><b>".escape($label_extension_setting_type)."</b></td>\n";
+				echo "		</tr>";
+				echo "<tr class='list-header'>\n";
+				if (permission_exists('extension_setting_add') || permission_exists('extension_setting_edit') || permission_exists('extension_setting_delete')) {
+					echo "	<th class='checkbox'>\n";
+					echo "		<input type='checkbox' id='checkbox_all_".$extension_setting_type."' name='checkbox_all' onclick=\"list_all_toggle('".$extension_setting_type."'); checkbox_on_change(this);\">\n";
+					echo "	</th>\n";
+				}
+				//if ($_GET['show'] == 'all' && permission_exists('extension_setting_all')) {
+				//	echo th_order_by('domain_name', $text['label-domain'], $order_by, $order);
+				//}
+
+				//echo th_order_by('extension_setting_type', $text['label-extension_setting_type'], $order_by, $order);
+				//echo th_order_by('extension_setting_name', $text['label-extension_setting_name'], $order_by, $order);
+				//echo th_order_by('extension_setting_value', $text['label-extension_setting_value'], $order_by, $order);
+				//echo th_order_by('extension_setting_enabled', $text['label-extension_setting_enabled'], $order_by, $order, null, "class='center'");
+				echo "	<th>".$text['label-extension_setting_type']."</th>\n";
+				echo "	<th>".$text['label-extension_setting_name']."</th>\n";
+				echo "	<th>".$text['label-extension_setting_value']."</th>\n";
+				echo "	<th class='center'>".$text['label-extension_setting_enabled']."</th>\n";
+
+				echo "	<th class='hide-sm-dn'>".$text['label-extension_setting_description']."</th>\n";
+				if (permission_exists('extension_setting_edit') && $_SESSION['theme']['list_row_edit_button']['boolean'] == 'true') {
+					echo "	<td class='action-button'>&nbsp;</td>\n";
+				}
+				echo "</tr>\n";
+
+			}
+			if (permission_exists('extension_setting_edit')) {
+				$list_row_url = "extension_setting_edit.php?id=".urlencode($row['extension_setting_uuid'])."&extension_uuid=".urlencode($extension_uuid);
+			}
+			echo "<tr class='list-row' href='".$list_row_url."'>\n";
+			if (permission_exists('extension_setting_add') || permission_exists('extension_setting_edit') || permission_exists('extension_setting_delete')) {
+				echo "	<td class='checkbox'>\n";
+				echo "		<input type='checkbox' name='extension_settings[$x][checked]' id='checkbox_".$x."' class='checkbox_".$extension_setting_type."' value='true' onclick=\"checkbox_on_change(this); if (!this.checked) { document.getElementById('checkbox_all_".$extension_setting_type."').checked = false; }\">\n";
+				echo "		<input type='hidden' name='extension_settings[$x][extension_setting_uuid]' value='".escape($row['extension_setting_uuid'])."' />\n";
+				echo "	</td>\n";
+			}
+			//if ($_GET['show'] == 'all' && permission_exists('extension_setting_all')) {
+			//	echo "	<td>".escape($row['domain_name'])."</td>\n";
+			//}
+			echo "	<td>".escape($row['extension_setting_type'])."</td>\n";
+			echo "	<td>".escape($row['extension_setting_name'])."</td>\n";
+			echo "	<td>".escape($row['extension_setting_value'])."</td>\n";
+			if (permission_exists('extension_setting_edit')) {
+				echo "	<td class='no-link center'>\n";
+				echo "		<input type='hidden' name='number_translations[$x][extension_setting_enabled]' value='".escape($row['extension_setting_enabled'])."' />\n";
+				echo button::create(['type'=>'submit','class'=>'link','label'=>$text['label-'.$row['extension_setting_enabled']],'title'=>$text['button-toggle'],'onclick'=>"list_self_check('checkbox_".$x."'); list_action_set('toggle'); list_form_submit('form_list')"]);
+			}
+			else {
+				echo "	<td class='center'>\n";
+				echo $text['label-'.$row['extension_setting_enabled']];
+			}
+			echo "	</td>\n";
+			echo "	<td class='description overflow hide-sm-dn'>".escape($row['extension_setting_description'])."</td>\n";
+			if (permission_exists('extension_setting_edit') && $_SESSION['theme']['list_row_edit_button']['boolean'] == 'true') {
+				echo "	<td class='action-button'>\n";
+				echo button::create(['type'=>'button','title'=>$text['button-edit'],'icon'=>$_SESSION['theme']['button_icon_edit'],'link'=>$list_row_url]);
+				echo "	</td>\n";
+			}
+			echo "</tr>\n";
+
+			//set the previous category
+			$previous_extension_setting_type = $row['extension_setting_type'];
+			$x++;
+		}
+		unset($extension_settings);
+	}
+
+	echo "</table>\n";
+	echo "<br />\n";
+	echo "<div align='center'>".$paging_controls."</div>\n";
+	echo "<input type='hidden' name='".$id."' value='".$extension_uuid."'>\n";
+	echo "<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
+	echo "</form>\n";
+
+//include the footer
+	require_once "resources/footer.php";
+
+?>
diff --git a/app/extension_settings/resources/classes/extension_settings.php b/app/extension_settings/resources/classes/extension_settings.php
new file mode 100755
index 0000000000..0fe50b8889
--- /dev/null
+++ b/app/extension_settings/resources/classes/extension_settings.php
@@ -0,0 +1,276 @@
+<?php
+/*
+	FusionPBX
+	Version: MPL 1.1
+
+	The contents of this file are subject to the Mozilla Public License Version
+	1.1 (the "License"); you may not use this file except in compliance with
+	the License. You may obtain a copy of the License at
+	http://www.mozilla.org/MPL/
+
+	Software distributed under the License is distributed on an "AS IS" basis,
+	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+	for the specific language governing rights and limitations under the
+	License.
+
+	The Original Code is FusionPBX
+
+	The Initial Developer of the Original Code is
+	Mark J Crane <markjcrane@fusionpbx.com>
+	Portions created by the Initial Developer are Copyright (C) 2021
+	the Initial Developer. All Rights Reserved.
+
+	Contributor(s):
+	Mark J Crane <markjcrane@fusionpbx.com>
+*/
+
+/**
+ * extension_settings class
+ *
+ * @method null delete
+ * @method null toggle
+ * @method null copy
+ */
+if (!class_exists('extension_settings')) {
+	class extension_settings {
+
+		/**
+		* declare the variables
+		*/
+		private $app_name;
+		private $app_uuid;
+		private $name;
+		private $table;
+		private $toggle_field;
+		private $toggle_values;
+		private $description_field;
+		private $location;
+
+		/**
+		 * called when the object is created
+		 */
+		public function __construct() {
+			//assign the variables
+				$this->app_name = 'extension_settings';
+				$this->app_uuid = '1416a250-f6e1-4edc-91a6-5c9b883638fd';
+				$this->name = 'extension_setting';
+				$this->table = 'extension_settings';
+				$this->toggle_field = 'extension_setting_enabled';
+				$this->toggle_values = ['true','false'];
+				$this->description_field = 'extension_setting_description';
+				$this->location = 'extension_settings.php';
+		}
+
+		/**
+		 * called when there are no references to a particular object
+		 * unset the variables used in the class
+		 */
+		public function __destruct() {
+			foreach ($this as $key => $value) {
+				unset($this->$key);
+			}
+		}
+
+		/**
+		 * delete rows from the database
+		 */
+		public function delete($records) {
+			if (permission_exists($this->name.'_delete')) {
+
+				//add multi-lingual support
+					$language = new text;
+					$text = $language->get();
+
+				//validate the token
+					$token = new token;
+					if (!$token->validate($_SERVER['PHP_SELF'])) {
+						message::add($text['message-invalid_token'],'negative');
+						header('Location: '.$this->location);
+						exit;
+					}
+
+				//delete multiple records
+					if (is_array($records) && @sizeof($records) != 0) {
+						//build the delete array
+							$x = 0;
+							foreach ($records as $record) {
+								//add to the array
+									if ($record['checked'] == 'true' && is_uuid($record['uuid'])) {
+										$array[$this->table][$x][$this->name.'_uuid'] = $record['uuid'];
+										$array[$this->table][$x]['domain_uuid'] = $_SESSION['domain_uuid'];
+									}
+
+								//increment the id
+									$x++;
+							}
+
+						//delete the checked rows
+							if (is_array($array) && @sizeof($array) != 0) {
+								//execute delete
+									$database = new database;
+									$database->app_name = $this->app_name;
+									$database->app_uuid = $this->app_uuid;
+									$database->delete($array);
+									unset($array);
+								
+								//clear the cache	
+									$sql = "select extension, number_alias, user_context from v_extensions ";
+									$sql .= "where extension_uuid = :extension_uuid ";
+									$parameters['extension_uuid'] = $extension_uuid;
+									$database = new database;
+									$extension = $database->select($sql, $parameters, 'row');
+									$cache = new cache;
+									$cache->delete("directory:".$extension["extension"]."@".$extension["user_context"]);
+									$cache->delete("directory:".$extension["number_alias"]."@".$extension["user_context"]);
+
+								//set message
+									message::add($text['message-delete']);
+							}
+							unset($records);
+					}
+			}
+		}
+
+		/**
+		 * toggle a field between two values
+		 */
+		public function toggle($records) {
+			if (permission_exists($this->name.'_edit')) {
+
+				//add multi-lingual support
+					$language = new text;
+					$text = $language->get();
+
+				//validate the token
+					$token = new token;
+					if (!$token->validate($_SERVER['PHP_SELF'])) {
+						message::add($text['message-invalid_token'],'negative');
+						header('Location: '.$this->location);
+						exit;
+					}
+
+				//toggle the checked records
+					if (is_array($records) && @sizeof($records) != 0) {
+						//get current toggle state
+							foreach($records as $record) {
+								if ($record['checked'] == 'true' && is_uuid($record['uuid'])) {
+									$uuids[] = "'".$record['uuid']."'";
+								}
+							}
+							if (is_array($uuids) && @sizeof($uuids) != 0) {
+								$sql = "select ".$this->name."_uuid as uuid, ".$this->toggle_field." as toggle from v_".$this->table." ";
+								$sql .= "where ".$this->name."_uuid in (".implode(', ', $uuids).") ";
+								$sql .= "and (domain_uuid = :domain_uuid or domain_uuid is null) ";
+								$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+								$database = new database;
+								$rows = $database->select($sql, $parameters, 'all');
+								if (is_array($rows) && @sizeof($rows) != 0) {
+									foreach ($rows as $row) {
+										$states[$row['uuid']] = $row['toggle'];
+									}
+								}
+								unset($sql, $parameters, $rows, $row);
+							}
+
+						//build update array
+							$x = 0;
+							foreach($states as $uuid => $state) {
+								//create the array
+									$array[$this->table][$x][$this->name.'_uuid'] = $uuid;
+									$array[$this->table][$x][$this->toggle_field] = $state == $this->toggle_values[0] ? $this->toggle_values[1] : $this->toggle_values[0];
+
+								//increment the id
+									$x++;
+							}
+
+						//save the changes
+							if (is_array($array) && @sizeof($array) != 0) {
+								//save the array
+									$database = new database;
+									$database->app_name = $this->app_name;
+									$database->app_uuid = $this->app_uuid;
+									$database->save($array);
+									unset($array);
+
+								//set message
+									message::add($text['message-toggle']);
+							}
+							unset($records, $states);
+					}
+			}
+		}
+
+		/**
+		 * copy rows from the database
+		 */
+		public function copy($records) {
+			if (permission_exists($this->name.'_add')) {
+
+				//add multi-lingual support
+					$language = new text;
+					$text = $language->get();
+
+				//validate the token
+					$token = new token;
+					if (!$token->validate($_SERVER['PHP_SELF'])) {
+						message::add($text['message-invalid_token'],'negative');
+						header('Location: '.$this->location);
+						exit;
+					}
+
+				//copy the checked records
+					if (is_array($records) && @sizeof($records) != 0) {
+
+						//get checked records
+							foreach($records as $record) {
+								if ($record['checked'] == 'true' && is_uuid($record['uuid'])) {
+									$uuids[] = "'".$record['uuid']."'";
+								}
+							}
+
+						//create the array from existing data
+							if (is_array($uuids) && @sizeof($uuids) != 0) {
+								$sql = "select * from v_".$this->table." ";
+								$sql .= "where ".$this->name."_uuid in (".implode(', ', $uuids).") ";
+								$sql .= "and (domain_uuid = :domain_uuid or domain_uuid is null) ";
+								$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+								$database = new database;
+								$rows = $database->select($sql, $parameters, 'all');
+								if (is_array($rows) && @sizeof($rows) != 0) {
+									$x = 0;
+									foreach ($rows as $row) {
+										//copy data
+											$array[$this->table][$x] = $row;
+
+										//add copy to the description
+											$array[$this->table][$x][$this->name.'_uuid'] = uuid();
+											$array[$this->table][$x][$this->description_field] = trim($row[$this->description_field]).' ('.$text['label-copy'].')';
+
+										//increment the id
+											$x++;
+									}
+								}
+								unset($sql, $parameters, $rows, $row);
+							}
+
+						//save the changes and set the message
+							if (is_array($array) && @sizeof($array) != 0) {
+								//save the array
+									$database = new database;
+									$database->app_name = $this->app_name;
+									$database->app_uuid = $this->app_uuid;
+									$database->save($array);
+									unset($array);
+
+								//set message
+									message::add($text['message-copy']);
+							}
+							unset($records);
+					}
+			}
+		}
+
+	}
+}
+
+?>
diff --git a/app/extension_settings/root.php b/app/extension_settings/root.php
new file mode 100755
index 0000000000..6fdf32f37b
--- /dev/null
+++ b/app/extension_settings/root.php
@@ -0,0 +1,90 @@
+<?php
+/*
+	FusionPBX
+	Version: MPL 1.1
+
+	The contents of this file are subject to the Mozilla Public License Version
+	1.1 (the "License"); you may not use this file except in compliance with
+	the License. You may obtain a copy of the License at
+	http://www.mozilla.org/MPL/
+
+	Software distributed under the License is distributed on an "AS IS" basis,
+	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+	for the specific language governing rights and limitations under the
+	License.
+
+	The Original Code is FusionPBX
+
+	The Initial Developer of the Original Code is
+	Mark J Crane <markjcrane@fusionpbx.com>
+	Portions created by the Initial Developer are Copyright (C) 2008-2012
+	the Initial Developer. All Rights Reserved.
+
+	Contributor(s):
+	Mark J Crane <markjcrane@fusionpbx.com>
+*/
+
+// make sure the PATH_SEPARATOR is defined
+	umask(2);
+	if (!defined("PATH_SEPARATOR")) {
+		if (strpos($_ENV["OS"], "Win") !== false) {
+			define("PATH_SEPARATOR", ";");
+		} else {
+			define("PATH_SEPARATOR", ":");
+		}
+	}
+
+	if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
+
+	// make sure the document_root is set
+	$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);
+	if(PHP_SAPI == 'cli'){
+		chdir(pathinfo(realpath($_SERVER["PHP_SELF"]), PATHINFO_DIRNAME));
+		$script_full_path = str_replace("\\", '/', getcwd() . '/' . $_SERVER["SCRIPT_FILENAME"]);
+		$dirs = explode('/', pathinfo($script_full_path, PATHINFO_DIRNAME));
+		if (file_exists('/project_root.php')) {
+			$path = '/';
+		} else {
+			$i    = 1;
+			$path = '';
+			while ($i < count($dirs)) {
+				$path .= '/' . $dirs[$i];
+				if (file_exists($path. '/project_root.php')) {
+					break;
+				}
+				$i++;
+			}
+		}
+		$_SERVER["DOCUMENT_ROOT"] = $path;
+	}else{
+		$_SERVER["DOCUMENT_ROOT"]   = str_replace($_SERVER["PHP_SELF"], "", $_SERVER["SCRIPT_FILENAME"]);
+	}
+	$_SERVER["DOCUMENT_ROOT"]   = realpath($_SERVER["DOCUMENT_ROOT"]);
+// try to detect if a project path is being used
+	if (!defined('PROJECT_PATH')) {
+		if (is_dir($_SERVER["DOCUMENT_ROOT"]. '/fusionpbx')) {
+			define('PROJECT_PATH', '/fusionpbx');
+		} elseif (file_exists($_SERVER["DOCUMENT_ROOT"]. '/project_root.php')) {
+			define('PROJECT_PATH', '');
+		} else {
+			$dirs = explode('/', str_replace('\\', '/', pathinfo($_SERVER["PHP_SELF"], PATHINFO_DIRNAME)));
+			$i    = 1;
+			$path = $_SERVER["DOCUMENT_ROOT"];
+			while ($i < count($dirs)) {
+				$path .= '/' . $dirs[$i];
+				if (file_exists($path. '/project_root.php')) {
+					break;
+				}
+				$i++;
+			}
+			if(!file_exists($path. '/project_root.php')){
+				die("Failed to locate the Project Root by searching for project_root.php please contact support for assistance");
+			}
+			$project_path = str_replace($_SERVER["DOCUMENT_ROOT"], "", $path);
+			define('PROJECT_PATH', $project_path);
+		}
+		$_SERVER["PROJECT_ROOT"] = realpath($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH);
+		set_include_path(get_include_path() . PATH_SEPARATOR . $_SERVER["PROJECT_ROOT"]);
+	}
+
+?>
\ No newline at end of file
diff --git a/app/extensions/app_config.php b/app/extensions/app_config.php
index ad73a13afb..1f7bee03d4 100644
--- a/app/extensions/app_config.php
+++ b/app/extensions/app_config.php
@@ -48,22 +48,9 @@
 		$apps[$x]['destinations'][$y]['select_label'] = "\${destination} \${description}";
 		$y++;
 		$apps[$x]['destinations'][$y]['type'] = "sql";
-		$apps[$x]['destinations'][$y]['label'] = "loopback";
-		$apps[$x]['destinations'][$y]['name'] = "extensions";
-		$apps[$x]['destinations'][$y]['sql'] = "select extension_uuid, extension, number_alias, user_context as context, description from v_extensions ";
-		$apps[$x]['destinations'][$y]['where'] = "where domain_uuid = '\${domain_uuid}' and enabled = 'true' ";
-		$apps[$x]['destinations'][$y]['order_by'] = "number_alias, extension asc";
-		$apps[$x]['destinations'][$y]['field']['extension_uuid'] = "extension_uuid";
-		$apps[$x]['destinations'][$y]['field']['destination'] = "number_alias,extension";
-		$apps[$x]['destinations'][$y]['field']['context'] = "user_context";
-		$apps[$x]['destinations'][$y]['field']['description'] = "description";
-		$apps[$x]['destinations'][$y]['select_value']['user_contact'] = "loopback/\${destination}/\${context}";
-		$apps[$x]['destinations'][$y]['select_label'] = "\${destination} \${description}";
-		$y++;
-		$apps[$x]['destinations'][$y]['type'] = "sql";
 		$apps[$x]['destinations'][$y]['label'] = "call_groups";
 		$apps[$x]['destinations'][$y]['name'] = "extensions";
-		$apps[$x]['destinations'][$y]['sql']['pgsql'] = "select extension_uuid, distinct(unnest(string_to_array(call_group, ','))) as destination from v_extensions ";
+		$apps[$x]['destinations'][$y]['sql']['pgsql'] = "select distinct(unnest(string_to_array(call_group, ','))) as destination from v_extensions ";
 		$apps[$x]['destinations'][$y]['sql']['sqlite'] = "select distinct(call_group) as destination from v_extensions";
 		$apps[$x]['destinations'][$y]['sql']['mysql'] = "select distinct(call_group) as destination from v_extensions";
 		$apps[$x]['destinations'][$y]['where'] = "where domain_uuid = '\${domain_uuid}' and call_group <> '' and enabled = 'true' ";
@@ -97,6 +84,10 @@
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "extension_extension";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
+		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "number_alias";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		//$apps[$x]['permissions'][$y]['groups'][] = "admin";
@@ -169,6 +160,8 @@
 		$apps[$x]['permissions'][$y]['name'] = "emergency_caller_id_number";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "emergency_caller_id_select";
+		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "extension_user_record";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
@@ -213,6 +206,26 @@
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$apps[$x]['permissions'][$y]['groups'][] = "user";
+                $y++;
+                $apps[$x]['permissions'][$y]['name'] = "extension_directory";
+                $apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+                $apps[$x]['permissions'][$y]['groups'][] = "admin";
+                $apps[$x]['permissions'][$y]['groups'][] = "user";
+                $y++;
+                $apps[$x]['permissions'][$y]['name'] = "extension_limit";
+                $apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+                $apps[$x]['permissions'][$y]['groups'][] = "admin";
+                $apps[$x]['permissions'][$y]['groups'][] = "user";
+                $y++;
+                $apps[$x]['permissions'][$y]['name'] = "extension_call_group";
+                $apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+                $apps[$x]['permissions'][$y]['groups'][] = "admin";
+                $apps[$x]['permissions'][$y]['groups'][] = "user";
+                $y++;
+                $apps[$x]['permissions'][$y]['name'] = "extension_hold_music";
+                $apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+                $apps[$x]['permissions'][$y]['groups'][] = "admin";
+                $apps[$x]['permissions'][$y]['groups'][] = "user"; 
 
 
 	//default settings
@@ -578,12 +591,6 @@
 		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = "v_follow_me";
 		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = "follow_me_uuid";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = "forward_caller_id_uuid";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "follow_me_enabled";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
diff --git a/app/extensions/app_languages.php b/app/extensions/app_languages.php
index 4aad443c58..5b4801b597 100644
--- a/app/extensions/app_languages.php
+++ b/app/extensions/app_languages.php
@@ -1150,8 +1150,8 @@ $text['label-hold_music']['de-ch'] = "Wartemusik"; //copied from de-de
 $text['label-hold_music']['de-de'] = "Wartemusik";
 $text['label-hold_music']['es-cl'] = "Música en Espera";
 $text['label-hold_music']['es-mx'] = "Música en Espera"; //copied from es-cl
-$text['label-hold_music']['fr-ca'] = "Musique de Garde"; //copied from fr-fr
-$text['label-hold_music']['fr-fr'] = "Musique de Garde";
+$text['label-hold_music']['fr-ca'] = "Musique d'attente"; //copied from fr-fr
+$text['label-hold_music']['fr-fr'] = "Musique d'attente";
 $text['label-hold_music']['he-il'] = "מוסיקה בהמתנה";
 $text['label-hold_music']['it-it'] = "Musica di Attesa";
 $text['label-hold_music']['nl-nl'] = "Wachtmuziek";
@@ -2460,8 +2460,8 @@ $text['description-hold_music']['de-ch'] = "Wählen Sie die Wartemusik Kategorie
 $text['description-hold_music']['de-de'] = "Wählen Sie die Wartemusik Kategorie.";
 $text['description-hold_music']['es-cl'] = "Ingrese la categoría de música en espera aquí";
 $text['description-hold_music']['es-mx'] = "Ingrese la categoría de música en espera aquí"; //copied from es-cl
-$text['description-hold_music']['fr-ca'] = "Choisir la musique de garde."; //copied from fr-fr
-$text['description-hold_music']['fr-fr'] = "Choisir la musique de garde.";
+$text['description-hold_music']['fr-ca'] = "Choisir la musique d'attente'."; //copied from fr-fr
+$text['description-hold_music']['fr-fr'] = "Choisir la musique d'attente.";
 $text['description-hold_music']['he-il'] = "";
 $text['description-hold_music']['it-it'] = "Seleziona la categoria di Musica d'attesa.";
 $text['description-hold_music']['nl-nl'] = "Kies Wachtmuziek hier.";
@@ -2746,8 +2746,8 @@ $text['description-dial_string']['ru-ru'] = "Местоположение кон
 $text['description-dial_string']['sv-se'] = "Plats för enheten.";
 $text['description-dial_string']['uk-ua'] = "";
 
-$text['description-cidr']['en-us'] = "Enter the CIDR here.";
-$text['description-cidr']['en-gb'] = "Enter the CIDR here.";
+$text['description-cidr']['en-us'] = "Enter allowed address/ranges in CIDR notation (comma separated).";
+$text['description-cidr']['en-gb'] = "Enter allowed address/ranges in CIDR notation (comma separated).";
 $text['description-cidr']['ar-eg'] = "";
 $text['description-cidr']['de-at'] = "Geben Sie hier die Beschränkung der IP Adresse an (z.B. 1.2.3.4/32)"; //copied from de-de
 $text['description-cidr']['de-ch'] = "Geben Sie hier die Beschränkung der IP Adresse an (z.B. 1.2.3.4/32)"; //copied from de-de
diff --git a/app/extensions/extension_download.php b/app/extensions/extension_download.php
index 4ade0e978c..04292c47df 100644
--- a/app/extensions/extension_download.php
+++ b/app/extensions/extension_download.php
@@ -92,7 +92,6 @@
 	$available_columns[] = 'follow_me_uuid';
 	$available_columns[] = 'enabled';
 	$available_columns[] = 'description';
-	$available_columns[] = 'forward_caller_id_uuid';
 	$available_columns[] = 'absolute_codec_string';
 	$available_columns[] = 'forward_user_not_registered_destination';
 	$available_columns[] = 'forward_user_not_registered_enabled';
@@ -210,4 +209,4 @@
 //include the footer
 	require_once "resources/footer.php";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/extensions/extension_edit.php b/app/extensions/extension_edit.php
index e32e24f1ea..89a6319d1f 100644
--- a/app/extensions/extension_edit.php
+++ b/app/extensions/extension_edit.php
@@ -76,7 +76,16 @@
 	if (count($_POST) > 0) {
 
 		//get the values from the HTTP POST and save them as PHP variables
-			$extension = str_replace(' ','-',$_POST["extension"]);
+			if ($action == 'add' || permission_exists("extension_extension")) {
+				$extension = str_replace(' ','-',$_POST["extension"]);
+			}
+			else { //lookup extension based on submitted uuid
+				$sql = "select extension from v_extensions where extension_uuid = :extension_uuid";
+				$parameters['extension_uuid'] = $extension_uuid;
+				$database = new database;
+				$extension = $database->select($sql, $parameters, 'column');
+				unset($sql, $parameters);
+			}
 			$number_alias = $_POST["number_alias"];
 			$password = $_POST["password"];
 
@@ -133,6 +142,24 @@
 				$voicemail_id = null;
 			}
 
+			$cidrs = preg_split("/[\s,]+/", $cidr);
+                        $ips = array();
+                        foreach ($cidrs as $ipaddr){
+                                $cx = strpos($ipaddr, '/');
+                                if ($cx){
+                                        $subnet = (int)(substr($ipaddr, $cx+1));
+                                        $ipaddr = substr($ipaddr, 0, $cx);
+                                }
+                                else{
+                                        $subnet = 32;
+                                }
+
+                                if(($addr = inet_pton($ipaddr)) !== false){
+                                        $ips[] = $ipaddr.'/'.$subnet;
+                                }
+                        }
+                        $cidr = implode(',',$ips);
+		
 		//change toll allow delimiter
 			$toll_allow = str_replace(',',':', $toll_allow);
 
@@ -267,15 +294,6 @@
 				return;
 			}
 
-		//set the default user context
-			if (permission_exists("extension_user_context")) {
-				//allow a user assigned to super admin to change the user_context
-			}
-			else {
-				//if the user_context was not set then set the default value
-				$user_context = $_SESSION['domain_name'];
-			}
-
 		//prevent users from bypassing extension limit by using range
 			if ($_SESSION['limit']['extensions']['numeric'] != '') {
 				if ($total_extensions + $range > $_SESSION['limit']['extensions']['numeric']){
@@ -396,13 +414,24 @@
 									if (permission_exists("emergency_caller_id_number")) {
 										$array["extensions"][$i]["emergency_caller_id_number"] = $emergency_caller_id_number;
 									}
-									$array["extensions"][$i]["directory_first_name"] = $directory_first_name;
-									$array["extensions"][$i]["directory_last_name"] = $directory_last_name;
-									$array["extensions"][$i]["directory_visible"] = $directory_visible;
-									$array["extensions"][$i]["directory_exten_visible"] = $directory_exten_visible;
-									$array["extensions"][$i]["limit_max"] = $limit_max;
-									$array["extensions"][$i]["limit_destination"] = $limit_destination;
-									$array["extensions"][$i]["user_context"] = $user_context;
+									if (permission_exists("extension_directory")) {
+										$array["extensions"][$i]["directory_first_name"] = $directory_first_name;
+										$array["extensions"][$i]["directory_last_name"] = $directory_last_name;
+										$array["extensions"][$i]["directory_visible"] = $directory_visible;
+										$array["extensions"][$i]["directory_exten_visible"] = $directory_exten_visible;
+									}
+									if (permission_exists("extension_limit")) {
+										$array["extensions"][$i]["limit_max"] = $limit_max;
+										$array["extensions"][$i]["limit_destination"] = $limit_destination;
+									}
+									if (permission_exists("extension_user_context")) {
+										$array["extensions"][$i]["user_context"] = $user_context;
+									}
+									else {
+										if ($action == "add") {
+											$array["extensions"][$i]["user_context"] = $_SESSION['domain_name'];
+										}
+									}
 									if (permission_exists('extension_missed_call')) {
 										$array["extensions"][$i]["missed_call_app"] = $missed_call_app;
 										$array["extensions"][$i]["missed_call_data"] = $missed_call_data;
@@ -413,12 +442,16 @@
 									if (strlen($call_timeout) > 0) {
 										$array["extensions"][$i]["call_timeout"] = $call_timeout;
 									}
-									$array["extensions"][$i]["call_group"] = $call_group;
+									if (permission_exists("extension_call_group")) {
+									       $array["extensions"][$i]["call_group"] = $call_group;
+									}
 									$array["extensions"][$i]["call_screen_enabled"] = $call_screen_enabled;
 									if (permission_exists('extension_user_record')) {
 										$array["extensions"][$i]["user_record"] = $user_record;
 									}
-									$array["extensions"][$i]["hold_music"] = $hold_music;
+									if (permission_exists('extension_hold_music')) {
+									       $array["extensions"][$i]["hold_music"] = $hold_music;
+									}
 									$array["extensions"][$i]["auth_acl"] = $auth_acl;
 									if (permission_exists("extension_cidr")) {
 										$array["extensions"][$i]["cidr"] = $cidr;
@@ -535,6 +568,7 @@
 											$array["voicemails"][$i]["voicemail_enabled"] = $voicemail_enabled;
 											$array["voicemails"][$i]["voicemail_description"] = $description;
 											$array["voicemails"][$i]["voicemail_tutorial"] = $voicemail_tutorial;
+											$array["voicemails"][$i]["voicemail_transcription_enabled"] = $_SESSION['voicemail']['transcription_enabled_default']['boolean'] ?: false;
 									}
 							}
 
@@ -622,11 +656,24 @@
 							}
 
 						//clear the cache
+							if (!permission_exists("extension_user_context") && $action == "update") {
+								$sql = "select user_context from v_extensions ";
+								$sql .= "where extension_uuid = :extension_uuid ";
+								$parameters['extension_uuid'] = $extension_uuid;
+								$database = new database;
+								$user_context = $database->select($sql, $parameters, 'column');
+							}
 							$cache = new cache;
 							$cache->delete("directory:".$extension."@".$user_context);
 							if (permission_exists('number_alias') && strlen($number_alias) > 0) {
 								$cache->delete("directory:".$number_alias."@".$user_context);
 							}
+
+						//clear the destinations session array
+							if (isset($_SESSION['destinations']['array'])) {
+								unset($_SESSION['destinations']['array']);
+							}
+
 					}
 
 				//set the message and redirect
@@ -802,6 +849,19 @@
 	$destinations = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 
+//get the emergency destinations
+	if (permission_exists('emergency_caller_id_select')) {
+		$sql = "select * from v_destinations ";
+		$sql .= "where domain_uuid = :domain_uuid ";
+		$sql .= "and destination_type = 'inbound' ";
+		$sql .= "and destination_type_emergency = 1 ";
+		$sql .= "order by destination_number asc ";
+		$parameters['domain_uuid'] = $domain_uuid;
+		$database = new database;
+		$emergency_destinations = $database->select($sql, $parameters, 'all');
+		unset($sql, $parameters);
+	}
+
 //change toll allow delimiter
 	$toll_allow = str_replace(':',',', $toll_allow);
 
@@ -836,7 +896,7 @@
 	echo "	document.iform.range_to.disabled = endis;\n";
 	echo "}\n";
 	echo "\n";
-	if (permission_exists(extension_advanced)) {
+	if (permission_exists('extension_advanced')) {
 		echo "function show_advanced_config() {\n";
 		echo "	$('#show_advanced_box').slideToggle();\n";
 		echo "	$('#show_advanced').slideToggle();\n";
@@ -884,12 +944,13 @@
 			echo button::create(['type'=>'button','label'=>$text['button-call_forward'],'icon'=>'project-diagram','style'=>$button_margin,'link'=>'../calls/call_edit.php?id='.urlencode($extension_uuid)]);
 			unset($button_margin);
 		}
+		if (permission_exists('extension_setting_view')) {
+			echo button::create(['type'=>'button','label'=>$text['button-settings'],'icon'=>$_SESSION['theme']['button_icon_settings'],'id'=>'btn_settings','style'=>'','link'=>PROJECT_PATH.'/app/extension_settings/extension_settings.php?id='.urlencode($extension_uuid)]);
+		}
 		if (permission_exists('extension_copy')) {
 			echo button::create(['type'=>'button','label'=>$text['button-copy'],'icon'=>$_SESSION['theme']['button_icon_copy'],'id'=>'btn_copy','style'=>'margin-left: 15px;','onclick'=>"copy_extension();"]);
 		}
-		if (permission_exists('domain_setting_view') && file_exists(PROJECT_PATH.'/app/extension_settings/app_config.php')) {
-			echo button::create(['type'=>'button','label'=>$text['button-settings'],'icon'=>$_SESSION['theme']['button_icon_settings'],'id'=>'btn_settings','style'=>'','link'=>PROJECT_PATH.'/app/extension_settings/extension_settings.php?id='.urlencode($extension_uuid)]);
-		}
+
 	}
 	echo button::create(['type'=>'button','label'=>$text['button-save'],'icon'=>$_SESSION['theme']['button_icon_save'],'id'=>'btn_save','style'=>'margin-left: 15px;','onclick'=>'submit_form();']);
 	echo "	</div>\n";
@@ -903,10 +964,15 @@
 	echo "    ".$text['label-extension']."\n";
 	echo "</td>\n";
 	echo "<td width='70%' class='vtable' align='left'>\n";
-	echo "    <input class='formfld' type='text' name='extension' autocomplete='new-password' maxlength='255' value=\"".escape($extension)."\" required='required'>\n";
-	echo "    <input type='text' style='display: none;' disabled='disabled'>\n"; //help defeat browser auto-fill
-	echo "<br />\n";
-	echo $text['description-extension']."\n";
+	if ($action == "add" || permission_exists("extension_extension")) {
+		echo "    <input class='formfld' type='text' name='extension' autocomplete='new-password' maxlength='255' value=\"".escape($extension)."\" required='required'>\n";
+		echo "    <input type='text' style='display: none;' disabled='disabled'>\n"; //help defeat browser auto-fill
+		echo "<br />\n";
+		echo $text['description-extension']."\n";
+	}
+	else {
+		echo escape($extension);
+	}
 	echo "</td>\n";
 	echo "</tr>\n";
 
@@ -1300,7 +1366,31 @@
 		echo "    ".$text['label-emergency_caller_id_name']."\n";
 		echo "</td>\n";
 		echo "<td class='vtable' align='left'>\n";
-		if (permission_exists('outbound_caller_id_select')) {
+		if (permission_exists('emergency_caller_id_select')) {
+			if (count($emergency_destinations) > 0) {
+				echo "	<select name='emergency_caller_id_name' id='emergency_caller_id_name' class='formfld'>\n";
+				echo "		<option value=''></option>\n";
+				foreach ($emergency_destinations as &$row) {
+					$tmp = $row["destination_caller_id_name"];
+					if(strlen($tmp) == 0){
+						$tmp = $row["destination_description"];
+					}
+					if(strlen($tmp) > 0){
+						if ($emergency_caller_id_name == $tmp) {
+							echo "		<option value='".escape($tmp)."' selected='selected'>".escape($tmp)."</option>\n";
+						}
+						else {
+							echo "		<option value='".escape($tmp)."'>".escape($tmp)."</option>\n";
+						}
+					}
+				}
+				echo "	</select>\n";
+			}
+			else {
+				echo "	<input type=\"button\" class=\"btn\" name=\"\" alt=\"".$text['button-add']."\" onclick=\"window.location='".PROJECT_PATH."/app/destinations/destinations.php'\" value='".$text['button-add']."'>\n";
+			}
+		}
+		elseif (permission_exists('outbound_caller_id_select')) {
 			if (count($destinations) > 0) {
 				echo "	<select name='emergency_caller_id_name' id='emergency_caller_id_name' class='formfld'>\n";
 				echo "		<option value=''></option>\n";
@@ -1344,14 +1434,38 @@
 		echo "    ".$text['label-emergency_caller_id_number']."\n";
 		echo "</td>\n";
 		echo "<td class='vtable' align='left'>\n";
-		if (permission_exists('outbound_caller_id_select')) {
+		if (permission_exists('emergency_caller_id_select')) {
+			if (count($emergency_destinations) > 0) {
+				echo "	<select name='emergency_caller_id_number' id='emergency_caller_id_number' class='formfld'>\n";
+				//echo "	<option value=''></option>\n"; Don't allow no selection when validating emergency numbers this way
+				foreach ($emergency_destinations as &$row) {
+					$tmp = $row["destination_caller_id_number"];
+					if(strlen($tmp) == 0){
+						$tmp = $row["destination_number"];
+					}
+					if(strlen($tmp) > 0){
+						if ($emergency_caller_id_number == $tmp) {
+							echo "		<option value='".escape($tmp)."' selected='selected'>".escape($tmp)."</option>\n";
+						}
+						else {
+							echo "		<option value='".escape($tmp)."'>".escape($tmp)."</option>\n";
+						}
+					}
+				}
+				echo "		</select>\n";
+			}
+			else {
+				echo "	<input type=\"button\" class=\"btn\" name=\"\" alt=\"".$text['button-add']."\" onclick=\"window.location='".PROJECT_PATH."/app/destinations/destinations.php'\" value='".$text['button-add']."'>\n";
+			}
+		}
+		elseif (permission_exists('outbound_caller_id_select')) {
 			if (count($destinations) > 0) {
 				echo "	<select name='emergency_caller_id_number' id='emergency_caller_id_number' class='formfld'>\n";
 				echo "	<option value=''></option>\n";
 				foreach ($destinations as &$row) {
 					$tmp = $row["destination_caller_id_number"];
 					if(strlen($tmp) == 0){
-						$tmp = $row["destination_description"];
+						$tmp = $row["destination_number"];
 					}
 					if(strlen($tmp) > 0){
 						if ($emergency_caller_id_number == $tmp) {
@@ -1372,7 +1486,10 @@
 			echo "    <input class='formfld' type='text' name='emergency_caller_id_number' maxlength='255' min='0' step='1' value=\"".escape($emergency_caller_id_number)."\">\n";
 		}
 		echo "<br />\n";
-		if (permission_exists('outbound_caller_id_select') && count($destinations) > 0) {
+		if (permission_exists('emergency_caller_id_select') && count($emergency_destinations) > 0){
+			echo $text['description-emergency_caller_id_number-select']."\n";
+		}
+		elseif (permission_exists('outbound_caller_id_select') && count($destinations) > 0) {
 			echo $text['description-emergency_caller_id_number-select']."\n";
 		}
 		else {
@@ -1382,89 +1499,93 @@
 		echo "</tr>\n";
 	}
 
-	echo "<tr>\n";
-	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-	echo "    ".$text['label-directory_full_name']."\n";
-	echo "</td>\n";
-	echo "<td class='vtable' align='left'>\n";
-	echo "    <input class='formfld' type='text' name='directory_first_name' maxlength='255' value=\"".escape($directory_first_name)."\">\n";
-	echo "    <input class='formfld' type='text' name='directory_last_name' maxlength='255' value=\"".escape($directory_last_name)."\">\n";
-	echo "<br />\n";
-	echo $text['description-directory_full_name']."\n";
-	echo "</td>\n";
-	echo "</tr>\n";
+	if (permission_exists("extension_directory")) {
+		echo "<tr>\n";
+		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+		echo "    ".$text['label-directory_full_name']."\n";
+		echo "</td>\n";
+		echo "<td class='vtable' align='left'>\n";
+		echo "    <input class='formfld' type='text' name='directory_first_name' maxlength='255' value=\"".escape($directory_first_name)."\">\n";
+		echo "    <input class='formfld' type='text' name='directory_last_name' maxlength='255' value=\"".escape($directory_last_name)."\">\n";
+		echo "<br />\n";
+		echo $text['description-directory_full_name']."\n";
+		echo "</td>\n";
+		echo "</tr>\n";
 
-	echo "<tr>\n";
-	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-	echo "    ".$text['label-directory_visible']."\n";
-	echo "</td>\n";
-	echo "<td class='vtable' align='left'>\n";
-	echo "    <select class='formfld' name='directory_visible'>\n";
-	if ($directory_visible == "true") {
-		echo "    <option value='true' selected='selected'>".$text['label-true']."</option>\n";
-	}
-	else {
-		echo "    <option value='true'>".$text['label-true']."</option>\n";
-	}
-	if ($directory_visible == "false") {
-		echo "    <option value='false' selected >".$text['label-false']."</option>\n";
-	}
-	else {
-		echo "    <option value='false'>".$text['label-false']."</option>\n";
-	}
-	echo "    </select>\n";
-	echo "<br />\n";
-	echo "<br />\n";
-	echo $text['description-directory_visible']."\n";
-	echo "</td>\n";
-	echo "</tr>\n";
+		echo "<tr>\n";
+		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+		echo "    ".$text['label-directory_visible']."\n";
+		echo "</td>\n";
+		echo "<td class='vtable' align='left'>\n";
+		echo "    <select class='formfld' name='directory_visible'>\n";
+		if ($directory_visible == "true") {
+			echo "    <option value='true' selected='selected'>".$text['label-true']."</option>\n";
+		}
+		else {
+			echo "    <option value='true'>".$text['label-true']."</option>\n";
+		}
+		if ($directory_visible == "false") {
+			echo "    <option value='false' selected >".$text['label-false']."</option>\n";
+		}
+		else {
+			echo "    <option value='false'>".$text['label-false']."</option>\n";
+		}
+		echo "    </select>\n";
+		echo "<br />\n";
+		echo "<br />\n";
+		echo $text['description-directory_visible']."\n";
+		echo "</td>\n";
+		echo "</tr>\n";
 
-	echo "<tr>\n";
-	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-	echo "    ".$text['label-directory_exten_visible']."\n";
-	echo "</td>\n";
-	echo "<td class='vtable' align='left'>\n";
-	echo "    <select class='formfld' name='directory_exten_visible'>\n";
-	if ($directory_exten_visible == "true") {
-		echo "    <option value='true' selected='selected'>".$text['label-true']."</option>\n";
+		echo "<tr>\n";
+		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+		echo "    ".$text['label-directory_exten_visible']."\n";
+		echo "</td>\n";
+		echo "<td class='vtable' align='left'>\n";
+		echo "    <select class='formfld' name='directory_exten_visible'>\n";
+		if ($directory_exten_visible == "true") {
+			echo "    <option value='true' selected='selected'>".$text['label-true']."</option>\n";
+		}
+		else {
+			echo "    <option value='true'>".$text['label-true']."</option>\n";
+		}
+		if ($directory_exten_visible == "false") {
+			echo "    <option value='false' selected >".$text['label-false']."</option>\n";
+		}
+		else {
+			echo "    <option value='false'>".$text['label-false']."</option>\n";
+		}
+		echo "    </select>\n";
+		echo "<br />\n";
+		echo "<br />\n";
+		echo $text['description-directory_exten_visible']."\n";
+		echo "</td>\n";
+		echo "</tr>\n";
 	}
-	else {
-		echo "    <option value='true'>".$text['label-true']."</option>\n";
-	}
-	if ($directory_exten_visible == "false") {
-		echo "    <option value='false' selected >".$text['label-false']."</option>\n";
-	}
-	else {
-		echo "    <option value='false'>".$text['label-false']."</option>\n";
-	}
-	echo "    </select>\n";
-	echo "<br />\n";
-	echo "<br />\n";
-	echo $text['description-directory_exten_visible']."\n";
-	echo "</td>\n";
-	echo "</tr>\n";
 
-	echo "<tr>\n";
-	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-	echo "    ".$text['label-limit_max']."\n";
-	echo "</td>\n";
-	echo "<td class='vtable' align='left'>\n";
-	echo "    <input class='formfld' type='text' name='limit_max' maxlength='255' value=\"".escape($limit_max)."\">\n";
-	echo "<br />\n";
-	echo $text['description-limit_max']."\n";
-	echo "</td>\n";
-	echo "</tr>\n";
+	if (permission_exists("extension_limit")) {
+		echo "<tr>\n";
+		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+		echo "    ".$text['label-limit_max']."\n";
+		echo "</td>\n";
+		echo "<td class='vtable' align='left'>\n";
+		echo "    <input class='formfld' type='text' name='limit_max' maxlength='255' value=\"".escape($limit_max)."\">\n";
+		echo "<br />\n";
+		echo $text['description-limit_max']."\n";
+		echo "</td>\n";
+		echo "</tr>\n";
 
-	echo "<tr>\n";
-	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-	echo "    ".$text['label-limit_destination']."\n";
-	echo "</td>\n";
-	echo "<td class='vtable' align='left'>\n";
-	echo "    <input class='formfld' type='text' name='limit_destination' maxlength='255' value=\"".escape($limit_destination)."\">\n";
-	echo "<br />\n";
-	echo $text['description-limit_destination']."\n";
-	echo "</td>\n";
-	echo "</tr>\n";
+		echo "<tr>\n";
+		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+		echo "    ".$text['label-limit_destination']."\n";
+		echo "</td>\n";
+		echo "<td class='vtable' align='left'>\n";
+		echo "    <input class='formfld' type='text' name='limit_destination' maxlength='255' value=\"".escape($limit_destination)."\">\n";
+		echo "<br />\n";
+		echo $text['description-limit_destination']."\n";
+		echo "</td>\n";
+		echo "</tr>\n";
+	}
 
 	if (permission_exists('voicemail_edit') && is_dir($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/app/voicemails')) {
 		echo "<tr>\n";
@@ -1593,30 +1714,32 @@
 	echo "</td>\n";
 	echo "</tr>\n";
 
-	echo "<tr>\n";
-	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-	echo "	".$text['label-call_group']."\n";
-	echo "</td>\n";
-	echo "<td class='vtable' align='left'>\n";
-	if (is_array($_SESSION['call group']['name'])) {
-		echo "	<select class='formfld' name='call_group'>\n";
-		echo "		<option value=''></option>\n";
-		foreach ($_SESSION['call group']['name'] as $name) {
-			if ($name == $call_group) {
-				echo "		<option value='".escape($name)."' selected='selected'>".escape($name)."</option>\n";
-			}
-			else {
-				echo "		<option value='".escape($name)."'>".escape($name)."</option>\n";
+	if (permission_exists("extension_call_group")) {
+		echo "<tr>\n";
+		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+		echo "	".$text['label-call_group']."\n";
+		echo "</td>\n";
+		echo "<td class='vtable' align='left'>\n";
+		if (is_array($_SESSION['call group']['name'])) {
+			echo "	<select class='formfld' name='call_group'>\n";
+			echo "		<option value=''></option>\n";
+			foreach ($_SESSION['call group']['name'] as $name) {
+				if ($name == $call_group) {
+					echo "		<option value='".escape($name)."' selected='selected'>".escape($name)."</option>\n";
+				}
+				else {
+					echo "		<option value='".escape($name)."'>".escape($name)."</option>\n";
+				}
 			}
+			echo "	</select>\n";
+		} else {
+			echo "	<input class='formfld' type='text' name='call_group' maxlength='255' value=\"".escape($call_group)."\">\n";
 		}
-		echo "	</select>\n";
-	} else {
-		echo "	<input class='formfld' type='text' name='call_group' maxlength='255' value=\"".escape($call_group)."\">\n";
+		echo "<br />\n";
+		echo $text['description-call_group']."\n";
+		echo "</td>\n";
+		echo "</tr>\n";
 	}
-	echo "<br />\n";
-	echo $text['description-call_group']."\n";
-	echo "</td>\n";
-	echo "</tr>\n";
 
 	if (permission_exists('extension_call_screen')) {
 		echo "<tr>\n";
@@ -1683,7 +1806,7 @@
 		echo "</tr>\n";
 	}
 
-	if (is_dir($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/app/music_on_hold')) {
+	if (is_dir($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/app/music_on_hold') && permission_exists('extension_hold_music')) {
 		echo "<tr>\n";
 		echo "<td width=\"30%\" class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
 		echo "	".$text['label-hold_music']."\n";
diff --git a/app/extensions/extensions.php b/app/extensions/extensions.php
index aea7b296d5..ed109b7f04 100644
--- a/app/extensions/extensions.php
+++ b/app/extensions/extensions.php
@@ -79,6 +79,16 @@
 	$order_by = $_GET["order_by"];
 	$order = $_GET["order"];
 
+//get total extension count for domain
+if (is_numeric($_SESSION['limit']['extensions']['numeric'])) {
+	$sql = "select count(*) from v_extensions ";
+	$sql .= "where domain_uuid = :domain_uuid ";
+	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+	$database = new database;
+	$total_extensions = $database->select($sql, $parameters, 'column');
+	unset($sql, $parameters);
+}
+
 //add the search term
 	$search = strtolower($_GET["search"]);
 	if (strlen($search) > 0) {
@@ -101,15 +111,7 @@
 		$parameters['search'] = '%'.$search.'%';
 	}
 
-//get total extension count for domain
-	if (is_numeric($_SESSION['limit']['extensions']['numeric'])) {
-		$sql = "select count(*) from v_extensions ";
-		$sql .= "where domain_uuid = :domain_uuid ";
-		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
-		$database = new database;
-		$total_extensions = $database->select($sql, $parameters, 'column');
-		unset($sql, $parameters);
-	}
+
 
 //get total extension count
 	$sql = "select count(*) from v_extensions where true ";
diff --git a/app/extensions/resources/classes/extension.php b/app/extensions/resources/classes/extension.php
index 29e97884c9..8ee14f4a84 100644
--- a/app/extensions/resources/classes/extension.php
+++ b/app/extensions/resources/classes/extension.php
@@ -625,12 +625,12 @@ if (!class_exists('extension')) {
 										$this->delete_voicemail
 										&& permission_exists('voicemail_delete')
 										&& is_array($voicemail_ids)
-										&& @sizeof($voicemail_ids)
+										&& @sizeof($voicemail_ids) != 0
 										) {
 										//retrieve voicemail uuids
 											$sql = "select voicemail_uuid as uuid from v_voicemails ";
 											$sql .= "where domain_uuid = :domain_uuid ";
-											$sql .= "and voicemail_id in (".implode(',', $voicemail_ids).") ";
+											$sql .= "and voicemail_id in ('".implode("','", $voicemail_ids)."') ";
 											$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 											$database = new database;
 											$rows = $database->select($sql, $parameters, 'all');
@@ -683,6 +683,11 @@ if (!class_exists('extension')) {
 										$this->xml();
 									}
 
+								//clear the destinations session array
+									if (isset($_SESSION['destinations']['array'])) {
+										unset($_SESSION['destinations']['array']);
+									}
+
 								//set message
 									message::add($text['message-delete']);
 
@@ -787,6 +792,11 @@ if (!class_exists('extension')) {
 									}
 									unset($extensions);
 
+								//clear the destinations session array
+									if (isset($_SESSION['destinations']['array'])) {
+										unset($_SESSION['destinations']['array']);
+									}
+
 								//set message
 									message::add($text['message-toggle']);
 
diff --git a/app/fanvil/app_config.php b/app/fanvil/app_config.php
index dd6f792bab..c4fe460dab 100644
--- a/app/fanvil/app_config.php
+++ b/app/fanvil/app_config.php
@@ -655,334 +655,6 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "EGS Syslog Server Port";
 		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "68feb973-be9a-42ac-94a1-54263dfde589";
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_lldp_tx_enable";
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
-		$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'] = " LLDP Transmit. 0-Disabled, 1-Enabled";
-		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "f0d1dd5b-7130-428c-bddb-a975d85587f5";
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_lldp_refresh";
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "60";
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = "LLDP Refresh Timer. Default 60 seconds";
-		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "10af1d27-ef61-4c7c-94cf-8db797a84ebc";
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_lldp_learn";
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
-		$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'] = "Use LLDP learned information such as voip vlan";
-		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "b4cc791a-5389-4e1f-9f87-e8394b399d64";
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_enable_vlan";
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
-		$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'] = "Enable VLAN Support. 0 - NO, 1 - Yes";
-		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "16d74bd9-7f44-4780-a202-3cfcbaa6ef5a";
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_lan_port_vlan";
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "256";
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Default VLAN for phone LAN port.";
-		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "530564ac-17aa-4167-b047-bf764250d91a";
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_pc_port_vlan";
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "1";
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Default VLAN for phone PC port.";
-		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "2b72e19b-2437-45c0-9df5-4fef6ac078c6";
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_enable_diffserv";
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "1";
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Enable DiffServ(DSCP) Support. 0 - NO, 1 - Yes";
-		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "86081f7e-af03-41b9-a5af-b5593182c9ff";
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_qos_rtp_voice";
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
-		$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'] = "Layer 2 QoS 802.1p Priority Value for RTP Voice media";
-		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "8050cfbd-44d1-46db-b553-2cc0defd5fc2";
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_qos_rtp_video";
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
-		$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'] = "Layer 2 QoS 802.1p Priority Value for RTP Video media";
-		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "ddf89377-7303-435c-917a-bdd32579cf36";
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_qos_sip";
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
-		$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'] = "Layer 2 QoS 802.1p Priority Value for SIP signaling";
-		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "b6a89aa6-2e21-489c-8f1f-e819e6ced17b";
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_dscp_rtp_voice";
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "46";
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Layer 3 QoS DSCP Value for RTP Voice media";
-		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "9a22bd5b-c2b0-4c06-bd19-63ef58837011";
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_dscp_rtp_video";
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "46";
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Layer 3 QoS DSCP Value for RTP Video media";
-		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "94effa7d-8c0f-4cca-b617-9d2d24748aa7";
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_dscp_sip";
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "-1";
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Layer 3 QoS DSCP Value for SIP signaling (Disabled by default)";
-		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "49f2ff3f-0628-44fa-a8d2-82cb38fbaf98";
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_video_codec";
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "H264";
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Enable video codec on sip lines (Only h264 currently supported)";
-		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "be8c1341-3cb6-4aa8-bef5-642ff11199e8";
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_syslog_enable";
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
-		$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'] = "Enable Syslog server";
-		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "8281507b-80fa-450a-94b7-6f58a7a9e6e1";
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_syslog_server";
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0.0.0.0";
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Syslog Server ip";
-		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "db7595a1-318b-49d8-86a6-8ff4b44e30f5";
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_syslog_server_port";
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "514";
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Syslog Server Port number";
-		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "67a916be-35df-44f1-ab12-81756fd1f911";
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_default_answer_mode";
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "2";
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Answer call as audio only or audio with video. 1-Audio, 2-Video";
-		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "bbbdf01c-d760-43cf-958d-e47c54dd3997";
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_default_dial_mode";
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "1";
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Dial call as audio only or audio with video. 1-Audio, 2-Video Note: If you set this to video, then video is offered in the first invite which can cause your call to hang or not complete if going through a sip trunk provider.";
-		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "37ddabf0-8d7c-494f-b381-5bc4e3048bff";
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_enable_auto_upgrade";
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
-		$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'] = "Enable firmware auto upgrade 0 - NO, 1 - Yes";
-		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "5a2a79c3-befb-4b7a-998d-3f0bfc9fcde4";
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_firmware_upgrade_server_1";
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "https://server.yourdomain.com/app/fanvil/resources/firmware";
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Auto upgrade firmware server 1.";
-		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "de60a8fb-628a-4ee3-a76a-ff3e0a7f045f";
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_firmware_upgrade_server_2";
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "https://server2.yourdomain.com/app/fanvil/resources/firmware";
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Auto upgrade firmware server 2.";
-		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "09134520-647a-4a86-bffd-d927aff2b33b";
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_firmware_upgrade_interval";
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "24";
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Check for firmware every X hours.";
-		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "3ca2b12b-21f1-4a6d-a0eb-8670105c77d9";
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_firmware_i20s";
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "i20S2.1.1.3664T20180809203309.z";
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = " Filename of the i20S firmware ROM";
-		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "d07be0b3-a34b-4739-a227-766231e5bb52";
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_firmware_i23s";
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "i23S2.1.1.3664T20180809204215.z";
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = " Filename of the i23S firmware ROM";
-		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "6e0d313d-e44a-446f-9274-99e778d87cf5";
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_firmware_i30";
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "i302.1.1.3664T20180809203614.z";
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = " Filename of the i30 firmware ROM";
-		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "a3cf0c35-4f92-4607-84a6-b06b29d67134";
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_firmware_i31s";
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "i31S2.1.1.3664T20180809203916.z";
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = " Filename of the i31S firmware ROM";
-		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "235ccea6-5ed0-45ff-a03f-d0cbc6ebaf01";
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_firmware_x2p";
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "x2-mono2.8.0.6251T20181017203533.z";
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = " Filename of the X2P firmware ROM";
-		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "8912437c-7142-4a85-b4aa-f83c1e50ad30";
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_firmware_x3";
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "x3s2.8.0.6251T20181017202549.z";
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = " Filename of the X3S/G firmware ROM";
-		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "756059c7-b754-4285-be22-0d51c82d62b3";
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_firmware_x4";
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "x42.8.0.6251T20181017202853.z";
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = " Filename of the X4/G firmware ROM";
-		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "122ba840-7dee-4c8e-a93c-739681b4b1d4";
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_firmware_x5s";
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "x5s-6900-P0.13.3-1.8.0-2698T2018-09-30-15.23.04.z";
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = " Filename of the X5S firmware ROM";
-		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "32635e1c-dcb8-44e1-a0c4-5209b4f84392";
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_firmware_x6";
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "x6-6914-P0.13.3-1.8.0-2697T2018-09-30-15.10.00.z";
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = " Filename of the X6 firmware ROM";
-		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "4b7f56f3-31a9-46dd-b588-35b253024b1f";
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_egs_switch_mode";
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = "0 - Monostable, 1 - Bistable";
-		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "316ce083-69ba-4932-be02-845d3ed8f585";
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_egs_enable_card_reader";
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Enable RFID Card Reader. 0 - NO, 1 - Yes";
-		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "7226d18c-7d49-449b-be7b-8cfb46c1ddb3";
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_egs_enable_indoor_open";
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Use indoor switch to unlock the door. 0 - NO, 1 - Yes";
-		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "83dce10f-6254-490c-af89-a2a004890c47";
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_egs_enable_access_table";
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "1";
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Default: Enabled. 0 - NO, 1 - Yes";
-		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "d4ffbf45-5abe-4ef3-9cf7-f222257d5633";
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_egs_opening_door_code_remote";
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "*";
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Default: *";
-		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "c51013fc-765e-4758-99a9-2738cfe9a7dd";
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_egs_opening_door_code_local";
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "6789";
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Default: 6789";
-		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "0c5fe247-0361-4c69-a247-d14b5417e53e";
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_egs_enable_syslog";
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Enable EGS Syslog. 0 - NO, 1 - Yes";
-		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "1a74a177-49fc-432e-b10e-39c7d0c7ddc4";
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_egs_log_server";
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0.0.0.0";
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = "EGS Syslog Server. Hostname or IP";
-		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "3fb2a87b-89b1-4d53-923d-c1478aec4f58";
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_egs_log_port";
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "514";
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = "EGS Syslog Server Port";
-		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "108f26c5-568d-4cc0-af94-097ecb600b8f";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_provision_url";
diff --git a/app/fax/app_config.php b/app/fax/app_config.php
index c6bb87aa7d..5df9f1f9fa 100644
--- a/app/fax/app_config.php
+++ b/app/fax/app_config.php
@@ -175,6 +175,10 @@
 		$apps[$x]['permissions'][$y]['name'] = "fax_destinations";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "fax_extension_view_domain";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 
 	//default settings
 		$y=0;
diff --git a/app/fax/app_languages.php b/app/fax/app_languages.php
index 914cc3685d..751e3ddf2d 100644
--- a/app/fax/app_languages.php
+++ b/app/fax/app_languages.php
@@ -303,8 +303,8 @@ $text['option-fax-resolution-superfine']['de-ch'] = "Superfein"; //copied from d
 $text['option-fax-resolution-superfine']['de-de'] = "Superfein";
 $text['option-fax-resolution-superfine']['es-cl'] = "Superfino";
 $text['option-fax-resolution-superfine']['es-mx'] = "Superfino"; //copied from es-cl
-$text['option-fax-resolution-superfine']['fr-ca'] = "Superfin"; //copied from fr-fr
-$text['option-fax-resolution-superfine']['fr-fr'] = "Superfin";
+$text['option-fax-resolution-superfine']['fr-ca'] = "Superfine"; //copied from fr-fr
+$text['option-fax-resolution-superfine']['fr-fr'] = "Superfine";
 $text['option-fax-resolution-superfine']['he-il'] = "";
 $text['option-fax-resolution-superfine']['it-it'] = "Superfine";
 $text['option-fax-resolution-superfine']['nl-nl'] = "";
@@ -324,8 +324,8 @@ $text['option-fax-resolution-normal']['de-ch'] = "Normal"; //copied from de-de
 $text['option-fax-resolution-normal']['de-de'] = "Normal";
 $text['option-fax-resolution-normal']['es-cl'] = "Normal";
 $text['option-fax-resolution-normal']['es-mx'] = "Normal"; //copied from es-cl
-$text['option-fax-resolution-normal']['fr-ca'] = "Normal"; //copied from fr-fr
-$text['option-fax-resolution-normal']['fr-fr'] = "Normal";
+$text['option-fax-resolution-normal']['fr-ca'] = "Normale"; //copied from fr-fr
+$text['option-fax-resolution-normal']['fr-fr'] = "Normale";
 $text['option-fax-resolution-normal']['he-il'] = "";
 $text['option-fax-resolution-normal']['it-it'] = "Normale";
 $text['option-fax-resolution-normal']['nl-nl'] = "";
@@ -492,8 +492,8 @@ $text['label-sent']['de-ch'] = "Gesendet"; //copied from de-de
 $text['label-sent']['de-de'] = "Gesendet";
 $text['label-sent']['es-cl'] = "Enviado";
 $text['label-sent']['es-mx'] = "Enviado"; //copied from es-cl
-$text['label-sent']['fr-ca'] = "Envoyé"; //copied from fr-fr
-$text['label-sent']['fr-fr'] = "Envoyé";
+$text['label-sent']['fr-ca'] = "Envoyés"; //copied from fr-fr
+$text['label-sent']['fr-fr'] = "Envoyés";
 $text['label-sent']['he-il'] = "";
 $text['label-sent']['it-it'] = "Spedito";
 $text['label-sent']['nl-nl'] = "";
@@ -1017,8 +1017,8 @@ $text['label-fax_files']['de-ch'] = "Fax Dateien"; //copied from de-de
 $text['label-fax_files']['de-de'] = "Fax Dateien";
 $text['label-fax_files']['es-cl'] = "Facsímil del Archivo(s)";
 $text['label-fax_files']['es-mx'] = "Facsímil del Archivo(s)"; //copied from es-cl
-$text['label-fax_files']['fr-ca'] = "Télécopieur Fichier(s)"; //copied from fr-fr
-$text['label-fax_files']['fr-fr'] = "Télécopieur Fichier(s)";
+$text['label-fax_files']['fr-ca'] = "Fichier(s) à Télécopier"; //copied from fr-fr
+$text['label-fax_files']['fr-fr'] = "Fichier(s) à Télécopier";
 $text['label-fax_files']['he-il'] = "";
 $text['label-fax_files']['it-it'] = "File(s) FAX";
 $text['label-fax_files']['nl-nl'] = "";
@@ -1332,8 +1332,8 @@ $text['label-fax-subject']['de-ch'] = "Betreff"; //copied from de-de
 $text['label-fax-subject']['de-de'] = "Betreff";
 $text['label-fax-subject']['es-cl'] = "Asunto";
 $text['label-fax-subject']['es-mx'] = "Asunto"; //copied from es-cl
-$text['label-fax-subject']['fr-ca'] = "Sujet"; //copied from fr-fr
-$text['label-fax-subject']['fr-fr'] = "Sujet";
+$text['label-fax-subject']['fr-ca'] = "Objet"; //copied from fr-fr
+$text['label-fax-subject']['fr-fr'] = "Objet";
 $text['label-fax-subject']['he-il'] = "נושא";
 $text['label-fax-subject']['it-it'] = "Oggetto";
 $text['label-fax-subject']['nl-nl'] = "";
@@ -1542,8 +1542,8 @@ $text['label-fax-footer']['de-ch'] = "Fußzeile"; //copied from de-de
 $text['label-fax-footer']['de-de'] = "Fußzeile";
 $text['label-fax-footer']['es-cl'] = "Pie de Página";
 $text['label-fax-footer']['es-mx'] = "Pie de Página"; //copied from es-cl
-$text['label-fax-footer']['fr-ca'] = "Footer"; //copied from fr-fr
-$text['label-fax-footer']['fr-fr'] = "Footer";
+$text['label-fax-footer']['fr-ca'] = "Bas de page"; //copied from fr-fr
+$text['label-fax-footer']['fr-fr'] = "Bas de page";
 $text['label-fax-footer']['he-il'] = "תחתית עמוד";
 $text['label-fax-footer']['it-it'] = "PiÃè di pagina";
 $text['label-fax-footer']['nl-nl'] = "";
@@ -2697,8 +2697,8 @@ $text['description-fax_files']['de-ch'] = "Wählen Sie die Datei(en) zum senden.
 $text['description-fax_files']['de-de'] = "Wählen Sie die Datei(en) zum senden.";
 $text['description-fax_files']['es-cl'] = "Seleccione el archivo a subir y enviar como fax.";
 $text['description-fax_files']['es-mx'] = "Seleccione el archivo a subir y enviar como fax."; //copied from es-cl
-$text['description-fax_files']['fr-ca'] = "Choisir un fichier à télécharger pour être émis en tant que Fax."; //copied from fr-fr
-$text['description-fax_files']['fr-fr'] = "Choisir un fichier à télécharger pour être émis en tant que Fax.";
+$text['description-fax_files']['fr-ca'] = "Choisir un fichier à télécharger pour émettre en tant que Fax."; //copied from fr-fr
+$text['description-fax_files']['fr-fr'] = "Choisir un fichier à télécharger pour émettre en tant que Fax.";
 $text['description-fax_files']['he-il'] = "";
 $text['description-fax_files']['it-it'] = "Scegli i/il file da caricare e spedire.";
 $text['description-fax_files']['nl-nl'] = "";
@@ -3537,8 +3537,8 @@ $text['description-2']['de-ch'] = "Um ein Fax zu senden, laden Sie eine PDF oder
 $text['description-2']['de-de'] = "Um ein Fax zu senden, laden Sie eine PDF oder eine TIF Datei hoch. Um ein Deckblatt zu generieren, geben Sie einen Betreff und/oder eine Nachricht unten an.";
 $text['description-2']['es-cl'] = "Para enviar un fax, cargar un archivo <strong>PDF</strong> o <strong>TIF</strong>.  Para generar una hoja de presentación, escriba un asunto y / o mensaje a continuación.";
 $text['description-2']['es-mx'] = "Para enviar un fax, cargar un archivo <strong>PDF</strong> o <strong>TIF</strong>.  Para generar una hoja de presentación, escriba un asunto y / o mensaje a continuación."; //copied from es-cl
-$text['description-2']['fr-ca'] = "Pour envoyer un fax, télécharger un fichier <strong>PDF</strong> ou <strong>TIF</strong>.  Pour générer une feuille de couverture, entrer un sujet et / ou un message ci-dessous."; //copied from fr-fr
-$text['description-2']['fr-fr'] = "Pour envoyer un fax, télécharger un fichier <strong>PDF</strong> ou <strong>TIF</strong>.  Pour générer une feuille de couverture, entrer un sujet et / ou un message ci-dessous.";
+$text['description-2']['fr-ca'] = "Pour envoyer un fax, téléchargez un fichier <strong>PDF</strong> ou <strong>TIF</strong>.  Pour générer une feuille de couverture, entrez un sujet et / ou un message ci-dessous."; //copied from fr-fr
+$text['description-2']['fr-fr'] = "Pour envoyer un fax, téléchargez un fichier <strong>PDF</strong> ou <strong>TIF</strong>.  Pour générer une feuille de couverture, entrez un sujet et / ou un message ci-dessous.";
 $text['description-2']['he-il'] = "";
 $text['description-2']['it-it'] = "Per spedire un fax, carica un <strong>PDF</strong> o un <strong>TIF</strong>. Per generare una copertina, inserisci un oggetto e/o un Messaggio qui sotto.";
 $text['description-2']['nl-nl'] = "";
@@ -3747,8 +3747,8 @@ $text['button-preview']['de-ch'] = "Vorschau"; //copied from de-de
 $text['button-preview']['de-de'] = "Vorschau";
 $text['button-preview']['es-cl'] = "Prevista";
 $text['button-preview']['es-mx'] = "Prevista"; //copied from es-cl
-$text['button-preview']['fr-ca'] = "Pré-Visualisation"; //copied from fr-fr
-$text['button-preview']['fr-fr'] = "Pré-Visualisation";
+$text['button-preview']['fr-ca'] = "Aperçu"; //copied from fr-fr
+$text['button-preview']['fr-fr'] = "Aperçu";
 $text['button-preview']['he-il'] = "תצוגה מקדימה";
 $text['button-preview']['it-it'] = "Anteprima";
 $text['button-preview']['nl-nl'] = "";
diff --git a/app/fax/fax.php b/app/fax/fax.php
index d5e3e22ded..486172ff07 100644
--- a/app/fax/fax.php
+++ b/app/fax/fax.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-2019
+	Portions created by the Initial Developer are Copyright (C) 2008-2021
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -75,37 +75,51 @@
 	$order_by = $_GET["order_by"];
 	$order = $_GET["order"];
 
-//add the search term
-	$search = strtolower($_GET["search"]);
-	if (strlen($search) > 0) {
-		$sql_search = "and (";
-		$sql_search .= "lower(fax_name) like :search ";
-		$sql_search .= "or lower(fax_email) like :search ";
-		$sql_search .= "or lower(fax_extension) like :search ";
-		$sql_search .= "or lower(fax_destination_number) like :search ";
-		$sql_search .= "or lower(fax_caller_id_name) like :search ";
-		$sql_search .= "or lower(fax_caller_id_number) like :search ";
-		$sql_search .= "or lower(fax_forward_number) like :search ";
-		$sql_search .= "or lower(fax_description) like :search ";
-		$sql_search .= ") ";
-		$parameters['search'] = '%'.$search.'%';
+//add the search
+	if (isset($_GET["search"])) {
+		$search = strtolower($_GET["search"]);
 	}
 
 //get record counts
-	if (if_group("superadmin") || if_group("admin")) {
-		//show all fax extensions
-		$sql = "select count(*) from v_fax as f ";
+	if (permission_exists('fax_extension_view_domain')) {
+		//count the fax extensions
+		$sql = "select count(f.fax_uuid) from v_fax as f ";
 		$sql .= "where f.domain_uuid = :domain_uuid ";
-		$sql .= $sql_search;
+		if (isset($search)) {
+			$sql = "and (";
+			$sql .= "	lower(fax_name) like :search ";
+			$sql .= "	or lower(fax_email) like :search ";
+			$sql .= "	or lower(fax_extension) like :search ";
+			$sql .= "	or lower(fax_destination_number) like :search ";
+			$sql .= "	or lower(fax_caller_id_name) like :search ";
+			$sql .= "	or lower(fax_caller_id_number) like :search ";
+			$sql .= "	or lower(fax_forward_number) like :search ";
+			$sql .= "	or lower(fax_description) like :search ";
+			$sql .= ") ";
+			$parameters['search'] = '%'.$search.'%';
+		}
 		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 	}
 	else {
-		//show only assigned fax extensions
-		$sql = "select count(*) from v_fax as f, v_fax_users as u ";
+		//ciount the assigned fax extensions
+		$sql = "select count(f.fax_uuid) ";
+		$sql .= "from v_fax as f, v_fax_users as u ";
 		$sql .= "where f.fax_uuid = u.fax_uuid ";
 		$sql .= "and f.domain_uuid = :domain_uuid ";
 		$sql .= "and u.user_uuid = :user_uuid ";
-		$sql .= $sql_search;
+		if (isset($search)) {
+			$sql = "and (";
+			$sql .= "	lower(fax_name) like :search ";
+			$sql .= "	or lower(fax_email) like :search ";
+			$sql .= "	or lower(fax_extension) like :search ";
+			$sql .= "	or lower(fax_destination_number) like :search ";
+			$sql .= "	or lower(fax_caller_id_name) like :search ";
+			$sql .= "	or lower(fax_caller_id_number) like :search ";
+			$sql .= "	or lower(fax_forward_number) like :search ";
+			$sql .= "	or lower(fax_description) like :search ";
+			$sql .= ") ";
+			$parameters['search'] = '%'.$search.'%';
+		}
 		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 		$parameters['user_uuid'] = $_SESSION['user_uuid'];
 	}
@@ -120,10 +134,54 @@
 	list($paging_controls_mini, $rows_per_page) = paging($num_rows, $param, $rows_per_page, true);
 	$offset = $rows_per_page * $page;
 
-//get records
-	$sql = str_replace('count(*)', '*', $sql);
+//get fax extensions
+	if (permission_exists('fax_extension_view_domain')) {
+		//show all fax extensions
+		$sql = "select f.fax_uuid, fax_extension, fax_prefix, fax_name, fax_email, fax_description ";
+		$sql .= "from v_fax as f ";
+		$sql .= "where f.domain_uuid = :domain_uuid ";
+		if (isset($search)) {
+			$sql = "and (";
+			$sql .= "	lower(fax_name) like :search ";
+			$sql .= "	or lower(fax_email) like :search ";
+			$sql .= "	or lower(fax_extension) like :search ";
+			$sql .= "	or lower(fax_destination_number) like :search ";
+			$sql .= "	or lower(fax_caller_id_name) like :search ";
+			$sql .= "	or lower(fax_caller_id_number) like :search ";
+			$sql .= "	or lower(fax_forward_number) like :search ";
+			$sql .= "	or lower(fax_description) like :search ";
+			$sql .= ") ";
+			$parameters['search'] = '%'.$search.'%';
+		}
+		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+	}
+	else {
+		//show only assigned fax extensions
+		$sql = "select f.fax_uuid, fax_extension, fax_prefix, fax_name, fax_email, fax_description ";
+		$sql .= "from v_fax as f, v_fax_users as u ";
+		$sql .= "where f.fax_uuid = u.fax_uuid ";
+		$sql .= "and f.domain_uuid = :domain_uuid ";
+		$sql .= "and u.user_uuid = :user_uuid ";
+		if (isset($search)) {
+			$sql = "and (";
+			$sql .= "	lower(fax_name) like :search ";
+			$sql .= "	or lower(fax_email) like :search ";
+			$sql .= "	or lower(fax_extension) like :search ";
+			$sql .= "	or lower(fax_destination_number) like :search ";
+			$sql .= "	or lower(fax_caller_id_name) like :search ";
+			$sql .= "	or lower(fax_caller_id_number) like :search ";
+			$sql .= "	or lower(fax_forward_number) like :search ";
+			$sql .= "	or lower(fax_description) like :search ";
+			$sql .= ") ";
+			$parameters['search'] = '%'.$search.'%';
+		}
+		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+		$parameters['user_uuid'] = $_SESSION['user_uuid'];
+	}
 	$sql .= order_by($order_by, $order, 'f.fax_name', 'asc');
 	$sql .= limit_offset($rows_per_page, $offset);
+//echo $sql."\n";
+//view_array($parameters);
 	$database = new database;
 	$result = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
diff --git a/app/fax/fax_edit.php b/app/fax/fax_edit.php
index 992fc212b1..ae11e2bdc1 100644
--- a/app/fax/fax_edit.php
+++ b/app/fax/fax_edit.php
@@ -278,7 +278,9 @@
 				//prep authorized senders
 					if (sizeof($fax_email_outbound_authorized_senders) > 0) {
 						foreach ($fax_email_outbound_authorized_senders as $sender_num => $sender) {
-							if ($sender == '' || !valid_email($sender)) { unset($fax_email_outbound_authorized_senders[$sender_num]); }
+							if ($sender == '' || (substr_count($sender, '@') == 1 && !valid_email($sender)) || substr_count($sender, '.') == 0) {
+								unset($fax_email_outbound_authorized_senders[$sender_num]);
+							}
 						}
 						$fax_email_outbound_authorized_senders = strtolower(implode(',', $fax_email_outbound_authorized_senders));
 					}
@@ -356,6 +358,12 @@
 					//revoke temp permissions
 						$p->delete('fax_add', 'temp');
 						$p->delete('fax_edit', 'temp');
+
+					//clear the destinations session array
+						if (isset($_SESSION['destinations']['array'])) {
+							unset($_SESSION['destinations']['array']);
+						}
+
 				}
 
 				//get the dialplan_uuid
diff --git a/app/fax/fax_emails.php b/app/fax/fax_emails.php
index 943e6516b4..d39859eff3 100644
--- a/app/fax/fax_emails.php
+++ b/app/fax/fax_emails.php
@@ -170,9 +170,9 @@ if (is_array($result) && @sizeof($result) != 0) {
 				$metadata[0]['from'] = strtolower($tmp[0]['mailbox']."@".$tmp[0]['host']);
 
 				//check sender
-				$sender_authorized = false;
-				if (in_array($metadata[0]['from'],$authorized_senders)) { $sender_authorized = true; }
-
+				$sender_email = $metadata[0]['from'];
+				$sender_domain = explode('@', $sender_email)[1];
+				$sender_authorized = in_array($sender_email, $authorized_senders) || in_array($sender_domain, $authorized_senders) ? true : false;
 				if ($sender_authorized) {
 
 					//add multi-lingual support
diff --git a/app/fax/fax_files.php b/app/fax/fax_files.php
index dca315d10d..f4a806b8ef 100644
--- a/app/fax/fax_files.php
+++ b/app/fax/fax_files.php
@@ -75,7 +75,7 @@
 //get fax extension
 	if (is_uuid($_GET["id"])) {
 		$fax_uuid = $_GET["id"];
-		if (if_group("superadmin") || if_group("admin")) {
+		if (permission_exists('fax_extension_view_domain')) {
 			//show all fax extensions
 			$sql = "select fax_name, fax_extension from v_fax ";
 			$sql .= "where domain_uuid = :domain_uuid ";
@@ -102,7 +102,7 @@
 				$fax_extension = $row["fax_extension"];
 		}
 		else {
-			if (!if_group("superadmin") && !if_group("admin")) {
+			if (!permission_exists('fax_extension_view_domain')) {
 				echo "access denied";
 				exit;
 			}
@@ -115,7 +115,6 @@
 
 //download the fax
 	if ($_GET['a'] == "download") {
-		session_cache_limiter('public');
 		//test to see if it is in the inbox or sent directory.
 		if ($_GET['type'] == "fax_inbox") {
 			if (file_exists($fax_dir.'/'.$_GET['ext'].'/inbox/'.$_GET['filename'])) {
@@ -349,19 +348,12 @@
 						$page_height = 11.7;
 						$page_size = 'a4';
 					}
-				//generate pdf (a work around, as tiff2pdf improperly inverts the colors)
-					$cmd_tif2pdf = "tiff2pdf -i -u i -p ".$page_size." -w ".$page_width." -l ".$page_height." -f -o ".$dir_fax_temp.'/'.$file_name.".pdf ".$dir_fax.'/'.$file_name.".tif";
-					//echo $cmd_tif2pdf."<br>";
+				//generate pdf from tif
+					$cmd_tif2pdf = "tiff2pdf -u i -p ".$page_size." -w ".$page_width." -l ".$page_height." -f -o ".$dir_fax.'/'.$file_name.".pdf ".$dir_fax.'/'.$file_name.".tif";
 					exec($cmd_tif2pdf);
-					chdir($dir_fax_temp);
-					$cmd_pdf2tif = "gs -q -sDEVICE=tiffg3 -r".$gs_r." -g".$gs_g." -dNOPAUSE -sOutputFile=".$file_name."_temp.tif -- ".$file_name.".pdf -c quit";
-					//echo $cmd_pdf2tif."<br>";
-					exec($cmd_pdf2tif); //convert pdf to tif
-					@unlink($dir_fax_temp.'/'.$file_name.".pdf");
-					$cmd_tif2pdf = "tiff2pdf -i -u i -p ".$page_size." -w ".$page_width." -l ".$page_height." -f -o ".$dir_fax.'/'.$file_name.".pdf ".$dir_fax_temp.'/'.$file_name."_temp.tif";
-					//echo $cmd_tif2pdf."<br>";
-					exec($cmd_tif2pdf);
-					@unlink($dir_fax_temp.'/'.$file_name."_temp.tif");
+				//clean up temporary files, if any
+					if (file_exists($dir_fax_temp.'/'.$file_name.'.pdf')) { @unlink($dir_fax_temp.'/'.$file_name.'.pdf'); }
+					if (file_exists($dir_fax_temp.'/'.$file_name.'.tif')) { @unlink($dir_fax_temp.'/'.$file_name.'.tif'); }
 			}
 
 			if ($_REQUEST['box'] == 'inbox' && permission_exists('fax_inbox_view')) {
@@ -417,4 +409,4 @@
 //include the footer
 	require_once "resources/footer.php";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/fax/fax_files_remote.php b/app/fax/fax_files_remote.php
index 8fd24acd68..773b1ba1e3 100644
--- a/app/fax/fax_files_remote.php
+++ b/app/fax/fax_files_remote.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-2012
+	Portions created by the Initial Developer are Copyright (C) 2008-2021
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -51,7 +51,7 @@
 //get fax server uuid, set connection parameters
 	if (is_uuid($fax_uuid)) {
 
-		if (if_group("superadmin") || if_group("admin")) {
+		if (permission_exists('fax_extension_view')) {
 			//show all fax extensions
 			$sql = "select * from v_fax ";
 			$sql .= "where domain_uuid = :domain_uuid ";
@@ -86,7 +86,7 @@
 			$fax_email_inbound_subject_tag = $row["fax_email_inbound_subject_tag"];
 		}
 		else {
-			if (!if_group("superadmin") && !if_group("admin")) {
+			if (!permission_exists('fax_extension_view')) {
 				echo "access denied";
 				exit;
 			}
diff --git a/app/fax/fax_send.php b/app/fax/fax_send.php
index 867d24e57f..b45bbcab5a 100644
--- a/app/fax/fax_send.php
+++ b/app/fax/fax_send.php
@@ -25,6 +25,7 @@
 	James Rose <james.o.rose@gmail.com>
 	Luis Daniel Lucio Quiroz <dlucio@okay.com.mx>
 	Errol Samuels <voiptology@gmail.com>
+	Corey Moullas <cmoullas@emak.tech>
 */
 
 if (!isset($included)) { $included = false; }
@@ -59,7 +60,7 @@ if (!$included) {
 	//pre-populate the form
 		if (is_uuid($_REQUEST['id']) && $_POST["persistformvar"] != "true") {
 			$fax_uuid = $_REQUEST["id"];
-			if (if_group("superadmin") || if_group("admin")) {
+			if (permission_exists('fax_extension_view_domain')) {
 				//show all fax extensions
 				$sql = "select fax_uuid, fax_extension, fax_caller_id_name, fax_caller_id_number, ";
 				$sql .= "fax_toll_allow, accountcode, fax_send_greeting ";
@@ -95,7 +96,7 @@ if (!$included) {
 					$fax_send_greeting = $row["fax_send_greeting"];
 			}
 			else {
-				if (!if_group("superadmin") && !if_group("admin")) {
+				if (!permission_exists('fax_extension_view_domain')) {
 					echo "access denied";
 					exit;
 				}
@@ -369,7 +370,9 @@ if (!function_exists('fax_split_dtmf')) {
 				$fax_name = str_replace("=", "_", $fax_name);
 
 				$attachment_file_name = $_files['name'][$index];
-				rename($dir_fax_temp.'/'.$attachment_file_name, $dir_fax_temp.'/'.$fax_name.'.'.$fax_file_extension);
+				if ($attachment_file_name != $fax_name.'.'.$fax_file_extension) {
+					rename($dir_fax_temp.'/'.$attachment_file_name, $dir_fax_temp.'/'.$fax_name.'.'.$fax_file_extension);
+				}
 				unset($attachment_file_name);
 
 				if (!$included) {
@@ -394,12 +397,8 @@ if (!function_exists('fax_split_dtmf')) {
 				if (file_exists($dir_fax_temp.'/'.$fax_name.'.pdf')) {
 					chdir($dir_fax_temp);
 
-					//$cmd = gs_cmd("-q -sDEVICE=psmono -r".$gs_r." -g".$gs_g." -dNOPAUSE -dBATCH -dSAFER -sOutputFile=".correct_path($fax_name).".pdf -- ".correct_path($fax_name).".pdf -c quit");
-					// echo($cmd . "<br/>\n");
-					//exec($cmd);
-
 					//convert pdf to tif
-					$cmd = gs_cmd("-q -sDEVICE=tiffg32d -r".$gs_r." -g".$gs_g." -dBATCH -dPDFFitPage -dNOPAUSE -sOutputFile=".correct_path($fax_name).".tif -- ".correct_path($fax_name).".pdf -c quit");
+					$cmd = gs_cmd("-q -r".$gs_r." -g".$gs_g." -dBATCH -dPDFFitPage -dSAFER -dNOPAUSE -dBATCH -sOutputFile=".correct_path($fax_name).".tif -sDEVICE=tiffg4 -Ilib stocht.ps -c \"{ .75 gt { 1 } { 0 } ifelse} settransfer\" -- ".correct_path($fax_name).".pdf -c quit");
 					// echo($cmd . "<br/>\n");
 					exec($cmd);
 					@unlink($dir_fax_temp.'/'.$fax_name.'.pdf');
@@ -660,41 +659,14 @@ if (!function_exists('fax_split_dtmf')) {
 				@unlink($tif_file);
 			}
 
-			//generate pdf (a work around, as tiff2pdf was improperly inverting the colors)
+			//generate pdf from tif
 			$cmd = 'tiff2pdf -u i -p '.$fax_page_size.
 				' -w '.$page_width.
 				' -l '.$page_height.
 				' -f -o '.
 				correct_path($dir_fax_temp.'/'.$fax_instance_uuid.'.pdf').' '.
 				correct_path($dir_fax_temp.'/'.$fax_instance_uuid.'.tif');
-			// echo($cmd . "<br/>\n");
 			exec($cmd);
-
-			chdir($dir_fax_temp);
-
-			//$cmd = gs_cmd("-q -sDEVICE=psmono -r".$gs_r." -g".$gs_g." -dNOPAUSE -dBATCH -dSAFER -sOutputFile=".correct_path($fax_instance_uuid).".pdf -- ".correct_path($fax_instance_uuid).".pdf -c quit");
-			// echo($cmd . "<br/>\n");
-			//exec($cmd);
-
-			//convert pdf to tif
-			$cmd = gs_cmd('-q -sDEVICE=tiffg32d -r'.$gs_r.' -g'.$gs_g.' -dBATCH -dPDFFitPage -dNOPAUSE -sOutputFile='.
-				correct_path($fax_instance_uuid.'_temp.tif').
-				' -- '.$fax_instance_uuid.'.pdf -c quit');
-			// echo($cmd . "<br/>\n");
-			exec($cmd);
-
-			@unlink($dir_fax_temp.'/'.$fax_instance_uuid.".pdf");
-
-			$cmd = 'tiff2pdf -u i -p '.$fax_page_size.
-				' -w '.$page_width.
-				' -l '.$page_height.
-				' -f -o '.
-				correct_path($dir_fax_temp.'/'.$fax_instance_uuid.'.pdf').' '.
-				correct_path($dir_fax_temp.'/'.$fax_instance_uuid.'_temp.tif');
-			// echo($cmd . "<br/>\n");
-			exec($cmd);
-
-			@unlink($dir_fax_temp.'/'.$fax_instance_uuid."_temp.tif");
 		}
 		else {
 			if (!$included) {
@@ -768,16 +740,16 @@ if (!function_exists('fax_split_dtmf')) {
 
 		//send the fax
 		$fax_file = $dir_fax_temp."/".$fax_instance_uuid.".tif";
-		$dial_string  = "for_fax=1,";
-		$dial_string .= "accountcode='"                  . $fax_accountcode         . "',";
-		$dial_string .= "sip_h_X-accountcode='"          . $fax_accountcode         . "',";
-		$dial_string .= "domain_uuid="                   . $_SESSION["domain_uuid"] . ",";
-		$dial_string .= "domain_name="                   . $_SESSION["domain_name"] . ",";
-		$dial_string .= "origination_caller_id_name='"   . $fax_caller_id_name      . "',";
-		$dial_string .= "origination_caller_id_number='" . $fax_caller_id_number    . "',";
-		$dial_string .= "fax_ident='"                    . $fax_caller_id_number    . "',";
-		$dial_string .= "fax_header='"                   . $fax_caller_id_name      . "',";
-		$dial_string .= "fax_file='"                     . $fax_file                . "',";
+		$tmp_dial_string  = "for_fax=1,";
+		$tmp_dial_string .= "accountcode='"                  . $fax_accountcode         . "',";
+		$tmp_dial_string .= "sip_h_X-accountcode='"          . $fax_accountcode         . "',";
+		$tmp_dial_string .= "domain_uuid="                   . $_SESSION["domain_uuid"] . ",";
+		$tmp_dial_string .= "domain_name="                   . $_SESSION["domain_name"] . ",";
+		$tmp_dial_string .= "origination_caller_id_name='"   . $fax_caller_id_name      . "',";
+		$tmp_dial_string .= "origination_caller_id_number='" . $fax_caller_id_number    . "',";
+		$tmp_dial_string .= "fax_ident='"                    . $fax_caller_id_number    . "',";
+		$tmp_dial_string .= "fax_header='"                   . $fax_caller_id_name      . "',";
+		$tmp_dial_string .= "fax_file='"                     . $fax_file                . "',";
 		foreach ($fax_numbers as $fax_number) {
 
 			$fax_number = trim($fax_number);
@@ -803,6 +775,7 @@ if (!function_exists('fax_split_dtmf')) {
 			}
 
 			if ($fax_send_mode != 'queue') {
+				$dial_string = $tmp_dial_string;
 				$dial_string .= $fax_variables;
 				$dial_string .= "mailto_address='"     . $mailto_address   . "',";
 				$dial_string .= "mailfrom_address='"   . $mailfrom_address . "',";
@@ -827,6 +800,7 @@ if (!function_exists('fax_split_dtmf')) {
 			}
 			else { // enqueue
 				$wav_file = ''; //! @todo add custom message
+				$dial_string = $tmp_dial_string;
 				$response = fax_enqueue($fax_uuid, $fax_file, $wav_file, $mailto_address, $fax_uri, $fax_dtmf, $dial_string);
 			}
 		}
@@ -927,8 +901,7 @@ if (!$included) {
 		echo "	</div>\n";
 		echo "	<div style='clear: both;'></div>\n";
 		echo "</div>\n";
-
-		echo $text['description-2']." ".(if_group('superadmin') ? $text['description-3'] : null)."\n";
+		echo $text['description-2']." ".(permission_exists('fax_extension_view_domain') ? $text['description-3'] : null)."\n";
 		echo "<br /><br />\n";
 
 		echo "<table width='100%' border='0' cellspacing='0' cellpadding='0'>\n";
@@ -1185,4 +1158,4 @@ function showgrid($pdf) {
 }
 */
 
-?>
\ No newline at end of file
+?>
diff --git a/app/fax/resources/classes/fax.php b/app/fax/resources/classes/fax.php
index c5b12b7c11..c34bf2ed54 100644
--- a/app/fax/resources/classes/fax.php
+++ b/app/fax/resources/classes/fax.php
@@ -162,7 +162,7 @@ if (!class_exists('fax')) {
 				$dialplan["dialplan_uuid"] = $this->dialplan_uuid;
 				$dialplan["dialplan_name"] = ($this->fax_name != '') ? $this->fax_name : format_phone($this->destination_number);
 				$dialplan["dialplan_number"] = $this->fax_extension;
-				$dialplan["dialplan_context"] = $_SESSION['context'];
+				$dialplan["dialplan_context"] = $_SESSION['domain_name'];
 				$dialplan["dialplan_continue"] = "false";
 				$dialplan["dialplan_xml"] = $dialplan_xml;
 				$dialplan["dialplan_order"] = "310";
@@ -195,7 +195,7 @@ if (!class_exists('fax')) {
 
 			//clear the cache
 				$cache = new cache;
-				$cache->delete("dialplan:".$_SESSION['context']);
+				$cache->delete("dialplan:".$_SESSION['domain_name']);
 
 			//return the dialplan_uuid
 				return $dialplan_response;
@@ -346,7 +346,12 @@ if (!class_exists('fax')) {
 
 								//clear the cache
 									$cache = new cache;
-									$cache->delete("dialplan:".$_SESSION["context"]);
+									$cache->delete("dialplan:".$_SESSION["domain_name"]);
+
+								//clear the destinations session array
+									if (isset($_SESSION['destinations']['array'])) {
+										unset($_SESSION['destinations']['array']);
+									}
 
 								//set message
 									message::add($text['message-delete']);
@@ -646,7 +651,7 @@ if (!class_exists('fax')) {
 
 								//clear the cache
 									$cache = new cache;
-									$cache->delete("dialplan:".$_SESSION["context"]);
+									$cache->delete("dialplan:".$_SESSION["domain_name"]);
 
 								//set message
 									message::add($text['message-copy']);
diff --git a/app/fifo/fifo_add.php b/app/fifo/fifo_add.php
index ffbe66fbf9..0f34fb5987 100644
--- a/app/fifo/fifo_add.php
+++ b/app/fifo/fifo_add.php
@@ -103,7 +103,7 @@
 			$queue_name = $extension_name."@\${domain_name}";
 			$app_uuid = '16589224-c876-aeb3-f59f-523a1c0801f7';
 			$dialplan_uuid = uuid();
-			$dialplan_context = $_SESSION['context'];
+			$dialplan_context = $_SESSION['domain_name'];
 			$domain_uuid = $_SESSION['domain_uuid'];
 			$dialplan_detail_order = 0;
 
@@ -406,7 +406,7 @@
 
 		//clear the cache
 		$cache = new cache;
-		$cache->delete("dialplan:".$_SESSION["context"]);
+		$cache->delete("dialplan:".$_SESSION["domain_name"]);
 
 		//redirect the user
 		message::add($text['message-add']);
diff --git a/app/follow_me/app_config.php b/app/follow_me/app_config.php
index a09aff8c7e..cd25312375 100644
--- a/app/follow_me/app_config.php
+++ b/app/follow_me/app_config.php
@@ -99,8 +99,6 @@
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$apps[$x]['permissions'][$y]['groups'][] = "user";
 		$apps[$x]['permissions'][$y]['groups'][] = "agent";
-		$y++;
-		$apps[$x]['permissions'][$y]['name'] = "follow_me_caller_id";
 
 	//default settings
 		$y=0;
@@ -153,15 +151,6 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = "follow_me_caller_id_uuid";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
-		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "foreign";
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = "v_destinations";
-		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = "destination_uuid";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "follow_me_ignore_busy";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
diff --git a/app/gateways/app_config.php b/app/gateways/app_config.php
index 5486038064..8cddfbb9c4 100644
--- a/app/gateways/app_config.php
+++ b/app/gateways/app_config.php
@@ -197,6 +197,14 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "ping_min";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "ping_max";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
+		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "caller_id_in_from";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
diff --git a/app/gateways/app_languages.php b/app/gateways/app_languages.php
index c7fef8b760..75a4823a4f 100644
--- a/app/gateways/app_languages.php
+++ b/app/gateways/app_languages.php
@@ -484,6 +484,48 @@ $text['label-ping']['ru-ru'] = "Пинг";
 $text['label-ping']['sv-se'] = "Ping";
 $text['label-ping']['uk-ua'] = "Пінг";
 
+$text['label-ping_min']['en-us'] = "Ping Min";
+$text['label-ping_min']['en-gb'] = "";
+$text['label-ping_min']['ar-eg'] = "";
+$text['label-ping_min']['de-at'] = "";
+$text['label-ping_min']['de-ch'] = "";
+$text['label-ping_min']['de-de'] = "";
+$text['label-ping_min']['es-cl'] = "";
+$text['label-ping_min']['es-mx'] = "";
+$text['label-ping_min']['fr-ca'] = "";
+$text['label-ping_min']['fr-fr'] = "";
+$text['label-ping_min']['he-il'] = "";
+$text['label-ping_min']['it-it'] = "";
+$text['label-ping_min']['nl-nl'] = "";
+$text['label-ping_min']['pl-pl'] = "";
+$text['label-ping_min']['pt-br'] = "";
+$text['label-ping_min']['pt-pt'] = "";
+$text['label-ping_min']['ro-ro'] = "";
+$text['label-ping_min']['ru-ru'] = "";
+$text['label-ping_min']['sv-se'] = "";
+$text['label-ping_min']['uk-ua'] = "";
+
+$text['label-ping_max']['en-us'] = "Ping Max";
+$text['label-ping_max']['en-gb'] = "";
+$text['label-ping_max']['ar-eg'] = "";
+$text['label-ping_max']['de-at'] = "";
+$text['label-ping_max']['de-ch'] = "";
+$text['label-ping_max']['de-de'] = "";
+$text['label-ping_max']['es-cl'] = "";
+$text['label-ping_max']['es-mx'] = "";
+$text['label-ping_max']['fr-ca'] = "";
+$text['label-ping_max']['fr-fr'] = "";
+$text['label-ping_max']['he-il'] = "";
+$text['label-ping_max']['it-it'] = "";
+$text['label-ping_max']['nl-nl'] = "";
+$text['label-ping_max']['pl-pl'] = "";
+$text['label-ping_max']['pt-br'] = "";
+$text['label-ping_max']['pt-pt'] = "";
+$text['label-ping_max']['ro-ro'] = "";
+$text['label-ping_max']['ru-ru'] = "";
+$text['label-ping_max']['sv-se'] = "";
+$text['label-ping_max']['uk-ua'] = "";
+
 $text['label-password']['en-us'] = "Password";
 $text['label-password']['en-gb'] = "Password";
 $text['label-password']['ar-eg'] = "كلمة السر";
diff --git a/app/gateways/gateway_copy.php b/app/gateways/gateway_copy.php
index 8cbd42a76f..81072b678f 100644
--- a/app/gateways/gateway_copy.php
+++ b/app/gateways/gateway_copy.php
@@ -75,12 +75,14 @@
 				$channels = $row["channels"];
 				$caller_id_in_from = $row["caller_id_in_from"];
 				$supress_cng = $row["supress_cng"];
+				$sip_cid_type = $row["sip_cid_type"];
 				$extension_in_contact = $row["extension_in_contact"];
 				$effective_caller_id_name = $row["effective_caller_id_name"];
 				$effective_caller_id_number = $row["effective_caller_id_number"];
 				$outbound_caller_id_name = $row["outbound_caller_id_name"];
 				$outbound_caller_id_number = $row["outbound_caller_id_number"];
 				$context = $row["context"];
+				$profile = $row["profile"];
 				$enabled = $row["enabled"];
 				$description = $row["description"]." (".$text['label-copy'].")";
 			}
@@ -118,8 +120,10 @@
 			//$array['gateways'][0]['channels'] = $channels;
 			$array['gateways'][0]['caller_id_in_from'] = $caller_id_in_from;
 			$array['gateways'][0]['supress_cng'] = $supress_cng;
+         		$array['gateways'][0]['sip_cid_type'] = $sip_cid_type;
 			$array['gateways'][0]['extension_in_contact'] = $extension_in_contact;
 			$array['gateways'][0]['context'] = $context;
+			$array['gateways'][0]['profile'] = $profile;
 			$array['gateways'][0]['enabled'] = $enabled;
 			$array['gateways'][0]['description'] = $description;
 
diff --git a/app/gateways/gateway_edit.php b/app/gateways/gateway_edit.php
index 17dda4f7f2..ec1eff8424 100644
--- a/app/gateways/gateway_edit.php
+++ b/app/gateways/gateway_edit.php
@@ -94,6 +94,8 @@
 		$retry_seconds = $_POST["retry_seconds"];
 		$extension = $_POST["extension"];
 		$ping = $_POST["ping"];
+		$ping_min = $_POST["ping_min"];
+		$ping_max = $_POST["ping_max"];
 		$channels = $_POST["channels"];
 		$caller_id_in_from = $_POST["caller_id_in_from"];
 		$supress_cng = $_POST["supress_cng"];
@@ -178,6 +180,8 @@
 					$array['gateways'][$x]["retry_seconds"] = $retry_seconds;
 					$array['gateways'][$x]["extension"] = $extension;
 					$array['gateways'][$x]["ping"] = $ping;
+					$array['gateways'][$x]["ping_min"] = $ping_min;
+					$array['gateways'][$x]["ping_max"] = $ping_max;
 					$array['gateways'][$x]["channels"] = $channels;
 					$array['gateways'][$x]["caller_id_in_from"] = $caller_id_in_from;
 					$array['gateways'][$x]["supress_cng"] = $supress_cng;
@@ -279,6 +283,8 @@
 			$retry_seconds = $row["retry_seconds"];
 			$extension = $row["extension"];
 			$ping = $row["ping"];
+			$ping_min = $row["ping_min"];
+			$ping_max = $row["ping_max"];
 			$channels = $row["channels"];
 			$caller_id_in_from = $row["caller_id_in_from"];
 			$supress_cng = $row["supress_cng"];
@@ -706,6 +712,28 @@
 	echo "</td>\n";
 	echo "</tr>\n";
 
+	echo "<tr>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap>\n";
+	echo "    ".$text['label-ping_min']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' align='left'>\n";
+	echo "    <input class='formfld' type='number' name='ping_min' maxlength='255' min='1' max='65535' step='1' value=\"".escape($ping_min)."\">\n";
+	echo "<br />\n";
+	echo $text['description-ping_min']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
+	echo "<tr>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap>\n";
+	echo "    ".$text['label-ping_max']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' align='left'>\n";
+	echo "    <input class='formfld' type='number' name='ping_max' maxlength='255' min='1' max='65535' step='1' value=\"".escape($ping_max)."\">\n";
+	echo "<br />\n";
+	echo $text['description-ping_max']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
 	if (permission_exists('gateway_channels')) {
 		echo "<tr>\n";
 		echo "<td class='vncell' valign='top' align='left' nowrap>\n";
diff --git a/app/gateways/resources/classes/gateways.php b/app/gateways/resources/classes/gateways.php
index 38236b3269..d0aec16895 100644
--- a/app/gateways/resources/classes/gateways.php
+++ b/app/gateways/resources/classes/gateways.php
@@ -553,7 +553,7 @@ if (!class_exists('gateways')) {
 
 								//add new gateways to session variables
 									if (is_array($gateways) && @sizeof($gateways) != 0) {
-										foreach ($gateways as $gateway_uuid -> $gateway) {
+										foreach ($gateways as $gateway_uuid => $gateway) {
 											$_SESSION['gateways'][$gateway_uuid] = $gateway['name'];
 										}
 									}
@@ -580,4 +580,4 @@ if (!class_exists('gateways')) {
 	}
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/app/grandstream/app_config.php b/app/grandstream/app_config.php
index cb735d8a6f..278802ec7f 100644
--- a/app/grandstream/app_config.php
+++ b/app/grandstream/app_config.php
@@ -38,6 +38,14 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Call Waiting 0-default, 1-enabled, 2-disable.";
 		$y++;
+        	$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "3efa97d6-a35a-4371-b3db-efca7ef9b9b5";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_call_waiting_ring";
+		$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'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Call waiting ringing instead of playing call waiting tone when call waiting is on. 0-disabled (default), 1-enabled";		
+		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "3a8841f3-e1c0-4eb1-abd3-068a3e3701a5";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_gxp_time_zone";
@@ -282,7 +290,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_dial_plan";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = '{\+x+|x+|*x+|*++|\p\a\r\k\+*x+|\f\l\o\w\+*x+}';
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = '{\+x+|x+|*x+|*++||\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+|**x+}';
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Define the digits that are allowed to be called.";
 		$y++;
@@ -302,6 +310,22 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Bluetooth Handsfree - 0 - Off, 1 - On";
 		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "5bc527d0-6f83-403b-a6c0-574540cfa9a6";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_headset_type";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "1";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Headset Type. 0 - Normal, 1 - Plantronics EHS. Default is 0";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "522ee640-5e24-4058-95ed-605bd982ec33";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_headset_key_mode";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "1";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "HEADSET Key Mode. 0 - Default Mode, 1 - Toggle Headset/Speaker. Default is 0";
+		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "453ec939-ef61-4ecd-ad0a-31905153efd8";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_auto_attended_transfer";
@@ -406,6 +430,14 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "BLF Call-pickup. 0 - Auto, 1 - Force BLF Call-pickup by prefix, 2 - Disabled. Default is 0";
 		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "53a9f955-d199-44f5-a97d-eed636348da5";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_blf_remote_status";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$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'] = "Hide BLF Remote Status. Default 0 - Not hidden, 1 - Hidden";
+		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "09ed1352-2594-4eb8-b3f8-93cdaabe6302";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_active_backlight_timeout";
@@ -614,37 +646,108 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Ring Timeout (in seconds). Default is 60 (30-3600)";
 		$y++;
-                $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "06a35172-1bea-4611-87d0-9d66475ae709";
-                $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
-                $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_wallpaper_source";
-                $apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
-                $apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
-                $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
-                $apps[$x]['default_settings'][$y]['default_setting_description'] = "0 - Default, 1 - Download, 2-USB(for GXP2140/2160/2170 only), 3 - Uploaded, 4 - Color Background";
-                $y++;
-                $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "7ee552de-4634-4d61-8869-e0f5230858fa";
-                $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
-                $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_display_language";
-                $apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
-                $apps[$x]['default_settings'][$y]['default_setting_value'] = "Auto";
-                $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
-                $apps[$x]['default_settings'][$y]['default_setting_description'] = "Display Language. See provision profile for codes.";
-                $y++;
-                $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "19604f85-b643-4b92-8e28-9c09c34cf559";
-                $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
-                $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_blind_xfer_blf";
-                $apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
-                $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'] = "Enable Blind Transfer to BLF Yes=1, No=0. Default=0";
-                $y++;
-                $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "82b7076b-e596-49e8-b535-af86e21e0453";
-                $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
-                $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_ip_address_mode";
-                $apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
-                $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'] = "IP Address Mode. 0 - DHCP, 1 - Static IP, 2 - PPPoE. Default is 0";
-                $y++;
-
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "06a35172-1bea-4611-87d0-9d66475ae709";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_wallpaper_source";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "0 - Default, 1 - Download, 2-USB(for GXP2140/2160/2170 only), 3 - Uploaded, 4 - Color Background";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "7ee552de-4634-4d61-8869-e0f5230858fa";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_display_language";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "Auto";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Display Language. See provision profile for codes.";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "19604f85-b643-4b92-8e28-9c09c34cf559";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_blind_xfer_blf";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$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'] = "Enable Blind Transfer to BLF Yes=1, No=0. Default=0";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "82b7076b-e596-49e8-b535-af86e21e0453";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_ip_address_mode";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$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'] = "IP Address Mode. 0 - DHCP, 1 - Static IP, 2 - PPPoE. Default is 0";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "6ab26457-fcc8-414e-8ac5-ae681f114974";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_speaker_ring_volume";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "5";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Number: 0-7. Default is 5.";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "6f3f3390-2b69-4898-a4d9-e62249d58d58";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_feature_key_sync";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$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'] = "Enabled: 1, Disabled: 0  Defaults to 0. Valid for firmware higher than 1.0.9.202 for the GXP series and all firmwares GRP phones.";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "a6c84c0b-a7f1-4457-8afb-b64af601597d";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_wifi_enable";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "boolean";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Configure the WiFi radio on supported phones. If disabled allow the device to manage itself";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "f7fdbe09-0d4a-4d06-b70b-e25cdf1b3376";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_wifi_essid";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Configure the WiFi ESSID on supported phones";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "2edaa516-d87e-410f-8ddc-1cc468dabd2e";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_wifi_password";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Configure the WiFi password on supported phones";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "7b525ca5-96ae-4104-ad6c-c929f85c30dc";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_wifi_hidden_security";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "None";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Configure the security to use when connecting to a hidden SSID. Valid values: None, WEP, WPA/WPA2_PSK, 802.1X_EAP";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "032e7e44-2f61-4d62-ba64-00199a51b4f6";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_dhcp_option_override";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "1";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Allow DHCP Option 43 and Option 66 to override server. 0 - No, 1 - Yes, 2 - Prefer, fallback when failed. Default is 1. option 2 not on all phones";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "b91d347a-4705-4798-92d4-a3a98916f330";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_dhcp_option_additional_override";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Additional Override DHCP Option. 0 - None,  1 - Option 150,  2 - Option 160. Default is 0. option will be effective only when grandstream_dhcp_option_override is enabled";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "12d023f4-9fdf-4f4b-830b-f311fcaa2503";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_dhcp_option_override_sip_server";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Allow DHCP Option 120 to Override SIP Server. 0 - No, 1 - Yes. Default is 0";
+		$y++;
 ?>
diff --git a/app/ivr_menus/app_config.php b/app/ivr_menus/app_config.php
index b5b4229262..88d5f857aa 100644
--- a/app/ivr_menus/app_config.php
+++ b/app/ivr_menus/app_config.php
@@ -48,7 +48,8 @@
 		$y++;
 		$apps[$x]['destinations'][$y]['type'] = "sql";
 		$apps[$x]['destinations'][$y]['label'] = "ivr_menus_sub";
-		$apps[$x]['destinations'][$y]['name'] = "ivr_menus";
+		$apps[$x]['destinations'][$y]['name'] = "ivr_menus_sub";
+		$apps[$x]['destinations'][$y]['sql'] = "select ivr_menu_name as name, ivr_menu_uuid as uuid from v_ivr_menus ";
 		$apps[$x]['destinations'][$y]['where'] = "where domain_uuid = '\${domain_uuid}' and ivr_menu_enabled = 'true' ";
 		$apps[$x]['destinations'][$y]['order_by'] = "ivr_menu_extension asc";
 		$apps[$x]['destinations'][$y]['field']['name'] = "ivr_menu_name";
@@ -59,24 +60,21 @@
 		$y++;
 		$apps[$x]['destinations'][$y]['type'] = 'array';
 		$apps[$x]['destinations'][$y]['label'] = 'ivr_menus_other';
-		$apps[$x]['destinations'][$y]['name'] = 'ivr_menus';
+		$apps[$x]['destinations'][$y]['name'] = 'ivr_menus_other';
 		$apps[$x]['destinations'][$y]['field']['name']  = 'name';
 		$apps[$x]['destinations'][$y]['field']['destination'] = 'destination';
 		$apps[$x]['destinations'][$y]['select_value']['ivr'] = "\${name}:";
 		$apps[$x]['destinations'][$y]['select_label'] = "\${name}";
 		$z=0;
-		$apps[$x]['destinations'][$y]['result']['data'][$z]['label'] = 'top';
-		$apps[$x]['destinations'][$y]['result']['data'][$z]['name'] = 'menu-top';
-		$apps[$x]['destinations'][$y]['result']['data'][$z]['application'] = 'menu-top';
+		$apps[$x]['destinations'][$y]['result']['data'][$z]['name'] = 'top';
+		$apps[$x]['destinations'][$y]['result']['data'][$z]['destination'] = 'menu-top';
 		$z++;
-		$apps[$x]['destinations'][$y]['result']['data'][$z]['label'] = 'back';
-		$apps[$x]['destinations'][$y]['result']['data'][$z]['label'] = 'back';
-		$apps[$x]['destinations'][$y]['result']['data'][$z]['name'] = 'menu-back';
+		$apps[$x]['destinations'][$y]['result']['data'][$z]['name'] = 'back';
+		$apps[$x]['destinations'][$y]['result']['data'][$z]['destination'] = 'menu-back';
 		$z++;
-		$apps[$x]['destinations'][$y]['result']['data'][$z]['label'] = 'exit';
-		$apps[$x]['destinations'][$y]['result']['data'][$z]['name'] = 'menu-exit';
+		$apps[$x]['destinations'][$y]['result']['data'][$z]['name'] = 'exit';
+		$apps[$x]['destinations'][$y]['result']['data'][$z]['destination'] = 'menu-exit';
 		//menu-say-phrase
-		//menu-play-sound
 
 	//permission details
 		$y=0;
@@ -122,6 +120,14 @@
 		$apps[$x]['permissions'][$y]['name'] = "ivr_menu_destinations";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "ivr_menus_sub_destinations";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "ivr_menus_other_destinations";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 
 	//default settings
 		$y=0;
@@ -149,6 +155,38 @@
 		$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'] = "1012fd92-acf9-4ce9-89da-f02d4cd0e794";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "ivr_menu";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "confirm_attempts";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "1";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "028bab4e-60e3-48d0-8892-4f678c8b72af";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "ivr_menu";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "inter_digit_timeout";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "2000";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Digit timeout in milliseconds";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "f5829fb7-8bd6-4c42-af16-565882fad7ca";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "ivr_menu";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "max_failures";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "1";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "46dc3c7b-8a8d-4957-b4bd-27708c933af9";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "ivr_menu";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "max_timeouts";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "1";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "";
+		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "26984efd-2445-4ac9-b459-bb7bda4217c6";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "limit";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "ivr_menus";
@@ -223,6 +261,14 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "ivr_menu_dialect";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "ivr_menu_voice";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
+		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "ivr_menu_greet_long";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
@@ -239,6 +285,10 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "ivr_menu_pin_number";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
+		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "ivr_menu_confirm_macro";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
diff --git a/app/ivr_menus/app_defaults.php b/app/ivr_menus/app_defaults.php
index 92b44ff490..4075d60551 100644
--- a/app/ivr_menus/app_defaults.php
+++ b/app/ivr_menus/app_defaults.php
@@ -52,14 +52,37 @@ if ($domains_processed == 1) {
 			}
 		}
 		if (is_array($array) && @sizeof($array) != 0) {
+
+			$p = new permissions;
+			$p->add('ivr_menu_edit', 'temp');
+
 			$database = new database;
 			$database->app_name = 'ivr_menus';
 			$database->app_uuid = 'a5788e9b-58bc-bd1b-df59-fff5d51253ab';
 			$database->save($array);
 			unset($array);
+	
+			$p->delete('ivr_menu_edit', 'temp');
 		}
 	}
 
+	//use the ivr_menu_language to update the language dialect and voice
+	$sql = "update v_ivr_menus set ";
+	if ($db_type == 'pgsql') {
+		$sql .= "ivr_menu_language = split_part(ivr_menu_language, '/', 1), ";
+		$sql .= "ivr_menu_dialect = split_part(ivr_menu_language, '/', 2),  ";
+		$sql .= "ivr_menu_voice = split_part(ivr_menu_language, '/', 3) ";
+	}
+	elseif ($db_type == 'mysql') {
+		$sql .= "ivr_menu_language = SUBSTRING_INDEX(SUBSTRING_INDEX(ivr_menu_language, '/', 1), '/', -1), ";
+		$sql .= "ivr_menu_dialect = SUBSTRING_INDEX(SUBSTRING_INDEX(ivr_menu_language, '/', 2), '/', -1),  ";
+		$sql .= "ivr_menu_voice = SUBSTRING_INDEX(SUBSTRING_INDEX(ivr_menu_language, '/', 3), '/', -1) ";
+	}
+	$sql .= "where ivr_menu_language like '%/%/%'; ";
+	$database = new database;
+	$ivr_menus = $database->select($sql, null, 'all');
+	unset($sql);
+
 }
 
 ?>
diff --git a/app/ivr_menus/app_languages.php b/app/ivr_menus/app_languages.php
index 62e135c59f..d87b6b46ac 100644
--- a/app/ivr_menus/app_languages.php
+++ b/app/ivr_menus/app_languages.php
@@ -9,8 +9,8 @@ $text['title-option_edit']['de-ch'] = "Optionen der Automatischen Vermittlung be
 $text['title-option_edit']['de-de'] = "Optionen der Automatischen Vermittlung bearbeiten";
 $text['title-option_edit']['es-cl'] = "Editar Menú IVR";
 $text['title-option_edit']['es-mx'] = "Editar Menú IVR"; //copied from es-cl
-$text['title-option_edit']['fr-ca'] = "Menu SVI Editer un Option"; //copied from fr-fr
-$text['title-option_edit']['fr-fr'] = "Menu SVI Editer un Option";
+$text['title-option_edit']['fr-ca'] = "Menu RVI Editer un Option"; //copied from fr-fr
+$text['title-option_edit']['fr-fr'] = "Menu RVI Editer un Option";
 $text['title-option_edit']['he-il'] = "";
 $text['title-option_edit']['it-it'] = "Modifica Opzioni Menu IVR";
 $text['title-option_edit']['nl-nl'] = "IVR meni optie bewerken";
@@ -30,7 +30,7 @@ $text['title-option_add']['de-ch'] = "Optionen der Automatischen Vermittlung hin
 $text['title-option_add']['de-de'] = "Optionen der Automatischen Vermittlung hinzufügen";
 $text['title-option_add']['es-cl'] = "Agregar Menú IVR";
 $text['title-option_add']['es-mx'] = "Agregar Menú IVR"; //copied from es-cl
-$text['title-option_add']['fr-ca'] = "Menu SVI Ajouter une Option"; //copied from fr-fr
+$text['title-option_add']['fr-ca'] = "Menu RVI Ajouter une Option"; //copied from fr-fr
 $text['title-option_add']['fr-fr'] = "Menu SVI Ajouter une Option";
 $text['title-option_add']['he-il'] = "";
 $text['title-option_add']['it-it'] = "Inserisci Opzione Menu IVR";
@@ -51,7 +51,7 @@ $text['title-ivr_menus']['de-ch'] = "Automatische Vermittlungen"; //copied from
 $text['title-ivr_menus']['de-de'] = "Automatische Vermittlungen";
 $text['title-ivr_menus']['es-cl'] = "Menus IVR";
 $text['title-ivr_menus']['es-mx'] = "Menus IVR"; //copied from es-cl
-$text['title-ivr_menus']['fr-ca'] = "Menus SVI"; //copied from fr-fr
+$text['title-ivr_menus']['fr-ca'] = "Menus RVI"; //copied from fr-fr
 $text['title-ivr_menus']['fr-fr'] = "Menus SVI";
 $text['title-ivr_menus']['he-il'] = "";
 $text['title-ivr_menus']['it-it'] = "Menu IVR";
@@ -72,7 +72,7 @@ $text['title-ivr_menu']['de-ch'] = "Automatische Vermittlung"; //copied from de-
 $text['title-ivr_menu']['de-de'] = "Automatische Vermittlung";
 $text['title-ivr_menu']['es-cl'] = "Menú IVR";
 $text['title-ivr_menu']['es-mx'] = "Menú IVR"; //copied from es-cl
-$text['title-ivr_menu']['fr-ca'] = "Menu SVI"; //copied from fr-fr
+$text['title-ivr_menu']['fr-ca'] = "Menu RVI"; //copied from fr-fr
 $text['title-ivr_menu']['fr-fr'] = "Menu SVI";
 $text['title-ivr_menu']['he-il'] = "";
 $text['title-ivr_menu']['it-it'] = "Menu IVR";
@@ -93,7 +93,7 @@ $text['title-ivr_menus_sub']['de-ch'] = "Automatische Vermittlungen - Sub"; //co
 $text['title-ivr_menus_sub']['de-de'] = "Automatische Vermittlungen - Sub";
 $text['title-ivr_menus_sub']['es-cl'] = "Menus IVR - Sub";
 $text['title-ivr_menus_sub']['es-mx'] = "Menus IVR - Sub"; //copied from es-cl
-$text['title-ivr_menus_sub']['fr-ca'] = "Menus SVI - Sub"; //copied from fr-fr
+$text['title-ivr_menus_sub']['fr-ca'] = "Menus RVI - Sub"; //copied from fr-fr
 $text['title-ivr_menus_sub']['fr-fr'] = "Menus SVI - Sub";
 $text['title-ivr_menus_sub']['he-il'] = "";
 $text['title-ivr_menus_sub']['it-it'] = "Menu IVR - Sub";
@@ -114,8 +114,8 @@ $text['title-ivr_menus_other']['de-ch'] = "Automatische Vermittlungen - Other";
 $text['title-ivr_menus_other']['de-de'] = "Automatische Vermittlungen - Other";
 $text['title-ivr_menus_other']['es-cl'] = "Menus IVR - Other";
 $text['title-ivr_menus_other']['es-mx'] = "Menus IVR - Other"; //copied from es-cl
-$text['title-ivr_menus_other']['fr-ca'] = "Menus SVI - Other"; //copied from fr-fr
-$text['title-ivr_menus_other']['fr-fr'] = "Menus SVI - Other";
+$text['title-ivr_menus_other']['fr-ca'] = "Menus RVI - Autre"; //copied from fr-fr
+$text['title-ivr_menus_other']['fr-fr'] = "Menus SVI - Autre";
 $text['title-ivr_menus_other']['he-il'] = "";
 $text['title-ivr_menus_other']['it-it'] = "Menu IVR - Other";
 $text['title-ivr_menus_other']['nl-nl'] = "IVR Sub - menu";
@@ -198,7 +198,7 @@ $text['message-maximum_ivr_menus']['de-ch'] = "Maximale Anzahl an Automatischen
 $text['message-maximum_ivr_menus']['de-de'] = "Maximale Anzahl an Automatischen Vermittlungen:";
 $text['message-maximum_ivr_menus']['es-cl'] = "Máxima IVR Menús Animales:";
 $text['message-maximum_ivr_menus']['es-mx'] = "Máxima IVR Menús Animales:"; //copied from es-cl
-$text['message-maximum_ivr_menus']['fr-ca'] = "Menus Maximale SVI Admis:"; //copied from fr-fr
+$text['message-maximum_ivr_menus']['fr-ca'] = "Menus Maximale RVI Admis:"; 
 $text['message-maximum_ivr_menus']['fr-fr'] = "Menus Maximale SVI Admis:";
 $text['message-maximum_ivr_menus']['he-il'] = "";
 $text['message-maximum_ivr_menus']['it-it'] = "Massimo Menu IVR:";
@@ -631,6 +631,27 @@ $text['label-destination']['ru-ru'] = "Место назначения";
 $text['label-destination']['sv-se'] = "Destination";
 $text['label-destination']['uk-ua'] = "";
 
+$text['label-pin_number']['en-us'] = "Pin Number";
+$text['label-pin_number']['en-gb'] = "Pin Number";
+$text['label-pin_number']['ar-eg'] = "";
+$text['label-pin_number']['de-at'] = "PIN Nummer"; //copied from de-de
+$text['label-pin_number']['de-ch'] = "PIN Nummer"; //copied from de-de
+$text['label-pin_number']['de-de'] = "PIN Nummer";
+$text['label-pin_number']['es-cl'] = "Número Pin";
+$text['label-pin_number']['es-mx'] = "Número Pin"; //copied from es-cl
+$text['label-pin_number']['fr-ca'] = "Code Pin"; //copied from fr-fr
+$text['label-pin_number']['fr-fr'] = "Code Pin";
+$text['label-pin_number']['he-il'] = "";
+$text['label-pin_number']['it-it'] = "PIN";
+$text['label-pin_number']['nl-nl'] = "PIN";
+$text['label-pin_number']['pl-pl'] = "";
+$text['label-pin_number']['pt-br'] = "Código Pin"; //copied from pt-pt
+$text['label-pin_number']['pt-pt'] = "Código Pin";
+$text['label-pin_number']['ro-ro'] = "";
+$text['label-pin_number']['ru-ru'] = "PIN Номер";
+$text['label-pin_number']['sv-se'] = "Pin Nummer";
+$text['label-pin_number']['uk-ua'] = "";
+
 $text['label-comfirm_macro']['en-us'] = "Confirm Macro";
 $text['label-comfirm_macro']['en-gb'] = "Confirm Macro";
 $text['label-comfirm_macro']['ar-eg'] = "";
@@ -765,7 +786,7 @@ $text['header-option_edit']['de-ch'] = "Optionen der Automatischen Vermittlung b
 $text['header-option_edit']['de-de'] = "Optionen der Automatischen Vermittlung bearbeiten";
 $text['header-option_edit']['es-cl'] = "Editar Menú IVR";
 $text['header-option_edit']['es-mx'] = "Editar Menú IVR"; //copied from es-cl
-$text['header-option_edit']['fr-ca'] = "Menu SVI Editer un Option"; //copied from fr-fr
+$text['header-option_edit']['fr-ca'] = "Menu RVI Editer un Option"; 
 $text['header-option_edit']['fr-fr'] = "Menu SVI Editer un Option";
 $text['header-option_edit']['he-il'] = "";
 $text['header-option_edit']['it-it'] = "Modificare Opzioni Menu IVR";
@@ -786,7 +807,7 @@ $text['header-option_add']['de-ch'] = "Optionen der Automatischen Vermittlung hi
 $text['header-option_add']['de-de'] = "Optionen der Automatischen Vermittlung hinzufügen";
 $text['header-option_add']['es-cl'] = "Agregar Menú IVR";
 $text['header-option_add']['es-mx'] = "Agregar Menú IVR"; //copied from es-cl
-$text['header-option_add']['fr-ca'] = "Menu SVI Ajouter une Option"; //copied from fr-fr
+$text['header-option_add']['fr-ca'] = "Menu RVI Ajouter une Option"; //copied from fr-fr
 $text['header-option_add']['fr-fr'] = "Menu SVI Ajouter une Option";
 $text['header-option_add']['he-il'] = "";
 $text['header-option_add']['it-it'] = "Inserire Opzioni Menu IVR";
@@ -807,7 +828,7 @@ $text['header-ivr_menus']['de-ch'] = "Automatische Vermittlungen"; //copied from
 $text['header-ivr_menus']['de-de'] = "Automatische Vermittlungen";
 $text['header-ivr_menus']['es-cl'] = "Menus IVR";
 $text['header-ivr_menus']['es-mx'] = "Menus IVR"; //copied from es-cl
-$text['header-ivr_menus']['fr-ca'] = "Menus SVI"; //copied from fr-fr
+$text['header-ivr_menus']['fr-ca'] = "Menus RVI"; 
 $text['header-ivr_menus']['fr-fr'] = "Menus SVI";
 $text['header-ivr_menus']['he-il'] = "";
 $text['header-ivr_menus']['it-it'] = "Menu IVR";
@@ -828,7 +849,7 @@ $text['header-ivr_menu']['de-ch'] = "Automatische Vermittlung"; //copied from de
 $text['header-ivr_menu']['de-de'] = "Automatische Vermittlung";
 $text['header-ivr_menu']['es-cl'] = "Menú IVR";
 $text['header-ivr_menu']['es-mx'] = "Menú IVR"; //copied from es-cl
-$text['header-ivr_menu']['fr-ca'] = "Menu SVI"; //copied from fr-fr
+$text['header-ivr_menu']['fr-ca'] = "Menu RVI"; 
 $text['header-ivr_menu']['fr-fr'] = "Menu SVI";
 $text['header-ivr_menu']['he-il'] = "";
 $text['header-ivr_menu']['it-it'] = "Menu IVR";
@@ -1038,7 +1059,7 @@ $text['description-name']['de-ch'] = "Geben Sie den Namen der Automatischen Verm
 $text['description-name']['de-de'] = "Geben Sie den Namen der Automatischen Vermittlung an";
 $text['description-name']['es-cl'] = "Ingrese un nombre para el menú IVR.";
 $text['description-name']['es-mx'] = "Ingrese un nombre para el menú IVR."; //copied from es-cl
-$text['description-name']['fr-ca'] = "Choisir un nom pour le menu SVI"; //copied from fr-fr
+$text['description-name']['fr-ca'] = "Choisir un nom pour le menu RVI"; 
 $text['description-name']['fr-fr'] = "Choisir un nom pour le menu SVI";
 $text['description-name']['he-il'] = "";
 $text['description-name']['it-it'] = "Inserire un nome per l'IVR.";
@@ -1101,7 +1122,7 @@ $text['description-ivr_menus']['de-ch'] = "Die Automatische Vermittlung spielt e
 $text['description-ivr_menus']['de-de'] = "Die Automatische Vermittlung spielt eine Aufnahme oder eine vordefinierte Phrase ab von welcher der Anrufe seine Optionen wählt. Jede Option hat ein entsprechendes Ziel. Das Ziel kann eine Nebenstelle, eine Mailbox eine andere Automatische Vermittlung, Rufgruppen, Fax Server und weitere Funktionen sein.";
 $text['description-ivr_menus']['es-cl'] = "El menú IVR reproduce una grabación o una frase predefinida que presenta opciones para elegir. Cada opción corresponde a un destino. Los destinos pueden ser extensiones, correo de voz, IVR, grupos, fax entre otros.";
 $text['description-ivr_menus']['es-mx'] = "El menú IVR reproduce una grabación o una frase predefinida que presenta opciones para elegir. Cada opción corresponde a un destino. Los destinos pueden ser extensiones, correo de voz, IVR, grupos, fax entre otros."; //copied from es-cl
-$text['description-ivr_menus']['fr-ca'] = "Le Menu SVI joue un guide vocal ou un texte prédéfini qui présente à l'appelant des options à choisir. Chaque option est configurée avec une destination correspondante. Ces destnations peuvent être des extensions, messageries vocales, d'autres menus SVI, groupes d'appel, Fax, ou autres."; //copied from fr-fr
+$text['description-ivr_menus']['fr-ca'] = "Le Menu RVI joue un guide vocal ou un texte prédéfini qui présente à l'appelant des options à choisir. Chaque option est configurée avec une destination correspondante. Ces destnations peuvent être des extensions, messageries vocales, d'autres menus RVI, groupes d'appel, Fax, ou autres.";
 $text['description-ivr_menus']['fr-fr'] = "Le Menu SVI joue un guide vocal ou un texte prédéfini qui présente à l'appelant des options à choisir. Chaque option est configurée avec une destination correspondante. Ces destnations peuvent être des extensions, messageries vocales, d'autres menus SVI, groupes d'appel, Fax, ou autres.";
 $text['description-ivr_menus']['he-il'] = "";
 $text['description-ivr_menus']['it-it'] = "Il Menu IVR suona al chiamante una registrazione o una frase che illustra le opzioni selezionabili. Ciascuna opzione ha una destinazione corrispondente. Le destinazioni possono essere interni, caselle vocali, altri IVR, gruppi di squillo, FAX virtuali, etc.";
@@ -1122,7 +1143,7 @@ $text['description-ivr_menu']['de-ch'] = "Die Automatische Vermittlung spielt ei
 $text['description-ivr_menu']['de-de'] = "Die Automatische Vermittlung spielt eine Aufnahme oder eine vordefinierte Phrase ab von welcher der Anrufe seine Optionen wählt. Jede Option hat ein entsprechendes Ziel. Das Ziel kann eine Nebenstelle, eine Mailbox eine andere Automatische Vermittlung, Rufgruppen, Fax Server und weitere Funktionen sein.";
 $text['description-ivr_menu']['es-cl'] = "El menú IVR reproduce una grabación o una frase predefinida que presenta opciones para elegir. Cada opción corresponde a un destino. Los destinos pueden ser extensiones, correo de voz, IVR, grupos, fax entre otros.";
 $text['description-ivr_menu']['es-mx'] = "El menú IVR reproduce una grabación o una frase predefinida que presenta opciones para elegir. Cada opción corresponde a un destino. Los destinos pueden ser extensiones, correo de voz, IVR, grupos, fax entre otros."; //copied from es-cl
-$text['description-ivr_menu']['fr-ca'] = "Le Menu SVI joue un guide vocal ou un texte prédéfini qui présente à l'appelant des options à choisir. Chaque option est configurée avec une destination correspondante. Ces destnations peuvent être des extensions, messageries vocales, d'autres menus SVI, groupes d'appel, Fax, ou autres."; //copied from fr-fr
+$text['description-ivr_menu']['fr-ca'] = "Le Menu RVI joue un guide vocal ou un texte prédéfini qui présente à l'appelant des options à choisir. Chaque option est configurée avec une destination correspondante. Ces destnations peuvent être des extensions, messageries vocales, d'autres menus RVI, groupes d'appel, Fax, ou autres."; //copied from fr-fr
 $text['description-ivr_menu']['fr-fr'] = "Le Menu SVI joue un guide vocal ou un texte prédéfini qui présente à l'appelant des options à choisir. Chaque option est configurée avec une destination correspondante. Ces destnations peuvent être des extensions, messageries vocales, d'autres menus SVI, groupes d'appel, Fax, ou autres.";
 $text['description-ivr_menu']['he-il'] = "";
 $text['description-ivr_menu']['it-it'] = "Il Menu IVR suona al chiamante una registrazione o una frase che illustra le opzioni selezionabili. Ciascuna opzione ha una destinazione corrispondente. Le destinazioni possono essere interni, caselle vocali, altri IVR, gruppi di squillo, FAX virtuali, etc.";
@@ -1269,7 +1290,7 @@ $text['description-exit_action']['de-ch'] = "Wählen Sie eine Aktion bei Verlass
 $text['description-exit_action']['de-de'] = "Wählen Sie eine Aktion bei Verlassen der Automatischen Vermittlung.";
 $text['description-exit_action']['es-cl'] = "Seleccione la acción de salida a ser realizada si el IVR existe.";
 $text['description-exit_action']['es-mx'] = "Seleccione la acción de salida a ser realizada si el IVR existe."; //copied from es-cl
-$text['description-exit_action']['fr-ca'] = "Choisir l'action à executer en sortie si on sort du SVI par ailleurs qu'un des choix proposé."; //copied from fr-fr
+$text['description-exit_action']['fr-ca'] = "Choisir l'action à executer en sortie si on sort du RVI par ailleurs qu'un des choix proposé."; //copied from fr-fr
 $text['description-exit_action']['fr-fr'] = "Choisir l'action à executer en sortie si on sort du SVI par ailleurs qu'un des choix proposé.";
 $text['description-exit_action']['he-il'] = "";
 $text['description-exit_action']['it-it'] = "Scegliere l'azione da compiere quando si esce dall'IVR.";
@@ -1311,7 +1332,7 @@ $text['description-direct_dial']['de-ch'] = "Definieren Sie ob Anrufer direkt zu
 $text['description-direct_dial']['de-de'] = "Definieren Sie ob Anrufer direkt zu Nebenstellen durchwählen können.";
 $text['description-direct_dial']['es-cl'] = "Define si quienes llaman pueden marcar directamente a las extensiones y códigos.";
 $text['description-direct_dial']['es-mx'] = "Define si quienes llaman pueden marcar directamente a las extensiones y códigos."; //copied from es-cl
-$text['description-direct_dial']['fr-ca'] = "Défini si on peut appeler directement le SVI via une extension."; //copied from fr-fr
+$text['description-direct_dial']['fr-ca'] = "Défini si on peut appeler directement le RVI via une extension."; //copied from fr-fr
 $text['description-direct_dial']['fr-fr'] = "Défini si on peut appeler directement le SVI via une extension.";
 $text['description-direct_dial']['he-il'] = "";
 $text['description-direct_dial']['it-it'] = "Definire se i chiamanti possono chiamare direttamente gli interni registrati.";
@@ -1366,6 +1387,27 @@ $text['description-destination']['ru-ru'] = "Выберите пункт наз
 $text['description-destination']['sv-se'] = "Välj destination.";
 $text['description-destination']['uk-ua'] = "";
 
+$text['description-pin_number']['en-us'] = "Optional pin number to secure access to the menu.";
+$text['description-pin_number']['en-gb'] = "Optional pin number to secure access to the menu.";
+$text['description-pin_number']['ar-eg'] = "";
+$text['description-pin_number']['de-at'] = "";
+$text['description-pin_number']['de-ch'] = "";
+$text['description-pin_number']['de-de'] = "";
+$text['description-pin_number']['es-cl'] = "";
+$text['description-pin_number']['es-mx'] = "";
+$text['description-pin_number']['fr-ca'] = "";
+$text['description-pin_number']['fr-fr'] = "";
+$text['description-pin_number']['he-il'] = "";
+$text['description-pin_number']['it-it'] = "";
+$text['description-pin_number']['nl-nl'] = "";
+$text['description-pin_number']['pl-pl'] = "";
+$text['description-pin_number']['pt-br'] = "";
+$text['description-pin_number']['pt-pt'] = "";
+$text['description-pin_number']['ro-ro'] = "";
+$text['description-pin_number']['ru-ru'] = "";
+$text['description-pin_number']['sv-se'] = "";
+$text['description-pin_number']['uk-ua'] = "";
+
 $text['description-comfirm_macro']['en-us'] = "Enter the confirm macro.";
 $text['description-comfirm_macro']['en-gb'] = "Enter the confirm macro.";
 $text['description-comfirm_macro']['ar-eg'] = "";
diff --git a/app/ivr_menus/ivr_menu_copy.php b/app/ivr_menus/ivr_menu_copy.php
index 21cd68476f..22dc134b87 100644
--- a/app/ivr_menus/ivr_menu_copy.php
+++ b/app/ivr_menus/ivr_menu_copy.php
@@ -57,7 +57,7 @@
 			$database = new database;
 			$ivr_menus = $database->select($sql, $parameters, 'all');
 			if (!is_array($ivr_menus)) {
-				echo "access denied 63";
+				echo "access denied";
 				exit;
 			}
 			unset($sql, $parameters);
@@ -84,6 +84,11 @@
 			$ivr_menu_name = $ivr_menus[$x]['ivr_menu_name'];
 			$ivr_menu_extension = $ivr_menus[$x]['ivr_menu_extension'];
 			$ivr_menu_ringback = $ivr_menus[$x]['ivr_menu_ringback'];
+			$ivr_menu_language = $ivr_menus[$x]['ivr_menu_language'];
+			$ivr_menu_dialect = $ivr_menus[$x]['ivr_menu_dialect'];
+			$ivr_menu_voice = $ivr_menus[$x]['ivr_menu_voice'];
+			$ivr_menu_cid_prefix = $ivr_menus[$x]['ivr_menu_cid_prefix'];
+			$ivr_menu_context = $ivr_menus[$x]['ivr_menu_context'];
 			$ivr_menu_description = $ivr_menus[$x]['ivr_menu_description'].' ('.$text['label-copy'].')';
 
 		//prepare the ivr menu array
@@ -107,12 +112,23 @@
 		//build the xml dialplan
 			$dialplan_xml = "<extension name=\"".$ivr_menu_name."\" continue=\"\" uuid=\"".$dialplan_uuid."\">\n";
 			$dialplan_xml .= "	<condition field=\"destination_number\" expression=\"^".$ivr_menu_extension."\">\n";
+			$dialplan_xml .= "		<action application=\"ring_ready\" data=\"\"/>\n";
 			$dialplan_xml .= "		<action application=\"answer\" data=\"\"/>\n";
 			$dialplan_xml .= "		<action application=\"sleep\" data=\"1000\"/>\n";
 			$dialplan_xml .= "		<action application=\"set\" data=\"hangup_after_bridge=true\"/>\n";
 			$dialplan_xml .= "		<action application=\"set\" data=\"ringback=".$ivr_menu_ringback."\"/>\n";
 			$dialplan_xml .= "		<action application=\"set\" data=\"transfer_ringback=".$ivr_menu_ringback."\"/>\n";
+			$dialplan_xml .= "		<action application=\"set\" data=\"presence_id=".$ivr_menu_extension."@".$_SESSION['domain_name']."\"/>\n";
+			if (strlen($ivr_menu_language) > 0) {
+				$dialplan_xml .= "		<action application=\"set\" data=\"default_language=".$ivr_menu_language."\" inline=\"true\"/>\n";
+				$dialplan_xml .= "		<action application=\"set\" data=\"default_dialect=".$ivr_menu_dialect."\" inline=\"true\"/>\n";
+				$dialplan_xml .= "		<action application=\"set\" data=\"default_voice=".$ivr_menu_voice ."\" inline=\"true\"/>\n";
+			}
 			$dialplan_xml .= "		<action application=\"set\" data=\"ivr_menu_uuid=".$ivr_menu_uuid."\"/>\n";
+			if (strlen($ivr_menu_cid_prefix) > 0) {
+				$dialplan_xml .= "		<action application=\"set\" data=\"caller_id_name=".$ivr_menu_cid_prefix."#\${caller_id_name}\"/>\n";
+				$dialplan_xml .= "		<action application=\"set\" data=\"effective_caller_id_name=\${caller_id_name}\"/>\n";
+			}
 			$dialplan_xml .= "		<action application=\"ivr\" data=\"".$ivr_menu_uuid."\"/>\n";
 			$dialplan_xml .= "		<action application=\"hangup\" data=\"\"/>\n";
 			$dialplan_xml .= "	</condition>\n";
@@ -123,7 +139,7 @@
 			$dialplan[$x]["dialplan_uuid"] = $dialplan_uuid;
 			$dialplan[$x]["dialplan_name"] = $ivr_menu_name;
 			$dialplan[$x]["dialplan_number"] = $ivr_menu_extension;
-			$dialplan[$x]["dialplan_context"] = $_SESSION["context"];
+			$dialplan[$x]["dialplan_context"] = $ivr_menu_context;
 			$dialplan[$x]["dialplan_continue"] = "false";
 			$dialplan[$x]["dialplan_xml"] = $dialplan_xml;
 			$dialplan[$x]["dialplan_order"] = "101";
@@ -156,7 +172,7 @@
 
 		//clear the cache
 			$cache = new cache;
-			$cache->delete("dialplan:".$_SESSION["context"]);
+			$cache->delete("dialplan:".$ivr_menu_context);
 
 		//set message
 			message::add($text['message-copy']);
diff --git a/app/ivr_menus/ivr_menu_edit.php b/app/ivr_menus/ivr_menu_edit.php
index a45b7c0a94..14e58916d3 100644
--- a/app/ivr_menus/ivr_menu_edit.php
+++ b/app/ivr_menus/ivr_menu_edit.php
@@ -112,6 +112,7 @@
 			$ivr_menu_options = $_POST["ivr_menu_options"];
 			$ivr_menu_invalid_sound = $_POST["ivr_menu_invalid_sound"];
 			$ivr_menu_exit_sound = $_POST["ivr_menu_exit_sound"];
+			$ivr_menu_pin_number = $_POST["ivr_menu_pin_number"];
 			$ivr_menu_confirm_macro = $_POST["ivr_menu_confirm_macro"];
 			$ivr_menu_confirm_key = $_POST["ivr_menu_confirm_key"];
 			$ivr_menu_tts_engine = $_POST["ivr_menu_tts_engine"];
@@ -248,6 +249,12 @@
 						$dialplan_uuid = uuid();
 					}
 
+				//seperate the language components into language, dialect and voice
+					$language_array = explode("/",$ivr_menu_language);
+					$ivr_menu_language = $language_array[0];
+					$ivr_menu_dialect = $language_array[1];
+					$ivr_menu_voice = $language_array[2];
+
 				//prepare the array
 					$array['ivr_menus'][0]["ivr_menu_uuid"] = $ivr_menu_uuid;
 					$array['ivr_menus'][0]["domain_uuid"] = $domain_uuid;
@@ -256,10 +263,13 @@
 					$array['ivr_menus'][0]["ivr_menu_extension"] = $ivr_menu_extension;
 					$array['ivr_menus'][0]["ivr_menu_parent_uuid"] = $ivr_menu_parent_uuid;
 					$array['ivr_menus'][0]["ivr_menu_language"] = $ivr_menu_language;
+					$array['ivr_menus'][0]["ivr_menu_dialect"] = $ivr_menu_dialect;
+					$array['ivr_menus'][0]["ivr_menu_voice"] = $ivr_menu_voice;
 					$array['ivr_menus'][0]["ivr_menu_greet_long"] = $ivr_menu_greet_long;
 					$array['ivr_menus'][0]["ivr_menu_greet_short"] = $ivr_menu_greet_short;
 					$array['ivr_menus'][0]["ivr_menu_invalid_sound"] = $ivr_menu_invalid_sound;
 					$array['ivr_menus'][0]["ivr_menu_exit_sound"] = $ivr_menu_exit_sound;
+					$array['ivr_menus'][0]["ivr_menu_pin_number"] = $ivr_menu_pin_number;
 					$array['ivr_menus'][0]["ivr_menu_confirm_macro"] = $ivr_menu_confirm_macro;
 					$array['ivr_menus'][0]["ivr_menu_confirm_key"] = $ivr_menu_confirm_key;
 					$array['ivr_menus'][0]["ivr_menu_tts_engine"] = $ivr_menu_tts_engine;
@@ -318,8 +328,6 @@
 					}
 
 				//build the xml dialplan
-					$ivr_menu_language = explode("/",$_POST["ivr_menu_language"]);
-
 					$dialplan_xml = "<extension name=\"".$ivr_menu_name."\" continue=\"false\" uuid=\"".$dialplan_uuid."\">\n";
 					$dialplan_xml .= "	<condition field=\"destination_number\" expression=\"^".$ivr_menu_extension."\$\">\n";
 					$dialplan_xml .= "		<action application=\"ring_ready\" data=\"\"/>\n";
@@ -328,10 +336,10 @@
 					$dialplan_xml .= "		<action application=\"set\" data=\"hangup_after_bridge=true\"/>\n";
 					$dialplan_xml .= "		<action application=\"set\" data=\"ringback=".$ivr_menu_ringback."\"/>\n";
 					$dialplan_xml .= "		<action application=\"set\" data=\"presence_id=".$ivr_menu_extension."@".$_SESSION['domain_name']."\"/>\n";
-					if (isset($_POST["ivr_menu_language"])) {
-						$dialplan_xml .= "		<action application=\"set\" data=\"default_language=".$ivr_menu_language[0]."\"/>\n";
-						$dialplan_xml .= "		<action application=\"set\" data=\"default_dialect=".$ivr_menu_language[1]."\"/>\n";
-						$dialplan_xml .= "		<action application=\"set\" data=\"default_voice=".$ivr_menu_language[2]."\"/>\n";
+					if (strlen($ivr_menu_language) > 0) {
+						$dialplan_xml .= "		<action application=\"set\" data=\"default_language=".$ivr_menu_language."\" inline=\"true\"/>\n";
+						$dialplan_xml .= "		<action application=\"set\" data=\"default_dialect=".$ivr_menu_dialect."\" inline=\"true\"/>\n";
+						$dialplan_xml .= "		<action application=\"set\" data=\"default_voice=".$ivr_menu_voice ."\" inline=\"true\"/>\n";
 					}
 					$dialplan_xml .= "		<action application=\"set\" data=\"transfer_ringback=".$ivr_menu_ringback."\"/>\n";
 					$dialplan_xml .= "		<action application=\"set\" data=\"ivr_menu_uuid=".$ivr_menu_uuid."\"/>\n";
@@ -340,6 +348,10 @@
 						$dialplan_xml .= "		<action application=\"lua\" data=\"ivr_menu.lua\"/>\n";
 					}
 					else {
+						if (strlen($ivr_menu_cid_prefix) > 0) {
+							$dialplan_xml .= "		<action application=\"set\" data=\"caller_id_name=".$ivr_menu_cid_prefix."#\${caller_id_name}\"/>\n";
+							$dialplan_xml .= "		<action application=\"set\" data=\"effective_caller_id_name=\${caller_id_name}\"/>\n";
+						}
 						$dialplan_xml .= "		<action application=\"ivr\" data=\"".$ivr_menu_uuid."\"/>\n";
 					}
 
@@ -456,6 +468,7 @@
 				$ivr_menu_greet_short = $row["ivr_menu_greet_short"];
 				$ivr_menu_invalid_sound = $row["ivr_menu_invalid_sound"];
 				$ivr_menu_exit_sound = $row["ivr_menu_exit_sound"];
+				$ivr_menu_pin_number = $row["ivr_menu_pin_number"];
 				$ivr_menu_confirm_macro = $row["ivr_menu_confirm_macro"];
 				$ivr_menu_confirm_key = $row["ivr_menu_confirm_key"];
 				$ivr_menu_tts_engine = $row["ivr_menu_tts_engine"];
@@ -531,15 +544,40 @@
 	if (strlen($ivr_menu_ringback) == 0) { $ivr_menu_ringback = 'local_stream://default'; }
 	if (strlen($ivr_menu_invalid_sound) == 0) { $ivr_menu_invalid_sound = 'ivr/ivr-that_was_an_invalid_entry.wav'; }
 	//if (strlen($ivr_menu_confirm_key) == 0) { $ivr_menu_confirm_key = '#'; }
-	if (strlen($ivr_menu_language_code) == 0) { $ivr_menu_language_code = 'en'; }
-	if (strlen($ivr_menu_dialect) == 0) { $ivr_menu_dialect = 'us'; }
-	if (strlen($ivr_menu_voice) == 0) { $ivr_menu_voice = 'callie'; }
 	if (strlen($ivr_menu_tts_engine) == 0) { $ivr_menu_tts_engine = 'flite'; }
 	if (strlen($ivr_menu_tts_voice) == 0) { $ivr_menu_tts_voice = 'rms'; }
-	if (strlen($ivr_menu_confirm_attempts) == 0) { $ivr_menu_confirm_attempts = '1'; }
-	if (strlen($ivr_menu_inter_digit_timeout) == 0) { $ivr_menu_inter_digit_timeout = '2000'; }
-	if (strlen($ivr_menu_max_failures) == 0) { $ivr_menu_max_failures = '1'; }
-	if (strlen($ivr_menu_max_timeouts) == 0) { $ivr_menu_max_timeouts = '1'; }
+	if (strlen($ivr_menu_confirm_attempts) == 0) { 
+		if (strlen($_SESSION['ivr_menu']['confirm_attempts']['numeric']) > 0) {
+			$ivr_menu_confirm_attempts = $_SESSION['ivr_menu']['confirm_attempts']['numeric'];
+		}
+		else {
+			$ivr_menu_confirm_attempts = '1';
+		}
+	}
+	if (strlen($ivr_menu_inter_digit_timeout) == 0) { 
+		if (strlen($_SESSION['ivr_menu']['inter_digit_timeout']['numeric']) > 0) {
+			$ivr_menu_inter_digit_timeout = $_SESSION['ivr_menu']['inter_digit_timeout']['numeric'];
+		}
+		else {
+			$ivr_menu_inter_digit_timeout = '2000'; 
+		}
+	}
+	if (strlen($ivr_menu_max_failures) == 0) { 
+		if (strlen($_SESSION['ivr_menu']['max_failures']['numeric']) > 0) {
+			$ivr_menu_max_failures = $_SESSION['ivr_menu']['max_failures']['numeric'];
+		}
+		else {
+			$ivr_menu_max_failures = '1'; 
+		}
+	}
+	if (strlen($ivr_menu_max_timeouts) == 0) { 
+		if (strlen($_SESSION['ivr_menu']['max_timeouts']['numeric']) > 0) {
+			$ivr_menu_max_timeouts = $_SESSION['ivr_menu']['max_timeouts']['numeric'];
+		}
+		else {
+			$ivr_menu_max_timeouts = '1'; 
+		}
+	}
 	if (strlen($ivr_menu_digit_len) == 0) { $ivr_menu_digit_len = '5'; }
 	if (strlen($ivr_menu_direct_dial) == 0) { $ivr_menu_direct_dial = 'false'; }
 	if (!isset($ivr_menu_context)) { $ivr_menu_context = $_SESSION['domain_name']; }
@@ -579,7 +617,7 @@
 
 //get the sound files
 	$file = new file;
-	$sound_files = $file->sounds();
+	$sound_files = $file->sounds($ivr_menu_language, $ivr_menu_dialect, $ivr_menu_voice);
 
 //create token
 	$object = new token;
@@ -680,25 +718,17 @@
 	echo "<td class='vtable' align='left'>\n";
 	echo "  <select class='formfld' type='text' name='ivr_menu_language'>\n";
 	echo "		<option></option>\n";
-
-	if (empty($ivr_menu_language)) {
-		$ivr_menu_language = "$ivr_menu_language_code/$ivr_menu_dialect/$ivr_menu_voice";
-		$language_formatted = "$ivr_menu_language_code-$ivr_menu_dialect $ivr_menu_voice";
-		echo "		<option value='".escape($ivr_menu_language)."'>".escape($language_formatted)."</option>\n";
+	if (strlen($ivr_menu_language) > 0) {
+		$language_formatted = $ivr_menu_language."-".$ivr_menu_dialect." ".$ivr_menu_voice;
+		echo "		<option value='".escape($ivr_menu_language.'/'.$ivr_menu_dialect.'/'.$ivr_menu_voice)."' selected='selected'>".escape($language_formatted)."</option>\n";
 	}
-	else {
-		$language_array = explode ('/', $ivr_menu_language);
-		$language_formatted = $language_array[0]."-".$language_array[1]." ".$language_array[2];
-		echo "		<option value='".escape($ivr_menu_language)."' selected='selected'>".escape($language_formatted)."</option>\n";
-	}
-	
 	foreach ($language_paths as $key => $language_variables) {
 		$language_variables = explode ('/',$language_paths[$key]);
 		$language = $language_variables[0];
 		$dialect = $language_variables[1];
 		$voice = $language_variables[2];
-		if ($language_formatted <> "$language-$dialect $voice") {
-			echo "		<option value='$language/$dialect/$voice'>$language-$dialect $voice</option>\n";
+		if ($language_formatted <> $language.'-'.$dialect.' '.$voice) {
+			echo "		<option value='".$language."/".$dialect."/".$voice."'>".$language."-".$dialect." ".$voice."</option>\n";
 		}
 	}
 	echo "<br />\n";
@@ -1378,6 +1408,17 @@
 		echo "</td>\n";
 		echo "</tr>\n";
 
+		echo "<tr>\n";
+		echo "<td class='vncell' valign='top' align='left' nowrap>\n";
+		echo "	".$text['label-pin_number']."\n";
+		echo "</td>\n";
+		echo "<td class='vtable' align='left'>\n";
+		echo "	<input class='formfld' type='text' name='ivr_menu_pin_number' maxlength='255' value=\"".escape($ivr_menu_pin_number)."\">\n";
+		echo "<br />\n";
+		echo $text['description-pin_number']."\n";
+		echo "</td>\n";
+		echo "</tr>\n";
+
 		echo "<tr>\n";
 		echo "<td class='vncell' valign='top' align='left' nowrap>\n";
 		echo "	".$text['label-comfirm_macro']."\n";
diff --git a/app/ivr_menus/resources/classes/ivr_menu.php b/app/ivr_menus/resources/classes/ivr_menu.php
index 40a46246fb..f9f33ce966 100644
--- a/app/ivr_menus/resources/classes/ivr_menu.php
+++ b/app/ivr_menus/resources/classes/ivr_menu.php
@@ -52,9 +52,9 @@ if (!class_exists('ivr_menu')) {
 		public function __construct() {
 
 			//assign private variables
-				$this->app_name = 'ivr_menus';
-				$this->app_uuid = 'a5788e9b-58bc-bd1b-df59-fff5d51253ab';
-				$this->list_page = 'ivr_menus.php';
+			$this->app_name = 'ivr_menus';
+			$this->app_uuid = 'a5788e9b-58bc-bd1b-df59-fff5d51253ab';
+			$this->list_page = 'ivr_menus.php';
 
 		}
 
@@ -170,6 +170,11 @@ if (!class_exists('ivr_menu')) {
 										}
 									}
 
+								//clear the destinations session array
+									if (isset($_SESSION['destinations']['array'])) {
+										unset($_SESSION['destinations']['array']);
+									}
+
 								//set message
 									message::add($text['message-delete']);
 							}
@@ -324,11 +329,16 @@ if (!class_exists('ivr_menu')) {
 
 								//clear the cache
 									$cache = new cache;
-									$cache->delete("dialplan:".$_SESSION["context"]);
+									$cache->delete("dialplan:".$_SESSION['domain_name']);
 									foreach ($ivr_menus as $ivr_menu_uuid => $ivr_menu) {
 										$cache->delete("configuration:ivr.conf:".$ivr_menu_uuid);
 									}
 
+								//clear the destinations session array
+									if (isset($_SESSION['destinations']['array'])) {
+										unset($_SESSION['destinations']['array']);
+									}
+
 								//set message
 									message::add($text['message-toggle']);
 							}
@@ -467,7 +477,7 @@ if (!class_exists('ivr_menu')) {
 
 								//clear the cache
 									$cache = new cache;
-									$cache->delete("dialplan:".$_SESSION["context"]);
+									$cache->delete("dialplan:".$_SESSION['domain_name']);
 
 								//set message
 									message::add($text['message-copy']);
diff --git a/app/ivr_menus/resources/functions/ivr_menu_xml.php b/app/ivr_menus/resources/functions/ivr_menu_xml.php
index 6178d5c5a9..ee5de986e7 100644
--- a/app/ivr_menus/resources/functions/ivr_menu_xml.php
+++ b/app/ivr_menus/resources/functions/ivr_menu_xml.php
@@ -82,6 +82,7 @@
 					$ivr_menu_max_timeouts = $row["ivr_menu_max_timeouts"];
 					$ivr_menu_digit_len = $row["ivr_menu_digit_len"];
 					$ivr_menu_direct_dial = $row["ivr_menu_direct_dial"];
+					$ivr_menu_context = $row["ivr_menu_context"];
 					$ivr_menu_enabled = $row["ivr_menu_enabled"];
 					$ivr_menu_description = $row["ivr_menu_description"];
 
@@ -159,7 +160,7 @@
 						unset($sub_sql, $sub_result, $sub_row);
 
 						if ($ivr_menu_direct_dial == "true") {
-							$tmp .= "		<entry action=\"menu-exec-app\" digits=\"/(^\d{3,6}$)/\" param=\"transfer $1 XML ".$_SESSION["context"]."\"/>\n";
+							$tmp .= "		<entry action=\"menu-exec-app\" digits=\"/(^\d{3,6}$)/\" param=\"transfer $1 XML ".$ivr_menu_context."\"/>\n";
 						}
 						$tmp .= "	</menu>\n";
 						$tmp .= "</include>\n";
diff --git a/app/log_viewer/app_config.php b/app/log_viewer/app_config.php
index c4aeecef9f..e9328c4553 100644
--- a/app/log_viewer/app_config.php
+++ b/app/log_viewer/app_config.php
@@ -41,4 +41,4 @@
 		$apps[$x]['permissions'][$y]['name'] = "log_path_view";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 
-?>
+?>
\ No newline at end of file
diff --git a/app/log_viewer/app_languages.php b/app/log_viewer/app_languages.php
index 67f56abbf6..9700f8c408 100644
--- a/app/log_viewer/app_languages.php
+++ b/app/log_viewer/app_languages.php
@@ -294,4 +294,4 @@ $text['label-display']['ru-ru'] = "Display";
 $text['label-display']['sv-se'] = "Display";
 $text['label-display']['uk-ua'] = "Display";
 
-?>
+?>
\ No newline at end of file
diff --git a/app/log_viewer/app_menu.php b/app/log_viewer/app_menu.php
index 2835d993e6..a344a0746d 100644
--- a/app/log_viewer/app_menu.php
+++ b/app/log_viewer/app_menu.php
@@ -26,4 +26,4 @@
 	$apps[$x]['menu'][$y]['path'] = "/app/log_viewer/log_viewer.php";
 	$apps[$x]['menu'][$y]['groups'][] = "superadmin";
 
-?>
+?>
\ No newline at end of file
diff --git a/app/log_viewer/log_viewer.php b/app/log_viewer/log_viewer.php
index 613d4ed627..1fae25ec91 100644
--- a/app/log_viewer/log_viewer.php
+++ b/app/log_viewer/log_viewer.php
@@ -296,4 +296,4 @@
 //include the footer
 	require_once "resources/footer.php";
 
-?>
+?>
\ No newline at end of file
diff --git a/app/music_on_hold/music_on_hold_edit.php b/app/music_on_hold/music_on_hold_edit.php
index c76d64a9d1..c32a7c3bdc 100644
--- a/app/music_on_hold/music_on_hold_edit.php
+++ b/app/music_on_hold/music_on_hold_edit.php
@@ -365,7 +365,7 @@
 		*/
 	//recordings
 		$tmp_selected = false;
-		$sql = "select * from v_recordings where domain_uuid = :domain_uuid ";
+		$sql = "select recording_name, recording_filename from v_recordings where domain_uuid = :domain_uuid ";
 		$parameters['domain_uuid'] = $domain_uuid;
 		$database = new database;
 		$recordings = $database->select($sql, $parameters, 'all');
@@ -510,4 +510,4 @@
 //include the footer
 	require_once "resources/footer.php";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/phrases/phrase_edit.php b/app/phrases/phrase_edit.php
index 6550540cda..72dcb1394f 100644
--- a/app/phrases/phrase_edit.php
+++ b/app/phrases/phrase_edit.php
@@ -174,6 +174,11 @@
 						$cache = new cache;
 						$cache->delete("languages:".$phrase_language.".".$phrase_uuid);
 
+					//clear the destinations session array
+						if (isset($_SESSION['destinations']['array'])) {
+							unset($_SESSION['destinations']['array']);
+						}
+
 					//send a redirect
 						message::add($text['message-add']);
 						header("Location: phrase_edit.php?id=".$phrase_uuid);
@@ -240,6 +245,11 @@
 						$cache = new cache;
 						$cache->delete("languages:".$phrase_language.".".$phrase_uuid);
 
+					//clear the destinations session array
+						if (isset($_SESSION['destinations']['array'])) {
+							unset($_SESSION['destinations']['array']);
+						}
+
 					//send a redirect
 						message::add($text['message-update']);
 						header("Location: phrase_edit.php?id=".$phrase_uuid);
@@ -286,8 +296,8 @@
 		unset($sql, $parameters);
 	}
 
-//get the recordings
-	$sql = "select * from v_recordings ";
+//get the recording names from the database.
+	$sql = "select recording_name, recording_filename from v_recordings ";
 	$sql .= "where domain_uuid = :domain_uuid ";
 	$sql .= "order by recording_name asc ";
 	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
diff --git a/app/phrases/phrases.php b/app/phrases/phrases.php
index 2e281f9126..52c48517e7 100644
--- a/app/phrases/phrases.php
+++ b/app/phrases/phrases.php
@@ -54,21 +54,21 @@
 				if (permission_exists('phrase_add')) {
 					$obj = new phrases;
 					$obj->copy($phrases);
-					save_phrases_xml();
+					//save_phrases_xml();
 				}
 				break;
 			case 'toggle':
 				if (permission_exists('phrase_edit')) {
 					$obj = new phrases;
 					$obj->toggle($phrases);
-					save_phrases_xml();
+					//save_phrases_xml();
 				}
 				break;
 			case 'delete':
 				if (permission_exists('phrase_delete')) {
 					$obj = new phrases;
 					$obj->delete($phrases);
-					save_phrases_xml();
+					//save_phrases_xml();
 				}
 				break;
 		}
diff --git a/app/phrases/resources/classes/phrases.php b/app/phrases/resources/classes/phrases.php
index 2fcbc013bd..4ad96c540d 100644
--- a/app/phrases/resources/classes/phrases.php
+++ b/app/phrases/resources/classes/phrases.php
@@ -152,6 +152,11 @@ if (!class_exists('phrases')) {
 										$cache->delete("languages:".$phrase_language);
 									}
 
+								//clear the destinations session array
+									if (isset($_SESSION['destinations']['array'])) {
+										unset($_SESSION['destinations']['array']);
+									}
+
 								//set message
 									message::add($text['message-delete']);
 							}
@@ -302,6 +307,11 @@ if (!class_exists('phrases')) {
 										$cache->delete("languages:".$phrase_language);
 									}
 
+								//clear the destinations session array
+									if (isset($_SESSION['destinations']['array'])) {
+										unset($_SESSION['destinations']['array']);
+									}
+
 								//set message
 									message::add($text['message-toggle']);
 							}
diff --git a/app/polycom/app_config.php b/app/polycom/app_config.php
index 9bd5c06df3..e1038f8544 100644
--- a/app/polycom/app_config.php
+++ b/app/polycom/app_config.php
@@ -46,7 +46,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = "[*]xxxx|[2-9]11|0T|011xxx.T|[0-1][2-9]xxxxxxxxx|[2-9]xxxxxxxxx|[1-9]xxT|**x.T";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Digit Timeouts";
-        $y++;
+		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "a6f7cd49-23a6-42c5-8e77-d1ebbd274884";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_digitmap_timeout";
@@ -348,7 +348,158 @@
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_provision_cert_validate";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = "1";
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Require Provisioning Cert Validation 0=Disabled - 1=Enabled ";
-
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "5f80d126-eae1-41af-8c47-5d118ef7be50";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_display_language";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "French_Canada, Portuguese_Portugal, DTGerman_Germany, Null (default) to US English.";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "3de149e1-f61a-4d07-9bfe-177299dd625b";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_platform_profile_cipher_suite";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "ALL:!aNULL:!eNULL:!IDEA:!MEDIUM:!LOW:!ADH:!LOW:!EXP:!DH:!AECDH:!PSK:!SRP:!MD5:!RC4:@STRENGTH";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Enter the cipher suites to use for TLS Platform Profile 1";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "d8e53e24-fbb4-4cbd-bce1-dd793d92e789";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_dns_server";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the primary server to which the phone directs DNS queries.";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "094f626b-5891-4a0c-a390-49c221fcb197";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_dns_alt_server";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the secondary server to which the phone directs DNS queries.";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "ba9ad978-5c38-467b-9630-f417690b1303";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_diversion_header";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$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'] = "0 (default) - If set to 0, the diversion header is not displayed. 1 - If set to 1, the diversion header is displayed if received.";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "3351d37d-e9b8-4c5c-96e7-0f232893895c";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_keep_alive";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "The keep-alive interval in seconds.";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "808a4cb8-054a-416a-b473-804b84822385";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_boot_server_option";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "Default";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Default, Custom or Static";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "355b778a-1c6c-4ed4-ae7b-6db37b6f139a";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_lldp_enabled";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "1";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Phone attempts to determine its VLAN ID and negotiate power through LLDP. 0 - disabled. 1 - enabled";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "b19aea7a-5f3e-455c-94fe-b6b4f895a7ca";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_cdp_enabled";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "1";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "phone attempts to determine its VLAN ID and negotiate power through CDP. 0 - disabled. 1 - enabled";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "95a35bbe-3410-432a-b318-fbd6a490a56c";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_dhcp_vlan_discovery";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "Fixed";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Disabled, Fixed or Custom";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "f402600f-c31a-471f-95e4-28b5e8c1c42b";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_pagination_enabled";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "1";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "0 (default) – Disables the pagination feature. 1 – Enables the pagination feature.";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "fc0c17d4-bd64-4523-ac16-4f3b3da181e9";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_softkey_newcall";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Newcall Softkey 1=enabled 0=disable";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "97eae52e-0a66-4a97-83d0-922eaa919f86";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_softkey_directories";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Directories Softkey 1=enabled 0=disable";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "9b854a6b-10dc-4de6-a268-dc17a6f0750a";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_homescreen_forward";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Home Screen Forward option 1=enabled 0=disable";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "8cc668ef-9c94-4f43-b287-b6dcdfaebcd3";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_homescreen_directories";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Home Screen Directories option 1=enabled 0=disable";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "5bd3bf50-6d8f-42eb-85ca-c463c9c1d63d";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_homescreen_do_not_disturb";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Home Screen Do Not Disturb option 1=enabled 0=disable";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "a16eda84-d585-41f5-921e-bd8d3382458d";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_basic_call_management_redundant";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Enable to display redundant call management functions for the soft keys. 1 (default) - Enabled. 0 - Disabled";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "5f7e8466-2c82-4092-aa19-bc8af99d05b5";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_pickup_enable";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Pickup softkey  0=Disabled - 1=Enabled ";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "eabcfacc-64be-457a-ad7f-1d53e27e9eaf";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_pickup_enable";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Pick up softkey  0=Disabled - 1=Enabled ";
 ?>
diff --git a/app/provision/index.php b/app/provision/index.php
index 037df0b9ff..c2e9874493 100644
--- a/app/provision/index.php
+++ b/app/provision/index.php
@@ -137,108 +137,23 @@
 	}
 
 //get the domain_uuid
-	$sql = "select device_uuid, domain_uuid from v_devices ";
+	$sql = "select d.device_uuid, d.domain_uuid, n.domain_name ";
+	$sql .= "from v_devices as d, v_domains as n ";
 	$sql .= "where device_mac_address = :mac ";
+	$sql .= "and d.domain_uuid = n.domain_uuid; ";
 	$parameters['mac'] = $mac;
 	$database = new database;
 	$row = $database->select($sql, $parameters, 'row');
 	if (is_array($row)) {
-		$domain_uuid = $row['domain_uuid'];
 		$device_uuid = $row['device_uuid'];
+		$domain_uuid = $row['domain_uuid'];
+		$domain_name = $row['domain_name'];
 		$_SESSION['domain_uuid'] = $domain_uuid;
 	}
 	unset($sql, $parameters);
 
 //get the domain_name and domain_uuid
-	if ($_SESSION['provision']['http_domain_filter']['boolean'] == "false") {
-
-		//get the domain name
-			$domain_name = $_SESSION['domains'][$domain_uuid]['domain_name'];
-
-		//get the default settings
-			$sql = "select * from v_default_settings ";
-			$sql .= "where default_setting_enabled = 'true' ";
-			$sql .= "order by default_setting_order asc ";
-			$database = new database;
-			$result = $database->select($sql, null, 'all');
-			//unset the previous settings
-			if (is_array($result) && @sizeof($result) != 0) {
-				foreach ($result as $row) {
-					unset($_SESSION[$row['default_setting_category']]);
-				}
-				//set the settings as a session
-				foreach ($result as $row) {
-					$name = $row['default_setting_name'];
-					$category = $row['default_setting_category'];
-					$subcategory = $row['default_setting_subcategory'];
-					if (strlen($subcategory) == 0) {
-						if ($name == "array") {
-							$_SESSION[$category][] = $row['default_setting_value'];
-						}
-						else {
-							$_SESSION[$category][$name] = $row['default_setting_value'];
-						}
-					}
-					else {
-						if ($name == "array") {
-							$_SESSION[$category][$subcategory][] = $row['default_setting_value'];
-						}
-						else {
-							$_SESSION[$category][$subcategory]['uuid'] = $row['default_setting_uuid'];
-							$_SESSION[$category][$subcategory][$name] = $row['default_setting_value'];
-						}
-					}
-				}
-			}
-			unset($sql, $result, $row);
-
-		//get the domains settings
-			if (is_uuid($domain_uuid)) {
-				$sql = "select * from v_domain_settings ";
-				$sql .= "where domain_uuid = :domain_uuid ";
-				$sql .= "and domain_setting_enabled = 'true' ";
-				$sql .= "order by domain_setting_order asc ";
-				$parameters['domain_uuid'] = $domain_uuid;
-				$database = new database;
-				$result = $database->select($sql, $parameters, 'all');
-				//unset the arrays that domains are overriding
-				if (is_array($result) && @sizeof($result) != 0) {
-					foreach ($result as $row) {
-						$name = $row['domain_setting_name'];
-						$category = $row['domain_setting_category'];
-						$subcategory = $row['domain_setting_subcategory'];
-						if ($name == "array") {
-							unset($_SESSION[$category][$subcategory]);
-						}
-					}
-					//set the settings as a session
-					foreach ($result as $row) {
-						$name = $row['domain_setting_name'];
-						$category = $row['domain_setting_category'];
-						$subcategory = $row['domain_setting_subcategory'];
-						if (strlen($subcategory) == 0) {
-							//$$category[$name] = $row['domain_setting_value'];
-							if ($name == "array") {
-								$_SESSION[$category][] = $row['domain_setting_value'];
-							}
-							else {
-								$_SESSION[$category][$name] = $row['domain_setting_value'];
-							}
-						}
-						else {
-							//$$category[$subcategory][$name] = $row['domain_setting_value'];
-							if ($name == "array") {
-								$_SESSION[$category][$subcategory][] = $row['domain_setting_value'];
-							}
-							else {
-								$_SESSION[$category][$subcategory][$name] = $row['domain_setting_value'];
-							}
-						}
-					}
-				}
-			}
-	}
-	else {
+	if ($_SESSION['provision']['http_domain_filter']['boolean'] == "true") {
 		//get the domain_name
 			$domain_array = explode(":", $_SERVER["HTTP_HOST"]);
 			$domain_name = $domain_array[0];
@@ -252,6 +167,89 @@
 			unset($sql, $parameters);
 	}
 
+//get the default settings
+	$sql = "select * from v_default_settings ";
+	$sql .= "where default_setting_enabled = 'true' ";
+	$sql .= "order by default_setting_order asc ";
+	$database = new database;
+	$result = $database->select($sql, null, 'all');
+	//unset the previous settings
+	if (is_array($result) && @sizeof($result) != 0) {
+		foreach ($result as $row) {
+			unset($_SESSION[$row['default_setting_category']]);
+		}
+		//set the settings as a session
+		foreach ($result as $row) {
+			$name = $row['default_setting_name'];
+			$category = $row['default_setting_category'];
+			$subcategory = $row['default_setting_subcategory'];
+			if (strlen($subcategory) == 0) {
+				if ($name == "array") {
+					$_SESSION[$category][] = $row['default_setting_value'];
+				}
+				else {
+					$_SESSION[$category][$name] = $row['default_setting_value'];
+				}
+			}
+			else {
+				if ($name == "array") {
+					$_SESSION[$category][$subcategory][] = $row['default_setting_value'];
+				}
+				else {
+					$_SESSION[$category][$subcategory]['uuid'] = $row['default_setting_uuid'];
+					$_SESSION[$category][$subcategory][$name] = $row['default_setting_value'];
+				}
+			}
+		}
+	}
+	unset($sql, $result, $row);
+
+//get the domains settings
+	if (is_uuid($domain_uuid)) {
+		$sql = "select * from v_domain_settings ";
+		$sql .= "where domain_uuid = :domain_uuid ";
+		$sql .= "and domain_setting_enabled = 'true' ";
+		$sql .= "order by domain_setting_order asc ";
+		$parameters['domain_uuid'] = $domain_uuid;
+		$database = new database;
+		$result = $database->select($sql, $parameters, 'all');
+		//unset the arrays that domains are overriding
+		if (is_array($result) && @sizeof($result) != 0) {
+			foreach ($result as $row) {
+				$name = $row['domain_setting_name'];
+				$category = $row['domain_setting_category'];
+				$subcategory = $row['domain_setting_subcategory'];
+				if ($name == "array") {
+					unset($_SESSION[$category][$subcategory]);
+				}
+			}
+			//set the settings as a session
+			foreach ($result as $row) {
+				$name = $row['domain_setting_name'];
+				$category = $row['domain_setting_category'];
+				$subcategory = $row['domain_setting_subcategory'];
+				if (strlen($subcategory) == 0) {
+					//$$category[$name] = $row['domain_setting_value'];
+					if ($name == "array") {
+						$_SESSION[$category][] = $row['domain_setting_value'];
+					}
+					else {
+						$_SESSION[$category][$name] = $row['domain_setting_value'];
+					}
+				}
+				else {
+					//$$category[$subcategory][$name] = $row['domain_setting_value'];
+					if ($name == "array") {
+						$_SESSION[$category][$subcategory][] = $row['domain_setting_value'];
+					}
+					else {
+						$_SESSION[$category][$subcategory][$name] = $row['domain_setting_value'];
+					}
+				}
+			}
+		}
+	}
+
 //build the provision array
 	foreach($_SESSION['provision'] as $key=>$val) {
 		if (strlen($val['var']) > 0) { $value = $val['var']; }
diff --git a/app/provision/resources/classes/provision.php b/app/provision/resources/classes/provision.php
index 0d87cf90ce..43dfec1b31 100644
--- a/app/provision/resources/classes/provision.php
+++ b/app/provision/resources/classes/provision.php
@@ -295,11 +295,12 @@ include "root.php";
 				$provision = array();
 				if (is_array($_SESSION['provision'])) {
 					foreach ($_SESSION['provision'] as $key => $val) {
-						if (strlen($val['var']) > 0) { $value = $val['var']; }
-						if (strlen($val['text']) > 0) { $value = $val['text']; }
-						if (strlen($val['boolean']) > 0) { $value = $val['boolean']; }
-						if (strlen($val['numeric']) > 0) { $value = $val['numeric']; }
-						if (strlen($value) > 0) { $provision[$key] = $value; }
+						if (isset($val['var'])) { $value = $val['var']; }
+						elseif (isset($val['text'])) { $value = $val['text']; }
+						elseif (isset($val['boolean'])) { $value = $val['boolean']; }
+						elseif (isset($val['numeric'])) { $value = $val['numeric']; }
+						elseif (is_array($val) && !is_uuid($val['uuid'])) { $value = $val; }
+						if (isset($value)) { $provision[$key] = $value; }
 						unset($value);
 					}
 				}
@@ -460,6 +461,9 @@ include "root.php";
 							$templates['HW GXP1620'] = 'grandstream/gxp16xx';
 							$templates['HW GXP1625'] = 'grandstream/gxp16xx';
 							$templates['HW GXP1630'] = 'grandstream/gxp16xx';
+							$templates['HW GXP1760W'] = 'grandstream/gxp17xx';
+							$templates['HW GXP1780'] = 'grandstream/gxp17xx';
+							$templates['HW GXP1782'] = 'grandstream/gxp17xx';
 							$templates['HW GXP2124'] = 'grandstream/gxp2124';
 							$templates['HW GXP2130'] = 'grandstream/gxp2130';
 							$templates['HW GXP2135'] = 'grandstream/gxp2135';
@@ -1196,11 +1200,12 @@ include "root.php";
 				$provision = array();
 				if (is_array($_SESSION['provision'])) {
 					foreach ($_SESSION['provision'] as $key => $val) {
-						if (strlen($val['var']) > 0) { $value = $val['var']; }
-						if (strlen($val['text']) > 0) { $value = $val['text']; }
-						if (strlen($val['boolean']) > 0) { $value = $val['boolean']; }
-						if (strlen($val['numeric']) > 0) { $value = $val['numeric']; }
-						if (strlen($value) > 0) { $provision[$key] = $value; }
+						if (isset($val['var'])) { $value = $val['var']; }
+						elseif (isset($val['text'])) { $value = $val['text']; }
+						elseif (isset($val['boolean'])) { $value = $val['boolean']; }
+						elseif (isset($val['numeric'])) { $value = $val['numeric']; }
+						elseif (is_array($val) && !is_uuid($val['uuid'])) { $value = $val; }
+						if (isset($value)) { $provision[$key] = $value; }
 						unset($value);
 					}
 				}
diff --git a/app/recordings/app_config.php b/app/recordings/app_config.php
index a0f039be2c..81ebbcfbab 100644
--- a/app/recordings/app_config.php
+++ b/app/recordings/app_config.php
@@ -16,8 +16,8 @@
 		$apps[$x]['description']['de-de'] = "Aufnahmen verwalten. Diese werden hauptsächlich für Anrufzentralen (IVR) verwendet.";
 		$apps[$x]['description']['es-cl'] = "Administrador de grabaciones, utilizadas primordialmente con un IVR";
 		$apps[$x]['description']['es-mx'] = "";
-		$apps[$x]['description']['fr-ca'] = "";
-		$apps[$x]['description']['fr-fr'] = "Gestion des enregistrements principalement utilisés dans les IVR";
+		$apps[$x]['description']['fr-ca'] = "Gestion des guides vocaux principalement utilisés dans les RVI";
+		$apps[$x]['description']['fr-fr'] = "Gestion des guides vocaux principalement utilisés dans les RVI";
 		$apps[$x]['description']['he-il'] = "";
 		$apps[$x]['description']['it-it'] = "";
 		$apps[$x]['description']['nl-nl'] = "Beheer opnamen met name gebruikt in een IVR.";
@@ -92,8 +92,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = "base64";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "";
-
-		$y=0;
+		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "960828e1-8d6b-4381-86c4-fa03fce4276a";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "recordings";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "recording_max_length";
diff --git a/app/recordings/app_languages.php b/app/recordings/app_languages.php
index fb7c7d59d3..231178c9fb 100644
--- a/app/recordings/app_languages.php
+++ b/app/recordings/app_languages.php
@@ -9,8 +9,8 @@ $text['title-edit']['de-ch'] = "Aufnahmen"; //copied from de-de
 $text['title-edit']['de-de'] = "Aufnahmen";
 $text['title-edit']['es-cl'] = "Grabación";
 $text['title-edit']['es-mx'] = "Grabación"; //copied from es-cl
-$text['title-edit']['fr-ca'] = "Guide"; //copied from fr-fr
-$text['title-edit']['fr-fr'] = "Guide";
+$text['title-edit']['fr-ca'] = "Guides vocaux";
+$text['title-edit']['fr-fr'] = "Guides vocaux";
 $text['title-edit']['he-il'] = "קובץ מדיה";
 $text['title-edit']['it-it'] = "Registrazioni Audio";
 $text['title-edit']['nl-nl'] = "Opname";
@@ -30,8 +30,8 @@ $text['title-add']['de-ch'] = "Aufnahme hinzufügen"; //copied from de-de
 $text['title-add']['de-de'] = "Aufnahme hinzufügen";
 $text['title-add']['es-cl'] = "Agregar Grabación";
 $text['title-add']['es-mx'] = "Agregar Grabación"; //copied from es-cl
-$text['title-add']['fr-ca'] = "Ajouter un Guide"; //copied from fr-fr
-$text['title-add']['fr-fr'] = "Ajouter un Guide";
+$text['title-add']['fr-ca'] = "Ajouter un guide vocal"; //copied from fr-fr
+$text['title-add']['fr-fr'] = "Ajouter un guide vocal";
 $text['title-add']['he-il'] = "הוסף קבצי מדיה";
 $text['title-add']['it-it'] = "Inserire Registrazione";
 $text['title-add']['nl-nl'] = "Voeg opname toe";
@@ -51,8 +51,8 @@ $text['title-recordings']['de-ch'] = "Aufnahmen"; //copied from de-de
 $text['title-recordings']['de-de'] = "Aufnahmen";
 $text['title-recordings']['es-cl'] = "Grabaciones";
 $text['title-recordings']['es-mx'] = "Grabaciones"; //copied from es-cl
-$text['title-recordings']['fr-ca'] = "Guides Vocaux"; //copied from fr-fr
-$text['title-recordings']['fr-fr'] = "Guides Vocaux";
+$text['title-recordings']['fr-ca'] = "Guides vocaux"; //copied from fr-fr
+$text['title-recordings']['fr-fr'] = "Guides vocaux";
 $text['title-recordings']['he-il'] = "קבצי מדיה";
 $text['title-recordings']['it-it'] = "Registrazioni";
 $text['title-recordings']['nl-nl'] = "Opnamen";
@@ -72,8 +72,8 @@ $text['message-uploaded']['de-ch'] = "Datei hochgeladen"; //copied from de-de
 $text['message-uploaded']['de-de'] = "Datei hochgeladen";
 $text['message-uploaded']['es-cl'] = "Subida de Archivos";
 $text['message-uploaded']['es-mx'] = "Subida de Archivos"; //copied from es-cl
-$text['message-uploaded']['fr-ca'] = "Fichier Téléchargé"; //copied from fr-fr
-$text['message-uploaded']['fr-fr'] = "Fichier Téléchargé";
+$text['message-uploaded']['fr-ca'] = "Fichier téléchargé"; //copied from fr-fr
+$text['message-uploaded']['fr-fr'] = "Fichier téléchargé";
 $text['message-uploaded']['he-il'] = "הקובץ הועלה";
 $text['message-uploaded']['it-it'] = "File Caricato";
 $text['message-uploaded']['nl-nl'] = "Bestand opsturen";
@@ -114,8 +114,8 @@ $text['label-upload']['de-ch'] = "Dateipfad"; //copied from de-de
 $text['label-upload']['de-de'] = "Dateipfad";
 $text['label-upload']['es-cl'] = "Archivo a subir";
 $text['label-upload']['es-mx'] = "Archivo a subir"; //copied from es-cl
-$text['label-upload']['fr-ca'] = "Fichier à déposer"; //copied from fr-fr
-$text['label-upload']['fr-fr'] = "Fichier à déposer";
+$text['label-upload']['fr-ca'] = "Chemin du fichier"; //copied from fr-fr
+$text['label-upload']['fr-fr'] = "Chemin du fichier";
 $text['label-upload']['he-il'] = "נתיב הקובץ";
 $text['label-upload']['it-it'] = "Percorso File";
 $text['label-upload']['nl-nl'] = "Bestandspad";
@@ -240,8 +240,8 @@ $text['label-file_size']['de-ch'] = "Dateigröße"; //copied from de-de
 $text['label-file_size']['de-de'] = "Dateigröße";
 $text['label-file_size']['es-cl'] = "Tamaño del archivo";
 $text['label-file_size']['es-mx'] = "Tamaño del archivo"; //copied from es-cl
-$text['label-file_size']['fr-ca'] = "Taille de Fichier"; //copied from fr-fr
-$text['label-file_size']['fr-fr'] = "Taille de Fichier";
+$text['label-file_size']['fr-ca'] = "Taille du fichier"; //copied from fr-fr
+$text['label-file_size']['fr-fr'] = "Taille du fichier";
 $text['label-file_size']['he-il'] = "גודל קובץ";
 $text['label-file_size']['it-it'] = "Dimensioni File";
 $text['label-file_size']['nl-nl'] = "Bestandsomvang";
@@ -261,8 +261,8 @@ $text['label-size']['de-ch'] = "Dateigröße"; //copied from de-de
 $text['label-size']['de-de'] = "Dateigröße";
 $text['label-size']['es-cl'] = "Tamaño del archivo";
 $text['label-size']['es-mx'] = "Tamaño del archivo"; //copied from es-cl
-$text['label-size']['fr-ca'] = "Taille de Fichier"; //copied from fr-fr
-$text['label-size']['fr-fr'] = "Taille de Fichier";
+$text['label-size']['fr-ca'] = "Taille du fichier"; //copied from fr-fr
+$text['label-size']['fr-fr'] = "Taille du fichier";
 $text['label-size']['he-il'] = "גודל";
 $text['label-size']['it-it'] = "Dimensioni File";
 $text['label-size']['nl-nl'] = "Afmetingen";
@@ -366,8 +366,8 @@ $text['header']['de-ch'] = "Aufnahme hochladen"; //copied from de-de
 $text['header']['de-de'] = "Aufnahme hochladen";
 $text['header']['es-cl'] = "Subir Grabación";
 $text['header']['es-mx'] = "Subir Grabación"; //copied from es-cl
-$text['header']['fr-ca'] = "Télécharger Enregistrement"; //copied from fr-fr
-$text['header']['fr-fr'] = "Télécharger Enregistrement";
+$text['header']['fr-ca'] = "Télécharger l'enregistrement"; //copied from fr-fr
+$text['header']['fr-fr'] = "Télécharger l'enregistrement";
 $text['header']['he-il'] = "העלאת הקלטה";
 $text['header']['it-it'] = "Caricare Registrazione";
 $text['header']['nl-nl'] = "Opsturen opname";
@@ -387,8 +387,8 @@ $text['description-recording']['de-ch'] = "Ein Name für die Aufnahme."; //copie
 $text['description-recording']['de-de'] = "Ein Name für die Aufnahme.";
 $text['description-recording']['es-cl'] = "Nombre de la grabación.";
 $text['description-recording']['es-mx'] = "Nombre de la grabación."; //copied from es-cl
-$text['description-recording']['fr-ca'] = "Nom de l'enregistrement (non parsé)."; //copied from fr-fr
-$text['description-recording']['fr-fr'] = "Nom de l'enregistrement (non parsé).";
+$text['description-recording']['fr-ca'] = "Nom de l'enregistrement (non analysé)."; //copied from fr-fr
+$text['description-recording']['fr-fr'] = "Nom de l'enregistrement (non analysé).";
 $text['description-recording']['he-il'] = "שם להקלטה לא מנותח.";
 $text['description-recording']['it-it'] = "Un nome per la registrazione (non parsato).";
 $text['description-recording']['nl-nl'] = "Een naam voor de opname (niet gecontroleerd).";
diff --git a/app/recordings/app_menu.php b/app/recordings/app_menu.php
index f0d3e45c06..9bcb6ed611 100644
--- a/app/recordings/app_menu.php
+++ b/app/recordings/app_menu.php
@@ -8,8 +8,8 @@
 	$apps[$x]['menu'][$y]['title']['de-de'] = "Aufnahmen";
 	$apps[$x]['menu'][$y]['title']['es-cl'] = "Grabaciones";
 	$apps[$x]['menu'][$y]['title']['es-mx'] = "";
-	$apps[$x]['menu'][$y]['title']['fr-ca'] = "";
-	$apps[$x]['menu'][$y]['title']['fr-fr'] = "Guides Vocaux";
+	$apps[$x]['menu'][$y]['title']['fr-ca'] = "Guides vocaux";
+	$apps[$x]['menu'][$y]['title']['fr-fr'] = "Guides vocaux";
 	$apps[$x]['menu'][$y]['title']['he-il'] = "";
 	$apps[$x]['menu'][$y]['title']['it-it'] = "Registrazioni Audio";
 	$apps[$x]['menu'][$y]['title']['nl-nl'] = "Opnamen";
diff --git a/app/recordings/recording_edit.php b/app/recordings/recording_edit.php
index d6c8ddb329..7091696773 100644
--- a/app/recordings/recording_edit.php
+++ b/app/recordings/recording_edit.php
@@ -55,10 +55,18 @@
 		$recording_name = $_POST["recording_name"];
 		$recording_description = $_POST["recording_description"];
 
-		//clean the recording filename and name
-		$recording_filename = str_replace(" ", "_", $recording_filename);
-		$recording_filename = str_replace("'", "", $recording_filename);
-		$recording_name = str_replace("'", "", $recording_name);
+		//sanitize recording filename and name
+		$recording_filename_ext = strtolower(pathinfo($recording_filename, PATHINFO_EXTENSION));
+		if (!in_array($recording_filename_ext, ['wav','mp3','ogg'])) {
+			$recording_filename = pathinfo($recording_filename, PATHINFO_FILENAME);
+			$recording_filename = str_replace('.', '', $recording_filename);
+		}
+		$recording_filename = str_replace("\\", '', $recording_filename);
+		$recording_filename = str_replace('/', '', $recording_filename);
+		$recording_filename = str_replace('..', '', $recording_filename);
+		$recording_filename = str_replace(' ', '_', $recording_filename);
+		$recording_filename = str_replace("'", '', $recording_filename);
+		$recording_name = str_replace("'", '', $recording_name);
 	}
 
 if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
@@ -140,7 +148,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 //pre-populate the form
 	if (count($_GET)>0 && $_POST["persistformvar"] != "true") {
 		$recording_uuid = $_GET["id"];
-		$sql = "select * from v_recordings ";
+		$sql = "select recording_name, recording_filename, recording_description from v_recordings ";
 		$sql .= "where domain_uuid = :domain_uuid ";
 		$sql .= "and recording_uuid = :recording_uuid ";
 		$parameters['domain_uuid'] = $domain_uuid;
@@ -229,4 +237,4 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 //include the footer
 	require_once "resources/footer.php";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/recordings/recordings.php b/app/recordings/recordings.php
index 941c7a374d..05ca5ac758 100644
--- a/app/recordings/recordings.php
+++ b/app/recordings/recordings.php
@@ -128,6 +128,11 @@
 		//move the uploaded files
 			move_uploaded_file($_FILES['ulfile']['tmp_name'], $_SESSION['switch']['recordings']['dir'].'/'.$_SESSION['domain_name'].'/'.$recording_filename);
 
+		//clear the destinations session array
+			if (isset($_SESSION['destinations']['array'])) {
+				unset($_SESSION['destinations']['array']);
+			}
+
 		//set the message
 			message::add($text['message-uploaded'].": ".htmlentities($recording_filename));
 
diff --git a/app/recordings/resources/classes/switch_recordings.php b/app/recordings/resources/classes/switch_recordings.php
index 6806c47086..77549ab6f0 100644
--- a/app/recordings/resources/classes/switch_recordings.php
+++ b/app/recordings/resources/classes/switch_recordings.php
@@ -76,7 +76,7 @@ if (!class_exists('switch_recordings')) {
 		 * list recordings
 		 */
 		public function list_recordings() {
-			$sql = "select recording_uuid, recording_filename, recording_base64 ";
+			$sql = "select recording_uuid, recording_filename ";
 			$sql .= "from v_recordings ";
 			$sql .= "where domain_uuid = :domain_uuid ";
 			$parameters['domain_uuid'] = $this->domain_uuid;
@@ -151,6 +151,11 @@ if (!class_exists('switch_recordings')) {
 										}
 									}
 
+								//clear the destinations session array
+									if (isset($_SESSION['destinations']['array'])) {
+										unset($_SESSION['destinations']['array']);
+									}
+
 								//set message
 									message::add($text['message-delete']);
 							}
@@ -162,4 +167,4 @@ if (!class_exists('switch_recordings')) {
 	} //class
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/app/registrations/registrations.php b/app/registrations/registrations.php
index ece59bf31e..97527b380d 100644
--- a/app/registrations/registrations.php
+++ b/app/registrations/registrations.php
@@ -191,13 +191,28 @@
 		foreach ($registrations as $row) {
 			$matches = preg_grep('/'.$search.'/i', $row);
 			if ($matches != false) {
+
+				//prepare the user variable
 				$user = explode('@', $row['user']);
 				if ($user[1] == $_SESSION['domains'][$_SESSION['domain_uuid']]['domain_name']) {
-					$user = "<span class='hide-sm-dn'>".escape($row['user'])."</span><span class='hide-md-up cursor-help' title='".$row['user']."'>".escape($user[0])."@...</span>";
+					$user = "<span class='hide-sm-dn'>".escape($row['user'])."</span><span class='hide-md-up cursor-help' title='".escape($row['user'])."'>".escape($user[0])."</span>";
 				}
 				else {
 					$user = escape($row['user']);
 				}
+
+				//reformat the status
+				$patterns = array();
+				$patterns[] = '/(\d{4})-(\d{2})-(\d{2})/';
+				$patterns[] = '/(\d{2}):(\d{2}):(\d{2})/';
+				$patterns[] = '/unknown/';
+				$patterns[] = '/exp\(/';
+				$patterns[] = '/\(/';
+				$patterns[] = '/\)/';
+				$patterns[] = '/\s+/';
+				$status = preg_replace($patterns, ' ', $row['status']);
+
+				//show the content
 				echo "<tr class='list-row' href='#'>\n";
 				echo "	<td class='checkbox'>\n";
 				echo "		<input type='checkbox' name='registrations[$x][checked]' id='checkbox_".$x."' value='true' onclick=\"if (!this.checked) { document.getElementById('checkbox_all').checked = false; }\">\n";
@@ -207,14 +222,14 @@
 				echo "		<input type='hidden' name='registrations[$x][host]' value='".escape($row['host'])."' />\n";
 				echo "		<input type='hidden' name='registrations[$x][domain]' value='".escape($row['sip-auth-realm'])."' />\n";
 				echo "	</td>\n";
-				echo "	<td>".$user."</td>\n";
-				echo "	<td class='overflow' title=\"".escape($row['agent'])."\"><span class='cursor-help'>".escape($row['agent'])."</span></td>\n";
+				echo "	<td class=''>".$user."</td>\n";
+				echo "	<td class='' title=\"".escape($row['agent'])."\"><span class='cursor-help'>".escape($row['agent'])."</span></td>\n";
 				echo "	<td class='hide-md-dn'>".escape(explode('"',$row['contact'])[1])."</td>\n";
 				echo "	<td class='hide-sm-dn no-link'><a href='https://".urlencode($row['lan-ip'])."' target='_blank'>".escape($row['lan-ip'])."</a></td>\n";
 				echo "	<td class='hide-sm-dn no-link'><a href='https://".urlencode($row['network-ip'])."' target='_blank'>".escape($row['network-ip'])."</a></td>\n";
 				echo "	<td class='hide-sm-dn'>".escape($row['network-port'])."</td>\n";
 				echo "	<td class='hide-md-dn'>".escape($row['host'])."</td>\n";
-				echo "	<td class='overflow' title=\"".escape($row['status'])."\"><span class='cursor-help'>".escape($row['status'])."</span></td>\n";
+				echo "	<td class='' title=\"".escape($row['status'])."\"><span class='cursor-help'>".escape($status)."</span></td>\n";
 				echo "	<td class='hide-md-dn'>".escape($row['ping-time'])."</td>\n";
 				echo "	<td class='hide-md-dn'>".escape($row['sip_profile_name'])."</td>\n";
 				echo "	<td class='action-button'>\n";
diff --git a/app/ring_groups/resources/classes/ring_groups.php b/app/ring_groups/resources/classes/ring_groups.php
index 3e4d8405eb..1677f30538 100644
--- a/app/ring_groups/resources/classes/ring_groups.php
+++ b/app/ring_groups/resources/classes/ring_groups.php
@@ -166,6 +166,11 @@ if (!class_exists('ring_groups')) {
 										}
 									}
 
+								//clear the destinations session array
+									if (isset($_SESSION['destinations']['array'])) {
+										unset($_SESSION['destinations']['array']);
+									}
+
 								//set message
 									message::add($text['message-delete']);
 							}
@@ -335,6 +340,11 @@ if (!class_exists('ring_groups')) {
 										}
 									}
 
+								//clear the destinations session array
+									if (isset($_SESSION['destinations']['array'])) {
+										unset($_SESSION['destinations']['array']);
+									}
+
 								//set message
 									message::add($text['message-toggle']);
 							}
diff --git a/app/ring_groups/ring_group_edit.php b/app/ring_groups/ring_group_edit.php
index 61d67811a4..3e0bd9b8cc 100644
--- a/app/ring_groups/ring_group_edit.php
+++ b/app/ring_groups/ring_group_edit.php
@@ -324,8 +324,12 @@
 			$array['ring_groups'][0]["ring_group_greeting"] = $ring_group_greeting;
 			$array['ring_groups'][0]["ring_group_strategy"] = $ring_group_strategy;
 			$array["ring_groups"][0]["ring_group_call_timeout"] = $ring_group_call_timeout;
-			$array["ring_groups"][0]["ring_group_caller_id_name"] = $ring_group_caller_id_name;
-			$array["ring_groups"][0]["ring_group_caller_id_number"] = $ring_group_caller_id_number;
+			if (permission_exists('ring_group_caller_id_name')) {
+				$array["ring_groups"][0]["ring_group_caller_id_name"] = $ring_group_caller_id_name;
+			}
+			if (permission_exists('ring_group_caller_id_number')) {
+				$array["ring_groups"][0]["ring_group_caller_id_number"] = $ring_group_caller_id_number;
+			}
 			if (permission_exists('ring_group_cid_name_prefix')) {
 				$array["ring_groups"][0]["ring_group_cid_name_prefix"] = $ring_group_cid_name_prefix;
 			}
@@ -435,6 +439,11 @@
 			$cache = new cache;
 			$cache->delete("dialplan:".$ring_group_context);
 
+		//clear the destinations session array
+			if (isset($_SESSION['destinations']['array'])) {
+				unset($_SESSION['destinations']['array']);
+			}
+
 		//set the message
 			if ($action == "add") {
 				//save the message to a session variable
diff --git a/app/ring_groups/ring_group_forward.php b/app/ring_groups/ring_group_forward.php
index 8eeab78fdb..3161c4fc87 100644
--- a/app/ring_groups/ring_group_forward.php
+++ b/app/ring_groups/ring_group_forward.php
@@ -24,6 +24,7 @@
 	Mark J Crane <markjcrane@fusionpbx.com>
 	James Rose <james.o.rose@gmail.com>
 */
+
 //includes
 	require_once "root.php";
 	require_once "resources/require.php";
@@ -43,6 +44,15 @@
 	$language = new text;
 	$text = $language->get($_SESSION['domain']['language']['code'], 'app/ring_groups');
 
+//get the list
+	if (permission_exists('ring_group_add') || permission_exists('ring_group_edit')) {
+		$domain_uuid = $_SESSION['domain_uuid'];
+	}
+	else {
+		//show only assigned ring groups
+		$domain_uuid = $_SESSION['user']['domain_uuid'];
+	}
+
 //get variables used to control the order
 	$order_by = $_GET["order_by"];
 	$order = $_GET["order"];
@@ -75,7 +85,6 @@
 			//build array
 				if (is_uuid($row['ring_group_uuid'])) {
 					$array['ring_groups'][$x]['ring_group_uuid'] = $row['ring_group_uuid'];
-					$array['ring_groups'][$x]['domain_uuid'] = $_SESSION['domain_uuid'];
 					$array['ring_groups'][$x]['ring_group_forward_enabled'] = $row['ring_group_forward_enabled'] == 'true' && $row['ring_group_forward_destination'] != '' ? 'true' : 'false';
 					$array['ring_groups'][$x]['ring_group_forward_destination'] = $row['ring_group_forward_destination'];
 				}
@@ -118,7 +127,7 @@
 		$sql .= "where r.ring_group_uuid = u.ring_group_uuid ";
 		$sql .= "and r.domain_uuid = :domain_uuid ";
 		$sql .= "and u.user_uuid = :user_uuid ";
-		$parameters['domain_uuid'] = $_SESSION['user']['domain_uuid'];
+		$parameters['domain_uuid'] = $domain_uuid;
 		$parameters['user_uuid'] = $_SESSION['user']['user_uuid'];
 	}
 	$database = new database;
@@ -144,7 +153,8 @@
 	}
 	else {
 		//show only assigned ring groups
-		$sql = "select r.ring_group_name, r.ring_group_uuid, r.ring_group_extension, r.ring_group_forward_destination, r.ring_group_forward_enabled, r.ring_group_description from v_ring_groups as r, v_ring_group_users as u ";
+		$sql = "select r.ring_group_name, r.ring_group_uuid, r.ring_group_extension, r.ring_group_forward_destination, ";
+		$sql .= "r.ring_group_forward_enabled, r.ring_group_description from v_ring_groups as r, v_ring_group_users as u ";
 		$sql .= "where r.ring_group_uuid = u.ring_group_uuid ";
 		$sql .= "and r.domain_uuid = :domain_uuid ";
 		$sql .= "and u.user_uuid = :user_uuid ";
diff --git a/app/scripts/resources/scripts/app/call_block/index.lua b/app/scripts/resources/scripts/app/call_block/index.lua
index 9e10fc4ddd..7e82784060 100644
--- a/app/scripts/resources/scripts/app/call_block/index.lua
+++ b/app/scripts/resources/scripts/app/call_block/index.lua
@@ -44,8 +44,10 @@
 	if (session:ready()) then
 		--session:setAutoHangup(false);
 		domain_uuid = session:getVariable("domain_uuid");
+		call_direction = session:getVariable("call_direction");
 		caller_id_name = session:getVariable("caller_id_name");
 		caller_id_number = session:getVariable("caller_id_number");
+		destination_number = session:getVariable("destination_number");
 		context = session:getVariable("context");
 		call_block = session:getVariable("call_block");
 		extension_uuid = session:getVariable("extension_uuid");
@@ -90,23 +92,48 @@
 				assert(dbh:connected());
 
 			--check to see if the call should be blocked
-				sql = "select * from v_call_block ";
-				sql = sql .. "where domain_uuid = :domain_uuid ";
-				sql = sql .. "and call_block_enabled = 'true' ";
-				sql = sql .. "and ( ";
-				sql = sql .. "	(call_block_name = :call_block_name and call_block_number = :call_block_number) ";
-				sql = sql .. "	or (call_block_name is null and call_block_number = :call_block_number) ";
-				sql = sql .. "	or (call_block_name = :call_block_name and call_block_number is null) ";
-				sql = sql .. ") ";
+				sql = "select * from v_call_block\n";
+				sql = sql .. "where (domain_uuid = :domain_uuid or domain_uuid is null) \n";
+				sql = sql .. "and call_block_enabled = 'true' \n";
+				sql = sql .. "and call_block_direction = :call_block_direction \n";
+				sql = sql .. "and ( \n";
+				sql = sql .. "	(\n";
+				sql = sql .. "		call_block_name = :call_block_name \n";
+				sql = sql .. "		and ( \n";
+				sql = sql .. "			'+' || call_block_country_code || call_block_number = :call_block_number \n";
+				sql = sql .. "			or call_block_country_code || call_block_number = :call_block_number \n";
+				sql = sql .. "			or call_block_number = :call_block_number \n";
+				sql = sql .. "		) \n";
+				sql = sql .. "	) \n";
+				sql = sql .. "	or (\n";
+				sql = sql .. "		call_block_name is null \n";
+				sql = sql .. "		and ( \n";
+				sql = sql .. "			'+' || call_block_country_code || call_block_number = :call_block_number \n";
+				sql = sql .. "			or call_block_country_code || call_block_number = :call_block_number \n";
+				sql = sql .. "			or call_block_number = :call_block_number \n";
+				sql = sql .. "		) \n";
+				sql = sql .. "	) \n";
+				sql = sql .. "	or (call_block_name = :call_block_name and call_block_number is null) \n";
+				sql = sql .. ") \n";
 				if (extension_uuid == nil) then
 					sql = sql .. "and extension_uuid is null ";
 				else
 					sql = sql .. "and (extension_uuid is null or extension_uuid = :extension_uuid) ";
 				end
 				if (extension_uuid ~= nil) then
-					params = {domain_uuid = domain_uuid, call_block_name = caller_id_name, call_block_number = caller_id_number, extension_uuid = extension_uuid};
+					if (call_direction == 'inbound') then
+						params = {domain_uuid = domain_uuid, call_block_direction = call_direction, call_block_name = caller_id_name, call_block_number = caller_id_number, extension_uuid = extension_uuid};
+					end
+					if (call_direction == 'outbound') then
+						params = {domain_uuid = domain_uuid, call_block_direction = call_direction, call_block_name = caller_id_name, call_block_number = destination_number, extension_uuid = extension_uuid};
+					end
 				else
-					params = {domain_uuid = domain_uuid, call_block_name = caller_id_name, call_block_number = caller_id_number};
+					if (call_direction == 'inbound') then
+						params = {domain_uuid = domain_uuid, call_block_direction = call_direction, call_block_name = caller_id_name, call_block_number = caller_id_number};
+					end
+					if (call_direction == 'outbound') then
+						params = {domain_uuid = domain_uuid, call_block_direction = call_direction, call_block_name = caller_id_name, call_block_number = destination_number};
+					end
 				end
 				if (debug["sql"]) then
 					freeswitch.consoleLog("notice", "[dialplan] SQL: " .. sql .. "; params:" .. json.encode(params) .. "\n");
diff --git a/app/scripts/resources/scripts/app/fax/resources/scripts/queue/exec.lua b/app/scripts/resources/scripts/app/fax/resources/scripts/queue/exec.lua
index 89c9864572..c2ca5fad26 100644
--- a/app/scripts/resources/scripts/app/fax/resources/scripts/queue/exec.lua
+++ b/app/scripts/resources/scripts/app/fax/resources/scripts/queue/exec.lua
@@ -8,7 +8,7 @@
 --  p     - pause 500 ms
 --  P     - pause 1000 ms
 --
--- example: pause 5 sec dial 008 pause 2 sec paly greeting
+-- example: pause 5 sec dial 008 pause 2 sec play greeting
 -- PPPPP008@300PP
 --
 
diff --git a/app/scripts/resources/scripts/app/fax/resources/scripts/queue/retry.lua b/app/scripts/resources/scripts/app/fax/resources/scripts/queue/retry.lua
index e35f97d85d..f168ea1182 100644
--- a/app/scripts/resources/scripts/app/fax/resources/scripts/queue/retry.lua
+++ b/app/scripts/resources/scripts/app/fax/resources/scripts/queue/retry.lua
@@ -223,8 +223,8 @@
 			fax_file                       = fax_file or dbh.NULL;
 			fax_ecm_used                   = fax_ecm_used or dbh.NULL;
 			fax_local_station_id           = fax_local_station_id or dbh.NULL;
-			fax_document_transferred_pages = fax_document_transferred_pages or "'0'";
-			fax_document_total_pages       = fax_document_total_pages or "'0'";
+			fax_document_transferred_pages = fax_document_transferred_pages or '0';
+			fax_document_total_pages       = fax_document_total_pages or '0';
 			fax_image_resolution           = fax_image_resolution or dbh.NULL;
 			fax_image_size                 = fax_image_size or dbh.NULL;
 			fax_bad_rows                   = fax_bad_rows or dbh.NULL;
diff --git a/app/scripts/resources/scripts/app/feature_event/index.lua b/app/scripts/resources/scripts/app/feature_event/index.lua
index d0d38d3930..95ec5edf72 100644
--- a/app/scripts/resources/scripts/app/feature_event/index.lua
+++ b/app/scripts/resources/scripts/app/feature_event/index.lua
@@ -16,7 +16,7 @@
 --
 --      The Initial Developer of the Original Code is
 --      Mark J Crane <markjcrane@fusionpbx.com>
---      Copyright (C) 2013 - 2014
+--      Copyright (C) 2013 - 2021
 --      the Initial Developer. All Rights Reserved.
 --
 --      Contributor(s):
@@ -72,11 +72,11 @@
 	end
 
 --get the events
-	--if (user == nil) then 		
+	--if (user == nil) then
 		--serialize the data for the console
 			--freeswitch.consoleLog("notice","[events] " .. event:serialize("xml") .. "\n");
 			--freeswitch.consoleLog("notice","[evnts] " .. event:serialize("json") .. "\n");
-	
+
 		--get the event variables
 			user            = event:getHeader("user");
 			host            = event:getHeader("host");
@@ -87,7 +87,7 @@
 			action_name     = event:getHeader("Action-Name");
 			action_value    = event:getHeader("Action-Value")
 			ring_count      = event:getHeader("ringCount")
-	
+
 		--send to the log
 			--freeswitch.consoleLog("notice","[events] user: " .. user .. "\n");
 			--freeswitch.consoleLog("notice","[events] host: " .. host .. "\n");
@@ -96,7 +96,7 @@
 			--if (action_name ~= nil) then freeswitch.consoleLog("notice","[events] action_name: " .. action_name .. "\n"); end
 			--if (action_value ~= nil) then freeswitch.consoleLog("notice","[events] action_value: " .. action_value .. "\n"); end
 	--end
-	
+
 	--get the domain uuid from the host
 		local sql = "select * from v_domains ";
 		sql = sql .. "where domain_name = :domain_name ";
@@ -112,19 +112,20 @@
 		if (user ~= nil and domain_name ~= nil) then
 			do_not_disturb, forward_all_enabled, forward_all_destination, forward_busy_enabled, forward_busy_destination, forward_no_answer_enabled, forward_no_answer_destination, call_timeout = notify.get_db_values(user, domain_name)
 		end
-		
+
 	--get sip profile
 		if (user ~= nil and host ~= nil) then
-			sip_profile = notify.get_profile(user, host);
+			sip_profiles = notify.get_profiles(user, host);
 		end
-			
+
 	--DND
-	
+		if (sip_profiles ~= nil) then
 		--DND enabled
-			if (feature_action == "SetDoNotDisturb" and feature_enabled == "true" and sip_profile ~= nil) then
+			if (feature_action == "SetDoNotDisturb" and feature_enabled == "true") then
 				--set a variable
 					dial_string = "error/user_busy";
 					do_not_disturb = "true";
+
 				--update the extension
 					sql = "update v_extensions set ";
 					sql = sql .. "do_not_disturb = :do_not_disturb, ";
@@ -152,16 +153,16 @@
 							dbh:query(sql, params);
 						end
 					end
-			
+
 				--send notify to the phone
-					notify.dnd(user, host, sip_profile, do_not_disturb);	
-				
+					notify.dnd(user, host, sip_profiles, do_not_disturb);
 			end
 
 		--DND disabled
-			if (feature_action == "SetDoNotDisturb" and feature_enabled == "false" and sip_profile ~= nil ) then
+			if (feature_action == "SetDoNotDisturb" and feature_enabled == "false") then
 					--set a variable
 						do_not_disturb = "false";
+
 					--update the extension
 						sql = "update v_extensions set ";
 						sql = sql .. "do_not_disturb = :do_not_disturb, ";
@@ -176,61 +177,24 @@
 						dbh:query(sql, params);
 
 				--send notify to the phone
-					notify.dnd(user, host, sip_profile, do_not_disturb);	
-		
+					notify.dnd(user, host, sip_profiles, do_not_disturb);
+
 			end
 
 	--Call Forward
-		
+
 		--Call Formward All enabled
-			if (feature_action == "SetCallForward" and feature_enabled == "true" and action_name == "forward_immediate" and sip_profile ~= nil) then
+			if (feature_action == "SetCallForward" and feature_enabled == "true" and action_name == "forward_immediate") then
 				--set a variable
 					forward_all_destination = action_value;
 					forward_all_enabled = "true";
 					forward_immediate_destination = action_value;
 					forward_immediate_enabled = "true";
-					
-				--get the caller_id for outbound call
-					local forward_caller_id = ""
-					if not empty(forward_caller_id_uuid) then
-						local sql = "select destination_number, destination_description,"..
-							"destination_caller_id_number, destination_caller_id_name " ..
-							"from v_destinations where domain_uuid = :domain_uuid and " ..
-							"destination_type = 'inbound' and destination_uuid = :destination_uuid";
-						local params = {domain_uuid = domain_uuid; destination_uuid = forward_caller_id_uuid}
-						if (debug["sql"]) then
-							freeswitch.consoleLog("notice", "[feature_event] "..sql.."; params:" .. json.encode(params) .. "\n");
-						end
-						local row = dbh:first_row(sql, params)
-						if row then
-							local caller_id_number = row.destination_caller_id_number
-							if empty(caller_id_number) then
-								caller_id_number = row.destination_number
-							end
-				
-							local caller_id_name = row.destination_caller_id_name
-							if empty(caller_id_name) then
-								caller_id_name = row.destination_description
-							end
-				
-							if not empty(caller_id_number) then
-								forward_caller_id = forward_caller_id ..
-									 ",outbound_caller_id_number=" .. caller_id_number ..
-									 ",origination_caller_id_number=" .. caller_id_number
-							end
-				
-							if not empty(caller_id_name) then
-								forward_caller_id = forward_caller_id ..
-									 ",outbound_caller_id_name=" .. caller_id_name ..
-									 ",origination_caller_id_name=" .. caller_id_name
-							end
-						end
-					end
-				
+
 				--set the dial string
 					if feature_enabled == "true" then
 						local destination_extension, destination_number_alias
-				
+
 						--used for number_alias to get the correct user
 						local sql = "select extension, number_alias from v_extensions ";
 						sql = sql .. "where domain_uuid = :domain_uuid ";
@@ -244,56 +208,56 @@
 							destination_extension = row.extension;
 							destination_number_alias = row.number_alias or '';
 						end);
-				
+
 						if (destination_user ~= nil) then
 							cmd = "user_exists id ".. destination_user .." "..domain_name;
 						else
 							cmd = "user_exists id ".. forward_all_destination .." "..domain_name;
 						end
 						local user_exists = trim(api:executeString(cmd));
-				
 					end
-					
-					--update the extension
-						sql = "update v_extensions set ";
-						sql = sql .. "do_not_disturb = 'false', ";
-						sql = sql .. "forward_all_enabled = 'true', ";
-						sql = sql .. "forward_all_destination = :forward_all_destination, ";
-						sql = sql .. "dial_string = null ";
-						sql = sql .. "where domain_uuid = :domain_uuid ";
-						sql = sql .. "and extension_uuid = :extension_uuid ";
-						local params = {domain_uuid = domain_uuid, extension_uuid = extension_uuid, forward_all_destination = forward_all_destination};
-						if (debug["sql"]) then
-							freeswitch.consoleLog("notice", "[feature_event] "..sql.."; params:" .. json.encode(params) .. "\n");
-						end
-						dbh:query(sql, params);
-						
-					--update follow me
-						if (follow_me_uuid ~= nil) then
-							if (string.len(follow_me_uuid) > 0) then
-								local sql = "update v_follow_me set ";
-								sql = sql .. "follow_me_enabled = 'false' ";
-								sql = sql .. "where domain_uuid = :domain_uuid ";
-								sql = sql .. "and follow_me_uuid = :follow_me_uuid ";
-								local params = {domain_uuid = domain_uuid, follow_me_uuid = follow_me_uuid};
-								if (debug["sql"]) then
-									freeswitch.consoleLog("notice", "[feature_event] "..sql.."; params:" .. json.encode(params) .. "\n");
-								end
-								dbh:query(sql, params);
+
+				--update the extension
+					sql = "update v_extensions set ";
+					sql = sql .. "do_not_disturb = 'false', ";
+					sql = sql .. "forward_all_enabled = 'true', ";
+					sql = sql .. "forward_all_destination = :forward_all_destination, ";
+					sql = sql .. "dial_string = null ";
+					sql = sql .. "where domain_uuid = :domain_uuid ";
+					sql = sql .. "and extension_uuid = :extension_uuid ";
+					local params = {domain_uuid = domain_uuid, extension_uuid = extension_uuid, forward_all_destination = forward_all_destination};
+					if (debug["sql"]) then
+						freeswitch.consoleLog("notice", "[feature_event] "..sql.."; params:" .. json.encode(params) .. "\n");
+					end
+					dbh:query(sql, params);
+
+				--update follow me
+					if (follow_me_uuid ~= nil) then
+						if (string.len(follow_me_uuid) > 0) then
+							local sql = "update v_follow_me set ";
+							sql = sql .. "follow_me_enabled = 'false' ";
+							sql = sql .. "where domain_uuid = :domain_uuid ";
+							sql = sql .. "and follow_me_uuid = :follow_me_uuid ";
+							local params = {domain_uuid = domain_uuid, follow_me_uuid = follow_me_uuid};
+							if (debug["sql"]) then
+								freeswitch.consoleLog("notice", "[feature_event] "..sql.."; params:" .. json.encode(params) .. "\n");
 							end
+							dbh:query(sql, params);
 						end
-					
-					--send notify to the phone
-						notify.forward_immediate(user, host, sip_profile, forward_immediate_enabled, forward_immediate_destination);	
+					end
+
+				--send notify to the phone
+					notify.forward_immediate(user, host, sip_profiles, forward_immediate_enabled, forward_immediate_destination);
 			end
 
 		--Call Formward All disable
-			if (feature_action == "SetCallForward" and feature_enabled == "false" and action_name == "forward_immediate" and sip_profile ~= nil) then
+			if (feature_action == "SetCallForward" and feature_enabled == "false" and action_name == "forward_immediate") then
 				--set a variable				
 					forward_all_destination = action_value;
 					forward_all_enabled = "false";
 					forward_immediate_enabled = "false";
 					forward_immediate_destination = action_value;
+
 				--update the extension
 					sql = "update v_extensions set ";
 					sql = sql .. "do_not_disturb = 'false', ";
@@ -311,19 +275,20 @@
 						freeswitch.consoleLog("notice", "[feature_event] "..sql.."; params:" .. json.encode(params) .. "\n");
 					end
 					dbh:query(sql, params);
-					
-					--send notify to the phone
-						if (forward_immediate_destination == nil) then 
-							forward_immediate_destination = " ";
-						end
-						notify.forward_immediate(user, host, sip_profile, forward_immediate_enabled, forward_immediate_destination);					
+
+				--send notify to the phone
+					if (forward_immediate_destination == nil) then
+						forward_immediate_destination = " ";
+					end
+					notify.forward_immediate(user, host, sip_profiles, forward_immediate_enabled, forward_immediate_destination);
 			end
-			
+
 		--Call Formward BUSY enable
-			if (feature_action == "SetCallForward" and feature_enabled == "true" and action_name == "forward_busy" and sip_profile ~= nil) then
+			if (feature_action == "SetCallForward" and feature_enabled == "true" and action_name == "forward_busy") then
 				--set a variable
 					forward_busy_destination = action_value;
 					forward_busy_enabled = "true";
+
 				--update the extension
 					sql = "update v_extensions set ";
 					sql = sql .. "do_not_disturb = 'false', ";
@@ -336,16 +301,17 @@
 						freeswitch.consoleLog("notice", "[feature_event] "..sql.."; params:" .. json.encode(params) .. "\n");
 					end
 					dbh:query(sql, params);
-					
+
 				--send notify to the phone
-					notify.forward_busy(user, host, sip_profile, forward_busy_enabled, forward_busy_destination);
+					notify.forward_busy(user, host, sip_profiles, forward_busy_enabled, forward_busy_destination);
 			end
-			
+
 		--Call Formward BUSY disable
-			if (feature_action == "SetCallForward" and feature_enabled == "false" and action_name == "forward_busy" and sip_profile ~= nil) then
+			if (feature_action == "SetCallForward" and feature_enabled == "false" and action_name == "forward_busy") then
 				--set a variable
 					forward_busy_destination = action_value;
 					forward_busy_enabled = "false";
+
 				--update the extension
 					sql = "update v_extensions set ";
 					sql = sql .. "do_not_disturb = 'false', ";
@@ -362,17 +328,18 @@
 						freeswitch.consoleLog("notice", "[feature_event] "..sql.."; params:" .. json.encode(params) .. "\n");
 					end
 					dbh:query(sql, params);
-					
+
 				--send notify to the phone
-					notify.forward_busy(user, host, sip_profile, forward_busy_enabled, forward_busy_destination);					
+					notify.forward_busy(user, host, sip_profiles, forward_busy_enabled, forward_busy_destination);
 			end
 
 		--Call Formward NO ANSWER enable
-			if (feature_action == "SetCallForward" and feature_enabled == "true" and action_name == "forward_no_answer" and sip_profile ~= nil) then
+			if (feature_action == "SetCallForward" and feature_enabled == "true" and action_name == "forward_no_answer") then
 				--set a variable
 					forward_no_answer_destination = action_value;
 					forward_no_answer_enabled = "true";
 					call_timeout = ring_count * 6;
+
 				--update the extension
 					sql = "update v_extensions set ";
 					sql = sql .. "do_not_disturb = 'false', ";
@@ -388,14 +355,15 @@
 					dbh:query(sql, params);
 
 				--send notify to the phone
-					notify.forward_no_answer(user, host, sip_profile, forward_no_answer_enabled, forward_no_answer_destination, ring_count);
+					notify.forward_no_answer(user, host, sip_profiles, forward_no_answer_enabled, forward_no_answer_destination, ring_count);
 			end
-			
+
 		--Call Formward NO ANSWER disable
-			if (feature_action == "SetCallForward" and feature_enabled == "false" and action_name == "forward_no_answer" and sip_profile ~= nil) then
+			if (feature_action == "SetCallForward" and feature_enabled == "false" and action_name == "forward_no_answer") then
 				--set a variable
 					forward_no_answer_destination = action_value;
 					forward_no_answer_enabled = "false";
+
 				--update the extension
 					sql = "update v_extensions set ";
 					sql = sql .. "do_not_disturb = 'false', ";
@@ -414,28 +382,28 @@
 					dbh:query(sql, params);
 
 				--send notify to the phone
-					notify.forward_no_answer(user, host, sip_profile, forward_no_answer_enabled, forward_no_answer_destination, ring_count);					
+					notify.forward_no_answer(user, host, sip_profiles, forward_no_answer_enabled, forward_no_answer_destination, ring_count);
 			end			
 	
 	--No feature event (phone boots): Send all values
 		if (feature_enabled == nil) then
 			--Do Not Disturb
-					--notify.dnd(user, host, sip_profile, do_not_disturb);
+				--notify.dnd(user, host, sip_profiles, do_not_disturb);
 
 			--Forward all
-					forward_immediate_enabled = forward_all_enabled;
-					forward_immediate_destination = forward_all_destination;
-					--notify.forward_immediate(user, host, sip_profile, forward_immediate_enabled, forward_immediate_destination);
+				forward_immediate_enabled = forward_all_enabled;
+				forward_immediate_destination = forward_all_destination;
+				--notify.forward_immediate(user, host, sip_profiles, forward_immediate_enabled, forward_immediate_destination);
 
 			--Forward busy
-					--notify.forward_busy(user, host, sip_profile, forward_busy_enabled, forward_busy_destination);
+				--notify.forward_busy(user, host, sip_profiles, forward_busy_enabled, forward_busy_destination);
 
 			--Forward No Answer
-					ring_count = math.ceil (call_timeout / 6);
-					--notify.forward_no_answer(user, host, sip_profile, forward_no_answer_enabled, forward_no_answer_destination, ring_count);
+				ring_count = math.ceil (call_timeout / 6);
+				--notify.forward_no_answer(user, host, sip_profiles, forward_no_answer_enabled, forward_no_answer_destination, ring_count);
 			notify.init(user, 
 				host, 
-				sip_profile, 
+				sip_profiles,
 				forward_immediate_enabled, 
 				forward_immediate_destination, 
 				forward_busy_enabled, 
@@ -445,9 +413,9 @@
 				ring_count, 
 				do_not_disturb);
 		end
-		
---		feature_event_notify.init(user, host, sip_profile, forward_immediate_enabled, forward_immediate_destination, forward_busy_enabled, forward_busy_destination, forward_no_answer_enabled, forward_no_answer_destination, ring_count, do_not_disturb)
-	
+
+--		feature_event_notify.init(user, host, sip_profiles, forward_immediate_enabled, forward_immediate_destination, forward_busy_enabled, forward_busy_destination, forward_no_answer_enabled, forward_no_answer_destination, ring_count, do_not_disturb)
+	end
 	--clear the cache
 		if (feature_enabled ~= nil) then
 			cache.del("directory:"..user.."@"..host)
diff --git a/app/scripts/resources/scripts/app/feature_event/resources/functions/feature_event_notify.lua b/app/scripts/resources/scripts/app/feature_event/resources/functions/feature_event_notify.lua
index e5769cada0..3cc4c1b34c 100644
--- a/app/scripts/resources/scripts/app/feature_event/resources/functions/feature_event_notify.lua
+++ b/app/scripts/resources/scripts/app/feature_event/resources/functions/feature_event_notify.lua
@@ -39,7 +39,6 @@ function feature_event_notify.get_db_values(user, domain_name)
 					forward_no_answer_destination           = row.forward_no_answer_destination;
 					forward_user_not_registered_enabled     = row.forward_user_not_registered_enabled;
 					forward_user_not_registered_destination = row.forward_user_not_registered_destination;
-					forward_caller_id_uuid                  = row.forward_caller_id_uuid;
 					toll_allow                              = row.toll_allow
 					call_timeout                            = row.call_timeout
 					--freeswitch.consoleLog("NOTICE", "[feature_event] extension "..row.extension.."\n");
@@ -57,22 +56,36 @@ function feature_event_notify.get_db_values(user, domain_name)
 			return do_not_disturb, forward_all_enabled, forward_all_destination, forward_busy_enabled, forward_busy_destination, forward_no_answer_enabled, forward_no_answer_destination, call_timeout
 end
 
-function feature_event_notify.get_profile(user, host)		
+---@return table, nil
+function feature_event_notify.get_profiles(user, domain)
 		--includes
-		require "resources.functions.explode"
 		require "resources.functions.trim"
-		
-		local account = user.."@"..host
+
+		local account = user.."@"..domain
 		--create the api object
 		api = freeswitch.API();
 		local sofia_contact = trim(api:executeString("sofia_contact */"..account));
-		local array = explode("/", sofia_contact);
-		local sip_profile = array[2];
-		return sip_profile
+		--get all profiles for the user account
+		local profile_iterator = string.gmatch(sofia_contact, "sofia/([^,]+)/[^,]+");
+
+		--remove any duplicates and check if we have any profiles
+		local unique_profiles = {}
+		local has_profile = false
+		for profile in profile_iterator do
+			has_profile = true
+			unique_profiles[profile] = 1
+		end
+
+		-- return nil if we have no profiles
+		if not has_profile then return nil end
+
+		return unique_profiles
 end
 
-function feature_event_notify.dnd(user, host, sip_profile, do_not_disturb)
-		--set the event and send it
+
+function feature_event_notify.dnd(user, host, sip_profiles, do_not_disturb)
+	--set the event and send it to each profile
+	for sip_profile, _ in pairs(sip_profiles) do
 		local event = freeswitch.Event("SWITCH_EVENT_PHONE_FEATURE")
 		event:addHeader("profile", sip_profile)
 		event:addHeader("user", user)
@@ -81,11 +94,14 @@ function feature_event_notify.dnd(user, host, sip_profile, do_not_disturb)
 		event:addHeader("Feature-Event", "DoNotDisturbEvent")
 		event:addHeader("doNotDisturbOn", do_not_disturb)
 		--freeswitch.consoleLog("notice","[events] " .. event:serialize("xml") .. "\n");
+		freeswitch.msleep(200);
 		event:fire()
+	end
 end
 
-function feature_event_notify.forward_immediate(user, host, sip_profile, forward_immediate_enabled, forward_immediate_destination)
-		--set the event and send it
+function feature_event_notify.forward_immediate(user, host, sip_profiles, forward_immediate_enabled, forward_immediate_destination)
+	--set the event and send it to each profile
+	for sip_profile, _ in pairs(sip_profiles) do
 		local event = freeswitch.Event("SWITCH_EVENT_PHONE_FEATURE")
 		event:addHeader("profile", sip_profile)
 		event:addHeader("user", user)
@@ -95,11 +111,14 @@ function feature_event_notify.forward_immediate(user, host, sip_profile, forward
 		event:addHeader("forward_immediate_enabled", forward_immediate_enabled)
 		event:addHeader("forward_immediate", forward_immediate_destination);
 		freeswitch.consoleLog("notice","[events] " .. event:serialize("xml") .. "\n");
+		freeswitch.msleep(200);
 		event:fire()
+	end
 end
 
-function feature_event_notify.forward_busy(user, host, sip_profile, forward_busy_enabled, forward_busy_destination)
-		--set the event and send it
+function feature_event_notify.forward_busy(user, host, sip_profiles, forward_busy_enabled, forward_busy_destination)
+	--set the event and send it to each profile
+	for sip_profile, _ in pairs(sip_profiles) do
 		local event = freeswitch.Event("SWITCH_EVENT_PHONE_FEATURE")
 		event:addHeader("profile", sip_profile)
 		event:addHeader("user", user)
@@ -108,11 +127,14 @@ function feature_event_notify.forward_busy(user, host, sip_profile, forward_busy
 		event:addHeader("Feature-Event", "ForwardingEvent")
 		event:addHeader("forward_busy", forward_busy_destination)
 		event:addHeader("forward_busy_enabled", forward_busy_enabled)
+		freeswitch.msleep(200);
 		event:fire()
+	end
 end
 
-function feature_event_notify.forward_no_answer(user, host, sip_profile, forward_no_answer_enabled, forward_no_answer_destination, ring_count)
-		--set the event and send it
+function feature_event_notify.forward_no_answer(user, host, sip_profiles, forward_no_answer_enabled, forward_no_answer_destination, ring_count)
+	--set the event and send it to each profile
+	for sip_profile, _ in pairs(sip_profiles) do
 		local event = freeswitch.Event("SWITCH_EVENT_PHONE_FEATURE")
 		event:addHeader("profile", sip_profile)
 		event:addHeader("user", user)
@@ -122,11 +144,14 @@ function feature_event_notify.forward_no_answer(user, host, sip_profile, forward
 		event:addHeader("forward_no_answer", forward_no_answer_destination)
 		event:addHeader("forward_no_answer_enabled", forward_no_answer_enabled)
 		event:addHeader("ringCount", ring_count)
+		freeswitch.msleep(200);
 		event:fire()
+	end
 end
 
-function feature_event_notify.init(user, host, sip_profile, forward_immediate_enabled, forward_immediate_destination, forward_busy_enabled, forward_busy_destination, forward_no_answer_enabled, forward_no_answer_destination, ring_count, do_not_disturb)
-		--set the event and send it
+function feature_event_notify.init(user, host, sip_profiles, forward_immediate_enabled, forward_immediate_destination, forward_busy_enabled, forward_busy_destination, forward_no_answer_enabled, forward_no_answer_destination, ring_count, do_not_disturb)
+	--set the event and send it to each profile
+	for sip_profile, _ in pairs(sip_profiles) do
 		local event = freeswitch.Event("SWITCH_EVENT_PHONE_FEATURE")
 		event:addHeader("profile", sip_profile)
 		event:addHeader("user", user)
@@ -143,7 +168,9 @@ function feature_event_notify.init(user, host, sip_profile, forward_immediate_en
 		event:addHeader("ringCount", ring_count)		
 		event:addHeader("Feature-Event", "DoNotDisturbEvent")
 		event:addHeader("doNotDisturbOn", do_not_disturb)
+		freeswitch.msleep(200);
 		event:fire()
+	end
 end
 
 return feature_event_notify
diff --git a/app/scripts/resources/scripts/app/follow_me/index.lua b/app/scripts/resources/scripts/app/follow_me/index.lua
index 6bf3b04bb7..5713d65a4d 100644
--- a/app/scripts/resources/scripts/app/follow_me/index.lua
+++ b/app/scripts/resources/scripts/app/follow_me/index.lua
@@ -28,6 +28,7 @@
 	if (session:ready()) then
 		domain_name = session:getVariable("domain_name");
 		domain_uuid = session:getVariable("domain_uuid");
+		uuid = session:getVariable("uuid");
 		destination_number = session:getVariable("destination_number");
 		caller_id_name = session:getVariable("caller_id_name");
 		caller_id_number = session:getVariable("caller_id_number");
@@ -80,18 +81,23 @@
 						cmd = "user_data ".. destination_number .."@" ..domain_name.." var toll_allow";
 						toll_allow = api:executeString(cmd);
 						--freeswitch.consoleLog("notice", "[follow me][call forward all] " .. destination_number .. " toll_allow is ".. toll_allow .."\n");
+					
+					--get the extensions accountcode
+						cmd = "user_data ".. destination_number .."@" ..domain_name.." var accountcode";
+						accountcode = api:executeString(cmd);
 
 					--get the new destination 
 						cmd = "user_data ".. destination_number .."@" ..domain_name.." var forward_all_destination";
 						destination_number = api:executeString(cmd);
+
 						--freeswitch.consoleLog("notice", "[follow me][call forward all] " .. count .. " " .. cmd .. " ".. destination_number .."\n");
 						count = count + 1;
 						if (count < 5) then
-							count, destination_number = get_forward_all(count, destination_number, domain_name);
+							count, destination_number, toll_allow, accountcode = get_forward_all(count, destination_number, domain_name);
 						end
 				end
 		end
-		return count, destination_number, toll_allow;
+		return count, destination_number, toll_allow, accountcode;
 	end
 
 --get the forward busy
@@ -116,7 +122,7 @@
 	end
 
 --select data from the database
-	local sql = "select follow_me_uuid, toll_allow ";
+	local sql = "select follow_me_uuid, toll_allow, accountcode ";
 	sql = sql .. "from v_extensions ";
 	sql = sql .. "where domain_uuid = :domain_uuid ";
 	sql = sql .. "and ( ";
@@ -130,13 +136,14 @@
 	status = dbh:query(sql, params, function(row)
 		follow_me_uuid = row["follow_me_uuid"];
 		extension_toll_allow = row["toll_allow"];
+		accountcode = row["accountcode"];
 	end);
 	--dbh:query(sql, params, function(row);
 
 --get the follow me data
 	if (follow_me_uuid ~= nil) then
 		local sql = "select cid_name_prefix, cid_number_prefix, ";
-		sql = sql .. "follow_me_enabled, follow_me_caller_id_uuid, follow_me_ignore_busy ";
+		sql = sql .. "follow_me_enabled, follow_me_ignore_busy ";
 		sql = sql .. "from v_follow_me ";
 		sql = sql .. "where domain_uuid = :domain_uuid ";
 		sql = sql .. "and follow_me_uuid = :follow_me_uuid; ";
@@ -148,7 +155,6 @@
 			caller_id_name_prefix = row["cid_name_prefix"];
 			caller_id_number_prefix = row["cid_number_prefix"];
 			follow_me_enabled = row["follow_me_enabled"];
-			follow_me_caller_id_uuid = row["follow_me_caller_id_uuid"];
 			follow_me_ignore_busy = row["follow_me_ignore_busy"];
 		end);
 		--dbh:query(sql, params, function(row);
@@ -176,7 +182,7 @@
 			end
 
 			--follow the forwards
-			count, destination_number, toll_allow = get_forward_all(0, row.destination_number, domain_name);
+			count, destination_number, toll_allow, accountcode = get_forward_all(0, row.destination_number, domain_name);
 
 			--update values
 			row['destination_number'] = destination_number
@@ -200,6 +206,7 @@
 				--set the values
 					external = "true";
 					row['user_exists'] = "false";
+					row['accountcode'] = accountcode;
 				--add the row to the destinations array
 					destinations[x] = row;
 			end
@@ -262,6 +269,7 @@
 			group_confirm_key = row.group_confirm_key;
 			group_confirm_file = row.group_confirm_file;
 			toll_allow = row.toll_allow;
+			accountcode = row.accountcode;
 			user_exists = row.user_exists;
 
 		--follow the forwards
@@ -322,8 +330,23 @@
 				--get the extension_uuid
 				cmd = "user_data ".. destination_number .."@"..domain_name.." var extension_uuid";
 				extension_uuid = trim(api:executeString(cmd));
+
+				local record_session = "";
+				--if session is already recording then skip
+				if (session:getVariable("record_session") ~= "true") then
+					local cmd = "user_data "..destination_number.."@"..domain_name.." var user_record";
+					local user_record = api:executeString(cmd);
+					if (user_record == "all" or user_record == call_direction) then 
+						local recordings_dir = session:getVariable("recordings_dir");
+						local record_ext = session:getVariable("record_ext") or "wav";
+						local record_name = uuid.."."..record_ext;
+						local record_path = recordings_dir .. "/" .. domain_name .. "/archive/" .. os.date("%Y/%b/%d");
+						record_session = ",api_on_answer='uuid_record "..uuid.." start ".. record_path .. "/" .. record_name .. "',record_path='".. record_path .."',record_name="..record_name;
+					end
+				end
+
 				--send to user
-				local dial_string_to_user = "[sip_invite_domain="..domain_name..",call_direction="..call_direction..","..group_confirm..","..timeout_name.."="..destination_timeout..","..delay_name.."="..destination_delay..",dialed_extension=" .. row.destination_number .. ",extension_uuid="..extension_uuid .. "]user/" .. row.destination_number .. "@" .. domain_name;
+				local dial_string_to_user = "[sip_invite_domain="..domain_name..",call_direction="..call_direction..","..group_confirm..","..timeout_name.."="..destination_timeout..","..delay_name.."="..destination_delay..",dialed_extension=" .. row.destination_number .. ",extension_uuid="..extension_uuid..record_session.."]user/" .. row.destination_number .. "@" .. domain_name;
 				dial_string = dial_string_to_user;
 			elseif (tonumber(destination_number) == nil) then
 				--sip uri
@@ -340,23 +363,6 @@
 						toll_allow = '';
 					end
 
-				--get the destination caller id name and number
-					if (follow_me_caller_id_uuid and follow_me_caller_id_uuid ~= '') then
-						local sql = "select destination_uuid, destination_number, destination_description, destination_caller_id_name, destination_caller_id_number ";
-						sql = sql .. "from v_destinations ";
-						sql = sql .. "where domain_uuid = :domain_uuid ";
-						sql = sql .. "and destination_uuid = :destination_uuid ";
-						sql = sql .. "order by destination_number asc ";
-						local params = {domain_uuid = domain_uuid, destination_uuid = follow_me_caller_id_uuid};
-						if (debug["sql"]) then
-							freeswitch.consoleLog("notice", "SQL:" .. sql .. "; params: " .. json.encode(params) .. "\n");
-						end
-						status = dbh:query(sql, params, function(field)
-							caller_id_name = field["destination_caller_id_name"];
-							caller_id_number = field["destination_caller_id_number"];
-						end);
-					end
-
 				--check if the user exists
 					if tonumber(caller_id_number) ~= nil then
 						cmd = "user_exists id ".. caller_id_number .." "..domain_name;
@@ -387,7 +393,7 @@
 				--set the destination dial string
 					-- have to double destination_delay here due a FS bug requiring a 50% delay value for internal extensions, but not external calls. 
 					destination_delay = destination_delay * 2;
-					dial_string = "[ignore_early_media=true,toll_allow=".. toll_allow ..",".. caller_id ..",sip_invite_domain="..domain_name..",domain_uuid="..domain_uuid..",call_direction="..call_direction..","..group_confirm..","..timeout_name.."="..destination_timeout..","..delay_name.."="..destination_delay.."]"..route_bridge
+					dial_string = "[ignore_early_media=true,toll_allow=".. toll_allow ..",accountcode="..accountcode..",".. caller_id ..",sip_invite_domain="..domain_name..",domain_uuid="..domain_uuid..",call_direction="..call_direction..","..group_confirm..","..timeout_name.."="..destination_timeout..","..delay_name.."="..destination_delay.."]"..route_bridge
 			end
 
 		--add a delimiter between destinations
diff --git a/app/scripts/resources/scripts/app/provision/index.lua b/app/scripts/resources/scripts/app/provision/index.lua
index 3256e785d7..05a2c78e58 100644
--- a/app/scripts/resources/scripts/app/provision/index.lua
+++ b/app/scripts/resources/scripts/app/provision/index.lua
@@ -193,6 +193,7 @@
 					event:addHeader('content-type', 'application/simple-message-summary');
 				--check sync
 					event:addHeader('event-string', 'check-sync;reboot='..reboot);
+					--event:addHeader('event-string', 'resync');
 				--send the event
 					event:fire();
 		end);
@@ -249,6 +250,7 @@
 			event:addHeader('content-type', 'application/simple-message-summary');
 		--check sync
 			event:addHeader('event-string', 'check-sync;reboot='..reboot);
+			--event:addHeader('event-string', 'resync');
 		--send the event
 			event:fire();
 	end
diff --git a/app/scripts/resources/scripts/app/ring_groups/index.lua b/app/scripts/resources/scripts/app/ring_groups/index.lua
index 1b9251b4a7..61d72800cb 100644
--- a/app/scripts/resources/scripts/app/ring_groups/index.lua
+++ b/app/scripts/resources/scripts/app/ring_groups/index.lua
@@ -305,7 +305,7 @@
 			if (missed_call_app == "email") then
 				--prepare the email address
 					mail_to = missed_call_data;
-			
+
 				--set the sounds path for the language, dialect and voice
 					default_language = session:getVariable("default_language");
 					default_dialect = session:getVariable("default_dialect");
@@ -325,6 +325,7 @@
 					if (debug["sql"]) then
 						freeswitch.consoleLog("notice", "[voicemail] SQL: " .. sql .. "; params:" .. json.encode(params) .. "\n");
 					end
+					dbh = Database.new('system');
 					dbh:query(sql, params, function(row)
 						subject = row["template_subject"];
 						body = row["template_body"];
@@ -882,6 +883,9 @@
 				end
 			end
 
+		--release dbh before bridge
+				dbh:release();
+				
 		--session execute
 			if (session:ready()) then
 				--set the variables
@@ -1006,6 +1010,7 @@
 									session:execute(ring_group_timeout_app, ring_group_timeout_data);
 								end
 						else
+							dbh = Database.new('system');
 							local sql = "SELECT ring_group_timeout_app, ring_group_timeout_data FROM v_ring_groups ";
 							sql = sql .. "where ring_group_uuid = :ring_group_uuid";
 							local params = {ring_group_uuid = ring_group_uuid};
diff --git a/app/scripts/resources/scripts/app/voicemail/resources/functions/forward_add_intro.lua b/app/scripts/resources/scripts/app/voicemail/resources/functions/forward_add_intro.lua
index cb0526115d..9ba01371e2 100644
--- a/app/scripts/resources/scripts/app/voicemail/resources/functions/forward_add_intro.lua
+++ b/app/scripts/resources/scripts/app/voicemail/resources/functions/forward_add_intro.lua
@@ -48,8 +48,9 @@
 
 				--record your message at the tone press any key or stop talking to end the recording
 					if (session:ready()) then
-						--session:sayPhrase("voicemail_record_greeting", "", "en")
 						session:execute("playback", "phrase:voicemail_record_greeting");
+						session:execute("sleep", "1000");
+						session:streamFile("tone_stream://L=1;%(1000, 0, 640)");
 					end
 
 				--set the file full path
diff --git a/app/scripts/resources/scripts/app/voicemail/resources/functions/listen_to_recording.lua b/app/scripts/resources/scripts/app/voicemail/resources/functions/listen_to_recording.lua
index 831202b0ad..0b0afd52e7 100644
--- a/app/scripts/resources/scripts/app/voicemail/resources/functions/listen_to_recording.lua
+++ b/app/scripts/resources/scripts/app/voicemail/resources/functions/listen_to_recording.lua
@@ -46,27 +46,27 @@
 					session:execute("playback", "phrase:voicemail_say_message_number:" .. message_status .. ":" .. message_number);
 				end
 			end
-		--say the caller id number
-			if (session:ready() and caller_id_number ~= nil) then
-				if (vm_say_caller_id_number ~= nil) then
-					if (vm_say_caller_id_number == "true") then
-						session:streamFile(sounds_dir.."/"..default_language.."/"..default_dialect.."/"..default_voice.."/voicemail/vm-from.wav");
-						session:say(caller_id_number, default_language, "name_spelled", "iterated");
-					end
-				end
+		--say the caller id number first (default)
+			if (
+				session:ready() and
+				caller_id_number ~= nil and (
+					vm_say_caller_id_number == nil or
+					vm_say_caller_id_number == "true"
+				)) then
+				session:streamFile(sounds_dir.."/"..default_language.."/"..default_dialect.."/"..default_voice.."/voicemail/vm-from.wav");
+				session:say(caller_id_number, default_language, "name_spelled", "iterated");
 			end
-		--say the message date
-			if (session:ready()) then
-				if (string.len(dtmf_digits) == 0) then
-					if (vm_say_date_time ~= nil) then
-						if (vm_say_date_time == "true") then
-							if (current_time_zone ~= nil) then
-								session:execute("set", "timezone="..current_time_zone.."");
-							end
-							session:say(created_epoch, default_language, "current_date_time", "pronounced");
-						end
-					end
+		--say the message date first (default)
+			if (
+				session:ready() and
+				string.len(dtmf_digits) == 0 and (
+					vm_say_date_time == nil or
+					vm_say_date_time == "true"
+				)) then
+				if (current_time_zone ~= nil) then
+					session:execute("set", "timezone="..current_time_zone.."");
 				end
+				session:say(created_epoch, default_language, "current_date_time", "pronounced");
 			end
 		--get the recordings from the database
 			if (storage_type == "base64") then
@@ -156,10 +156,31 @@
 				os.remove(voicemail_dir.."/"..voicemail_id.."/intro_"..uuid.."."..vm_message_ext);
 				os.remove(voicemail_dir.."/"..voicemail_id.."/msg_"..uuid.."."..vm_message_ext);
 			end
-		
+		--say the caller id number last (optional)
+			if (
+				session:ready() and
+				caller_id_number ~= nil and
+				vm_say_caller_id_number ~= nil and
+				vm_say_caller_id_number == "last"
+				) then
+				session:streamFile(sounds_dir.."/"..default_language.."/"..default_dialect.."/"..default_voice.."/voicemail/vm-from.wav");
+				session:say(caller_id_number, default_language, "name_spelled", "iterated");
+			end
+		--say the message date last (optional)
+			if (
+				session:ready() and
+				string.len(dtmf_digits) == 0 and
+				vm_say_date_time ~= nil and
+				vm_say_date_time == "last"
+				) then
+				if (current_time_zone ~= nil) then
+					session:execute("set", "timezone="..current_time_zone.."");
+				end
+				session:say(created_epoch, default_language, "current_date_time", "pronounced");
+			end
 		--post listen options
-			if (session:ready()) then 
-				if (string.len(dtmf_digits) == 0) then 
+			if (session:ready()) then
+				if (string.len(dtmf_digits) == 0) then
 					dtmf_digits = session:playAndGetDigits(1, 1, max_tries, digit_timeout, "#", "phrase:voicemail_listen_file_options:1:2:5:7:8:9:0", "", "\\d+");
 				end
 			end
@@ -172,7 +193,7 @@
 		--process the dtmf
 			if (session:ready()) then
 				if (dtmf_digits == "1") then
-					listen_to_recording(message_number, uuid, created_epoch, caller_id_name, caller_id_number);
+					listen_to_recording(message_number, uuid, created_epoch, caller_id_name, caller_id_number, message_status);
 				elseif (dtmf_digits == "2") then
 					message_saved(voicemail_id, uuid);
 					session:execute("playback", "phrase:voicemail_ack:saved");
diff --git a/app/scripts/resources/scripts/app/voicemail/resources/functions/mwi_notify.lua b/app/scripts/resources/scripts/app/voicemail/resources/functions/mwi_notify.lua
index f274ddffc5..39936cbdc3 100644
--- a/app/scripts/resources/scripts/app/voicemail/resources/functions/mwi_notify.lua
+++ b/app/scripts/resources/scripts/app/voicemail/resources/functions/mwi_notify.lua
@@ -12,6 +12,11 @@
 		array = explode("/", sofia_contact);
 		sip_profile = array[2];
 
+		--debug info
+		--freeswitch.consoleLog("NOTICE", "sofia_contact */"..account.."\n");
+		--freeswitch.consoleLog("NOTICE", "sip_profile="..sip_profile.."\n");
+		--freeswitch.consoleLog("NOTICE", "sofia_contact="..sofia_contact.."\n");
+
 		--set the variables
 		new_messages   = tonumber(new_messages)   or 0
 		saved_messages = tonumber(saved_messages) or 0
diff --git a/app/scripts/resources/scripts/app/voicemail/resources/functions/play_greeting.lua b/app/scripts/resources/scripts/app/voicemail/resources/functions/play_greeting.lua
index e4a67f498d..43480ee639 100644
--- a/app/scripts/resources/scripts/app/voicemail/resources/functions/play_greeting.lua
+++ b/app/scripts/resources/scripts/app/voicemail/resources/functions/play_greeting.lua
@@ -85,17 +85,17 @@
 
 								if saved then
 									--play the greeting
-										dtmf_digits = session:playAndGetDigits(min_digits, max_digits, tries, timeout, "#", voicemail_dir.."/"..voicemail_id.."/greeting_"..greeting_id..".wav", "", ".*", max_timeout);								
+										dtmf_digits = session:playAndGetDigits(0, max_digits, tries, timeout, "#", voicemail_dir.."/"..voicemail_id.."/greeting_"..greeting_id..".wav", "", ".*", max_timeout);
 										--session:execute("playback",voicemail_dir.."/"..voicemail_id.."/greeting_"..greeting_id..".wav");
 
 									--delete the greeting (retain local for better responsiveness)
 										--os.remove(voicemail_dir.."/"..voicemail_id.."/greeting_"..greeting_id..".wav");
 								end
 							elseif (storage_type == "http_cache") then
-								dtmf_digits = session:playAndGetDigits(min_digits, max_digits, tries, timeout, "#", voicemail_dir.."/"..voicemail_id.."/greeting_"..greeting_id..".wav", "", ".*", max_timeout);								
+								dtmf_digits = session:playAndGetDigits(0, max_digits, tries, timeout, "#", voicemail_dir.."/"..voicemail_id.."/greeting_"..greeting_id..".wav", "", ".*", max_timeout);
 								--session:execute("playback",storage_path.."/"..voicemail_id.."/greeting_"..greeting_id..".wav");
 							else
-								dtmf_digits = session:playAndGetDigits(min_digits, max_digits, tries, timeout, "#", voicemail_dir.."/"..voicemail_id.."/greeting_"..greeting_id..".wav", "",".*", max_timeout);								
+								dtmf_digits = session:playAndGetDigits(0, max_digits, tries, timeout, "#", voicemail_dir.."/"..voicemail_id.."/greeting_"..greeting_id..".wav", "",".*", max_timeout);
 								--session:execute("playback",voicemail_dir.."/"..voicemail_id.."/greeting_"..greeting_id..".wav");
 							end
 
@@ -110,7 +110,7 @@
 						else
 							voicemail_id_say = voicemail_id;
 						end
-						dtmf_digits = session:playAndGetDigits(0, 1, 1, 200, "#", "phrase:voicemail_play_greeting:" .. voicemail_id_say, "", "\\d+");
+						dtmf_digits = session:playAndGetDigits(0, 1, 1, 200, "#", "phrase:voicemail_play_greeting:" .. voicemail_id_say, "", ".*");
 					end
 			end
 		end
diff --git a/app/scripts/resources/scripts/app/voicemail/resources/functions/record_message.lua b/app/scripts/resources/scripts/app/voicemail/resources/functions/record_message.lua
index 7943ff2355..09c5a92cb6 100644
--- a/app/scripts/resources/scripts/app/voicemail/resources/functions/record_message.lua
+++ b/app/scripts/resources/scripts/app/voicemail/resources/functions/record_message.lua
@@ -277,73 +277,71 @@
 					end
 				end
 			end
-		
-		                        if (transcribe_provider == "google") then
-                                local api_key = settings:get('voicemail', 'google_key', 'text') or '';
-                                local transcription_server = settings:get('voicemail', 'google_url', 'text') or '';
-                                if (api_key ~= '') then
-     transcribe_cmd = [[sox ]]..file_path..[[ ]]..file_path..[[.flac && echo "{ 'config': { 'languageCode': 'en-US', 'enableWordTimeOffsets': false }, 'audio': { 'content': '`base64 -w 0 ]]..file_path..[[.flac`' } }" | curl -X POST -H "Content-Type: application/json" -d @- "]]..transcription_server..[[:recognize?key=]]..api_key..[[" && rm -f ]]..file_path..[[.flac]]
 
-end
+			if (transcribe_provider == "google") then
+				local api_key = settings:get('voicemail', 'google_key', 'text') or '';
+				local transcription_server = settings:get('voicemail', 'google_url', 'text') or '';
+				if (api_key ~= '') then
+					transcribe_cmd = [[sox ]]..file_path..[[ ]]..file_path..[[.flac trim 0 00:59 && echo "{ 'config': { 'languageCode': ']]..transcribe_language..[[', 'enableWordTimeOffsets': false , 'enableAutomaticPunctuation': true , 'alternativeLanguageCodes': ']]..transcribe_alternate_language..[[' }, 'audio': { 'content': '`base64 -w 0 ]]..file_path..[[.flac`' } }" | curl -X POST -H "Content-Type: application/json" -d @- "]]..transcription_server..[[:recognize?key=]]..api_key..[[" && rm -f ]]..file_path..[[.flac]]
+				end
 
-					local handle = io.popen(transcribe_cmd);
-					local transcribe_result = handle:read("*a");
-					transcribe_result = transcribe_result:gsub('%%HESITATION ', '');
-					handle:close();
-					if (debug["info"]) then
-						freeswitch.consoleLog("notice", "[voicemail] CMD: " .. transcribe_cmd .. "\n");
-						freeswitch.consoleLog("notice", "[voicemail] RESULT: " .. transcribe_result .. "\n");
-					end
+				local handle = io.popen(transcribe_cmd);
+				local transcribe_result = handle:read("*a");
+				transcribe_result = transcribe_result:gsub('%%HESITATION ', '');
+				handle:close();
+				if (debug["info"]) then
+					freeswitch.consoleLog("notice", "[voicemail] CMD: " .. transcribe_cmd .. "\n");
+					freeswitch.consoleLog("notice", "[voicemail] RESULT: " .. transcribe_result .. "\n");
+				end
 
-					--Trancribe request can fail
-					if (transcribe_result == '') then
-						freeswitch.consoleLog("notice", "[voicemail] TRANSCRIPTION: (null) \n");
-						return ''
-					else
-						status, transcribe_json = pcall(JSON.decode, transcribe_result);
-						if not status then
-							if (debug["info"]) then
-								freeswitch.consoleLog("notice", "[voicemail] error decoding google json\n");
-							end
-							return '';
-						end 
-					end
-					
-										if (transcribe_json["results"] ~= nil) then
-						--Transcription	
-						if (transcribe_json["results"][1]["alternatives"][1]["transcript"] ~= nil) then
-							transcription = '';
-							for key, row in pairs(transcribe_json["results"]) do 
-								transcription = transcription .. row["alternatives"][1]["transcript"];
-							end
-							if (debug["info"]) then
-								freeswitch.consoleLog("notice", "[voicemail] TRANSCRIPTION: " .. transcription .. "\n");
-							end
-						else
-							if (debug["info"]) then
-								freeswitch.consoleLog("notice", "[voicemail] TRANSCRIPTION: (null) \n");
-							end
-							return '';
+				--Trancribe request can fail
+				if (transcribe_result == '') then
+					freeswitch.consoleLog("notice", "[voicemail] TRANSCRIPTION: (null) \n");
+					return ''
+				else
+					status, transcribe_json = pcall(JSON.decode, transcribe_result);
+					if not status then
+						if (debug["info"]) then
+							freeswitch.consoleLog("notice", "[voicemail] error decoding google json\n");
 						end
-						--Confidence
-						if (transcribe_json["results"][1]["alternatives"][1]["confidence"]) then
-							if (debug["info"]) then
-								freeswitch.consoleLog("notice", "[voicemail] CONFIDENCE: " .. transcribe_json["results"][1]["alternatives"][1]["confidence"] .. "\n");
-							end
-							confidence = transcribe_json["results"][1]["alternatives"][1]["confidence"];
-						else
-							if (debug["info"]) then
-								freeswitch.consoleLog("notice", "[voicemail] CONFIDENCE: (null) \n");
-							end
+						return '';
+					end 
+				end
+				if (transcribe_json["results"] ~= nil) then
+					--Transcription	
+					if (transcribe_json["results"][1]["alternatives"][1]["transcript"] ~= nil) then
+						transcription = '';
+						for key, row in pairs(transcribe_json["results"]) do 
+							transcription = transcription .. row["alternatives"][1]["transcript"];
+						end
+						if (debug["info"]) then
+							freeswitch.consoleLog("notice", "[voicemail] TRANSCRIPTION: " .. transcription .. "\n");
 						end
-						return transcription;
 					else
 						if (debug["info"]) then
-							freeswitch.consoleLog("notice", "[voicemail] TRANSCRIPTION: json error \n");
+							freeswitch.consoleLog("notice", "[voicemail] TRANSCRIPTION: (null) \n");
 						end
 						return '';
 					end
+					--Confidence
+					if (transcribe_json["results"][1]["alternatives"][1]["confidence"]) then
+						if (debug["info"]) then
+							freeswitch.consoleLog("notice", "[voicemail] CONFIDENCE: " .. transcribe_json["results"][1]["alternatives"][1]["confidence"] .. "\n");
+						end
+						confidence = transcribe_json["results"][1]["alternatives"][1]["confidence"];
+					else
+						if (debug["info"]) then
+							freeswitch.consoleLog("notice", "[voicemail] CONFIDENCE: (null) \n");
+						end
+					end
+					return transcription;
+				else
+					if (debug["info"]) then
+						freeswitch.consoleLog("notice", "[voicemail] TRANSCRIPTION: json error \n");
+					end
+					return '';
 				end
+			end
 
 			if (transcribe_provider == "custom") then
 				local transcription_server = settings:get('voicemail', 'transcription_server', 'text') or '';
@@ -396,9 +394,9 @@ end
 			local message_max_length = settings:get('voicemail', 'message_max_length', 'numeric') or 300;
 			local message_silence_threshold = settings:get('voicemail', 'message_silence_threshold', 'numeric') or 200;
 			local message_silence_seconds = settings:get('voicemail', 'message_silence_seconds', 'numeric') or 3;
-			transcribe_enabled = settings:get('voicemail', 'transcribe_enabled', 'boolean') or "false";
+			local email_queue_enabled = settings:get('email_queue', 'enabled', 'boolean') or "false";
 			local transcribe_provider = settings:get('voicemail', 'transcribe_provider', 'text') or '';
-			local email_method = settings:get('email', 'method', 'text') or "smtp";
+			transcribe_enabled = settings:get('voicemail', 'transcribe_enabled', 'boolean') or "false";
 
 		--debug information
 			if (debug["info"]) then
@@ -522,13 +520,14 @@ end
 
 		--play the beep
 			dtmf_digits = '';
+			session:execute("playback","silence_stream://200");
 			session:streamFile("tone_stream://L=1;%(1000, 0, 640)");
 
 		--start epoch
 			start_epoch = os.time();
 
 		--if using the email queue disable inline transcription
-			if (email_method == 'queue') then
+			if (email_queue_enabled == 'true') then
 				transcribe_enabled = 'false';
 			end
 
@@ -588,7 +587,7 @@ end
 
 		--if the recording is below the minimal length then re-record the message
 			if (message_length > 2) then
-				--continue
+				session:setVariable("voicemail_message_seconds", message_length);
 			else
 				if (session:ready()) then
 					--your recording is below the minimal acceptable length, please try again
diff --git a/app/scripts/resources/scripts/app/voicemail/resources/functions/send_email.lua b/app/scripts/resources/scripts/app/voicemail/resources/functions/send_email.lua
index b7941aa6ee..ea144fdb93 100644
--- a/app/scripts/resources/scripts/app/voicemail/resources/functions/send_email.lua
+++ b/app/scripts/resources/scripts/app/voicemail/resources/functions/send_email.lua
@@ -32,8 +32,8 @@
 	function send_email(id, uuid)
 		local db = dbh or Database.new('system')
 		local settings = Settings.new(db, domain_name, domain_uuid)
-		local email_method = settings:get('email', 'method', 'text');
 		local transcribe_enabled = settings:get('voicemail', 'transcribe_enabled', 'boolean');
+		local email_queue_enabled = settings:get('email_queue', 'enabled', 'boolean') or "false";
 		
 		--get voicemail message details
 			local sql = [[SELECT * FROM v_voicemails
@@ -48,6 +48,7 @@
 				--voicemail_password = row["voicemail_password"];
 				--greeting_id = row["greeting_id"];
 				voicemail_mail_to = row["voicemail_mail_to"];
+				voicemail_transcription_enabled = row["voicemail_transcription_enabled"];
 				voicemail_file = row["voicemail_file"];
 				voicemail_local_after_email = row["voicemail_local_after_email"];
 				voicemail_description = row["voicemail_description"];
@@ -135,7 +136,7 @@
 					sql = sql .. "WHERE (domain_uuid = :domain_uuid or domain_uuid is null) ";
 					sql = sql .. "AND template_language = :template_language ";
 					sql = sql .. "AND template_category = 'voicemail' "
-					if (transcribe_enabled == 'true') then
+					if (transcribe_enabled == 'true' and voicemail_transcription_enabled == 'true') then
 						sql = sql .. "AND template_subcategory = 'transcription' "
 					else
 						sql = sql .. "AND template_subcategory = 'default' "
@@ -184,6 +185,7 @@
 					subject = subject:gsub("${voicemail_description}", voicemail_description);
 					subject = subject:gsub("${voicemail_name_formatted}", voicemail_name_formatted);
 					subject = subject:gsub("${domain_name}", domain_name);
+					subject = subject:gsub("${new_messages}", new_messages);
 					subject = trim(subject);
 					subject = '=?utf-8?B?'..base64.encode(subject)..'?=';
 
@@ -202,7 +204,9 @@
 					body = body:gsub("${voicemail_name_formatted}", voicemail_name_formatted);
 					body = body:gsub("${domain_name}", domain_name);
 					body = body:gsub("${sip_to_user}", id);
-					body = body:gsub("${origination_callee_id_name}", origination_callee_id_name);
+					if (origination_callee_id_name ~= nil) then
+						body = body:gsub("${origination_callee_id_name}", origination_callee_id_name);
+					end
 					body = body:gsub("${dialed_user}", id);
 					if (voicemail_file == "attach") then
 						body = body:gsub("${message}", text['label-attached']);
@@ -228,7 +232,7 @@
 			end
 
 		--whether to keep the voicemail message and details local after email
-			if (string.len(voicemail_mail_to) > 2 and email_method ~= 'queue') then
+			if (string.len(voicemail_mail_to) > 2 and email_queue_enabled == 'false') then
 				if (voicemail_local_after_email == "false") then
 					--delete the voicemail message details
 						local sql = [[DELETE FROM v_voicemail_messages
diff --git a/app/scripts/resources/scripts/app/voicemail/resources/scripts/mwi.lua b/app/scripts/resources/scripts/app/voicemail/resources/scripts/mwi.lua
index 149ddc2757..f676b13fff 100644
--- a/app/scripts/resources/scripts/app/voicemail/resources/scripts/mwi.lua
+++ b/app/scripts/resources/scripts/app/voicemail/resources/scripts/mwi.lua
@@ -76,6 +76,7 @@
 				FROM v_voicemail_messages as m, v_voicemails as v, v_domains as d
 				WHERE v.voicemail_uuid = m.voicemail_uuid
 				AND v.domain_uuid = d.domain_uuid
+				AND v.voicemail_enabled = 'true'
 				GROUP BY v.voicemail_id, v.voicemail_uuid, v.domain_uuid, d.domain_name;]];
 			if (debug["sql"]) then
 				freeswitch.consoleLog("notice", "[voicemail] SQL: " .. sql .. "\n");
diff --git a/app/scripts/resources/scripts/app/voicemail/resources/scripts/mwi_notify.lua b/app/scripts/resources/scripts/app/voicemail/resources/scripts/mwi_notify.lua
new file mode 100644
index 0000000000..fdc83fcdc3
--- /dev/null
+++ b/app/scripts/resources/scripts/app/voicemail/resources/scripts/mwi_notify.lua
@@ -0,0 +1,22 @@
+
+--get the argv values
+	voicemail_id = argv[1];
+	domain_name = argv[2];
+	new_messages = argv[3] or '0';
+	saved_messages = argv[4] or '0';
+
+--include the lua script
+	require "resources.functions.config";
+
+--send MWI NOTIFY message
+	require "app.voicemail.resources.functions.mwi_notify";
+
+--debug info
+	--freeswitch.consoleLog("NOTICE", "voicemail_id="..voicemail_id.."\n");
+	--freeswitch.consoleLog("NOTICE", "domain_name="..domain_name.."\n");
+	--freeswitch.consoleLog("NOTICE", "new_messages="..new_messages.."\n");
+	--freeswitch.consoleLog("NOTICE", "saved_messages="..saved_messages.."\n");
+
+--send the message waiting event
+	mwi_notify(voicemail_id..'@'..domain_name, domain_name, new_messages, saved_messages);
+
diff --git a/app/scripts/resources/scripts/app/voicemail/resources/scripts/mwi_subscribe.lua b/app/scripts/resources/scripts/app/voicemail/resources/scripts/mwi_subscribe.lua
index f261f5a955..3c9aa2abee 100644
--- a/app/scripts/resources/scripts/app/voicemail/resources/scripts/mwi_subscribe.lua
+++ b/app/scripts/resources/scripts/app/voicemail/resources/scripts/mwi_subscribe.lua
@@ -13,18 +13,18 @@ local vm_message_count do
 
 local vm_to_uuid_sql = [[SELECT v.voicemail_uuid
 FROM v_voicemails as v inner join v_domains as d on v.domain_uuid = d.domain_uuid
-WHERE v.voicemail_id = :voicemail_id and d.domain_name = :domain_name]]
+WHERE v.voicemail_enabled = 'true' and v.voicemail_id = :voicemail_id and d.domain_name = :domain_name]]
 
 local vm_messages_sql = [[SELECT
 ( SELECT count(*)
 	FROM v_voicemail_messages
-	WHERE voicemail_uuid = %s
+	WHERE voicemail_uuid = :voicemail_uuid
 	AND (message_status is null or message_status = '')
 ) as new_messages,
 
 ( SELECT count(*)
 	FROM v_voicemail_messages
-	WHERE voicemail_uuid = %s
+	WHERE voicemail_uuid = :voicemail_uuid
 	AND message_status = 'saved'
 ) as saved_messages
 ]]
@@ -42,38 +42,32 @@ function vm_message_count(account, use_cache)
 	local dbh = Database.new('system')
 	if not dbh then return end
 
+	-- Get the UUID from the cache if enabled/supported
 	local uuid
 	if use_cache and cache.support() then
-		local uuid = cache.get('voicemail_uuid:' .. account)
-		if not uuid then
-			uuid = dbh:first_value(vm_to_uuid_sql, {
-				voicemail_id = id, domain_name = domain_name
-			})
+		uuid = cache.get('voicemail_uuid:' .. account)
+	end
 
-			if uuid and #uuid > 0 then
-				cache.set('voicemail_uuid:' .. account, uuid, 3600)
-			end
+	-- If no UUID cached or if cache is not enabled/supported get the UUID from the database
+	if not uuid then
+		uuid = dbh:first_value(vm_to_uuid_sql, {
+			voicemail_id = id, domain_name = domain_name
+		})
+
+		if uuid and #uuid > 0 and use_cache and cache.support() then
+			cache.set('voicemail_uuid:' .. account, uuid, 3600)
 		end
 	end
 
+	-- Get the count of unread and read messages from the database if there is a valid voicemail account
 	local row
 	if uuid and #uuid > 0 then
-		local sql = string.format(vm_messages_sql, ":voicemail_uuid", ":voicemail_uuid")
-		row = dbh:first_row(sql, {voicemail_uuid = uuid})
-	else
-		local uuid_sql = '(' .. vm_to_uuid_sql .. ')'
-
-		local sql = string.format(vm_messages_sql,
-			uuid_sql, uuid_sql
-		)
-
-		row = dbh:first_row(sql, {
-			voicemail_id = id, domain_name = domain_name
-		})
+		row = dbh:first_row(vm_messages_sql, {voicemail_uuid = uuid})
 	end
 
 	dbh:release()
 
+	-- This condition can be hit if the voicemail box is either disabled or non-existent
 	if not row then return end
 
 	return row.new_messages, row.saved_messages
diff --git a/app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/callcenter.conf.lua b/app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/callcenter.conf.lua
index 01a404abb5..8d747bd7c4 100644
--- a/app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/callcenter.conf.lua
+++ b/app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/callcenter.conf.lua
@@ -180,16 +180,21 @@
 					agent_wrap_up_time = row.agent_wrap_up_time;
 					agent_reject_delay_time = row.agent_reject_delay_time;
 					agent_busy_delay_time = row.agent_busy_delay_time;
+					agent_record = row.agent_record;
 
 				--get and then set the complete agent_contact with the call_timeout and when necessary confirm
 						--confirm = "group_confirm_file=custom/press_1_to_accept_this_call.wav,group_confirm_key=1";
 						--if you change this variable also change app/call_center/call_center_agent_edit.php
 						confirm = "group_confirm_file=ivr/ivr-accept_reject_voicemail.wav,group_confirm_key=1,group_confirm_read_timeout=2000,leg_timeout="..agent_call_timeout;
+						local record = "";
+						if (agent_record == "true") then
+							record = string.format(",execute_on_pre_bridge='record_session %s/%s/archive/${strftime(%%Y)}/${strftime(%%b)}/${strftime(%%d)}/${uuid}.${record_ext}'", recordings_dir, domain_name)
+						end
 						if (string.find(agent_contact, '}') == nil) then
 							--not found
 							if (string.find(agent_contact, 'sofia/gateway') == nil) then
 								--add the call_timeout
-								agent_contact = "{call_timeout="..agent_call_timeout..",domain_name="..domain_name..",domain_uuid="..domain_uuid..",extension_uuid="..extension_uuid..",sip_h_caller_destination=${caller_destination}}"..agent_contact;
+								agent_contact = "{call_timeout="..agent_call_timeout..",domain_name="..domain_name..",domain_uuid="..domain_uuid..",extension_uuid="..extension_uuid..",sip_h_caller_destination=${caller_destination}"..record.."}"..agent_contact;
 							else
 								--add the call_timeout and confirm
 								agent_contact = "{"..confirm..",call_timeout="..agent_call_timeout..",domain_name="..domain_name..",domain_uuid="..domain_uuid..",sip_h_caller_destination=${caller_destination}}"..agent_contact;
diff --git a/app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/ivr.conf.lua b/app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/ivr.conf.lua
index 851f951251..d6497da5c4 100644
--- a/app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/ivr.conf.lua
+++ b/app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/ivr.conf.lua
@@ -98,6 +98,7 @@
 					ivr_menu_greet_short = row["ivr_menu_greet_short"];
 					ivr_menu_invalid_sound = row["ivr_menu_invalid_sound"];
 					ivr_menu_exit_sound = row["ivr_menu_exit_sound"];
+					ivr_menu_pin_number = row["ivr_menu_pin_number"];
 					ivr_menu_confirm_macro = row["ivr_menu_confirm_macro"];
 					ivr_menu_confirm_key = row["ivr_menu_confirm_key"];
 					ivr_menu_tts_engine = row["ivr_menu_tts_engine"];
@@ -248,6 +249,7 @@
 					table.insert(xml, [[				greet-short="]]..ivr_menu_greet_short..[[" ]]);
 					table.insert(xml, [[				invalid-sound="]]..ivr_menu_invalid_sound..[[" ]]);
 					table.insert(xml, [[				exit-sound="]]..ivr_menu_exit_sound..[[" ]]);
+					table.insert(xml, [[				pin="]]..ivr_menu_pin_number..[[" ]]);
 					table.insert(xml, [[				confirm-macro="]]..ivr_menu_confirm_macro..[[" ]]);
 					table.insert(xml, [[				confirm-key="]]..ivr_menu_confirm_key..[[" ]]);
 					table.insert(xml, [[				tts-engine="]]..ivr_menu_tts_engine..[[" ]]);
@@ -279,9 +281,12 @@
 				--direct dial
 					if (ivr_menu_direct_dial == "true") then
 						table.insert(xml, [[					<entry action="menu-exec-app" digits="]]..direct_dial_digits..[[" param="set ${cond(${user_exists id $1 ]]..domain_name..[[} == true ? user_exists=true : user_exists=false)}" description="direct dial"/>\n]]);
-						table.insert(xml, [[					<entry action="menu-exec-app" digits="]]..direct_dial_digits..[[" param="set ${cond(${user_exists} == true ? user_exists=true : ivr_max_failures=${system(expr ${ivr_max_failures} + 1)})}" description="increment max failures"/>\n]]);
+						--table.insert(xml, [[					<entry action="menu-exec-app" digits="]]..direct_dial_digits..[[" param="set ${cond(${user_exists} == true ? user_exists=true : ivr_max_failures=${system(expr ${ivr_max_failures} + 1)})}" description="increment max failures"/>\n]]);
 						table.insert(xml, [[					<entry action="menu-exec-app" digits="]]..direct_dial_digits..[[" param="playback ${cond(${user_exists} == true ? ]]..sound_prefix..[[ivr/ivr-call_being_transferred.wav : ]]..sound_prefix..[[ivr/ivr-that_was_an_invalid_entry.wav)}" description="play sound"/>\n]]);
-						table.insert(xml, [[					<entry action="menu-exec-app" digits="]]..direct_dial_digits..[[" param="transfer ${cond(${ivr_max_failures} == ]]..ivr_menu_max_failures..[[ ? ]]..ivr_menu_exit_data..[[)}" description="max fail transfer"/>\n]]);
+						--table.insert(xml, [[					<entry action="menu-exec-app" digits="]]..direct_dial_digits..[[" param="transfer ${cond(${ivr_max_failures} == ]]..ivr_menu_max_failures..[[ ? ]]..ivr_menu_exit_data..[[)}" description="max fail transfer"/>\n]]);
+						if (#ivr_menu_cid_prefix > 0) then
+							table.insert(xml, [[					<entry action="menu-exec-app" digits="]]..direct_dial_digits..[[" param="set effective_caller_id_name=]]..ivr_menu_cid_prefix..[[#${caller_id_name}" description="direct dial"/>\n]]);
+						end
 						table.insert(xml, [[					<entry action="menu-exec-app" digits="]]..direct_dial_digits..[[" param="transfer ${cond(${user_exists} == true ? $1 XML ]]..domain_name..[[)}" description="direct dial transfer"/>\n]]);
 					end
 
diff --git a/app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/sofia.conf.lua b/app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/sofia.conf.lua
index 71beae1443..6274ab2e4c 100644
--- a/app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/sofia.conf.lua
+++ b/app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/sofia.conf.lua
@@ -181,6 +181,12 @@
 								if (string.len(field.ping) > 0) then
 									table.insert(xml, [[							<param name="ping" value="]] .. field.ping .. [["/>]]);
 								end
+								if (string.len(field.ping_min) > 0) then
+									table.insert(xml, [[							<param name="ping-min" value="]] .. field.ping_min .. [["/>]]);
+								end
+								if (string.len(field.ping_max) > 0) then
+									table.insert(xml, [[							<param name="ping-max" value="]] .. field.ping_max .. [["/>]]);
+								end
 								if (string.len(field.context) > 0) then
 									table.insert(xml, [[							<param name="context" value="]] .. field.context .. [["/>]]);
 								end
diff --git a/app/scripts/resources/scripts/app/xml_handler/resources/scripts/dialplan/dialplan.lua b/app/scripts/resources/scripts/app/xml_handler/resources/scripts/dialplan/dialplan.lua
index 5b24939647..90a9909417 100644
--- a/app/scripts/resources/scripts/app/xml_handler/resources/scripts/dialplan/dialplan.lua
+++ b/app/scripts/resources/scripts/app/xml_handler/resources/scripts/dialplan/dialplan.lua
@@ -116,7 +116,7 @@
 
 		--get the dialplan xml
 			if (context_name == 'public' and dialplan_mode == 'single') then
-				sql = "SELECT d.domain_name, dialplan_xml FROM v_dialplans AS p, v_domains AS d ";
+				sql = "SELECT (select domain_name from v_domains where domain_uuid = p.domain_uuid) as domain_name, dialplan_xml FROM v_dialplans AS p ";
 				sql = sql .. "WHERE ( ";
 				sql = sql .. "	p.dialplan_uuid IN ( ";
 				sql = sql .. "		SELECT dialplan_uuid FROM v_destinations "
@@ -132,7 +132,6 @@
 				sql = sql .. "	) ";
 				sql = sql .. "	or (p.dialplan_context like '%public%' and p.domain_uuid IS NULL) ";
 				sql = sql .. ") ";
-				sql = sql .. "AND p.domain_uuid = d.domain_uuid ";
 				sql = sql .. "AND (p.hostname = :hostname OR p.hostname IS NULL) ";
 				sql = sql .. "AND p.dialplan_enabled = 'true' ";
 				sql = sql .. "ORDER BY p.dialplan_order ASC ";
diff --git a/app/scripts/resources/scripts/app/xml_handler/resources/scripts/directory/directory.lua b/app/scripts/resources/scripts/app/xml_handler/resources/scripts/directory/directory.lua
index b02e0fc606..89a5b3d044 100644
--- a/app/scripts/resources/scripts/app/xml_handler/resources/scripts/directory/directory.lua
+++ b/app/scripts/resources/scripts/app/xml_handler/resources/scripts/directory/directory.lua
@@ -312,6 +312,7 @@
 								password = row.password;
 								mwi_account = row.mwi_account;
 								auth_acl = row.auth_acl;
+
 							--variables
 								sip_from_user = row.extension;
 								sip_from_number = (#number_alias > 0) and number_alias or row.extension;
@@ -412,6 +413,25 @@
 						end);
 					end
 
+				--get the extension settings from the database
+					if (extension_uuid) then
+						local sql = "SELECT * FROM v_extension_settings "
+							.. "WHERE extension_uuid = :extension_uuid "
+							.. "and extension_setting_enabled = 'true' ";
+						local params = {extension_uuid=extension_uuid};
+						if (debug["sql"]) then
+							freeswitch.consoleLog("notice", "[xml_handler] SQL: " .. sql .. "; params:" .. json.encode(params) .. "\n");
+						end
+						extension_settings = {}
+						dbh:query(sql, params, function(row)
+							table.insert(extension_settings, {
+								extension_setting_type = row.extension_setting_type,
+								extension_setting_name = row.extension_setting_name,
+								extension_setting_value = row.extension_setting_value
+							});
+						end);
+					end
+
 				--get the voicemail from the database
 					if (continue) then
 						vm_enabled = "true";
@@ -510,6 +530,11 @@
 							table.insert(xml, [[								<param name="verto-dialplan" value="XML"/>]]);
 							table.insert(xml, [[								<param name="jsonrpc-allowed-methods" value="verto"/>]]);
 							table.insert(xml, [[								<param name="jsonrpc-allowed-event-channels" value="demo,conference,presence"/>]]);
+							for key,row in pairs(extension_settings) do
+								if (row.extension_setting_type == 'param') then
+									table.insert(xml, [[								<param name="]]..row.extension_setting_name..[[" value="]]..row.extension_setting_value..[["/>]]);
+								end
+							end
 							table.insert(xml, [[							</params>]]);
 							table.insert(xml, [[							<variables>]]);
 							table.insert(xml, [[								<variable name="domain_uuid" value="]] .. domain_uuid .. [["/>]]);
@@ -645,6 +670,11 @@
 							table.insert(xml, [[								<variable name="record_stereo" value="true"/>]]);
 							table.insert(xml, [[								<variable name="transfer_fallback_extension" value="operator"/>]]);
 							table.insert(xml, [[								<variable name="export_vars" value="domain_name"/>]]);
+							for key,row in pairs(extension_settings) do
+								if (row.extension_setting_type == 'variable') then
+									table.insert(xml, [[								<variable name="]]..row.extension_setting_name..[[" value="]]..row.extension_setting_value..[["/>]]);
+								end
+							end
 							table.insert(xml, [[							</variables>]]);
 							table.insert(xml, [[						</user>]]);
 							table.insert(xml, [[					</users>]]);
diff --git a/app/scripts/resources/scripts/call_forward.lua b/app/scripts/resources/scripts/call_forward.lua
index bc97e5f130..ceed101ea1 100644
--- a/app/scripts/resources/scripts/call_forward.lua
+++ b/app/scripts/resources/scripts/call_forward.lua
@@ -147,7 +147,6 @@
 	local last_forward_all_destination = row.forward_all_destination;
 	local follow_me_uuid = row.follow_me_uuid;
 	local toll_allow = row.toll_allow or '';
-	local forward_caller_id_uuid = row.forward_caller_id_uuid;
 
 --toggle enabled
 	if enabled == "toggle" then
@@ -190,56 +189,17 @@
 			session:streamFile(sounds_dir.."/"..default_language.."/"..default_dialect.."/"..default_voice.."/ivr/ivr-call_forwarding_has_been_set.wav");
 	end
 
---get the caller_id for outbound call
-	local forward_caller_id = ""
-	if enabled == "true" and not empty(forward_caller_id_uuid) then
-		local sql = "select destination_number, destination_description,"..
-			"destination_caller_id_number, destination_caller_id_name " ..
-			"from v_destinations where domain_uuid = :domain_uuid and " ..
-			"destination_type = 'inbound' and destination_uuid = :destination_uuid";
-		local params = {domain_uuid = domain_uuid; destination_uuid = forward_caller_id_uuid}
-		if (debug["sql"]) then
-			log.noticef("SQL: %s; params: %s", sql, json.encode(params));
-		end
-		local row = dbh:first_row(sql, params)
-		if row then
-			local caller_id_number = row.destination_caller_id_number
-			if empty(caller_id_number) then
-				caller_id_number = row.destination_number
-			end
-
-			local caller_id_name = row.destination_caller_id_name
-			if empty(caller_id_name) then
-				caller_id_name = row.destination_description
-			end
-
-			if not empty(caller_id_number) then
-				forward_caller_id = forward_caller_id ..
-					 ",outbound_caller_id_number=" .. caller_id_number ..
-					 ",origination_caller_id_number=" .. caller_id_number
-			end
-
-			if not empty(caller_id_name) then
-				forward_caller_id = forward_caller_id ..
-					 ",outbound_caller_id_name=" .. caller_id_name ..
-					 ",origination_caller_id_name=" .. caller_id_name
-			end
-		end
-	end
-
 --get default caller_id for outbound call
-	if enabled == "true" and empty(forward_caller_id_uuid) then
-		if settings:get('cdr', 'call_forward_fix', 'boolean') == 'true' then
-			if not empty(row.outbound_caller_id_number) then
-				forward_caller_id = forward_caller_id ..
-					 ",outbound_caller_id_number=" .. row.outbound_caller_id_number ..
-					 ",origination_caller_id_number=" .. row.outbound_caller_id_number
-			end
-			if not empty(row.outbound_caller_id_name) then
-				forward_caller_id = forward_caller_id ..
-					 ",outbound_caller_id_name=" .. row.outbound_caller_id_name ..
-					 ",origination_caller_id_name=" .. row.outbound_caller_id_name
-			end
+	if enabled == "true" and settings:get('cdr', 'call_forward_fix', 'boolean') == 'true' then
+		if not empty(row.outbound_caller_id_number) then
+			forward_caller_id = forward_caller_id ..
+				 ",outbound_caller_id_number=" .. row.outbound_caller_id_number ..
+				 ",origination_caller_id_number=" .. row.outbound_caller_id_number
+		end
+		if not empty(row.outbound_caller_id_name) then
+			forward_caller_id = forward_caller_id ..
+				 ",outbound_caller_id_name=" .. row.outbound_caller_id_name ..
+				 ",origination_caller_id_name=" .. row.outbound_caller_id_name
 		end
 	end
 
@@ -302,14 +262,14 @@
 
 		-- Get the sip_profile
 			if (extension ~= nil and domain_name ~= nil) then
-				sip_profile = notify.get_profile(extension, domain_name);
+				sip_profiles = notify.get_profiles(extension, domain_name);
 			end
 
-		if (sip_profile ~= nil) then 
+		if (sip_profiles ~= nil) then
 				freeswitch.consoleLog("NOTICE", "[feature_event] SIP NOTIFY: CFWD set to "..forward_all_enabled.."\n");
 
 			--Do Not Disturb
-				notify.dnd(extension, domain_name, sip_profile, do_not_disturb);
+				notify.dnd(extension, domain_name, sip_profiles, do_not_disturb);
 
 			--Forward all
 				forward_immediate_enabled = forward_all_enabled;
@@ -321,7 +281,7 @@
 					end
 
 				freeswitch.consoleLog("NOTICE", "[feature_event] forward_immediate_destination "..forward_immediate_destination.."\n");
-				notify.forward_immediate(extension, domain_name, sip_profile, forward_immediate_enabled, forward_immediate_destination);
+				notify.forward_immediate(extension, domain_name, sip_profiles, forward_immediate_enabled, forward_immediate_destination);
 
 			--Forward busy
 				--workaround for freeswitch not sending NOTIFY when destination values are nil. Send 0.
@@ -330,7 +290,7 @@
 					end
 
 				freeswitch.consoleLog("NOTICE", "[feature_event] forward_busy_destination "..forward_busy_destination.."\n");
-				notify.forward_busy(extension, domain_name, sip_profile, forward_busy_enabled, forward_busy_destination);
+				notify.forward_busy(extension, domain_name, sip_profiles, forward_busy_enabled, forward_busy_destination);
 
 			--Forward No Answer
 				ring_count = math.ceil (call_timeout / 6);
@@ -340,7 +300,7 @@
 					end
 
 				freeswitch.consoleLog("NOTICE", "[feature_event] forward_no_answer_destination "..forward_no_answer_destination.."\n");
-				notify.forward_no_answer(extension, domain_name, sip_profile, forward_no_answer_enabled, forward_no_answer_destination, ring_count);
+				notify.forward_no_answer(extension, domain_name, sip_profiles, forward_no_answer_enabled, forward_no_answer_destination, ring_count);
 		end
 	end
 
diff --git a/app/scripts/resources/scripts/do_not_disturb.lua b/app/scripts/resources/scripts/do_not_disturb.lua
index 27229694f4..bb70185552 100644
--- a/app/scripts/resources/scripts/do_not_disturb.lua
+++ b/app/scripts/resources/scripts/do_not_disturb.lua
@@ -100,7 +100,7 @@
 		extension = row.extension;
 		number_alias = row.number_alias or '';
 		accountcode = row.accountcode;
-		follow_me_uuid = row.follow_me_uuid;
+		follow_me_uuid = row.follow_me_uuid or nil;
 		do_not_disturb = row.do_not_disturb;
 		forward_all_destination = row.forward_all_destination;
 		forward_all_enabled = row.forward_all_enabled;
@@ -227,15 +227,15 @@
 
 		-- Get the sip_profile
 		if (extension ~= nil and domain_name ~= nil) then
-			sip_profile = notify.get_profile(extension, domain_name);
+			sip_profiles = notify.get_profiles(extension, domain_name);
 		end
 
 		-- check if not nil
-		if (sip_profile ~= nil) then 
+		if (sip_profiles ~= nil) then
 				freeswitch.consoleLog("NOTICE", "[feature_event] SIP NOTIFY: CFWD set to "..forward_all_enabled.."\n");
 
 			--Do Not Disturb
-				notify.dnd(extension, domain_name, sip_profile, do_not_disturb);
+				notify.dnd(extension, domain_name, sip_profiles, do_not_disturb);
 
 			--Forward all
 				forward_immediate_enabled = forward_all_enabled;
@@ -246,7 +246,7 @@
 						forward_immediate_destination = '0';
 					end
 
-				notify.forward_immediate(extension, domain_name, sip_profile, forward_immediate_enabled, forward_immediate_destination);
+				notify.forward_immediate(extension, domain_name, sip_profiles, forward_immediate_enabled, forward_immediate_destination);
 
 			--Forward busy
 				--workaround for freeswitch not sending NOTIFY when destination values are nil. Send 0.
@@ -254,7 +254,7 @@
 						forward_busy_destination = '0';
 					end
 
-				notify.forward_busy(extension, domain_name, sip_profile, forward_busy_enabled, forward_busy_destination);
+				notify.forward_busy(extension, domain_name, sip_profiles, forward_busy_enabled, forward_busy_destination);
 
 			--Forward No Answer
 				ring_count = math.ceil (call_timeout / 6);
@@ -263,7 +263,7 @@
 						forward_no_answer_destination = '0';
 					end
 
-				notify.forward_no_answer(extension, domain_name, sip_profile, forward_no_answer_enabled, forward_no_answer_destination, ring_count);
+				notify.forward_no_answer(extension, domain_name, sip_profiles, forward_no_answer_enabled, forward_no_answer_destination, ring_count);
 		end
 	end
 
diff --git a/app/scripts/resources/scripts/dtmf_handler.lua b/app/scripts/resources/scripts/dtmf_handler.lua
new file mode 100644
index 0000000000..89f4faa786
--- /dev/null
+++ b/app/scripts/resources/scripts/dtmf_handler.lua
@@ -0,0 +1,16 @@
+--local s = event:serialize("xml")
+--local name = event:getHeader("Event-Name")
+--freeswitch.consoleLog("NOTICE", "Got event! " .. name)
+--freeswitch.consoleLog("NOTICE", "Serial!\n" .. s)
+
+local call_uuid = event:getHeader("Caller-Unique-ID");
+--local channel_timestamp = event:getHeader("Event-Date-Timestamp");
+local channel_timestamp = os.time();
+local dtmf_value = event:getHeader("DTMF-Digit");
+
+local session = freeswitch.Session(call_uuid);
+local history = channel_timestamp .. ':' .. dtmf_value .. "\n";
+session:execute("push", "dtmf_history="..history);
+
+-- lua.conf.xml
+-- <hook event="DTMF" script="dtmf_handler.lua"/>
diff --git a/app/scripts/resources/scripts/resources/functions/send_mail.lua b/app/scripts/resources/scripts/resources/functions/send_mail.lua
index 72af13bf59..c99ce9be3f 100644
--- a/app/scripts/resources/scripts/resources/functions/send_mail.lua
+++ b/app/scripts/resources/scripts/resources/functions/send_mail.lua
@@ -1,30 +1,13 @@
-local Settings = require "resources.functions.lazy_settings";
 local Database = require "resources.functions.database";
+local Settings = require "resources.functions.lazy_settings";
 local cache = require"resources.functions.cache";
 local log = require "resources.functions.log".send_mail
 
-
 local db = dbh or Database.new('system');
---local settings = Settings.new(db, nil, nil);
---local email_method = settings:get('email', 'method', 'text');
+local settings = Settings.new(db, domain_name, domain_uuid)
+local email_queue_enabled = settings:get('email_queue', 'enabled', 'boolean') or "false";
 
---get the dialplan mode from the cache
-email_method_key = "settings:email:email_mode";
-email_method, err = cache.get(email_method_key);
-
---if not found in the cache then get it from the database
-if (err == 'NOT FOUND') then
-	--get the mode from default settings
-	sql = "select default_setting_value from v_default_settings "
-	sql = sql .. "where default_setting_category = 'email' ";
-	sql = sql .. "and default_setting_subcategory = 'method' ";
-	email_method = db:first_value(sql, nil);
-	if (email_method) then
-		local ok, err = cache.set(email_method_key, email_method, expire["dialplan"]);
-	end
-end
-
-if (email_method == 'queue') then
+if (email_queue_enabled == 'true') then
 	function send_mail(headers, email_address, email_message, email_file)
 
 		--include json library
@@ -36,8 +19,16 @@ if (email_method == 'queue') then
 		local domain_uuid = headers["X-FusionPBX-Domain-UUID"];
 		local domain_name = headers["X-FusionPBX-Domain-Name"];
 		local email_type = headers["X-FusionPBX-Email-Type"] or 'info';
-		local call_uuid = headers["X-FusionPBX-Email-Call-UUID"];
+		local call_uuid = headers["X-FusionPBX-Call-UUID"];
+		local local_after_email = headers["X-FusionPBX-local_after_email"] or '';
 
+		if (local_after_email == 'false') then
+			email_action_after = 'delete';
+		else
+			email_action_after = '';
+		end
+
+		local db = dbh or Database.new('system');
 		local settings = Settings.new(db, domain_name, domain_uuid);
 
 		local email_from = settings:get('email', 'smtp_from', 'text');
@@ -65,7 +56,10 @@ if (email_method == 'queue') then
 		sql = sql .. "	email_to, ";
 		sql = sql .. "	email_subject, ";
 		sql = sql .. "	email_body, ";
-		sql = sql .. "	email_status ";
+		sql = sql .. "	email_status, ";
+		sql = sql .. "	email_uuid, ";
+		sql = sql .. "	email_action_after ";
+		
 		sql = sql .. ") ";
 		sql = sql .. "values ( ";
 		sql = sql .. "	:email_queue_uuid, ";
@@ -76,7 +70,9 @@ if (email_method == 'queue') then
 		sql = sql .. "	:email_to, ";
 		sql = sql .. "	:email_subject, ";
 		sql = sql .. "	:email_body, ";
-		sql = sql .. "	:email_status ";
+		sql = sql .. "	:email_status, ";
+		sql = sql .. "	:email_uuid, ";
+		sql = sql .. "	:email_action_after ";
 		sql = sql .. ") ";
 		local params = {
 			email_queue_uuid = email_queue_uuid;
@@ -87,6 +83,8 @@ if (email_method == 'queue') then
 			email_subject = email_subject;
 			email_body = email_body;
 			email_status = email_status;
+			email_uuid = call_uuid;
+			email_action_after = email_action_after;
 		}
 		db:query(sql, params);
 
@@ -100,7 +98,8 @@ if (email_method == 'queue') then
 			local email_table = split(email_file, '/', true)
 			email_attachment_name = email_table[#email_table]
 
-			email_attachment_path = email_file.sub(email_file, 0, (string.len(email_file) - string.len(email_attachment_name)) - 1); 
+			email_attachment_path = email_file.sub(email_file, 0, (string.len(email_file) - string.len(email_attachment_name)) - 1);
+			--freeswitch.consoleLog("notice", "[send_email] voicemail path: " .. email_attachment_path .. "/" .. email_attachment_name .. "\n");
 
 			--base64 encode the file
 			--local file = require "resources.functions.file"
@@ -136,7 +135,7 @@ if (email_method == 'queue') then
 				email_attachment_base64  = email_attachment_base64;
 			}
 			if (debug["sql"]) then
-				freeswitch.consoleLog("notice", "[dialplan] SQL: " .. sql .. "; params:" .. json.encode(params) .. "\n");
+				freeswitch.consoleLog("notice", "[send_email] SQL: " .. sql .. "; params:" .. json.encode(params) .. "\n");
 			end
 			db:query(sql, params);
 		end
@@ -162,7 +161,7 @@ else
 			local domain_uuid = headers["X-FusionPBX-Domain-UUID"]
 			local domain_name = headers["X-FusionPBX-Domain-Name"]
 			local email_type = headers["X-FusionPBX-Email-Type"] or 'info'
-			local call_uuid = headers["X-FusionPBX-Email-Call-UUID"]
+			local call_uuid = headers["X-FusionPBX-Call-UUID"]
 			local db = dbh or Database.new('system')
 			local settings = Settings.new(db, domain_name, domain_uuid)
 
diff --git a/app/sip_status/app_languages.php b/app/sip_status/app_languages.php
index ad694a46fb..9b939199e0 100644
--- a/app/sip_status/app_languages.php
+++ b/app/sip_status/app_languages.php
@@ -345,8 +345,8 @@ $text['button-flush_registrations']['de-ch'] = "Registrierungen verwerfen"; //co
 $text['button-flush_registrations']['de-de'] = "Registrierungen verwerfen";
 $text['button-flush_registrations']['es-cl'] = "Inscripciones Flush";
 $text['button-flush_registrations']['es-mx'] = "Inscripciones Flush"; //copied from es-cl
-$text['button-flush_registrations']['fr-ca'] = "Nettoyer enregistrements"; //copied from fr-fr
-$text['button-flush_registrations']['fr-fr'] = "Nettoyer enregistrements";
+$text['button-flush_registrations']['fr-ca'] = "Effacer enregistrements"; //copied from fr-fr
+$text['button-flush_registrations']['fr-fr'] = "Effacer enregistrements";
 $text['button-flush_registrations']['he-il'] = "";
 $text['button-flush_registrations']['it-it'] = "Pulisci Registrazioni";
 $text['button-flush_registrations']['nl-nl'] = "Verwijder Registraties";
diff --git a/app/time_conditions/app_config.php b/app/time_conditions/app_config.php
index 9bd9a0e8b5..6c90db17d9 100644
--- a/app/time_conditions/app_config.php
+++ b/app/time_conditions/app_config.php
@@ -34,7 +34,7 @@
 		$apps[$x]['destinations'][$y]['type'] = "sql";
 		$apps[$x]['destinations'][$y]['label'] = "time_conditions";
 		$apps[$x]['destinations'][$y]['name'] = "time_conditions";
-		$apps[$x]['destinations'][$y]['sql'] = "select dialplan_name as name, dialplan_number as destination, dialplan_context as context, dialplan_description as description from v_dialplans ";
+		$apps[$x]['destinations'][$y]['sql'] = "select dialplan_name as name, dialplan_number as destination, dialplan_number as extension, dialplan_context as context, dialplan_description as description from v_dialplans ";
 		$apps[$x]['destinations'][$y]['where'] = "where (domain_uuid = '\${domain_uuid}' or domain_uuid is null) and app_uuid = '4b821450-926b-175a-af93-a03c441818b1' and dialplan_enabled = 'true' ";
 		$apps[$x]['destinations'][$y]['order_by'] = "dialplan_number asc";
 		$apps[$x]['destinations'][$y]['field']['context'] = "context";
@@ -94,6 +94,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "preset_england";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "array";
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = '{"new_years_day":{"mday":"1","mon":"1"}}';
+        	$apps[$x]['default_settings'][$y]['default_setting_order'] = "1";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "England Holiday";
 		$y++;
@@ -102,6 +103,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "preset_england";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "array";
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = '{"may_day":{"mon":"5","mday":"1-7","wday":"2"}}';
+        	$apps[$x]['default_settings'][$y]['default_setting_order'] = "129";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "England Holiday";
 		$y++;
@@ -110,6 +112,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "preset_england";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "array";
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = '{"spring_bank_holiday":{"mon":"5","mday":"25-31","wday":"2"}}';
+        	$apps[$x]['default_settings'][$y]['default_setting_order'] = "146";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "England Holiday";
 		$y++;
@@ -118,6 +121,16 @@
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "preset_england";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "array";
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = '{"august_bank_holiday":{"mon":"8","mday":"25-31","wday":"2"}}';
+        	$apps[$x]['default_settings'][$y]['default_setting_order'] = "243";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "England Holiday";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "0c29051f-d2f4-4f9c-b84c-2abca0943897";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "time_conditions";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "preset_england";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "array";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = '{"christmas_eve":{"mday":"24","mon":"12"}}';
+		$apps[$x]['default_settings'][$y]['default_setting_order'] = "359";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "England Holiday";
 		$y++;
@@ -126,6 +139,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "preset_england";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "array";
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = '{"christmas_day":{"mday":"25","mon":"12"}}';
+        	$apps[$x]['default_settings'][$y]['default_setting_order'] = "360";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "England Holiday";
 		$y++;
@@ -134,16 +148,27 @@
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "preset_england";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "array";
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = '{"boxing_day":{"mday":"26","mon":"12"}}';
+        	$apps[$x]['default_settings'][$y]['default_setting_order'] = "361";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "England Holiday";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "d157d293-6f8c-4350-89fd-2cee42070b3f";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "time_conditions";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "preset_england";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "array";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = '{"new_years_eve":{"mday":"31","mon":"12"}}';
+        	$apps[$x]['default_settings'][$y]['default_setting_order'] = "366";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "England Holiday";
 
-	//define USA holiday presets
+    //define USA holiday presets
 		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "3df036bb-ae96-4735-96da-a32e90b51940";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "time_conditions";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "preset_usa";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "array";
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = '{"new_years_day":{"mday":"1","mon":"1"}}';
+        	$apps[$x]['default_settings'][$y]['default_setting_order'] = "1";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "USA Holiday";
 		$y++;
@@ -152,6 +177,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "preset_usa";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "array";
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = '{"martin_luther_king_jr_day":{"wday":"2","mon":"1","mday":"15-21"}}';
+		$apps[$x]['default_settings'][$y]['default_setting_order'] = "19";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "USA Holiday";
 		$y++;
@@ -160,7 +186,8 @@
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "preset_usa";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "array";
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = '{"presidents_day":{"wday":"2","mon":"2","mday":"15-21"}}';
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_order'] = "38";
+        	$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "USA Holiday";
 		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "0957bbc4-60e8-44d1-b51d-943de4ee5b2f";
@@ -168,7 +195,8 @@
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "preset_usa";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "array";
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = '{"memorial_day":{"mday":"25-31","wday":"2","mon":"5"}}';
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_order'] = "146";
+        	$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "USA Holiday";
 		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "0aa94174-a339-47d6-b6ab-c264b3786074";
@@ -176,6 +204,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "preset_usa";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "array";
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = '{"independence_day":{"mday":"4","mon":"7"}}';
+        	$apps[$x]['default_settings'][$y]['default_setting_order'] = "186";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "USA Holiday";
 		$y++;
@@ -184,7 +213,8 @@
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "preset_usa";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "array";
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = '{"labor_day":{"wday":"2","mon":"9","mday":"1-7"}}';
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_order'] = "251";
+        	$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "USA Holiday";
 		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "261a0ea4-26a3-4261-95e5-888afd221ca0";
@@ -192,7 +222,8 @@
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "preset_usa";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "array";
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = '{"columbus_day":{"wday":"2","mon":"10","mday":"8-14"}}';
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_order'] = "281";
+        	$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "USA Holiday";
 		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "829d346b-b0ed-4690-8641-8ed01052e303";
@@ -200,7 +231,8 @@
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "preset_usa";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "array";
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = '{"veterans_day":{"mday":"11","mon":"11"}}';
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_order'] = "316";
+        	$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "USA Holiday";
 		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "c1fdfebe-3544-4b01-8a83-d0fee8e9a47a";
@@ -208,7 +240,8 @@
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "preset_usa";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "array";
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = '{"thanksgiving_day":{"wday":"5","mon":"11","mday":"22-28"}}';
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_order'] = "331";
+        	$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "USA Holiday";
 		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "2fcab411-971d-466c-bf6d-42f6bcd32ad2";
@@ -216,6 +249,16 @@
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "preset_usa";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "array";
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = '{"black_friday":{"wday":"6","mon":"11","mday":"23-29"}}';
+		$apps[$x]['default_settings'][$y]['default_setting_order'] = "332";
+        	$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "USA Holiday";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "d3279498-d796-4ce9-a3b7-6a4ee600e8b1";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "time_conditions";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "preset_usa";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "array";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = '{"christmas_eve":{"mday":"24","mon":"12"}}';
+        	$apps[$x]['default_settings'][$y]['default_setting_order'] = "359";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "USA Holiday";
 		$y++;
@@ -224,14 +267,27 @@
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "preset_usa";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "array";
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = '{"christmas_day":{"mday":"25","mon":"12"}}';
+        	$apps[$x]['default_settings'][$y]['default_setting_order'] = "360";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "USA Holiday";
 		$y++;
+        	$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "106ba766-1f26-4edc-81be-e4c0dd8937b1";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "time_conditions";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "preset_usa";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "array";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = '{"new_years_eve":{"mday":"31","mon":"12"}}';
+        	$apps[$x]['default_settings'][$y]['default_setting_order'] = "366";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "USA Holiday";
+
+    //define Canada holiday presets
+    		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = '340856f4-ed1d-42ec-b13b-7f37630d019a';
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = 'time_conditions';
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = 'preset_canada';
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = 'array';
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = '{"new_years_day":{"mday":"1","mon":"1"}}';
+       		$apps[$x]['default_settings'][$y]['default_setting_order'] = "1";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = 'true';
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = 'Canada Holiday';
 		$y++;
@@ -240,6 +296,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = 'preset_canada';
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = 'array';
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = '{"family_day":{"wday":"2","mon":"2","mday":"15-21"}}';
+        	$apps[$x]['default_settings'][$y]['default_setting_order'] = "48";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = 'true';
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = 'Canada Holiday';
 		$y++;
@@ -248,6 +305,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = 'preset_canada';
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = 'array';
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = '{"victoria_day":{"wday":"2","mon":"5","mday":"18-24"}}';
+		$apps[$x]['default_settings'][$y]['default_setting_order'] = "139";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = 'true';
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = 'Canada Holiday';
 		$y++;
@@ -256,6 +314,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = 'preset_canada';
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = 'array';
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = '{"canada_day":{"mday":"1","mon":"7"}}';
+        	$apps[$x]['default_settings'][$y]['default_setting_order'] = "183";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = 'true';
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = 'Canada Holiday';
 		$y++;
@@ -264,38 +323,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = 'preset_canada';
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = 'array';
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = '{"bc_day":{"wday":"2","mon":"8","mday":"1-7"}}';
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = 'true';
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = 'Canada Holiday';
-		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = '2eed38e8-11c3-4477-9185-103c36ccf26d';
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = 'time_conditions';
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = 'preset_canada';
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = 'array';
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = '{"thanksgiving_day":{"wday":"2","mon":"10","mday":"8-14"}}';
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = 'true';
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = 'Canada Holiday';
-		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = 'c3244258-55fe-4d20-a23d-ac9e108bf38e';
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = 'time_conditions';
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = 'preset_canada';
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = 'array';
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = '{"remembrance_day":{"mday":"11","mon":"11"}}';
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = 'true';
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = 'Canada Holiday';
-		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = '51717873-86d2-43a2-8748-ff191b4915e7';
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = 'time_conditions';
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = 'preset_canada';
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = 'array';
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = '{"christmas_day":{"mday":"25","mon":"12"}}';
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = 'true';
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = 'Canada Holiday';
-		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = 'a96c087a-503c-4b7c-87af-dff24d5d39c1';
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = 'time_conditions';
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = 'preset_canada';
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = 'array';
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = '{"boxing_day":{"mday":"26","mon":"12"}}';
+        	$apps[$x]['default_settings'][$y]['default_setting_order'] = "216";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = 'true';
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = 'Canada Holiday';
 		$y++;
@@ -304,8 +332,63 @@
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = 'preset_canada';
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = 'array';
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = '{"labour_day":{"wday":"2","mon":"9","mday":"1-7"}}';
+        	$apps[$x]['default_settings'][$y]['default_setting_order'] = "251";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = 'true';
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = 'Canada Holiday';
+        	$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = '2eed38e8-11c3-4477-9185-103c36ccf26d';
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = 'time_conditions';
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = 'preset_canada';
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = 'array';
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = '{"thanksgiving_day":{"wday":"2","mon":"10","mday":"8-14"}}';
+        	$apps[$x]['default_settings'][$y]['default_setting_order'] = "286";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = 'true';
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = 'Canada Holiday';
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = 'c3244258-55fe-4d20-a23d-ac9e108bf38e';
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = 'time_conditions';
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = 'preset_canada';
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = 'array';
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = '{"remembrance_day":{"mday":"11","mon":"11"}}';
+        	$apps[$x]['default_settings'][$y]['default_setting_order'] = "316";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = 'true';
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = 'Canada Holiday';
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "a8f39f63-436f-464c-83ce-5b845f90416e";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "time_conditions";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "preset_canada";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "array";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = '{"christmas_eve":{"mday":"24","mon":"12"}}';
+        	$apps[$x]['default_settings'][$y]['default_setting_order'] = "359";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = 'Canada Holiday';
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = '51717873-86d2-43a2-8748-ff191b4915e7';
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = 'time_conditions';
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = 'preset_canada';
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = 'array';
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = '{"christmas_day":{"mday":"25","mon":"12"}}';
+        	$apps[$x]['default_settings'][$y]['default_setting_order'] = "360";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = 'true';
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = 'Canada Holiday';
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = 'a96c087a-503c-4b7c-87af-dff24d5d39c1';
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = 'time_conditions';
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = 'preset_canada';
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = 'array';
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = '{"boxing_day":{"mday":"26","mon":"12"}}';
+        	$apps[$x]['default_settings'][$y]['default_setting_order'] = "361";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = 'true';
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = 'Canada Holiday';
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "d51cd684-f712-4537-9d5d-d4335a089cf8";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "time_conditions";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "preset_canada";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "array";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = '{"new_years_eve":{"mday":"31","mon":"12"}}';
+        	$apps[$x]['default_settings'][$y]['default_setting_order'] = "366";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = 'Canada Holiday';
 
 	//cache details
 		$apps[$x]['cache']['key'] = "dialplan.\${dialplan_context}";
diff --git a/app/time_conditions/resources/classes/time_conditions.php b/app/time_conditions/resources/classes/time_conditions.php
index 4beba427df..3adf26ddc5 100644
--- a/app/time_conditions/resources/classes/time_conditions.php
+++ b/app/time_conditions/resources/classes/time_conditions.php
@@ -123,6 +123,11 @@
 											}
 										}
 
+									//clear the destinations session array
+										if (isset($_SESSION['destinations']['array'])) {
+											unset($_SESSION['destinations']['array']);
+										}
+
 									//set message
 										message::add($text['message-delete'].': '.@sizeof($array[$this->table]));
 
@@ -210,6 +215,11 @@
 											}
 										}
 
+									//clear the destinations session array
+										if (isset($_SESSION['destinations']['array'])) {
+											unset($_SESSION['destinations']['array']);
+										}
+
 									//set message
 										message::add($text['message-toggle']);
 								}
diff --git a/app/time_conditions/time_condition_edit.php b/app/time_conditions/time_condition_edit.php
index 7b2aa374f4..e99afdb52d 100644
--- a/app/time_conditions/time_condition_edit.php
+++ b/app/time_conditions/time_condition_edit.php
@@ -49,7 +49,11 @@
 	$preset_region = "preset_".$_SESSION['time_conditions']['region']['text'];
 	if (is_array($_SESSION['time_conditions'][$preset_region])) {
 		foreach ($_SESSION['time_conditions'][$preset_region] as $json) {
-			$available_presets[] = json_decode($json, true);
+			$json_array = json_decode($json, true);
+			if (is_array($json_array)) {
+				$available_presets[] = $json_array;
+				$valid_presets[] = array_key_first(end($available_presets));
+			}
 		}
 	}
 	unset($preset_region);
@@ -501,7 +505,12 @@
 
 		//clear the cache
 			$cache = new cache;
-			$cache->delete("dialplan:".$_SESSION["context"]);
+			$cache->delete("dialplan:".$_SESSION["domain_name"]);
+
+		//clear the destinations session array
+			if (isset($_SESSION['destinations']['array'])) {
+				unset($_SESSION['destinations']['array']);
+			}
 
 		//set the message
 			if ($action == "add") {
@@ -555,10 +564,7 @@
 			$sql .= "		dialplan_detail_tag = 'condition' ";
 			$sql .= "		and dialplan_detail_type in ('year','mon','mday','wday','yday','week','mweek','hour','minute','minute-of-day','time-of-day','date-time') ";
 			$sql .= "	) ";
-			$sql .= "	or ( ";
-			$sql .= "		dialplan_detail_tag = 'action' ";
-			$sql .= "		and dialplan_detail_data not like 'preset=%' ";
-			$sql .= "	) ";
+			$sql .= "	or dialplan_detail_tag = 'action' ";
 			$sql .= ") ";
 			$sql .= "order by dialplan_detail_group asc, dialplan_detail_order asc";
 			$parameters['dialplan_uuid'] = $dialplan_uuid;
@@ -569,46 +575,52 @@
 
 		//load current conditions into array (combined by group), and retrieve action and anti-action
 			$c = 0;
-			if (is_array($dialplan_details)) {
-				foreach ($dialplan_details as $row) {
-					if ($row['dialplan_detail_tag'] == 'action') {
-						if ($row['dialplan_detail_group'] == '999') {
-							$dialplan_anti_action = $row['dialplan_detail_type'].(($row['dialplan_detail_data'] != '') ? ':'.$row['dialplan_detail_data'] : null);
+			if (is_array($dialplan_details) && @sizeof($dialplan_details) != 0) {
+				//detect dialplan detail group has valid preset
+				$dialplan_detail_group_max = 0;
+				foreach ($dialplan_details as $i => $row) {
+					if ($row['dialplan_detail_tag'] == 'action' && $row['dialplan_detail_type'] == 'set' && strpos($row['dialplan_detail_data'], 'preset=') === 0) {
+						$preset_name = explode('=',$row['dialplan_detail_data'])[1];
+						if (in_array($preset_name, $valid_presets)) {
+							$dialplan_detail_group_preset[$row['dialplan_detail_group']] = $preset_name;
 						}
 						else {
-							$dialplan_actions[$row['dialplan_detail_group']] = $row['dialplan_detail_type'].(($row['dialplan_detail_data'] != '') ? ':'.$row['dialplan_detail_data'] : null);
+							$invalid_presets_dialplan_detail_groups[] = $row['dialplan_detail_group'];
+							unset($dialplan_details[$i]);
+						}
+					}
+					if ($row['dialplan_detail_group'] > $dialplan_detail_group_max) { $dialplan_detail_group_max = $row['dialplan_detail_group']; }
+				}
+				//reorder any invalid preset dialplan detail groups
+				if (is_array($invalid_presets_dialplan_detail_groups) && @sizeof($invalid_presets_dialplan_detail_groups) != 0) {
+					foreach ($dialplan_details as $i => $row) {
+						if (in_array($row['dialplan_detail_group'], $invalid_presets_dialplan_detail_groups)) {
+							$dialplan_details[$i]['dialplan_detail_group'] = $dialplan_detail_group_max + 5;
+						}
+					}
+				}
+				//parse out dialplan actions, anti-actions and conditions
+				foreach ($dialplan_details as $i => $row) {
+					if ($row['dialplan_detail_tag'] == 'action') {
+						if ($row['dialplan_detail_group'] == '999') {
+							$dialplan_anti_action = $row['dialplan_detail_type'].($row['dialplan_detail_data'] != '' || $row['dialplan_detail_type'] == 'hangup' ? ':'.$row['dialplan_detail_data'] : null);
+						}
+						else {
+							$dialplan_detail_group = $dialplan_detail_group_preset[$row['dialplan_detail_group']] ?: $row['dialplan_detail_group'];
+							$dialplan_actions[$dialplan_detail_group] = $row['dialplan_detail_type'].($row['dialplan_detail_data'] != '' || $row['dialplan_detail_type'] == 'hangup' ? ':'.$row['dialplan_detail_data'] : null);
 						}
 					}
 					else if ($row['dialplan_detail_tag'] == 'condition') {
-						$current_conditions[$row['dialplan_detail_group']][$row['dialplan_detail_type']] = $row['dialplan_detail_data'];
+						$dialplan_detail_group = $dialplan_detail_group_preset[$row['dialplan_detail_group']] ?: $row['dialplan_detail_group'];
+						$current_conditions[$dialplan_detail_group][$row['dialplan_detail_type']] = $row['dialplan_detail_data'];
 					}
 				}
 			}
 
-// 		//find the selected presets
-// 			if (is_array($available_presets)) {
-// 				foreach ($available_presets as $preset_number => &$preset) {
-// 					if (is_array($preset)) {
-// 						foreach ($preset as $preset_name => $preset_variables) {
-// 							$preset_checked[$preset_name] = 'false';
-// 							if (is_array($dialplan_details)) {
-// 								foreach ($dialplan_details as $row) {
-// 									if ($row['dialplan_detail_tag'] == 'action') {
-// 										if ($row['dialplan_detail_data'] == 'preset='.$preset_name) {
-// 											$preset_checked[$preset_name] = 'true';
-// 										}
-// 									}
-// 								}
-// 							}
-// 						}
-// 					}
-// 				}
-// 			}
-
 		//loop through available presets (if any)
-			if (is_array($available_presets)) {
+			if (is_array($available_presets) && @sizeof($available_presets) != 0) {
 				foreach ($available_presets as $preset_number => $preset) {
-					if (is_array($preset)) {
+					if (is_array($preset) && @sizeof($preset) != 0) {
 						foreach ($preset as $preset_name => $preset_variables) {
 							//loop through each condition group
 							if (is_array($current_conditions)) {
@@ -622,8 +634,17 @@
 									}
 									//if all preset variables found, then condition is a preset
 									if ($matches == sizeof($preset_variables)) {
-
-										$current_presets[$preset_number] = $group_id;
+										//preset found
+										if (!is_numeric($group_id)) {
+											$current_presets[] = $group_id;
+										}
+										//preset *conditions* found, but wasn't marked as a preset in the dialplan, so promote and update current conditions and dialplan actions
+										else {
+											$current_presets[] = $preset_name;
+											$current_conditions[$preset_name] = $current_conditions[$group_id];
+											$dialplan_actions[$preset_name] = $dialplan_actions[$group_id];
+											unset($current_conditions[$group_id], $dialplan_actions[$group_id]);
+										}
 									}
 								}
 							}
@@ -631,6 +652,11 @@
 					}
 				}
 			}
+
+		//sort arrays by keys
+			if (is_array($dialplan_actions)) { ksort($dialplan_actions); }
+			if (is_array($current_conditions)) { ksort($current_conditions); }
+
 	}
 
 //set the defaults
@@ -644,6 +670,16 @@
 	$document['title'] = $text['title-time_condition'];
 	require_once "resources/header.php";
 
+//debug
+// 	echo "<div style='overflow: auto; font-family: courier; width: 100%; height: 200px; border: 1px solid #ccc; padding: 20px;'>\n";
+// 	echo "<b>".'$dialplan_details'."</b>\n"; view_array($dialplan_details, false);
+// 	echo "<b>".'$dialplan_anti_action'."</b>\n"; view_array($dialplan_anti_action, false);
+// 	echo "<b>".'$dialplan_actions'."</b>\n"; view_array($dialplan_actions, false); //
+// 	echo "<b>".'$current_conditions'."</b>\n"; view_array($current_conditions, false); //
+// 	echo "<b>".'$available_presets'."</b>\n"; view_array($available_presets, false);
+// 	echo "<b>".'$current_presets'."</b>\n"; view_array($current_presets, false); //
+// 	echo "</div><br><br>\n";
+
 ?>
 
 <script type="text/javascript">
@@ -1021,7 +1057,7 @@ if ($action == 'update') {
 					}
 				}
 				//used to determine largest custom group id in use
-				$largest_group_id = ($group_id > $largest_group_id) ? $group_id : $largest_group_id;
+				$largest_group_id = (is_numeric($group_id) && $group_id > $largest_group_id) ? $group_id : $largest_group_id;
 			}
 		}
 	}
@@ -1053,10 +1089,8 @@ if ($action == 'update') {
 			foreach ($available_presets as $preset_number => $preset) {
 				if (is_array($preset)) {
 					foreach ($preset as $preset_name => $preset_variables) {
-						$checked = (is_array($current_presets) && $current_presets[$preset_number] != '') ? "checked='checked'" : null;
-// 						$checked = (is_array($current_presets) && $preset_checked[$preset_name] == 'true') ? "checked='checked'" : null;
-
-						$preset_group_id = ($checked) ? $current_presets[$preset_number] : $preset_group_id = $preset_number * 5 + 100;
+						$checked = is_array($current_presets) && in_array($preset_name, $current_presets) ? "checked='checked'" : null;
+						$preset_group_id = $preset_number * 5 + 100;
 						if (strlen($text['label-preset_'.$preset_name]) > 0) {
 							$label_preset_name = $text['label-preset_'.$preset_name];
 						}
@@ -1077,17 +1111,17 @@ if ($action == 'update') {
 						echo "		</tr>";
 						echo "		<tr>";
 						echo "			<td colspan='4' style='padding-top: 10px;'>";
-						echo 				$destination->select('dialplan', 'dialplan_action['.$preset_group_id.']', $dialplan_action);
+						echo 				$destination->select('dialplan', 'dialplan_action['.$preset_group_id.']', $dialplan_actions[$preset_name]);
 						echo "			</td>";
 						echo "		</tr>";
 						echo "	</table>";
 						echo "	<br />";
 						echo "</div>";
 
-						if ($action == 'update' && is_array($current_presets) && $current_presets[$preset_number] != '') {
+						if ($action == 'update' && is_array($current_presets) && in_array($preset_name, $current_presets)) {
 							//add (potentially customized) preset conditions and populate
-							if (is_array($current_conditions[$preset_group_id])) {
-								foreach ($current_conditions[$preset_group_id] as $cond_var => $cond_val) {
+							if (is_array($current_conditions[$preset_name])) {
+								foreach ($current_conditions[$preset_name] as $cond_var => $cond_val) {
 									$range_indicator = ($cond_var == 'date-time') ? '~' : '-';
 									$tmp = explode($range_indicator, $cond_val);
 									$cond_val_start = $tmp[0];
@@ -1117,7 +1151,6 @@ if ($action == 'update') {
 										echo "	$('#value_".$preset_group_id."_' + condition_id + '_start option[value=\"".$cond_val_start."\"]').prop('selected', true);\n";
 										echo "	$('#value_".$preset_group_id."_' + condition_id + '_stop option[value=\"".$cond_val_stop."\"]').prop('selected', true);\n";
 									}
-									echo "	$('#dialplan_action_".$preset_group_id." option[value=\"".$dialplan_actions[$preset_group_id]."\"]').prop('selected', true);\n\n";
 									echo "</script>";
 								}
 							}
@@ -1152,7 +1185,7 @@ if ($action == 'update') {
 		echo "		<tr>";
 		echo "			<td>";
 		echo button::create(['type'=>'button','label'=>$text['button-advanced'],'icon'=>'tools','onclick'=>"$(this).fadeOut(400, function() { $('#default_preset_destination').fadeIn(400); document.getElementById('default_preset_destination_description').innerHTML += '<br>".$text['description-presets_advanced']."'; });"]);
-		echo "				<span id='default_preset_destination' style=' display: none;'>";
+		echo "				<span id='default_preset_destination' style='display: none;'>";
 		echo 				$destination->select('dialplan', 'default_preset_action', $dialplan_action);
 		echo "				</span>";
 		echo "			</td>";
diff --git a/app/vars/app_languages.php b/app/vars/app_languages.php
index f58f1efa22..5770bac89a 100644
--- a/app/vars/app_languages.php
+++ b/app/vars/app_languages.php
@@ -274,8 +274,8 @@ $text['description-variables_advanced']['ru-ru'] = "Определите зде
 $text['description-variables_advanced']['sv-se'] = "Definiera preprocessor variabler här. Kan nås i xml konfigurationen med $.";
 $text['description-variables_advanced']['uk-ua'] = "Задайте змінні препроцесора тут. Вони будуть доступними в конфігурації XML з символом $.";
 
-$text['description-variables']['en-us'] = "Define preprocessor variables here.";
-$text['description-variables']['en-gb'] = "Define preprocessor variables here.";
+$text['description-variables']['en-us'] = "Define preprocessor variables here. A switch restart is required for changes to take effect.";
+$text['description-variables']['en-gb'] = "Define preprocessor variables here. A switch restart is required for changes to take effect.";
 $text['description-variables']['ar-eg'] = "";
 $text['description-variables']['de-at'] = "Definieren Sie Preprozessor Variablen."; //copied from de-de
 $text['description-variables']['de-ch'] = "Definieren Sie Preprozessor Variablen."; //copied from de-de
diff --git a/app/voicemails/app_config.php b/app/voicemails/app_config.php
index 60a2d41e43..595ff12c8a 100644
--- a/app/voicemails/app_config.php
+++ b/app/voicemails/app_config.php
@@ -34,9 +34,10 @@
 		$apps[$x]['destinations'][$y]['type'] = "sql";
 		$apps[$x]['destinations'][$y]['label'] = "voicemails";
 		$apps[$x]['destinations'][$y]['name'] = "voicemails";
-		$apps[$x]['destinations'][$y]['sql'] = "select voicemail_id as destination, '*99' || voicemail_id as extension, voicemail_description as description from v_voicemails";
+		$apps[$x]['destinations'][$y]['sql'] = "select voicemail_uuid, voicemail_id as destination, '*99' || voicemail_id as extension, voicemail_description as description from v_voicemails";
 		$apps[$x]['destinations'][$y]['where'] = "where domain_uuid = '\${domain_uuid}' and voicemail_enabled = 'true' ";
 		$apps[$x]['destinations'][$y]['order_by'] = "voicemail_id asc ";
+		$apps[$x]['destinations'][$y]['field']['voicemail_uuid'] = "voicemail_uuid";
 		$apps[$x]['destinations'][$y]['field']['destination'] = "voicemail_id";
 		$apps[$x]['destinations'][$y]['field']['extension'] = "voicemail_id";
 		$apps[$x]['destinations'][$y]['field']['description'] = "voicemail_description";
@@ -85,10 +86,6 @@
 		$apps[$x]['permissions'][$y]['groups'][] = "user";
 		$apps[$x]['permissions'][$y]['groups'][] = "agent";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = "voicemail_message_edit";
-		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
-		$apps[$x]['permissions'][$y]['groups'][] = "admin";
-		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "voicemail_message_delete";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
@@ -296,6 +293,15 @@
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Voicemail enabled default value.";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "3f74cd0b-7f2e-4504-ac02-8755e0364a1e";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "voicemail";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "transcription_enabled_default";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "boolean";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Transcription enabled default value.";
+		
 
 	//schema details
 		$y=0;
@@ -317,7 +323,7 @@
 		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "primary";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "voicemail_id";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "numeric";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['search'] = 'true';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the voicemail id.";
 		$z++;
diff --git a/app/voicemails/app_defaults.php b/app/voicemails/app_defaults.php
index fb39d834a5..18c0433c58 100644
--- a/app/voicemails/app_defaults.php
+++ b/app/voicemails/app_defaults.php
@@ -27,30 +27,67 @@
 //process this only one time
 if ($domains_processed == 1) {
 
-	// process change from using macros to phrases
-	$languages_path = $_SESSION['switch']['phrases']['dir'];
-	if ($languages_path != '' && file_exists($languages_path)) {
-		$folder_contents = scandir($languages_path);
+	// define initial, get current, define correct languages folder paths
+	$switch_configuration_dir = $_SESSION['switch']['conf']['dir'] != '' ? $_SESSION['switch']['conf']['dir'] : '/etc/freeswitch';
+	$switch_phrases_dir_initial = $switch_configuration_dir.'/lang';
+	$switch_phrases_dir_current = $_SESSION['switch']['phrases']['dir'];
+	$switch_phrases_dir_correct = $switch_configuration_dir.'/languages';
+
+	// ensure switch using languages (not lang) folder
+	if ($switch_phrases_dir_current == $switch_phrases_dir_initial) {
+		// rename languages folder, if necessary
+		if (file_exists($switch_phrases_dir_current) && !file_exists($switch_phrases_dir_correct)) {
+			rename($switch_phrases_dir_current, $switch_phrases_dir_correct);
+		}
+		// update default setting value
+		if (file_exists($switch_phrases_dir_correct)) {
+			// session
+			$_SESSION['switch']['phrases']['dir'] = $switch_phrases_dir_correct;
+			// database
+			$sql = "update v_default_settings ";
+			$sql .= "set default_setting_value = '".$switch_phrases_dir_correct."', ";
+			$sql .= "default_setting_enabled = true ";
+			$sql .= "where default_setting_category = 'switch' ";
+			$sql .= "and default_setting_subcategory = 'phrases' ";
+			$sql .= "and default_setting_name = 'dir' ";
+			$database = new database;
+			$database->execute($sql);
+			unset($sql);
+		}
+
+	}
+
+	if (file_exists($switch_phrases_dir_correct)) {
+		// update language path in main switch xml file
+		if (file_exists($switch_configuration_dir.'/freeswitch.xml')) {
+			$switch_xml_content = file_get_contents($switch_configuration_dir.'/freeswitch.xml');
+			$switch_xml_content = str_replace('data="lang/', 'data="languages/', $switch_xml_content);
+			@file_put_contents($switch_configuration_dir.'/freeswitch.xml', $switch_xml_content);
+		}
+		$folder_contents = scandir($switch_phrases_dir_correct);
 		if (is_array($folder_contents) && @sizeof($folder_contents) != 0) {
 			foreach ($folder_contents as $language_abbreviation) {
 				if ($language_abbreviation == '.' || $language_abbreviation == '..') { continue; }
-				// adjust language xml to include all xml phrase files in the vm folder
-				$language_xml_path = $languages_path.'/'.$language_abbreviation.'/'.$language_abbreviation.'.xml';
+				// adjust language xml file to include all xml phrase files in the vm folder
+				$language_xml_path = $switch_phrases_dir_correct.'/'.$language_abbreviation.'/'.$language_abbreviation.'.xml';
 				if (file_exists($language_xml_path)) {
 					$language_xml_content = file_get_contents($language_xml_path);
 					$language_xml_content = str_replace('data="vm/sounds.xml"', 'data="vm/*.xml"', $language_xml_content);
 					@file_put_contents($language_xml_path, $language_xml_content);
 				}
-				// copy voicemail.xml to language/xx/vm folders
+				// copy voicemail.xml to languages/xx/vm folders
 				$voicemail_xml_source = $_SERVER['PROJECT_ROOT'].'/app/voicemails/resources/switch/languages/'.$language_abbreviation.'/vm/voicemail.xml';
-				$voicemail_xml_target = $languages_path.'/'.$language_abbreviation.'/vm/voicemail.xml';
+				$voicemail_xml_target = $switch_phrases_dir_correct.'/'.$language_abbreviation.'/vm/voicemail.xml';
 				if (!file_exists($voicemail_xml_target)) {
 					copy($voicemail_xml_source, $voicemail_xml_target);
 				}
 			}
 		}
 	}
-	unset($languages_path, $folder_contents, $language_abbreviation, $language_xml_path, $language_xml_content, $voicemail_xml_source, $voicemail_xml_target);
+
+	// clear variables
+	unset($switch_configuration_dir, $switch_phrases_dir_initial, $switch_phrases_dir_current, $switch_phrases_dir_correct);
+	unset($switch_xml_content, $folder_contents, $language_abbreviation, $language_xml_path, $language_xml_content, $voicemail_xml_source, $voicemail_xml_target);
 
 }
 
diff --git a/app/voicemails/resources/classes/voicemail.php b/app/voicemails/resources/classes/voicemail.php
index 63773b2699..8390206ee0 100644
--- a/app/voicemails/resources/classes/voicemail.php
+++ b/app/voicemails/resources/classes/voicemail.php
@@ -364,6 +364,11 @@
 									$p->delete('voicemail_destination_delete', 'temp');
 									$p->delete('voicemail_greeting_delete', 'temp');
 
+								//clear the destinations session array
+									if (isset($_SESSION['destinations']['array'])) {
+										unset($_SESSION['destinations']['array']);
+									}
+
 								//set message
 									message::add($text['message-delete']);
 							}
@@ -544,6 +549,11 @@
 									$database->save($array);
 									unset($array);
 
+								//clear the destinations session array
+									if (isset($_SESSION['destinations']['array'])) {
+										unset($_SESSION['destinations']['array']);
+									}
+
 								//set message
 									message::add($text['message-toggle']);
 							}
diff --git a/app/voicemails/voicemail_edit.php b/app/voicemails/voicemail_edit.php
index 4316b4af68..aa6e20fa1b 100644
--- a/app/voicemails/voicemail_edit.php
+++ b/app/voicemails/voicemail_edit.php
@@ -137,6 +137,8 @@
 				//get a new voicemail_uuid
 					if ($action == "add" && permission_exists('voicemail_add')) {
 						$voicemail_uuid = uuid();
+						//If adding a mailbox, set the default transcribe behavior
+						$voicemail_transcription_enabled = $_SESSION['voicemail']['transcription_enabled_default']['boolean'];
 					}
 
 				//add common array fields
@@ -244,6 +246,11 @@
 						$obj->voicemail_destinations_delete($voicemail_destinations_delete);
 					}
 
+				//clear the destinations session array
+					if (isset($_SESSION['destinations']['array'])) {
+						unset($_SESSION['destinations']['array']);
+					}
+
 				//set message
 					if ($action == "add" && permission_exists('voicemail_add')) {
 						message::add($text['message-add']);
@@ -300,7 +307,7 @@
 //set defaults
 	if (strlen($voicemail_local_after_email) == 0) { $voicemail_local_after_email = "true"; }
 	if (strlen($voicemail_enabled) == 0) { $voicemail_enabled = "true"; }
-	if (strlen($voicemail_transcription_enabled) == 0) { $voicemail_transcription_enabled = "false"; }	
+	if (strlen($voicemail_transcription_enabled) == 0) { $voicemail_transcription_enabled = $_SESSION['voicemail']['transcription_enabled_default']['boolean'] ?: "false"; }	
 	if (strlen($voicemail_tutorial) == 0) { $voicemail_tutorial = "false"; }
 
 //get the greetings list
diff --git a/app/voicemails/voicemail_messages.php b/app/voicemails/voicemail_messages.php
index 9a7ee5a80b..457514f7a6 100644
--- a/app/voicemails/voicemail_messages.php
+++ b/app/voicemails/voicemail_messages.php
@@ -178,7 +178,7 @@
 	$voicemails = $vm->messages();
 
 //count messages
-	$new_messages = 0;
+	$new_messages = $num_rows = 0;
 	if (is_array($voicemails) && @sizeof($voicemails) != 0) {
 		foreach ($voicemails as $voicemail) {
 			if (is_array($voicemail['messages'])) {
diff --git a/app/voicemails/voicemails.php b/app/voicemails/voicemails.php
index 17e1c6e838..18ef21370c 100644
--- a/app/voicemails/voicemails.php
+++ b/app/voicemails/voicemails.php
@@ -79,6 +79,16 @@
 			}
 		}
 	}
+	else {
+		$voicemail = new voicemail;
+		$rows = $voicemail->voicemails();
+		if (is_array($rows) && @sizeof($rows) != 0) {
+			foreach ($rows as $row) {
+				$voicemail_uuids[]['voicemail_uuid'] = $row['voicemail_uuid'];
+			}
+		}
+		unset($voicemail, $rows, $row);
+	}
 
 //get order and order by
 	$order_by = $_GET["order_by"];
diff --git a/app/xml_cdr/app_config.php b/app/xml_cdr/app_config.php
index c01ccef3cc..3cd481481d 100644
--- a/app/xml_cdr/app_config.php
+++ b/app/xml_cdr/app_config.php
@@ -39,6 +39,7 @@
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "xml_cdr_domain";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "xml_cdr_add";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
@@ -196,6 +197,12 @@
 		$apps[$x]['permissions'][$y]['name'] = "xml_cdr_lose_race";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "xml_cdr_enterprise_leg";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "xml_cdr_cc_agent_leg";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "xml_cdr_archive";
 		//$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
@@ -206,6 +213,14 @@
 		$apps[$x]['permissions'][$y]['name'] = "xml_cdr_export";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "xml_cdr_export_csv";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "xml_cdr_export_pdf";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 
 	//default settings
 		$y=0;
@@ -525,6 +540,12 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(1)";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "The leg of the call a or b.";
 		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "originating_leg_uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Originating Leg UUID. Used to identify legs of an enterprise ring group - and exclude them ";
+		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "pdd_ms";
 		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "numeric";
 		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "numeric";
@@ -543,6 +564,12 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Save the last application data.";
 		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "voicemail_message";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "boolean";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
+		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "missed_call";
 		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "boolean";
 		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
diff --git a/app/xml_cdr/app_languages.php b/app/xml_cdr/app_languages.php
index 366fd4a3f5..be989695a1 100644
--- a/app/xml_cdr/app_languages.php
+++ b/app/xml_cdr/app_languages.php
@@ -1562,8 +1562,8 @@ $text['label-hangup_cause']['de-ch'] = "Hangup Ursache"; //copied from de-de
 $text['label-hangup_cause']['de-de'] = "Hangup Ursache";
 $text['label-hangup_cause']['es-cl'] = "Causa Colgar";
 $text['label-hangup_cause']['es-mx'] = "Causa Colgar"; //copied from es-cl
-$text['label-hangup_cause']['fr-ca'] = "Parce hangup"; //copied from fr-fr
-$text['label-hangup_cause']['fr-fr'] = "Parce hangup";
+$text['label-hangup_cause']['fr-ca'] = "Cause de raccrochage"; //copied from fr-fr
+$text['label-hangup_cause']['fr-fr'] = "Cause de raccrochage";
 $text['label-hangup_cause']['he-il'] = "";
 $text['label-hangup_cause']['it-it'] = "Causa Chiusura Chiamata";
 $text['label-hangup_cause']['nl-nl'] = "";
@@ -1982,8 +1982,8 @@ $text['label-caller_id_number']['de-ch'] = "Anrufer Nummer"; //copied from de-de
 $text['label-caller_id_number']['de-de'] = "Anrufer Nummer";
 $text['label-caller_id_number']['es-cl'] = "Número CID";
 $text['label-caller_id_number']['es-mx'] = "Número CID"; //copied from es-cl
-$text['label-caller_id_number']['fr-ca'] = "Nombre de l'Appelant"; //copied from fr-fr
-$text['label-caller_id_number']['fr-fr'] = "Nombre de l'Appelant";
+$text['label-caller_id_number']['fr-ca'] = "Numéro de l'Appelant"; //copied from fr-fr
+$text['label-caller_id_number']['fr-fr'] = "Numéro de l'Appelant";
 $text['label-caller_id_number']['he-il'] = "";
 $text['label-caller_id_number']['it-it'] = "Numero CID";
 $text['label-caller_id_number']['nl-nl'] = "";
@@ -2402,8 +2402,8 @@ $text['label-order']['de-ch'] = "Order";
 $text['label-order']['de-de'] = "Order";
 $text['label-order']['es-cl'] = "Order";
 $text['label-order']['es-mx'] = "Order";
-$text['label-order']['fr-ca'] = "Order";
-$text['label-order']['fr-fr'] = "Order";
+$text['label-order']['fr-ca'] = "Ordre";
+$text['label-order']['fr-fr'] = "Ordre";
 $text['label-order']['he-il'] = "Order";
 $text['label-order']['it-it'] = "Order";
 $text['label-order']['nl-nl'] = "Order";
@@ -2696,8 +2696,8 @@ $text['description-tta']['de-ch'] = "Zeit zu beantworten"; //copied from de-de
 $text['description-tta']['de-de'] = "Zeit zu beantworten";
 $text['description-tta']['es-cl'] = "Hora de contestar";
 $text['description-tta']['es-mx'] = "Hora de contestar"; //copied from es-cl
-$text['description-tta']['fr-ca'] = "Le temps de répondre"; //copied from fr-fr
-$text['description-tta']['fr-fr'] = "Le temps de répondre";
+$text['description-tta']['fr-ca'] = "Temps de réponse"; //copied from fr-fr
+$text['description-tta']['fr-fr'] = "Temps de réponse";
 $text['description-tta']['he-il'] = "הגיע הזמן לענות";
 $text['description-tta']['it-it'] = "Tempo per rispondere";
 $text['description-tta']['nl-nl'] = "Tijd om te antwoorden";
@@ -2898,4 +2898,4 @@ $text['button-advanced_search']['ru-ru'] = "Расширенный поиск";
 $text['button-advanced_search']['sv-se'] = "Avancerad";
 $text['button-advanced_search']['uk-ua'] = "";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/xml_cdr/resources/classes/xml_cdr.php b/app/xml_cdr/resources/classes/xml_cdr.php
index 840a17800e..4f488c1002 100644
--- a/app/xml_cdr/resources/classes/xml_cdr.php
+++ b/app/xml_cdr/resources/classes/xml_cdr.php
@@ -145,10 +145,12 @@ if (!class_exists('xml_cdr')) {
 			$this->fields[] = "record_path";
 			$this->fields[] = "record_name";
 			$this->fields[] = "leg";
+			$this->fields[] = "originating_leg_uuid";
 			$this->fields[] = "pdd_ms";
 			$this->fields[] = "rtp_audio_in_mos";
 			$this->fields[] = "last_app";
 			$this->fields[] = "last_arg";
+			$this->fields[] = "voicemail_message";
 			$this->fields[] = "cc_side";
 			$this->fields[] = "cc_member_uuid";
 			$this->fields[] = "cc_queue_joined_epoch";
@@ -186,50 +188,37 @@ if (!class_exists('xml_cdr')) {
 
 			$this->fields();
 			$field_count = sizeof($this->fields);
-			$row_count = sizeof($this->array);
 			//$field_count = sizeof($this->fields);
-			$i = 0;
 			if (isset($this->array)) {
 				foreach ($this->array as $row) {
-					$sql = "insert into v_xml_cdr (";
-					$f = 1;
-					if (isset($this->fields)) {
-						foreach ($this->fields as $field) {
-							$field = preg_replace('#[^a-zA-Z0-9_\-]#', '', $field);
-							if ($field_count == $f) {
-								$sql .= "$field ";
-							}
-							else {
-								$sql .= "$field, ";
-							}
-							$f++;
-						}
-					}
-					$sql .= ")\n";
-					$sql .= "values \n";
-					$sql .= "(";
-					$f = 1;
+					//build the array
 					if (isset($this->fields)) {
 						foreach ($this->fields as $field) {
 							$field = preg_replace('#[^a-zA-Z0-9_\-]#', '', $field);
 							if (isset($row[$field]) && strlen($row[$field]) > 0) {
-								$sql .= ":".$field." \n";
-								$parameters[$field] = $row[$field];
+								$array['xml_cdr'][0][$field] = $row[$field];
 							}
-							else {
-								$sql .= "null\n";
-							}
-							if ($field_count != $f) {
-								$sql .= ",";
-							}
-							$f++;
 						}
 					}
-					$sql .= ")";
+
+					//add the temporary permission
+					$p = new permissions;
+					$p->add("xml_cdr_add", "temp");
+					$p->add("xml_cdr_edit", "temp");
+
+					//save the call details record to the database
 					$database = new database;
-					$database->execute($sql, $parameters);
-					unset($sql, $parameters);
-					$i++;
+					$database->app_name = 'xml_cdr';
+					$database->app_uuid = '4a085c51-7635-ff03-f67b-86e834422848';
+					$database->domain_uuid = $domain_uuid;
+					$database->save($array, false);
+					//$message = $database->message;
+					//print_r($message);
+
+					//remove the temporary permission
+					$p->delete("xml_cdr_add", "temp");
+					$p->delete("xml_cdr_edit", "temp");
+					unset($array);
 				}
 			}
 
@@ -329,7 +318,7 @@ if (!class_exists('xml_cdr')) {
 
 					//set missed calls
 						$missed_call = 'false';
-						if (strlen($xml->variables->answer_stamp) == 0) {
+						if ($xml->variables->cc_side != "agent" && strlen($xml->variables->originating_leg_uuid) == 0 && $xml->variables->call_direction != 'outbound' && strlen($xml->variables->answer_stamp) == 0) {
 							$missed_call = 'true';
 						}
 						if ($xml->variables->missed_call == 'true') {
@@ -403,6 +392,14 @@ if (!class_exists('xml_cdr')) {
 						$this->array[$key]['last_app'] = urldecode($xml->variables->last_app);
 						$this->array[$key]['last_arg'] = urldecode($xml->variables->last_arg);
 
+					//voicemail message success
+						if ($xml->variables->voicemail_action == "save" && $xml->variables->voicemail_message_seconds > 0){
+							$this->array[$key]['voicemail_message'] = "true";
+						}
+						else { //if ($xml->variables->voicemail_action == "save") {
+							$this->array[$key]['voicemail_message'] = "false";
+						}
+
 					//conference
 						$this->array[$key]['conference_name'] = urldecode($xml->variables->conference_name);
 						$this->array[$key]['conference_uuid'] = urldecode($xml->variables->conference_uuid);
@@ -417,6 +414,9 @@ if (!class_exists('xml_cdr')) {
 					//store the call leg
 						$this->array[$key]['leg'] = $leg;
 
+					//store the originating leg uuid
+						$this->array[$key]['originating_leg_uuid'] = urldecode($xml->variables->originating_leg_uuid);
+
 					//store post dial delay, in milliseconds
 						$this->array[$key]['pdd_ms'] = urldecode($xml->variables->progress_mediamsec) + urldecode($xml->variables->progressmsec);
 
@@ -443,7 +443,7 @@ if (!class_exists('xml_cdr')) {
 						if (strlen($domain_name) == 0) {
 							$presence_id = urldecode($xml->variables->presence_id);
 							if (strlen($presence_id) > 0) {
-								$presence_array = explode($presence_id);
+								$presence_array = explode($presence_id, '%40');
 								$domain_name = $presence_array[1];
 							}
 						}
@@ -510,7 +510,12 @@ if (!class_exists('xml_cdr')) {
 							$record_length = urldecode($xml->variables->record_seconds);
 						}
 						elseif (strlen($xml->variables->record_name) > 0) {
-							$record_path = urldecode($xml->variables->record_path);
+							if (isset($xml->variables->record_path)) {
+								$record_path = urldecode($xml->variables->record_path);
+							}
+							else {
+								$record_path = $_SESSION['switch']['recordings']['dir'].'/'.$domain_name.'/archive/'.$start_year.'/'.$start_month.'/'.$start_day;
+							}
 							$record_name = urldecode($xml->variables->record_name);
 							$record_length = urldecode($xml->variables->duration);
 						}
@@ -577,7 +582,7 @@ if (!class_exists('xml_cdr')) {
 							}
 						}
 
-					// Last check
+					//last check
 						 if (!isset($record_name) || is_null ($record_name) || (strlen($record_name) == 0)) {
 							$bridge_uuid = urldecode($xml->variables->bridge_uuid);
 							$path = $_SESSION['switch']['recordings']['dir'].'/'.$domain_name.'/archive/'.$start_year.'/'.$start_month.'/'.$start_day;
@@ -600,6 +605,13 @@ if (!class_exists('xml_cdr')) {
 							}
 						}
 
+					//debug information
+						//echo "line: ".__line__;
+						//echo "record_path: ".$record_path."\n";
+						//echo "record_name: ".$record_name."\n";
+						//echo "record_length: ".$record_length."\n";
+						//exit;
+
 					//add the call recording
 						if (isset($record_path) && isset($record_name) && file_exists($record_path.'/'.$record_name) && $record_length > 0) {
 							//add to the xml cdr table
@@ -628,8 +640,8 @@ if (!class_exists('xml_cdr')) {
 									$database->app_name = 'call_recordings';
 									$database->app_uuid = '56165644-598d-4ed8-be01-d960bcb8ffed';
 									$database->domain_uuid = $domain_uuid;
-									$database->save($array);
-									$message = $database->message;
+									$database->save($array, false);
+									//$message = $database->message;
 
 									//remove the temporary permission
 									$p->delete("call_recording_add", "temp");
@@ -649,11 +661,11 @@ if (!class_exists('xml_cdr')) {
 						}
 
 					//get the extension_uuid and then add it to the database fields array
-						if (strlen($xml->variables->extension_uuid) > 0) {
+						if (isset($xml->variables->extension_uuid)) {
 							$this->array[$key]['extension_uuid'] = urldecode($xml->variables->extension_uuid);
 						}
 						else {
-							if (strlen($xml->variables->dialed_user) > 0) {
+							if (isset($domain_uuid) && isset($xml->variables->dialed_user)) {
 								$sql = "select extension_uuid from v_extensions ";
 								$sql .= "where domain_uuid = :domain_uuid ";
 								$sql .= "and (extension = :dialed_user or number_alias = :dialed_user) ";
@@ -664,7 +676,7 @@ if (!class_exists('xml_cdr')) {
 								$this->array[$key]['extension_uuid'] = $extension_uuid;
 								unset($parameters);
 							}
-							if (strlen($xml->variables->referred_by_user) > 0) {
+							if (isset($domain_uuid) && isset($xml->variables->referred_by_user)) {
 								$sql = "select extension_uuid from v_extensions ";
 								$sql .= "where domain_uuid = :domain_uuid ";
 								$sql .= "and (extension = :referred_by_user or number_alias = :referred_by_user) ";
@@ -675,12 +687,12 @@ if (!class_exists('xml_cdr')) {
 								$this->array[$key]['extension_uuid'] = $extension_uuid;
 								unset($parameters);
 							}
-							if (strlen($xml->variables->last_sent_callee_id_number) > 0) {
+							if (isset($domain_uuid) && isset($xml->variables->last_sent_callee_id_number)) {
 								$sql = "select extension_uuid from v_extensions ";
 								$sql .= "where domain_uuid = :domain_uuid ";
-								$sql .= "and (extension = :callee_id_number or number_alias = :last_sent_callee_id_number) ";
+								$sql .= "and (extension = :last_sent_callee_id_number or number_alias = :last_sent_callee_id_number) ";
 								$parameters['domain_uuid'] = $domain_uuid;
-								$parameters['callee_id_number'] = $xml->variables->callee_id_number;
+								$parameters['last_sent_callee_id_number'] = $xml->variables->last_sent_callee_id_number;
 								$database = new database;
 								$extension_uuid = $database->select($sql, $parameters, 'column');
 								$this->array[$key]['extension_uuid'] = $extension_uuid;
@@ -919,13 +931,13 @@ if (!class_exists('xml_cdr')) {
 				if (strlen($this->start_stamp_begin) > 0 || strlen($this->start_stamp_end) > 0) {
 					unset($this->quick_select);
 					if (strlen($this->start_stamp_begin) > 0 && strlen($this->start_stamp_end) > 0) {
-						$sql_date_range .= " and start_stamp between :start_stamp_begin and :start_stamp_end \n";
+						$sql_date_range = " and start_stamp between :start_stamp_begin and :start_stamp_end \n";
 						$parameters['start_stamp_begin'] = $this->start_stamp_begin.':00.000';
 						$parameters['start_stamp_end'] = $this->start_stamp_end.':59.999';
 					}
 					else {
 						if (strlen($this->start_stamp_begin) > 0) { 
-							$sql_date_range .= "and start_stamp >= :start_stamp_begin \n"; 
+							$sql_date_range = "and start_stamp >= :start_stamp_begin \n"; 
 							$parameters['start_stamp_begin'] = $this->start_stamp_begin.':00.000';
 						}
 						if (strlen($this->start_stamp_end) > 0) { 
@@ -936,13 +948,13 @@ if (!class_exists('xml_cdr')) {
 				}
 				else {
 					switch ($this->quick_select) {
-						case 1: $sql_date_range .= "and start_stamp >= '".date('Y-m-d H:i:s.000', strtotime("-1 week"))."' \n"; break; //last 7 days
-						case 2: $sql_date_range .= "and start_stamp >= '".date('Y-m-d H:i:s.000', strtotime("-1 hour"))."' \n"; break; //last hour
-						case 3: $sql_date_range .= "and start_stamp >= '".date('Y-m-d')." "."00:00:00.000' \n"; break; //today
-						case 4: $sql_date_range .= "and start_stamp between '".date('Y-m-d',strtotime("-1 day"))." "."00:00:00.000' and '".date('Y-m-d',strtotime("-1 day"))." "."23:59:59.999' \n"; break; //yesterday
-						case 5: $sql_date_range .= "and start_stamp >= '".date('Y-m-d',strtotime("this week"))." "."00:00:00.000' \n"; break; //this week
-						case 6: $sql_date_range .= "and start_stamp >= '".date('Y-m-')."01 "."00:00:00.000' \n"; break; //this month
-						case 7: $sql_date_range .= "and start_stamp >= '".date('Y-')."01-01 "."00:00:00.000' \n"; break; //this year
+						case 1: $sql_date_range = "and start_stamp >= '".date('Y-m-d H:i:s.000', strtotime("-1 week"))."' \n"; break; //last 7 days
+						case 2: $sql_date_range = "and start_stamp >= '".date('Y-m-d H:i:s.000', strtotime("-1 hour"))."' \n"; break; //last hour
+						case 3: $sql_date_range = "and start_stamp >= '".date('Y-m-d')." "."00:00:00.000' \n"; break; //today
+						case 4: $sql_date_range = "and start_stamp between '".date('Y-m-d',strtotime("-1 day"))." "."00:00:00.000' and '".date('Y-m-d',strtotime("-1 day"))." "."23:59:59.999' \n"; break; //yesterday
+						case 5: $sql_date_range = "and start_stamp >= '".date('Y-m-d',strtotime("this week"))." "."00:00:00.000' \n"; break; //this week
+						case 6: $sql_date_range = "and start_stamp >= '".date('Y-m-')."01 "."00:00:00.000' \n"; break; //this month
+						case 7: $sql_date_range = "and start_stamp >= '".date('Y-')."01-01 "."00:00:00.000' \n"; break; //this year
 					}
 				}
 
@@ -970,7 +982,10 @@ if (!class_exists('xml_cdr')) {
 				$sql .= "filter ( \n";
 				$sql .= " where c.extension_uuid = e.extension_uuid \n";
 				$sql .= " and missed_call = true \n";
-				if (!permission_exists('xml_cdr_lose_race')) {
+				if (!permission_exists('xml_cdr_enterprise_leg')) {
+					$sql .= " and originating_leg_uuid is null \n";
+				}
+				elseif (!permission_exists('xml_cdr_lose_race')) {
 					$sql .= " and hangup_cause <> 'LOSE_RACE' \n";
 				}
 				if ($this->include_internal) {
@@ -1026,7 +1041,10 @@ if (!class_exists('xml_cdr')) {
 				$sql .= "count(*) \n";
 				$sql .= "filter ( \n";
 				$sql .= " where c.extension_uuid = e.extension_uuid \n";
-				if (!permission_exists('xml_cdr_lose_race')) {
+				if (!permission_exists('xml_cdr_enterprise_leg')) {
+					$sql .= " and originating_leg_uuid is null \n";
+				}
+				elseif (!permission_exists('xml_cdr_lose_race')) {
 					$sql .= " and hangup_cause <> 'LOSE_RACE' \n";
 				}
 				if ($this->include_internal) {
@@ -1077,6 +1095,7 @@ if (!class_exists('xml_cdr')) {
 				$sql .= " direction, \n";
 				$sql .= " start_stamp, \n";
 				$sql .= " hangup_cause, \n";
+				$sql .= " originating_leg_uuid, \n";
 				$sql .= " billsec \n";
 				$sql .= " from v_xml_cdr \n";
 				if (!($_GET['show'] === 'all' && permission_exists('xml_cdr_all'))) {
@@ -1211,7 +1230,7 @@ if (!class_exists('xml_cdr')) {
 				// If the range starts with an '-' we start from the beginning
 				// If not, we forward the file pointer
 				// And make sure to get the end byte if spesified
-				if ($range0 == '-') {
+				if ($range == '-') {
 					// The n-number of the last bytes is requested
 					$c_start = $size - substr($range, 1);
 				}
diff --git a/app/xml_cdr/v_xml_cdr_import.php b/app/xml_cdr/v_xml_cdr_import.php
index 1ccdf7187c..6230f8c030 100644
--- a/app/xml_cdr/v_xml_cdr_import.php
+++ b/app/xml_cdr/v_xml_cdr_import.php
@@ -198,6 +198,14 @@
 			$database->fields['last_app'] = urldecode($xml->variables->last_app);
 			$database->fields['last_arg'] = urldecode($xml->variables->last_arg);
 
+		//voicemail message success
+			if ($xml->variables->voicemail_action == "save" && $xml->variables->voicemail_message_seconds > 0){
+				$database->fields['voicemail_message'] = "true";
+			}
+			elseif ($xml->variables->voicemail_action == "save") {
+				$database->fields['voicemail_message'] = "false";
+			}
+
 		//conference
 			$database->fields['conference_name'] = urldecode($xml->variables->conference_name);
 			$database->fields['conference_uuid'] = urldecode($xml->variables->conference_uuid);
@@ -211,7 +219,7 @@
 
 		//set missed calls
 			$database->fields['missed_call'] = 'false';
-			if (strlen($xml->variables->answer_stamp) == 0) {
+			if ($xml->variables->cc_side != "agent" && strlen($xml->variables->originating_leg_uuid) == 0 && $xml->variables->call_direction != 'outbound' && strlen($xml->variables->answer_stamp) == 0) {
 				$database->fields['missed_call'] = 'true';
 			}
 			if ($xml->variables->missed_call == 'true') {
@@ -292,7 +300,7 @@
 			if (strlen($domain_name) == 0) {
 				$presence_id = urldecode($xml->variables->presence_id);
 				if (strlen($presence_id) > 0) {
-					$presence_array = explode($presence_id);
+					$presence_array = explode($presence_id, '%40');
 					$domain_name = $presence_array[1];
 				}
 			}
@@ -509,11 +517,12 @@
 						$p->add("call_recording_add", "temp");
 						$p->add("call_recording_edit", "temp");
 
+						//save the call recording to the database
 						$recording_database = new database;
 						$recording_database->app_name = 'call_recordings';
 						$recording_database->app_uuid = '56165644-598d-4ed8-be01-d960bcb8ffed';
 						$recording_database->domain_uuid = $domain_uuid;
-						$recording_database->save($recordings);
+						$recording_database->save($recordings, false);
 						//$message = $recording_database->message;
 						unset($recordings, $i);
 
diff --git a/app/xml_cdr/xml_cdr.php b/app/xml_cdr/xml_cdr.php
index 3de3cee14f..adf9c25588 100644
--- a/app/xml_cdr/xml_cdr.php
+++ b/app/xml_cdr/xml_cdr.php
@@ -188,8 +188,12 @@
 		echo button::create(['type'=>'button','label'=>$text['button-export'],'icon'=>$_SESSION['theme']['button_icon_export'],'onclick'=>"toggle_select('export_format'); this.blur();"]);
 		echo 		"<select class='formfld' style='display: none; width: auto;' name='export_format' id='export_format' onchange=\"display_message('".$text['message-preparing_download']."'); toggle_select('export_format'); document.getElementById('frm_export').submit();\">";
 		echo "			<option value='' disabled='disabled' selected='selected'>".$text['label-format']."</option>";
-		echo "			<option value='csv'>CSV</option>";
-		echo "			<option value='pdf'>PDF</option>";
+		if (permission_exists('xml_cdr_export_csv')) {
+			echo "			<option value='csv'>CSV</option>";
+		}
+		if (permission_exists('xml_cdr_export_pdf')) {
+			echo "			<option value='pdf'>PDF</option>";
+		}
 		echo "		</select>";
 	}
 	if (!$archive_request && permission_exists('xml_cdr_delete')) {
@@ -758,7 +762,7 @@
 					}
 				//recording
 					if (permission_exists('xml_cdr_recording') && (permission_exists('xml_cdr_recording_play') || permission_exists('xml_cdr_recording_download'))) {
-						if ($record_path != '' && file_exists($record_path.'/'.$record_name)) {
+						if ($record_path != '') {
 							$content .= "	<td class='middle button center no-link no-wrap'>";
 							if (permission_exists('xml_cdr_recording_play')) {
 								$content .= 	"<audio id='recording_audio_".escape($row['xml_cdr_uuid'])."' style='display: none;' preload='none' ontimeupdate=\"update_progress('".escape($row['xml_cdr_uuid'])."')\" onended=\"recording_reset('".escape($row['xml_cdr_uuid'])."');\" src=\"download.php?id=".escape($row['xml_cdr_uuid'])."&t=record\" type='".escape($record_type)."'></audio>";
@@ -792,7 +796,7 @@
 					}
 				//tta (time to answer)
 					if (permission_exists('xml_cdr_tta')) {
-						$content .= "	<td class='middle right hide-md-dn'>".(($row['tta'] > 0) ? $row['tta']."s" : "&nbsp;")."</td>\n";
+						$content .= "	<td class='middle right hide-md-dn'>".(($row['tta'] >= 0) ? $row['tta']."s" : "&nbsp;")."</td>\n";
 					}
 				//duration
 					if (permission_exists('xml_cdr_duration')) {
@@ -819,11 +823,7 @@
 					}
 
 					$content .= "</tr>\n";
-
 				//show the leg b only to those with the permission
-					if (!permission_exists('xml_cdr_lose_race') && $row['hangup_cause'] == 'LOSE_RACE') {
-						$content = '';
-					}
 					if ($row['leg'] == 'a') {
 						echo $content;
 					}
diff --git a/app/xml_cdr/xml_cdr_details.php b/app/xml_cdr/xml_cdr_details.php
index dee13f107e..3e76933f16 100644
--- a/app/xml_cdr/xml_cdr_details.php
+++ b/app/xml_cdr/xml_cdr_details.php
@@ -387,9 +387,17 @@
 
 	//foreach($array["variables"] as $key => $value) {
 	if (is_array($array["app_log"]["application"])) {
-		foreach ($array["app_log"]["application"] as $row) {
-			$app_name = $row["@attributes"]["app_name"];
-			$app_data = urldecode($row["@attributes"]["app_data"]);
+		foreach ($array["app_log"]["application"] as $key=>$row) {
+			//single app
+			if ($key === "@attributes") {
+				$app_name = $row["app_name"];
+				$app_data = urldecode($row["app_data"]);
+			}
+			//multiple apps
+			else {
+				$app_name = $row["@attributes"]["app_name"];
+				$app_data = urldecode($row["@attributes"]["app_data"]);
+			}
 			echo "<tr >\n";
 			echo "	<td valign='top' align='left' class='".$row_style[$c]."'>".escape($app_name)."&nbsp;</td>\n";
 			echo "	<td valign='top' align='left' class='".$row_style[$c]."'>".escape(wordwrap($app_data,75,"\n", true))."&nbsp;</td>\n";
diff --git a/app/xml_cdr/xml_cdr_export.php b/app/xml_cdr/xml_cdr_export.php
index df0c0f78f6..96a12d26f7 100644
--- a/app/xml_cdr/xml_cdr_export.php
+++ b/app/xml_cdr/xml_cdr_export.php
@@ -51,7 +51,7 @@
 	$export_format = $_REQUEST['export_format'];
 
 //export the csv
-	if ($export_format == 'csv') {
+	if (permission_exists('xml_cdr_export_csv') && $export_format == 'csv') {
 
 		//define file name
 			if ($_GET['show'] == 'all' && permission_exists('xml_cdr_all')) {
@@ -104,7 +104,7 @@
 	}
 
 //export as a PDF
-	if ($export_format == 'pdf') {
+	if (permission_exists('xml_cdr_export_pdf') && $export_format == 'pdf') {
 
 		//load pdf libraries
 		require_once "resources/tcpdf/tcpdf.php";
@@ -192,7 +192,7 @@
 				$data_body[$p] .= '<td>'.format_phone($fields['destination_number']).'</td>';
 				$data_body[$p] .= '<td>'.$fields['start_stamp'].'</td>';
 				$total['tta'] += ($fields['tta'] > 0) ? $fields['tta'] : 0;
-				$data_body[$p] .= '<td align="right">'.(($fields['tta'] > 0) ? $fields['tta'].'s' : null).'</td>';
+				$data_body[$p] .= '<td align="right">'.(($fields['tta'] >= 0) ? $fields['tta'].'s' : null).'</td>';
 				$seconds = ($fields['hangup_cause'] == "ORIGINATOR_CANCEL") ? $fields['duration'] : round(($fields['billmsec'] / 1000), 0, PHP_ROUND_HALF_UP);
 				$total['duration'] += $seconds;
 				$data_body[$p] .= '<td align="right">'.gmdate("G:i:s", $seconds).'</td>';
diff --git a/app/xml_cdr/xml_cdr_import_update.php b/app/xml_cdr/xml_cdr_import_update.php
deleted file mode 100644
index b308b64604..0000000000
--- a/app/xml_cdr/xml_cdr_import_update.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-/*
-	FusionPBX
-	Version: MPL 1.1
-
-	The contents of this file are subject to the Mozilla Public License Version
-	1.1 (the "License"); you may not use this file except in compliance with
-	the License. You may obtain a copy of the License at
-	http://www.mozilla.org/MPL/
-
-	Software distributed under the License is distributed on an "AS IS" basis,
-	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-	for the specific language governing rights and limitations under the
-	License.
-
-	The Original Code is FusionPBX
-
-	The Initial Developer of the Original Code is
-	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2012
-	the Initial Developer. All Rights Reserved.
-
-	Contributor(s):
-	Mark J Crane <markjcrane@fusionpbx.com>
-*/
-
-//check the permission
-	if(defined('STDIN')) {
-		$document_root = str_replace("\\", "/", $_SERVER["PHP_SELF"]);
-		preg_match("/^(.*)\/mod\/.*$/", $document_root, $matches);
-		$document_root = $matches[1];
-		set_include_path($document_root);
-		require_once "resources/require.php";
-		$_SERVER["DOCUMENT_ROOT"] = $document_root;
-	}
-	else {
-		echo "access denied";
-		exit;
-	}
-
-//determine where the xml cdr will be archived
-	$sql = "select * from v_vars ";
-	$sql .= "where domain_uuid  = '1' ";
-	$sql .= "and var_name = 'xml_cdr_archive' ";
-	$row = $db->query($sql)->fetch();
-	$var_value = trim($row["var_value"]);
-	switch ($var_value) {
-	case "dir":
-		$xml_cdr_archive = 'dir';
-		break;
-	case "db":
-		$xml_cdr_archive = 'db';
-		break;
-	case "none":
-		$xml_cdr_archive = 'none';
-		break;
-	default:
-		$xml_cdr_archive = 'dir';
-		break;
-	}
-
-//get the list of installed apps from the core and mod directories
-	if ($xml_cdr_archive == "db") {
-		//get the xml cdr list
-			$sql = "select xml_cdr, uuid from v_xml_cdr ";
-			$sql .= "where waitsec is null ";
-			//$sql .= "limit 5000 ";
-		//start the transaction
-			$db->beginTransaction();
-		//loop through the results
-			$x = 0;
-			foreach ($db->query($sql,PDO::FETCH_ASSOC) as $row) {
-				//get the values from the db
-					$uuid = $row['uuid'];
-					$xml_string = $row['xml_cdr'];
-				//save each set of records and begin a new transaction
-					if ($x > 5000) {
-						//save the transaction
-							$db->commit();
-						//start the transaction
-							$db->beginTransaction();
-						//reset the count
-							$x = 0;
-					}
-				//parse the xml to get the call detail record info
-					try {
-						$xml = simplexml_load_string($xml_string);
-					}
-					catch(Exception $e) {
-						echo $e->getMessage();
-					}
-				//get the values from the xml and set at variables
-					$uuid = urldecode($xml->variables->uuid);
-					$waitsec = urldecode($xml->variables->waitsec);
-				//update the database
-					if (strlen($waitsec) > 0) {
-						$sql = "update v_xml_cdr ";
-						$sql .= "set waitsec = '$waitsec' ";
-						$sql .= "where uuid = '$uuid' ";
-						echo $sql."\n";
-						$db->exec($sql);
-						$x++;
-					}
-			}
-		//save the transaction
-			$db->commit();
-		//echo finished
-			echo "completed\n";
-	}
-	if ($xml_cdr_archive == "dir") {
-		$xml_cdr_list = glob($_SESSION['switch']['log']['dir']."/xml_cdr/archive/*/*/*/*.xml");
-		echo "count: ".count($xml_cdr_list)."\n";
-		//print_r($xml_cdr_list);
-		$x = 0;
-		//start the transaction
-			$db->beginTransaction();
-		//loop through the xml cdr records
-			foreach ($xml_cdr_list as $xml_cdr) {
-				//save each set of records and begin a new transaction
-					if ($x > 5000) {
-						//save the transaction
-							$db->commit();
-						//start the transaction
-							$db->beginTransaction();
-						//reset the count
-							$x = 0;
-					}
-				//get the xml cdr string
-					$xml_string = file_get_contents($xml_cdr);
-				//parse the xml to get the call detail record info
-					try {
-						$xml = simplexml_load_string($xml_string);
-					}
-					catch(Exception $e) {
-						echo $e->getMessage();
-					}
-				//get the values from the xml and set at variables
-					$uuid = urldecode($xml->variables->uuid);
-					$waitsec = urldecode($xml->variables->waitsec);
-				//update the database
-					//if ($num_rows == "0" && strlen($waitsec) > 0) {
-					if (strlen($waitsec) > 0) {
-						$sql = "update v_xml_cdr ";
-						$sql .= "set waitsec = '$waitsec' ";
-						$sql .= "where uuid = '$uuid' ";
-						echo $sql."\n";
-						$db->exec($sql);
-						$x++;
-					}
-			}
-		//save the transaction
-			$db->commit();
-		//echo finished
-			echo "completed\n";
-	}
-
-?>
diff --git a/app/xml_cdr/xml_cdr_inc.php b/app/xml_cdr/xml_cdr_inc.php
index bb10bfb56e..d7255167d8 100644
--- a/app/xml_cdr/xml_cdr_inc.php
+++ b/app/xml_cdr/xml_cdr_inc.php
@@ -242,6 +242,7 @@
 	$sql .= "c.source_number, \n";
 	$sql .= "c.destination_number, \n";
 	$sql .= "c.leg, \n";
+	$sql .= "c.cc_side, \n";
 	//$sql .= "(c.xml is not null or c.json is not null) as raw_data_exists, \n";
 	//$sql .= "c.json, \n";
 	if (is_array($_SESSION['cdr']['field'])) {
@@ -416,6 +417,13 @@
 		$sql .= "and hangup_cause like :hangup_cause ";
 		$parameters['hangup_cause'] = '%'.$hangup_cause.'%';
 	}
+	elseif (!permission_exists('xml_cdr_lose_race') && !permission_exists('xml_cdr_enterprise_leg')) {
+		$sql .= "and hangup_cause != 'LOSE_RACE' ";
+	}
+	//exclude enterprise ring group legs
+	if (!permission_exists('xml_cdr_enterprise_leg')) {
+		$sql .= "and originating_leg_uuid IS NULL ";
+	}
 	if (strlen($call_result) > 0) {
 		switch ($call_result) {
 			case 'answered':
@@ -429,10 +437,20 @@
 				break;
 			case 'cancelled':
 				if ($direction == 'inbound' || $direction == 'local' || $call_result == 'missed') {
-					$sql = "and (answer_stamp is null and bridge_uuid is null and sip_hangup_disposition <> 'send_refuse') ";
+					$sql .= "
+						and ((
+							answer_stamp is null 
+							and bridge_uuid is null 
+							and sip_hangup_disposition <> 'send_refuse'
+						)
+						or (
+							answer_stamp is not null 
+							and bridge_uuid is null 
+							and voicemail_message = false
+						))";
 				}
 				else if ($direction == 'outbound') {
-					$sql = "and (answer_stamp is null and bridge_uuid is not null) ";
+					$sql .= "and (answer_stamp is null and bridge_uuid is not null) ";
 				}
 				else {
 					$sql .= "
@@ -446,10 +464,17 @@
 							direction = 'outbound'
 							and answer_stamp is null
 							and bridge_uuid is not null
+						)
+						or (
+							(direction = 'inbound' or direction = 'local')
+							and answer_stamp is not null
+							and bridge_uuid is null
+							and voicemail_message = false
 						))";
 				}
 				break;
-			default: //failed
+			default: 
+			    $sql .= "and (answer_stamp is null and bridge_uuid is null and duration = 0) ";
 				//$sql .= "and (answer_stamp is null and bridge_uuid is null and billsec = 0 and sip_hangup_disposition = 'send_refuse') ";
 		}
 	}
@@ -506,6 +531,10 @@
 			$sql .= "and (c.record_path is null or c.record_name is null) ";
 		}
 	}
+	//show agent originated legs only to those with the permission
+	if (!permission_exists('xml_cdr_cc_agent_leg')) {
+		$sql .= "and (cc_side is null or cc_side != 'agent') ";
+	}
 	//end where
 	if (strlen($order_by) > 0) {
 		$sql .= order_by($order_by, $order);
@@ -533,7 +562,7 @@
 		$database->password = $_SESSION['cdr']['archive_database_password']['text'];
 	}
 	$result = $database->select($sql, $parameters, 'all');
-	$result_count = (count($result) ? count($result) : 0);
+	$result_count = is_array($result) ? sizeof($result) : 0;
 	unset($database, $sql, $parameters);
 
 //return the paging
diff --git a/app/xml_cdr/xml_cdr_statistics.php b/app/xml_cdr/xml_cdr_statistics.php
index f05ebdccbb..554fc73048 100644
--- a/app/xml_cdr/xml_cdr_statistics.php
+++ b/app/xml_cdr/xml_cdr_statistics.php
@@ -314,7 +314,7 @@
 		echo "	<td>".escape($row['volume'])."&nbsp;</td>\n";
 		echo "	<td>".(round(escape($row['minutes']),2))."&nbsp;</td>\n";
 		echo "	<td>".(round(escape($row['avg_min']),2))."&nbsp;/&nbsp;".(round(escape($row['cpm_ans']),2))."&nbsp;</td>\n";
-		echo "	<td class='center'><a href=\"xml_cdr.php?missed=true&direction=$direction&start_epoch=".escape($row['start_epoch'])."&stop_epoch=".escape($row['stop_epoch'])."\">".escape($row['missed'])."</a>&nbsp;</td>\n";
+		echo "	<td class='center'><a href=\"xml_cdr.php?call_result=missed&direction=$direction&start_epoch=".escape($row['start_epoch'])."&stop_epoch=".escape($row['stop_epoch'])."\">".escape($row['missed'])."</a>&nbsp;</td>\n";
 		echo "	<td>".(round(escape($row['asr']),2))."&nbsp;</td>\n";
 		echo "	<td>".(round(escape($row['aloc']),2))."&nbsp;</td>\n";
 		echo "</tr >\n";
diff --git a/app/xml_cdr/xml_cdr_statistics_inc.php b/app/xml_cdr/xml_cdr_statistics_inc.php
index 6d48f28174..e695b8e67c 100644
--- a/app/xml_cdr/xml_cdr_statistics_inc.php
+++ b/app/xml_cdr/xml_cdr_statistics_inc.php
@@ -153,7 +153,7 @@
 		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 	}
 	if ($missed == true) {
-		$sql_where_ands[] = "billsec = '0'";
+		$sql_where_ands[] = "missed_call = true ";
 	}
 	if (strlen($start_epoch) > 0 && strlen($stop_epoch) > 0) {
 		$sql_where_ands[] = "start_epoch between :start_epoch and :stop_epoch";
@@ -280,6 +280,15 @@
 		$sql_where_ands[] = "leg = :leg";
 		$parameters['leg'] = $leg;
 	}
+	//Exclude enterprise ring group legs
+	if (!permission_exists('xml_cdr_enterprise_leg')) {
+		$sql_where_ands[] .= "originating_leg_uuid IS NULL";
+	}
+	//If you can't see lose_race, don't run stats on it
+	elseif (!permission_exists('xml_cdr_lose_race')) {
+		$sql_where_ands[] = "hangup_cause != 'LOSE_RACE'";
+	}
+	
 
 	//if not admin or superadmin, only show own calls
 	if (!permission_exists('xml_cdr_domain')) {
@@ -345,7 +354,7 @@
 
 //get the call volume between a start end end time in seconds
 	function get_call_volume_between($start, $end, $where, $parameters) {
-		$sql = "select count(*) as count, sum(billsec) as seconds from v_xml_cdr ";
+		$sql = "select count(*) as count, sum(billsec) as seconds, sum(answer_stamp - start_stamp) as tta from v_xml_cdr ";
 		$sql .= $where." ";
 		$sql .= "start_epoch between :start and :end ";
 		$parameters['start'] = $start;
@@ -356,6 +365,7 @@
 			return array(
 				'volume' => $row['count'],
 				'seconds' => $row['seconds'],
+				'tta' => $row['tta'],
 			);
 		}
 		return false;
@@ -375,14 +385,13 @@
 		$stats[$i]['volume'] = $stat_range ? $stat_range['volume'] : 0;
 		$stats[$i]['seconds'] = $stat_range ? $stat_range['seconds'] : 0;
 		$stats[$i]['minutes'] = $stats[$i]['seconds'] / 60;
-		$stats[$i]['avg_sec'] = $stats[$i]['volume'] == 0 ? 0 : $stats[$i]['seconds'] / $stats[$i]['volume'];
 
 		if ($missed) {
 			//we select only missed calls at first place - no reasons to select it again
 			$stats[$i]['missed'] = $stats[$i]['volume'];
 		}
 		else {
-			$where = $sql_where."billsec = '0' and ";
+			$where = $sql_where."missed_call = true and ";
 			$stat_range = get_call_volume_between($stats[$i]['start_epoch'], $stats[$i]['stop_epoch'], $where, $parameters);
 			$stats[$i]['missed'] = $stat_range ? $stat_range['volume'] : 0;
 		}
@@ -399,6 +408,9 @@
 		//answer / seizure ratio
 		$stats[$i]['asr'] = $stats[$i]['volume'] == 0 ? 0 : ($success_volume / $stats[$i]['volume'] * 100);
 
+		//average time to answer
+		$stats[$i]['avg_tta'] = $stats[$i]['volume'] == 0 ? 0 : round($stat_range['tta'] / $success_volume);
+
 		//average length of call
 		$stats[$i]['aloc'] = $success_volume == 0 ? 0 : $stats[$i]['minutes'] / $success_volume;
 	}
diff --git a/app/yealink/app_config.php b/app/yealink/app_config.php
index 410d47d97b..73f74ff29e 100644
--- a/app/yealink/app_config.php
+++ b/app/yealink/app_config.php
@@ -263,6 +263,14 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Filename of the CP860 firmware ROM";
 		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "2d167eaf-dbfb-423d-a073-feb66e1434bd";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_firmware_cp920";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "cp920-78.85.0.5.rom";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Filename of the CP920 firmware ROM";
+		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "7a769f2f-2833-4b90-9789-ff96a4723773";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_firmware_cp960";
@@ -359,6 +367,38 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Filename of the T46S firmware ROM";
 		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "6b70cfeb-2124-42dc-ba8b-6cd77da3fa5f";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_firmware_t53w";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "T53W(T53)-95.84.0.125.rom";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Filename of the T53w firmware ROM";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "83e51b20-2d8d-4437-889d-dc97d9810fb5";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_firmware_t54s";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "T54S(T52S)-70.82.0.20.rom";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Filename of the T54s firmware ROM";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "84be24be-d03d-49cf-bc9e-79fb19e04718";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_firmware_t54w";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "T54W-96.84.0.125.rom";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Filename of the T54w firmware ROM";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "27ae0140-7ea1-44e5-892c-d59a24b0ad22";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_firmware_t57w";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "T57W-97.84.0.125.rom";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Filename of the T57w firmware ROM";
+		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "0276b965-0ef6-493a-bdd0-b9786bf8aad7";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_firmware_t48g";
@@ -527,14 +567,6 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "http://localhost/all,delete all the customized ring tones";
 		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "7af991ec-ddb9-4942-a05d-d1acc529fef5";
-		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_ringtone_url";
-		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "custom.wav";
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Before using this parameter, you should store the desired ring tone (custom.wav) to the provisioning server";
-		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "95862d61-18ac-41b5-ac69-467e0ef3afd7";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_remote_phonebook_1_name";
@@ -567,6 +599,14 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Enable phone to query the contact names from the remote phonebook when receiving incoming calls. 0-Disabled (default), 1-Enabled;";
 		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "1a703585-bee8-4b77-8e5b-7f1fb29958ff";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_local_directory_enable";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "1";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Enable the Local Directory.";
+		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "765e18d9-9440-42be-a858-2c0ef90ee50f";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_ring_text_1";
@@ -859,7 +899,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_trust_certificates";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Required trusted certificate for provisioning.";
 		$y++;
@@ -1166,5 +1206,60 @@
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = "";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "PC port VLAN enable Set 1 = ON 0 = OFF.";	
-
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "fe946865-b2a4-47a0-92f7-9b2b879be8ef";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_lock_enable";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "boolean";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Configure the keypad lock type; 0-Disabled (default), 1-Enable. If needing remove pin lock, set value=0 and enabled=true, reprovision. Then you can set enabled=false and reprovision again for full removal and disablement.";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "c9020c9e-ffb8-4755-9bf8-e3c9344cd129";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_lock_key_type";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Configure the keypad lock type;0-All Keys(default), 1-Function Key, 2-Menu Key";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "d3ebfed3-13a8-44b6-bed9-6eaeb6ba7bf6";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_lock_pin";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "123";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Configure the unlock password for the phone. The default value is 123.";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "b4e7451c-ff42-4269-8404-5434a6303013";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_emergency_number";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "911,110,112";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Configure the emergency number, each separated by a comma. The default value is 911,110,112.";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "76efe175-8701-4222-b022-552c43e647cf";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_lock_timeout";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Configures the interval (in seconds) to automatically lock the IP phone. It ranges from 0 to 3600, the default value is 0.";
+        	$y++;
+        	$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "1549a926-fcb5-4384-a237-83aa77170e5a";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_summer_time";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "It configures Daylight Saving Time (DST) feature. 0-Disabled, 1-Enabled, 2-Automatic";
+		$y++;
+        	$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "2bcfc683-8731-4eb1-b79e-a4fb94ede2c9";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_dst_type";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "It configures the Daylight Saving Time (DST) type. (It works only if “local_time.summer_time” is set to 1 (Enabled)). 0-DST by Date, 1-DST by Week";
 ?>
diff --git a/core/authentication/resources/classes/authentication.php b/core/authentication/resources/classes/authentication.php
index a6b50bad9f..6b7fd340d5 100644
--- a/core/authentication/resources/classes/authentication.php
+++ b/core/authentication/resources/classes/authentication.php
@@ -102,7 +102,7 @@ class authentication {
 			}
 
 		//add user logs
-			if (file_exists($_SERVER["PROJECT_ROOT"]."/app/user_logs/app_config.php")) {
+			if (file_exists($_SERVER["PROJECT_ROOT"]."/core/user_logs/app_config.php")) {
 				user_logs::add($result);
 			}
 
diff --git a/core/authentication/resources/classes/plugins/database.php b/core/authentication/resources/classes/plugins/database.php
index ceb6405596..df85e1e936 100644
--- a/core/authentication/resources/classes/plugins/database.php
+++ b/core/authentication/resources/classes/plugins/database.php
@@ -30,13 +30,15 @@ class plugin_database {
 			$user_authorized = false;
 
 		//check the username and password if they don't match then redirect to the login
-			$sql = "select * from v_users ";
+			$sql = "select u.user_uuid, u.contact_uuid, u.username, u.password, u.salt, u.api_key, u.domain_uuid, d.domain_name ";
+			$sql .= "from v_users as u, v_domains as d ";
+			$sql .= "where u.domain_uuid = d.domain_uuid ";
 			if (strlen($this->key) > 30) {
-				$sql .= "where api_key = :api_key ";
+				$sql .= "and u.api_key = :api_key ";
 				$parameters['api_key'] = $this->key;
 			}
 			else {
-				$sql .= "where lower(username) = lower(:username) ";
+				$sql .= "and lower(u.username) = lower(:username) ";
 				$parameters['username'] = $this->username;
 			}
 			if ($_SESSION["users"]["unique"]["text"] === "global") {
@@ -44,7 +46,7 @@ class plugin_database {
 			}
 			else {
 				//unique username - per domain
-				$sql .= "and domain_uuid = :domain_uuid ";
+				$sql .= "and u.domain_uuid = :domain_uuid ";
 				$parameters['domain_uuid'] = $this->domain_uuid;
 			}
 			$sql .= "and (user_enabled = 'true' or user_enabled is null) ";
@@ -56,7 +58,7 @@ class plugin_database {
 					if ($_SESSION["users"]["unique"]["text"] === "global" && $row["domain_uuid"] !== $this->domain_uuid) {
 						//set the domain_uuid
 							$this->domain_uuid = $row["domain_uuid"];
-							$this->domain_name = $_SESSION['domains'][$this->domain_uuid]['domain_name'];
+							$this->domain_name = $row["domain_name"];
 
 						//set the domain session variables
 							$_SESSION["domain_uuid"] = $this->domain_uuid;
diff --git a/core/default_settings/app_config.php b/core/default_settings/app_config.php
index a5e72052f8..e53c918856 100644
--- a/core/default_settings/app_config.php
+++ b/core/default_settings/app_config.php
@@ -82,7 +82,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "domain";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "time_zone";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "name";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "UTC";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "";
 		$y++;
@@ -222,6 +222,14 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Display a Reset Password link on the login box (requires smtp_host be defined).";
 		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "a21a002c-c065-411c-ae56-3d33a09f64b4";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "login";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "password_reset_domain";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the domain to use in the Password Reset link sent via email.";
+		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "962ac32c-74ce-4cce-b1d9-89f4d921493d";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "login";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "domain_name_visible";
diff --git a/core/default_settings/app_defaults.php b/core/default_settings/app_defaults.php
index ebdf9f35b5..23d08e041d 100644
--- a/core/default_settings/app_defaults.php
+++ b/core/default_settings/app_defaults.php
@@ -487,6 +487,21 @@
 				unset($sql, $parameters);
 			}
 
+		//set domain > time_zone to UTC if not set
+			$sql = "update v_default_settings set ";
+			$sql .= "default_setting_value = 'UTC', ";
+			$sql .= "default_setting_enabled = 'true' ";
+			$sql .= "where ( ";
+			$sql .= "	default_setting_value is null or ";
+			$sql .= "	default_setting_value = '' ";
+			$sql .= ") ";
+			$sql .= "and default_setting_category = 'domain' ";
+			$sql .= "and default_setting_subcategory = 'time_zone' ";
+			$sql .= "and default_setting_name = 'name' ";
+			$database = new database;
+			$database->execute($sql);
+			unset($sql);
+
 	}
 
 ?>
diff --git a/core/default_settings/app_languages.php b/core/default_settings/app_languages.php
index cbf8cff21e..306f738929 100644
--- a/core/default_settings/app_languages.php
+++ b/core/default_settings/app_languages.php
@@ -835,6 +835,60 @@ $text['label-base64']['pt-br'] = "Base64";
 $text['label-base64']['pt-pt'] = "Base64";
 $text['label-base64']['ro-ro'] = "Base64";
 
+$text['label-dynamic']['en-us'] = "Dynamic";
+$text['label-dynamic']['en-gb'] = "Dynamic";
+$text['label-dynamic']['ar-eg'] = "Dynamic";
+$text['label-dynamic']['de-at'] = "Dynamic";
+$text['label-dynamic']['de-ch'] = "Dynamic";
+$text['label-dynamic']['de-de'] = "Dynamic";
+$text['label-dynamic']['es-cl'] = "Dynamic";
+$text['label-dynamic']['es-mx'] = "Dynamic";
+$text['label-dynamic']['fr-ca'] = "Dynamic";
+$text['label-dynamic']['fr-fr'] = "Dynamic";
+$text['label-dynamic']['he-il'] = "Dynamic";
+$text['label-dynamic']['it-it'] = "Dynamic";
+$text['label-dynamic']['nl-nl'] = "Dynamic";
+$text['label-dynamic']['pl-pl'] = "Dynamic";
+$text['label-dynamic']['pt-br'] = "Dynamic";
+$text['label-dynamic']['pt-pt'] = "Dynamic";
+$text['label-dynamic']['ro-ro'] = "Dynamic";
+
+$text['label-single']['en-us'] = "Single";
+$text['label-single']['en-gb'] = "Single";
+$text['label-single']['ar-eg'] = "Single";
+$text['label-single']['de-at'] = "Single";
+$text['label-single']['de-ch'] = "Single";
+$text['label-single']['de-de'] = "Single";
+$text['label-single']['es-cl'] = "Single";
+$text['label-single']['es-mx'] = "Single";
+$text['label-single']['fr-ca'] = "Single";
+$text['label-single']['fr-fr'] = "Single";
+$text['label-single']['he-il'] = "Single";
+$text['label-single']['it-it'] = "Single";
+$text['label-single']['nl-nl'] = "Single";
+$text['label-single']['pl-pl'] = "Single";
+$text['label-single']['pt-br'] = "Single";
+$text['label-single']['pt-pt'] = "Single";
+$text['label-single']['ro-ro'] = "Single";
+
+$text['label-multiple']['en-us'] = "Multiple";
+$text['label-multiple']['en-gb'] = "Multiple";
+$text['label-multiple']['ar-eg'] = "Multiple";
+$text['label-multiple']['de-at'] = "Multiple";
+$text['label-multiple']['de-ch'] = "Multiple";
+$text['label-multiple']['de-de'] = "Multiple";
+$text['label-multiple']['es-cl'] = "Multiple";
+$text['label-multiple']['es-mx'] = "Multiple";
+$text['label-multiple']['fr-ca'] = "Multiple";
+$text['label-multiple']['fr-fr'] = "Multiple";
+$text['label-multiple']['he-il'] = "Multiple";
+$text['label-multiple']['it-it'] = "Multiple";
+$text['label-multiple']['nl-nl'] = "Multiple";
+$text['label-multiple']['pl-pl'] = "Multiple";
+$text['label-multiple']['pt-br'] = "Multiple";
+$text['label-multiple']['pt-pt'] = "Multiple";
+$text['label-multiple']['ro-ro'] = "Multiple";
+
 $text['header-default_settings']['en-us'] = "Default Settings";
 $text['header-default_settings']['en-gb'] = "Default Settings";
 $text['header-default_settings']['ar-eg'] = "";
diff --git a/core/default_settings/default_setting_edit.php b/core/default_settings/default_setting_edit.php
index ee527970a0..9dde93d365 100644
--- a/core/default_settings/default_setting_edit.php
+++ b/core/default_settings/default_setting_edit.php
@@ -211,7 +211,7 @@
 //pre-populate the form
 	if (count($_GET) > 0 && $_POST["persistformvar"] != "true") {
 		$default_setting_uuid = $_GET["id"];
-		$sql = "select default_setting_uuid, default_setting_category, default_setting_subcategory, default_setting_name, default_setting_value, cast(default_setting_enabled as text), default_setting_description ";
+		$sql = "select default_setting_uuid, default_setting_category, default_setting_subcategory, default_setting_name, default_setting_value, default_setting_order, cast(default_setting_enabled as text), default_setting_description ";
 		$sql .= "from v_default_settings ";
 		$sql .= "where default_setting_uuid = :default_setting_uuid ";
 		$parameters['default_setting_uuid'] = $default_setting_uuid;
@@ -642,6 +642,13 @@
 		echo "    	<option value='none' ".(($default_setting_value == "none") ? "selected='selected'" : null).">".$text['label-none']."</option>\n";
 		echo "    </select>\n";
 	}
+	elseif ($category == "users" && $subcategory == "username_format" && $name == "text" ) {
+		echo "	<select class='formfld' id='default_setting_value' name='default_setting_value'>\n";
+		echo "    	<option value='any' ".($default_setting_value == 'any' ? "selected='selected'" : null).">".$text['option-username_format_any']."</option>\n";
+		echo "    	<option value='email' ".($default_setting_value == 'email' ? "selected='selected'" : null).">".$text['option-username_format_email']."</option>\n";
+		echo "    	<option value='no_email' ".($default_setting_value == 'no_email' ? "selected='selected'" : null).">".$text['option-username_format_no_email']."</option>\n";
+		echo "	</select>\n";
+	}
 	elseif ($category == "voicemail" && $subcategory == "voicemail_file" && $name == "text" ) {
 		echo "    <select class='formfld' id='default_setting_value' name='default_setting_value'>\n";
 		echo "    	<option value='listen' ".(($default_setting_value == "listen") ? "selected='selected'" : null).">".$text['option-voicemail_file_listen']."</option>\n";
@@ -661,6 +668,30 @@
 		echo "    	<option value='base64' ".(($default_setting_value == "base64") ? "selected='selected'" : null).">".$text['label-base64']."</option>\n";
 		echo "	</select>\n";
 	}
+	elseif ($category == "destinations" && $subcategory == "dialplan_details" && $name == "boolean" ) {
+		echo "	<select class='formfld' id='default_setting_value' name='default_setting_value'>\n";
+		echo "    	<option value='true'>".$text['label-true']."</option>\n";
+		echo "    	<option value='false' ".(($default_setting_value == "false") ? "selected='selected'" : null).">".$text['label-false']."</option>\n";
+		echo "	</select>\n";
+	}
+	elseif ($category == "destinations" && $subcategory == "dialplan_mode" && $name == "text" ) {
+		echo "	<select class='formfld' id='default_setting_value' name='default_setting_value'>\n";
+		echo "    	<option value='multiple'>".$text['label-multiple']."</option>\n";
+		echo "    	<option value='single' ".(($default_setting_value == "single") ? "selected='selected'" : null).">".$text['label-single']."</option>\n";
+		echo "	</select>\n";
+	}
+	elseif ($category == "destinations" && $subcategory == "select_mode" && $name == "text" ) {
+		echo "	<select class='formfld' id='default_setting_value' name='default_setting_value'>\n";
+		echo "    	<option value='default'>".$text['label-default']."</option>\n";
+		echo "    	<option value='dynamic' ".(($default_setting_value == "dynamic") ? "selected='selected'" : null).">".$text['label-dynamic']."</option>\n";
+		echo "	</select>\n";
+	}
+	elseif ($category == "destinations" && $subcategory == "unique" && $name == "boolean" ) {
+		echo "	<select class='formfld' id='default_setting_value' name='default_setting_value'>\n";
+		echo "    	<option value='true'>".$text['label-true']."</option>\n";
+		echo "    	<option value='false' ".(($default_setting_value == "false") ? "selected='selected'" : null).">".$text['label-false']."</option>\n";
+		echo "	</select>\n";
+	}
 	elseif (is_json($default_setting_value)) {
 		echo "	<textarea class='formfld' style='width: 100%; height: 80px; font-family: courier, monospace; overflow: auto;' id='default_setting_value' name='default_setting_value' wrap='off'>".$default_setting_value."</textarea>\n";
 	}
@@ -734,8 +765,8 @@
 	echo "	".$text['label-description']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
-	echo "	<input class='formfld' type='text' name='default_setting_description' style='width: 80%; max-width: 600px; min-width: 167px;' maxlength='255' value=\"".$default_setting_description."\">\n";
-	echo "<br />\n";
+	echo "	<textarea class='formfld' style='width: 185px; height: 80px;' name='default_setting_description'>".escape($default_setting_description)."</textarea>\n";
+	echo "	<br />\n";
 	echo $text['description-description']."\n";
 	echo "</td>\n";
 	echo "</tr>\n";
diff --git a/core/default_settings/default_settings.php b/core/default_settings/default_settings.php
index 7b88cc0761..b47cb8586d 100644
--- a/core/default_settings/default_settings.php
+++ b/core/default_settings/default_settings.php
@@ -128,10 +128,40 @@
 	$default_settings = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
 
+//get default setting categories
+	$sql = "select ";
+	$sql .= "distinct(d1.default_setting_category), ";
+	$sql .= "( ";
+	$sql .= "	select ";
+	$sql .= "	count(d2.default_setting_category) ";
+	$sql .= "	from v_default_settings as d2 ";
+	$sql .= "	where d2.default_setting_category = d1.default_setting_category ";
+	if (isset($search) && strlen($search) > 0) {
+		$sql .= "	and (";
+		$sql .= "		lower(d2.default_setting_category) like :search ";
+		$sql .= "		or lower(d2.default_setting_subcategory) like :search ";
+		$sql .= "		or lower(d2.default_setting_name) like :search ";
+		$sql .= "		or lower(d2.default_setting_value) like :search ";
+		$sql .= "		or lower(d2.default_setting_description) like :search ";
+		$sql .= "	) ";
+		$parameters['search'] = '%'.$search.'%';
+	}
+	$sql .= ") as quantity ";
+	$sql .= "from v_default_settings as d1 ";
+	$sql .= "order by d1.default_setting_category asc ";
+	$database = new database;
+	$rows = $database->select($sql, $parameters, 'all');
+	if (is_array($rows) && @sizeof($rows) != 0) {
+		foreach ($rows as $row) {
+			$default_setting_categories[$row['default_setting_category']] += $row['quantity'];
+		}
+	}
+	unset($sql, $rows, $row);
+
 //get the list of categories
-	if (is_array($default_settings) && @sizeof($default_settings) != 0) {
-		foreach ($default_settings as $default_setting) {
-			$category = strtolower($default_setting['default_setting_category']);
+	if (is_array($default_setting_categories) && @sizeof($default_setting_categories) != 0) {
+		foreach ($default_setting_categories as $default_setting_category => $quantity) {
+			$category = strtolower($default_setting_category);
 			switch ($category) {
 				case "api" : $category = "API"; break;
 				case "cdr" : $category = "CDR"; break;
@@ -142,11 +172,11 @@
 					$category = str_replace("-", " ", $category);
 					$category = ucwords($category);
 			}
-			$categories[$default_setting['default_setting_category']]['formatted'] = $category;
-			$categories[$default_setting['default_setting_category']]['count']++;
+			$categories[$default_setting_category]['formatted'] = $category;
+			$categories[$default_setting_category]['count'] = $quantity;
 		}
 		ksort($categories);
-		unset($default_setting, $category);
+		unset($default_setting_categories, $default_setting_category, $category);
 	}
 
 //create token
@@ -180,7 +210,7 @@
 
 //show the content
 	echo "<div class='action_bar' id='action_bar'>\n";
-	echo "	<div class='heading'><b>".$text['title-default_settings']." (".$num_rows.")</b></div>\n";
+	echo "	<div class='heading'><b>".$text['title-default_settings']." (".number_format($num_rows).")</b></div>\n";
 	echo "	<div class='actions'>\n";
 	echo button::create(['label'=>$text['button-reload'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'button_reload','link'=>'default_settings_reload.php'.($search != '' ? '?search='.urlencode($search) : null),'style'=>'margin-right: 15px;']);
 	if (permission_exists('default_setting_add')) {
@@ -209,17 +239,18 @@
 	if (is_array($categories) && @sizeof($categories) != 0) {
 		echo 		"<select name='default_setting_category' class='formfld' style='width: auto; margin-left: 15px;' id='select_category' onchange='this.form.submit();'>\n";
 		echo "			<option value=''>".$text['label-category']."...</option>\n";
+		echo "			<option value=''>".$text['label-all']."</option>\n";
 		foreach ($categories as $category_name => $category) {
 			$selected = ($_GET['default_setting_category'] == $category_name) ? " selected='selected'" : "";
-			echo "		<option value='".escape($category_name)."' $selected>".escape($category['formatted'])." (".$category['count'].")</option>\n";
+			echo "		<option value='".escape($category_name)."' $selected>".escape($category['formatted']).($category['count'] ? " (".$category['count'].")" : null)."</option>\n";
 		}
-		echo "			<option value=''>".$text['label-all']." (".$num_rows.")</option>\n";
+		echo "			<option disabled='disabled'>\n";
+		echo "			<option value=''>".$text['label-all']."</option>\n";
 		echo "		</select>";
 	}
 	echo 		"<input type='text' class='txt list-search' name='search' id='search' style='margin-left: 0 !important;' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown='list_search_reset();'>";
-	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search','style'=>($search != '' ? '' : null)]);
-	//echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search','style'=>($search != '' ? 'display: none;' : null)]);
-	//echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'default_settings.php','style'=>($search == '' ? 'display: none;' : null)]);
+	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search','style'=>($search != '' ? 'display: none;' : null)]);
+	echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'default_settings.php','style'=>($search == '' ? 'display: none;' : null)]);
 	if ($paging_controls_mini != '') {
 		echo 	"<span style='margin-left: 15px;'>".$paging_controls_mini."</span>\n";
 	}
@@ -368,9 +399,18 @@
 				echo "		".(img_spacer('15px', '15px', 'background: '.escape($row['default_setting_value']).'; margin-right: 4px; vertical-align: middle; border: 1px solid '.(color_adjust($row['default_setting_value'], -0.18)).'; padding: -1px;'));
 				echo "<span style=\"font-family: 'Courier New'; line-height: 6pt;\">".escape($row['default_setting_value'])."</span>\n";
 			}
+			else if ($category == 'users' && $subcategory == 'username_format' && $name == 'text') {
+				echo "		".$text['option-username_format_'.$row['default_setting_value']]."\n";
+			}
 			else if ($category == 'recordings' && $subcategory == 'storage_type' && $name == 'text') {
 				echo "		".$text['label-'.$row['default_setting_value']]."\n";
 			}
+			else if ($category == 'destinations' && $subcategory == 'dialplan_mode' && $name == 'text') {
+				echo "		".$text['label-'.$row['default_setting_value']]."\n";
+			}
+			else if ($category == 'destinations' && $subcategory == 'select_mode' && $name == 'text') {
+				echo "		".$text['label-'.$row['default_setting_value']]."\n";
+			}
 			else {
 				echo "		".escape($row['default_setting_value'])."\n";
 			}
@@ -407,14 +447,7 @@
 	echo "<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
 	echo "</form>\n";
 
-//focus on category selector
-	echo "<script>\n";
-	echo "	$(document).ready(function() {\n";
-	echo "		document.getElementById('select_category').focus();\n";
-	echo "	});\n";
-	echo "</script>\n";
-
 //include the footer
 	require_once "resources/footer.php";
 
-?>
+?>
\ No newline at end of file
diff --git a/core/default_settings/resources/classes/default_settings.php b/core/default_settings/resources/classes/default_settings.php
index 727f4b8107..a3401d9b5f 100644
--- a/core/default_settings/resources/classes/default_settings.php
+++ b/core/default_settings/resources/classes/default_settings.php
@@ -269,7 +269,7 @@ if (!class_exists('default_settings')) {
 									$array['domain_settings'][$x]['domain_setting_name'] = $default_setting_name;
 									$array['domain_settings'][$x]['domain_setting_value'] = $default_setting_value;
 									$array['domain_settings'][$x]['domain_setting_order'] = $default_setting_order;
-									$array['domain_settings'][$x]['domain_setting_enabled'] = $default_setting_enabled;
+									$array['domain_settings'][$x]['domain_setting_enabled'] = $default_setting_enabled ?: 0;
 									$array['domain_settings'][$x]['domain_setting_description'] = $default_setting_description;
 
 									//insert
diff --git a/core/domain_settings/app_languages.php b/core/domain_settings/app_languages.php
index ce58731acf..abd72c85c4 100644
--- a/core/domain_settings/app_languages.php
+++ b/core/domain_settings/app_languages.php
@@ -610,6 +610,60 @@ $text['label-12-hour']['ru-ru'] = "12-часовой";
 $text['label-12-hour']['sv-se'] = "12-timmars";
 $text['label-12-hour']['uk-ua'] = "12-годинний";
 
+$text['label-dynamic']['en-us'] = "Dynamic";
+$text['label-dynamic']['en-gb'] = "Dynamic";
+$text['label-dynamic']['ar-eg'] = "Dynamic";
+$text['label-dynamic']['de-at'] = "Dynamic";
+$text['label-dynamic']['de-ch'] = "Dynamic";
+$text['label-dynamic']['de-de'] = "Dynamic";
+$text['label-dynamic']['es-cl'] = "Dynamic";
+$text['label-dynamic']['es-mx'] = "Dynamic";
+$text['label-dynamic']['fr-ca'] = "Dynamic";
+$text['label-dynamic']['fr-fr'] = "Dynamic";
+$text['label-dynamic']['he-il'] = "Dynamic";
+$text['label-dynamic']['it-it'] = "Dynamic";
+$text['label-dynamic']['nl-nl'] = "Dynamic";
+$text['label-dynamic']['pl-pl'] = "Dynamic";
+$text['label-dynamic']['pt-br'] = "Dynamic";
+$text['label-dynamic']['pt-pt'] = "Dynamic";
+$text['label-dynamic']['ro-ro'] = "Dynamic";
+
+$text['label-single']['en-us'] = "Single";
+$text['label-single']['en-gb'] = "Single";
+$text['label-single']['ar-eg'] = "Single";
+$text['label-single']['de-at'] = "Single";
+$text['label-single']['de-ch'] = "Single";
+$text['label-single']['de-de'] = "Single";
+$text['label-single']['es-cl'] = "Single";
+$text['label-single']['es-mx'] = "Single";
+$text['label-single']['fr-ca'] = "Single";
+$text['label-single']['fr-fr'] = "Single";
+$text['label-single']['he-il'] = "Single";
+$text['label-single']['it-it'] = "Single";
+$text['label-single']['nl-nl'] = "Single";
+$text['label-single']['pl-pl'] = "Single";
+$text['label-single']['pt-br'] = "Single";
+$text['label-single']['pt-pt'] = "Single";
+$text['label-single']['ro-ro'] = "Single";
+
+$text['label-multiple']['en-us'] = "Multiple";
+$text['label-multiple']['en-gb'] = "Multiple";
+$text['label-multiple']['ar-eg'] = "Multiple";
+$text['label-multiple']['de-at'] = "Multiple";
+$text['label-multiple']['de-ch'] = "Multiple";
+$text['label-multiple']['de-de'] = "Multiple";
+$text['label-multiple']['es-cl'] = "Multiple";
+$text['label-multiple']['es-mx'] = "Multiple";
+$text['label-multiple']['fr-ca'] = "Multiple";
+$text['label-multiple']['fr-fr'] = "Multiple";
+$text['label-multiple']['he-il'] = "Multiple";
+$text['label-multiple']['it-it'] = "Multiple";
+$text['label-multiple']['nl-nl'] = "Multiple";
+$text['label-multiple']['pl-pl'] = "Multiple";
+$text['label-multiple']['pt-br'] = "Multiple";
+$text['label-multiple']['pt-pt'] = "Multiple";
+$text['label-multiple']['ro-ro'] = "Multiple";
+
 $text['header-settings']['en-us'] = "Settings";
 $text['header-settings']['en-gb'] = "Settings";
 $text['header-settings']['ar-eg'] = "";
diff --git a/core/domain_settings/domain_setting_edit.php b/core/domain_settings/domain_setting_edit.php
index 22b8a3c122..5fd1e5dbc3 100644
--- a/core/domain_settings/domain_setting_edit.php
+++ b/core/domain_settings/domain_setting_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-2020
+ Portions created by the Initial Developer are Copyright (C) 2008-2021
  the Initial Developer. All Rights Reserved.
 
  Contributor(s):
@@ -325,7 +325,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 //pre-populate the form
 	if (count($_GET)>0 && $_POST["persistformvar"] != "true" && is_uuid($_GET["id"])) {
 		$domain_setting_uuid = $_GET["id"];
-		$sql = "select domain_setting_uuid, domain_setting_category, domain_setting_subcategory, domain_setting_name, domain_setting_value, cast(domain_setting_enabled as text), domain_setting_description ";
+		$sql = "select domain_setting_uuid, domain_setting_category, domain_setting_subcategory, domain_setting_name, domain_setting_value, domain_setting_order, cast(domain_setting_enabled as text), domain_setting_description ";
 		$sql .= "from v_domain_settings ";
 		$sql .= "where domain_uuid = :domain_uuid ";
 		$sql .= "and domain_setting_uuid = :domain_setting_uuid ";
@@ -695,6 +695,13 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 		echo "    	<option value='none' ".(($row['domain_setting_value'] == "none") ? "selected='selected'" : null).">".$text['label-none']."</option>\n";
 		echo "    </select>\n";
 	}
+	elseif ($category == "users" && $subcategory == "username_format" && $name == "text" ) {
+		echo "	<select class='formfld' id='domain_setting_value' name='domain_setting_value'>\n";
+		echo "    	<option value='any' ".($row['domain_setting_value'] == 'any' ? "selected='selected'" : null).">".$text['option-username_format_any']."</option>\n";
+		echo "    	<option value='email' ".($row['domain_setting_value'] == 'email' ? "selected='selected'" : null).">".$text['option-username_format_email']."</option>\n";
+		echo "    	<option value='no_email' ".($row['domain_setting_value'] == 'no_email' ? "selected='selected'" : null).">".$text['option-username_format_no_email']."</option>\n";
+		echo "	</select>\n";
+	}
 	elseif ($category == "voicemail" && $subcategory == "voicemail_file" && $name == "text" ) {
 		echo "    <select class='formfld' id='domain_setting_value' name='domain_setting_value'>\n";
 		echo "    	<option value='listen' ".(($row['domain_setting_value'] == "listen") ? "selected='selected'" : null).">".$text['option-voicemail_file_listen']."</option>\n";
@@ -714,6 +721,30 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 		echo "    	<option value='base64' ".(($row['domain_setting_value'] == "base64") ? "selected='selected'" : null).">".$text['label-base64']."</option>\n";
 		echo "	</select>\n";
 	}
+	elseif ($category == "destinations" && $subcategory == "dialplan_details" && $name == "boolean" ) {
+		echo "	<select class='formfld' id='domain_setting_value' name='domain_setting_value'>\n";
+		echo "    	<option value='true'>".$text['label-true']."</option>\n";
+		echo "    	<option value='false' ".(($row['domain_setting_value'] == "false") ? "selected='selected'" : null).">".$text['label-false']."</option>\n";
+		echo "	</select>\n";
+	}
+	elseif ($category == "destinations" && $subcategory == "dialplan_mode" && $name == "text" ) {
+		echo "	<select class='formfld' id='domain_setting_value' name='domain_setting_value'>\n";
+		echo "    	<option value='multiple'>".$text['label-multiple']."</option>\n";
+		echo "    	<option value='single' ".(($row['domain_setting_value'] == "single") ? "selected='selected'" : null).">".$text['label-single']."</option>\n";
+		echo "	</select>\n";
+	}
+	elseif ($category == "destinations" && $subcategory == "select_mode" && $name == "text" ) {
+		echo "	<select class='formfld' id='domain_setting_value' name='domain_setting_value'>\n";
+		echo "    	<option value='default'>".$text['label-default']."</option>\n";
+		echo "    	<option value='dynamic' ".(($row['domain_setting_value'] == "dynamic") ? "selected='selected'" : null).">".$text['label-dynamic']."</option>\n";
+		echo "	</select>\n";
+	}
+	elseif ($category == "destinations" && $subcategory == "unique" && $name == "boolean" ) {
+		echo "	<select class='formfld' id='domain_setting_value' name='domain_setting_value'>\n";
+		echo "    	<option value='true'>".$text['label-true']."</option>\n";
+		echo "    	<option value='false' ".(($row['domain_setting_value'] == "false") ? "selected='selected'" : null).">".$text['label-false']."</option>\n";
+		echo "	</select>\n";
+	}
 	elseif (is_json($row['domain_setting_value'])) {
 		echo "	<textarea class='formfld' style='width: 100%; height: 80px; font-family: courier, monospace; overflow: auto;' id='domain_setting_value' name='domain_setting_value' wrap='off'>".$row['domain_setting_value']."</textarea>\n";
 	}
@@ -789,7 +820,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "	".$text['label-description']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
-	echo "	<input class='formfld' type='text' name='domain_setting_description' style='width: 80%; max-width: 600px; min-width: 167px;' maxlength='255' value=\"".escape($domain_setting_description)."\">\n";
+	echo "	<textarea class='formfld' style='width: 185px; height: 80px;' name='domain_setting_description'>".escape($domain_setting_description)."</textarea>\n";
 	echo "<br />\n";
 	echo $text['description-description']."\n";
 	echo "</td>\n";
diff --git a/core/domain_settings/domain_settings.php b/core/domain_settings/domain_settings.php
index 530af44112..ed4d245101 100644
--- a/core/domain_settings/domain_settings.php
+++ b/core/domain_settings/domain_settings.php
@@ -332,9 +332,18 @@
 				echo "		".(img_spacer('15px', '15px', 'background: '.escape($row['domain_setting_value']).'; margin-right: 4px; vertical-align: middle; border: 1px solid '.(color_adjust($row['domain_setting_value'], -0.18)).'; padding: -1px;'));
 				echo "<span style=\"font-family: 'Courier New'; line-height: 6pt;\">".escape($row['domain_setting_value'])."</span>\n";
 			}
+			else if ($category == 'users' && $subcategory == 'username_format' && $name == 'text') {
+				echo "		".$text['option-username_format_'.$row['domain_setting_value']]."\n";
+			}
 			else if ($category == 'recordings' && $subcategory == 'storage_type' && $name == 'text') {
 				echo "		".$text['label-'.$row['domain_setting_value']]."\n";
 			}
+			else if ($category == 'destinations' && $subcategory == 'dialplan_mode' && $name == 'text') {
+				echo "		".$text['label-'.$row['domain_setting_value']]."\n";
+			}
+			else if ($category == 'destinations' && $subcategory == 'select_mode' && $name == 'text') {
+				echo "		".$text['label-'.$row['domain_setting_value']]."\n";
+			}
 			else {
 				echo "		".escape($row['domain_setting_value'])."\n";
 			}
diff --git a/core/domain_settings/resources/classes/domain_settings.php b/core/domain_settings/resources/classes/domain_settings.php
index f4d810cd71..35a510349d 100644
--- a/core/domain_settings/resources/classes/domain_settings.php
+++ b/core/domain_settings/resources/classes/domain_settings.php
@@ -276,7 +276,7 @@ if (!class_exists('domain_settings')) {
 											$array['domain_settings'][0]['domain_setting_name'] = $domain_setting_name;
 											$array['domain_settings'][0]['domain_setting_value'] = $domain_setting_value;
 											$array['domain_settings'][0]['domain_setting_order'] = $domain_setting_order;
-											$array['domain_settings'][0]['domain_setting_enabled'] = $domain_setting_enabled;
+											$array['domain_settings'][0]['domain_setting_enabled'] = $domain_setting_enabled ?: 0;
 											$array['domain_settings'][0]['domain_setting_description'] = $domain_setting_description;
 
 											//insert
diff --git a/core/domains/domain_edit.php b/core/domains/domain_edit.php
index 5f4e7e3757..c01851ba87 100644
--- a/core/domains/domain_edit.php
+++ b/core/domains/domain_edit.php
@@ -500,8 +500,6 @@
 
 			//clear the domains session array to update it
 				unset($_SESSION["domains"]);
-				unset($_SESSION["domain_uuid"]);
-				unset($_SESSION["domain_name"]);
 				unset($_SESSION['domain']);
 				unset($_SESSION['switch']);
 
diff --git a/core/domains/domains.php b/core/domains/domains.php
index 1f1ca5a62f..22deeb6767 100644
--- a/core/domains/domains.php
+++ b/core/domains/domains.php
@@ -233,6 +233,7 @@
 		echo th_order_by('domain_name', $text['label-domain'], $order_by, $order);
 	}
 	echo th_order_by('domain_name', $text['label-domain_name'], $order_by, $order);
+	echo "<th class='center'>".$text['label-tools']."</th>";
 	echo th_order_by('domain_enabled', $text['label-domain_enabled'], $order_by, $order, null, "class='center'");
 	echo "	<th class='hide-sm-dn'>".$text['label-domain_description']."</th>\n";
 	if (permission_exists('domain_edit') && $_SESSION['theme']['list_row_edit_button']['boolean'] == 'true') {
@@ -264,15 +265,23 @@
 				echo "	".escape($row['domain_name']);
 			}
 			echo "	</td>\n";
+			echo "	<td class='no-link center'>\n";
+			echo "		<a href='".PROJECT_PATH."/core/domains/domains.php?domain_uuid=".escape($row['domain_uuid'])."&domain_change=true'>".$text['label-manage']."</a>";
+			if (permission_exists('domain_setting_view')) {
+				$list_setting_url = PROJECT_PATH."/core/domain_settings/domain_settings.php?id=".urlencode($row['domain_uuid']);
+				echo " | <a href='".$list_setting_url."'\">".$text['button-settings'];
+			}
+			echo "	</td>\n";
 			if (permission_exists('domain_edit')) {
 				echo "	<td class='no-link center'>\n";
 				echo button::create(['type'=>'submit','class'=>'link','label'=>$text['label-'.$row['domain_enabled']],'title'=>$text['button-toggle'],'onclick'=>"list_self_check('checkbox_".$x."'); list_action_set('toggle'); list_form_submit('form_list')"]);
+				echo "	</td>\n";
 			}
 			else {
 				echo "	<td class='center'>\n";
 				echo $text['label-'.$row['domain_enabled']];
+				echo "	</td>\n";
 			}
-			echo "	</td>\n";
 			echo "	<td class='description overflow hide-sm-dn'>".escape($row['domain_description'])."</td>\n";
 			if (permission_exists('domain_edit') && $_SESSION['theme']['list_row_edit_button']['boolean'] == 'true') {
 				echo "	<td class='action-button'>\n";
diff --git a/core/groups/app_languages.php b/core/groups/app_languages.php
index a703294a8c..f984c6967c 100644
--- a/core/groups/app_languages.php
+++ b/core/groups/app_languages.php
@@ -1681,6 +1681,48 @@ $text['label-12-hour']['ru-ru'] = "12-часовой";
 $text['label-12-hour']['sv-se'] = "12-timmars";
 $text['label-12-hour']['uk-ua'] = "12-годинний";
 
+$text['label-assigned']['en-us'] = "Assigned";
+$text['label-assigned']['en-gb'] = "Assigned";
+$text['label-assigned']['ar-eg'] = "Assigned";
+$text['label-assigned']['de-at'] = "Assigned";
+$text['label-assigned']['de-ch'] = "Assigned";
+$text['label-assigned']['de-de'] = "Assigned";
+$text['label-assigned']['es-cl'] = "Assigned";
+$text['label-assigned']['es-mx'] = "Assigned";
+$text['label-assigned']['fr-ca'] = "Assigned";
+$text['label-assigned']['fr-fr'] = "Assigned";
+$text['label-assigned']['he-il'] = "Assigned";
+$text['label-assigned']['it-it'] = "Assigned";
+$text['label-assigned']['nl-nl'] = "Assigned";
+$text['label-assigned']['pl-pl'] = "Assigned";
+$text['label-assigned']['pt-br'] = "Assigned";
+$text['label-assigned']['pt-pt'] = "Assigned";
+$text['label-assigned']['ro-ro'] = "Assigned";
+$text['label-assigned']['ru-ru'] = "Assigned";
+$text['label-assigned']['sv-se'] = "Assigned";
+$text['label-assigned']['uk-ua'] = "Assigned";
+
+$text['label-unassigned']['en-us'] = "Unassigned";
+$text['label-unassigned']['en-gb'] = "Unassigned";
+$text['label-unassigned']['ar-eg'] = "Unassigned";
+$text['label-unassigned']['de-at'] = "Unassigned";
+$text['label-unassigned']['de-ch'] = "Unassigned";
+$text['label-unassigned']['de-de'] = "Unassigned";
+$text['label-unassigned']['es-cl'] = "Unassigned";
+$text['label-unassigned']['es-mx'] = "Unassigned";
+$text['label-unassigned']['fr-ca'] = "Unassigned";
+$text['label-unassigned']['fr-fr'] = "Unassigned";
+$text['label-unassigned']['he-il'] = "Unassigned";
+$text['label-unassigned']['it-it'] = "Unassigned";
+$text['label-unassigned']['nl-nl'] = "Unassigned";
+$text['label-unassigned']['pl-pl'] = "Unassigned";
+$text['label-unassigned']['pt-br'] = "Unassigned";
+$text['label-unassigned']['pt-pt'] = "Unassigned";
+$text['label-unassigned']['ro-ro'] = "Unassigned";
+$text['label-unassigned']['ru-ru'] = "Unassigned";
+$text['label-unassigned']['sv-se'] = "Unassigned";
+$text['label-unassigned']['uk-ua'] = "Unassigned";
+
 $text['header-user_setting-edit']['en-us'] = "User Setting";
 $text['header-user_setting-edit']['en-gb'] = "User Setting";
 $text['header-user_setting-edit']['ar-eg'] = "";
diff --git a/core/groups/group_edit.php b/core/groups/group_edit.php
index 20c46742ed..a47fb1e3cd 100644
--- a/core/groups/group_edit.php
+++ b/core/groups/group_edit.php
@@ -56,6 +56,7 @@
 	if (is_array($_POST)) {
 		$group_uuid = $_POST["group_uuid"];
 		$group_name = $_POST["group_name"];
+		$group_name_previous = $_POST["group_name_previous"];
 		$domain_uuid = $_POST["domain_uuid"];
 		$group_level = $_POST["group_level"];
 		$group_protected = $_POST["group_protected"];
@@ -136,6 +137,22 @@
 			$database->app_uuid = '2caf27b0-540a-43d5-bb9b-c9871a1e4f84';
 			$database->save($array);
 
+		//update group name in group permissions if group name changed
+			if ($group_name != $group_name_previous) {
+				$sql = "update v_group_permissions ";
+				$sql .= "set group_name = :group_name ";
+				$sql .= "where group_name = :group_name_previous ";
+				$sql .= "and group_uuid = :group_uuid ";
+				$parameters['group_name'] = $group_name;
+				$parameters['group_name_previous'] = $group_name_previous;
+				$parameters['group_uuid'] = $group_uuid;
+				$database = new database;
+				$database->app_name = 'Group Manager';
+				$database->app_uuid = '2caf27b0-540a-43d5-bb9b-c9871a1e4f84';
+				$database->execute($sql, $parameters);
+				unset($sql, $parameters, $database);
+			}
+
 		//redirect the user
 			if (isset($action)) {
 				if ($action == "add") {
@@ -147,7 +164,7 @@
 				header('Location: group_edit.php?id='.urlencode($group_uuid));
 				return;
 			}
-	} //(is_array($_POST) && strlen($_POST["persistformvar"]) == 0)
+	}
 
 //pre-populate the form
 	if (is_array($_GET) && $_POST["persistformvar"] != "true") {
@@ -227,6 +244,7 @@
 	echo "</td>\n";
 	echo "<td width='70%' class='vtable' style='position: relative;' align='left'>\n";
 	echo "	<input class='formfld' type='text' name='group_name' maxlength='255' value='".escape($group_name)."'>\n";
+	echo "	<input type='hidden' name='group_name_previous' value='".escape($group_name)."'>\n";
 	echo "<br />\n";
 	echo $text['description-group_name']."\n";
 	echo "</td>\n";
diff --git a/core/groups/group_permissions.php b/core/groups/group_permissions.php
index 8fb203056f..23378c8860 100644
--- a/core/groups/group_permissions.php
+++ b/core/groups/group_permissions.php
@@ -94,6 +94,9 @@
 		}
 	}
 
+//get the view preference
+	$view = $_REQUEST['view'];
+
 //get the http post data
 	if (is_array($_POST['group_permissions'])) {
 		$action = $_POST['action'];
@@ -122,11 +125,13 @@
 	$sql .= "	v_group_permissions as g \n"; 
 	$sql .= "	on p.permission_name = g.permission_name \n"; 
 	$sql .= "	and group_name = :group_name \n"; 
+	$sql .= " 	and g.group_uuid = :group_uuid \n";
 	if (isset($sql_search)) {
 		$sql .= "where ".$sql_search;
 	}
 	$sql .= "	order by p.application_name, p.permission_name asc "; 
 	$parameters['group_name'] = $group_name;
+	$parameters['group_uuid'] = $group_uuid;
 	$database = new database;
 	$group_permissions = $database->select($sql, $parameters, 'all');
 
@@ -231,7 +236,7 @@
 			$token = new token;
 			if (!$token->validate($_SERVER['PHP_SELF'])) {
 				message::add($text['message-invalid_token'],'negative');
-				header('Location: group_permissions.php?group_uuid='.urlencode($group_uuid).'&search='.urlencode($search));
+				header('Location: group_permissions.php?group_uuid='.urlencode($group_uuid).($view ? '&view='.urlencode($view) : null).($search ? '&search='.urlencode($search) : null));
 				exit;
 			}
 
@@ -262,10 +267,6 @@
 			exit;
 	}
 
-//get order and order by
-	//$order_by = $_GET["order_by"];
-	//$order = $_GET["order"];
-
 //create token
 	$object = new token;
 	$token = $object->create($_SERVER['PHP_SELF']);
@@ -285,7 +286,13 @@
 	}
 	echo 		"<form id='form_search' class='inline' method='get'>\n";
 	echo 		"<input type='hidden' name='group_uuid' value='".escape($group_uuid)."'>\n";
-	echo 		"<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown='list_search_reset();'>";
+	echo 		"<select class='txt' style='margin-left: 15px; margin-right: 0;' id='view' name='view' onchange=\"document.getElementById('form_search').submit();\">\n";
+	echo 		"	<option value=''>".$text['label-all']."</option>\n";
+	echo 		"	<option value='assigned' ".($view == 'assigned' ? "selected='selected'" : null).">".$text['label-assigned']."</option>\n";
+	echo 		"	<option value='unassigned' ".($view == 'unassigned' ? "selected='selected'" : null).">".$text['label-unassigned']."</option>\n";
+	echo 		"	<option value='protected' ".($view == 'protected' ? "selected='selected'" : null).">".$text['label-group_protected']."</option>\n";
+	echo 		"</select>\n";
+	echo 		"<input type='text' class='txt list-search' style='margin-left: 0;' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown='list_search_reset();'>";
 	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search','collapse'=>'hide-sm-dn','style'=>($search != '' ? 'display: none;' : null)]);
 	echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','collapse'=>'hide-sm-dn','link'=>'group_permissions.php?group_uuid='.urlencode($group_uuid),'style'=>($search == '' ? 'display: none;' : null)]);
 	if (permission_exists('group_permission_edit')) {
@@ -302,6 +309,7 @@
 	echo "<form id='form_list' method='post'>\n";
 	echo "<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
 	echo "<input type='hidden' name='group_uuid' value='".escape($group_uuid)."'>\n";
+	echo "<input type='hidden' name='view' value=\"".escape($view)."\">\n";
 	echo "<input type='hidden' name='search' value=\"".escape($search)."\">\n";
 	echo "<table class='list' style='margin-bottom: 25px;'>\n";
 	if (is_array($group_permissions) && @sizeof($group_permissions) != 0) {
@@ -309,59 +317,75 @@
 		foreach ($group_permissions as $row) {
 			$checked = ($row['permission_assigned'] === 'true') ? " checked=\"checked\"" : $checked = '';
 			$protected = ($row['permission_protected'] === 'true') ? " checked=\"checked\"" : '';
-			$application_name = strtolower($row['application_name']);
-			$label_application_name = ucwords(str_replace(['_','-'], " ", $row['application_name']));
-
-			$label_application_name = ucwords($label_application_name);
+			$application_name = strtolower(str_replace([' ','-'], '_', $row['application_name']));
+			$application_name_label = ucwords(str_replace(['_','-'], " ", $row['application_name']));
 
+			//application heading
 			if ($previous_application_name !== $row['application_name']) {
-				echo "		<tr>";
+				echo "		<tr class='heading_".$application_name."'>";
 				echo "			<td align='left' colspan='999'>&nbsp;</td>\n";
 				echo "		</tr>";
-				echo "		<tr>";
-				echo "			<td align='left' colspan='999' nowrap='nowrap'><b>".escape($label_application_name)."</b></td>\n";
+				echo "		<tr class='heading_".$application_name."'>";
+				echo "			<td align='left' colspan='999' nowrap='nowrap'><b>".escape($application_name_label)."</b></td>\n";
 				echo "		</tr>";
-				echo "<tr class='list-header'>\n";
+				echo "		<tr class='list-header heading_".$application_name."'>\n";
 				if (permission_exists('group_permission_add') || permission_exists('group_permission_edit') || permission_exists('group_permission_delete')) {
-					echo "	<th class='checkbox'>\n";
-					echo "		<input type='checkbox' id='checkbox_all_".$application_name."' name='checkbox_all' onclick=\"list_all_toggle('".$application_name."');\">\n";
-					echo "	</th>\n";
+					echo "		<th class='checkbox'>\n";
+					echo "			<input type='checkbox' id='checkbox_all_".$application_name."' name='checkbox_all' onclick=\"list_all_toggle('".$application_name."');\">\n";
+					echo "		</th>\n";
 				}
 				echo th_order_by('group_name', $text['label-group_name'], $order_by, $order);
-				if (permission_exists('group_permission_edit') && $_SESSION['theme']['list_row_edit_button']['boolean'] == 'true') {
-					echo "	<td class='action-button'>&nbsp;</td>\n";
+				if (permission_exists('group_permission_add') || permission_exists('group_permission_edit') || permission_exists('group_permission_delete')) {
+					echo th_order_by('group_permission_protected', $text['label-group_protected'], $order_by, $order, null, "style='text-align: right;'");
+					echo "		<th class='checkbox'>\n";
+					echo "			<input type='checkbox' id='checkbox_all_".$application_name."_protected' name='checkbox_protected_all' onclick=\"list_all_toggle('".$application_name."_protected');\">\n";
+					echo "		</th>\n";
+				}
+				echo "		</tr>\n";
+				$displayed_permissions[$application_name] = 0;
+			}
+
+			//application permission
+			if (!$view || ($view == 'assigned' && $checked) || ($view == 'unassigned' && !$checked) || ($view == 'protected' && $protected)) {
+				echo "<tr class='list-row'>\n";
+				if (permission_exists('group_permission_add') || permission_exists('group_permission_edit') || permission_exists('group_permission_delete')) {
+					echo "	<td class='checkbox'>\n";
+					echo "		<input type='checkbox' name='group_permissions[$x][checked]' id='checkbox_".$x."' class='checkbox_".$application_name."' value='true' ".$checked." onclick=\"if (!this.checked) { document.getElementById('checkbox_all_".$application_name."').checked = false; }\">\n";
+					echo "		<input type='hidden' name='group_permissions[$x][permission_uuid]' value='".escape($row['permission_uuid'])."' />\n";
+					echo "		<input type='hidden' name='group_permissions[$x][permission_name]' value='".escape($row['permission_name'])."' />\n";
+					echo "	</td>\n";
+				}
+				echo "	<td class='no-wrap' onclick=\"if (document.getElementById('checkbox_".$x."').checked) { document.getElementById('checkbox_".$x."').checked = false; document.getElementById('checkbox_all_".$application_name."').checked = false; } else { document.getElementById('checkbox_".$x."').checked = true; }\">";
+				echo "		".escape($row['permission_name']);
+				echo "	</td>\n";
+				if (permission_exists('group_permission_add') || permission_exists('group_permission_edit') || permission_exists('group_permission_delete')) {
+					echo "	<td>&nbsp;</td>\n";
+					echo "	<td class='checkbox'>\n";
+					echo "		<input type='checkbox' name='group_permissions[$x][permission_protected]' id='checkbox_protected_".$x."' class='checkbox_".$application_name."_protected' value='true' ".$protected." onclick=\"if (!this.checked) { document.getElementById('checkbox_all_".$application_name."_protected').checked = false; }\">\n";
+					echo "	</td>\n";
 				}
-				echo "	<th class='checkbox'>\n";
-				echo "		<input type='checkbox' id='checkbox_all_".$application_name."_protected' name='checkbox_protected_all' onclick=\"list_all_toggle('".$application_name."_protected');\">\n";
-				echo "	</th>\n";
-				echo th_order_by('group_permission_protected', $text['label-group_protected'], $order_by, $order, null, "class=''");
 				echo "</tr>\n";
+				$displayed_permissions[$application_name]++;
+			}
 
-			}
-			echo "<tr class='list-row'>\n";
-			if (permission_exists('group_permission_add') || permission_exists('group_permission_edit') || permission_exists('group_permission_delete')) {
-				echo "	<td class='checkbox'>\n";
-				echo "		<input type='checkbox' name='group_permissions[$x][checked]' id='checkbox_".$x."' class='checkbox_".$application_name."' value='true' ".$checked." onclick=\"if (!this.checked) { document.getElementById('checkbox_all_".$application_name."').checked = false; }\">\n";
-				echo "		<input type='hidden' name='group_permissions[$x][permission_uuid]' value='".escape($row['permission_uuid'])."' />\n";
-				echo "		<input type='hidden' name='group_permissions[$x][permission_name]' value='".escape($row['permission_name'])."' />\n";
-				echo "	</td>\n";
-			}
-			echo "	<td  class='no-wrap' onclick=\"if (document.getElementById('checkbox_".$x."').checked) { document.getElementById('checkbox_".$x."').checked = false; document.getElementById('checkbox_all_".$application_name."').checked = false; } else { document.getElementById('checkbox_".$x."').checked = true; }\">".escape($row['permission_name'])."</td>\n";
-			if (permission_exists('group_permission_add') || permission_exists('group_permission_edit') || permission_exists('group_permission_delete')) {
-				echo "	<td class='checkbox'>\n";
-				echo "		<input type='checkbox' name='group_permissions[$x][permission_protected]' id='checkbox_protected_".$x."' class='checkbox_".$application_name."_protected' value='true' ".$protected." onclick=\"if (!this.checked) { document.getElementById('checkbox_all_".$application_name."_protected').checked = false; }\">\n";
-				echo "	</td>\n";
-			}
-			echo "	</td>\n";
-			echo "	<td>";
-			echo "	</td>\n";
-			echo "</tr>\n";
-
-			//set the previous category
+			//set the previous application name
 			$previous_application_name = $row['application_name'];
 			$x++;
+
 		}
 		unset($group_permissions);
+
+		//hide application heading if no permissions displayed
+		if (is_array($displayed_permissions) && @sizeof($displayed_permissions) != 0) {
+			echo "<script>\n";
+			foreach ($displayed_permissions as $application_name => $permission_count) {
+				if (!$permission_count) {
+					echo "$('.heading_".$application_name."').hide();\n";
+				}
+			}
+			echo "</script>\n";
+		}
+
 	}
 
 	echo "</table>\n";
diff --git a/core/menu/app_languages.php b/core/menu/app_languages.php
index 1402fe0c8f..d7a9e33c83 100644
--- a/core/menu/app_languages.php
+++ b/core/menu/app_languages.php
@@ -925,4 +925,25 @@ $text['button-move_down']['ru-ru'] = "Переместить вниз";
 $text['button-move_down']['sv-se'] = "Flytta Ned";
 $text['button-move_down']['uk-ua'] = "Перемістити вниз";
 
-?>
+$text['confirm-restore']['en-us'] = "You are about to restore all <i>unprotected</i> items on this menu.";
+$text['confirm-restore']['en-gb'] = "You are about to restore all <i>unprotected</i> items on this menu.";
+$text['confirm-restore']['ar-eg'] = "You are about to restore all <i>unprotected</i> items on this menu.";
+$text['confirm-restore']['de-at'] = "You are about to restore all <i>unprotected</i> items on this menu.";
+$text['confirm-restore']['de-ch'] = "You are about to restore all <i>unprotected</i> items on this menu.";
+$text['confirm-restore']['de-de'] = "You are about to restore all <i>unprotected</i> items on this menu.";
+$text['confirm-restore']['es-cl'] = "You are about to restore all <i>unprotected</i> items on this menu.";
+$text['confirm-restore']['es-mx'] = "You are about to restore all <i>unprotected</i> items on this menu.";
+$text['confirm-restore']['fr-ca'] = "You are about to restore all <i>unprotected</i> items on this menu.";
+$text['confirm-restore']['fr-fr'] = "You are about to restore all <i>unprotected</i> items on this menu.";
+$text['confirm-restore']['he-il'] = "You are about to restore all <i>unprotected</i> items on this menu.";
+$text['confirm-restore']['it-it'] = "You are about to restore all <i>unprotected</i> items on this menu.";
+$text['confirm-restore']['nl-nl'] = "You are about to restore all <i>unprotected</i> items on this menu.";
+$text['confirm-restore']['pl-pl'] = "You are about to restore all <i>unprotected</i> items on this menu.";
+$text['confirm-restore']['pt-br'] = "You are about to restore all <i>unprotected</i> items on this menu.";
+$text['confirm-restore']['pt-pt'] = "You are about to restore all <i>unprotected</i> items on this menu.";
+$text['confirm-restore']['ro-ro'] = "You are about to restore all <i>unprotected</i> items on this menu.";
+$text['confirm-restore']['ru-ru'] = "You are about to restore all <i>unprotected</i> items on this menu.";
+$text['confirm-restore']['sv-se'] = "You are about to restore all <i>unprotected</i> items on this menu.";
+$text['confirm-restore']['uk-ua'] = "You are about to restore all <i>unprotected</i> items on this menu.";
+
+?>
\ No newline at end of file
diff --git a/core/menu/menu_edit.php b/core/menu/menu_edit.php
index 0ac637eead..c4911b3618 100644
--- a/core/menu/menu_edit.php
+++ b/core/menu/menu_edit.php
@@ -165,13 +165,17 @@
 	echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$_SESSION['theme']['button_icon_back'],'id'=>'btn_back','collapse'=>'hide-xs','link'=>'menu.php']);
 	echo button::create(['type'=>'button','label'=>$text['button-reload'],'icon'=>$_SESSION['theme']['button_icon_reload'],'collapse'=>'hide-xs','style'=>'margin-left: 15px;','link'=>'menu_reload.php?menu_uuid='.urlencode($menu_uuid).'&menu_language='.urlencode($menu_language)]);
 	if (permission_exists('menu_restore') && $action == "update") {
-		echo button::create(['type'=>'button','label'=>$text['button-restore_default'],'icon'=>'key','collapse'=>'hide-xs','link'=>'menu_restore_default.php?menu_uuid='.urlencode($menu_uuid).'&menu_language='.urlencode($menu_language)]);
+		echo button::create(['type'=>'button','label'=>$text['button-restore_default'],'icon'=>'undo-alt','collapse'=>'hide-xs','onclick'=>"modal_open('modal-restore','btn_restore');"]);
 	}
 	echo button::create(['type'=>'submit','label'=>$text['button-save'],'icon'=>$_SESSION['theme']['button_icon_save'],'id'=>'btn_save','collapse'=>'hide-xs']);
 	echo "	</div>\n";
 	echo "	<div style='clear: both;'></div>\n";
 	echo "</div>\n";
 
+	if (permission_exists('menu_restore') && $action == "update") {
+		echo modal::create(['id'=>'modal-restore','type'=>'confirmation','message'=>$text['confirm-restore'],'actions'=>button::create(['type'=>'button','label'=>$text['button-continue'],'icon'=>'check','id'=>'btn_restore','style'=>'float: right; margin-left: 15px;','collapse'=>'never','link'=>'menu_restore_default.php?menu_uuid='.urlencode($menu_uuid).'&menu_language='.urlencode($menu_language),'onclick'=>'modal_close();'])]);
+	}
+
 	echo $text['description-menu']."\n";
 	echo "<br /><br />\n";
 
diff --git a/core/software/resources/classes/software.php b/core/software/resources/classes/software.php
index 6a627941bc..2760d50b2d 100644
--- a/core/software/resources/classes/software.php
+++ b/core/software/resources/classes/software.php
@@ -12,7 +12,7 @@ if (!class_exists('software')) {
 		 * version
 		 */
 		public static function version() {
-			return '4.5.18';
+			return '4.5.22';
 		}
 
 		/**
diff --git a/core/upgrade/index.php b/core/upgrade/index.php
index 45ef27cafe..1b1308e47c 100644
--- a/core/upgrade/index.php
+++ b/core/upgrade/index.php
@@ -86,9 +86,11 @@
 
 		// load an array of the database schema and compare it with the active database
 		if ($do["schema"] && permission_exists("upgrade_schema")) {
-			$upgrade_data_types = check_str($do["data_types"]);
 			require_once "resources/classes/schema.php";
 			$obj = new schema();
+			if (isset($do["data_types"]) && $do["data_types"] == 'true') {
+				$obj->data_types = true;
+			}
 			$_SESSION["response"]["schema"] = $obj->schema("html");
 			message::add($text['message-upgrade_schema'], null, $message_timeout);
 		}
@@ -283,4 +285,4 @@
 //include the footer
 	require_once "resources/footer.php";
 
-?>
\ No newline at end of file
+?>
diff --git a/core/upgrade/upgrade_schema.php b/core/upgrade/upgrade_schema.php
index 7acb2829ea..04a305a122 100644
--- a/core/upgrade/upgrade_schema.php
+++ b/core/upgrade/upgrade_schema.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-2014
+	Portions created by the Initial Developer are Copyright (C) 2008-2020
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -64,12 +64,16 @@
 //get the database schema put it into an array then compare and update the database as needed.
 	require_once "resources/classes/schema.php";
 	$obj = new schema;
+	if (isset($argv[1]) && $argv[1] == 'data_types') {
+		$obj->data_types = true;
+	}
 	echo $obj->schema($format);
 
-if (!$included && $format == 'html') {
-	echo "<br />\n";
-	echo "<br />\n";
-	require_once "resources/footer.php";
-}
+//formatting for html
+	if (!$included && $format == 'html') {
+		echo "<br />\n";
+		echo "<br />\n";
+		require_once "resources/footer.php";
+	}
 
 ?>
diff --git a/core/user_logs/app_config.php b/core/user_logs/app_config.php
new file mode 100644
index 0000000000..a303770571
--- /dev/null
+++ b/core/user_logs/app_config.php
@@ -0,0 +1,84 @@
+<?php
+
+	//application details
+		$apps[$x]['name'] = 'User Logs';
+		$apps[$x]['uuid'] = '582a13cf-7d75-4ea3-b2d9-60914352d76e';
+		$apps[$x]['category'] = 'system';
+		$apps[$x]['subcategory'] = 'users';
+		$apps[$x]['version'] = '1.1';
+		$apps[$x]['license'] = 'Mozilla Public License 1.1';
+		$apps[$x]['url'] = 'http://www.fusionpbx.com';
+		$apps[$x]['description']['en-us'] = '';
+
+	//permission details
+		$y = 0;
+		$apps[$x]['permissions'][$y]['name'] = 'user_log_view';
+		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = 'user_log_all';
+		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = 'user_log_delete';
+		//$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$y++;
+
+	//User Logs
+		$y = 0;
+		$apps[$x]['db'][$y]['table']['name'] = 'v_user_logs';
+		$apps[$x]['db'][$y]['table']['parent'] = '';
+		$z = 0;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_log_uuid';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
+		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'primary';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'domain_uuid';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
+		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'foreign';
+		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = 'v_domains';
+		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = 'domain_uuid';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'timestamp';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'timestamptz';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'date';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'date';
+		$apps[$x]['db'][$y]['fields'][$z]['search_by'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Set the datetime.';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_uuid';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
+		$apps[$x]['db'][$y]['fields'][$z]['search_by'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Select the user.';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'username';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['search_by'] = 'true';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the Username.';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'type';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['search_by'] = 'true';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the type.';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'result';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['search_by'] = 'true';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the result.';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'remote_address';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['search_by'] = 'true';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the IP address.';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'user_agent';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['search_by'] = 'true';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the user agent.';
+		$z++;
+
+?>
diff --git a/core/user_logs/app_defaults.php b/core/user_logs/app_defaults.php
new file mode 100644
index 0000000000..adadacce42
--- /dev/null
+++ b/core/user_logs/app_defaults.php
@@ -0,0 +1,7 @@
+<?php
+
+if ($domains_processed == 1) {
+
+}
+
+?>
diff --git a/core/user_logs/app_languages.php b/core/user_logs/app_languages.php
new file mode 100644
index 0000000000..75c752b8a4
--- /dev/null
+++ b/core/user_logs/app_languages.php
@@ -0,0 +1,422 @@
+<?php
+
+	//User Logs
+		$text['title-user_logs']['en-us'] = 'User Logs';
+		$text['title-user_logs']['ar-eg'] = '';
+		$text['title-user_logs']['de-at'] = '';
+		$text['title-user_logs']['de-ch'] = '';
+		$text['title-user_logs']['de-de'] = '';
+		$text['title-user_logs']['es-cl'] = '';
+		$text['title-user_logs']['es-mx'] = '';
+		$text['title-user_logs']['fr-ca'] = '';
+		$text['title-user_logs']['fr-fr'] = '';
+		$text['title-user_logs']['he-il'] = '';
+		$text['title-user_logs']['it-it'] = '';
+		$text['title-user_logs']['nl-nl'] = '';
+		$text['title-user_logs']['pl-pl'] = '';
+		$text['title-user_logs']['pt-br'] = '';
+		$text['title-user_logs']['pt-pt'] = '';
+		$text['title-user_logs']['ro-ro'] = '';
+		$text['title-user_logs']['ru-ru'] = '';
+		$text['title-user_logs']['sv-se'] = '';
+		$text['title-user_logs']['uk-ua'] = '';
+
+		$text['title-user_log']['en-us'] = 'User Log';
+		$text['title-user_log']['ar-eg'] = '';
+		$text['title-user_log']['de-at'] = '';
+		$text['title-user_log']['de-ch'] = '';
+		$text['title-user_log']['de-de'] = '';
+		$text['title-user_log']['es-cl'] = '';
+		$text['title-user_log']['es-mx'] = '';
+		$text['title-user_log']['fr-ca'] = '';
+		$text['title-user_log']['fr-fr'] = '';
+		$text['title-user_log']['he-il'] = '';
+		$text['title-user_log']['it-it'] = '';
+		$text['title-user_log']['nl-nl'] = '';
+		$text['title-user_log']['pl-pl'] = '';
+		$text['title-user_log']['pt-br'] = '';
+		$text['title-user_log']['pt-pt'] = '';
+		$text['title-user_log']['ro-ro'] = '';
+		$text['title-user_log']['ru-ru'] = '';
+		$text['title-user_log']['sv-se'] = '';
+		$text['title-user_log']['uk-ua'] = '';
+
+		$text['title_description-user_logs']['en-us'] = 'Shows authentication attempts with the result, timestamp, remote address and user details.';
+		$text['title_description-user_logs']['ar-eg'] = '';
+		$text['title_description-user_logs']['de-at'] = '';
+		$text['title_description-user_logs']['de-ch'] = '';
+		$text['title_description-user_logs']['de-de'] = '';
+		$text['title_description-user_logs']['es-cl'] = '';
+		$text['title_description-user_logs']['es-mx'] = '';
+		$text['title_description-user_logs']['fr-ca'] = '';
+		$text['title_description-user_logs']['fr-fr'] = '';
+		$text['title_description-user_logs']['he-il'] = '';
+		$text['title_description-user_logs']['it-it'] = '';
+		$text['title_description-user_logs']['nl-nl'] = '';
+		$text['title_description-user_logs']['pl-pl'] = '';
+		$text['title_description-user_logs']['pt-br'] = '';
+		$text['title_description-user_logs']['pt-pt'] = '';
+		$text['title_description-user_logs']['ro-ro'] = '';
+		$text['title_description-user_logs']['ru-ru'] = '';
+		$text['title_description-user_logs']['sv-se'] = '';
+		$text['title_description-user_logs']['uk-ua'] = '';
+
+		$text['label-timestamp']['en-us'] = 'Timestamp';
+		$text['label-timestamp']['ar-eg'] = '';
+		$text['label-timestamp']['de-at'] = '';
+		$text['label-timestamp']['de-ch'] = '';
+		$text['label-timestamp']['de-de'] = '';
+		$text['label-timestamp']['es-cl'] = '';
+		$text['label-timestamp']['es-mx'] = '';
+		$text['label-timestamp']['fr-ca'] = '';
+		$text['label-timestamp']['fr-fr'] = '';
+		$text['label-timestamp']['he-il'] = '';
+		$text['label-timestamp']['it-it'] = '';
+		$text['label-timestamp']['nl-nl'] = '';
+		$text['label-timestamp']['pl-pl'] = '';
+		$text['label-timestamp']['pt-br'] = '';
+		$text['label-timestamp']['pt-pt'] = '';
+		$text['label-timestamp']['ro-ro'] = '';
+		$text['label-timestamp']['ru-ru'] = '';
+		$text['label-timestamp']['sv-se'] = '';
+		$text['label-timestamp']['uk-ua'] = '';
+
+		$text['description-timestamp']['en-us'] = 'Set the datetime.';
+		$text['description-timestamp']['ar-eg'] = '';
+		$text['description-timestamp']['de-at'] = '';
+		$text['description-timestamp']['de-ch'] = '';
+		$text['description-timestamp']['de-de'] = '';
+		$text['description-timestamp']['es-cl'] = '';
+		$text['description-timestamp']['es-mx'] = '';
+		$text['description-timestamp']['fr-ca'] = '';
+		$text['description-timestamp']['fr-fr'] = '';
+		$text['description-timestamp']['he-il'] = '';
+		$text['description-timestamp']['it-it'] = '';
+		$text['description-timestamp']['nl-nl'] = '';
+		$text['description-timestamp']['pl-pl'] = '';
+		$text['description-timestamp']['pt-br'] = '';
+		$text['description-timestamp']['pt-pt'] = '';
+		$text['description-timestamp']['ro-ro'] = '';
+		$text['description-timestamp']['ru-ru'] = '';
+		$text['description-timestamp']['sv-se'] = '';
+		$text['description-timestamp']['uk-ua'] = '';
+
+		$text['label-user_uuid']['en-us'] = 'User';
+		$text['label-user_uuid']['ar-eg'] = '';
+		$text['label-user_uuid']['de-at'] = '';
+		$text['label-user_uuid']['de-ch'] = '';
+		$text['label-user_uuid']['de-de'] = '';
+		$text['label-user_uuid']['es-cl'] = '';
+		$text['label-user_uuid']['es-mx'] = '';
+		$text['label-user_uuid']['fr-ca'] = '';
+		$text['label-user_uuid']['fr-fr'] = '';
+		$text['label-user_uuid']['he-il'] = '';
+		$text['label-user_uuid']['it-it'] = '';
+		$text['label-user_uuid']['nl-nl'] = '';
+		$text['label-user_uuid']['pl-pl'] = '';
+		$text['label-user_uuid']['pt-br'] = '';
+		$text['label-user_uuid']['pt-pt'] = '';
+		$text['label-user_uuid']['ro-ro'] = '';
+		$text['label-user_uuid']['ru-ru'] = '';
+		$text['label-user_uuid']['sv-se'] = '';
+		$text['label-user_uuid']['uk-ua'] = '';
+
+		$text['description-user_uuid']['en-us'] = 'Select the user.';
+		$text['description-user_uuid']['ar-eg'] = '';
+		$text['description-user_uuid']['de-at'] = '';
+		$text['description-user_uuid']['de-ch'] = '';
+		$text['description-user_uuid']['de-de'] = '';
+		$text['description-user_uuid']['es-cl'] = '';
+		$text['description-user_uuid']['es-mx'] = '';
+		$text['description-user_uuid']['fr-ca'] = '';
+		$text['description-user_uuid']['fr-fr'] = '';
+		$text['description-user_uuid']['he-il'] = '';
+		$text['description-user_uuid']['it-it'] = '';
+		$text['description-user_uuid']['nl-nl'] = '';
+		$text['description-user_uuid']['pl-pl'] = '';
+		$text['description-user_uuid']['pt-br'] = '';
+		$text['description-user_uuid']['pt-pt'] = '';
+		$text['description-user_uuid']['ro-ro'] = '';
+		$text['description-user_uuid']['ru-ru'] = '';
+		$text['description-user_uuid']['sv-se'] = '';
+		$text['description-user_uuid']['uk-ua'] = '';
+
+		$text['label-username']['en-us'] = 'Username';
+		$text['label-username']['ar-eg'] = '';
+		$text['label-username']['de-at'] = '';
+		$text['label-username']['de-ch'] = '';
+		$text['label-username']['de-de'] = '';
+		$text['label-username']['es-cl'] = '';
+		$text['label-username']['es-mx'] = '';
+		$text['label-username']['fr-ca'] = '';
+		$text['label-username']['fr-fr'] = '';
+		$text['label-username']['he-il'] = '';
+		$text['label-username']['it-it'] = '';
+		$text['label-username']['nl-nl'] = '';
+		$text['label-username']['pl-pl'] = '';
+		$text['label-username']['pt-br'] = '';
+		$text['label-username']['pt-pt'] = '';
+		$text['label-username']['ro-ro'] = '';
+		$text['label-username']['ru-ru'] = '';
+		$text['label-username']['sv-se'] = '';
+		$text['label-username']['uk-ua'] = '';
+
+		$text['description-username']['en-us'] = 'Enter the Username.';
+		$text['description-username']['ar-eg'] = '';
+		$text['description-username']['de-at'] = '';
+		$text['description-username']['de-ch'] = '';
+		$text['description-username']['de-de'] = '';
+		$text['description-username']['es-cl'] = '';
+		$text['description-username']['es-mx'] = '';
+		$text['description-username']['fr-ca'] = '';
+		$text['description-username']['fr-fr'] = '';
+		$text['description-username']['he-il'] = '';
+		$text['description-username']['it-it'] = '';
+		$text['description-username']['nl-nl'] = '';
+		$text['description-username']['pl-pl'] = '';
+		$text['description-username']['pt-br'] = '';
+		$text['description-username']['pt-pt'] = '';
+		$text['description-username']['ro-ro'] = '';
+		$text['description-username']['ru-ru'] = '';
+		$text['description-username']['sv-se'] = '';
+		$text['description-username']['uk-ua'] = '';
+
+		$text['label-type']['en-us'] = 'Type';
+		$text['label-type']['ar-eg'] = '';
+		$text['label-type']['de-at'] = '';
+		$text['label-type']['de-ch'] = '';
+		$text['label-type']['de-de'] = '';
+		$text['label-type']['es-cl'] = '';
+		$text['label-type']['es-mx'] = '';
+		$text['label-type']['fr-ca'] = '';
+		$text['label-type']['fr-fr'] = '';
+		$text['label-type']['he-il'] = '';
+		$text['label-type']['it-it'] = '';
+		$text['label-type']['nl-nl'] = '';
+		$text['label-type']['pl-pl'] = '';
+		$text['label-type']['pt-br'] = '';
+		$text['label-type']['pt-pt'] = '';
+		$text['label-type']['ro-ro'] = '';
+		$text['label-type']['ru-ru'] = '';
+		$text['label-type']['sv-se'] = '';
+		$text['label-type']['uk-ua'] = '';
+
+		$text['description-type']['en-us'] = 'Enter the type.';
+		$text['description-type']['ar-eg'] = '';
+		$text['description-type']['de-at'] = '';
+		$text['description-type']['de-ch'] = '';
+		$text['description-type']['de-de'] = '';
+		$text['description-type']['es-cl'] = '';
+		$text['description-type']['es-mx'] = '';
+		$text['description-type']['fr-ca'] = '';
+		$text['description-type']['fr-fr'] = '';
+		$text['description-type']['he-il'] = '';
+		$text['description-type']['it-it'] = '';
+		$text['description-type']['nl-nl'] = '';
+		$text['description-type']['pl-pl'] = '';
+		$text['description-type']['pt-br'] = '';
+		$text['description-type']['pt-pt'] = '';
+		$text['description-type']['ro-ro'] = '';
+		$text['description-type']['ru-ru'] = '';
+		$text['description-type']['sv-se'] = '';
+		$text['description-type']['uk-ua'] = '';
+
+		$text['label-result']['en-us'] = 'Result';
+		$text['label-result']['ar-eg'] = '';
+		$text['label-result']['de-at'] = '';
+		$text['label-result']['de-ch'] = '';
+		$text['label-result']['de-de'] = '';
+		$text['label-result']['es-cl'] = '';
+		$text['label-result']['es-mx'] = '';
+		$text['label-result']['fr-ca'] = '';
+		$text['label-result']['fr-fr'] = '';
+		$text['label-result']['he-il'] = '';
+		$text['label-result']['it-it'] = '';
+		$text['label-result']['nl-nl'] = '';
+		$text['label-result']['pl-pl'] = '';
+		$text['label-result']['pt-br'] = '';
+		$text['label-result']['pt-pt'] = '';
+		$text['label-result']['ro-ro'] = '';
+		$text['label-result']['ru-ru'] = '';
+		$text['label-result']['sv-se'] = '';
+		$text['label-result']['uk-ua'] = '';
+
+		$text['description-result']['en-us'] = 'Enter the result.';
+		$text['description-result']['ar-eg'] = '';
+		$text['description-result']['de-at'] = '';
+		$text['description-result']['de-ch'] = '';
+		$text['description-result']['de-de'] = '';
+		$text['description-result']['es-cl'] = '';
+		$text['description-result']['es-mx'] = '';
+		$text['description-result']['fr-ca'] = '';
+		$text['description-result']['fr-fr'] = '';
+		$text['description-result']['he-il'] = '';
+		$text['description-result']['it-it'] = '';
+		$text['description-result']['nl-nl'] = '';
+		$text['description-result']['pl-pl'] = '';
+		$text['description-result']['pt-br'] = '';
+		$text['description-result']['pt-pt'] = '';
+		$text['description-result']['ro-ro'] = '';
+		$text['description-result']['ru-ru'] = '';
+		$text['description-result']['sv-se'] = '';
+		$text['description-result']['uk-ua'] = '';
+
+		$text['label-success']['en-us'] = 'success';
+		$text['label-success']['ar-eg'] = '';
+		$text['label-success']['de-at'] = '';
+		$text['label-success']['de-ch'] = '';
+		$text['label-success']['de-de'] = '';
+		$text['label-success']['es-mx'] = '';
+		$text['label-success']['fr-ca'] = '';
+		$text['label-success']['fr-fr'] = '';
+		$text['label-success']['he-il'] = '';
+		$text['label-success']['it-it'] = '';
+		$text['label-success']['nl-nl'] = '';
+		$text['label-success']['pl-pl'] = '';
+		$text['label-success']['pt-br'] = '';
+		$text['label-success']['pt-pt'] = '';
+		$text['label-success']['ro-ro'] = '';
+		$text['label-success']['ru-ru'] = '';
+		$text['label-success']['sv-se'] = '';
+		$text['label-success']['uk-ua'] = '';
+
+		$text['label-failure']['en-us'] = 'failure';
+		$text['label-failure']['ar-eg'] = '';
+		$text['label-failure']['de-at'] = '';
+		$text['label-failure']['de-ch'] = '';
+		$text['label-failure']['de-de'] = '';
+		$text['label-failure']['es-mx'] = '';
+		$text['label-failure']['fr-ca'] = '';
+		$text['label-failure']['fr-fr'] = '';
+		$text['label-failure']['he-il'] = '';
+		$text['label-failure']['it-it'] = '';
+		$text['label-failure']['nl-nl'] = '';
+		$text['label-failure']['pl-pl'] = '';
+		$text['label-failure']['pt-br'] = '';
+		$text['label-failure']['pt-pt'] = '';
+		$text['label-failure']['ro-ro'] = '';
+		$text['label-failure']['ru-ru'] = '';
+		$text['label-failure']['sv-se'] = '';
+		$text['label-failure']['uk-ua'] = '';
+
+		$text['label-remote_address']['en-us'] = 'Remote Address';
+		$text['label-remote_address']['ar-eg'] = '';
+		$text['label-remote_address']['de-at'] = '';
+		$text['label-remote_address']['de-ch'] = '';
+		$text['label-remote_address']['de-de'] = '';
+		$text['label-remote_address']['es-cl'] = '';
+		$text['label-remote_address']['es-mx'] = '';
+		$text['label-remote_address']['fr-ca'] = '';
+		$text['label-remote_address']['fr-fr'] = '';
+		$text['label-remote_address']['he-il'] = '';
+		$text['label-remote_address']['it-it'] = '';
+		$text['label-remote_address']['nl-nl'] = '';
+		$text['label-remote_address']['pl-pl'] = '';
+		$text['label-remote_address']['pt-br'] = '';
+		$text['label-remote_address']['pt-pt'] = '';
+		$text['label-remote_address']['ro-ro'] = '';
+		$text['label-remote_address']['ru-ru'] = '';
+		$text['label-remote_address']['sv-se'] = '';
+		$text['label-remote_address']['uk-ua'] = '';
+
+		$text['description-remote_address']['en-us'] = 'Enter the IP address.';
+		$text['description-remote_address']['ar-eg'] = '';
+		$text['description-remote_address']['de-at'] = '';
+		$text['description-remote_address']['de-ch'] = '';
+		$text['description-remote_address']['de-de'] = '';
+		$text['description-remote_address']['es-cl'] = '';
+		$text['description-remote_address']['es-mx'] = '';
+		$text['description-remote_address']['fr-ca'] = '';
+		$text['description-remote_address']['fr-fr'] = '';
+		$text['description-remote_address']['he-il'] = '';
+		$text['description-remote_address']['it-it'] = '';
+		$text['description-remote_address']['nl-nl'] = '';
+		$text['description-remote_address']['pl-pl'] = '';
+		$text['description-remote_address']['pt-br'] = '';
+		$text['description-remote_address']['pt-pt'] = '';
+		$text['description-remote_address']['ro-ro'] = '';
+		$text['description-remote_address']['ru-ru'] = '';
+		$text['description-remote_address']['sv-se'] = '';
+		$text['description-remote_address']['uk-ua'] = '';
+
+		$text['label-user_agent']['en-us'] = 'User Agent';
+		$text['label-user_agent']['ar-eg'] = '';
+		$text['label-user_agent']['de-at'] = '';
+		$text['label-user_agent']['de-ch'] = '';
+		$text['label-user_agent']['de-de'] = '';
+		$text['label-user_agent']['es-cl'] = '';
+		$text['label-user_agent']['es-mx'] = '';
+		$text['label-user_agent']['fr-ca'] = '';
+		$text['label-user_agent']['fr-fr'] = '';
+		$text['label-user_agent']['he-il'] = '';
+		$text['label-user_agent']['it-it'] = '';
+		$text['label-user_agent']['nl-nl'] = '';
+		$text['label-user_agent']['pl-pl'] = '';
+		$text['label-user_agent']['pt-br'] = '';
+		$text['label-user_agent']['pt-pt'] = '';
+		$text['label-user_agent']['ro-ro'] = '';
+		$text['label-user_agent']['ru-ru'] = '';
+		$text['label-user_agent']['sv-se'] = '';
+		$text['label-user_agent']['uk-ua'] = '';
+
+		$text['description-user_agent']['en-us'] = 'Enter the user agent.';
+		$text['description-user_agent']['ar-eg'] = '';
+		$text['description-user_agent']['de-at'] = '';
+		$text['description-user_agent']['de-ch'] = '';
+		$text['description-user_agent']['de-de'] = '';
+		$text['description-user_agent']['es-cl'] = '';
+		$text['description-user_agent']['es-mx'] = '';
+		$text['description-user_agent']['fr-ca'] = '';
+		$text['description-user_agent']['fr-fr'] = '';
+		$text['description-user_agent']['he-il'] = '';
+		$text['description-user_agent']['it-it'] = '';
+		$text['description-user_agent']['nl-nl'] = '';
+		$text['description-user_agent']['pl-pl'] = '';
+		$text['description-user_agent']['pt-br'] = '';
+		$text['description-user_agent']['pt-pt'] = '';
+		$text['description-user_agent']['ro-ro'] = '';
+		$text['description-user_agent']['ru-ru'] = '';
+		$text['description-user_agent']['sv-se'] = '';
+		$text['description-user_agent']['uk-ua'] = '';
+
+		$text['label-location']['en-us'] = 'Location';
+		$text['label-location']['ar-eg'] = '';
+		$text['label-location']['de-at'] = '';
+		$text['label-location']['de-ch'] = '';
+		$text['label-location']['de-de'] = '';
+		$text['label-location']['es-cl'] = '';
+		$text['label-location']['es-mx'] = '';
+		$text['label-location']['fr-ca'] = '';
+		$text['label-location']['fr-fr'] = '';
+		$text['label-location']['he-il'] = '';
+		$text['label-location']['it-it'] = '';
+		$text['label-location']['nl-nl'] = '';
+		$text['label-location']['pl-pl'] = '';
+		$text['label-location']['pt-br'] = '';
+		$text['label-location']['pt-pt'] = '';
+		$text['label-location']['ro-ro'] = '';
+		$text['label-location']['ru-ru'] = '';
+		$text['label-location']['sv-se'] = '';
+		$text['label-location']['uk-ua'] = '';
+
+		$text['description-location']['en-us'] = 'Enter the location.';
+		$text['description-location']['ar-eg'] = '';
+		$text['description-location']['de-at'] = '';
+		$text['description-location']['de-ch'] = '';
+		$text['description-location']['de-de'] = '';
+		$text['description-location']['es-cl'] = '';
+		$text['description-location']['es-mx'] = '';
+		$text['description-location']['fr-ca'] = '';
+		$text['description-location']['fr-fr'] = '';
+		$text['description-location']['he-il'] = '';
+		$text['description-location']['it-it'] = '';
+		$text['description-location']['nl-nl'] = '';
+		$text['description-location']['pl-pl'] = '';
+		$text['description-location']['pt-br'] = '';
+		$text['description-location']['pt-pt'] = '';
+		$text['description-location']['ro-ro'] = '';
+		$text['description-location']['ru-ru'] = '';
+		$text['description-location']['sv-se'] = '';
+		$text['description-location']['uk-ua'] = '';
+
+?>
\ No newline at end of file
diff --git a/core/user_logs/app_menu.php b/core/user_logs/app_menu.php
new file mode 100644
index 0000000000..77d20630af
--- /dev/null
+++ b/core/user_logs/app_menu.php
@@ -0,0 +1,19 @@
+<?php
+
+$apps[$x]['menu'][0]['title']['en-us'] = 'User Logs';
+$apps[$x]['menu'][0]['title']['es-cl'] = '';
+$apps[$x]['menu'][0]['title']['fr-fr'] = '';
+$apps[$x]['menu'][0]['title']['fr-ca'] = '';
+$apps[$x]['menu'][0]['title']['pl'] = '';
+$apps[$x]['menu'][0]['title']['sv-se'] = '';
+$apps[$x]['menu'][0]['title']['uk'] = '';
+$apps[$x]['menu'][0]['title']['de-at'] = '';
+$apps[$x]['menu'][0]['uuid'] = '88e5773a-2e33-43dc-9a6e-07d46d200e9c';
+$apps[$x]['menu'][0]['parent_uuid'] = '0438b504-8613-7887-c420-c837ffb20cb1';
+$apps[$x]['menu'][0]['category'] = 'internal';
+$apps[$x]['menu'][0]['path'] = '/core/user_logs/user_logs.php';
+$apps[$x]['menu'][0]['groups'][] = 'superadmin';
+//$apps[$x]['menu'][0]['groups'][] = 'admin';
+//$apps[$x]['menu'][0]['groups'][] = 'user';
+
+?>
diff --git a/core/user_logs/resources/classes/user_logs.php b/core/user_logs/resources/classes/user_logs.php
new file mode 100644
index 0000000000..b654a06416
--- /dev/null
+++ b/core/user_logs/resources/classes/user_logs.php
@@ -0,0 +1,161 @@
+<?php
+/*
+	FusionPBX
+	Version: MPL 1.1
+
+	The contents of this file are subject to the Mozilla Public License Version
+	1.1 (the "License"); you may not use this file except in compliance with
+	the License. You may obtain a copy of the License at
+	http://www.mozilla.org/MPL/
+
+	Software distributed under the License is distributed on an "AS IS" basis,
+	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+	for the specific language governing rights and limitations under the
+	License.
+
+	The Original Code is FusionPBX
+
+	The Initial Developer of the Original Code is
+	Mark J Crane <markjcrane@fusionpbx.com>
+	Portions created by the Initial Developer are Copyright (C) 2019-2021
+	the Initial Developer. All Rights Reserved.
+
+	Contributor(s):
+	Mark J Crane <markjcrane@fusionpbx.com>
+*/
+
+/**
+ * user_logs class
+ *
+ * @method null delete
+ * @method null toggle
+ * @method null copy
+ */
+if (!class_exists('user_logs')) {
+	class user_logs {
+
+		/**
+		* declare the variables
+		*/
+		private $app_name;
+		private $app_uuid;
+		private $name;
+		private $table;
+		private $toggle_field;
+		private $toggle_values;
+		private $location;
+
+		/**
+		 * called when the object is created
+		 */
+		public function __construct() {
+			//assign the variables
+				$this->app_name = 'user_logs';
+				$this->app_uuid = '582a13cf-7d75-4ea3-b2d9-60914352d76e';
+				$this->name = 'user_log';
+				$this->table = 'user_logs';
+				$this->toggle_field = '';
+				$this->toggle_values = ['true','false'];
+				$this->location = 'user_logs.php';
+		}
+
+		/**
+		 * called when there are no references to a particular object
+		 * unset the variables used in the class
+		 */
+		public function __destruct() {
+			foreach ($this as $key => $value) {
+				unset($this->$key);
+			}
+		}
+
+		/**
+		 * add user_logs
+		 */
+		public static function add($result) {
+			//prepare the array
+				$array['user_logs'][0]["timestamp"] = 'now()';
+				$array['user_logs'][0]["domain_uuid"] = $result['domain_uuid'];
+				$array['user_logs'][0]["user_uuid"] = $result['user_uuid'];
+				$array['user_logs'][0]["username"] = $result['username'];
+				$array['user_logs'][0]["type"] = 'login';
+				$array['user_logs'][0]["remote_address"] = $_SERVER['REMOTE_ADDR'];
+				$array['user_logs'][0]["user_agent"] = $_SERVER['HTTP_USER_AGENT'];
+				$array['user_logs'][0]["type"] = 'login';
+				if ($result["authorized"] == "true") {
+					$array['user_logs'][0]["result"] = 'success';
+				}
+				else {
+					$array['user_logs'][0]["result"] = 'failure';
+				}
+
+			//add the dialplan permission
+				$p = new permissions;
+				$p->add("user_log_add", 'temp');
+
+			//save to the data
+				$database = new database;
+				$database->app_name = 'authentication';
+				$database->app_uuid = 'a8a12918-69a4-4ece-a1ae-3932be0e41f1';
+				$database->uuid($user_log_uuid);
+				$database->save($array);
+				$message = $database->message;
+
+			//remove the temporary permission
+				$p->delete("user_log_add", 'temp');
+		}
+
+		/**
+		 * delete rows from the database
+		 */
+		public function delete($records) {
+			if (permission_exists($this->name.'_delete')) {
+
+				//add multi-lingual support
+					$language = new text;
+					$text = $language->get();
+
+				//validate the token
+					$token = new token;
+					if (!$token->validate($_SERVER['PHP_SELF'])) {
+						message::add($text['message-invalid_token'],'negative');
+						header('Location: '.$this->location);
+						exit;
+					}
+
+				//delete multiple records
+					if (is_array($records) && @sizeof($records) != 0) {
+						//build the delete array
+							$x = 0;
+							foreach ($records as $record) {
+								//add to the array
+									if ($record['checked'] == 'true' && is_uuid($record['uuid'])) {
+										$array[$this->table][$x][$this->name.'_uuid'] = $record['uuid'];
+										$array[$this->table][$x]['domain_uuid'] = $_SESSION['domain_uuid'];
+									}
+
+								//increment the id
+									$x++;
+							}
+
+						//delete the checked rows
+							if (is_array($array) && @sizeof($array) != 0) {
+								//execute delete
+									$database = new database;
+									$database->app_name = $this->app_name;
+									$database->app_uuid = $this->app_uuid;
+									$database->delete($array);
+									unset($array);
+
+								//set message
+									message::add($text['message-delete']);
+							}
+							unset($records);
+					}
+			}
+		}
+
+	}
+}
+
+?>
diff --git a/core/user_logs/root.php b/core/user_logs/root.php
new file mode 100644
index 0000000000..6fdf32f37b
--- /dev/null
+++ b/core/user_logs/root.php
@@ -0,0 +1,90 @@
+<?php
+/*
+	FusionPBX
+	Version: MPL 1.1
+
+	The contents of this file are subject to the Mozilla Public License Version
+	1.1 (the "License"); you may not use this file except in compliance with
+	the License. You may obtain a copy of the License at
+	http://www.mozilla.org/MPL/
+
+	Software distributed under the License is distributed on an "AS IS" basis,
+	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+	for the specific language governing rights and limitations under the
+	License.
+
+	The Original Code is FusionPBX
+
+	The Initial Developer of the Original Code is
+	Mark J Crane <markjcrane@fusionpbx.com>
+	Portions created by the Initial Developer are Copyright (C) 2008-2012
+	the Initial Developer. All Rights Reserved.
+
+	Contributor(s):
+	Mark J Crane <markjcrane@fusionpbx.com>
+*/
+
+// make sure the PATH_SEPARATOR is defined
+	umask(2);
+	if (!defined("PATH_SEPARATOR")) {
+		if (strpos($_ENV["OS"], "Win") !== false) {
+			define("PATH_SEPARATOR", ";");
+		} else {
+			define("PATH_SEPARATOR", ":");
+		}
+	}
+
+	if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
+
+	// make sure the document_root is set
+	$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);
+	if(PHP_SAPI == 'cli'){
+		chdir(pathinfo(realpath($_SERVER["PHP_SELF"]), PATHINFO_DIRNAME));
+		$script_full_path = str_replace("\\", '/', getcwd() . '/' . $_SERVER["SCRIPT_FILENAME"]);
+		$dirs = explode('/', pathinfo($script_full_path, PATHINFO_DIRNAME));
+		if (file_exists('/project_root.php')) {
+			$path = '/';
+		} else {
+			$i    = 1;
+			$path = '';
+			while ($i < count($dirs)) {
+				$path .= '/' . $dirs[$i];
+				if (file_exists($path. '/project_root.php')) {
+					break;
+				}
+				$i++;
+			}
+		}
+		$_SERVER["DOCUMENT_ROOT"] = $path;
+	}else{
+		$_SERVER["DOCUMENT_ROOT"]   = str_replace($_SERVER["PHP_SELF"], "", $_SERVER["SCRIPT_FILENAME"]);
+	}
+	$_SERVER["DOCUMENT_ROOT"]   = realpath($_SERVER["DOCUMENT_ROOT"]);
+// try to detect if a project path is being used
+	if (!defined('PROJECT_PATH')) {
+		if (is_dir($_SERVER["DOCUMENT_ROOT"]. '/fusionpbx')) {
+			define('PROJECT_PATH', '/fusionpbx');
+		} elseif (file_exists($_SERVER["DOCUMENT_ROOT"]. '/project_root.php')) {
+			define('PROJECT_PATH', '');
+		} else {
+			$dirs = explode('/', str_replace('\\', '/', pathinfo($_SERVER["PHP_SELF"], PATHINFO_DIRNAME)));
+			$i    = 1;
+			$path = $_SERVER["DOCUMENT_ROOT"];
+			while ($i < count($dirs)) {
+				$path .= '/' . $dirs[$i];
+				if (file_exists($path. '/project_root.php')) {
+					break;
+				}
+				$i++;
+			}
+			if(!file_exists($path. '/project_root.php')){
+				die("Failed to locate the Project Root by searching for project_root.php please contact support for assistance");
+			}
+			$project_path = str_replace($_SERVER["DOCUMENT_ROOT"], "", $path);
+			define('PROJECT_PATH', $project_path);
+		}
+		$_SERVER["PROJECT_ROOT"] = realpath($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH);
+		set_include_path(get_include_path() . PATH_SEPARATOR . $_SERVER["PROJECT_ROOT"]);
+	}
+
+?>
\ No newline at end of file
diff --git a/core/user_logs/user_log_edit.php b/core/user_logs/user_log_edit.php
new file mode 100644
index 0000000000..10c368ab30
--- /dev/null
+++ b/core/user_logs/user_log_edit.php
@@ -0,0 +1,213 @@
+<?php
+
+//includes
+	require_once "root.php";
+	require_once "resources/require.php";
+	require_once "resources/check_auth.php";
+
+//check permissions
+	if (permission_exists('user_log_view')) {
+		//access granted
+	}
+	else {
+		echo "access denied";
+		exit;
+	}
+
+//add multi-lingual support
+	$language = new text;
+	$text = $language->get();
+
+//get the uuid
+	$user_log_uuid = $_GET['id'];
+
+//pre-populate the form
+	if (is_array($_GET) && $_POST["persistformvar"] != "true") {
+		$sql = "select * from v_user_logs ";
+		$sql .= "where user_log_uuid = :user_log_uuid ";
+		//$sql .= "and domain_uuid = :domain_uuid ";
+		//$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+		$parameters['user_log_uuid'] = $user_log_uuid;
+		$database = new database;
+		$row = $database->select($sql, $parameters, 'row');
+		if (is_array($row) && @sizeof($row) != 0) {
+			$domain_uuid = $row["domain_uuid"];
+			$timestamp = $row["timestamp"];
+			$user_uuid = $row["user_uuid"];
+			$username = $row["username"];
+			$type = $row["type"];
+			$result = $row["result"];
+			$remote_address = $row["remote_address"];
+			$user_agent = $row["user_agent"];
+		}
+		unset($sql, $parameters, $row);
+	}
+
+//create token
+	$object = new token;
+	$token = $object->create($_SERVER['PHP_SELF']);
+
+//show the header
+	$document['title'] = $text['title-user_log'];
+	require_once "resources/header.php";
+
+//get the users
+	$sql = "SELECT user_uuid, username FROM v_users ";
+	$sql .= "WHERE domain_uuid = :domain_uuid ";
+	$sql .= "ORDER by username asc ";
+	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+	$database = new database;
+	$users = $database->execute($sql, $parameters, 'all');
+	unset ($sql, $parameters);
+
+//show the content
+	echo "<form name='frm' id='frm' method='post' action=''>\n";
+	echo "<input class='formfld' type='hidden' name='user_log_uuid' value='".escape($user_log_uuid)."'>\n";
+
+	echo "<div class='action_bar' id='action_bar'>\n";
+	echo "	<div class='heading'><b>".$text['title-user_log']."</b></div>\n";
+	echo "	<div class='actions'>\n";
+	echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$_SESSION['theme']['button_icon_back'],'id'=>'btn_back','collapse'=>'hide-xs','style'=>'margin-right: 15px;','link'=>'user_logs.php']);
+	echo "	</div>\n";
+	echo "	<div style='clear: both;'></div>\n";
+	echo "</div>\n";
+
+	echo $text['title_description-user_logs']."\n";
+	echo "<br /><br />\n";
+
+	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
+
+	echo "<tr>\n";
+	echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-domain_uuid']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' style='position: relative;' align='left'>\n";
+	echo "	<select class='formfld' name='domain_uuid'>\n";
+	if (strlen($domain_uuid) == 0) {
+		echo "		<option value='' selected='selected'>".$text['select-global']."</option>\n";
+	}
+	else {
+		echo "		<option value=''>".$text['label-global']."</option>\n";
+	}
+	foreach ($_SESSION['domains'] as $row) {
+		if ($row['domain_uuid'] == $domain_uuid) {
+			echo "		<option value='".$row['domain_uuid']."' selected='selected'>".escape($row['domain_name'])."</option>\n";
+		}
+		else {
+			echo "		<option value='".$row['domain_uuid']."'>".$row['domain_name']."</option>\n";
+		}
+	}
+	echo "	</select>\n";
+	echo "<br />\n";
+	echo $text['description-domain_uuid']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
+	echo "<tr>\n";
+	echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-timestamp']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' style='position: relative;' align='left'>\n";
+	echo "  <input class='formfld' type='text' name='timestamp' maxlength='255' value='".escape($timestamp)."'>\n";
+	echo "<br />\n";
+	echo $text['description-timestamp']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
+	echo "<tr>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-user_uuid']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' style='position: relative;' align='left'>\n";
+	echo "	<select class='formfld' name='user_uuid'>\n";
+	echo "		<option value=''></option>\n";
+	foreach($users as $field) {
+		if ($field['user_uuid'] == $user_uuid) { $selected = "selected='selected'"; } else { $selected = ''; }
+		echo "		<option value='".$field['user_uuid']."' $selected>".escape($field['username'])."</option>\n";
+	}
+	echo "	</select>\n";
+	echo "<br />\n";
+	echo $text['description-user_uuid']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
+	echo "<tr>\n";
+	echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-username']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' style='position: relative;' align='left'>\n";
+	echo "	<input class='formfld' type='text' name='username' maxlength='255' value='".escape($username)."'>\n";
+	echo "<br />\n";
+	echo $text['description-username']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
+	echo "<tr>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-type']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' style='position: relative;' align='left'>\n";
+	echo "	<input class='formfld' type='text' name='type' maxlength='255' value='".escape($type)."'>\n";
+	echo "<br />\n";
+	echo $text['description-type']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
+	echo "<tr>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-result']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' style='position: relative;' align='left'>\n";
+		echo "	<select class='formfld' name='result'>\n";
+		echo "		<option value=''></option>\n";
+		if ($result == "success") {
+			echo "		<option value='success' selected='selected'>".$text['label-success']."</option>\n";
+		}
+		else {
+			echo "		<option value='success'>".$text['label-success']."</option>\n";
+		}
+		if ($result == "failure") {
+			echo "		<option value='failure' selected='selected'>".$text['label-failure']."</option>\n";
+		}
+		else {
+			echo "		<option value='failure'>".$text['label-failure']."</option>\n";
+		}
+		echo "	</select>\n";
+	echo "<br />\n";
+	echo $text['description-result']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
+	echo "<tr>\n";
+	echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-remote_address']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' style='position: relative;' align='left'>\n";
+	echo "	<input class='formfld' type='text' name='remote_address' maxlength='255' value='".escape($remote_address)."'>\n";
+	echo "<br />\n";
+	echo $text['description-remote_address']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
+	echo "<tr>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-user_agent']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' style='position: relative;' align='left'>\n";
+	echo "	<input class='formfld' type='text' name='user_agent' maxlength='255' value='".escape($user_agent)."'>\n";
+	echo "<br />\n";
+	echo $text['description-user_agent']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
+	echo "</table>";
+	echo "<br /><br />";
+
+	echo "<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
+
+	echo "</form>";
+
+//include the footer
+	require_once "resources/footer.php";
+
+?>
\ No newline at end of file
diff --git a/core/user_logs/user_logs.php b/core/user_logs/user_logs.php
new file mode 100644
index 0000000000..b497244ad7
--- /dev/null
+++ b/core/user_logs/user_logs.php
@@ -0,0 +1,270 @@
+<?php
+/*
+	FusionPBX
+	Version: MPL 1.1
+
+	The contents of this file are subject to the Mozilla Public License Version
+	1.1 (the "License"); you may not use this file except in compliance with
+	the License. You may obtain a copy of the License at
+	http://www.mozilla.org/MPL/
+
+	Software distributed under the License is distributed on an "AS IS" basis,
+	WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+	for the specific language governing rights and limitations under the
+	License.
+
+	The Original Code is FusionPBX
+
+	The Initial Developer of the Original Code is
+	Mark J Crane <markjcrane@fusionpbx.com>
+	Portions created by the Initial Developer are Copyright (C) 2018 - 2020
+	the Initial Developer. All Rights Reserved.
+*/
+
+//includes
+	require_once "root.php";
+	require_once "resources/require.php";
+	require_once "resources/check_auth.php";
+	require_once "resources/paging.php";
+
+//check permissions
+	if (permission_exists('user_log_view')) {
+		//access granted
+	}
+	else {
+		echo "access denied";
+		exit;
+	}
+
+//add multi-lingual support
+	$language = new text;
+	$text = $language->get();
+
+//get the http post data
+	if (is_array($_POST['user_logs'])) {
+		$action = $_POST['action'];
+		$search = $_POST['search'];
+		$user_logs = $_POST['user_logs'];
+	}
+
+//process the http post data by action
+	if ($action != '' && is_array($user_logs) && @sizeof($user_logs) != 0) {
+
+		//validate the token
+		$token = new token;
+		if (!$token->validate($_SERVER['PHP_SELF'])) {
+			message::add($text['message-invalid_token'],'negative');
+			header('Location: user_logs.php');
+			exit;
+		}
+
+		//prepare the array
+		foreach($user_logs as $row) {
+			$array['user_logs'][$x]['checked'] = $row['checked'];
+			$array['user_logs'][$x]['user_log_uuid'] = $row['user_log_uuid'];
+			$x++;
+		}
+
+		//prepare the database object
+		$database = new database;
+		$database->app_name = 'user_logs';
+		$database->app_uuid = '582a13cf-7d75-4ea3-b2d9-60914352d76e';
+
+		//send the array to the database class
+		if ($action == 'delete') {
+			if (permission_exists('user_log_delete')) {
+				$database->delete($array);
+			}
+		}
+
+		//redirect the user
+		header('Location: user_logs.php'.($search != '' ? '?search='.urlencode($search) : null));
+		exit;
+	}
+
+//get order and order by
+	$order_by = $_GET["order_by"];
+	$order = $_GET["order"];
+
+//add the search
+	if (isset($_GET["search"])) {
+		$search = strtolower($_GET["search"]);
+	}
+
+//get the count
+	$sql = "select count(user_log_uuid) ";
+	$sql .= "from v_user_logs ";
+	if (permission_exists('user_log_all') && $_GET['show'] == 'all') {
+		$sql .= "where true ";
+	}
+	else {
+		$sql .= "where (domain_uuid = :domain_uuid or domain_uuid is null) ";
+		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+	}
+	if (isset($search)) {
+		$sql .= "and (";
+		$sql .= "	lower(username) like :search ";
+		$sql .= "	or lower(type) like :search ";
+		$sql .= "	or lower(result) like :search ";
+		$sql .= "	or lower(remote_address) like :search ";
+		$sql .= "	or lower(user_agent) like :search ";
+		$sql .= ") ";
+		$parameters['search'] = '%'.$search.'%';
+	}
+	$database = new database;
+	$num_rows = $database->select($sql, $parameters, 'column');
+	unset($sql, $parameters);
+
+//prepare to page the results
+	$rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50;
+	$param = $search ? "&search=".$search : null;
+	$param = ($_GET['show'] == 'all' && permission_exists('user_log_all')) ? "&show=all" : null;
+	$page = is_numeric($_GET['page']) ? $_GET['page'] : 0;
+	list($paging_controls, $rows_per_page) = paging($num_rows, $param, $rows_per_page);
+	list($paging_controls_mini, $rows_per_page) = paging($num_rows, $param, $rows_per_page, true);
+	$offset = $rows_per_page * $page;
+
+//get the list
+	$sql = "select ";
+	$sql .= "domain_uuid, ";
+	$sql .= "user_log_uuid, ";
+	$sql .= "timestamp, ";
+	$sql .= "username, ";
+	$sql .= "type, ";
+	$sql .= "result, ";
+	$sql .= "remote_address, ";
+	$sql .= "user_agent ";
+	$sql .= "from v_user_logs ";
+	if (permission_exists('user_log_all') && $_GET['show'] == 'all') {
+		$sql .= "where true ";
+	}
+	else {
+		$sql .= "where (domain_uuid = :domain_uuid or domain_uuid is null) ";
+		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+	}
+	if (isset($search)) {
+		$sql .= "and ( ";
+		$sql .= "	lower(username) like :search ";
+		$sql .= "	or lower(type) like :search ";
+		$sql .= "	or lower(result) like :search ";
+		$sql .= "	or lower(remote_address) like :search ";
+		$sql .= "	or lower(user_agent) like :search ";
+		$sql .= ") ";
+		$parameters['search'] = '%'.$search.'%';
+	}
+	$sql .= order_by($order_by, $order, 'timestamp', 'desc');
+	$sql .= limit_offset($rows_per_page, $offset);
+	$database = new database;
+	$user_logs = $database->select($sql, $parameters, 'all');
+	unset($sql, $parameters);
+
+//create token
+	$object = new token;
+	$token = $object->create($_SERVER['PHP_SELF']);
+
+//additional includes
+	$document['title'] = $text['title-user_logs'];
+	require_once "resources/header.php";
+
+//show the content
+	echo "<div class='action_bar' id='action_bar'>\n";
+	echo "	<div class='heading'><b>".$text['title-user_logs']." (".$num_rows.")</b></div>\n";
+	echo "	<div class='actions'>\n";
+	if (permission_exists('user_log_delete') && $user_logs) {
+		echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'id'=>'btn_delete','name'=>'btn_delete','style'=>'display:none;','onclick'=>"modal_open('modal-delete','btn_delete');"]);
+	}
+	echo 		"<form id='form_search' class='inline' method='get'>\n";
+	if (permission_exists('user_log_all')) {
+		if ($_GET['show'] == 'all') {
+			echo "		<input type='hidden' name='show' value='all'>\n";
+		}
+		else {
+			echo button::create(['type'=>'button','label'=>$text['button-show_all'],'icon'=>$_SESSION['theme']['button_icon_all'],'link'=>'?show=all']);
+		}
+	}
+	echo 		"<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown='list_search_reset();'>";
+	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search','style'=>($search != '' ? 'display: none;' : null)]);
+	echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'user_logs.php','style'=>($search == '' ? 'display: none;' : null)]);
+	if ($paging_controls_mini != '') {
+		echo 	"<span style='margin-left: 15px;'>".$paging_controls_mini."</span>\n";
+	}
+	echo "		</form>\n";
+	echo "	</div>\n";
+	echo "	<div style='clear: both;'></div>\n";
+	echo "</div>\n";
+
+	if (permission_exists('user_log_delete') && $user_logs) {
+		echo modal::create(['id'=>'modal-delete','type'=>'delete','actions'=>button::create(['type'=>'button','label'=>$text['button-continue'],'icon'=>'check','id'=>'btn_delete','style'=>'float: right; margin-left: 15px;','collapse'=>'never','onclick'=>"modal_close(); list_action_set('delete'); list_form_submit('form_list');"])]);
+	}
+
+	echo $text['title_description-user_logs']."\n";
+	echo "<br /><br />\n";
+
+	echo "<form id='form_list' method='post'>\n";
+	echo "<input type='hidden' id='action' name='action' value=''>\n";
+	echo "<input type='hidden' name='search' value=\"".escape($search)."\">\n";
+
+	echo "<table class='list'>\n";
+	echo "<tr class='list-header'>\n";
+	if (permission_exists('user_log_add') || permission_exists('user_log_edit') || permission_exists('user_log_delete')) {
+		echo "	<th class='checkbox'>\n";
+		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle(); checkbox_on_change(this);' ".($user_logs ?: "style='visibility: hidden;'").">\n";
+		echo "	</th>\n";
+	}
+	if ($_GET['show'] == 'all' && permission_exists('user_log_all')) {
+		echo th_order_by('domain_name', $text['label-domain'], $order_by, $order);
+	}
+	echo th_order_by('timestamp', $text['label-timestamp'], $order_by, $order);
+	echo th_order_by('username', $text['label-username'], $order_by, $order);
+	echo th_order_by('type', $text['label-type'], $order_by, $order);
+	echo th_order_by('result', $text['label-result'], $order_by, $order);
+	echo th_order_by('remote_address', $text['label-remote_address'], $order_by, $order);
+	echo th_order_by('user_agent', $text['label-user_agent'], $order_by, $order);
+	if (permission_exists('user_log_edit') && $_SESSION['theme']['list_row_edit_button']['boolean'] == 'true') {
+		echo "	<td class='action-button'>&nbsp;</td>\n";
+	}
+	echo "</tr>\n";
+
+	if (is_array($user_logs) && @sizeof($user_logs) != 0) {
+		$x = 0;
+		foreach ($user_logs as $row) {
+			if (permission_exists('user_log_edit')) {
+				$list_row_url = "user_log_edit.php?id=".urlencode($row['user_log_uuid']);
+			}
+			echo "<tr class='list-row' href='".$list_row_url."'>\n";
+			if (permission_exists('user_log_add') || permission_exists('user_log_edit') || permission_exists('user_log_delete')) {
+				echo "	<td class='checkbox'>\n";
+				echo "		<input type='checkbox' name='user_logs[$x][checked]' id='checkbox_".$x."' value='true' onclick=\"checkbox_on_change(this); if (!this.checked) { document.getElementById('checkbox_all').checked = false; }\">\n";
+				echo "		<input type='hidden' name='user_logs[$x][user_log_uuid]' value='".escape($row['user_log_uuid'])."' />\n";
+				echo "	</td>\n";
+			}
+			if ($_GET['show'] == 'all' && permission_exists('user_log_all')) {
+				echo "	<td>".escape($_SESSION['domains'][$row['domain_uuid']]['domain_name'])."</td>\n";
+			}
+			echo "	<td>".escape($row['timestamp'])."</td>\n";
+			echo "	<td>".escape($row['username'])."</td>\n";
+			echo "	<td>".escape($row['type'])."</td>\n";
+			echo "	<td>".escape($row['result'])."</td>\n";
+			echo "	<td>".escape($row['remote_address'])."</td>\n";
+			echo "	<td>".escape($row['user_agent'])."</td>\n";
+			if (permission_exists('user_log_edit') && $_SESSION['theme']['list_row_edit_button']['boolean'] == 'true') {
+				echo "	<td class='action-button'>\n";
+				echo button::create(['type'=>'button','title'=>$text['button-edit'],'icon'=>$_SESSION['theme']['button_icon_edit'],'link'=>$list_row_url]);
+				echo "	</td>\n";
+			}
+			echo "</tr>\n";
+			$x++;
+		}
+		unset($user_logs);
+	}
+
+	echo "</table>\n";
+	echo "<br />\n";
+	echo "<div align='center'>".$paging_controls."</div>\n";
+	echo "<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
+	echo "</form>\n";
+
+//include the footer
+	require_once "resources/footer.php";
+
+?>
diff --git a/core/user_settings/app_languages.php b/core/user_settings/app_languages.php
index 3b25bb7a90..714a717fff 100644
--- a/core/user_settings/app_languages.php
+++ b/core/user_settings/app_languages.php
@@ -1332,7 +1332,7 @@ $text['label-ivr_menus']['de-de'] = "Automatische Vermittlungen";
 $text['label-ivr_menus']['el-gr'] = "Μενού IVR";
 $text['label-ivr_menus']['es-cl'] = "Menus IVR";
 $text['label-ivr_menus']['es-mx'] = "Menus IVR"; //copied from es-cl
-$text['label-ivr_menus']['fr-ca'] = "Menus SVI"; //copied from fr-fr
+$text['label-ivr_menus']['fr-ca'] = "Menus RVI"; 
 $text['label-ivr_menus']['fr-fr'] = "Menus SVI";
 $text['label-ivr_menus']['he-il'] = "";
 $text['label-ivr_menus']['it-it'] = "Menu IVR";
@@ -2049,6 +2049,60 @@ $text['label-active_domains']['ru-ru'] = "Активные домены";
 $text['label-active_domains']['sv-se'] = "Aktiva Domäner";
 $text['label-active_domains']['uk-ua'] = "активні домени";
 
+$text['label-dynamic']['en-us'] = "Dynamic";
+$text['label-dynamic']['en-gb'] = "Dynamic";
+$text['label-dynamic']['ar-eg'] = "Dynamic";
+$text['label-dynamic']['de-at'] = "Dynamic";
+$text['label-dynamic']['de-ch'] = "Dynamic";
+$text['label-dynamic']['de-de'] = "Dynamic";
+$text['label-dynamic']['es-cl'] = "Dynamic";
+$text['label-dynamic']['es-mx'] = "Dynamic";
+$text['label-dynamic']['fr-ca'] = "Dynamic";
+$text['label-dynamic']['fr-fr'] = "Dynamic";
+$text['label-dynamic']['he-il'] = "Dynamic";
+$text['label-dynamic']['it-it'] = "Dynamic";
+$text['label-dynamic']['nl-nl'] = "Dynamic";
+$text['label-dynamic']['pl-pl'] = "Dynamic";
+$text['label-dynamic']['pt-br'] = "Dynamic";
+$text['label-dynamic']['pt-pt'] = "Dynamic";
+$text['label-dynamic']['ro-ro'] = "Dynamic";
+
+$text['label-single']['en-us'] = "Single";
+$text['label-single']['en-gb'] = "Single";
+$text['label-single']['ar-eg'] = "Single";
+$text['label-single']['de-at'] = "Single";
+$text['label-single']['de-ch'] = "Single";
+$text['label-single']['de-de'] = "Single";
+$text['label-single']['es-cl'] = "Single";
+$text['label-single']['es-mx'] = "Single";
+$text['label-single']['fr-ca'] = "Single";
+$text['label-single']['fr-fr'] = "Single";
+$text['label-single']['he-il'] = "Single";
+$text['label-single']['it-it'] = "Single";
+$text['label-single']['nl-nl'] = "Single";
+$text['label-single']['pl-pl'] = "Single";
+$text['label-single']['pt-br'] = "Single";
+$text['label-single']['pt-pt'] = "Single";
+$text['label-single']['ro-ro'] = "Single";
+
+$text['label-multiple']['en-us'] = "Multiple";
+$text['label-multiple']['en-gb'] = "Multiple";
+$text['label-multiple']['ar-eg'] = "Multiple";
+$text['label-multiple']['de-at'] = "Multiple";
+$text['label-multiple']['de-ch'] = "Multiple";
+$text['label-multiple']['de-de'] = "Multiple";
+$text['label-multiple']['es-cl'] = "Multiple";
+$text['label-multiple']['es-mx'] = "Multiple";
+$text['label-multiple']['fr-ca'] = "Multiple";
+$text['label-multiple']['fr-fr'] = "Multiple";
+$text['label-multiple']['he-il'] = "Multiple";
+$text['label-multiple']['it-it'] = "Multiple";
+$text['label-multiple']['nl-nl'] = "Multiple";
+$text['label-multiple']['pl-pl'] = "Multiple";
+$text['label-multiple']['pt-br'] = "Multiple";
+$text['label-multiple']['pt-pt'] = "Multiple";
+$text['label-multiple']['ro-ro'] = "Multiple";
+
 $text['header-user_dashboard']['en-us'] = "Dashboard";
 $text['header-user_dashboard']['en-gb'] = "Dashboard";
 $text['header-user_dashboard']['ar-eg'] = "الصفحه الرئيسيه للمستخدم";
@@ -2071,7 +2125,6 @@ $text['header-user_dashboard']['ru-ru'] = "Панель пользователя
 $text['header-user_dashboard']['sv-se'] = "Dashboard";
 $text['header-user_dashboard']['uk-ua'] = "Панель користувача";
 
-
 $text['header-user_setting-edit']['en-us'] = "User Setting";
 $text['header-user_setting-edit']['en-gb'] = "User Setting";
 $text['header-user_setting-edit']['ar-eg'] = "";
diff --git a/core/user_settings/user_setting_edit.php b/core/user_settings/user_setting_edit.php
index cb57ebda9f..f81ddb3fed 100644
--- a/core/user_settings/user_setting_edit.php
+++ b/core/user_settings/user_setting_edit.php
@@ -319,7 +319,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 //pre-populate the form
 	if (is_uuid($_GET["id"]) && count($_GET) > 0 && $_POST["persistformvar"] != "true") {
 		$user_setting_uuid = $_GET["id"];
-		$sql = "select user_setting_category, user_setting_subcategory, user_setting_name, user_setting_value, cast(user_setting_enabled as text), user_setting_description ";
+		$sql = "select user_setting_category, user_setting_subcategory, user_setting_name, user_setting_value, user_setting_order, cast(user_setting_enabled as text), user_setting_description ";
 		$sql .= "from v_user_settings ";
 		$sql .= "where user_setting_uuid = :user_setting_uuid ";
 		$sql .= "and user_uuid = :user_uuid ";
@@ -657,6 +657,37 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 		echo "    	<option value='none' ".(($user_setting_value == "none") ? "selected='selected'" : null).">".$text['label-none']."</option>\n";
 		echo "    </select>\n";
 	}
+	elseif ($user_setting_category == "users" && $user_setting_subcategory == "username_format" && $user_setting_name == "text" ) {
+		echo "	<select class='formfld' id='user_setting_value' name='user_setting_value'>\n";
+		echo "    	<option value='any' ".($user_setting_value == 'any' ? "selected='selected'" : null).">".$text['option-username_format_any']."</option>\n";
+		echo "    	<option value='email' ".($user_setting_value == 'email' ? "selected='selected'" : null).">".$text['option-username_format_email']."</option>\n";
+		echo "    	<option value='no_email' ".($user_setting_value == 'no_email' ? "selected='selected'" : null).">".$text['option-username_format_no_email']."</option>\n";
+		echo "	</select>\n";
+	}
+	elseif ($user_setting_category == "destinations" && $user_setting_subcategory == "dialplan_details" && $user_setting_name == "boolean" ) {
+		echo "	<select class='formfld' id='user_setting_value' name='user_setting_value'>\n";
+		echo "    	<option value='true'>".$text['label-true']."</option>\n";
+		echo "    	<option value='false' ".(($user_setting_value == "false") ? "selected='selected'" : null).">".$text['label-false']."</option>\n";
+		echo "	</select>\n";
+	}
+	elseif ($user_setting_category == "destinations" && $user_setting_subcategory == "dialplan_mode" && $user_setting_name == "text" ) {
+		echo "	<select class='formfld' id='user_setting_value' name='user_setting_value'>\n";
+		echo "    	<option value='multiple'>".$text['label-multiple']."</option>\n";
+		echo "    	<option value='single' ".(($user_setting_value == "single") ? "selected='selected'" : null).">".$text['label-single']."</option>\n";
+		echo "	</select>\n";
+	}
+	elseif ($user_setting_category == "destinations" && $user_setting_subcategory == "select_mode" && $user_setting_name == "text" ) {
+		echo "	<select class='formfld' id='user_setting_value' name='user_setting_value'>\n";
+		echo "    	<option value='default'>".$text['label-default']."</option>\n";
+		echo "    	<option value='dynamic' ".(($user_setting_value == "dynamic") ? "selected='selected'" : null).">".$text['label-dynamic']."</option>\n";
+		echo "	</select>\n";
+	}
+	elseif ($user_setting_category == "destinations" && $user_setting_subcategory == "unique" && $user_setting_name == "boolean" ) {
+		echo "	<select class='formfld' id='user_setting_value' name='user_setting_value'>\n";
+		echo "    	<option value='true'>".$text['label-true']."</option>\n";
+		echo "    	<option value='false' ".(($user_setting_value == "false") ? "selected='selected'" : null).">".$text['label-false']."</option>\n";
+		echo "	</select>\n";
+	}
 	else {
 		echo "	<input class='formfld' type='text' id='user_setting_value' name='user_setting_value' maxlength='255' value=\"".escape($user_setting_value)."\">\n";
 	}
diff --git a/core/user_settings/user_settings.php b/core/user_settings/user_settings.php
index ad7421d20d..cbb12bb017 100644
--- a/core/user_settings/user_settings.php
+++ b/core/user_settings/user_settings.php
@@ -298,9 +298,18 @@
 				echo "		".(img_spacer('15px', '15px', 'background: '.escape($row['user_setting_value']).'; margin-right: 4px; vertical-align: middle; border: 1px solid '.(color_adjust($row['user_setting_value'], -0.18)).'; padding: -1px;'));
 				echo "<span style=\"font-family: 'Courier New'; line-height: 6pt;\">".escape($row['user_setting_value'])."</span>\n";
 			}
+			else if ($category == 'users' && $subcategory == 'username_format' && $name == 'text') {
+				echo "		".$text['option-username_format_'.$row['user_setting_value']]."\n";
+			}
 			else if ($category == 'recordings' && $subcategory == 'storage_type' && $name == 'text') {
 				echo "		".$text['label-'.$row['user_setting_value']]."\n";
 			}
+			else if ($category == 'destinations' && $subcategory == 'dialplan_mode' && $name == 'text') {
+				echo "		".$text['label-'.$row['user_setting_value']]."\n";
+			}
+			else if ($category == 'destinations' && $subcategory == 'select_mode' && $name == 'text') {
+				echo "		".$text['label-'.$row['user_setting_value']]."\n";
+			}
 			else {
 				echo "		".escape($row['user_setting_value'])."\n";
 			}
diff --git a/core/users/app_config.php b/core/users/app_config.php
index ffba651654..f22620cfbd 100644
--- a/core/users/app_config.php
+++ b/core/users/app_config.php
@@ -94,6 +94,14 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "";
 		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "53cc1060-78f9-44ca-b9b0-17fb2fffd5e1";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "users";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "username_format";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "any";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Require a specific username format.";
+		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "e3f5f4cd-0f17-428a-b788-2f2db91b6dc7";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "users";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "password_length";
diff --git a/core/users/app_languages.php b/core/users/app_languages.php
index cdfc4dc6c4..2698b2c3cf 100644
--- a/core/users/app_languages.php
+++ b/core/users/app_languages.php
@@ -1558,6 +1558,60 @@ $text['label-12-hour']['ru-ru'] = "12-часовой";
 $text['label-12-hour']['sv-se'] = "12-Timmars";
 $text['label-12-hour']['uk-ua'] = "12-годинний";
 
+$text['label-dynamic']['en-us'] = "Dynamic";
+$text['label-dynamic']['en-gb'] = "Dynamic";
+$text['label-dynamic']['ar-eg'] = "Dynamic";
+$text['label-dynamic']['de-at'] = "Dynamic";
+$text['label-dynamic']['de-ch'] = "Dynamic";
+$text['label-dynamic']['de-de'] = "Dynamic";
+$text['label-dynamic']['es-cl'] = "Dynamic";
+$text['label-dynamic']['es-mx'] = "Dynamic";
+$text['label-dynamic']['fr-ca'] = "Dynamic";
+$text['label-dynamic']['fr-fr'] = "Dynamic";
+$text['label-dynamic']['he-il'] = "Dynamic";
+$text['label-dynamic']['it-it'] = "Dynamic";
+$text['label-dynamic']['nl-nl'] = "Dynamic";
+$text['label-dynamic']['pl-pl'] = "Dynamic";
+$text['label-dynamic']['pt-br'] = "Dynamic";
+$text['label-dynamic']['pt-pt'] = "Dynamic";
+$text['label-dynamic']['ro-ro'] = "Dynamic";
+
+$text['label-single']['en-us'] = "Single";
+$text['label-single']['en-gb'] = "Single";
+$text['label-single']['ar-eg'] = "Single";
+$text['label-single']['de-at'] = "Single";
+$text['label-single']['de-ch'] = "Single";
+$text['label-single']['de-de'] = "Single";
+$text['label-single']['es-cl'] = "Single";
+$text['label-single']['es-mx'] = "Single";
+$text['label-single']['fr-ca'] = "Single";
+$text['label-single']['fr-fr'] = "Single";
+$text['label-single']['he-il'] = "Single";
+$text['label-single']['it-it'] = "Single";
+$text['label-single']['nl-nl'] = "Single";
+$text['label-single']['pl-pl'] = "Single";
+$text['label-single']['pt-br'] = "Single";
+$text['label-single']['pt-pt'] = "Single";
+$text['label-single']['ro-ro'] = "Single";
+
+$text['label-multiple']['en-us'] = "Multiple";
+$text['label-multiple']['en-gb'] = "Multiple";
+$text['label-multiple']['ar-eg'] = "Multiple";
+$text['label-multiple']['de-at'] = "Multiple";
+$text['label-multiple']['de-ch'] = "Multiple";
+$text['label-multiple']['de-de'] = "Multiple";
+$text['label-multiple']['es-cl'] = "Multiple";
+$text['label-multiple']['es-mx'] = "Multiple";
+$text['label-multiple']['fr-ca'] = "Multiple";
+$text['label-multiple']['fr-fr'] = "Multiple";
+$text['label-multiple']['he-il'] = "Multiple";
+$text['label-multiple']['it-it'] = "Multiple";
+$text['label-multiple']['nl-nl'] = "Multiple";
+$text['label-multiple']['pl-pl'] = "Multiple";
+$text['label-multiple']['pt-br'] = "Multiple";
+$text['label-multiple']['pt-pt'] = "Multiple";
+$text['label-multiple']['ro-ro'] = "Multiple";
+
 $text['header-user_manager']['en-us'] = "Users";
 $text['header-user_manager']['en-gb'] = "Users";
 $text['header-user_manager']['ar-eg'] = "";
diff --git a/core/users/user_edit.php b/core/users/user_edit.php
index c0190fd82d..5bedf46777 100644
--- a/core/users/user_edit.php
+++ b/core/users/user_edit.php
@@ -135,7 +135,9 @@
 			}
 			$group_uuid_name = $_POST["group_uuid_name"];
 			$user_enabled = $_POST["user_enabled"];
-			$api_key = $_POST["api_key"];
+			if (permission_exists('api_key')) {
+				$api_key = $_POST["api_key"];
+			}
 			if (permission_exists('message_key')) {
 				$message_key = $_POST["message_key"];
 			}
@@ -152,6 +154,14 @@
 			if ($username == '') {
 				$invalid[] = $text['label-username'];
 			}
+			if ($_SESSION['users']['username_format']['text'] != '' && $_SESSION['users']['username_format']['text'] != 'any') {
+				if (
+					($_SESSION['users']['username_format']['text'] == 'email' && !valid_email($username)) ||
+					($_SESSION['users']['username_format']['text'] == 'no_email' && valid_email($username))
+					) {
+					message::add($text['message-username_format_invalid'], 'negative', 7500);
+				}
+			}
 			if ((permission_exists('user_edit') && $action == 'edit' && $username != $username_old && $username != '') ||
 				(permission_exists('user_add') && $action == 'add' && $username != '')) {
 				$sql = "select count(*) from v_users where username = :username ";
@@ -490,7 +500,9 @@
 			$array['users'][$x]['user_email'] = $user_email;
 			$array['users'][$x]['user_status'] = $user_status;
 			if (permission_exists('user_add') || permission_exists('user_edit')) {
-				$array['users'][$x]['api_key'] = ($api_key != '') ? $api_key : null;
+				if (permission_exists('api_key')) {
+					$array['users'][$x]['api_key'] = ($api_key != '') ? $api_key : null;
+				}
 				$array['users'][$x]['user_enabled'] = $user_enabled;
 				if (permission_exists('contact_add')) {
 					$array['users'][$x]['contact_uuid'] = ($contact_uuid != '') ? $contact_uuid : null;
@@ -941,7 +953,7 @@
 					echo "	<td class='vtable' style='white-space: nowrap; padding-right: 30px;' nowrap='nowrap'>";
 					echo escape($field['group_name']).(($field['group_domain_uuid'] != '') ? "@".$_SESSION['domains'][$field['group_domain_uuid']]['domain_name'] : null);
 					echo "	</td>\n";
-					if (permission_exists('group_member_delete') || if_group("superadmin")) {
+					if (permission_exists('user_group_delete') || if_group("superadmin")) {
 						echo "	<td class='list_control_icons' style='width: 25px;'>\n";
 						echo "		<a href='user_edit.php?id=".urlencode($user_uuid)."&domain_uuid=".urlencode($domain_uuid)."&group_uuid=".urlencode($field['group_uuid'])."&a=delete' alt='".$text['button-delete']."' onclick=\"return confirm('".$text['confirm-delete']."')\">".$v_link_label_delete."</a>\n";
 						echo "	</td>\n";
diff --git a/core/users/user_imports.php b/core/users/user_imports.php
index 4cefe880e7..3cebb54c1d 100644
--- a/core/users/user_imports.php
+++ b/core/users/user_imports.php
@@ -62,26 +62,25 @@
 
 //save the data to the csv file
 	if (isset($_POST['data'])) {
-		$file = $_SESSION['server']['temp']['dir']."/users-".$_SESSION['domain_name'].".csv";
-		file_put_contents($file, $_POST['data']);
-		$_SESSION['file'] = $file;
-	}
-
-//copy the csv file
-	//$_POST['submit'] == "Upload" &&
-	if (is_uploaded_file($_FILES['ulfile']['tmp_name']) && permission_exists('user_imports')) {
-		if ($_POST['type'] == 'csv') {
-			move_uploaded_file($_FILES['ulfile']['tmp_name'], $_SESSION['server']['temp']['dir'].'/'.$_FILES['ulfile']['name']);
-			$save_msg = "Uploaded file to ".$_SESSION['server']['temp']['dir']."/". htmlentities($_FILES['ulfile']['name']);
-			//system('chmod -R 744 '.$_SESSION['server']['temp']['dir'].'*');
-			unset($_POST['txtCommand']);
-			$file = $_SESSION['server']['temp']['dir'].'/'.$_FILES['ulfile']['name'];
+		$file = $_SESSION['server']['temp']['dir'].'/users-'.$_SESSION['domain_name'].'.csv';
+		if (file_put_contents($file, $_POST['data'])) {
 			$_SESSION['file'] = $file;
 		}
 	}
 
+//copy the csv file
+	//$_POST['submit'] == "Upload" &&
+	if (is_uploaded_file($_FILES['ulfile']['tmp_name']) && permission_exists('user_import')) {
+		if ($_POST['type'] == 'csv') {
+			$file = $_SESSION['server']['temp']['dir'].'/users-'.$_SESSION['domain_name'].'.csv';
+			if (move_uploaded_file($_FILES['ulfile']['tmp_name'], $file)) {
+				$_SESSION['file'] = $file;
+			}
+		}
+	}
+
 //get the schema
-	if (strlen($delimiter) > 0) {
+	if (strlen($delimiter) > 0 && file_exists($_SESSION['file'])) {
 		//get the first line
 			$line = fgets(fopen($_SESSION['file'], 'r'));
 			$line_fields = explode($delimiter, $line);
diff --git a/resources/app_languages.php b/resources/app_languages.php
index bb58f8cd50..77d9360dfc 100644
--- a/resources/app_languages.php
+++ b/resources/app_languages.php
@@ -409,6 +409,90 @@ $text['message-unsupported_file_type']['ru-ru'] = "Тип файла не под
 $text['message-unsupported_file_type']['sv-se'] = "Inte stöds filtyp";
 $text['message-unsupported_file_type']['uk-ua'] = "Тип файлу не підтримується";
 
+$text['message-username_format_invalid']['en-us'] = "Invalid Username Format";
+$text['message-username_format_invalid']['en-gb'] = "Invalid Username Format";
+$text['message-username_format_invalid']['ar-eg'] = "";
+$text['message-username_format_invalid']['de-at'] = "Ungültiger Benutzername"; //copied from de-de
+$text['message-username_format_invalid']['de-ch'] = "Ungültiger Benutzername"; //copied from de-de
+$text['message-username_format_invalid']['de-de'] = "Ungültiger Benutzername";
+$text['message-username_format_invalid']['es-cl'] = "";
+$text['message-username_format_invalid']['es-mx'] = "";
+$text['message-username_format_invalid']['fr-ca'] = "";
+$text['message-username_format_invalid']['fr-fr'] = "";
+$text['message-username_format_invalid']['he-il'] = "";
+$text['message-username_format_invalid']['it-it'] = "";
+$text['message-username_format_invalid']['nl-nl'] = "";
+$text['message-username_format_invalid']['pl-pl'] = "";
+$text['message-username_format_invalid']['pt-br'] = "Nome de usuário inválida";
+$text['message-username_format_invalid']['pt-pt'] = "";
+$text['message-username_format_invalid']['ro-ro'] = "";
+$text['message-username_format_invalid']['ru-ru'] = "Неверное имя пользователя";
+$text['message-username_format_invalid']['sv-se'] = "";
+$text['message-username_format_invalid']['uk-ua'] = "Geçersiz Kullanıcı Adı";
+
+$text['option-username_format_any']['en-us'] = "Any";
+$text['option-username_format_any']['en-gb'] = "Any";
+$text['option-username_format_any']['ar-eg'] = "Any";
+$text['option-username_format_any']['de-at'] = "Any";
+$text['option-username_format_any']['de-ch'] = "Any";
+$text['option-username_format_any']['de-de'] = "Any";
+$text['option-username_format_any']['es-cl'] = "Any";
+$text['option-username_format_any']['es-mx'] = "Any";
+$text['option-username_format_any']['fr-ca'] = "Any";
+$text['option-username_format_any']['fr-fr'] = "Any";
+$text['option-username_format_any']['he-il'] = "Any";
+$text['option-username_format_any']['it-it'] = "Any";
+$text['option-username_format_any']['nl-nl'] = "Any";
+$text['option-username_format_any']['pl-pl'] = "Any";
+$text['option-username_format_any']['pt-br'] = "Any";
+$text['option-username_format_any']['pt-pt'] = "Any";
+$text['option-username_format_any']['ro-ro'] = "Any";
+$text['option-username_format_any']['ru-ru'] = "Any";
+$text['option-username_format_any']['sv-se'] = "Any";
+$text['option-username_format_any']['uk-ua'] = "Any";
+
+$text['option-username_format_email']['en-us'] = "Email Address";
+$text['option-username_format_email']['en-gb'] = "Email Address";
+$text['option-username_format_email']['ar-eg'] = "Email Address";
+$text['option-username_format_email']['de-at'] = "Email Address";
+$text['option-username_format_email']['de-ch'] = "Email Address";
+$text['option-username_format_email']['de-de'] = "Email Address";
+$text['option-username_format_email']['es-cl'] = "Email Address";
+$text['option-username_format_email']['es-mx'] = "Email Address";
+$text['option-username_format_email']['fr-ca'] = "Email Address";
+$text['option-username_format_email']['fr-fr'] = "Email Address";
+$text['option-username_format_email']['he-il'] = "Email Address";
+$text['option-username_format_email']['it-it'] = "Email Address";
+$text['option-username_format_email']['nl-nl'] = "Email Address";
+$text['option-username_format_email']['pl-pl'] = "Email Address";
+$text['option-username_format_email']['pt-br'] = "Email Address";
+$text['option-username_format_email']['pt-pt'] = "Email Address";
+$text['option-username_format_email']['ro-ro'] = "Email Address";
+$text['option-username_format_email']['ru-ru'] = "Email Address";
+$text['option-username_format_email']['sv-se'] = "Email Address";
+$text['option-username_format_email']['uk-ua'] = "Email Address";
+
+$text['option-username_format_no_email']['en-us'] = "Not Email Address";
+$text['option-username_format_no_email']['en-gb'] = "Not Email Address";
+$text['option-username_format_no_email']['ar-eg'] = "Not Email Address";
+$text['option-username_format_no_email']['de-at'] = "Not Email Address";
+$text['option-username_format_no_email']['de-ch'] = "Not Email Address";
+$text['option-username_format_no_email']['de-de'] = "Not Email Address";
+$text['option-username_format_no_email']['es-cl'] = "Not Email Address";
+$text['option-username_format_no_email']['es-mx'] = "Not Email Address";
+$text['option-username_format_no_email']['fr-ca'] = "Not Email Address";
+$text['option-username_format_no_email']['fr-fr'] = "Not Email Address";
+$text['option-username_format_no_email']['he-il'] = "Not Email Address";
+$text['option-username_format_no_email']['it-it'] = "Not Email Address";
+$text['option-username_format_no_email']['nl-nl'] = "Not Email Address";
+$text['option-username_format_no_email']['pl-pl'] = "Not Email Address";
+$text['option-username_format_no_email']['pt-br'] = "Not Email Address";
+$text['option-username_format_no_email']['pt-pt'] = "Not Email Address";
+$text['option-username_format_no_email']['ro-ro'] = "Not Email Address";
+$text['option-username_format_no_email']['ru-ru'] = "Not Email Address";
+$text['option-username_format_no_email']['sv-se'] = "Not Email Address";
+$text['option-username_format_no_email']['uk-ua'] = "Not Email Address";
+
 $text['confirm-delete']['en-us'] = "Do you really want to DELETE this?";
 $text['confirm-delete']['en-gb'] = "Do you really want to DELETE this?";
 $text['confirm-delete']['ar-eg'] = "هل تريد حقا أن تحذف هذا؟";
@@ -578,8 +662,8 @@ $text['button-clear']['de-de'] = "Zurücksetzen";
 $text['button-clear']['el-gr'] = "Εκκαθάριση";
 $text['button-clear']['es-cl'] = "Limpiar";
 $text['button-clear']['es-mx'] = "Limpiar"; //copied from es-cl
-$text['button-clear']['fr-ca'] = "Nettoyer"; //copied from fr-fr
-$text['button-clear']['fr-fr'] = "Nettoyer";
+$text['button-clear']['fr-ca'] = "Effacer"; //copied from fr-fr
+$text['button-clear']['fr-fr'] = "Effacer";
 $text['button-clear']['he-il'] = "נקה";
 $text['button-clear']['it-it'] = "Pulisci";
 $text['button-clear']['nl-nl'] = "";
@@ -670,8 +754,8 @@ $text['button-search']['de-de'] = "Suchen";
 $text['button-search']['el-gr'] = "Αναζήτηση";
 $text['button-search']['es-cl'] = "Buscar";
 $text['button-search']['es-mx'] = "Buscar"; //copied from es-cl
-$text['button-search']['fr-ca'] = "Chercher"; //copied from fr-fr
-$text['button-search']['fr-fr'] = "Chercher";
+$text['button-search']['fr-ca'] = "Rechercher"; //copied from fr-fr
+$text['button-search']['fr-fr'] = "Rechercher";
 $text['button-search']['he-il'] = "חפש";
 $text['button-search']['it-it'] = "Ricerca";
 $text['button-search']['nl-nl'] = "";
@@ -3061,6 +3145,29 @@ $text['label-add']['sv-se'] = "Lägg Till";
 $text['label-add']['uk-ua'] = "Додати";
 $text['label-add']['tr-tr'] = "Ekle";
 
+$text['label-update']['en-us'] = "Update";
+$text['label-update']['en-gb'] = "Update";
+$text['label-update']['ar-eg'] = "";
+$text['label-update']['de-at'] = ""; //copied from de-de
+$text['label-update']['de-ch'] = ""; //copied from de-de
+$text['label-update']['de-de'] = "";
+$text['label-update']['el-gr'] = "";
+$text['label-update']['es-cl'] = "";
+$text['label-update']['es-mx'] = ""; //copied from es-cl
+$text['label-update']['fr-ca'] = ""; //copied from fr-fr
+$text['label-update']['fr-fr'] = "";
+$text['label-update']['he-il'] = "";
+$text['label-update']['it-it'] = "";
+$text['label-update']['nl-nl'] = "";
+$text['label-update']['pl-pl'] = "";
+$text['label-update']['pt-br'] = ""; //copied from pt-pt
+$text['label-update']['pt-pt'] = "";
+$text['label-update']['ro-ro'] = "";
+$text['label-update']['ru-ru'] = "";
+$text['label-update']['sv-se'] = "";
+$text['label-update']['uk-ua'] = "";
+$text['label-update']['tr-tr'] = "";
+
 $text['label-delete']['en-us'] = "Delete";
 $text['label-delete']['en-gb'] = "Delete";
 $text['label-delete']['ar-eg'] = "";
@@ -4142,8 +4249,8 @@ $text['label-uploaded']['de-ch'] = "Hochgeladen"; //copied from de-de
 $text['label-uploaded']['de-de'] = "Hochgeladen";
 $text['label-uploaded']['es-cl'] = "Subir";
 $text['label-uploaded']['es-mx'] = "Subir"; //copied from es-cl
-$text['label-uploaded']['fr-ca'] = "Envoyé"; //copied from fr-fr
-$text['label-uploaded']['fr-fr'] = "Envoyé";
+$text['label-uploaded']['fr-ca'] = "Envoyés"; //copied from fr-fr
+$text['label-uploaded']['fr-fr'] = "Envoyés";
 $text['label-uploaded']['he-il'] = "הוטען";
 $text['label-uploaded']['it-it'] = "Caricato";
 $text['label-uploaded']['nl-nl'] = "Opgestuurd";
diff --git a/resources/check_auth.php b/resources/check_auth.php
index 462b43abc9..745bba9322 100644
--- a/resources/check_auth.php
+++ b/resources/check_auth.php
@@ -74,6 +74,7 @@
 			if ($result["authorized"] === "true") {
 				//set the session variables
 					$_SESSION["domain_uuid"] = $result["domain_uuid"];
+					//$_SESSION["domain_name"] = $result["domain_name"];
 					$_SESSION["user_uuid"] = $result["user_uuid"];
 
 				//user session array
@@ -146,6 +147,7 @@
 				if (is_array($sql_where_or) && @sizeof($sql_where_or) != 0) {
 					$sql .= "and (".implode(' or ', $sql_where_or).") ";
 				}
+				$sql .= "and permission_assigned = 'true' ";
 				$parameters['domain_uuid'] = $_SESSION["domain_uuid"];
 				$database = new database;
 				$result = $database->select($sql, $parameters, 'all');
@@ -246,7 +248,7 @@
 								$_SESSION['user']['extension'][$x]['user_context'] = $row['user_context'];
 								$_SESSION['user']['extension'][$x]['description'] = $row['description'];
 
-								//set the user context
+								//set the context
 								$_SESSION['user']['user_context'] = $row["user_context"];
 								$_SESSION['user_context'] = $row["user_context"];
 							}
diff --git a/resources/classes/button.php b/resources/classes/button.php
index 8af56f1f05..c10ee3c017 100644
--- a/resources/classes/button.php
+++ b/resources/classes/button.php
@@ -59,7 +59,9 @@ if (!class_exists('button')) {
 				$button .= $array['onclick'] ? "onclick=".self::quote($array['onclick'])." " : null;
 				$button .= $array['onmouseover'] ? "onmouseenter=".self::quote($array['onmouseover'])." " : null;
  				$button .= $array['onmouseout'] ? "onmouseleave=".self::quote($array['onmouseout'])." " : null;
-				$button .= "class='btn btn-".($array['class'] ? $array['class'] : 'default')." ".($array['disabled'] ? 'disabled' : null)."' ";
+				//detect class addition (using + prefix)
+				$button_class = $array['class'] && $array['class'][0] == '+' ? 'default '.substr($array['class'], 1) : $array['class'];
+				$button .= "class='btn btn-".($button_class ? $button_class : 'default')." ".($array['disabled'] ? 'disabled' : null)."' ";
 				//ensure margin* styles are not applied to the button element when a link is defined
 				if (is_array($array['style']) && @sizeof($array['style']) != 0) {
 					foreach ($array['style'] as $property => $value) {
diff --git a/resources/classes/cache.php b/resources/classes/cache.php
index 84ecf6100b..dcd1655817 100644
--- a/resources/classes/cache.php
+++ b/resources/classes/cache.php
@@ -145,11 +145,13 @@ class cache {
 					event_socket_request($fp, $event);
 
 				//remove the local files
-					if (file_exists($_SESSION['cache']['location']['text'] . "/" . $key)) {
-						unlink($_SESSION['cache']['location']['text'] . "/" . $key);
-					}
-					if (file_exists($_SESSION['cache']['location']['text'] . "/" . $key . ".tmp")) {
-						unlink($_SESSION['cache']['location']['text'] . "/" . $key . ".tmp");
+					foreach (glob($_SESSION['cache']['location']['text'] . "/" . $key) as $file) {
+						if (file_exists($file)) {
+							unlink($file);
+						}
+						if (file_exists($file)) {
+							unlink($file . ".tmp");
+						}
 					}
 			}
 
diff --git a/resources/classes/database.php b/resources/classes/database.php
index 31fad75c1b..c711d9c4f2 100644
--- a/resources/classes/database.php
+++ b/resources/classes/database.php
@@ -62,7 +62,7 @@ include "root.php";
 			 * Called when the object is created
 			 */
 			public function __construct() {
-				if (!isset($this->domain_uuid)) {
+				if (!isset($this->domain_uuid) && isset($_SESSION['domain_uuid'])) {
 					$this->domain_uuid = $_SESSION['domain_uuid'];
 				}
 			}
@@ -1619,7 +1619,7 @@ include "root.php";
 			} //end function toggle
 
 
-			public function save($array) {
+			public function save($array, $transaction_save = true) {
 
 				//return the array
 					if (!is_array($array)) { echo "not an array"; return false; }
@@ -2248,7 +2248,7 @@ include "root.php";
 					$user_uuid = $_SESSION['user_uuid'];
 
 				//log the transaction results
-					if (file_exists($_SERVER["PROJECT_ROOT"]."/app/database_transactions/app_config.php")) {
+					if ($transaction_save && file_exists($_SERVER["PROJECT_ROOT"]."/app/database_transactions/app_config.php")) {
 						try {
 							$sql = "insert into v_database_transactions ";
 							$sql .= "(";
diff --git a/resources/classes/domains.php b/resources/classes/domains.php
index bbec08c196..40c34c1b0e 100644
--- a/resources/classes/domains.php
+++ b/resources/classes/domains.php
@@ -262,8 +262,6 @@ if (!class_exists('domains')) {
 
 										//clear the domains session array to update it
 											unset($_SESSION["domains"]);
-											unset($_SESSION["domain_uuid"]);
-											unset($_SESSION["domain_name"]);
 											unset($_SESSION['domain']);
 											unset($_SESSION['switch']);
 
@@ -873,6 +871,9 @@ if (!class_exists('domains')) {
 						$sql .= "default_setting_subcategory, ";
 						$sql .= "default_setting_name, ";
 						$sql .= "default_setting_value, ";
+						if ($row['default_setting_order']) {
+							$sql .= "default_setting_order, ";
+						}
 						$sql .= "default_setting_enabled, ";
 						$sql .= "default_setting_description ";
 						$sql .= ") values \n";
@@ -882,6 +883,9 @@ if (!class_exists('domains')) {
 						$sql .= "'".check_str($row['default_setting_subcategory'])."', ";
 						$sql .= "'".check_str($row['default_setting_name'])."', ";
 						$sql .= "'".check_str($row['default_setting_value'])."', ";
+						if ($row['default_setting_order']) {
+							$sql .= "'".check_str($row['default_setting_order'])."', ";
+						}
 						$sql .= "'".check_str($row['default_setting_enabled'])."', ";
 						$sql .= "'".check_str($row['default_setting_description'])."' ";
 						$sql .= ");";
diff --git a/resources/classes/file.php b/resources/classes/file.php
index 6072c16cf5..52c244bff0 100644
--- a/resources/classes/file.php
+++ b/resources/classes/file.php
@@ -65,15 +65,25 @@ class file {
 	/**
 	 * Get the sounds list of search as a relative path without the rate
 	 */
-	public function sounds() {
-		$dir = $_SESSION['switch']['sounds']['dir'].'/en/us/callie';
+	public function sounds($language = 'en', $dialect = 'us', $voice = 'callie') {
+		//set default values
+		if (!isset($language)) { $language = 'en'; }
+		if (!isset($dialect)) { $dialect = 'us'; }
+		if (!isset($voice)) { $voice = 'callie'; }
+
+		//set the variables
+		$dir = $_SESSION['switch']['sounds']['dir'].'/'.$language.'/'.$dialect.'/'.$voice;
 		$rate = '8000';
 		$files = $this->glob($dir.'/*/'.$rate, true);
+		
+		//loop through the languages
 		foreach($files as $file) {
 			$file = substr($file, strlen($dir)+1);
 			$file = str_replace("/".$rate, "", $file);
 			$array[] = $file;
 		}
+
+		//return the list of sounds
 		return $array;
 	}
 
diff --git a/resources/classes/schema.php b/resources/classes/schema.php
index 4c29d6fc2a..a10a6be5f1 100644
--- a/resources/classes/schema.php
+++ b/resources/classes/schema.php
@@ -34,6 +34,7 @@ if (!class_exists('schema')) {
 			public $apps;
 			public $db_type;
 			public $result;
+			public $data_types;
 
 		//class constructor
 			public function __construct() {
@@ -49,7 +50,12 @@ if (!class_exists('schema')) {
 				$config_list = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/*/*/app_config.php");
 				$x=0;
 				foreach ($config_list as &$config_path) {
-					include($config_path);
+					try {
+					    include($config_path);
+					}
+					catch (Exception $e) {
+					    //echo 'Caught exception: ',  $e->getMessage(), "\n";
+					}
 					$x++;
 				}
 				$this->apps = $apps;
@@ -381,7 +387,7 @@ if (!class_exists('schema')) {
 									$field_count++;
 								}
 							}
-							$sql .= ");\n\n";
+							$sql .= ");\n";
 							return $sql;
 						}
 					}
@@ -452,7 +458,7 @@ if (!class_exists('schema')) {
 									$field_count++;
 								}
 							}
-							$sql .= " FROM tmp_".$table.";\n\n";
+							$sql .= " FROM tmp_".$table.";\n";
 							return $sql;
 						}
 					}
@@ -463,8 +469,9 @@ if (!class_exists('schema')) {
 			public function schema ($format = '') {
  
  				//set the global variable
-					global $db, $upgrade_data_types, $text,$output_format;
-					if ($format=='') $format = $output_format;
+					global $db, $text, $output_format;
+
+					if ($format == '') $format = $output_format;
 
 				//get the db variables
 					require_once "resources/classes/config.php";
@@ -519,7 +526,12 @@ if (!class_exists('schema')) {
 					$config_list = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/*/*/app_config.php");
 					$x=0;
 					foreach ($config_list as &$config_path) {
-						include($config_path);
+						try {
+							include($config_path);
+						}
+						catch (Exception $e) {
+						    //echo 'Caught exception: ',  $e->getMessage(), "\n";
+						}
 						$x++;
 					}
 
@@ -665,7 +677,7 @@ if (!class_exists('schema')) {
 
 												//change the data type if it has been changed
 													//if the data type in the app db array is different than the type in the database then change the data type
-													if ($upgrade_data_types) {
+													if ($this->data_types) {
 														$db_field_type = $this->db_column_data_type ($db_type, $db_name, $table_name, $field_name);
 														$field_type_array = explode("(", $field_type);
 														$field_type = $field_type_array[0];
@@ -677,40 +689,24 @@ if (!class_exists('schema')) {
 																	$sql_update .= "AS uuid);\n";
 																}
 																else {
-																	if ($db_field_type == "integer" && strtolower($field_type) == "serial") {
-																		//field type has not changed
-																	}
-																	else if ($db_field_type == "timestamp without time zone" && strtolower($field_type) == "timestamp") {
-																		//field type has not changed
-																	}
-																	else if ($db_field_type == "timestamp without time zone" && strtolower($field_type) == "datetime") {
-																		//field type has not changed
-																	}
-																	else if ($db_field_type == "timestamp with time zone" && strtolower($field_type) == "timestamptz") {
-																		//field type has not changed
-																	}
-																	else if ($db_field_type == "integer" && strtolower($field_type) == "numeric") {
-																		//field type has not changed
-																	}
-																	else if ($db_field_type == "character" && strtolower($field_type) == "char") {
-																		//field type has not changed
-																	}
+																	//field type has not changed
+																	if ($db_field_type == "integer" && strtolower($field_type) == "serial") { }
+																	else if ($db_field_type == "timestamp without time zone" && strtolower($field_type) == "timestamp") { }
+																	else if ($db_field_type == "timestamp without time zone" && strtolower($field_type) == "datetime") { }
+																	else if ($db_field_type == "timestamp with time zone" && strtolower($field_type) == "timestamptz") { }
+																	else if ($db_field_type == "integer" && strtolower($field_type) == "numeric") { }
+																	else if ($db_field_type == "character" && strtolower($field_type) == "char") { }
+																	//field type has changed
 																	else {
 																		switch ($field_type) {
+																			case 'numeric':	$using = $field_name."::numeric"; break;
 																			case 'timestamp':
-																			case 'datetime':
-																				$sql_update .= "ALTER TABLE ".$table_name." ALTER COLUMN ".$field_name." TYPE ".$field_type." USING ".$field_name."::timestamp without time zone;\n";
-																				break;
-																			case 'timestamptz':
-																				$sql_update .= "ALTER TABLE ".$table_name." ALTER COLUMN ".$field_name." TYPE ".$field_type." USING ".$field_name."::timestamp with time zone;\n";
-																				break;
-																			case 'boolean':
-																				$sql_update .= "ALTER TABLE ".$table_name." ALTER COLUMN ".$field_name." TYPE ".$field_type." USING ".$field_name."::boolean;\n";
-																				break;
-																			default:
-																				//$sql_update .= "-- $db_type, $db_name, $table_name, $field_name ".db_column_data_type ($db_type, $db_name, $table_name, $field_name)."<br>";
-																				$sql_update .= "ALTER TABLE ".$table_name." ALTER COLUMN ".$field_name." TYPE ".$field_type.";\n";
+																			case 'datetime': $using = $field_name."::timestamp without time zone"; break;
+																			case 'timestamptz': $using = $field_name."::timestamp with time zone"; break;
+																			case 'boolean': $using = $field_name."::boolean"; break;
+																			default: unset($using);
 																		}
+																		$sql_update .= "ALTER TABLE ".$table_name." ALTER COLUMN ".$field_name." TYPE ".$field_type." ".($using ? "USING ".$using : null).";\n";
 																	}
 																}
 															}
@@ -896,11 +892,11 @@ if (!class_exists('schema')) {
 									try {
 										$this->db->query(trim($sql));
 										if ($format == "text") {
-											$response .= "	$sql\n";
+											$response .= "	$sql;\n";
 										}
 									}
 									catch (PDOException $error) {
-										$response .= "	error: " . $error->getMessage() . "	sql: $sql<br/>";
+										$response .= "	error: " . $error->getMessage() . "	sql: $sql\n";
 									}
 								}
 							}
diff --git a/resources/footer.php b/resources/footer.php
index dfe6bb571d..c75cb1e0b1 100644
--- a/resources/footer.php
+++ b/resources/footer.php
@@ -72,7 +72,7 @@
 	$view = new template();
 	$view->engine = 'smarty';
 	$view->template_dir = $_SERVER['DOCUMENT_ROOT'].PROJECT_PATH.'/themes/'.$_SESSION['domain']['template']['name'].'/';
-	$view->cache_dir = $_SESSION['server']['temp']['dir'];
+	$view->cache_dir = $_SESSION['server']['temp']['dir'] ?: sys_get_temp_dir();
 	$view->init();
 
 //add multi-lingual support
diff --git a/resources/functions.php b/resources/functions.php
index 9203a49788..0ed1240d45 100644
--- a/resources/functions.php
+++ b/resources/functions.php
@@ -51,7 +51,7 @@
 				}
 			}
 			if ($db_type == "pgsql") {
-				$string = pg_escape_string($string);
+				$string = str_replace("'","''",$string);
 			}
 			if ($db_type == "mysql") {
 				if(function_exists('mysql_real_escape_string')){
@@ -393,7 +393,7 @@
 		//html table header order by
 		function th_order_by($field_name, $column_title, $order_by, $order, $app_uuid = '', $css = '', $http_get_params = '', $description = '') {
 			global $text;
-			if (is_uuid($app_uuid) > 0) { $app_uuid = "&app_uuid=".$app_uuid; }	// accomodate need to pass app_uuid where necessary (inbound/outbound routes lists)
+			if (is_uuid($app_uuid) > 0) { $app_uuid = "&app_uuid=".urlencode($app_uuid); }	// accomodate need to pass app_uuid where necessary (inbound/outbound routes lists)
 
 			$field_name = preg_replace("#[^a-zA-Z0-9_]#", "", $field_name);
 			$field_value = preg_replace("#[^a-zA-Z0-9_]#", "", $field_value);
@@ -438,13 +438,19 @@
 			if (strlen($order_by) == 0) {
 				$order = 'asc';
 			}
-			if ($order == "asc") {
-				$description .= $text['label-order'].': '.$text['label-ascending'];
-				$html .= "<a href='?order_by=".urlencode($field_name)."&order=desc".urlencode($app_uuid).$sanitized_parameters."' title=\"".escape($description)."\">".escape($column_title)."</a>";
+			if ($order_by == $field_name) {
+				if ($order == "asc") {
+					$description .= $text['label-order'].' '.$text['label-descending'];
+					$html .= "<a href='?order_by=".urlencode($field_name)."&order=desc".$app_uuid.$sanitized_parameters."' title=\"".escape($description)."\">".escape($column_title)."</a>";
+				}
+				else {
+					$description .= $text['label-order'].' '.$text['label-ascending'];
+					$html .= "<a href='?order_by=".urlencode($field_name)."&order=asc".$app_uuid.$sanitized_parameters."' title=\"".escape($description)."\">".escape($column_title)."</a>";
+				}
 			}
 			else {
-				$description .= $text['label-order'].': '.$text['label-descending'];
-				$html .= "<a href='?order_by=".urlencode($field_name)."&order=asc".urlencode($app_uuid).$sanitized_parameters."' title=\"".escape($description)."\">".escape($column_title)."</a>";
+				$description .= $text['label-order'].' '.$text['label-ascending'];
+				$html .= "<a href='?order_by=".urlencode($field_name)."&order=asc".$app_uuid.$sanitized_parameters."' title=\"".escape($description)."\">".escape($column_title)."</a>";
 			}
 			$html .= "</th>";
 			return $html;
@@ -1405,45 +1411,33 @@ function number_pad($number,$n) {
 
 			if (!is_array($eml_recipients)) { // must be a single or delimited recipient address(s)
 				$eml_recipients = str_replace(' ', '', $eml_recipients);
-				if (substr_count(',', $eml_recipients)) { $delim = ','; }
-				if (substr_count(';', $eml_recipients)) { $delim = ';'; }
-				if ($delim) { $eml_recipients = explode($delim, $eml_recipients); } // delimiter found, convert to array of addresses
+				$eml_recipients = str_replace(array(';',','), ' ', $eml_recipients);
+				$eml_recipients = explode(' ', $eml_recipients); // convert to array of addresses
 			}
-
-			if (is_array($eml_recipients)) { // check if multiple recipients
-				foreach ($eml_recipients as $eml_recipient) {
-					if (is_array($eml_recipient)) { // check if each recipient has multiple fields
-						if ($eml_recipient["address"] != '' && preg_match($regexp, $eml_recipient["address"]) == 1) { // check if valid address
-							switch ($eml_recipient["delivery"]) {
-								case "cc" :		$mail -> AddCC($eml_recipient["address"], ($eml_recipient["name"]) ? $eml_recipient["name"] : $eml_recipient["address"]);			break;
-								case "bcc" :	$mail -> AddBCC($eml_recipient["address"], ($eml_recipient["name"]) ? $eml_recipient["name"] : $eml_recipient["address"]);			break;
-								default :		$mail -> AddAddress($eml_recipient["address"], ($eml_recipient["name"]) ? $eml_recipient["name"] : $eml_recipient["address"]);
-							}
-							$address_found = true;
+			foreach ($eml_recipients as $eml_recipient) {
+				if (is_array($eml_recipient)) { // check if each recipient has multiple fields
+					if ($eml_recipient["address"] != '' && preg_match($regexp, $eml_recipient["address"]) == 1) { // check if valid address
+						switch ($eml_recipient["delivery"]) {
+							case "cc" :		$mail -> AddCC($eml_recipient["address"], ($eml_recipient["name"]) ? $eml_recipient["name"] : $eml_recipient["address"]);			break;
+							case "bcc" :	$mail -> AddBCC($eml_recipient["address"], ($eml_recipient["name"]) ? $eml_recipient["name"] : $eml_recipient["address"]);			break;
+							default :		$mail -> AddAddress($eml_recipient["address"], ($eml_recipient["name"]) ? $eml_recipient["name"] : $eml_recipient["address"]);
 						}
-					}
-					else if ($eml_recipient != '' && preg_match($regexp, $eml_recipient) == 1) { // check if recipient value is simply (only) an address
-						$mail -> AddAddress($eml_recipient);
 						$address_found = true;
 					}
 				}
-
-				if (!$address_found) {
-					$eml_error = "No valid e-mail address provided.";
-					return false;
-				}
-
-			}
-			else { // just a single e-mail address found, not an array of addresses
-				if ($eml_recipients != '' && preg_match($regexp, $eml_recipients) == 1) { // check if email syntax is valid
-					$mail -> AddAddress($eml_recipients);
-				}
-				else {
-					$eml_error = "No valid e-mail address provided.";
-					return false;
+				else if ($eml_recipient != '' && preg_match($regexp, $eml_recipient) == 1) { // check if recipient value is simply (only) an address
+					$mail -> AddAddress($eml_recipient);
+					$address_found = true;
 				}
 			}
 
+			if (!$address_found) {
+				$eml_error = "No valid e-mail address provided.";
+				return false;
+			}
+
+
+
 			if (is_array($eml_attachments) && sizeof($eml_attachments) > 0) {
 				foreach ($eml_attachments as $attachment) {
 					$attachment['name'] = $attachment['name'] != '' ? $attachment['name'] : basename($attachment['value']);
@@ -2058,13 +2052,25 @@ function number_pad($number,$n) {
 //validate and format order by clause of select statement
 	if (!function_exists('order_by')) {
 		function order_by($col, $dir, $col_default = '', $dir_default = 'asc') {
+			$order_by = ' order by ';
 			$col = preg_replace('#[^a-zA-Z0-9-_.]#', '', $col);
 			$dir = strtolower($dir) == 'desc' ? 'desc' : 'asc';
 			if ($col != '') {
-				return ' order by '.$col.' '.$dir.' ';
+				return $order_by.$col.' '.$dir.' ';
 			}
-			else if ($col_default != '') {
-				return ' order by '.$col_default.' '.$dir_default.' ';
+			else if (is_array($col_default) || $col_default != '') {
+				if (is_array($col_default) && @sizeof($col_default) != 0) {
+					foreach ($col_default as $k => $column) {
+						$direction = (is_array($dir_default) && @sizeof($dir_default) != 0 && (strtolower($dir_default[$k]) == 'asc' || strtolower($dir_default[$k]) == 'desc')) ? $dir_default[$k] : 'asc';
+						$order_bys[] = $column.' '.$direction.' ';
+					}
+					if (is_array($order_bys) && @sizeof($order_bys) != 0) {
+						return $order_by.implode(', ', $order_bys);
+					}
+				}
+				else {
+					return $order_by.$col_default.' '.$dir_default.' ';
+				}
 			}
 		}
 	}
@@ -2135,19 +2141,29 @@ function number_pad($number,$n) {
 		function persistent_form_values($action, $array = null) {
 			switch ($action) {
 				case 'store':
+					// $array is expected to be an array of key / value pairs to store in the session
 					if (is_array($array) && @sizeof($array) != 0) {
-						$_SESSION[$_SERVER['PHP_SELF']] = $array;
+						$_SESSION['persistent'][$_SERVER['PHP_SELF']] = $array;
 					}
 					break;
 				case 'exists':
-					return is_array($_SESSION[$_SERVER['PHP_SELF']]) && @sizeof($_SESSION[$_SERVER['PHP_SELF']]) != 0 ? true : false;
+					return is_array($_SESSION['persistent'][$_SERVER['PHP_SELF']]) && @sizeof($_SESSION['persistent'][$_SERVER['PHP_SELF']]) != 0 ? true : false;
 					break;
 				case 'load':
-					if (is_array($_SESSION[$_SERVER['PHP_SELF']]) && @sizeof($_SESSION[$_SERVER['PHP_SELF']]) != 0) {
-						foreach ($_SESSION[$_SERVER['PHP_SELF']] as $key => $value) {
+					// $array is expected to be the name of the array to create containing the key / value pairs
+					if ($array && !is_array($array)) {
+						global $$array;
+					}
+					if (is_array($_SESSION['persistent'][$_SERVER['PHP_SELF']]) && @sizeof($_SESSION['persistent'][$_SERVER['PHP_SELF']]) != 0) {
+						foreach ($_SESSION['persistent'][$_SERVER['PHP_SELF']] as $key => $value) {
 							if ($key != 'XID' && $key != 'ACT' && $key != 'RET') {
-								global $$key;
-								$$key = $value;
+								if ($array && !is_array($array)) {
+									$$array[$key] = $value;
+								}
+								else {
+									global $$key;
+									$$key = $value;
+								}
 							}
 						}
 						global $unsaved;
@@ -2155,15 +2171,25 @@ function number_pad($number,$n) {
 					}
 					break;
 				case 'view':
-					if (is_array($_SESSION[$_SERVER['PHP_SELF']]) && @sizeof($_SESSION[$_SERVER['PHP_SELF']]) != 0) {
-						view_array($_SESSION[$_SERVER['PHP_SELF']], false);
+					if (is_array($_SESSION['persistent'][$_SERVER['PHP_SELF']]) && @sizeof($_SESSION['persistent'][$_SERVER['PHP_SELF']]) != 0) {
+						view_array($_SESSION['persistent'][$_SERVER['PHP_SELF']], false);
 					}
 					break;
 				case 'clear':
-					unset($_SESSION[$_SERVER['PHP_SELF']]);
+					unset($_SESSION['persistent'][$_SERVER['PHP_SELF']]);
 					break;
 			}
 		}
 	}
 
+//add alternative array_key_first for older verisons of PHP
+	if (!function_exists('array_key_first')) {
+	    function array_key_first(array $arr) {
+		foreach($arr as $key => $unused) {
+		    return $key;
+		}
+		return NULL;
+	    }
+	}
+
 ?>
diff --git a/resources/login.php b/resources/login.php
index d8c0b0019d..75aff2ade5 100644
--- a/resources/login.php
+++ b/resources/login.php
@@ -70,6 +70,7 @@
 
 			//see if email exists
 				$sql = "select ";
+				$sql .= "user_uuid, ";
 				$sql .= "username, ";
 				$sql .= "password, ";
 				$sql .= "domain_uuid ";
@@ -91,12 +92,40 @@
 
 							//generate reset link email and body variables
 								$domain_uuid = $result['domain_uuid'];
-								$domain_name = $_SESSION['domains'][$domain_uuid]['domain_name'];
+								if ($_SESSION['login']['password_reset_domain']['text'] != '') {
+									$domain_name = $_SESSION['login']['password_reset_domain']['text'];
+								}
+								else {
+									foreach ($_SESSION['domains'] as $uuid => $domain) {
+										if (strtolower($domain['domain_name']) == strtolower($_SERVER['HTTP_HOST'])) {
+											$domain_name = $_SERVER['HTTP_HOST'];
+											break;
+										}
+									}
+									$domain_name = $domain_name ? $domain_name : $_SESSION['domains'][$domain_uuid]['domain_name'];
+								}
 								$key = encrypt($_SESSION['login']['password_reset_key']['text'], $result['username'].'|'.$result['domain_uuid'].'|'.$result['password']);
 								$reset_link = "https://".$domain_name.PROJECT_PATH."/login.php?action=define&key=".urlencode($key);
-								$reset_button = email_button(strtoupper($text['label-reset_password']), $reset_link, '#2e82d0', '#fff');
+								$reset_button = email_button(strtoupper($text['label-reset_password']), $reset_link, ($_SESSION['theme']['button_background_color_email']['text'] ? $_SESSION['theme']['button_background_color_email']['text'] : '#2e82d0'), ($_SESSION['theme']['button_text_color_email']['text'] ? $_SESSION['theme']['button_text_color_email']['text'] : '#ffffff'));
 								$logo_full = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAPoAAABGCAYAAADl5IkzAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NjAzQjkyMEYxMzA5MTFFNEJCMEVBNTk1RkYzM0FEMjciIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NjAzQjkyMTAxMzA5MTFFNEJCMEVBNTk1RkYzM0FEMjciPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo2MDNCOTIwRDEzMDkxMUU0QkIwRUE1OTVGRjMzQUQyNyIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo2MDNCOTIwRTEzMDkxMUU0QkIwRUE1OTVGRjMzQUQyNyIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PufA528AAFJVSURBVHja7H0HnBRV8n/15Lg5B9hdwpKDkiQJBlA5Eczp7sR05sN0Zw5n+OmZw5m9UzFgVowICh4gIhmJy7I5787O7OTY8//Wm55lWBZEz/Pu703zaWZ2Zvr169fvW/WtelXVUjQapd62t99+mw5lO+200w72tZTwPkr/3k36hc6T3JLbz7YdKs5+Avb22TQ/N9i2b98upaSkdAO8qKhI/ingwwBIh3Ch0YMIkgMdnxQEye1/bvs5gC41NDSo+I1er5eys7PFh+3t7fK2bduiB5I8PYAsxfe8vDy1RqNRDR06VKt8p+pxqKxSqSRZlqPr168Pd3R0hJ1OZ1yYRBOB3EMQ9BQCScAntyTQD0GbCu0NkEsMcP4sEAhEV69eLR8E1ALM0Pjq4cOHGw0GgxF/G9RqtRG7GQC24tUiSRLvJuxqBehxsMswNbj9CPYwwO4vLi524TN3OBzm3YPPPOiHz263e3HekAJouQf4o0nQJ7ck0A8R5EzRGeSJ2rsXzamCltfk5OSYzGZzqlarzQSYs7FnAdi5eM3Bawb2NACbwZ6GPQXvDfH+4b0AuuJPiMaBjr/9kUikC69dALgLeyf2duxtmZmZraWlpfzeHgqFHB6Px4k+egB+uQfwk2BPbkmg9wS4YocTgxyUOQrwyL2BG9TbZLFY0gFsBnUewFsASt5X2UvxWTE+s2A3RtxuQ3tVFfna2sjNu8NBQZeLIoEARYJBikYiFOfmKq2WNHo9aUwm0mK3pKeTMTeXzAUFlFtaGlVJkg/gdjPYoeFbsNdAGNRDyNRnZWU14+9WAL/NZrN17dmzxw8GEgUrkdFf1ZAhQxJt+CTwk9v/rkaHRjwQENT9+vUzpKenp0HL5wHg/QDogdj5tT/+7o/XnIjPJ9WuXk0Na9dS265dZKupIV97O/kB7JDPR2HsQYBbDodJBsDjqwKJ/DuqUpGkVpNFo6FMAF8NwJPZTJA+kgTmkF5WZiodOTKncMSIYVkjR5LZag2jvSYAfDeAXgXg7zEajbtzc3NrmAGkpqba29ra/BBakR+w7ZNbcvv/cpN+4vJaos2tHjRoUArAkqfT6foB5MMB6CEA9iD8PTDo81laNm+m6q++op3LllHLzp0kA8zRUEiAGLSc1AAs7wTwavGqYiDjc7xh3i4ALiV42gBO8ZkRgiAd73UQCjgXaVnb43gWErDTyYv2261WShs4kAaMH08FkyZR+ogRlJmW1smgx74dv1vn9/vXgZ1UAegOxSxIgj25/SLbf+vyWhzgqoKCAn1+fn4WNGMf1tgA+BiAbTxrcr/Nlr7j00+pdsUKqli+nJorKoQGNhoMpAcg1UYjaSwWAs3uBrUAdswg3/c10ROnAJ3b4m9lAJu9bTpuB5+puX1odj00vDE1lYwpKaTDubx1dWT76CP6JwaVz23p1y8je9as8cOmTRufnpMzA/b7xwD9wpEjR1ZDiDjRlzAofQCUPpQEfXL7n6LubMOC3qoyMjKAn5RMALs/gD0K+2F4Px6vJdsXL1ZtXbSIqr75hppgxxO0tgmAs2Rmkh6alsEswB2jEmInaGWo6ARRIsWkSQ+tToowiFN4SVG9QewmtCO0PLfD79FmCPRf4/eTFsBOB30vzMigSRACrq4uam9ooJoFC+jDW2+lnNNPLzzujjtOhw3vBqWvhNDy4TxOXGN9Tk5OHa7ZoXjvk4BPbr96oEtdXV2avn37prMjzWQyTQSwgRvzUZFAIG3tK6/QmpdeogaAm21trV5PKWlppGI6DnBqAbwwQCcD+BJ2BrdaFdPCWrVG2NwsAKIMaABVmBORMIUje8HLbanRrhZg1YAVRBLoPL+P8HEMdrQdYecdzhMBhQ+BwqthKnjtdmEaWPr3p9yJE2kYKH3zhg305V13U+SWW1JwTTO1Ot1p6E9xKBxaD0q/Vq1Wr8L1bkhPT2+y2+1u9tgnwZ7cftVAh9Y247UUmu63APgcZ2trwZLnnqOVTz1FHaDGTJF1AKIlK4v0AGwYGjUA0EcBMq1OS6k5uZTety9Zc3PIkp9PhuwcMkMYpIDCq40GUuF4/BCIDZHsD1DI6aIut5v8Djt5mprJ29ZKflsndeJcDH6m6bJC6+NAjyhaXXjpWbgw2Nmxx3/jcwZ90OEgNSi/IT2dDKD2Um4ue/HDUjhcIDlaMmoeO59Sj/r9mJSJp7IpMg6mxaug9Z87HI5qhUAkt+T2qwS6WC6DlrVCuw21WCxnrnr++Yz37rqLOpqaKAtgMYMWMw1ngIWdTuEIS8vOpmHHHEO5hx9OOUMGU/aAAZRZXBzVZGT2bD+2OJ7gFJT22uf7hLGGQburli+Xvrj5ZiFEVBAs4QSgh6HBGdwaAJm1OTvl+DUCYSNYAFgFe/Y1Hg8ZsLOW7+JIvhiL0ETCPnKu+5LsK74ky6gnqOCCvx5uGjDO53Q6K3HdbW63O3665JbcfpUaXQ0QcaRaXwbEtx98QA0AeT7sbwao3+UUFNwKwI+aO4fKTziBSiZPJlN2TjTaw63fC6ClHuDeTxDEj1FDqJTPmUMrH3hA8nZ0CKDzNwHsWvbOQ2sHAWDZ6yUT+qKF1mdmIcCOVzWEQJjX5tmMAFtwVVezYy7eB7Xsw3WYBX0h16a15Nm+itIHHdEHfeM1f2Y0To7yS9L35Parpe6grxqAXQfQSUUFBbQOH/qhYTNBw/uPP4oOP+VkGnX66RAD2m5wM/Ck2NYNaIfTT502p2Tr9FJbm5u6uvzkcgcoLEdJUkkJwkCitFQDlQ/IkcaMLhZtckPehgbJb7PF7Hlli4e6RQHmDmhuc3k5dVZUUCEYhrawUGh5LXah4Rnk/AqB0Pn991R44myK+f5UqmBnI3EMntqkF+fXpOUITY/rSOHrT7AUklty+1UCnem4HAwGfZFIJABqbC2Cdj3qkkvosDPPiOaOGMkx6NEQECFFIpIqtokoum1bG6Wd25qporKD6psd1AGA2xx+cnugYdUSGSwG4WSTI7Ct8S8oS2Rz+sjX5SW7w0eeLg+t//qP0sihBULr1yxdSoGWFmFfy4n8HqB2gc6XX345HQWzYsOiRbTlj38ko9Uq2o9Auwt7nbU6NH4YQG/fXUmDB/QXQgT9VYdbd5FKxwE5Eqm0OlKZUtgcCGAP+/3+pBZPbr96oEdhn4P1BtoBpj2TL700a9r8P1J6/wFBAJ8FAGeUqbTYOC59xVfb6ZMPvpeqatsBGBXpDTqypFooLdNCpQNzSWfQCi97KCyTNyiT2x+igDdIQfzdGYpSpstHsicEwdBFoWAa5eenUZwW1K5cSUHY2bxkF1HUKwOetbYLDGLkBRcIrl88Zoy0Q6MRVF144hWNzjt/BsObWvB+2vCRIg5HrVZrQx3b0V+18N6T0UzarBKCJnfj+lxerzeeIJPcktuvD+hDhw6V2traJJ/P58HebLfbt2YWF2cYDIYcKDoNa0KSNMbNG6vp/bc3SCuX7aCCwlQaOaYfnTxuDECtIZ1OC01N5PGHyYfdD2B7/EFyh2Tyh6MU8AQA+gh1BqHRAyGK+gIUxHd7Gl10w+WTKDfTLPriqaulJmh0PbQ5r6+r45QdwOwCcIvGjaPMkhLx2+ply8gFO74A1F144KHNdQx4xWZ3NjaSr29fSklPZTAL+yLcuAF2v5ZkKG+1VkOajDwKRCIC6BBoAuhJ+zy5/Wo1ul6vlx0OhxeK0sGx4Xj1QXlr6mo7jIs/3aJa/tVWcjtDdPSxw+ieh04nk1lLIYDFCzB7fGFy+SLkC4QpADAHg3gPoLuBfL/MJkEYmjxCdoA8xHZ6KEzusES7bCHK65tJV5w3rrsf37/8CjmbGslUWCS87VHlAgBGnN9JZTNndvsUbBs2iGU+9hOI5BjY7gx2NV55haBlxQoqHjM2HoarCns7Kdq5hyRodO6YyqAnTRbOY2t3cQqsQh6SIE9uv16gs30OrcfY8kGTa81mS/97/vKOaeOGaupTnEW/v3AqDR/eF/QZgIUN7nFDcweC0NxhaG6ZfAB3EN8FgmEBeA9rcoAaX1MUn3cFZAJjF6Bz4bMmn0TtriA99+eplGbRiz546+to23PPki49Q4TAxr1igs/D3k7Jz6fS446L9Rd7x6pVlAr7nNfW40ttQqvzWjte6+obaMRVV/E5RSEL/54VUjTiA1Hg0NwwaVOySK1R4bAwp8D6kkBPbr96oHO+ucKSZWhyq98XNL3+8jJ64bUraMSIPuTpCpPd7gbeQqDeADY0uT8Q6QY5a/KQAHkINjmoOlrCxxAMoNBAe0iBT0dEBc2upj1tTjptRjnNmzu8uw+rbryR/HYH6bKzhcddpaCOaTmntJbPnk15w4aJ37Zu2kTtW7ZQGqg5a3S23xnkGuz8nr32bbDfc4+cLoQL+xdCNSuV0NtYvJ0mrz+bBDgsyAkwcY2+XxGNHzne3UUvkiZAcvuvArqSbx5f6+alJkpLs8ijDx+okmQNOTuDZGt3UyDEkWcyeaHJAwC51x/pBnmwW5PDBsf0Znudvexu2ObBCEe0RakxDJD7YVs3OmlIeQ49e8tReyn7U09R5QcfkDEtnSIazT4oY1rOGW/lJ53U/fu6jz8mNce7Y9dw7Htco3PGHD7jpbecIUPImmqNSux4Y/u87mvRoEiwgWFg6DtUOOKw21wul5NlSnp6unrAgAEpGo0mlavh4DMD0/4DZQB22xExP2KE8+TxWyfsfefq1as9nAefBPzPu/VSoqw3Ydu99Rz/XmoVHnIbBzj2UEqb9TxPb4VQov9WoCeeyOv1+kDjXaFw2DVoUGHq+jU1VJCfBlBzBJosNHZAaHIAnal6iCl7GNode4QXzyTQdZns4OdVrU6q7/BDm4OuQ5N7wxzfHqURg3Jo0V1HUYoulrPWtOJr+u6OO0ijN4hAFnbAhZUOqRjMXi9lDx1Kw845p7ujW998k6wpKRThUFyAWw2qL7zuDHRo9araWup/7bUi3E+AvH07ReyVMftcuNyiZCgdw0B3QKN34Lq93G5paWmeXq8fajQap3J+PT4yEXWTC/qBm8gVcWycFuvxeFbj+N1sdCTNgZ8P4EOHDlWPGTOGS5Sx99YEgarqDTS45bi1oYDf7/ctXbrUa7fbu82y/v3769LS0sxow4L7peMV48TjlaVYfglgbgRaW1s98ZJlUASqgQMHchUlEx+bcC6PGxt+F+zFoct1FtXFxcUGzC0L5ir3W83nYCsUpqMPu1en0wWUMm3RfzfQZafT6cZE7cBuHz6iJPW9d9bSzBNGABAx+ztG16G9xd+y+NznC1OrM0QNHR7a2eQiJ7R8HwiHocMKaVauiXIyzGQ1aknPy3B6DR05IofMBjFGZNu4nr783e9FoowpJyeW0Ra/cxy2yuD1+2n0xRd3d3I7QO6oqqLCzEwuKhfT5qxO8crHeFpbyYW/844+Ni4lpdDOj6SoywHb38yePSKdgXR9RsOs8LfhJnVSDP68ejjQZDKdVVdf97sG2PgHiebbX0pGuQENjRo1ciZu2n3oSzvfyHhm3MG0zAG0xU/6/SFosB9s+1/p10/p4yH2FRhR82pQP4zvELwvwGcW2re4qFiN5RJkXGfQarW2AZz1AHzdnj17uBoRZ2cWQpAP43Rr3N90vu89tKqsCG03fmdHG40FBQX1AL0X507FzgVWShXGx6ajG23VoT87Ro4cWbt582Z7PDmKrwfn15SUlORxv7mGA1djwmFcSzGAY21cNwFt7QH2GhXF8G/X6DIA7sUFtft8vqYB5fklthY3NTQ6KAJNzM421uw+AJxpfBiUvd3mpeVbmsmH4T1sZDHdNnsYTRmVRwU51kMyb+s++ZRaa2oplePRlcw28cqJKwC5F7Z2n7Fjxdp5fFv/7LPQzFoKcVpsjC8Lbc7x71GAnSvaZIw+jIrLSmIBfLye3/ClIluh0cM+0uUPI21GFgUaGtpwzTZuBlLXihs/xGKxnHrHbXfS7h0NlJufTSKpVvphkLOjcvv2LbRg4Yv548aOOxZao6qsrGxLSkpKCDeZC4AwtQ+APPg5D56lN0+G7du3q/A9ayouoqlHH3QxpaKK4vcilmf9+vXeqqqqONGRioqKNNBuBkxEo0pRPxzoBKXiV7RKd6zRuHHjuDAnMxOhvbDxf9ywnzVWe3t7aPny5ZFe6KmKNdjw4cNNmNg67Go+uMe5QtRLIQ9ug7XY6NGjTQAl91GjgIJ9Ij5cj4+vJ/GcRxxxhKgMDK3Hvxfn42tDP4M2m41JFyw4TRku+XSNJM0LORyp+1VVQffE/NFoZLXZHNKbTI2RYHATALYW92IN7rUf7Y8EG7wyYLMNY/anCPPEuG0WKbKk08m6lJQumIYVOGYbhEUNzp+r02pnh93uEp6fYp6iC5aioiaNx7MQ7z8BK9xUXV3dpdQuVPfp06eA07x5XuGYE8OdnQbOshTZmmp1VG+1/tPhcDyG37J+8v9Up/AhB8wokwNjEeDJ31pSmhXNzrVKtbUdlJ+XQT5vEJo8Sn4GOSa1Hxr+0zX1dPWF4+h3J42I/oDN0+s25OKLaPsrr1DnnioyMXC5tBQGEIKG/E4n8RL+xDvv3OtPeO01qlu7llSg7UFOgWVVzE44Jckl5HZTa3sHDTrh+O4A+kjbVlWk+isisAkewijMD9Pgo5jys1BrxQQSQMdk4AKWfRlofK9Hjx5FRX0KIeTkQ7oWvmibrSMWjqvVDobmOBNAGYfJEVU0RCfGdRf+rgG1b8VnTPUEaMEiMjAZ+uK4cnxfiD4YebUAux3H7MBv90CrtDGmCwsLcwCeYv6dUniTaaQM8HVA+7QAYI3QDg2VlZXuAQMGpOJ3fSBIhuCVNaCBccrt4to5N39PfX09axKvUgmFNZAafUpDW7noTz7az+NCn1y5V6G2rIk6IcBacnJymqGRWgHajjht5d+A3hpw/TzBy5gl4dhM5dhOnLeCz4s/m3GMLz58EByW1NTUYvyejynjIqIkQijkTvx+N8bMzcVPNAbDKYsuuCDVX1lJGSUlUjzNWTQCQRZlM85gUMkWiyYnI6N/3pQp/Qcee+x0tPcZzrEbgmLSnq++GvYZWOLAqVOFksDxUqK/JcK2oNGo1qSmZuUWFWWVnXrqxJTc3Ap8p1395psl/4RZePiRRwpl4/d4SJeXVzD3uecu4/RpCHh27H7P9zwvL8+K8402m81nOyorT1o8fz6lZWSQxmgkf10dbayrk/787bdHYlw+xpzfSv9CCPaP0ujYg5BcTN1bcnP1rpKy/JStmxopc5pF2OWsuXkVjkHu4iUzScUg7y4ZxeNUD9t8R10XVbT6qMnppy4c5PJDQOA3Me+7imaPzqZ5k4tIn5NHx774PH0852RyNjeTCu2ZQeELRx9OBrz2mzOb+kyf3i2JNr38MgUDAbIq+eoRRaNHldRVL4SDPy+PDjvj7LjgkYLbF5Lswfc6kyDoUehFQ9l4boft6WaAwq5cO2u9VMERcQPxOTnsZvohR1x8iwm/AMZBxUIjH5NyLrerVLjlwQkCFFs7OjoewoRgye1TLotBzTUAzoDUP4cr5YoCHLHzcmRiE94/lJ+fvxsAt+J3hwG4R+D9MKVsNttBDF4/tF8jgMR59iugHWvxmQngOReTbYbyW0kBXAi/rezs7HwYbXE/BAsYMWJEBgDMNQCHoP0RXHhEASozDZarrETDim3ZgnNtxDVtLC8v3wwBtGvTpk0dCsfOwHHjISzOwziMVSr+suzFIcEt+P4NvF8OAbFHccloWFvimMkQENcAlPnsGI4fg/7vxPsv8Fl+IBRKyQRQDr/nHsqaODFWtix+j+IZlvjMA2bXsmoVbfvb36jivfcyj3/mmdNw3l3Y0zgD88jjjqNxL7xAMudVxGlZ7AKFAxiMgRw7dlDlsmX0xfnn09ibbx5YOnly16iTTw52LlqkG3/ZZZQ9ebIIzf783HNp1YIFhvFnnXUK8FMLe7wNArQzNzeXTcGZOotl9rK//IWm//a3VPb73wsmsBZ/56amkspi2eVpakKXfT9lleenOeN40DHBO3HSOmi61uEjilPeeGMVjRpfSh7cDo5qY9ruDUOrY85YrTq66r6vqLAgVdpS30W7mtxk90ZFZFxTN6njLBLs7AiLxm7rB9+2UE66nmYNzaacKdNo1qJFVLngNcqaNJEKZ/yGTLnp+z3VwQ6t316xW0hDtuXjobGcvsppsyquH1dbS32uu470OjXTxKikVqtCW/8Gbc5Xh89CPlKnZZCu7xhyer3NuClN7AhRAKnhBJe40HI4ushkNnYLsVAwRC4whljue3QfAcDvQ6EgNTXUx5052nnzztOuXPEtxsjKTj9eszd+9dXSSZjM3wC8VbzayN1nYDOwMJlPvPbaa7Jef+0tgvYW5+lyOoyrvlmRajZb5mCCVmPSDIQwOHbZsmWq119/nbZs3grpAUaj1lBeQU7KrBNOyDnnnLNHQysfid8vY4cUgDbjzjvvyHn15TfIkmIlLpsP7Whc8OrLhw0ZMuQY/IZB5ABFz8Bx4wH8Y9CXY7Radclnn31Bn372CW37fht12rtEWLNer6WBgwbQscfMyPnNibNGQIOdjPY+wTUsHTVq1EqAvRXXVAQhMQ0U9tizzz4XbNAvav2ppKhxwWuvTBkwYGCUa/P379+/C8yDx4EzpYpw7hlfffXVgHnnzaOsrFxRYMTv9Rjvf+C+8ccce6yMOelUqdUaHhv7nj0UxVzgnAamwZJS4Yi/ixkeKio88UTKhzDY+Nxz9Onll+tnPf54P85t4KCqrtZWsq9fT367PVYZiY/HMXFzjwWGrk8fOuzSS6nPxo205JJLyPrRR5b0Pn28I6++WrP0mmtU026/XdRZGA6gfwbmOXjGjL643ydCWNVj/Gtxvybhfh239sUXpXQwz+yRI8m2Zg21rlhBu8FMT1m8OAqJsBuYa23jDLB/wXH7Y2vGcby7GwBoZBCMm1gy4KUFK6ihzUNmkz5mp4djgTAc7TaiJI2+g40e2NxCOo2KXAAT7gNpjVrKsGqBaYnCALmsUQNnGEQoN/5M9sl06kuVtOkaI5XnWyh30mSxH2xL7VNK6SWl5GhpEVI3rATOiDBZ0PYgQNhhMtPJF19K8Uy44LonJBkTNMomahDnhfmhGzIRNnppNNjQIICu2EUCn3uRKzEYxM4ytqvLSXtqttOYMaNIpzOwagaLiIoknTjQw0ENHT1zEsEWZDopb9r8PQ0eOILycvME0D/8+H1ofD8Z9cYSzpaL3xscyx7kYnQ3bU9lDRXklND4w8cBFGp66bUXye3xUkZG5kiAYKQ/4Cs+ac5J9N03m2ncmAk0bNDhilkqEUx/evrxV+ieu/9KDz/y1/K5c+fmsq8FbZsrdldQnz4DqaykRPR56dKl1MFpwCoVO5WKYVfy0uIETMozMDmPfOGFF+mxRx4Dq/HTqOGHUZ/CgdSvRBtjTrhkj9tDD/zfk3TdNTfQeeefa4WAOtNqTRmCfhSASaxkRxnaLWNTxucO0rjDJ5PFaqJNW76nP//pRlr8xedTodmbwTa4f98y0AHqTBzTpw0ADAc0NGHMFFEteBf6XgsByiaEgC8AybkQPmhsLgcunLGcB1FVFVuK5RLhRUWkgYD1QBiwACg7+mhas2AB7V650lA6YYLMsVsAuOTG9yHcY74ud309uZuaxAoO7GZK7d+fVAYDOdE+VyEee9pp9OVNN6nPevNNXfHYscGKWbMM255+mgaedRZ7/2gYBMrya66hua++OgFAb4ewrMT1HWtvayvZ+eCDNB0KqGPbNsFAvoWQnvbii+Rsb9+G+7ABzIorF/tob9nEf7tG5xP5ITkbMUnqi0uKfNmZKca6mg4qG5gPkOPLoAzNHhbLaq5ghApzTNCqErWHJTLjaC90cRDwk6KxenBqjVoMNgOdYHNz0lvQIJHfJdOoR7fRpxeW0/QBaQlrfOtg7H5OUmALpCpM2YyLSMo+l9RaifoePZ1qVq4QTjfYUQKhDHQdbnRTWzuNuuHPlJqdwXZdVMXafPNDrMjFr1hCC9rebyIFfD727tRAkrbEaauU4GKPqmRB3a1WswBRQ10DjRwxkt5++90IbwxktnX3dch1q3h+q7NyeWqMAU8CNEhmi570Wh1/ycsrxriMwmRm5xvbv2qLxQzNp6ZwJEy8+mIymshg0HO7ZlxO2gnH/YbsHV76zawTRREOGV0QzkKcQwdNO27cGGpr76B5v7uYdAt1aTNmzOB+SinWFGojdyyOAP+4FBhPaGxcunsQQD4UlP30ltamERdeeAlt2biTpk85hlLTLeI8QgOEw93XikkMoXc4RcKj6d03P6F333mPHnz4gRGzTpjFBQqKICBdGLds7pNOrxNj4AcIhw0dQp9++ik98cSTdOmll8zAte+GkKln5xWPCY7VazBGXLFI2N4yTxmMnUmYUGw66NFrie1qD0w9TVqa0MINoNfNXV2UA0EWRD/d0NRFoMVZhx0mfDf8nIBM/N3yySfqsiOO0LBpxgD3ANzMAFwQGlvRRub48YL8haHld61cSQNAzblSEd9aLjqqBpUHMNWwuV1H33yzeuHUqVrrl19SCsdsFBZScPVq+v799y2DTzxxGgTzCIxT2YfnnUeD0C4HcXHEZ8U771DJ2WdT/rBhjtra2g12u30D5lpTgiPuF9HofKIAblQ79j0Ae9u0o4f1Xfj+esotyRFe9yBoOWeh2Rnwip+qHXPAJ5bJJXIx0DEwQaZBvOPiZA6C0fDfahH1pmaKlYab3xakc96qoT3XjyIjW5qe70jaMT52ycJe4t6AWQLovA075Uza8Oxz5IVU1Gm1FED7BkwIzptn23zclX+MU2cpuPYhKdxSS7LKAKmPPgQhgqyppB9wDLSftxnXV40BtilAV+/jWIPM93o95PX4hOXhhVYNhUM82cM4tsvtdrMfwyV0v2L24ivOnNECMDmZmZnF/CEkNWm0GiEYmYZyRVyWQZjEcbtdwufMAMSSPwOis9NO9k6HiElgjYbJwtejv//++1U7tu6haUceQ20QanxeO9iKzdZOWoAjKzMLQsHAsoUG9BtKl/zhMqpvqDULoQcm5XA6yNZhFecI+L1C4PITc6DFx4N+D6qqqhz0m9/MpZBfTVMnTcM99lNri0+wkQCXDeN8Arw3QLtx6W29EBYSjRo1mmqqa+ics35PT/7t0bxzzjnnZAgRdvRlaHV68vkC1GHrRN+04oKHDB5Gd95+F8068fj0vJz8WRAyO1paWjZg/IRjTSXYiQeAsmO8Q+Tscsalpyoe18jU2tvWRhqAkJVI6/btNPqFF6IDp0wJsC3UXFWlWzV/vkQbNpAhPz9W1xBj3wXhIHKscQ3s7PWAHTLQO6FpC2bMoGMefDCE+xFmv8qORYu02++4Q1U2fboQJixMrTCpmlatUg86/ngVqK9v8oMPar865xwazhWKIXSKBw+mtffeSwPnzMnRwSTb9PLLRnnzZtKdcILor2vXLuqEwJhzww3U0NCwxeFwfGez2SpwRU5liZd+KaDzBmHncWBCV2OvP2nusL6PP7OM3DYnaLhWpJ7aQ6CqykoYh7VyJjdjvkuW2HtEYQCagc22OQNd2NRcwhl/RzSg9Hy7IjjIKGPCqPeuhDq+joFcn0Bg/G3gWTtIMgymrCEDaMAJs+i7V14WEpbb5DpxLQ4HHXXrrZSakSYUqywHpeDmJ0lwtCi0KDor+2HLlhxBhv5j5M7GxlpcWx17mxXhti/Q0f9gyE++gEcUy/AFPdC02liNeqhWTHKx9MOrTQrYGbAMVomXTMRnOK6jo1OYMoFgAJNWFlpUlsM9V4W6mQQX1HR0OQQwuPPhcBCswoK5rNEu/vxLSk/PArg7xbg3NNZRRo6Fzjh7NrV3dtDrrywkszFDXLO9s41U2iDV19epi4qKuYAAOewOmA0m4V/wAeiwwTl11wKQjwOdL5h78mmCZZWXDwQraBPRjtDw6E87pWdaqXxQOY6xErQvNTY0g51YqbCgEOc0k8lsoaK8fnTZJVdSYVFB1tQpR6qZ+XAdfr6GTpgJRrMhZjpD6KjVZvz2cvr8889Hgd4el5+f78SYGOKj4fUB6GAmLFy5qq+U4AtRxVzxYulVjZ0LkHL5MDUrl2CQH+EVzisu1h12xRXW7847T+o/e3asRgHb+2grCBDz8iyHVXvQL27Lh891aIMzGGHO8ZyIDps7N23jffepXI2NpGF2xvMaLCDQ2Smxnc9KovCww9T9fvtbc8U//kF9p0wR9noaGMSKO+9UH/6nP1k3/u1v1Le8XKRMRyD0t69bR3PAHKDFq6AE1uCVvfM2xTEb+SVt9HjRVS/A3sDLESUlWWPGjCszbK91Ur+yLLIxyGGf81KYDZrSK8ovy9QJjsz54mHFDg9EEowBOWb3kklLosSLHFVWEjR03KAUMiq9jNpWk+RLCIFQKT7Z+kehpp4VHx1586205YP3xbIGF5yox80qxSBP/OPV7GiK2ebf3CuFm2ooatBTNAAWEY7RduPIudBmfofL5dqFa2s40ACzHev1ucnj8wqtxRTZ0WUDuOq1RoMpLRQKpsuxNVRBhmPCJSJCNbKzsz0sbSAPyO3rIqMHNr0/AFYROoQAHEmc1+XqEsFAPNFNRrPkdDp0VXuqQGEzyOmJ1exTa6O0Zs3qqA+oZZf1Gaedqp88eSplZ+XSNddfRjffehOFQ7KPKS+flqN8LSkWsVwYCuN4tagUpAYLSLvwgguourKBhg0ZQV1OOwRTiPZUVdCowwfTU889QLNO+A2DIBzzcanUFRU7pbvuvpfeePVtKu3bjyyWFGh6PQSBheZfOZ+2bN1s4YxAnUYj2IDT00URKdQt1bIzM+mLxV/T0888I80777wp7LzyserHhOBxC4R81MXHsO3tde3jjOYpwYyQQatlRxqEGNcfoJgpIitL/bIJ58C9Jj8AJnw47e0wAzPEkiwzqxB/h+MZ6AG0Zdx7b7pzqZgt8G84hwJSRAgGEzQ3WE4XgLoT5/JPuP32Ua9//rnUAc1t5rRo7NUvvUQ1y5dLmfy4MbThA5PgpxeN+ctfKLtfP3d9ff16aPMNmIP1vMyqzPLoL63RBX1HR5pxAyrRmcZ5Z4/td86V71JaYToFfbjoQJC4jKKb1EJDdEVYm2vIIzMolAATq4pSss2UmgKKB17O694OfO/twoEBJSAe3509IkfhEbhpre/HPGzMbFkgwFamkExS6CWKlj6EgbdgIAvpyOuvo/f+9KdY5RrQyKNuuY00UsxKlp21UmDdX0nWspMOtB1tyQEfSdB2lvHnk93lqoQQq4RE7lBoe68D7Pf7YMt7hI3Itvr2rbtAm49mra0S9rFSq16cU44Iiooz0VfLl5lGjRoJja4ht9sF6m1AW34ANyKYwsEYmgS7PBAG0AFmGbiKyLGitGyzuzxucTslFTQTBIfRpBHzkQNK2IMNaRxdsmSJgTVyRkamw9Zhb2PBEjMjMO7+mAARdfcwAVnbsqmxc/sO1Ssvv0aF+SXkdDvEeWvqq+m00+bQW2+9TZgHraCZ7WBAHEEYBZtJycnJy3v5pZdyxo4Zo54//1oqKigBnddTVlYGbd+5nR595DHt5VdcoeeH6UYiQXK5nWykdGtlZjapKal020230slz55Rgns3EeXaxicL94nnvQV9EeDVofKJ8lJQoSDdrcy5aCtAGoI3NmZkSzBz2dUQ9brd6wwMPSCkw51ygzHyTuioqKPP443mtPQK6rvFCo7sBfr75XgA9jeMyYAOhb6lM3Td88IEmUFtLftjeEtqXebkVvy+eMiUK07ER2ngLxr0R9nr69CefLPnwyCOpmFkrzIL03FxyVVaSql8/sWzsrKoi07hxdNj8+dTe2LgFdv5qUHaOj7AfbA7+u4EuYMfpm5CyNQD6nslT+/XrW5BC1RXtVJipIw/umSOigZKO4r1ETsYubkpZYQadOCGfjh6eRcP6pFEm6JpOqxbPaGAlHsJxnb4Q7Wj309f1bso0qWlKH2PsjNXPxwIAxYqrSlk7U8XogDtI0q6biIY+Ln46+frrqeLLZfTN4s/ojBtvpkHHHi0ccDxz/V9eTBGXHwLAStEgtDkERcTjJ+OkeWjb4HO2trI2r1HCDXutKsMTKxjxkRcCgjUM/80TsNPmEGymuza9gnReyw/LMccCa9vYWrJEHq+TjG49+ZkWyhFSqQ6u0WOyQwYgHSK3IF5ANzUlXU5LTVE3NzYDOFkCKFV7GujMM8+S3njj9VReRuMQzYkTJwZxz7pAr7/v6upq5KAV2MC5HIDj9WNiu42CfYVDDHRdFNekf+yJx9X4hPwwUwJBmBu2Dho5apgAOSZjTWNj41porx0cQciaEvY52H7aANBtsOMrypsaG7V/feABysosgOmhIq3aRM+/8CJdc+21RiMoLxMBv89BbNFExJKhnSzmVAhAPTW31tEf/nAJvffeeyPYSckFOlWqmBXlBANh2u9Bv/YLZeCoSWhXDYDOk4ufCrT0d78jXWqqLghAsjMtit0M+5wf6qmCYLPBvBs0cqTw4bBdzlSO25DZjwRlUbNkCb37299qJLdb4wVdd3JhUauVfG63OB9T+PzTTqOUrCxvR1XVbozv92CGeoxFdt+RI7NG33CDZd0dd1BuWRlB6pEBfXOj/Qj6YUMb5zz1FLk7O6va29u/YU87Pwz056Ds/wrQldVugtBz1QIUu7xe/+gLfzcu+/q7FlNuejG5/UxTMVig6w5ip1CILjixnF64ZlL0QFVg+X/OYzEDMMUpWprRz9ojo6aOJBft9cKppb1kjSf97ieIii4iSo2ltp7y0ss0ac03nNUWLyxJgfVPScEdS3DjoOnDGnRRRRGAlR3G1smXc805jg/YDWlcrwxy78sZytObnc5OimkYheqElbry0cSlNQ7a2euR1ut1sYvmgC3IEZu9je1yEeWn+gHqHh+7js5WcQzFIpj44sJTpk5Uv/HGQmrrgM2oiXmy33rrTdi5n6ruvff/jJdccomRs/G4BibaaQaoOGCG+Xkkdh8iot14dKzZbBLlu77++mvxd2dXB8XYeZTuv/8+XnVoaW5uXgVt/iU7ZpUQTe6gCd/t4r9ZUNxy260DXn7lFWpt5aUprRAku3bt5LgCyajXCWbENneQY4TkmB+Cr0Gtio3rhx9+SAsXLtSecsophezs1Om0Ij/Bhr5GFSd0z2GLKnxXxRpZ+H7U5Nm1i9xxIcvhpdCsrtZW8UARpxcmGEA76Pzzw5GY91M4Z1gI8GO/xOi0tFDzwoXihoqSwRBSLKCjACknVhmGDqVTX32Vx4UFng2CtV7Ed9jtawH28umg8A0YSxtscD3MBnZEC4EEATPpiScoq6TEi7Hcit+v5xUtZTx/tvJlqp94nByn77jJO7nu+UmzBlOf/FTaWuUQGWzsSfZ5AyTBngO3pKIsowhSUZaeumOtZY+N5K4mcPtG6FBMtPAB4vb7XhnrLcOPVb9fWXDwq2JiB3c2+t3emPeU3KzowNmzY5qcJVPHLpX/n9fHouUi7GnnsFh87vCQadQppC8ZCo3mrgTQKzGfHAejTHHABUMBaGV39+4PeoU3OhQJ4JKDYo/RazlBK8feR5QhiAOW6b30A7cj2uMYwRCCwtsfuu2227v7yppOjsZMAKfTRdCslJOTQ48++qiFI9tKSkom9enTp8xqtabFSoEl3tbYZjKZJYyFVFdXF+tvrJIWBICZZs6YyWHIDbjvnIm3CV9wJl61slfywysxN9awr8OgN/iOP/6E7jbi4Pz6639CSOoxPrF+BtgUCvroN7Nn0bRp07s/5+3iiy9mbW/mQCOYAIqYjfRUGN2bG5K7Eq810JYN0Jp1AHwTQM5rVBzPW4vv90CzV4KSbwFImb5Nf+wxMlmtIRECLMsSO2iqAMJ6HMt7IwDdhPvOx/N3dR6PaLceNn4FTC83tDQ/XATCjbPn9EpEoR1jUY+9neNPhlxwATEfr4VZwW1Wc3QdhNBE3B+Yb1z3oEFxAncpYSA/W2aj6l84lu+EGzeUacpWnVZlP2PucGpv7iKvN0x2P+eDR4W3k7Qq+nhtC6n2clMpULlKan1gLLU/chh1PDuROl6YQJ0vjSPny6PJ/dYE8i8+jUJbX9x7M9PLKTrgaoo6FQgGpb17SCN8eVSzluRVF++3ds3OWN9n5xCMDUxlC0AOjQeTIuLxYiS1ZJ14MZeiqgfQeYLuUWh7+EBZVL05zfgzjljLzc2j9PQMSktLp9TUNLFbrCliyclisQpbdd9l9YO3GxdUB8oSUJbfQgCvb/ny5SJDrreNl/JuvPFGGjBgAG3evHkQqPWs1NTUIZxQIvXSMOYqtHCbxP6DxG348OGiKg8HtPCz5/FRq2JLupSdhWQLBMEe/KaGWURZWel+7VfBLo09YHPfKQhzgj766CMyGA3dn3FgEhgJFLFGjz73dkP210LKNAko+sCloIf3TmVnJ0xuWhpd8uabNOzssz2Yx82C4SjCON6GX5kQzoQ23MoeUKzJnWvW0N+GDWOzIBt9HFZUVMS5AzLem5RcBcuKe+8VgAsm7J0wE5bdeScvk6ZBiJqysrI0CrbknxPoP9VG7/a+Axh10AxbIN1HXXDOYWP/sXAD7WmwUVpWCqn1GuHsSsXr+i0t9OXGRmnaiDzFt9ZE7g3rSAOGruFaj2BqYHbEYQ/MzCPSGlKp36FoVwXpJt0fO+vIu0mufIOkrhaoHIwFh3HzEpnMnm2t0Bjy2udBgXNIP/HueLEMyf3JxRSs3EAyLx+FDfgdQB4MQ5uDco04kYyjjo02NzZW4EZvgxZqU+6f/GMGZOrUqfTVV191P/C1u5i91F2rXmy8PMOBH7Is9+JTl3oG1wgw7I3Hk3pjFxIA5Ya9XD969OiCxsamrAugORgsvW28/DVlyhQOTMk96qijDPGVgd48/GKloMfGAku5rgD65laWIEMQivEKPCEFGw4eeiUhqDcB1atg6+pysZAJP/boY5o//OEP3Z8vWLCAmYkWwlTqLWEoceNagWz4mZXveKQPnzEj9gguDC0HyKSUllLRtGnU/5hjyOV0ttbW1m7nzLnCwsLhasgbY0KOK0+GsiFDaOBJJ4GhBsUTfhpWrqSaCsxN5Rz82uBy0ZfXX0/H//3vwzMzM8dDMFnxOoaB//n8+bRn+3bK6KFdeaC+gO0+ZO5cS2pp6SgIxnIOFGppafFSQkWi/xTQ42DnTCU7wFEBwG8uKUkrn3fOmJTr71lC4ZQwqXVqEVyi0cri6p75tJKOGlXAGihqPfyUaGdxPykCBapS4wZAE/G6N6nZKQVqquEa7H6SV/6VpL4nk7ZoPEkM1DEvUujjWRhwdvFCI0RVIngkNiKYUCovhb+5h+RAkLRH3C4Fvn2U/AB/RMt03SSCYyJhCRZCgCIqI6VMv4q8bncz9x9Ar0ywjX4cNeJYABixYAWdaKdFKT8VVQAvKwEzGtz0fEjt0khkfxBJMb+DKnEu4HfxB2JIvQGDQ22DoaADtt0uaL4mTNSR77//fvbSpUs1d999N63EhOxtO+mkuaDfHo7Ci/TubQ2BlaRyTOk+psIeDhuFGoaG4swrXaLXIrFbMBH0+J6z40xNTU37tS/i9XsRdhR7Mq584YUXyq+88opq1apV3V+dd9550j333HNIk1qnvMrK+3MXL+ZlL56vnMnHjyDgRBFHTXV1I3v0MX41UFiZGOr+IpJQOV6lSLK+EybQ9Dvv5CSiMMdIcOzCkquvVi9//HER1sG/5bjlikWL6Kiurjy0NY0zAzmvoH7VKv3XMA2sSl+iijY3KO3zhPt43jy6YP36UZgnx+IcNQD7GrAwN/2HbfR9tDo6xOGi32Owdl5z8QQaVJZJPncg5hnGoGlxQ816Nb2zspYqm1yxmAZJilqPvppgzlI4oKZwiG1mftVg54qtZgDfAs2LEyy9pFu9agaeQKox11LIS2LtOcwOtbAK7/HKx8opFIam9337AHW9MJI8K+7E32grbIl9H1KhbZkirphtbhl1DC8RbUP/N0NgNcU9nQcvmrD/sHEACZsmaGdPQ0PDElDTd2pqat6CjfsWtMU7+Pvt5ubmpRx7wFT7QFpOrVZzeSq1EqQTD7IROdu9CgcVJ5LodaB9Kmhbzv5yAPB2MAwPGEYIO02aNGl/IIcC9Nhjj/MSu643H6Df549mZmbJ+fl5+3ze2NhIu3fv5ii7wrS0tP4QXKz4NJxSq+Sqi6jj3Nzc/haLZRD6lMJ96LmNHz9eedR1D1MlKpyZMpcXf/bZZ/f5dseOHXTdddcdIAl4Xx9KXFrGU744go/HBfdmI9r5GPtbfE/q6+vfxT1aBEb0Lca9kcMspARpq0pY8mDhwMwJ97ESc6VzxqOPRlPUMReHWonjcsKW79y1i+9JOcey64zG/p+cd54AilYRPGajkUadfLJgCpLCPHZs2EDf3HcfzDvLdBYSMK1KlUOk/zTQKUE4dWGC7wTQNwWCYccdV08nr9MPMIZJCmOPyKTjdVJfkO5+czMpxRDkjJmXR7UFh1HY7QP4QKcBwkhQJQAfCWEPGCisNlOgchN5P7+m+5bqpz5IUr/jKdTJKYdcs50j4NQxgREEmAHqsJxKoY5GCAIOAsEe1gqQs08p4mZnlZkyT76TuhyOagiqdej7bsUMC/6w9j5QeIEIdeU11G8xHt9AgPwTE2MZ2l+GScbhjGvwPXtUwykp+9uaEAjszMmCFijDJGEFYYTm6w/NyM9+0/emGTnkFJMqFZp8DOz0aRAKAzG2KTARnLzGPW7cONfXX38dPieh1FZ8++ab1ZISwbffdx6PqJ5F48aN3e+7G264gSfkYNDSE8rLy6cOHTq0D86dyvvgwYPzcc4p+G4WfjP673//B9cd3Od4joXHRBYZfT0tpLhLAsD0Dxw4MHz77bf3btsnLEX27D5nwmnikjJ+d2Jhuh3t7e0r0cYHEMLvMcBbW1u/gnDkDjZAKHk4iDH+zIDEXVJuOqdpe73eJi4PxeOWUlAQ8+QrWl04e2PefSPay1px8820h9fJld/wN9MeeohOf/ddKhs+XFB3raLdl9x4I7kbG7MwbicA7IfDzk+Pn/6/AejM6zyYzNXQVt/jdcsZc0fQSTPLqbO1CxctC6BrcUN5+ezdZTW0vcEpxeoAyNH0k26jkMsP8IViIBc7g57rvQHsQSPJMODdKx4h77qXu8FuOvFtWFIDKGz3iWqyMSHBwoGXzFhQ6CgCsLPjjdsTgoTb9skU7HRQ2qxrSJNT7AP4NoJqb+abFw95/aESSL1SaKU2ASaZz2QycZmoOsULXavsdbjxnCTTwTnbffv23a+NhQvfIBzbF9R+1vDhw8+GJj4rLy9vLrT1MGhSDYC5z++zs3NIr9NG0G5qS0t73/nz56fgWPVzzz2rRzvMFDlkswvX5r7vvvvk3oJ+evgB9qYpwtLgYmcXXnThfse999579NDDD6shjI4GoC9CHy8uLS09F0A/CwC+KCMj43J8d+KOHTvT/vCHi/Zrm9fGA2IL7r8GHmOqXLasBXOp8Q7Yr4MHD0kQshrhwFNJ6gNPaqUceKJmjsZiG+xgRbz0t0PZK5R7w/fLBSEZiT8rMFGjC4ERK0oaBYvJys7OLsT4pmDSU1d9fYziK+dkwPIDRjjYyFZRYfznvfcKyq5RqOKQsWNpzCWXsK/Gd8yTT4qaURHlOBZ7n5x7Lq9sjMJ+DO7lUAhxw38D0Lttddbq/BQXDt0DcOrumD9ZRL25HB6SmdaGI2RRR8nT5qRH3tosxcsOpYyfHbVMOJtCdhs0sizAzRo6tsfoeCSaIuzqrkVXkr/6m5gENZrJfOYSilqgGexu8Vuxh9T7viptxYRAFFreRoayCZQx5yYO+NiB/q7D6y7FmXpItvmBvO5igoCsgNaGFKHhVZyz7LR1Y5K5gB1RnmrixIn7tfHww4/T2rXrzbBvpwJAl+NGX4eJNRft9bnssstp76pkbJs+fbqwZ0HBjf37l9JTTz0lPn/66WdJrdEaAbZcaAf2+BqWLv1qv05nc4kuUiKO9zMjZOFzmDljZnTChCP2+/56UOg///kGDUA3Dee5GPuf0Neb8Ho5tNHM119/LWPCuHGxAKJEbavWgBH8mZ8TEGSg93QwMoh5anCGZFtb2/e4P40LFryyz3RTCaCrDng/oj2AGrf9uao32IRHAXa7skLgVnxi4cR2ugUFr7nzePhFzjxHA5UAhAMd27ZlfDB7tsRaTity6SUB2Iy8PM4rZ+FrWDJvngjs1SkTiwE/45lneBmXc0W6CidODE286qruSceg37FqFa1je95qPQb7kf369ev7c1B4zb+KcqXIHV8jL0/UYVKuw14ydFCf7D9dMsF484Nfg17qSA+qxZlaBr2KXvpoF10wc5A0bnCmWFfPPesetW/bSgo77KROTY9ltKmjIuRTVoMRqHTYs0lytJHtpVMo46IlZCwaRrqsvtGU3y+RbM8eQxGvj6Iqo9CsjAf2xMsRtXgvwlz5bzeEDkhU1il3Uigc7OAUQHbCgU63HZptTt2JFzFmoVKmnhxP6+wGfDyKX2lPjBEmtw+SvBU3uvrUU08d8Ntzf98dxsqtud1dNG36NDr9tFMNA8vL8w0Q5ryOvXjxYtjFFQn2aKyLs2efJIDe0tLSw7NeRSOGD1effeaZpj4lfWnnzl30JLRHzw3CRo5lhO0v8JWUfQ6H9S1YsMDCy3I9/UIPPPBXevPNN2nGsTNSB5YPTOVHb9XV1RMH2axfv67XsXv88ccJwoAr0MgidqAHSGNLbuIJO+28osNe/pEjR2befPMthnvuuVusBLCwSDyu5xKdVqHuIoyXi3rsvS8y7lNYwV04YaVAlSgwmKaLnFf2o+D86RASDUuW0JtHHqnlYqQhl4s6KyvJj7Gz6PWxoqU4DzdSeswxfF5p3aOPqqvXrqV42BefdMott1D60KEcy74dQHeA/Qw+9rHHymo++ojaqqtJr/x2BSh82Zw52dasrOMwZ6qUAhwt/0qUnIZ+ni2u1XFvHDsA9NWgNkU3XTltzOdfVtLKTU2Uq00TwWxWgL3d4adbn18rLX1sFseFR3S5feXMk29WNT1/FUU1QVKZ9OD1LLWjFMEgqgToOW89l8JtrdT25EzKvuJzMhUNJ33BkKh5xv9JnQsvA/+xdoM8GonF1Yv3DHLYTeFOJ+zya8g65pgIpwEC6N8p6+aug62bx5fpogo/j9trkjIpWfvtE+XX+8MdxBgB5E0ul2sn6O3YO+68Lf3WW29R2lfHQmsDfnr11Vd7dThxbEvcAz5o0FA688zTYQ4GQhdffJH+oYce3EcQ7NixnW69/bYeINIQp8kzjTWbrXT++fPYpxBmJ3ov3nzOwvJzzH9BQX7hhx9+kHpSQu38mM6TAexaeuHF5w9CGPeuEN1440108R8uDmHM7cwyZE5+6qbgcQEWwxwA6cJY7eAlOgiGwrvvvuvwDz9cRFu3bhEhxXHB2oNRiTHnpBaN8tp9U2Jev4OWY4om1IYTyS0xhkaSxUL+jg4Rl96dbsVLeFzNiKvNcOJLOEyQdDQd9nfQ7VZ9C1AbFKHjx3clI0bQlLvuoubm5oqmpqbl7BhEd+3ASeqMF1/MfOOo2HMMTDify+ejldD0sz/8cCzu7wyAvTk3N9fV2trq+qlA/zmoe7zCp9DqXE8ON3JTR0fHt9Dw9U/fewKlmzXktnvF41nU4RClm7T05fJKeuLNTcIZxLZ65vEXRdOOPp8itk7Y0RFhc4cVb7qg38Izb6CIOocCbe3U8uhJ5K7eJEqW+nZ9R6GQUXHGqWO2fUQdc+qxN94PGgq73DRoEuWddz9T9grs3wDo27i4oELd5B9aPusGs7x33Xsv9VQlTiTVAaIJg7A7mzGBd2J8Nt9yy810/IzjlEkWjhV9UOtF+KfExTmw83v+TMPho8q6tlZjoL///QWOTnNy7jsHy/zlzrsTqK1mvzY0aiXmQDGKn3nmaZE/HwsPVu3nvRZJM5EI+152NTY2bpwxY4ZryZKllJuT1305sfPoxGucKKsAMbXEn2n3ifn46/0PEMAaAfvY1d7eXgGm4AmLtfR9PeeSqEei4tRbzqdoxm/Xg8Kv4hWRp576W3eEnZxQlDMasz2kRImqJPN33ww5ZqOL8rk/oLDYeUSKE4lUvHPZKGhus8kkPObsTNQZDGI+iGKlTOuZli9YIGoaLj7zTAFWXs7gIihM3Y9+7jkCHho4lh3zbg3uG2eorcE82NgXJtiEq6+OlVngFSq8bFkEofb3vxPMuBlQnKNhZhUoiln6jwE9Aeysbpy4oCpOmsdFrRs4INt3/43Hks/pxe4jKRAmvRwiKG26/ek1VNXkUilUTS667HEyDhxDEU4m8HEJIJXwpsvCW67Y4Bzwosshf5uNGh85lapvPoLsKxYSD0+425mnOPS4PBTsctntIo0xlfIvfYIzzjpYCGECrwd9avihKLiECDVefw0KOhuO0W0O0+QwV0HNgsG4VogcJKqJ12/ZG76T840xPtsXfbKILrv0yu72OHyWX9kc4D3+Wew8UTps1Bha9c0KGjFieCcAuB7M5DsAYdett91MN910q2Jzh5U2ImKP95M/1wCYzz33PJ111pkhFhQMKl566rkcHhK172Q3xmgnzrMcdPOfEyaMt23esomuuOwqYp0ZO0+s3Xi+MSfARKJ7Q3BnzjieVq9eTVf98UoP2lgDU2QZa2qMpSMEYRIMBvcJv+Xae4owCkFrOwH2JgBjHSd6TJx4RPC6a6+PjXckuI82ZwcnMxBezQk5nYJe+pTkFGGAA4xcjomXNg+kFfn+cqlqLvMsjgdIfR6PSFzh3e/1ikw43rkSMT/Xg6v69psyhU5eupTKTzklsvaBB2jDZ58JNHLBU55cR9x0E+WNGcNLc+y/WscBMbEIXftGzINv2Rcx6Z57qKhfP0Et42sRn19wAXXt3JnJdepxXZn/CgP/uah7otbice3ERW1FB3P58coXnjt20vfbWunxZ1eQuiiDdEYdmaFF2pvsdOmdS+iL505RxQCikovmv6iqvvNEijjtJBlyYzRZ6uXOmFIp7Ia95KgjSZ/BT0uL5bRHlfLvgnpxnrmPIgEv5Vz0IBn6Dg7U1tZ+y8tfnC+sOOCCh3JdHGwRz9CChlV4Y3zlIyxCW0FM2FHd1dtk6uHLqMYkXsPFFNhuf+TRB4dccunFxoVvLKRPP/2MamvrRf24aCRWAiotNVWshZ922uk09+TZImsMgFkP7fgdL6OhjTous3zHHbeOPOXkOYZnn32ePvtssaj7xokonA5aUlJMs0G9L7zwfA4z7QDo6nhdGNppqFql1u/PYNgkifADBCohkBr4gRN478zKyjr80ccfLr32umu077z7Ln3y0Se0dds28ri9IgPPaNBTn9K+dMJxx9GcuXMIwoH7W1tdXb0JE3o1xr0yMzMznyPAmLoboB35mX1xU4Cr4XB9e4DWiTFinHbiOraazeZizKW8++6/dwyXm9q+Y++SnU6rZ4HBT0NphgbMG3HZZZbCsWNF2W/OWGJBwJ5wGwYM53UdgL1F+JycUJI5ZMjYWTfcQGoOt+3hQ5DiNddZs+fmUsagQWIP+P1ero/PlXV+c/PNXL1VVKfRgQUMvfxywrVvZOXHMRuKI5DTh/kpxetxTC4ofO7MV1/NaVi8mCR+4i9XRursJH97O+nz8qy4Pk3ChIv+R4GeOJkxoLw8sl6r1WZiT334rhnDtu1soi9XVlFOQbrIIEq3aGjp0p30lydXSLdePlmsrRuKy6nw8mdUDQ+dG0sBtWTEJHz84Q0JXlRIC4ChR05+NIEJsja0t1D2addS5ozzZGg/1gwrMPE2KaHOh+qA4wAOXqaqxw1b8/gTj0y+9767RTioyIqD/c9lmpzOrl2gmBzV5DnAZBJxBwCQHX3YhjGSefmLaWl2dlb/W269uejue+7ics4qt9sjnklnMhpE/DoLGvyuHYBhtsTe6A24FhZWnI1Wj2P4+fVtRcVF5Y8/8WgRJo/J5/OLvnGlWR5LnMvFy6DYtrHjFPfFwDmlf7nrzoHX/+m67kw81vAQBh7Y399z27wExTQIAHTxMiSOHWqxWPpcdtklBVdf/Ud+jJDGBdYkQzClWC18n/hhHz70l2u61+P325X+cm1yfp4dvnJtLS0rHVpZWZGrrFaIaDymxxgbZluNbDrw73HeNvyezcFcXFf6xk3r+9lsdmGng99TWkqKp6m5iYOeKtFfV+7UqWMLjjuO21UrD5TwtrS1sTbdhjGy0f6FHKK4lxzV2Iw2N1BmZvawW27hPABdT2ApkcyiJiBXrOH7V1Nd7ea8fwjNlNJ58/KUB20wKPncvqaWlgooFzY/NuH3zXEWyW1zVB6n9jIWs8rKxg+9/voC5YEW7KgOerzeWgjajaxlWIjE05z/0xo9DvZQLEjIXY3JswYXwo/KSX/16dMLjz7peaqqd1Bappn0uJ4Uo4ru/9tKGto/U3XyzMEiiSNl9FHRvHn3SW0LbiV1Rg4knKX3NSAx8BGi3mqrY5zDDdsoZexxlPu7u6mluXkLQPo1JhFrwQZlWSV0iA85ZKcXPz5rd1NT01IApxODngcyb1BoPWxvD3vTN3GaKwuF3oCeIAi9PHlxk8Eo/RzJVoeJ0A8TpQ/2HIxZCiaLlp1LDrsMdhjy4vxcZpuzmzhegcNda5XcjDDeM9Nw4rUebZbzchzayeY67xx263DYQ5iULpyrhVNKMeEreMIDrOkAohdY5xrtubgeLkTJms1VVbWHH4qwkSv+KkLRDiHh4Xp6mLD8oIO+HB2Hnc/DD54UEZ2dnZyhGXQFlLr4XGQT7exO6C9/H0Zb33HWKTTZIH5oJQs31uS4R+ysXMd1DriIpMK4nPiskh9zxPwc/R6C8c+KRFQa7mttXW0Vr6Bw37BX4LdVGMM85Qk0HH7MzKQa/dnKQTO9AJ2TdII4Xwuun9vhZ6ptxvlSlTLfiYJaAJ3vOXYvsxy+XrbsMA4Wnus8HsoTdUTdBmZcGO8daHcX7a3/Jtgvr/hwVCabDVxRBmORr/SbGZVga/jNNn5wCvrzH/e6H8gLj/G37+ALx8Cn9enTZ+aCZ09PnXPGS2TrcFFampnMXJQvEKLL//QxDeqXrRrSP4sHUc44+ncqORSUbO/cR7p+hwHsZpHjvr93uOe1S2K5JdRcQbqcEiq48gVy2e3VmEAroRG+4aKPP2bNXAEn3xQProULYoYBlFoMejqXEVQmqJ+derghdZyxxWWS6AAVO5X2lMRaNh39YsmNJTsmbw72TK7VxtpEPB8J9Jo1Ej/w0R97FhzTPrsyYeIPeeBHEvmwd7CjETQ3D2PO7XCxBm1MqUUY6OJxWooDkuuacf87GVT8UAV+EIPyW37iKz+LrJofwUV7n/nFDyZ0KWWwvwfIs7BncvIGzmNQgqAYAOyUtfP50E4n7c1uExE6ACILxy38dBUcu0Wp2qLm59Arzxur4Xx5tM0aUzgAeKLjuM147cJYbVf6yxpbsEem3Nj5PGpc+05+EEOsTJbEF8Qa14b3NvYNHODesG3WiTHcjmtp4+KVOJ6XtjV7syBjW8x/LASwT5nncVONHwvFj6gyK9jivvswhja+LvSrK+74TVCIrEC4DgJH2rGASuMHWij3nhWCg80mtOnA9f3kApHSgZ40ojyC51CAcKDjpXisPzpZnJubO5lTIwsLC49cvmyX8ezfvSYe35QCzc4LuR1dPhrYL4e+eP8iyssyReLPLe/45FnJ9v7DZBg2BXZRCoAd3mc5RgA9upevc4mmYCMYrd9DRde/TmFrZivs0S9gnn0KoK+nWFql9xApe+K1qJWYBouyG5VYiPgyqU8Bb3xCH9TBp7SpSsjBMCbsugR7TFYmkl/pd+LkiiQ4VTVKuDUfb1Jetd3Gb0wzxoN44qWDtUqotVX5vTrhtx7lWjy0Nze/t/4aEnJI4rHA8f7GfWF+ZYzi9da0Sh9TlPPrlbZDCePopr0VVuIrXvHxtyYcE78ujzIupPQnPobRhP7Es0MjB3jYpFo5zqC0r01YSYn28EXJCdcaZ29q5Rh1wliGlXMHep5bOaeUcO/ie3wsQ8px8WPDieuVB8LeLwr0hAvhgUuDdC7NzMycXFBQcDzAPvHDDzYbLrjodQFyc4pRXG+73UPjxpTQp+9fFLWYdRGlfpjK9sU/VJ3vPkTGMTNIa82CYg91r6FwPfaYpgfIuaJqw04KtVRR0fy/UzS3zMYeY9CwxewIgnRsVCZv5Mc+lzxhIsTDmhNDqaMJNz3+NCg6lHMk3GxVj3bVvUyq+C73bD9BcKgS+pj42OD4pAsnrAokXk/i0k0k4beCMvUyOVU9wsF7jkViX+UENpN4vDbhminhOuPn7QmKnuMvHQBwUsK1U8L1yrT/Y4sPdC+kg6xKRfdZKtjXMyT1WK8/6Lnjz7TrEbErJbSbePw+SyP/NUBPiDpiKZXOj4bNzs6ekpeXN6OoqOiID97bqLv0D6+Jp7GaUgwiqq2t00NTJw+kd969KGo1acQk4yoojn++rer44CEyjz6WdJlFFA2H9gKdH1Sg0VOgZTf5d62ngsv+RqrCckdDQ8M/ock/b29vXwPKVqeAPPhjQd5jIlAvQTHRxNef0n4vbfc2sX7so4ilg7WR8Ftpv7C7Q7iWXo4/5P4e5NwHPPaHrq0XwUeHOm4/MI4HWk4+pGN/4Lf7R0YdWLD8KOz90kCPSyoGu3h+dVZW1iRo9pnQ7OM/+3CT/qJ5L5PHHaC0DIu4IpvNTWPGltFbH10azcmyiKefsGfXs/Vrdfs/biL90CPI2G+sUpCNV+U05KtaR74dq6nwsqeJCgc6oMlXAuSLAfJvcXi9Etf8k0Ge3JLbv2M7VJz9q0BX/bsvRAFWvLoPO2iq2CnW3Ny8BGD89rjZI/2vvnUR5cJWt3HR/UCIMq16Wru2guZOf1iqqbJpWKPzArVp6NRQ4Z9fpXBDBXk3LRGFKDSZBeTf8x35K9dT4RXPMMjtaHcFqPpS9rAD5A1x51sS5Mntf3VT/RInSQC7CKYB2PcA7Cubmpq+AL3+Zsr0cs+ir+bT8P4F1Obu5PImlG3Q09YdNXTSkQ/Q11/u0GixMdhVmX2CRTe8JautaeT48hVyLH6ewu31VDz/JYrklLWjva+hyZdw5BkX5lNAzppcTt7u5JYE+i8Mdi4eCK27AmD/rL6+fkXfsizbZ2tupONnjKZGfzt5Al6yGLS0p7mRTj/hIXrmscW8bKLnMkAhUvlyz38wkj55LmlT0qnwjy+S15hWx443MAXheOPnUCt0PZAEeXJLAv0X3HqCPRgM8vr2KoD907q6ui+j0VD1e4uvoxv+OIfcUTfZ/HYy6yXyyG664tqn6IJzn1L7AzKX/VVxbTb12Dkd1t8/0N7S5V4LYfE52+RgCt/Jshy3yX/WkrnJLbn9/7ppfukTJgSgCLBzmirAyRFEHE3lAPgn3vvIOUOHHV4k3Xj1K1RvqycTWYhzsV5euJDeeftL+mb9I8b8AksDB4dwyCmOq8e+W6nHxnm78YiqaNIuT27J7T8A9F7AzllhEYCWI4hc2Dlk0H3q6UcMnzhpgPmqy56ljxdzcUFeadPRGeceSRaLgQv97cExX3PkHcwAjh/uVLR4vPxwkq4nt+T2nwR6Ao1nwIvikgxOaOcgNLuHs4hgY9tycnJGf/T5XwoeeXgkPfXkB/TIY5fRCbPGh2GHf9fY2MbJKd+yNqe90Wi9Rj0lt+SWBPp/eGPNq4BdREJBOwdB5TlWuoN3gH/YlVedNPzqa07RdXV1NdXU1Gzr7OxcDY2+Ad/XsCYvKioKpaamigisIUOGJEGe3JLbfxvQE6h8RKHdYS4PyskLnIjg9Xpruegk1zbn5ADODgP4t3A2k0LVAw0NDREAXQLIk3Q9uSW3/1ag9wB7vKxT0OFwcFpko16v53KlWiUDq1WW5Q6F7ifmkyc1eXJLbv/tQO9ht/OyWMRisXB5Xn7GV2c8XxnvOc9d5JIn7fHkltwObfuXY93/nX2jfTOkJNo3IyqpxZPb//T2Y2LdNf/F1xEPromnVxL1yKxKbsktuR3apvov718isJMgT27J7Sdu/0+AAQDJxwXsCF3uggAAAABJRU5ErkJggg==';
 								$logo_shield = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB8AAAAeCAYAAADU8sWcAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAACVVJREFUeNqcVgtwlNUV/v59b3Y3u2Gzm2XJg7wJIUASSBShToECArUwjhAqVVt8tEVn+lBbRtFAtQ4gPlBaFftQUSi+WpmkKPJQCkyCgBBDSMhrEzab3Wyy2ezj3/0f+/f8a9JBC07wzny789+593z3nHPPdy4jSRJGh2L0P4Grj1TCRIKDMIGgJjCj63nCEMFD6CNEMI6hGjVwNVI7oVqGGI9XBFyuyUPd3bZQf39aNBBQCrEYEqJIFlTQ6PVItVgEg9MZMGRleUxOZ4fBaGwiw6dofwNh4GrkzBWey0NHWEpY6b1wYf6lI0ecPY2N8LW0INjTg3gwCFEmHV0sjbosn36SUgmrxQJDZiashYVIKSqCQf4vKPA4ysoOm8zmF0cP8n/kZsK9bCBwT+OePcVf7NuHS8eOYSSRSMbWQDARtFotGPJU9piPxyHSXp3ZDE1GBkw8nzxAqtUKY3o6DDTPmExgJk5EkNYWrFnTbCsre53MeAnvyamRw54X9Pk+OLB16/Rju3ahd2QENposLilBzuzZyJ5WknAU5klmm1XSGVLAKBSQBA4DHj/jbutmXP85ruhqbICgViPKMNCEw9AQqYFgzc+HY9EiXDp0CMFhNts22LbJ9daz+kl3P3WXKtVaI5OXHtq1a/qz27fjlqJi3P7oBqFq1Y8E/eQSZjSiTJh+BsNgvFH6kGeUQMZMSNnLwGdWVmraV6xQ8OQpy7KQ6HAMRSGFUhQeGABHKePIc2vpTI67fEDqfuYVvT6vfL59+f3lMrm7ZNYs32t7XreX1dzpo29Nj1/QtR7pVPV2eZRefwSDw1EEQnGEWBHBGI8LFzyYXmRH3d6fKQJNZxmRiBgiDwwP47Z335WCZ8+if+dOJoXCH/J4wNOhTGkaBft5q84wmcokLSM+FvYLJYsX7wvEpHvrPm6xeDrcGo4VoFCr5CQjNc0AlVEPTYSHIhCFGGQRoqr8Yc1NyfI89+bbyfxyRGwtLUVedTWOf/ghI5C3Asch0N4OLitbMjBQ+nrOqNRUsBqrU857r1zb8dZWd+nOLXu1iIU1FZV5uGFeMRw59mQZhaMcfME4LntD6BliUd/kR9W8Kfj5imJcfPE5eBsaYbLbESfyslWrkpe4t74eaoMBVKLwdXXBWDBVkMuacx1TaDMMUFud/fTtkz2XRD4h5mQ7MGNGPlouuDE4EkcwyqO1axBt3ghYiS6ZgoFfUKC6Ohd7ty0Be+YkDj36BIx0m/lQKHnLq9avR9cnn8Df1ARzRQUEurwhyv/kqnkJhM+reLcbuuwqIs/sJN6YTI7iKc6GTw+3LDx1qgNcQgE/edrtCcI+KU1auqwMMwrTGbvV8DWB2P3LXyEok8qyRv9LNm6EitJ08vnnIdKlE6gcA53EMbMczmyLFDvytEoMUtlmTaeKQdOYwkGpUjaYU1PQ/GUfnPkT0dkXBK9U4f61syVeSDDnXcNobvRgICIgyCXw0KqpuH1rLXb/eB0s06ox86ZlmLvxHnR8VIfmAweQmZUFiTz2eb2YumGzHHJEm95VMnpAXyCLJk7/j1z+yMlN7/qsoTtX70yHQqXECF2sNY/sV7QEePRGpa+W6rRkRcTBtiBOPr4E67q7ITEqMMqhpJGIP5QUII5qfogUUU0qV7L6VhFdb6m47k4obUbo8m5so6VnrmwmfeWzcj9ValXo6PJjiHI+wkkIiAwYgx6qCaRvDgtpaBpQkYVWVwxr/txO59GAcS8BjpIsBTZg2h01cM6YCV9fH1xUflPW/0YkvZZCh7ao+BDd8pxq6LJKj45p/Rg5UgzautKpk/BFcz9CVMuDMRF9IQE9PSMQ+ARMFh3M6UYwlFfodMgvzKNdLUDrwa8E/uJfksZueqgWnZEIrPPno/KuGhHNO9WxjiYIJE76aStkqv1XdrWx8fGiBVPOv/HPpukezwg6KdRKixHbH6hKLKjKkpyOFLrvYIaokZ2jc8+RG+vFfwFy0VhJ8lw0mfEkytc+Jt3R9HumbO19lOtBJlD/sJKLkZcTMmGcvfoErT54NfKRgnzbm3Mqsra9tO8ckG7BFKcFD9xaHNcgwuD0Szrww0g3aFDkzKfltxHpAkikVUxQ/MrCZxvBGBcwy7c8zSUN7v6eJu5jERumxrS4Bmqzba+sK9dqqbaWi97j1St3FQomI1i1Fnt23MnVVIqJtp86dBqGhT6dTkxbUuYshX5lHYSTT0A4shlKh5bUL45EigP6nzQm2IZXmeD+JxkOGnB8GnIe/7xFY8ucO/ro+NrrZWwMlEzJeGX92tlgXX7QLrz6j2MaesQk7MsfTkSpw/A6J3ijBSPH6xE7/TJUN24i+fw+gpfiiCmtYP1DGNiSpxg++Awj6BwI9XBIvflBEPGLVxJfzXN5GMKh2NHypS/PavdTslINeP9Pa+MrK9MSFx8s0SeGW0kosqDg/VCIUdh+3QBNVpU0sKOC4S+fpZA4kHzlJPSIXO6HylGOom2nDjNKxcLR9weu5XmyXI0m3Ybtjy0CQvQUC4Txhx0HtfLGwvte4NhBCRFvDDEhA9GwGr1/nAth2I0Jd9dLbMyM6KCAWNSMsE9APKLFxLufE4i49pvESXGrra292vOqs7jApo2GY/NOfHIR/f0kHnqdYsGymzkmwaj9R+sYhS6N9D6NnlYRBE+8w7C97Qzr6QcfU0KIK8H2kFreuRnpC9duIntvjucN982o7F+2+rWl9e+fhyLXjo/fWsctmD1RcD13b0rgxIfQ55RSeEUkosMQ2SBUqRnUiqk5dn8J8w3LkfvIG++QjVXXIvg2cnlkRSLxwzcveqHg9IlWZJYX4vhHv41n29Riz45fpLCuZugnT6PWGaXWKL8BdIh7u6AyWZH78N/PKLQpcp4D35VcHjN83lD9ksXPO8+eO4+yWZU4eviR6ASTQnT/9XcmbsgHQ0E5JIpA3NOBRCyCSeu2dKot9ltob9u3WpbJx4HyAe9I79yKWjrpQml60aNSX180QvMD/rqdQu/fHpM8+7ZJva8+JMX97naanzoeu+MllzE1znKtq5dsp13VUobpLunzU+4QzbuGT3wQd+/eLPFD/efou2C8Nq+HXIaNsP+pje/RzjmEQmnTE+/QlHRcksQH6d9+Pfaul3wMmw78u1GqqnhA2v3GoSh9z/8udsZz4a41fkCgZo63x14m1zv+K8AAzpBEP7qfQcsAAAAASUVORK5CYII=';
+
+							//get user language code, if exists
+								$sql = "select user_setting_value from v_user_settings ";
+								$sql .= "where user_uuid = :user_uuid ";
+								$sql .= "and domain_uuid = :domain_uuid ";
+								$sql .= "and user_setting_category = 'domain' ";
+								$sql .= "and user_setting_subcategory = 'language' ";
+								$sql .= "and user_setting_name = 'code' ";
+								$parameters['user_uuid'] = $result['user_uuid'];
+								$parameters['domain_uuid'] = $domain_uuid;
+								$database = new database;
+								$row = $database->select($sql, $parameters, 'row');
+								if (is_array($row) && @sizeof($row) != 0) {
+									$user_language_code = $row['user_setting_value'];
+								}
+								unset($sql, $parameters, $row);
+
 							//get email template from db
 								$sql = "select template_subject, template_body from v_email_templates ";
 								$sql .= "where template_language = :template_language ";
@@ -105,12 +134,14 @@
 								$sql .= "and template_subcategory = 'default' ";
 								$sql .= "and template_type = 'html' ";
 								$sql .= "and template_enabled = 'true' ";
-								$parameters['template_language'] = $_SESSION['domain']['language']['code'];
+								$parameters['template_language'] = $user_language_code ? $user_language_code : $_SESSION['domain']['language']['code'];
 								$parameters['domain_uuid'] = $domain_uuid;
 								$database = new database;
 								$row = $database->select($sql, $parameters, 'row');
-								$email_subject = $row['template_subject'];
-								$email_body = $row['template_body'];
+								if (is_array($row)) {
+									$email_subject = $row['template_subject'];
+									$email_body = $row['template_body'];
+								}
 								unset($sql, $parameters, $row);
 
 							//replace variables in email body
@@ -160,6 +191,11 @@
 		$password_new = trim($_REQUEST['password_new']);
 		$password_repeat = trim($_REQUEST['password_repeat']);
 
+		//if not requiring usernames to be of email format, strip off @domain as the valid domain for the reset is already being provided in the where clause below
+		if ($_SESSION['users']['username_format']['text'] != 'email') {
+			$username = substr_count($username, '@') != 0 ? explode('@', $username)[0] : $username;
+		}
+
 		if ($username !== '' &&
 			$username === $_SESSION['valid_username'] &&
 			$password_new !== '' &&
@@ -384,4 +420,4 @@
 	$login_page = true;
 	include "resources/footer.php";
 
-?>
\ No newline at end of file
+?>
diff --git a/resources/pdo.php b/resources/pdo.php
index e856d9ef80..0d9e038927 100644
--- a/resources/pdo.php
+++ b/resources/pdo.php
@@ -246,15 +246,12 @@ if ($db_type == "mysql") {
 if ($db_type == "pgsql") {
 	//database connection
 	try {
-		if (isset($db_secure)) {
-			$dbissecure = $db_secure;
-		}
-		else {
-			$dbissecure = false;
+		if (!isset($db_secure)) {
+			$db_secure = false;
 		}
 		if (strlen($db_host) > 0) {
 			if (strlen($db_port) == 0) { $db_port = "5432"; }
-			if ($dbissecure == true) {
+			if ($db_secure == true) {
 				$db = new PDO("pgsql:host=$db_host port=$db_port dbname=$db_name user=$db_username password=$db_password sslmode=verify-ca sslrootcert=$db_cert_authority");
 			}
 			else {
@@ -304,18 +301,20 @@ if ($db_type == "pgsql") {
 				unset($result);
 			}
 
-			if (is_array($domains)) { 
+			if (is_array($domains)) {
 				foreach($domains as $row) {
-					if (count($domains) == 1) {
-						$_SESSION["domain_uuid"] = $row["domain_uuid"];
-						$_SESSION["domain_name"] = $row['domain_name'];
-					}
-					else {
-						if ($row['domain_name'] == $domain_array[0] || $row['domain_name'] == 'www.'.$domain_array[0]) {
+					if (!isset($_SESSION['username'])) {
+						if (count($domains) == 1) {
 							$_SESSION["domain_uuid"] = $row["domain_uuid"];
-							$_SESSION["domain_name"] = $row["domain_name"];
+							$_SESSION["domain_name"] = $row['domain_name'];
 						}
-					}
+						else {
+							if ($row['domain_name'] == $domain_array[0] || $row['domain_name'] == 'www.'.$domain_array[0]) {
+								$_SESSION["domain_uuid"] = $row["domain_uuid"];
+								$_SESSION["domain_name"] = $row["domain_name"];
+							}
+						}
+					}	
 					$_SESSION['domains'][$row['domain_uuid']] = $row;
 				}
 				unset($domains, $prep_statement);
diff --git a/resources/require.php b/resources/require.php
index 6561af7ee9..4f6d9e7b41 100644
--- a/resources/require.php
+++ b/resources/require.php
@@ -72,11 +72,14 @@
 	require_once "resources/functions.php";
 	if ($config_exists) {
 		require "resources/pdo.php";
-		require_once "resources/switch.php";
+		if (file_exists($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/resources/switch.php")) {
+			require_once "resources/switch.php";
+		}
 	}
 
 //change language on the fly - for translate tool (if available)
 	if (isset($_REQUEST['view_lang_code']) && ($_REQUEST['view_lang_code']) != '') {
 		$_SESSION['domain']['language']['code'] = $_REQUEST['view_lang_code'];
 	}
+
 ?>
diff --git a/resources/switch.php b/resources/switch.php
index f83401c8f8..76652fcdb3 100644
--- a/resources/switch.php
+++ b/resources/switch.php
@@ -432,97 +432,96 @@ function outbound_route_to_bridge($domain_uuid, $destination_number, array $chan
 		$hostname = 'unknown';
 	}
 
-	$sql = "select * from v_dialplans ";
-	if (is_uuid($domain_uuid)) {
-		$sql .= "where (domain_uuid = :domain_uuid or domain_uuid is null) ";
-	}
-	else {
-		$sql .= "where (domain_uuid is null) ";
-	}
-	$sql .= "and (hostname = :hostname or hostname is null) ";
-	$sql .= "and app_uuid = '8c914ec3-9fc0-8ab5-4cda-6c9288bdc9a3' ";
-	$sql .= "and dialplan_enabled = 'true' ";
-	$sql .= "order by dialplan_order asc ";
+	$sql = "select d.dialplan_uuid, ";
+	$sql .= "d.dialplan_name, "; 
+	$sql .= "dd.dialplan_detail_uuid, ";
+	$sql .= "dd.dialplan_detail_tag, ";
+	$sql .= "dd.dialplan_detail_type, ";
+	$sql .= "dd.dialplan_detail_data , ";
+	$sql .= "d.dialplan_continue ";
+	$sql .= "from v_dialplans d, v_dialplan_details dd  ";
+	$sql .= "where d.dialplan_uuid = dd.dialplan_uuid ";
 	if (is_uuid($domain_uuid)) {
+		$sql .= "and (d.domain_uuid = :domain_uuid or d.domain_uuid is null) ";
 		$parameters['domain_uuid'] = $domain_uuid;
 	}
+	else {
+		$sql .= "and (d.domain_uuid is null) ";
+	}
+	$sql .= "and (hostname = :hostname or hostname is null) ";
+	$sql .= "and d.app_uuid = '8c914ec3-9fc0-8ab5-4cda-6c9288bdc9a3' ";
+	$sql .= "and d.dialplan_enabled = 'true' ";
+	$sql .= "order by d.domain_uuid,  d.dialplan_order, dd.dialplan_detail_order ";
 	$parameters['hostname'] = $hostname;
 	$database = new database;
 	$result = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
+
 	if (is_array($result) && @sizeof($result) != 0) {
-		$x = 0;
 		foreach ($result as &$row) {
-			//set as variables
-				$dialplan_uuid = $row['dialplan_uuid'];
-				$dialplan_detail_tag = $row["dialplan_detail_tag"];
-				$dialplan_detail_type = $row['dialplan_detail_type'];
-				$dialplan_continue = $row['dialplan_continue'];
-
-			//get the extension number using the dialplan_uuid
-				$sql = "select * ";
-				$sql .= "from v_dialplan_details ";
-				$sql .= "where dialplan_uuid = :dialplan_uuid ";
-				$sql .= "order by dialplan_detail_order asc ";
-				$parameters['dialplan_uuid'] = $dialplan_uuid;
-				$database = new database;
-				$sub_result = $database->select($sql, $parameters, 'all');
-				unset($sql, $parameters);
-
-				$condition_match = false;
-				if (is_array($sub_result) && @sizeof($sub_result) != 0) {
-					foreach ($sub_result as &$sub_row) {
-						if ($sub_row['dialplan_detail_tag'] == "condition") {
-							if ($sub_row['dialplan_detail_type'] == "destination_number") {
-									$pattern = '/'.$sub_row['dialplan_detail_data'].'/';
-									preg_match($pattern, $destination_number, $matches, PREG_OFFSET_CAPTURE);
-									if (count($matches) == 0) {
-										$condition_match[] = 'false';
-									}
-									else {
-										$condition_match[] = 'true';
-										$regex_match_1 = $matches[1][0];
-										$regex_match_2 = $matches[2][0];
-										$regex_match_3 = $matches[3][0];
-										$regex_match_4 = $matches[4][0];
-										$regex_match_5 = $matches[5][0];
-									}
-							}
-							elseif ($sub_row['dialplan_detail_type'] == "\${toll_allow}") {
-								$pattern = '/'.$sub_row['dialplan_detail_data'].'/';
-								preg_match($pattern, $channel_variables['toll_allow'], $matches, PREG_OFFSET_CAPTURE);
-								if (count($matches) == 0) {
-									$condition_match[] = 'false';
-								} 
-								else {
-									$condition_match[] = 'true';
-								}
-							}
-						}
-					}
-				}
-
-				if (!in_array('false', $condition_match)) {
-					$x = 0;
-					foreach ($sub_result as &$sub_row) {
-						$dialplan_detail_data = $sub_row['dialplan_detail_data'];
-						if ($sub_row['dialplan_detail_tag'] == "action" && $sub_row['dialplan_detail_type'] == "bridge" && $dialplan_detail_data != "\${enum_auto_route}") {
-							$dialplan_detail_data = str_replace("\$1", $regex_match_1, $dialplan_detail_data);
-							$dialplan_detail_data = str_replace("\$2", $regex_match_2, $dialplan_detail_data);
-							$dialplan_detail_data = str_replace("\$3", $regex_match_3, $dialplan_detail_data);
-							$dialplan_detail_data = str_replace("\$4", $regex_match_4, $dialplan_detail_data);
-							$dialplan_detail_data = str_replace("\$5", $regex_match_5, $dialplan_detail_data);
-							$bridge_array[$x] = $dialplan_detail_data;
-							$x++;
-							if ($dialplan_continue == "false") {
-								break 2;
-							}
-						}
-					}
-				}
+			$dialplan_uuid = $row["dialplan_uuid"];
+			$dialplan_detail_uuid = $row["dialplan_detail_uuid"];
+			$outbound_routes[$dialplan_uuid][$dialplan_detail_uuid]["dialplan_detail_tag"] = $row["dialplan_detail_tag"];
+			$outbound_routes[$dialplan_uuid][$dialplan_detail_uuid]["dialplan_detail_type"] = $row["dialplan_detail_type"];
+			$outbound_routes[$dialplan_uuid][$dialplan_detail_uuid]["dialplan_detail_data"] = $row["dialplan_detail_data"];
+			$outbound_routes[$dialplan_uuid]["dialplan_continue"] = $row["dialplan_continue"];
+		}
+	}
+	
+	if (is_array($outbound_routes) && @sizeof($outbound_routes) != 0) {
+		$x = 0;
+		foreach ($outbound_routes as &$dialplan) {
+			$condition_match = false;
+			foreach ($dialplan as &$dialplan_details) {
+				if ($dialplan_details['dialplan_detail_tag'] == "condition") {
+					if ($dialplan_details['dialplan_detail_type'] == "destination_number") {
+							$pattern = '/'.$dialplan_details['dialplan_detail_data'].'/';
+							preg_match($pattern, $destination_number, $matches, PREG_OFFSET_CAPTURE);
+							if (count($matches) == 0) {
+								$condition_match[] = 'false';
+							}
+							else {
+								$condition_match[] = 'true';
+								$regex_match_1 = $matches[1][0];
+								$regex_match_2 = $matches[2][0];
+								$regex_match_3 = $matches[3][0];
+								$regex_match_4 = $matches[4][0];
+								$regex_match_5 = $matches[5][0];
+							}
+					}
+					elseif ($dialplan_details['dialplan_detail_type'] == "\${toll_allow}") {
+						$pattern = '/'.$dialplan_details['dialplan_detail_data'].'/';
+						preg_match($pattern, $channel_variables['toll_allow'], $matches, PREG_OFFSET_CAPTURE);
+						if (count($matches) == 0) {
+							$condition_match[] = 'false';
+						} 
+						else {
+							$condition_match[] = 'true';
+						}
+					}
+				}
+			}
+		
+			if (!in_array('false', $condition_match)) {
+				foreach ($dialplan as &$dialplan_details) {
+					$dialplan_detail_data = $dialplan_details['dialplan_detail_data'];
+					if ($dialplan_details['dialplan_detail_tag'] == "action" && $dialplan_details['dialplan_detail_type'] == "bridge" && $dialplan_detail_data != "\${enum_auto_route}") {
+						$dialplan_detail_data = str_replace("\$1", $regex_match_1, $dialplan_detail_data);
+						$dialplan_detail_data = str_replace("\$2", $regex_match_2, $dialplan_detail_data);
+						$dialplan_detail_data = str_replace("\$3", $regex_match_3, $dialplan_detail_data);
+						$dialplan_detail_data = str_replace("\$4", $regex_match_4, $dialplan_detail_data);
+						$dialplan_detail_data = str_replace("\$5", $regex_match_5, $dialplan_detail_data);
+						$bridge_array[$x] = $dialplan_detail_data;
+						$x++;
+					}
+				}
+				
+				if ($dialplan["dialplan_continue"] == "false") {
+					break;
+				}
+			}
 		}
 	}
-	unset($result, $row);
 	return $bridge_array;
 }
 //$destination_number = '1231234';
diff --git a/resources/templates/conf/dialplan/default.xml.noload b/resources/templates/conf/dialplan/default.xml.noload
deleted file mode 100644
index 350a85e97c..0000000000
--- a/resources/templates/conf/dialplan/default.xml.noload
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<include>
-<context name="{v_domain}">
-	<X-PRE-PROCESS cmd="include" data="{v_domain}/*.xml"/>
-</context>
-</include>
diff --git a/resources/templates/conf/dialplan/default/00_ladspa.xml.noload b/resources/templates/conf/dialplan/default/00_ladspa.xml.noload
deleted file mode 100644
index c950e1b3c0..0000000000
--- a/resources/templates/conf/dialplan/default/00_ladspa.xml.noload
+++ /dev/null
@@ -1,77 +0,0 @@
-<include>
-
-  <X-PRE-PROCESS cmd="set" data="AT_EPENT1=0 0 0 -1 -1 0 -1 0 -1 -1 0 -1"/>
-  <X-PRE-PROCESS cmd="set" data="AT_EPENT2=1 1 1 -1 -1 1 -1 1 -1 -1 1 -1"/>
-  <X-PRE-PROCESS cmd="set" data="AT_CPENT1=0 -1 -1 0 -1 0 0 0 -1 -1 0 -1"/>
-  <X-PRE-PROCESS cmd="set" data="AT_CPENT2=1 -1 -1 1 -1 1 1 1 -1 -1 1 -1"/>
-  <X-PRE-PROCESS cmd="set" data="AT_CMAJ1=0 -1 0 0 -1 0 -1 0 0 -1 0 -1"/>
-  <X-PRE-PROCESS cmd="set" data="AT_CMAJ2=1 -1 1 1 -1 1 -1 1 1 -1 1 -1"/>
-  <X-PRE-PROCESS cmd="set" data="AT_BBLUES=1 -1 1 -1 -1 1 -1 1 1 1 -1 -1"/>
-  <X-PRE-PROCESS cmd="set" data="ATGPENT2=-1 1 -1 1 -1 1 -1 -1 1 -1 1 -1"/>
-
-  <extension name="101">
-    <condition field="destination_number" expression="^101$">
-      <!-- AUTOTALENT DEFAULTS -->
-
-      <!--
-      <action application="set" data="AT_TUNE=440"/>
-      <action application="set" data="AT_FIXED=0"/>
-      <action application="set" data="AT_PULL=0"/>
-      <action application="set" data="AT_A=0"/>
-      <action application="set" data="AT_Bb=-1"/>
-      <action application="set" data="AT_B=0"/>
-      <action application="set" data="AT_C=0"/>
-      <action application="set" data="AT_Db=-1"/>
-      <action application="set" data="AT_D=0"/>
-      <action application="set" data="AT_Eb=-1"/>
-      <action application="set" data="AT_E=0"/>
-      <action application="set" data="AT_F=0"/>
-      <action application="set" data="AT_Gb=-1"/>
-      <action application="set" data="AT_G=0"/>
-      <action application="set" data="AT_Ab=-1"/>
-      <action application="set" data="AT_AMOUNT=1"/>
-      <action application="set" data="AT_SMOOTH=0"/>
-      <action application="set" data="AT_SHIFT=0"/>
-      <action application="set" data="AT_OUTSCALE=0"/>
-      <action application="set" data="AT_LFODEPTH=0"/>
-      <action application="set" data="AT_LFORATE=5"/>
-      <action application="set" data="AT_LFOSHAPE=0"/>
-      <action application="set" data="AT_LFOSYMM=0"/>
-      <action application="set" data="AT_LFOQUANT=0"/>
-      <action application="set" data="AT_FCORR=0"/>
-      <action application="set" data="AT_FWARP=0"/>
-      <action application="set" data="AT_MIX=1"/>
-      -->
-
-
-      <action application="set" data="AT_TUNE=440"/>
-      <action application="set" data="AT_FIXED=0"/>
-      <action application="set" data="AT_PULL=0"/>
-
-      <action application="set" data="AT_AMOUNT=1"/>
-      <action application="set" data="AT_SMOOTH=0"/>
-      <action application="set" data="AT_SHIFT=1"/>
-      <action application="set" data="AT_OUTSCALE=0"/>
-      <action application="set" data="AT_LFODEPTH=0"/>
-      <action application="set" data="AT_LFORATE=5"/>
-      <action application="set" data="AT_LFOSHAPE=0"/>
-      <action application="set" data="AT_LFOSYMM=0"/>
-      <action application="set" data="AT_LFOQUANT=0"/>
-      <action application="set" data="AT_FCORR=0"/>
-      <action application="set" data="AT_FWARP=0"/>
-      <action application="set" data="AT_MIX=1"/>
-
-      <!-- you have to download the ladspa package and the desired plugins from their desired site -->
-
-
-      <action application="set"><![CDATA[ladspa_params=${AT_TUNE} ${AT_FIXED} ${AT_PULL} ${AT_EPENT2} ${AT_AMOUNT} ${AT_SMOOTH} ${AT_SHIFT} ${AT_OUTSCALE} ${AT_LFODEPTH} ${AT_LFORATE} ${AT_LFOSHAPE} ${AT_LFOSYMM} ${AT_LFOQUANT} ${AT_FCORR} ${AT_FWARP} ${AT_MIX}]]></action>
-
-      <action application="ladspa_run" data="r|autotalent||${ladspa_params}"/>
-      <action application="ladspa_run" data="r|tap_chorusflanger||"/>
-      <action application="ladspa_run" data="r|phasers_1217.so|autoPhaser|"/>
-      <action application="bridge" data="sofia/internal/888@conference.freeswitch.org"/>
-
-      </condition>
-  </extension>
-
-</include>
diff --git a/resources/templates/conf/dialplan/default/00_pizza_demo.xml.noload b/resources/templates/conf/dialplan/default/00_pizza_demo.xml.noload
deleted file mode 100644
index e7fcca204a..0000000000
--- a/resources/templates/conf/dialplan/default/00_pizza_demo.xml.noload
+++ /dev/null
@@ -1,9 +0,0 @@
-<include>
-  <extension name="pizza_demo">
-    <condition field="destination_number" expression="^(pizza|74992)$"/>
-    <condition field="${module_exists(mod_spidermonkey)}" expression="true"/>
-    <condition field="${module_exists(mod_pocketsphinx)}" expression="true">
-      <action application="javascript" data="ps_pizza.js"/>
-    </condition>
-  </extension>
-</include>
diff --git a/resources/templates/conf/dialplan/default/01_Talking_Clock.xml.noload b/resources/templates/conf/dialplan/default/01_Talking_Clock.xml.noload
deleted file mode 100644
index 1424f2e16e..0000000000
--- a/resources/templates/conf/dialplan/default/01_Talking_Clock.xml.noload
+++ /dev/null
@@ -1,32 +0,0 @@
-<include>
-  <extension name="Talking Clock Time" ><!--e.g. 10:56pm-->
-    <condition field="destination_number" expression="^9170$">
-      <action application="answer"/>
-      <action application="sleep" data="1000"/>
-      <action application="say" data="en CURRENT_TIME pronounced
-				      ${strepoch()}"/>
-      <action application="hangup"/>
-    </condition>
-  </extension>
-
-  <extension name="Talking Clock Date" ><!--e.g. March 8, 2011-->
-    <condition field="destination_number" expression="^9171$">
-      <action application="answer"/>
-      <action application="sleep" data="1000"/>
-      <action application="say" data="en CURRENT_DATE pronounced
-				      ${strepoch()}"/>
-      <action application="hangup"/>
-    </condition>
-  </extension>
-
-  <extension name="Talking Clock Date and Time" ><!--e.g. March 8, 2011
-						     10:56pm-->
-    <condition field="destination_number" expression="^9172$">
-      <action application="answer"/>
-      <action application="sleep" data="1000"/>
-      <action application="say" data="en CURRENT_DATE_TIME pronounced
-				      ${strepoch()}"/>
-      <action application="hangup"/>
-    </condition>
-  </extension>
-</include>
diff --git a/resources/templates/conf/dialplan/default/01_example.com.xml.noload b/resources/templates/conf/dialplan/default/01_example.com.xml.noload
deleted file mode 100644
index bd61cd2788..0000000000
--- a/resources/templates/conf/dialplan/default/01_example.com.xml.noload
+++ /dev/null
@@ -1,30 +0,0 @@
-<include>
-
-  <extension name="local.example.com">
-    <condition field="${toll_allow}" expression="local"/>
-    <condition field="destination_number" expression="^(\d{7})$">
-      <action application="set" data="effective_caller_id_number=${outbound_caller_id_number}"/>
-      <action application="set" data="effective_caller_id_name=${outbound_caller_id_name}"/>
-      <action application="bridge" data="sofia/gateway/${default_gateway}/1${default_areacode}$1"/>
-    </condition>
-  </extension>
-
-  <extension name="domestic.example.com">
-    <condition field="${toll_allow}" expression="domestic"/>
-    <condition field="destination_number" expression="^(\d{11})$">
-      <action application="set" data="effective_caller_id_number=${outbound_caller_id_number}"/>
-      <action application="set" data="effective_caller_id_name=${outbound_caller_id_name}"/>
-      <action application="bridge" data="sofia/gateway/${default_gateway}/$1"/>
-    </condition>
-  </extension>
-
-  <extension name="international.example.com">
-    <condition field="${toll_allow}" expression="international"/>
-    <condition field="destination_number" expression="^(011\d+)$">
-      <action application="set" data="effective_caller_id_number=${outbound_caller_id_number}"/>
-      <action application="set" data="effective_caller_id_name=${outbound_caller_id_name}"/>
-      <action application="bridge" data="sofia/gateway/${default_gateway}/$1"/>
-    </condition>
-  </extension>
-
-</include>
diff --git a/resources/templates/conf/dialplan/features.xml.noload b/resources/templates/conf/dialplan/features.xml.noload
deleted file mode 100644
index 204a4b6fc8..0000000000
--- a/resources/templates/conf/dialplan/features.xml.noload
+++ /dev/null
@@ -1,67 +0,0 @@
-<!-- http://wiki.freeswitch.org/wiki/Dialplan_XML -->
-<include>
-<context name="features">
-
-	<!-- In call Transfer for phones without a transfer button -->
-	<extension name="dx">
-		<condition field="destination_number" expression="^dx$">
-			<action application="answer"/>
-			<action application="read" data="11 11 'tone_stream://%(10000,0,350,440)' digits 5000 #"/>
-			<action application="execute_extension" data="is_transfer XML features"/>
-		</condition>
-	</extension>
-
-	<extension name="att_xfer">
-		<condition field="destination_number" expression="^att_xfer$">
-			<action application="read" data="3 4 'tone_stream://%(10000,0,350,440)' digits 30000 #"/>
-			<action application="set" data="origination_cancel_key=#"/>
-			<action application="att_xfer" data="user/${digits}@$${domain}"/>
-		</condition>
-	</extension>
-
-	<extension name="is_transfer">
-		<condition field="destination_number" expression="^is_transfer$"/>
-		<condition field="${digits}" expression="^(\d+)$">
-			<action application="transfer" data="-bleg ${digits} XML default"/>
-			<anti-action application="eval" data="cancel transfer"/>
-		</condition>
-	</extension>
-
-	<!-- Used to transfer both legs into a conference -->
-	<extension name="cf">
-		<condition field="destination_number" expression="^cf$">
-			<action application="answer"/>
-			<action application="transfer" data="-both 30${dialed_extension:2} XML default"/>
-		</condition>
-	</extension>
-
-	<extension name="please_hold">
-		<condition field="destination_number" expression="^(10[01][0-9])$">
-			<action application="set" data="transfer_ringback=$${hold_music}"/>
-			<action application="answer"/>
-			<action application="sleep" data="1500"/>
-			<action application="playback" data="ivr/ivr-hold_connect_call.wav"/>
-			<action application="transfer" data="$1 XML default"/>
-		</condition>
-	</extension>
-
-	<extension name="is_zrtp_secure" continue="true">
-		<condition field="${zrtp_secure_media_confirmed}" expression="^true$">
-			<action application="sleep" data="1000"/>
-			<action application="playback" data="misc/call_secured.wav"/>
-			<anti-action application="eval" data="not_secure"/>
-		</condition>
-	</extension>
-
-	<extension name="is_secure" continue="true">
-		<!-- Only Truly consider it secure if its TLS and SRTP -->
-		<condition field="${sip_via_protocol}" expression="tls"/>
-		<condition field="${sip_secure_media_confirmed}" expression="^true$">
-			<action application="sleep" data="1000"/>
-			<action application="playback" data="misc/call_secured.wav"/>
-			<anti-action application="eval" data="not_secure"/>
-		</condition>
-	</extension>
-
-</context>
-</include>
diff --git a/resources/templates/conf/dialplan/public.xml.noload b/resources/templates/conf/dialplan/public.xml.noload
deleted file mode 100644
index 8f6dd4a2ab..0000000000
--- a/resources/templates/conf/dialplan/public.xml.noload
+++ /dev/null
@@ -1,71 +0,0 @@
-<!--
-    NOTICE:
-
-    This context is usually accessed via the external sip profile listening on port 5080.
-
-    It is recommended to have separate inbound and outbound contexts.  Not only for security
-    but clearing up why you would need to do such a thing.  You don't want outside un-authenticated
-    callers hitting your default context which allows dialing calls thru your providers and results
-    in Toll Fraud.
--->
-
-<!-- http://wiki.freeswitch.org/wiki/Dialplan_XML -->
-<include>
-<context name="public">
-
-	<extension name="unloop">
-		<condition field="${unroll_loops}" expression="^true$"/>
-		<condition field="${sip_looped_call}" expression="^true$">
-			<action application="deflect" data="${destination_number}"/>
-		</condition>
-	</extension>
-
-	<!--
-	Tag anything pass thru here as an outside_call so you can make sure not
-	to create any routing loops based on the conditions that it came from
-	the outside of the switch.
-	-->
-	<extension name="outside_call" continue="true">
-		<condition>
-			<action application="set" data="outside_call=true"/>
-	<action application="export" data="RFC2822_DATE=${strftime(%a, %d %b %Y %T %z)}"/>
-		</condition>
-	</extension>
-
-	<extension name="call_debug" continue="true">
-		<condition field="${call_debug}" expression="^true$" break="never">
-			<action application="info"/>
-		</condition>
-	</extension>
-
-	<!--
-	<extension name="public_extensions">
-		<condition field="destination_number" expression="^(10[01][0-9])$">
-			<action application="transfer" data="$1 XML default"/>
-		</condition>
-	</extension>
-	-->
-
-	<!--
-	You can place files in the public directory to get included.
-	-->
-	<X-PRE-PROCESS cmd="include" data="public/*.xml"/>
-	<!--
-	If you have made it this far lets challenge the caller and if they authenticate
-	lets try what they dialed in the default context. (commented out by default)
-	-->
-	<!--
-	<extension name="check_auth" continue="true">
-		<condition field="${sip_authorized}" expression="^true$" break="never">
-			<anti-action application="respond" data="407"/>
-		</condition>
-	</extension>
-
-	<extension name="transfer_to_default">
-		<condition>
-			<action application="transfer" data="${destination_number} XML default"/>
-		</condition>
-	</extension>
-	-->
-</context>
-</include>
diff --git a/resources/templates/conf/dialplan/public/00_inbound_did.xml.noload b/resources/templates/conf/dialplan/public/00_inbound_did.xml.noload
deleted file mode 100644
index 22b7223014..0000000000
--- a/resources/templates/conf/dialplan/public/00_inbound_did.xml.noload
+++ /dev/null
@@ -1,18 +0,0 @@
-<include>
-  <extension name="public_did">
-    <condition field="destination_number" expression="^(5551212)$">
-      <!--
-	  If you're hosting multiple domains you will want to set the
-	  target_domain on these calls so they hit the proper domain after you
-	  transfer the caller into the default context.
-
-	  $${domain} is the default domain set from vars.xml but you can set it
-	  to any domain you have setup in your user directory.
-
-      -->
-      <action application="set" data="domain_name=$${domain}"/>
-      <!-- This example maps the DID 5551212 to ring 1000 in the default context -->
-      <action application="transfer" data="1000 XML default"/>
-    </condition>
-  </extension>
-</include>
diff --git a/resources/templates/conf/dialplan/skinny-patterns.xml.noload b/resources/templates/conf/dialplan/skinny-patterns.xml.noload
deleted file mode 100644
index 7817323aa9..0000000000
--- a/resources/templates/conf/dialplan/skinny-patterns.xml.noload
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    NOTICE:
-
-    This context is used for skinny to match dialed number
-
-    The special applications:
-    - skinny-process tells skinny to process the call (route, set call forwarding, ...)
-    - skinny-drop tells skinny to drop the call
-    - skinny-wait tells skinny to wait 'data' seconds for more numbers before drop
--->
-<!-- http://wiki.freeswitch.org/wiki/Mod_skinny -->
-<include>
-<context name="skinny-patterns">
-	<!--
-	Wait 10 seconds for another digit by default
-	-->
-	<extension name="Default">
-		<condition>
-			<action application="skinny-wait" data="10"/>
-		</condition>
-	</extension>
-
-	<!--
-	You can place files in the skinny-patterns directory to get included.
-	-->
-	<X-PRE-PROCESS cmd="include" data="skinny-patterns/*.xml"/>
-
-</context>
-</include>
diff --git a/resources/templates/conf/dialplan/skinny-patterns/20-Demo.xml b/resources/templates/conf/dialplan/skinny-patterns/20-Demo.xml
deleted file mode 100644
index f69658128f..0000000000
--- a/resources/templates/conf/dialplan/skinny-patterns/20-Demo.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<include>
-  <extension name="Demo">
-    <condition field="destination_number" expression="^(9[0-9]{3})$">
-      <action application="skinny-process"/>
-    </condition>
-  </extension>
-</include>
-
diff --git a/resources/templates/conf/dialplan/skinny-patterns/20-Local_extension.xml b/resources/templates/conf/dialplan/skinny-patterns/20-Local_extension.xml
deleted file mode 100644
index 9ad5651328..0000000000
--- a/resources/templates/conf/dialplan/skinny-patterns/20-Local_extension.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<include>
-  <extension name="Local_Extension">
-    <condition field="destination_number" expression="^(10[01][0-9])$">
-      <action application="skinny-process"/>
-    </condition>
-  </extension>
-  <extension name="Local_Extension_Skinny">
-    <condition field="destination_number" expression="^(11[01][0-9])$">
-      <action application="skinny-process"/>
-    </condition>
-  </extension>
-</include>
-
diff --git a/resources/templates/conf/dialplan/skinny-patterns/90-External.xml b/resources/templates/conf/dialplan/skinny-patterns/90-External.xml
deleted file mode 100644
index 50d6c37f24..0000000000
--- a/resources/templates/conf/dialplan/skinny-patterns/90-External.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<include>
-  <extension name="External">
-    <condition field="destination_number" expression="^(0[0-9]{10,})$">
-      <action application="skinny-process"/>
-    </condition>
-  </extension>
-</include>
-
diff --git a/resources/templates/conf/dialplan/skinny-patterns/99-Default_Drop.xml b/resources/templates/conf/dialplan/skinny-patterns/99-Default_Drop.xml
deleted file mode 100644
index 897fd8fb94..0000000000
--- a/resources/templates/conf/dialplan/skinny-patterns/99-Default_Drop.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<include>
-  <!-- drop long dialed number -->
-  <extension name="Default_Drop">
-    <condition field="destination_number" expression="^(.{14,})$">
-      <action application="skinny-drop"/>
-    </condition>
-  </extension>
-</include>
-
diff --git a/resources/templates/conf/directory/default.xml.noload b/resources/templates/conf/directory/default.xml.noload
deleted file mode 100644
index 818586b509..0000000000
--- a/resources/templates/conf/directory/default.xml.noload
+++ /dev/null
@@ -1,78 +0,0 @@
-<!--
-    NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE
-
-    FreeSWITCH works off the concept of users and domains just like email.
-    You have users that are in domains for example 1000@domain.com.
-
-    When freeswitch gets a register packet it looks for the user in the directory
-    based on the from or to domain in the packet depending on how your sofia profile
-    is configured.  Out of the box the default domain will be the IP address of the
-    machine running FreeSWITCH.  This IP can be found by typing "sofia status" at the
-    CLI.  You will register your phones to the IP and not the hostname by default.
-    If you wish to register using the domain please open vars.xml in the root conf
-    directory and set the default domain to the hostname you desire.  Then you would
-    use the domain name in the client instead of the IP address to register
-    with FreeSWITCH.
-
-    NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE NOTICE
--->
-
-<include>
-  <!--the domain or ip (the right hand side of the @ in the addr-->
-  <domain name="$${domain}">
-    <params>
-      <param name="dial-string" value="{sip_invite_domain=${dialed_domain},presence_id=${dialed_user}@${dialed_domain}}${sofia_contact(${dialed_user}@${dialed_domain})}"/>
-    </params>
-
-    <variables>
-      <variable name="record_stereo" value="true"/>
-      <variable name="default_gateway" value="$${default_provider}"/>
-      <variable name="default_areacode" value="$${default_areacode}"/>
-      <variable name="transfer_fallback_extension" value="operator"/>
-    </variables>
-
-    <groups>
-      <group name="default">
-	<users>
-	  <X-PRE-PROCESS cmd="include" data="default/*.xml"/>
-	</users>
-      </group>
-
-      <group name="sales">
-	<users>
-	  <!--
-	      type="pointer" is a pointer so you can have the
-	      same user in multiple groups.  It basically means
-	      to keep searching for the user in the directory.
-	  -->
-	  <user id="1000" type="pointer"/>
-	  <user id="1001" type="pointer"/>
-	  <user id="1002" type="pointer"/>
-	  <user id="1003" type="pointer"/>
-	  <user id="1004" type="pointer"/>
-	</users>
-      </group>
-
-      <group name="billing">
-	<users>
-	  <user id="1005" type="pointer"/>
-	  <user id="1006" type="pointer"/>
-	  <user id="1007" type="pointer"/>
-	  <user id="1008" type="pointer"/>
-	  <user id="1009" type="pointer"/>
-	</users>
-      </group>
-
-      <group name="support">
-	<users>
-	  <user id="1010" type="pointer"/>
-	  <user id="1011" type="pointer"/>
-	  <user id="1012" type="pointer"/>
-	  <user id="1013" type="pointer"/>
-	  <user id="1014" type="pointer"/>
-	</users>
-      </group>
-    </groups>
-
-  </domain>
-</include>
diff --git a/resources/templates/conf/directory/default/brian.xml.noload b/resources/templates/conf/directory/default/brian.xml.noload
deleted file mode 100644
index 2cbb68fc76..0000000000
--- a/resources/templates/conf/directory/default/brian.xml.noload
+++ /dev/null
@@ -1,92 +0,0 @@
-<include>
-  <!--
-      ipauth if you have an cidr= in the user attributes ie cidr="1.2.3.4/32"
-      see <node type="allow" domain="$${domain}"/> in default acl.conf.xml
-  -->
-  <user id="brian" cidr="192.0.2.0/24">
-    <!-- Outbound Registrations Related to this user -->
-    <gateways>
-      <!--<gateway name="asterlink.com">-->
-      <!--/// account username *required* ///-->
-      <!--<param name="username" value="cluecon"/>-->
-      <!--/// auth realm: *optional* same as gateway name, if blank ///-->
-      <!--<param name="realm" value="asterlink.com"/>-->
-      <!--/// username to use in from: *optional* same as  username, if blank ///-->
-      <!--<param name="from-user" value="cluecon"/>-->
-      <!--/// domain to use in from: *optional* same as  realm, if blank ///-->
-      <!--<param name="from-domain" value="asterlink.com"/>-->
-      <!--/// account password *required* ///-->
-      <!--<param name="password" value="2007"/>-->
-      <!--/// replace the INVITE from user with the channel's caller-id ///-->
-      <!--<param name="caller-id-in-from" value="false"/>-->
-      <!--/// extension for inbound calls: *optional* same as username, if blank ///-->
-      <!--<param name="extension" value="cluecon"/>-->
-      <!--/// proxy host: *optional* same as realm, if blank ///-->
-      <!--<param name="proxy" value="asterlink.com"/>-->
-      <!--/// send register to this proxy: *optional* same as proxy, if blank ///-->
-      <!--<param name="register-proxy" value="mysbc.com"/>-->
-      <!--/// expire in seconds: *optional* 3600, if blank ///-->
-      <!--<param name="expire-seconds" value="60"/>-->
-      <!--/// do not register ///-->
-      <!--<param name="register" value="false"/>-->
-      <!-- which transport to use for register -->
-      <!--<param name="register-transport" value="udp"/>-->
-      <!--How many seconds before a retry when a failure or timeout occurs -->
-      <!--<param name="retry-seconds" value="30"/>-->
-      <!--Use the callerid of an inbound call in the from field on outbound calls via this gateway -->
-      <!--<param name="caller-id-in-from" value="false"/>-->
-      <!--extra sip params to send in the contact-->
-      <!--<param name="contact-params" value="tport=tcp"/>-->
-      <!--send an options ping every x seconds, failure will unregister and/or mark it down-->
-      <!--<param name="ping" value="25"/>-->
-      <!--</gateway>-->
-    </gateways>
-    <params>
-      <!-- omit password for authless registration -->
-      <param name="password" value="$${default_password}"/>
-      <param name="vm-password" value="9999"/><!--if vm-password is omitted password param is used-->
-      <!--<param name="email-addr" value="me@mydomain.com"/>-->
-      <!--<param name="vm-delete-file" value="true"/>-->
-      <!--<param name="vm-attach-file" value="true"/>-->
-      <!--<param name="vm-mailto" value="me@mydomain.com"/>-->
-      <!--<param name="vm-email-all-messages" value="true"/>-->
-      <!-- optionally use this instead if you want to store the hash of user:domain:pass-->
-      <!--<param name="a1-hash" value="c6440e5de50b403206989679159de89a"/>-->
-      <!-- What this user is allowed to acces -->
-      <!--<param name="http-allowed-api" value="jsapi,voicemail,status"/> -->
-    </params>
-    <variables>
-      <!--all variables here will be set on all inbound calls that originate from this user -->
-      <variable name="user_context" value="default"/>
-      <variable name="effective_caller_id_name" value="Brian West"/>
-      <variable name="effective_caller_id_number" value="1000"/>
-      <!-- Don't write a CDR if this is false valid values are: true, false, a_leg and b_leg -->
-      <variable name="process_cdr" value="true"/>
-      <!-- sip_secure_media will offer mandatory SRTP on invite AES_CM_128_HMAC_SHA1_32, AES_CM_128_HMAC_SHA1_80 or true-->
-      <variable name="sip_secure_media" value="true"/>
-      <!-- limit the max number of outgoing calls for this user -->
-      <!--<variable name="max_calls" value="2"/>-->
-
-      <!-- send presence information if FS is configured to do so -->
-      <!--<variable name="presence_id" value="1000@$${domain}"/>-->
-
-      <!-- set these to take advantage of a dialplan localized to this user -->
-      <!--<variable name="numbering_plan" value="US"/>-->
-      <!--<variable name="default_area_code" value="434"/>-->
-      <!--<variable name="default_gateway" value="asterlink.com"/>-->
-      <!--
-	   NDLB-connectile-dysfunction - Rewrite contact ip and port
-	   NDLB-tls-connectile-dysfunction - Rewrite contact port only.
-      -->
-      <!--<variable name="sip-force-contact" value="NDLB-connectile-dysfunction"/>-->
-      <!--<variable name="sip-force-expires" value="10"/>-->
-      <!--<variable name="sip-register-gateway" value="cluecon.com"/>-->
-      <!-- Set the file format for a specific user -->
-      <!--<variable name="vm_message_ext" value="mp3"/> -->
-    </variables>
-
-    <vcard>
-      <!-- insert optional compliant vcard xml here-->
-    </vcard>
-  </user>
-</include>
diff --git a/resources/templates/conf/directory/default/default.xml.noload b/resources/templates/conf/directory/default/default.xml.noload
deleted file mode 100644
index bdddab9cac..0000000000
--- a/resources/templates/conf/directory/default/default.xml.noload
+++ /dev/null
@@ -1,22 +0,0 @@
-<include>
-  <user id="default"> <!--if id is numeric mailbox param is not necessary-->
-    <!--
-	ATTENTION PLEASE READ THIS...
-
-	Let it be known that this user can register without a password but since we do not assign
-	this user a user_context and we don't authenticate this user they will be put in context 'public'.
-
-	This isn't a security issue as the endpoint would be put into the same context 'public' as the
-	sofia profile that starts on 5080 by default. If you're paranoid just remove this file and
-	remove the external profile also.
-
-    -->
-    <variables>
-      <!--all variables here will be set on all inbound calls that originate from this user -->
-      <!-- set these to take advantage of a dialplan localized to this user -->
-      <variable name="numbering_plan" value="$${default_country}"/>
-      <!--<variable name="default_areacode" value="$${default_areacode}"/>-->
-      <!--<variable name="default_gateway" value="$${default_provider}"/>-->
-    </variables>
-  </user>
-</include>
diff --git a/resources/templates/conf/directory/default/example.com.xml.noload b/resources/templates/conf/directory/default/example.com.xml.noload
deleted file mode 100644
index 42a33ddbf3..0000000000
--- a/resources/templates/conf/directory/default/example.com.xml.noload
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
-    Shell provider account should work with most providers.
-
--->
-<include>
-  <user id="$${default_provider}">
-    <gateways>
-      <gateway name="$${default_provider}">
-	<param name="username" value="$${default_provider_username}"/>
-	<param name="password" value="$${default_provider_password}"/>
-	<param name="from-user" value="$${default_provider_username}"/>
-	<param name="from-domain" value="$${default_provider_from_domain}"/>
-	<param name="expire-seconds" value="600"/>
-	<param name="register" value="$${default_provider_register}"/>
-	<param name="retry-seconds" value="30"/>
-	<param name="extension" value="$${default_provider_contact}"/>
-	<!--<param name="contact-params" value="domain_name=$${domain}"/>-->
-	<param name="context" value="public"/>
-      </gateway>
-    </gateways>
-    <params>
-      <param name="password" value="$${default_provider_password}"/>
-    </params>
-  </user>
-</include>
-
diff --git a/resources/templates/conf/directory/default/skinny-example.xml.noload b/resources/templates/conf/directory/default/skinny-example.xml.noload
deleted file mode 100644
index 357eb72f12..0000000000
--- a/resources/templates/conf/directory/default/skinny-example.xml.noload
+++ /dev/null
@@ -1,35 +0,0 @@
-<include>
- <user id="SEP001120AABBCC">
-   <params>
-    <!-- for devices requesting firmware via SCCP, like ATA186
-    <param name="skinny-firmware-version" value="ATA030101SCCP04"
-    <param name="skinny-soft-key-set-set" value="default"
-    -->
-    <param name="foo" value="bar"/>
-   </params>
-   <skinny>
-    <buttons>
-      <!--
-      position: 1..
-      type: one of line, speed-dial
-      label: button label
-      -->
-      <!--
-      value is the directory number (or user)
-      caller-name is shown to the calling party during call
-      -->
-      <button position="1" type="Line" label="Line 1" value="1101" caller-name="Calling as 1101"/>
-      <button position="3" type="Line" label="Shared Line 10" value="1110" caller-name="Calling as 1110"/>
-      <!--
-      value is the directory number to call
-      -->
-      <button position="5" type="SpeedDial" label="Call 1001" value="1001"/>
-      <!--
-      value is the URL
-      -->
-      <button position="6" type="ServiceUrl" label="Some URL" value="http://phone-xml.berbee.com/menu.xml"/>
-    </buttons>
-   </skinny>
-  </user>
-</include>
-
diff --git a/resources/templates/conf/sip_profiles/external-ipv6.xml.noload b/resources/templates/conf/sip_profiles/external-ipv6.xml.noload
index d41740e9f4..4bf6ff2d46 100644
--- a/resources/templates/conf/sip_profiles/external-ipv6.xml.noload
+++ b/resources/templates/conf/sip_profiles/external-ipv6.xml.noload
@@ -84,7 +84,7 @@
 		<!-- Optionally set the passphrase password used by openSSL to encrypt/decrypt TLS private key files -->
 		<param name="tls-passphrase" value=""/>
 		<!-- Verify the date on TLS certificates -->
-		<param name="tls-verify-date" value="true"/>
+		<param name="tls-verify-date" value="false"/>
 		<!-- TLS verify policy, when registering/inviting gateways with other servers (outbound) or handling inbound registration/invite requests how should we verify their certificate -->
 		<!-- set to 'in' to only verify incoming connections, 'out' to only verify outgoing connections, 'all' to verify all connections, also 'in_subjects', 'out_subjects' and 'all_subjects' for subject validation. Multiple policies can be split with a '|' pipe -->
 		<param name="tls-verify-policy" value="all|subjects_all" enabled="false"/>
diff --git a/resources/templates/conf/sip_profiles/external.xml.noload b/resources/templates/conf/sip_profiles/external.xml.noload
index 23f80d382e..6ffd93ea6c 100644
--- a/resources/templates/conf/sip_profiles/external.xml.noload
+++ b/resources/templates/conf/sip_profiles/external.xml.noload
@@ -2,7 +2,6 @@
 	<!-- http://wiki.freeswitch.org/wiki/Sofia_Configuration_Files -->
 	<!-- This profile is only for outbound registrations to providers -->
 	<gateways>
-		<X-PRE-PROCESS cmd="include" data="external/*.xml"/>
 	</gateways>
 
 	<aliases>
@@ -90,7 +89,7 @@
 		<!-- Optionally set the passphrase password used by openSSL to encrypt/decrypt TLS private key files -->
 		<param name="tls-passphrase" value=""/>
 		<!-- Verify the date on TLS certificates -->
-		<param name="tls-verify-date" value="true"/>
+		<param name="tls-verify-date" value="false"/>
 		<!-- TLS verify policy, when registering/inviting gateways with other servers (outbound) or handling inbound registration/invite requests how should we verify their certificate -->
 		<!-- set to 'in' to only verify incoming connections, 'out' to only verify outgoing connections, 'all' to verify all connections, also 'in_subjects', 'out_subjects' and 'all_subjects' for subject validation. Multiple policies can be split with a '|' pipe -->
 		<param name="tls-verify-policy" value="all|subjects_all" enabled="false"/>
diff --git a/resources/templates/conf/sip_profiles/external/example.xml b/resources/templates/conf/sip_profiles/external/example.xml
deleted file mode 100644
index 2a4df31aaf..0000000000
--- a/resources/templates/conf/sip_profiles/external/example.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<include>
-  <!--<gateway name="asterlink.com">-->
-  <!--/// account username *required* ///-->
-  <!--<param name="username" value="cluecon"/>-->
-  <!--/// auth realm: *optional* same as gateway name, if blank ///-->
-  <!--<param name="realm" value="asterlink.com"/>-->
-  <!--/// username to use in from: *optional* same as  username, if blank ///-->
-  <!--<param name="from-user" value="cluecon"/>-->
-  <!--/// domain to use in from: *optional* same as  realm, if blank ///-->
-  <!--<param name="from-domain" value="asterlink.com"/>-->
-  <!--/// account password *required* ///-->
-  <!--<param name="password" value="2007"/>-->
-  <!--/// extension for inbound calls: *optional* same as username, if blank ///-->
-  <!--<param name="extension" value="cluecon"/>-->
-  <!--/// proxy host: *optional* same as realm, if blank ///-->
-  <!--<param name="proxy" value="asterlink.com"/>-->
-  <!--/// send register to this proxy: *optional* same as proxy, if blank ///-->
-  <!--<param name="register-proxy" value="mysbc.com"/>-->
-  <!--/// expire in seconds: *optional* 3600, if blank ///-->
-  <!--<param name="expire-seconds" value="60"/>-->
-  <!--/// do not register ///-->
-  <!--<param name="register" value="false"/>-->
-  <!-- which transport to use for register -->
-  <!--<param name="register-transport" value="udp"/>-->
-  <!--How many seconds before a retry when a failure or timeout occurs -->
-  <!--<param name="retry-seconds" value="30"/>-->
-  <!--Use the callerid of an inbound call in the from field on outbound calls via this gateway -->
-  <!--<param name="caller-id-in-from" value="false"/>-->
-  <!--extra sip params to send in the contact-->
-  <!--<param name="contact-params" value="tport=tcp"/>-->
-  <!--send an options ping every x seconds, failure will unregister and/or mark it down-->
-  <!--<param name="ping" value="25"/>-->
-  <!--</gateway>-->
-  <!--rfc5626 : Abilitazione rfc5626 ///-->
-  <!--<param name="rfc-5626" value="true"/>-->
-  <!--rfc5626 : extra sip params to send in the contact-->
-  <!--<param name="reg-id" value="1"/>-->
-</include>
diff --git a/resources/templates/conf/sip_profiles/internal-ipv6.xml.noload b/resources/templates/conf/sip_profiles/internal-ipv6.xml.noload
index 1129d7a80b..c9fcf7b73e 100644
--- a/resources/templates/conf/sip_profiles/internal-ipv6.xml.noload
+++ b/resources/templates/conf/sip_profiles/internal-ipv6.xml.noload
@@ -60,7 +60,7 @@
 		<!-- Optionally set the passphrase password used by openSSL to encrypt/decrypt TLS private key files -->
 		<param name="tls-passphrase" value=""/>
 		<!-- Verify the date on TLS certificates -->
-		<param name="tls-verify-date" value="true"/>
+		<param name="tls-verify-date" value="false"/>
 		<!-- TLS verify policy, when registering/inviting gateways with other servers (outbound) or handling inbound registration/invite requests how should we verify their certificate -->
 		<!-- set to 'in' to only verify incoming connections, 'out' to only verify outgoing connections, 'all' to verify all connections, also 'in_subjects', 'out_subjects' and 'all_subjects' for subject validation. Multiple policies can be split with a '|' pipe -->
 		<param name="tls-verify-policy" value="all|subjects_all" enabled="false"/>
diff --git a/resources/templates/conf/sip_profiles/internal.xml.noload b/resources/templates/conf/sip_profiles/internal.xml.noload
index 560acc671d..667147540b 100644
--- a/resources/templates/conf/sip_profiles/internal.xml.noload
+++ b/resources/templates/conf/sip_profiles/internal.xml.noload
@@ -16,7 +16,6 @@
 
 	<!-- Outbound Registrations -->
 	<gateways>
-		<X-PRE-PROCESS cmd="include" data="internal/*.xml"/>
 	</gateways>
 
 	<domains>
@@ -182,7 +181,7 @@
 		<!-- Optionally set the passphrase password used by openSSL to encrypt/decrypt TLS private key files -->
 		<param name="tls-passphrase" value=""/>
 		<!-- Verify the date on TLS certificates -->
-		<param name="tls-verify-date" value="true"/>
+		<param name="tls-verify-date" value="false"/>
 		<!-- TLS verify policy, when registering/inviting gateways with other servers (outbound) or handling inbound registration/invite requests how should we verify their certificate -->
 		<!-- set to 'in' to only verify incoming connections, 'out' to only verify outgoing connections, 'all' to verify all connections, also 'in_subjects', 'out_subjects' and 'all_subjects' for subject validation. Multiple policies can be split with a '|' pipe -->
 		<param name="tls-verify-policy" value="all|subjects_all" enabled="false"/>
diff --git a/resources/templates/conf/sip_profiles/internal/example.xml b/resources/templates/conf/sip_profiles/internal/example.xml
deleted file mode 100644
index 10263b05a5..0000000000
--- a/resources/templates/conf/sip_profiles/internal/example.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<include>
-  <!--<gateway name="asterlink.com">-->
-  <!--/// account username *required* ///-->
-  <!--<param name="username" value="cluecon"/>-->
-  <!--/// auth realm: *optional* same as gateway name, if blank ///-->
-  <!--<param name="realm" value="asterlink.com"/>-->
-  <!--/// username to use in from: *optional* same as  username, if blank ///-->
-  <!--<param name="from-user" value="cluecon"/>-->
-  <!--/// domain to use in from: *optional* same as  realm, if blank ///-->
-  <!--<param name="from-domain" value="asterlink.com"/>-->
-  <!--/// account password *required* ///-->
-  <!--<param name="password" value="2007"/>-->
-  <!--/// extension for inbound calls: *optional* same as username, if blank ///-->
-  <!--<param name="extension" value="cluecon"/>-->
-  <!--/// proxy host: *optional* same as realm, if blank ///-->
-  <!--<param name="proxy" value="asterlink.com"/>-->
-  <!--/// send register to this proxy: *optional* same as proxy, if blank ///-->
-  <!--<param name="register-proxy" value="mysbc.com"/>-->
-  <!--/// expire in seconds: *optional* 3600, if blank ///-->
-  <!--<param name="expire-seconds" value="60"/>-->
-  <!--/// do not register ///-->
-  <!--<param name="register" value="false"/>-->
-  <!-- which transport to use for register -->
-  <!--<param name="register-transport" value="udp"/>-->
-  <!--How many seconds before a retry when a failure or timeout occurs -->
-  <!--<param name="retry-seconds" value="30"/>-->
-  <!--Use the callerid of an inbound call in the from field on outbound calls via this gateway -->
-  <!--<param name="caller-id-in-from" value="false"/>-->
-  <!--extra sip params to send in the contact-->
-  <!--<param name="contact-params" value="tport=tcp"/>-->
-  <!-- Put the extension in the contact -->
-  <!--<param name="extension-in-contact" value="true"/>-->
-  <!--send an options ping every x seconds, failure will unregister and/or mark it down-->
-  <!--<param name="ping" value="25"/>-->
-  <!--<param name="cid-type" value="rpid"/>-->
-  <!--</gateway>-->
-</include>
diff --git a/resources/templates/provision/fanvil/x210/{$mac}.cfg b/resources/templates/provision/fanvil/x210/{$mac}.cfg
index 144202828e..545a99b630 100644
--- a/resources/templates/provision/fanvil/x210/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x210/{$mac}.cfg
@@ -19,6 +19,7 @@
         <PPPoEUser>user123</PPPoEUser>
         <PPPoEPassword>password</PPPoEPassword>
         <ARPCacheLife>2</ARPCacheLife>
+        <MTU>1500</MTU>
         <WAN6IP></WAN6IP>
         <WAN6IPPREFIX></WAN6IPPREFIX>
         <WAN6Gateway></WAN6Gateway>
@@ -32,7 +33,36 @@
         <Vendor6ClassID>Fanvil X210</Vendor6ClassID>
         <wifi>
             <WIFIEnable>{$fanvil_wifi_enable}</WIFIEnable>
+            <WIFILogEnable>0</WIFILogEnable>
+            <WANTYPE>0</WANTYPE>
+            <WANIP>192.168.1.179</WANIP>
+            <WANSubnetMask>255.255.255.0</WANSubnetMask>
+            <WANGateway>192.168.1.1</WANGateway>
+            <DomainName></DomainName>
+            <PrimaryDNS>8.8.8.8</PrimaryDNS>
+            <SecondaryDNS>202.96.134.133</SecondaryDNS>
+            <EnableDHCP>1</EnableDHCP>
+            <DHCPAutoDNS>1</DHCPAutoDNS>
+            <DHCPOption100-101>1</DHCPOption100-101>
+            <UseVendorClassID>0</UseVendorClassID>
+            <VendorClassID>Fanvil X210</VendorClassID>
+            <EnablePPPoE>0</EnablePPPoE>
+            <PPPoEUser>user123</PPPoEUser>
+            <PPPoEPassword>password</PPPoEPassword>
+            <WAN6IP></WAN6IP>
+            <WAN6IPPREFIX></WAN6IPPREFIX>
+            <WAN6Gateway></WAN6Gateway>
+            <Domain6Name></Domain6Name>
+            <PrimaryDNS6></PrimaryDNS6>
+            <SecondaryDNS6></SecondaryDNS6>
+            <EnableDHCP6>1</EnableDHCP6>
+            <DHCP6AutoDNS>1</DHCP6AutoDNS>
+            <UseVendor6ClassID>0</UseVendor6ClassID>
+            <Vendor6ClassID>Fanvil X210</Vendor6ClassID>
         </wifi>
+        <NetGlobal>
+            <NetPriority>10</NetPriority>
+        </NetGlobal>
     </net>
     <mm>
         <G723BitRate>1</G723BitRate>
@@ -50,9 +80,10 @@
         <VAD>0</VAD>
         <H264PayloadType>117</H264PayloadType>
         <ResvAudioBand>0</ResvAudioBand>
-        <RTPInitialPort>10000</RTPInitialPort>
-        <RTPPortQuantity>1000</RTPPortQuantity>
-        <RTPKeepAlive>1</RTPKeepAlive>
+        <RTPInitialPort>16384</RTPInitialPort>
+        <RTPPortQuantity>16384</RTPPortQuantity>
+        <RTPKeepAlive>0</RTPKeepAlive>
+        <RTPRelay>0</RTPRelay>
         <RTCPCNAMEUser></RTCPCNAMEUser>
         <RTCPCNAMEHost></RTCPCNAMEHost>
         <SelectYourTone>{if isset($fanvil_country_toneset)}{$fanvil_country_toneset}{else}11{/if}</SelectYourTone>
@@ -75,7 +106,7 @@
         <RecordTone>440/500,0/5000</RecordTone>
         <AutoAnswerTone></AutoAnswerTone>
         <capability>
-            <AudioCodecSets>PCMU,PCMA,G726-16,G726-24,G726-32,G726-40,G729,G723,iLBC</AudioCodecSets>
+            <AudioCodecSets>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,opus,G722</AudioCodecSets>
             <VideoCodecSets>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}H264{/if}</VideoCodecSets>
             <VideoFrameRate>25</VideoFrameRate>
             <VideoBitRate>2000000</VideoBitRate>
@@ -108,22 +139,25 @@
             <RegisterUser>{$account.1.auth_id}</RegisterUser>
             <RegisterPswd>{$account.1.password}</RegisterPswd>
             <RegisterTTL>{$account.1.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.1.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.1.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.1.sip_port}</ProxyPort>
             <ProxyUser>{$account.1.auth_id}</ProxyUser>
             <ProxyPswd>{$account.1.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.1.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.1.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.1.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -157,7 +191,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.1.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.1.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -176,7 +210,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.1.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.1.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.1.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.1.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -184,7 +218,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.1.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -210,7 +244,7 @@
             <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VoiceCodecMap>opus,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
             <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
@@ -233,7 +267,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -251,6 +285,12 @@
             <BLFDialogMatch>1</BLFDialogMatch>
             <Ptime>0</Ptime>
             <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="2">
             <PhoneNumber>{$account.2.user_id}</PhoneNumber>
@@ -261,22 +301,25 @@
             <RegisterUser>{$account.2.auth_id}</RegisterUser>
             <RegisterPswd>{$account.2.password}</RegisterPswd>
             <RegisterTTL>{$account.2.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.2.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.2.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.2.sip_port}</ProxyPort>
             <ProxyUser>{$account.2.auth_id}</ProxyUser>
             <ProxyPswd>{$account.2.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.2.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.2.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.2.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -310,7 +353,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.2.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.2.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -329,7 +372,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.2.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.2.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.2.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.2.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -337,7 +380,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.2.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -363,7 +406,7 @@
             <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VoiceCodecMap>opus,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
             <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
@@ -386,7 +429,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -404,6 +447,12 @@
             <BLFDialogMatch>1</BLFDialogMatch>
             <Ptime>0</Ptime>
             <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="3">
             <PhoneNumber>{$account.3.user_id}</PhoneNumber>
@@ -414,22 +463,25 @@
             <RegisterUser>{$account.3.auth_id}</RegisterUser>
             <RegisterPswd>{$account.3.password}</RegisterPswd>
             <RegisterTTL>{$account.3.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.3.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.3.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.3.sip_port}</ProxyPort>
             <ProxyUser>{$account.3.auth_id}</ProxyUser>
             <ProxyPswd>{$account.3.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.3.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.3.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.3.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -463,7 +515,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.3.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.3.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -482,7 +534,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.3.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.3.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.3.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.3.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -490,7 +542,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.3.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -516,7 +568,7 @@
             <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VoiceCodecMap>opus,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
             <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
@@ -539,7 +591,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -557,6 +609,12 @@
             <BLFDialogMatch>1</BLFDialogMatch>
             <Ptime>0</Ptime>
             <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="4">
             <PhoneNumber>{$account.4.user_id}</PhoneNumber>
@@ -567,22 +625,25 @@
             <RegisterUser>{$account.4.auth_id}</RegisterUser>
             <RegisterPswd>{$account.4.password}</RegisterPswd>
             <RegisterTTL>{$account.4.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.4.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.4.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.4.sip_port}</ProxyPort>
             <ProxyUser>{$account.4.auth_id}</ProxyUser>
             <ProxyPswd>{$account.4.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.4.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.4.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.4.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -616,7 +677,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.4.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.4.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -635,7 +696,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.4.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.4.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.4.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.4.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -643,7 +704,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.4.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -669,7 +730,7 @@
             <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VoiceCodecMap>opus,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
             <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
@@ -692,7 +753,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -710,6 +771,12 @@
             <BLFDialogMatch>1</BLFDialogMatch>
             <Ptime>0</Ptime>
             <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="5">
             <PhoneNumber>{$account.5.user_id}</PhoneNumber>
@@ -720,22 +787,25 @@
             <RegisterUser>{$account.5.auth_id}</RegisterUser>
             <RegisterPswd>{$account.5.password}</RegisterPswd>
             <RegisterTTL>{$account.5.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.5.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.5.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.5.sip_port}</ProxyPort>
             <ProxyUser>{$account.5.auth_id}</ProxyUser>
             <ProxyPswd>{$account.5.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.5.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.5.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.5.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -769,7 +839,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.5.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.5.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -788,7 +858,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.5.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.5.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.5.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.5.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -796,7 +866,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.5.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -822,7 +892,7 @@
             <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VoiceCodecMap>opus,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
             <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
@@ -845,7 +915,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -863,6 +933,12 @@
             <BLFDialogMatch>1</BLFDialogMatch>
             <Ptime>0</Ptime>
             <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="6">
             <PhoneNumber>{$account.6.user_id}</PhoneNumber>
@@ -873,22 +949,25 @@
             <RegisterUser>{$account.6.auth_id}</RegisterUser>
             <RegisterPswd>{$account.6.password}</RegisterPswd>
             <RegisterTTL>{$account.6.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.6.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.6.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.6.sip_port}</ProxyPort>
             <ProxyUser>{$account.6.auth_id}</ProxyUser>
             <ProxyPswd>{$account.6.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.6.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.6.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.6.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -922,7 +1001,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.6.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.6.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -941,7 +1020,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.6.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.6.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.6.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.6.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -949,7 +1028,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.6.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -975,7 +1054,7 @@
             <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VoiceCodecMap>opus,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
             <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
@@ -998,7 +1077,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -1016,6 +1095,12 @@
             <BLFDialogMatch>1</BLFDialogMatch>
             <Ptime>0</Ptime>
             <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="7">
             <PhoneNumber>{$account.7.user_id}</PhoneNumber>
@@ -1026,22 +1111,25 @@
             <RegisterUser>{$account.7.auth_id}</RegisterUser>
             <RegisterPswd>{$account.7.password}</RegisterPswd>
             <RegisterTTL>{$account.7.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.7.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.7.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.7.sip_port}</ProxyPort>
             <ProxyUser>{$account.7.auth_id}</ProxyUser>
             <ProxyPswd>{$account.7.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.7.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.7.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.7.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -1075,7 +1163,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.7.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.7.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -1094,7 +1182,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.7.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.7.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.7.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.7.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -1102,7 +1190,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.7.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -1128,7 +1216,7 @@
             <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VoiceCodecMap>opus,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
             <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
@@ -1151,7 +1239,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -1169,6 +1257,12 @@
             <BLFDialogMatch>1</BLFDialogMatch>
             <Ptime>0</Ptime>
             <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="8">
             <PhoneNumber>{$account.8.user_id}</PhoneNumber>
@@ -1179,22 +1273,25 @@
             <RegisterUser>{$account.8.auth_id}</RegisterUser>
             <RegisterPswd>{$account.8.password}</RegisterPswd>
             <RegisterTTL>{$account.8.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.8.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.8.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.8.sip_port}</ProxyPort>
             <ProxyUser>{$account.8.auth_id}</ProxyUser>
             <ProxyPswd>{$account.8.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.8.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.8.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.8.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -1228,7 +1325,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.8.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.8.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -1247,7 +1344,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.8.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.8.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.8.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.8.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -1255,7 +1352,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.8.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -1281,7 +1378,7 @@
             <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VoiceCodecMap>opus,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
             <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
@@ -1304,7 +1401,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -1322,6 +1419,12 @@
             <BLFDialogMatch>1</BLFDialogMatch>
             <Ptime>0</Ptime>
             <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="9">
             <PhoneNumber>{$account.9.user_id}</PhoneNumber>
@@ -1332,22 +1435,25 @@
             <RegisterUser>{$account.9.auth_id}</RegisterUser>
             <RegisterPswd>{$account.9.password}</RegisterPswd>
             <RegisterTTL>{$account.9.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.9.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.9.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.9.sip_port}</ProxyPort>
             <ProxyUser>{$account.9.auth_id}</ProxyUser>
             <ProxyPswd>{$account.9.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.9.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.9.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.9.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -1381,7 +1487,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.9.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.9.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -1400,7 +1506,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.9.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.9.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.9.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.9.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -1408,7 +1514,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.9.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -1434,7 +1540,7 @@
             <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VoiceCodecMap>opus,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
             <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
@@ -1457,7 +1563,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -1475,6 +1581,12 @@
             <BLFDialogMatch>1</BLFDialogMatch>
             <Ptime>0</Ptime>
             <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="10">
             <PhoneNumber>{$account.10.user_id}</PhoneNumber>
@@ -1485,22 +1597,25 @@
             <RegisterUser>{$account.10.auth_id}</RegisterUser>
             <RegisterPswd>{$account.10.password}</RegisterPswd>
             <RegisterTTL>{$account.10.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.10.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.10.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.10.sip_port}</ProxyPort>
             <ProxyUser>{$account.10.auth_id}</ProxyUser>
             <ProxyPswd>{$account.10.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.10.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.10.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.10.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -1534,7 +1649,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.10.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.10.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -1553,7 +1668,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.10.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.10.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.10.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.10.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -1561,7 +1676,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.10.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -1587,7 +1702,7 @@
             <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VoiceCodecMap>opus,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
             <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
@@ -1610,7 +1725,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -1628,6 +1743,12 @@
             <BLFDialogMatch>1</BLFDialogMatch>
             <Ptime>0</Ptime>
             <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="11">
             <PhoneNumber>{$account.11.user_id}</PhoneNumber>
@@ -1638,22 +1759,25 @@
             <RegisterUser>{$account.11.auth_id}</RegisterUser>
             <RegisterPswd>{$account.11.password}</RegisterPswd>
             <RegisterTTL>{$account.11.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.11.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.11.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.11.sip_port}</ProxyPort>
             <ProxyUser>{$account.11.auth_id}</ProxyUser>
             <ProxyPswd>{$account.11.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.11.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.11.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.11.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -1687,7 +1811,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.11.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.11.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -1706,7 +1830,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.11.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.11.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.11.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.11.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -1714,7 +1838,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.11.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -1740,7 +1864,7 @@
             <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VoiceCodecMap>opus,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
             <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
@@ -1763,7 +1887,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -1781,6 +1905,12 @@
             <BLFDialogMatch>1</BLFDialogMatch>
             <Ptime>0</Ptime>
             <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="12">
             <PhoneNumber>{$account.12.user_id}</PhoneNumber>
@@ -1791,22 +1921,25 @@
             <RegisterUser>{$account.12.auth_id}</RegisterUser>
             <RegisterPswd>{$account.12.password}</RegisterPswd>
             <RegisterTTL>{$account.12.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.12.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.12.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.12.sip_port}</ProxyPort>
             <ProxyUser>{$account.12.auth_id}</ProxyUser>
             <ProxyPswd>{$account.12.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.12.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.12.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.12.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -1840,7 +1973,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.12.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.12.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -1859,7 +1992,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.12.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.12.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.12.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.12.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -1867,7 +2000,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.12.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -1893,7 +2026,7 @@
             <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VoiceCodecMap>opus,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
             <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
@@ -1916,7 +2049,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -1934,6 +2067,12 @@
             <BLFDialogMatch>1</BLFDialogMatch>
             <Ptime>0</Ptime>
             <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="13">
             <PhoneNumber>{$account.13.user_id}</PhoneNumber>
@@ -1944,22 +2083,25 @@
             <RegisterUser>{$account.13.auth_id}</RegisterUser>
             <RegisterPswd>{$account.13.password}</RegisterPswd>
             <RegisterTTL>{$account.13.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.13.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.13.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.13.sip_port}</ProxyPort>
             <ProxyUser>{$account.13.auth_id}</ProxyUser>
             <ProxyPswd>{$account.13.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.13.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.13.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.13.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -1993,7 +2135,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.13.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.13.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -2012,7 +2154,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.13.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.13.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.13.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.13.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -2020,7 +2162,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.13.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -2046,7 +2188,7 @@
             <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VoiceCodecMap>opus,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
             <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
@@ -2069,7 +2211,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -2087,6 +2229,12 @@
             <BLFDialogMatch>1</BLFDialogMatch>
             <Ptime>0</Ptime>
             <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="14">
             <PhoneNumber>{$account.14.user_id}</PhoneNumber>
@@ -2097,22 +2245,25 @@
             <RegisterUser>{$account.14.auth_id}</RegisterUser>
             <RegisterPswd>{$account.14.password}</RegisterPswd>
             <RegisterTTL>{$account.14.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.14.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.14.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.14.sip_port}</ProxyPort>
             <ProxyUser>{$account.14.auth_id}</ProxyUser>
             <ProxyPswd>{$account.14.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.14.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.14.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.14.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -2146,7 +2297,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.14.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.14.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -2165,7 +2316,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.14.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.14.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.14.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.14.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -2173,7 +2324,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.14.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -2199,7 +2350,7 @@
             <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VoiceCodecMap>opus,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
             <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
@@ -2222,7 +2373,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -2240,6 +2391,12 @@
             <BLFDialogMatch>1</BLFDialogMatch>
             <Ptime>0</Ptime>
             <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="15">
             <PhoneNumber>{$account.15.user_id}</PhoneNumber>
@@ -2250,22 +2407,25 @@
             <RegisterUser>{$account.15.auth_id}</RegisterUser>
             <RegisterPswd>{$account.15.password}</RegisterPswd>
             <RegisterTTL>{$account.15.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.15.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.15.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.15.sip_port}</ProxyPort>
             <ProxyUser>{$account.15.auth_id}</ProxyUser>
             <ProxyPswd>{$account.15.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.15.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.15.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.15.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -2299,7 +2459,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.15.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.15.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -2318,7 +2478,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.15.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.15.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.15.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.15.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -2326,7 +2486,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.15.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -2352,7 +2512,7 @@
             <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VoiceCodecMap>opus,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
             <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
@@ -2375,7 +2535,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -2393,6 +2553,12 @@
             <BLFDialogMatch>1</BLFDialogMatch>
             <Ptime>0</Ptime>
             <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="16">
             <PhoneNumber>{$account.16.user_id}</PhoneNumber>
@@ -2403,22 +2569,25 @@
             <RegisterUser>{$account.16.auth_id}</RegisterUser>
             <RegisterPswd>{$account.16.password}</RegisterPswd>
             <RegisterTTL>{$account.16.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.16.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.16.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.16.sip_port}</ProxyPort>
             <ProxyUser>{$account.16.auth_id}</ProxyUser>
             <ProxyPswd>{$account.16.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.16.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.16.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.16.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -2452,7 +2621,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.16.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.16.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -2471,7 +2640,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.16.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.16.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.16.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.16.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -2479,7 +2648,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.16.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -2505,7 +2674,7 @@
             <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VoiceCodecMap>opus,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
             <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
@@ -2528,7 +2697,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -2546,6 +2715,12 @@
             <BLFDialogMatch>1</BLFDialogMatch>
             <Ptime>0</Ptime>
             <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="17">
             <PhoneNumber>{$account.17.user_id}</PhoneNumber>
@@ -2556,22 +2731,25 @@
             <RegisterUser>{$account.17.auth_id}</RegisterUser>
             <RegisterPswd>{$account.17.password}</RegisterPswd>
             <RegisterTTL>{$account.17.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.17.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.17.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.17.sip_port}</ProxyPort>
             <ProxyUser>{$account.17.auth_id}</ProxyUser>
             <ProxyPswd>{$account.17.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.17.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.17.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.17.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -2605,14 +2783,13 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.17.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.17.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            <DNSSRV>0</DNSSRV>
             {if $account.17.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
             {if $account.17.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             <XFERExpire>0</XFERExpire>
@@ -2625,7 +2802,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.17.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.17.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.17.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.17.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -2633,7 +2810,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.17.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -2659,7 +2836,7 @@
             <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VoiceCodecMap>opus,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
             <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
@@ -2682,7 +2859,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -2700,6 +2877,12 @@
             <BLFDialogMatch>1</BLFDialogMatch>
             <Ptime>0</Ptime>
             <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="18">
             <PhoneNumber>{$account.18.user_id}</PhoneNumber>
@@ -2710,22 +2893,25 @@
             <RegisterUser>{$account.18.auth_id}</RegisterUser>
             <RegisterPswd>{$account.18.password}</RegisterPswd>
             <RegisterTTL>{$account.18.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.18.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.18.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.18.sip_port}</ProxyPort>
             <ProxyUser>{$account.18.auth_id}</ProxyUser>
             <ProxyPswd>{$account.18.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.18.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.18.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.18.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -2759,14 +2945,13 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.18.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.18.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            <DNSSRV>0</DNSSRV>
             {if $account.18.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
             {if $account.18.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             <XFERExpire>0</XFERExpire>
@@ -2779,7 +2964,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.18.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.18.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.18.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.18.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -2787,7 +2972,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.18.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -2813,7 +2998,7 @@
             <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VoiceCodecMap>opus,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
             <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
@@ -2836,7 +3021,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -2854,9 +3039,15 @@
             <BLFDialogMatch>1</BLFDialogMatch>
             <Ptime>0</Ptime>
             <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="19">
-            <PhoneNumber>{$account.19.user_id}</PhoneNumber>
+             <PhoneNumber>{$account.19.user_id}</PhoneNumber>
             <DisplayName>{$account.19.display_name}</DisplayName>
             <SipName></SipName>
             <RegisterAddr>{$account.19.server_address}</RegisterAddr>
@@ -2864,22 +3055,25 @@
             <RegisterUser>{$account.19.auth_id}</RegisterUser>
             <RegisterPswd>{$account.19.password}</RegisterPswd>
             <RegisterTTL>{$account.19.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.19.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.19.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.19.sip_port}</ProxyPort>
             <ProxyUser>{$account.19.auth_id}</ProxyUser>
             <ProxyPswd>{$account.19.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.19.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.19.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.19.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -2913,14 +3107,13 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.19.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.19.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            <DNSSRV>0</DNSSRV>
             {if $account.19.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
             {if $account.19.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             <XFERExpire>0</XFERExpire>
@@ -2933,7 +3126,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.19.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.19.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.19.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.19.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -2941,7 +3134,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.19.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -2967,7 +3160,7 @@
             <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VoiceCodecMap>opus,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
             <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
@@ -2990,7 +3183,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -3008,6 +3201,12 @@
             <BLFDialogMatch>1</BLFDialogMatch>
             <Ptime>0</Ptime>
             <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="20">
             <PhoneNumber>{$account.20.user_id}</PhoneNumber>
@@ -3018,22 +3217,25 @@
             <RegisterUser>{$account.20.auth_id}</RegisterUser>
             <RegisterPswd>{$account.20.password}</RegisterPswd>
             <RegisterTTL>{$account.20.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.20.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.20.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.20.sip_port}</ProxyPort>
             <ProxyUser>{$account.20.auth_id}</ProxyUser>
             <ProxyPswd>{$account.20.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.20.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.20.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.20.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -3067,14 +3269,13 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.20.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.20.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            <DNSSRV>0</DNSSRV>
             {if $account.20.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
             {if $account.20.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             <XFERExpire>0</XFERExpire>
@@ -3087,7 +3288,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.20.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.20.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.20.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.20.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -3095,7 +3296,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.20.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -3121,7 +3322,7 @@
             <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VoiceCodecMap>opus,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
             <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
@@ -3144,7 +3345,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -3162,7 +3363,22 @@
             <BLFDialogMatch>1</BLFDialogMatch>
             <Ptime>0</Ptime>
             <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
+        <p2p>
+            <SIPP2PEnableAutoAnswer>0</SIPP2PEnableAutoAnswer>
+            <SIPP2PAutoAnswerDelay>30</SIPP2PAutoAnswerDelay>
+            <SIPP2PDtmfMode>1</SIPP2PDtmfMode>
+            <SIPP2PSipInfoDtmfMode>0</SIPP2PSipInfoDtmfMode>
+            <SIPP2PEnablePreview>0</SIPP2PEnablePreview>
+            <SIPP2PPreviewMode>0</SIPP2PPreviewMode>
+            <SIPP2PUseVPN>1</SIPP2PUseVPN>
+        </p2p>
     </sip>
     <call>
         <port index="1">
@@ -3236,6 +3452,10 @@
             <ConfDTMFCode></ConfDTMFCode>
             <DisableDialSearch>0</DisableDialSearch>
             <CallNumberFilter></CallNumberFilter>
+            <AutoResumeCurrent>0</AutoResumeCurrent>
+            <AlertTimeout>120</AlertTimeout>
+            <RingTimeout>120</RingTimeout>
+            <RingPriority>0</RingPriority>
         </port>
         <basic>
             <DialbyPound>1</DialbyPound>
@@ -3251,42 +3471,52 @@
         </basic>
         <alertInfo index="1">
             <Text>External</Text>
+            <Line>-1</Line>
             <RingType>{if isset($fanvil_default_ringtone_ext)}{$fanvil_default_ringtone_ext}{else}Type 1{/if}</RingType>
         </alertInfo>
         <alertInfo index="2">
             <Text>External2</Text>
+            <Line>-1</Line>
             <RingType>{if isset($fanvil_default_ringtone_ext2)}{$fanvil_default_ringtone_ext2}{else}Type 4{/if}</RingType>
         </alertInfo>
         <alertInfo index="3">
             <Text></Text>
+            <Line>-1</Line>
             <RingType>Type 1</RingType>
         </alertInfo>
         <alertInfo index="4">
             <Text></Text>
+            <Line>-1</Line>
             <RingType>Type 1</RingType>
         </alertInfo>
         <alertInfo index="5">
             <Text></Text>
+            <Line>-1</Line>
             <RingType>Type 1</RingType>
         </alertInfo>
         <alertInfo index="6">
             <Text></Text>
+            <Line>-1</Line>
             <RingType>Type 1</RingType>
         </alertInfo>
         <alertInfo index="7">
             <Text></Text>
+            <Line>-1</Line>
             <RingType>Type 1</RingType>
         </alertInfo>
         <alertInfo index="8">
             <Text></Text>
+            <Line>-1</Line>
             <RingType>Type 1</RingType>
         </alertInfo>
         <alertInfo index="9">
             <Text></Text>
+            <Line>-1</Line>
             <RingType>Type 1</RingType>
         </alertInfo>
         <alertInfo index="10">
             <Text></Text>
+            <Line>-1</Line>
             <RingType>Type 1</RingType>
         </alertInfo>
     </call>
@@ -3306,12 +3536,17 @@
         <CallLogDisplayType>0</CallLogDisplayType>
         <EnableRecvSMS>1</EnableRecvSMS>
         <EnableCallHistory>1</EnableCallHistory>
-        <LineDisplayFormat>$name@$protocol$instance</LineDisplayFormat>
+        <LineDisplayFormat>$name</LineDisplayFormat>
         <EnableMWITone>0</EnableMWITone>
         <AllPswdEncryption>0</AllPswdEncryption>
         <SIPNotifyXML>1</SIPNotifyXML>
         <BlockXMLWhenCall>1</BlockXMLWhenCall>
         <XMLUpdateInterval>30</XMLUpdateInterval>
+        <VqmDisplayOrder></VqmDisplayOrder>
+        <EnablePushXMLAuth>0</EnablePushXMLAuth>
+        <PickupVisualAlert>0</PickupVisualAlert>
+        <PickupAudioAlert>0</PickupAudioAlert>
+        <PickupRingType></PickupRingType>
         <display>
             <LCDTitle>{$fanvil_greeting}</LCDTitle>
             <LCDConstrast>5</LCDConstrast>
@@ -3340,14 +3575,25 @@
         <blfLed>
             <BLFIdleColor>0</BLFIdleColor>
             <BLFIdleCtl>1</BLFIdleCtl>
+            <BLFIdleText>terminated</BLFIdleText>
             <BLFRingColor>1</BLFRingColor>
             <BLFRingCtl>2</BLFRingCtl>
-            <BLFUsingColor>1</BLFUsingColor>
-            <BLFUsingCtl>1</BLFUsingCtl>
+            <BLFRingText>early</BLFRingText>
+            <BLFDialingColor>1</BLFDialingColor>
+            <BLFDialingCtl>0</BLFDialingCtl>
+            <BLFDialingText></BLFDialingText>
+            <BLFTalkingColor>1</BLFTalkingColor>
+            <BLFTalkingCtl>1</BLFTalkingCtl>
+            <BLFTalkingText>confirmed</BLFTalkingText>
+            <BLFHoldColor>1</BLFHoldColor>
+            <BLFHoldCtl>0</BLFHoldCtl>
+            <BLFHoldText></BLFHoldText>
             <BLFFailedColor>2</BLFFailedColor>
             <BLFFailedCtl>0</BLFFailedCtl>
+            <BLFFailedText>failed</BLFFailedText>
             <BLFParkedColor>0</BLFParkedColor>
             <BLFParkedCtl>3</BLFParkedCtl>
+            <BLFParkedText>parked</BLFParkedText>
         </blfLed>
         <volume>
             <HandsetVol>5</HandsetVol>
@@ -3391,7 +3637,7 @@
         </timeDisplay>
         <softkey>
             <SoftkeyMode>0</SoftkeyMode>
-             <SoftKeyExitStyle>{if isset($fanvil_softkey_exit)}{$fanvil_softkey_exit}{else}2{/if}</SoftKeyExitStyle>
+            <SoftKeyExitStyle>{if isset($fanvil_softkey_exit)}{$fanvil_softkey_exit}{else}1{/if}</SoftKeyExitStyle>
             <DesktopSoftkey>{if isset($fanvil_softkey_desktopsoftkey)}{$fanvil_softkey_desktopsoftkey}{else}history;contact;dnd;menu;{/if}</DesktopSoftkey>
             <TalkingSoftkey>{if isset($fanvil_softkey_talkingsoftkey)}{$fanvil_softkey_talkingsoftkey}{else}hold;xfer;conf;end;{/if}</TalkingSoftkey>
             <RingingSoftkey>{if isset($fanvil_softkey_ringingsoftkey)}{$fanvil_softkey_ringingsoftkey}{else}accept;none;forward;reject;{/if}</RingingSoftkey>
@@ -3400,14 +3646,15 @@
             <ConferenceSoftkey>hold;none;split;end;</ConferenceSoftkey>
             <WaitingSoftkey>xfer;accept;reject;end;</WaitingSoftkey>
             <EndingSoftkey>redial;none;none;end;</EndingSoftkey>
-            <DialerPreSoftkey>send;2aB;delete;exit;</DialerPreSoftkey>
+            <DialerPreSoftkey>send;save;delete;exit;</DialerPreSoftkey>
             <DialerCallSoftkey>send;2aB;delete;exit;</DialerCallSoftkey>
             <DialerXferSoftkey>delete;xfer;send;exit;</DialerXferSoftkey>
             <DialerCfwdSoftkey>send;2aB;delete;exit;</DialerCfwdSoftkey>
             <DesktopClick>{if isset($fanvil_softkey_desktopclick)}{$fanvil_softkey_desktopclick}{else}history;status;none;none;none;{/if}</DesktopClick>
-            <DailerClick>pline;nline;none;none;none;</DailerClick>
+            <DailerClick>none;none;none;none;none;</DailerClick>
             <CallClick>none;none;voldown;volup;none;</CallClick>
             <DesktopLongPress>status;none;none;none;reset;</DesktopLongPress>
+            <SoftkeyMode>0</SoftkeyMode>
             <DialerConfSoftkey>contact;clogs;redial;video;cancel;</DialerConfSoftkey>
         </softkey>
         <agent>
@@ -3642,9 +3889,24 @@
             <Sipline>-1</Sipline>
             <BindLine>-1</BindLine>
         </xmlContact>
+        <screenSaver>
+            <ScreenSaverType>0</ScreenSaverType>
+            <ScreenTimeout>0</ScreenTimeout>
+            <EnableActivePeriod>0</EnableActivePeriod>
+            <PeriodOneStart>0</PeriodOneStart>
+            <PeriodOneEndTime>0</PeriodOneEndTime>
+            <PeriodTwoStart>0</PeriodTwoStart>
+            <PeriodTwoEndTime>0</PeriodTwoEndTime>
+            <ScreenSaverApp></ScreenSaverApp>
+            <SleepAfterActive>0</SleepAfterActive>
+            <SleepTimeout>0</SleepTimeout>
+        </screenSaver>
     </phone>
     <dm>
         <OnhookTime>120</OnhookTime>
+        <EnableHookflash>0</EnableHookflash>
+        <KeyLongPressTime>2</KeyLongPressTime>
+        <KeyLongLongPressTime>6</KeyLongLongPressTime>
     </dm>
     <vqm>
         <SessionReport>1</SessionReport>
@@ -3680,7 +3942,7 @@
         <NoAnsFWDOffUrl></NoAnsFWDOffUrl>
         <MuteOnUrl></MuteOnUrl>
         <MuteOffUrl></MuteOffUrl>
-        <IncmoingCallUrl></IncmoingCallUrl>
+        <IncomingCallUrl></IncomingCallUrl>
         <OutgoingCallUrl></OutgoingCallUrl>
         <CallActiveUrl></CallActiveUrl>
         <CallStopUrl></CallStopUrl>
@@ -3705,56 +3967,72 @@
     <mcast>
         <Priority>0</Priority>
         <EnablePriority>0</EnablePriority>
+        <EnablePrioChan>0</EnablePrioChan>
+        <EnableEmerChan>0</EnableEmerChan>
+        <MulticastTone>1</MulticastTone>
         <addr index="1">
             <Name></Name>
             <Host></Host>
             <Port>0</Port>
+            <Channel>0</Channel>
         </addr>
         <addr index="2">
             <Name></Name>
             <Host></Host>
             <Port>0</Port>
+            <Channel>0</Channel>
         </addr>
         <addr index="3">
             <Name></Name>
             <Host></Host>
             <Port>0</Port>
+            <Channel>0</Channel>
         </addr>
         <addr index="4">
             <Name></Name>
             <Host></Host>
             <Port>0</Port>
+            <Channel>0</Channel>
         </addr>
         <addr index="5">
             <Name></Name>
             <Host></Host>
             <Port>0</Port>
+            <Channel>0</Channel>
         </addr>
         <addr index="6">
             <Name></Name>
             <Host></Host>
             <Port>0</Port>
+            <Channel>0</Channel>
         </addr>
         <addr index="7">
             <Name></Name>
             <Host></Host>
             <Port>0</Port>
+            <Channel>0</Channel>
         </addr>
         <addr index="8">
             <Name></Name>
             <Host></Host>
             <Port>0</Port>
+            <Channel>0</Channel>
         </addr>
         <addr index="9">
             <Name></Name>
             <Host></Host>
             <Port>0</Port>
+            <Channel>0</Channel>
         </addr>
         <addr index="10">
             <Name></Name>
             <Host></Host>
             <Port>0</Port>
+            <Channel>0</Channel>
         </addr>
+        <dynamic>
+            <AutoExitExpires>60</AutoExitExpires>
+        </dynamic>
     </mcast>
     <dsskey>
         <SelectDsskeyAction>0</SelectDsskeyAction>
@@ -3762,6 +4040,12 @@
         <FuncKeyPageNum>3</FuncKeyPageNum>
         <SideKeyPageNum>1</SideKeyPageNum>
         <DSSHomePage>0</DSSHomePage>
+        <DisplayParkedInfo>0</DisplayParkedInfo>
+        <DSSDIALSwitchMode>0</DSSDIALSwitchMode>
+        <FirstCallWaitTime>16</FirstCallWaitTime>
+        <FirstNumStartTime>360</FirstNumStartTime>
+        <FirstNumEndTime>1080</FirstNumEndTime>
+        <DSSLongPressAction>1</DSSLongPressAction>
         <Extern1PageBelong>0</Extern1PageBelong>
         <Extern2PageBelong>0</Extern2PageBelong>
         <Extern3PageBelong>0</Extern3PageBelong>
@@ -3777,57 +4061,60 @@
         <DSSExtend4IP></DSSExtend4IP>
         <DSSExtend5MAC></DSSExtend5MAC>
         <DSSExtend5IP></DSSExtend5IP>
+        <dssSide index="1">
         {foreach $keys["line"] as $row}
-            <SidekeyConfig1 index="{$row.device_key_id}">
+            <Fkey index="{$row.device_key_id}">
                 <Type>{if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if}</Type>
                 <Value>{if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if}</Value>
                 <Title>{$row.device_key_label}</Title>
                 <ICON>{$row.device_key_icon}</ICON>
-            </SidekeyConfig1>
+            </Fkey>
         {/foreach}
+        </dssSide>
+
         {strip}{*-- Each Internal Index contains 32 keys --*}{/strip}        
         <internal index="1">
-            {foreach $keys["memory"] as $row}
-                {if $row.device_key_id <= 32}
-                <Fkey index="{$row.device_key_id}">
-                    <Type>{if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if}</Type>
-                    <Value>{if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if}</Value>
-                    <Title>{$row.device_key_label}</Title>
-                    <ICON>{$row.device_key_icon}</ICON>
-                </Fkey>
-                {/if}
-            {/foreach}
-        </internal>
-        <internal index="2">
-            {foreach $keys["memory"] as $row}
-                {if $row.device_key_id > 32 && $row.device_key_id <= 64}
-                <Fkey index="{$row.device_key_id-32}">
-                    <Type>{if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if}</Type>
-                    <Value>{if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if}</Value>
-                    <Title>{$row.device_key_label}</Title>
-                    <ICON>{$row.device_key_icon}</ICON>
-                </Fkey>
-                {/if}
-            {/foreach}
-        </internal>
-        <internal index="3">
-            {foreach $keys["memory"] as $row}
-                {if $row.device_key_id > 64 && $row.device_key_id <= 96}
-                <Fkey index="{$row.device_key_id-64}">
-                    <Type>{if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if}</Type>
-                    <Value>{if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if}</Value>
-                    <Title>{$row.device_key_label}</Title>
-                    <ICON>{$row.device_key_icon}</ICON>
-                </Fkey>
-                {/if}
-            {/foreach}
-        </internal>
-        {foreach $keys["programmable"] as $row}
-            <dssSoft index="{$row.device_key_id}">
+        {foreach $keys["memory"] as $row}
+        {if $row.device_key_id <= 32}
+            <Fkey index="{$row.device_key_id}">
                 <Type>{if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if}</Type>
                 <Value>{if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if}</Value>
                 <Title>{$row.device_key_label}</Title>
-            </dssSoft>
+                <ICON>{$row.device_key_icon}</ICON>
+            </Fkey>
+        {/if}
+        {/foreach}
+        </internal>
+        <internal index="2">
+        {foreach $keys["memory"] as $row}
+        {if $row.device_key_id > 32 && $row.device_key_id <= 64}
+            <Fkey index="{$row.device_key_id-32}">
+                <Type>{if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if}</Type>
+                <Value>{if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if}</Value>
+                <Title>{$row.device_key_label}</Title>
+                <ICON>{$row.device_key_icon}</ICON>
+            </Fkey>
+        {/if}
+        {/foreach}
+        </internal>
+        <internal index="3">
+        {foreach $keys["memory"] as $row}
+        {if $row.device_key_id > 64 && $row.device_key_id <= 96}
+            <Fkey index="{$row.device_key_id-64}">
+                <Type>{if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if}</Type>
+                <Value>{if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if}</Value>
+                <Title>{$row.device_key_label}</Title>
+                <ICON>{$row.device_key_icon}</ICON>
+            </Fkey>
+        {/if}
+        {/foreach}
+        </internal>
+        {foreach $keys["programmable"] as $row}
+        <dssSoft index="{$row.device_key_id}">
+            <Type>1</Type>
+            <Value>{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}</Value>
+            <Title>{$row.device_key_label}</Title>
+        </dssSoft>
         {/foreach}
     </dsskey>
     <web>
@@ -3855,12 +4142,12 @@
     <log>
         <Level>INFO</Level>
         <Style>level,tag</Style>
-        <OutputDevice>stdout</OutputDevice>
+        <OutputDevice>{if $fanvil_syslog_enable == '1'},syslog{else}stdout{/if}</OutputDevice>
         <FileName>platform.log</FileName>
         <FileSize>512KB</FileSize>
         <SyslogTag>platform</SyslogTag>
-        <SyslogServer>0.0.0.0</SyslogServer>
-        <SyslogServerPort>514</SyslogServerPort>
+        <SyslogServer>{if isset($fanvil_syslog_server)}{$fanvil_syslog_server}{else}0.0.0.0{/if}</SyslogServer>
+        <SyslogServerPort>{if isset($fanvil_syslog_server_port)}{$fanvil_syslog_server_port}{else}514{/if}</SyslogServerPort>
     </log>
     <tr069>
         <TR069Tone>1</TR069Tone>
@@ -3876,7 +4163,7 @@
         <CPEUserName>dps</CPEUserName>
         <CPEPassword>dps</CPEPassword>
         <PeriodixInterval>3600</PeriodixInterval>
-        <TLSVersion>0</TLSVersion>
+        <TLSVersion>2</TLSVersion>
         <AreaCode>020</AreaCode>
         <STUNEnable>0</STUNEnable>
         <STUNServerAddr>{$fanvil_stun_server}</STUNServerAddr>
@@ -3890,23 +4177,88 @@
         <ListenIP>224.0.2.0</ListenIP>
         <ListenPort>16360</ListenPort>
         <OwnName>SIP Hotspot</OwnName>
+        <RingMode>0</RingMode>
+        <EnableManageMode>0</EnableManageMode>
+        <EnableConfigMode>0</EnableConfigMode>
         <hs index="1">
             <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
         </hs>
         <hs index="2">
             <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
         </hs>
         <hs index="3">
             <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
         </hs>
         <hs index="4">
             <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
         </hs>
         <hs index="5">
             <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
         </hs>
         <hs index="6">
             <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
+        </hs>
+        <hs index="7">
+            <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
+        </hs>
+        <hs index="8">
+            <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
+        </hs>
+        <hs index="9">
+            <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
+        </hs>
+        <hs index="10">
+            <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
+        </hs>
+        <hs index="11">
+            <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
+        </hs>
+        <hs index="12">
+            <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
+        </hs>
+        <hs index="13">
+            <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
+        </hs>
+        <hs index="14">
+            <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
+        </hs>
+        <hs index="15">
+            <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
+        </hs>
+        <hs index="16">
+            <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
+        </hs>
+        <hs index="17">
+            <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
+        </hs>
+        <hs index="18">
+            <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
+        </hs>
+        <hs index="19">
+            <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
+        </hs>
+        <hs index="20">
+            <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
         </hs>
     </hotspot>
     <vpn>
@@ -3914,11 +4266,11 @@
         <EnableVPN>0</EnableVPN>
         <EnableNat>0</EnableNat>
         <Openvpnmode>0</Openvpnmode>
-        <L2TPServerAddress>0.0.0.0</L2TPServerAddress>
+        <L2TPServerAddress></L2TPServerAddress>
         <L2TPUserName></L2TPUserName>
         <L2TPPassword></L2TPPassword>
         <L2TPNegotiateDNS>1</L2TPNegotiateDNS>
-        <PPTPServerAddress>0.0.0.0</PPTPServerAddress>
+        <PPTPServerAddress></PPTPServerAddress>
         <PPTPUserName></PPTPUserName>
         <PPTPPassword></PPTPPassword>
     </vpn>
@@ -3953,6 +4305,7 @@
             <DHCPOption>66</DHCPOption>
             <DHCPv6Option>0</DHCPv6Option>
             <DhcpOption120>0</DhcpOption120>
+            <SaveDHCPOpion>0</SaveDHCPOpion>
         </opt>
     </ap>
     <fwCheck>
@@ -3982,6 +4335,22 @@
         <CDPRefreshTime>60</CDPRefreshTime>
         <DHCPOptionVlan>132</DHCPOptionVlan>
     </qos>
+    <pubApp>
+        <WatchDogEnabled>1</WatchDogEnabled>
+        <EnableInAccess>0</EnableInAccess>
+        <EnableOutAccess>0</EnableOutAccess>
+    </pubApp>
+    <vqm>
+        <SessionReport>1</SessionReport>
+        <IntervalReport>1</IntervalReport>
+        <IntervalPeriod>60</IntervalPeriod>
+        <MOS-LQWarning>40</MOS-LQWarning>
+        <MOS-LQCritical>25</MOS-LQCritical>
+        <DelayWarning>150</DelayWarning>
+        <DelayCritical>200</DelayCritical>
+        <PhoneReport>1</PhoneReport>
+        <WEBReport>1</WEBReport>
+    </vqm>
     <dot1x>
         <XsupMode>0</XsupMode>
         <XsupUser>admin</XsupUser>
@@ -4024,5 +4393,24 @@
         <SMSPopup>1</SMSPopup>
         <OtherPopup>1</OtherPopup>
         <EnablePortMirror>0</EnablePortMirror>
+        <AutoCloseLed>0</AutoCloseLed>
+        <IdleTimeFontColor>0xffffff</IdleTimeFontColor>
+        <CommonTitleFontColor>0xffffff</CommonTitleFontColor>
+        <SoftkeyFontColor>0xffffff</SoftkeyFontColor>
+        <MenuListFontColor>0x262626</MenuListFontColor>
+        <ScrollBarColor>0x5a9dba</ScrollBarColor>
+        <WarnThemeColor>0xc4012f</WarnThemeColor>
+        <InformThemeColor>0x007bb0</InformThemeColor>
+        <FunkeyListFontColor>0xffffff</FunkeyListFontColor>
+        <TalkingFontColor>0x262626</TalkingFontColor>
+        <SidekeyLabelLength>0</SidekeyLabelLength>
+        <AppIconDisplay>1,1,1,1</AppIconDisplay>
+        <DisplayProvisionprompt>0</DisplayProvisionprompt>
+        <DsskeyPage1Type>0</DsskeyPage1Type>
+        <DsskeyPage2Type>0</DsskeyPage2Type>
+        <DsskeyPage3Type>0</DsskeyPage3Type>
+        <DsskeyPage1XmlUrl></DsskeyPage1XmlUrl>
+        <DsskeyPage2XmlUrl></DsskeyPage2XmlUrl>
+        <DsskeyPage3XmlUrl></DsskeyPage3XmlUrl>
     </background>
 </sysConf>
diff --git a/resources/templates/provision/fanvil/x3sg/{$mac}.cfg b/resources/templates/provision/fanvil/x3sg/{$mac}.cfg
index 72daacdf3b..c1b773fdb8 100644
--- a/resources/templates/provision/fanvil/x3sg/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x3sg/{$mac}.cfg
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--Template is optimized for firmware ver 2.2.10 and newer. Older firmware has incorrect tag names.-->
 <sysConf>
     <Version>2.0000000000</Version>
     <net>
@@ -98,17 +99,21 @@
             <RegisterUser>{$account.1.auth_id}</RegisterUser>
             <RegisterPswd>{$account.1.password}</RegisterPswd>
             <RegisterTTL>{$account.1.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.1.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.1.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.1.sip_port}</ProxyPort>
             <ProxyUser>{$account.1.auth_id}</ProxyUser>
             <ProxyPswd>{$account.1.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.1.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.1.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.1.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
@@ -165,7 +170,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.1.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.1.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.1.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.1.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -206,6 +211,7 @@
             <Respond182>0</Respond182>
             <EnableBLFList>0</EnableBLFList>
             <CallerIdType>4</CallerIdType>
+            <KeepHigherCallerID>0</KeepHigherCallerID>
             <SynClockTime>0</SynClockTime>
             <MohServer></MohServer>
             <UseVPN>1</UseVPN>
@@ -245,6 +251,7 @@
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
             <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="2">
             <PhoneNumber>{$account.2.user_id}</PhoneNumber>
@@ -255,17 +262,21 @@
             <RegisterUser>{$account.2.auth_id}</RegisterUser>
             <RegisterPswd>{$account.2.password}</RegisterPswd>
             <RegisterTTL>{$account.2.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.2.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.2.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.2.sip_port}</ProxyPort>
             <ProxyUser>{$account.2.auth_id}</ProxyUser>
             <ProxyPswd>{$account.2.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.2.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.2.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.2.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
@@ -322,7 +333,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.2.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.2.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.2.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.2.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -363,6 +374,7 @@
             <Respond182>0</Respond182>
             <EnableBLFList>0</EnableBLFList>
             <CallerIdType>4</CallerIdType>
+            <KeepHigherCallerID>0</KeepHigherCallerID>
             <SynClockTime>0</SynClockTime>
             <MohServer></MohServer>
             <UseVPN>1</UseVPN>
@@ -402,6 +414,7 @@
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
             <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="3">
             <PhoneNumber>{$account.3.user_id}</PhoneNumber>
@@ -412,17 +425,21 @@
             <RegisterUser>{$account.3.auth_id}</RegisterUser>
             <RegisterPswd>{$account.3.password}</RegisterPswd>
             <RegisterTTL>{$account.3.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.3.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.3.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.3.sip_port}</ProxyPort>
             <ProxyUser>{$account.3.auth_id}</ProxyUser>
             <ProxyPswd>{$account.3.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.3.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.3.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.3.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
@@ -479,7 +496,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.3.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.3.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.3.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.3.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -520,6 +537,7 @@
             <Respond182>0</Respond182>
             <EnableBLFList>0</EnableBLFList>
             <CallerIdType>4</CallerIdType>
+            <KeepHigherCallerID>0</KeepHigherCallerID>
             <SynClockTime>0</SynClockTime>
             <MohServer></MohServer>
             <UseVPN>1</UseVPN>
@@ -559,6 +577,7 @@
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
             <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="4">
             <PhoneNumber>{$account.4.user_id}</PhoneNumber>
@@ -569,17 +588,21 @@
             <RegisterUser>{$account.4.auth_id}</RegisterUser>
             <RegisterPswd>{$account.4.password}</RegisterPswd>
             <RegisterTTL>{$account.4.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.4.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.4.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.4.sip_port}</ProxyPort>
             <ProxyUser>{$account.4.auth_id}</ProxyUser>
             <ProxyPswd>{$account.4.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.4.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.4.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.4.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
@@ -636,7 +659,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.4.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.4.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.4.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.4.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -677,6 +700,7 @@
             <Respond182>0</Respond182>
             <EnableBLFList>0</EnableBLFList>
             <CallerIdType>4</CallerIdType>
+            <KeepHigherCallerID>0</KeepHigherCallerID>
             <SynClockTime>0</SynClockTime>
             <MohServer></MohServer>
             <UseVPN>1</UseVPN>
@@ -716,6 +740,7 @@
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
             <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <p2p>
             <SIPP2PEnableAutoAnswer>0</SIPP2PEnableAutoAnswer>
@@ -724,6 +749,7 @@
             <SIPP2PSipInfoDtmfMode>0</SIPP2PSipInfoDtmfMode>
             <SIPP2PEnablePreview>0</SIPP2PEnablePreview>
             <SIPP2PPreviewMode>0</SIPP2PPreviewMode>
+            <SIPP2PUseVPN>1</SIPP2PUseVPN>
         </p2p>
     </sip>
     <call>
@@ -799,6 +825,8 @@
             <CallNumberFilter></CallNumberFilter>
             <AutoResumeCurrent>0</AutoResumeCurrent>
             <AlertTimeout>120</AlertTimeout>
+            <RingTimeout>120</RingTimeout>
+            <RingPriority>0</RingPriority>
         </port>
         <basic>
             <DialbyPound>1</DialbyPound>
@@ -879,7 +907,7 @@
         <CallLogDisplayType>0</CallLogDisplayType>
         <EnableRecvSMS>1</EnableRecvSMS>
         <EnableCallHistory>1</EnableCallHistory>
-        <LineDisplayFormat>$name@$protocol$instance</LineDisplayFormat>
+        <LineDisplayFormat>$name</LineDisplayFormat>
         <EnableMWITone>0</EnableMWITone>
         <AllPswdEncryption>0</AllPswdEncryption>
         <SIPNotifyXML>1</SIPNotifyXML>
@@ -1252,6 +1280,7 @@
     <cti>
         <EnabledActiveUri>1</EnabledActiveUri>
         <EnabledActionUrl>1</EnabledActionUrl>
+        <ActionUrlType>0</ActionUrlType>
         <ActiveUriIP></ActiveUriIP>
         <StartRebootUrl></StartRebootUrl>
         <BootCompletedUrl></BootCompletedUrl>
@@ -1262,6 +1291,8 @@
         <PhoneStateIdleUrl></PhoneStateIdleUrl>
         <PhoneStateTalking></PhoneStateTalking>
         <PhoneStateRinging></PhoneStateRinging>
+        <OnhookUri></OnhookUri>
+        <OffhookUrl></OffhookUrl>
         <DNDOnUrl></DNDOnUrl>
         <DNDOffUrl></DNDOffUrl>
         <AlwaysFWDOnUrl></AlwaysFWDOnUrl>
@@ -1531,6 +1562,7 @@
             <DHCPOption>66</DHCPOption>
             <DHCPv6Option>0</DHCPv6Option>
             <DhcpOption120>0</DhcpOption120>
+            <SaveDHCPOpion>0</SaveDHCPOpion>
         </opt>
     </ap>
     <fwCheck>
diff --git a/resources/templates/provision/fanvil/x3u/{$mac}.cfg b/resources/templates/provision/fanvil/x3u/{$mac}.cfg
index 0689edb733..814c34ed11 100644
--- a/resources/templates/provision/fanvil/x3u/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x3u/{$mac}.cfg
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--Template is optimized for firmware ver 2.2.10 and newer. Older firmware has incorrect tag names.-->
 <sysConf>
     <Version>2.0000000000</Version>
     <net>
@@ -11,7 +12,7 @@
         <SecondaryDNS>{if isset($dns_server_secondary)}{$dns_server_secondary}{else}208.67.222.222{/if}</SecondaryDNS>
         <EnableDHCP>1</EnableDHCP>
         <DHCPAutoDNS>1</DHCPAutoDNS>
-        <DHCPAutoTime>1</DHCPAutoTime>
+
         <DHCPOption100-101>1</DHCPOption100-101>
         <UseVendorClassID>0</UseVendorClassID>
         <VendorClassID>Fanvil X3U</VendorClassID>
@@ -43,11 +44,11 @@
         <OpusPayloadType></OpusPayloadType>
         <OpusSampleRate></OpusSampleRate>
         <VAD></VAD>
-        <H264PayloadType></H264PayloadType>
         <ResvAudioBand></ResvAudioBand>
         <RTPInitialPort></RTPInitialPort>
         <RTPPortQuantity></RTPPortQuantity>
         <RTPKeepAlive></RTPKeepAlive>
+        <RTPRelay></RTPRelay>
         <RTCPCNAMEUser></RTCPCNAMEUser>
         <RTCPCNAMEHost></RTCPCNAMEHost>
         <SelectYourTone>{if isset($fanvil_country_toneset)}{$fanvil_country_toneset}{else}11{/if}</SelectYourTone>
@@ -98,22 +99,25 @@
             <RegisterUser>{$account.1.auth_id}</RegisterUser>
             <RegisterPswd>{$account.1.password}</RegisterPswd>
             <RegisterTTL>{$account.1.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.1.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.1.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.1.sip_port}</ProxyPort>
             <ProxyUser>{$account.1.auth_id}</ProxyUser>
             <ProxyPswd>{$account.1.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.1.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.1.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.1.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -147,7 +151,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.1.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.1.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -166,7 +170,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.1.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.1.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.1.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.1.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -174,10 +178,11 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.1.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
+            <RetrieveType>0</RetrieveType>
             <HelpNo></HelpNo>
             <MSRPHelpNum></MSRPHelpNum>
             <UserIsPhone>0</UserIsPhone>
@@ -200,13 +205,14 @@
             <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,iLBC,G722</VoiceCodecMap>
+            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,iLBC,G722</VoiceCodecMap>
             <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
             <EnableBLFList>0</EnableBLFList>
             <CallerIdType>4</CallerIdType>
+            <KeepHigherCallerID>0</KeepHigherCallerID>
             <SynClockTime>0</SynClockTime>
             <MohServer></MohServer>
             <UseVPN>1</UseVPN>
@@ -223,7 +229,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -245,6 +251,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="2">
             <PhoneNumber>{$account.2.user_id}</PhoneNumber>
@@ -255,22 +263,25 @@
             <RegisterUser>{$account.2.auth_id}</RegisterUser>
             <RegisterPswd>{$account.2.password}</RegisterPswd>
             <RegisterTTL>{$account.2.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.2.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.2.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.2.sip_port}</ProxyPort>
             <ProxyUser>{$account.2.auth_id}</ProxyUser>
             <ProxyPswd>{$account.2.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.2.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.2.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.2.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -304,7 +315,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.2.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.2.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -323,7 +334,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.2.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.2.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.2.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.2.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -331,10 +342,11 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.2.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
+            <RetrieveType>0</RetrieveType>
             <HelpNo></HelpNo>
             <MSRPHelpNum></MSRPHelpNum>
             <UserIsPhone>0</UserIsPhone>
@@ -357,13 +369,14 @@
             <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,iLBC,G722</VoiceCodecMap>
+            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,iLBC,G722</VoiceCodecMap>
             <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
             <EnableBLFList>0</EnableBLFList>
             <CallerIdType>4</CallerIdType>
+            <KeepHigherCallerID>0</KeepHigherCallerID>
             <SynClockTime>0</SynClockTime>
             <MohServer></MohServer>
             <UseVPN>1</UseVPN>
@@ -380,7 +393,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -402,6 +415,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="3">
             <PhoneNumber>{$account.3.user_id}</PhoneNumber>
@@ -412,22 +427,25 @@
             <RegisterUser>{$account.3.auth_id}</RegisterUser>
             <RegisterPswd>{$account.3.password}</RegisterPswd>
             <RegisterTTL>{$account.3.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.3.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.3.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.3.sip_port}</ProxyPort>
             <ProxyUser>{$account.3.auth_id}</ProxyUser>
             <ProxyPswd>{$account.3.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.3.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.3.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.3.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -461,7 +479,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.3.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.3.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -480,7 +498,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.3.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.3.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.3.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.3.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -488,10 +506,11 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.3.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
+            <RetrieveType>0</RetrieveType>
             <HelpNo></HelpNo>
             <MSRPHelpNum></MSRPHelpNum>
             <UserIsPhone>0</UserIsPhone>
@@ -514,13 +533,14 @@
             <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,iLBC,G722</VoiceCodecMap>
+            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,iLBC,G722</VoiceCodecMap>
             <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
             <EnableBLFList>0</EnableBLFList>
             <CallerIdType>4</CallerIdType>
+            <KeepHigherCallerID>0</KeepHigherCallerID>
             <SynClockTime>0</SynClockTime>
             <MohServer></MohServer>
             <UseVPN>1</UseVPN>
@@ -537,7 +557,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -559,6 +579,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="4">
             <PhoneNumber>{$account.4.user_id}</PhoneNumber>
@@ -569,22 +591,25 @@
             <RegisterUser>{$account.4.auth_id}</RegisterUser>
             <RegisterPswd>{$account.4.password}</RegisterPswd>
             <RegisterTTL>{$account.4.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.4.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.4.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.4.sip_port}</ProxyPort>
             <ProxyUser>{$account.4.auth_id}</ProxyUser>
             <ProxyPswd>{$account.4.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.4.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.4.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.4.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -618,7 +643,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.4.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.4.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -637,7 +662,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.4.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.4.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.4.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.4.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -645,10 +670,11 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.4.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
+            <RetrieveType>0</RetrieveType>
             <HelpNo></HelpNo>
             <MSRPHelpNum></MSRPHelpNum>
             <UserIsPhone>0</UserIsPhone>
@@ -671,13 +697,14 @@
             <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,iLBC,G722</VoiceCodecMap>
+            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,iLBC,G722</VoiceCodecMap>
             <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
             <EnableBLFList>0</EnableBLFList>
             <CallerIdType>4</CallerIdType>
+            <KeepHigherCallerID>0</KeepHigherCallerID>
             <SynClockTime>0</SynClockTime>
             <MohServer></MohServer>
             <UseVPN>1</UseVPN>
@@ -694,7 +721,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -716,6 +743,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="5">
             <PhoneNumber>{$account.5.user_id}</PhoneNumber>
@@ -726,22 +755,25 @@
             <RegisterUser>{$account.5.auth_id}</RegisterUser>
             <RegisterPswd>{$account.5.password}</RegisterPswd>
             <RegisterTTL>{$account.5.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.5.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.5.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.5.sip_port}</ProxyPort>
             <ProxyUser>{$account.5.auth_id}</ProxyUser>
             <ProxyPswd>{$account.5.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.5.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.5.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.5.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -775,15 +807,15 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.5.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.5.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            <DNSSRV>0</DNSSRV>
-            <DNSMode>0</DNSMode>
+            {if $account.5.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.5.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             <XFERExpire>0</XFERExpire>
             <BanAnonymous>0</BanAnonymous>
             <DialOffLine>0</DialOffLine>
@@ -794,7 +826,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.5.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.5.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.5.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.5.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -802,10 +834,11 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.5.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
+            <RetrieveType>0</RetrieveType>
             <HelpNo></HelpNo>
             <MSRPHelpNum></MSRPHelpNum>
             <UserIsPhone>0</UserIsPhone>
@@ -828,13 +861,14 @@
             <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,iLBC,G722</VoiceCodecMap>
+            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,iLBC,G722</VoiceCodecMap>
             <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
             <EnableBLFList>0</EnableBLFList>
             <CallerIdType>4</CallerIdType>
+            <KeepHigherCallerID>0</KeepHigherCallerID>
             <SynClockTime>0</SynClockTime>
             <MohServer></MohServer>
             <UseVPN>1</UseVPN>
@@ -851,7 +885,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -873,6 +907,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="6">
             <PhoneNumber>{$account.6.user_id}</PhoneNumber>
@@ -883,22 +919,25 @@
             <RegisterUser>{$account.6.auth_id}</RegisterUser>
             <RegisterPswd>{$account.6.password}</RegisterPswd>
             <RegisterTTL>{$account.6.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.6.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.6.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.6.sip_port}</ProxyPort>
             <ProxyUser>{$account.6.auth_id}</ProxyUser>
             <ProxyPswd>{$account.6.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.6.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.6.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.6.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -932,15 +971,15 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.6.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.6.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            <DNSSRV>0</DNSSRV>
-            <DNSMode>0</DNSMode>
+            {if $account.6.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.6.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             <XFERExpire>0</XFERExpire>
             <BanAnonymous>0</BanAnonymous>
             <DialOffLine>0</DialOffLine>
@@ -951,7 +990,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.6.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.6.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.6.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.6.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -959,10 +998,11 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.6.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
+            <RetrieveType>0</RetrieveType>
             <HelpNo></HelpNo>
             <MSRPHelpNum></MSRPHelpNum>
             <UserIsPhone>0</UserIsPhone>
@@ -985,13 +1025,14 @@
             <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,iLBC,G722</VoiceCodecMap>
+            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,iLBC,G722</VoiceCodecMap>
             <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
             <EnableBLFList>0</EnableBLFList>
             <CallerIdType>4</CallerIdType>
+            <KeepHigherCallerID>0</KeepHigherCallerID>
             <SynClockTime>0</SynClockTime>
             <MohServer></MohServer>
             <UseVPN>1</UseVPN>
@@ -1008,7 +1049,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -1030,17 +1071,22 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <p2p>
             <SIPP2PEnableAutoAnswer>0</SIPP2PEnableAutoAnswer>
             <SIPP2PAutoAnswerDelay>30</SIPP2PAutoAnswerDelay>
             <SIPP2PDtmfMode>1</SIPP2PDtmfMode>
             <SIPP2PSipInfoDtmfMode>0</SIPP2PSipInfoDtmfMode>
+            <SIPP2PEnablePreview>0</SIPP2PEnablePreview>
+            <SIPP2PPreviewMode>0</SIPP2PPreviewMode>
+            <SIPP2PUseVPN>1</SIPP2PUseVPN>
         </p2p>
     </sip>
     <call>
         <port index="1">
-            <EnableXferDPlan></EnableXferDPlan>
+            <EnableXferDPlan>1</EnableXferDPlan>
             <EnableFwdDPlan>0</EnableFwdDPlan>
             <EnablePreDPlan>0</EnablePreDPlan>
             <IPDialPrefix>.</IPDialPrefix>
@@ -1085,7 +1131,7 @@
             <AllowIPCall>1</AllowIPCall>
             <CallerNameType>0</CallerNameType>
             <MuteForRing>0</MuteForRing>
-            <AutoHandleVideo>0</AutoHandleVideo>
+            <AutoHandleVideo>1</AutoHandleVideo>
             <DefaultAnsMode>{$fanvil_default_answer_mode}</DefaultAnsMode>
             <DefaultDialMode>{$fanvil_default_dial_mode}</DefaultDialMode>
             <HoldToTransfer>0</HoldToTransfer>
@@ -1109,6 +1155,10 @@
             <ConfDTMFCode></ConfDTMFCode>
             <DisableDialSearch>0</DisableDialSearch>
             <CallNumberFilter></CallNumberFilter>
+            <AutoResumeCurrent>0</AutoResumeCurrent>
+            <AlertTimeout>120</AlertTimeout>
+            <RingTimeout>120</RingTimeout>
+            <RingPriority>0</RingPriority>
         </port>
         <basic>
             <DialbyPound>1</DialbyPound>
@@ -1189,13 +1239,17 @@
         <CallLogDisplayType>0</CallLogDisplayType>
         <EnableRecvSMS>1</EnableRecvSMS>
         <EnableCallHistory>1</EnableCallHistory>
-        <LineDisplayFormat>$name@$protocol$instance</LineDisplayFormat>
+        <LineDisplayFormat>$name</LineDisplayFormat>
         <EnableMWITone>0</EnableMWITone>
         <AllPswdEncryption>0</AllPswdEncryption>
         <SIPNotifyXML>1</SIPNotifyXML>
         <BlockXMLWhenCall>1</BlockXMLWhenCall>
         <XMLUpdateInterval>30</XMLUpdateInterval>
         <VqmDisplayOrder></VqmDisplayOrder>
+        <EnablePushXMLAuth>0</EnablePushXMLAuth>
+        <PickupVisualAlert>0</PickupVisualAlert>
+        <PickupAudioAlert>0</PickupAudioAlert>
+        <PickupRingType></PickupRingType>
         <display>
             <LCDTitle>{$fanvil_greeting}</LCDTitle>
             <LCDConstrast>5</LCDConstrast>
@@ -1216,6 +1270,7 @@
             <Hold>0</Hold>
             <Mute>0</Mute>
             <MissedCall>3</MissedCall>
+            <PowserSaving>1</PowserSaving>
         </powerLed>
         <lineLed>
             <LineIdleColor>0</LineIdleColor>
@@ -1224,25 +1279,36 @@
         <blfLed>
             <BLFIdleColor>0</BLFIdleColor>
             <BLFIdleCtl>1</BLFIdleCtl>
+            <BLFIdleText>terminated</BLFIdleText>
             <BLFRingColor>1</BLFRingColor>
             <BLFRingCtl>2</BLFRingCtl>
-            <BLFUsingColor>1</BLFUsingColor>
-            <BLFUsingCtl>1</BLFUsingCtl>
+            <BLFRingText>early</BLFRingText>
+            <BLFDialingColor>1</BLFDialingColor>
+            <BLFDialingCtl>0</BLFDialingCtl>
+            <BLFDialingText></BLFDialingText>
+            <BLFTalkingColor>1</BLFTalkingColor>
+            <BLFTalkingCtl>1</BLFTalkingCtl>
+            <BLFTalkingText>confirmed</BLFTalkingText>
+            <BLFHoldColor>1</BLFHoldColor>
+            <BLFHoldCtl>0</BLFHoldCtl>
+            <BLFHoldText></BLFHoldText>
             <BLFFailedColor>0</BLFFailedColor>
             <BLFFailedCtl>0</BLFFailedCtl>
+            <BLFFailedText>failed</BLFFailedText>
             <BLFParkedColor>0</BLFParkedColor>
             <BLFParkedCtl>3</BLFParkedCtl>
+            <BLFParkedText>parked</BLFParkedText>
         </blfLed>
         <volume>
-            <HandsetVol></HandsetVol>
-            <HandsetMicVol></HandsetMicVol>
-            <HeadsetVol></HeadsetVol>
-            <HeadsetMicVol></HeadsetMicVol>
-            <HeadsetRingVol></HeadsetRingVol>
-            <HandFreeVol></HandFreeVol>
-            <HandFreeMicVol></HandFreeMicVol>
-            <HandFreeRingVol></HandFreeRingVol>
-            <RingType>{if isset($fanvil_default_ringtone)}{$fanvil_default_ringtone}{else}Type 1{/if}</RingType>
+            <HandsetVol>5</HandsetVol>
+            <HandsetMicVol>3</HandsetMicVol>
+            <HeadsetVol>5</HeadsetVol>
+            <HeadsetMicVol>3</HeadsetMicVol>
+            <HeadsetRingVol>5</HeadsetRingVol>
+            <HandFreeVol>8</HandFreeVol>
+            <HandFreeMicVol>3</HandFreeMicVol>
+            <HandFreeRingVol>4</HandFreeRingVol>
+            <RingType>{if isset($fanvil_default_ringtone)}{$fanvil_default_ringtone}{else}Type 2{/if}</RingType>
         </volume>
         <date>
             <EnableSNTP>{if isset($fanvil_enable_sntp)}{$fanvil_enable_sntp}{else}1{/if}</EnableSNTP>
@@ -1274,7 +1340,7 @@
         </timeDisplay>
         <softkey>
             <SoftkeyMode>0</SoftkeyMode>
-            <SoftKeyExitStyle>{if isset($fanvil_softkey_exit)}{$fanvil_softkey_exit}{else}2{/if}</SoftKeyExitStyle>
+             <SoftKeyExitStyle>{if isset($fanvil_softkey_exit)}{$fanvil_softkey_exit}{else}2{/if}</SoftKeyExitStyle>
             <DesktopSoftkey>{if isset($fanvil_softkey_desktopsoftkey)}{$fanvil_softkey_desktopsoftkey}{else}history;contact;dnd;menu;{/if}</DesktopSoftkey>
             <TalkingSoftkey>{if isset($fanvil_softkey_talkingsoftkey)}{$fanvil_softkey_talkingsoftkey}{else}hold;xfer;conf;end;{/if}</TalkingSoftkey>
             <RingingSoftkey>{if isset($fanvil_softkey_ringingsoftkey)}{$fanvil_softkey_ringingsoftkey}{else}accept;none;forward;reject;{/if}</RingingSoftkey>
@@ -1289,6 +1355,7 @@
             <DialerCfwdSoftkey>send;2aB;delete;exit;</DialerCfwdSoftkey>
             <DesktopClick>{if isset($fanvil_softkey_desktopclick)}{$fanvil_softkey_desktopclick}{else}history;status;none;none;none;{/if}</DesktopClick>
             <DailerClick>pline;nline;none;none;none;</DailerClick>
+            <RingingClick>none;none;none;none;none;</RingingClick>
             <CallClick>none;none;none;none;none;</CallClick>
             <DesktopLongPress>status;none;none;none;reset;</DesktopLongPress>
             <DialerConfSoftkey>contact;clogs;redial;video;cancel;</DialerConfSoftkey>
@@ -1529,6 +1596,8 @@
     <dm>
         <OnhookTime>120</OnhookTime>
         <EnableHookflash>0</EnableHookflash>
+        <KeyLongPressTime>2</KeyLongPressTime>
+        <KeyLongLongPressTime>6</KeyLongLongPressTime>
     </dm>
     <vqm>
         <SessionReport>1</SessionReport>
@@ -1544,6 +1613,7 @@
     <cti>
         <EnabledActiveUri>1</EnabledActiveUri>
         <EnabledActionUrl>1</EnabledActionUrl>
+        <ActionUrlType>0</ActionUrlType>
         <ActiveUriIP></ActiveUriIP>
         <StartRebootUrl></StartRebootUrl>
         <BootCompletedUrl></BootCompletedUrl>
@@ -1554,6 +1624,8 @@
         <PhoneStateIdleUrl></PhoneStateIdleUrl>
         <PhoneStateTalking></PhoneStateTalking>
         <PhoneStateRinging></PhoneStateRinging>
+        <OnhookUri></OnhookUri>
+        <OffhookUrl></OffhookUrl>
         <DNDOnUrl></DNDOnUrl>
         <DNDOffUrl></DNDOffUrl>
         <AlwaysFWDOnUrl></AlwaysFWDOnUrl>
@@ -1578,6 +1650,7 @@
         <NewMissedcallUrl></NewMissedcallUrl>
         <NewMWIUrl></NewMWIUrl>
         <NewSMSUrl></NewSMSUrl>
+        <WebAuthChangedUrl></WebAuthChangedUrl>
         <at></at>
     </cti>
     <ateTest>
@@ -1649,6 +1722,9 @@
             <Port>0</Port>
             <Channel>0</Channel>
         </addr>
+        <dynamic>
+            <AutoExitExpires>60</AutoExitExpires>
+        </dynamic>
     </mcast>
     <dsskey>
         <SelectDsskeyAction>0</SelectDsskeyAction>
@@ -1656,10 +1732,12 @@
         <FuncKeyPageNum>1</FuncKeyPageNum>
         <SideKeyPageNum>1</SideKeyPageNum>
         <DSSHomePage>0</DSSHomePage>
+        <DisplayParkedInfo>0</DisplayParkedInfo>
         <DSSDIALSwitchMode>0</DSSDIALSwitchMode>
         <FirstCallWaitTime>16</FirstCallWaitTime>
         <FirstNumStartTime>360</FirstNumStartTime>
         <FirstNumEndTime>1080</FirstNumEndTime>
+        <DSSLongPressAction>1</DSSLongPressAction>
         <Extern1PageBelong>0</Extern1PageBelong>
         <Extern2PageBelong>0</Extern2PageBelong>
         <Extern3PageBelong>0</Extern3PageBelong>
@@ -1725,7 +1803,7 @@
     </log>
     <tr069>
         <TR069Tone>1</TR069Tone>
-        <CPESerialNumber>00100400FV02001000000c383e3aaf78</CPESerialNumber>
+        <CPESerialNumber></CPESerialNumber>
         <ACSServerType>1</ACSServerType>
         <EnableTR069>0</EnableTR069>
         <ACSURL>0.0.0.0</ACSURL>
@@ -1737,12 +1815,14 @@
         <CPEUserName>dps</CPEUserName>
         <CPEPassword>dps</CPEPassword>
         <PeriodixInterval>3600</PeriodixInterval>
-        <TLSVersion>2</TLSVersion>
+        <TLSVersion>0</TLSVersion>
         <AreaCode>020</AreaCode>
         <STUNEnable>0</STUNEnable>
         <STUNServerAddr>{$fanvil_stun_server}</STUNServerAddr>
         <STUNServerPort>{$fanvil_stun_port}</STUNServerPort>
         <STUNLocalPort>30000</STUNLocalPort>
+        <STUNMaxPeriod>30</STUNMaxPeriod>
+        <STUNMinPeriod>30</STUNMinPeriod>
     </tr069>
     <hotspot>
         <EnableHotspot>0</EnableHotspot>
@@ -1751,23 +1831,32 @@
         <ListenIP>224.0.2.0</ListenIP>
         <ListenPort>16360</ListenPort>
         <OwnName>SIP Hotspot</OwnName>
+        <RingMode>0</RingMode>
+        <EnableManageMode>0</EnableManageMode>
+        <EnableConfigMode>0</EnableConfigMode>
         <hs index="1">
             <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
         </hs>
         <hs index="2">
             <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
         </hs>
         <hs index="3">
             <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
         </hs>
         <hs index="4">
             <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
         </hs>
         <hs index="5">
             <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
         </hs>
         <hs index="6">
             <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
         </hs>
     </hotspot>
     <vpn>
@@ -1794,7 +1883,7 @@
         <DeviceCfgFileKey></DeviceCfgFileKey>
         <CommonCfgFileKey></CommonCfgFileKey>
         <DownloadCommonConf>1</DownloadCommonConf>
-        <SaveProvisionInfo>0</SaveProvisionInfo>
+        <SaveProvisionInfo>1</SaveProvisionInfo>
         <CheckFailTimes>5</CheckFailTimes>
         <FlashServerIP>{if isset($fanvil_provision_url)}{$fanvil_provision_url}{else}https://{$domain_name}/app/provision{/if}</FlashServerIP>
         <FlashFileName>{$fanvil_firmware_config}</FlashFileName>
@@ -1814,6 +1903,8 @@
             <DHCPOption>66</DHCPOption>
             <DHCPv6Option>0</DHCPv6Option>
             <DhcpOption120>0</DhcpOption120>
+            <SaveDHCPOpion>0</SaveDHCPOpion>
+            <DhcpRenewUpgrade>1</DhcpRenewUpgrade>
         </opt>
     </ap>
     <fwCheck>
@@ -1839,7 +1930,7 @@
         <LLDPRefreshTime>{if isset($fanvil_lldp_refresh)}{$fanvil_lldp_refresh}{else}60{/if}</LLDPRefreshTime>
         <LLDPLearnPolicy>{if isset($fanvil_lldp_learn)}{$fanvil_lldp_learn}{else}0{/if}</LLDPLearnPolicy>
         <LLDPSaveLearnData>0</LLDPSaveLearnData>
-        <CDPEnable>0</CDPEnable>
+        <CDPEnable>1</CDPEnable>
         <CDPRefreshTime>60</CDPRefreshTime>
         <DHCPOptionVlan>132</DHCPOptionVlan>
     </qos>
@@ -1867,6 +1958,7 @@
         <ServerAddr>0.0.0.0</ServerAddr>
         <ServerPort>10000</ServerPort>
     </record>
+    <UIconfig></UIconfig>
     <background>
         <TimeoutToScreensaver>0</TimeoutToScreensaver>
         <UserChangeBackground>0</UserChangeBackground>
@@ -1878,5 +1970,19 @@
         <SMSPopup>1</SMSPopup>
         <OtherPopup>1</OtherPopup>
         <EnablePortMirror>0</EnablePortMirror>
+        <SidekeyLabelLength>0</SidekeyLabelLength>
+        <AppIconDisplay>1,1,1,1</AppIconDisplay>
+        <DisplayProvisionprompt>0</DisplayProvisionprompt>
+        <IdleTimeFontColor>0x262626</IdleTimeFontColor>
+        <CommonTitleFontColor>0xffffff</CommonTitleFontColor>
+        <SoftkeyFontColor>0xffffff</SoftkeyFontColor>
+        <MenuListFontColor>0x262626</MenuListFontColor>
+        <ScrollBarColor>0x5a9dba</ScrollBarColor>
+        <WarnThemeColor>0xc4012f</WarnThemeColor>
+        <InformThemeColor>0x007bb0</InformThemeColor>
+        <FunkeyListFontColor>0xffffff</FunkeyListFontColor>
+        <TalkingFontColor>0x262626</TalkingFontColor>
+        <DesktopTimeDisplay>1</DesktopTimeDisplay>
+        <TimeoutToPowerSaving></TimeoutToPowerSaving>
     </background>
 </sysConf>
diff --git a/resources/templates/provision/fanvil/x4u/{$mac}.cfg b/resources/templates/provision/fanvil/x4u/{$mac}.cfg
index 7cdcc915a6..f9a24bd673 100644
--- a/resources/templates/provision/fanvil/x4u/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x4u/{$mac}.cfg
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--Template is optimized for firmware ver 2.2.10 and newer. Older firmware has incorrect tag names.-->
 <sysConf>
     <Version>2.0000000000</Version>
     <net>
@@ -33,7 +34,36 @@
         <Vendor6ClassID>Fanvil X4U</Vendor6ClassID>
         <wifi>
             <WIFIEnable>{$fanvil_wifi_enable}</WIFIEnable>
+            <WIFILogEnable>0</WIFILogEnable>
+            <WANTYPE>0</WANTYPE>
+            <WANIP>192.168.1.179</WANIP>
+            <WANSubnetMask>255.255.255.0</WANSubnetMask>
+            <WANGateway>192.168.1.1</WANGateway>
+            <DomainName></DomainName>
+            <PrimaryDNS>8.8.8.8</PrimaryDNS>
+            <SecondaryDNS>202.96.134.133</SecondaryDNS>
+            <EnableDHCP>1</EnableDHCP>
+            <DHCPAutoDNS>1</DHCPAutoDNS>
+            <DHCPOption100-101>1</DHCPOption100-101>
+            <UseVendorClassID>0</UseVendorClassID>
+            <VendorClassID>Fanvil X4U</VendorClassID>
+            <EnablePPPoE>0</EnablePPPoE>
+            <PPPoEUser>user123</PPPoEUser>
+            <PPPoEPassword>password</PPPoEPassword>
+            <WAN6IP></WAN6IP>
+            <WAN6IPPREFIX></WAN6IPPREFIX>
+            <WAN6Gateway></WAN6Gateway>
+            <Domain6Name></Domain6Name>
+            <PrimaryDNS6></PrimaryDNS6>
+            <SecondaryDNS6></SecondaryDNS6>
+            <EnableDHCP6>1</EnableDHCP6>
+            <DHCP6AutoDNS>1</DHCP6AutoDNS>
+            <UseVendor6ClassID>0</UseVendor6ClassID>
+            <Vendor6ClassID>Fanvil X4U</Vendor6ClassID>
         </wifi>
+        <NetGlobal>
+            <NetPriority>10</NetPriority>
+        </NetGlobal>
     </net>
     <mm>
         <G723BitRate>1</G723BitRate>
@@ -54,6 +84,7 @@
         <RTPInitialPort>10000</RTPInitialPort>
         <RTPPortQuantity>1000</RTPPortQuantity>
         <RTPKeepAlive>1</RTPKeepAlive>
+        <RTPRelay>0</RTPRelay>
         <RTCPCNAMEUser></RTCPCNAMEUser>
         <RTCPCNAMEHost></RTCPCNAMEHost>
         <SelectYourTone>{if isset($fanvil_country_toneset)}{$fanvil_country_toneset}{else}11{/if}</SelectYourTone>
@@ -104,22 +135,25 @@
             <RegisterUser>{$account.1.auth_id}</RegisterUser>
             <RegisterPswd>{$account.1.password}</RegisterPswd>
             <RegisterTTL>{$account.1.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.1.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.1.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.1.sip_port}</ProxyPort>
             <ProxyUser>{$account.1.auth_id}</ProxyUser>
             <ProxyPswd>{$account.1.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.1.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.1.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.1.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -153,7 +187,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.1.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.1.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -172,7 +206,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.1.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.1.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.1.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.1.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -180,7 +214,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.1.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -229,7 +263,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -251,6 +285,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="2">
             <PhoneNumber>{$account.2.user_id}</PhoneNumber>
@@ -261,22 +297,25 @@
             <RegisterUser>{$account.2.auth_id}</RegisterUser>
             <RegisterPswd>{$account.2.password}</RegisterPswd>
             <RegisterTTL>{$account.2.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.2.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.2.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.2.sip_port}</ProxyPort>
             <ProxyUser>{$account.2.auth_id}</ProxyUser>
             <ProxyPswd>{$account.2.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.2.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.2.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.2.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -310,7 +349,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.2.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.2.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -329,7 +368,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.2.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.2.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.2.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.2.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -337,7 +376,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.2.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -386,7 +425,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -408,6 +447,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="3">
             <PhoneNumber>{$account.3.user_id}</PhoneNumber>
@@ -418,22 +459,25 @@
             <RegisterUser>{$account.3.auth_id}</RegisterUser>
             <RegisterPswd>{$account.3.password}</RegisterPswd>
             <RegisterTTL>{$account.3.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.3.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.3.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.3.sip_port}</ProxyPort>
             <ProxyUser>{$account.3.auth_id}</ProxyUser>
             <ProxyPswd>{$account.3.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.3.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.3.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.3.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -467,7 +511,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.3.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.3.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -486,7 +530,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.3.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.3.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.3.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.3.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -494,7 +538,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.3.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -543,7 +587,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -565,6 +609,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="4">
             <PhoneNumber>{$account.4.user_id}</PhoneNumber>
@@ -575,22 +621,25 @@
             <RegisterUser>{$account.4.auth_id}</RegisterUser>
             <RegisterPswd>{$account.4.password}</RegisterPswd>
             <RegisterTTL>{$account.4.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.4.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.4.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.4.sip_port}</ProxyPort>
             <ProxyUser>{$account.4.auth_id}</ProxyUser>
             <ProxyPswd>{$account.4.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.4.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.4.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.4.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -624,7 +673,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.4.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.4.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -643,7 +692,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.4.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.4.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.4.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.4.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -651,7 +700,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.4.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -700,7 +749,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -722,6 +771,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="5">
             <PhoneNumber>{$account.5.user_id}</PhoneNumber>
@@ -732,22 +783,25 @@
             <RegisterUser>{$account.5.auth_id}</RegisterUser>
             <RegisterPswd>{$account.5.password}</RegisterPswd>
             <RegisterTTL>{$account.5.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.5.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.5.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.5.sip_port}</ProxyPort>
             <ProxyUser>{$account.5.auth_id}</ProxyUser>
             <ProxyPswd>{$account.5.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.5.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.5.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.5.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -781,15 +835,15 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.5.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.5.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            <DNSSRV>0</DNSSRV>
-            <DNSMode>0</DNSMode>
+            {if $account.5.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.5.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             <XFERExpire>0</XFERExpire>
             <BanAnonymous>0</BanAnonymous>
             <DialOffLine>0</DialOffLine>
@@ -800,7 +854,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.5.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.5.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.5.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.5.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -808,7 +862,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.5.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -857,7 +911,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -879,6 +933,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="6">
             <PhoneNumber>{$account.6.user_id}</PhoneNumber>
@@ -889,22 +945,25 @@
             <RegisterUser>{$account.6.auth_id}</RegisterUser>
             <RegisterPswd>{$account.6.password}</RegisterPswd>
             <RegisterTTL>{$account.6.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.6.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.6.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.6.sip_port}</ProxyPort>
             <ProxyUser>{$account.6.auth_id}</ProxyUser>
             <ProxyPswd>{$account.6.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.6.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.6.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.6.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -924,7 +983,7 @@
             <PickupNum></PickupNum>
             <JoinNum></JoinNum>
             <IntercomNum></IntercomNum>
-            <RingType>{if isset($fanvil_ringtone_line)}{$fanvil_ringtone_line6}{else}default{/if}</RingType>
+            <RingType>{if isset($fanvil_ringtone_line6)}{$fanvil_ringtone_line6}{else}default{/if}</RingType>
             <NATUDPUpdate>2</NATUDPUpdate>
             <UDPUpdateTTL>30</UDPUpdateTTL>
             <ServerType>0</ServerType>
@@ -938,7 +997,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.6.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.6.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -957,15 +1016,15 @@
             <SignalPort>5060</SignalPort>
             {if $account.6.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.6.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.6.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.6.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
-            <AutoTCP>0</AutoTCP>
+            <AutoTCP>1</AutoTCP>
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.6.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -976,7 +1035,7 @@
             <NoAnswerTime>5</NoAnswerTime>
             <MissedCallLog>1</MissedCallLog>
             <ParkMode></ParkMode>
-            <SvcCodeMode>0</SvcCodeMode>
+            <SvcCodeMode>1</SvcCodeMode>
             <DNDOnSvcCode></DNDOnSvcCode>
             <DNDOffSvcCode></DNDOffSvcCode>
             <CFUOnSvcCode></CFUOnSvcCode>
@@ -992,7 +1051,7 @@
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
             <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -1014,7 +1073,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -1036,6 +1095,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="7">
             <PhoneNumber>{$account.7.user_id}</PhoneNumber>
@@ -1046,22 +1107,25 @@
             <RegisterUser>{$account.7.auth_id}</RegisterUser>
             <RegisterPswd>{$account.7.password}</RegisterPswd>
             <RegisterTTL>{$account.7.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.7.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.7.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.7.sip_port}</ProxyPort>
             <ProxyUser>{$account.7.auth_id}</ProxyUser>
             <ProxyPswd>{$account.7.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.7.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.7.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.7.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -1095,7 +1159,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.7.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.7.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -1114,15 +1178,15 @@
             <SignalPort>5060</SignalPort>
             {if $account.7.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.7.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.7.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.7.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
-            <AutoTCP>0</AutoTCP>
+            <AutoTCP>1</AutoTCP>
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.7.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -1133,7 +1197,7 @@
             <NoAnswerTime>5</NoAnswerTime>
             <MissedCallLog>1</MissedCallLog>
             <ParkMode></ParkMode>
-            <SvcCodeMode>0</SvcCodeMode>
+            <SvcCodeMode>1</SvcCodeMode>
             <DNDOnSvcCode></DNDOnSvcCode>
             <DNDOffSvcCode></DNDOffSvcCode>
             <CFUOnSvcCode></CFUOnSvcCode>
@@ -1149,7 +1213,7 @@
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
             <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -1171,7 +1235,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -1193,6 +1257,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="8">
             <PhoneNumber>{$account.8.user_id}</PhoneNumber>
@@ -1203,22 +1269,25 @@
             <RegisterUser>{$account.8.auth_id}</RegisterUser>
             <RegisterPswd>{$account.8.password}</RegisterPswd>
             <RegisterTTL>{$account.8.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.8.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.8.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.8.sip_port}</ProxyPort>
             <ProxyUser>{$account.8.auth_id}</ProxyUser>
             <ProxyPswd>{$account.8.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.8.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.8.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.8.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -1252,7 +1321,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.8.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.8.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -1271,15 +1340,15 @@
             <SignalPort>5060</SignalPort>
             {if $account.8.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.8.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.8.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.8.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
-            <AutoTCP>0</AutoTCP>
+            <AutoTCP>1</AutoTCP>
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.8.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -1290,7 +1359,7 @@
             <NoAnswerTime>5</NoAnswerTime>
             <MissedCallLog>1</MissedCallLog>
             <ParkMode></ParkMode>
-            <SvcCodeMode>0</SvcCodeMode>
+            <SvcCodeMode>1</SvcCodeMode>
             <DNDOnSvcCode></DNDOnSvcCode>
             <DNDOffSvcCode></DNDOffSvcCode>
             <CFUOnSvcCode></CFUOnSvcCode>
@@ -1306,7 +1375,7 @@
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
             <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -1328,7 +1397,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -1350,6 +1419,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="9">
             <PhoneNumber>{$account.9.user_id}</PhoneNumber>
@@ -1360,22 +1431,25 @@
             <RegisterUser>{$account.9.auth_id}</RegisterUser>
             <RegisterPswd>{$account.9.password}</RegisterPswd>
             <RegisterTTL>{$account.9.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.9.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.9.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.9.sip_port}</ProxyPort>
             <ProxyUser>{$account.9.auth_id}</ProxyUser>
             <ProxyPswd>{$account.9.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.9.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.9.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.9.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -1409,7 +1483,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.9.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.9.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -1428,15 +1502,15 @@
             <SignalPort>5060</SignalPort>
             {if $account.9.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.9.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.9.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.9.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
-            <AutoTCP>0</AutoTCP>
+            <AutoTCP>1</AutoTCP>
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.9.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -1447,7 +1521,7 @@
             <NoAnswerTime>5</NoAnswerTime>
             <MissedCallLog>1</MissedCallLog>
             <ParkMode></ParkMode>
-            <SvcCodeMode>0</SvcCodeMode>
+            <SvcCodeMode>1</SvcCodeMode>
             <DNDOnSvcCode></DNDOnSvcCode>
             <DNDOffSvcCode></DNDOffSvcCode>
             <CFUOnSvcCode></CFUOnSvcCode>
@@ -1463,7 +1537,7 @@
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
             <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -1485,7 +1559,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -1507,6 +1581,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="10">
             <PhoneNumber>{$account.10.user_id}</PhoneNumber>
@@ -1517,22 +1593,25 @@
             <RegisterUser>{$account.10.auth_id}</RegisterUser>
             <RegisterPswd>{$account.10.password}</RegisterPswd>
             <RegisterTTL>{$account.10.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.10.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.10.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.10.sip_port}</ProxyPort>
             <ProxyUser>{$account.10.auth_id}</ProxyUser>
             <ProxyPswd>{$account.10.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.10.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.10.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.10.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -1566,7 +1645,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.10.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.10.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -1585,15 +1664,15 @@
             <SignalPort>5060</SignalPort>
             {if $account.10.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.10.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.10.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.10.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
-            <AutoTCP>0</AutoTCP>
+            <AutoTCP>1</AutoTCP>
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.10.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -1604,7 +1683,7 @@
             <NoAnswerTime>5</NoAnswerTime>
             <MissedCallLog>1</MissedCallLog>
             <ParkMode></ParkMode>
-            <SvcCodeMode>0</SvcCodeMode>
+            <SvcCodeMode>1</SvcCodeMode>
             <DNDOnSvcCode></DNDOnSvcCode>
             <DNDOffSvcCode></DNDOffSvcCode>
             <CFUOnSvcCode></CFUOnSvcCode>
@@ -1620,7 +1699,7 @@
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
             <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -1642,7 +1721,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -1664,6 +1743,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="11">
             <PhoneNumber>{$account.11.user_id}</PhoneNumber>
@@ -1674,22 +1755,25 @@
             <RegisterUser>{$account.11.auth_id}</RegisterUser>
             <RegisterPswd>{$account.11.password}</RegisterPswd>
             <RegisterTTL>{$account.11.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.11.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.11.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.11.sip_port}</ProxyPort>
             <ProxyUser>{$account.11.auth_id}</ProxyUser>
             <ProxyPswd>{$account.11.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.11.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.11.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.11.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -1723,7 +1807,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.11.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.11.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -1742,15 +1826,15 @@
             <SignalPort>5060</SignalPort>
             {if $account.11.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.11.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.11.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.11.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
-            <AutoTCP>0</AutoTCP>
+            <AutoTCP>1</AutoTCP>
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.11.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -1761,7 +1845,7 @@
             <NoAnswerTime>5</NoAnswerTime>
             <MissedCallLog>1</MissedCallLog>
             <ParkMode></ParkMode>
-            <SvcCodeMode>0</SvcCodeMode>
+            <SvcCodeMode>1</SvcCodeMode>
             <DNDOnSvcCode></DNDOnSvcCode>
             <DNDOffSvcCode></DNDOffSvcCode>
             <CFUOnSvcCode></CFUOnSvcCode>
@@ -1777,7 +1861,7 @@
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
             <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -1799,7 +1883,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -1821,6 +1905,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="12">
             <PhoneNumber>{$account.12.user_id}</PhoneNumber>
@@ -1831,22 +1917,25 @@
             <RegisterUser>{$account.12.auth_id}</RegisterUser>
             <RegisterPswd>{$account.12.password}</RegisterPswd>
             <RegisterTTL>{$account.12.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.12.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.12.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.12.sip_port}</ProxyPort>
             <ProxyUser>{$account.12.auth_id}</ProxyUser>
             <ProxyPswd>{$account.12.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.12.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.12.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.12.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -1880,7 +1969,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.12.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.12.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -1899,15 +1988,15 @@
             <SignalPort>5060</SignalPort>
             {if $account.12.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.12.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.12.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.12.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
-            <AutoTCP>0</AutoTCP>
+            <AutoTCP>1</AutoTCP>
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.12.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -1918,7 +2007,7 @@
             <NoAnswerTime>5</NoAnswerTime>
             <MissedCallLog>1</MissedCallLog>
             <ParkMode></ParkMode>
-            <SvcCodeMode>0</SvcCodeMode>
+            <SvcCodeMode>1</SvcCodeMode>
             <DNDOnSvcCode></DNDOnSvcCode>
             <DNDOffSvcCode></DNDOffSvcCode>
             <CFUOnSvcCode></CFUOnSvcCode>
@@ -1934,7 +2023,7 @@
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
             <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -1956,7 +2045,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -1978,12 +2067,17 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <p2p>
             <SIPP2PEnableAutoAnswer>0</SIPP2PEnableAutoAnswer>
             <SIPP2PAutoAnswerDelay>30</SIPP2PAutoAnswerDelay>
             <SIPP2PDtmfMode>1</SIPP2PDtmfMode>
             <SIPP2PSipInfoDtmfMode>0</SIPP2PSipInfoDtmfMode>
+            <SIPP2PEnablePreview>0</SIPP2PEnablePreview>
+            <SIPP2PPreviewMode>0</SIPP2PPreviewMode>
+            <SIPP2PUseVPN>1</SIPP2PUseVPN>
         </p2p>
     </sip>
     <call>
@@ -2057,6 +2151,10 @@
             <ConfDTMFCode></ConfDTMFCode>
             <DisableDialSearch>0</DisableDialSearch>
             <CallNumberFilter></CallNumberFilter>
+            <AutoResumeCurrent>0</AutoResumeCurrent>
+            <AlertTimeout>120</AlertTimeout>
+            <RingTimeout>120</RingTimeout>
+            <RingPriority>0</RingPriority>
         </port>
         <basic>
             <DialbyPound>1</DialbyPound>
@@ -2137,13 +2235,17 @@
         <CallLogDisplayType>0</CallLogDisplayType>
         <EnableRecvSMS>1</EnableRecvSMS>
         <EnableCallHistory>1</EnableCallHistory>
-        <LineDisplayFormat>$name@$protocol$instance</LineDisplayFormat>
+        <LineDisplayFormat>$name</LineDisplayFormat>
         <EnableMWITone>0</EnableMWITone>
         <AllPswdEncryption>0</AllPswdEncryption>
         <SIPNotifyXML>1</SIPNotifyXML>
         <BlockXMLWhenCall>1</BlockXMLWhenCall>
         <XMLUpdateInterval>30</XMLUpdateInterval>
         <VqmDisplayOrder></VqmDisplayOrder>
+        <EnablePushXMLAuth>0</EnablePushXMLAuth>
+        <PickupVisualAlert>0</PickupVisualAlert>
+        <PickupAudioAlert>0</PickupAudioAlert>
+        <PickupRingType></PickupRingType>
         <display>
             <LCDTitle>{$fanvil_greeting}</LCDTitle>
             <LCDConstrast>5</LCDConstrast>
@@ -2172,25 +2274,36 @@
         <blfLed>
             <BLFIdleColor>0</BLFIdleColor>
             <BLFIdleCtl>1</BLFIdleCtl>
+            <BLFIdleText>terminated</BLFIdleText>
             <BLFRingColor>1</BLFRingColor>
             <BLFRingCtl>2</BLFRingCtl>
-            <BLFUsingColor>1</BLFUsingColor>
-            <BLFUsingCtl>1</BLFUsingCtl>
+            <BLFRingText>early</BLFRingText>
+            <BLFDialingColor>1</BLFDialingColor>
+            <BLFDialingCtl>0</BLFDialingCtl>
+            <BLFDialingText></BLFDialingText>
+            <BLFTalkingColor>1</BLFTalkingColor>
+            <BLFTalkingCtl>1</BLFTalkingCtl>
+            <BLFTalkingText>confirmed</BLFTalkingText>
+            <BLFHoldColor>1</BLFHoldColor>
+            <BLFHoldCtl>0</BLFHoldCtl>
+            <BLFHoldText></BLFHoldText>
             <BLFFailedColor>2</BLFFailedColor>
             <BLFFailedCtl>0</BLFFailedCtl>
+            <BLFFailedText>failed</BLFFailedText>
             <BLFParkedColor>0</BLFParkedColor>
             <BLFParkedCtl>3</BLFParkedCtl>
+            <BLFParkedText>parked</BLFParkedText>
         </blfLed>
         <volume>
-            <HandsetVol></HandsetVol>
-            <HandsetMicVol></HandsetMicVol>
-            <HeadsetVol></HeadsetVol>
-            <HeadsetMicVol></HeadsetMicVol>
-            <HeadsetRingVol></HeadsetRingVol>
-            <HandFreeVol></HandFreeVol>
-            <HandFreeMicVol></HandFreeMicVol>
-            <HandFreeRingVol></HandFreeRingVol>
-            <RingType>{if isset($fanvil_default_ringtone)}{$fanvil_default_ringtone}{else}Type 1{/if}</RingType>
+            <HandsetVol>5</HandsetVol>
+            <HandsetMicVol>3</HandsetMicVol>
+            <HeadsetVol>5</HeadsetVol>
+            <HeadsetMicVol>3</HeadsetMicVol>
+            <HeadsetRingVol>5</HeadsetRingVol>
+            <HandFreeVol>8</HandFreeVol>
+            <HandFreeMicVol>3</HandFreeMicVol>
+            <HandFreeRingVol>4</HandFreeRingVol>
+            <RingType>{if isset($fanvil_default_ringtone)}{$fanvil_default_ringtone}{else}Type 2{/if}</RingType>
         </volume>
         <date>
             <EnableSNTP>{if isset($fanvil_enable_sntp)}{$fanvil_enable_sntp}{else}1{/if}</EnableSNTP>
@@ -2235,8 +2348,9 @@
             <DialerCallSoftkey>send;2aB;delete;exit;</DialerCallSoftkey>
             <DialerXferSoftkey>delete;xfer;send;exit;</DialerXferSoftkey>
             <DialerCfwdSoftkey>send;2aB;delete;exit;</DialerCfwdSoftkey>
-            <DesktopClick>history;status;none;none;none;</DesktopClick>
+            <DesktopClick>{if isset($fanvil_softkey_desktopclick)}{$fanvil_softkey_desktopclick}{else}history;status;none;none;none;{/if}</DesktopClick>
             <DailerClick>pline;nline;none;none;none;</DailerClick>
+            <RingingClick>none;none;none;none;none;</RingingClick>
             <CallClick>none;none;voldown;volup;none;</CallClick>
             <DesktopLongPress>status;none;none;none;reset;</DesktopLongPress>
             <DialerConfSoftkey>contact;clogs;redial;video;cancel;</DialerConfSoftkey>
@@ -2477,6 +2591,8 @@
     <dm>
         <OnhookTime>120</OnhookTime>
         <EnableHookflash>0</EnableHookflash>
+        <KeyLongPressTime>2</KeyLongPressTime>
+        <KeyLongLongPressTime>6</KeyLongLongPressTime>
     </dm>
     <vqm>
         <SessionReport>1</SessionReport>
@@ -2526,6 +2642,7 @@
         <NewMissedcallUrl></NewMissedcallUrl>
         <NewMWIUrl></NewMWIUrl>
         <NewSMSUrl></NewSMSUrl>
+        <WebAuthChangedUrl></WebAuthChangedUrl>
         <at></at>
     </cti>
     <ateTest>
@@ -2597,6 +2714,9 @@
             <Port>0</Port>
             <Channel>0</Channel>
         </addr>
+        <dynamic>
+            <AutoExitExpires>60</AutoExitExpires>
+        </dynamic>
     </mcast>
     <dsskey>
         <SelectDsskeyAction>0</SelectDsskeyAction>
@@ -2604,10 +2724,12 @@
         <FuncKeyPageNum>5</FuncKeyPageNum>
         <SideKeyPageNum>1</SideKeyPageNum>
         <DSSHomePage>0</DSSHomePage>
+        <DisplayParkedInfo>0</DisplayParkedInfo>
         <DSSDIALSwitchMode>0</DSSDIALSwitchMode>
         <FirstCallWaitTime>16</FirstCallWaitTime>
         <FirstNumStartTime>360</FirstNumStartTime>
         <FirstNumEndTime>1080</FirstNumEndTime>
+        <DSSLongPressAction>1</DSSLongPressAction>
         <Extern1PageBelong>0</Extern1PageBelong>
         <Extern2PageBelong>0</Extern2PageBelong>
         <Extern3PageBelong>0</Extern3PageBelong>
@@ -2633,7 +2755,6 @@
 	            </Fkey>
             {/foreach}
         </dssSide>
-        
         {strip}{*-- Each Internal Index contains 6 keys --*}{/strip}        
         <internal index="1">
             {foreach $keys["memory"] as $row}
@@ -2737,7 +2858,7 @@
     </log>
     <tr069>
         <TR069Tone>1</TR069Tone>
-        <CPESerialNumber>00100400FV02001000000c383e42691d</CPESerialNumber>
+        <CPESerialNumber></CPESerialNumber>
         <ACSServerType>1</ACSServerType>
         <EnableTR069>0</EnableTR069>
         <ACSURL>0.0.0.0</ACSURL>
@@ -2859,6 +2980,7 @@
             <DHCPOption>66</DHCPOption>
             <DHCPv6Option>0</DHCPv6Option>
             <DhcpOption120>0</DhcpOption120>
+            <SaveDHCPOpion>0</SaveDHCPOpion>
         </opt>
     </ap>
     <fwCheck>
@@ -2929,5 +3051,27 @@
         <OtherPopup>1</OtherPopup>
         <EnablePortMirror>0</EnablePortMirror>
         <AutoCloseLed>0</AutoCloseLed>
+        <IdleTimeFontColor>0xffffff</IdleTimeFontColor>
+        <CommonTitleFontColor>0xffffff</CommonTitleFontColor>
+        <SoftkeyFontColor>0xffffff</SoftkeyFontColor>
+        <MenuListFontColor>0x262626</MenuListFontColor>
+        <ScrollBarColor>0x5a9dba</ScrollBarColor>
+        <WarnThemeColor>0xc4012f</WarnThemeColor>
+        <InformThemeColor>0x007bb0</InformThemeColor>
+        <FunkeyListFontColor>0xffffff</FunkeyListFontColor>
+        <TalkingFontColor>0x262626</TalkingFontColor>
+        <SidekeyLabelLength>0</SidekeyLabelLength>
+        <AppIconDisplay>1,1,1,1</AppIconDisplay>
+        <DisplayProvisionprompt>0</DisplayProvisionprompt>
+        <DsskeyPage1Type>0</DsskeyPage1Type>
+        <DsskeyPage2Type>0</DsskeyPage2Type>
+        <DsskeyPage3Type>0</DsskeyPage3Type>
+        <DsskeyPage4Type>0</DsskeyPage4Type>
+        <DsskeyPage5Type>0</DsskeyPage5Type>
+        <DsskeyPage1XmlUrl></DsskeyPage1XmlUrl>
+        <DsskeyPage2XmlUrl></DsskeyPage2XmlUrl>
+        <DsskeyPage3XmlUrl></DsskeyPage3XmlUrl>
+        <DsskeyPage4XmlUrl></DsskeyPage4XmlUrl>
+        <DsskeyPage5XmlUrl></DsskeyPage5XmlUrl>
     </background>
 </sysConf>
diff --git a/resources/templates/provision/fanvil/x5u/{$mac}.cfg b/resources/templates/provision/fanvil/x5u/{$mac}.cfg
index 38439e2e30..353930b5cc 100644
--- a/resources/templates/provision/fanvil/x5u/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x5u/{$mac}.cfg
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--Template is optimized for firmware ver 2.2.10 and newer. Older firmware has incorrect tag names.-->
 <sysConf>
     <Version>2.0000000000</Version>
     <net>
@@ -33,7 +34,36 @@
         <Vendor6ClassID>Fanvil X5U</Vendor6ClassID>
         <wifi>
             <WIFIEnable>{$fanvil_wifi_enable}</WIFIEnable>
+            <WIFILogEnable>0</WIFILogEnable>
+            <WANTYPE>0</WANTYPE>
+            <WANIP>192.168.1.179</WANIP>
+            <WANSubnetMask>255.255.255.0</WANSubnetMask>
+            <WANGateway>192.168.1.1</WANGateway>
+            <DomainName></DomainName>
+            <PrimaryDNS>8.8.8.8</PrimaryDNS>
+            <SecondaryDNS>202.96.134.133</SecondaryDNS>
+            <EnableDHCP>1</EnableDHCP>
+            <DHCPAutoDNS>1</DHCPAutoDNS>
+            <DHCPOption100-101>1</DHCPOption100-101>
+            <UseVendorClassID>0</UseVendorClassID>
+            <VendorClassID>Fanvil X5U</VendorClassID>
+            <EnablePPPoE>0</EnablePPPoE>
+            <PPPoEUser>user123</PPPoEUser>
+            <PPPoEPassword>password</PPPoEPassword>
+            <WAN6IP></WAN6IP>
+            <WAN6IPPREFIX></WAN6IPPREFIX>
+            <WAN6Gateway></WAN6Gateway>
+            <Domain6Name></Domain6Name>
+            <PrimaryDNS6></PrimaryDNS6>
+            <SecondaryDNS6></SecondaryDNS6>
+            <EnableDHCP6>1</EnableDHCP6>
+            <DHCP6AutoDNS>1</DHCP6AutoDNS>
+            <UseVendor6ClassID>0</UseVendor6ClassID>
+            <Vendor6ClassID>Fanvil X5U</Vendor6ClassID>
         </wifi>
+        <NetGlobal>
+            <NetPriority>10</NetPriority>
+        </NetGlobal>
     </net>
     <mm>
         <G723BitRate>1</G723BitRate>
@@ -54,6 +84,7 @@
         <RTPInitialPort>10000</RTPInitialPort>
         <RTPPortQuantity>1000</RTPPortQuantity>
         <RTPKeepAlive>1</RTPKeepAlive>
+        <RTPRelay>0</RTPRelay>
         <RTCPCNAMEUser></RTCPCNAMEUser>
         <RTCPCNAMEHost></RTCPCNAMEHost>
         <SelectYourTone>{if isset($fanvil_country_toneset)}{$fanvil_country_toneset}{else}11{/if}</SelectYourTone>
@@ -104,22 +135,25 @@
             <RegisterUser>{$account.1.auth_id}</RegisterUser>
             <RegisterPswd>{$account.1.password}</RegisterPswd>
             <RegisterTTL>{$account.1.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.1.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.1.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.1.sip_port}</ProxyPort>
             <ProxyUser>{$account.1.auth_id}</ProxyUser>
             <ProxyPswd>{$account.1.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.1.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.1.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.1.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -153,7 +187,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.1.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.1.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -172,7 +206,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.1.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.1.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.1.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.1.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -180,7 +214,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.1.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -229,7 +263,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -251,6 +285,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="2">
             <PhoneNumber>{$account.2.user_id}</PhoneNumber>
@@ -261,22 +297,24 @@
             <RegisterUser>{$account.2.auth_id}</RegisterUser>
             <RegisterPswd>{$account.2.password}</RegisterPswd>
             <RegisterTTL>{$account.2.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.2.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.2.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.2.sip_port}</ProxyPort>
             <ProxyUser>{$account.2.auth_id}</ProxyUser>
             <ProxyPswd>{$account.2.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.2.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.2.sip_port}</BakProxyPort>
             <EnableFailback>{if isset($account.2.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -310,7 +348,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.2.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.2.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -329,7 +367,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.2.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.2.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.2.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.2.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -337,7 +375,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.2.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -386,7 +424,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -408,6 +446,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="3">
             <PhoneNumber>{$account.3.user_id}</PhoneNumber>
@@ -418,22 +458,25 @@
             <RegisterUser>{$account.3.auth_id}</RegisterUser>
             <RegisterPswd>{$account.3.password}</RegisterPswd>
             <RegisterTTL>{$account.3.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.3.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.3.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.3.sip_port}</ProxyPort>
             <ProxyUser>{$account.3.auth_id}</ProxyUser>
             <ProxyPswd>{$account.3.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.3.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.3.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.3.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -467,7 +510,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.3.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.3.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -486,7 +529,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.3.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.3.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.3.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.3.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -494,7 +537,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.3.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -543,7 +586,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -565,6 +608,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="4">
             <PhoneNumber>{$account.4.user_id}</PhoneNumber>
@@ -575,22 +620,25 @@
             <RegisterUser>{$account.4.auth_id}</RegisterUser>
             <RegisterPswd>{$account.4.password}</RegisterPswd>
             <RegisterTTL>{$account.4.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.4.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.4.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.4.sip_port}</ProxyPort>
             <ProxyUser>{$account.4.auth_id}</ProxyUser>
             <ProxyPswd>{$account.4.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.4.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.4.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.4.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -624,7 +672,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.4.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.4.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -643,7 +691,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.4.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.4.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.4.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.4.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -651,7 +699,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.4.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -700,7 +748,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -722,6 +770,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="5">
             <PhoneNumber>{$account.5.user_id}</PhoneNumber>
@@ -732,22 +782,25 @@
             <RegisterUser>{$account.5.auth_id}</RegisterUser>
             <RegisterPswd>{$account.5.password}</RegisterPswd>
             <RegisterTTL>{$account.5.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.5.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.5.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.5.sip_port}</ProxyPort>
             <ProxyUser>{$account.5.auth_id}</ProxyUser>
             <ProxyPswd>{$account.5.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.5.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.5.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.5.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -781,7 +834,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.5.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.5.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -800,7 +853,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.5.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.5.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.5.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.5.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -808,7 +861,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.5.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -857,7 +910,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -879,6 +932,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="6">
             <PhoneNumber>{$account.6.user_id}</PhoneNumber>
@@ -889,22 +944,25 @@
             <RegisterUser>{$account.6.auth_id}</RegisterUser>
             <RegisterPswd>{$account.6.password}</RegisterPswd>
             <RegisterTTL>{$account.6.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.6.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.6.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.6.sip_port}</ProxyPort>
             <ProxyUser>{$account.6.auth_id}</ProxyUser>
             <ProxyPswd>{$account.6.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.6.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.6.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.6.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -938,7 +996,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.6.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.6.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -957,15 +1015,15 @@
             <SignalPort>5060</SignalPort>
             {if $account.6.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.6.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.6.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.6.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
-            <AutoTCP>0</AutoTCP>
+            <AutoTCP>1</AutoTCP>
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.6.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -976,7 +1034,7 @@
             <NoAnswerTime>5</NoAnswerTime>
             <MissedCallLog>1</MissedCallLog>
             <ParkMode></ParkMode>
-            <SvcCodeMode>0</SvcCodeMode>
+            <SvcCodeMode>1</SvcCodeMode>
             <DNDOnSvcCode></DNDOnSvcCode>
             <DNDOffSvcCode></DNDOffSvcCode>
             <CFUOnSvcCode></CFUOnSvcCode>
@@ -1014,7 +1072,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -1036,6 +1094,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="7">
             <PhoneNumber>{$account.7.user_id}</PhoneNumber>
@@ -1046,22 +1106,25 @@
             <RegisterUser>{$account.7.auth_id}</RegisterUser>
             <RegisterPswd>{$account.7.password}</RegisterPswd>
             <RegisterTTL>{$account.7.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.7.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.7.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.7.sip_port}</ProxyPort>
             <ProxyUser>{$account.7.auth_id}</ProxyUser>
             <ProxyPswd>{$account.7.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.7.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.7.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.7.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -1095,7 +1158,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.7.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.7.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -1114,15 +1177,15 @@
             <SignalPort>5060</SignalPort>
             {if $account.7.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.7.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.7.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.7.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
-            <AutoTCP>0</AutoTCP>
+            <AutoTCP>1</AutoTCP>
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.7.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -1133,7 +1196,7 @@
             <NoAnswerTime>5</NoAnswerTime>
             <MissedCallLog>1</MissedCallLog>
             <ParkMode></ParkMode>
-            <SvcCodeMode>0</SvcCodeMode>
+            <SvcCodeMode>1</SvcCodeMode>
             <DNDOnSvcCode></DNDOnSvcCode>
             <DNDOffSvcCode></DNDOffSvcCode>
             <CFUOnSvcCode></CFUOnSvcCode>
@@ -1171,7 +1234,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -1193,6 +1256,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="8">
             <PhoneNumber>{$account.8.user_id}</PhoneNumber>
@@ -1203,22 +1268,25 @@
             <RegisterUser>{$account.8.auth_id}</RegisterUser>
             <RegisterPswd>{$account.8.password}</RegisterPswd>
             <RegisterTTL>{$account.8.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.8.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.8.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.8.sip_port}</ProxyPort>
             <ProxyUser>{$account.8.auth_id}</ProxyUser>
             <ProxyPswd>{$account.8.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.8.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.8.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.8.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -1252,7 +1320,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.8.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.8.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -1271,15 +1339,15 @@
             <SignalPort>5060</SignalPort>
             {if $account.8.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.8.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.8.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.8.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
-            <AutoTCP>0</AutoTCP>
+            <AutoTCP>1</AutoTCP>
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.8.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -1290,7 +1358,7 @@
             <NoAnswerTime>5</NoAnswerTime>
             <MissedCallLog>1</MissedCallLog>
             <ParkMode></ParkMode>
-            <SvcCodeMode>0</SvcCodeMode>
+            <SvcCodeMode>1</SvcCodeMode>
             <DNDOnSvcCode></DNDOnSvcCode>
             <DNDOffSvcCode></DNDOffSvcCode>
             <CFUOnSvcCode></CFUOnSvcCode>
@@ -1328,7 +1396,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -1350,6 +1418,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="9">
             <PhoneNumber>{$account.9.user_id}</PhoneNumber>
@@ -1360,22 +1430,25 @@
             <RegisterUser>{$account.9.auth_id}</RegisterUser>
             <RegisterPswd>{$account.9.password}</RegisterPswd>
             <RegisterTTL>{$account.9.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.9.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.9.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.9.sip_port}</ProxyPort>
             <ProxyUser>{$account.9.auth_id}</ProxyUser>
             <ProxyPswd>{$account.9.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.9.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.9.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.9.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -1409,7 +1482,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.9.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.9.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -1428,15 +1501,15 @@
             <SignalPort>5060</SignalPort>
             {if $account.9.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.9.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.9.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.9.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
-            <AutoTCP>0</AutoTCP>
+            <AutoTCP>1</AutoTCP>
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.9.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -1447,7 +1520,7 @@
             <NoAnswerTime>5</NoAnswerTime>
             <MissedCallLog>1</MissedCallLog>
             <ParkMode></ParkMode>
-            <SvcCodeMode>0</SvcCodeMode>
+            <SvcCodeMode>1</SvcCodeMode>
             <DNDOnSvcCode></DNDOnSvcCode>
             <DNDOffSvcCode></DNDOffSvcCode>
             <CFUOnSvcCode></CFUOnSvcCode>
@@ -1485,7 +1558,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -1507,6 +1580,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="10">
             <PhoneNumber>{$account.10.user_id}</PhoneNumber>
@@ -1517,22 +1592,25 @@
             <RegisterUser>{$account.10.auth_id}</RegisterUser>
             <RegisterPswd>{$account.10.password}</RegisterPswd>
             <RegisterTTL>{$account.10.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.10.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.10.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.10.sip_port}</ProxyPort>
             <ProxyUser>{$account.10.auth_id}</ProxyUser>
             <ProxyPswd>{$account.10.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.10.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.10.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.10.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -1566,7 +1644,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.10.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.10.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -1585,15 +1663,15 @@
             <SignalPort>5060</SignalPort>
             {if $account.10.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.10.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.10.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.10.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
-            <AutoTCP>0</AutoTCP>
+            <AutoTCP>1</AutoTCP>
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.10.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -1604,7 +1682,7 @@
             <NoAnswerTime>5</NoAnswerTime>
             <MissedCallLog>1</MissedCallLog>
             <ParkMode></ParkMode>
-            <SvcCodeMode>0</SvcCodeMode>
+            <SvcCodeMode>1</SvcCodeMode>
             <DNDOnSvcCode></DNDOnSvcCode>
             <DNDOffSvcCode></DNDOffSvcCode>
             <CFUOnSvcCode></CFUOnSvcCode>
@@ -1642,7 +1720,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -1664,6 +1742,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="11">
             <PhoneNumber>{$account.11.user_id}</PhoneNumber>
@@ -1674,22 +1754,25 @@
             <RegisterUser>{$account.11.auth_id}</RegisterUser>
             <RegisterPswd>{$account.11.password}</RegisterPswd>
             <RegisterTTL>{$account.11.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.11.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.11.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.11.sip_port}</ProxyPort>
             <ProxyUser>{$account.11.auth_id}</ProxyUser>
             <ProxyPswd>{$account.11.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.11.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.11.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.11.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -1723,7 +1806,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.11.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.11.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -1742,15 +1825,15 @@
             <SignalPort>5060</SignalPort>
             {if $account.11.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.11.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.11.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.11.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
-            <AutoTCP>0</AutoTCP>
+            <AutoTCP>1</AutoTCP>
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.11.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -1761,7 +1844,7 @@
             <NoAnswerTime>5</NoAnswerTime>
             <MissedCallLog>1</MissedCallLog>
             <ParkMode></ParkMode>
-            <SvcCodeMode>0</SvcCodeMode>
+            <SvcCodeMode>1</SvcCodeMode>
             <DNDOnSvcCode></DNDOnSvcCode>
             <DNDOffSvcCode></DNDOffSvcCode>
             <CFUOnSvcCode></CFUOnSvcCode>
@@ -1799,7 +1882,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -1821,6 +1904,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="12">
             <PhoneNumber>{$account.12.user_id}</PhoneNumber>
@@ -1831,22 +1916,25 @@
             <RegisterUser>{$account.12.auth_id}</RegisterUser>
             <RegisterPswd>{$account.12.password}</RegisterPswd>
             <RegisterTTL>{$account.12.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.12.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.12.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.12.sip_port}</ProxyPort>
             <ProxyUser>{$account.12.auth_id}</ProxyUser>
             <ProxyPswd>{$account.12.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.12.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.12.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.12.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -1880,7 +1968,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.12.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.12.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -1899,15 +1987,15 @@
             <SignalPort>5060</SignalPort>
             {if $account.12.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.12.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.12.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.12.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
-            <AutoTCP>0</AutoTCP>
+            <AutoTCP>1</AutoTCP>
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.12.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -1918,7 +2006,7 @@
             <NoAnswerTime>5</NoAnswerTime>
             <MissedCallLog>1</MissedCallLog>
             <ParkMode></ParkMode>
-            <SvcCodeMode>0</SvcCodeMode>
+            <SvcCodeMode>1</SvcCodeMode>
             <DNDOnSvcCode></DNDOnSvcCode>
             <DNDOffSvcCode></DNDOffSvcCode>
             <CFUOnSvcCode></CFUOnSvcCode>
@@ -1956,7 +2044,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -1978,6 +2066,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="13">
             <PhoneNumber>{$account.13.user_id}</PhoneNumber>
@@ -1988,22 +2078,25 @@
             <RegisterUser>{$account.13.auth_id}</RegisterUser>
             <RegisterPswd>{$account.13.password}</RegisterPswd>
             <RegisterTTL>{$account.13.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.13.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.13.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.13.sip_port}</ProxyPort>
             <ProxyUser>{$account.13.auth_id}</ProxyUser>
             <ProxyPswd>{$account.13.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.13.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.13.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.13.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -2037,7 +2130,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.13.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.13.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -2056,15 +2149,15 @@
             <SignalPort>5060</SignalPort>
             {if $account.13.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.13.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.13.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.13.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
-            <AutoTCP>0</AutoTCP>
+            <AutoTCP>1</AutoTCP>
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.13.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -2075,7 +2168,7 @@
             <NoAnswerTime>5</NoAnswerTime>
             <MissedCallLog>1</MissedCallLog>
             <ParkMode></ParkMode>
-            <SvcCodeMode>0</SvcCodeMode>
+            <SvcCodeMode>1</SvcCodeMode>
             <DNDOnSvcCode></DNDOnSvcCode>
             <DNDOffSvcCode></DNDOffSvcCode>
             <CFUOnSvcCode></CFUOnSvcCode>
@@ -2113,7 +2206,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -2135,6 +2228,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="14">
             <PhoneNumber>{$account.14.user_id}</PhoneNumber>
@@ -2145,22 +2240,25 @@
             <RegisterUser>{$account.14.auth_id}</RegisterUser>
             <RegisterPswd>{$account.14.password}</RegisterPswd>
             <RegisterTTL>{$account.14.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.14.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.14.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.14.sip_port}</ProxyPort>
             <ProxyUser>{$account.14.auth_id}</ProxyUser>
             <ProxyPswd>{$account.14.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.14.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.14.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.14.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -2194,7 +2292,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.14.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.14.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -2213,15 +2311,15 @@
             <SignalPort>5060</SignalPort>
             {if $account.14.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.14.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.14.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.14.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
-            <AutoTCP>0</AutoTCP>
+            <AutoTCP>1</AutoTCP>
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.14.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -2232,7 +2330,7 @@
             <NoAnswerTime>5</NoAnswerTime>
             <MissedCallLog>1</MissedCallLog>
             <ParkMode></ParkMode>
-            <SvcCodeMode>0</SvcCodeMode>
+            <SvcCodeMode>1</SvcCodeMode>
             <DNDOnSvcCode></DNDOnSvcCode>
             <DNDOffSvcCode></DNDOffSvcCode>
             <CFUOnSvcCode></CFUOnSvcCode>
@@ -2270,7 +2368,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -2292,6 +2390,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="15">
             <PhoneNumber>{$account.15.user_id}</PhoneNumber>
@@ -2302,22 +2402,25 @@
             <RegisterUser>{$account.15.auth_id}</RegisterUser>
             <RegisterPswd>{$account.15.password}</RegisterPswd>
             <RegisterTTL>{$account.15.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.15.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.15.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.15.sip_port}</ProxyPort>
             <ProxyUser>{$account.15.auth_id}</ProxyUser>
             <ProxyPswd>{$account.15.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.15.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.15.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.15.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -2351,7 +2454,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.15.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.15.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -2370,15 +2473,15 @@
             <SignalPort>5060</SignalPort>
             {if $account.15.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.15.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.15.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.15.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
-            <AutoTCP>0</AutoTCP>
+            <AutoTCP>1</AutoTCP>
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.15.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -2389,7 +2492,7 @@
             <NoAnswerTime>5</NoAnswerTime>
             <MissedCallLog>1</MissedCallLog>
             <ParkMode></ParkMode>
-            <SvcCodeMode>0</SvcCodeMode>
+            <SvcCodeMode>1</SvcCodeMode>
             <DNDOnSvcCode></DNDOnSvcCode>
             <DNDOffSvcCode></DNDOffSvcCode>
             <CFUOnSvcCode></CFUOnSvcCode>
@@ -2427,7 +2530,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -2449,6 +2552,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="16">
             <PhoneNumber>{$account.16.user_id}</PhoneNumber>
@@ -2459,22 +2564,25 @@
             <RegisterUser>{$account.16.auth_id}</RegisterUser>
             <RegisterPswd>{$account.16.password}</RegisterPswd>
             <RegisterTTL>{$account.16.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.16.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.16.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.16.sip_port}</ProxyPort>
             <ProxyUser>{$account.16.auth_id}</ProxyUser>
             <ProxyPswd>{$account.16.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.16.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.16.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.16.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -2508,7 +2616,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.16.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.16.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -2527,15 +2635,15 @@
             <SignalPort>5060</SignalPort>
             {if $account.16.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.16.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.16.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.16.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
-            <AutoTCP>0</AutoTCP>
+            <AutoTCP>1</AutoTCP>
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.16.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -2546,7 +2654,7 @@
             <NoAnswerTime>5</NoAnswerTime>
             <MissedCallLog>1</MissedCallLog>
             <ParkMode></ParkMode>
-            <SvcCodeMode>0</SvcCodeMode>
+            <SvcCodeMode>1</SvcCodeMode>
             <DNDOnSvcCode></DNDOnSvcCode>
             <DNDOffSvcCode></DNDOffSvcCode>
             <CFUOnSvcCode></CFUOnSvcCode>
@@ -2584,7 +2692,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -2606,12 +2714,17 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <p2p>
             <SIPP2PEnableAutoAnswer>0</SIPP2PEnableAutoAnswer>
             <SIPP2PAutoAnswerDelay>30</SIPP2PAutoAnswerDelay>
             <SIPP2PDtmfMode>1</SIPP2PDtmfMode>
             <SIPP2PSipInfoDtmfMode>0</SIPP2PSipInfoDtmfMode>
+            <SIPP2PEnablePreview>0</SIPP2PEnablePreview>
+            <SIPP2PPreviewMode>0</SIPP2PPreviewMode>
+            <SIPP2PUseVPN>1</SIPP2PUseVPN>
         </p2p>
     </sip>
     <call>
@@ -2685,6 +2798,10 @@
             <ConfDTMFCode></ConfDTMFCode>
             <DisableDialSearch>0</DisableDialSearch>
             <CallNumberFilter></CallNumberFilter>
+            <AutoResumeCurrent>0</AutoResumeCurrent>
+            <AlertTimeout>120</AlertTimeout>
+            <RingTimeout>120</RingTimeout>
+            <RingPriority>0</RingPriority>
         </port>
         <basic>
             <DialbyPound>1</DialbyPound>
@@ -2765,13 +2882,17 @@
         <CallLogDisplayType>0</CallLogDisplayType>
         <EnableRecvSMS>1</EnableRecvSMS>
         <EnableCallHistory>1</EnableCallHistory>
-        <LineDisplayFormat>$name@$protocol$instance</LineDisplayFormat>
+        <LineDisplayFormat>$name</LineDisplayFormat>
         <EnableMWITone>0</EnableMWITone>
         <AllPswdEncryption>0</AllPswdEncryption>
         <SIPNotifyXML>1</SIPNotifyXML>
         <BlockXMLWhenCall>1</BlockXMLWhenCall>
         <XMLUpdateInterval>30</XMLUpdateInterval>
         <VqmDisplayOrder></VqmDisplayOrder>
+        <EnablePushXMLAuth>0</EnablePushXMLAuth>
+        <PickupVisualAlert>0</PickupVisualAlert>
+        <PickupAudioAlert>0</PickupAudioAlert>
+        <PickupRingType></PickupRingType>
         <display>
             <LCDTitle>{$fanvil_greeting}</LCDTitle>
             <LCDConstrast>5</LCDConstrast>
@@ -2800,25 +2921,36 @@
         <blfLed>
             <BLFIdleColor>0</BLFIdleColor>
             <BLFIdleCtl>1</BLFIdleCtl>
+            <BLFIdleText>terminated</BLFIdleText>
             <BLFRingColor>1</BLFRingColor>
             <BLFRingCtl>2</BLFRingCtl>
-            <BLFUsingColor>1</BLFUsingColor>
-            <BLFUsingCtl>1</BLFUsingCtl>
+            <BLFRingText>early</BLFRingText>
+            <BLFDialingColor>1</BLFDialingColor>
+            <BLFDialingCtl>0</BLFDialingCtl>
+            <BLFDialingText></BLFDialingText>
+            <BLFTalkingColor>1</BLFTalkingColor>
+            <BLFTalkingCtl>1</BLFTalkingCtl>
+            <BLFTalkingText>confirmed</BLFTalkingText>
+            <BLFHoldColor>1</BLFHoldColor>
+            <BLFHoldCtl>0</BLFHoldCtl>
+            <BLFHoldText></BLFHoldText>
             <BLFFailedColor>2</BLFFailedColor>
             <BLFFailedCtl>0</BLFFailedCtl>
+            <BLFFailedText>failed</BLFFailedText>
             <BLFParkedColor>0</BLFParkedColor>
             <BLFParkedCtl>3</BLFParkedCtl>
+            <BLFParkedText>parked</BLFParkedText>
         </blfLed>
         <volume>
-            <HandsetVol></HandsetVol>
-            <HandsetMicVol></HandsetMicVol>
-            <HeadsetVol></HeadsetVol>
-            <HeadsetMicVol></HeadsetMicVol>
-            <HeadsetRingVol></HeadsetRingVol>
-            <HandFreeVol></HandFreeVol>
-            <HandFreeMicVol></HandFreeMicVol>
-            <HandFreeRingVol></HandFreeRingVol>
-            <RingType>{if isset($fanvil_default_ringtone)}{$fanvil_default_ringtone}{else}Type 1{/if}</RingType>
+            <HandsetVol>5</HandsetVol>
+            <HandsetMicVol>3</HandsetMicVol>
+            <HeadsetVol>5</HeadsetVol>
+            <HeadsetMicVol>3</HeadsetMicVol>
+            <HeadsetRingVol>5</HeadsetRingVol>
+            <HandFreeVol>8</HandFreeVol>
+            <HandFreeMicVol>3</HandFreeMicVol>
+            <HandFreeRingVol>4</HandFreeRingVol>
+            <RingType>{if isset($fanvil_default_ringtone)}{$fanvil_default_ringtone}{else}Type 2{/if}</RingType>
         </volume>
         <date>
             <EnableSNTP>{if isset($fanvil_enable_sntp)}{$fanvil_enable_sntp}{else}1{/if}</EnableSNTP>
@@ -2859,7 +2991,7 @@
             <ConferenceSoftkey>hold;none;split;end;</ConferenceSoftkey>
             <WaitingSoftkey>xfer;accept;reject;end;</WaitingSoftkey>
             <EndingSoftkey>redial;none;none;end;</EndingSoftkey>
-            <DialerPreSoftkey>send;save;delete;exit;</DialerPreSoftkey>
+            <DialerPreSoftkey>send;2aB;delete;exit;</DialerPreSoftkey>
             <DialerCallSoftkey>send;2aB;delete;exit;</DialerCallSoftkey>
             <DialerXferSoftkey>delete;xfer;send;exit;</DialerXferSoftkey>
             <DialerCfwdSoftkey>send;2aB;delete;exit;</DialerCfwdSoftkey>
@@ -3105,6 +3237,8 @@
     <dm>
         <OnhookTime>120</OnhookTime>
         <EnableHookflash>0</EnableHookflash>
+        <KeyLongPressTime>2</KeyLongPressTime>
+        <KeyLongLongPressTime>6</KeyLongLongPressTime>
     </dm>
     <vqm>
         <SessionReport>1</SessionReport>
@@ -3154,6 +3288,7 @@
         <NewMissedcallUrl></NewMissedcallUrl>
         <NewMWIUrl></NewMWIUrl>
         <NewSMSUrl></NewSMSUrl>
+        <WebAuthChangedUrl></WebAuthChangedUrl>
         <at></at>
     </cti>
     <ateTest>
@@ -3225,6 +3360,9 @@
             <Port>0</Port>
             <Channel>0</Channel>
         </addr>
+        <dynamic>
+            <AutoExitExpires>60</AutoExitExpires>
+        </dynamic>
     </mcast>
     <dsskey>
         <SelectDsskeyAction>0</SelectDsskeyAction>
@@ -3232,10 +3370,12 @@
         <FuncKeyPageNum>5</FuncKeyPageNum>
         <SideKeyPageNum>1</SideKeyPageNum>
         <DSSHomePage>0</DSSHomePage>
+        <DisplayParkedInfo>0</DisplayParkedInfo>
         <DSSDIALSwitchMode>0</DSSDIALSwitchMode>
         <FirstCallWaitTime>16</FirstCallWaitTime>
         <FirstNumStartTime>360</FirstNumStartTime>
         <FirstNumEndTime>1080</FirstNumEndTime>
+        <DSSLongPressAction>1</DSSLongPressAction>
         <Extern1PageBelong>0</Extern1PageBelong>
         <Extern2PageBelong>0</Extern2PageBelong>
         <Extern3PageBelong>0</Extern3PageBelong>
@@ -3251,15 +3391,16 @@
         <DSSExtend4IP></DSSExtend4IP>
         <DSSExtend5MAC></DSSExtend5MAC>
         <DSSExtend5IP></DSSExtend5IP>
+        <dssSide index="1">
         {foreach $keys["line"] as $row}
-            <SidekeyConfig1 index="{$row.device_key_id}">
+            <Fkey index="{$row.device_key_id}">
                 <Type>{if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if}</Type>
                 <Value>{if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if}</Value>
                 <Title>{$row.device_key_label}</Title>
                 <ICON>{$row.device_key_icon}</ICON>
-            </SidekeyConfig1>
+            </Fkey>
         {/foreach}
-        
+        </dssSide>
         {strip}{*-- Each Internal Index contains 6 keys --*}{/strip}        
         <internal index="1">
             {foreach $keys["memory"] as $row}
@@ -3363,7 +3504,7 @@
     </log>
     <tr069>
         <TR069Tone>1</TR069Tone>
-        <CPESerialNumber>00100400FV02001000000c383e43ed5d</CPESerialNumber>
+        <CPESerialNumber></CPESerialNumber>
         <ACSServerType>1</ACSServerType>
         <EnableTR069>0</EnableTR069>
         <ACSURL>0.0.0.0</ACSURL>
@@ -3501,6 +3642,7 @@
             <DHCPOption>66</DHCPOption>
             <DHCPv6Option>0</DHCPv6Option>
             <DhcpOption120>0</DhcpOption120>
+            <SaveDHCPOpion>0</SaveDHCPOpion>
         </opt>
     </ap>
     <fwCheck>
@@ -3571,5 +3713,27 @@
         <OtherPopup>1</OtherPopup>
         <EnablePortMirror>0</EnablePortMirror>
         <AutoCloseLed>0</AutoCloseLed>
+        <IdleTimeFontColor>0xffffff</IdleTimeFontColor>
+        <CommonTitleFontColor>0xffffff</CommonTitleFontColor>
+        <SoftkeyFontColor>0xffffff</SoftkeyFontColor>
+        <MenuListFontColor>0x262626</MenuListFontColor>
+        <ScrollBarColor>0x5a9dba</ScrollBarColor>
+        <WarnThemeColor>0xc4012f</WarnThemeColor>
+        <InformThemeColor>0x007bb0</InformThemeColor>
+        <FunkeyListFontColor>0xffffff</FunkeyListFontColor>
+        <TalkingFontColor>0x262626</TalkingFontColor>
+        <SidekeyLabelLength>0</SidekeyLabelLength>
+        <AppIconDisplay>1,1,1,1</AppIconDisplay>
+        <DisplayProvisionprompt>0</DisplayProvisionprompt>
+        <DsskeyPage1Type>0</DsskeyPage1Type>
+        <DsskeyPage2Type>0</DsskeyPage2Type>
+        <DsskeyPage3Type>0</DsskeyPage3Type>
+        <DsskeyPage4Type>0</DsskeyPage4Type>
+        <DsskeyPage5Type>0</DsskeyPage5Type>
+        <DsskeyPage1XmlUrl></DsskeyPage1XmlUrl>
+        <DsskeyPage2XmlUrl></DsskeyPage2XmlUrl>
+        <DsskeyPage3XmlUrl></DsskeyPage3XmlUrl>
+        <DsskeyPage4XmlUrl></DsskeyPage4XmlUrl>
+        <DsskeyPage5XmlUrl></DsskeyPage5XmlUrl>
     </background>
 </sysConf>
diff --git a/resources/templates/provision/fanvil/x6u/{$mac}.cfg b/resources/templates/provision/fanvil/x6u/{$mac}.cfg
index 9e2fdfac51..6b597071e8 100644
--- a/resources/templates/provision/fanvil/x6u/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x6u/{$mac}.cfg
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--Template is optimized for firmware ver 2.2.10 and newer. Older firmware has incorrect tag names.-->
 <sysConf>
     <Version>2.0000000000</Version>
     <net>
@@ -33,7 +34,36 @@
         <Vendor6ClassID>Fanvil X6U</Vendor6ClassID>
         <wifi>
             <WIFIEnable>{$fanvil_wifi_enable}</WIFIEnable>
+            <WIFILogEnable>0</WIFILogEnable>
+            <WANTYPE>0</WANTYPE>
+            <WANIP>192.168.1.179</WANIP>
+            <WANSubnetMask>255.255.255.0</WANSubnetMask>
+            <WANGateway>192.168.1.1</WANGateway>
+            <DomainName></DomainName>
+            <PrimaryDNS>8.8.8.8</PrimaryDNS>
+            <SecondaryDNS>202.96.134.133</SecondaryDNS>
+            <EnableDHCP>1</EnableDHCP>
+            <DHCPAutoDNS>1</DHCPAutoDNS>
+            <DHCPOption100-101>1</DHCPOption100-101>
+            <UseVendorClassID>0</UseVendorClassID>
+            <VendorClassID>Fanvil X6U</VendorClassID>
+            <EnablePPPoE>0</EnablePPPoE>
+            <PPPoEUser>user123</PPPoEUser>
+            <PPPoEPassword>password</PPPoEPassword>
+            <WAN6IP></WAN6IP>
+            <WAN6IPPREFIX></WAN6IPPREFIX>
+            <WAN6Gateway></WAN6Gateway>
+            <Domain6Name></Domain6Name>
+            <PrimaryDNS6></PrimaryDNS6>
+            <SecondaryDNS6></SecondaryDNS6>
+            <EnableDHCP6>1</EnableDHCP6>
+            <DHCP6AutoDNS>1</DHCP6AutoDNS>
+            <UseVendor6ClassID>0</UseVendor6ClassID>
+            <Vendor6ClassID>Fanvil X6U</Vendor6ClassID>
         </wifi>
+        <NetGlobal>
+            <NetPriority>10</NetPriority>
+        </NetGlobal>
     </net>
     <mm>
         <G723BitRate>1</G723BitRate>
@@ -54,6 +84,7 @@
         <RTPInitialPort>10000</RTPInitialPort>
         <RTPPortQuantity>1000</RTPPortQuantity>
         <RTPKeepAlive>1</RTPKeepAlive>
+        <RTPRelay>0</RTPRelay>
         <RTCPCNAMEUser></RTCPCNAMEUser>
         <RTCPCNAMEHost></RTCPCNAMEHost>
         <SelectYourTone>{if isset($fanvil_country_toneset)}{$fanvil_country_toneset}{else}11{/if}</SelectYourTone>
@@ -109,22 +140,25 @@
             <RegisterUser>{$account.1.auth_id}</RegisterUser>
             <RegisterPswd>{$account.1.password}</RegisterPswd>
             <RegisterTTL>{$account.1.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.1.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.1.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.1.sip_port}</ProxyPort>
             <ProxyUser>{$account.1.auth_id}</ProxyUser>
             <ProxyPswd>{$account.1.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.1.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.1.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.1.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -158,7 +192,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.1.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.1.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -177,7 +211,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.1.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.1.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.1.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.1.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -185,7 +219,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.1.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -234,7 +268,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -256,6 +290,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="2">
             <PhoneNumber>{$account.2.user_id}</PhoneNumber>
@@ -266,22 +302,25 @@
             <RegisterUser>{$account.2.auth_id}</RegisterUser>
             <RegisterPswd>{$account.2.password}</RegisterPswd>
             <RegisterTTL>{$account.2.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.2.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.2.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.2.sip_port}</ProxyPort>
             <ProxyUser>{$account.2.auth_id}</ProxyUser>
             <ProxyPswd>{$account.2.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.2.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.2.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.2.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -315,7 +354,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.2.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.2.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -334,7 +373,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.2.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.2.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.2.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.2.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -342,7 +381,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.2.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -391,7 +430,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -413,6 +452,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="3">
             <PhoneNumber>{$account.3.user_id}</PhoneNumber>
@@ -423,22 +464,25 @@
             <RegisterUser>{$account.3.auth_id}</RegisterUser>
             <RegisterPswd>{$account.3.password}</RegisterPswd>
             <RegisterTTL>{$account.3.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.3.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.3.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.3.sip_port}</ProxyPort>
             <ProxyUser>{$account.3.auth_id}</ProxyUser>
             <ProxyPswd>{$account.3.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.3.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.3.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.3.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -472,7 +516,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.3.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.3.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -491,7 +535,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.3.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.3.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.3.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.3.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -499,7 +543,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.3.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -548,7 +592,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -570,6 +614,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="4">
             <PhoneNumber>{$account.4.user_id}</PhoneNumber>
@@ -580,22 +626,25 @@
             <RegisterUser>{$account.4.auth_id}</RegisterUser>
             <RegisterPswd>{$account.4.password}</RegisterPswd>
             <RegisterTTL>{$account.4.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.4.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.4.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.4.sip_port}</ProxyPort>
             <ProxyUser>{$account.4.auth_id}</ProxyUser>
             <ProxyPswd>{$account.4.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.4.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.4.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.4.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -629,7 +678,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.4.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.4.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -648,7 +697,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.4.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.4.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.4.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.4.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -656,7 +705,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.4.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -705,7 +754,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -727,6 +776,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="5">
             <PhoneNumber>{$account.5.user_id}</PhoneNumber>
@@ -737,22 +788,25 @@
             <RegisterUser>{$account.5.auth_id}</RegisterUser>
             <RegisterPswd>{$account.5.password}</RegisterPswd>
             <RegisterTTL>{$account.5.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.5.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.5.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.5.sip_port}</ProxyPort>
             <ProxyUser>{$account.5.auth_id}</ProxyUser>
             <ProxyPswd>{$account.5.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.5.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.5.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.5.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -786,7 +840,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.5.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.5.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -805,7 +859,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.5.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.5.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.5.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.5.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -813,7 +867,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.5.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -862,7 +916,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -884,6 +938,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="6">
             <PhoneNumber>{$account.6.user_id}</PhoneNumber>
@@ -894,22 +950,25 @@
             <RegisterUser>{$account.6.auth_id}</RegisterUser>
             <RegisterPswd>{$account.6.password}</RegisterPswd>
             <RegisterTTL>{$account.6.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.6.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.6.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.6.sip_port}</ProxyPort>
             <ProxyUser>{$account.6.auth_id}</ProxyUser>
             <ProxyPswd>{$account.6.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.6.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.6.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.6.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -943,7 +1002,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.6.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.6.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -962,7 +1021,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.6.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.6.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.6.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.6.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -970,7 +1029,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.6.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -1019,7 +1078,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -1041,6 +1100,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="7">
             <PhoneNumber>{$account.7.user_id}</PhoneNumber>
@@ -1051,22 +1112,25 @@
             <RegisterUser>{$account.7.auth_id}</RegisterUser>
             <RegisterPswd>{$account.7.password}</RegisterPswd>
             <RegisterTTL>{$account.7.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.7.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.7.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.7.sip_port}</ProxyPort>
             <ProxyUser>{$account.7.auth_id}</ProxyUser>
             <ProxyPswd>{$account.7.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.7.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.7.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.7.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -1100,7 +1164,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.7.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.7.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -1119,7 +1183,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.7.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.7.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.7.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.7.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -1127,7 +1191,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.7.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -1176,7 +1240,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -1198,6 +1262,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="8">
             <PhoneNumber>{$account.8.user_id}</PhoneNumber>
@@ -1208,22 +1274,25 @@
             <RegisterUser>{$account.8.auth_id}</RegisterUser>
             <RegisterPswd>{$account.8.password}</RegisterPswd>
             <RegisterTTL>{$account.8.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.8.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.8.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.8.sip_port}</ProxyPort>
             <ProxyUser>{$account.8.auth_id}</ProxyUser>
             <ProxyPswd>{$account.8.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.8.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.8.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.8.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -1257,7 +1326,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.8.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.8.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -1276,7 +1345,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.8.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.8.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.8.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.8.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -1284,7 +1353,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.8.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -1333,7 +1402,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -1355,6 +1424,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="9">
             <PhoneNumber>{$account.9.user_id}</PhoneNumber>
@@ -1365,22 +1436,25 @@
             <RegisterUser>{$account.9.auth_id}</RegisterUser>
             <RegisterPswd>{$account.9.password}</RegisterPswd>
             <RegisterTTL>{$account.9.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.9.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.9.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.9.sip_port}</ProxyPort>
             <ProxyUser>{$account.9.auth_id}</ProxyUser>
             <ProxyPswd>{$account.9.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.9.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.9.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.9.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -1414,7 +1488,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.9.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.9.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -1433,7 +1507,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.9.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.9.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.9.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.9.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -1441,7 +1515,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.9.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -1490,7 +1564,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -1512,6 +1586,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="10">
             <PhoneNumber>{$account.10.user_id}</PhoneNumber>
@@ -1522,22 +1598,25 @@
             <RegisterUser>{$account.10.auth_id}</RegisterUser>
             <RegisterPswd>{$account.10.password}</RegisterPswd>
             <RegisterTTL>{$account.10.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.10.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.10.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.10.sip_port}</ProxyPort>
             <ProxyUser>{$account.10.auth_id}</ProxyUser>
             <ProxyPswd>{$account.10.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.10.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.10.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.10.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -1571,7 +1650,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.10.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.10.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -1590,7 +1669,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.10.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.10.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.10.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.10.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -1598,7 +1677,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.10.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -1647,7 +1726,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -1669,6 +1748,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="11">
             <PhoneNumber>{$account.11.user_id}</PhoneNumber>
@@ -1679,22 +1760,25 @@
             <RegisterUser>{$account.11.auth_id}</RegisterUser>
             <RegisterPswd>{$account.11.password}</RegisterPswd>
             <RegisterTTL>{$account.11.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.11.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.11.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.11.sip_port}</ProxyPort>
             <ProxyUser>{$account.11.auth_id}</ProxyUser>
             <ProxyPswd>{$account.11.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.11.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.11.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.11.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -1728,7 +1812,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.11.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.11.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -1747,7 +1831,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.11.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.11.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.11.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.11.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -1755,7 +1839,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.11.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -1804,7 +1888,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -1826,6 +1910,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="12">
             <PhoneNumber>{$account.12.user_id}</PhoneNumber>
@@ -1836,22 +1922,25 @@
             <RegisterUser>{$account.12.auth_id}</RegisterUser>
             <RegisterPswd>{$account.12.password}</RegisterPswd>
             <RegisterTTL>{$account.12.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.12.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.12.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.12.sip_port}</ProxyPort>
             <ProxyUser>{$account.12.auth_id}</ProxyUser>
             <ProxyPswd>{$account.12.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.12.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.12.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.12.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -1885,7 +1974,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.12.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.12.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -1904,7 +1993,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.12.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.12.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.12.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.12.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -1912,7 +2001,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.12.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -1961,7 +2050,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -1983,6 +2072,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="13">
             <PhoneNumber>{$account.13.user_id}</PhoneNumber>
@@ -1997,18 +2088,20 @@
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.13.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.13.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.13.sip_port}</ProxyPort>
             <ProxyUser>{$account.13.auth_id}</ProxyUser>
             <ProxyPswd>{$account.13.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.13.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.13.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.13.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -2042,7 +2135,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.13.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.13.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -2061,7 +2154,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.13.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.13.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.13.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.13.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -2069,7 +2162,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.13.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -2118,7 +2211,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -2140,6 +2233,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="14">
             <PhoneNumber>{$account.14.user_id}</PhoneNumber>
@@ -2150,22 +2245,25 @@
             <RegisterUser>{$account.14.auth_id}</RegisterUser>
             <RegisterPswd>{$account.14.password}</RegisterPswd>
             <RegisterTTL>{$account.14.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.14.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.14.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.14.sip_port}</ProxyPort>
             <ProxyUser>{$account.14.auth_id}</ProxyUser>
             <ProxyPswd>{$account.14.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.14.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.14.sip_port}</BakProxyPort>
+             <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.14.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -2199,7 +2297,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.14.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.14.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -2218,7 +2316,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.14.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.14.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.14.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.14.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -2226,7 +2324,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.14.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -2275,7 +2373,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -2297,6 +2395,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="15">
             <PhoneNumber>{$account.15.user_id}</PhoneNumber>
@@ -2307,22 +2407,25 @@
             <RegisterUser>{$account.15.auth_id}</RegisterUser>
             <RegisterPswd>{$account.15.password}</RegisterPswd>
             <RegisterTTL>{$account.15.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.15.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.15.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.15.sip_port}</ProxyPort>
             <ProxyUser>{$account.15.auth_id}</ProxyUser>
             <ProxyPswd>{$account.15.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.15.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.15.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.15.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -2356,7 +2459,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.15.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.15.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -2375,7 +2478,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.15.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.15.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.15.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.15.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -2383,7 +2486,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.15.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -2432,7 +2535,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -2454,6 +2557,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="16">
             <PhoneNumber>{$account.16.user_id}</PhoneNumber>
@@ -2464,22 +2569,25 @@
             <RegisterUser>{$account.16.auth_id}</RegisterUser>
             <RegisterPswd>{$account.16.password}</RegisterPswd>
             <RegisterTTL>{$account.16.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.16.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.16.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.16.sip_port}</ProxyPort>
             <ProxyUser>{$account.16.auth_id}</ProxyUser>
             <ProxyPswd>{$account.16.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.16.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.16.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.16.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -2513,7 +2621,7 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.16.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.16.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
@@ -2532,7 +2640,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.16.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.16.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.16.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.16.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -2540,7 +2648,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.16.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -2589,7 +2697,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -2611,6 +2719,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="17">
             <PhoneNumber>{$account.17.user_id}</PhoneNumber>
@@ -2621,22 +2731,25 @@
             <RegisterUser>{$account.17.auth_id}</RegisterUser>
             <RegisterPswd>{$account.17.password}</RegisterPswd>
             <RegisterTTL>{$account.17.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.17.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.17.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.17.sip_port}</ProxyPort>
             <ProxyUser>{$account.17.auth_id}</ProxyUser>
             <ProxyPswd>{$account.17.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.17.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.17.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.17.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -2670,14 +2783,13 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.17.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.17.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            <DNSSRV>0</DNSSRV>
             {if $account.17.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
             {if $account.17.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             <XFERExpire>0</XFERExpire>
@@ -2690,7 +2802,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.17.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.17.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.17.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.17.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -2698,7 +2810,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.17.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -2747,7 +2859,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -2769,6 +2881,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="18">
             <PhoneNumber>{$account.18.user_id}</PhoneNumber>
@@ -2779,22 +2893,25 @@
             <RegisterUser>{$account.18.auth_id}</RegisterUser>
             <RegisterPswd>{$account.18.password}</RegisterPswd>
             <RegisterTTL>{$account.18.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.18.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.18.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.18.sip_port}</ProxyPort>
             <ProxyUser>{$account.18.auth_id}</ProxyUser>
             <ProxyPswd>{$account.18.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.18.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.18.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.18.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -2828,14 +2945,13 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.18.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.18.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            <DNSSRV>0</DNSSRV>
             {if $account.18.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
             {if $account.18.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             <XFERExpire>0</XFERExpire>
@@ -2848,7 +2964,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.18.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.18.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.18.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.18.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -2856,7 +2972,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.18.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -2905,7 +3021,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -2927,6 +3043,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="19">
             <PhoneNumber>{$account.19.user_id}</PhoneNumber>
@@ -2937,22 +3055,25 @@
             <RegisterUser>{$account.19.auth_id}</RegisterUser>
             <RegisterPswd>{$account.19.password}</RegisterPswd>
             <RegisterTTL>{$account.19.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.19.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.19.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.19.sip_port}</ProxyPort>
             <ProxyUser>{$account.19.auth_id}</ProxyUser>
             <ProxyPswd>{$account.19.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.19.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.19.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.19.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -2986,14 +3107,13 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.19.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.19.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            <DNSSRV>0</DNSSRV>
             {if $account.19.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
             {if $account.19.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             <XFERExpire>0</XFERExpire>
@@ -3006,7 +3126,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.19.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.19.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.19.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.19.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -3014,7 +3134,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.19.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -3063,7 +3183,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -3085,6 +3205,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="20">
             <PhoneNumber>{$account.20.user_id}</PhoneNumber>
@@ -3095,22 +3217,25 @@
             <RegisterUser>{$account.20.auth_id}</RegisterUser>
             <RegisterPswd>{$account.20.password}</RegisterPswd>
             <RegisterTTL>{$account.20.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.20.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.20.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.20.sip_port}</ProxyPort>
             <ProxyUser>{$account.20.auth_id}</ProxyUser>
             <ProxyPswd>{$account.20.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.20.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.20.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.20.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -3144,14 +3269,13 @@
             <DTMFInfoMode>0</DTMFInfoMode>
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
-            <Subscribe>0</Subscribe>
+            <Subscribe>{if isset($account.20.user_id)}1{else}{/if}</Subscribe>
             <SubExpire>{$account.20.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            <DNSSRV>0</DNSSRV>
             {if $account.20.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
             {if $account.20.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             <XFERExpire>0</XFERExpire>
@@ -3164,7 +3288,7 @@
             <SignalPort>5060</SignalPort>
             {if $account.20.sip_transport == 'udp'}<Transport>0</Transport>{/if}
             {if $account.20.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
-            {if $account.20.sip_transport == 'tls'}<Transport>2</Transport>{/if}
+            {if $account.20.sip_transport == 'tls'}<Transport>3</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
@@ -3172,7 +3296,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum></MWINum>
+            <MWINum>{if isset($account.20.user_id)}*97{else}{/if}</MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -3221,7 +3345,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -3243,12 +3367,17 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <p2p>
             <SIPP2PEnableAutoAnswer>0</SIPP2PEnableAutoAnswer>
             <SIPP2PAutoAnswerDelay>30</SIPP2PAutoAnswerDelay>
             <SIPP2PDtmfMode>1</SIPP2PDtmfMode>
             <SIPP2PSipInfoDtmfMode>0</SIPP2PSipInfoDtmfMode>
+            <SIPP2PEnablePreview>0</SIPP2PEnablePreview>
+            <SIPP2PPreviewMode>0</SIPP2PPreviewMode>
+            <SIPP2PUseVPN>1</SIPP2PUseVPN>
         </p2p>
     </sip>
     <call>
@@ -3322,6 +3451,10 @@
             <ConfDTMFCode></ConfDTMFCode>
             <DisableDialSearch>0</DisableDialSearch>
             <CallNumberFilter></CallNumberFilter>
+            <AutoResumeCurrent>0</AutoResumeCurrent>
+            <AlertTimeout>120</AlertTimeout>
+            <RingTimeout>120</RingTimeout>
+            <RingPriority>0</RingPriority>
         </port>
         <basic>
             <DialbyPound>1</DialbyPound>
@@ -3402,13 +3535,17 @@
         <CallLogDisplayType>0</CallLogDisplayType>
         <EnableRecvSMS>1</EnableRecvSMS>
         <EnableCallHistory>1</EnableCallHistory>
-        <LineDisplayFormat>$name@$protocol$instance</LineDisplayFormat>
+        <LineDisplayFormat>$name</LineDisplayFormat>
         <EnableMWITone>0</EnableMWITone>
         <AllPswdEncryption>0</AllPswdEncryption>
         <SIPNotifyXML>1</SIPNotifyXML>
         <BlockXMLWhenCall>1</BlockXMLWhenCall>
         <XMLUpdateInterval>30</XMLUpdateInterval>
         <VqmDisplayOrder></VqmDisplayOrder>
+        <EnablePushXMLAuth>0</EnablePushXMLAuth>
+        <PickupVisualAlert>0</PickupVisualAlert>
+        <PickupAudioAlert>0</PickupAudioAlert>
+        <PickupRingType></PickupRingType>
         <display>
             <LCDTitle>{$fanvil_greeting}</LCDTitle>
             <LCDConstrast>5</LCDConstrast>
@@ -3437,24 +3574,35 @@
         <blfLed>
             <BLFIdleColor>0</BLFIdleColor>
             <BLFIdleCtl>1</BLFIdleCtl>
+            <BLFIdleText>terminated</BLFIdleText>
             <BLFRingColor>1</BLFRingColor>
             <BLFRingCtl>2</BLFRingCtl>
-            <BLFUsingColor>1</BLFUsingColor>
-            <BLFUsingCtl>1</BLFUsingCtl>
+            <BLFRingText>early</BLFRingText>
+            <BLFDialingColor>1</BLFDialingColor>
+            <BLFDialingCtl>0</BLFDialingCtl>
+            <BLFDialingText></BLFDialingText>
+            <BLFTalkingColor>1</BLFTalkingColor>
+            <BLFTalkingCtl>1</BLFTalkingCtl>
+            <BLFTalkingText>confirmed</BLFTalkingText>
+            <BLFHoldColor>1</BLFHoldColor>
+            <BLFHoldCtl>0</BLFHoldCtl>
+            <BLFHoldText></BLFHoldText>
             <BLFFailedColor>2</BLFFailedColor>
             <BLFFailedCtl>0</BLFFailedCtl>
+            <BLFFailedText>failed</BLFFailedText>
             <BLFParkedColor>0</BLFParkedColor>
             <BLFParkedCtl>3</BLFParkedCtl>
+            <BLFParkedText>parked</BLFParkedText>
         </blfLed>
         <volume>
-            <HandsetVol></HandsetVol>
-            <HandsetMicVol></HandsetMicVol>
-            <HeadsetVol></HeadsetVol>
-            <HeadsetMicVol></HeadsetMicVol>
-            <HeadsetRingVol></HeadsetRingVol>
-            <HandFreeVol></HandFreeVol>
-            <HandFreeMicVol></HandFreeMicVol>
-            <HandFreeRingVol></HandFreeRingVol>
+            <HandsetVol>5</HandsetVol>
+            <HandsetMicVol>3</HandsetMicVol>
+            <HeadsetVol>5</HeadsetVol>
+            <HeadsetMicVol>3</HeadsetMicVol>
+            <HeadsetRingVol>5</HeadsetRingVol>
+            <HandFreeVol>8</HandFreeVol>
+            <HandFreeMicVol>3</HandFreeMicVol>
+            <HandFreeRingVol>4</HandFreeRingVol>
             <RingType>{if isset($fanvil_default_ringtone)}{$fanvil_default_ringtone}{else}Type 2{/if}</RingType>
         </volume>
         <date>
@@ -3742,6 +3890,8 @@
     <dm>
         <OnhookTime>120</OnhookTime>
         <EnableHookflash>0</EnableHookflash>
+        <KeyLongPressTime>2</KeyLongPressTime>
+        <KeyLongLongPressTime>6</KeyLongLongPressTime>
     </dm>
     <vqm>
         <SessionReport>1</SessionReport>
@@ -3791,6 +3941,7 @@
         <NewMissedcallUrl></NewMissedcallUrl>
         <NewMWIUrl></NewMWIUrl>
         <NewSMSUrl></NewSMSUrl>
+        <WebAuthChangedUrl></WebAuthChangedUrl>
         <at></at>
     </cti>
     <ateTest>
@@ -3862,6 +4013,9 @@
             <Port>0</Port>
             <Channel>0</Channel>
         </addr>
+        <dynamic>
+            <AutoExitExpires>60</AutoExitExpires>
+        </dynamic>
     </mcast>
     <dsskey>
         <SelectDsskeyAction>0</SelectDsskeyAction>
@@ -3869,10 +4023,12 @@
         <FuncKeyPageNum>5</FuncKeyPageNum>
         <SideKeyPageNum>1</SideKeyPageNum>
         <DSSHomePage>0</DSSHomePage>
+        <DisplayParkedInfo>0</DisplayParkedInfo>
         <DSSDIALSwitchMode>0</DSSDIALSwitchMode>
         <FirstCallWaitTime>16</FirstCallWaitTime>
         <FirstNumStartTime>360</FirstNumStartTime>
         <FirstNumEndTime>1080</FirstNumEndTime>
+        <DSSLongPressAction>1</DSSLongPressAction>
         <Extern1PageBelong>0</Extern1PageBelong>
         <Extern2PageBelong>0</Extern2PageBelong>
         <Extern3PageBelong>0</Extern3PageBelong>
@@ -3888,15 +4044,16 @@
         <DSSExtend4IP></DSSExtend4IP>
         <DSSExtend5MAC></DSSExtend5MAC>
         <DSSExtend5IP></DSSExtend5IP>
+        <dssSide index="1">
         {foreach $keys["line"] as $row}
-            <SidekeyConfig1 index="{$row.device_key_id}">
+            <Fkey index="{$row.device_key_id}">
                 <Type>{if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if}</Type>
                 <Value>{if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if}</Value>
                 <Title>{$row.device_key_label}</Title>
                 <ICON>{$row.device_key_icon}</ICON>
-            </SidekeyConfig1>
+            </Fkey>
         {/foreach}
-        
+        </dssSide>
         {strip}{*-- Each Internal Index contains 12 keys --*}{/strip}        
         <internal index="1">
             {foreach $keys["memory"] as $row}
@@ -4000,7 +4157,7 @@
     </log>
     <tr069>
         <TR069Tone>1</TR069Tone>
-        <CPESerialNumber>00100400FV02001000000c383e3dc493</CPESerialNumber>
+        <CPESerialNumber></CPESerialNumber>
         <ACSServerType>1</ACSServerType>
         <EnableTR069>0</EnableTR069>
         <ACSURL>0.0.0.0</ACSURL>
@@ -4154,6 +4311,7 @@
             <DHCPOption>66</DHCPOption>
             <DHCPv6Option>0</DHCPv6Option>
             <DhcpOption120>0</DhcpOption120>
+            <SaveDHCPOpion>0</SaveDHCPOpion>
         </opt>
     </ap>
     <fwCheck>
@@ -4224,5 +4382,27 @@
         <OtherPopup>1</OtherPopup>
         <EnablePortMirror>0</EnablePortMirror>
         <AutoCloseLed>0</AutoCloseLed>
+        <IdleTimeFontColor>0xffffff</IdleTimeFontColor>
+        <CommonTitleFontColor>0xffffff</CommonTitleFontColor>
+        <SoftkeyFontColor>0xffffff</SoftkeyFontColor>
+        <MenuListFontColor>0x262626</MenuListFontColor>
+        <ScrollBarColor>0x5a9dba</ScrollBarColor>
+        <WarnThemeColor>0xc4012f</WarnThemeColor>
+        <InformThemeColor>0x007bb0</InformThemeColor>
+        <FunkeyListFontColor>0xffffff</FunkeyListFontColor>
+        <TalkingFontColor>0x262626</TalkingFontColor>
+        <SidekeyLabelLength>0</SidekeyLabelLength>
+        <AppIconDisplay>1,1,1,1</AppIconDisplay>
+        <DisplayProvisionprompt>0</DisplayProvisionprompt>
+        <DsskeyPage1Type>0</DsskeyPage1Type>
+        <DsskeyPage2Type>0</DsskeyPage2Type>
+        <DsskeyPage3Type>0</DsskeyPage3Type>
+        <DsskeyPage4Type>0</DsskeyPage4Type>
+        <DsskeyPage5Type>0</DsskeyPage5Type>
+        <DsskeyPage1XmlUrl></DsskeyPage1XmlUrl>
+        <DsskeyPage2XmlUrl></DsskeyPage2XmlUrl>
+        <DsskeyPage3XmlUrl></DsskeyPage3XmlUrl>
+        <DsskeyPage4XmlUrl></DsskeyPage4XmlUrl>
+        <DsskeyPage5XmlUrl></DsskeyPage5XmlUrl>
     </background>
 </sysConf>
diff --git a/resources/templates/provision/fanvil/x7/{$mac}.cfg b/resources/templates/provision/fanvil/x7/{$mac}.cfg
index a3b3f5f6ff..656ec9b74a 100644
--- a/resources/templates/provision/fanvil/x7/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x7/{$mac}.cfg
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--Template is optimized for firmware ver 2.2.10 and newer. Older firmware has incorrect tag names.-->
 <sysConf>
     <Version>2.0000000000</Version>
     <net>
@@ -19,6 +20,7 @@
         <PPPoEUser>user123</PPPoEUser>
         <PPPoEPassword>password</PPPoEPassword>
         <ARPCacheLife>2</ARPCacheLife>
+        <MTU>1500</MTU>
         <WAN6IP></WAN6IP>
         <WAN6IPPREFIX></WAN6IPPREFIX>
         <WAN6Gateway></WAN6Gateway>
@@ -32,7 +34,36 @@
         <Vendor6ClassID>Fanvil X7</Vendor6ClassID>
         <wifi>
             <WIFIEnable>{$fanvil_wifi_enable}</WIFIEnable>
+            <WIFILogEnable>0</WIFILogEnable>
+            <WANTYPE>0</WANTYPE>
+            <WANIP>192.168.1.179</WANIP>
+            <WANSubnetMask>255.255.255.0</WANSubnetMask>
+            <WANGateway>192.168.1.1</WANGateway>
+            <DomainName></DomainName>
+            <PrimaryDNS>8.8.8.8</PrimaryDNS>
+            <SecondaryDNS>202.96.134.133</SecondaryDNS>
+            <EnableDHCP>1</EnableDHCP>
+            <DHCPAutoDNS>1</DHCPAutoDNS>
+            <DHCPOption100-101>1</DHCPOption100-101>
+            <UseVendorClassID>0</UseVendorClassID>
+            <VendorClassID>Fanvil X7</VendorClassID>
+            <EnablePPPoE>0</EnablePPPoE>
+            <PPPoEUser>user123</PPPoEUser>
+            <PPPoEPassword>password</PPPoEPassword>
+            <WAN6IP></WAN6IP>
+            <WAN6IPPREFIX></WAN6IPPREFIX>
+            <WAN6Gateway></WAN6Gateway>
+            <Domain6Name></Domain6Name>
+            <PrimaryDNS6></PrimaryDNS6>
+            <SecondaryDNS6></SecondaryDNS6>
+            <EnableDHCP6>1</EnableDHCP6>
+            <DHCP6AutoDNS>1</DHCP6AutoDNS>
+            <UseVendor6ClassID>0</UseVendor6ClassID>
+            <Vendor6ClassID></Vendor6ClassID>
         </wifi>
+        <NetGlobal>
+            <NetPriority>10</NetPriority>
+        </NetGlobal>
     </net>
     <mm>
         <G723BitRate>1</G723BitRate>
@@ -53,9 +84,10 @@
         <RTPInitialPort>16384</RTPInitialPort>
         <RTPPortQuantity>16384</RTPPortQuantity>
         <RTPKeepAlive>1</RTPKeepAlive>
+        <RTPRelay>0</RTPRelay>
         <RTCPCNAMEUser></RTCPCNAMEUser>
         <RTCPCNAMEHost></RTCPCNAMEHost>
-        <SelectYourTone>11</SelectYourTone>
+        <SelectYourTone>{if isset($fanvil_country_toneset)}{$fanvil_country_toneset}{else}11{/if}</SelectYourTone>
         <SidetoneGAIN>1</SidetoneGAIN>
         <PlayEgressDTMF>0</PlayEgressDTMF>
         <DialTone>350+440/0</DialTone>
@@ -108,22 +140,25 @@
             <RegisterUser>{$account.1.auth_id}</RegisterUser>
             <RegisterPswd>{$account.1.password}</RegisterPswd>
             <RegisterTTL>{$account.1.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.1.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.1.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.1.sip_port}</ProxyPort>
             <ProxyUser>{$account.1.auth_id}</ProxyUser>
             <ProxyPswd>{$account.1.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.1.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.1.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.1.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -184,7 +219,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum>*97</MWINum>
+            <MWINum></MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -195,19 +230,19 @@
             <NoAnswerTime>5</NoAnswerTime>
             <MissedCallLog>1</MissedCallLog>
             <ParkMode></ParkMode>
-            <SvcCodeMode>1</SvcCodeMode>
-            <DNDOnSvcCode>*78</DNDOnSvcCode>
-            <DNDOffSvcCode>*79</DNDOffSvcCode>
-            <CFUOnSvcCode>*72</CFUOnSvcCode>
-            <CFUOffSvcCode>*73</CFUOffSvcCode>
-            <CFBOnSvcCode>*72</CFBOnSvcCode>
-            <CFBOffSvcCode>*73</CFBOffSvcCode>
-            <CFNOnSvcCode>*72</CFNOnSvcCode>
-            <CFNOffSvcCode>*73</CFNOffSvcCode>
+            <SvcCodeMode>0</SvcCodeMode>
+            <DNDOnSvcCode></DNDOnSvcCode>
+            <DNDOffSvcCode></DNDOffSvcCode>
+            <CFUOnSvcCode></CFUOnSvcCode>
+            <CFUOffSvcCode></CFUOffSvcCode>
+            <CFBOnSvcCode></CFBOnSvcCode>
+            <CFBOffSvcCode></CFBOffSvcCode>
+            <CFNOnSvcCode></CFNOnSvcCode>
+            <CFNOffSvcCode></CFNOffSvcCode>
             <ANCOnSvcCode></ANCOnSvcCode>
             <ANCOffSvcCode></ANCOffSvcCode>
-            <SendANOnCode>*67</SendANOnCode>
-            <SendANOffCode>*67</SendANOffCode>
+            <SendANOnCode></SendANOnCode>
+            <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
             <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
@@ -222,7 +257,7 @@
             <UseVPN>1</UseVPN>
             <EnableDND>0</EnableDND>
             <InactiveHold>0</InactiveHold>
-            <ReqWithPort>0</ReqWithPort>
+            <ReqWithPort>1</ReqWithPort>
             <UpdateRegExpire>1</UpdateRegExpire>
             <EnableSCA>0</EnableSCA>
             <SubCallPark>0</SubCallPark>
@@ -233,7 +268,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -251,6 +286,12 @@
             <BLFDialogMatch>1</BLFDialogMatch>
             <Ptime>0</Ptime>
             <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="2">
             <PhoneNumber>{$account.2.user_id}</PhoneNumber>
@@ -261,22 +302,25 @@
             <RegisterUser>{$account.2.auth_id}</RegisterUser>
             <RegisterPswd>{$account.2.password}</RegisterPswd>
             <RegisterTTL>{$account.2.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.2.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.2.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.2.sip_port}</ProxyPort>
             <ProxyUser>{$account.2.auth_id}</ProxyUser>
             <ProxyPswd>{$account.2.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.2.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.2.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.2.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -337,7 +381,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum>*97</MWINum>
+            <MWINum></MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -348,19 +392,19 @@
             <NoAnswerTime>5</NoAnswerTime>
             <MissedCallLog>1</MissedCallLog>
             <ParkMode></ParkMode>
-            <SvcCodeMode>1</SvcCodeMode>
-            <DNDOnSvcCode>*78</DNDOnSvcCode>
-            <DNDOffSvcCode>*79</DNDOffSvcCode>
-            <CFUOnSvcCode>*72</CFUOnSvcCode>
-            <CFUOffSvcCode>*73</CFUOffSvcCode>
-            <CFBOnSvcCode>*72</CFBOnSvcCode>
-            <CFBOffSvcCode>*73</CFBOffSvcCode>
-            <CFNOnSvcCode>*72</CFNOnSvcCode>
-            <CFNOffSvcCode>*73</CFNOffSvcCode>
+            <SvcCodeMode>0</SvcCodeMode>
+            <DNDOnSvcCode></DNDOnSvcCode>
+            <DNDOffSvcCode></DNDOffSvcCode>
+            <CFUOnSvcCode></CFUOnSvcCode>
+            <CFUOffSvcCode></CFUOffSvcCode>
+            <CFBOnSvcCode></CFBOnSvcCode>
+            <CFBOffSvcCode></CFBOffSvcCode>
+            <CFNOnSvcCode></CFNOnSvcCode>
+            <CFNOffSvcCode></CFNOffSvcCode>
             <ANCOnSvcCode></ANCOnSvcCode>
             <ANCOffSvcCode></ANCOffSvcCode>
-            <SendANOnCode>*67</SendANOnCode>
-            <SendANOffCode>*67</SendANOffCode>
+            <SendANOnCode></SendANOnCode>
+            <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
             <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
@@ -375,7 +419,7 @@
             <UseVPN>1</UseVPN>
             <EnableDND>0</EnableDND>
             <InactiveHold>0</InactiveHold>
-            <ReqWithPort>0</ReqWithPort>
+            <ReqWithPort>1</ReqWithPort>
             <UpdateRegExpire>1</UpdateRegExpire>
             <EnableSCA>0</EnableSCA>
             <SubCallPark>0</SubCallPark>
@@ -386,7 +430,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -404,6 +448,12 @@
             <BLFDialogMatch>1</BLFDialogMatch>
             <Ptime>0</Ptime>
             <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="3">
             <PhoneNumber>{$account.3.user_id}</PhoneNumber>
@@ -414,22 +464,25 @@
             <RegisterUser>{$account.3.auth_id}</RegisterUser>
             <RegisterPswd>{$account.3.password}</RegisterPswd>
             <RegisterTTL>{$account.3.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.3.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.3.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.3.sip_port}</ProxyPort>
             <ProxyUser>{$account.3.auth_id}</ProxyUser>
             <ProxyPswd>{$account.3.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.3.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.3.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.3.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -490,7 +543,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum>*97</MWINum>
+            <MWINum></MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -501,19 +554,17 @@
             <NoAnswerTime>5</NoAnswerTime>
             <MissedCallLog>1</MissedCallLog>
             <ParkMode></ParkMode>
-            <SvcCodeMode>1</SvcCodeMode>
-            <DNDOnSvcCode>*78</DNDOnSvcCode>
-            <DNDOffSvcCode>*79</DNDOffSvcCode>
-            <CFUOnSvcCode>*72</CFUOnSvcCode>
-            <CFUOffSvcCode>*73</CFUOffSvcCode>
-            <CFBOnSvcCode>*72</CFBOnSvcCode>
-            <CFBOffSvcCode>*73</CFBOffSvcCode>
-            <CFNOnSvcCode>*72</CFNOnSvcCode>
-            <CFNOffSvcCode>*73</CFNOffSvcCode>
+            <SvcCodeMode>0</SvcCodeMode>
+            <DNDOnSvcCode></DNDOnSvcCode>
+            <DNDOffSvcCode></DNDOffSvcCode>
+            <CFUOnSvcCode></CFUOnSvcCode>
+            <CFUOffSvcCode></CFUOffSvcCode>
+            <CFBOnSvcCode></CFBOnSvcCode>
+            <CFBOffSvcCode></CFBOffSvcCode>
+            <CFNOnSvcCode></CFNOnSvcCode>
+            <CFNOffSvcCode></CFNOffSvcCode>
             <ANCOnSvcCode></ANCOnSvcCode>
             <ANCOffSvcCode></ANCOffSvcCode>
-            <SendANOnCode>*67</SendANOnCode>
-            <SendANOffCode>*67</SendANOffCode>
             <SendANOnCode></SendANOnCode>
             <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
@@ -530,7 +581,7 @@
             <UseVPN>1</UseVPN>
             <EnableDND>0</EnableDND>
             <InactiveHold>0</InactiveHold>
-            <ReqWithPort>0</ReqWithPort>
+            <ReqWithPort>1</ReqWithPort>
             <UpdateRegExpire>1</UpdateRegExpire>
             <EnableSCA>0</EnableSCA>
             <SubCallPark>0</SubCallPark>
@@ -541,7 +592,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -559,6 +610,12 @@
             <BLFDialogMatch>1</BLFDialogMatch>
             <Ptime>0</Ptime>
             <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="4">
             <PhoneNumber>{$account.4.user_id}</PhoneNumber>
@@ -569,22 +626,25 @@
             <RegisterUser>{$account.4.auth_id}</RegisterUser>
             <RegisterPswd>{$account.4.password}</RegisterPswd>
             <RegisterTTL>{$account.4.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.4.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.4.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.4.sip_port}</ProxyPort>
             <ProxyUser>{$account.4.auth_id}</ProxyUser>
             <ProxyPswd>{$account.4.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.4.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.4.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.4.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -645,7 +705,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum>*97</MWINum>
+            <MWINum></MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -656,19 +716,19 @@
             <NoAnswerTime>5</NoAnswerTime>
             <MissedCallLog>1</MissedCallLog>
             <ParkMode></ParkMode>
-            <SvcCodeMode>1</SvcCodeMode>
-            <DNDOnSvcCode>*78</DNDOnSvcCode>
-            <DNDOffSvcCode>*79</DNDOffSvcCode>
-            <CFUOnSvcCode>*72</CFUOnSvcCode>
-            <CFUOffSvcCode>*73</CFUOffSvcCode>
-            <CFBOnSvcCode>*72</CFBOnSvcCode>
-            <CFBOffSvcCode>*73</CFBOffSvcCode>
-            <CFNOnSvcCode>*72</CFNOnSvcCode>
-            <CFNOffSvcCode>*73</CFNOffSvcCode>
+            <SvcCodeMode>0</SvcCodeMode>
+            <DNDOnSvcCode></DNDOnSvcCode>
+            <DNDOffSvcCode></DNDOffSvcCode>
+            <CFUOnSvcCode></CFUOnSvcCode>
+            <CFUOffSvcCode></CFUOffSvcCode>
+            <CFBOnSvcCode></CFBOnSvcCode>
+            <CFBOffSvcCode></CFBOffSvcCode>
+            <CFNOnSvcCode></CFNOnSvcCode>
+            <CFNOffSvcCode></CFNOffSvcCode>
             <ANCOnSvcCode></ANCOnSvcCode>
             <ANCOffSvcCode></ANCOffSvcCode>
-            <SendANOnCode>*67</SendANOnCode>
-            <SendANOffCode>*67</SendANOffCode>
+            <SendANOnCode></SendANOnCode>
+            <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
             <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
@@ -683,7 +743,7 @@
             <UseVPN>1</UseVPN>
             <EnableDND>0</EnableDND>
             <InactiveHold>0</InactiveHold>
-            <ReqWithPort>0</ReqWithPort>
+            <ReqWithPort>1</ReqWithPort>
             <UpdateRegExpire>1</UpdateRegExpire>
             <EnableSCA>0</EnableSCA>
             <SubCallPark>0</SubCallPark>
@@ -694,7 +754,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -712,6 +772,12 @@
             <BLFDialogMatch>1</BLFDialogMatch>
             <Ptime>0</Ptime>
             <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="5">
             <PhoneNumber>{$account.5.user_id}</PhoneNumber>
@@ -722,22 +788,25 @@
             <RegisterUser>{$account.5.auth_id}</RegisterUser>
             <RegisterPswd>{$account.5.password}</RegisterPswd>
             <RegisterTTL>{$account.5.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.5.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.5.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.5.sip_port}</ProxyPort>
             <ProxyUser>{$account.5.auth_id}</ProxyUser>
             <ProxyPswd>{$account.5.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.5.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.5.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.5.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -798,7 +867,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum>*97</MWINum>
+            <MWINum></MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -809,19 +878,19 @@
             <NoAnswerTime>5</NoAnswerTime>
             <MissedCallLog>1</MissedCallLog>
             <ParkMode></ParkMode>
-            <SvcCodeMode>1</SvcCodeMode>
-            <DNDOnSvcCode>*78</DNDOnSvcCode>
-            <DNDOffSvcCode>*79</DNDOffSvcCode>
-            <CFUOnSvcCode>*72</CFUOnSvcCode>
-            <CFUOffSvcCode>*73</CFUOffSvcCode>
-            <CFBOnSvcCode>*72</CFBOnSvcCode>
-            <CFBOffSvcCode>*73</CFBOffSvcCode>
-            <CFNOnSvcCode>*72</CFNOnSvcCode>
-            <CFNOffSvcCode>*73</CFNOffSvcCode>
+            <SvcCodeMode>0</SvcCodeMode>
+            <DNDOnSvcCode></DNDOnSvcCode>
+            <DNDOffSvcCode></DNDOffSvcCode>
+            <CFUOnSvcCode></CFUOnSvcCode>
+            <CFUOffSvcCode></CFUOffSvcCode>
+            <CFBOnSvcCode></CFBOnSvcCode>
+            <CFBOffSvcCode></CFBOffSvcCode>
+            <CFNOnSvcCode></CFNOnSvcCode>
+            <CFNOffSvcCode></CFNOffSvcCode>
             <ANCOnSvcCode></ANCOnSvcCode>
             <ANCOffSvcCode></ANCOffSvcCode>
-            <SendANOnCode>*67</SendANOnCode>
-            <SendANOffCode>*67</SendANOffCode>
+            <SendANOnCode></SendANOnCode>
+            <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
             <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
@@ -836,7 +905,7 @@
             <UseVPN>1</UseVPN>
             <EnableDND>0</EnableDND>
             <InactiveHold>0</InactiveHold>
-            <ReqWithPort>0</ReqWithPort>
+            <ReqWithPort>1</ReqWithPort>
             <UpdateRegExpire>1</UpdateRegExpire>
             <EnableSCA>0</EnableSCA>
             <SubCallPark>0</SubCallPark>
@@ -847,7 +916,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -865,6 +934,12 @@
             <BLFDialogMatch>1</BLFDialogMatch>
             <Ptime>0</Ptime>
             <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="6">
             <PhoneNumber>{$account.6.user_id}</PhoneNumber>
@@ -875,22 +950,25 @@
             <RegisterUser>{$aaccount.6.uth_id}</RegisterUser>
             <RegisterPswd>{$account.6.password}</RegisterPswd>
             <RegisterTTL>{$account.6.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.6.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.6.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.6.sip_port}</ProxyPort>
             <ProxyUser>{$account.6.auth_id}</ProxyUser>
             <ProxyPswd>{$account.6.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.6.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.6.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.6.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -951,7 +1029,7 @@
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
-            <MWINum>*97</MWINum>
+            <MWINum></MWINum>
             <ParkNo></ParkNo>
             <CallParkNum></CallParkNum>
             <RetrieveNum></RetrieveNum>
@@ -962,19 +1040,19 @@
             <NoAnswerTime>5</NoAnswerTime>
             <MissedCallLog>1</MissedCallLog>
             <ParkMode></ParkMode>
-            <SvcCodeMode>1</SvcCodeMode>
-            <DNDOnSvcCode>*78</DNDOnSvcCode>
-            <DNDOffSvcCode>*79</DNDOffSvcCode>
-            <CFUOnSvcCode>*72</CFUOnSvcCode>
-            <CFUOffSvcCode>*73</CFUOffSvcCode>
-            <CFBOnSvcCode>*72</CFBOnSvcCode>
-            <CFBOffSvcCode>*73</CFBOffSvcCode>
-            <CFNOnSvcCode>*72</CFNOnSvcCode>
-            <CFNOffSvcCode>*73</CFNOffSvcCode>
+            <SvcCodeMode>0</SvcCodeMode>
+            <DNDOnSvcCode></DNDOnSvcCode>
+            <DNDOffSvcCode></DNDOffSvcCode>
+            <CFUOnSvcCode></CFUOnSvcCode>
+            <CFUOffSvcCode></CFUOffSvcCode>
+            <CFBOnSvcCode></CFBOnSvcCode>
+            <CFBOffSvcCode></CFBOffSvcCode>
+            <CFNOnSvcCode></CFNOnSvcCode>
+            <CFNOffSvcCode></CFNOffSvcCode>
             <ANCOnSvcCode></ANCOnSvcCode>
             <ANCOffSvcCode></ANCOffSvcCode>
-            <SendANOnCode>*67</SendANOnCode>
-            <SendANOffCode>*67</SendANOffCode>
+            <SendANOnCode></SendANOnCode>
+            <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
             <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
@@ -989,7 +1067,7 @@
             <UseVPN>1</UseVPN>
             <EnableDND>0</EnableDND>
             <InactiveHold>0</InactiveHold>
-            <ReqWithPort>0</ReqWithPort>
+            <ReqWithPort>1</ReqWithPort>
             <UpdateRegExpire>1</UpdateRegExpire>
             <EnableSCA>0</EnableSCA>
             <SubCallPark>0</SubCallPark>
@@ -1000,7 +1078,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -1018,32 +1096,41 @@
             <BLFDialogMatch>1</BLFDialogMatch>
             <Ptime>0</Ptime>
             <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="7">
-            <PhoneNumber></PhoneNumber>
-            <DisplayName></DisplayName>
+            <PhoneNumber>{$account.7.user_id}</PhoneNumber>
+            <DisplayName>{$account.7.display_name}</DisplayName>
             <SipName></SipName>
-            <RegisterAddr></RegisterAddr>
-            <RegisterPort>5060</RegisterPort>
-            <RegisterUser></RegisterUser>
-            <RegisterPswd></RegisterPswd>
-            <RegisterTTL>3600</RegisterTTL>
+            <RegisterAddr>{$account.7.server_address}</RegisterAddr>
+            <RegisterPort>{$account.7.sip_port}</RegisterPort>
+            <RegisterUser>{$account.7.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.7.password}</RegisterPswd>
+            <RegisterTTL>{$account.7.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
-            <EnableReg>0</EnableReg>
-            <ProxyAddr></ProxyAddr>
-            <ProxyPort>5060</ProxyPort>
-            <ProxyUser></ProxyUser>
-            <ProxyPswd></ProxyPswd>
-            <BakProxyAddr></BakProxyAddr>
-            <BakProxyPort>5060</BakProxyPort>
-            <EnableFailback>1</EnableFailback>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
+            <EnableReg>{if isset($account.7.password)}1{else}0{/if}</EnableReg>
+            <ProxyAddr>{$account.7.outbound_proxy_primary}</ProxyAddr>
+            <ProxyPort>{$account.7.sip_port}</ProxyPort>
+            <ProxyUser>{$account.7.auth_id}</ProxyUser>
+            <ProxyPswd>{$account.7.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
+            <BakProxyAddr>{$account.7.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.7.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
+            <EnableFailback>{if isset($account.7.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -1063,7 +1150,7 @@
             <PickupNum></PickupNum>
             <JoinNum></JoinNum>
             <IntercomNum></IntercomNum>
-            <RingType>default</RingType>
+            <RingType>{if isset($fanvil_ringtone_line7)}{$fanvil_ringtone_line7}{else}default{/if}</RingType>
             <NATUDPUpdate>2</NATUDPUpdate>
             <UDPUpdateTTL>30</UDPUpdateTTL>
             <ServerType>0</ServerType>
@@ -1078,14 +1165,14 @@
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
             <Subscribe>0</Subscribe>
-            <SubExpire>3600</SubExpire>
+            <SubExpire>{$account.7.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            <DNSSRV>0</DNSSRV>
-            <DNSMode>0</DNSMode>
+            {if $account.7.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.7.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             <XFERExpire>0</XFERExpire>
             <BanAnonymous>0</BanAnonymous>
             <DialOffLine>0</DialOffLine>
@@ -1094,11 +1181,13 @@
             <RFCVer>1</RFCVer>
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>
-            <Transport>0</Transport>
+            {if $account.7.sip_transport == 'udp'}<Transport>0</Transport>{/if}
+            {if $account.7.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
+            {if $account.7.sip_transport == 'tls'}<Transport>2</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
-            <AutoTCP>0</AutoTCP>
+            <AutoTCP>1</AutoTCP>
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
@@ -1128,8 +1217,8 @@
             <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -1140,7 +1229,7 @@
             <UseVPN>1</UseVPN>
             <EnableDND>0</EnableDND>
             <InactiveHold>0</InactiveHold>
-            <ReqWithPort>0</ReqWithPort>
+            <ReqWithPort>1</ReqWithPort>
             <UpdateRegExpire>1</UpdateRegExpire>
             <EnableSCA>0</EnableSCA>
             <SubCallPark>0</SubCallPark>
@@ -1151,7 +1240,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -1169,32 +1258,41 @@
             <BLFDialogMatch>1</BLFDialogMatch>
             <Ptime>0</Ptime>
             <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="8">
-            <PhoneNumber></PhoneNumber>
-            <DisplayName></DisplayName>
+            <PhoneNumber>{$account.8.user_id}</PhoneNumber>
+            <DisplayName>{$account.8.display_name}</DisplayName>
             <SipName></SipName>
-            <RegisterAddr></RegisterAddr>
-            <RegisterPort>5060</RegisterPort>
-            <RegisterUser></RegisterUser>
-            <RegisterPswd></RegisterPswd>
-            <RegisterTTL>3600</RegisterTTL>
+            <RegisterAddr>{$account.8.server_address}</RegisterAddr>
+            <RegisterPort>{$account.8.sip_port}</RegisterPort>
+            <RegisterUser>{$account.8.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.8.password}</RegisterPswd>
+            <RegisterTTL>{$account.8.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
-            <EnableReg>0</EnableReg>
-            <ProxyAddr></ProxyAddr>
-            <ProxyPort>5060</ProxyPort>
-            <ProxyUser></ProxyUser>
-            <ProxyPswd></ProxyPswd>
-            <BakProxyAddr></BakProxyAddr>
-            <BakProxyPort>5060</BakProxyPort>
-            <EnableFailback>1</EnableFailback>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
+            <EnableReg>{if isset($account.8.password)}1{else}0{/if}</EnableReg>
+            <ProxyAddr>{$account.8.outbound_proxy_primary}</ProxyAddr>
+            <ProxyPort>{$account.8.sip_port}</ProxyPort>
+            <ProxyUser>{$account.8.auth_id}</ProxyUser>
+            <ProxyPswd>{$account.8.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
+            <BakProxyAddr>{$account.8.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.8.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
+            <EnableFailback>{if isset($account.8.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -1214,7 +1312,7 @@
             <PickupNum></PickupNum>
             <JoinNum></JoinNum>
             <IntercomNum></IntercomNum>
-            <RingType>default</RingType>
+            <RingType>{if isset($fanvil_ringtone_line8)}{$fanvil_ringtone_line8}{else}default{/if}</RingType>
             <NATUDPUpdate>2</NATUDPUpdate>
             <UDPUpdateTTL>30</UDPUpdateTTL>
             <ServerType>0</ServerType>
@@ -1229,14 +1327,14 @@
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
             <Subscribe>0</Subscribe>
-            <SubExpire>3600</SubExpire>
+            <SubExpire>{$account.8.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            <DNSSRV>0</DNSSRV>
-            <DNSMode>0</DNSMode>
+            {if $account.8.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.8.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             <XFERExpire>0</XFERExpire>
             <BanAnonymous>0</BanAnonymous>
             <DialOffLine>0</DialOffLine>
@@ -1245,11 +1343,13 @@
             <RFCVer>1</RFCVer>
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>
-            <Transport>0</Transport>
+            {if $account.8.sip_transport == 'udp'}<Transport>0</Transport>{/if}
+            {if $account.8.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
+            {if $account.8.sip_transport == 'tls'}<Transport>2</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
-            <AutoTCP>0</AutoTCP>
+            <AutoTCP>1</AutoTCP>
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
@@ -1279,8 +1379,8 @@
             <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -1291,7 +1391,7 @@
             <UseVPN>1</UseVPN>
             <EnableDND>0</EnableDND>
             <InactiveHold>0</InactiveHold>
-            <ReqWithPort>0</ReqWithPort>
+            <ReqWithPort>1</ReqWithPort>
             <UpdateRegExpire>1</UpdateRegExpire>
             <EnableSCA>0</EnableSCA>
             <SubCallPark>0</SubCallPark>
@@ -1302,7 +1402,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -1320,32 +1420,41 @@
             <BLFDialogMatch>1</BLFDialogMatch>
             <Ptime>0</Ptime>
             <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="9">
-            <PhoneNumber></PhoneNumber>
-            <DisplayName></DisplayName>
+            <PhoneNumber>{$account.9.user_id}</PhoneNumber>
+            <DisplayName>{$account.9.display_name}</DisplayName>
             <SipName></SipName>
-            <RegisterAddr></RegisterAddr>
-            <RegisterPort>5060</RegisterPort>
-            <RegisterUser></RegisterUser>
-            <RegisterPswd></RegisterPswd>
-            <RegisterTTL>3600</RegisterTTL>
+            <RegisterAddr>{$account.9.server_address}</RegisterAddr>
+            <RegisterPort>{$account.9.sip_port}</RegisterPort>
+            <RegisterUser>{$account.9.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.9.password}</RegisterPswd>
+            <RegisterTTL>{$account.9.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
-            <EnableReg>0</EnableReg>
-            <ProxyAddr></ProxyAddr>
-            <ProxyPort>5060</ProxyPort>
-            <ProxyUser></ProxyUser>
-            <ProxyPswd></ProxyPswd>
-            <BakProxyAddr></BakProxyAddr>
-            <BakProxyPort>5060</BakProxyPort>
-            <EnableFailback>1</EnableFailback>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
+            <EnableReg>{if isset($account.9.password)}1{else}0{/if}</EnableReg>
+            <ProxyAddr>{$account.9.outbound_proxy_primary}</ProxyAddr>
+            <ProxyPort>{$account.9.sip_port}</ProxyPort>
+            <ProxyUser>{$account.9.auth_id}</ProxyUser>
+            <ProxyPswd>{$account.9.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
+            <BakProxyAddr>{$account.9.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.9.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
+            <EnableFailback>{if isset($account.9.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -1365,7 +1474,7 @@
             <PickupNum></PickupNum>
             <JoinNum></JoinNum>
             <IntercomNum></IntercomNum>
-            <RingType>default</RingType>
+            <RingType>{if isset($fanvil_ringtone_line9)}{$fanvil_ringtone_line9}{else}default{/if}</RingType>
             <NATUDPUpdate>2</NATUDPUpdate>
             <UDPUpdateTTL>30</UDPUpdateTTL>
             <ServerType>0</ServerType>
@@ -1380,14 +1489,14 @@
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
             <Subscribe>0</Subscribe>
-            <SubExpire>3600</SubExpire>
+            <SubExpire>{$account.9.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            <DNSSRV>0</DNSSRV>
-            <DNSMode>0</DNSMode>
+            {if $account.9.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.9.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             <XFERExpire>0</XFERExpire>
             <BanAnonymous>0</BanAnonymous>
             <DialOffLine>0</DialOffLine>
@@ -1396,11 +1505,13 @@
             <RFCVer>1</RFCVer>
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>
-            <Transport>0</Transport>
+            {if $account.9.sip_transport == 'udp'}<Transport>0</Transport>{/if}
+            {if $account.9.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
+            {if $account.9.sip_transport == 'tls'}<Transport>2</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
-            <AutoTCP>0</AutoTCP>
+            <AutoTCP>1</AutoTCP>
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
@@ -1430,8 +1541,8 @@
             <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -1442,7 +1553,7 @@
             <UseVPN>1</UseVPN>
             <EnableDND>0</EnableDND>
             <InactiveHold>0</InactiveHold>
-            <ReqWithPort>0</ReqWithPort>
+            <ReqWithPort>1</ReqWithPort>
             <UpdateRegExpire>1</UpdateRegExpire>
             <EnableSCA>0</EnableSCA>
             <SubCallPark>0</SubCallPark>
@@ -1453,7 +1564,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -1471,32 +1582,41 @@
             <BLFDialogMatch>1</BLFDialogMatch>
             <Ptime>0</Ptime>
             <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="10">
-            <PhoneNumber></PhoneNumber>
-            <DisplayName></DisplayName>
+            <PhoneNumber>{$account.10.user_id}</PhoneNumber>
+            <DisplayName>{$account.10.display_name}</DisplayName>
             <SipName></SipName>
-            <RegisterAddr></RegisterAddr>
-            <RegisterPort>5060</RegisterPort>
-            <RegisterUser></RegisterUser>
-            <RegisterPswd></RegisterPswd>
-            <RegisterTTL>3600</RegisterTTL>
+            <RegisterAddr>{$account.10.server_address}</RegisterAddr>
+            <RegisterPort>{$account.10.sip_port}</RegisterPort>
+            <RegisterUser>{$account.10.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.10.password}</RegisterPswd>
+            <RegisterTTL>{$account.10.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
-            <EnableReg>0</EnableReg>
-            <ProxyAddr></ProxyAddr>
-            <ProxyPort>5060</ProxyPort>
-            <ProxyUser></ProxyUser>
-            <ProxyPswd></ProxyPswd>
-            <BakProxyAddr></BakProxyAddr>
-            <BakProxyPort>5060</BakProxyPort>
-            <EnableFailback>1</EnableFailback>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
+            <EnableReg>{if isset($account.10.password)}1{else}0{/if}</EnableReg>
+            <ProxyAddr>{$account.10.outbound_proxy_primary}</ProxyAddr>
+            <ProxyPort>{$account.10.sip_port}</ProxyPort>
+            <ProxyUser>{$account.10.auth_id}</ProxyUser>
+            <ProxyPswd>{$account.10.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
+            <BakProxyAddr>{$account.10.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.10.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
+            <EnableFailback>{if isset($account.10.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -1516,7 +1636,7 @@
             <PickupNum></PickupNum>
             <JoinNum></JoinNum>
             <IntercomNum></IntercomNum>
-            <RingType>default</RingType>
+            <RingType>{if isset($fanvil_ringtone_line10)}{$fanvil_ringtone_line10}{else}default{/if}</RingType>
             <NATUDPUpdate>2</NATUDPUpdate>
             <UDPUpdateTTL>30</UDPUpdateTTL>
             <ServerType>0</ServerType>
@@ -1531,14 +1651,14 @@
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
             <Subscribe>0</Subscribe>
-            <SubExpire>3600</SubExpire>
+            <SubExpire>{$account.10.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            <DNSSRV>0</DNSSRV>
-            <DNSMode>0</DNSMode>
+            {if $account.10.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.10.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             <XFERExpire>0</XFERExpire>
             <BanAnonymous>0</BanAnonymous>
             <DialOffLine>0</DialOffLine>
@@ -1547,11 +1667,13 @@
             <RFCVer>1</RFCVer>
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>
-            <Transport>0</Transport>
+            {if $account.10.sip_transport == 'udp'}<Transport>0</Transport>{/if}
+            {if $account.10.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
+            {if $account.10.sip_transport == 'tls'}<Transport>2</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
-            <AutoTCP>0</AutoTCP>
+            <AutoTCP>1</AutoTCP>
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
@@ -1581,8 +1703,8 @@
             <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -1593,7 +1715,7 @@
             <UseVPN>1</UseVPN>
             <EnableDND>0</EnableDND>
             <InactiveHold>0</InactiveHold>
-            <ReqWithPort>0</ReqWithPort>
+            <ReqWithPort>1</ReqWithPort>
             <UpdateRegExpire>1</UpdateRegExpire>
             <EnableSCA>0</EnableSCA>
             <SubCallPark>0</SubCallPark>
@@ -1604,7 +1726,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -1622,32 +1744,41 @@
             <BLFDialogMatch>1</BLFDialogMatch>
             <Ptime>0</Ptime>
             <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="11">
-            <PhoneNumber></PhoneNumber>
-            <DisplayName></DisplayName>
+            <PhoneNumber>{$account.11.user_id}</PhoneNumber>
+            <DisplayName>{$account.11.display_name}</DisplayName>
             <SipName></SipName>
-            <RegisterAddr></RegisterAddr>
-            <RegisterPort>5060</RegisterPort>
-            <RegisterUser></RegisterUser>
-            <RegisterPswd></RegisterPswd>
-            <RegisterTTL>3600</RegisterTTL>
+            <RegisterAddr>{$account.11.server_address}</RegisterAddr>
+            <RegisterPort>{$account.11.sip_port}</RegisterPort>
+            <RegisterUser>{$account.11.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.11.password}</RegisterPswd>
+            <RegisterTTL>{$account.11.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
-            <EnableReg>0</EnableReg>
-            <ProxyAddr></ProxyAddr>
-            <ProxyPort>5060</ProxyPort>
-            <ProxyUser></ProxyUser>
-            <ProxyPswd></ProxyPswd>
-            <BakProxyAddr></BakProxyAddr>
-            <BakProxyPort>5060</BakProxyPort>
-            <EnableFailback>1</EnableFailback>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
+            <EnableReg>{if isset($account.11.password)}1{else}0{/if}</EnableReg>
+            <ProxyAddr>{$account.11.outbound_proxy_primary}</ProxyAddr>
+            <ProxyPort>{$account.11.sip_port}</ProxyPort>
+            <ProxyUser>{$account.11.auth_id}</ProxyUser>
+            <ProxyPswd>{$account.11.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
+            <BakProxyAddr>{$account.11.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.11.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
+            <EnableFailback>{if isset($account.11.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -1667,7 +1798,7 @@
             <PickupNum></PickupNum>
             <JoinNum></JoinNum>
             <IntercomNum></IntercomNum>
-            <RingType>default</RingType>
+            <RingType>{if isset($fanvil_ringtone_line11)}{$fanvil_ringtone_line11}{else}default{/if}</RingType>
             <NATUDPUpdate>2</NATUDPUpdate>
             <UDPUpdateTTL>30</UDPUpdateTTL>
             <ServerType>0</ServerType>
@@ -1682,14 +1813,14 @@
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
             <Subscribe>0</Subscribe>
-            <SubExpire>3600</SubExpire>
+            <SubExpire>{$account.11.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            <DNSSRV>0</DNSSRV>
-            <DNSMode>0</DNSMode>
+            {if $account.11.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.11.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             <XFERExpire>0</XFERExpire>
             <BanAnonymous>0</BanAnonymous>
             <DialOffLine>0</DialOffLine>
@@ -1698,11 +1829,13 @@
             <RFCVer>1</RFCVer>
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>
-            <Transport>0</Transport>
+            {if $account.11.sip_transport == 'udp'}<Transport>0</Transport>{/if}
+            {if $account.11.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
+            {if $account.11.sip_transport == 'tls'}<Transport>2</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
-            <AutoTCP>0</AutoTCP>
+            <AutoTCP>1</AutoTCP>
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
@@ -1732,8 +1865,8 @@
             <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -1744,7 +1877,7 @@
             <UseVPN>1</UseVPN>
             <EnableDND>0</EnableDND>
             <InactiveHold>0</InactiveHold>
-            <ReqWithPort>0</ReqWithPort>
+            <ReqWithPort>1</ReqWithPort>
             <UpdateRegExpire>1</UpdateRegExpire>
             <EnableSCA>0</EnableSCA>
             <SubCallPark>0</SubCallPark>
@@ -1755,7 +1888,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -1773,32 +1906,41 @@
             <BLFDialogMatch>1</BLFDialogMatch>
             <Ptime>0</Ptime>
             <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="12">
-            <PhoneNumber></PhoneNumber>
-            <DisplayName></DisplayName>
+            <PhoneNumber>{$account.12.user_id}</PhoneNumber>
+            <DisplayName>{$account.12.display_name}</DisplayName>
             <SipName></SipName>
-            <RegisterAddr></RegisterAddr>
-            <RegisterPort>5060</RegisterPort>
-            <RegisterUser></RegisterUser>
-            <RegisterPswd></RegisterPswd>
-            <RegisterTTL>3600</RegisterTTL>
+            <RegisterAddr>{$account.12.server_address}</RegisterAddr>
+            <RegisterPort>{$account.12.sip_port}</RegisterPort>
+            <RegisterUser>{$account.12.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.12.password}</RegisterPswd>
+            <RegisterTTL>{$account.12.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
-            <EnableReg>0</EnableReg>
-            <ProxyAddr></ProxyAddr>
-            <ProxyPort>5060</ProxyPort>
-            <ProxyUser></ProxyUser>
-            <ProxyPswd></ProxyPswd>
-            <BakProxyAddr></BakProxyAddr>
-            <BakProxyPort>5060</BakProxyPort>
-            <EnableFailback>1</EnableFailback>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
+            <EnableReg>{if isset($account.12.password)}1{else}0{/if}</EnableReg>
+            <ProxyAddr>{$account.12.outbound_proxy_primary}</ProxyAddr>
+            <ProxyPort>{$account.12.sip_port}</ProxyPort>
+            <ProxyUser>{$account.12.auth_id}</ProxyUser>
+            <ProxyPswd>{$account.12.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
+            <BakProxyAddr>{$account.12.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.12.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
+            <EnableFailback>{if isset($account.12.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -1818,7 +1960,7 @@
             <PickupNum></PickupNum>
             <JoinNum></JoinNum>
             <IntercomNum></IntercomNum>
-            <RingType>default</RingType>
+            <RingType>{if isset($fanvil_ringtone_line12)}{$fanvil_ringtone_line12}{else}default{/if}</RingType>
             <NATUDPUpdate>2</NATUDPUpdate>
             <UDPUpdateTTL>30</UDPUpdateTTL>
             <ServerType>0</ServerType>
@@ -1833,14 +1975,14 @@
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
             <Subscribe>0</Subscribe>
-            <SubExpire>3600</SubExpire>
+            <SubExpire>{$account.12.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            <DNSSRV>0</DNSSRV>
-            <DNSMode>0</DNSMode>
+            {if $account.12.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.12.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             <XFERExpire>0</XFERExpire>
             <BanAnonymous>0</BanAnonymous>
             <DialOffLine>0</DialOffLine>
@@ -1849,11 +1991,13 @@
             <RFCVer>1</RFCVer>
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>
-            <Transport>0</Transport>
+            {if $account.12.sip_transport == 'udp'}<Transport>0</Transport>{/if}
+            {if $account.12.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
+            {if $account.12.sip_transport == 'tls'}<Transport>2</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
-            <AutoTCP>0</AutoTCP>
+            <AutoTCP>1</AutoTCP>
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
@@ -1883,8 +2027,8 @@
             <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -1895,7 +2039,7 @@
             <UseVPN>1</UseVPN>
             <EnableDND>0</EnableDND>
             <InactiveHold>0</InactiveHold>
-            <ReqWithPort>0</ReqWithPort>
+            <ReqWithPort>1</ReqWithPort>
             <UpdateRegExpire>1</UpdateRegExpire>
             <EnableSCA>0</EnableSCA>
             <SubCallPark>0</SubCallPark>
@@ -1906,7 +2050,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -1924,32 +2068,41 @@
             <BLFDialogMatch>1</BLFDialogMatch>
             <Ptime>0</Ptime>
             <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="13">
-            <PhoneNumber></PhoneNumber>
-            <DisplayName></DisplayName>
+            <PhoneNumber>{$account.13.user_id}</PhoneNumber>
+            <DisplayName>{$account.13.display_name}</DisplayName>
             <SipName></SipName>
-            <RegisterAddr></RegisterAddr>
-            <RegisterPort>5060</RegisterPort>
-            <RegisterUser></RegisterUser>
-            <RegisterPswd></RegisterPswd>
-            <RegisterTTL>3600</RegisterTTL>
+            <RegisterAddr>{$account.13.server_address}</RegisterAddr>
+            <RegisterPort>{$account.13.sip_port}</RegisterPort>
+            <RegisterUser>{$account.13.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.13.password}</RegisterPswd>
+            <RegisterTTL>{$account.13.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
-            <EnableReg>0</EnableReg>
-            <ProxyAddr></ProxyAddr>
-            <ProxyPort>5060</ProxyPort>
-            <ProxyUser></ProxyUser>
-            <ProxyPswd></ProxyPswd>
-            <BakProxyAddr></BakProxyAddr>
-            <BakProxyPort>5060</BakProxyPort>
-            <EnableFailback>1</EnableFailback>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
+            <EnableReg>{if isset($account.13.password)}1{else}0{/if}</EnableReg>
+            <ProxyAddr>{$account.13.outbound_proxy_primary}</ProxyAddr>
+            <ProxyPort>{$account.13.sip_port}</ProxyPort>
+            <ProxyUser>{$account.13.auth_id}</ProxyUser>
+            <ProxyPswd>{$account.13.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
+            <BakProxyAddr>{$account.13.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.13.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
+            <EnableFailback>{if isset($account.13.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -1969,7 +2122,7 @@
             <PickupNum></PickupNum>
             <JoinNum></JoinNum>
             <IntercomNum></IntercomNum>
-            <RingType>default</RingType>
+            <RingType>{if isset($fanvil_ringtone_line13)}{$fanvil_ringtone_line13}{else}default{/if}</RingType>
             <NATUDPUpdate>2</NATUDPUpdate>
             <UDPUpdateTTL>30</UDPUpdateTTL>
             <ServerType>0</ServerType>
@@ -1984,14 +2137,14 @@
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
             <Subscribe>0</Subscribe>
-            <SubExpire>3600</SubExpire>
+            <SubExpire>{$account.13.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            <DNSSRV>0</DNSSRV>
-            <DNSMode>0</DNSMode>
+            {if $account.13.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.13.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             <XFERExpire>0</XFERExpire>
             <BanAnonymous>0</BanAnonymous>
             <DialOffLine>0</DialOffLine>
@@ -2000,11 +2153,13 @@
             <RFCVer>1</RFCVer>
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>
-            <Transport>0</Transport>
+            {if $account.13.sip_transport == 'udp'}<Transport>0</Transport>{/if}
+            {if $account.13.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
+            {if $account.13.sip_transport == 'tls'}<Transport>2</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
-            <AutoTCP>0</AutoTCP>
+            <AutoTCP>1</AutoTCP>
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
@@ -2034,8 +2189,8 @@
             <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -2046,7 +2201,7 @@
             <UseVPN>1</UseVPN>
             <EnableDND>0</EnableDND>
             <InactiveHold>0</InactiveHold>
-            <ReqWithPort>0</ReqWithPort>
+            <ReqWithPort>1</ReqWithPort>
             <UpdateRegExpire>1</UpdateRegExpire>
             <EnableSCA>0</EnableSCA>
             <SubCallPark>0</SubCallPark>
@@ -2057,7 +2212,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -2075,32 +2230,41 @@
             <BLFDialogMatch>1</BLFDialogMatch>
             <Ptime>0</Ptime>
             <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="14">
-            <PhoneNumber></PhoneNumber>
-            <DisplayName></DisplayName>
+            <PhoneNumber>{$account.14.user_id}</PhoneNumber>
+            <DisplayName>{$account.14.display_name}</DisplayName>
             <SipName></SipName>
-            <RegisterAddr></RegisterAddr>
-            <RegisterPort>5060</RegisterPort>
-            <RegisterUser></RegisterUser>
-            <RegisterPswd></RegisterPswd>
-            <RegisterTTL>3600</RegisterTTL>
+            <RegisterAddr>{$account.14.server_address}</RegisterAddr>
+            <RegisterPort>{$account.14.sip_port}</RegisterPort>
+            <RegisterUser>{$account.14.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.14.password}</RegisterPswd>
+            <RegisterTTL>{$account.14.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
-            <EnableReg>0</EnableReg>
-            <ProxyAddr></ProxyAddr>
-            <ProxyPort>5060</ProxyPort>
-            <ProxyUser></ProxyUser>
-            <ProxyPswd></ProxyPswd>
-            <BakProxyAddr></BakProxyAddr>
-            <BakProxyPort>5060</BakProxyPort>
-            <EnableFailback>1</EnableFailback>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
+            <EnableReg>{if isset($account.14.password)}1{else}0{/if}</EnableReg>
+            <ProxyAddr>{$account.14.outbound_proxy_primary}</ProxyAddr>
+            <ProxyPort>{$account.14.sip_port}</ProxyPort>
+            <ProxyUser>{$account.14.auth_id}</ProxyUser>
+            <ProxyPswd>{$account.14.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
+            <BakProxyAddr>{$account.14.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.14.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
+            <EnableFailback>{if isset($account.14.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -2120,7 +2284,7 @@
             <PickupNum></PickupNum>
             <JoinNum></JoinNum>
             <IntercomNum></IntercomNum>
-            <RingType>default</RingType>
+            <RingType>{if isset($fanvil_ringtone_line14)}{$fanvil_ringtone_line14}{else}default{/if}</RingType>
             <NATUDPUpdate>2</NATUDPUpdate>
             <UDPUpdateTTL>30</UDPUpdateTTL>
             <ServerType>0</ServerType>
@@ -2135,14 +2299,14 @@
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
             <Subscribe>0</Subscribe>
-            <SubExpire>3600</SubExpire>
+            <SubExpire>{$account.14.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            <DNSSRV>0</DNSSRV>
-            <DNSMode>0</DNSMode>
+            {if $account.14.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.14.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             <XFERExpire>0</XFERExpire>
             <BanAnonymous>0</BanAnonymous>
             <DialOffLine>0</DialOffLine>
@@ -2151,11 +2315,13 @@
             <RFCVer>1</RFCVer>
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>
-            <Transport>0</Transport>
+            {if $account.14.sip_transport == 'udp'}<Transport>0</Transport>{/if}
+            {if $account.14.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
+            {if $account.14.sip_transport == 'tls'}<Transport>2</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
-            <AutoTCP>0</AutoTCP>
+            <AutoTCP>1</AutoTCP>
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
@@ -2185,8 +2351,8 @@
             <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -2197,7 +2363,7 @@
             <UseVPN>1</UseVPN>
             <EnableDND>0</EnableDND>
             <InactiveHold>0</InactiveHold>
-            <ReqWithPort>0</ReqWithPort>
+            <ReqWithPort>1</ReqWithPort>
             <UpdateRegExpire>1</UpdateRegExpire>
             <EnableSCA>0</EnableSCA>
             <SubCallPark>0</SubCallPark>
@@ -2208,7 +2374,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -2226,32 +2392,41 @@
             <BLFDialogMatch>1</BLFDialogMatch>
             <Ptime>0</Ptime>
             <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="15">
-            <PhoneNumber></PhoneNumber>
-            <DisplayName></DisplayName>
+            <PhoneNumber>{$account.15.user_id}</PhoneNumber>
+            <DisplayName>{$account.15.display_name}</DisplayName>
             <SipName></SipName>
-            <RegisterAddr></RegisterAddr>
-            <RegisterPort>5060</RegisterPort>
-            <RegisterUser></RegisterUser>
-            <RegisterPswd></RegisterPswd>
-            <RegisterTTL>3600</RegisterTTL>
+            <RegisterAddr>{$account.15.server_address}</RegisterAddr>
+            <RegisterPort>{$account.15.sip_port}</RegisterPort>
+            <RegisterUser>{$account.15.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.15.password}</RegisterPswd>
+            <RegisterTTL>{$account.15.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
-            <EnableReg>0</EnableReg>
-            <ProxyAddr></ProxyAddr>
-            <ProxyPort>5060</ProxyPort>
-            <ProxyUser></ProxyUser>
-            <ProxyPswd></ProxyPswd>
-            <BakProxyAddr></BakProxyAddr>
-            <BakProxyPort>5060</BakProxyPort>
-            <EnableFailback>1</EnableFailback>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
+            <EnableReg>{if isset($account.15.password)}1{else}0{/if}</EnableReg>
+            <ProxyAddr>{$account.15.outbound_proxy_primary}</ProxyAddr>
+            <ProxyPort>{$account.15.sip_port}</ProxyPort>
+            <ProxyUser>{$account.15.auth_id}</ProxyUser>
+            <ProxyPswd>{$account.15.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
+            <BakProxyAddr>{$account.15.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.15.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
+            <EnableFailback>{if isset($account.15.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -2271,7 +2446,7 @@
             <PickupNum></PickupNum>
             <JoinNum></JoinNum>
             <IntercomNum></IntercomNum>
-            <RingType>default</RingType>
+            <RingType>{if isset($fanvil_ringtone_line15)}{$fanvil_ringtone_line15}{else}default{/if}</RingType>
             <NATUDPUpdate>2</NATUDPUpdate>
             <UDPUpdateTTL>30</UDPUpdateTTL>
             <ServerType>0</ServerType>
@@ -2286,14 +2461,14 @@
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
             <Subscribe>0</Subscribe>
-            <SubExpire>3600</SubExpire>
+            <SubExpire>{$account.15.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            <DNSSRV>0</DNSSRV>
-            <DNSMode>0</DNSMode>
+            {if $account.15.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.15.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             <XFERExpire>0</XFERExpire>
             <BanAnonymous>0</BanAnonymous>
             <DialOffLine>0</DialOffLine>
@@ -2302,11 +2477,13 @@
             <RFCVer>1</RFCVer>
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>
-            <Transport>0</Transport>
+            {if $account.15.sip_transport == 'udp'}<Transport>0</Transport>{/if}
+            {if $account.15.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
+            {if $account.15.sip_transport == 'tls'}<Transport>2</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
-            <AutoTCP>0</AutoTCP>
+            <AutoTCP>1</AutoTCP>
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
@@ -2336,8 +2513,8 @@
             <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -2348,7 +2525,7 @@
             <UseVPN>1</UseVPN>
             <EnableDND>0</EnableDND>
             <InactiveHold>0</InactiveHold>
-            <ReqWithPort>0</ReqWithPort>
+            <ReqWithPort>1</ReqWithPort>
             <UpdateRegExpire>1</UpdateRegExpire>
             <EnableSCA>0</EnableSCA>
             <SubCallPark>0</SubCallPark>
@@ -2359,7 +2536,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -2377,32 +2554,41 @@
             <BLFDialogMatch>1</BLFDialogMatch>
             <Ptime>0</Ptime>
             <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="16">
-            <PhoneNumber></PhoneNumber>
-            <DisplayName></DisplayName>
+            <PhoneNumber>{$account.16.user_id}</PhoneNumber>
+            <DisplayName>{$account.16.display_name}</DisplayName>
             <SipName></SipName>
-            <RegisterAddr></RegisterAddr>
-            <RegisterPort>5060</RegisterPort>
-            <RegisterUser></RegisterUser>
-            <RegisterPswd></RegisterPswd>
-            <RegisterTTL>3600</RegisterTTL>
+            <RegisterAddr>{$account.16.server_address}</RegisterAddr>
+            <RegisterPort>{$account.16.sip_port}</RegisterPort>
+            <RegisterUser>{$account.16.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.16.password}</RegisterPswd>
+            <RegisterTTL>{$account.16.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
-            <EnableReg>0</EnableReg>
-            <ProxyAddr></ProxyAddr>
-            <ProxyPort>5060</ProxyPort>
-            <ProxyUser></ProxyUser>
-            <ProxyPswd></ProxyPswd>
-            <BakProxyAddr></BakProxyAddr>
-            <BakProxyPort>5060</BakProxyPort>
-            <EnableFailback>1</EnableFailback>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
+            <EnableReg>{if isset($account.16.password)}1{else}0{/if}</EnableReg>
+            <ProxyAddr>{$account.16.outbound_proxy_primary}</ProxyAddr>
+            <ProxyPort>{$account.16.sip_port}</ProxyPort>
+            <ProxyUser>{$account.16.auth_id}</ProxyUser>
+            <ProxyPswd>{$account.16.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
+            <BakProxyAddr>{$account.16.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.16.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
+            <EnableFailback>{if isset($account.16.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -2422,7 +2608,7 @@
             <PickupNum></PickupNum>
             <JoinNum></JoinNum>
             <IntercomNum></IntercomNum>
-            <RingType>default</RingType>
+            <RingType>{if isset($fanvil_ringtone_line16)}{$fanvil_ringtone_line16}{else}default{/if}</RingType>
             <NATUDPUpdate>2</NATUDPUpdate>
             <UDPUpdateTTL>30</UDPUpdateTTL>
             <ServerType>0</ServerType>
@@ -2437,14 +2623,14 @@
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
             <Subscribe>0</Subscribe>
-            <SubExpire>3600</SubExpire>
+            <SubExpire>{$account.16.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            <DNSSRV>0</DNSSRV>
-            <DNSMode>0</DNSMode>
+            {if $account.16.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.16.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             <XFERExpire>0</XFERExpire>
             <BanAnonymous>0</BanAnonymous>
             <DialOffLine>0</DialOffLine>
@@ -2453,11 +2639,13 @@
             <RFCVer>1</RFCVer>
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>
-            <Transport>0</Transport>
+            {if $account.16.sip_transport == 'udp'}<Transport>0</Transport>{/if}
+            {if $account.16.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
+            {if $account.16.sip_transport == 'tls'}<Transport>2</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
-            <AutoTCP>0</AutoTCP>
+            <AutoTCP>1</AutoTCP>
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
@@ -2487,8 +2675,8 @@
             <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -2499,7 +2687,7 @@
             <UseVPN>1</UseVPN>
             <EnableDND>0</EnableDND>
             <InactiveHold>0</InactiveHold>
-            <ReqWithPort>0</ReqWithPort>
+            <ReqWithPort>1</ReqWithPort>
             <UpdateRegExpire>1</UpdateRegExpire>
             <EnableSCA>0</EnableSCA>
             <SubCallPark>0</SubCallPark>
@@ -2510,7 +2698,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -2528,32 +2716,41 @@
             <BLFDialogMatch>1</BLFDialogMatch>
             <Ptime>0</Ptime>
             <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="17">
-            <PhoneNumber></PhoneNumber>
-            <DisplayName></DisplayName>
+            <PhoneNumber>{$account.17.user_id}</PhoneNumber>
+            <DisplayName>{$account.17.display_name}</DisplayName>
             <SipName></SipName>
-            <RegisterAddr></RegisterAddr>
-            <RegisterPort>5060</RegisterPort>
-            <RegisterUser></RegisterUser>
-            <RegisterPswd></RegisterPswd>
-            <RegisterTTL>3600</RegisterTTL>
+            <RegisterAddr>{$account.17.server_address}</RegisterAddr>
+            <RegisterPort>{$account.17.sip_port}</RegisterPort>
+            <RegisterUser>{$account.17.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.17.password}</RegisterPswd>
+            <RegisterTTL>{$account.17.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
-            <EnableReg>0</EnableReg>
-            <ProxyAddr></ProxyAddr>
-            <ProxyPort>5060</ProxyPort>
-            <ProxyUser></ProxyUser>
-            <ProxyPswd></ProxyPswd>
-            <BakProxyAddr></BakProxyAddr>
-            <BakProxyPort>5060</BakProxyPort>
-            <EnableFailback>1</EnableFailback>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
+            <EnableReg>{if isset($account.17.password)}1{else}0{/if}</EnableReg>
+            <ProxyAddr>{$account.17.outbound_proxy_primary}</ProxyAddr>
+            <ProxyPort>{$account.17.sip_port}</ProxyPort>
+            <ProxyUser>{$account.17.auth_id}</ProxyUser>
+            <ProxyPswd>{$account.17.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
+            <BakProxyAddr>{$account.17.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.17.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
+            <EnableFailback>{if isset($account.17.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -2573,7 +2770,7 @@
             <PickupNum></PickupNum>
             <JoinNum></JoinNum>
             <IntercomNum></IntercomNum>
-            <RingType>default</RingType>
+            <RingType>{if isset($fanvil_ringtone_line17)}{$fanvil_ringtone_line17}{else}default{/if}</RingType>
             <NATUDPUpdate>2</NATUDPUpdate>
             <UDPUpdateTTL>30</UDPUpdateTTL>
             <ServerType>0</ServerType>
@@ -2588,14 +2785,14 @@
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
             <Subscribe>0</Subscribe>
-            <SubExpire>3600</SubExpire>
+            <SubExpire>{$account.17.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            <DNSSRV>0</DNSSRV>
-            <DNSMode>0</DNSMode>
+            {if $account.17.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.17.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             <XFERExpire>0</XFERExpire>
             <BanAnonymous>0</BanAnonymous>
             <DialOffLine>0</DialOffLine>
@@ -2604,11 +2801,13 @@
             <RFCVer>1</RFCVer>
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>
-            <Transport>0</Transport>
+            {if $account.17.sip_transport == 'udp'}<Transport>0</Transport>{/if}
+            {if $account.17.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
+            {if $account.17.sip_transport == 'tls'}<Transport>2</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
-            <AutoTCP>0</AutoTCP>
+            <AutoTCP>1</AutoTCP>
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
@@ -2638,8 +2837,8 @@
             <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -2650,7 +2849,7 @@
             <UseVPN>1</UseVPN>
             <EnableDND>0</EnableDND>
             <InactiveHold>0</InactiveHold>
-            <ReqWithPort>0</ReqWithPort>
+            <ReqWithPort>1</ReqWithPort>
             <UpdateRegExpire>1</UpdateRegExpire>
             <EnableSCA>0</EnableSCA>
             <SubCallPark>0</SubCallPark>
@@ -2661,7 +2860,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -2679,32 +2878,41 @@
             <BLFDialogMatch>1</BLFDialogMatch>
             <Ptime>0</Ptime>
             <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="18">
-            <PhoneNumber></PhoneNumber>
-            <DisplayName></DisplayName>
+            <PhoneNumber>{$account.18.user_id}</PhoneNumber>
+            <DisplayName>{$account.18.display_name}</DisplayName>
             <SipName></SipName>
-            <RegisterAddr></RegisterAddr>
-            <RegisterPort>5060</RegisterPort>
-            <RegisterUser></RegisterUser>
-            <RegisterPswd></RegisterPswd>
-            <RegisterTTL>3600</RegisterTTL>
+            <RegisterAddr>{$account.18.server_address}</RegisterAddr>
+            <RegisterPort>{$account.18.sip_port}</RegisterPort>
+            <RegisterUser>{$account.18.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.18.password}</RegisterPswd>
+            <RegisterTTL>{$account.18.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
-            <EnableReg>0</EnableReg>
-            <ProxyAddr></ProxyAddr>
-            <ProxyPort>5060</ProxyPort>
-            <ProxyUser></ProxyUser>
-            <ProxyPswd></ProxyPswd>
-            <BakProxyAddr></BakProxyAddr>
-            <BakProxyPort>5060</BakProxyPort>
-            <EnableFailback>1</EnableFailback>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
+            <EnableReg>{if isset($account.18.password)}1{else}0{/if}</EnableReg>
+            <ProxyAddr>{$account.18.outbound_proxy_primary}</ProxyAddr>
+            <ProxyPort>{$account.18.sip_port}</ProxyPort>
+            <ProxyUser>{$account.18.auth_id}</ProxyUser>
+            <ProxyPswd>{$account.18.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
+            <BakProxyAddr>{$account.18.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.18.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
+            <EnableFailback>{if isset($account.18.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -2724,7 +2932,7 @@
             <PickupNum></PickupNum>
             <JoinNum></JoinNum>
             <IntercomNum></IntercomNum>
-            <RingType>default</RingType>
+            <RingType>{if isset($fanvil_ringtone_line18)}{$fanvil_ringtone_line18}{else}default{/if}</RingType>
             <NATUDPUpdate>2</NATUDPUpdate>
             <UDPUpdateTTL>30</UDPUpdateTTL>
             <ServerType>0</ServerType>
@@ -2739,14 +2947,14 @@
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
             <Subscribe>0</Subscribe>
-            <SubExpire>3600</SubExpire>
+            <SubExpire>{$account.18.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            <DNSSRV>0</DNSSRV>
-            <DNSMode>0</DNSMode>
+            {if $account.18.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.18.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             <XFERExpire>0</XFERExpire>
             <BanAnonymous>0</BanAnonymous>
             <DialOffLine>0</DialOffLine>
@@ -2755,11 +2963,13 @@
             <RFCVer>1</RFCVer>
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>
-            <Transport>0</Transport>
+            {if $account.18.sip_transport == 'udp'}<Transport>0</Transport>{/if}
+            {if $account.18.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
+            {if $account.18.sip_transport == 'tls'}<Transport>2</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
-            <AutoTCP>0</AutoTCP>
+            <AutoTCP>1</AutoTCP>
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
@@ -2789,8 +2999,8 @@
             <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -2801,7 +3011,7 @@
             <UseVPN>1</UseVPN>
             <EnableDND>0</EnableDND>
             <InactiveHold>0</InactiveHold>
-            <ReqWithPort>0</ReqWithPort>
+            <ReqWithPort>1</ReqWithPort>
             <UpdateRegExpire>1</UpdateRegExpire>
             <EnableSCA>0</EnableSCA>
             <SubCallPark>0</SubCallPark>
@@ -2812,7 +3022,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -2830,32 +3040,41 @@
             <BLFDialogMatch>1</BLFDialogMatch>
             <Ptime>0</Ptime>
             <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="19">
-            <PhoneNumber></PhoneNumber>
-            <DisplayName></DisplayName>
+            <PhoneNumber>{$account.19.user_id}</PhoneNumber>
+            <DisplayName>{$account.19.display_name}</DisplayName>
             <SipName></SipName>
-            <RegisterAddr></RegisterAddr>
-            <RegisterPort>5060</RegisterPort>
-            <RegisterUser></RegisterUser>
-            <RegisterPswd></RegisterPswd>
-            <RegisterTTL>3600</RegisterTTL>
+            <RegisterAddr>{$account.19.server_address}</RegisterAddr>
+            <RegisterPort>{$account.19.sip_port}</RegisterPort>
+            <RegisterUser>{$account.19.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.19.password}</RegisterPswd>
+            <RegisterTTL>{$account.19.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
-            <EnableReg>0</EnableReg>
-            <ProxyAddr></ProxyAddr>
-            <ProxyPort>5060</ProxyPort>
-            <ProxyUser></ProxyUser>
-            <ProxyPswd></ProxyPswd>
-            <BakProxyAddr></BakProxyAddr>
-            <BakProxyPort>5060</BakProxyPort>
-            <EnableFailback>1</EnableFailback>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
+            <EnableReg>{if isset($account.19.password)}1{else}0{/if}</EnableReg>
+            <ProxyAddr>{$account.19.outbound_proxy_primary}</ProxyAddr>
+            <ProxyPort>{$account.19.sip_port}</ProxyPort>
+            <ProxyUser>{$account.19.auth_id}</ProxyUser>
+            <ProxyPswd>{$account.19.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
+            <BakProxyAddr>{$account.19.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.19.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
+            <EnableFailback>{if isset($account.19.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -2875,7 +3094,7 @@
             <PickupNum></PickupNum>
             <JoinNum></JoinNum>
             <IntercomNum></IntercomNum>
-            <RingType>default</RingType>
+            <RingType>{if isset($fanvil_ringtone_line19)}{$fanvil_ringtone_line19}{else}default{/if}</RingType>
             <NATUDPUpdate>2</NATUDPUpdate>
             <UDPUpdateTTL>30</UDPUpdateTTL>
             <ServerType>0</ServerType>
@@ -2890,14 +3109,14 @@
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
             <Subscribe>0</Subscribe>
-            <SubExpire>3600</SubExpire>
+            <SubExpire>{$account.19.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            <DNSSRV>0</DNSSRV>
-            <DNSMode>0</DNSMode>
+            {if $account.19.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.19.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             <XFERExpire>0</XFERExpire>
             <BanAnonymous>0</BanAnonymous>
             <DialOffLine>0</DialOffLine>
@@ -2906,11 +3125,13 @@
             <RFCVer>1</RFCVer>
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>
-            <Transport>0</Transport>
+            {if $account.19.sip_transport == 'udp'}<Transport>0</Transport>{/if}
+            {if $account.19.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
+            {if $account.19.sip_transport == 'tls'}<Transport>2</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
-            <AutoTCP>0</AutoTCP>
+            <AutoTCP>1</AutoTCP>
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
@@ -2940,8 +3161,8 @@
             <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -2952,7 +3173,7 @@
             <UseVPN>1</UseVPN>
             <EnableDND>0</EnableDND>
             <InactiveHold>0</InactiveHold>
-            <ReqWithPort>0</ReqWithPort>
+            <ReqWithPort>1</ReqWithPort>
             <UpdateRegExpire>1</UpdateRegExpire>
             <EnableSCA>0</EnableSCA>
             <SubCallPark>0</SubCallPark>
@@ -2963,7 +3184,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -2981,32 +3202,41 @@
             <BLFDialogMatch>1</BLFDialogMatch>
             <Ptime>0</Ptime>
             <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="20">
-            <PhoneNumber></PhoneNumber>
-            <DisplayName></DisplayName>
+            <PhoneNumber>{$account.20.user_id}</PhoneNumber>
+            <DisplayName>{$account.20.display_name}</DisplayName>
             <SipName></SipName>
-            <RegisterAddr></RegisterAddr>
-            <RegisterPort>5060</RegisterPort>
-            <RegisterUser></RegisterUser>
-            <RegisterPswd></RegisterPswd>
-            <RegisterTTL>3600</RegisterTTL>
+            <RegisterAddr>{$account.20.server_address}</RegisterAddr>
+            <RegisterPort>{$account.20.sip_port}</RegisterPort>
+            <RegisterUser>{$account.20.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.20.password}</RegisterPswd>
+            <RegisterTTL>{$account.20.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
-            <EnableReg>0</EnableReg>
-            <ProxyAddr></ProxyAddr>
-            <ProxyPort>5060</ProxyPort>
-            <ProxyUser></ProxyUser>
-            <ProxyPswd></ProxyPswd>
-            <BakProxyAddr></BakProxyAddr>
-            <BakProxyPort>5060</BakProxyPort>
-            <EnableFailback>1</EnableFailback>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
+            <EnableReg>{if isset($account.20.password)}1{else}0{/if}</EnableReg>
+            <ProxyAddr>{$account.20.outbound_proxy_primary}</ProxyAddr>
+            <ProxyPort>{$account.20.sip_port}</ProxyPort>
+            <ProxyUser>{$account.20.auth_id}</ProxyUser>
+            <ProxyPswd>{$account.20.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
+            <BakProxyAddr>{$account.20.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.20.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
+            <EnableFailback>{if isset($account.20.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -3026,7 +3256,7 @@
             <PickupNum></PickupNum>
             <JoinNum></JoinNum>
             <IntercomNum></IntercomNum>
-            <RingType>default</RingType>
+            <RingType>{if isset($fanvil_ringtone_line20)}{$fanvil_ringtone_line20}{else}default{/if}</RingType>
             <NATUDPUpdate>2</NATUDPUpdate>
             <UDPUpdateTTL>30</UDPUpdateTTL>
             <ServerType>0</ServerType>
@@ -3041,14 +3271,14 @@
             <NATType>0</NATType>
             <EnableRport>1</EnableRport>
             <Subscribe>0</Subscribe>
-            <SubExpire>3600</SubExpire>
+            <SubExpire>{$account.20.register_expires}</SubExpire>
             <SingleCodec>0</SingleCodec>
             <CLIR>0</CLIR>
             <StrictProxy>1</StrictProxy>
             <DirectContact>0</DirectContact>
             <HistoryInfo>0</HistoryInfo>
-            <DNSSRV>0</DNSSRV>
-            <DNSMode>0</DNSMode>
+            {if $account.20.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.20.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
             <XFERExpire>0</XFERExpire>
             <BanAnonymous>0</BanAnonymous>
             <DialOffLine>0</DialOffLine>
@@ -3057,11 +3287,13 @@
             <RFCVer>1</RFCVer>
             <PhonePort>0</PhonePort>
             <SignalPort>5060</SignalPort>
-            <Transport>0</Transport>
+            {if $account.20.sip_transport == 'udp'}<Transport>0</Transport>{/if}
+            {if $account.20.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
+            {if $account.20.sip_transport == 'tls'}<Transport>2</Transport>{/if}
             <UseSRVMixer>0</UseSRVMixer>
             <SRVMixerUri></SRVMixerUri>
             <LongContact>0</LongContact>
-            <AutoTCP>0</AutoTCP>
+            <AutoTCP>1</AutoTCP>
             <UriEscaped>1</UriEscaped>
             <ClicktoTalk>0</ClicktoTalk>
             <MwiNo></MwiNo>
@@ -3091,8 +3323,8 @@
             <SendANOffCode></SendANOffCode>
             <CWOnCode></CWOnCode>
             <CWOffCode></CWOffCode>
-            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
-            <VideoCodecMap></VideoCodecMap>
+            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
             <BLFListUri></BLFListUri>
             <BLFServer></BLFServer>
             <Respond182>0</Respond182>
@@ -3103,7 +3335,7 @@
             <UseVPN>1</UseVPN>
             <EnableDND>0</EnableDND>
             <InactiveHold>0</InactiveHold>
-            <ReqWithPort>0</ReqWithPort>
+            <ReqWithPort>1</ReqWithPort>
             <UpdateRegExpire>1</UpdateRegExpire>
             <EnableSCA>0</EnableSCA>
             <SubCallPark>0</SubCallPark>
@@ -3114,7 +3346,7 @@
             <UseTelCall>0</UseTelCall>
             <EnablePreview>0</EnablePreview>
             <PreviewMode>1</PreviewMode>
-            <TLSVersion>0</TLSVersion>
+            <TLSVersion>2</TLSVersion>
             <CSTANumber></CSTANumber>
             <EnableChgPort>0</EnableChgPort>
             <VQName></VQName>
@@ -3132,7 +3364,22 @@
             <BLFDialogMatch>1</BLFDialogMatch>
             <Ptime>0</Ptime>
             <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
+        <p2p>
+            <SIPP2PEnableAutoAnswer>0</SIPP2PEnableAutoAnswer>
+            <SIPP2PAutoAnswerDelay>30</SIPP2PAutoAnswerDelay>
+            <SIPP2PDtmfMode>1</SIPP2PDtmfMode>
+            <SIPP2PSipInfoDtmfMode>0</SIPP2PSipInfoDtmfMode>
+            <SIPP2PEnablePreview>0</SIPP2PEnablePreview>
+            <SIPP2PPreviewMode>0</SIPP2PPreviewMode>
+            <SIPP2PUseVPN>1</SIPP2PUseVPN>
+        </p2p>
     </sip>
     <call>
         <port index="1">
@@ -3151,7 +3398,6 @@
             <MuteRinging>0</MuteRinging>
             <BanDialOut>0</BanDialOut>
             <BanEmptyCID>0</BanEmptyCID>
-            <AcceptAnyCall>1</AcceptAnyCall>
             <EnableCLIP>1</EnableCLIP>
             <CallWaiting>1</CallWaiting>
             <CallTransfer>1</CallTransfer>
@@ -3164,7 +3410,7 @@
             <EnableIntercom>1</EnableIntercom>
             <IntercomMute>0</IntercomMute>
             <IntercomTone>1</IntercomTone>
-            <IntercomBarge>1</IntercomBarge>
+            <IntercomBarge>0</IntercomBarge>
             <UseAutoRedial>0</UseAutoRedial>
             <RedialEnterCallLog>0</RedialEnterCallLog>
             <AutoRedialDelay>30</AutoRedialDelay>
@@ -3183,8 +3429,8 @@
             <CallerNameType>0</CallerNameType>
             <MuteForRing>0</MuteForRing>
             <AutoHandleVideo>1</AutoHandleVideo>
-            <DefaultAnsMode>2</DefaultAnsMode>
-            <DefaultDialMode>2</DefaultDialMode>
+            <DefaultAnsMode>{$fanvil_default_answer_mode}</DefaultAnsMode>
+            <DefaultDialMode>{$fanvil_default_dial_mode}</DefaultDialMode>
             <HoldToTransfer>0</HoldToTransfer>
             <EnablePreDial>1</EnablePreDial>
             <DefaultExtLine>1</DefaultExtLine>
@@ -3206,6 +3452,10 @@
             <ConfDTMFCode></ConfDTMFCode>
             <DisableDialSearch>0</DisableDialSearch>
             <CallNumberFilter></CallNumberFilter>
+            <AutoResumeCurrent>0</AutoResumeCurrent>
+            <AlertTimeout>120</AlertTimeout>
+            <RingTimeout>120</RingTimeout>
+            <RingPriority>0</RingPriority>
         </port>
         <basic>
             <DialbyPound>1</DialbyPound>
@@ -3221,47 +3471,57 @@
         </basic>
         <alertInfo index="1">
             <Text></Text>
-            <RingType>Type 1</RingType>
+            <Line>-1</Line>
+            <RingType>{if isset($fanvil_default_ringtone_ext)}{$fanvil_default_ringtone_ext}{else}Type 1{/if}</RingType>
         </alertInfo>
         <alertInfo index="2">
             <Text></Text>
-            <RingType>Type 1</RingType>
+            <Line>-1</Line>
+            <RingType>{if isset($fanvil_default_ringtone_ext2)}{$fanvil_default_ringtone_ext2}{else}Type 4{/if}</RingType>
         </alertInfo>
         <alertInfo index="3">
             <Text></Text>
+            <Line>-1</Line>
             <RingType>Type 1</RingType>
         </alertInfo>
         <alertInfo index="4">
             <Text></Text>
+            <Line>-1</Line>
             <RingType>Type 1</RingType>
         </alertInfo>
         <alertInfo index="5">
             <Text></Text>
+            <Line>-1</Line>
             <RingType>Type 1</RingType>
         </alertInfo>
         <alertInfo index="6">
             <Text></Text>
+            <Line>-1</Line>
             <RingType>Type 1</RingType>
         </alertInfo>
         <alertInfo index="7">
             <Text></Text>
+            <Line>-1</Line>
             <RingType>Type 1</RingType>
         </alertInfo>
         <alertInfo index="8">
             <Text></Text>
+            <Line>-1</Line>
             <RingType>Type 1</RingType>
         </alertInfo>
         <alertInfo index="9">
             <Text></Text>
+            <Line>-1</Line>
             <RingType>Type 1</RingType>
         </alertInfo>
         <alertInfo index="10">
             <Text></Text>
+            <Line>-1</Line>
             <RingType>Type 1</RingType>
         </alertInfo>
     </call>
     <phone>
-        <MenuPassword>123</MenuPassword>
+        <MenuPassword>{if isset($fanvil_menu_password)}{$fanvil_menu_password}{else}123{/if}</MenuPassword>
         <KeyLockPassword>123</KeyLockPassword>
         <FastKeylockCode></FastKeylockCode>
         <EnableKeyLock>0</EnableKeyLock>
@@ -3276,18 +3536,23 @@
         <CallLogDisplayType>0</CallLogDisplayType>
         <EnableRecvSMS>1</EnableRecvSMS>
         <EnableCallHistory>1</EnableCallHistory>
-        <LineDisplayFormat>$name@$protocol$instance</LineDisplayFormat>
+        <LineDisplayFormat>$name</LineDisplayFormat>
         <EnableMWITone>0</EnableMWITone>
         <AllPswdEncryption>0</AllPswdEncryption>
         <SIPNotifyXML>1</SIPNotifyXML>
         <BlockXMLWhenCall>1</BlockXMLWhenCall>
         <XMLUpdateInterval>30</XMLUpdateInterval>
+        <VqmDisplayOrder></VqmDisplayOrder>
+        <EnablePushXMLAuth>0</EnablePushXMLAuth>
+        <PickupVisualAlert>0</PickupVisualAlert>
+        <PickupAudioAlert>0</PickupAudioAlert>
+        <PickupRingType></PickupRingType>
         <display>
-            <LCDTitle>VOIP PHONE</LCDTitle>
+            <LCDTitle>{$fanvil_greeting}</LCDTitle>
             <LCDConstrast>5</LCDConstrast>
-            <EnableEnergysaving>4</EnableEnergysaving>
-            <LCDLuminanceLevel>12</LCDLuminanceLevel>
-            <BacklightOffTime>45</BacklightOffTime>
+            <EnableEnergysaving>{if isset($fanvil_display_brightness_inactive)}{$fanvil_display_brightness_inactive}{else}4{/if}</EnableEnergysaving>
+            <LCDLuminanceLevel>{if isset($fanvil_display_brightness_active)}{$fanvil_display_brightness_active}{else}12{/if}</LCDLuminanceLevel>
+            <BacklightOffTime>{if isset($fanvil_display_inactivity_time)}{$fanvil_display_inactivity_time}{else}45{/if}</BacklightOffTime>
             <DisableCHNIME>0</DisableCHNIME>
             <PhoneModel></PhoneModel>
             <HostName>bcm911188sv</HostName>
@@ -3310,14 +3575,25 @@
         <blfLed>
             <BLFIdleColor>0</BLFIdleColor>
             <BLFIdleCtl>1</BLFIdleCtl>
+            <BLFIdleText>terminated</BLFIdleText>
             <BLFRingColor>1</BLFRingColor>
             <BLFRingCtl>2</BLFRingCtl>
-            <BLFUsingColor>1</BLFUsingColor>
-            <BLFUsingCtl>1</BLFUsingCtl>
+            <BLFRingText>early</BLFRingText>
+            <BLFDialingColor>1</BLFDialingColor>
+            <BLFDialingCtl>0</BLFDialingCtl>
+            <BLFDialingText></BLFDialingText>
+            <BLFTalkingColor>1</BLFTalkingColor>
+            <BLFTalkingCtl>1</BLFTalkingCtl>
+            <BLFTalkingText>confirmed</BLFTalkingText>
+            <BLFHoldColor>1</BLFHoldColor>
+            <BLFHoldCtl>0</BLFHoldCtl>
+            <BLFHoldText></BLFHoldText>
             <BLFFailedColor>2</BLFFailedColor>
             <BLFFailedCtl>0</BLFFailedCtl>
+            <BLFFailedText>failed</BLFFailedText>
             <BLFParkedColor>0</BLFParkedColor>
             <BLFParkedCtl>3</BLFParkedCtl>
+            <BLFParkedText>parked</BLFParkedText>
         </blfLed>
         <volume>
             <HandsetVol></HandsetVol>
@@ -3328,19 +3604,21 @@
             <HandFreeVol></HandFreeVol>
             <HandFreeMicVol></HandFreeMicVol>
             <HandFreeRingVol></HandFreeRingVol>
-            <RingType></RingType>
+            <RingType>{if isset($fanvil_default_ringtone)}{$fanvil_default_ringtone}{else}Type 2{/if}</RingType>
         </volume>
         <date>
-            <EnableSNTP>1</EnableSNTP>
-            <SNTPServer>0.pool.ntp.org</SNTPServer>
-            <SecondSNTPServer>time.nist.gov</SecondSNTPServer>
-            <TimeZone>32</TimeZone>
-            <TimeZoneName>UTC+8</TimeZoneName>
+            <EnableSNTP>{if isset($fanvil_enable_sntp)}{$fanvil_enable_sntp}{else}1{/if}</EnableSNTP>
+            <SNTPServer>{$ntp_server_primary}</SNTPServer>
+            <SecondSNTPServer>{$ntp_server_secondary}</SecondSNTPServer>
+            <TimeZone>{$fanvil_time_zone}</TimeZone>
+            <TimeZoneName>{$fanvil_time_zone_name}</TimeZoneName>
+            <Enable_DST>{$fanvil_enable_dst}</Enable_DST>
+            <DST_Fixed_Type>{if isset($fanvil_dst_fixed_type)}{$fanvil_dst_fixed_type}{else}0{/if}</DST_Fixed_Type>
             <SNTPTimeout>60</SNTPTimeout>
-            <DSTType>0</DSTType>
-            <DSTLocation>0</DSTLocation>
+            <DSTType>1</DSTType>
+            <DSTLocation>{if isset($fanvil_location)}{$fanvil_location}{else}4{/if}</DSTLocation>
             <DSTRuleMode>0</DSTRuleMode>
-            <DSTMinOffset>60</DSTMinOffset>
+            <DSTMinOffset>{if isset($fanvil_dst_minute_offset)}{$fanvil_dst_minute_offset}{else}60{/if}</DSTMinOffset>
             <DSTStartMon>3</DSTStartMon>
             <DSTStartWeek>5</DSTStartWeek>
             <DSTStartWday>0</DSTStartWday>
@@ -3352,27 +3630,28 @@
         </date>
         <timeDisplay>
             <EnableTimeDisplay>0</EnableTimeDisplay>
-            <TimeDisplayStyle>0</TimeDisplayStyle>
-            <DateDisplayStyle>0</DateDisplayStyle>
-            <DateSeparator>0</DateSeparator>
+            <TimeDisplayStyle>{if isset($fanvil_time_display)}{$fanvil_time_display}{else}0{/if}</TimeDisplayStyle>
+            <DateDisplayStyle>{if isset($fanvil_date_display)}{$fanvil_date_display}{else}6{/if}</DateDisplayStyle>
+            <DateSeparator>{if isset($fanvil_date_separator)}{$fanvil_date_separator}{else}0{/if}</DateSeparator>
         </timeDisplay>
         <softkey>
             <SoftkeyMode>0</SoftkeyMode>
-            <SoftKeyExitStyle>2</SoftKeyExitStyle>
-            <DesktopSoftkey>history;contact;dnd;menu;</DesktopSoftkey>
-            <TalkingSoftkey>hold;xfer;conf;end;</TalkingSoftkey>
-            <RingingSoftkey>accept;none;forward;reject;</RingingSoftkey>
+            <SoftKeyExitStyle>{if isset($fanvil_softkey_exit)}{$fanvil_softkey_exit}{else}2{/if}</SoftKeyExitStyle>
+            <DesktopSoftkey>{if isset($fanvil_softkey_desktopsoftkey)}{$fanvil_softkey_desktopsoftkey}{else}history;contact;dnd;menu;{/if}</DesktopSoftkey>
+            <TalkingSoftkey>{if isset($fanvil_softkey_talkingsoftkey)}{$fanvil_softkey_talkingsoftkey}{else}hold;xfer;conf;end;{/if}</TalkingSoftkey>
+            <RingingSoftkey>{if isset($fanvil_softkey_ringingsoftkey)}{$fanvil_softkey_ringingsoftkey}{else}accept;none;forward;reject;{/if}</RingingSoftkey>
             <AlertingSoftkey>end;none;none;none;</AlertingSoftkey>
             <XAlertingSoftkey>end;none;none;xfer;</XAlertingSoftkey>
             <ConferenceSoftkey>hold;none;split;end;</ConferenceSoftkey>
             <WaitingSoftkey>xfer;accept;reject;end;</WaitingSoftkey>
             <EndingSoftkey>redial;none;none;end;</EndingSoftkey>
-            <DialerPreSoftkey>send;2aB;delete;exit;</DialerPreSoftkey>
+            <DialerPreSoftkey>send;save;delete;exit;</DialerPreSoftkey>
             <DialerCallSoftkey>send;2aB;delete;exit;</DialerCallSoftkey>
             <DialerXferSoftkey>delete;xfer;send;exit;</DialerXferSoftkey>
             <DialerCfwdSoftkey>send;2aB;delete;exit;</DialerCfwdSoftkey>
-            <DesktopClick>history;status;none;none;none;</DesktopClick>
+            <DesktopClick>{if isset($fanvil_softkey_desktopclick)}{$fanvil_softkey_desktopclick}{else}history;status;none;none;none;{/if}</DesktopClick>
             <DailerClick>pline;nline;none;none;none;</DailerClick>
+            <RingingClick>none;none;none;none;none;</RingingClick>
             <CallClick>none;none;voldown;volup;none;</CallClick>
             <DesktopLongPress>status;none;none;none;reset;</DesktopLongPress>
             <DialerConfSoftkey>contact;clogs;redial;video;cancel;</DialerConfSoftkey>
@@ -3612,6 +3891,9 @@
     </phone>
     <dm>
         <OnhookTime>120</OnhookTime>
+        <EnableHookflash>0</EnableHookflash>
+        <KeyLongPressTime>2</KeyLongPressTime>
+        <KeyLongLongPressTime>6</KeyLongLongPressTime>
     </dm>
     <vqm>
         <SessionReport>1</SessionReport>
@@ -3661,10 +3943,8 @@
         <NewMissedcallUrl></NewMissedcallUrl>
         <NewMWIUrl></NewMWIUrl>
         <NewSMSUrl></NewSMSUrl>
-        <at>
-            <AtEnabled>0</AtEnabled>
-            <AtServer></AtServer>
-        </at>
+        <WebAuthChangedUrl></WebAuthChangedUrl>
+        <at></at>
     </cti>
     <ateTest>
         <ATEId>0000000000000000</ATEId>
@@ -3672,56 +3952,72 @@
     <mcast>
         <Priority>0</Priority>
         <EnablePriority>0</EnablePriority>
+        <EnablePrioChan>0</EnablePrioChan>
+        <EnableEmerChan>0</EnableEmerChan>
+        <MulticastTone>1</MulticastTone>
         <addr index="1">
             <Name></Name>
             <Host></Host>
             <Port>0</Port>
+            <Channel>0</Channel>
         </addr>
         <addr index="2">
             <Name></Name>
             <Host></Host>
             <Port>0</Port>
+            <Channel>0</Channel>
         </addr>
         <addr index="3">
             <Name></Name>
             <Host></Host>
             <Port>0</Port>
+            <Channel>0</Channel>
         </addr>
         <addr index="4">
             <Name></Name>
             <Host></Host>
             <Port>0</Port>
+            <Channel>0</Channel>
         </addr>
         <addr index="5">
             <Name></Name>
             <Host></Host>
             <Port>0</Port>
+            <Channel>0</Channel>
         </addr>
         <addr index="6">
             <Name></Name>
             <Host></Host>
             <Port>0</Port>
+            <Channel>0</Channel>
         </addr>
         <addr index="7">
             <Name></Name>
             <Host></Host>
             <Port>0</Port>
+            <Channel>0</Channel>
         </addr>
         <addr index="8">
             <Name></Name>
             <Host></Host>
             <Port>0</Port>
+            <Channel>0</Channel>
         </addr>
         <addr index="9">
             <Name></Name>
             <Host></Host>
             <Port>0</Port>
+            <Channel>0</Channel>
         </addr>
         <addr index="10">
             <Name></Name>
             <Host></Host>
             <Port>0</Port>
+            <Channel>0</Channel>
         </addr>
+        <dynamic>
+            <AutoExitExpires>60</AutoExitExpires>
+        </dynamic>
     </mcast>
     <dsskey>
         <SelectDsskeyAction>0</SelectDsskeyAction>
@@ -3729,6 +4025,12 @@
         <FuncKeyPageNum>4</FuncKeyPageNum>
         <SideKeyPageNum>1</SideKeyPageNum>
         <DSSHomePage>0</DSSHomePage>
+        <DisplayParkedInfo>0</DisplayParkedInfo>
+        <DSSDIALSwitchMode>0</DSSDIALSwitchMode>
+        <FirstCallWaitTime>16</FirstCallWaitTime>
+        <FirstNumStartTime>360</FirstNumStartTime>
+        <FirstNumEndTime>1080</FirstNumEndTime>
+        <DSSLongPressAction>1</DSSLongPressAction>
         <Extern1PageBelong>0</Extern1PageBelong>
         <Extern2PageBelong>0</Extern2PageBelong>
         <Extern3PageBelong>0</Extern3PageBelong>
@@ -3744,1446 +4046,74 @@
         <DSSExtend4IP></DSSExtend4IP>
         <DSSExtend5MAC></DSSExtend5MAC>
         <DSSExtend5IP></DSSExtend5IP>
-        <SidekeyConfig1 index="1">
-            <Type>2</Type>
-            <Value>SIP1</Value>
-            <Title></Title>
-            <ICON>Green</ICON>
-        </SidekeyConfig1>
-        <SidekeyConfig1 index="2">
-            <Type>2</Type>
-            <Value>SIP2</Value>
-            <Title></Title>
-            <ICON>Green</ICON>
-        </SidekeyConfig1>
-        <SidekeyConfig1 index="3">
-            <Type>2</Type>
-            <Value>SIP3</Value>
-            <Title></Title>
-            <ICON>Green</ICON>
-        </SidekeyConfig1>
-        <SidekeyConfig1 index="4">
-            <Type>2</Type>
-            <Value>SIP4</Value>
-            <Title></Title>
-            <ICON>Green</ICON>
-        </SidekeyConfig1>
-        <SidekeyConfig1 index="5">
-            <Type>2</Type>
-            <Value>SIP5</Value>
-            <Title></Title>
-            <ICON>Green</ICON>
-        </SidekeyConfig1>
-        <SidekeyConfig1 index="6">
-            <Type>2</Type>
-            <Value>SIP6</Value>
-            <Title></Title>
-            <ICON>Green</ICON>
-        </SidekeyConfig1>
-        <SidekeyConfig1 index="7">
-            <Type>3</Type>
-            <Value>F_MWI</Value>
-            <Title></Title>
-            <ICON>Green</ICON>
-        </SidekeyConfig1>
-        <SidekeyConfig1 index="8">
-            <Type>3</Type>
-            <Value>F_HEADSET</Value>
-            <Title></Title>
-            <ICON>Green</ICON>
-        </SidekeyConfig1>
-        <SidekeyConfig1 index="9">
-            <Type>0</Type>
-            <Value></Value>
-            <Title></Title>
-            <ICON>Green</ICON>
-        </SidekeyConfig1>
-        <SidekeyConfig1 index="10">
-            <Type>0</Type>
-            <Value></Value>
-            <Title></Title>
-            <ICON>Green</ICON>
-        </SidekeyConfig1>
-        <SidekeyConfig1 index="11">
-            <Type>0</Type>
-            <Value></Value>
-            <Title></Title>
-            <ICON>Green</ICON>
-        </SidekeyConfig1>
+        {strip}{*-- 11 dssSide keys --*}{/strip}   
+        <dssSide index="1">
+        {foreach $keys["line"] as $row}
+            <Fkey index="{$row.device_key_id}">
+                <Type>{if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if}</Type>
+                <Value>{if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if}</Value>
+                <Title>{$row.device_key_label}</Title>
+                <ICON>{$row.device_key_icon}</ICON>
+            </Fkey>
+        {/foreach}
+        </dssSide>
+        {strip}{*-- 4 pages containing 29 keys each --*}{/strip}
         <internal index="1">
-            <Fkey index="1">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="2">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="3">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="4">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="5">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="6">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="7">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="8">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="9">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="10">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="11">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="12">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="13">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="14">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="15">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="16">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="17">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="18">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="19">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="20">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="21">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="22">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="23">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="24">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="25">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="26">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="27">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="28">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="29">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
+            {foreach $keys["memory"] as $row}
+                {if $row.device_key_id <= 29}
+                <Fkey index="{$row.device_key_id}">
+                    <Type>{if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if}</Type>
+                    <Value>{if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if}</Value>
+                    <Title>{$row.device_key_label}</Title>
+                    <ICON>{$row.device_key_icon}</ICON>
+                </Fkey>
+                {/if}
+            {/foreach}
         </internal>
         <internal index="2">
-            <Fkey index="1">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="2">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="3">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="4">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="5">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="6">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="7">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="8">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="9">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="10">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="11">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="12">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="13">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="14">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="15">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="16">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="17">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="18">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="19">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="20">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="21">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="22">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="23">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="24">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="25">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="26">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="27">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="28">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="29">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
+            {foreach $keys["memory"] as $row}
+                {if $row.device_key_id > 29 && $row.device_key_id <= 58}
+                <Fkey index="{$row.device_key_id-29}">
+                    <Type>{if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if}</Type>
+                    <Value>{if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if}</Value>
+                    <Title>{$row.device_key_label}</Title>
+                    <ICON>{$row.device_key_icon}</ICON>
+                </Fkey>
+                {/if}
+            {/foreach}
         </internal>
         <internal index="3">
-            <Fkey index="1">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="2">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="3">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="4">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="5">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="6">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="7">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="8">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="9">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="10">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="11">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="12">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="13">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="14">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="15">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="16">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="17">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="18">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="19">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="20">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="21">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="22">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="23">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="24">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="25">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="26">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="27">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="28">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="29">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
+            {foreach $keys["memory"] as $row}
+                {if $row.device_key_id > 58 && $row.device_key_id <= 87}
+                <Fkey index="{$row.device_key_id-58}">
+                    <Type>{if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if}</Type>
+                    <Value>{if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if}</Value>
+                    <Title>{$row.device_key_label}</Title>
+                    <ICON>{$row.device_key_icon}</ICON>
+                </Fkey>
+                {/if}
+            {/foreach}
         </internal>
         <internal index="4">
-            <Fkey index="1">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="2">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="3">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="4">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="5">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="6">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="7">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="8">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="9">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="10">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="11">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="12">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="13">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="14">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="15">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="16">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="17">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="18">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="19">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="20">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="21">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="22">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="23">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="24">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="25">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="26">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="27">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="28">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
-            <Fkey index="29">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </Fkey>
+            {foreach $keys["memory"] as $row}
+                {if $row.device_key_id > 87 && $row.device_key_id <= 116}
+                <Fkey index="{$row.device_key_id-87}">
+                    <Type>{if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if}</Type>
+                    <Value>{if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if}</Value>
+                    <Title>{$row.device_key_label}</Title>
+                    <ICON>{$row.device_key_icon}</ICON>
+                </Fkey>
+                {/if}
+            {/foreach}
         </internal>
-        <dssSoft index="1">
-            <Type>0</Type>
-            <Value></Value>
-            <Title></Title>
-            <ICON>Green</ICON>
-        </dssSoft>
-        <dssSoft index="2">
-            <Type>0</Type>
-            <Value></Value>
-            <Title></Title>
-            <ICON>Green</ICON>
-        </dssSoft>
-        <dssSoft index="3">
-            <Type>0</Type>
-            <Value></Value>
-            <Title></Title>
-            <ICON>Green</ICON>
-        </dssSoft>
-        <dssSoft index="4">
-            <Type>0</Type>
-            <Value></Value>
-            <Title></Title>
-            <ICON>Green</ICON>
-        </dssSoft>
-        <dssSoft index="5">
-            <Type>0</Type>
-            <Value></Value>
-            <Title></Title>
-            <ICON>Green</ICON>
-        </dssSoft>
-        <dssSoft index="6">
-            <Type>0</Type>
-            <Value></Value>
-            <Title></Title>
-            <ICON>Green</ICON>
-        </dssSoft>
-        <dssSoft index="7">
-            <Type>0</Type>
-            <Value></Value>
-            <Title></Title>
-            <ICON>Green</ICON>
-        </dssSoft>
-        <dssSoft index="8">
-            <Type>0</Type>
-            <Value></Value>
-            <Title></Title>
-            <ICON>Green</ICON>
-        </dssSoft>
-        <dssSoft index="9">
-            <Type>0</Type>
-            <Value></Value>
-            <Title></Title>
-            <ICON>Green</ICON>
-        </dssSoft>
-        <dssSoft index="10">
-            <Type>0</Type>
-            <Value></Value>
-            <Title></Title>
-            <ICON>Green</ICON>
-        </dssSoft>
-        <external index="1">
-            <exKey index="1">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="2">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="3">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="4">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="5">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="6">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="7">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="8">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="9">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="10">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="11">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="12">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="13">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="14">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="15">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="16">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="17">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="18">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="19">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="20">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-        </external>
-        <external index="2">
-            <exKey index="1">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="2">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="3">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="4">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="5">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="6">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="7">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="8">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="9">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="10">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="11">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="12">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="13">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="14">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="15">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="16">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="17">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="18">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="19">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="20">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-        </external>
-        <external index="3">
-            <exKey index="1">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="2">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="3">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="4">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="5">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="6">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="7">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="8">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="9">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="10">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="11">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="12">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="13">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="14">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="15">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="16">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="17">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="18">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="19">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="20">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-        </external>
-        <external index="4">
-            <exKey index="1">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="2">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="3">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="4">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="5">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="6">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="7">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="8">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="9">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="10">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="11">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="12">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="13">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="14">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="15">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="16">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="17">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="18">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="19">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="20">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-        </external>
-        <external index="5">
-            <exKey index="1">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="2">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="3">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="4">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="5">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="6">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="7">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="8">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="9">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="10">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="11">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="12">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="13">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="14">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="15">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="16">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="17">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="18">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="19">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-            <exKey index="20">
-                <Type>0</Type>
-                <Value></Value>
-                <Title></Title>
-                <ICON>Green</ICON>
-            </exKey>
-        </external>
+        {strip}{*-- 11 dssSoft keys --*}{/strip}
+        {foreach $keys["programmable"] as $row}
+            <dssSoft index="{$row.device_key_id}">
+                <Type>{if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if}</Type>
+                <Value>{if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if}</Value>
+                <Title>{$row.device_key_label}</Title>
+            </dssSoft>
+        {/foreach}
     </dsskey>
     <web>
         <WebServerType>0</WebServerType>
@@ -5219,7 +4149,7 @@
     </log>
     <tr069>
         <TR069Tone>1</TR069Tone>
-        <CPESerialNumber>00100400FV02001000000c383e30234d</CPESerialNumber>
+        <CPESerialNumber></CPESerialNumber>
         <ACSServerType>1</ACSServerType>
         <EnableTR069>0</EnableTR069>
         <ACSURL>0.0.0.0</ACSURL>
@@ -5231,7 +4161,7 @@
         <CPEUserName>dps</CPEUserName>
         <CPEPassword>dps</CPEPassword>
         <PeriodixInterval>3600</PeriodixInterval>
-        <TLSVersion>0</TLSVersion>
+        <TLSVersion>2</TLSVersion>
         <AreaCode>020</AreaCode>
         <STUNEnable>0</STUNEnable>
         <STUNServerAddr></STUNServerAddr>
@@ -5245,23 +4175,88 @@
         <ListenIP>224.0.2.0</ListenIP>
         <ListenPort>16360</ListenPort>
         <OwnName>SIP Hotspot</OwnName>
+        <RingMode>0</RingMode>
+        <EnableManageMode>0</EnableManageMode>
+        <EnableConfigMode>0</EnableConfigMode>
         <hs index="1">
             <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
         </hs>
         <hs index="2">
             <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
         </hs>
         <hs index="3">
             <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
         </hs>
         <hs index="4">
             <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
         </hs>
         <hs index="5">
             <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
         </hs>
         <hs index="6">
             <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
+        </hs>
+        <hs index="7">
+            <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
+        </hs>
+        <hs index="8">
+            <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
+        </hs>
+        <hs index="9">
+            <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
+        </hs>
+        <hs index="10">
+            <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
+        </hs>
+        <hs index="11">
+            <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
+        </hs>
+        <hs index="12">
+            <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
+        </hs>
+        <hs index="13">
+            <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
+        </hs>
+        <hs index="14">
+            <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
+        </hs>
+        <hs index="15">
+            <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
+        </hs>
+        <hs index="16">
+            <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
+        </hs>
+        <hs index="17">
+            <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
+        </hs>
+        <hs index="18">
+            <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
+        </hs>
+        <hs index="19">
+            <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
+        </hs>
+        <hs index="20">
+            <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
         </hs>
     </hotspot>
     <vpn>
@@ -5282,18 +4277,18 @@
         <AutoServerDigest>0</AutoServerDigest>
     </mt>
     <ap>
-        <DefaultUsername></DefaultUsername>
-        <DefaultPassword></DefaultPassword>
+        <DefaultUsername>{$http_auth_username}</DefaultUsername>
+        <DefaultPassword>{$http_auth_password}</DefaultPassword>
         <InputCfgFileName></InputCfgFileName>
         <DeviceCfgFileKey></DeviceCfgFileKey>
         <CommonCfgFileKey></CommonCfgFileKey>
         <DownloadCommonConf>1</DownloadCommonConf>
-        <SaveProvisionInfo>0</SaveProvisionInfo>
+        <SaveProvisionInfo>1</SaveProvisionInfo>
         <CheckFailTimes>5</CheckFailTimes>
-        <FlashServerIP></FlashServerIP>
-        <FlashFileName></FlashFileName>
-        <FlashProtocol>2</FlashProtocol>
-        <FlashMode>0</FlashMode>
+        <FlashServerIP>{if isset($fanvil_provision_url)}{$fanvil_provision_url}{else}https://{$domain_name}/app/provision{/if}</FlashServerIP>
+        <FlashFileName>{$fanvil_firmware_config}</FlashFileName>
+        <FlashProtocol>5</FlashProtocol>
+        <FlashMode>1</FlashMode>
         <FlashInterval>1</FlashInterval>
         <updatePBInterval>720</updatePBInterval>
         <APPswdEncryption>0</APPswdEncryption>
@@ -5308,30 +4303,31 @@
             <DHCPOption>66</DHCPOption>
             <DHCPv6Option>0</DHCPv6Option>
             <DhcpOption120>0</DhcpOption120>
+            <SaveDHCPOpion>0</SaveDHCPOpion>
         </opt>
     </ap>
     <fwCheck>
-        <EnableAutoUpgrade>0</EnableAutoUpgrade>
-        <UpgradeServer1></UpgradeServer1>
-        <UpgradeServer2></UpgradeServer2>
-        <AutoUpgradeInterval>24</AutoUpgradeInterval>
+        <EnableAutoUpgrade>{if isset($fanvil_enable_auto_upgrade)}{$fanvil_enable_auto_upgrade}{else}0{/if}</EnableAutoUpgrade>
+        <UpgradeServer1>{if isset($fanvil_firmware_upgrade_server_1)}{$fanvil_firmware_upgrade_server_1}{else}{/if}</UpgradeServer1>
+        <UpgradeServer2>{if isset($fanvil_firmware_upgrade_server_2)}{$fanvil_firmware_upgrade_server_2}{else}{/if}</UpgradeServer2>
+        <AutoUpgradeInterval>{if isset($fanvil_firmware_upgrade_interval)}{$fanvil_firmware_upgrade_interval}{else}24{/if}</AutoUpgradeInterval>
     </fwCheck>
     <qos>
-        <EnableVLAN>0</EnableVLAN>
-        <VLANID>256</VLANID>
-        <EnablePVID>0</EnablePVID>
-        <PVIDValue>254</PVIDValue>
-        <SignallingPriority>0</SignallingPriority>
-        <VoicePriority>0</VoicePriority>
-        <VideoPriority>0</VideoPriority>
+        <EnableVLAN>{if isset($fanvil_enable_vlan)}{$fanvil_enable_vlan}{else}0{/if}</EnableVLAN>
+        <VLANID>{if isset($fanvil_lan_port_vlan)}{$fanvil_lan_port_vlan}{else}256{/if}</VLANID>
+        <EnablePVID>{if isset($fanvil_pc_port_vlan)}2{else}1{/if}</EnablePVID>
+        <PVIDValue>{if isset($fanvil_pc_port_vlan)}{$fanvil_pc_port_vlan}{else}254{/if}</PVIDValue>
+        <SignallingPriority>{if isset($fanvil_qos_sip)}{$fanvil_qos_sip}{else}0{/if}</SignallingPriority>
+        <VoicePriority>{if isset($fanvil_qos_rtp_voice)}{$fanvil_qos_rtp_voice}{else}0{/if}</VoicePriority>
+        <VideoPriority>{if isset($fanvil_qos_rtp_video)}{$fanvil_qos_rtp_video}{else}0{/if}</VideoPriority>
         <LANPortPriority>0</LANPortPriority>
-        <EnablediffServ>0</EnablediffServ>
-        <SingallingDSCP>46</SingallingDSCP>
-        <VoiceDSCP>46</VoiceDSCP>
-        <VideoDSCP>46</VideoDSCP>
-        <LLDPTransmit>1</LLDPTransmit>
-        <LLDPRefreshTime>60</LLDPRefreshTime>
-        <LLDPLearnPolicy>1</LLDPLearnPolicy>
+        <EnablediffServ>{if isset($fanvil_enable_diffserv)}{$fanvil_enable_diffserv}{else}0{/if}</EnablediffServ>
+        <SingallingDSCP>{if isset($fanvil_dscp_sip)}{$fanvil_dscp_sip}{else}46{/if}</SingallingDSCP>
+        <VoiceDSCP>{if isset($fanvil_dscp_rtp_voice)}{$fanvil_dscp_rtp_voice}{else}46{/if}</VoiceDSCP>
+        <VideoDSCP>{if isset($fanvil_dscp_rtp_video)}{$fanvil_dscp_rtp_video}{else}34{/if}</VideoDSCP>
+        <LLDPTransmit>{if isset($fanvil_lldp_tx_enable)}{$fanvil_lldp_tx_enable}{else}0{/if}</LLDPTransmit>
+        <LLDPRefreshTime>{if isset($fanvil_lldp_refresh)}{$fanvil_lldp_refresh}{else}60{/if}</LLDPRefreshTime>
+        <LLDPLearnPolicy>{if isset($fanvil_lldp_learn)}{$fanvil_lldp_learn}{else}0{/if}</LLDPLearnPolicy>
         <LLDPSaveLearnData>0</LLDPSaveLearnData>
         <CDPEnable>1</CDPEnable>
         <CDPRefreshTime>60</CDPRefreshTime>
@@ -5364,12 +4360,10 @@
     <UIconfig>
         <BluetoothEnabled>0</BluetoothEnabled>
         <BluetoothAdapterName>Fanvil X7</BluetoothAdapterName>
-        <BTLastConnectedAddr>00:00:00:00:00:00</BTLastConnectedAddr>
-        <BTAudioCodec>0</BTAudioCodec>
         <BluetoothRingMode>1</BluetoothRingMode>
     </UIconfig>
     <background>
-        <TimeoutToScreensaver>0</TimeoutToScreensaver>
+        <TimeoutToScreensaver>7200</TimeoutToScreensaver>
         <UserChangeBackground>0</UserChangeBackground>
         <UserChangeSubBackground></UserChangeSubBackground>
         <EHSHeadsettype>0</EHSHeadsettype>
@@ -5379,5 +4373,18 @@
         <SMSPopup>1</SMSPopup>
         <OtherPopup>1</OtherPopup>
         <EnablePortMirror>0</EnablePortMirror>
+        <AutoCloseLed>0</AutoCloseLed>
+        <IdleTimeFontColor>0xffffff</IdleTimeFontColor>
+        <CommonTitleFontColor>0xffffff</CommonTitleFontColor>
+        <SoftkeyFontColor>0xffffff</SoftkeyFontColor>
+        <MenuListFontColor>0x262626</MenuListFontColor>
+        <ScrollBarColor>0x5a9dba</ScrollBarColor>
+        <WarnThemeColor>0xc4012f</WarnThemeColor>
+        <InformThemeColor>0x007bb0</InformThemeColor>
+        <FunkeyListFontColor>0xffffff</FunkeyListFontColor>
+        <TalkingFontColor>0xffffff</TalkingFontColor>
+        <SidekeyLabelLength>0</SidekeyLabelLength>
+        <AppIconDisplay>1,1,1,1</AppIconDisplay>
+        <DisplayProvisionprompt>0</DisplayProvisionprompt>
     </background>
 </sysConf>
diff --git a/resources/templates/provision/fanvil/x7c/{$mac}.cfg b/resources/templates/provision/fanvil/x7c/{$mac}.cfg
new file mode 100644
index 0000000000..c66421ecb3
--- /dev/null
+++ b/resources/templates/provision/fanvil/x7c/{$mac}.cfg
@@ -0,0 +1,4390 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Template is optimized for firmware ver 2.2.10 and newer. Older firmware has incorrect tag names.-->
+<sysConf>
+    <Version>2.0000000000</Version>
+    <net>
+        <WANTYPE>0</WANTYPE>
+        <WANIP></WANIP>
+        <WANSubnetMask></WANSubnetMask>
+        <WANGateway></WANGateway>
+        <DomainName></DomainName>
+        <PrimaryDNS>{if isset($dns_server_primary)}{$dns_server_primary}{else}9.9.9.9{/if}</PrimaryDNS>
+        <SecondaryDNS>{if isset($dns_server_secondary)}{$dns_server_secondary}{else}208.67.222.222{/if}</SecondaryDNS>
+        <EnableDHCP>1</EnableDHCP>
+        <DHCPAutoDNS>1</DHCPAutoDNS>
+        <DHCPAutoTime>1</DHCPAutoTime>
+        <DHCPOption100-101>1</DHCPOption100-101>
+        <UseVendorClassID>0</UseVendorClassID>
+        <VendorClassID>Fanvil X7C</VendorClassID>
+        <EnablePPPoE>0</EnablePPPoE>
+        <PPPoEUser>user123</PPPoEUser>
+        <PPPoEPassword>password</PPPoEPassword>
+        <ARPCacheLife>2</ARPCacheLife>
+        <MTU>1500</MTU>
+        <WAN6IP></WAN6IP>
+        <WAN6IPPREFIX></WAN6IPPREFIX>
+        <WAN6Gateway></WAN6Gateway>
+        <Domain6Name></Domain6Name>
+        <PrimaryDNS6></PrimaryDNS6>
+        <SecondaryDNS6></SecondaryDNS6>
+        <EnableDHCP6>1</EnableDHCP6>
+        <DHCP6AutoDNS>1</DHCP6AutoDNS>
+        <DHCP6AutoTime>0</DHCP6AutoTime>
+        <UseVendor6ClassID>0</UseVendor6ClassID>
+        <Vendor6ClassID>Fanvil X7C</Vendor6ClassID>
+        <wifi>
+            <WIFIEnable>{$fanvil_wifi_enable}</WIFIEnable>
+            <WIFILogEnable>0</WIFILogEnable>
+            <WANTYPE>0</WANTYPE>
+            <WANIP>192.168.1.179</WANIP>
+            <WANSubnetMask>255.255.255.0</WANSubnetMask>
+            <WANGateway>192.168.1.1</WANGateway>
+            <DomainName></DomainName>
+            <PrimaryDNS>8.8.8.8</PrimaryDNS>
+            <SecondaryDNS>202.96.134.133</SecondaryDNS>
+            <EnableDHCP>1</EnableDHCP>
+            <DHCPAutoDNS>1</DHCPAutoDNS>
+            <DHCPOption100-101>1</DHCPOption100-101>
+            <UseVendorClassID>0</UseVendorClassID>
+            <VendorClassID>Fanvil X7C</VendorClassID>
+            <EnablePPPoE>0</EnablePPPoE>
+            <PPPoEUser>user123</PPPoEUser>
+            <PPPoEPassword>password</PPPoEPassword>
+            <WAN6IP></WAN6IP>
+            <WAN6IPPREFIX></WAN6IPPREFIX>
+            <WAN6Gateway></WAN6Gateway>
+            <Domain6Name></Domain6Name>
+            <PrimaryDNS6></PrimaryDNS6>
+            <SecondaryDNS6></SecondaryDNS6>
+            <EnableDHCP6>1</EnableDHCP6>
+            <DHCP6AutoDNS>1</DHCP6AutoDNS>
+            <UseVendor6ClassID>0</UseVendor6ClassID>
+            <Vendor6ClassID>Fanvil X7C</Vendor6ClassID>
+        </wifi>
+        <NetGlobal>
+            <NetPriority>10</NetPriority>
+        </NetGlobal>
+    </net>
+    <mm>
+        <G723BitRate>1</G723BitRate>
+        <ILBCPayloadType>97</ILBCPayloadType>
+        <ILBCPayloadLen>20</ILBCPayloadLen>
+        <AMRPayloadType>108</AMRPayloadType>
+        <AMRWBPayloadType>109</AMRWBPayloadType>
+        <G726-16PayloadType>103</G726-16PayloadType>
+        <G726-24PayloadType>104</G726-24PayloadType>
+        <G726-32PayloadType>102</G726-32PayloadType>
+        <G726-40PayloadType>105</G726-40PayloadType>
+        <DtmfPayloadType>101</DtmfPayloadType>
+        <OpusPayloadType>107</OpusPayloadType>
+        <OpusSampleRate>0</OpusSampleRate>
+        <VAD>0</VAD>
+        <H264PayloadType>117</H264PayloadType>
+        <ResvAudioBand>0</ResvAudioBand>
+        <RTPInitialPort>10000</RTPInitialPort>
+        <RTPPortQuantity>1000</RTPPortQuantity>
+        <RTPKeepAlive>1</RTPKeepAlive>
+        <RTPRelay>0</RTPRelay>
+        <RTCPCNAMEUser></RTCPCNAMEUser>
+        <RTCPCNAMEHost></RTCPCNAMEHost>
+        <SelectYourTone>{if isset($fanvil_country_toneset)}{$fanvil_country_toneset}{else}11{/if}</SelectYourTone>
+        <SidetoneGAIN>1</SidetoneGAIN>
+        <PlayEgressDTMF>0</PlayEgressDTMF>
+        <DialTone>350+440/0</DialTone>
+        <RingbackTone>440+480/2000,0/4000</RingbackTone>
+        <BusyTone>480+620/500,0/500</BusyTone>
+        <CongestionTone></CongestionTone>
+        <CallwaitingTone>440/300,0/10000,440/300,0/10000,0/0</CallwaitingTone>
+        <HoldingTone></HoldingTone>
+        <ErrorTone></ErrorTone>
+        <StutterTone></StutterTone>
+        <InformationTone></InformationTone>
+        <DialRecallTone>350+440/100,0/100,350+440/100,0/100,350+440/100,0/100,350+440/0</DialRecallTone>
+        <MessageTone></MessageTone>
+        <HowlerTone></HowlerTone>
+        <NumberUnobtainable>400/500,0/6000</NumberUnobtainable>
+        <WarningTone>1400/500,0/0</WarningTone>
+        <RecordTone>440/500,0/5000</RecordTone>
+        <AutoAnswerTone></AutoAnswerTone>
+        <capability>
+            <AudioCodecSets>PCMU,PCMA,G726-16,G726-24,G726-32,G726-40,G729,G723,iLBC</AudioCodecSets>
+            <VideoCodecSets>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}H264{/if}</VideoCodecSets>
+            <VideoFrameRate>25</VideoFrameRate>
+            <VideoBitRate>2000000</VideoBitRate>
+            <VideoResolution>4</VideoResolution>
+            <VideoNegotiateDir>2</VideoNegotiateDir>
+        </capability>
+    </mm>
+    <sip>
+        <SIPPort>{$sip_port}</SIPPort>
+        <STUNServer>{$fanvil_stun_server}</STUNServer>
+        <STUNPort>{$fanvil_stun_port}</STUNPort>
+        <STUNRefreshTime>50</STUNRefreshTime>
+        <SIPWaitStunTime>800</SIPWaitStunTime>
+        <ExternNATAddrs></ExternNATAddrs>
+        <RegFailInterval>32</RegFailInterval>
+        <SIPPswdEncryption>0</SIPPswdEncryption>
+        <StrictBranchPrefix>0</StrictBranchPrefix>
+        <VideoMuteAttr>0</VideoMuteAttr>
+        <EnableGroupBackup>0</EnableGroupBackup>
+        <EnableRFC4475>1</EnableRFC4475>
+        <StrictUAMatch>1</StrictUAMatch>
+        <CSTAEnable>0</CSTAEnable>
+        <NotifyReboot>1</NotifyReboot>
+        <line index="1">
+            <PhoneNumber>{$account.1.user_id}</PhoneNumber>
+            <DisplayName>{$account.1.display_name}</DisplayName>
+            <SipName></SipName>
+            <RegisterAddr>{$account.1.server_address}</RegisterAddr>
+            <RegisterPort>{$account.1.sip_port}</RegisterPort>
+            <RegisterUser>{$account.1.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.1.password}</RegisterPswd>
+            <RegisterTTL>{$account.1.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
+            <BackupAddr></BackupAddr>
+            <BackupPort>5060</BackupPort>
+            <BackupTransport>0</BackupTransport>
+            <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
+            <EnableReg>{if isset($account.1.password)}1{else}0{/if}</EnableReg>
+            <ProxyAddr>{$account.1.outbound_proxy_primary}</ProxyAddr>
+            <ProxyPort>{$account.1.sip_port}</ProxyPort>
+            <ProxyUser>{$account.1.auth_id}</ProxyUser>
+            <ProxyPswd>{$account.1.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
+            <BakProxyAddr>{$account.1.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.1.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
+            <EnableFailback>{if isset($account.1.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
+            <FailbackInterval>1800</FailbackInterval>
+            <SignalFailback>0</SignalFailback>
+            <SignalRetryCounts>3</SignalRetryCounts>
+            <SigCryptoKey></SigCryptoKey>
+            <MediaCrypto>0</MediaCrypto>
+            <MedCryptoKey></MedCryptoKey>
+            <SRTPAuth-Tag>0</SRTPAuth-Tag>
+            <EnableRFC5939>0</EnableRFC5939>
+            <LocalDomain></LocalDomain>
+            <AlwaysFWD>0</AlwaysFWD>
+            <BusyFWD>0</BusyFWD>
+            <NoAnswerFWD>0</NoAnswerFWD>
+            <AlwaysFWDNum></AlwaysFWDNum>
+            <BusyFWDNum></BusyFWDNum>
+            <NoAnswerFWDNum></NoAnswerFWDNum>
+            <FWDTimer>5</FWDTimer>
+            <HotlineNum></HotlineNum>
+            <EnableHotline>0</EnableHotline>
+            <WarmLineTime>0</WarmLineTime>
+            <PickupNum></PickupNum>
+            <JoinNum></JoinNum>
+            <IntercomNum></IntercomNum>
+            <RingType>{if isset($fanvil_ringtone_line1)}{$fanvil_ringtone_line1}{else}default{/if}</RingType>
+            <NATUDPUpdate>2</NATUDPUpdate>
+            <UDPUpdateTTL>30</UDPUpdateTTL>
+            <ServerType>0</ServerType>
+            <UserAgent></UserAgent>
+            <PRACK>0</PRACK>
+            <KeepAUTH>0</KeepAUTH>
+            <SessionTimer>0</SessionTimer>
+            <STimerExpires>0</STimerExpires>
+            <EnableGRUU>0</EnableGRUU>
+            <DTMFMode>3</DTMFMode>
+            <DTMFInfoMode>0</DTMFInfoMode>
+            <NATType>0</NATType>
+            <EnableRport>1</EnableRport>
+            <Subscribe>{if isset($account.1.user_id)}1{else}{/if}</Subscribe>
+            <SubExpire>{$account.1.register_expires}</SubExpire>
+            <SingleCodec>0</SingleCodec>
+            <CLIR>0</CLIR>
+            <StrictProxy>1</StrictProxy>
+            <DirectContact>0</DirectContact>
+            <HistoryInfo>0</HistoryInfo>
+            {if $account.1.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.1.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
+            <XFERExpire>0</XFERExpire>
+            <BanAnonymous>0</BanAnonymous>
+            <DialOffLine>0</DialOffLine>
+            <QuotaName>0</QuotaName>
+            <PresenceMode>0</PresenceMode>
+            <RFCVer>1</RFCVer>
+            <PhonePort>0</PhonePort>
+            <SignalPort>5060</SignalPort>
+            {if $account.1.sip_transport == 'udp'}<Transport>0</Transport>{/if}
+            {if $account.1.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
+            {if $account.1.sip_transport == 'tls'}<Transport>3</Transport>{/if}
+            <UseSRVMixer>0</UseSRVMixer>
+            <SRVMixerUri></SRVMixerUri>
+            <LongContact>0</LongContact>
+            <AutoTCP>1</AutoTCP>
+            <UriEscaped>1</UriEscaped>
+            <ClicktoTalk>0</ClicktoTalk>
+            <MwiNo></MwiNo>
+            <MWINum>{if isset($account.1.user_id)}*97{else}{/if}</MWINum>
+            <ParkNo></ParkNo>
+            <CallParkNum></CallParkNum>
+            <RetrieveNum></RetrieveNum>
+            <HelpNo></HelpNo>
+            <MSRPHelpNum></MSRPHelpNum>
+            <UserIsPhone>0</UserIsPhone>
+            <AutoAnswer>0</AutoAnswer>
+            <NoAnswerTime>5</NoAnswerTime>
+            <MissedCallLog>1</MissedCallLog>
+            <ParkMode></ParkMode>
+            <SvcCodeMode>1</SvcCodeMode>
+            <DNDOnSvcCode></DNDOnSvcCode>
+            <DNDOffSvcCode></DNDOffSvcCode>
+            <CFUOnSvcCode></CFUOnSvcCode>
+            <CFUOffSvcCode></CFUOffSvcCode>
+            <CFBOnSvcCode></CFBOnSvcCode>
+            <CFBOffSvcCode></CFBOffSvcCode>
+            <CFNOnSvcCode></CFNOnSvcCode>
+            <CFNOffSvcCode></CFNOffSvcCode>
+            <ANCOnSvcCode></ANCOnSvcCode>
+            <ANCOffSvcCode></ANCOffSvcCode>
+            <SendANOnCode></SendANOnCode>
+            <SendANOffCode></SendANOffCode>
+            <CWOnCode></CWOnCode>
+            <CWOffCode></CWOffCode>
+            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
+            <BLFListUri></BLFListUri>
+            <BLFServer></BLFServer>
+            <Respond182>0</Respond182>
+            <EnableBLFList>0</EnableBLFList>
+            <CallerIdType>4</CallerIdType>
+            <SynClockTime>0</SynClockTime>
+            <MohServer></MohServer>
+            <UseVPN>1</UseVPN>
+            <EnableDND>0</EnableDND>
+            <InactiveHold>0</InactiveHold>
+            <ReqWithPort>1</ReqWithPort>
+            <UpdateRegExpire>1</UpdateRegExpire>
+            <EnableSCA>0</EnableSCA>
+            <SubCallPark>0</SubCallPark>
+            <SubCCStatus>0</SubCCStatus>
+            <FeatureSync>0</FeatureSync>
+            <EnableXferBack>0</EnableXferBack>
+            <XferBackTime>35</XferBackTime>
+            <UseTelCall>0</UseTelCall>
+            <EnablePreview>0</EnablePreview>
+            <PreviewMode>1</PreviewMode>
+            <TLSVersion>2</TLSVersion>
+            <CSTANumber></CSTANumber>
+            <EnableChgPort>0</EnableChgPort>
+            <VQName></VQName>
+            <VQServer></VQServer>
+            <VQServerPort>5060</VQServerPort>
+            <VQHTTPServer></VQHTTPServer>
+            <FlashMode>0</FlashMode>
+            <ContentType></ContentType>
+            <ContentBody></ContentBody>
+            <UnregisterOnBoot>0</UnregisterOnBoot>
+            <EnableMACHeader>0</EnableMACHeader>
+            <EnableRegisterMAC>0</EnableRegisterMAC>
+            <RecordStart>Record:on</RecordStart>
+            <RecordStop>Record:off</RecordStop>
+            <BLFDialogMatch>1</BLFDialogMatch>
+            <Ptime>0</Ptime>
+            <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
+        </line>
+        <line index="2">
+            <PhoneNumber>{$account.2.user_id}</PhoneNumber>
+            <DisplayName>{$account.2.display_name}</DisplayName>
+            <SipName></SipName>
+            <RegisterAddr>{$account.2.server_address}</RegisterAddr>
+            <RegisterPort>{$account.2.sip_port}</RegisterPort>
+            <RegisterUser>{$account.2.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.2.password}</RegisterPswd>
+            <RegisterTTL>{$account.2.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
+            <BackupAddr></BackupAddr>
+            <BackupPort>5060</BackupPort>
+            <BackupTransport>0</BackupTransport>
+            <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
+            <EnableReg>{if isset($account.2.password)}1{else}0{/if}</EnableReg>
+            <ProxyAddr>{$account.2.outbound_proxy_primary}</ProxyAddr>
+            <ProxyPort>{$account.2.sip_port}</ProxyPort>
+            <ProxyUser>{$account.2.auth_id}</ProxyUser>
+            <ProxyPswd>{$account.2.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
+            <BakProxyAddr>{$account.2.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.2.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
+            <EnableFailback>{if isset($account.2.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
+            <FailbackInterval>1800</FailbackInterval>
+            <SignalFailback>0</SignalFailback>
+            <SignalRetryCounts>3</SignalRetryCounts>
+            <SigCryptoKey></SigCryptoKey>
+            <MediaCrypto>0</MediaCrypto>
+            <MedCryptoKey></MedCryptoKey>
+            <SRTPAuth-Tag>0</SRTPAuth-Tag>
+            <EnableRFC5939>0</EnableRFC5939>
+            <LocalDomain></LocalDomain>
+            <AlwaysFWD>0</AlwaysFWD>
+            <BusyFWD>0</BusyFWD>
+            <NoAnswerFWD>0</NoAnswerFWD>
+            <AlwaysFWDNum></AlwaysFWDNum>
+            <BusyFWDNum></BusyFWDNum>
+            <NoAnswerFWDNum></NoAnswerFWDNum>
+            <FWDTimer>5</FWDTimer>
+            <HotlineNum></HotlineNum>
+            <EnableHotline>0</EnableHotline>
+            <WarmLineTime>0</WarmLineTime>
+            <PickupNum></PickupNum>
+            <JoinNum></JoinNum>
+            <IntercomNum></IntercomNum>
+            <RingType>{if isset($fanvil_ringtone_line2)}{$fanvil_ringtone_line2}{else}default{/if}</RingType>
+            <NATUDPUpdate>2</NATUDPUpdate>
+            <UDPUpdateTTL>30</UDPUpdateTTL>
+            <ServerType>0</ServerType>
+            <UserAgent></UserAgent>
+            <PRACK>0</PRACK>
+            <KeepAUTH>0</KeepAUTH>
+            <SessionTimer>0</SessionTimer>
+            <STimerExpires>0</STimerExpires>
+            <EnableGRUU>0</EnableGRUU>
+            <DTMFMode>3</DTMFMode>
+            <DTMFInfoMode>0</DTMFInfoMode>
+            <NATType>0</NATType>
+            <EnableRport>1</EnableRport>
+            <Subscribe>{if isset($account.2.user_id)}1{else}{/if}</Subscribe>
+            <SubExpire>{$account.2.register_expires}</SubExpire>
+            <SingleCodec>0</SingleCodec>
+            <CLIR>0</CLIR>
+            <StrictProxy>1</StrictProxy>
+            <DirectContact>0</DirectContact>
+            <HistoryInfo>0</HistoryInfo>
+            {if $account.2.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.2.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
+            <XFERExpire>0</XFERExpire>
+            <BanAnonymous>0</BanAnonymous>
+            <DialOffLine>0</DialOffLine>
+            <QuotaName>0</QuotaName>
+            <PresenceMode>0</PresenceMode>
+            <RFCVer>1</RFCVer>
+            <PhonePort>0</PhonePort>
+            <SignalPort>5060</SignalPort>
+            {if $account.2.sip_transport == 'udp'}<Transport>0</Transport>{/if}
+            {if $account.2.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
+            {if $account.2.sip_transport == 'tls'}<Transport>3</Transport>{/if}
+            <UseSRVMixer>0</UseSRVMixer>
+            <SRVMixerUri></SRVMixerUri>
+            <LongContact>0</LongContact>
+            <AutoTCP>1</AutoTCP>
+            <UriEscaped>1</UriEscaped>
+            <ClicktoTalk>0</ClicktoTalk>
+            <MwiNo></MwiNo>
+            <MWINum>{if isset($account.2.user_id)}*97{else}{/if}</MWINum>
+            <ParkNo></ParkNo>
+            <CallParkNum></CallParkNum>
+            <RetrieveNum></RetrieveNum>
+            <HelpNo></HelpNo>
+            <MSRPHelpNum></MSRPHelpNum>
+            <UserIsPhone>0</UserIsPhone>
+            <AutoAnswer>0</AutoAnswer>
+            <NoAnswerTime>5</NoAnswerTime>
+            <MissedCallLog>1</MissedCallLog>
+            <ParkMode></ParkMode>
+            <SvcCodeMode>1</SvcCodeMode>
+            <DNDOnSvcCode></DNDOnSvcCode>
+            <DNDOffSvcCode></DNDOffSvcCode>
+            <CFUOnSvcCode></CFUOnSvcCode>
+            <CFUOffSvcCode></CFUOffSvcCode>
+            <CFBOnSvcCode></CFBOnSvcCode>
+            <CFBOffSvcCode></CFBOffSvcCode>
+            <CFNOnSvcCode></CFNOnSvcCode>
+            <CFNOffSvcCode></CFNOffSvcCode>
+            <ANCOnSvcCode></ANCOnSvcCode>
+            <ANCOffSvcCode></ANCOffSvcCode>
+            <SendANOnCode></SendANOnCode>
+            <SendANOffCode></SendANOffCode>
+            <CWOnCode></CWOnCode>
+            <CWOffCode></CWOffCode>
+            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
+            <BLFListUri></BLFListUri>
+            <BLFServer></BLFServer>
+            <Respond182>0</Respond182>
+            <EnableBLFList>0</EnableBLFList>
+            <CallerIdType>4</CallerIdType>
+            <SynClockTime>0</SynClockTime>
+            <MohServer></MohServer>
+            <UseVPN>1</UseVPN>
+            <EnableDND>0</EnableDND>
+            <InactiveHold>0</InactiveHold>
+            <ReqWithPort>1</ReqWithPort>
+            <UpdateRegExpire>1</UpdateRegExpire>
+            <EnableSCA>0</EnableSCA>
+            <SubCallPark>0</SubCallPark>
+            <SubCCStatus>0</SubCCStatus>
+            <FeatureSync>0</FeatureSync>
+            <EnableXferBack>0</EnableXferBack>
+            <XferBackTime>35</XferBackTime>
+            <UseTelCall>0</UseTelCall>
+            <EnablePreview>0</EnablePreview>
+            <PreviewMode>1</PreviewMode>
+            <TLSVersion>2</TLSVersion>
+            <CSTANumber></CSTANumber>
+            <EnableChgPort>0</EnableChgPort>
+            <VQName></VQName>
+            <VQServer></VQServer>
+            <VQServerPort>5060</VQServerPort>
+            <VQHTTPServer></VQHTTPServer>
+            <FlashMode>0</FlashMode>
+            <ContentType></ContentType>
+            <ContentBody></ContentBody>
+            <UnregisterOnBoot>0</UnregisterOnBoot>
+            <EnableMACHeader>0</EnableMACHeader>
+            <EnableRegisterMAC>0</EnableRegisterMAC>
+            <RecordStart>Record:on</RecordStart>
+            <RecordStop>Record:off</RecordStop>
+            <BLFDialogMatch>1</BLFDialogMatch>
+            <Ptime>0</Ptime>
+            <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
+        </line>
+        <line index="3">
+            <PhoneNumber>{$account.3.user_id}</PhoneNumber>
+            <DisplayName>{$account.3.display_name}</DisplayName>
+            <SipName></SipName>
+            <RegisterAddr>{$account.3.server_address}</RegisterAddr>
+            <RegisterPort>{$account.3.sip_port}</RegisterPort>
+            <RegisterUser>{$account.3.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.3.password}</RegisterPswd>
+            <RegisterTTL>{$account.3.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
+            <BackupAddr></BackupAddr>
+            <BackupPort>5060</BackupPort>
+            <BackupTransport>0</BackupTransport>
+            <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
+            <EnableReg>{if isset($account.3.password)}1{else}0{/if}</EnableReg>
+            <ProxyAddr>{$account.3.outbound_proxy_primary}</ProxyAddr>
+            <ProxyPort>{$account.3.sip_port}</ProxyPort>
+            <ProxyUser>{$account.3.auth_id}</ProxyUser>
+            <ProxyPswd>{$account.3.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
+            <BakProxyAddr>{$account.3.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.3.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
+            <EnableFailback>{if isset($account.3.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
+            <FailbackInterval>1800</FailbackInterval>
+            <SignalFailback>0</SignalFailback>
+            <SignalRetryCounts>3</SignalRetryCounts>
+            <SigCryptoKey></SigCryptoKey>
+            <MediaCrypto>0</MediaCrypto>
+            <MedCryptoKey></MedCryptoKey>
+            <SRTPAuth-Tag>0</SRTPAuth-Tag>
+            <EnableRFC5939>0</EnableRFC5939>
+            <LocalDomain></LocalDomain>
+            <AlwaysFWD>0</AlwaysFWD>
+            <BusyFWD>0</BusyFWD>
+            <NoAnswerFWD>0</NoAnswerFWD>
+            <AlwaysFWDNum></AlwaysFWDNum>
+            <BusyFWDNum></BusyFWDNum>
+            <NoAnswerFWDNum></NoAnswerFWDNum>
+            <FWDTimer>5</FWDTimer>
+            <HotlineNum></HotlineNum>
+            <EnableHotline>0</EnableHotline>
+            <WarmLineTime>0</WarmLineTime>
+            <PickupNum></PickupNum>
+            <JoinNum></JoinNum>
+            <IntercomNum></IntercomNum>
+            <RingType>{if isset($fanvil_ringtone_line3)}{$fanvil_ringtone_line3}{else}default{/if}</RingType>
+            <NATUDPUpdate>2</NATUDPUpdate>
+            <UDPUpdateTTL>30</UDPUpdateTTL>
+            <ServerType>0</ServerType>
+            <UserAgent></UserAgent>
+            <PRACK>0</PRACK>
+            <KeepAUTH>0</KeepAUTH>
+            <SessionTimer>0</SessionTimer>
+            <STimerExpires>0</STimerExpires>
+            <EnableGRUU>0</EnableGRUU>
+            <DTMFMode>3</DTMFMode>
+            <DTMFInfoMode>0</DTMFInfoMode>
+            <NATType>0</NATType>
+            <EnableRport>1</EnableRport>
+            <Subscribe>{if isset($account.3.user_id)}1{else}{/if}</Subscribe>
+            <SubExpire>{$account.3.register_expires}</SubExpire>
+            <SingleCodec>0</SingleCodec>
+            <CLIR>0</CLIR>
+            <StrictProxy>1</StrictProxy>
+            <DirectContact>0</DirectContact>
+            <HistoryInfo>0</HistoryInfo>
+            {if $account.3.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.3.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
+            <XFERExpire>0</XFERExpire>
+            <BanAnonymous>0</BanAnonymous>
+            <DialOffLine>0</DialOffLine>
+            <QuotaName>0</QuotaName>
+            <PresenceMode>0</PresenceMode>
+            <RFCVer>1</RFCVer>
+            <PhonePort>0</PhonePort>
+            <SignalPort>5060</SignalPort>
+            {if $account.3.sip_transport == 'udp'}<Transport>0</Transport>{/if}
+            {if $account.3.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
+            {if $account.3.sip_transport == 'tls'}<Transport>3</Transport>{/if}
+            <UseSRVMixer>0</UseSRVMixer>
+            <SRVMixerUri></SRVMixerUri>
+            <LongContact>0</LongContact>
+            <AutoTCP>1</AutoTCP>
+            <UriEscaped>1</UriEscaped>
+            <ClicktoTalk>0</ClicktoTalk>
+            <MwiNo></MwiNo>
+            <MWINum>{if isset($account.3.user_id)}*97{else}{/if}</MWINum>
+            <ParkNo></ParkNo>
+            <CallParkNum></CallParkNum>
+            <RetrieveNum></RetrieveNum>
+            <HelpNo></HelpNo>
+            <MSRPHelpNum></MSRPHelpNum>
+            <UserIsPhone>0</UserIsPhone>
+            <AutoAnswer>0</AutoAnswer>
+            <NoAnswerTime>5</NoAnswerTime>
+            <MissedCallLog>1</MissedCallLog>
+            <ParkMode></ParkMode>
+            <SvcCodeMode>1</SvcCodeMode>
+            <DNDOnSvcCode></DNDOnSvcCode>
+            <DNDOffSvcCode></DNDOffSvcCode>
+            <CFUOnSvcCode></CFUOnSvcCode>
+            <CFUOffSvcCode></CFUOffSvcCode>
+            <CFBOnSvcCode></CFBOnSvcCode>
+            <CFBOffSvcCode></CFBOffSvcCode>
+            <CFNOnSvcCode></CFNOnSvcCode>
+            <CFNOffSvcCode></CFNOffSvcCode>
+            <ANCOnSvcCode></ANCOnSvcCode>
+            <ANCOffSvcCode></ANCOffSvcCode>
+            <SendANOnCode></SendANOnCode>
+            <SendANOffCode></SendANOffCode>
+            <CWOnCode></CWOnCode>
+            <CWOffCode></CWOffCode>
+            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
+            <BLFListUri></BLFListUri>
+            <BLFServer></BLFServer>
+            <Respond182>0</Respond182>
+            <EnableBLFList>0</EnableBLFList>
+            <CallerIdType>4</CallerIdType>
+            <SynClockTime>0</SynClockTime>
+            <MohServer></MohServer>
+            <UseVPN>1</UseVPN>
+            <EnableDND>0</EnableDND>
+            <InactiveHold>0</InactiveHold>
+            <ReqWithPort>1</ReqWithPort>
+            <UpdateRegExpire>1</UpdateRegExpire>
+            <EnableSCA>0</EnableSCA>
+            <SubCallPark>0</SubCallPark>
+            <SubCCStatus>0</SubCCStatus>
+            <FeatureSync>0</FeatureSync>
+            <EnableXferBack>0</EnableXferBack>
+            <XferBackTime>35</XferBackTime>
+            <UseTelCall>0</UseTelCall>
+            <EnablePreview>0</EnablePreview>
+            <PreviewMode>1</PreviewMode>
+            <TLSVersion>2</TLSVersion>
+            <CSTANumber></CSTANumber>
+            <EnableChgPort>0</EnableChgPort>
+            <VQName></VQName>
+            <VQServer></VQServer>
+            <VQServerPort>5060</VQServerPort>
+            <VQHTTPServer></VQHTTPServer>
+            <FlashMode>0</FlashMode>
+            <ContentType></ContentType>
+            <ContentBody></ContentBody>
+            <UnregisterOnBoot>0</UnregisterOnBoot>
+            <EnableMACHeader>0</EnableMACHeader>
+            <EnableRegisterMAC>0</EnableRegisterMAC>
+            <RecordStart>Record:on</RecordStart>
+            <RecordStop>Record:off</RecordStop>
+            <BLFDialogMatch>1</BLFDialogMatch>
+            <Ptime>0</Ptime>
+            <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
+        </line>
+        <line index="4">
+            <PhoneNumber>{$account.4.user_id}</PhoneNumber>
+            <DisplayName>{$account.4.display_name}</DisplayName>
+            <SipName></SipName>
+            <RegisterAddr>{$account.4.server_address}</RegisterAddr>
+            <RegisterPort>{$account.4.sip_port}</RegisterPort>
+            <RegisterUser>{$account.4.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.4.password}</RegisterPswd>
+            <RegisterTTL>{$account.4.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
+            <BackupAddr></BackupAddr>
+            <BackupPort>5060</BackupPort>
+            <BackupTransport>0</BackupTransport>
+            <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
+            <EnableReg>{if isset($account.4.password)}1{else}0{/if}</EnableReg>
+            <ProxyAddr>{$account.4.outbound_proxy_primary}</ProxyAddr>
+            <ProxyPort>{$account.4.sip_port}</ProxyPort>
+            <ProxyUser>{$account.4.auth_id}</ProxyUser>
+            <ProxyPswd>{$account.4.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
+            <BakProxyAddr>{$account.4.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.4.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
+            <EnableFailback>{if isset($account.4.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
+            <FailbackInterval>1800</FailbackInterval>
+            <SignalFailback>0</SignalFailback>
+            <SignalRetryCounts>3</SignalRetryCounts>
+            <SigCryptoKey></SigCryptoKey>
+            <MediaCrypto>0</MediaCrypto>
+            <MedCryptoKey></MedCryptoKey>
+            <SRTPAuth-Tag>0</SRTPAuth-Tag>
+            <EnableRFC5939>0</EnableRFC5939>
+            <LocalDomain></LocalDomain>
+            <AlwaysFWD>0</AlwaysFWD>
+            <BusyFWD>0</BusyFWD>
+            <NoAnswerFWD>0</NoAnswerFWD>
+            <AlwaysFWDNum></AlwaysFWDNum>
+            <BusyFWDNum></BusyFWDNum>
+            <NoAnswerFWDNum></NoAnswerFWDNum>
+            <FWDTimer>5</FWDTimer>
+            <HotlineNum></HotlineNum>
+            <EnableHotline>0</EnableHotline>
+            <WarmLineTime>0</WarmLineTime>
+            <PickupNum></PickupNum>
+            <JoinNum></JoinNum>
+            <IntercomNum></IntercomNum>
+            <RingType>{if isset($fanvil_ringtone_line4)}{$fanvil_ringtone_line4}{else}default{/if}</RingType>
+            <NATUDPUpdate>2</NATUDPUpdate>
+            <UDPUpdateTTL>30</UDPUpdateTTL>
+            <ServerType>0</ServerType>
+            <UserAgent></UserAgent>
+            <PRACK>0</PRACK>
+            <KeepAUTH>0</KeepAUTH>
+            <SessionTimer>0</SessionTimer>
+            <STimerExpires>0</STimerExpires>
+            <EnableGRUU>0</EnableGRUU>
+            <DTMFMode>3</DTMFMode>
+            <DTMFInfoMode>0</DTMFInfoMode>
+            <NATType>0</NATType>
+            <EnableRport>1</EnableRport>
+            <Subscribe>{if isset($account.4.user_id)}1{else}{/if}</Subscribe>
+            <SubExpire>{$account.4.register_expires}</SubExpire>
+            <SingleCodec>0</SingleCodec>
+            <CLIR>0</CLIR>
+            <StrictProxy>1</StrictProxy>
+            <DirectContact>0</DirectContact>
+            <HistoryInfo>0</HistoryInfo>
+            {if $account.4.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.4.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
+            <XFERExpire>0</XFERExpire>
+            <BanAnonymous>0</BanAnonymous>
+            <DialOffLine>0</DialOffLine>
+            <QuotaName>0</QuotaName>
+            <PresenceMode>0</PresenceMode>
+            <RFCVer>1</RFCVer>
+            <PhonePort>0</PhonePort>
+            <SignalPort>5060</SignalPort>
+            {if $account.4.sip_transport == 'udp'}<Transport>0</Transport>{/if}
+            {if $account.4.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
+            {if $account.4.sip_transport == 'tls'}<Transport>3</Transport>{/if}
+            <UseSRVMixer>0</UseSRVMixer>
+            <SRVMixerUri></SRVMixerUri>
+            <LongContact>0</LongContact>
+            <AutoTCP>1</AutoTCP>
+            <UriEscaped>1</UriEscaped>
+            <ClicktoTalk>0</ClicktoTalk>
+            <MwiNo></MwiNo>
+            <MWINum>{if isset($account.4.user_id)}*97{else}{/if}</MWINum>
+            <ParkNo></ParkNo>
+            <CallParkNum></CallParkNum>
+            <RetrieveNum></RetrieveNum>
+            <HelpNo></HelpNo>
+            <MSRPHelpNum></MSRPHelpNum>
+            <UserIsPhone>0</UserIsPhone>
+            <AutoAnswer>0</AutoAnswer>
+            <NoAnswerTime>5</NoAnswerTime>
+            <MissedCallLog>1</MissedCallLog>
+            <ParkMode></ParkMode>
+            <SvcCodeMode>1</SvcCodeMode>
+            <DNDOnSvcCode></DNDOnSvcCode>
+            <DNDOffSvcCode></DNDOffSvcCode>
+            <CFUOnSvcCode></CFUOnSvcCode>
+            <CFUOffSvcCode></CFUOffSvcCode>
+            <CFBOnSvcCode></CFBOnSvcCode>
+            <CFBOffSvcCode></CFBOffSvcCode>
+            <CFNOnSvcCode></CFNOnSvcCode>
+            <CFNOffSvcCode></CFNOffSvcCode>
+            <ANCOnSvcCode></ANCOnSvcCode>
+            <ANCOffSvcCode></ANCOffSvcCode>
+            <SendANOnCode></SendANOnCode>
+            <SendANOffCode></SendANOffCode>
+            <CWOnCode></CWOnCode>
+            <CWOffCode></CWOffCode>
+            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,iLBC,G722</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
+            <BLFListUri></BLFListUri>
+            <BLFServer></BLFServer>
+            <Respond182>0</Respond182>
+            <EnableBLFList>0</EnableBLFList>
+            <CallerIdType>4</CallerIdType>
+            <SynClockTime>0</SynClockTime>
+            <MohServer></MohServer>
+            <UseVPN>1</UseVPN>
+            <EnableDND>0</EnableDND>
+            <InactiveHold>0</InactiveHold>
+            <ReqWithPort>1</ReqWithPort>
+            <UpdateRegExpire>1</UpdateRegExpire>
+            <EnableSCA>0</EnableSCA>
+            <SubCallPark>0</SubCallPark>
+            <SubCCStatus>0</SubCCStatus>
+            <FeatureSync>0</FeatureSync>
+            <EnableXferBack>0</EnableXferBack>
+            <XferBackTime>35</XferBackTime>
+            <UseTelCall>0</UseTelCall>
+            <EnablePreview>0</EnablePreview>
+            <PreviewMode>1</PreviewMode>
+            <TLSVersion>2</TLSVersion>
+            <CSTANumber></CSTANumber>
+            <EnableChgPort>0</EnableChgPort>
+            <VQName></VQName>
+            <VQServer></VQServer>
+            <VQServerPort>5060</VQServerPort>
+            <VQHTTPServer></VQHTTPServer>
+            <FlashMode>0</FlashMode>
+            <ContentType></ContentType>
+            <ContentBody></ContentBody>
+            <UnregisterOnBoot>0</UnregisterOnBoot>
+            <EnableMACHeader>0</EnableMACHeader>
+            <EnableRegisterMAC>0</EnableRegisterMAC>
+            <RecordStart>Record:on</RecordStart>
+            <RecordStop>Record:off</RecordStop>
+            <BLFDialogMatch>1</BLFDialogMatch>
+            <Ptime>0</Ptime>
+            <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
+        </line>
+        <line index="5">
+            <PhoneNumber>{$account.5.user_id}</PhoneNumber>
+            <DisplayName>{$account.5.display_name}</DisplayName>
+            <SipName></SipName>
+            <RegisterAddr>{$account.5.server_address}</RegisterAddr>
+            <RegisterPort>{$account.5.sip_port}</RegisterPort>
+            <RegisterUser>{$account.5.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.5.password}</RegisterPswd>
+            <RegisterTTL>{$account.5.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
+            <BackupAddr></BackupAddr>
+            <BackupPort>5060</BackupPort>
+            <BackupTransport>0</BackupTransport>
+            <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
+            <EnableReg>{if isset($account.5.password)}1{else}0{/if}</EnableReg>
+            <ProxyAddr>{$account.5.outbound_proxy_primary}</ProxyAddr>
+            <ProxyPort>{$account.5.sip_port}</ProxyPort>
+            <ProxyUser>{$account.5.auth_id}</ProxyUser>
+            <ProxyPswd>{$account.5.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
+            <BakProxyAddr>{$account.5.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.5.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
+            <EnableFailback>{if isset($account.5.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
+            <FailbackInterval>1800</FailbackInterval>
+            <SignalFailback>0</SignalFailback>
+            <SignalRetryCounts>3</SignalRetryCounts>
+            <SigCryptoKey></SigCryptoKey>
+            <MediaCrypto>0</MediaCrypto>
+            <MedCryptoKey></MedCryptoKey>
+            <SRTPAuth-Tag>0</SRTPAuth-Tag>
+            <EnableRFC5939>0</EnableRFC5939>
+            <LocalDomain></LocalDomain>
+            <AlwaysFWD>0</AlwaysFWD>
+            <BusyFWD>0</BusyFWD>
+            <NoAnswerFWD>0</NoAnswerFWD>
+            <AlwaysFWDNum></AlwaysFWDNum>
+            <BusyFWDNum></BusyFWDNum>
+            <NoAnswerFWDNum></NoAnswerFWDNum>
+            <FWDTimer>5</FWDTimer>
+            <HotlineNum></HotlineNum>
+            <EnableHotline>0</EnableHotline>
+            <WarmLineTime>0</WarmLineTime>
+            <PickupNum></PickupNum>
+            <JoinNum></JoinNum>
+            <IntercomNum></IntercomNum>
+            <RingType>{if isset($fanvil_ringtone_line5)}{$fanvil_ringtone_line5}{else}default{/if}</RingType>
+            <NATUDPUpdate>2</NATUDPUpdate>
+            <UDPUpdateTTL>30</UDPUpdateTTL>
+            <ServerType>0</ServerType>
+            <UserAgent></UserAgent>
+            <PRACK>0</PRACK>
+            <KeepAUTH>0</KeepAUTH>
+            <SessionTimer>0</SessionTimer>
+            <STimerExpires>0</STimerExpires>
+            <EnableGRUU>0</EnableGRUU>
+            <DTMFMode>3</DTMFMode>
+            <DTMFInfoMode>0</DTMFInfoMode>
+            <NATType>0</NATType>
+            <EnableRport>1</EnableRport>
+            <Subscribe>{if isset($account.5.user_id)}1{else}{/if}</Subscribe>
+            <SubExpire>{$account.5.register_expires}</SubExpire>
+            <SingleCodec>0</SingleCodec>
+            <CLIR>0</CLIR>
+            <StrictProxy>1</StrictProxy>
+            <DirectContact>0</DirectContact>
+            <HistoryInfo>0</HistoryInfo>
+            {if $account.5.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.5.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
+            <XFERExpire>0</XFERExpire>
+            <BanAnonymous>0</BanAnonymous>
+            <DialOffLine>0</DialOffLine>
+            <QuotaName>0</QuotaName>
+            <PresenceMode>0</PresenceMode>
+            <RFCVer>1</RFCVer>
+            <PhonePort>0</PhonePort>
+            <SignalPort>5060</SignalPort>
+            {if $account.5.sip_transport == 'udp'}<Transport>0</Transport>{/if}
+            {if $account.5.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
+            {if $account.5.sip_transport == 'tls'}<Transport>3</Transport>{/if}
+            <UseSRVMixer>0</UseSRVMixer>
+            <SRVMixerUri></SRVMixerUri>
+            <LongContact>0</LongContact>
+            <AutoTCP>1</AutoTCP>
+            <UriEscaped>1</UriEscaped>
+            <ClicktoTalk>0</ClicktoTalk>
+            <MwiNo></MwiNo>
+            <MWINum>{if isset($account.5.user_id)}*97{else}{/if}</MWINum>
+            <ParkNo></ParkNo>
+            <CallParkNum></CallParkNum>
+            <RetrieveNum></RetrieveNum>
+            <HelpNo></HelpNo>
+            <MSRPHelpNum></MSRPHelpNum>
+            <UserIsPhone>0</UserIsPhone>
+            <AutoAnswer>0</AutoAnswer>
+            <NoAnswerTime>5</NoAnswerTime>
+            <MissedCallLog>1</MissedCallLog>
+            <ParkMode></ParkMode>
+            <SvcCodeMode>1</SvcCodeMode>
+            <DNDOnSvcCode></DNDOnSvcCode>
+            <DNDOffSvcCode></DNDOffSvcCode>
+            <CFUOnSvcCode></CFUOnSvcCode>
+            <CFUOffSvcCode></CFUOffSvcCode>
+            <CFBOnSvcCode></CFBOnSvcCode>
+            <CFBOffSvcCode></CFBOffSvcCode>
+            <CFNOnSvcCode></CFNOnSvcCode>
+            <CFNOffSvcCode></CFNOffSvcCode>
+            <ANCOnSvcCode></ANCOnSvcCode>
+            <ANCOffSvcCode></ANCOffSvcCode>
+            <SendANOnCode></SendANOnCode>
+            <SendANOffCode></SendANOffCode>
+            <CWOnCode></CWOnCode>
+            <CWOffCode></CWOffCode>
+            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
+            <BLFListUri></BLFListUri>
+            <BLFServer></BLFServer>
+            <Respond182>0</Respond182>
+            <EnableBLFList>0</EnableBLFList>
+            <CallerIdType>4</CallerIdType>
+            <SynClockTime>0</SynClockTime>
+            <MohServer></MohServer>
+            <UseVPN>1</UseVPN>
+            <EnableDND>0</EnableDND>
+            <InactiveHold>0</InactiveHold>
+            <ReqWithPort>1</ReqWithPort>
+            <UpdateRegExpire>1</UpdateRegExpire>
+            <EnableSCA>0</EnableSCA>
+            <SubCallPark>0</SubCallPark>
+            <SubCCStatus>0</SubCCStatus>
+            <FeatureSync>0</FeatureSync>
+            <EnableXferBack>0</EnableXferBack>
+            <XferBackTime>35</XferBackTime>
+            <UseTelCall>0</UseTelCall>
+            <EnablePreview>0</EnablePreview>
+            <PreviewMode>1</PreviewMode>
+            <TLSVersion>2</TLSVersion>
+            <CSTANumber></CSTANumber>
+            <EnableChgPort>0</EnableChgPort>
+            <VQName></VQName>
+            <VQServer></VQServer>
+            <VQServerPort>5060</VQServerPort>
+            <VQHTTPServer></VQHTTPServer>
+            <FlashMode>0</FlashMode>
+            <ContentType></ContentType>
+            <ContentBody></ContentBody>
+            <UnregisterOnBoot>0</UnregisterOnBoot>
+            <EnableMACHeader>0</EnableMACHeader>
+            <EnableRegisterMAC>0</EnableRegisterMAC>
+            <RecordStart>Record:on</RecordStart>
+            <RecordStop>Record:off</RecordStop>
+            <BLFDialogMatch>1</BLFDialogMatch>
+            <Ptime>0</Ptime>
+            <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
+        </line>
+        <line index="6">
+            <PhoneNumber>{$account.6.user_id}</PhoneNumber>
+            <DisplayName>{$account.6.display_name}</DisplayName>
+            <SipName></SipName>
+            <RegisterAddr>{$account.6.server_address}</RegisterAddr>
+            <RegisterPort>{$account.6.sip_port}</RegisterPort>
+            <RegisterUser>{$account.6.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.6.password}</RegisterPswd>
+            <RegisterTTL>{$account.6.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
+            <BackupAddr></BackupAddr>
+            <BackupPort>5060</BackupPort>
+            <BackupTransport>0</BackupTransport>
+            <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
+            <EnableReg>{if isset($account.6.password)}1{else}0{/if}</EnableReg>
+            <ProxyAddr>{$account.6.outbound_proxy_primary}</ProxyAddr>
+            <ProxyPort>{$account.6.sip_port}</ProxyPort>
+            <ProxyUser>{$account.6.auth_id}</ProxyUser>
+            <ProxyPswd>{$account.6.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
+            <BakProxyAddr>{$account.6.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.6.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
+            <EnableFailback>{if isset($account.6.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
+            <FailbackInterval>1800</FailbackInterval>
+            <SignalFailback>0</SignalFailback>
+            <SignalRetryCounts>3</SignalRetryCounts>
+            <SigCryptoKey></SigCryptoKey>
+            <MediaCrypto>0</MediaCrypto>
+            <MedCryptoKey></MedCryptoKey>
+            <SRTPAuth-Tag>0</SRTPAuth-Tag>
+            <EnableRFC5939>0</EnableRFC5939>
+            <LocalDomain></LocalDomain>
+            <AlwaysFWD>0</AlwaysFWD>
+            <BusyFWD>0</BusyFWD>
+            <NoAnswerFWD>0</NoAnswerFWD>
+            <AlwaysFWDNum></AlwaysFWDNum>
+            <BusyFWDNum></BusyFWDNum>
+            <NoAnswerFWDNum></NoAnswerFWDNum>
+            <FWDTimer>5</FWDTimer>
+            <HotlineNum></HotlineNum>
+            <EnableHotline>0</EnableHotline>
+            <WarmLineTime>0</WarmLineTime>
+            <PickupNum></PickupNum>
+            <JoinNum></JoinNum>
+            <IntercomNum></IntercomNum>
+            <RingType>{if isset($fanvil_ringtone_line6)}{$fanvil_ringtone_line6}{else}default{/if}</RingType>
+            <NATUDPUpdate>2</NATUDPUpdate>
+            <UDPUpdateTTL>30</UDPUpdateTTL>
+            <ServerType>0</ServerType>
+            <UserAgent></UserAgent>
+            <PRACK>0</PRACK>
+            <KeepAUTH>0</KeepAUTH>
+            <SessionTimer>0</SessionTimer>
+            <STimerExpires>0</STimerExpires>
+            <EnableGRUU>0</EnableGRUU>
+            <DTMFMode>3</DTMFMode>
+            <DTMFInfoMode>0</DTMFInfoMode>
+            <NATType>0</NATType>
+            <EnableRport>1</EnableRport>
+            <Subscribe>{if isset($account.6.user_id)}1{else}{/if}</Subscribe>
+            <SubExpire>{$account.6.register_expires}</SubExpire>
+            <SingleCodec>0</SingleCodec>
+            <CLIR>0</CLIR>
+            <StrictProxy>1</StrictProxy>
+            <DirectContact>0</DirectContact>
+            <HistoryInfo>0</HistoryInfo>
+            {if $account.6.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.6.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
+            <XFERExpire>0</XFERExpire>
+            <BanAnonymous>0</BanAnonymous>
+            <DialOffLine>0</DialOffLine>
+            <QuotaName>0</QuotaName>
+            <PresenceMode>0</PresenceMode>
+            <RFCVer>1</RFCVer>
+            <PhonePort>0</PhonePort>
+            <SignalPort>5060</SignalPort>
+            {if $account.6.sip_transport == 'udp'}<Transport>0</Transport>{/if}
+            {if $account.6.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
+            {if $account.6.sip_transport == 'tls'}<Transport>3</Transport>{/if}
+            <UseSRVMixer>0</UseSRVMixer>
+            <SRVMixerUri></SRVMixerUri>
+            <LongContact>0</LongContact>
+            <AutoTCP>1</AutoTCP>
+            <UriEscaped>1</UriEscaped>
+            <ClicktoTalk>0</ClicktoTalk>
+            <MwiNo></MwiNo>
+            <MWINum>{if isset($account.6.user_id)}*97{else}{/if}</MWINum>
+            <ParkNo></ParkNo>
+            <CallParkNum></CallParkNum>
+            <RetrieveNum></RetrieveNum>
+            <HelpNo></HelpNo>
+            <MSRPHelpNum></MSRPHelpNum>
+            <UserIsPhone>0</UserIsPhone>
+            <AutoAnswer>0</AutoAnswer>
+            <NoAnswerTime>5</NoAnswerTime>
+            <MissedCallLog>1</MissedCallLog>
+            <ParkMode></ParkMode>
+            <SvcCodeMode>1</SvcCodeMode>
+            <DNDOnSvcCode></DNDOnSvcCode>
+            <DNDOffSvcCode></DNDOffSvcCode>
+            <CFUOnSvcCode></CFUOnSvcCode>
+            <CFUOffSvcCode></CFUOffSvcCode>
+            <CFBOnSvcCode></CFBOnSvcCode>
+            <CFBOffSvcCode></CFBOffSvcCode>
+            <CFNOnSvcCode></CFNOnSvcCode>
+            <CFNOffSvcCode></CFNOffSvcCode>
+            <ANCOnSvcCode></ANCOnSvcCode>
+            <ANCOffSvcCode></ANCOffSvcCode>
+            <SendANOnCode></SendANOnCode>
+            <SendANOffCode></SendANOffCode>
+            <CWOnCode></CWOnCode>
+            <CWOffCode></CWOffCode>
+            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
+            <BLFListUri></BLFListUri>
+            <BLFServer></BLFServer>
+            <Respond182>0</Respond182>
+            <EnableBLFList>0</EnableBLFList>
+            <CallerIdType>4</CallerIdType>
+            <SynClockTime>0</SynClockTime>
+            <MohServer></MohServer>
+            <UseVPN>1</UseVPN>
+            <EnableDND>0</EnableDND>
+            <InactiveHold>0</InactiveHold>
+            <ReqWithPort>1</ReqWithPort>
+            <UpdateRegExpire>1</UpdateRegExpire>
+            <EnableSCA>0</EnableSCA>
+            <SubCallPark>0</SubCallPark>
+            <SubCCStatus>0</SubCCStatus>
+            <FeatureSync>0</FeatureSync>
+            <EnableXferBack>0</EnableXferBack>
+            <XferBackTime>35</XferBackTime>
+            <UseTelCall>0</UseTelCall>
+            <EnablePreview>0</EnablePreview>
+            <PreviewMode>1</PreviewMode>
+            <TLSVersion>2</TLSVersion>
+            <CSTANumber></CSTANumber>
+            <EnableChgPort>0</EnableChgPort>
+            <VQName></VQName>
+            <VQServer></VQServer>
+            <VQServerPort>5060</VQServerPort>
+            <VQHTTPServer></VQHTTPServer>
+            <FlashMode>0</FlashMode>
+            <ContentType></ContentType>
+            <ContentBody></ContentBody>
+            <UnregisterOnBoot>0</UnregisterOnBoot>
+            <EnableMACHeader>0</EnableMACHeader>
+            <EnableRegisterMAC>0</EnableRegisterMAC>
+            <RecordStart>Record:on</RecordStart>
+            <RecordStop>Record:off</RecordStop>
+            <BLFDialogMatch>1</BLFDialogMatch>
+            <Ptime>0</Ptime>
+            <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
+        </line>
+        <line index="7">
+            <PhoneNumber>{$account.7.user_id}</PhoneNumber>
+            <DisplayName>{$account.7.display_name}</DisplayName>
+            <SipName></SipName>
+            <RegisterAddr>{$account.7.server_address}</RegisterAddr>
+            <RegisterPort>{$account.7.sip_port}</RegisterPort>
+            <RegisterUser>{$account.7.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.7.password}</RegisterPswd>
+            <RegisterTTL>{$account.7.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
+            <BackupAddr></BackupAddr>
+            <BackupPort>5060</BackupPort>
+            <BackupTransport>0</BackupTransport>
+            <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
+            <EnableReg>{if isset($account.7.password)}1{else}0{/if}</EnableReg>
+            <ProxyAddr>{$account.7.outbound_proxy_primary}</ProxyAddr>
+            <ProxyPort>{$account.7.sip_port}</ProxyPort>
+            <ProxyUser>{$account.7.auth_id}</ProxyUser>
+            <ProxyPswd>{$account.7.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
+            <BakProxyAddr>{$account.7.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.7.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
+            <EnableFailback>{if isset($account.7.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
+            <FailbackInterval>1800</FailbackInterval>
+            <SignalFailback>0</SignalFailback>
+            <SignalRetryCounts>3</SignalRetryCounts>
+            <SigCryptoKey></SigCryptoKey>
+            <MediaCrypto>0</MediaCrypto>
+            <MedCryptoKey></MedCryptoKey>
+            <SRTPAuth-Tag>0</SRTPAuth-Tag>
+            <EnableRFC5939>0</EnableRFC5939>
+            <LocalDomain></LocalDomain>
+            <AlwaysFWD>0</AlwaysFWD>
+            <BusyFWD>0</BusyFWD>
+            <NoAnswerFWD>0</NoAnswerFWD>
+            <AlwaysFWDNum></AlwaysFWDNum>
+            <BusyFWDNum></BusyFWDNum>
+            <NoAnswerFWDNum></NoAnswerFWDNum>
+            <FWDTimer>5</FWDTimer>
+            <HotlineNum></HotlineNum>
+            <EnableHotline>0</EnableHotline>
+            <WarmLineTime>0</WarmLineTime>
+            <PickupNum></PickupNum>
+            <JoinNum></JoinNum>
+            <IntercomNum></IntercomNum>
+            <RingType>{if isset($fanvil_ringtone_line7)}{$fanvil_ringtone_line7}{else}default{/if}</RingType>
+            <NATUDPUpdate>2</NATUDPUpdate>
+            <UDPUpdateTTL>30</UDPUpdateTTL>
+            <ServerType>0</ServerType>
+            <UserAgent></UserAgent>
+            <PRACK>0</PRACK>
+            <KeepAUTH>0</KeepAUTH>
+            <SessionTimer>0</SessionTimer>
+            <STimerExpires>0</STimerExpires>
+            <EnableGRUU>0</EnableGRUU>
+            <DTMFMode>3</DTMFMode>
+            <DTMFInfoMode>0</DTMFInfoMode>
+            <NATType>0</NATType>
+            <EnableRport>1</EnableRport>
+            <Subscribe>{if isset($account.7.user_id)}1{else}{/if}</Subscribe>
+            <SubExpire>{$account.7.register_expires}</SubExpire>
+            <SingleCodec>0</SingleCodec>
+            <CLIR>0</CLIR>
+            <StrictProxy>1</StrictProxy>
+            <DirectContact>0</DirectContact>
+            <HistoryInfo>0</HistoryInfo>
+            {if $account.7.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.7.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
+            <XFERExpire>0</XFERExpire>
+            <BanAnonymous>0</BanAnonymous>
+            <DialOffLine>0</DialOffLine>
+            <QuotaName>0</QuotaName>
+            <PresenceMode>0</PresenceMode>
+            <RFCVer>1</RFCVer>
+            <PhonePort>0</PhonePort>
+            <SignalPort>5060</SignalPort>
+            {if $account.7.sip_transport == 'udp'}<Transport>0</Transport>{/if}
+            {if $account.7.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
+            {if $account.7.sip_transport == 'tls'}<Transport>3</Transport>{/if}
+            <UseSRVMixer>0</UseSRVMixer>
+            <SRVMixerUri></SRVMixerUri>
+            <LongContact>0</LongContact>
+            <AutoTCP>1</AutoTCP>
+            <UriEscaped>1</UriEscaped>
+            <ClicktoTalk>0</ClicktoTalk>
+            <MwiNo></MwiNo>
+            <MWINum>{if isset($account.7.user_id)}*97{else}{/if}</MWINum>
+            <ParkNo></ParkNo>
+            <CallParkNum></CallParkNum>
+            <RetrieveNum></RetrieveNum>
+            <HelpNo></HelpNo>
+            <MSRPHelpNum></MSRPHelpNum>
+            <UserIsPhone>0</UserIsPhone>
+            <AutoAnswer>0</AutoAnswer>
+            <NoAnswerTime>5</NoAnswerTime>
+            <MissedCallLog>1</MissedCallLog>
+            <ParkMode></ParkMode>
+            <SvcCodeMode>1</SvcCodeMode>
+            <DNDOnSvcCode></DNDOnSvcCode>
+            <DNDOffSvcCode></DNDOffSvcCode>
+            <CFUOnSvcCode></CFUOnSvcCode>
+            <CFUOffSvcCode></CFUOffSvcCode>
+            <CFBOnSvcCode></CFBOnSvcCode>
+            <CFBOffSvcCode></CFBOffSvcCode>
+            <CFNOnSvcCode></CFNOnSvcCode>
+            <CFNOffSvcCode></CFNOffSvcCode>
+            <ANCOnSvcCode></ANCOnSvcCode>
+            <ANCOffSvcCode></ANCOffSvcCode>
+            <SendANOnCode></SendANOnCode>
+            <SendANOffCode></SendANOffCode>
+            <CWOnCode></CWOnCode>
+            <CWOffCode></CWOffCode>
+            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
+            <BLFListUri></BLFListUri>
+            <BLFServer></BLFServer>
+            <Respond182>0</Respond182>
+            <EnableBLFList>0</EnableBLFList>
+            <CallerIdType>4</CallerIdType>
+            <SynClockTime>0</SynClockTime>
+            <MohServer></MohServer>
+            <UseVPN>1</UseVPN>
+            <EnableDND>0</EnableDND>
+            <InactiveHold>0</InactiveHold>
+            <ReqWithPort>1</ReqWithPort>
+            <UpdateRegExpire>1</UpdateRegExpire>
+            <EnableSCA>0</EnableSCA>
+            <SubCallPark>0</SubCallPark>
+            <SubCCStatus>0</SubCCStatus>
+            <FeatureSync>0</FeatureSync>
+            <EnableXferBack>0</EnableXferBack>
+            <XferBackTime>35</XferBackTime>
+            <UseTelCall>0</UseTelCall>
+            <EnablePreview>0</EnablePreview>
+            <PreviewMode>1</PreviewMode>
+            <TLSVersion>2</TLSVersion>
+            <CSTANumber></CSTANumber>
+            <EnableChgPort>0</EnableChgPort>
+            <VQName></VQName>
+            <VQServer></VQServer>
+            <VQServerPort>5060</VQServerPort>
+            <VQHTTPServer></VQHTTPServer>
+            <FlashMode>0</FlashMode>
+            <ContentType></ContentType>
+            <ContentBody></ContentBody>
+            <UnregisterOnBoot>0</UnregisterOnBoot>
+            <EnableMACHeader>0</EnableMACHeader>
+            <EnableRegisterMAC>0</EnableRegisterMAC>
+            <RecordStart>Record:on</RecordStart>
+            <RecordStop>Record:off</RecordStop>
+            <BLFDialogMatch>1</BLFDialogMatch>
+            <Ptime>0</Ptime>
+            <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
+        </line>
+        <line index="8">
+            <PhoneNumber>{$account.8.user_id}</PhoneNumber>
+            <DisplayName>{$account.8.display_name}</DisplayName>
+            <SipName></SipName>
+            <RegisterAddr>{$account.8.server_address}</RegisterAddr>
+            <RegisterPort>{$account.8.sip_port}</RegisterPort>
+            <RegisterUser>{$account.8.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.8.password}</RegisterPswd>
+            <RegisterTTL>{$account.8.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
+            <BackupAddr></BackupAddr>
+            <BackupPort>5060</BackupPort>
+            <BackupTransport>0</BackupTransport>
+            <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
+            <EnableReg>{if isset($account.8.password)}1{else}0{/if}</EnableReg>
+            <ProxyAddr>{$account.8.outbound_proxy_primary}</ProxyAddr>
+            <ProxyPort>{$account.8.sip_port}</ProxyPort>
+            <ProxyUser>{$account.8.auth_id}</ProxyUser>
+            <ProxyPswd>{$account.8.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
+            <BakProxyAddr>{$account.8.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.8.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
+            <EnableFailback>{if isset($account.8.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
+            <FailbackInterval>1800</FailbackInterval>
+            <SignalFailback>0</SignalFailback>
+            <SignalRetryCounts>3</SignalRetryCounts>
+            <SigCryptoKey></SigCryptoKey>
+            <MediaCrypto>0</MediaCrypto>
+            <MedCryptoKey></MedCryptoKey>
+            <SRTPAuth-Tag>0</SRTPAuth-Tag>
+            <EnableRFC5939>0</EnableRFC5939>
+            <LocalDomain></LocalDomain>
+            <AlwaysFWD>0</AlwaysFWD>
+            <BusyFWD>0</BusyFWD>
+            <NoAnswerFWD>0</NoAnswerFWD>
+            <AlwaysFWDNum></AlwaysFWDNum>
+            <BusyFWDNum></BusyFWDNum>
+            <NoAnswerFWDNum></NoAnswerFWDNum>
+            <FWDTimer>5</FWDTimer>
+            <HotlineNum></HotlineNum>
+            <EnableHotline>0</EnableHotline>
+            <WarmLineTime>0</WarmLineTime>
+            <PickupNum></PickupNum>
+            <JoinNum></JoinNum>
+            <IntercomNum></IntercomNum>
+            <RingType>{if isset($fanvil_ringtone_line8)}{$fanvil_ringtone_line8}{else}default{/if}</RingType>
+            <NATUDPUpdate>2</NATUDPUpdate>
+            <UDPUpdateTTL>30</UDPUpdateTTL>
+            <ServerType>0</ServerType>
+            <UserAgent></UserAgent>
+            <PRACK>0</PRACK>
+            <KeepAUTH>0</KeepAUTH>
+            <SessionTimer>0</SessionTimer>
+            <STimerExpires>0</STimerExpires>
+            <EnableGRUU>0</EnableGRUU>
+            <DTMFMode>3</DTMFMode>
+            <DTMFInfoMode>0</DTMFInfoMode>
+            <NATType>0</NATType>
+            <EnableRport>1</EnableRport>
+            <Subscribe>{if isset($account.8.user_id)}1{else}{/if}</Subscribe>
+            <SubExpire>{$account.8.register_expires}</SubExpire>
+            <SingleCodec>0</SingleCodec>
+            <CLIR>0</CLIR>
+            <StrictProxy>1</StrictProxy>
+            <DirectContact>0</DirectContact>
+            <HistoryInfo>0</HistoryInfo>
+            {if $account.8.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.8.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
+            <XFERExpire>0</XFERExpire>
+            <BanAnonymous>0</BanAnonymous>
+            <DialOffLine>0</DialOffLine>
+            <QuotaName>0</QuotaName>
+            <PresenceMode>0</PresenceMode>
+            <RFCVer>1</RFCVer>
+            <PhonePort>0</PhonePort>
+            <SignalPort>5060</SignalPort>
+            {if $account.8.sip_transport == 'udp'}<Transport>0</Transport>{/if}
+            {if $account.8.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
+            {if $account.8.sip_transport == 'tls'}<Transport>3</Transport>{/if}
+            <UseSRVMixer>0</UseSRVMixer>
+            <SRVMixerUri></SRVMixerUri>
+            <LongContact>0</LongContact>
+            <AutoTCP>1</AutoTCP>
+            <UriEscaped>1</UriEscaped>
+            <ClicktoTalk>0</ClicktoTalk>
+            <MwiNo></MwiNo>
+            <MWINum>{if isset($account.8.user_id)}*97{else}{/if}</MWINum>
+            <ParkNo></ParkNo>
+            <CallParkNum></CallParkNum>
+            <RetrieveNum></RetrieveNum>
+            <HelpNo></HelpNo>
+            <MSRPHelpNum></MSRPHelpNum>
+            <UserIsPhone>0</UserIsPhone>
+            <AutoAnswer>0</AutoAnswer>
+            <NoAnswerTime>5</NoAnswerTime>
+            <MissedCallLog>1</MissedCallLog>
+            <ParkMode></ParkMode>
+            <SvcCodeMode>1</SvcCodeMode>
+            <DNDOnSvcCode></DNDOnSvcCode>
+            <DNDOffSvcCode></DNDOffSvcCode>
+            <CFUOnSvcCode></CFUOnSvcCode>
+            <CFUOffSvcCode></CFUOffSvcCode>
+            <CFBOnSvcCode></CFBOnSvcCode>
+            <CFBOffSvcCode></CFBOffSvcCode>
+            <CFNOnSvcCode></CFNOnSvcCode>
+            <CFNOffSvcCode></CFNOffSvcCode>
+            <ANCOnSvcCode></ANCOnSvcCode>
+            <ANCOffSvcCode></ANCOffSvcCode>
+            <SendANOnCode></SendANOnCode>
+            <SendANOffCode></SendANOffCode>
+            <CWOnCode></CWOnCode>
+            <CWOffCode></CWOffCode>
+            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
+            <BLFListUri></BLFListUri>
+            <BLFServer></BLFServer>
+            <Respond182>0</Respond182>
+            <EnableBLFList>0</EnableBLFList>
+            <CallerIdType>4</CallerIdType>
+            <SynClockTime>0</SynClockTime>
+            <MohServer></MohServer>
+            <UseVPN>1</UseVPN>
+            <EnableDND>0</EnableDND>
+            <InactiveHold>0</InactiveHold>
+            <ReqWithPort>1</ReqWithPort>
+            <UpdateRegExpire>1</UpdateRegExpire>
+            <EnableSCA>0</EnableSCA>
+            <SubCallPark>0</SubCallPark>
+            <SubCCStatus>0</SubCCStatus>
+            <FeatureSync>0</FeatureSync>
+            <EnableXferBack>0</EnableXferBack>
+            <XferBackTime>35</XferBackTime>
+            <UseTelCall>0</UseTelCall>
+            <EnablePreview>0</EnablePreview>
+            <PreviewMode>1</PreviewMode>
+            <TLSVersion>2</TLSVersion>
+            <CSTANumber></CSTANumber>
+            <EnableChgPort>0</EnableChgPort>
+            <VQName></VQName>
+            <VQServer></VQServer>
+            <VQServerPort>5060</VQServerPort>
+            <VQHTTPServer></VQHTTPServer>
+            <FlashMode>0</FlashMode>
+            <ContentType></ContentType>
+            <ContentBody></ContentBody>
+            <UnregisterOnBoot>0</UnregisterOnBoot>
+            <EnableMACHeader>0</EnableMACHeader>
+            <EnableRegisterMAC>0</EnableRegisterMAC>
+            <RecordStart>Record:on</RecordStart>
+            <RecordStop>Record:off</RecordStop>
+            <BLFDialogMatch>1</BLFDialogMatch>
+            <Ptime>0</Ptime>
+            <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
+        </line>
+        <line index="9">
+            <PhoneNumber>{$account.9.user_id}</PhoneNumber>
+            <DisplayName>{$account.9.display_name}</DisplayName>
+            <SipName></SipName>
+            <RegisterAddr>{$account.9.server_address}</RegisterAddr>
+            <RegisterPort>{$account.9.sip_port}</RegisterPort>
+            <RegisterUser>{$account.9.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.9.password}</RegisterPswd>
+            <RegisterTTL>{$account.9.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
+            <BackupAddr></BackupAddr>
+            <BackupPort>5060</BackupPort>
+            <BackupTransport>0</BackupTransport>
+            <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
+            <EnableReg>{if isset($account.9.password)}1{else}0{/if}</EnableReg>
+            <ProxyAddr>{$account.9.outbound_proxy_primary}</ProxyAddr>
+            <ProxyPort>{$account.9.sip_port}</ProxyPort>
+            <ProxyUser>{$account.9.auth_id}</ProxyUser>
+            <ProxyPswd>{$account.9.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
+            <BakProxyAddr>{$account.9.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.9.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
+            <EnableFailback>{if isset($account.9.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
+            <FailbackInterval>1800</FailbackInterval>
+            <SignalFailback>0</SignalFailback>
+            <SignalRetryCounts>3</SignalRetryCounts>
+            <SigCryptoKey></SigCryptoKey>
+            <MediaCrypto>0</MediaCrypto>
+            <MedCryptoKey></MedCryptoKey>
+            <SRTPAuth-Tag>0</SRTPAuth-Tag>
+            <EnableRFC5939>0</EnableRFC5939>
+            <LocalDomain></LocalDomain>
+            <AlwaysFWD>0</AlwaysFWD>
+            <BusyFWD>0</BusyFWD>
+            <NoAnswerFWD>0</NoAnswerFWD>
+            <AlwaysFWDNum></AlwaysFWDNum>
+            <BusyFWDNum></BusyFWDNum>
+            <NoAnswerFWDNum></NoAnswerFWDNum>
+            <FWDTimer>5</FWDTimer>
+            <HotlineNum></HotlineNum>
+            <EnableHotline>0</EnableHotline>
+            <WarmLineTime>0</WarmLineTime>
+            <PickupNum></PickupNum>
+            <JoinNum></JoinNum>
+            <IntercomNum></IntercomNum>
+            <RingType>{if isset($fanvil_ringtone_line9)}{$fanvil_ringtone_line9}{else}default{/if}</RingType>
+            <NATUDPUpdate>2</NATUDPUpdate>
+            <UDPUpdateTTL>30</UDPUpdateTTL>
+            <ServerType>0</ServerType>
+            <UserAgent></UserAgent>
+            <PRACK>0</PRACK>
+            <KeepAUTH>0</KeepAUTH>
+            <SessionTimer>0</SessionTimer>
+            <STimerExpires>0</STimerExpires>
+            <EnableGRUU>0</EnableGRUU>
+            <DTMFMode>3</DTMFMode>
+            <DTMFInfoMode>0</DTMFInfoMode>
+            <NATType>0</NATType>
+            <EnableRport>1</EnableRport>
+            <Subscribe>{if isset($account.9.user_id)}1{else}{/if}</Subscribe>
+            <SubExpire>{$account.9.register_expires}</SubExpire>
+            <SingleCodec>0</SingleCodec>
+            <CLIR>0</CLIR>
+            <StrictProxy>1</StrictProxy>
+            <DirectContact>0</DirectContact>
+            <HistoryInfo>0</HistoryInfo>
+            {if $account.9.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.9.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
+            <XFERExpire>0</XFERExpire>
+            <BanAnonymous>0</BanAnonymous>
+            <DialOffLine>0</DialOffLine>
+            <QuotaName>0</QuotaName>
+            <PresenceMode>0</PresenceMode>
+            <RFCVer>1</RFCVer>
+            <PhonePort>0</PhonePort>
+            <SignalPort>5060</SignalPort>
+            {if $account.9.sip_transport == 'udp'}<Transport>0</Transport>{/if}
+            {if $account.9.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
+            {if $account.9.sip_transport == 'tls'}<Transport>3</Transport>{/if}
+            <UseSRVMixer>0</UseSRVMixer>
+            <SRVMixerUri></SRVMixerUri>
+            <LongContact>0</LongContact>
+            <AutoTCP>1</AutoTCP>
+            <UriEscaped>1</UriEscaped>
+            <ClicktoTalk>0</ClicktoTalk>
+            <MwiNo></MwiNo>
+            <MWINum>{if isset($account.9.user_id)}*97{else}{/if}</MWINum>
+            <ParkNo></ParkNo>
+            <CallParkNum></CallParkNum>
+            <RetrieveNum></RetrieveNum>
+            <HelpNo></HelpNo>
+            <MSRPHelpNum></MSRPHelpNum>
+            <UserIsPhone>0</UserIsPhone>
+            <AutoAnswer>0</AutoAnswer>
+            <NoAnswerTime>5</NoAnswerTime>
+            <MissedCallLog>1</MissedCallLog>
+            <ParkMode></ParkMode>
+            <SvcCodeMode>1</SvcCodeMode>
+            <DNDOnSvcCode></DNDOnSvcCode>
+            <DNDOffSvcCode></DNDOffSvcCode>
+            <CFUOnSvcCode></CFUOnSvcCode>
+            <CFUOffSvcCode></CFUOffSvcCode>
+            <CFBOnSvcCode></CFBOnSvcCode>
+            <CFBOffSvcCode></CFBOffSvcCode>
+            <CFNOnSvcCode></CFNOnSvcCode>
+            <CFNOffSvcCode></CFNOffSvcCode>
+            <ANCOnSvcCode></ANCOnSvcCode>
+            <ANCOffSvcCode></ANCOffSvcCode>
+            <SendANOnCode></SendANOnCode>
+            <SendANOffCode></SendANOffCode>
+            <CWOnCode></CWOnCode>
+            <CWOffCode></CWOffCode>
+            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
+            <BLFListUri></BLFListUri>
+            <BLFServer></BLFServer>
+            <Respond182>0</Respond182>
+            <EnableBLFList>0</EnableBLFList>
+            <CallerIdType>4</CallerIdType>
+            <SynClockTime>0</SynClockTime>
+            <MohServer></MohServer>
+            <UseVPN>1</UseVPN>
+            <EnableDND>0</EnableDND>
+            <InactiveHold>0</InactiveHold>
+            <ReqWithPort>1</ReqWithPort>
+            <UpdateRegExpire>1</UpdateRegExpire>
+            <EnableSCA>0</EnableSCA>
+            <SubCallPark>0</SubCallPark>
+            <SubCCStatus>0</SubCCStatus>
+            <FeatureSync>0</FeatureSync>
+            <EnableXferBack>0</EnableXferBack>
+            <XferBackTime>35</XferBackTime>
+            <UseTelCall>0</UseTelCall>
+            <EnablePreview>0</EnablePreview>
+            <PreviewMode>1</PreviewMode>
+            <TLSVersion>2</TLSVersion>
+            <CSTANumber></CSTANumber>
+            <EnableChgPort>0</EnableChgPort>
+            <VQName></VQName>
+            <VQServer></VQServer>
+            <VQServerPort>5060</VQServerPort>
+            <VQHTTPServer></VQHTTPServer>
+            <FlashMode>0</FlashMode>
+            <ContentType></ContentType>
+            <ContentBody></ContentBody>
+            <UnregisterOnBoot>0</UnregisterOnBoot>
+            <EnableMACHeader>0</EnableMACHeader>
+            <EnableRegisterMAC>0</EnableRegisterMAC>
+            <RecordStart>Record:on</RecordStart>
+            <RecordStop>Record:off</RecordStop>
+            <BLFDialogMatch>1</BLFDialogMatch>
+            <Ptime>0</Ptime>
+            <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
+        </line>
+        <line index="10">
+            <PhoneNumber>{$account.10.user_id}</PhoneNumber>
+            <DisplayName>{$account.10.display_name}</DisplayName>
+            <SipName></SipName>
+            <RegisterAddr>{$account.10.server_address}</RegisterAddr>
+            <RegisterPort>{$account.10.sip_port}</RegisterPort>
+            <RegisterUser>{$account.10.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.10.password}</RegisterPswd>
+            <RegisterTTL>{$account.10.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
+            <BackupAddr></BackupAddr>
+            <BackupPort>5060</BackupPort>
+            <BackupTransport>0</BackupTransport>
+            <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
+            <EnableReg>{if isset($account.10.password)}1{else}0{/if}</EnableReg>
+            <ProxyAddr>{$account.10.outbound_proxy_primary}</ProxyAddr>
+            <ProxyPort>{$account.10.sip_port}</ProxyPort>
+            <ProxyUser>{$account.10.auth_id}</ProxyUser>
+            <ProxyPswd>{$account.10.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
+            <BakProxyAddr>{$account.10.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.10.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
+            <EnableFailback>{if isset($account.10.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
+            <FailbackInterval>1800</FailbackInterval>
+            <SignalFailback>0</SignalFailback>
+            <SignalRetryCounts>3</SignalRetryCounts>
+            <SigCryptoKey></SigCryptoKey>
+            <MediaCrypto>0</MediaCrypto>
+            <MedCryptoKey></MedCryptoKey>
+            <SRTPAuth-Tag>0</SRTPAuth-Tag>
+            <EnableRFC5939>0</EnableRFC5939>
+            <LocalDomain></LocalDomain>
+            <AlwaysFWD>0</AlwaysFWD>
+            <BusyFWD>0</BusyFWD>
+            <NoAnswerFWD>0</NoAnswerFWD>
+            <AlwaysFWDNum></AlwaysFWDNum>
+            <BusyFWDNum></BusyFWDNum>
+            <NoAnswerFWDNum></NoAnswerFWDNum>
+            <FWDTimer>5</FWDTimer>
+            <HotlineNum></HotlineNum>
+            <EnableHotline>0</EnableHotline>
+            <WarmLineTime>0</WarmLineTime>
+            <PickupNum></PickupNum>
+            <JoinNum></JoinNum>
+            <IntercomNum></IntercomNum>
+            <RingType>{if isset($fanvil_ringtone_line10)}{$fanvil_ringtone_line10}{else}default{/if}</RingType>
+            <NATUDPUpdate>2</NATUDPUpdate>
+            <UDPUpdateTTL>30</UDPUpdateTTL>
+            <ServerType>0</ServerType>
+            <UserAgent></UserAgent>
+            <PRACK>0</PRACK>
+            <KeepAUTH>0</KeepAUTH>
+            <SessionTimer>0</SessionTimer>
+            <STimerExpires>0</STimerExpires>
+            <EnableGRUU>0</EnableGRUU>
+            <DTMFMode>3</DTMFMode>
+            <DTMFInfoMode>0</DTMFInfoMode>
+            <NATType>0</NATType>
+            <EnableRport>1</EnableRport>
+            <Subscribe>{if isset($account.10.user_id)}1{else}{/if}</Subscribe>
+            <SubExpire>{$account.10.register_expires}</SubExpire>
+            <SingleCodec>0</SingleCodec>
+            <CLIR>0</CLIR>
+            <StrictProxy>1</StrictProxy>
+            <DirectContact>0</DirectContact>
+            <HistoryInfo>0</HistoryInfo>
+            {if $account.10.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.10.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
+            <XFERExpire>0</XFERExpire>
+            <BanAnonymous>0</BanAnonymous>
+            <DialOffLine>0</DialOffLine>
+            <QuotaName>0</QuotaName>
+            <PresenceMode>0</PresenceMode>
+            <RFCVer>1</RFCVer>
+            <PhonePort>0</PhonePort>
+            <SignalPort>5060</SignalPort>
+            {if $account.10.sip_transport == 'udp'}<Transport>0</Transport>{/if}
+            {if $account.10.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
+            {if $account.10.sip_transport == 'tls'}<Transport>3</Transport>{/if}
+            <UseSRVMixer>0</UseSRVMixer>
+            <SRVMixerUri></SRVMixerUri>
+            <LongContact>0</LongContact>
+            <AutoTCP>1</AutoTCP>
+            <UriEscaped>1</UriEscaped>
+            <ClicktoTalk>0</ClicktoTalk>
+            <MwiNo></MwiNo>
+            <MWINum>{if isset($account.10.user_id)}*97{else}{/if}</MWINum>
+            <ParkNo></ParkNo>
+            <CallParkNum></CallParkNum>
+            <RetrieveNum></RetrieveNum>
+            <HelpNo></HelpNo>
+            <MSRPHelpNum></MSRPHelpNum>
+            <UserIsPhone>0</UserIsPhone>
+            <AutoAnswer>0</AutoAnswer>
+            <NoAnswerTime>5</NoAnswerTime>
+            <MissedCallLog>1</MissedCallLog>
+            <ParkMode></ParkMode>
+            <SvcCodeMode>1</SvcCodeMode>
+            <DNDOnSvcCode></DNDOnSvcCode>
+            <DNDOffSvcCode></DNDOffSvcCode>
+            <CFUOnSvcCode></CFUOnSvcCode>
+            <CFUOffSvcCode></CFUOffSvcCode>
+            <CFBOnSvcCode></CFBOnSvcCode>
+            <CFBOffSvcCode></CFBOffSvcCode>
+            <CFNOnSvcCode></CFNOnSvcCode>
+            <CFNOffSvcCode></CFNOffSvcCode>
+            <ANCOnSvcCode></ANCOnSvcCode>
+            <ANCOffSvcCode></ANCOffSvcCode>
+            <SendANOnCode></SendANOnCode>
+            <SendANOffCode></SendANOffCode>
+            <CWOnCode></CWOnCode>
+            <CWOffCode></CWOffCode>
+            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
+            <BLFListUri></BLFListUri>
+            <BLFServer></BLFServer>
+            <Respond182>0</Respond182>
+            <EnableBLFList>0</EnableBLFList>
+            <CallerIdType>4</CallerIdType>
+            <SynClockTime>0</SynClockTime>
+            <MohServer></MohServer>
+            <UseVPN>1</UseVPN>
+            <EnableDND>0</EnableDND>
+            <InactiveHold>0</InactiveHold>
+            <ReqWithPort>1</ReqWithPort>
+            <UpdateRegExpire>1</UpdateRegExpire>
+            <EnableSCA>0</EnableSCA>
+            <SubCallPark>0</SubCallPark>
+            <SubCCStatus>0</SubCCStatus>
+            <FeatureSync>0</FeatureSync>
+            <EnableXferBack>0</EnableXferBack>
+            <XferBackTime>35</XferBackTime>
+            <UseTelCall>0</UseTelCall>
+            <EnablePreview>0</EnablePreview>
+            <PreviewMode>1</PreviewMode>
+            <TLSVersion>2</TLSVersion>
+            <CSTANumber></CSTANumber>
+            <EnableChgPort>0</EnableChgPort>
+            <VQName></VQName>
+            <VQServer></VQServer>
+            <VQServerPort>5060</VQServerPort>
+            <VQHTTPServer></VQHTTPServer>
+            <FlashMode>0</FlashMode>
+            <ContentType></ContentType>
+            <ContentBody></ContentBody>
+            <UnregisterOnBoot>0</UnregisterOnBoot>
+            <EnableMACHeader>0</EnableMACHeader>
+            <EnableRegisterMAC>0</EnableRegisterMAC>
+            <RecordStart>Record:on</RecordStart>
+            <RecordStop>Record:off</RecordStop>
+            <BLFDialogMatch>1</BLFDialogMatch>
+            <Ptime>0</Ptime>
+            <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
+        </line>
+        <line index="11">
+            <PhoneNumber>{$account.11.user_id}</PhoneNumber>
+            <DisplayName>{$account.11.display_name}</DisplayName>
+            <SipName></SipName>
+            <RegisterAddr>{$account.11.server_address}</RegisterAddr>
+            <RegisterPort>{$account.11.sip_port}</RegisterPort>
+            <RegisterUser>{$account.11.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.11.password}</RegisterPswd>
+            <RegisterTTL>{$account.11.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
+            <BackupAddr></BackupAddr>
+            <BackupPort>5060</BackupPort>
+            <BackupTransport>0</BackupTransport>
+            <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
+            <EnableReg>{if isset($account.11.password)}1{else}0{/if}</EnableReg>
+            <ProxyAddr>{$account.11.outbound_proxy_primary}</ProxyAddr>
+            <ProxyPort>{$account.11.sip_port}</ProxyPort>
+            <ProxyUser>{$account.11.auth_id}</ProxyUser>
+            <ProxyPswd>{$account.11.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
+            <BakProxyAddr>{$account.11.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.11.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
+            <EnableFailback>{if isset($account.11.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
+            <FailbackInterval>1800</FailbackInterval>
+            <SignalFailback>0</SignalFailback>
+            <SignalRetryCounts>3</SignalRetryCounts>
+            <SigCryptoKey></SigCryptoKey>
+            <MediaCrypto>0</MediaCrypto>
+            <MedCryptoKey></MedCryptoKey>
+            <SRTPAuth-Tag>0</SRTPAuth-Tag>
+            <EnableRFC5939>0</EnableRFC5939>
+            <LocalDomain></LocalDomain>
+            <AlwaysFWD>0</AlwaysFWD>
+            <BusyFWD>0</BusyFWD>
+            <NoAnswerFWD>0</NoAnswerFWD>
+            <AlwaysFWDNum></AlwaysFWDNum>
+            <BusyFWDNum></BusyFWDNum>
+            <NoAnswerFWDNum></NoAnswerFWDNum>
+            <FWDTimer>5</FWDTimer>
+            <HotlineNum></HotlineNum>
+            <EnableHotline>0</EnableHotline>
+            <WarmLineTime>0</WarmLineTime>
+            <PickupNum></PickupNum>
+            <JoinNum></JoinNum>
+            <IntercomNum></IntercomNum>
+            <RingType>{if isset($fanvil_ringtone_line11)}{$fanvil_ringtone_line11}{else}default{/if}</RingType>
+            <NATUDPUpdate>2</NATUDPUpdate>
+            <UDPUpdateTTL>30</UDPUpdateTTL>
+            <ServerType>0</ServerType>
+            <UserAgent></UserAgent>
+            <PRACK>0</PRACK>
+            <KeepAUTH>0</KeepAUTH>
+            <SessionTimer>0</SessionTimer>
+            <STimerExpires>0</STimerExpires>
+            <EnableGRUU>0</EnableGRUU>
+            <DTMFMode>3</DTMFMode>
+            <DTMFInfoMode>0</DTMFInfoMode>
+            <NATType>0</NATType>
+            <EnableRport>1</EnableRport>
+            <Subscribe>{if isset($account.11.user_id)}1{else}{/if}</Subscribe>
+            <SubExpire>{$account.11.register_expires}</SubExpire>
+            <SingleCodec>0</SingleCodec>
+            <CLIR>0</CLIR>
+            <StrictProxy>1</StrictProxy>
+            <DirectContact>0</DirectContact>
+            <HistoryInfo>0</HistoryInfo>
+            {if $account.11.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.11.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
+            <XFERExpire>0</XFERExpire>
+            <BanAnonymous>0</BanAnonymous>
+            <DialOffLine>0</DialOffLine>
+            <QuotaName>0</QuotaName>
+            <PresenceMode>0</PresenceMode>
+            <RFCVer>1</RFCVer>
+            <PhonePort>0</PhonePort>
+            <SignalPort>5060</SignalPort>
+            {if $account.11.sip_transport == 'udp'}<Transport>0</Transport>{/if}
+            {if $account.11.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
+            {if $account.11.sip_transport == 'tls'}<Transport>3</Transport>{/if}
+            <UseSRVMixer>0</UseSRVMixer>
+            <SRVMixerUri></SRVMixerUri>
+            <LongContact>0</LongContact>
+            <AutoTCP>1</AutoTCP>
+            <UriEscaped>1</UriEscaped>
+            <ClicktoTalk>0</ClicktoTalk>
+            <MwiNo></MwiNo>
+            <MWINum>{if isset($account.11.user_id)}*97{else}{/if}</MWINum>
+            <ParkNo></ParkNo>
+            <CallParkNum></CallParkNum>
+            <RetrieveNum></RetrieveNum>
+            <HelpNo></HelpNo>
+            <MSRPHelpNum></MSRPHelpNum>
+            <UserIsPhone>0</UserIsPhone>
+            <AutoAnswer>0</AutoAnswer>
+            <NoAnswerTime>5</NoAnswerTime>
+            <MissedCallLog>1</MissedCallLog>
+            <ParkMode></ParkMode>
+            <SvcCodeMode>1</SvcCodeMode>
+            <DNDOnSvcCode></DNDOnSvcCode>
+            <DNDOffSvcCode></DNDOffSvcCode>
+            <CFUOnSvcCode></CFUOnSvcCode>
+            <CFUOffSvcCode></CFUOffSvcCode>
+            <CFBOnSvcCode></CFBOnSvcCode>
+            <CFBOffSvcCode></CFBOffSvcCode>
+            <CFNOnSvcCode></CFNOnSvcCode>
+            <CFNOffSvcCode></CFNOffSvcCode>
+            <ANCOnSvcCode></ANCOnSvcCode>
+            <ANCOffSvcCode></ANCOffSvcCode>
+            <SendANOnCode></SendANOnCode>
+            <SendANOffCode></SendANOffCode>
+            <CWOnCode></CWOnCode>
+            <CWOffCode></CWOffCode>
+            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
+            <BLFListUri></BLFListUri>
+            <BLFServer></BLFServer>
+            <Respond182>0</Respond182>
+            <EnableBLFList>0</EnableBLFList>
+            <CallerIdType>4</CallerIdType>
+            <SynClockTime>0</SynClockTime>
+            <MohServer></MohServer>
+            <UseVPN>1</UseVPN>
+            <EnableDND>0</EnableDND>
+            <InactiveHold>0</InactiveHold>
+            <ReqWithPort>1</ReqWithPort>
+            <UpdateRegExpire>1</UpdateRegExpire>
+            <EnableSCA>0</EnableSCA>
+            <SubCallPark>0</SubCallPark>
+            <SubCCStatus>0</SubCCStatus>
+            <FeatureSync>0</FeatureSync>
+            <EnableXferBack>0</EnableXferBack>
+            <XferBackTime>35</XferBackTime>
+            <UseTelCall>0</UseTelCall>
+            <EnablePreview>0</EnablePreview>
+            <PreviewMode>1</PreviewMode>
+            <TLSVersion>2</TLSVersion>
+            <CSTANumber></CSTANumber>
+            <EnableChgPort>0</EnableChgPort>
+            <VQName></VQName>
+            <VQServer></VQServer>
+            <VQServerPort>5060</VQServerPort>
+            <VQHTTPServer></VQHTTPServer>
+            <FlashMode>0</FlashMode>
+            <ContentType></ContentType>
+            <ContentBody></ContentBody>
+            <UnregisterOnBoot>0</UnregisterOnBoot>
+            <EnableMACHeader>0</EnableMACHeader>
+            <EnableRegisterMAC>0</EnableRegisterMAC>
+            <RecordStart>Record:on</RecordStart>
+            <RecordStop>Record:off</RecordStop>
+            <BLFDialogMatch>1</BLFDialogMatch>
+            <Ptime>0</Ptime>
+            <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
+        </line>
+        <line index="12">
+            <PhoneNumber>{$account.12.user_id}</PhoneNumber>
+            <DisplayName>{$account.12.display_name}</DisplayName>
+            <SipName></SipName>
+            <RegisterAddr>{$account.12.server_address}</RegisterAddr>
+            <RegisterPort>{$account.12.sip_port}</RegisterPort>
+            <RegisterUser>{$account.12.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.12.password}</RegisterPswd>
+            <RegisterTTL>{$account.12.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
+            <BackupAddr></BackupAddr>
+            <BackupPort>5060</BackupPort>
+            <BackupTransport>0</BackupTransport>
+            <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
+            <EnableReg>{if isset($account.12.password)}1{else}0{/if}</EnableReg>
+            <ProxyAddr>{$account.12.outbound_proxy_primary}</ProxyAddr>
+            <ProxyPort>{$account.12.sip_port}</ProxyPort>
+            <ProxyUser>{$account.12.auth_id}</ProxyUser>
+            <ProxyPswd>{$account.12.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
+            <BakProxyAddr>{$account.12.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.12.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
+            <EnableFailback>{if isset($account.12.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
+            <FailbackInterval>1800</FailbackInterval>
+            <SignalFailback>0</SignalFailback>
+            <SignalRetryCounts>3</SignalRetryCounts>
+            <SigCryptoKey></SigCryptoKey>
+            <MediaCrypto>0</MediaCrypto>
+            <MedCryptoKey></MedCryptoKey>
+            <SRTPAuth-Tag>0</SRTPAuth-Tag>
+            <EnableRFC5939>0</EnableRFC5939>
+            <LocalDomain></LocalDomain>
+            <AlwaysFWD>0</AlwaysFWD>
+            <BusyFWD>0</BusyFWD>
+            <NoAnswerFWD>0</NoAnswerFWD>
+            <AlwaysFWDNum></AlwaysFWDNum>
+            <BusyFWDNum></BusyFWDNum>
+            <NoAnswerFWDNum></NoAnswerFWDNum>
+            <FWDTimer>5</FWDTimer>
+            <HotlineNum></HotlineNum>
+            <EnableHotline>0</EnableHotline>
+            <WarmLineTime>0</WarmLineTime>
+            <PickupNum></PickupNum>
+            <JoinNum></JoinNum>
+            <IntercomNum></IntercomNum>
+            <RingType>{if isset($fanvil_ringtone_line12)}{$fanvil_ringtone_line12}{else}default{/if}</RingType>
+            <NATUDPUpdate>2</NATUDPUpdate>
+            <UDPUpdateTTL>30</UDPUpdateTTL>
+            <ServerType>0</ServerType>
+            <UserAgent></UserAgent>
+            <PRACK>0</PRACK>
+            <KeepAUTH>0</KeepAUTH>
+            <SessionTimer>0</SessionTimer>
+            <STimerExpires>0</STimerExpires>
+            <EnableGRUU>0</EnableGRUU>
+            <DTMFMode>3</DTMFMode>
+            <DTMFInfoMode>0</DTMFInfoMode>
+            <NATType>0</NATType>
+            <EnableRport>1</EnableRport>
+            <Subscribe>{if isset($account.12.user_id)}1{else}{/if}</Subscribe>
+            <SubExpire>{$account.12.register_expires}</SubExpire>
+            <SingleCodec>0</SingleCodec>
+            <CLIR>0</CLIR>
+            <StrictProxy>1</StrictProxy>
+            <DirectContact>0</DirectContact>
+            <HistoryInfo>0</HistoryInfo>
+            {if $account.12.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.12.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
+            <XFERExpire>0</XFERExpire>
+            <BanAnonymous>0</BanAnonymous>
+            <DialOffLine>0</DialOffLine>
+            <QuotaName>0</QuotaName>
+            <PresenceMode>0</PresenceMode>
+            <RFCVer>1</RFCVer>
+            <PhonePort>0</PhonePort>
+            <SignalPort>5060</SignalPort>
+            {if $account.12.sip_transport == 'udp'}<Transport>0</Transport>{/if}
+            {if $account.12.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
+            {if $account.12.sip_transport == 'tls'}<Transport>3</Transport>{/if}
+            <UseSRVMixer>0</UseSRVMixer>
+            <SRVMixerUri></SRVMixerUri>
+            <LongContact>0</LongContact>
+            <AutoTCP>1</AutoTCP>
+            <UriEscaped>1</UriEscaped>
+            <ClicktoTalk>0</ClicktoTalk>
+            <MwiNo></MwiNo>
+            <MWINum>{if isset($account.12.user_id)}*97{else}{/if}</MWINum>
+            <ParkNo></ParkNo>
+            <CallParkNum></CallParkNum>
+            <RetrieveNum></RetrieveNum>
+            <HelpNo></HelpNo>
+            <MSRPHelpNum></MSRPHelpNum>
+            <UserIsPhone>0</UserIsPhone>
+            <AutoAnswer>0</AutoAnswer>
+            <NoAnswerTime>5</NoAnswerTime>
+            <MissedCallLog>1</MissedCallLog>
+            <ParkMode></ParkMode>
+            <SvcCodeMode>1</SvcCodeMode>
+            <DNDOnSvcCode></DNDOnSvcCode>
+            <DNDOffSvcCode></DNDOffSvcCode>
+            <CFUOnSvcCode></CFUOnSvcCode>
+            <CFUOffSvcCode></CFUOffSvcCode>
+            <CFBOnSvcCode></CFBOnSvcCode>
+            <CFBOffSvcCode></CFBOffSvcCode>
+            <CFNOnSvcCode></CFNOnSvcCode>
+            <CFNOffSvcCode></CFNOffSvcCode>
+            <ANCOnSvcCode></ANCOnSvcCode>
+            <ANCOffSvcCode></ANCOffSvcCode>
+            <SendANOnCode></SendANOnCode>
+            <SendANOffCode></SendANOffCode>
+            <CWOnCode></CWOnCode>
+            <CWOffCode></CWOffCode>
+            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
+            <BLFListUri></BLFListUri>
+            <BLFServer></BLFServer>
+            <Respond182>0</Respond182>
+            <EnableBLFList>0</EnableBLFList>
+            <CallerIdType>4</CallerIdType>
+            <SynClockTime>0</SynClockTime>
+            <MohServer></MohServer>
+            <UseVPN>1</UseVPN>
+            <EnableDND>0</EnableDND>
+            <InactiveHold>0</InactiveHold>
+            <ReqWithPort>1</ReqWithPort>
+            <UpdateRegExpire>1</UpdateRegExpire>
+            <EnableSCA>0</EnableSCA>
+            <SubCallPark>0</SubCallPark>
+            <SubCCStatus>0</SubCCStatus>
+            <FeatureSync>0</FeatureSync>
+            <EnableXferBack>0</EnableXferBack>
+            <XferBackTime>35</XferBackTime>
+            <UseTelCall>0</UseTelCall>
+            <EnablePreview>0</EnablePreview>
+            <PreviewMode>1</PreviewMode>
+            <TLSVersion>2</TLSVersion>
+            <CSTANumber></CSTANumber>
+            <EnableChgPort>0</EnableChgPort>
+            <VQName></VQName>
+            <VQServer></VQServer>
+            <VQServerPort>5060</VQServerPort>
+            <VQHTTPServer></VQHTTPServer>
+            <FlashMode>0</FlashMode>
+            <ContentType></ContentType>
+            <ContentBody></ContentBody>
+            <UnregisterOnBoot>0</UnregisterOnBoot>
+            <EnableMACHeader>0</EnableMACHeader>
+            <EnableRegisterMAC>0</EnableRegisterMAC>
+            <RecordStart>Record:on</RecordStart>
+            <RecordStop>Record:off</RecordStop>
+            <BLFDialogMatch>1</BLFDialogMatch>
+            <Ptime>0</Ptime>
+            <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
+        </line>
+        <line index="13">
+            <PhoneNumber>{$account.13.user_id}</PhoneNumber>
+            <DisplayName>{$account.13.display_name}</DisplayName>
+            <SipName></SipName>
+            <RegisterAddr>{$account.13.server_address}</RegisterAddr>
+            <RegisterPort>{$account.13.sip_port}</RegisterPort>
+            <RegisterUser>{$account.13.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.13.password}</RegisterPswd>
+            <RegisterTTL>{$account.13.register_expires}</RegisterTTL>
+            <BackupAddr></BackupAddr>
+            <BackupPort>5060</BackupPort>
+            <BackupTransport>0</BackupTransport>
+            <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
+            <EnableReg>{if isset($account.13.password)}1{else}0{/if}</EnableReg>
+            <ProxyAddr>{$account.13.outbound_proxy_primary}</ProxyAddr>
+            <ProxyPort>{$account.13.sip_port}</ProxyPort>
+            <ProxyUser>{$account.13.auth_id}</ProxyUser>
+            <ProxyPswd>{$account.13.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
+            <BakProxyAddr>{$account.13.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.13.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
+            <EnableFailback>{if isset($account.13.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
+            <FailbackInterval>1800</FailbackInterval>
+            <SignalFailback>0</SignalFailback>
+            <SignalRetryCounts>3</SignalRetryCounts>
+            <SigCryptoKey></SigCryptoKey>
+            <MediaCrypto>0</MediaCrypto>
+            <MedCryptoKey></MedCryptoKey>
+            <SRTPAuth-Tag>0</SRTPAuth-Tag>
+            <EnableRFC5939>0</EnableRFC5939>
+            <LocalDomain></LocalDomain>
+            <AlwaysFWD>0</AlwaysFWD>
+            <BusyFWD>0</BusyFWD>
+            <NoAnswerFWD>0</NoAnswerFWD>
+            <AlwaysFWDNum></AlwaysFWDNum>
+            <BusyFWDNum></BusyFWDNum>
+            <NoAnswerFWDNum></NoAnswerFWDNum>
+            <FWDTimer>5</FWDTimer>
+            <HotlineNum></HotlineNum>
+            <EnableHotline>0</EnableHotline>
+            <WarmLineTime>0</WarmLineTime>
+            <PickupNum></PickupNum>
+            <JoinNum></JoinNum>
+            <IntercomNum></IntercomNum>
+            <RingType>{if isset($fanvil_ringtone_line13)}{$fanvil_ringtone_line13}{else}default{/if}</RingType>
+            <NATUDPUpdate>2</NATUDPUpdate>
+            <UDPUpdateTTL>30</UDPUpdateTTL>
+            <ServerType>0</ServerType>
+            <UserAgent></UserAgent>
+            <PRACK>0</PRACK>
+            <KeepAUTH>0</KeepAUTH>
+            <SessionTimer>0</SessionTimer>
+            <STimerExpires>0</STimerExpires>
+            <EnableGRUU>0</EnableGRUU>
+            <DTMFMode>3</DTMFMode>
+            <DTMFInfoMode>0</DTMFInfoMode>
+            <NATType>0</NATType>
+            <EnableRport>1</EnableRport>
+            <Subscribe>{if isset($account.13.user_id)}1{else}{/if}</Subscribe>
+            <SubExpire>{$account.13.register_expires}</SubExpire>
+            <SingleCodec>0</SingleCodec>
+            <CLIR>0</CLIR>
+            <StrictProxy>1</StrictProxy>
+            <DirectContact>0</DirectContact>
+            <HistoryInfo>0</HistoryInfo>
+            {if $account.13.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.13.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
+            <XFERExpire>0</XFERExpire>
+            <BanAnonymous>0</BanAnonymous>
+            <DialOffLine>0</DialOffLine>
+            <QuotaName>0</QuotaName>
+            <PresenceMode>0</PresenceMode>
+            <RFCVer>1</RFCVer>
+            <PhonePort>0</PhonePort>
+            <SignalPort>5060</SignalPort>
+            {if $account.13.sip_transport == 'udp'}<Transport>0</Transport>{/if}
+            {if $account.13.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
+            {if $account.13.sip_transport == 'tls'}<Transport>3</Transport>{/if}
+            <UseSRVMixer>0</UseSRVMixer>
+            <SRVMixerUri></SRVMixerUri>
+            <LongContact>0</LongContact>
+            <AutoTCP>1</AutoTCP>
+            <UriEscaped>1</UriEscaped>
+            <ClicktoTalk>0</ClicktoTalk>
+            <MwiNo></MwiNo>
+            <MWINum>{if isset($account.13.user_id)}*97{else}{/if}</MWINum>
+            <ParkNo></ParkNo>
+            <CallParkNum></CallParkNum>
+            <RetrieveNum></RetrieveNum>
+            <HelpNo></HelpNo>
+            <MSRPHelpNum></MSRPHelpNum>
+            <UserIsPhone>0</UserIsPhone>
+            <AutoAnswer>0</AutoAnswer>
+            <NoAnswerTime>5</NoAnswerTime>
+            <MissedCallLog>1</MissedCallLog>
+            <ParkMode></ParkMode>
+            <SvcCodeMode>1</SvcCodeMode>
+            <DNDOnSvcCode></DNDOnSvcCode>
+            <DNDOffSvcCode></DNDOffSvcCode>
+            <CFUOnSvcCode></CFUOnSvcCode>
+            <CFUOffSvcCode></CFUOffSvcCode>
+            <CFBOnSvcCode></CFBOnSvcCode>
+            <CFBOffSvcCode></CFBOffSvcCode>
+            <CFNOnSvcCode></CFNOnSvcCode>
+            <CFNOffSvcCode></CFNOffSvcCode>
+            <ANCOnSvcCode></ANCOnSvcCode>
+            <ANCOffSvcCode></ANCOffSvcCode>
+            <SendANOnCode></SendANOnCode>
+            <SendANOffCode></SendANOffCode>
+            <CWOnCode></CWOnCode>
+            <CWOffCode></CWOffCode>
+            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
+            <BLFListUri></BLFListUri>
+            <BLFServer></BLFServer>
+            <Respond182>0</Respond182>
+            <EnableBLFList>0</EnableBLFList>
+            <CallerIdType>4</CallerIdType>
+            <SynClockTime>0</SynClockTime>
+            <MohServer></MohServer>
+            <UseVPN>1</UseVPN>
+            <EnableDND>0</EnableDND>
+            <InactiveHold>0</InactiveHold>
+            <ReqWithPort>1</ReqWithPort>
+            <UpdateRegExpire>1</UpdateRegExpire>
+            <EnableSCA>0</EnableSCA>
+            <SubCallPark>0</SubCallPark>
+            <SubCCStatus>0</SubCCStatus>
+            <FeatureSync>0</FeatureSync>
+            <EnableXferBack>0</EnableXferBack>
+            <XferBackTime>35</XferBackTime>
+            <UseTelCall>0</UseTelCall>
+            <EnablePreview>0</EnablePreview>
+            <PreviewMode>1</PreviewMode>
+            <TLSVersion>2</TLSVersion>
+            <CSTANumber></CSTANumber>
+            <EnableChgPort>0</EnableChgPort>
+            <VQName></VQName>
+            <VQServer></VQServer>
+            <VQServerPort>5060</VQServerPort>
+            <VQHTTPServer></VQHTTPServer>
+            <FlashMode>0</FlashMode>
+            <ContentType></ContentType>
+            <ContentBody></ContentBody>
+            <UnregisterOnBoot>0</UnregisterOnBoot>
+            <EnableMACHeader>0</EnableMACHeader>
+            <EnableRegisterMAC>0</EnableRegisterMAC>
+            <RecordStart>Record:on</RecordStart>
+            <RecordStop>Record:off</RecordStop>
+            <BLFDialogMatch>1</BLFDialogMatch>
+            <Ptime>0</Ptime>
+            <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
+        </line>
+        <line index="14">
+            <PhoneNumber>{$account.14.user_id}</PhoneNumber>
+            <DisplayName>{$account.14.display_name}</DisplayName>
+            <SipName></SipName>
+            <RegisterAddr>{$account.14.server_address}</RegisterAddr>
+            <RegisterPort>{$account.14.sip_port}</RegisterPort>
+            <RegisterUser>{$account.14.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.14.password}</RegisterPswd>
+            <RegisterTTL>{$account.14.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
+            <BackupAddr></BackupAddr>
+            <BackupPort>5060</BackupPort>
+            <BackupTransport>0</BackupTransport>
+            <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
+            <EnableReg>{if isset($account.14.password)}1{else}0{/if}</EnableReg>
+            <ProxyAddr>{$account.14.outbound_proxy_primary}</ProxyAddr>
+            <ProxyPort>{$account.14.sip_port}</ProxyPort>
+            <ProxyUser>{$account.14.auth_id}</ProxyUser>
+            <ProxyPswd>{$account.14.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
+            <BakProxyAddr>{$account.14.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.14.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
+            <EnableFailback>{if isset($account.14.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
+            <FailbackInterval>1800</FailbackInterval>
+            <SignalFailback>0</SignalFailback>
+            <SignalRetryCounts>3</SignalRetryCounts>
+            <SigCryptoKey></SigCryptoKey>
+            <MediaCrypto>0</MediaCrypto>
+            <MedCryptoKey></MedCryptoKey>
+            <SRTPAuth-Tag>0</SRTPAuth-Tag>
+            <EnableRFC5939>0</EnableRFC5939>
+            <LocalDomain></LocalDomain>
+            <AlwaysFWD>0</AlwaysFWD>
+            <BusyFWD>0</BusyFWD>
+            <NoAnswerFWD>0</NoAnswerFWD>
+            <AlwaysFWDNum></AlwaysFWDNum>
+            <BusyFWDNum></BusyFWDNum>
+            <NoAnswerFWDNum></NoAnswerFWDNum>
+            <FWDTimer>5</FWDTimer>
+            <HotlineNum></HotlineNum>
+            <EnableHotline>0</EnableHotline>
+            <WarmLineTime>0</WarmLineTime>
+            <PickupNum></PickupNum>
+            <JoinNum></JoinNum>
+            <IntercomNum></IntercomNum>
+            <RingType>{if isset($fanvil_ringtone_line14)}{$fanvil_ringtone_line14}{else}default{/if}</RingType>
+            <NATUDPUpdate>2</NATUDPUpdate>
+            <UDPUpdateTTL>30</UDPUpdateTTL>
+            <ServerType>0</ServerType>
+            <UserAgent></UserAgent>
+            <PRACK>0</PRACK>
+            <KeepAUTH>0</KeepAUTH>
+            <SessionTimer>0</SessionTimer>
+            <STimerExpires>0</STimerExpires>
+            <EnableGRUU>0</EnableGRUU>
+            <DTMFMode>3</DTMFMode>
+            <DTMFInfoMode>0</DTMFInfoMode>
+            <NATType>0</NATType>
+            <EnableRport>1</EnableRport>
+            <Subscribe>{if isset($account.14.user_id)}1{else}{/if}</Subscribe>
+            <SubExpire>{$account.14.register_expires}</SubExpire>
+            <SingleCodec>0</SingleCodec>
+            <CLIR>0</CLIR>
+            <StrictProxy>1</StrictProxy>
+            <DirectContact>0</DirectContact>
+            <HistoryInfo>0</HistoryInfo>
+            {if $account.14.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.14.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
+            <XFERExpire>0</XFERExpire>
+            <BanAnonymous>0</BanAnonymous>
+            <DialOffLine>0</DialOffLine>
+            <QuotaName>0</QuotaName>
+            <PresenceMode>0</PresenceMode>
+            <RFCVer>1</RFCVer>
+            <PhonePort>0</PhonePort>
+            <SignalPort>5060</SignalPort>
+            {if $account.14.sip_transport == 'udp'}<Transport>0</Transport>{/if}
+            {if $account.14.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
+            {if $account.14.sip_transport == 'tls'}<Transport>3</Transport>{/if}
+            <UseSRVMixer>0</UseSRVMixer>
+            <SRVMixerUri></SRVMixerUri>
+            <LongContact>0</LongContact>
+            <AutoTCP>1</AutoTCP>
+            <UriEscaped>1</UriEscaped>
+            <ClicktoTalk>0</ClicktoTalk>
+            <MwiNo></MwiNo>
+            <MWINum>{if isset($account.14.user_id)}*97{else}{/if}</MWINum>
+            <ParkNo></ParkNo>
+            <CallParkNum></CallParkNum>
+            <RetrieveNum></RetrieveNum>
+            <HelpNo></HelpNo>
+            <MSRPHelpNum></MSRPHelpNum>
+            <UserIsPhone>0</UserIsPhone>
+            <AutoAnswer>0</AutoAnswer>
+            <NoAnswerTime>5</NoAnswerTime>
+            <MissedCallLog>1</MissedCallLog>
+            <ParkMode></ParkMode>
+            <SvcCodeMode>1</SvcCodeMode>
+            <DNDOnSvcCode></DNDOnSvcCode>
+            <DNDOffSvcCode></DNDOffSvcCode>
+            <CFUOnSvcCode></CFUOnSvcCode>
+            <CFUOffSvcCode></CFUOffSvcCode>
+            <CFBOnSvcCode></CFBOnSvcCode>
+            <CFBOffSvcCode></CFBOffSvcCode>
+            <CFNOnSvcCode></CFNOnSvcCode>
+            <CFNOffSvcCode></CFNOffSvcCode>
+            <ANCOnSvcCode></ANCOnSvcCode>
+            <ANCOffSvcCode></ANCOffSvcCode>
+            <SendANOnCode></SendANOnCode>
+            <SendANOffCode></SendANOffCode>
+            <CWOnCode></CWOnCode>
+            <CWOffCode></CWOffCode>
+            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
+            <BLFListUri></BLFListUri>
+            <BLFServer></BLFServer>
+            <Respond182>0</Respond182>
+            <EnableBLFList>0</EnableBLFList>
+            <CallerIdType>4</CallerIdType>
+            <SynClockTime>0</SynClockTime>
+            <MohServer></MohServer>
+            <UseVPN>1</UseVPN>
+            <EnableDND>0</EnableDND>
+            <InactiveHold>0</InactiveHold>
+            <ReqWithPort>1</ReqWithPort>
+            <UpdateRegExpire>1</UpdateRegExpire>
+            <EnableSCA>0</EnableSCA>
+            <SubCallPark>0</SubCallPark>
+            <SubCCStatus>0</SubCCStatus>
+            <FeatureSync>0</FeatureSync>
+            <EnableXferBack>0</EnableXferBack>
+            <XferBackTime>35</XferBackTime>
+            <UseTelCall>0</UseTelCall>
+            <EnablePreview>0</EnablePreview>
+            <PreviewMode>1</PreviewMode>
+            <TLSVersion>2</TLSVersion>
+            <CSTANumber></CSTANumber>
+            <EnableChgPort>0</EnableChgPort>
+            <VQName></VQName>
+            <VQServer></VQServer>
+            <VQServerPort>5060</VQServerPort>
+            <VQHTTPServer></VQHTTPServer>
+            <FlashMode>0</FlashMode>
+            <ContentType></ContentType>
+            <ContentBody></ContentBody>
+            <UnregisterOnBoot>0</UnregisterOnBoot>
+            <EnableMACHeader>0</EnableMACHeader>
+            <EnableRegisterMAC>0</EnableRegisterMAC>
+            <RecordStart>Record:on</RecordStart>
+            <RecordStop>Record:off</RecordStop>
+            <BLFDialogMatch>1</BLFDialogMatch>
+            <Ptime>0</Ptime>
+            <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
+        </line>
+        <line index="15">
+            <PhoneNumber>{$account.15.user_id}</PhoneNumber>
+            <DisplayName>{$account.15.display_name}</DisplayName>
+            <SipName></SipName>
+            <RegisterAddr>{$account.15.server_address}</RegisterAddr>
+            <RegisterPort>{$account.15.sip_port}</RegisterPort>
+            <RegisterUser>{$account.15.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.15.password}</RegisterPswd>
+            <RegisterTTL>{$account.15.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
+            <BackupAddr></BackupAddr>
+            <BackupPort>5060</BackupPort>
+            <BackupTransport>0</BackupTransport>
+            <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
+            <EnableReg>{if isset($account.15.password)}1{else}0{/if}</EnableReg>
+            <ProxyAddr>{$account.15.outbound_proxy_primary}</ProxyAddr>
+            <ProxyPort>{$account.15.sip_port}</ProxyPort>
+            <ProxyUser>{$account.15.auth_id}</ProxyUser>
+            <ProxyPswd>{$account.15.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
+            <BakProxyAddr>{$account.15.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.15.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
+            <EnableFailback>{if isset($account.15.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
+            <FailbackInterval>1800</FailbackInterval>
+            <SignalFailback>0</SignalFailback>
+            <SignalRetryCounts>3</SignalRetryCounts>
+            <SigCryptoKey></SigCryptoKey>
+            <MediaCrypto>0</MediaCrypto>
+            <MedCryptoKey></MedCryptoKey>
+            <SRTPAuth-Tag>0</SRTPAuth-Tag>
+            <EnableRFC5939>0</EnableRFC5939>
+            <LocalDomain></LocalDomain>
+            <AlwaysFWD>0</AlwaysFWD>
+            <BusyFWD>0</BusyFWD>
+            <NoAnswerFWD>0</NoAnswerFWD>
+            <AlwaysFWDNum></AlwaysFWDNum>
+            <BusyFWDNum></BusyFWDNum>
+            <NoAnswerFWDNum></NoAnswerFWDNum>
+            <FWDTimer>5</FWDTimer>
+            <HotlineNum></HotlineNum>
+            <EnableHotline>0</EnableHotline>
+            <WarmLineTime>0</WarmLineTime>
+            <PickupNum></PickupNum>
+            <JoinNum></JoinNum>
+            <IntercomNum></IntercomNum>
+            <RingType>{if isset($fanvil_ringtone_line15)}{$fanvil_ringtone_line15}{else}default{/if}</RingType>
+            <NATUDPUpdate>2</NATUDPUpdate>
+            <UDPUpdateTTL>30</UDPUpdateTTL>
+            <ServerType>0</ServerType>
+            <UserAgent></UserAgent>
+            <PRACK>0</PRACK>
+            <KeepAUTH>0</KeepAUTH>
+            <SessionTimer>0</SessionTimer>
+            <STimerExpires>0</STimerExpires>
+            <EnableGRUU>0</EnableGRUU>
+            <DTMFMode>3</DTMFMode>
+            <DTMFInfoMode>0</DTMFInfoMode>
+            <NATType>0</NATType>
+            <EnableRport>1</EnableRport>
+            <Subscribe>{if isset($account.15.user_id)}1{else}{/if}</Subscribe>
+            <SubExpire>{$account.15.register_expires}</SubExpire>
+            <SingleCodec>0</SingleCodec>
+            <CLIR>0</CLIR>
+            <StrictProxy>1</StrictProxy>
+            <DirectContact>0</DirectContact>
+            <HistoryInfo>0</HistoryInfo>
+            {if $account.15.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.15.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
+            <XFERExpire>0</XFERExpire>
+            <BanAnonymous>0</BanAnonymous>
+            <DialOffLine>0</DialOffLine>
+            <QuotaName>0</QuotaName>
+            <PresenceMode>0</PresenceMode>
+            <RFCVer>1</RFCVer>
+            <PhonePort>0</PhonePort>
+            <SignalPort>5060</SignalPort>
+            {if $account.15.sip_transport == 'udp'}<Transport>0</Transport>{/if}
+            {if $account.15.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
+            {if $account.15.sip_transport == 'tls'}<Transport>3</Transport>{/if}
+            <UseSRVMixer>0</UseSRVMixer>
+            <SRVMixerUri></SRVMixerUri>
+            <LongContact>0</LongContact>
+            <AutoTCP>1</AutoTCP>
+            <UriEscaped>1</UriEscaped>
+            <ClicktoTalk>0</ClicktoTalk>
+            <MwiNo></MwiNo>
+            <MWINum>{if isset($account.15.user_id)}*97{else}{/if}</MWINum>
+            <ParkNo></ParkNo>
+            <CallParkNum></CallParkNum>
+            <RetrieveNum></RetrieveNum>
+            <HelpNo></HelpNo>
+            <MSRPHelpNum></MSRPHelpNum>
+            <UserIsPhone>0</UserIsPhone>
+            <AutoAnswer>0</AutoAnswer>
+            <NoAnswerTime>5</NoAnswerTime>
+            <MissedCallLog>1</MissedCallLog>
+            <ParkMode></ParkMode>
+            <SvcCodeMode>1</SvcCodeMode>
+            <DNDOnSvcCode></DNDOnSvcCode>
+            <DNDOffSvcCode></DNDOffSvcCode>
+            <CFUOnSvcCode></CFUOnSvcCode>
+            <CFUOffSvcCode></CFUOffSvcCode>
+            <CFBOnSvcCode></CFBOnSvcCode>
+            <CFBOffSvcCode></CFBOffSvcCode>
+            <CFNOnSvcCode></CFNOnSvcCode>
+            <CFNOffSvcCode></CFNOffSvcCode>
+            <ANCOnSvcCode></ANCOnSvcCode>
+            <ANCOffSvcCode></ANCOffSvcCode>
+            <SendANOnCode></SendANOnCode>
+            <SendANOffCode></SendANOffCode>
+            <CWOnCode></CWOnCode>
+            <CWOffCode></CWOffCode>
+            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
+            <BLFListUri></BLFListUri>
+            <BLFServer></BLFServer>
+            <Respond182>0</Respond182>
+            <EnableBLFList>0</EnableBLFList>
+            <CallerIdType>4</CallerIdType>
+            <SynClockTime>0</SynClockTime>
+            <MohServer></MohServer>
+            <UseVPN>1</UseVPN>
+            <EnableDND>0</EnableDND>
+            <InactiveHold>0</InactiveHold>
+            <ReqWithPort>1</ReqWithPort>
+            <UpdateRegExpire>1</UpdateRegExpire>
+            <EnableSCA>0</EnableSCA>
+            <SubCallPark>0</SubCallPark>
+            <SubCCStatus>0</SubCCStatus>
+            <FeatureSync>0</FeatureSync>
+            <EnableXferBack>0</EnableXferBack>
+            <XferBackTime>35</XferBackTime>
+            <UseTelCall>0</UseTelCall>
+            <EnablePreview>0</EnablePreview>
+            <PreviewMode>1</PreviewMode>
+            <TLSVersion>2</TLSVersion>
+            <CSTANumber></CSTANumber>
+            <EnableChgPort>0</EnableChgPort>
+            <VQName></VQName>
+            <VQServer></VQServer>
+            <VQServerPort>5060</VQServerPort>
+            <VQHTTPServer></VQHTTPServer>
+            <FlashMode>0</FlashMode>
+            <ContentType></ContentType>
+            <ContentBody></ContentBody>
+            <UnregisterOnBoot>0</UnregisterOnBoot>
+            <EnableMACHeader>0</EnableMACHeader>
+            <EnableRegisterMAC>0</EnableRegisterMAC>
+            <RecordStart>Record:on</RecordStart>
+            <RecordStop>Record:off</RecordStop>
+            <BLFDialogMatch>1</BLFDialogMatch>
+            <Ptime>0</Ptime>
+            <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
+        </line>
+        <line index="16">
+            <PhoneNumber>{$account.16.user_id}</PhoneNumber>
+            <DisplayName>{$account.16.display_name}</DisplayName>
+            <SipName></SipName>
+            <RegisterAddr>{$account.16.server_address}</RegisterAddr>
+            <RegisterPort>{$account.16.sip_port}</RegisterPort>
+            <RegisterUser>{$account.16.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.16.password}</RegisterPswd>
+            <RegisterTTL>{$account.16.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
+            <BackupAddr></BackupAddr>
+            <BackupPort>5060</BackupPort>
+            <BackupTransport>0</BackupTransport>
+            <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
+            <EnableReg>{if isset($account.16.password)}1{else}0{/if}</EnableReg>
+            <ProxyAddr>{$account.16.outbound_proxy_primary}</ProxyAddr>
+            <ProxyPort>{$account.16.sip_port}</ProxyPort>
+            <ProxyUser>{$account.16.auth_id}</ProxyUser>
+            <ProxyPswd>{$account.16.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
+            <BakProxyAddr>{$account.16.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.16.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
+            <EnableFailback>{if isset($account.16.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
+            <FailbackInterval>1800</FailbackInterval>
+            <SignalFailback>0</SignalFailback>
+            <SignalRetryCounts>3</SignalRetryCounts>
+            <SigCryptoKey></SigCryptoKey>
+            <MediaCrypto>0</MediaCrypto>
+            <MedCryptoKey></MedCryptoKey>
+            <SRTPAuth-Tag>0</SRTPAuth-Tag>
+            <EnableRFC5939>0</EnableRFC5939>
+            <LocalDomain></LocalDomain>
+            <AlwaysFWD>0</AlwaysFWD>
+            <BusyFWD>0</BusyFWD>
+            <NoAnswerFWD>0</NoAnswerFWD>
+            <AlwaysFWDNum></AlwaysFWDNum>
+            <BusyFWDNum></BusyFWDNum>
+            <NoAnswerFWDNum></NoAnswerFWDNum>
+            <FWDTimer>5</FWDTimer>
+            <HotlineNum></HotlineNum>
+            <EnableHotline>0</EnableHotline>
+            <WarmLineTime>0</WarmLineTime>
+            <PickupNum></PickupNum>
+            <JoinNum></JoinNum>
+            <IntercomNum></IntercomNum>
+            <RingType>{if isset($fanvil_ringtone_line16)}{$fanvil_ringtone_line16}{else}default{/if}</RingType>
+            <NATUDPUpdate>2</NATUDPUpdate>
+            <UDPUpdateTTL>30</UDPUpdateTTL>
+            <ServerType>0</ServerType>
+            <UserAgent></UserAgent>
+            <PRACK>0</PRACK>
+            <KeepAUTH>0</KeepAUTH>
+            <SessionTimer>0</SessionTimer>
+            <STimerExpires>0</STimerExpires>
+            <EnableGRUU>0</EnableGRUU>
+            <DTMFMode>3</DTMFMode>
+            <DTMFInfoMode>0</DTMFInfoMode>
+            <NATType>0</NATType>
+            <EnableRport>1</EnableRport>
+            <Subscribe>{if isset($account.16.user_id)}1{else}{/if}</Subscribe>
+            <SubExpire>{$account.16.register_expires}</SubExpire>
+            <SingleCodec>0</SingleCodec>
+            <CLIR>0</CLIR>
+            <StrictProxy>1</StrictProxy>
+            <DirectContact>0</DirectContact>
+            <HistoryInfo>0</HistoryInfo>
+            {if $account.16.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.16.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
+            <XFERExpire>0</XFERExpire>
+            <BanAnonymous>0</BanAnonymous>
+            <DialOffLine>0</DialOffLine>
+            <QuotaName>0</QuotaName>
+            <PresenceMode>0</PresenceMode>
+            <RFCVer>1</RFCVer>
+            <PhonePort>0</PhonePort>
+            <SignalPort>5060</SignalPort>
+            {if $account.16.sip_transport == 'udp'}<Transport>0</Transport>{/if}
+            {if $account.16.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
+            {if $account.16.sip_transport == 'tls'}<Transport>3</Transport>{/if}
+            <UseSRVMixer>0</UseSRVMixer>
+            <SRVMixerUri></SRVMixerUri>
+            <LongContact>0</LongContact>
+            <AutoTCP>1</AutoTCP>
+            <UriEscaped>1</UriEscaped>
+            <ClicktoTalk>0</ClicktoTalk>
+            <MwiNo></MwiNo>
+            <MWINum>{if isset($account.16.user_id)}*97{else}{/if}</MWINum>
+            <ParkNo></ParkNo>
+            <CallParkNum></CallParkNum>
+            <RetrieveNum></RetrieveNum>
+            <HelpNo></HelpNo>
+            <MSRPHelpNum></MSRPHelpNum>
+            <UserIsPhone>0</UserIsPhone>
+            <AutoAnswer>0</AutoAnswer>
+            <NoAnswerTime>5</NoAnswerTime>
+            <MissedCallLog>1</MissedCallLog>
+            <ParkMode></ParkMode>
+            <SvcCodeMode>1</SvcCodeMode>
+            <DNDOnSvcCode></DNDOnSvcCode>
+            <DNDOffSvcCode></DNDOffSvcCode>
+            <CFUOnSvcCode></CFUOnSvcCode>
+            <CFUOffSvcCode></CFUOffSvcCode>
+            <CFBOnSvcCode></CFBOnSvcCode>
+            <CFBOffSvcCode></CFBOffSvcCode>
+            <CFNOnSvcCode></CFNOnSvcCode>
+            <CFNOffSvcCode></CFNOffSvcCode>
+            <ANCOnSvcCode></ANCOnSvcCode>
+            <ANCOffSvcCode></ANCOffSvcCode>
+            <SendANOnCode></SendANOnCode>
+            <SendANOffCode></SendANOffCode>
+            <CWOnCode></CWOnCode>
+            <CWOffCode></CWOffCode>
+            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
+            <BLFListUri></BLFListUri>
+            <BLFServer></BLFServer>
+            <Respond182>0</Respond182>
+            <EnableBLFList>0</EnableBLFList>
+            <CallerIdType>4</CallerIdType>
+            <SynClockTime>0</SynClockTime>
+            <MohServer></MohServer>
+            <UseVPN>1</UseVPN>
+            <EnableDND>0</EnableDND>
+            <InactiveHold>0</InactiveHold>
+            <ReqWithPort>1</ReqWithPort>
+            <UpdateRegExpire>1</UpdateRegExpire>
+            <EnableSCA>0</EnableSCA>
+            <SubCallPark>0</SubCallPark>
+            <SubCCStatus>0</SubCCStatus>
+            <FeatureSync>0</FeatureSync>
+            <EnableXferBack>0</EnableXferBack>
+            <XferBackTime>35</XferBackTime>
+            <UseTelCall>0</UseTelCall>
+            <EnablePreview>0</EnablePreview>
+            <PreviewMode>1</PreviewMode>
+            <TLSVersion>2</TLSVersion>
+            <CSTANumber></CSTANumber>
+            <EnableChgPort>0</EnableChgPort>
+            <VQName></VQName>
+            <VQServer></VQServer>
+            <VQServerPort>5060</VQServerPort>
+            <VQHTTPServer></VQHTTPServer>
+            <FlashMode>0</FlashMode>
+            <ContentType></ContentType>
+            <ContentBody></ContentBody>
+            <UnregisterOnBoot>0</UnregisterOnBoot>
+            <EnableMACHeader>0</EnableMACHeader>
+            <EnableRegisterMAC>0</EnableRegisterMAC>
+            <RecordStart>Record:on</RecordStart>
+            <RecordStop>Record:off</RecordStop>
+            <BLFDialogMatch>1</BLFDialogMatch>
+            <Ptime>0</Ptime>
+            <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
+        </line>
+        <line index="17">
+            <PhoneNumber>{$account.17.user_id}</PhoneNumber>
+            <DisplayName>{$account.17.display_name}</DisplayName>
+            <SipName></SipName>
+            <RegisterAddr>{$account.17.server_address}</RegisterAddr>
+            <RegisterPort>{$account.17.sip_port}</RegisterPort>
+            <RegisterUser>{$account.17.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.17.password}</RegisterPswd>
+            <RegisterTTL>{$account.17.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
+            <BackupAddr></BackupAddr>
+            <BackupPort>5060</BackupPort>
+            <BackupTransport>0</BackupTransport>
+            <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
+            <EnableReg>{if isset($account.17.password)}1{else}0{/if}</EnableReg>
+            <ProxyAddr>{$account.17.outbound_proxy_primary}</ProxyAddr>
+            <ProxyPort>{$account.17.sip_port}</ProxyPort>
+            <ProxyUser>{$account.17.auth_id}</ProxyUser>
+            <ProxyPswd>{$account.17.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
+            <BakProxyAddr>{$account.17.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.17.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
+            <EnableFailback>{if isset($account.17.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
+            <FailbackInterval>1800</FailbackInterval>
+            <SignalFailback>0</SignalFailback>
+            <SignalRetryCounts>3</SignalRetryCounts>
+            <SigCryptoKey></SigCryptoKey>
+            <MediaCrypto>0</MediaCrypto>
+            <MedCryptoKey></MedCryptoKey>
+            <SRTPAuth-Tag>0</SRTPAuth-Tag>
+            <EnableRFC5939>0</EnableRFC5939>
+            <LocalDomain></LocalDomain>
+            <AlwaysFWD>0</AlwaysFWD>
+            <BusyFWD>0</BusyFWD>
+            <NoAnswerFWD>0</NoAnswerFWD>
+            <AlwaysFWDNum></AlwaysFWDNum>
+            <BusyFWDNum></BusyFWDNum>
+            <NoAnswerFWDNum></NoAnswerFWDNum>
+            <FWDTimer>5</FWDTimer>
+            <HotlineNum></HotlineNum>
+            <EnableHotline>0</EnableHotline>
+            <WarmLineTime>0</WarmLineTime>
+            <PickupNum></PickupNum>
+            <JoinNum></JoinNum>
+            <IntercomNum></IntercomNum>
+            <RingType>{if isset($fanvil_ringtone_line17)}{$fanvil_ringtone_line17}{else}default{/if}</RingType>
+            <NATUDPUpdate>2</NATUDPUpdate>
+            <UDPUpdateTTL>30</UDPUpdateTTL>
+            <ServerType>0</ServerType>
+            <UserAgent></UserAgent>
+            <PRACK>0</PRACK>
+            <KeepAUTH>0</KeepAUTH>
+            <SessionTimer>0</SessionTimer>
+            <STimerExpires>0</STimerExpires>
+            <EnableGRUU>0</EnableGRUU>
+            <DTMFMode>3</DTMFMode>
+            <DTMFInfoMode>0</DTMFInfoMode>
+            <NATType>0</NATType>
+            <EnableRport>1</EnableRport>
+            <Subscribe>{if isset($account.17.user_id)}1{else}{/if}</Subscribe>
+            <SubExpire>{$account.17.register_expires}</SubExpire>
+            <SingleCodec>0</SingleCodec>
+            <CLIR>0</CLIR>
+            <StrictProxy>1</StrictProxy>
+            <DirectContact>0</DirectContact>
+            <HistoryInfo>0</HistoryInfo>
+            {if $account.17.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.17.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
+            <XFERExpire>0</XFERExpire>
+            <BanAnonymous>0</BanAnonymous>
+            <DialOffLine>0</DialOffLine>
+            <QuotaName>0</QuotaName>
+            <PresenceMode>0</PresenceMode>
+            <RFCVer>1</RFCVer>
+            <PhonePort>0</PhonePort>
+            <SignalPort>5060</SignalPort>
+            {if $account.17.sip_transport == 'udp'}<Transport>0</Transport>{/if}
+            {if $account.17.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
+            {if $account.17.sip_transport == 'tls'}<Transport>3</Transport>{/if}
+            <UseSRVMixer>0</UseSRVMixer>
+            <SRVMixerUri></SRVMixerUri>
+            <LongContact>0</LongContact>
+            <AutoTCP>1</AutoTCP>
+            <UriEscaped>1</UriEscaped>
+            <ClicktoTalk>0</ClicktoTalk>
+            <MwiNo></MwiNo>
+            <MWINum>{if isset($account.17.user_id)}*97{else}{/if}</MWINum>
+            <ParkNo></ParkNo>
+            <CallParkNum></CallParkNum>
+            <RetrieveNum></RetrieveNum>
+            <HelpNo></HelpNo>
+            <MSRPHelpNum></MSRPHelpNum>
+            <UserIsPhone>0</UserIsPhone>
+            <AutoAnswer>0</AutoAnswer>
+            <NoAnswerTime>5</NoAnswerTime>
+            <MissedCallLog>1</MissedCallLog>
+            <ParkMode></ParkMode>
+            <SvcCodeMode>1</SvcCodeMode>
+            <DNDOnSvcCode></DNDOnSvcCode>
+            <DNDOffSvcCode></DNDOffSvcCode>
+            <CFUOnSvcCode></CFUOnSvcCode>
+            <CFUOffSvcCode></CFUOffSvcCode>
+            <CFBOnSvcCode></CFBOnSvcCode>
+            <CFBOffSvcCode></CFBOffSvcCode>
+            <CFNOnSvcCode></CFNOnSvcCode>
+            <CFNOffSvcCode></CFNOffSvcCode>
+            <ANCOnSvcCode></ANCOnSvcCode>
+            <ANCOffSvcCode></ANCOffSvcCode>
+            <SendANOnCode></SendANOnCode>
+            <SendANOffCode></SendANOffCode>
+            <CWOnCode></CWOnCode>
+            <CWOffCode></CWOffCode>
+            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
+            <BLFListUri></BLFListUri>
+            <BLFServer></BLFServer>
+            <Respond182>0</Respond182>
+            <EnableBLFList>0</EnableBLFList>
+            <CallerIdType>4</CallerIdType>
+            <SynClockTime>0</SynClockTime>
+            <MohServer></MohServer>
+            <UseVPN>1</UseVPN>
+            <EnableDND>0</EnableDND>
+            <InactiveHold>0</InactiveHold>
+            <ReqWithPort>1</ReqWithPort>
+            <UpdateRegExpire>1</UpdateRegExpire>
+            <EnableSCA>0</EnableSCA>
+            <SubCallPark>0</SubCallPark>
+            <SubCCStatus>0</SubCCStatus>
+            <FeatureSync>0</FeatureSync>
+            <EnableXferBack>0</EnableXferBack>
+            <XferBackTime>35</XferBackTime>
+            <UseTelCall>0</UseTelCall>
+            <EnablePreview>0</EnablePreview>
+            <PreviewMode>1</PreviewMode>
+            <TLSVersion>2</TLSVersion>
+            <CSTANumber></CSTANumber>
+            <EnableChgPort>0</EnableChgPort>
+            <VQName></VQName>
+            <VQServer></VQServer>
+            <VQServerPort>5060</VQServerPort>
+            <VQHTTPServer></VQHTTPServer>
+            <FlashMode>0</FlashMode>
+            <ContentType></ContentType>
+            <ContentBody></ContentBody>
+            <UnregisterOnBoot>0</UnregisterOnBoot>
+            <EnableMACHeader>0</EnableMACHeader>
+            <EnableRegisterMAC>0</EnableRegisterMAC>
+            <RecordStart>Record:on</RecordStart>
+            <RecordStop>Record:off</RecordStop>
+            <BLFDialogMatch>1</BLFDialogMatch>
+            <Ptime>0</Ptime>
+            <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
+        </line>
+        <line index="18">
+            <PhoneNumber>{$account.18.user_id}</PhoneNumber>
+            <DisplayName>{$account.18.display_name}</DisplayName>
+            <SipName></SipName>
+            <RegisterAddr>{$account.18.server_address}</RegisterAddr>
+            <RegisterPort>{$account.18.sip_port}</RegisterPort>
+            <RegisterUser>{$account.18.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.18.password}</RegisterPswd>
+            <RegisterTTL>{$account.18.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
+            <BackupAddr></BackupAddr>
+            <BackupPort>5060</BackupPort>
+            <BackupTransport>0</BackupTransport>
+            <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
+            <EnableReg>{if isset($account.18.password)}1{else}0{/if}</EnableReg>
+            <ProxyAddr>{$account.18.outbound_proxy_primary}</ProxyAddr>
+            <ProxyPort>{$account.18.sip_port}</ProxyPort>
+            <ProxyUser>{$account.18.auth_id}</ProxyUser>
+            <ProxyPswd>{$account.18.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
+            <BakProxyAddr>{$account.18.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.18.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
+            <EnableFailback>{if isset($account.18.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
+            <FailbackInterval>1800</FailbackInterval>
+            <SignalFailback>0</SignalFailback>
+            <SignalRetryCounts>3</SignalRetryCounts>
+            <SigCryptoKey></SigCryptoKey>
+            <MediaCrypto>0</MediaCrypto>
+            <MedCryptoKey></MedCryptoKey>
+            <SRTPAuth-Tag>0</SRTPAuth-Tag>
+            <EnableRFC5939>0</EnableRFC5939>
+            <LocalDomain></LocalDomain>
+            <AlwaysFWD>0</AlwaysFWD>
+            <BusyFWD>0</BusyFWD>
+            <NoAnswerFWD>0</NoAnswerFWD>
+            <AlwaysFWDNum></AlwaysFWDNum>
+            <BusyFWDNum></BusyFWDNum>
+            <NoAnswerFWDNum></NoAnswerFWDNum>
+            <FWDTimer>5</FWDTimer>
+            <HotlineNum></HotlineNum>
+            <EnableHotline>0</EnableHotline>
+            <WarmLineTime>0</WarmLineTime>
+            <PickupNum></PickupNum>
+            <JoinNum></JoinNum>
+            <IntercomNum></IntercomNum>
+            <RingType>{if isset($fanvil_ringtone_line18)}{$fanvil_ringtone_line18}{else}default{/if}</RingType>
+            <NATUDPUpdate>2</NATUDPUpdate>
+            <UDPUpdateTTL>30</UDPUpdateTTL>
+            <ServerType>0</ServerType>
+            <UserAgent></UserAgent>
+            <PRACK>0</PRACK>
+            <KeepAUTH>0</KeepAUTH>
+            <SessionTimer>0</SessionTimer>
+            <STimerExpires>0</STimerExpires>
+            <EnableGRUU>0</EnableGRUU>
+            <DTMFMode>3</DTMFMode>
+            <DTMFInfoMode>0</DTMFInfoMode>
+            <NATType>0</NATType>
+            <EnableRport>1</EnableRport>
+            <Subscribe>{if isset($account.18.user_id)}1{else}{/if}</Subscribe>
+            <SubExpire>{$account.18.register_expires}</SubExpire>
+            <SingleCodec>0</SingleCodec>
+            <CLIR>0</CLIR>
+            <StrictProxy>1</StrictProxy>
+            <DirectContact>0</DirectContact>
+            <HistoryInfo>0</HistoryInfo>
+            {if $account.18.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.18.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
+            <XFERExpire>0</XFERExpire>
+            <BanAnonymous>0</BanAnonymous>
+            <DialOffLine>0</DialOffLine>
+            <QuotaName>0</QuotaName>
+            <PresenceMode>0</PresenceMode>
+            <RFCVer>1</RFCVer>
+            <PhonePort>0</PhonePort>
+            <SignalPort>5060</SignalPort>
+            {if $account.18.sip_transport == 'udp'}<Transport>0</Transport>{/if}
+            {if $account.18.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
+            {if $account.18.sip_transport == 'tls'}<Transport>3</Transport>{/if}
+            <UseSRVMixer>0</UseSRVMixer>
+            <SRVMixerUri></SRVMixerUri>
+            <LongContact>0</LongContact>
+            <AutoTCP>1</AutoTCP>
+            <UriEscaped>1</UriEscaped>
+            <ClicktoTalk>0</ClicktoTalk>
+            <MwiNo></MwiNo>
+            <MWINum>{if isset($account.18.user_id)}*97{else}{/if}</MWINum>
+            <ParkNo></ParkNo>
+            <CallParkNum></CallParkNum>
+            <RetrieveNum></RetrieveNum>
+            <HelpNo></HelpNo>
+            <MSRPHelpNum></MSRPHelpNum>
+            <UserIsPhone>0</UserIsPhone>
+            <AutoAnswer>0</AutoAnswer>
+            <NoAnswerTime>5</NoAnswerTime>
+            <MissedCallLog>1</MissedCallLog>
+            <ParkMode></ParkMode>
+            <SvcCodeMode>1</SvcCodeMode>
+            <DNDOnSvcCode></DNDOnSvcCode>
+            <DNDOffSvcCode></DNDOffSvcCode>
+            <CFUOnSvcCode></CFUOnSvcCode>
+            <CFUOffSvcCode></CFUOffSvcCode>
+            <CFBOnSvcCode></CFBOnSvcCode>
+            <CFBOffSvcCode></CFBOffSvcCode>
+            <CFNOnSvcCode></CFNOnSvcCode>
+            <CFNOffSvcCode></CFNOffSvcCode>
+            <ANCOnSvcCode></ANCOnSvcCode>
+            <ANCOffSvcCode></ANCOffSvcCode>
+            <SendANOnCode></SendANOnCode>
+            <SendANOffCode></SendANOffCode>
+            <CWOnCode></CWOnCode>
+            <CWOffCode></CWOffCode>
+            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
+            <BLFListUri></BLFListUri>
+            <BLFServer></BLFServer>
+            <Respond182>0</Respond182>
+            <EnableBLFList>0</EnableBLFList>
+            <CallerIdType>4</CallerIdType>
+            <SynClockTime>0</SynClockTime>
+            <MohServer></MohServer>
+            <UseVPN>1</UseVPN>
+            <EnableDND>0</EnableDND>
+            <InactiveHold>0</InactiveHold>
+            <ReqWithPort>1</ReqWithPort>
+            <UpdateRegExpire>1</UpdateRegExpire>
+            <EnableSCA>0</EnableSCA>
+            <SubCallPark>0</SubCallPark>
+            <SubCCStatus>0</SubCCStatus>
+            <FeatureSync>0</FeatureSync>
+            <EnableXferBack>0</EnableXferBack>
+            <XferBackTime>35</XferBackTime>
+            <UseTelCall>0</UseTelCall>
+            <EnablePreview>0</EnablePreview>
+            <PreviewMode>1</PreviewMode>
+            <TLSVersion>2</TLSVersion>
+            <CSTANumber></CSTANumber>
+            <EnableChgPort>0</EnableChgPort>
+            <VQName></VQName>
+            <VQServer></VQServer>
+            <VQServerPort>5060</VQServerPort>
+            <VQHTTPServer></VQHTTPServer>
+            <FlashMode>0</FlashMode>
+            <ContentType></ContentType>
+            <ContentBody></ContentBody>
+            <UnregisterOnBoot>0</UnregisterOnBoot>
+            <EnableMACHeader>0</EnableMACHeader>
+            <EnableRegisterMAC>0</EnableRegisterMAC>
+            <RecordStart>Record:on</RecordStart>
+            <RecordStop>Record:off</RecordStop>
+            <BLFDialogMatch>1</BLFDialogMatch>
+            <Ptime>0</Ptime>
+            <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
+        </line>
+        <line index="19">
+            <PhoneNumber>{$account.19.user_id}</PhoneNumber>
+            <DisplayName>{$account.19.display_name}</DisplayName>
+            <SipName></SipName>
+            <RegisterAddr>{$account.19.server_address}</RegisterAddr>
+            <RegisterPort>{$account.19.sip_port}</RegisterPort>
+            <RegisterUser>{$account.19.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.19.password}</RegisterPswd>
+            <RegisterTTL>{$account.19.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
+            <BackupAddr></BackupAddr>
+            <BackupPort>5060</BackupPort>
+            <BackupTransport>0</BackupTransport>
+            <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
+            <EnableReg>{if isset($account.19.password)}1{else}0{/if}</EnableReg>
+            <ProxyAddr>{$account.19.outbound_proxy_primary}</ProxyAddr>
+            <ProxyPort>{$account.19.sip_port}</ProxyPort>
+            <ProxyUser>{$account.19.auth_id}</ProxyUser>
+            <ProxyPswd>{$account.19.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
+            <BakProxyAddr>{$account.19.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.19.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
+            <EnableFailback>{if isset($account.19.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
+            <FailbackInterval>1800</FailbackInterval>
+            <SignalFailback>0</SignalFailback>
+            <SignalRetryCounts>3</SignalRetryCounts>
+            <SigCryptoKey></SigCryptoKey>
+            <MediaCrypto>0</MediaCrypto>
+            <MedCryptoKey></MedCryptoKey>
+            <SRTPAuth-Tag>0</SRTPAuth-Tag>
+            <EnableRFC5939>0</EnableRFC5939>
+            <LocalDomain></LocalDomain>
+            <AlwaysFWD>0</AlwaysFWD>
+            <BusyFWD>0</BusyFWD>
+            <NoAnswerFWD>0</NoAnswerFWD>
+            <AlwaysFWDNum></AlwaysFWDNum>
+            <BusyFWDNum></BusyFWDNum>
+            <NoAnswerFWDNum></NoAnswerFWDNum>
+            <FWDTimer>5</FWDTimer>
+            <HotlineNum></HotlineNum>
+            <EnableHotline>0</EnableHotline>
+            <WarmLineTime>0</WarmLineTime>
+            <PickupNum></PickupNum>
+            <JoinNum></JoinNum>
+            <IntercomNum></IntercomNum>
+            <RingType>{if isset($fanvil_ringtone_line19)}{$fanvil_ringtone_line19}{else}default{/if}</RingType>
+            <NATUDPUpdate>2</NATUDPUpdate>
+            <UDPUpdateTTL>30</UDPUpdateTTL>
+            <ServerType>0</ServerType>
+            <UserAgent></UserAgent>
+            <PRACK>0</PRACK>
+            <KeepAUTH>0</KeepAUTH>
+            <SessionTimer>0</SessionTimer>
+            <STimerExpires>0</STimerExpires>
+            <EnableGRUU>0</EnableGRUU>
+            <DTMFMode>3</DTMFMode>
+            <DTMFInfoMode>0</DTMFInfoMode>
+            <NATType>0</NATType>
+            <EnableRport>1</EnableRport>
+            <Subscribe>{if isset($account.19.user_id)}1{else}{/if}</Subscribe>
+            <SubExpire>{$account.19.register_expires}</SubExpire>
+            <SingleCodec>0</SingleCodec>
+            <CLIR>0</CLIR>
+            <StrictProxy>1</StrictProxy>
+            <DirectContact>0</DirectContact>
+            <HistoryInfo>0</HistoryInfo>
+            {if $account.19.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.19.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
+            <XFERExpire>0</XFERExpire>
+            <BanAnonymous>0</BanAnonymous>
+            <DialOffLine>0</DialOffLine>
+            <QuotaName>0</QuotaName>
+            <PresenceMode>0</PresenceMode>
+            <RFCVer>1</RFCVer>
+            <PhonePort>0</PhonePort>
+            <SignalPort>5060</SignalPort>
+            {if $account.19.sip_transport == 'udp'}<Transport>0</Transport>{/if}
+            {if $account.19.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
+            {if $account.19.sip_transport == 'tls'}<Transport>3</Transport>{/if}
+            <UseSRVMixer>0</UseSRVMixer>
+            <SRVMixerUri></SRVMixerUri>
+            <LongContact>0</LongContact>
+            <AutoTCP>1</AutoTCP>
+            <UriEscaped>1</UriEscaped>
+            <ClicktoTalk>0</ClicktoTalk>
+            <MwiNo></MwiNo>
+            <MWINum>{if isset($account.19.user_id)}*97{else}{/if}</MWINum>
+            <ParkNo></ParkNo>
+            <CallParkNum></CallParkNum>
+            <RetrieveNum></RetrieveNum>
+            <HelpNo></HelpNo>
+            <MSRPHelpNum></MSRPHelpNum>
+            <UserIsPhone>0</UserIsPhone>
+            <AutoAnswer>0</AutoAnswer>
+            <NoAnswerTime>5</NoAnswerTime>
+            <MissedCallLog>1</MissedCallLog>
+            <ParkMode></ParkMode>
+            <SvcCodeMode>1</SvcCodeMode>
+            <DNDOnSvcCode></DNDOnSvcCode>
+            <DNDOffSvcCode></DNDOffSvcCode>
+            <CFUOnSvcCode></CFUOnSvcCode>
+            <CFUOffSvcCode></CFUOffSvcCode>
+            <CFBOnSvcCode></CFBOnSvcCode>
+            <CFBOffSvcCode></CFBOffSvcCode>
+            <CFNOnSvcCode></CFNOnSvcCode>
+            <CFNOffSvcCode></CFNOffSvcCode>
+            <ANCOnSvcCode></ANCOnSvcCode>
+            <ANCOffSvcCode></ANCOffSvcCode>
+            <SendANOnCode></SendANOnCode>
+            <SendANOffCode></SendANOffCode>
+            <CWOnCode></CWOnCode>
+            <CWOffCode></CWOffCode>
+            <VoiceCodecMap>PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
+            <BLFListUri></BLFListUri>
+            <BLFServer></BLFServer>
+            <Respond182>0</Respond182>
+            <EnableBLFList>0</EnableBLFList>
+            <CallerIdType>4</CallerIdType>
+            <SynClockTime>0</SynClockTime>
+            <MohServer></MohServer>
+            <UseVPN>1</UseVPN>
+            <EnableDND>0</EnableDND>
+            <InactiveHold>0</InactiveHold>
+            <ReqWithPort>1</ReqWithPort>
+            <UpdateRegExpire>1</UpdateRegExpire>
+            <EnableSCA>0</EnableSCA>
+            <SubCallPark>0</SubCallPark>
+            <SubCCStatus>0</SubCCStatus>
+            <FeatureSync>0</FeatureSync>
+            <EnableXferBack>0</EnableXferBack>
+            <XferBackTime>35</XferBackTime>
+            <UseTelCall>0</UseTelCall>
+            <EnablePreview>0</EnablePreview>
+            <PreviewMode>1</PreviewMode>
+            <TLSVersion>2</TLSVersion>
+            <CSTANumber></CSTANumber>
+            <EnableChgPort>0</EnableChgPort>
+            <VQName></VQName>
+            <VQServer></VQServer>
+            <VQServerPort>5060</VQServerPort>
+            <VQHTTPServer></VQHTTPServer>
+            <FlashMode>0</FlashMode>
+            <ContentType></ContentType>
+            <ContentBody></ContentBody>
+            <UnregisterOnBoot>0</UnregisterOnBoot>
+            <EnableMACHeader>0</EnableMACHeader>
+            <EnableRegisterMAC>0</EnableRegisterMAC>
+            <RecordStart>Record:on</RecordStart>
+            <RecordStop>Record:off</RecordStop>
+            <BLFDialogMatch>1</BLFDialogMatch>
+            <Ptime>0</Ptime>
+            <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
+        </line>
+        <line index="20">
+            <PhoneNumber>{$account.20.user_id}</PhoneNumber>
+            <DisplayName>{$account.20.display_name}</DisplayName>
+            <SipName></SipName>
+            <RegisterAddr>{$account.20.server_address}</RegisterAddr>
+            <RegisterPort>{$account.20.sip_port}</RegisterPort>
+            <RegisterUser>{$account.20.auth_id}</RegisterUser>
+            <RegisterPswd>{$account.20.password}</RegisterPswd>
+            <RegisterTTL>{$account.20.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
+            <BackupAddr></BackupAddr>
+            <BackupPort>5060</BackupPort>
+            <BackupTransport>0</BackupTransport>
+            <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
+            <EnableReg>{if isset($account.20.password)}1{else}0{/if}</EnableReg>
+            <ProxyAddr>{$account.20.outbound_proxy_primary}</ProxyAddr>
+            <ProxyPort>{$account.20.sip_port}</ProxyPort>
+            <ProxyUser>{$account.20.auth_id}</ProxyUser>
+            <ProxyPswd>{$account.20.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
+            <BakProxyAddr>{$account.20.outbound_proxy_secondary}</BakProxyAddr>
+            <BakProxyPort>{$account.20.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
+            <EnableFailback>{if isset($account.20.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
+            <FailbackInterval>1800</FailbackInterval>
+            <SignalFailback>0</SignalFailback>
+            <SignalRetryCounts>3</SignalRetryCounts>
+            <SigCryptoKey></SigCryptoKey>
+            <MediaCrypto>0</MediaCrypto>
+            <MedCryptoKey></MedCryptoKey>
+            <SRTPAuth-Tag>0</SRTPAuth-Tag>
+            <EnableRFC5939>0</EnableRFC5939>
+            <LocalDomain></LocalDomain>
+            <AlwaysFWD>0</AlwaysFWD>
+            <BusyFWD>0</BusyFWD>
+            <NoAnswerFWD>0</NoAnswerFWD>
+            <AlwaysFWDNum></AlwaysFWDNum>
+            <BusyFWDNum></BusyFWDNum>
+            <NoAnswerFWDNum></NoAnswerFWDNum>
+            <FWDTimer>5</FWDTimer>
+            <HotlineNum></HotlineNum>
+            <EnableHotline>0</EnableHotline>
+            <WarmLineTime>0</WarmLineTime>
+            <PickupNum></PickupNum>
+            <JoinNum></JoinNum>
+            <IntercomNum></IntercomNum>
+            <RingType>{if isset($fanvil_ringtone_line20)}{$fanvil_ringtone_line20}{else}default{/if}</RingType>
+            <NATUDPUpdate>2</NATUDPUpdate>
+            <UDPUpdateTTL>30</UDPUpdateTTL>
+            <ServerType>0</ServerType>
+            <UserAgent></UserAgent>
+            <PRACK>0</PRACK>
+            <KeepAUTH>0</KeepAUTH>
+            <SessionTimer>0</SessionTimer>
+            <STimerExpires>0</STimerExpires>
+            <EnableGRUU>0</EnableGRUU>
+            <DTMFMode>3</DTMFMode>
+            <DTMFInfoMode>0</DTMFInfoMode>
+            <NATType>0</NATType>
+            <EnableRport>1</EnableRport>
+            <Subscribe>{if isset($account.20.user_id)}1{else}{/if}</Subscribe>
+            <SubExpire>{$account.20.register_expires}</SubExpire>
+            <SingleCodec>0</SingleCodec>
+            <CLIR>0</CLIR>
+            <StrictProxy>1</StrictProxy>
+            <DirectContact>0</DirectContact>
+            <HistoryInfo>0</HistoryInfo>
+            {if $account.20.sip_transport == 'dns srv'}<DNSSRV>1</DNSSRV>{/if}
+            {if $account.20.sip_transport == 'dns srv'}<DNSMode>1</DNSMode>{/if}
+            <XFERExpire>0</XFERExpire>
+            <BanAnonymous>0</BanAnonymous>
+            <DialOffLine>0</DialOffLine>
+            <QuotaName>0</QuotaName>
+            <PresenceMode>0</PresenceMode>
+            <RFCVer>1</RFCVer>
+            <PhonePort>0</PhonePort>
+            <SignalPort>5060</SignalPort>
+            {if $account.20.sip_transport == 'udp'}<Transport>0</Transport>{/if}
+            {if $account.20.sip_transport == 'tcp'}<Transport>1</Transport>{/if}
+            {if $account.20.sip_transport == 'tls'}<Transport>3</Transport>{/if}
+            <UseSRVMixer>0</UseSRVMixer>
+            <SRVMixerUri></SRVMixerUri>
+            <LongContact>0</LongContact>
+            <AutoTCP>1</AutoTCP>
+            <UriEscaped>1</UriEscaped>
+            <ClicktoTalk>0</ClicktoTalk>
+            <MwiNo></MwiNo>
+            <MWINum>{if isset($account.20.user_id)}*97{else}{/if}</MWINum>
+            <ParkNo></ParkNo>
+            <CallParkNum></CallParkNum>
+            <RetrieveNum></RetrieveNum>
+            <HelpNo></HelpNo>
+            <MSRPHelpNum></MSRPHelpNum>
+            <UserIsPhone>0</UserIsPhone>
+            <AutoAnswer>0</AutoAnswer>
+            <NoAnswerTime>5</NoAnswerTime>
+            <MissedCallLog>1</MissedCallLog>
+            <ParkMode></ParkMode>
+            <SvcCodeMode>1</SvcCodeMode>
+            <DNDOnSvcCode></DNDOnSvcCode>
+            <DNDOffSvcCode></DNDOffSvcCode>
+            <CFUOnSvcCode></CFUOnSvcCode>
+            <CFUOffSvcCode></CFUOffSvcCode>
+            <CFBOnSvcCode></CFBOnSvcCode>
+            <CFBOffSvcCode></CFBOffSvcCode>
+            <CFNOnSvcCode></CFNOnSvcCode>
+            <CFNOffSvcCode></CFNOffSvcCode>
+            <ANCOnSvcCode></ANCOnSvcCode>
+            <ANCOffSvcCode></ANCOffSvcCode>
+            <SendANOnCode></SendANOnCode>
+            <SendANOffCode></SendANOffCode>
+            <CWOnCode></CWOnCode>
+            <CWOffCode></CWOffCode>
+            <VoiceCodecMap>OPUS,PCMU,PCMA,G726-32,G729,G723,iLBC,AMR,G722,AMR-WB</VoiceCodecMap>
+            <VideoCodecMap>{if isset($fanvil_video_codec)}{$fanvil_video_codec}{else}{/if}</VideoCodecMap>
+            <BLFListUri></BLFListUri>
+            <BLFServer></BLFServer>
+            <Respond182>0</Respond182>
+            <EnableBLFList>0</EnableBLFList>
+            <CallerIdType>4</CallerIdType>
+            <SynClockTime>0</SynClockTime>
+            <MohServer></MohServer>
+            <UseVPN>1</UseVPN>
+            <EnableDND>0</EnableDND>
+            <InactiveHold>0</InactiveHold>
+            <ReqWithPort>1</ReqWithPort>
+            <UpdateRegExpire>1</UpdateRegExpire>
+            <EnableSCA>0</EnableSCA>
+            <SubCallPark>0</SubCallPark>
+            <SubCCStatus>0</SubCCStatus>
+            <FeatureSync>0</FeatureSync>
+            <EnableXferBack>0</EnableXferBack>
+            <XferBackTime>35</XferBackTime>
+            <UseTelCall>0</UseTelCall>
+            <EnablePreview>0</EnablePreview>
+            <PreviewMode>1</PreviewMode>
+            <TLSVersion>2</TLSVersion>
+            <CSTANumber></CSTANumber>
+            <EnableChgPort>0</EnableChgPort>
+            <VQName></VQName>
+            <VQServer></VQServer>
+            <VQServerPort>5060</VQServerPort>
+            <VQHTTPServer></VQHTTPServer>
+            <FlashMode>0</FlashMode>
+            <ContentType></ContentType>
+            <ContentBody></ContentBody>
+            <UnregisterOnBoot>0</UnregisterOnBoot>
+            <EnableMACHeader>0</EnableMACHeader>
+            <EnableRegisterMAC>0</EnableRegisterMAC>
+            <RecordStart>Record:on</RecordStart>
+            <RecordStop>Record:off</RecordStop>
+            <BLFDialogMatch>1</BLFDialogMatch>
+            <Ptime>0</Ptime>
+            <EnableDeal180>1</EnableDeal180>
+            <KeepSingleContact>0</KeepSingleContact>
+            <SessionTimerT1>500</SessionTimerT1>
+            <SessionTimerT2>4000</SessionTimerT2>
+            <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
+        </line>
+        <p2p>
+            <SIPP2PEnableAutoAnswer>0</SIPP2PEnableAutoAnswer>
+            <SIPP2PAutoAnswerDelay>30</SIPP2PAutoAnswerDelay>
+            <SIPP2PDtmfMode>1</SIPP2PDtmfMode>
+            <SIPP2PSipInfoDtmfMode>0</SIPP2PSipInfoDtmfMode>
+            <SIPP2PEnablePreview>0</SIPP2PEnablePreview>
+            <SIPP2PPreviewMode>0</SIPP2PPreviewMode>
+            <SIPP2PUseVPN>1</SIPP2PUseVPN>
+        </p2p>
+    </sip>
+    <call>
+        <port index="1">
+            <EnableXferDPlan>1</EnableXferDPlan>
+            <EnableFwdDPlan>1</EnableFwdDPlan>
+            <EnablePreDPlan>0</EnablePreDPlan>
+            <IPDialPrefix>.</IPDialPrefix>
+            <EnableDND>1</EnableDND>
+            <DNDMode>0</DNDMode>
+            <EnableSpaceDND>0</EnableSpaceDND>
+            <DNDStartTime>1500</DNDStartTime>
+            <DNDEndTime>1730</DNDEndTime>
+            <EnableWhiteList>1</EnableWhiteList>
+            <EnableBlackList>1</EnableBlackList>
+            <EnableCallBar>1</EnableCallBar>
+            <MuteRinging>0</MuteRinging>
+            <BanDialOut>0</BanDialOut>
+            <BanEmptyCID>0</BanEmptyCID>
+            <EnableCLIP>1</EnableCLIP>
+            <CallWaiting>1</CallWaiting>
+            <CallTransfer>1</CallTransfer>
+            <CallSemiXfer>1</CallSemiXfer>
+            <CallConference>1</CallConference>
+            <AutoPickupNext>0</AutoPickupNext>
+            <BusyNoLine>1</BusyNoLine>
+            <AutoOnhook>1</AutoOnhook>
+            <AutoOnhookTime>3</AutoOnhookTime>
+            <EnableIntercom>1</EnableIntercom>
+            <IntercomMute>0</IntercomMute>
+            <IntercomTone>1</IntercomTone>
+            <IntercomBarge>1</IntercomBarge>
+            <UseAutoRedial>0</UseAutoRedial>
+            <RedialEnterCallLog>0</RedialEnterCallLog>
+            <AutoRedialDelay>30</AutoRedialDelay>
+            <AutoRedialTimes>5</AutoRedialTimes>
+            <CallComplete>0</CallComplete>
+            <CHoldingTone>1</CHoldingTone>
+            <CWaitingTone>1</CWaitingTone>
+            <HideDTMFType>0</HideDTMFType>
+            <TalkDTMFTone>1</TalkDTMFTone>
+            <DialDTMFTone>1</DialDTMFTone>
+            <PswDialMode>0</PswDialMode>
+            <PswDialLength>0</PswDialLength>
+            <PswDialPrefix></PswDialPrefix>
+            <EnableMultiLine>1</EnableMultiLine>
+            <AllowIPCall>1</AllowIPCall>
+            <CallerNameType>0</CallerNameType>
+            <MuteForRing>0</MuteForRing>
+            <AutoHandleVideo>1</AutoHandleVideo>
+            <DefaultAnsMode>{$fanvil_default_answer_mode}</DefaultAnsMode>
+            <DefaultDialMode>{$fanvil_default_dial_mode}</DefaultDialMode>
+            <HoldToTransfer>0</HoldToTransfer>
+            <EnablePreDial>1</EnablePreDial>
+            <DefaultExtLine>1</DefaultExtLine>
+            <EnableDefLine>1</EnableDefLine>
+            <EnableSelLine>1</EnableSelLine>
+            <RinginHeadset>0</RinginHeadset>
+            <AutoHeadset>0</AutoHeadset>
+            <DNDReturnCode>480</DNDReturnCode>
+            <BusyReturnCode>486</BusyReturnCode>
+            <RejectReturnCode>603</RejectReturnCode>
+            <ContactType>0</ContactType>
+            <EnableCountryCode>0</EnableCountryCode>
+            <CountryCode></CountryCode>
+            <CallAreaCode></CallAreaCode>
+            <NumberPrivacy>0</NumberPrivacy>
+            <PrivacyRule></PrivacyRule>
+            <TransfDTMFCode></TransfDTMFCode>
+            <HoldDTMFCode></HoldDTMFCode>
+            <ConfDTMFCode></ConfDTMFCode>
+            <DisableDialSearch>0</DisableDialSearch>
+            <CallNumberFilter></CallNumberFilter>
+            <AutoResumeCurrent>0</AutoResumeCurrent>
+            <AlertTimeout>120</AlertTimeout>
+            <RingTimeout>120</RingTimeout>
+            <RingPriority>0</RingPriority>
+        </port>
+        <basic>
+            <DialbyPound>1</DialbyPound>
+            <BTransferbyPound>0</BTransferbyPound>
+            <OnhooktoBXfer>0</OnhooktoBXfer>
+            <OnhooktoAXfer>0</OnhooktoAXfer>
+            <ConfOnhooktoXfer>0</ConfOnhooktoXfer>
+            <DialFixedLength>0</DialFixedLength>
+            <FixedLengthNums>11</FixedLengthNums>
+            <DialbyTimeout>1</DialbyTimeout>
+            <DialTimeoutvalue>10</DialTimeoutvalue>
+            <EnableEOneSixFour>0</EnableEOneSixFour>
+        </basic>
+        <alertInfo index="1">
+            <Text></Text>
+            <Line>-1</Line>
+            <RingType>{if isset($fanvil_default_ringtone_ext)}{$fanvil_default_ringtone_ext}{else}Type 1{/if}</RingType>
+        </alertInfo>
+        <alertInfo index="2">
+            <Text></Text>
+            <Line>-1</Line>
+            <RingType>{if isset($fanvil_default_ringtone_ext2)}{$fanvil_default_ringtone_ext2}{else}Type 4{/if}</RingType>
+        </alertInfo>
+        <alertInfo index="3">
+            <Text></Text>
+            <Line>-1</Line>
+            <RingType>Type 1</RingType>
+        </alertInfo>
+        <alertInfo index="4">
+            <Text></Text>
+            <Line>-1</Line>
+            <RingType>Type 1</RingType>
+        </alertInfo>
+        <alertInfo index="5">
+            <Text></Text>
+            <Line>-1</Line>
+            <RingType>Type 1</RingType>
+        </alertInfo>
+        <alertInfo index="6">
+            <Text></Text>
+            <Line>-1</Line>
+            <RingType>Type 1</RingType>
+        </alertInfo>
+        <alertInfo index="7">
+            <Text></Text>
+            <Line>-1</Line>
+            <RingType>Type 1</RingType>
+        </alertInfo>
+        <alertInfo index="8">
+            <Text></Text>
+            <Line>-1</Line>
+            <RingType>Type 1</RingType>
+        </alertInfo>
+        <alertInfo index="9">
+            <Text></Text>
+            <Line>-1</Line>
+            <RingType>Type 1</RingType>
+        </alertInfo>
+        <alertInfo index="10">
+            <Text></Text>
+            <Line>-1</Line>
+            <RingType>Type 1</RingType>
+        </alertInfo>
+    </call>
+    <phone>
+        <MenuPassword>{if isset($fanvil_menu_password)}{$fanvil_menu_password}{else}123{/if}</MenuPassword>
+        <KeyLockPassword>123</KeyLockPassword>
+        <FastKeylockCode></FastKeylockCode>
+        <EnableKeyLock>0</EnableKeyLock>
+        <KeyLockTimeout>0</KeyLockTimeout>
+        <KeyLockStatus>0</KeyLockStatus>
+        <EmergencyCall>110</EmergencyCall>
+        <PushXMLIP></PushXMLIP>
+        <SIPNumberPlan>0</SIPNumberPlan>
+        <LDAPSearch>0</LDAPSearch>
+        <SearchPath>0</SearchPath>
+        <CallerDisplayT>5</CallerDisplayT>
+        <CallLogDisplayType>0</CallLogDisplayType>
+        <EnableRecvSMS>1</EnableRecvSMS>
+        <EnableCallHistory>1</EnableCallHistory>
+        <LineDisplayFormat>$name</LineDisplayFormat>
+        <EnableMWITone>0</EnableMWITone>
+        <AllPswdEncryption>0</AllPswdEncryption>
+        <SIPNotifyXML>1</SIPNotifyXML>
+        <BlockXMLWhenCall>1</BlockXMLWhenCall>
+        <XMLUpdateInterval>30</XMLUpdateInterval>
+        <VqmDisplayOrder></VqmDisplayOrder>
+        <EnablePushXMLAuth>0</EnablePushXMLAuth>
+        <PickupVisualAlert>0</PickupVisualAlert>
+        <PickupAudioAlert>0</PickupAudioAlert>
+        <PickupRingType></PickupRingType>
+        <display>
+            <LCDTitle>{$fanvil_greeting}</LCDTitle>
+            <LCDConstrast>5</LCDConstrast>
+            <EnableEnergysaving>{if isset($fanvil_display_brightness_inactive)}{$fanvil_display_brightness_inactive}{else}4{/if}</EnableEnergysaving>
+            <LCDLuminanceLevel>{if isset($fanvil_display_brightness_active)}{$fanvil_display_brightness_active}{else}12{/if}</LCDLuminanceLevel>
+            <BacklightOffTime>{if isset($fanvil_display_inactivity_time)}{$fanvil_display_inactivity_time}{else}45{/if}</BacklightOffTime>
+            <DisableCHNIME>0</DisableCHNIME>
+            <PhoneModel></PhoneModel>
+            <HostName>bcm911188sv</HostName>
+            <DefaultLanguage>en</DefaultLanguage>
+            <EnableGreetings>0</EnableGreetings>
+        </display>
+        <powerLed>
+            <Power>0</Power>
+            <MWIOrSMS>3</MWIOrSMS>
+            <InUsing>0</InUsing>
+            <Ring>2</Ring>
+            <Hold>0</Hold>
+            <Mute>0</Mute>
+            <MissedCall>3</MissedCall>
+        </powerLed>
+        <lineLed>
+            <LineIdleColor>0</LineIdleColor>
+            <LineIdleCtl>1</LineIdleCtl>
+        </lineLed>
+        <blfLed>
+            <BLFIdleColor>0</BLFIdleColor>
+            <BLFIdleCtl>1</BLFIdleCtl>
+            <BLFIdleText>terminated</BLFIdleText>
+            <BLFRingColor>1</BLFRingColor>
+            <BLFRingCtl>2</BLFRingCtl>
+            <BLFRingText>early</BLFRingText>
+            <BLFDialingColor>1</BLFDialingColor>
+            <BLFDialingCtl>0</BLFDialingCtl>
+            <BLFDialingText></BLFDialingText>
+            <BLFTalkingColor>1</BLFTalkingColor>
+            <BLFTalkingCtl>1</BLFTalkingCtl>
+            <BLFTalkingText>confirmed</BLFTalkingText>
+            <BLFHoldColor>1</BLFHoldColor>
+            <BLFHoldCtl>0</BLFHoldCtl>
+            <BLFHoldText></BLFHoldText>
+            <BLFFailedColor>2</BLFFailedColor>
+            <BLFFailedCtl>0</BLFFailedCtl>
+            <BLFFailedText>failed</BLFFailedText>
+            <BLFParkedColor>0</BLFParkedColor>
+            <BLFParkedCtl>3</BLFParkedCtl>
+            <BLFParkedText>parked</BLFParkedText>
+        </blfLed>
+        <volume>
+            <HandsetVol></HandsetVol>
+            <HandsetMicVol></HandsetMicVol>
+            <HeadsetVol></HeadsetVol>
+            <HeadsetMicVol></HeadsetMicVol>
+            <HeadsetRingVol></HeadsetRingVol>
+            <HandFreeVol></HandFreeVol>
+            <HandFreeMicVol></HandFreeMicVol>
+            <HandFreeRingVol></HandFreeRingVol>
+            <RingType>{if isset($fanvil_default_ringtone)}{$fanvil_default_ringtone}{else}Type 2{/if}</RingType>
+        </volume>
+        <date>
+            <EnableSNTP>{if isset($fanvil_enable_sntp)}{$fanvil_enable_sntp}{else}1{/if}</EnableSNTP>
+            <SNTPServer>{$ntp_server_primary}</SNTPServer>
+            <SecondSNTPServer>{$ntp_server_secondary}</SecondSNTPServer>
+            <TimeZone>{$fanvil_time_zone}</TimeZone>
+            <TimeZoneName>{$fanvil_time_zone_name}</TimeZoneName>
+            <Enable_DST>{$fanvil_enable_dst}</Enable_DST>
+            <DST_Fixed_Type>{if isset($fanvil_dst_fixed_type)}{$fanvil_dst_fixed_type}{else}0{/if}</DST_Fixed_Type>
+            <SNTPTimeout>60</SNTPTimeout>
+            <DSTType>1</DSTType>
+            <DSTLocation>{if isset($fanvil_location)}{$fanvil_location}{else}4{/if}</DSTLocation>
+            <DSTRuleMode>0</DSTRuleMode>
+            <DSTMinOffset>{if isset($fanvil_dst_minute_offset)}{$fanvil_dst_minute_offset}{else}60{/if}</DSTMinOffset>
+            <DSTStartMon>3</DSTStartMon>
+            <DSTStartWeek>5</DSTStartWeek>
+            <DSTStartWday>0</DSTStartWday>
+            <DSTStartHour>2</DSTStartHour>
+            <DSTEndMon>10</DSTEndMon>
+            <DSTEndWeek>5</DSTEndWeek>
+            <DSTEndWday>0</DSTEndWday>
+            <DSTEndHour>2</DSTEndHour>
+        </date>
+        <timeDisplay>
+            <EnableTimeDisplay>0</EnableTimeDisplay>
+            <TimeDisplayStyle>{if isset($fanvil_time_display)}{$fanvil_time_display}{else}0{/if}</TimeDisplayStyle>
+            <DateDisplayStyle>{if isset($fanvil_date_display)}{$fanvil_date_display}{else}6{/if}</DateDisplayStyle>
+            <DateSeparator>{if isset($fanvil_date_separator)}{$fanvil_date_separator}{else}0{/if}</DateSeparator>
+        </timeDisplay>
+        <softkey>
+            <SoftkeyMode>0</SoftkeyMode>
+             <SoftKeyExitStyle>{if isset($fanvil_softkey_exit)}{$fanvil_softkey_exit}{else}2{/if}</SoftKeyExitStyle>
+            <DesktopSoftkey>{if isset($fanvil_softkey_desktopsoftkey)}{$fanvil_softkey_desktopsoftkey}{else}history;contact;dnd;menu;{/if}</DesktopSoftkey>
+            <TalkingSoftkey>{if isset($fanvil_softkey_talkingsoftkey)}{$fanvil_softkey_talkingsoftkey}{else}hold;xfer;conf;end;{/if}</TalkingSoftkey>
+            <RingingSoftkey>{if isset($fanvil_softkey_ringingsoftkey)}{$fanvil_softkey_ringingsoftkey}{else}accept;none;forward;reject;{/if}</RingingSoftkey>
+            <AlertingSoftkey>end;none;none;none;</AlertingSoftkey>
+            <XAlertingSoftkey>end;none;none;xfer;</XAlertingSoftkey>
+            <ConferenceSoftkey>hold;none;split;end;</ConferenceSoftkey>
+            <WaitingSoftkey>xfer;accept;reject;end;</WaitingSoftkey>
+            <EndingSoftkey>redial;none;none;end;</EndingSoftkey>
+            <DialerPreSoftkey>send;2aB;delete;exit;</DialerPreSoftkey>
+            <DialerCallSoftkey>send;2aB;delete;exit;</DialerCallSoftkey>
+            <DialerXferSoftkey>delete;xfer;send;exit;</DialerXferSoftkey>
+            <DialerCfwdSoftkey>send;2aB;delete;exit;</DialerCfwdSoftkey>
+            <DesktopClick>{if isset($fanvil_softkey_desktopclick)}{$fanvil_softkey_desktopclick}{else}history;status;none;none;none;{/if}</DesktopClick>
+            <DailerClick>pline;nline;none;none;none;</DailerClick>
+            <RingingClick>none;none;none;none;none;</RingingClick>
+            <CallClick>none;none;voldown;volup;none;</CallClick>
+            <DesktopLongPress>status;none;none;none;reset;</DesktopLongPress>
+            <DialerConfSoftkey>contact;clogs;redial;video;cancel;</DialerConfSoftkey>
+        </softkey>
+        <agent>
+            <AgentUsername></AgentUsername>
+            <AgentPassword></AgentPassword>
+            <AgentNumber></AgentNumber>
+            <AgentSipline>0</AgentSipline>
+            <AgentStatus>0</AgentStatus>
+            <AgentStatusReason></AgentStatusReason>
+            <AgentClearCallLog>0</AgentClearCallLog>
+        </agent>
+        <bwDir index="1">
+            <Title></Title>
+            <URL></URL>
+            <Username></Username>
+            <Password></Password>
+            <SipLine>0</SipLine>
+        </bwDir>
+        <bwDir index="2">
+            <Title></Title>
+            <URL></URL>
+            <Username></Username>
+            <Password></Password>
+            <SipLine>0</SipLine>
+        </bwDir>
+        <bwDir index="3">
+            <Title></Title>
+            <URL></URL>
+            <Username></Username>
+            <Password></Password>
+            <SipLine>0</SipLine>
+        </bwDir>
+        <bwDir index="4">
+            <Title></Title>
+            <URL></URL>
+            <Username></Username>
+            <Password></Password>
+            <SipLine>0</SipLine>
+        </bwDir>
+        <bwDir index="5">
+            <Title></Title>
+            <URL></URL>
+            <Username></Username>
+            <Password></Password>
+            <SipLine>0</SipLine>
+        </bwDir>
+        <bwDir index="6">
+            <Title></Title>
+            <URL></URL>
+            <Username></Username>
+            <Password></Password>
+            <SipLine>0</SipLine>
+        </bwDir>
+        <bwCallLog index="1">
+            <Title></Title>
+            <URL></URL>
+            <Username></Username>
+            <Password></Password>
+            <SipLine>0</SipLine>
+        </bwCallLog>
+        <bwCallLog index="2">
+            <Title></Title>
+            <URL></URL>
+            <Username></Username>
+            <Password></Password>
+            <SipLine>0</SipLine>
+        </bwCallLog>
+        <bwCallLog index="3">
+            <Title></Title>
+            <URL></URL>
+            <Username></Username>
+            <Password></Password>
+            <SipLine>0</SipLine>
+        </bwCallLog>
+        <ldap index="1">
+            <Title></Title>
+            <Server></Server>
+            <port>389</port>
+            <Base></Base>
+            <UseSSL>0</UseSSL>
+            <Version>3</Version>
+            <CallingLine>-1</CallingLine>
+            <BindLine>-1</BindLine>
+            <InCallSearch>0</InCallSearch>
+            <OutCallSearch>0</OutCallSearch>
+            <Authenticate>3</Authenticate>
+            <Username></Username>
+            <Password></Password>
+            <TelAttr>telephoneNumber</TelAttr>
+            <MobileAttr>mobile</MobileAttr>
+            <OtherAttr>other</OtherAttr>
+            <NameAttr>cn sn ou</NameAttr>
+            <SortAttr>cn</SortAttr>
+            <Displayname>cn</Displayname>
+            <NumberFilter>(|(telephoneNumber=%)(mobile=%)(other=%))</NumberFilter>
+            <NameFilter>(|(cn=%)(sn=%))</NameFilter>
+            <MaxHits>50</MaxHits>
+        </ldap>
+        <ldap index="2">
+            <Title></Title>
+            <Server></Server>
+            <port>389</port>
+            <Base></Base>
+            <UseSSL>0</UseSSL>
+            <Version>3</Version>
+            <CallingLine>-1</CallingLine>
+            <BindLine>-1</BindLine>
+            <InCallSearch>0</InCallSearch>
+            <OutCallSearch>0</OutCallSearch>
+            <Authenticate>3</Authenticate>
+            <Username></Username>
+            <Password></Password>
+            <TelAttr>telephoneNumber</TelAttr>
+            <MobileAttr>mobile</MobileAttr>
+            <OtherAttr>other</OtherAttr>
+            <NameAttr>cn sn ou</NameAttr>
+            <SortAttr>cn</SortAttr>
+            <Displayname>cn</Displayname>
+            <NumberFilter>(|(telephoneNumber=%)(mobile=%)(other=%))</NumberFilter>
+            <NameFilter>(|(cn=%)(sn=%))</NameFilter>
+            <MaxHits>50</MaxHits>
+        </ldap>
+        <ldap index="3">
+            <Title></Title>
+            <Server></Server>
+            <port>389</port>
+            <Base></Base>
+            <UseSSL>0</UseSSL>
+            <Version>3</Version>
+            <CallingLine>-1</CallingLine>
+            <BindLine>-1</BindLine>
+            <InCallSearch>0</InCallSearch>
+            <OutCallSearch>0</OutCallSearch>
+            <Authenticate>3</Authenticate>
+            <Username></Username>
+            <Password></Password>
+            <TelAttr>telephoneNumber</TelAttr>
+            <MobileAttr>mobile</MobileAttr>
+            <OtherAttr>other</OtherAttr>
+            <NameAttr>cn sn ou</NameAttr>
+            <SortAttr>cn</SortAttr>
+            <Displayname>cn</Displayname>
+            <NumberFilter>(|(telephoneNumber=%)(mobile=%)(other=%))</NumberFilter>
+            <NameFilter>(|(cn=%)(sn=%))</NameFilter>
+            <MaxHits>50</MaxHits>
+        </ldap>
+        <ldap index="4">
+            <Title></Title>
+            <Server></Server>
+            <port>389</port>
+            <Base></Base>
+            <UseSSL>0</UseSSL>
+            <Version>3</Version>
+            <CallingLine>-1</CallingLine>
+            <BindLine>-1</BindLine>
+            <InCallSearch>0</InCallSearch>
+            <OutCallSearch>0</OutCallSearch>
+            <Authenticate>3</Authenticate>
+            <Username></Username>
+            <Password></Password>
+            <TelAttr>telephoneNumber</TelAttr>
+            <MobileAttr>mobile</MobileAttr>
+            <OtherAttr>other</OtherAttr>
+            <NameAttr>cn sn ou</NameAttr>
+            <SortAttr>cn</SortAttr>
+            <Displayname>cn</Displayname>
+            <NumberFilter>(|(telephoneNumber=%)(mobile=%)(other=%))</NumberFilter>
+            <NameFilter>(|(cn=%)(sn=%))</NameFilter>
+            <MaxHits>50</MaxHits>
+        </ldap>
+        <ldap index="5">
+            <Title></Title>
+            <Server></Server>
+            <port>389</port>
+            <Base></Base>
+            <UseSSL>0</UseSSL>
+            <Version>3</Version>
+            <CallingLine>-1</CallingLine>
+            <BindLine>-1</BindLine>
+            <InCallSearch>0</InCallSearch>
+            <OutCallSearch>0</OutCallSearch>
+            <Authenticate>3</Authenticate>
+            <Username></Username>
+            <Password></Password>
+            <TelAttr>telephoneNumber</TelAttr>
+            <MobileAttr>mobile</MobileAttr>
+            <OtherAttr>other</OtherAttr>
+            <NameAttr>cn sn ou</NameAttr>
+            <SortAttr>cn</SortAttr>
+            <Displayname>cn</Displayname>
+            <NumberFilter>(|(telephoneNumber=%)(mobile=%)(other=%))</NumberFilter>
+            <NameFilter>(|(cn=%)(sn=%))</NameFilter>
+            <MaxHits>50</MaxHits>
+        </ldap>
+        <xmlContact index="1">
+            <Name></Name>
+            <Addr></Addr>
+            <UserName></UserName>
+            <PassWd></PassWd>
+            <Sipline>-1</Sipline>
+            <BindLine>-1</BindLine>
+        </xmlContact>
+        <xmlContact index="2">
+            <Name></Name>
+            <Addr></Addr>
+            <UserName></UserName>
+            <PassWd></PassWd>
+            <Sipline>-1</Sipline>
+            <BindLine>-1</BindLine>
+        </xmlContact>
+        <xmlContact index="3">
+            <Name></Name>
+            <Addr></Addr>
+            <UserName></UserName>
+            <PassWd></PassWd>
+            <Sipline>-1</Sipline>
+            <BindLine>-1</BindLine>
+        </xmlContact>
+        <xmlContact index="4">
+            <Name></Name>
+            <Addr></Addr>
+            <UserName></UserName>
+            <PassWd></PassWd>
+            <Sipline>-1</Sipline>
+            <BindLine>-1</BindLine>
+        </xmlContact>
+        <xmlContact index="5">
+            <Name></Name>
+            <Addr></Addr>
+            <UserName></UserName>
+            <PassWd></PassWd>
+            <Sipline>-1</Sipline>
+            <BindLine>-1</BindLine>
+        </xmlContact>
+    </phone>
+    <dm>
+        <OnhookTime>120</OnhookTime>
+        <EnableHookflash>0</EnableHookflash>
+        <KeyLongPressTime>2</KeyLongPressTime>
+        <KeyLongLongPressTime>6</KeyLongLongPressTime>
+    </dm>
+    <vqm>
+        <SessionReport>1</SessionReport>
+        <IntervalReport>1</IntervalReport>
+        <IntervalPeriod>60</IntervalPeriod>
+        <MOS-LQWarning>40</MOS-LQWarning>
+        <MOS-LQCritical>25</MOS-LQCritical>
+        <DelayWarning>150</DelayWarning>
+        <DelayCritical>200</DelayCritical>
+        <PhoneReport>1</PhoneReport>
+        <WEBReport>1</WEBReport>
+    </vqm>
+    <cti>
+        <EnabledActiveUri>1</EnabledActiveUri>
+        <EnabledActionUrl>1</EnabledActionUrl>
+        <ActiveUriIP></ActiveUriIP>
+        <StartRebootUrl></StartRebootUrl>
+        <BootCompletedUrl></BootCompletedUrl>
+        <IPChangeUrl></IPChangeUrl>
+        <RegOnUrl></RegOnUrl>
+        <RegOffUrl></RegOffUrl>
+        <RegFailedUrl></RegFailedUrl>
+        <PhoneStateIdleUrl></PhoneStateIdleUrl>
+        <PhoneStateTalking></PhoneStateTalking>
+        <PhoneStateRinging></PhoneStateRinging>
+        <DNDOnUrl></DNDOnUrl>
+        <DNDOffUrl></DNDOffUrl>
+        <AlwaysFWDOnUrl></AlwaysFWDOnUrl>
+        <AlwaysFWDOffUrl></AlwaysFWDOffUrl>
+        <BusyFWDOnUrl></BusyFWDOnUrl>
+        <BusyFWDOffUrl></BusyFWDOffUrl>
+        <NoAnsFWDOnUrl></NoAnsFWDOnUrl>
+        <NoAnsFWDOffUrl></NoAnsFWDOffUrl>
+        <MuteOnUrl></MuteOnUrl>
+        <MuteOffUrl></MuteOffUrl>
+        <IncomingCallUrl></IncomingCallUrl>
+        <OutgoingCallUrl></OutgoingCallUrl>
+        <CallActiveUrl></CallActiveUrl>
+        <CallStopUrl></CallStopUrl>
+        <TransferUrl></TransferUrl>
+        <HoldOnUrl></HoldOnUrl>
+        <HoldOffUrl></HoldOffUrl>
+        <HeldOnUrl></HeldOnUrl>
+        <HeldOffUrl></HeldOffUrl>
+        <MuteOnCallUrl></MuteOnCallUrl>
+        <MuteOffCallUrl></MuteOffCallUrl>
+        <NewMissedcallUrl></NewMissedcallUrl>
+        <NewMWIUrl></NewMWIUrl>
+        <NewSMSUrl></NewSMSUrl>
+        <WebAuthChangedUrl></WebAuthChangedUrl>
+        <at></at>
+    </cti>
+    <ateTest>
+        <ATEId>0000000000000000</ATEId>
+    </ateTest>
+    <mcast>
+        <Priority>0</Priority>
+        <EnablePriority>0</EnablePriority>
+        <EnablePrioChan>0</EnablePrioChan>
+        <EnableEmerChan>0</EnableEmerChan>
+        <MulticastTone>1</MulticastTone>
+        <addr index="1">
+            <Name></Name>
+            <Host></Host>
+            <Port>0</Port>
+            <Channel>0</Channel>
+        </addr>
+        <addr index="2">
+            <Name></Name>
+            <Host></Host>
+            <Port>0</Port>
+            <Channel>0</Channel>
+        </addr>
+        <addr index="3">
+            <Name></Name>
+            <Host></Host>
+            <Port>0</Port>
+            <Channel>0</Channel>
+        </addr>
+        <addr index="4">
+            <Name></Name>
+            <Host></Host>
+            <Port>0</Port>
+            <Channel>0</Channel>
+        </addr>
+        <addr index="5">
+            <Name></Name>
+            <Host></Host>
+            <Port>0</Port>
+            <Channel>0</Channel>
+        </addr>
+        <addr index="6">
+            <Name></Name>
+            <Host></Host>
+            <Port>0</Port>
+            <Channel>0</Channel>
+        </addr>
+        <addr index="7">
+            <Name></Name>
+            <Host></Host>
+            <Port>0</Port>
+            <Channel>0</Channel>
+        </addr>
+        <addr index="8">
+            <Name></Name>
+            <Host></Host>
+            <Port>0</Port>
+            <Channel>0</Channel>
+        </addr>
+        <addr index="9">
+            <Name></Name>
+            <Host></Host>
+            <Port>0</Port>
+            <Channel>0</Channel>
+        </addr>
+        <addr index="10">
+            <Name></Name>
+            <Host></Host>
+            <Port>0</Port>
+            <Channel>0</Channel>
+        </addr>
+        <dynamic>
+            <AutoExitExpires>60</AutoExitExpires>
+        </dynamic>
+    </mcast>
+    <dsskey>
+        <SelectDsskeyAction>0</SelectDsskeyAction>
+        <MemoryKeytoBXfer>3</MemoryKeytoBXfer>
+        <FuncKeyPageNum>4</FuncKeyPageNum>
+        <SideKeyPageNum>5</SideKeyPageNum>
+        <DSSHomePage>0</DSSHomePage>
+        <DisplayParkedInfo>0</DisplayParkedInfo>
+        <DSSDIALSwitchMode>0</DSSDIALSwitchMode>
+        <FirstCallWaitTime>16</FirstCallWaitTime>
+        <FirstNumStartTime>360</FirstNumStartTime>
+        <FirstNumEndTime>1080</FirstNumEndTime>
+        <DSSLongPressAction>1</DSSLongPressAction>
+        <Extern1PageBelong>0</Extern1PageBelong>
+        <Extern2PageBelong>0</Extern2PageBelong>
+        <Extern3PageBelong>0</Extern3PageBelong>
+        <Extern4PageBelong>0</Extern4PageBelong>
+        <Extern5PageBelong>0</Extern5PageBelong>
+        <DSSExtend1MAC></DSSExtend1MAC>
+        <DSSExtend1IP></DSSExtend1IP>
+        <DSSExtend2MAC></DSSExtend2MAC>
+        <DSSExtend2IP></DSSExtend2IP>
+        <DSSExtend3MAC></DSSExtend3MAC>
+        <DSSExtend3IP></DSSExtend3IP>
+        <DSSExtend4MAC></DSSExtend4MAC>
+        <DSSExtend4IP></DSSExtend4IP>
+        <DSSExtend5MAC></DSSExtend5MAC>
+        <DSSExtend5IP></DSSExtend5IP>
+        {strip}{*-- 12 dssSide keys --*}{/strip}
+        <dssSide index="1">
+            {foreach $keys["line"] as $row}
+                {if $row.device_key_id <= 12}
+                <Fkey index="{$row.device_key_id}">
+                    <Type>{if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if}</Type>
+                    <Value>{if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if}</Value>
+                    <Title>{$row.device_key_label}</Title>
+                    <ICON>{$row.device_key_icon}</ICON>
+            	</Fkey>
+                {/if}
+            {/foreach}
+        </dssSide>
+        <dssSide index="2">
+            {foreach $keys["line"] as $row}
+                {if $row.device_key_id > 12 && $row.device_key_id <= 24}
+                <Fkey index="{$row.device_key_id-12}">
+                    <Type>{if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if}</Type>
+                    <Value>{if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if}</Value>
+                    <Title>{$row.device_key_label}</Title>
+                    <ICON>{$row.device_key_icon}</ICON>
+            	</Fkey>
+                {/if}
+            {/foreach}
+        </dssSide>
+        <dssSide index="3">
+            {foreach $keys["line"] as $row}
+                {if $row.device_key_id > 24 && $row.device_key_id <= 36}
+                <Fkey index="{$row.device_key_id-24}">
+                    <Type>{if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if}</Type>
+                    <Value>{if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if}</Value>
+                    <Title>{$row.device_key_label}</Title>
+                    <ICON>{$row.device_key_icon}</ICON>
+            	</Fkey>
+                {/if}
+            {/foreach}
+        </dssSide>
+        <dssSide index="4">
+            {foreach $keys["line"] as $row}
+                {if $row.device_key_id > 36 && $row.device_key_id <= 48}
+                <Fkey index="{$row.device_key_id-36}">
+                    <Type>{if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if}</Type>
+                    <Value>{if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if}</Value>
+                    <Title>{$row.device_key_label}</Title>
+                    <ICON>{$row.device_key_icon}</ICON>
+            	</Fkey>
+                {/if}
+            {/foreach}
+        </dssSide>
+        <dssSide index="5">
+            {foreach $keys["line"] as $row}
+                {if $row.device_key_id > 48 && $row.device_key_id <= 60}
+                <Fkey index="{$row.device_key_id-48}">
+                    <Type>{if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if}</Type>
+                    <Value>{if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if}</Value>
+                    <Title>{$row.device_key_label}</Title>
+                    <ICON>{$row.device_key_icon}</ICON>
+            	</Fkey>
+                {/if}
+            {/foreach}
+        </dssSide>
+        {strip}{*-- 10 dssSoft keys --*}{/strip}
+        {foreach $keys["programmable"] as $row}
+            <dssSoft index="{$row.device_key_id}">
+                <Type>{if $row.device_key_type == 3}0{elseif $row.device_key_type == 1}2{else}1{/if}</Type>
+                <Value>{if $row.device_key_type == 3}{elseif $row.device_key_type == 1}SIP{$row.device_key_line}{else}{$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type}{/if}</Value>
+                <Title>{$row.device_key_label}</Title>
+            </dssSoft>
+        {/foreach}
+    </dsskey>
+    <web>
+        <WebServerType>0</WebServerType>
+        <WebPort>80</WebPort>
+        <HttpsWebPort>443</HttpsWebPort>
+        <RemoteControl>1</RemoteControl>
+        <EnableMMIFilter>0</EnableMMIFilter>
+        <WebAuthentication>0</WebAuthentication>
+        <EnableTelnet>0</EnableTelnet>
+        <TelnetPort>23</TelnetPort>
+        <TelnetPrompt></TelnetPrompt>
+        <LogonTimeout>15</LogonTimeout>
+        <account index="1">
+            <Name>{if isset($admin_name)}{$admin_name}{else}admin{/if}</Name>
+            <Password>{if isset($admin_password)}{$admin_password}{else}admin{/if}</Password>
+            <Level>10</Level>
+        </account>
+        <account index="2">
+            <Name>guest</Name>
+            <Password>guest</Password>
+            <Level>5</Level>
+        </account>
+    </web>
+    <log>
+        <Level>INFO</Level>
+        <Style>level,tag</Style>
+        <OutputDevice>{if $fanvil_syslog_enable == '1'},syslog{else}stdout{/if}</OutputDevice>
+        <FileName>platform.log</FileName>
+        <FileSize>512KB</FileSize>
+        <SyslogTag>platform</SyslogTag>
+        <SyslogServer>{if isset($fanvil_syslog_server)}{$fanvil_syslog_server}{else}0.0.0.0{/if}</SyslogServer>
+        <SyslogServerPort>{if isset($fanvil_syslog_server_port)}{$fanvil_syslog_server_port}{else}514{/if}</SyslogServerPort>
+    </log>
+    <tr069>
+        <TR069Tone>1</TR069Tone>
+        <CPESerialNumber></CPESerialNumber>
+        <ACSServerType>1</ACSServerType>
+        <EnableTR069>0</EnableTR069>
+        <ACSURL>0.0.0.0</ACSURL>
+        <ACSUserName>admin</ACSUserName>
+        <ACSPassword></ACSPassword>
+        <ACSBackupURL>0.0.0.0</ACSBackupURL>
+        <ACSBackupUserName></ACSBackupUserName>
+        <ACSBackupPassword></ACSBackupPassword>
+        <CPEUserName>dps</CPEUserName>
+        <CPEPassword>dps</CPEPassword>
+        <PeriodixInterval>3600</PeriodixInterval>
+        <TLSVersion>2</TLSVersion>
+        <AreaCode>020</AreaCode>
+        <STUNEnable>0</STUNEnable>
+        <STUNServerAddr>{$fanvil_stun_server}</STUNServerAddr>
+        <STUNServerPort>{$fanvil_stun_port}</STUNServerPort>
+        <STUNLocalPort>30000</STUNLocalPort>
+    </tr069>
+    <hotspot>
+        <EnableHotspot>0</EnableHotspot>
+        <Mode>1</Mode>
+        <ListenType>0</ListenType>
+        <ListenIP>224.0.2.0</ListenIP>
+        <ListenPort>16360</ListenPort>
+        <OwnName>SIP Hotspot</OwnName>
+        <RingMode>0</RingMode>
+        <EnableManageMode>1</EnableManageMode>
+        <EnableConfigMode>0</EnableConfigMode>
+        <hs index="1">
+            <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
+        </hs>
+        <hs index="2">
+            <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
+        </hs>
+        <hs index="3">
+            <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
+        </hs>
+        <hs index="4">
+            <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
+        </hs>
+        <hs index="5">
+            <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
+        </hs>
+        <hs index="6">
+            <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
+        </hs>
+        <hs index="7">
+            <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
+        </hs>
+        <hs index="8">
+            <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
+        </hs>
+        <hs index="9">
+            <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
+        </hs>
+        <hs index="10">
+            <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
+        </hs>
+        <hs index="11">
+            <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
+        </hs>
+        <hs index="12">
+            <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
+        </hs>
+        <hs index="13">
+            <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
+        </hs>
+        <hs index="14">
+            <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
+        </hs>
+        <hs index="15">
+            <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
+        </hs>
+        <hs index="16">
+            <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
+        </hs>
+        <hs index="17">
+            <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
+        </hs>
+        <hs index="18">
+            <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
+        </hs>
+        <hs index="19">
+            <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
+        </hs>
+        <hs index="20">
+            <Enable>1</Enable>
+            <ExtPrefix></ExtPrefix>
+        </hs>
+    </hotspot>
+    <vpn>
+        <VPNmode>-1</VPNmode>
+        <EnableVPN>0</EnableVPN>
+        <EnableNat>0</EnableNat>
+        <Openvpnmode>0</Openvpnmode>
+        <L2TPServerAddress>0.0.0.0</L2TPServerAddress>
+        <L2TPUserName></L2TPUserName>
+        <L2TPPassword></L2TPPassword>
+        <L2TPNegotiateDNS>1</L2TPNegotiateDNS>
+        <PPTPServerAddress>0.0.0.0</PPTPServerAddress>
+        <PPTPUserName></PPTPUserName>
+        <PPTPPassword></PPTPPassword>
+    </vpn>
+    <mt>
+        <ContactUpdateMode>0</ContactUpdateMode>
+        <AutoServerDigest>0</AutoServerDigest>
+    </mt>
+    <ap>
+        <DefaultUsername>{$http_auth_username}</DefaultUsername>
+        <DefaultPassword>{$http_auth_password}</DefaultPassword>
+        <InputCfgFileName></InputCfgFileName>
+        <DeviceCfgFileKey></DeviceCfgFileKey>
+        <CommonCfgFileKey></CommonCfgFileKey>
+        <DownloadCommonConf>1</DownloadCommonConf>
+        <SaveProvisionInfo>1</SaveProvisionInfo>
+        <CheckFailTimes>5</CheckFailTimes>
+        <FlashServerIP>{if isset($fanvil_provision_url)}{$fanvil_provision_url}{else}https://{$domain_name}/app/provision{/if}</FlashServerIP>
+        <FlashFileName>{$fanvil_firmware_config}</FlashFileName>
+        <FlashProtocol>5</FlashProtocol>
+        <FlashMode>1</FlashMode>
+        <FlashInterval>1</FlashInterval>
+        <updatePBInterval>720</updatePBInterval>
+        <APPswdEncryption>0</APPswdEncryption>
+        <pnp>
+            <PNPEnable>1</PNPEnable>
+            <PNPIP>224.0.1.75</PNPIP>
+            <PNPPort>5060</PNPPort>
+            <PNPTransport>0</PNPTransport>
+            <PNPInterval>1</PNPInterval>
+        </pnp>
+        <opt>
+            <DHCPOption>66</DHCPOption>
+            <DHCPv6Option>0</DHCPv6Option>
+            <DhcpOption120>0</DhcpOption120>
+            <SaveDHCPOpion>0</SaveDHCPOpion>
+        </opt>
+    </ap>
+    <fwCheck>
+        <EnableAutoUpgrade>{if isset($fanvil_enable_auto_upgrade)}{$fanvil_enable_auto_upgrade}{else}0{/if}</EnableAutoUpgrade>
+        <UpgradeServer1>{if isset($fanvil_firmware_upgrade_server_1)}{$fanvil_firmware_upgrade_server_1}{else}{/if}</UpgradeServer1>
+        <UpgradeServer2>{if isset($fanvil_firmware_upgrade_server_2)}{$fanvil_firmware_upgrade_server_2}{else}{/if}</UpgradeServer2>
+        <AutoUpgradeInterval>{if isset($fanvil_firmware_upgrade_interval)}{$fanvil_firmware_upgrade_interval}{else}24{/if}</AutoUpgradeInterval>
+    </fwCheck>
+    <qos>
+        <EnableVLAN>{if isset($fanvil_enable_vlan)}{$fanvil_enable_vlan}{else}0{/if}</EnableVLAN>
+        <VLANID>{if isset($fanvil_lan_port_vlan)}{$fanvil_lan_port_vlan}{else}256{/if}</VLANID>
+        <EnablePVID>{if isset($fanvil_pc_port_vlan)}2{else}0{/if}</EnablePVID>
+        <PVIDValue>{if isset($fanvil_pc_port_vlan)}{$fanvil_pc_port_vlan}{else}254{/if}</PVIDValue>
+        <SignallingPriority>{if isset($fanvil_qos_sip)}{$fanvil_qos_sip}{else}0{/if}</SignallingPriority>
+        <VoicePriority>{if isset($fanvil_qos_rtp_voice)}{$fanvil_qos_rtp_voice}{else}0{/if}</VoicePriority>
+        <VideoPriority>{if isset($fanvil_qos_rtp_video)}{$fanvil_qos_rtp_video}{else}0{/if}</VideoPriority>
+        <LANPortPriority>0</LANPortPriority>
+        <EnablediffServ>{if isset($fanvil_enable_diffserv)}{$fanvil_enable_diffserv}{else}0{/if}</EnablediffServ>
+        <SingallingDSCP>{if isset($fanvil_dscp_sip)}{$fanvil_dscp_sip}{else}46{/if}</SingallingDSCP>
+        <VoiceDSCP>{if isset($fanvil_dscp_rtp_voice)}{$fanvil_dscp_rtp_voice}{else}46{/if}</VoiceDSCP>
+        <VideoDSCP>{if isset($fanvil_dscp_rtp_video)}{$fanvil_dscp_rtp_video}{else}34{/if}</VideoDSCP>
+        <LLDPTransmit>{if isset($fanvil_lldp_tx_enable)}{$fanvil_lldp_tx_enable}{else}0{/if}</LLDPTransmit>
+        <LLDPRefreshTime>{if isset($fanvil_lldp_refresh)}{$fanvil_lldp_refresh}{else}60{/if}</LLDPRefreshTime>
+        <LLDPLearnPolicy>{if isset($fanvil_lldp_learn)}{$fanvil_lldp_learn}{else}0{/if}</LLDPLearnPolicy>
+        <LLDPSaveLearnData>0</LLDPSaveLearnData>
+        <CDPEnable>1</CDPEnable>
+        <CDPRefreshTime>60</CDPRefreshTime>
+        <DHCPOptionVlan>132</DHCPOptionVlan>
+    </qos>
+    <dot1x>
+        <XsupMode></XsupMode>
+        <XsupUser></XsupUser>
+        <XsupPassword></XsupPassword>
+        <sslMode>
+            <PermissionCTF>0</PermissionCTF>
+            <CommonName>0</CommonName>
+            <CTFmode>0</CTFmode>
+            <DeviceCertMode>0</DeviceCertMode>
+        </sslMode>
+    </dot1x>
+    <pubApp>
+        <WatchDogEnabled>1</WatchDogEnabled>
+        <EnableInAccess>0</EnableInAccess>
+        <EnableOutAccess>0</EnableOutAccess>
+    </pubApp>
+    <record>
+        <Enabled>1</Enabled>
+        <VoiceCodec>G729</VoiceCodec>
+        <RecordType>0</RecordType>
+        <FileSizeLimit>8</FileSizeLimit>
+        <ServerAddr>0.0.0.0</ServerAddr>
+        <ServerPort>10000</ServerPort>
+    </record>
+    <UIconfig>
+        <BluetoothEnabled>0</BluetoothEnabled>
+        <BluetoothAdapterName>Fanvil X7C</BluetoothAdapterName>
+        <BluetoothRingMode>1</BluetoothRingMode>
+    </UIconfig>
+    <background>
+        <TimeoutToScreensaver>0</TimeoutToScreensaver>
+        <UserChangeBackground>0</UserChangeBackground>
+        <UserChangeSubBackground></UserChangeSubBackground>
+        <EHSHeadsettype>0</EHSHeadsettype>
+        <MissedCallPopup>1</MissedCallPopup>
+        <MWIPopup>1</MWIPopup>
+        <DeviceConnectPopup>1</DeviceConnectPopup>
+        <SMSPopup>1</SMSPopup>
+        <OtherPopup>1</OtherPopup>
+        <EnablePortMirror>0</EnablePortMirror>
+        <AutoCloseLed>0</AutoCloseLed>
+        <IdleTimeFontColor>0xffffff</IdleTimeFontColor>
+        <CommonTitleFontColor>0xffffff</CommonTitleFontColor>
+        <SoftkeyFontColor>0xffffff</SoftkeyFontColor>
+        <MenuListFontColor>0x262626</MenuListFontColor>
+        <ScrollBarColor>0x5a9dba</ScrollBarColor>
+        <WarnThemeColor>0xc4012f</WarnThemeColor>
+        <InformThemeColor>0x007bb0</InformThemeColor>
+        <FunkeyListFontColor>0xffffff</FunkeyListFontColor>
+        <TalkingFontColor>0xffffff</TalkingFontColor>
+        <SidekeyLabelLength>0</SidekeyLabelLength>
+        <AppIconDisplay>1,1,1,1</AppIconDisplay>
+        <DisplayProvisionprompt>0</DisplayProvisionprompt>
+    </background>
+</sysConf>
diff --git a/resources/templates/provision/grandstream/dp715.sm/{$mac}.xml b/resources/templates/provision/grandstream/dp715.sm/{$mac}.xml
index 34a4a3a753..9cb1e356a6 100644
--- a/resources/templates/provision/grandstream/dp715.sm/{$mac}.xml
+++ b/resources/templates/provision/grandstream/dp715.sm/{$mac}.xml
@@ -80,7 +80,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
@@ -107,7 +107,7 @@
 
 <!-- Allow DHCP Option 66 to override server. 0 - No, 1 - Yes. Default is Yes. -->
 <!-- When set to Yes(1), it will override the configured provision path and method. -->
-<P145>1</P145>
+{if isset($grandstream_dhcp_option_override)}<P145>{$grandstream_dhcp_option_override}</P145>{else}<P145>1</P145>{/if}
 
 <!-- Automatic Upgrade. 0 - No, 1 - Check daily, 2 - Check weekly, 3 - Check every () minutes. Default is No. -->
 <P194>0</P194>
@@ -377,7 +377,7 @@
 {if isset($grandstream_dial_plan) }
 <P4200>{$grandstream_dial_plan}</P4200>
 {else}
-<P4200>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P4200>
+<P4200>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P4200>
 {/if}
 
 <!-- SUBSCRIBE for MWI. 0 - No, 1 - Yes -->
diff --git a/resources/templates/provision/grandstream/dp715/{$mac}.xml b/resources/templates/provision/grandstream/dp715/{$mac}.xml
index 03e799b669..5fac771637 100644
--- a/resources/templates/provision/grandstream/dp715/{$mac}.xml
+++ b/resources/templates/provision/grandstream/dp715/{$mac}.xml
@@ -42,7 +42,7 @@
                 <P237></P237>
                 {elseif isset($grandstream_config_server_path)}
                 <P237>{$grandstream_config_server_path}</P237>
-                {else}
+                {elseif isset($domain_name)}
                 <P237>{$domain_name}{$project_path}/app/provision</P237>
                 {/if}
 	
@@ -62,7 +62,7 @@
 		<P235></P235>
 		<!-- Allow DHCP Option 66 to override server. 0 - No, 1 - Yes. Default is Yes. -->
 		<!-- When set to Yes(1), it will override the configured provision path and method. -->
-		<P145>1</P145>
+		{if isset($grandstream_dhcp_option_override)}<P145>{$grandstream_dhcp_option_override}</P145>{else}<P145>1</P145>{/if}
 		<!-- Automatic Upgrade. 0 - No, 1 - Check daily, 2 - Check weekly, 3 - Check every () minutes. Default is No. -->
 		<P194>0</P194>
 		<!-- Check for new firmware/config file every () minutes, unit is in minute, minimum 60 minutes, default is 7 days. -->
@@ -243,7 +243,7 @@
 		{if isset($grandstream_dial_plan) }
 		<P4200>{$grandstream_dial_plan}</P4200>
 		{else}
-		<P4200>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P4200>
+		<P4200>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P4200>
 		{/if}
 		
 		<!-- SUBSCRIBE for MWI. 0 - No, 1 - Yes -->
diff --git a/resources/templates/provision/grandstream/dp750/{$mac}.xml b/resources/templates/provision/grandstream/dp750/{$mac}.xml
index b759950d6f..09ff80b1b9 100644
--- a/resources/templates/provision/grandstream/dp750/{$mac}.xml
+++ b/resources/templates/provision/grandstream/dp750/{$mac}.xml
@@ -489,10 +489,10 @@
 {if isset($grandstream_dial_plan) }
 <P4200>{$grandstream_dial_plan}</P4200>
 {else}
-<P4200>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P4200>
+<P4200>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P4200>
 {/if}
   
-<!-- <P4200>{ x+ | *x+ | *xx | *xxx | *xxxx | *xxxxx | *xxxxxx | **xx | **xxx | **xxxx | **xxxxx | **xxxxxx | **xxxxxxx | **xxxxxxxx | *xx*x+ | \+x+ | \p\a\r\k\+*x+ }</P4200> -->
+<!-- <P4200>{ x+ | *x+ | *xx | *xxx | *xxxx | *xxxxx | *xxxxxx | **xx | **xxx | **xxxx | **xxxxx | **xxxxxx | **xxxxxxx | **xxxxxxxx | *xx*x+ | \+x+ | \p\a\r\k\+*x+ | \p\a\r\k\+x+ }</P4200> -->
 
 <!-- Use #as Dial Key (if set to Yes, "#" will function as the "(Re-)Dial" key). 0 - no, 1 - yes -->
 <!-- Number: 0,1 -->
@@ -1022,7 +1022,7 @@
 <!-- Dial Plan  -->
 <!-- String Max Length: 1024 -->
 <P4201>{ x+ | *x+ | *xx | *xxx | *xxxx | *xxxxx | *xxxxxx | **xx | **xxx | **xxxx | **xxxxx | **xxxxxx | **xxxxxxx | **xxxxxxxx | *xx*x+ }</P4201>
-<!-- <P4201>{ x+ | *x+ | *xx | *xxx | *xxxx | *xxxxx | *xxxxxx | **xx | **xxx | **xxxx | **xxxxx | **xxxxxx | **xxxxxxx | **xxxxxxxx | *xx*x+ | \+x+ | \p\a\r\k\+*x+ }</P4201> -->
+<!-- <P4201>{ x+ | *x+ | *xx | *xxx | *xxxx | *xxxxx | *xxxxxx | **xx | **xxx | **xxxx | **xxxxx | **xxxxxx | **xxxxxxx | **xxxxxxxx | *xx*x+ | \+x+ | \p\a\r\k\+*x+ | \p\a\r\k\+x+ }</P4201> -->
 
 <!-- Use #as Dial Key (if set to Yes, "#" will function as the "(Re-)Dial" key). 0 - no, 1 - yes -->
 <!-- Number: 0,1 -->
@@ -1551,7 +1551,7 @@
 <!-- Dial Plan  -->
 <!-- String Max Length: 1024 -->
 <P4202>{ x+ | *x+ | *xx | *xxx | *xxxx | *xxxxx | *xxxxxx | **xx | **xxx | **xxxx | **xxxxx | **xxxxxx | **xxxxxxx | **xxxxxxxx | *xx*x+ }</P4202>
-<!-- <P4202>{ x+ | *x+ | *xx | *xxx | *xxxx | *xxxxx | *xxxxxx | **xx | **xxx | **xxxx | **xxxxx | **xxxxxx | **xxxxxxx | **xxxxxxxx | *xx*x+ | \+x+ | \p\a\r\k\+*x+ }</P4202> -->
+<!-- <P4202>{ x+ | *x+ | *xx | *xxx | *xxxx | *xxxxx | *xxxxxx | **xx | **xxx | **xxxx | **xxxxx | **xxxxxx | **xxxxxxx | **xxxxxxxx | *xx*x+ | \+x+ | \p\a\r\k\+*x+ | \p\a\r\k\+x+ }</P4202> -->
 
 <!-- Use #as Dial Key (if set to Yes, "#" will function as the "(Re-)Dial" key). 0 - no, 1 - yes -->
 <!-- Number: 0,1 -->
@@ -2081,7 +2081,7 @@
 <!-- Dial Plan  -->
 <!-- String Max Length: 1024 -->
 <P4203>{ x+ | *x+ | *xx | *xxx | *xxxx | *xxxxx | *xxxxxx | **xx | **xxx | **xxxx | **xxxxx | **xxxxxx | **xxxxxxx | **xxxxxxxx | *xx*x+ }</P4203>
-<!-- <P4203>{ x+ | *x+ | *xx | *xxx | *xxxx | *xxxxx | *xxxxxx | **xx | **xxx | **xxxx | **xxxxx | **xxxxxx | **xxxxxxx | **xxxxxxxx | *xx*x+ | \+x+ | \p\a\r\k\+*x+ }</P4203> -->
+<!-- <P4203>{ x+ | *x+ | *xx | *xxx | *xxxx | *xxxxx | *xxxxxx | **xx | **xxx | **xxxx | **xxxxx | **xxxxxx | **xxxxxxx | **xxxxxxxx | *xx*x+ | \+x+ | \p\a\r\k\+*x+ | \p\a\r\k\+x+ }</P4203> -->
 
 <!-- Use #as Dial Key (if set to Yes, "#" will function as the "(Re-)Dial" key). 0 - no, 1 - yes -->
 <!-- Number: 0,1 -->
@@ -2913,7 +2913,7 @@
 <!-- Provisioning via. 0 - TFTP Upgrade, 1 - HTTP Upgrade, 2 - HTTPS Upgrade. -->
 <!-- Number: 0 to 2 -->
 <!-- Mandatory -->
-<P212>1</P212>
+<P212>2</P212>
 
 <!-- Config Server Path -->
 <!-- String: serveraddress  -->
@@ -2921,7 +2921,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
@@ -2938,13 +2938,13 @@
 <!-- Number: 0,1 -->
 <!-- Mandatory -->
 <!-- Reboot required  -->
-<P145>1</P145>
+{if isset($grandstream_dhcp_option_override)}<P145>{$grandstream_dhcp_option_override}</P145>{else}<P145>1</P145>{/if}
 
 <!-- Allow DHCP Option 120 to Override SIP Server -->
 <!-- 0 - No, 1 - Yes. Default is 0 -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P1411>0</P1411>
+{if isset($grandstream_dhcp_option_override_sip_server)}<P1411>{$grandstream_dhcp_option_override_sip_server}</P1411>{else}<P1411>0</P1411>{/if}
 
 <!-- 3CX Auto Provision. 0 - No, 1 - Yes. Default is 1 -->
 <!-- Number: 0, 1 -->
diff --git a/resources/templates/provision/grandstream/gac2500/{$mac}.xml b/resources/templates/provision/grandstream/gac2500/{$mac}.xml
index 44958da1f2..1715e9fee0 100644
--- a/resources/templates/provision/grandstream/gac2500/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gac2500/{$mac}.xml
@@ -410,7 +410,7 @@
 	{if isset($grandstream_dial_plan) }
 	<P290>{$grandstream_dial_plan}</P290>
 	{else}
-	<P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P290>
+	<P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P290>
 	{/if}
     <!-- # Refer-To Use Target Contact. 0 - No, 1 - Yes. Default value is 0 -->
     <!-- # Number: 0, 1 -->
@@ -449,7 +449,9 @@
 
     <!-- # Feature Key Synchronization. 0 - Disable,  1 - Broadsoft. Default value is 0 -->
     <!-- # Number: 0, 1 -->
-    <P2325>0</P2325>
+{if isset($grandstream_feature_key_sync)}
+    <P2325>{$grandstream_feature_key_sync}</P2325>
+{/if}
 
     <!-- # Enable Call Features. 0 - No, 1 - Yes. Default value is 0 -->
     <!-- # Number: 0, 1 -->
@@ -486,7 +488,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2318></P2318>
+    <P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
 
     <!-- # Account Ring Tone. See ring tone options and value in the Ring Tone Value Table below -->
    	{if isset($grandstream_account_ring_tone_1)}
@@ -500,7 +502,7 @@
 
     <!-- # Matching Incoming Caller ID. Matching Rule 1 -->
     <!-- # String -->
-    <P1488></P1488>
+    <P1488>{$grandstream_distinctive_ringtone_name_1}</P1488>
 
     <!-- # Matching Rule 1 Distinctive Ringtone. See ring tone options and value in the Ring Tone Value Table below -->
     <!-- # String -->
@@ -508,7 +510,7 @@
 
     <!-- # Matching Incoming Caller ID. Matching Rule 2 -->
     <!-- # String -->
-    <P1490></P1490>
+    <P1490>{$grandstream_distinctive_ringtone_name_2}</P1490>
 
     <!-- # Matching Rule 2 Distinctive Ringtone. See ring tone options and value in the Ring Tone Value Table below -->
     <!-- # String -->
@@ -516,7 +518,7 @@
 
     <!-- # Matching Incoming Caller ID. Matching Rule 3 -->
     <!-- # String -->
-    <P1492></P1492>
+    <P1492>{$grandstream_distinctive_ringtone_name_3}</P1492>
 
     <!-- # Matching Rule 3 Distinctive Ringtone. See ring tone options and value in the Ring Tone Value Table below -->
     <!-- # String -->
@@ -979,7 +981,7 @@
     {if isset($grandstream_dial_plan) }
     <P459>{$grandstream_dial_plan}</P459>
     {else}
-    <P459>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P459>
+    <P459>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P459>
     {/if}
 
     <!-- # Refer-To Use Target Contact. 0 - No, 1 - Yes. Default value is 0 -->
@@ -1054,7 +1056,7 @@
 
     <!-- # Conference-URI -->
     <!-- # String -->
-    <P2418></P2418>
+    <P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
 
     <!-- # No Answer Timeout (s). Default value is 20 -->
     <!-- # Number: 1 - 120. -->
@@ -1547,7 +1549,7 @@
     {if isset($grandstream_dial_plan) }
     <P559>{$grandstream_dial_plan}</P559>
     {else}
-    <P559>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P559>
+    <P559>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P559>
     {/if}
 
     <!-- # Refer-To Use Target Contact. 0 - No, 1 - Yes. Default value is 0 -->
@@ -1622,7 +1624,7 @@
 
     <!-- # Conference-URI -->
     <!-- # String -->
-    <P2518></P2518>
+    <P2518>{if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}</P2518>
 
     <!-- # No Answer Timeout (s). Default value is 20 -->
     <!-- # Number: 1 - 120 -->
@@ -1630,7 +1632,7 @@
 
     <!-- # Matching Incoming Caller ID. Matching Rule 1 -->
     <!-- # String -->
-    <P1500></P1500>
+    <P1500>{$grandstream_distinctive_ringtone_name_1}</P1500>
 
     <!-- # Account Ring Tone. See ring tone options and value in the Ring Tone value table below -->
     <P523>content://settings/system/ringtone</P523>
@@ -2116,7 +2118,7 @@
     {if isset($grandstream_dial_plan) }
     <P659>{$grandstream_dial_plan}</P659>
     {else}
-    <P659>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P659>
+    <P659>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P659>
     {/if}
 
     <!-- # Refer-To Use Target Contact. 0 - No, 1 - Yes. Default value is 0 -->
@@ -2191,7 +2193,7 @@
 
     <!-- # Conference-URI -->
     <!-- # String -->
-    <P2618></P2618>
+    <P2618>{if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}</P2618>
 
     <!-- # Account Ring Tone. See ring tone options and value in the Ring Tone value table below -->
     
@@ -2687,7 +2689,7 @@
     {if isset($grandstream_dial_plan) }
     <P1759>{$grandstream_dial_plan}</P1759>
     {else}
-    <P1759>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P1759>
+    <P1759>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P1759>
     {/if}
 
     <!-- # Refer-To Use Target Contact. 0 - No, 1 - Yes. Default value is 0 -->
@@ -2762,7 +2764,7 @@
 
     <!-- # Conference-URI -->
     <!-- # String -->
-    <P2718></P2718>
+    <P2718>{if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}</P2718>
 
     <!-- # No Answer Timeout (s). Default value is 20 -->
     <!-- # Number: 1 - 120 -->
@@ -3258,7 +3260,7 @@
     {if isset($grandstream_dial_plan) }
     <P1859>{$grandstream_dial_plan}</P1859>
     {else}
-    <P1859>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P1859>
+    <P1859>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P1859>
     {/if}
 
     <!-- # Refer-To Use Target Contact. 0 - No, 1 - Yes. Default value is 0 -->
@@ -3333,7 +3335,7 @@
 
     <!-- # Conference-URI -->
     <!-- # String -->
-    <P2818></P2818>
+    <P2818>{if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}</P2818>
 
     <!-- # No Answer Timeout (s). Default value is 20 -->
     <!-- # Number: 1 - 120 -->
@@ -4128,11 +4130,11 @@
     <!-- # DHCP Option 66 Override server. 0 - No, 1 - Yes. Default value is 1 -->
     <!-- # When set to Yes(1), it will override the configured provision path and method -->
     <!-- # Number: 0, 1 -->
-    <P145>1</P145>
+    {if isset($grandstream_dhcp_option_override)}<P145>{$grandstream_dhcp_option_override}</P145>{else}<P145>1</P145>{/if}
 
     <!-- # DHCP Option 120 Override SIP Server.  0 - No, 1 - Yes. Default value is 1 -->
     <!-- # Number: 0, 1 -->
-    <P1411>1</P1411>
+    {if isset($grandstream_dhcp_option_override_sip_server)}<P1411>{$grandstream_dhcp_option_override_sip_server}</P1411>{else}{if isset($grandstream_dhcp_option_override_sip_server)}<P1411>{$grandstream_dhcp_option_override_sip_server}</P1411>{else}<P1411>0</P1411>{/if}{/if}
 
     <!-- # Firmware Upgrade Via. 0 - TFTP, 1 - HTTP, 2 - HTTPS, 3 - Manual Upload. Default value is 1 -->
     <!-- # Number: 0, 1, 2, 3 -->
@@ -4168,7 +4170,7 @@
 	<P237></P237>
 	{elseif isset($grandstream_config_server_path)}
 	<P237>{$grandstream_config_server_path}</P237>
-	{else}
+	{elseif isset($domain_name)}
 	<P237>{$domain_name}{$project_path}/app/provision</P237>
 	{/if}
 
diff --git a/resources/templates/provision/grandstream/gds3705/{$mac}.xml b/resources/templates/provision/grandstream/gds3705/{$mac}.xml
index 36576d913f..109ca488a9 100644
--- a/resources/templates/provision/grandstream/gds3705/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gds3705/{$mac}.xml
@@ -690,7 +690,7 @@
     <P237></P237>
     {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-    {else}
+    {elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
     {/if}
     <!-- HTTP/HTTPS User Name -->
@@ -708,7 +708,7 @@
     <!-- Automatic Upgrade Interval(m) (value:60~525600) -->
     <P193>10080</P193>
     <!-- DHCP Option 66 Override Server (0:Disable  1:Enable) -->
-    <P145>0</P145>
+    {if isset($grandstream_dhcp_option_override)}<P145>{$grandstream_dhcp_option_override}</P145>{else}<P145>1</P145>{/if}
     <!-- Zero Config (0:Disable  1:Enable) -->
     <P1414>0</P1414>
     <!-- Automatic Upgrade (0:Disable  1:Enable) -->
diff --git a/resources/templates/provision/grandstream/gds3710/{$mac}.xml b/resources/templates/provision/grandstream/gds3710/{$mac}.xml
index 456a9013b2..8c9311a371 100644
--- a/resources/templates/provision/grandstream/gds3710/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gds3710/{$mac}.xml
@@ -743,7 +743,7 @@ E0Fw0O5Kx31JPa+aSBLDMZAG1+SZ/zfxRYQe7VH8p1g=
     <P237></P237>
     {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-    {else}
+    {elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
     {/if}
     <!-- Config HTTP/HTTPS User Name -->
@@ -759,7 +759,7 @@ E0Fw0O5Kx31JPa+aSBLDMZAG1+SZ/zfxRYQe7VH8p1g=
     <!-- Automatic Upgrade Interval(m) (value:60~525600) -->
     <P193>10080</P193>
     <!-- DHCP Option 66 Override Server (0:Disable  1:Enable) -->
-    <P145>1</P145>
+    {if isset($grandstream_dhcp_option_override)}<P145>{$grandstream_dhcp_option_override}</P145>{else}<P145>1</P145>{/if}
     <!-- Zero Config (0:Disable  1:Enable) -->
     <P1414>0</P1414>
     <!-- Automatic Upgrade (0:Disable  1:Enable) -->
diff --git a/resources/templates/provision/grandstream/grp2612/{$mac}.xml b/resources/templates/provision/grandstream/grp2612/{$mac}.xml
index 03122670b7..b32a67d986 100644
--- a/resources/templates/provision/grandstream/grp2612/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2612/{$mac}.xml
@@ -354,7 +354,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2318></P2318>
+    <P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -420,7 +420,9 @@
     <!-- # Feature Key Synchronization. 0 - Disabled, 1 - Enabled. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P2325>0</P2325>
+{if isset($grandstream_feature_key_sync)}
+    <P2325>{$grandstream_feature_key_sync}</P2325>
+{/if}
 
     <!-- # Broadsoft Call Park. 0 - Disabled, 1 - Enabled. Default is 0 -->
     <!-- # Number: 0, 1 -->
@@ -686,7 +688,7 @@
 
     <!-- # Dial Plan Prefix -->
     <!-- # String  -->
-    <P66></P66>
+    <P66>{$grandstream_dial_prefix}</P66>
 
     <!-- # Dial Plan. Default value is { x+ | \+x+ | *x+ | *xx*x+ } -->
     <!-- # String -->
@@ -695,7 +697,7 @@
 {if isset($grandstream_dial_plan) }
     <P290>{$grandstream_dial_plan}</P290>
 {else}
-    <P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P290>
+    <P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P290>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -793,7 +795,7 @@
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P1489>5</P1489>
+    <P1489>{$grandstream_distinctive_ringtone_1}</P1489>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 2 -->
     <!-- # String -->
@@ -803,87 +805,87 @@
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P1491>2</P1491>
+    <P1491>{$grandstream_distinctive_ringtone_2}</P1491>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 3 -->
     <!-- # String -->
-    <P1492>ring3</P1492>
+    <P1492>{$grandstream_distinctive_ringtone_name_3}</P1492>
 
     <!-- # Matching Rule 3 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P1493>3</P1493>
+    <P1493>{$grandstream_distinctive_ringtone_3}</P1493>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 4 -->
     <!-- # String -->
-    <P6716></P6716>
+    <P6716>{$grandstream_distinctive_ringtone_name_4}</P6716>
 
     <!-- # Matching Rule 4 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P6717>5</P6717>
+    <P6717>{$grandstream_distinctive_ringtone_4}</P6717>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 5 -->
     <!-- # String -->
-    <P6718></P6718>
+    <P6718>{$grandstream_distinctive_ringtone_name_5}</P6718>
 
     <!-- # Matching Rule 5 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P6719>5</P6719>
+    <P6719>{$grandstream_distinctive_ringtone_5}</P6719>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 6 -->
     <!-- # String -->
-    <P6720></P6720>
+    <P6720>{$grandstream_distinctive_ringtone_name_6}</P6720>
 
     <!-- # Matching Rule 6 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P6721>5</P6721>
+    <P6721>{$grandstream_distinctive_ringtone_6}</P6721>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 7 -->
     <!-- # String -->
-    <P26064></P26064>
+    <P26064>{$grandstream_distinctive_ringtone_name_7}</P26064>
 
     <!-- # Matching Rule 7 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P26065>5</P26065>
+    <P26065>{$grandstream_distinctive_ringtone_7}</P26065>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 8 -->
     <!-- # String -->
-    <P26066></P26066>
+    <P26066>{$grandstream_distinctive_ringtone_name_8}</P26066>
 
     <!-- # Matching Rule 8 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P26067>5</P26067>
+    <P26067>{$grandstream_distinctive_ringtone_8}</P26067>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 9 -->
     <!-- # String -->
-    <P26068></P26068>
+    <P26068>{$grandstream_distinctive_ringtone_name_9}</P26068>
 
     <!-- # Matching Rule 9 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P26069>5</P26069>
+    <P26069>{$grandstream_distinctive_ringtone_9}</P26069>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 10 -->
     <!-- # String -->
-    <P26096></P26096>
+    <P26096>{$grandstream_distinctive_ringtone_name_10}</P26096>
 
     <!-- # Matching Rule 10 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P26097>5</P26097>
+    <P26097>{$grandstream_distinctive_ringtone_10}</P26097>
 
     <!-- # Ring Timeout (in seconds). Default is 60 -->
     <!-- # Number: 30 - 3600 -->
@@ -1306,7 +1308,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2418></P2418>
+    <P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -1645,7 +1647,7 @@
 {if isset($grandstream_dial_plan) }
     <P459>{$grandstream_dial_plan}</P459>
 {else}
-    <P459>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P459>
+    <P459>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P459>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -2379,18 +2381,18 @@
     <!-- # When set to Yes(1), it will override the configured provision path and method -->
     <!-- # Number: 0, 1, 2 -->
     <!-- # Mandatory -->
-    <P145>0</P145>
+    {if isset($grandstream_dhcp_option_override)}<P145>{$grandstream_dhcp_option_override}</P145>{else}<P145>1</P145>{/if}
 
     <!-- # Additional Override DHCP Option. 0 - None,  1 - Option 150,  2 - Option 160. Default is 0 -->
     <!-- # Number: 0, 1, 2 -->
     <!-- # Mandatory -->
-    <P8337>0</P8337>
+    {if isset($grandstream_dhcp_option_additional_override)}<P8337>{$grandstream_dhcp_option_additional_override}</P8337>{else}<P8337>0</P8337>{/if}
 
     <!-- # Allow DHCP Option 120 to Override SIP Server -->
     <!-- # 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1411>0</P1411>
+    {if isset($grandstream_dhcp_option_override_sip_server)}<P1411>{$grandstream_dhcp_option_override_sip_server}</P1411>{else}<P1411>0</P1411>{/if}
 
     <!-- # 3CX Auto Provision. 0 - No, 1 - Yes. Default is Yes -->
     <!-- # Number: 0, 1 -->
@@ -2451,7 +2453,7 @@
     <P237></P237>
 {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
@@ -3484,7 +3486,7 @@
 {if $grandstream_call_waiting_ring == "0"}    <P22102>0</P22102>{/if}
 {if $grandstream_call_waiting_ring == "1"}    <P22102>1</P22102>{/if}
 {else}
-<P2202>1</P2202>
+<P22102>1</P22102>
 {/if}
 
     <!-- # Disable Busy Tone on Remote Disconnect. 0 - No, 1 - Yes. Default is 0 -->
@@ -3652,7 +3654,7 @@
     <!-- # Hide BLF Remote Status. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P8374>0</P8374>
+    <P8374>{$grandstream_blf_remote_status}</P8374>
 
     <!-- # Show SIP Error Response. 0 - No, 1 - Yes. Default is 1 -->
     <!-- # Number: 0, 1 -->
@@ -3915,17 +3917,21 @@
     <!-- # HEADSET Key Mode. 0 - Default Mode, 1 - Toggle Headset/Speaker. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1312>0</P1312>
+{if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
 
     <!-- # Headset Type. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P6779>0</P6779>
+{if isset($grandstream_headset_type)}
+    <P6779>{$grandstream_headset_type}</P6779>
 
     <!-- # EHS Headset Ring Tone. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1487>0</P1487>
+    <P1487>{$grandstream_headset_type}</P1487>
+{/if}
 
     <!-- # Always Ring Speaker. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
@@ -4154,9 +4160,7 @@
 {if isset($grandstream_wallpaper_url)}
     <P2916>1</P2916>
     <P2917>{$grandstream_wallpaper_url}</P2917>
-{else}
-    <P2916>0</P2916>
-    <P2917></P2917>
+
 {/if}
 
     <!-- # Color Background. Default is #000000. -->
@@ -4168,8 +4172,6 @@
     <!-- # Mandatory -->
 {if isset($grandstream_screensaver)}
     <P2918>{$grandstream_screensaver}</P2918>
-{else}
-    <P2918>2</P2918>
 {/if}
 
     <!-- # Screensaver Source.  0 - Default, 1 - USB, 2 - Download. Default is 0. -->
@@ -4177,8 +4179,6 @@
     <!-- # Mandatory -->
 {if isset($grandstream_screensaver_source)}
     <P6759>{$grandstream_screensaver_source}</P6759>
-{else}
-    <P6759>0</P6759>
 {/if}
 
     <!-- # Show Date and Time. 0 - No, 1 - Yes. Default is 1 -->
@@ -4287,7 +4287,9 @@
     <!-- # Speaker Ring Volume -->
     <!-- # Number: 0-7. Default is 5. -->
     <!-- # Mandatory -->
-    <P8352>5</P8352>
+{if isset($grandstream_speaker_ring_volume)}
+    <P8352>{$grandstream_speaker_ring_volume}</P8352>
+{/if}
 
     <!-- # Notification Tone Volume -->
     <!-- # Number: 0-7. Default is 5. -->
@@ -4406,7 +4408,7 @@
 
 <!-- Detected {$template} with {$fixed_keys} fixed keys -->
 {$start_id=1363}
-{assign var=key_types value=["none"=>-1,"line"=>31,"shared line"=>32,"speed dial"=>0, "blf"=>1, "presence watcher"=>2, "eventlist blf"=>3,"speed dial active"=>4,"dial dtmf"=>5,"voicemail"=>6,"call return"=>7,"transfer"=>8,"call park"=>9,"intercom"=>10,"ldap search"=>11,"multicast paging"=>13,"record"=>14,"call log"=>15,"monitored call park"=>16,"menu"=>17]}
+{assign var=key_types value=["none"=>-1,"phonebook"=>30,"line"=>31,"shared line"=>32,"speed dial"=>0, "blf"=>1, "presence watcher"=>2, "eventlist blf"=>3,"speed dial active"=>4,"dial dtmf"=>5,"voicemail"=>6,"call return"=>7,"transfer"=>8,"call park"=>9,"intercom"=>10,"ldap search"=>11,"multicast paging"=>13,"record"=>14,"call log"=>15,"monitored call park"=>16,"menu"=>17]}
 
 {for $line=1 to 6}
 {$pid=$line*2-2}
diff --git a/resources/templates/provision/grandstream/grp2612w/{$mac}.xml b/resources/templates/provision/grandstream/grp2612w/{$mac}.xml
index 10ecc89471..70bf565116 100644
--- a/resources/templates/provision/grandstream/grp2612w/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2612w/{$mac}.xml
@@ -354,7 +354,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2318></P2318>
+    <P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -420,7 +420,9 @@
     <!-- # Feature Key Synchronization. 0 - Disabled, 1 - Enabled. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P2325>0</P2325>
+{if isset($grandstream_feature_key_sync)}
+    <P2325>{$grandstream_feature_key_sync}</P2325>
+{/if}
 
     <!-- # Broadsoft Call Park. 0 - Disabled, 1 - Enabled. Default is 0 -->
     <!-- # Number: 0, 1 -->
@@ -686,7 +688,7 @@
 
     <!-- # Dial Plan Prefix -->
     <!-- # String  -->
-    <P66></P66>
+    <P66>{$grandstream_dial_prefix}</P66>
 
     <!-- # Dial Plan. Default value is { x+ | \+x+ | *x+ | *xx*x+ } -->
     <!-- # String -->
@@ -695,7 +697,7 @@
 {if isset($grandstream_dial_plan) }
     <P290>{$grandstream_dial_plan}</P290>
 {else}
-    <P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P290>
+    <P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P290>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -793,7 +795,7 @@
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P1489>5</P1489>
+    <P1489>{$grandstream_distinctive_ringtone_1}</P1489>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 2 -->
     <!-- # String -->
@@ -803,87 +805,87 @@
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P1491>2</P1491>
+    <P1491>{$grandstream_distinctive_ringtone_2}</P1491>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 3 -->
     <!-- # String -->
-    <P1492>ring3</P1492>
+    <P1492>{$grandstream_distinctive_ringtone_name_3}</P1492>
 
     <!-- # Matching Rule 3 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P1493>3</P1493>
+    <P1493>{$grandstream_distinctive_ringtone_3}</P1493>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 4 -->
     <!-- # String -->
-    <P6716></P6716>
+    <P6716>{$grandstream_distinctive_ringtone_name_4}</P6716>
 
     <!-- # Matching Rule 4 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P6717>5</P6717>
+    <P6717>{$grandstream_distinctive_ringtone_4}</P6717>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 5 -->
     <!-- # String -->
-    <P6718></P6718>
+    <P6718>{$grandstream_distinctive_ringtone_name_5}</P6718>
 
     <!-- # Matching Rule 5 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P6719>5</P6719>
+    <P6719>{$grandstream_distinctive_ringtone_5}</P6719>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 6 -->
     <!-- # String -->
-    <P6720></P6720>
+    <P6720>{$grandstream_distinctive_ringtone_name_6}</P6720>
 
     <!-- # Matching Rule 6 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P6721>5</P6721>
+    <P6721>{$grandstream_distinctive_ringtone_6}</P6721>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 7 -->
     <!-- # String -->
-    <P26064></P26064>
+    <P26064>{$grandstream_distinctive_ringtone_name_7}</P26064>
 
     <!-- # Matching Rule 7 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P26065>5</P26065>
+    <P26065>{$grandstream_distinctive_ringtone_7}</P26065>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 8 -->
     <!-- # String -->
-    <P26066></P26066>
+    <P26066>{$grandstream_distinctive_ringtone_name_8}</P26066>
 
     <!-- # Matching Rule 8 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P26067>5</P26067>
+    <P26067>{$grandstream_distinctive_ringtone_8}</P26067>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 9 -->
     <!-- # String -->
-    <P26068></P26068>
+    <P26068>{$grandstream_distinctive_ringtone_name_9}</P26068>
 
     <!-- # Matching Rule 9 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P26069>5</P26069>
+    <P26069>{$grandstream_distinctive_ringtone_9}</P26069>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 10 -->
     <!-- # String -->
-    <P26096></P26096>
+    <P26096>{$grandstream_distinctive_ringtone_name_10}</P26096>
 
     <!-- # Matching Rule 10 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P26097>5</P26097>
+    <P26097>{$grandstream_distinctive_ringtone_10}</P26097>
 
     <!-- # Ring Timeout (in seconds). Default is 60 -->
     <!-- # Number: 30 - 3600 -->
@@ -1306,7 +1308,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2418></P2418>
+    <P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -1645,7 +1647,7 @@
 {if isset($grandstream_dial_plan) }
     <P459>{$grandstream_dial_plan}</P459>
 {else}
-    <P459>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P459>
+    <P459>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P459>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -2473,18 +2475,18 @@
     <!-- # When set to Yes(1), it will override the configured provision path and method -->
     <!-- # Number: 0, 1, 2 -->
     <!-- # Mandatory -->
-    <P145>0</P145>
+    {if isset($grandstream_dhcp_option_override)}<P145>{$grandstream_dhcp_option_override}</P145>{else}<P145>1</P145>{/if}
 
     <!-- # Additional Override DHCP Option. 0 - None,  1 - Option 150,  2 - Option 160. Default is 0 -->
     <!-- # Number: 0, 1, 2 -->
     <!-- # Mandatory -->
-    <P8337>0</P8337>
+    {if isset($grandstream_dhcp_option_additional_override)}<P8337>{$grandstream_dhcp_option_additional_override}</P8337>{else}<P8337>0</P8337>{/if}
 
     <!-- # Allow DHCP Option 120 to Override SIP Server -->
     <!-- # 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1411>0</P1411>
+    {if isset($grandstream_dhcp_option_override_sip_server)}<P1411>{$grandstream_dhcp_option_override_sip_server}</P1411>{else}<P1411>0</P1411>{/if}
 
     <!-- # 3CX Auto Provision. 0 - No, 1 - Yes. Default is Yes -->
     <!-- # Number: 0, 1 -->
@@ -2545,7 +2547,7 @@
     <P237></P237>
 {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
@@ -3578,7 +3580,7 @@
 {if $grandstream_call_waiting_ring == "0"}    <P22102>0</P22102>{/if}
 {if $grandstream_call_waiting_ring == "1"}    <P22102>1</P22102>{/if}
 {else}
-<P2202>1</P2202>
+<P22102>1</P22102>
 {/if}
 
     <!-- # Disable Busy Tone on Remote Disconnect. 0 - No, 1 - Yes. Default is 0 -->
@@ -3747,7 +3749,7 @@
     <!-- # Hide BLF Remote Status. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P8374>0</P8374>
+    <P8374>{$grandstream_blf_remote_status}</P8374>
 
     <!-- # Show SIP Error Response. 0 - No, 1 - Yes. Default is 1 -->
     <!-- # Number: 0, 1 -->
@@ -4010,17 +4012,21 @@
     <!-- # HEADSET Key Mode. 0 - Default Mode, 1 - Toggle Headset/Speaker. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1312>0</P1312>
+{if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
 
     <!-- # Headset Type. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P6779>0</P6779>
+{if isset($grandstream_headset_type)}
+    <P6779>{$grandstream_headset_type}</P6779>
 
     <!-- # EHS Headset Ring Tone. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1487>0</P1487>
+    <P1487>{$grandstream_headset_type}</P1487>
+{/if}
 
     <!-- # Always Ring Speaker. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
@@ -4249,9 +4255,7 @@
 {if isset($grandstream_wallpaper_url)}
     <P2916>1</P2916>
     <P2917>{$grandstream_wallpaper_url}</P2917>
-{else}
-    <P2916>0</P2916>
-    <P2917></P2917>
+
 {/if}
 
     <!-- # Color Background. Default is #000000. -->
@@ -4263,8 +4267,6 @@
     <!-- # Mandatory -->
 {if isset($grandstream_screensaver)}
     <P2918>{$grandstream_screensaver}</P2918>
-{else}
-    <P2918>2</P2918>
 {/if}
 
     <!-- # Screensaver Source.  0 - Default, 1 - USB, 2 - Download. Default is 0. -->
@@ -4272,8 +4274,6 @@
     <!-- # Mandatory -->
 {if isset($grandstream_screensaver_source)}
     <P6759>{$grandstream_screensaver_source}</P6759>
-{else}
-    <P6759>0</P6759>
 {/if}
 
     <!-- # Show Date and Time. 0 - No, 1 - Yes. Default is 1 -->
@@ -4382,7 +4382,9 @@
     <!-- # Speaker Ring Volume -->
     <!-- # Number: 0-7. Default is 5. -->
     <!-- # Mandatory -->
-    <P8352>5</P8352>
+{if isset($grandstream_speaker_ring_volume)}
+    <P8352>{$grandstream_speaker_ring_volume}</P8352>
+{/if} 
 
     <!-- # Notification Tone Volume -->
     <!-- # Number: 0-7. Default is 5. -->
@@ -4501,7 +4503,7 @@
 
 <!-- Detected {$template} with {$fixed_keys} fixed keys -->
 {$start_id=1363}
-{assign var=key_types value=["none"=>-1,"line"=>31,"shared line"=>32,"speed dial"=>0, "blf"=>1, "presence watcher"=>2, "eventlist blf"=>3,"speed dial active"=>4,"dial dtmf"=>5,"voicemail"=>6,"call return"=>7,"transfer"=>8,"call park"=>9,"intercom"=>10,"ldap search"=>11,"multicast paging"=>13,"record"=>14,"call log"=>15,"monitored call park"=>16,"menu"=>17]}
+{assign var=key_types value=["none"=>-1,"phonebook"=>30,"line"=>31,"shared line"=>32,"speed dial"=>0, "blf"=>1, "presence watcher"=>2, "eventlist blf"=>3,"speed dial active"=>4,"dial dtmf"=>5,"voicemail"=>6,"call return"=>7,"transfer"=>8,"call park"=>9,"intercom"=>10,"ldap search"=>11,"multicast paging"=>13,"record"=>14,"call log"=>15,"monitored call park"=>16,"menu"=>17]}
 
 {for $line=1 to 6}
 {$pid=$line*2-2}
diff --git a/resources/templates/provision/grandstream/grp2613/phonebook.xml b/resources/templates/provision/grandstream/grp2613/phonebook.xml
index 62c745db9f..deb211d001 100644
--- a/resources/templates/provision/grandstream/grp2613/phonebook.xml
+++ b/resources/templates/provision/grandstream/grp2613/phonebook.xml
@@ -1,49 +1,151 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
+
 <AddressBook>
-<version>1</version>
-{foreach $contacts as $contact}
-{if $contact.contact_type == "group"}
-<pbgroup>
-<id>{$contact.id}</id>
-<name>{$contact.group_description|truncate:10}</name>
-</pbgroup>
-{/if}
-{/foreach}
-{$i=0}
-{foreach $contacts as $contact}
-{if $contact.contact_name_given != "" && $contact.contact_type == "contact"}
-<Contact>
-<FirstName>{$contact.contact_name_given}</FirstName>
-<LastName>{$contact.contact_name_family}</LastName>
-{if $contact.contact_role != "" }
-<JobTitle>{$contact.contact_role}</JobTitle>
-{/if}
-{if $contact.contact_category != "" }
-<Department>{$contact.contact_category}</Department>
-{/if}
-<Phone type="Work">
-<phonenumber>{$contact.contact_work}</phonenumber>
-<accountindex>1</accountindex>
-</Phone>
-{if $contact.contact_home != "" }
-<Phone type="Home">
-<phonenumber>{$contact.contact_home}</phonenumber>
-<accountindex>1</accountindex>
-</Phone>
-{/if}
-{if $contact.contact_cell != "" }
-<Phone type="Cell">
-<phonenumber>{$contact.contact_cell}</phonenumber>
-<accountindex>1</accountindex>
-</Phone>
-{/if}
-{if $contact.contact_organization != "" }
-<Company>{$contact.contact_organization}</Company>
-{/if}
-{foreach $contact.groups as $group}
-<Group>{$group}</Group>
-{/foreach}
-</Contact>
-{/if}
-{/foreach}
+
+	<pbgroup>
+		<id>1</id>
+		<name>Users</name>
+		<ringtones>default ringtone</ringtones>
+	</pbgroup>
+	<pbgroup>
+		<id>2</id>
+		<name>Groups</name>
+		<ringtones>default ringtone</ringtones>
+	</pbgroup>
+	<pbgroup>
+		<id>3</id>
+		<name>Extensions</name>
+		<ringtones>system</ringtones>
+	</pbgroup>
+
+	{$start_id=0}
+	{foreach $contacts as $row}
+		{if $row.category == "users"}
+		<Contact>
+			<id>{$start_id++}</id>
+			{if $row.contact_name_given != ""}
+			{if $row.contact_organization != ""}
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<Company>{$row.contact_organization}</Company>
+			{else}
+				<FirstName>{$row.contact_name_given}</FirstName>
+				<LastName>{$row.contact_name_family}</LastName>
+			{/if}
+			{else}
+				<FirstName>{$row.effective_caller_id_name}</FirstName>
+			{/if}
+			<JobTitle></JobTitle>
+			<Frequent>0</Frequent>
+			{foreach $row.numbers as $number}
+			{if $number.phone_number != ""}
+				{if $number.phone_label == "work"}
+				<Phone type="Work">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+				{if $number.phone_label == "home"}
+				<Phone type="Home">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+				{if $number.phone_label == "mobile"}
+				<Phone type="Cell">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+			{/if}
+			{/foreach}
+			<Group>1</Group>
+			<Primary>0</Primary>
+			<Department></Department>
+			<Job></Job>
+			<Company></Company>
+		</Contact>
+		{elseif $row.category == "groups"}
+		<Contact>
+			<id>{$start_id++}</id>
+			{if $row.contact_name_given != ""}
+			{if $row.contact_organization != ""}
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<Company>{$row.contact_organization}</Company>
+			{else}
+				<FirstName>{$row.contact_name_given}</FirstName>
+				<LastName>{$row.contact_name_family}</LastName>
+			{/if}
+			{else}
+				<FirstName>{$row.effective_caller_id_name}</FirstName>
+			{/if}
+			<JobTitle></JobTitle>
+
+			<Frequent>0</Frequent>
+			{foreach $row.numbers as $number}
+			{if $number.phone_number != ""}
+				{if $number.phone_label == "work"}
+				<Phone type="Work">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+				{if $number.phone_label == "home"}
+				<Phone type="Home">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+				{if $number.phone_label == "mobile"}
+				<Phone type="Cell">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+			{/if}
+			{/foreach}
+			<Group>2</Group>
+			<Primary>0</Primary>
+			<Department></Department>
+			<Job></Job>
+			<Company></Company>
+		</Contact>
+		{elseif $row.category == "extensions"}
+		<Contact>
+			<id>{$start_id++}</id>
+			{if $row.contact_name_given != ""}
+			{if $row.contact_organization != ""}
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<Company>{$row.contact_organization}</Company>
+			{else}
+				<FirstName>{$row.contact_name_given}</FirstName>
+				<LastName>{$row.contact_name_family}</LastName>
+			{/if}
+			{else}
+				<FirstName>{$row.effective_caller_id_name}</FirstName>
+			{/if}
+			<JobTitle></JobTitle>
+			<Frequent>0</Frequent>
+			{if $row.phone_number != ""}
+				<Phone type="Work">
+					<phonenumber>{$row.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+			{else}
+				<Phone type="Work">
+					<phonenumber>{$row.phone_extension}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+			{/if}
+			<Group>3</Group>
+			<Primary>0</Primary>
+			<Department></Department>
+			<Job></Job>
+			<Company></Company>
+		</Contact>
+		{/if}
+	{/foreach}
+
 </AddressBook>
diff --git a/resources/templates/provision/grandstream/grp2613/{$mac}.xml b/resources/templates/provision/grandstream/grp2613/{$mac}.xml
index 83980ee35a..d82ed4cadd 100644
--- a/resources/templates/provision/grandstream/grp2613/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2613/{$mac}.xml
@@ -354,7 +354,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2318></P2318>
+    <P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -420,7 +420,9 @@
     <!-- # Feature Key Synchronization. 0 - Disabled, 1 - Enabled. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P2325>0</P2325>
+{if isset($grandstream_feature_key_sync)}
+    <P2325>{$grandstream_feature_key_sync}</P2325>
+{/if}
 
     <!-- # Broadsoft Call Park. 0 - Disabled, 1 - Enabled. Default is 0 -->
     <!-- # Number: 0, 1 -->
@@ -686,7 +688,7 @@
 
     <!-- # Dial Plan Prefix -->
     <!-- # String  -->
-    <P66></P66>
+    <P66>{$grandstream_dial_prefix}</P66>
 
     <!-- # Dial Plan. Default value is { x+ | \+x+ | *x+ | *xx*x+ } -->
     <!-- # String -->
@@ -695,7 +697,7 @@
 {if isset($grandstream_dial_plan) }
     <P290>{$grandstream_dial_plan}</P290>
 {else}
-    <P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P290>
+    <P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P290>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -793,7 +795,7 @@
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P1489>5</P1489>
+    <P1489>{$grandstream_distinctive_ringtone_1}</P1489>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 2 -->
     <!-- # String -->
@@ -803,87 +805,87 @@
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P1491>2</P1491>
+    <P1491>{$grandstream_distinctive_ringtone_2}</P1491>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 3 -->
     <!-- # String -->
-    <P1492>ring3</P1492>
+    <P1492>{$grandstream_distinctive_ringtone_name_3}</P1492>
 
     <!-- # Matching Rule 3 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P1493>3</P1493>
+    <P1493>{$grandstream_distinctive_ringtone_3}</P1493>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 4 -->
     <!-- # String -->
-    <P6716></P6716>
+    <P6716>{$grandstream_distinctive_ringtone_name_4}</P6716>
 
     <!-- # Matching Rule 4 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P6717>5</P6717>
+    <P6717>{$grandstream_distinctive_ringtone_4}</P6717>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 5 -->
     <!-- # String -->
-    <P6718></P6718>
+    <P6718>{$grandstream_distinctive_ringtone_name_5}</P6718>
 
     <!-- # Matching Rule 5 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P6719>5</P6719>
+    <P6719>{$grandstream_distinctive_ringtone_5}</P6719>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 6 -->
     <!-- # String -->
-    <P6720></P6720>
+    <P6720>{$grandstream_distinctive_ringtone_name_6}</P6720>
 
     <!-- # Matching Rule 6 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P6721>5</P6721>
+    <P6721>{$grandstream_distinctive_ringtone_6}</P6721>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 7 -->
     <!-- # String -->
-    <P26064></P26064>
+    <P26064>{$grandstream_distinctive_ringtone_name_7}</P26064>
 
     <!-- # Matching Rule 7 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P26065>5</P26065>
+    <P26065>{$grandstream_distinctive_ringtone_7}</P26065>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 8 -->
     <!-- # String -->
-    <P26066></P26066>
+    <P26066>{$grandstream_distinctive_ringtone_name_8}</P26066>
 
     <!-- # Matching Rule 8 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P26067>5</P26067>
+    <P26067>{$grandstream_distinctive_ringtone_8}</P26067>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 9 -->
     <!-- # String -->
-    <P26068></P26068>
+    <P26068>{$grandstream_distinctive_ringtone_name_9}</P26068>
 
     <!-- # Matching Rule 9 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P26069>5</P26069>
+    <P26069>{$grandstream_distinctive_ringtone_9}</P26069>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 10 -->
     <!-- # String -->
-    <P26096></P26096>
+    <P26096>{$grandstream_distinctive_ringtone_name_10}</P26096>
 
     <!-- # Matching Rule 10 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P26097>5</P26097>
+    <P26097>{$grandstream_distinctive_ringtone_10}</P26097>
 
     <!-- # Ring Timeout (in seconds). Default is 60 -->
     <!-- # Number: 30 - 3600 -->
@@ -1306,7 +1308,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2418></P2418>
+    <P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -1645,7 +1647,7 @@
 {if isset($grandstream_dial_plan) }
     <P459>{$grandstream_dial_plan}</P459>
 {else}
-    <P459>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P459>
+    <P459>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P459>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -2254,7 +2256,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2518></P2518>
+    <P2518>{if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}</P2518>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -2592,7 +2594,7 @@
 {if isset($grandstream_dial_plan) }
     <P559>{$grandstream_dial_plan}</P559>
 {else}
-    <P559>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P559>
+    <P559>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P559>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -2613,7 +2615,7 @@
 
     <!-- # Matching Incoming Caller ID. Matching Rule 1 -->
     <!-- # String -->
-    <P1500></P1500>
+    <P1500>{$grandstream_distinctive_ringtone_name_1}</P1500>
 
     <!-- # Matching Rule 1 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 0. -->
@@ -3205,18 +3207,18 @@
     <!-- # When set to Yes(1), it will override the configured provision path and method -->
     <!-- # Number: 0, 1, 2 -->
     <!-- # Mandatory -->
-    <P145>0</P145>
+    {if isset($grandstream_dhcp_option_override)}<P145>{$grandstream_dhcp_option_override}</P145>{else}<P145>1</P145>{/if}
 
     <!-- # Additional Override DHCP Option. 0 - None,  1 - Option 150,  2 - Option 160. Default is 0 -->
     <!-- # Number: 0, 1, 2 -->
     <!-- # Mandatory -->
-    <P8337>0</P8337>
+    {if isset($grandstream_dhcp_option_additional_override)}<P8337>{$grandstream_dhcp_option_additional_override}</P8337>{else}<P8337>0</P8337>{/if}
 
     <!-- # Allow DHCP Option 120 to Override SIP Server -->
     <!-- # 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1411>0</P1411>
+    {if isset($grandstream_dhcp_option_override_sip_server)}<P1411>{$grandstream_dhcp_option_override_sip_server}</P1411>{else}<P1411>0</P1411>{/if}
 
     <!-- # 3CX Auto Provision. 0 - No, 1 - Yes. Default is Yes -->
     <!-- # Number: 0, 1 -->
@@ -3277,7 +3279,7 @@
     <P237></P237>
 {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
@@ -4480,7 +4482,7 @@
     <!-- # Hide BLF Remote Status. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P8374>0</P8374>
+    <P8374>{$grandstream_blf_remote_status}</P8374>
 
     <!-- # Show SIP Error Response. 0 - No, 1 - Yes. Default is 1 -->
     <!-- # Number: 0, 1 -->
@@ -4751,22 +4753,22 @@
     <!-- # HEADSET Key Mode. 0 - Default Mode, 1 - Toggle Headset/Speaker. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1312>0</P1312>
+{if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
 
-   {if isset ($grandstream_EHS)}
-    <P6779>{$grandstream_EHS}</P6779>
-    <P1487>{$grandstream_EHS}</P1487>
-    {else}
     <!-- # Headset Type. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P6779>0</P6779>
+{if isset($grandstream_headset_type)}
+    <P6779>{$grandstream_headset_type}</P6779>
 
     <!-- # EHS Headset Ring Tone. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1487>0</P1487>
-	{/if}
+    <P1487>{$grandstream_headset_type}</P1487>
+{/if}
+
     <!-- # Always Ring Speaker. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
@@ -4969,9 +4971,7 @@
 {if isset($grandstream2135_wallpaper_url)}
     <P2916>1</P2916>
     <P2917>{$grandstream2135_wallpaper_url}</P2917>
-{else}
-    <P2916>0</P2916>
-    <P2917></P2917>
+
 {/if}
 
     <!-- # Color Background. Default is #000000. -->
@@ -4983,8 +4983,6 @@
     <!-- # Mandatory -->
 {if isset($grandstream_screensaver)}
     <P2918>{$grandstream_screensaver}</P2918>
-{else}
-    <P2918>1</P2918>
 {/if}
 
     <!-- # Screensaver Source.  0 - Default, 1 - USB, 2 - Download. Default is 0.  -->
@@ -4992,8 +4990,6 @@
     <!-- # Mandatory -->
 {if isset($grandstream_screensaver_source)}
     <P6759>{$grandstream_screensaver_source}</P6759>
-{else}
-    <P6759>0</P6759>
 {/if}
 
     <!-- # Show Date and Time. 0 - No, 1 - Yes. Default is 1 -->
@@ -5102,7 +5098,9 @@
     <!-- # Speaker Ring Volume -->
     <!-- # Number: 0-7. Default is 5. -->
     <!-- # Mandatory -->
-    <P8352>5</P8352>
+{if isset($grandstream_speaker_ring_volume)}
+    <P8352>{$grandstream_speaker_ring_volume}</P8352>
+{/if} 
 
     <!-- # Notification Tone Volume -->
     <!-- # Number: 0-7. Default is 5. -->
@@ -5232,7 +5230,7 @@
 
 <!-- Detected {$template} with {$fixed_keys} fixed keys -->
 {$start_id=1363}
-{assign var=key_types value=["none"=>-1,"line"=>31,"shared line"=>32,"speed dial"=>0, "blf"=>1, "presence watcher"=>2, "eventlist blf"=>3,"speed dial active"=>4,"dial dtmf"=>5,"voicemail"=>6,"call return"=>7,"transfer"=>8,"call park"=>9,"intercom"=>10,"ldap search"=>11,"multicast paging"=>13,"record"=>14,"call log"=>15,"monitored call park"=>16,"menu"=>17]}
+{assign var=key_types value=["none"=>-1,"phonebook"=>30,"line"=>31,"shared line"=>32,"speed dial"=>0, "blf"=>1, "presence watcher"=>2, "eventlist blf"=>3,"speed dial active"=>4,"dial dtmf"=>5,"voicemail"=>6,"call return"=>7,"transfer"=>8,"call park"=>9,"intercom"=>10,"ldap search"=>11,"multicast paging"=>13,"record"=>14,"call log"=>15,"monitored call park"=>16,"menu"=>17]}
 
 {for $line=1 to 6}
 {$pid=$line*2-2}
diff --git a/resources/templates/provision/grandstream/grp2614/phonebook.xml b/resources/templates/provision/grandstream/grp2614/phonebook.xml
index 62c745db9f..deb211d001 100644
--- a/resources/templates/provision/grandstream/grp2614/phonebook.xml
+++ b/resources/templates/provision/grandstream/grp2614/phonebook.xml
@@ -1,49 +1,151 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
+
 <AddressBook>
-<version>1</version>
-{foreach $contacts as $contact}
-{if $contact.contact_type == "group"}
-<pbgroup>
-<id>{$contact.id}</id>
-<name>{$contact.group_description|truncate:10}</name>
-</pbgroup>
-{/if}
-{/foreach}
-{$i=0}
-{foreach $contacts as $contact}
-{if $contact.contact_name_given != "" && $contact.contact_type == "contact"}
-<Contact>
-<FirstName>{$contact.contact_name_given}</FirstName>
-<LastName>{$contact.contact_name_family}</LastName>
-{if $contact.contact_role != "" }
-<JobTitle>{$contact.contact_role}</JobTitle>
-{/if}
-{if $contact.contact_category != "" }
-<Department>{$contact.contact_category}</Department>
-{/if}
-<Phone type="Work">
-<phonenumber>{$contact.contact_work}</phonenumber>
-<accountindex>1</accountindex>
-</Phone>
-{if $contact.contact_home != "" }
-<Phone type="Home">
-<phonenumber>{$contact.contact_home}</phonenumber>
-<accountindex>1</accountindex>
-</Phone>
-{/if}
-{if $contact.contact_cell != "" }
-<Phone type="Cell">
-<phonenumber>{$contact.contact_cell}</phonenumber>
-<accountindex>1</accountindex>
-</Phone>
-{/if}
-{if $contact.contact_organization != "" }
-<Company>{$contact.contact_organization}</Company>
-{/if}
-{foreach $contact.groups as $group}
-<Group>{$group}</Group>
-{/foreach}
-</Contact>
-{/if}
-{/foreach}
+
+	<pbgroup>
+		<id>1</id>
+		<name>Users</name>
+		<ringtones>default ringtone</ringtones>
+	</pbgroup>
+	<pbgroup>
+		<id>2</id>
+		<name>Groups</name>
+		<ringtones>default ringtone</ringtones>
+	</pbgroup>
+	<pbgroup>
+		<id>3</id>
+		<name>Extensions</name>
+		<ringtones>system</ringtones>
+	</pbgroup>
+
+	{$start_id=0}
+	{foreach $contacts as $row}
+		{if $row.category == "users"}
+		<Contact>
+			<id>{$start_id++}</id>
+			{if $row.contact_name_given != ""}
+			{if $row.contact_organization != ""}
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<Company>{$row.contact_organization}</Company>
+			{else}
+				<FirstName>{$row.contact_name_given}</FirstName>
+				<LastName>{$row.contact_name_family}</LastName>
+			{/if}
+			{else}
+				<FirstName>{$row.effective_caller_id_name}</FirstName>
+			{/if}
+			<JobTitle></JobTitle>
+			<Frequent>0</Frequent>
+			{foreach $row.numbers as $number}
+			{if $number.phone_number != ""}
+				{if $number.phone_label == "work"}
+				<Phone type="Work">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+				{if $number.phone_label == "home"}
+				<Phone type="Home">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+				{if $number.phone_label == "mobile"}
+				<Phone type="Cell">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+			{/if}
+			{/foreach}
+			<Group>1</Group>
+			<Primary>0</Primary>
+			<Department></Department>
+			<Job></Job>
+			<Company></Company>
+		</Contact>
+		{elseif $row.category == "groups"}
+		<Contact>
+			<id>{$start_id++}</id>
+			{if $row.contact_name_given != ""}
+			{if $row.contact_organization != ""}
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<Company>{$row.contact_organization}</Company>
+			{else}
+				<FirstName>{$row.contact_name_given}</FirstName>
+				<LastName>{$row.contact_name_family}</LastName>
+			{/if}
+			{else}
+				<FirstName>{$row.effective_caller_id_name}</FirstName>
+			{/if}
+			<JobTitle></JobTitle>
+
+			<Frequent>0</Frequent>
+			{foreach $row.numbers as $number}
+			{if $number.phone_number != ""}
+				{if $number.phone_label == "work"}
+				<Phone type="Work">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+				{if $number.phone_label == "home"}
+				<Phone type="Home">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+				{if $number.phone_label == "mobile"}
+				<Phone type="Cell">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+			{/if}
+			{/foreach}
+			<Group>2</Group>
+			<Primary>0</Primary>
+			<Department></Department>
+			<Job></Job>
+			<Company></Company>
+		</Contact>
+		{elseif $row.category == "extensions"}
+		<Contact>
+			<id>{$start_id++}</id>
+			{if $row.contact_name_given != ""}
+			{if $row.contact_organization != ""}
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<Company>{$row.contact_organization}</Company>
+			{else}
+				<FirstName>{$row.contact_name_given}</FirstName>
+				<LastName>{$row.contact_name_family}</LastName>
+			{/if}
+			{else}
+				<FirstName>{$row.effective_caller_id_name}</FirstName>
+			{/if}
+			<JobTitle></JobTitle>
+			<Frequent>0</Frequent>
+			{if $row.phone_number != ""}
+				<Phone type="Work">
+					<phonenumber>{$row.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+			{else}
+				<Phone type="Work">
+					<phonenumber>{$row.phone_extension}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+			{/if}
+			<Group>3</Group>
+			<Primary>0</Primary>
+			<Department></Department>
+			<Job></Job>
+			<Company></Company>
+		</Contact>
+		{/if}
+	{/foreach}
+
 </AddressBook>
diff --git a/resources/templates/provision/grandstream/grp2614/{$mac}.xml b/resources/templates/provision/grandstream/grp2614/{$mac}.xml
index 2e4bba62af..692e171c01 100644
--- a/resources/templates/provision/grandstream/grp2614/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2614/{$mac}.xml
@@ -354,7 +354,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2318></P2318>
+    <P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -420,7 +420,9 @@
     <!-- # Feature Key Synchronization. 0 - Disabled, 1 - Enabled. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P2325>0</P2325>
+{if isset($grandstream_feature_key_sync)}
+    <P2325>{$grandstream_feature_key_sync}</P2325>
+{/if}
 
     <!-- # Broadsoft Call Park. 0 - Disabled, 1 - Enabled. Default is 0 -->
     <!-- # Number: 0, 1 -->
@@ -686,7 +688,7 @@
 
     <!-- # Dial Plan Prefix -->
     <!-- # String  -->
-    <P66></P66>
+    <P66>{$grandstream_dial_prefix}</P66>
 
     <!-- # Dial Plan. Default value is { x+ | \+x+ | *x+ | *xx*x+ } -->
     <!-- # String -->
@@ -695,7 +697,7 @@
 {if isset($grandstream_dial_plan) }
     <P290>{$grandstream_dial_plan}</P290>
 {else}
-    <P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P290>
+    <P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P290>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -793,7 +795,7 @@
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P1489>5</P1489>
+    <P1489>{$grandstream_distinctive_ringtone_1}</P1489>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 2 -->
     <!-- # String -->
@@ -803,87 +805,87 @@
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P1491>2</P1491>
+    <P1491>{$grandstream_distinctive_ringtone_2}</P1491>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 3 -->
     <!-- # String -->
-    <P1492>ring3</P1492>
+    <P1492>{$grandstream_distinctive_ringtone_name_3}</P1492>
 
     <!-- # Matching Rule 3 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P1493>3</P1493>
+    <P1493>{$grandstream_distinctive_ringtone_3}</P1493>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 4 -->
     <!-- # String -->
-    <P6716></P6716>
+    <P6716>{$grandstream_distinctive_ringtone_name_4}</P6716>
 
     <!-- # Matching Rule 4 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P6717>5</P6717>
+    <P6717>{$grandstream_distinctive_ringtone_4}</P6717>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 5 -->
     <!-- # String -->
-    <P6718></P6718>
+    <P6718>{$grandstream_distinctive_ringtone_name_5}</P6718>
 
     <!-- # Matching Rule 5 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P6719>5</P6719>
+    <P6719>{$grandstream_distinctive_ringtone_5}</P6719>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 6 -->
     <!-- # String -->
-    <P6720></P6720>
+    <P6720>{$grandstream_distinctive_ringtone_name_6}</P6720>
 
     <!-- # Matching Rule 6 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P6721>5</P6721>
+    <P6721>{$grandstream_distinctive_ringtone_6}</P6721>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 7 -->
     <!-- # String -->
-    <P26064></P26064>
+    <P26064>{$grandstream_distinctive_ringtone_name_7}</P26064>
 
     <!-- # Matching Rule 7 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P26065>5</P26065>
+    <P26065>{$grandstream_distinctive_ringtone_7}</P26065>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 8 -->
     <!-- # String -->
-    <P26066></P26066>
+    <P26066>{$grandstream_distinctive_ringtone_name_8}</P26066>
 
     <!-- # Matching Rule 8 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P26067>5</P26067>
+    <P26067>{$grandstream_distinctive_ringtone_8}</P26067>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 9 -->
     <!-- # String -->
-    <P26068></P26068>
+    <P26068>{$grandstream_distinctive_ringtone_name_9}</P26068>
 
     <!-- # Matching Rule 9 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P26069>5</P26069>
+    <P26069>{$grandstream_distinctive_ringtone_9}</P26069>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 10 -->
     <!-- # String -->
-    <P26096></P26096>
+    <P26096>{$grandstream_distinctive_ringtone_name_10}</P26096>
 
     <!-- # Matching Rule 10 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P26097>5</P26097>
+    <P26097>{$grandstream_distinctive_ringtone_10}</P26097>
 
     <!-- # Ring Timeout (in seconds). Default is 60 -->
     <!-- # Number: 30 - 3600 -->
@@ -1306,7 +1308,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2418></P2418>
+    <P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -1645,7 +1647,7 @@
 {if isset($grandstream_dial_plan) }
     <P459>{$grandstream_dial_plan}</P459>
 {else}
-    <P459>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P459>
+    <P459>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P459>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -2254,7 +2256,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2518></P2518>
+    <P2518>{if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}</P2518>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -2592,7 +2594,7 @@
 {if isset($grandstream_dial_plan) }
     <P559>{$grandstream_dial_plan}</P559>
 {else}
-    <P559>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P559>
+    <P559>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P559>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -2613,7 +2615,7 @@
 
     <!-- # Matching Incoming Caller ID. Matching Rule 1 -->
     <!-- # String -->
-    <P1500></P1500>
+    <P1500>{$grandstream_distinctive_ringtone_name_1}</P1500>
 
     <!-- # Matching Rule 1 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 0. -->
@@ -3203,7 +3205,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2618></P2618>
+    <P2618>{if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}</P2618>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -3543,7 +3545,7 @@
 {if isset($grandstream_dial_plan) }
     <P659>{$grandstream_dial_plan}</P659>
 {else}
-    <P659>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P659>
+    <P659>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P659>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -4411,18 +4413,18 @@
     <!-- # When set to Yes(1), it will override the configured provision path and method -->
     <!-- # Number: 0, 1, 2 -->
     <!-- # Mandatory -->
-    <P145>0</P145>
+    {if isset($grandstream_dhcp_option_override)}<P145>{$grandstream_dhcp_option_override}</P145>{else}<P145>1</P145>{/if}
 
     <!-- # Additional Override DHCP Option. 0 - None,  1 - Option 150,  2 - Option 160. Default is 0 -->
     <!-- # Number: 0, 1, 2 -->
     <!-- # Mandatory -->
-    <P8337>0</P8337>
+    {if isset($grandstream_dhcp_option_additional_override)}<P8337>{$grandstream_dhcp_option_additional_override}</P8337>{else}<P8337>0</P8337>{/if}
 
     <!-- # Allow DHCP Option 120 to Override SIP Server -->
     <!-- # 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1411>0</P1411>
+    {if isset($grandstream_dhcp_option_override_sip_server)}<P1411>{$grandstream_dhcp_option_override_sip_server}</P1411>{else}<P1411>0</P1411>{/if}
 
     <!-- # 3CX Auto Provision. 0 - No, 1 - Yes. Default is Yes -->
     <!-- # Number: 0, 1 -->
@@ -4483,7 +4485,7 @@
     <P237></P237>
 {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
@@ -5569,7 +5571,7 @@
 {if $grandstream_call_waiting_ring == "0"}    <P22102>0</P22102>{/if}
 {if $grandstream_call_waiting_ring == "1"}    <P22102>1</P22102>{/if}
 {else}
-<P2202>1</P2202>
+<P22102>1</P22102>
 {/if}
 
     <!-- # Disable Busy Tone on Remote Disconnect. 0 - No, 1 - Yes. Default is 0 -->
@@ -5743,7 +5745,7 @@
     <!-- # Hide BLF Remote Status. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P8374>0</P8374>
+    <P8374>{$grandstream_blf_remote_status}</P8374>
 
     <!-- # Show SIP Error Response. 0 - No, 1 - Yes. Default is 1 -->
     <!-- # Number: 0, 1 -->
@@ -6070,17 +6072,21 @@
     <!-- # HEADSET Key Mode. 0 - Default Mode, 1 - Toggle Headset/Speaker. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1312>0</P1312>
+{if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
 
     <!-- # Headset Type. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P6779>0</P6779>
+{if isset($grandstream_headset_type)}
+    <P6779>{$grandstream_headset_type}</P6779>
 
     <!-- # EHS Headset Ring Tone. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1487>0</P1487>
+    <P1487>{$grandstream_headset_type}</P1487>
+{/if}
 
     <!-- # Always Ring Speaker. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
@@ -6284,9 +6290,7 @@
 {if isset($grandstream_wallpaper_url)}
     <P2916>1</P2916>
     <P2917>{$grandstream_wallpaper_url}</P2917>
-{else}
-    <P2916>0</P2916>
-    <P2917></P2917>
+
 {/if}
 
     <!-- # Color Background. Default is #000000. -->
@@ -6298,8 +6302,6 @@
     <!-- # Mandatory -->
 {if isset($grandstream_screensaver)}
     <P2918>{$grandstream_screensaver}</P2918>
-{else}
-    <P2918>2</P2918>
 {/if}
 
     <!-- # Screensaver Source.  0 - Default, 1 - USB, 2 - Download. Default is 0. -->
@@ -6307,8 +6309,6 @@
     <!-- # Mandatory -->
 {if isset($grandstream_screensaver_source)}
     <P6759>{$grandstream_screensaver_source}</P6759>
-{else}
-    <P6759>0</P6759>
 {/if}
 
     <!-- # Show Date and Time. 0 - No, 1 - Yes. Default is 1 -->
@@ -6431,7 +6431,9 @@
     <!-- # Speaker Ring Volume -->
     <!-- # Number: 0-7. Default is 5. -->
     <!-- # Mandatory -->
-    <P8352>5</P8352>
+{if isset($grandstream_speaker_ring_volume)}
+    <P8352>{$grandstream_speaker_ring_volume}</P8352>
+{/if} 
 
     <!-- # Notification Tone Volume -->
     <!-- # Number: 0-7. Default is 5. -->
@@ -6891,7 +6893,7 @@
     <!-- # P8480 = -->
 
     <!-- ######################################################################## -->
-    <!-- ##          Settings/Extension Boards --->
+    <!-- ##          Settings/Extension Boards -->
     <!-- ######################################################################## -->
 
     <!-- ######################################################################## -->
@@ -6936,8 +6938,6 @@
     <!-- # String -->
     <!-- <P23003></P23003> -->
 
-
-
 {assign var=key_types value=["none"=>-1,"speed dial"=>0, "blf"=>1, "presence watcher"=>2, "eventlist blf"=>3,"speed dial active"=>4,"dial dtmf"=>5,"voicemail"=>6,"call return"=>7,"transfer"=>8,"call park"=>9,"intercom"=>10,"ldap search"=>11,"multicast paging"=>13,"record"=>14,"call log"=>15,"monitored call park"=>16,"menu"=>17]}
 {$start_id=23000}
 {for $exp=1 to 160}
@@ -6955,7 +6955,6 @@
 {/if}
 
 {/for}
-{
 
   </config>
 </gs_provision>
diff --git a/resources/templates/provision/grandstream/grp2615/phonebook.xml b/resources/templates/provision/grandstream/grp2615/phonebook.xml
index 62c745db9f..deb211d001 100644
--- a/resources/templates/provision/grandstream/grp2615/phonebook.xml
+++ b/resources/templates/provision/grandstream/grp2615/phonebook.xml
@@ -1,49 +1,151 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
+
 <AddressBook>
-<version>1</version>
-{foreach $contacts as $contact}
-{if $contact.contact_type == "group"}
-<pbgroup>
-<id>{$contact.id}</id>
-<name>{$contact.group_description|truncate:10}</name>
-</pbgroup>
-{/if}
-{/foreach}
-{$i=0}
-{foreach $contacts as $contact}
-{if $contact.contact_name_given != "" && $contact.contact_type == "contact"}
-<Contact>
-<FirstName>{$contact.contact_name_given}</FirstName>
-<LastName>{$contact.contact_name_family}</LastName>
-{if $contact.contact_role != "" }
-<JobTitle>{$contact.contact_role}</JobTitle>
-{/if}
-{if $contact.contact_category != "" }
-<Department>{$contact.contact_category}</Department>
-{/if}
-<Phone type="Work">
-<phonenumber>{$contact.contact_work}</phonenumber>
-<accountindex>1</accountindex>
-</Phone>
-{if $contact.contact_home != "" }
-<Phone type="Home">
-<phonenumber>{$contact.contact_home}</phonenumber>
-<accountindex>1</accountindex>
-</Phone>
-{/if}
-{if $contact.contact_cell != "" }
-<Phone type="Cell">
-<phonenumber>{$contact.contact_cell}</phonenumber>
-<accountindex>1</accountindex>
-</Phone>
-{/if}
-{if $contact.contact_organization != "" }
-<Company>{$contact.contact_organization}</Company>
-{/if}
-{foreach $contact.groups as $group}
-<Group>{$group}</Group>
-{/foreach}
-</Contact>
-{/if}
-{/foreach}
+
+	<pbgroup>
+		<id>1</id>
+		<name>Users</name>
+		<ringtones>default ringtone</ringtones>
+	</pbgroup>
+	<pbgroup>
+		<id>2</id>
+		<name>Groups</name>
+		<ringtones>default ringtone</ringtones>
+	</pbgroup>
+	<pbgroup>
+		<id>3</id>
+		<name>Extensions</name>
+		<ringtones>system</ringtones>
+	</pbgroup>
+
+	{$start_id=0}
+	{foreach $contacts as $row}
+		{if $row.category == "users"}
+		<Contact>
+			<id>{$start_id++}</id>
+			{if $row.contact_name_given != ""}
+			{if $row.contact_organization != ""}
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<Company>{$row.contact_organization}</Company>
+			{else}
+				<FirstName>{$row.contact_name_given}</FirstName>
+				<LastName>{$row.contact_name_family}</LastName>
+			{/if}
+			{else}
+				<FirstName>{$row.effective_caller_id_name}</FirstName>
+			{/if}
+			<JobTitle></JobTitle>
+			<Frequent>0</Frequent>
+			{foreach $row.numbers as $number}
+			{if $number.phone_number != ""}
+				{if $number.phone_label == "work"}
+				<Phone type="Work">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+				{if $number.phone_label == "home"}
+				<Phone type="Home">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+				{if $number.phone_label == "mobile"}
+				<Phone type="Cell">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+			{/if}
+			{/foreach}
+			<Group>1</Group>
+			<Primary>0</Primary>
+			<Department></Department>
+			<Job></Job>
+			<Company></Company>
+		</Contact>
+		{elseif $row.category == "groups"}
+		<Contact>
+			<id>{$start_id++}</id>
+			{if $row.contact_name_given != ""}
+			{if $row.contact_organization != ""}
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<Company>{$row.contact_organization}</Company>
+			{else}
+				<FirstName>{$row.contact_name_given}</FirstName>
+				<LastName>{$row.contact_name_family}</LastName>
+			{/if}
+			{else}
+				<FirstName>{$row.effective_caller_id_name}</FirstName>
+			{/if}
+			<JobTitle></JobTitle>
+
+			<Frequent>0</Frequent>
+			{foreach $row.numbers as $number}
+			{if $number.phone_number != ""}
+				{if $number.phone_label == "work"}
+				<Phone type="Work">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+				{if $number.phone_label == "home"}
+				<Phone type="Home">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+				{if $number.phone_label == "mobile"}
+				<Phone type="Cell">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+			{/if}
+			{/foreach}
+			<Group>2</Group>
+			<Primary>0</Primary>
+			<Department></Department>
+			<Job></Job>
+			<Company></Company>
+		</Contact>
+		{elseif $row.category == "extensions"}
+		<Contact>
+			<id>{$start_id++}</id>
+			{if $row.contact_name_given != ""}
+			{if $row.contact_organization != ""}
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<Company>{$row.contact_organization}</Company>
+			{else}
+				<FirstName>{$row.contact_name_given}</FirstName>
+				<LastName>{$row.contact_name_family}</LastName>
+			{/if}
+			{else}
+				<FirstName>{$row.effective_caller_id_name}</FirstName>
+			{/if}
+			<JobTitle></JobTitle>
+			<Frequent>0</Frequent>
+			{if $row.phone_number != ""}
+				<Phone type="Work">
+					<phonenumber>{$row.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+			{else}
+				<Phone type="Work">
+					<phonenumber>{$row.phone_extension}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+			{/if}
+			<Group>3</Group>
+			<Primary>0</Primary>
+			<Department></Department>
+			<Job></Job>
+			<Company></Company>
+		</Contact>
+		{/if}
+	{/foreach}
+
 </AddressBook>
diff --git a/resources/templates/provision/grandstream/grp2615/{$mac}.xml b/resources/templates/provision/grandstream/grp2615/{$mac}.xml
index 1ca0654809..424007eb08 100644
--- a/resources/templates/provision/grandstream/grp2615/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2615/{$mac}.xml
@@ -354,7 +354,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2318></P2318>
+    <P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -420,7 +420,9 @@
     <!-- # Feature Key Synchronization. 0 - Disabled, 1 - Enabled. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P2325>0</P2325>
+{if isset($grandstream_feature_key_sync)}
+    <P2325>{$grandstream_feature_key_sync}</P2325>
+{/if}
 
     <!-- # Broadsoft Call Park. 0 - Disabled, 1 - Enabled. Default is 0 -->
     <!-- # Number: 0, 1 -->
@@ -686,7 +688,7 @@
 
     <!-- # Dial Plan Prefix -->
     <!-- # String  -->
-    <P66></P66>
+    <P66>{$grandstream_dial_prefix}</P66>
 
     <!-- # Dial Plan. Default value is { x+ | \+x+ | *x+ | *xx*x+ } -->
     <!-- # String -->
@@ -695,7 +697,7 @@
 {if isset($grandstream_dial_plan) }
     <P290>{$grandstream_dial_plan}</P290>
 {else}
-    <P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P290>
+    <P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P290>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -793,7 +795,7 @@
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P1489>5</P1489>
+    <P1489>{$grandstream_distinctive_ringtone_1}</P1489>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 2 -->
     <!-- # String -->
@@ -803,87 +805,87 @@
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P1491>2</P1491>
+    <P1491>{$grandstream_distinctive_ringtone_2}</P1491>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 3 -->
     <!-- # String -->
-    <P1492>ring3</P1492>
+    <P1492>{$grandstream_distinctive_ringtone_name_3}</P1492>
 
     <!-- # Matching Rule 3 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P1493>3</P1493>
+    <P1493>{$grandstream_distinctive_ringtone_3}</P1493>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 4 -->
     <!-- # String -->
-    <P6716></P6716>
+    <P6716>{$grandstream_distinctive_ringtone_name_4}</P6716>
 
     <!-- # Matching Rule 4 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P6717>5</P6717>
+    <P6717>{$grandstream_distinctive_ringtone_4}</P6717>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 5 -->
     <!-- # String -->
-    <P6718></P6718>
+    <P6718>{$grandstream_distinctive_ringtone_name_5}</P6718>
 
     <!-- # Matching Rule 5 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P6719>5</P6719>
+    <P6719>{$grandstream_distinctive_ringtone_5}</P6719>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 6 -->
     <!-- # String -->
-    <P6720></P6720>
+    <P6720>{$grandstream_distinctive_ringtone_name_6}</P6720>
 
     <!-- # Matching Rule 6 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P6721>5</P6721>
+    <P6721>{$grandstream_distinctive_ringtone_6}</P6721>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 7 -->
     <!-- # String -->
-    <P26064></P26064>
+    <P26064>{$grandstream_distinctive_ringtone_name_7}</P26064>
 
     <!-- # Matching Rule 7 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P26065>5</P26065>
+    <P26065>{$grandstream_distinctive_ringtone_7}</P26065>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 8 -->
     <!-- # String -->
-    <P26066></P26066>
+    <P26066>{$grandstream_distinctive_ringtone_name_8}</P26066>
 
     <!-- # Matching Rule 8 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P26067>5</P26067>
+    <P26067>{$grandstream_distinctive_ringtone_8}</P26067>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 9 -->
     <!-- # String -->
-    <P26068></P26068>
+    <P26068>{$grandstream_distinctive_ringtone_name_9}</P26068>
 
     <!-- # Matching Rule 9 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P26069>5</P26069>
+    <P26069>{$grandstream_distinctive_ringtone_9}</P26069>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 10 -->
     <!-- # String -->
-    <P26096></P26096>
+    <P26096>{$grandstream_distinctive_ringtone_name_10}</P26096>
 
     <!-- # Matching Rule 10 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P26097>5</P26097>
+    <P26097>{$grandstream_distinctive_ringtone_10}</P26097>
 
     <!-- # Ring Timeout (in seconds). Default is 60 -->
     <!-- # Number: 30 - 3600 -->
@@ -1306,7 +1308,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2418></P2418>
+    <P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -1645,7 +1647,7 @@
 {if isset($grandstream_dial_plan) }
     <P459>{$grandstream_dial_plan}</P459>
 {else}
-    <P459>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P459>
+    <P459>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P459>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -2254,7 +2256,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2518></P2518>
+    <P2518>{if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}</P2518>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -2592,7 +2594,7 @@
 {if isset($grandstream_dial_plan) }
     <P559>{$grandstream_dial_plan}</P559>
 {else}
-    <P559>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P559>
+    <P559>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P559>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -2613,7 +2615,7 @@
 
     <!-- # Matching Incoming Caller ID. Matching Rule 1 -->
     <!-- # String -->
-    <P1500></P1500>
+    <P1500>{$grandstream_distinctive_ringtone_name_1}</P1500>
 
     <!-- # Matching Rule 1 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 0. -->
@@ -3203,7 +3205,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2618></P2618>
+    <P2618>{if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}</P2618>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -3543,7 +3545,7 @@
 {if isset($grandstream_dial_plan) }
     <P659>{$grandstream_dial_plan}</P659>
 {else}
-    <P659>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P659>
+    <P659>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P659>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -4153,7 +4155,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2718></P2718>
+    <P2718>{if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}</P2718>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -4491,7 +4493,7 @@
 {if isset($grandstream_dial_plan) }
     <P1759>{$grandstream_dial_plan}</P1759>
 {else}
-    <P1759>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P1759>
+    <P1759>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P1759>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -5358,18 +5360,18 @@
     <!-- # When set to Yes(1), it will override the configured provision path and method -->
     <!-- # Number: 0, 1, 2 -->
     <!-- # Mandatory -->
-    <P145>0</P145>
+    {if isset($grandstream_dhcp_option_override)}<P145>{$grandstream_dhcp_option_override}</P145>{else}<P145>1</P145>{/if}
 
     <!-- # Additional Override DHCP Option. 0 - None,  1 - Option 150,  2 - Option 160. Default is 0 -->
     <!-- # Number: 0, 1, 2 -->
     <!-- # Mandatory -->
-    <P8337>0</P8337>
+    {if isset($grandstream_dhcp_option_additional_override)}<P8337>{$grandstream_dhcp_option_additional_override}</P8337>{else}<P8337>0</P8337>{/if}
 
     <!-- # Allow DHCP Option 120 to Override SIP Server -->
     <!-- # 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1411>0</P1411>
+    {if isset($grandstream_dhcp_option_override_sip_server)}<P1411>{$grandstream_dhcp_option_override_sip_server}</P1411>{else}<P1411>0</P1411>{/if}
 
     <!-- # 3CX Auto Provision. 0 - No, 1 - Yes. Default is Yes -->
     <!-- # Number: 0, 1 -->
@@ -5430,7 +5432,7 @@
     <P237></P237>
 {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
@@ -6508,7 +6510,7 @@
 {if $grandstream_call_waiting_ring == "0"}    <P22102>0</P22102>{/if}
 {if $grandstream_call_waiting_ring == "1"}    <P22102>1</P22102>{/if}
 {else}
-<P2202>1</P2202>
+<P22102>1</P22102>
 {/if}
 
     <!-- # Disable Busy Tone on Remote Disconnect. 0 - No, 1 - Yes. Default is 0 -->
@@ -6678,7 +6680,7 @@
     <!-- # Hide BLF Remote Status. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P8374>0</P8374>
+    <P8374>{$grandstream_blf_remote_status}</P8374>
 
     <!-- # Show SIP Error Response. 0 - No, 1 - Yes. Default is 1 -->
     <!-- # Number: 0, 1 -->
@@ -7005,17 +7007,21 @@
     <!-- # HEADSET Key Mode. 0 - Default Mode, 1 - Toggle Headset/Speaker. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1312>0</P1312>
+{if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
 
     <!-- # Headset Type. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P6779>0</P6779>
+{if isset($grandstream_headset_type)}
+    <P6779>{$grandstream_headset_type}</P6779>
 
     <!-- # EHS Headset Ring Tone. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1487>0</P1487>
+    <P1487>{$grandstream_headset_type}</P1487>
+{/if}
 
     <!-- # Always Ring Speaker. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
@@ -7218,9 +7224,7 @@
 {if isset($grandstream_wallpaper_url)}
     <P2916>1</P2916>
     <P2917>{$grandstream_wallpaper_url}</P2917>
-{else}
-    <P2916>0</P2916>
-    <P2917></P2917>
+
 {/if}
 
     <!-- # Color Background. Default is #000000. -->
@@ -7232,8 +7236,6 @@
     <!-- # Mandatory -->
 {if isset($grandstream_screensaver)}
     <P2918>{$grandstream_screensaver}</P2918>
-{else}
-    <P2918>2</P2918>
 {/if}
 
     <!-- # Screensaver Source.  0 - Default, 1 - USB, 2 - Download. Default is 0.  -->
@@ -7241,8 +7243,6 @@
     <!-- # Mandatory -->
 {if isset($grandstream_screensaver_source)}
     <P6759>{$grandstream_screensaver_source}</P6759>
-{else}
-    <P6759>0</P6759>
 {/if}
 
     <!-- # Show Date and Time. 0 - No, 1 - Yes. Default is 1 -->
@@ -7351,7 +7351,9 @@
     <!-- # Speaker Ring Volume -->
     <!-- # Number: 0-7. Default is 5. -->
     <!-- # Mandatory -->
-    <P8352>5</P8352>
+{if isset($grandstream_speaker_ring_volume)}
+    <P8352>{$grandstream_speaker_ring_volume}</P8352>
+{/if} 
 
     <!-- # Notification Tone Volume -->
     <!-- # Number: 0-7. Default is 5. -->
@@ -7486,7 +7488,7 @@
 
 <!-- Detected {$template} with {$fixed_keys} fixed keys -->
 {$start_id=1363}
-{assign var=key_types value=["none"=>-1,"line"=>31,"shared line"=>32,"speed dial"=>0, "blf"=>1, "presence watcher"=>2, "eventlist blf"=>3,"speed dial active"=>4,"dial dtmf"=>5,"voicemail"=>6,"call return"=>7,"transfer"=>8,"call park"=>9,"intercom"=>10,"ldap search"=>11,"multicast paging"=>13,"record"=>14,"call log"=>15,"monitored call park"=>16,"menu"=>17]}
+{assign var=key_types value=["none"=>-1,"phonebook"=>30,"line"=>31,"shared line"=>32,"speed dial"=>0, "blf"=>1, "presence watcher"=>2, "eventlist blf"=>3,"speed dial active"=>4,"dial dtmf"=>5,"voicemail"=>6,"call return"=>7,"transfer"=>8,"call park"=>9,"intercom"=>10,"ldap search"=>11,"multicast paging"=>13,"record"=>14,"call log"=>15,"monitored call park"=>16,"menu"=>17]}
 
 {for $line=1 to 6}
 {$pid=$line*2-2}
diff --git a/resources/templates/provision/grandstream/grp2616/phonebook.xml b/resources/templates/provision/grandstream/grp2616/phonebook.xml
index 62c745db9f..deb211d001 100644
--- a/resources/templates/provision/grandstream/grp2616/phonebook.xml
+++ b/resources/templates/provision/grandstream/grp2616/phonebook.xml
@@ -1,49 +1,151 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
+
 <AddressBook>
-<version>1</version>
-{foreach $contacts as $contact}
-{if $contact.contact_type == "group"}
-<pbgroup>
-<id>{$contact.id}</id>
-<name>{$contact.group_description|truncate:10}</name>
-</pbgroup>
-{/if}
-{/foreach}
-{$i=0}
-{foreach $contacts as $contact}
-{if $contact.contact_name_given != "" && $contact.contact_type == "contact"}
-<Contact>
-<FirstName>{$contact.contact_name_given}</FirstName>
-<LastName>{$contact.contact_name_family}</LastName>
-{if $contact.contact_role != "" }
-<JobTitle>{$contact.contact_role}</JobTitle>
-{/if}
-{if $contact.contact_category != "" }
-<Department>{$contact.contact_category}</Department>
-{/if}
-<Phone type="Work">
-<phonenumber>{$contact.contact_work}</phonenumber>
-<accountindex>1</accountindex>
-</Phone>
-{if $contact.contact_home != "" }
-<Phone type="Home">
-<phonenumber>{$contact.contact_home}</phonenumber>
-<accountindex>1</accountindex>
-</Phone>
-{/if}
-{if $contact.contact_cell != "" }
-<Phone type="Cell">
-<phonenumber>{$contact.contact_cell}</phonenumber>
-<accountindex>1</accountindex>
-</Phone>
-{/if}
-{if $contact.contact_organization != "" }
-<Company>{$contact.contact_organization}</Company>
-{/if}
-{foreach $contact.groups as $group}
-<Group>{$group}</Group>
-{/foreach}
-</Contact>
-{/if}
-{/foreach}
+
+	<pbgroup>
+		<id>1</id>
+		<name>Users</name>
+		<ringtones>default ringtone</ringtones>
+	</pbgroup>
+	<pbgroup>
+		<id>2</id>
+		<name>Groups</name>
+		<ringtones>default ringtone</ringtones>
+	</pbgroup>
+	<pbgroup>
+		<id>3</id>
+		<name>Extensions</name>
+		<ringtones>system</ringtones>
+	</pbgroup>
+
+	{$start_id=0}
+	{foreach $contacts as $row}
+		{if $row.category == "users"}
+		<Contact>
+			<id>{$start_id++}</id>
+			{if $row.contact_name_given != ""}
+			{if $row.contact_organization != ""}
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<Company>{$row.contact_organization}</Company>
+			{else}
+				<FirstName>{$row.contact_name_given}</FirstName>
+				<LastName>{$row.contact_name_family}</LastName>
+			{/if}
+			{else}
+				<FirstName>{$row.effective_caller_id_name}</FirstName>
+			{/if}
+			<JobTitle></JobTitle>
+			<Frequent>0</Frequent>
+			{foreach $row.numbers as $number}
+			{if $number.phone_number != ""}
+				{if $number.phone_label == "work"}
+				<Phone type="Work">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+				{if $number.phone_label == "home"}
+				<Phone type="Home">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+				{if $number.phone_label == "mobile"}
+				<Phone type="Cell">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+			{/if}
+			{/foreach}
+			<Group>1</Group>
+			<Primary>0</Primary>
+			<Department></Department>
+			<Job></Job>
+			<Company></Company>
+		</Contact>
+		{elseif $row.category == "groups"}
+		<Contact>
+			<id>{$start_id++}</id>
+			{if $row.contact_name_given != ""}
+			{if $row.contact_organization != ""}
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<Company>{$row.contact_organization}</Company>
+			{else}
+				<FirstName>{$row.contact_name_given}</FirstName>
+				<LastName>{$row.contact_name_family}</LastName>
+			{/if}
+			{else}
+				<FirstName>{$row.effective_caller_id_name}</FirstName>
+			{/if}
+			<JobTitle></JobTitle>
+
+			<Frequent>0</Frequent>
+			{foreach $row.numbers as $number}
+			{if $number.phone_number != ""}
+				{if $number.phone_label == "work"}
+				<Phone type="Work">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+				{if $number.phone_label == "home"}
+				<Phone type="Home">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+				{if $number.phone_label == "mobile"}
+				<Phone type="Cell">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+			{/if}
+			{/foreach}
+			<Group>2</Group>
+			<Primary>0</Primary>
+			<Department></Department>
+			<Job></Job>
+			<Company></Company>
+		</Contact>
+		{elseif $row.category == "extensions"}
+		<Contact>
+			<id>{$start_id++}</id>
+			{if $row.contact_name_given != ""}
+			{if $row.contact_organization != ""}
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<Company>{$row.contact_organization}</Company>
+			{else}
+				<FirstName>{$row.contact_name_given}</FirstName>
+				<LastName>{$row.contact_name_family}</LastName>
+			{/if}
+			{else}
+				<FirstName>{$row.effective_caller_id_name}</FirstName>
+			{/if}
+			<JobTitle></JobTitle>
+			<Frequent>0</Frequent>
+			{if $row.phone_number != ""}
+				<Phone type="Work">
+					<phonenumber>{$row.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+			{else}
+				<Phone type="Work">
+					<phonenumber>{$row.phone_extension}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+			{/if}
+			<Group>3</Group>
+			<Primary>0</Primary>
+			<Department></Department>
+			<Job></Job>
+			<Company></Company>
+		</Contact>
+		{/if}
+	{/foreach}
+
 </AddressBook>
diff --git a/resources/templates/provision/grandstream/grp2616/{$mac}.xml b/resources/templates/provision/grandstream/grp2616/{$mac}.xml
index 43bf6d6cb7..d9ec6b3bef 100644
--- a/resources/templates/provision/grandstream/grp2616/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2616/{$mac}.xml
@@ -354,7 +354,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2318></P2318>
+    <P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -420,7 +420,9 @@
     <!-- # Feature Key Synchronization. 0 - Disabled, 1 - Enabled. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P2325>0</P2325>
+{if isset($grandstream_feature_key_sync)}
+    <P2325>{$grandstream_feature_key_sync}</P2325>
+{/if}
 
     <!-- # Broadsoft Call Park. 0 - Disabled, 1 - Enabled. Default is 0 -->
     <!-- # Number: 0, 1 -->
@@ -686,7 +688,7 @@
 
     <!-- # Dial Plan Prefix -->
     <!-- # String  -->
-    <P66></P66>
+    <P66>{$grandstream_dial_prefix}</P66>
 
     <!-- # Dial Plan. Default value is { x+ | \+x+ | *x+ | *xx*x+ } -->
     <!-- # String -->
@@ -695,7 +697,7 @@
 {if isset($grandstream_dial_plan) }
     <P290>{$grandstream_dial_plan}</P290>
 {else}
-    <P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P290>
+    <P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P290>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -793,7 +795,7 @@
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P1489>5</P1489>
+    <P1489>{$grandstream_distinctive_ringtone_1}</P1489>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 2 -->
     <!-- # String -->
@@ -803,87 +805,87 @@
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P1491>2</P1491>
+    <P1491>{$grandstream_distinctive_ringtone_2}</P1491>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 3 -->
     <!-- # String -->
-    <P1492>ring3</P1492>
+    <P1492>{$grandstream_distinctive_ringtone_name_3}</P1492>
 
     <!-- # Matching Rule 3 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P1493>3</P1493>
+    <P1493>{$grandstream_distinctive_ringtone_3}</P1493>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 4 -->
     <!-- # String -->
-    <P6716></P6716>
+    <P6716>{$grandstream_distinctive_ringtone_name_4}</P6716>
 
     <!-- # Matching Rule 4 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P6717>5</P6717>
+    <P6717>{$grandstream_distinctive_ringtone_4}</P6717>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 5 -->
     <!-- # String -->
-    <P6718></P6718>
+    <P6718>{$grandstream_distinctive_ringtone_name_5}</P6718>
 
     <!-- # Matching Rule 5 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P6719>5</P6719>
+    <P6719>{$grandstream_distinctive_ringtone_5}</P6719>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 6 -->
     <!-- # String -->
-    <P6720></P6720>
+    <P6720>{$grandstream_distinctive_ringtone_name_6}</P6720>
 
     <!-- # Matching Rule 6 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P6721>5</P6721>
+    <P6721>{$grandstream_distinctive_ringtone_6}</P6721>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 7 -->
     <!-- # String -->
-    <P26064></P26064>
+    <P26064>{$grandstream_distinctive_ringtone_name_7}</P26064>
 
     <!-- # Matching Rule 7 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P26065>5</P26065>
+    <P26065>{$grandstream_distinctive_ringtone_7}</P26065>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 8 -->
     <!-- # String -->
-    <P26066></P26066>
+    <P26066>{$grandstream_distinctive_ringtone_name_8}</P26066>
 
     <!-- # Matching Rule 8 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P26067>5</P26067>
+    <P26067>{$grandstream_distinctive_ringtone_8}</P26067>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 9 -->
     <!-- # String -->
-    <P26068></P26068>
+    <P26068>{$grandstream_distinctive_ringtone_name_9}</P26068>
 
     <!-- # Matching Rule 9 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P26069>5</P26069>
+    <P26069>{$grandstream_distinctive_ringtone_9}</P26069>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 10 -->
     <!-- # String -->
-    <P26096></P26096>
+    <P26096>{$grandstream_distinctive_ringtone_name_10}</P26096>
 
     <!-- # Matching Rule 10 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P26097>5</P26097>
+    <P26097>{$grandstream_distinctive_ringtone_10}</P26097>
 
     <!-- # Ring Timeout (in seconds). Default is 60 -->
     <!-- # Number: 30 - 3600 -->
@@ -1306,7 +1308,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2418></P2418>
+    <P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -1645,7 +1647,7 @@
 {if isset($grandstream_dial_plan) }
     <P459>{$grandstream_dial_plan}</P459>
 {else}
-    <P459>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P459>
+    <P459>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P459>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -2254,7 +2256,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2518></P2518>
+    <P2518>{if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}</P2518>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -2592,7 +2594,7 @@
 {if isset($grandstream_dial_plan) }
     <P559>{$grandstream_dial_plan}</P559>
 {else}
-    <P559>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P559>
+    <P559>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P559>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -2613,7 +2615,7 @@
 
     <!-- # Matching Incoming Caller ID. Matching Rule 1 -->
     <!-- # String -->
-    <P1500></P1500>
+    <P1500>{$grandstream_distinctive_ringtone_name_1}</P1500>
 
     <!-- # Matching Rule 1 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 0. -->
@@ -3203,7 +3205,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2618></P2618>
+    <P2618>{if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}</P2618>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -3543,7 +3545,7 @@
 {if isset($grandstream_dial_plan) }
     <P659>{$grandstream_dial_plan}</P659>
 {else}
-    <P659>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P659>
+    <P659>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P659>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -4153,7 +4155,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2718></P2718>
+    <P2718>{if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}</P2718>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -4491,7 +4493,7 @@
 {if isset($grandstream_dial_plan) }
     <P1759>{$grandstream_dial_plan}</P1759>
 {else}
-    <P1759>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P1759>
+    <P1759>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P1759>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -5103,7 +5105,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2818></P2818>
+    <P2818>{if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}</P2818>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -5443,7 +5445,7 @@
 {if isset($grandstream_dial_plan) }
     <P1859>{$grandstream_dial_plan}</P1859>
 {else}
-    <P1859>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P1859>
+    <P1859>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P1859>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -6309,18 +6311,18 @@
     <!-- # When set to Yes(1), it will override the configured provision path and method -->
     <!-- # Number: 0, 1, 2 -->
     <!-- # Mandatory -->
-    <P145>0</P145>
+    {if isset($grandstream_dhcp_option_override)}<P145>{$grandstream_dhcp_option_override}</P145>{else}<P145>1</P145>{/if}
 
     <!-- # Additional Override DHCP Option. 0 - None,  1 - Option 150,  2 - Option 160. Default is 0 -->
     <!-- # Number: 0, 1, 2 -->
     <!-- # Mandatory -->
-    <P8337>0</P8337>
+    {if isset($grandstream_dhcp_option_additional_override)}<P8337>{$grandstream_dhcp_option_additional_override}</P8337>{else}<P8337>0</P8337>{/if}
 
     <!-- # Allow DHCP Option 120 to Override SIP Server -->
     <!-- # 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1411>0</P1411>
+    {if isset($grandstream_dhcp_option_override_sip_server)}<P1411>{$grandstream_dhcp_option_override_sip_server}</P1411>{else}<P1411>0</P1411>{/if}
 
     <!-- # 3CX Auto Provision. 0 - No, 1 - Yes. Default is Yes -->
     <!-- # Number: 0, 1 -->
@@ -6381,7 +6383,7 @@
     <P237></P237>
 {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
@@ -7468,7 +7470,7 @@
 {if $grandstream_call_waiting_ring == "0"}    <P22102>0</P22102>{/if}
 {if $grandstream_call_waiting_ring == "1"}    <P22102>1</P22102>{/if}
 {else}
-<P2202>1</P2202>
+<P22102>1</P22102>
 {/if}
 
     <!-- # Disable Busy Tone on Remote Disconnect. 0 - No, 1 - Yes. Default is 0 -->
@@ -7642,7 +7644,7 @@
     <!-- # Hide BLF Remote Status. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P8374>0</P8374>
+    <P8374>{$grandstream_blf_remote_status}</P8374>
 
     <!-- # Show SIP Error Response. 0 - No, 1 - Yes. Default is 1 -->
     <!-- # Number: 0, 1 -->
@@ -7969,17 +7971,21 @@
     <!-- # HEADSET Key Mode. 0 - Default Mode, 1 - Toggle Headset/Speaker. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1312>0</P1312>
+{if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
 
     <!-- # Headset Type. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P6779>0</P6779>
+{if isset($grandstream_headset_type)}
+    <P6779>{$grandstream_headset_type}</P6779>
 
     <!-- # EHS Headset Ring Tone. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1487>0</P1487>
+    <P1487>{$grandstream_headset_type}</P1487>
+{/if}
 
     <!-- # Always Ring Speaker. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
@@ -8183,9 +8189,7 @@
 {if isset($grandstream_wallpaper_url)}
     <P2916>1</P2916>
     <P2917>{$grandstream_wallpaper_url}</P2917>
-{else}
-    <P2916>0</P2916>
-    <P2917></P2917>
+
 {/if}
 
     <!-- # Color Background. Default is #000000. -->
@@ -8197,8 +8201,6 @@
     <!-- # Mandatory -->
 {if isset($grandstream_screensaver)}
     <P2918>{$grandstream_screensaver}</P2918>
-{else}
-    <P2918>2</P2918>
 {/if}
 
     <!-- # Screensaver Source.  0 - Default, 1 - USB, 2 - Download. Default is 0. -->
@@ -8206,8 +8208,6 @@
     <!-- # Mandatory -->
 {if isset($grandstream_screensaver_source)}
     <P6759>{$grandstream_screensaver_source}</P6759>
-{else}
-    <P6759>0</P6759>
 {/if}
 
     <!-- # Show Date and Time. 0 - No, 1 - Yes. Default is 1 -->
@@ -8330,7 +8330,9 @@
     <!-- # Speaker Ring Volume -->
     <!-- # Number: 0-7. Default is 5. -->
     <!-- # Mandatory -->
-    <P8352>5</P8352>
+{if isset($grandstream_speaker_ring_volume)}
+    <P8352>{$grandstream_speaker_ring_volume}</P8352>
+{/if} 
 
     <!-- # Notification Tone Volume -->
     <!-- # Number: 0-7. Default is 5. -->
@@ -8464,7 +8466,7 @@
 
 <!-- Detected {$template} with {$fixed_keys} fixed keys -->
 {$start_id=1363}
-{assign var=key_types value=["none"=>-1,"line"=>31,"shared line"=>32,"speed dial"=>0, "blf"=>1, "presence watcher"=>2, "eventlist blf"=>3,"speed dial active"=>4,"dial dtmf"=>5,"voicemail"=>6,"call return"=>7,"transfer"=>8,"call park"=>9,"intercom"=>10,"ldap search"=>11,"multicast paging"=>13,"record"=>14,"call log"=>15,"monitored call park"=>16,"menu"=>17]}
+{assign var=key_types value=["none"=>-1,"phonebook"=>30,"line"=>31,"shared line"=>32,"speed dial"=>0, "blf"=>1, "presence watcher"=>2, "eventlist blf"=>3,"speed dial active"=>4,"dial dtmf"=>5,"voicemail"=>6,"call return"=>7,"transfer"=>8,"call park"=>9,"intercom"=>10,"ldap search"=>11,"multicast paging"=>13,"record"=>14,"call log"=>15,"monitored call park"=>16,"menu"=>17]}
 
 {for $line=1 to 6}
 {$pid=$line*2-2}
@@ -8813,7 +8815,7 @@
     <!-- # P8480 = -->
 
     <!-- ###################################################################################### -->
-    <!-- # Softkey 3 --->
+    <!-- # Softkey 3 -->
     <!-- ###################################################################################### -->
     <!-- # Key Mode. -->
     <!-- # 0 - Default, 10 - Speed Dial, 14 - Speed Dial via active account, 15 - Dial DTMF, 16 - Voicemail,  -->
@@ -8831,7 +8833,7 @@
     <!-- # P8483 =  -->
 
     <!-- ######################################################################## -->
-    <!-- ##          Settings/Extension Boards --->
+    <!-- ##          Settings/Extension Boards -->
     <!-- ######################################################################## -->
 
     <!-- ######################################################################## -->
@@ -8895,7 +8897,6 @@
 {/if}
 
 {/for}
-{
 
   </config>
 </gs_provision>
diff --git a/resources/templates/provision/grandstream/grp26xx/{$mac}.xml b/resources/templates/provision/grandstream/grp26xx/{$mac}.xml
index 765d517f9c..20351d820e 100644
--- a/resources/templates/provision/grandstream/grp26xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp26xx/{$mac}.xml
@@ -350,7 +350,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2318></P2318>
+    <P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -416,7 +416,9 @@
     <!-- # Feature Key Synchronization. 0 - Disabled, 1 - Enabled. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P2325>0</P2325>
+{if isset($grandstream_feature_key_sync)}
+    <P2325>{$grandstream_feature_key_sync}</P2325>
+{/if}
 
     <!-- # Broadsoft Call Park. 0 - Disabled, 1 - Enabled. Default is 0 -->
     <!-- # Number: 0, 1 -->
@@ -695,7 +697,7 @@
 
     <!-- # Dial Plan Prefix -->
     <!-- # String  -->
-    <P66></P66>
+    <P66>{$grandstream_dial_prefix}</P66>
 
     <!-- # Dial Plan. Default value is { x+ | \+x+ | *x+ | *xx*x+ } -->
     <!-- # String -->
@@ -704,7 +706,7 @@
 {if isset($grandstream_dial_plan) }
     <P290>{$grandstream_dial_plan}</P290>
 {else}
-    <P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P290>
+    <P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P290>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -800,7 +802,7 @@
     <!-- # 1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P1489>5</P1489>
+    <P1489>{$grandstream_distinctive_ringtone_1}</P1489>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 2 -->
     <!-- # String -->
@@ -810,87 +812,87 @@
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P1491>2</P1491>
+    <P1491>{$grandstream_distinctive_ringtone_2}</P1491>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 3 -->
     <!-- # String -->
-    <P1492>ring3</P1492>
+    <P1492>{$grandstream_distinctive_ringtone_name_3}</P1492>
 
     <!-- # Matching Rule 3 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P1493>3</P1493>
+    <P1493>{$grandstream_distinctive_ringtone_3}</P1493>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 4 -->
     <!-- # String -->
-    <P6716></P6716>
+    <P6716>{$grandstream_distinctive_ringtone_name_4}</P6716>
 
     <!-- # Matching Rule 4 Distinctive Ringtone -->
     <!-- # 1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P6717>5</P6717>
+    <P6717>{$grandstream_distinctive_ringtone_4}</P6717>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 5 -->
     <!-- # String -->
-    <P6718></P6718>
+    <P6718>{$grandstream_distinctive_ringtone_name_5}</P6718>
 
     <!-- # Matching Rule 5 Distinctive Ringtone -->
     <!-- # 1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P6719>5</P6719>
+    <P6719>{$grandstream_distinctive_ringtone_5}</P6719>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 6 -->
     <!-- # String -->
-    <P6720></P6720>
+    <P6720>{$grandstream_distinctive_ringtone_name_6}</P6720>
 
     <!-- # Matching Rule 6 Distinctive Ringtone -->
     <!-- # 1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P6721>5</P6721>
+    <P6721>{$grandstream_distinctive_ringtone_6}</P6721>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 7 -->
     <!-- # String -->
-    <P26064></P26064>
+    <P26064>{$grandstream_distinctive_ringtone_name_7}</P26064>
 
     <!-- # Matching Rule 7 Distinctive Ringtone -->
     <!-- # 1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P26065>5</P26065>
+    <P26065>{$grandstream_distinctive_ringtone_7}</P26065>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 8 -->
     <!-- # String -->
-    <P26066></P26066>
+    <P26066>{$grandstream_distinctive_ringtone_name_8}</P26066>
 
     <!-- # Matching Rule 8 Distinctive Ringtone -->
     <!-- # 1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P26067>5</P26067>
+    <P26067>{$grandstream_distinctive_ringtone_8}</P26067>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 9 -->
     <!-- # String -->
-    <P26068></P26068>
+    <P26068>{$grandstream_distinctive_ringtone_name_9}</P26068>
 
     <!-- # Matching Rule 9 Distinctive Ringtone -->
     <!-- # 1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P26069>5</P26069>
+    <P26069>{$grandstream_distinctive_ringtone_9}</P26069>
 
     <!-- # Matching Incoming Caller ID. Matching Rule 10 -->
     <!-- # String -->
-    <P26096></P26096>
+    <P26096>{$grandstream_distinctive_ringtone_name_10}</P26096>
 
     <!-- # Matching Rule 10 Distinctive Ringtone -->
     <!-- # 1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 5. -->
     <!-- # Number: -1, 0, 1, 2, 3, 4, 5 -->
     <!-- # Mandatory -->
-    <P26097>5</P26097>
+    <P26097>{$grandstream_distinctive_ringtone_10}</P26097>
 
     <!-- # Ring Timeout (in seconds). Default is 60 -->
     <!-- # Number: 30 - 3600 -->
@@ -1324,7 +1326,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2418></P2418>
+    <P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -1673,7 +1675,7 @@
 {if isset($grandstream_dial_plan) }
     <P459>{$grandstream_dial_plan}</P459>
 {else}
-    <P459>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P459>
+    <P459>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P459>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -2291,7 +2293,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2518></P2518>
+    <P2518>{if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}</P2518>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -2642,7 +2644,7 @@
 {if isset($grandstream_dial_plan) }
     <P559>{$grandstream_dial_plan}</P559>
 {else}
-    <P559>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P559>
+    <P559>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P559>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -2731,7 +2733,7 @@
 
     <!-- # Matching Incoming Caller ID. Matching Rule 1 -->
     <!-- # String -->
-    <P1500></P1500>
+    <P1500>{$grandstream_distinctive_ringtone_name_1}</P1500>
 
     <!-- # Matching Rule 1 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 0. -->
@@ -3260,7 +3262,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2618></P2618>
+    <P2618>{if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}</P2618>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -3613,7 +3615,7 @@
 {if isset($grandstream_dial_plan) }
     <P659>{$grandstream_dial_plan}</P659>
 {else}
-    <P659>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P659>
+    <P659>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P659>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -4231,7 +4233,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2718></P2718>
+    <P2718>{if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}</P2718>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -4584,7 +4586,7 @@
 {if isset($grandstream_dial_plan) }
     <P1759>{$grandstream_dial_plan}</P1759>
 {else}
-    <P1759>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P1759>
+    <P1759>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P1759>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -5674,18 +5676,18 @@
     <!-- # When set to Yes(1), it will override the configured provision path and method -->
     <!-- # Number: 0, 1, 2 -->
     <!-- # Mandatory -->
-    <P145>1</P145>
+    {if isset($grandstream_dhcp_option_override)}<P145>{$grandstream_dhcp_option_override}</P145>{else}<P145>1</P145>{/if}
 
     <!-- # Additional Override DHCP Option. 0 - None,  1 - Option 150,  2 - Option 160. Default is 0 -->
     <!-- # Number: 0, 1, 2 -->
     <!-- # Mandatory -->
-    <P8337>0</P8337>
+    {if isset($grandstream_dhcp_option_additional_override)}<P8337>{$grandstream_dhcp_option_additional_override}</P8337>{else}<P8337>0</P8337>{/if}
 
     <!-- # Allow DHCP Option 120 to Override SIP Server -->
     <!-- # 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1411>0</P1411>
+    {if isset($grandstream_dhcp_option_override_sip_server)}<P1411>{$grandstream_dhcp_option_override_sip_server}</P1411>{else}<P1411>0</P1411>{/if}
 
     <!-- # 3CX Auto Provision. 0 - No, 1 - Yes. Default is Yes -->
     <!-- # Number: 0, 1 -->
@@ -5746,7 +5748,7 @@
     <P237></P237>
 {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
@@ -6997,7 +6999,7 @@
     <!-- # Hide BLF Remote Status. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P8374>0</P8374>
+    <P8374>{$grandstream_blf_remote_status}</P8374>
 
     <!-- # Show SIP Error Response. 0 - No, 1 - Yes. Default is 1 -->
     <!-- # Number: 0, 1 -->
@@ -7247,17 +7249,21 @@
     <!-- # HEADSET Key Mode. 0 - Default Mode, 1 - Toggle Headset/Speaker. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1312>0</P1312>
+{if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
 
     <!-- # Headset Type. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1487>0</P1487>
+{if isset($grandstream_headset_type)}
+    <P6779>{$grandstream_headset_type}</P6779>
 
-    <!-- # EHS Headset Ringtone. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
+    <!-- # EHS Headset Ring Tone. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P6779>0</P6779>
+    <P1487>{$grandstream_headset_type}</P1487>
+{/if}
 
     <!-- # Always Ring Speaker. 0 - No, 1 - Yes, both, 2 - Yes, speaker only. Default is 0 -->
     <!-- # Number: 0, 1, 2 -->
@@ -7471,16 +7477,14 @@
     <!-- # Wallpaper Source. 0 - Default, 1 - Download, 2-USB(for GXP2140/2160/2170 only), 3 - Uploaded, 4 - Color Background -->
     <!-- # Number: 0-4 -->
     <!-- # Mandatory -->
-    <P2916>0</P2916>
+    <!-- <P2916>0</P2916> -->
 
     <!-- # Wallpaper Server Path -->
     <!-- # String  -->
 {if isset($grandstream_wallpaper_url)}
     <P2916>1</P2916>
     <P2917>{$grandstream_wallpaper_url}</P2917>
-{else}
-    <P2916>0</P2916>
-    <P2917></P2917>
+
 {/if}
 
     <!-- # Color Background. Default is #000000. -->
@@ -7492,8 +7496,6 @@
     <!-- # Mandatory -->
 {if isset($grandstream_screensaver)}
     <P2918>{$grandstream_screensaver}</P2918>
-{else}
-    <P2918>1</P2918>
 {/if}
 
     <!-- # Screensaver Source.  0 - Default, 1 - USB, 2 - Download. Default is 0.  -->
@@ -7501,8 +7503,6 @@
     <!-- # Mandatory -->
 {if isset($grandstream_screensaver_source)}
     <P6759>{$grandstream_screensaver_source}</P6759>
-{else}
-    <P6759>0</P6759>
 {/if}
 
     <!-- # Show Date and Time. 0 - No, 1 - Yes. Default is 1 -->
@@ -7625,7 +7625,9 @@
     <!-- # Speaker Ring Volume -->
     <!-- # Number: 0-7. Default is 5. -->
     <!-- # Mandatory -->
-    <P8352>5</P8352>
+{if isset($grandstream_speaker_ring_volume)}
+    <P8352>{$grandstream_speaker_ring_volume}</P8352>
+{/if} 
 
     <!-- # Notification Tone Volume -->
     <!-- # Number: 0-7. Default is 5. -->
@@ -7794,7 +7796,7 @@
 {if $template == "grandstream/grp2615"}{$fixed_keys=10}{/if}
 <!-- Detected {$template} with {$fixed_keys} fixed keys -->
 {$start_id=1363}
-{assign var=key_types value=["none"=>-1,"line"=>31,"sharedline"=>32,"speeddial"=>0, "blf"=>1, "presence watcher"=>2, "eventlist blf"=>3,"speed dial active"=>4,"dial dtmf"=>5,"voicemail"=>6,"call return"=>7,"transfer"=>8,"call park"=>9,"intercom"=>10,"ldap search"=>11,"multicast paging"=>13,"record"=>14,"call log"=>15,"monitored call park"=>16,"menu"=>17,"dnd"=>22]}
+{assign var=key_types value=["none"=>-1,"phonebook"=>30,"line"=>31,"shared line"=>32,"speed dial"=>0, "blf"=>1, "presence watcher"=>2, "eventlist blf"=>3,"speed dial active"=>4,"dial dtmf"=>5,"voicemail"=>6,"call return"=>7,"transfer"=>8,"call park"=>9,"intercom"=>10,"ldap search"=>11,"multicast paging"=>13,"record"=>14,"call log"=>15,"monitored call park"=>16,"menu"=>17,"dnd"=>22]}
 
 {for $line=1 to 6}
 {$pid=$line*2-2}
diff --git a/resources/templates/provision/grandstream/gxp110x/{$mac}.xml b/resources/templates/provision/grandstream/gxp110x/{$mac}.xml
index 516c02b91b..ecb28b3e4c 100644
--- a/resources/templates/provision/grandstream/gxp110x/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp110x/{$mac}.xml
@@ -353,7 +353,7 @@
 
 <!-- Conference URI -->
 <!-- String -->
-<P2318></P2318>
+<P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
 
 <!-- Music On Hold URI -->
 <!-- String -->
@@ -584,7 +584,7 @@
 {if isset($grandstream_dial_plan) }
 <P290>{$grandstream_dial_plan}</P290>
 {else}
-<P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P290>
+<P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P290>
 {/if}
     
 <!-- Delayed Call Forward Wait Time (in seconds). Default is 20 -->
@@ -609,33 +609,33 @@
 
 <!-- Matching Incoming Caller ID. Matching Rule 1 -->
 <!-- String -->
-<P1488></P1488>
+<P1488>{$grandstream_distinctive_ringtone_name_1}</P1488>
 
 <!-- Matching Rule 1 Distinctive Ringtone -->
 <!-- 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3. Default is 0. -->
 <!-- Number: 0, 1, 2, 3 -->
 <!-- Mandatory -->
-<P1489>0</P1489>
+<P1489>{$grandstream_distinctive_ringtone_1}</P1489>
 
 <!-- Matching Incoming Caller ID. Matching Rule 2 -->
 <!-- String -->
-<P1490></P1490>
+<P1490>{$grandstream_distinctive_ringtone_name_2}</P1490>
 
 <!-- Matching Rule 2 Distinctive Ringtone -->
 <!-- 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3. Default is 0 -->
 <!-- Number: 0, 1, 2, 3 -->
 <!-- Mandatory -->
-<P1491>0</P1491>
+<P1491>{$grandstream_distinctive_ringtone_2}</P1491>
 
 <!-- Matching Incoming Caller ID. Matching Rule 3 -->
 <!-- String -->
-<P1492></P1492>
+<P1492>{$grandstream_distinctive_ringtone_name_3}</P1492>
 
 <!-- Matching Rule 3 Distinctive Ringtone -->
 <!-- 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3. Default is 0 -->
 <!-- Number: 0, 1, 2, 3 -->
 <!-- Mandatory -->
-<P1493>0</P1493>
+<P1493>{$grandstream_distinctive_ringtone_3}</P1493>
 
 <!-- Ring Timeout (in seconds). Default is 60 -->
 <!-- Number: 30 - 3600 -->
@@ -940,7 +940,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
@@ -964,13 +964,13 @@
 <!-- When set to Yes(1), it will override the configured provision path and method -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P145>1</P145>
+{if isset($grandstream_dhcp_option_override)}<P145>{$grandstream_dhcp_option_override}</P145>{else}<P145>1</P145>{/if}
 
 <!-- Allow DHCP Option 120 to Override SIP Server -->
 <!-- 0 - No, 1 - Yes. Default is 0 -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P1411>0</P1411>
+{if isset($grandstream_dhcp_option_override_sip_server)}<P1411>{$grandstream_dhcp_option_override_sip_server}</P1411>{else}<P1411>0</P1411>{/if}
 
 <!-- Automatic Upgrade. 0 - No, 1 - Yes. Default is No -->
 <!-- Number: 0, 1 -->
diff --git a/resources/templates/provision/grandstream/gxp116x/{$mac}.xml b/resources/templates/provision/grandstream/gxp116x/{$mac}.xml
index a563803545..7d9ce41884 100644
--- a/resources/templates/provision/grandstream/gxp116x/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp116x/{$mac}.xml
@@ -227,7 +227,7 @@
 
 <!--  Conference URI -->
 <!--  String -->
-<P2318></P2318>
+<P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
 
 <!--  Music On Hold URI -->
 <!--  String -->
@@ -453,7 +453,7 @@
 {if isset($grandstream_dial_plan) }
 <P290>{$grandstream_dial_plan}</P290>
 {else}
-<P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P290>
+<P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P290>
 {/if}
 
 <!--  Delayed Call Forward Wait Time (in seconds). Default is 20 -->
@@ -478,33 +478,33 @@
 
 <!--  Matching Incoming Caller ID. Matching Rule 1 -->
 <!--  String -->
-<P1488></P1488>
+<P1488>{$grandstream_distinctive_ringtone_name_1}</P1488>
 
 <!--  Matching Rule 1 Distinctive Ringtone -->
 <!--  0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3. Default is 0. -->
 <!--  Number: 0, 1, 2, 3 -->
 <!--  Mandatory -->
-<P1489>0</P1489>
+<P1489>{$grandstream_distinctive_ringtone_1}</P1489>
 
 <!--  Matching Incoming Caller ID. Matching Rule 2 -->
 <!--  String -->
-<P1490></P1490>
+<P1490>{$grandstream_distinctive_ringtone_name_2}</P1490>
 
 <!--  Matching Rule 2 Distinctive Ringtone -->
 <!--  0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3. Default is 0 -->
 <!--  Number: 0, 1, 2, 3 -->
 <!--  Mandatory -->
-<P1491>0</P1491>
+<P1491>{$grandstream_distinctive_ringtone_2}</P1491>
 
 <!--  Matching Incoming Caller ID. Matching Rule 3 -->
 <!--  String -->
-<P1492></P1492>
+<P1492>{$grandstream_distinctive_ringtone_name_3}</P1492>
 
 <!--  Matching Rule 3 Distinctive Ringtone -->
 <!--  0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3. Default is 0 -->
 <!--  Number: 0, 1, 2, 3 -->
 <!--  Mandatory -->
-<P1493>0</P1493>
+<P1493>{$grandstream_distinctive_ringtone_3}</P1493>
 
 <!--  Ring Timeout (in seconds). Default is 60 -->
 <!--  Number: 30 - 3600 -->
@@ -814,7 +814,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
@@ -838,13 +838,13 @@
 <!--  When set to Yes(1), it will override the configured provision path and method -->
 <!--  Number: 0, 1 -->
 <!--  Mandatory -->
-<P145>1</P145>
+{if isset($grandstream_dhcp_option_override)}<P145>{$grandstream_dhcp_option_override}</P145>{else}<P145>1</P145>{/if}
 
 <!--  Allow DHCP Option 120 to Override SIP Server -->
 <!--  0 - No, 1 - Yes. Default is 0 -->
 <!--  Number: 0, 1V -->
 <!--  Mandatory -->
-<P1411>0</P1411>
+{if isset($grandstream_dhcp_option_override_sip_server)}<P1411>{$grandstream_dhcp_option_override_sip_server}</P1411>{else}<P1411>0</P1411>{/if}
 
 <!--  Automatic Upgrade. 0 - No, 1 - Yes. Default is No -->
 <!--  Number: 0, 1 -->
@@ -1279,12 +1279,21 @@
 <!--  HEADSET Key Mode. 0 - Default Mode, 1 - Toggle Headset/Speaker. Default is 0 -->
 <!--  Number: 0, 1 -->
 <!--  Mandatory -->
-<P1312>0</P1312>
+{if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
 
-<!--  Headset Type. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
-<!--  Number: 0, 1 -->
-<!--  Mandatory -->
-<P1487>0</P1487>
+    <!-- # Headset Type. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
+    <!-- # Number: 0, 1 -->
+    <!-- # Mandatory -->
+{if isset($grandstream_headset_type)}
+    <P6779>{$grandstream_headset_type}</P6779>
+
+    <!-- # EHS Headset Ring Tone. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
+    <!-- # Number: 0, 1 -->
+    <!-- # Mandatory -->
+    <P1487>{$grandstream_headset_type}</P1487>
+{/if}
 
 <!--  Always Ring Speaker. 0 - No, 1 - Yes. Default is 0 -->
 <!--  Number: 0, 1 -->
diff --git a/resources/templates/provision/grandstream/gxp140x/{$mac}.xml b/resources/templates/provision/grandstream/gxp140x/{$mac}.xml
index 9a9b3c0acb..18977b16ed 100644
--- a/resources/templates/provision/grandstream/gxp140x/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp140x/{$mac}.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <gs_provision version="1">
   <config version="1">
     <!--  Configuration Template For GXP140x Firmware Version 1.0.5.26 -->
@@ -290,7 +290,9 @@
     <!--  Feature Key Synchronization. 0 - Disabled, 1 - Enabled. Default is 0 -->
     <!--  Number: 0, 1 -->
     <!--  Mandatory -->
-    <P2325>0</P2325>
+{if isset($grandstream_feature_key_sync)}
+    <P2325>{$grandstream_feature_key_sync}</P2325>
+{/if}
     <!--  Line-Seize Timeout (in seconds). Default is 15 -->
     <!--  Number: 15 - 60 -->
     <!--  Mandatory -->
@@ -300,7 +302,7 @@
     <P134></P134>
     <!--  Conference URI -->
     <!--  String -->
-    <P2318></P2318>
+    <P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
     <!--  Music On Hold URI -->
     <!--  String -->
     <P2350></P2350>
@@ -481,7 +483,7 @@
     {if isset($grandstream_dial_plan) }
     <P290>{$grandstream_dial_plan}</P290>
     {else}
-    <P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P290>
+    <P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P290>
     {/if}
     
     <!--  Delayed Call Forward Wait Time (in seconds). Default is 20 -->
@@ -502,28 +504,28 @@
     <P104>0</P104>
     <!--  Matching Incoming Caller ID. Matching Rule 1 -->
     <!--  String -->
-    <P1488></P1488>
+    <P1488>{$grandstream_distinctive_ringtone_name_1}</P1488>
     <!--  Matching Rule 1 Distinctive Ringtone -->
     <!--  0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3. Default is 0. -->
     <!--  Number: 0, 1, 2, 3 -->
     <!--  Mandatory -->
-    <P1489>0</P1489>
+    <P1489>{$grandstream_distinctive_ringtone_1}</P1489>
     <!--  Matching Incoming Caller ID. Matching Rule 2 -->
     <!--  String -->
-    <P1490></P1490>
+    <P1490>{$grandstream_distinctive_ringtone_name_2}</P1490>
     <!--  Matching Rule 2 Distinctive Ringtone -->
     <!--  0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3. Default is 0 -->
     <!--  Number: 0, 1, 2, 3 -->
     <!--  Mandatory -->
-    <P1491>0</P1491>
+    <P1491>{$grandstream_distinctive_ringtone_2}</P1491>
     <!--  Matching Incoming Caller ID. Matching Rule 3 -->
     <!--  String -->
-    <P1492></P1492>
+    <P1492>{$grandstream_distinctive_ringtone_name_3}</P1492>
     <!--  Matching Rule 3 Distinctive Ringtone -->
     <!--  0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3. Default is 0 -->
     <!--  Number: 0, 1, 2, 3 -->
     <!--  Mandatory -->
-    <P1493>0</P1493>
+    <P1493>{$grandstream_distinctive_ringtone_3}</P1493>
     <!--  Ring Timeout (in seconds). Default is 60 -->
     <!--  Number: 30 - 3600 -->
     <!--  Mandatory -->
@@ -734,7 +736,7 @@
     <P444></P444>
     <!--  Conference URI -->
     <!--  String -->
-    <P2418></P2418>
+    <P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
     <!--  Music On Hold URI -->
     <!--  String -->
     <P2450></P2450>
@@ -1186,7 +1188,7 @@
     <P237></P237>
     {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-    {else}
+    {elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
     {/if}
     
@@ -1206,12 +1208,12 @@
     <!--  When set to Yes(1), it will override the configured provision path and method -->
     <!--  Number: 0, 1 -->
     <!--  Mandatory -->
-    <P145>1</P145>
+    {if isset($grandstream_dhcp_option_override)}<P145>{$grandstream_dhcp_option_override}</P145>{else}<P145>1</P145>{/if}
     <!--  Allow DHCP Option 120 to Override SIP Server -->
     <!--  0 - No, 1 - Yes. Default is 0 -->
     <!--  Number: 0, 1 -->
     <!--  Mandatory -->
-    <P1411>0</P1411>
+    {if isset($grandstream_dhcp_option_override_sip_server)}<P1411>{$grandstream_dhcp_option_override_sip_server}</P1411>{else}<P1411>0</P1411>{/if}
     <!--  Automatic Upgrade. 0 - No, 1 - Yes. Default is No -->
     <!--  Number: 0, 1 -->
     <!--  Mandatory -->
@@ -1548,7 +1550,9 @@
     <!--  HEADSET Key Mode. 0 = Default Mode, 1 = Toggle Headset/Speaker. Default is 0 -->
     <!--  Number: 0, 1 -->
     <!--  Mandatory -->
-    <P1312>0</P1312>
+    {if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
     <!--  Always Ring Speaker. 0 - No, 1 - Yes. Default is 0 -->
     <!--  Number: 0, 1 -->
     <!--  Mandatory -->
diff --git a/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml b/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml
index b2073dec5f..248e5623fa 100644
--- a/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml
@@ -290,7 +290,9 @@
     <!--  Feature Key Synchronization. 0 - Disabled, 1 - Enabled. Default is 0 -->
     <!--  Number: 0, 1 -->
     <!--  Mandatory -->
-    <P2325>0</P2325>
+{if isset($grandstream_feature_key_sync)}
+    <P2325>{$grandstream_feature_key_sync}</P2325>
+{/if}
     <!--  Line-Seize Timeout (in seconds). Default is 15 -->
     <!--  Number: 15 - 60 -->
     <!--  Mandatory -->
@@ -300,7 +302,7 @@
     <P134></P134>
     <!--  Conference URI -->
     <!--  String -->
-    <P2318></P2318>
+    <P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
     <!--  Music On Hold URI -->
     <!--  String -->
     <P2350></P2350>
@@ -481,7 +483,7 @@
     {if isset($grandstream_dial_plan) }
     <P290>{$grandstream_dial_plan}</P290>
     {else}
-    <P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P290>
+    <P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P290>
     {/if}
     
     <!--  Delayed Call Forward Wait Time (in seconds). Default is 20 -->
@@ -502,28 +504,28 @@
     <P104>0</P104>
     <!--  Matching Incoming Caller ID. Matching Rule 1 -->
     <!--  String -->
-    <P1488></P1488>
+    <P1488>{$grandstream_distinctive_ringtone_name_1}</P1488>
     <!--  Matching Rule 1 Distinctive Ringtone -->
     <!--  0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3. Default is 0. -->
     <!--  Number: 0, 1, 2, 3 -->
     <!--  Mandatory -->
-    <P1489>0</P1489>
+    <P1489>{$grandstream_distinctive_ringtone_1}</P1489>
     <!--  Matching Incoming Caller ID. Matching Rule 2 -->
     <!--  String -->
-    <P1490></P1490>
+    <P1490>{$grandstream_distinctive_ringtone_name_2}</P1490>
     <!--  Matching Rule 2 Distinctive Ringtone -->
     <!--  0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3. Default is 0 -->
     <!--  Number: 0, 1, 2, 3 -->
     <!--  Mandatory -->
-    <P1491>0</P1491>
+    <P1491>{$grandstream_distinctive_ringtone_2}</P1491>
     <!--  Matching Incoming Caller ID. Matching Rule 3 -->
     <!--  String -->
-    <P1492></P1492>
+    <P1492>{$grandstream_distinctive_ringtone_name_3}</P1492>
     <!--  Matching Rule 3 Distinctive Ringtone -->
     <!--  0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3. Default is 0 -->
     <!--  Number: 0, 1, 2, 3 -->
     <!--  Mandatory -->
-    <P1493>0</P1493>
+    <P1493>{$grandstream_distinctive_ringtone_3}</P1493>
     <!--  Ring Timeout (in seconds). Default is 60 -->
     <!--  Number: 30 - 3600 -->
     <!--  Mandatory -->
@@ -734,7 +736,7 @@
     <P444></P444>
     <!--  Conference URI -->
     <!--  String -->
-    <P2418></P2418>
+    <P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
     <!--  Music On Hold URI -->
     <!--  String -->
     <P2450></P2450>
@@ -1186,7 +1188,7 @@
     <P237></P237>
     {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-    {else}
+    {elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
     {/if}
     
@@ -1206,12 +1208,12 @@
     <!--  When set to Yes(1), it will override the configured provision path and method -->
     <!--  Number: 0, 1 -->
     <!--  Mandatory -->
-    <P145>1</P145>
+    {if isset($grandstream_dhcp_option_override)}<P145>{$grandstream_dhcp_option_override}</P145>{else}<P145>1</P145>{/if}
     <!--  Allow DHCP Option 120 to Override SIP Server -->
     <!--  0 - No, 1 - Yes. Default is 0 -->
     <!--  Number: 0, 1 -->
     <!--  Mandatory -->
-    <P1411>0</P1411>
+    {if isset($grandstream_dhcp_option_override_sip_server)}<P1411>{$grandstream_dhcp_option_override_sip_server}</P1411>{else}<P1411>0</P1411>{/if}
     <!--  Automatic Upgrade. 0 - No, 1 - Yes. Default is No -->
     <!--  Number: 0, 1 -->
     <!--  Mandatory -->
@@ -1548,7 +1550,9 @@
     <!--  HEADSET Key Mode. 0 = Default Mode, 1 = Toggle Headset/Speaker. Default is 0 -->
     <!--  Number: 0, 1 -->
     <!--  Mandatory -->
-    <P1312>0</P1312>
+    {if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
     <!--  Always Ring Speaker. 0 - No, 1 - Yes. Default is 0 -->
     <!--  Number: 0, 1 -->
     <!--  Mandatory -->
diff --git a/resources/templates/provision/grandstream/gxp1450/{$mac}.xml b/resources/templates/provision/grandstream/gxp1450/{$mac}.xml
index d9a5c8c87d..8cd4fd550e 100644
--- a/resources/templates/provision/grandstream/gxp1450/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp1450/{$mac}.xml
@@ -417,7 +417,7 @@
 
 <!-- Conference URI -->
 <!-- String -->
-<P2318></P2318>
+<P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
 
 <!-- Music On Hold URI -->
 <!-- String -->
@@ -648,7 +648,7 @@
 {if isset($grandstream_dial_plan) }
 <P290>{$grandstream_dial_plan}</P290>
 {else}
-<P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P290>
+<P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P290>
 {/if}
 
 <!-- Delayed Call Forward Wait Time (in seconds). Default is 20 -->
@@ -673,33 +673,33 @@
 
 <!-- Matching Incoming Caller ID. Matching Rule 1 -->
 <!-- String -->
-<P1488></P1488>
+<P1488>{$grandstream_distinctive_ringtone_name_1}</P1488>
 
 <!-- Matching Rule 1 Distinctive Ringtone -->
 <!-- 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3. Default is 0. -->
 <!-- Number: 0, 1, 2, 3 -->
 <!-- Mandatory -->
-<P1489>0</P1489>
+<P1489>{$grandstream_distinctive_ringtone_1}</P1489>
 
 <!-- Matching Incoming Caller ID. Matching Rule 2 -->
 <!-- String -->
-<P1490></P1490>
+<P1490>{$grandstream_distinctive_ringtone_name_2}</P1490>
 
 <!-- Matching Rule 2 Distinctive Ringtone -->
 <!-- 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3. Default is 0 -->
 <!-- Number: 0, 1, 2, 3 -->
 <!-- Mandatory -->
-<P1491>0</P1491>
+<P1491>{$grandstream_distinctive_ringtone_2}</P1491>
 
 <!-- Matching Incoming Caller ID. Matching Rule 3 -->
 <!-- String -->
-<P1492></P1492>
+<P1492>{$grandstream_distinctive_ringtone_name_3}</P1492>
 
 <!-- Matching Rule 3 Distinctive Ringtone -->
 <!-- 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3. Default is 0 -->
 <!-- Number: 0, 1, 2, 3 -->
 <!-- Mandatory -->
-<P1493>0</P1493>
+<P1493>{$grandstream_distinctive_ringtone_3}</P1493>
 
 <!-- Ring Timeout (in seconds). Default is 60 -->
 <!-- Number: 30 - 3600 -->
@@ -974,7 +974,7 @@
 
 <!-- Conference URI -->
 <!-- String -->
-<P2418></P2418>
+<P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
 
 <!-- Music On Hold URI -->
 <!-- String -->
@@ -1569,7 +1569,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
@@ -1593,13 +1593,13 @@
 <!-- When set to Yes(1), it will override the configured provision path and method -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P145>1</P145>
+{if isset($grandstream_dhcp_option_override)}<P145>{$grandstream_dhcp_option_override}</P145>{else}<P145>1</P145>{/if}
 
 <!-- Allow DHCP Option 120 to Override SIP Server -->
 <!-- 0 - No, 1 - Yes. Default is 0 -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P1411>0</P1411>
+{if isset($grandstream_dhcp_option_override_sip_server)}<P1411>{$grandstream_dhcp_option_override_sip_server}</P1411>{else}<P1411>0</P1411>{/if}
 
 <!-- Automatic Upgrade. 0 - No, 1 - Yes. Default is No -->
 <!-- Number: 0, 1 -->
@@ -2055,7 +2055,9 @@
 <!-- HEADSET Key Mode. 0 = Default Mode, 1 = Toggle Headset/Speaker. Default is 0 -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P1312>0</P1312>
+{if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
 
 <!-- Always Ring Speaker. 0 - No, 1 - Yes. Default is 0 -->
 <!-- Number: 0, 1 -->
diff --git a/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml b/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml
index d222f2762c..49d81cf5e3 100644
--- a/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml
@@ -226,7 +226,7 @@
 
 <!-- Conference URI -->
 <!-- String -->
-<P2318></P2318>
+<P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
 
 <!-- Music On Hold URI -->
 <!-- String -->
@@ -457,7 +457,7 @@
 {if isset($grandstream_dial_plan) }
 <P290>{$grandstream_dial_plan}</P290>
 {else}
-<P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P290>
+<P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P290>
 {/if}
 
 <!-- Delayed Call Forward Wait Time (in seconds). Default is 20 -->
@@ -482,33 +482,33 @@
 
 <!-- Matching Incoming Caller ID. Matching Rule 1 -->
 <!-- String -->
-<P1488></P1488>
+<P1488>{$grandstream_distinctive_ringtone_name_1}</P1488>
 
 <!-- Matching Rule 1 Distinctive Ringtone -->
 <!-- 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3. Default is 0. -->
 <!-- Number: 0, 1, 2, 3 -->
 <!-- Mandatory -->
-<P1489>0</P1489>
+<P1489>{$grandstream_distinctive_ringtone_1}</P1489>
 
 <!-- Matching Incoming Caller ID. Matching Rule 2 -->
 <!-- String -->
-<P1490></P1490>
+<P1490>{$grandstream_distinctive_ringtone_name_2}</P1490>
 
 <!-- Matching Rule 2 Distinctive Ringtone -->
 <!-- 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3. Default is 0 -->
 <!-- Number: 0, 1, 2, 3 -->
 <!-- Mandatory -->
-<P1491>0</P1491>
+<P1491>{$grandstream_distinctive_ringtone_2}</P1491>
 
 <!-- Matching Incoming Caller ID. Matching Rule 3 -->
 <!-- String -->
-<P1492></P1492>
+<P1492>{$grandstream_distinctive_ringtone_name_3}</P1492>
 
 <!-- Matching Rule 3 Distinctive Ringtone -->
 <!-- 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3. Default is 0 -->
 <!-- Number: 0, 1, 2, 3 -->
 <!-- Mandatory -->
-<P1493>0</P1493>
+<P1493>{$grandstream_distinctive_ringtone_3}</P1493>
 
 <!-- Ring Timeout (in seconds). Default is 60 -->
 <!-- Number: 30 - 3600 -->
@@ -783,7 +783,7 @@
 
 <!-- Conference URI -->
 <!-- String -->
-<P2418></P2418>
+<P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
 
 <!-- Music On Hold URI -->
 <!-- String -->
@@ -1376,7 +1376,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
@@ -1400,13 +1400,13 @@
 <!-- When set to Yes(1), it will override the configured provision path and method -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P145>1</P145>
+{if isset($grandstream_dhcp_option_override)}<P145>{$grandstream_dhcp_option_override}</P145>{else}<P145>1</P145>{/if}
 
 <!-- Allow DHCP Option 120 to Override SIP Server -->
 <!-- 0 - No, 1 - Yes. Default is 0 -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P1411>0</P1411>
+{if isset($grandstream_dhcp_option_override_sip_server)}<P1411>{$grandstream_dhcp_option_override_sip_server}</P1411>{else}<P1411>0</P1411>{/if}
 
 <!-- Automatic Upgrade. 0 - No, 1 - Yes. Default is No -->
 <!-- Number: 0, 1 -->
@@ -1862,7 +1862,9 @@
 <!-- HEADSET Key Mode. 0 = Default Mode, 1 = Toggle Headset/Speaker. Default is 0 -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P1312>0</P1312>
+{if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
 
 <!-- Always Ring Speaker. 0 - No, 1 - Yes. Default is 0 -->
 <!-- Number: 0, 1 -->
diff --git a/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml
index a33b9bbca9..191766a91a 100644
--- a/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml
@@ -264,7 +264,7 @@
 <P188>0</P188>
 <!--  Conference URI -->
 <!--  String -->
-<P2318></P2318>
+<P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
 <!--  Music On Hold URI -->
 <!--  String -->
 <P2350></P2350>
@@ -482,10 +482,10 @@
 {if isset($grandstream_dial_plan) }
 <P290>{$grandstream_dial_plan}</P290>
 {else}
-<P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P290>
+<P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P290>
 {/if}
 
-<!-- <P290>{ x+ | *x+ | *xx | *xxx | *xxxx | *xxxxx | *xxxxxx | **xx | **xxx | **xxxx | **xxxxx | **xxxxxx | **xxxxxxx | **xxxxxxxx | *xx*x+ | \+x+ | \p\a\r\k\+*x+ }</P290> -->
+<!-- <P290>{ x+ | *x+ | *xx | *xxx | *xxxx | *xxxxx | *xxxxxx | **xx | **xxx | **xxxx | **xxxxx | **xxxxxx | **xxxxxxx | **xxxxxxxx | *xx*x+ | \+x+ | \p\a\r\k\+*x+ | \p\a\r\k\+x+ }</P290> -->
 <!--  Delayed Call Forward Wait Time (in seconds). Default is 20 -->
 <!--  Number: 1 - 120 -->
 <!--  Mandatory -->
@@ -872,7 +872,7 @@
 <P488>0</P488>
 <!--  Conference URI -->
 <!--  String -->
-<P2418></P2418>
+<P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
 <!--  Music On Hold URI -->
 <!--  String -->
 <P2450></P2450>
@@ -1087,7 +1087,7 @@
 <!--  String -->
 <!--  Mandatory -->
 <P459>{ x+ | *x+ | *xx | *xxx | *xxxx | *xxxxx | *xxxxxx | **xx | **xxx | **xxxx | **xxxxx | **xxxxxx | **xxxxxxx | **xxxxxxxx | *xx*x+ }</P459>
-<!-- <P459>{ x+ | *x+ | *xx | *xxx | *xxxx | *xxxxx | *xxxxxx | **xx | **xxx | **xxxx | **xxxxx | **xxxxxx | **xxxxxxx | **xxxxxxxx | *xx*x+ | \+x+ | \p\a\r\k\+*x+ }</P459> -->
+<!-- <P459>{ x+ | *x+ | *xx | *xxx | *xxxx | *xxxxx | *xxxxxx | **xx | **xxx | **xxxx | **xxxxx | **xxxxxx | **xxxxxxx | **xxxxxxxx | *xx*x+ | \+x+ | \p\a\r\k\+*x+ | \p\a\r\k\+x+ }</P459> -->
 <!--  Delayed Call Forward Wait Time (in seconds). Default is 20 -->
 <!--  Number: 1 - 120 -->
 <!--  Mandatory -->
@@ -1445,7 +1445,7 @@
 <P2589>0</P2589>
 <!--  Conference URI -->
 <!--  String -->
-<P2518></P2518>
+<P2518>{if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}</P2518>
 <!--  Music On Hold URI -->
 <!--  String -->
 <P2550></P2550>
@@ -1667,7 +1667,7 @@
 <!--  String -->
 <!--  Mandatory -->
 <P559>{ x+ | *x+ | *xx | *xxx | *xxxx | *xxxxx | *xxxxxx | **xx | **xxx | **xxxx | **xxxxx | **xxxxxx | **xxxxxxx | **xxxxxxxx | *xx*x+ }</P559>
-<!-- <P559>{ x+ | *x+ | *xx | *xxx | *xxxx | *xxxxx | *xxxxxx | **xx | **xxx | **xxxx | **xxxxx | **xxxxxx | **xxxxxxx | **xxxxxxxx | *xx*x+ | \+x+ | \p\a\r\k\+*x+ }</P559> -->
+<!-- <P559>{ x+ | *x+ | *xx | *xxx | *xxxx | *xxxxx | *xxxxxx | **xx | **xxx | **xxxx | **xxxxx | **xxxxxx | **xxxxxxx | **xxxxxxxx | *xx*x+ | \+x+ | \p\a\r\k\+*x+ | \p\a\r\k\+x+ }</P559> -->
 <!--  Delayed Call Forward Wait Time (in seconds). Default is 20 -->
 <!--  Number: 1 - 120 -->
 <!--  Mandatory -->
@@ -1686,7 +1686,7 @@
 <P523>0</P523>
 <!--  Matching Incoming Caller ID. Matching Rule 1 -->
 <!--  String -->
-<P1500></P1500>
+<P1500>{$grandstream_distinctive_ringtone_name_1}</P1500>
 <!--  Matching Rule 1 Distinctive Ringtone -->
 <!--  0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3. Default is 0. -->
 <!--  Number: 0, 1, 2, 3 -->
@@ -2018,17 +2018,17 @@
 <!--  When set to Yes(1), it will override the configured provision path and method -->
 <!--  Number: 0, 1 -->
 <!--  Mandatory -->
-<P145>1</P145>
+{if isset($grandstream_dhcp_option_override)}<P145>{$grandstream_dhcp_option_override}</P145>{else}<P145>1</P145>{/if}
 <!--  Additional Override DHCP option -->
 <!--  0 - None, 1 - Option 150, 2 - Option 160 -->
 <!--  Number: 0, 1, 2 -->
 <!--  Mandatory -->
-<P8337>0</P8337>
+{if isset($grandstream_dhcp_option_additional_override)}<P8337>{$grandstream_dhcp_option_additional_override}</P8337>{else}<P8337>0</P8337>{/if}
 <!--  Allow DHCP Option 120 to Override SIP Server -->
 <!--  0 - No, 1 - Yes. Default is 0 -->
 <!--  Number: 0, 1 -->
 <!--  Mandatory -->
-<P1411>0</P1411>
+{if isset($grandstream_dhcp_option_override_sip_server)}<P1411>{$grandstream_dhcp_option_override_sip_server}</P1411>{else}<P1411>0</P1411>{/if}
 <!--  3CX Auto Provision. 0 - No, 1 - Yes. Default is 1 -->
 <!--  Number: 0, 1 -->
 <!--  Mandatory -->
@@ -2073,7 +2073,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 <!--  Config HTTP/HTTPS User Name -->
@@ -2694,11 +2694,21 @@
 <!--  HEADSET Key Mode. 0=Default Mode, 1=Toggle Headset/Speaker. Default is 0 -->
 <!--  Number: 0, 1 -->
 <!--  Mandatory -->
-<P1312>0</P1312>
-<!--  Headset Type. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
-<!--  Number: 0, 1 -->
-<!--  Mandatory -->
-<P1487>0</P1487>
+{if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
+
+    <!-- # Headset Type. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
+    <!-- # Number: 0, 1 -->
+    <!-- # Mandatory -->
+{if isset($grandstream_headset_type)}
+    <P6779>{$grandstream_headset_type}</P6779>
+
+    <!-- # EHS Headset Ring Tone. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
+    <!-- # Number: 0, 1 -->
+    <!-- # Mandatory -->
+    <P1487>{$grandstream_headset_type}</P1487>
+{/if}
 <!--  Always Ring Speaker. 0 - No, 1 - Yes. Default is 0 -->
 <!--  Number: 0, 1 -->
 <!--  Mandatory -->
diff --git a/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml
index fe878be725..6257158e76 100644
--- a/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml
@@ -773,7 +773,7 @@
 
 <!-- # SIP Server -->
 <!-- # String -->
-<P47>{$account.1.server_address}</P47>
+<P47>{$account.1.server_address}:{$account.1.sip_port}</P47>
 
 <!-- # Secondary SIP Server -->
 <!-- # String -->
@@ -781,11 +781,19 @@
 
 <!-- # Outbound Proxy -->
 <!-- # String -->
+{if isset($account.1.outbound_proxy_primary)}
+<P48>{$account.1.outbound_proxy_primary}:{$account.1.sip_port}</P48>
+{else}
 <P48></P48>
+{/if}	 
 
 <!-- # Backup Outbound Proxy -->
 <!-- # String -->
+{if isset($account.1.outbound_proxy_secondary)}
+<P2333>{$account.1.outbound_proxy_secondary}:{$account.1.sip_port}</P2333>
+{else}
 <P2333></P2333>
+{/if}	
 
 <!-- # BLF Server -->
 <!-- # String -->
@@ -816,7 +824,11 @@
 <!-- # DNS Mode. 0 - A Record, 1 - SRV, 2 - NAPTR/SRV, 3 - Use Configured IP. Default is 0 -->
 <!-- # Number: 0, 1, 2, 3 -->
 <!-- # Mandatory -->
+{if isset($grandstream_dns_mode)}
+<P103>{$grandstream_dns_mode}</P103>
+{else}
 <P103>0</P103>
+{/if}
 
 <!-- # Primary IP. Maximum 15 characters -->
 <!-- # String -->
@@ -833,7 +845,11 @@
 <!-- # NAT Traversal. 0 - No, 1 - STUN, 2 - keep alive, 3 - UPnP, 4 - Auto, 5 - VPN. Default is 0. -->
 <!-- # Number: 0, 1, 2, 3, 4, 5 -->
 <!-- # Mandatory -->
+{if isset($grandstream_nat_traversal)}
+<P52>{$grandstream_nat_traversal}</P52>
+{else}
 <P52>0</P52>
+{/if}
 
 <!-- # Proxy-Require (A SIP extension to enable firewall penetration). Max length is 64 characters -->
 <!-- # String -->
@@ -911,7 +927,12 @@
 <!-- # SIP Transport. 0 - UDP, 1 - TCP, 2 - TLS/TCP. Default is 0 -->
 <!-- # Number: 0, 1, 2 -->
 <!-- # Mandatory -->
-<P130>0</P130>
+{$tp=0}
+{if $account.1.sip_transport == 'udp'}{$tp=0}{/if}
+{if $account.1.sip_transport == 'tcp'}{$tp=1}{/if}
+{if $account.1.sip_transport == 'tls'}{$tp=2}{/if}
+{if $account.1.sip_transport == 'dns srv'}{$tp=1}{/if}
+<P130>{$tp}</P130>
 
 <!-- # SIP URI Scheme when using TLS. 0 - sip, 1 - sips. Default is 1 -->
 <!-- # Number: 0, 1 -->
@@ -936,7 +957,12 @@
 <!-- # SUBSCRIBE for MWI. 0 - No, 1 - Yes. Default is 0 -->
 <!-- # Number: 0, 1 -->
 <!-- # Mandatory -->
+{if isset($subscribe_mwi)}
+<P99>1</P99>
+{else}
 <P99>0</P99>
+{/if}
+
 
 <!-- # SUBSCRIBE for Registration. 0 - No, 1 - Yes. Default is 0 -->
 <!-- # Number: 0, 1 -->
@@ -1008,7 +1034,7 @@
 
 <!-- # Conference URI -->
 <!-- # String -->
-<P2318></P2318>
+<P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
 
 <!-- # Music On Hold URI -->
 <!-- # String -->
@@ -1017,7 +1043,9 @@
 <!-- # Force BLF Call-pickup by prefix. 0 - Disable, 1 - Enable. Default is 0 -->
 <!-- # Number: 0, 1 -->
 <!-- # Mandatory -->
-<P6752>0</P6752>
+{if isset($grandstream_blf_call_pickup)}
+<P6752>{$grandstream_blf_call_pickup}</P6752>
+{/if}
 
 <!-- # BLF Call-pickup Prefix. Default is ** -->
 <!-- # String -->
@@ -1146,7 +1174,7 @@
 <!-- # Accept Incoming SIP from Proxy Only. 0 - No, 1 - Yes. Default is 0 -->
 <!-- # Number: 0, 1 -->
 <!-- # Mandatory -->
-<P2347>0</P2347>
+<P2347>1</P2347>
 
 <!-- # Authenticate Incoming INVITE. 0 - No, 1 - Yes. Default is 0 -->
 <!-- # Number: 0, 1 -->
@@ -1217,7 +1245,11 @@
 <!-- # SRTP Mode. 0 - Disabled, 1 - Enabled but not forced, 2 - Enabled and forced, 3 - Optional. Default is 0 -->
 <!-- # Number: 0, 1, 2, 3 -->
 <!-- # Mandatory -->
+{if isset($grandstream_srtp)}
+<P183>{$grandstream_srtp}</P183>
+{else}
 <P183>0</P183>
+{/if}
 
 <!-- # Crypto Life Time -->
 <!-- # 0 - No, 1 - Yes. Default is 0 -->
@@ -1314,7 +1346,7 @@
 {if isset($grandstream_dial_plan) }
 <P290>{$grandstream_dial_plan}</P290>
 {else}
-<P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P290>
+<P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P290>
 {/if}
 
 <!-- # Call Log. 0 - Log All Calls, 1 - Log Incoming/Outgoing only (missed calls NOT recorded), 2 - Disable Call Log. Default is 0 -->
@@ -1329,33 +1361,33 @@
 
 <!-- # Matching Incoming Caller ID. Matching Rule 1 -->
 <!-- # String -->
-<P1488></P1488>
+<P1488>{$grandstream_distinctive_ringtone_name_1}</P1488>
 
 <!-- # Matching Rule 1 Distinctive Ringtone -->
 <!-- # 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3. Default is 0. -->
 <!-- # Number: 0, 1, 2, 3 -->
 <!-- # Mandatory -->
-<P1489>0</P1489>
+<P1489>{$grandstream_distinctive_ringtone_1}</P1489>
 
 <!-- # Matching Incoming Caller ID. Matching Rule 2 -->
 <!-- # String -->
-<P1490></P1490>
+<P1490>{$grandstream_distinctive_ringtone_name_2}</P1490>
 
 <!-- # Matching Rule 2 Distinctive Ringtone -->
 <!-- # 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3. Default is 0 -->
 <!-- # Number: 0, 1, 2, 3 -->
 <!-- # Mandatory -->
-<P1491>0</P1491>
+<P1491>{$grandstream_distinctive_ringtone_2}</P1491>
 
 <!-- # Matching Incoming Caller ID. Matching Rule 3 -->
 <!-- # String -->
-<P1492></P1492>
+<P1492>{$grandstream_distinctive_ringtone_name_3}</P1492>
 
 <!-- # Matching Rule 3 Distinctive Ringtone -->
 <!-- # 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3. Default is 0 -->
 <!-- # Number: 0, 1, 2, 3 -->
 <!-- # Mandatory -->
-<P1493>0</P1493>
+<P1493>{$grandstream_distinctive_ringtone_3}</P1493>
 
 <!-- # Ring Timeout (in seconds). Default is 60 -->
 <!-- # Number: 30 - 3600 -->
@@ -1448,11 +1480,11 @@
 
 <!-- # Account Name -->
 <!-- # String -->
-<P417>{$display_name_2}</P417>
+<P417>{$account.2.display_name}</P417>
 
 <!-- # SIP Server -->
 <!-- # String -->
-<P402>{$server_address_2}</P402>
+<P402>{$account.2.server_address}:{$account.2.sip_port}</P402>
 
 <!-- # Secondary SIP Server -->
 <!-- # String -->
@@ -1460,11 +1492,19 @@
 
 <!-- # Outbound Proxy -->
 <!-- # String -->
+{if isset($account.2.outbound_proxy_primary)}
+<P403>{$account.2.outbound_proxy_primary}:{$account.2.sip_port}</P403>
+{else}
 <P403></P403>
+{/if}  
 
 <!-- # Backup Outbound Proxy -->
 <!-- # String -->
+{if isset($account.2.outbound_proxy_secondary)}
+<P2433>{$account.2.outbound_proxy_secondary}:{$account.2.sip_port}</P2433>
+{else}
 <P2433></P2433>
+{/if}
 
 <!-- # BLF Server -->
 <!-- # String -->
@@ -1472,7 +1512,7 @@
 
 <!-- # SIP User ID -->
 <!-- # String -->
-<P404>{$account.2.user_id}</P404>
+<P404></P404>
 
 <!-- # Authenticate ID -->
 <!-- # String -->
@@ -1495,7 +1535,11 @@
 <!-- # DNS Mode. 0 - A Record, 1 - SRV, 2 - NAPTR/SRV, 3 - Use Configured IP. Default is 0 -->
 <!-- # Number: 0, 1, 2, 3 -->
 <!-- # Mandatory -->
+{if isset($grandstream_dns_mode)}
+<P408>{$grandstream_dns_mode}</P408>
+{else}
 <P408>0</P408>
+{/if}
 
 <!-- # Primary IP. Maximum 15 characters -->
 <!-- # String -->
@@ -1512,7 +1556,11 @@
 <!-- # NAT Traversal. 0 - No, 1 - STUN, 2 - keep alive, 3 - UPnP, 4 - Auto, 5 - VPN. Default is 0 -->
 <!-- # Number: 0, 1, 2, 3, 4, 5 -->
 <!-- # Mandatory -->
+{if isset($grandstream_nat_traversal)}
+<P414>{$grandstream_nat_traversal}</P414>
+{else}
 <P414>0</P414>
+{/if}
 
 <!-- # Proxy-Require (A SIP extension to enable firewall penetration). Max length is 64 characters -->
 <!-- # String -->
@@ -1590,7 +1638,12 @@
 <!-- # SIP Transport. 0 - UDP, 1 - TCP, 2 - TCP/TLS. Default is 0 -->
 <!-- # Number: 0, 1, 2 -->
 <!-- # Mandatory -->
-<P448>0</P448>
+{$tp=0}
+{if $account.2.sip_transport == 'udp'}{$tp=0}{/if}
+{if $account.2.sip_transport == 'tcp'}{$tp=1}{/if}
+{if $account.2.sip_transport == 'tls'}{$tp=2}{/if}
+{if $account.2.sip_transport == 'dns srv'}{$tp=1}{/if}
+<P448>{$tp}</P448>
 
 <!-- # SIP URI Scheme when using TLS. 0 - sip, 1 - sips. Default is 1 -->
 <!-- # Number: 0, 1 -->
@@ -1615,7 +1668,12 @@
 <!-- # SUBSCRIBE for MWI (Whether or not send SUBSCRIBE for Message Waiting Indication). 0 - No, 1 - Yes. Default is 0 -->
 <!-- # Number: 0, 1 -->
 <!-- # Mandatory -->
+{if isset($subscribe_mwi)}
+<P415>1</P415>
+{else}
 <P415>0</P415>
+{/if}
+
 
 <!-- # SUBSCRIBE for Registration. 0 - No, 1 - Yes. Default is 0 -->
 <!-- # Number: 0, 1 -->
@@ -1687,7 +1745,7 @@
 
 <!-- # Conference URI -->
 <!-- # String -->
-<P2418></P2418>
+<P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
 
 <!-- # Music On Hold URI -->
 <!-- # String -->
@@ -1696,7 +1754,9 @@
 <!-- # Force BLF Call-pickup by prefix. 0 - No, 1 - Yes. Default is 0 -->
 <!-- # Number: 0, 1 -->
 <!-- # Mandatory -->
-<P6753>0</P6753>
+{if isset($grandstream_blf_call_pickup)}
+<P6753>{$grandstream_blf_call_pickup}</P6753>
+{/if}
 
 <!-- # BLF Call-pickup Prefix. Default is ** -->
 <!-- # String -->
@@ -1895,7 +1955,11 @@
 <!-- # 0 - Disabled, 1 - Enabled but not forced, 2 - Enabled and forced, 3 - Optional. Default is 0 -->
 <!-- # Number: 0, 1, 2, 3 -->
 <!-- # Mandatory -->
+{if isset($grandstream_srtp)}
+<P443>{$grandstream_srtp}</P443>
+{else}
 <P443>0</P443>
+{/if}
 
 <!-- #Crypto Life Time -->
 <!-- #0 - No, 1 - Yes. Default is 0 -->
@@ -2120,7 +2184,7 @@
 
 <!-- # SIP Server -->
 <!-- # String -->
-<P502>{$account.3.server_address}</P502>
+<P502>{$account.3.server_address}:{$account.3.sip_port}</P502>
 
 <!-- # Secondary SIP Server -->
 <!-- # String -->
@@ -2128,11 +2192,19 @@
 
 <!-- # Outbound Proxy -->
 <!-- # String -->
+{if isset($account.3.outbound_proxy_primary)}
+<P503>{$account.3.outbound_proxy_primary}:{$account.3.sip_port}</P503>
+{else}
 <P503></P503>
+{/if}  
 
 <!-- # Backup Outbound Proxy -->
 <!-- # String -->
+{if isset($account.3.outbound_proxy_secondary)}
+<P2533>{$account.3.outbound_proxy_secondary}:{$account.3.sip_port}</P2533>
+{else}
 <P2533></P2533>
+{/if}
 
 <!-- # BLF Server -->
 <!-- # String -->
@@ -2163,7 +2235,11 @@
 <!-- # DNS Mode. 0 - A Record, 1 - SRV, 2 - NAPTR/SRV, 3 - Use Configured IP. Default is 0  -->
 <!-- # Number: 0, 1, 2, 3 -->
 <!-- # Mandatory -->
+{if isset($grandstream_dns_mode)}
+<P508>{$grandstream_dns_mode}</P508>
+{else}
 <P508>0</P508>
+{/if}
 
 <!-- # Primary IP. Maximum 15 characters -->
 <!-- # String -->
@@ -2180,7 +2256,11 @@
 <!-- # NAT Traversal. 0 - No, 1 - STUN, 2 - keep alive, 3 - UPnP, 4 - Auto, 5 - VPN. Default is 0 -->
 <!-- # Number: 0, 1, 2, 3, 4, 5 -->
 <!-- # Mandatory -->
+{if isset($grandstream_nat_traversal)}
+<P514>{$grandstream_nat_traversal}</P514>
+{else}
 <P514>0</P514>
+{/if}
 
 <!-- # Proxy-Require (A SIP extension to enable firewall penetration). Max length is 64 characters -->
 <!-- # String -->
@@ -2258,7 +2338,12 @@
 <!-- # SIP Transport. 0 - UDP, 1 - TCP. 2- TCP/TLS. Default is 0 -->
 <!-- # Number: 0, 1, 2 -->
 <!-- # Mandatory -->
-<P548>0</P548>
+{$tp=0}
+{if $account.3.sip_transport == 'udp'}{$tp=0}{/if}
+{if $account.3.sip_transport == 'tcp'}{$tp=1}{/if}
+{if $account.3.sip_transport == 'tls'}{$tp=2}{/if}
+{if $account.3.sip_transport == 'dns srv'}{$tp=1}{/if}
+<P548>{$tp}</P548>
 
 <!-- # SIP URI Scheme When Using TLS. 0 - sip, 1 - sips. Default is 1 -->
 <!-- # Number: 0, 1 -->
@@ -2283,7 +2368,12 @@
 <!-- # SUBSCRIBE for MWI (Whether or not send SUBSCRIBE for Message Waiting Indication). 0 - No, 1 - Yes. Default is 0 -->
 <!-- # Number: 0, 1 -->
 <!-- # Mandatory -->
+{if isset($subscribe_mwi)}
+<P515>1</P515>
+{else}
 <P515>0</P515>
+{/if}
+
 
 <!-- # SUBSCRIBE for Registration. 0 - No, 1 - Yes. Default is 0 -->
 <!-- # Number: 0, 1 -->
@@ -2355,7 +2445,7 @@
 
 <!-- # Conference URI -->
 <!-- # String -->
-<P2518></P2518>
+<P2518>{if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}</P2518>
 
 <!-- # Music On Hold URI -->
 <!-- # String -->
@@ -2364,7 +2454,9 @@
 <!-- # Force BLF Call-pickup by prefix. 0 - No, 1 - Yes. Default is 0 -->
 <!-- # Number: 0, 1 -->
 <!-- # Mandatory -->
-<P6754>0</P6754>
+{if isset($grandstream_blf_call_pickup)}
+<P6754>{$grandstream_blf_call_pickup}</P6754>
+{/if}
 
 <!-- # BLF Call-pickup Prefix. Default is ** -->
 <!-- # String -->
@@ -2562,7 +2654,11 @@
 <!-- # 0 - Disabled, 1 - Enabled but not forced, 2 - Enabled and forced, 3 - Optional. Default is 0 -->
 <!-- # Number: 0, 1, 2, 3 -->
 <!-- # Mandatory -->
+{if isset($grandstream_srtp)}
+<P543>{$grandstream_srtp}</P543>
+{else}
 <P543>0</P543>
+{/if}
 
 <!-- # Crypto Life Time -->
 <!-- # 0 - No, 1 - Yes. Default is 0 -->
@@ -2668,7 +2764,7 @@
 
 <!-- # Matching Incoming Caller ID. Matching Rule 1 -->
 <!-- # String -->
-<P1500></P1500>
+<P1500>{$grandstream_distinctive_ringtone_name_1}</P1500>
 
 <!-- # Matching Rule 1 Distinctive Ringtone -->
 <!-- # 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3. Default is 0 -->
@@ -3763,12 +3859,21 @@
 <!-- # HEADSET Key Mode. 0 - Default Mode, 1 - Toggle Headset/Speaker. Default is 0 -->
 <!-- # Number: 0, 1 -->
 <!-- # Mandatory -->
-<P1312>0</P1312>
+{if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
 
-<!-- # Headset Type. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
-<!-- # Number: 0, 1 -->
-<!-- # Mandatory -->
-<P1487>0</P1487>
+    <!-- # Headset Type. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
+    <!-- # Number: 0, 1 -->
+    <!-- # Mandatory -->
+{if isset($grandstream_headset_type)}
+    <P6779>{$grandstream_headset_type}</P6779>
+
+    <!-- # EHS Headset Ring Tone. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
+    <!-- # Number: 0, 1 -->
+    <!-- # Mandatory -->
+    <P1487>{$grandstream_headset_type}</P1487>
+{/if}
 
 <!-- # Always Ring Speaker. 0 - No, 1 - Yes. Default is 0 -->
 <!-- # Number: 0, 1 -->
@@ -5981,18 +6086,18 @@
 <!-- # When set to Yes(1), it will override the configured provision path and method -->
 <!-- # Number: 0, 1 -->
 <!-- # Mandatory -->
-<P145>1</P145>
+{if isset($grandstream_dhcp_option_override)}<P145>{$grandstream_dhcp_option_override}</P145>{else}<P145>1</P145>{/if}
 
 <!-- # Additional Override DHCP Option. 0 - None,  1 - Option 150,  2 - Option 160. Default is 0 -->
 <!-- # Number: 0, 1, 2 -->
 <!-- # Mandatory -->
-<P8337>0</P8337>
+{if isset($grandstream_dhcp_option_additional_override)}<P8337>{$grandstream_dhcp_option_additional_override}</P8337>{else}<P8337>0</P8337>{/if}
 
 <!-- # Allow DHCP Option 120 to Override SIP Server. -->
 <!-- # 0 - No, 1 - Yes. Default is 0 -->
 <!-- # Number: 0, 1 -->
 <!-- # Mandatory -->
-<P1411>0</P1411>
+{if isset($grandstream_dhcp_option_override_sip_server)}<P1411>{$grandstream_dhcp_option_override_sip_server}</P1411>{else}<P1411>0</P1411>{/if}
 
 <!-- # 3CX Auto Provision. 0 - No, 1 - Yes. Default is Yes -->
 <!-- # Number: 0, 1 -->
@@ -6039,7 +6144,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
diff --git a/resources/templates/provision/grandstream/gxp20xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp20xx/{$mac}.xml
index 7574d645a2..16c3c84a6d 100644
--- a/resources/templates/provision/grandstream/gxp20xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp20xx/{$mac}.xml
@@ -85,7 +85,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
@@ -106,7 +106,7 @@
 
 <!--  Allow DHCP Option43 and Option 66 to override server: 0 - No, 1 - Yes. Default is Yes. -->
 <!--  When set to Yes(1), it will override the configured provision path and method. -->
-<P145>1</P145>
+{if isset($grandstream_dhcp_option_override)}<P145>{$grandstream_dhcp_option_override}</P145>{else}<P145>1</P145>{/if}
 
 <!--  Automatic Upgrade. 0 - No, 1 - Yes. Default is No. -->
 <P194>0</P194>
@@ -1991,7 +1991,9 @@
 
 <!--  Headset keymode. 0 - Default Mode, 1 - Toggle Speaker(default)/Headset, 2 - Toggle Speaker/Headset(default)   -->
 <!--  Not avaliable for GXP2000 -->
-<P1312>0</P1312>
+{if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
 
 <!--  For GXP1200 and GXP280 Only; 0 = Switch, 1 = Hub -->
 <P1348>0</P1348>
diff --git a/resources/templates/provision/grandstream/gxp2100/{$mac}.xml b/resources/templates/provision/grandstream/gxp2100/{$mac}.xml
index 2751136ec3..4dea5864c1 100644
--- a/resources/templates/provision/grandstream/gxp2100/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2100/{$mac}.xml
@@ -243,7 +243,9 @@
 <!--# Feature Key Synchronization. 0 - Disabled, 1 - Enabled. Default is 0-->
 <!--# Number: 0, 1-->
 <!--# Mandatory-->
-    <P2325>0</P2325>
+{if isset($grandstream_feature_key_sync)}
+    <P2325>{$grandstream_feature_key_sync}</P2325>
+{/if}
 
 <!--# Broadsoft Call Park. 0 - Disabled, 1 - Enabled. Default is 0 -->
 <!--# Number: 0, 1-->
@@ -261,7 +263,7 @@
 
 <!--# Conference URI-->
 <!--# String-->
-    <P2318></P2318>
+    <P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
 
 <!--# Music On Hold URI-->
 <!--# String-->
@@ -513,7 +515,7 @@
 {if isset($grandstream_dial_plan) }
 <P290>{$grandstream_dial_plan}</P290>
 {else}
-<P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P290>
+<P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P290>
 {/if}
 
 <!--# Delayed Call Forward Wait Time (in seconds). Default is 20-->
@@ -538,33 +540,33 @@
 
 <!--# Matching Incoming Caller ID. Matching Rule 1-->
 <!--# String-->
-    <P1488></P1488>
+    <P1488>{$grandstream_distinctive_ringtone_name_1}</P1488>
 
 <!--# Matching Rule 1 Distinctive Ringtone-->
 <!--# 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3. Default is 0.-->
 <!--# Number: 0, 1, 2, 3-->
 <!--# Mandatory-->
-    <P1489>0</P1489>
+    <P1489>{$grandstream_distinctive_ringtone_1}</P1489>
 
 <!--# Matching Incoming Caller ID. Matching Rule 2-->
 <!--# String-->
-    <P1490></P1490>
+    <P1490>{$grandstream_distinctive_ringtone_name_2}</P1490>
 
 <!--# Matching Rule 2 Distinctive Ringtone-->
 <!--# 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3. Default is 0-->
 <!--# Number: 0, 1, 2, 3-->
 <!--# Mandatory-->
-    <P1491>0</P1491>
+    <P1491>{$grandstream_distinctive_ringtone_2}</P1491>
 
 <!--# Matching Incoming Caller ID. Matching Rule 3-->
 <!--# String-->
-    <P1492></P1492>
+    <P1492>{$grandstream_distinctive_ringtone_name_3}</P1492>
 
 <!--# Matching Rule 3 Distinctive Ringtone-->
 <!--# 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3. Default is 0-->
 <!--# Number: 0, 1, 2, 3-->
 <!--# Mandatory-->
-    <P1493>0</P1493>
+    <P1493>{$grandstream_distinctive_ringtone_3}</P1493>
 
 <!--# Ring Timeout (in seconds). Default is 60-->
 <!--# Number: 30 - 3600-->
@@ -891,7 +893,7 @@
 
 <!--# Conference URI-->
 <!--# String-->
-    <P2418></P2418>
+    <P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
 
 <!--# Music On Hold URI-->
 <!--# String-->
@@ -1519,7 +1521,7 @@
 
 <!--# Conference URI-->
 <!--# String-->
-    <P2518></P2518>
+    <P2518>{if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}</P2518>
 
 <!--# Music On Hold URI-->
 <!--# String-->
@@ -1794,7 +1796,7 @@
 
 <!--# Matching Incoming Caller ID. Matching Rule 1-->
 <!--# String-->
-    <P1500></P1500>
+    <P1500>{$grandstream_distinctive_ringtone_name_1}</P1500>
 
 <!--# Matching Rule 1 Distinctive Ringtone-->
 <!--# 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3. Default is 0-->
@@ -2145,7 +2147,7 @@
 
 <!--# Conference URI-->
 <!--# String-->
-    <P2618></P2618>
+    <P2618>{if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}</P2618>
 
 <!--# Music On Hold URI-->
 <!--# String-->
@@ -2809,7 +2811,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
@@ -2833,13 +2835,13 @@
 <!--# When set to Yes(1), it will override the configured provision path and method-->
 <!--# Number: 0, 1-->
 <!--# Mandatory-->
-    <P145>1</P145>
+    {if isset($grandstream_dhcp_option_override)}<P145>{$grandstream_dhcp_option_override}</P145>{else}<P145>1</P145>{/if}
 
 <!--# Allow DHCP Option 120 to Override SIP Server-->
 <!--# 0 - No, 1 - Yes. Default is 0-->
 <!--# Number: 0, 1-->
 <!--# Mandatory-->
-    <P1411>0</P1411>
+    {if isset($grandstream_dhcp_option_override_sip_server)}<P1411>{$grandstream_dhcp_option_override_sip_server}</P1411>{else}<P1411>0</P1411>{/if}
 
 <!--# 3CX Auto Provision. 0 - No, 1 - Yes. Default is 1-->
 <!--# Number: 0, 1-->
@@ -3470,7 +3472,9 @@
 <!--# HEADSET Key Mode. 0 = Default Mode, 1 = Toggle Headset/Speaker. Default is 0-->
 <!--# Number: 0, 1-->
 <!--# Mandatory-->
-    <P1312>0</P1312>
+    {if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
 
 <!--# Always Ring Speaker. 0 - No, 1 - Yes. Default is 0-->
 <!--# Number: 0, 1-->
diff --git a/resources/templates/provision/grandstream/gxp2124/{$mac}.xml b/resources/templates/provision/grandstream/gxp2124/{$mac}.xml
index 353fbb0256..d180e429c2 100644
--- a/resources/templates/provision/grandstream/gxp2124/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2124/{$mac}.xml
@@ -166,7 +166,9 @@
     <!-- Feature Key Synchronization. 0 - Disabled, 1 - Enabled. Default is 0 -->
     <!-- Number: 0, 1 -->
     <!-- Mandatory -->
-    <P2325>0</P2325>
+{if isset($grandstream_feature_key_sync)}
+    <P2325>{$grandstream_feature_key_sync}</P2325>
+{/if}
     <!-- Line-Seize Timeout (in seconds). Default is 15 -->
     <!-- Number: 15 - 60 -->
     <!-- Mandatory -->
@@ -176,7 +178,7 @@
     <P134></P134>
     <!-- Conference URI -->
     <!-- String -->
-    <P2318></P2318>
+    <P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
     <!-- Music On Hold URI -->
     <!-- String -->
     <P2350></P2350>
@@ -357,7 +359,7 @@
     {if isset($grandstream_dial_plan) }
     <P290>{$grandstream_dial_plan}</P290>
     {else}
-    <P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P290>
+    <P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P290>
     {/if}
     
     <!-- Delayed Call Forward Wait Time (in seconds). Default is 20-->
@@ -378,28 +380,28 @@
     <P104>0</P104>
     <!-- Matching Incoming Caller ID. Matching Rule 1-->
     <!-- String-->
-    <P1488></P1488>
+    <P1488>{$grandstream_distinctive_ringtone_name_1}</P1488>
     <!-- Matching Rule 1 Distinctive Ringtone-->
     <!-- 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3. Default is 0.-->
     <!-- Number: 0, 1, 2, 3-->
     <!-- Mandatory -->
-    <P1489>0</P1489>
+    <P1489>{$grandstream_distinctive_ringtone_1}</P1489>
     <!-- Matching Incoming Caller ID. Matching Rule 2-->
     <!-- String-->
-    <P1490>0</P1490>
+    <P1490>{$grandstream_distinctive_ringtone_name_2}</P1490>
     <!-- Matching Rule 2 Distinctive Ringtone-->
     <!-- 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3. Default is 0-->
     <!-- Number: 0, 1, 2, 3-->
     <!-- Mandatory-->
-    <P1491>0</P1491>
+    <P1491>{$grandstream_distinctive_ringtone_2}</P1491>
     <!-- Matching Incoming Caller ID. Matching Rule 3-->
     <!-- String-->
-    <P1492></P1492>
+    <P1492>{$grandstream_distinctive_ringtone_name_3}</P1492>
     <!-- Matching Rule 3 Distinctive Ringtone -->
     <!-- 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3. Default is 0 -->
     <!-- Number: 0, 1, 2,3-->
     <!-- Mandatory -->
-    <P1493>0</P1493>
+    <P1493>{$grandstream_distinctive_ringtone_3}</P1493>
     <!-- Ring Timeout (in seconds). Default is 60 -->
     <!-- Number: 30 - 3600 -->
     <!-- Mandatory -->
@@ -614,7 +616,7 @@
     <P444></P444>
     <!-- Conference URI-->
     <!-- String-->
-    <P2418></P2418>
+    <P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
     <!-- Music On Hold URI-->
     <!-- String-->
     <P2450></P2450>
@@ -1047,7 +1049,7 @@
     <P544></P544>
     <!-- Conference URI -->
     <!-- String -->
-    <P2518></P2518>
+    <P2518>{if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}</P2518>
     <!-- Music On Hold URI -->
     <!-- String -->
     <P2550></P2550>
@@ -1241,7 +1243,7 @@
     <P523>0</P523>
     <!-- Matching Incoming Caller ID. Matching Rule 1 -->
     <!-- String -->
-    <P1500></P1500>
+    <P1500>{$grandstream_distinctive_ringtone_name_1}</P1500>
     <!-- Matching Rule 1 Distinctive Ringtone -->
     <!-- 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3. Default is 0 -->
     <!-- Number: 0, 1, 2, 3 -->
@@ -1478,7 +1480,7 @@
     <P644></P644>
     <!-- Conference URI -->
     <!-- String -->
-    <P2618></P2618>
+    <P2618>{if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}</P2618>
     <!-- Music On Hold -->
     <!-- String -->
     <P2650></P2650>
@@ -1925,7 +1927,7 @@
     <P237></P237>
     {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-    {else}
+    {elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
     {/if}
     
@@ -1945,12 +1947,12 @@
     <!-- When set to Yes(1), it will override the configured provision path and method -->
     <!-- Number: 0, 1 -->
     <!-- Mandatory -->
-    <P145>1</P145>
+    {if isset($grandstream_dhcp_option_override)}<P145>{$grandstream_dhcp_option_override}</P145>{else}<P145>1</P145>{/if}
     <!-- Allow DHCP Option 120 to Override SIP Server -->
     <!-- 0 - No, 1 - Yes. Default is 0 -->
     <!-- Number: 0, 1 -->
     <!-- Mandatory -->
-    <P1411>0</P1411>
+    {if isset($grandstream_dhcp_option_override_sip_server)}<P1411>{$grandstream_dhcp_option_override_sip_server}</P1411>{else}<P1411>0</P1411>{/if}
     <!-- Automatic Upgrade. 0 - No, 1 - Yes. Default is No -->
     <!-- Number: 0, 1 -->
     <!-- Mandatory -->
@@ -2283,11 +2285,21 @@
     <!-- HEADSET Key Mode. 0 - Default Mode, 1 - Toggle Headset/Speaker. Default is 0 -->
     <!-- Number: 0, 1 -->
     <!-- Mandatory -->
-    <P1312>0</P1312>
-    <!-- Headset Type. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
-    <!-- Number: 0, 1 -->
-    <!-- Mandatory -->
-    <P1487>0</P1487>
+{if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
+
+    <!-- # Headset Type. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
+    <!-- # Number: 0, 1 -->
+    <!-- # Mandatory -->
+{if isset($grandstream_headset_type)}
+    <P6779>{$grandstream_headset_type}</P6779>
+
+    <!-- # EHS Headset Ring Tone. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
+    <!-- # Number: 0, 1 -->
+    <!-- # Mandatory -->
+    <P1487>{$grandstream_headset_type}</P1487>
+{/if}
     <!-- Always Ring Speaker. 0 - No, 1 - Yes. Default is 0 -->
     <!-- Number: 0, 1 -->
     <!-- Mandatory -->
diff --git a/resources/templates/provision/grandstream/gxp2130/{$mac}.xml b/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
index 3060319c5b..44bb563784 100644
--- a/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
@@ -354,7 +354,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2318></P2318>
+    <P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -420,7 +420,9 @@
     <!-- # Feature Key Synchronization. 0 - Disabled, 1 - Enabled. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P2325>0</P2325>
+{if isset($grandstream_feature_key_sync)}
+    <P2325>{$grandstream_feature_key_sync}</P2325>
+{/if}
 
     <!-- # Broadsoft Call Park. 0 - Disabled, 1 - Enabled. Default is 0 -->
     <!-- # Number: 0, 1 -->
@@ -686,7 +688,7 @@
 
     <!-- # Dial Plan Prefix -->
     <!-- # String  -->
-    <P66></P66>
+    <P66>{$grandstream_dial_prefix}</P66>
 
     <!-- # Dial Plan. Default value is { x+ | \+x+ | *x+ | *xx*x+ } -->
     <!-- # String -->
@@ -695,7 +697,7 @@
 {if isset($grandstream_dial_plan) }
     <P290>{$grandstream_dial_plan}</P290>
 {else}
-    <P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P290>
+    <P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P290>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -1306,7 +1308,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2418></P2418>
+    <P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -1645,7 +1647,7 @@
 {if isset($grandstream_dial_plan) }
     <P459>{$grandstream_dial_plan}</P459>
 {else}
-    <P459>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P459>
+    <P459>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P459>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -2254,7 +2256,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2518></P2518>
+    <P2518>{if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}</P2518>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -2592,7 +2594,7 @@
 {if isset($grandstream_dial_plan) }
     <P559>{$grandstream_dial_plan}</P559>
 {else}
-    <P559>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P559>
+    <P559>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P559>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -2613,7 +2615,7 @@
 
     <!-- # Matching Incoming Caller ID. Matching Rule 1 -->
     <!-- # String -->
-    <P1500>grandstream_distinctive_ringtone_name_1</P1500>
+    <P1500>{$grandstream_distinctive_ringtone_name_1}</P1500>
 
     <!-- # Matching Rule 1 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 0. -->
@@ -3203,7 +3205,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2618></P2618>
+    <P2618>{if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}</P2618>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -3543,7 +3545,7 @@
 {if isset($grandstream_dial_plan) }
     <P659>{$grandstream_dial_plan}</P659>
 {else}
-    <P659>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P659>
+    <P659>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P659>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -4153,7 +4155,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2718></P2718>
+    <P2718>{if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}</P2718>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -4491,7 +4493,7 @@
 {if isset($grandstream_dial_plan) }
     <P1759>{$grandstream_dial_plan}</P1759>
 {else}
-    <P1759>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P1759>
+    <P1759>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P1759>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -5103,7 +5105,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2818></P2818>
+    <P2818>{if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}</P2818>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -5443,7 +5445,7 @@
 {if isset($grandstream_dial_plan) }
     <P1859>{$grandstream_dial_plan}</P1859>
 {else}
-    <P1859>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P1859>
+    <P1859>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P1859>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -6054,50 +6056,66 @@
     <!-- # OpenVPN Enable.  0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1  -->
     <!-- # Mandatory -->
+{if isset($grandstream_openvpn_enable)}
+    <P7050>{$grandstream_openvpn_enable}</P7050>
+{else}
     <P7050>0</P7050>
+{/if}
 
     <!-- # OpenVPN Server Address -->
     <!-- # String -->
-    <P7051></P7051>
+    <P7051>{$grandstream_openvpn_server}</P7051>
 
     <!-- # OpenVPN Port. Default is 1194 -->
-    <!-- # Number -->
+    <!-- # Number -->   
     <!-- # Mandatory -->
+{if isset($grandstream_openvpn_port)}  
+    <P7052>{$grandstream_openvpn_port}</P7052>
+{else}
     <P7052>1194</P7052>
+{/if}
 
     <!-- # OpenVPN Transport.  0 - UDP, 1 - TCP. Default is 0 -->
     <!-- #Number: 0, 1  -->
     <!-- #Mandatory -->
+{if isset($grandstream_openvpn_transport)}
+    <P2912>{$grandstream_openvpn_transport}</P2912>
+{else}
     <P2912>0</P2912>
+{/if}
 
     <!-- # OpenVPN CA -->
     <!-- # String -->
-    <P9902></P9902>
+    <P9902>{$grandstream_openvpn_ca}</P9902>
 
     <!-- # OpenVPN Certificate -->
     <!-- # String -->
-    <P9903></P9903>
+    <P9903>{$grandstream_openvpn_cert}</P9903>
 
     <!-- # OpenVPN Client Key -->
     <!-- # String -->
-    <P9904></P9904>
+    <P9904>{$grandstream_openvpn_key}</P9904>
 
     <!-- # OpenVPN Cipher Method. 0 - Blowfish, 1 - AES-128, 2 - AES-256, 3 - Triple-DES. Default is 0 -->
     <!-- # Number: 0, 1, 2, 3  -->
     <!-- # Mandatory -->
+{if isset($grandstream_openvpn_cipher)}
+    <P8396>{$grandstream_openvpn_cipher}</P8396>
+{else}
     <P8396>0</P8396>
+{/if}
 
     <!-- # OpenVPN Username -->
     <!-- # String -->
-    <P8394></P8394>
+    <P8394>{$grandstream_openvpn_username}</P8394>
 
     <!-- # OpenVPN Password -->
     <!-- # String -->
-    <P8395></P8395>
+    <P8395>{$grandstream_openvpn_password}</P8395>
 
     <!-- # Additional Options -->
     <!-- # String -->
-    <P8460></P8460>
+    <P8460>{$grandstream_openvpn_options}</P8460>
 
     <!-- ############################################################################## -->
     <!-- ## Network/SNMP Settings                     ## -->
@@ -6233,18 +6251,18 @@
     <!-- # When set to Yes(1), it will override the configured provision path and method -->
     <!-- # Number: 0, 1, 2 -->
     <!-- # Mandatory -->
-    <P145>1</P145>
+    {if isset($grandstream_dhcp_option_override)}<P145>{$grandstream_dhcp_option_override}</P145>{else}<P145>1</P145>{/if}
 
     <!-- # Additional Override DHCP Option. 0 - None,  1 - Option 150,  2 - Option 160. Default is 0 -->
     <!-- # Number: 0, 1, 2 -->
     <!-- # Mandatory -->
-    <P8337>0</P8337>
+    {if isset($grandstream_dhcp_option_additional_override)}<P8337>{$grandstream_dhcp_option_additional_override}</P8337>{else}<P8337>0</P8337>{/if}
 
     <!-- # Allow DHCP Option 120 to Override SIP Server -->
     <!-- # 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1411>0</P1411>
+    {if isset($grandstream_dhcp_option_override_sip_server)}<P1411>{$grandstream_dhcp_option_override_sip_server}</P1411>{else}<P1411>0</P1411>{/if}
 
     <!-- # 3CX Auto Provision. 0 - No, 1 - Yes. Default is Yes -->
     <!-- # Number: 0, 1 -->
@@ -6305,7 +6323,7 @@
     <P237></P237>
 {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
@@ -6679,7 +6697,11 @@
     <!-- # Sort Phonebook by. 0 - Last Name, 1 - First Name. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
+{if isset($grandstream_sort_phonebook_by)}
+    <P2914>{$grandstream_sort_phonebook_by}</P2914>
+{else}
     <P2914>0</P2914>
+{/if}
 
     <!-- # Phonebook Key Function. 0 - Default, 1 - LDAP Search, 2 - Local Phonebook, 3 - Local Group, 4 - Broadsoft Phonebook -->
     <!-- # Number: 0, 1, 2, 3, 4. -->
@@ -6693,7 +6715,11 @@
     <!-- # Default search mode. 0 - Quick match, 1 - Exact match. Default is 0 -->
     <!-- # Number: 0, 1. -->
     <!-- # Mandatory -->
+{if isset($grandstream_phonebook_search_mode)}
+    <P2970>{$grandstream_phonebook_search_mode}</P2970>
+{else}
     <P2970>0</P2970>
+{/if}
 
     <!-- ############################################################################## -->
     <!-- ##  Phonebook/LDAP -->
@@ -7581,7 +7607,7 @@
     <!-- # Hide BLF Remote Status. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P8374>0</P8374>
+    <P8374>{$grandstream_blf_remote_status}</P8374>
 
     <!-- # Show SIP Error Response. 0 - No, 1 - Yes. Default is 1 -->
     <!-- # Number: 0, 1 -->
@@ -7908,17 +7934,21 @@
     <!-- # HEADSET Key Mode. 0 - Default Mode, 1 - Toggle Headset/Speaker. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1312>0</P1312>
+{if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
 
     <!-- # Headset Type. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P6779>0</P6779>
+{if isset($grandstream_headset_type)}
+    <P6779>{$grandstream_headset_type}</P6779>
 
     <!-- # EHS Headset Ring Tone. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1487>0</P1487>
+    <P1487>{$grandstream_headset_type}</P1487>
+{/if}
 
     <!-- # Always Ring Speaker. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
@@ -8122,9 +8152,7 @@
 {if isset($grandstream_wallpaper_url)}
     <P2916>1</P2916>
     <P2917>{$grandstream_wallpaper_url}</P2917>
-{else}
-    <P2916>0</P2916>
-    <P2917></P2917>
+
 {/if}
 
     <!-- # Color Background. Default is #000000. -->
@@ -8136,8 +8164,6 @@
     <!-- # Mandatory -->
 {if isset($grandstream_screensaver)}
     <P2918>{$grandstream_screensaver}</P2918>
-{else}
-    <P2918>1</P2918>
 {/if}
 
     <!-- # Screensaver Source.  0 - Default, 1 - USB, 2 - Download. Default is 0. ~~for GXP2140/2160/2170 only -->
@@ -8145,8 +8171,6 @@
     <!-- # Mandatory -->
 {if isset($grandstream_screensaver_source)}
     <P6759>{$grandstream_screensaver_source}</P6759>
-{else}
-    <P6759>0</P6759>
 {/if}
 
     <!-- # Show Date and Time. 0 - No, 1 - Yes. Default is 1 -->
@@ -8255,7 +8279,9 @@
     <!-- # Speaker Ring Volume -->
     <!-- # Number: 0-7. Default is 5. -->
     <!-- # Mandatory -->
-    <P8352>5</P8352>
+{if isset($grandstream_speaker_ring_volume)}
+    <P8352>{$grandstream_speaker_ring_volume}</P8352>
+{/if} 
 
     <!-- # Notification Tone Volume -->
     <!-- # Number: 0-7. Default is 5. -->
diff --git a/resources/templates/provision/grandstream/gxp2135/{$mac}.xml b/resources/templates/provision/grandstream/gxp2135/{$mac}.xml
index e27f59b922..eed4e495a7 100644
--- a/resources/templates/provision/grandstream/gxp2135/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2135/{$mac}.xml
@@ -354,7 +354,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2318></P2318>
+    <P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -420,7 +420,9 @@
     <!-- # Feature Key Synchronization. 0 - Disabled, 1 - Enabled. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P2325>0</P2325>
+{if isset($grandstream_feature_key_sync)}
+    <P2325>{$grandstream_feature_key_sync}</P2325>
+{/if}
 
     <!-- # Broadsoft Call Park. 0 - Disabled, 1 - Enabled. Default is 0 -->
     <!-- # Number: 0, 1 -->
@@ -686,7 +688,7 @@
 
     <!-- # Dial Plan Prefix -->
     <!-- # String  -->
-    <P66></P66>
+    <P66>{$grandstream_dial_prefix}</P66>
 
     <!-- # Dial Plan. Default value is { x+ | \+x+ | *x+ | *xx*x+ } -->
     <!-- # String -->
@@ -695,7 +697,7 @@
 {if isset($grandstream_dial_plan) }
     <P290>{$grandstream_dial_plan}</P290>
 {else}
-    <P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P290>
+    <P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P290>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -1306,7 +1308,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2418></P2418>
+    <P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -1645,7 +1647,7 @@
 {if isset($grandstream_dial_plan) }
     <P459>{$grandstream_dial_plan}</P459>
 {else}
-    <P459>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P459>
+    <P459>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P459>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -2254,7 +2256,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2518></P2518>
+    <P2518>{if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}</P2518>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -2592,7 +2594,7 @@
 {if isset($grandstream_dial_plan) }
     <P559>{$grandstream_dial_plan}</P559>
 {else}
-    <P559>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P559>
+    <P559>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P559>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -2613,7 +2615,7 @@
 
     <!-- # Matching Incoming Caller ID. Matching Rule 1 -->
     <!-- # String -->
-    <P1500>grandstream_distinctive_ringtone_name_1</P1500>
+    <P1500>{$grandstream_distinctive_ringtone_name_1}</P1500>
 
     <!-- # Matching Rule 1 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 0. -->
@@ -3203,7 +3205,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2618></P2618>
+    <P2618>{if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}</P2618>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -3543,7 +3545,7 @@
 {if isset($grandstream_dial_plan) }
     <P659>{$grandstream_dial_plan}</P659>
 {else}
-    <P659>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P659>
+    <P659>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P659>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -4153,7 +4155,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2718></P2718>
+    <P2718>{if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}</P2718>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -4491,7 +4493,7 @@
 {if isset($grandstream_dial_plan) }
     <P1759>{$grandstream_dial_plan}</P1759>
 {else}
-    <P1759>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P1759>
+    <P1759>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P1759>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -5103,7 +5105,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2818></P2818>
+    <P2818>{if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}</P2818>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -5443,7 +5445,7 @@
 {if isset($grandstream_dial_plan) }
     <P1859>{$grandstream_dial_plan}</P1859>
 {else}
-    <P1859>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P1859>
+    <P1859>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P1859>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -6054,50 +6056,66 @@
     <!-- # OpenVPN Enable.  0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1  -->
     <!-- # Mandatory -->
+{if isset($grandstream_openvpn_enable)}
+    <P7050>{$grandstream_openvpn_enable}</P7050>
+{else}
     <P7050>0</P7050>
+{/if}
 
     <!-- # OpenVPN Server Address -->
     <!-- # String -->
-    <P7051></P7051>
+    <P7051>{$grandstream_openvpn_server}</P7051>
 
     <!-- # OpenVPN Port. Default is 1194 -->
     <!-- # Number -->
     <!-- # Mandatory -->
+{if isset($grandstream_openvpn_port)}  
+    <P7052>{$grandstream_openvpn_port}</P7052>
+{else}
     <P7052>1194</P7052>
+{/if}
 
     <!-- # OpenVPN Transport.  0 - UDP, 1 - TCP. Default is 0 -->
     <!-- #Number: 0, 1  -->
     <!-- #Mandatory -->
+{if isset($grandstream_openvpn_transport)}
+    <P2912>{$grandstream_openvpn_transport}</P2912>
+{else}
     <P2912>0</P2912>
+{/if}
 
     <!-- # OpenVPN CA -->
     <!-- # String -->
-    <P9902></P9902>
+    <P9902>{$grandstream_openvpn_ca}</P9902>
 
     <!-- # OpenVPN Certificate -->
     <!-- # String -->
-    <P9903></P9903>
+    <P9903>{$grandstream_openvpn_cert}</P9903>
 
     <!-- # OpenVPN Client Key -->
     <!-- # String -->
-    <P9904></P9904>
+    <P9904>{$grandstream_openvpn_key}</P9904>
 
     <!-- # OpenVPN Cipher Method. 0 - Blowfish, 1 - AES-128, 2 - AES-256, 3 - Triple-DES. Default is 0 -->
     <!-- # Number: 0, 1, 2, 3  -->
     <!-- # Mandatory -->
+{if isset($grandstream_openvpn_cipher)}
+    <P8396>{$grandstream_openvpn_cipher}</P8396>
+{else}
     <P8396>0</P8396>
+{/if}
 
     <!-- # OpenVPN Username -->
     <!-- # String -->
-    <P8394></P8394>
+    <P8394>{$grandstream_openvpn_username}</P8394>
 
     <!-- # OpenVPN Password -->
     <!-- # String -->
-    <P8395></P8395>
+    <P8395>{$grandstream_openvpn_password}</P8395>
 
     <!-- # Additional Options -->
     <!-- # String -->
-    <P8460></P8460>
+    <P8460>{$grandstream_openvpn_options}</P8460>
 
     <!-- ############################################################################## -->
     <!-- ## Network/SNMP Settings                     ## -->
@@ -6233,23 +6251,23 @@
     <!-- # When set to Yes(1), it will override the configured provision path and method -->
     <!-- # Number: 0, 1, 2 -->
     <!-- # Mandatory -->
-    <P145>1</P145>
+    {if isset($grandstream_dhcp_option_override)}<P145>{$grandstream_dhcp_option_override}</P145>{else}<P145>1</P145>{/if}
 
     <!-- # Additional Override DHCP Option. 0 - None,  1 - Option 150,  2 - Option 160. Default is 0 -->
     <!-- # Number: 0, 1, 2 -->
     <!-- # Mandatory -->
-    <P8337>0</P8337>
+    {if isset($grandstream_dhcp_option_additional_override)}<P8337>{$grandstream_dhcp_option_additional_override}</P8337>{else}<P8337>0</P8337>{/if}
 
     <!-- # Allow DHCP Option 120 to Override SIP Server -->
     <!-- # 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1411>0</P1411>
+    {if isset($grandstream_dhcp_option_override_sip_server)}<P1411>{$grandstream_dhcp_option_override_sip_server}</P1411>{else}<P1411>0</P1411>{/if}
 
     <!-- # 3CX Auto Provision. 0 - No, 1 - Yes. Default is Yes -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1414>1</P1414>
+    <P1414>0</P1414>
 
     <!-- # Automatic Upgrade.  -->
     <!-- # 0 - No,  -->
@@ -6291,7 +6309,7 @@
     <!-- # Firmware Upgrade Confirmation. 0 - No, 1 - Yes. Default is 1 -->
     <!-- # Number: 0,1 -->
     <!-- # Mandatory -->
-    <P8375>1</P8375>
+    <P8375>0</P8375>
 
     <!-- #Config -->
     <!-- # Config Via. 0 - TFTP,  1 - HTTP, 2 - HTTPS, 3 - FTP, 4 - FTPS. Default is 1. Default is 2 -->
@@ -6305,7 +6323,7 @@
     <P237></P237>
 {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
@@ -7581,7 +7599,7 @@
     <!-- # Hide BLF Remote Status. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P8374>0</P8374>
+    <P8374>{$grandstream_blf_remote_status}</P8374>
 
     <!-- # Show SIP Error Response. 0 - No, 1 - Yes. Default is 1 -->
     <!-- # Number: 0, 1 -->
@@ -7908,17 +7926,21 @@
     <!-- # HEADSET Key Mode. 0 - Default Mode, 1 - Toggle Headset/Speaker. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1312>0</P1312>
+{if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
 
     <!-- # Headset Type. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P6779>0</P6779>
+{if isset($grandstream_headset_type)}
+    <P6779>{$grandstream_headset_type}</P6779>
 
     <!-- # EHS Headset Ring Tone. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1487>0</P1487>
+    <P1487>{$grandstream_headset_type}</P1487>
+{/if}
 
     <!-- # Always Ring Speaker. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
@@ -8123,9 +8145,7 @@
 {if isset($grandstream_wallpaper_url)}
     <P2916>1</P2916>
     <P2917>{$grandstream_wallpaper_url}</P2917>
-{else}
-    <P2916>0</P2916>
-    <P2917></P2917>
+
 {/if}
 
     <!-- # Color Background. Default is #000000. -->
@@ -8137,8 +8157,6 @@
     <!-- # Mandatory -->
 {if isset($grandstream_screensaver)}
     <P2918>{$grandstream_screensaver}</P2918>
-{else}
-    <P2918>1</P2918>
 {/if}
 
     <!-- # Screensaver Source.  0 - Default, 1 - USB, 2 - Download. Default is 0. ~~for GXP2140/2160/2170 only -->
@@ -8146,8 +8164,6 @@
     <!-- # Mandatory -->
 {if isset($grandstream_screensaver_source)}
     <P6759>{$grandstream_screensaver_source}</P6759>
-{else}
-    <P6759>0</P6759>
 {/if}
 
     <!-- # Show Date and Time. 0 - No, 1 - Yes. Default is 1 -->
@@ -8256,7 +8272,9 @@
     <!-- # Speaker Ring Volume -->
     <!-- # Number: 0-7. Default is 5. -->
     <!-- # Mandatory -->
-    <P8352>5</P8352>
+{if isset($grandstream_speaker_ring_volume)}
+    <P8352>{$grandstream_speaker_ring_volume}</P8352>
+{/if} 
 
     <!-- # Notification Tone Volume -->
     <!-- # Number: 0-7. Default is 5. -->
diff --git a/resources/templates/provision/grandstream/gxp2140/{$mac}.xml b/resources/templates/provision/grandstream/gxp2140/{$mac}.xml
index e27f59b922..131813c209 100644
--- a/resources/templates/provision/grandstream/gxp2140/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2140/{$mac}.xml
@@ -354,7 +354,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2318></P2318>
+    <P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -420,7 +420,9 @@
     <!-- # Feature Key Synchronization. 0 - Disabled, 1 - Enabled. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P2325>0</P2325>
+{if isset($grandstream_feature_key_sync)}
+    <P2325>{$grandstream_feature_key_sync}</P2325>
+{/if}
 
     <!-- # Broadsoft Call Park. 0 - Disabled, 1 - Enabled. Default is 0 -->
     <!-- # Number: 0, 1 -->
@@ -686,7 +688,7 @@
 
     <!-- # Dial Plan Prefix -->
     <!-- # String  -->
-    <P66></P66>
+    <P66>{$grandstream_dial_prefix}</P66>
 
     <!-- # Dial Plan. Default value is { x+ | \+x+ | *x+ | *xx*x+ } -->
     <!-- # String -->
@@ -695,7 +697,7 @@
 {if isset($grandstream_dial_plan) }
     <P290>{$grandstream_dial_plan}</P290>
 {else}
-    <P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P290>
+    <P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P290>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -1306,7 +1308,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2418></P2418>
+    <P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -1645,7 +1647,7 @@
 {if isset($grandstream_dial_plan) }
     <P459>{$grandstream_dial_plan}</P459>
 {else}
-    <P459>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P459>
+    <P459>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P459>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -2254,7 +2256,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2518></P2518>
+    <P2518>{if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}</P2518>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -2592,7 +2594,7 @@
 {if isset($grandstream_dial_plan) }
     <P559>{$grandstream_dial_plan}</P559>
 {else}
-    <P559>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P559>
+    <P559>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P559>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -2613,7 +2615,7 @@
 
     <!-- # Matching Incoming Caller ID. Matching Rule 1 -->
     <!-- # String -->
-    <P1500>grandstream_distinctive_ringtone_name_1</P1500>
+    <P1500>{$grandstream_distinctive_ringtone_name_1}</P1500>
 
     <!-- # Matching Rule 1 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 0. -->
@@ -3203,7 +3205,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2618></P2618>
+    <P2618>{if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}</P2618>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -3543,7 +3545,7 @@
 {if isset($grandstream_dial_plan) }
     <P659>{$grandstream_dial_plan}</P659>
 {else}
-    <P659>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P659>
+    <P659>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P659>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -4153,7 +4155,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2718></P2718>
+    <P2718>{if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}</P2718>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -4491,7 +4493,7 @@
 {if isset($grandstream_dial_plan) }
     <P1759>{$grandstream_dial_plan}</P1759>
 {else}
-    <P1759>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P1759>
+    <P1759>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P1759>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -5103,7 +5105,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2818></P2818>
+    <P2818>{if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}</P2818>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -5443,7 +5445,7 @@
 {if isset($grandstream_dial_plan) }
     <P1859>{$grandstream_dial_plan}</P1859>
 {else}
-    <P1859>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P1859>
+    <P1859>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P1859>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -6054,50 +6056,66 @@
     <!-- # OpenVPN Enable.  0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1  -->
     <!-- # Mandatory -->
+{if isset($grandstream_openvpn_enable)}
+    <P7050>{$grandstream_openvpn_enable}</P7050>
+{else}
     <P7050>0</P7050>
+{/if}
 
     <!-- # OpenVPN Server Address -->
     <!-- # String -->
-    <P7051></P7051>
+    <P7051>{$grandstream_openvpn_server}</P7051>
 
     <!-- # OpenVPN Port. Default is 1194 -->
     <!-- # Number -->
     <!-- # Mandatory -->
+{if isset($grandstream_openvpn_port)}  
+    <P7052>{$grandstream_openvpn_port}</P7052>
+{else}
     <P7052>1194</P7052>
+{/if}
 
     <!-- # OpenVPN Transport.  0 - UDP, 1 - TCP. Default is 0 -->
     <!-- #Number: 0, 1  -->
     <!-- #Mandatory -->
+{if isset($grandstream_openvpn_transport)}
+    <P2912>{$grandstream_openvpn_transport}</P2912>
+{else}
     <P2912>0</P2912>
+{/if}
 
     <!-- # OpenVPN CA -->
     <!-- # String -->
-    <P9902></P9902>
+    <P9902>{$grandstream_openvpn_ca}</P9902>
 
     <!-- # OpenVPN Certificate -->
     <!-- # String -->
-    <P9903></P9903>
+    <P9903>{$grandstream_openvpn_cert}</P9903>
 
     <!-- # OpenVPN Client Key -->
     <!-- # String -->
-    <P9904></P9904>
+    <P9904>{$grandstream_openvpn_key}</P9904>
 
     <!-- # OpenVPN Cipher Method. 0 - Blowfish, 1 - AES-128, 2 - AES-256, 3 - Triple-DES. Default is 0 -->
     <!-- # Number: 0, 1, 2, 3  -->
     <!-- # Mandatory -->
+{if isset($grandstream_openvpn_cipher)}
+    <P8396>{$grandstream_openvpn_cipher}</P8396>
+{else}
     <P8396>0</P8396>
+{/if}
 
     <!-- # OpenVPN Username -->
     <!-- # String -->
-    <P8394></P8394>
+    <P8394>{$grandstream_openvpn_username}</P8394>
 
     <!-- # OpenVPN Password -->
     <!-- # String -->
-    <P8395></P8395>
+    <P8395>{$grandstream_openvpn_password}</P8395>
 
     <!-- # Additional Options -->
     <!-- # String -->
-    <P8460></P8460>
+    <P8460>{$grandstream_openvpn_options}</P8460>
 
     <!-- ############################################################################## -->
     <!-- ## Network/SNMP Settings                     ## -->
@@ -6233,18 +6251,18 @@
     <!-- # When set to Yes(1), it will override the configured provision path and method -->
     <!-- # Number: 0, 1, 2 -->
     <!-- # Mandatory -->
-    <P145>1</P145>
+    {if isset($grandstream_dhcp_option_override)}<P145>{$grandstream_dhcp_option_override}</P145>{else}<P145>1</P145>{/if}
 
     <!-- # Additional Override DHCP Option. 0 - None,  1 - Option 150,  2 - Option 160. Default is 0 -->
     <!-- # Number: 0, 1, 2 -->
     <!-- # Mandatory -->
-    <P8337>0</P8337>
+    {if isset($grandstream_dhcp_option_additional_override)}<P8337>{$grandstream_dhcp_option_additional_override}</P8337>{else}<P8337>0</P8337>{/if}
 
     <!-- # Allow DHCP Option 120 to Override SIP Server -->
     <!-- # 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1411>0</P1411>
+    {if isset($grandstream_dhcp_option_override_sip_server)}<P1411>{$grandstream_dhcp_option_override_sip_server}</P1411>{else}<P1411>0</P1411>{/if}
 
     <!-- # 3CX Auto Provision. 0 - No, 1 - Yes. Default is Yes -->
     <!-- # Number: 0, 1 -->
@@ -6305,7 +6323,7 @@
     <P237></P237>
 {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
@@ -7581,7 +7599,7 @@
     <!-- # Hide BLF Remote Status. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P8374>0</P8374>
+    <P8374>{$grandstream_blf_remote_status}</P8374>
 
     <!-- # Show SIP Error Response. 0 - No, 1 - Yes. Default is 1 -->
     <!-- # Number: 0, 1 -->
@@ -7908,17 +7926,21 @@
     <!-- # HEADSET Key Mode. 0 - Default Mode, 1 - Toggle Headset/Speaker. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1312>0</P1312>
+{if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
 
     <!-- # Headset Type. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P6779>0</P6779>
+{if isset($grandstream_headset_type)}
+    <P6779>{$grandstream_headset_type}</P6779>
 
     <!-- # EHS Headset Ring Tone. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1487>0</P1487>
+    <P1487>{$grandstream_headset_type}</P1487>
+{/if}
 
     <!-- # Always Ring Speaker. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
@@ -8123,9 +8145,7 @@
 {if isset($grandstream_wallpaper_url)}
     <P2916>1</P2916>
     <P2917>{$grandstream_wallpaper_url}</P2917>
-{else}
-    <P2916>0</P2916>
-    <P2917></P2917>
+
 {/if}
 
     <!-- # Color Background. Default is #000000. -->
@@ -8137,8 +8157,6 @@
     <!-- # Mandatory -->
 {if isset($grandstream_screensaver)}
     <P2918>{$grandstream_screensaver}</P2918>
-{else}
-    <P2918>1</P2918>
 {/if}
 
     <!-- # Screensaver Source.  0 - Default, 1 - USB, 2 - Download. Default is 0. ~~for GXP2140/2160/2170 only -->
@@ -8146,8 +8164,6 @@
     <!-- # Mandatory -->
 {if isset($grandstream_screensaver_source)}
     <P6759>{$grandstream_screensaver_source}</P6759>
-{else}
-    <P6759>0</P6759>
 {/if}
 
     <!-- # Show Date and Time. 0 - No, 1 - Yes. Default is 1 -->
@@ -8256,7 +8272,9 @@
     <!-- # Speaker Ring Volume -->
     <!-- # Number: 0-7. Default is 5. -->
     <!-- # Mandatory -->
-    <P8352>5</P8352>
+{if isset($grandstream_speaker_ring_volume)}
+    <P8352>{$grandstream_speaker_ring_volume}</P8352>
+{/if} 
 
     <!-- # Notification Tone Volume -->
     <!-- # Number: 0-7. Default is 5. -->
diff --git a/resources/templates/provision/grandstream/gxp2160/{$mac}.xml b/resources/templates/provision/grandstream/gxp2160/{$mac}.xml
index 8db9185b49..802852d4ec 100644
--- a/resources/templates/provision/grandstream/gxp2160/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2160/{$mac}.xml
@@ -354,7 +354,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2318></P2318>
+    <P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -420,7 +420,9 @@
     <!-- # Feature Key Synchronization. 0 - Disabled, 1 - Enabled. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P2325>0</P2325>
+{if isset($grandstream_feature_key_sync)}
+    <P2325>{$grandstream_feature_key_sync}</P2325>
+{/if}
 
     <!-- # Broadsoft Call Park. 0 - Disabled, 1 - Enabled. Default is 0 -->
     <!-- # Number: 0, 1 -->
@@ -686,7 +688,7 @@
 
     <!-- # Dial Plan Prefix -->
     <!-- # String  -->
-    <P66></P66>
+    <P66>{$grandstream_dial_prefix}</P66>
 
     <!-- # Dial Plan. Default value is { x+ | \+x+ | *x+ | *xx*x+ } -->
     <!-- # String -->
@@ -695,7 +697,7 @@
 {if isset($grandstream_dial_plan) }
     <P290>{$grandstream_dial_plan}</P290>
 {else}
-    <P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P290>
+    <P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P290>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -1306,7 +1308,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2418></P2418>
+    <P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -1645,7 +1647,7 @@
 {if isset($grandstream_dial_plan) }
     <P459>{$grandstream_dial_plan}</P459>
 {else}
-    <P459>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P459>
+    <P459>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P459>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -2254,7 +2256,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2518></P2518>
+    <P2518>{if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}</P2518>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -2592,7 +2594,7 @@
 {if isset($grandstream_dial_plan) }
     <P559>{$grandstream_dial_plan}</P559>
 {else}
-    <P559>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P559>
+    <P559>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P559>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -2613,7 +2615,7 @@
 
     <!-- # Matching Incoming Caller ID. Matching Rule 1 -->
     <!-- # String -->
-    <P1500>grandstream_distinctive_ringtone_name_1</P1500>
+    <P1500>{$grandstream_distinctive_ringtone_name_1}</P1500>
 
     <!-- # Matching Rule 1 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 0. -->
@@ -3203,7 +3205,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2618></P2618>
+    <P2618>{if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}</P2618>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -3543,7 +3545,7 @@
 {if isset($grandstream_dial_plan) }
     <P659>{$grandstream_dial_plan}</P659>
 {else}
-    <P659>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P659>
+    <P659>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P659>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -4153,7 +4155,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2718></P2718>
+    <P2718>{if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}</P2718>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -4491,7 +4493,7 @@
 {if isset($grandstream_dial_plan) }
     <P1759>{$grandstream_dial_plan}</P1759>
 {else}
-    <P1759>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P1759>
+    <P1759>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P1759>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -5103,7 +5105,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2818></P2818>
+    <P2818>{if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}</P2818>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -5443,7 +5445,7 @@
 {if isset($grandstream_dial_plan) }
     <P1859>{$grandstream_dial_plan}</P1859>
 {else}
-    <P1859>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P1859>
+    <P1859>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P1859>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -6054,50 +6056,66 @@
     <!-- # OpenVPN Enable.  0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1  -->
     <!-- # Mandatory -->
+{if isset($grandstream_openvpn_enable)}
+    <P7050>{$grandstream_openvpn_enable}</P7050>
+{else}
     <P7050>0</P7050>
+{/if}
 
     <!-- # OpenVPN Server Address -->
     <!-- # String -->
-    <P7051></P7051>
+    <P7051>{$grandstream_openvpn_server}</P7051>
 
     <!-- # OpenVPN Port. Default is 1194 -->
     <!-- # Number -->
     <!-- # Mandatory -->
+{if isset($grandstream_openvpn_port)}  
+    <P7052>{$grandstream_openvpn_port}</P7052>
+{else}
     <P7052>1194</P7052>
+{/if}
 
     <!-- # OpenVPN Transport.  0 - UDP, 1 - TCP. Default is 0 -->
     <!-- #Number: 0, 1  -->
     <!-- #Mandatory -->
+{if isset($grandstream_openvpn_transport)}
+    <P2912>{$grandstream_openvpn_transport}</P2912>
+{else}
     <P2912>0</P2912>
+{/if}
 
     <!-- # OpenVPN CA -->
     <!-- # String -->
-    <P9902></P9902>
+    <P9902>{$grandstream_openvpn_ca}</P9902>
 
     <!-- # OpenVPN Certificate -->
     <!-- # String -->
-    <P9903></P9903>
+    <P9903>{$grandstream_openvpn_cert}</P9903>
 
     <!-- # OpenVPN Client Key -->
     <!-- # String -->
-    <P9904></P9904>
+    <P9904>{$grandstream_openvpn_key}</P9904>
 
     <!-- # OpenVPN Cipher Method. 0 - Blowfish, 1 - AES-128, 2 - AES-256, 3 - Triple-DES. Default is 0 -->
     <!-- # Number: 0, 1, 2, 3  -->
     <!-- # Mandatory -->
+{if isset($grandstream_openvpn_cipher)}
+    <P8396>{$grandstream_openvpn_cipher}</P8396>
+{else}
     <P8396>0</P8396>
+{/if}
 
     <!-- # OpenVPN Username -->
     <!-- # String -->
-    <P8394></P8394>
+    <P8394>{$grandstream_openvpn_username}</P8394>
 
     <!-- # OpenVPN Password -->
     <!-- # String -->
-    <P8395></P8395>
+    <P8395>{$grandstream_openvpn_password}</P8395>
 
     <!-- # Additional Options -->
     <!-- # String -->
-    <P8460></P8460>
+    <P8460>{$grandstream_openvpn_options}</P8460>
 
     <!-- ############################################################################## -->
     <!-- ## Network/SNMP Settings                     ## -->
@@ -6233,18 +6251,18 @@
     <!-- # When set to Yes(1), it will override the configured provision path and method -->
     <!-- # Number: 0, 1, 2 -->
     <!-- # Mandatory -->
-    <P145>1</P145>
+    {if isset($grandstream_dhcp_option_override)}<P145>{$grandstream_dhcp_option_override}</P145>{else}<P145>1</P145>{/if}
 
     <!-- # Additional Override DHCP Option. 0 - None,  1 - Option 150,  2 - Option 160. Default is 0 -->
     <!-- # Number: 0, 1, 2 -->
     <!-- # Mandatory -->
-    <P8337>0</P8337>
+    {if isset($grandstream_dhcp_option_additional_override)}<P8337>{$grandstream_dhcp_option_additional_override}</P8337>{else}<P8337>0</P8337>{/if}
 
     <!-- # Allow DHCP Option 120 to Override SIP Server -->
     <!-- # 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1411>0</P1411>
+    {if isset($grandstream_dhcp_option_override_sip_server)}<P1411>{$grandstream_dhcp_option_override_sip_server}</P1411>{else}<P1411>0</P1411>{/if}
 
     <!-- # 3CX Auto Provision. 0 - No, 1 - Yes. Default is Yes -->
     <!-- # Number: 0, 1 -->
@@ -6305,7 +6323,7 @@
     <P237></P237>
 {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
@@ -6683,7 +6701,11 @@
     <!-- # Sort Phonebook by. 0 - Last Name, 1 - First Name. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
+{if isset($grandstream_sort_phonebook_by)}
+    <P2914>{$grandstream_sort_phonebook_by}</P2914>
+{else}
     <P2914>0</P2914>
+{/if}
 
     <!-- # Phonebook Key Function. 0 - Default, 1 - LDAP Search, 2 - Local Phonebook, 3 - Local Group, 4 - Broadsoft Phonebook -->
     <!-- # Number: 0, 1, 2, 3, 4. -->
@@ -6697,7 +6719,11 @@
     <!-- # Default search mode. 0 - Quick match, 1 - Exact match. Default is 0 -->
     <!-- # Number: 0, 1. -->
     <!-- # Mandatory -->
+{if isset($grandstream_phonebook_search_mode)}
+    <P2970>{$grandstream_phonebook_search_mode}</P2970>
+{else}
     <P2970>0</P2970>
+{/if}
 
     <!-- ############################################################################## -->
     <!-- ##  Phonebook/LDAP -->
@@ -7585,7 +7611,7 @@
     <!-- # Hide BLF Remote Status. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P8374>0</P8374>
+    <P8374>{$grandstream_blf_remote_status}</P8374>
 
     <!-- # Show SIP Error Response. 0 - No, 1 - Yes. Default is 1 -->
     <!-- # Number: 0, 1 -->
@@ -7912,17 +7938,21 @@
     <!-- # HEADSET Key Mode. 0 - Default Mode, 1 - Toggle Headset/Speaker. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1312>0</P1312>
+{if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
 
     <!-- # Headset Type. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P6779>0</P6779>
+{if isset($grandstream_headset_type)}
+    <P6779>{$grandstream_headset_type}</P6779>
 
     <!-- # EHS Headset Ring Tone. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1487>0</P1487>
+    <P1487>{$grandstream_headset_type}</P1487>
+{/if}
 
     <!-- # Always Ring Speaker. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
@@ -8127,9 +8157,7 @@
 {if isset($grandstream_wallpaper_url)}
     <P2916>1</P2916>
     <P2917>{$grandstream_wallpaper_url}</P2917>
-{else}
-    <P2916>0</P2916>
-    <P2917></P2917>
+
 {/if}
 
     <!-- # Color Background. Default is #000000. -->
@@ -8141,8 +8169,6 @@
     <!-- # Mandatory -->
 {if isset($grandstream_screensaver)}
     <P2918>{$grandstream_screensaver}</P2918>
-{else}
-    <P2918>1</P2918>
 {/if}
 
     <!-- # Screensaver Source.  0 - Default, 1 - USB, 2 - Download. Default is 0. ~~for GXP2140/2160/2170 only -->
@@ -8150,8 +8176,6 @@
     <!-- # Mandatory -->
 {if isset($grandstream_screensaver_source)}
     <P6759>{$grandstream_screensaver_source}</P6759>
-{else}
-    <P6759>0</P6759>
 {/if}
 
     <!-- # Show Date and Time. 0 - No, 1 - Yes. Default is 1 -->
@@ -8260,7 +8284,9 @@
     <!-- # Speaker Ring Volume -->
     <!-- # Number: 0-7. Default is 5. -->
     <!-- # Mandatory -->
-    <P8352>5</P8352>
+{if isset($grandstream_speaker_ring_volume)}
+    <P8352>{$grandstream_speaker_ring_volume}</P8352>
+{/if} 
 
     <!-- # Notification Tone Volume -->
     <!-- # Number: 0-7. Default is 5. -->
diff --git a/resources/templates/provision/grandstream/gxp2170/{$mac}.xml b/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
index 74d943b559..d4346f02e8 100644
--- a/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
@@ -354,7 +354,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2318></P2318>
+    <P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -420,7 +420,9 @@
     <!-- # Feature Key Synchronization. 0 - Disabled, 1 - Enabled. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P2325>0</P2325>
+{if isset($grandstream_feature_key_sync)}
+    <P2325>{$grandstream_feature_key_sync}</P2325>
+{/if}
 
     <!-- # Broadsoft Call Park. 0 - Disabled, 1 - Enabled. Default is 0 -->
     <!-- # Number: 0, 1 -->
@@ -686,7 +688,7 @@
 
     <!-- # Dial Plan Prefix -->
     <!-- # String  -->
-    <P66></P66>
+    <P66>{$grandstream_dial_prefix}</P66>
 
     <!-- # Dial Plan. Default value is { x+ | \+x+ | *x+ | *xx*x+ } -->
     <!-- # String -->
@@ -695,7 +697,7 @@
 {if isset($grandstream_dial_plan) }
     <P290>{$grandstream_dial_plan}</P290>
 {else}
-    <P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P290>
+    <P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P290>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -1306,7 +1308,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2418></P2418>
+    <P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -1645,7 +1647,7 @@
 {if isset($grandstream_dial_plan) }
     <P459>{$grandstream_dial_plan}</P459>
 {else}
-    <P459>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P459>
+    <P459>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P459>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -2254,7 +2256,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2518></P2518>
+    <P2518>{if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}</P2518>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -2592,7 +2594,7 @@
 {if isset($grandstream_dial_plan) }
     <P559>{$grandstream_dial_plan}</P559>
 {else}
-    <P559>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P559>
+    <P559>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P559>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -2613,7 +2615,7 @@
 
     <!-- # Matching Incoming Caller ID. Matching Rule 1 -->
     <!-- # String -->
-    <P1500>grandstream_distinctive_ringtone_name_1</P1500>
+    <P1500>{$grandstream_distinctive_ringtone_name_1}</P1500>
 
     <!-- # Matching Rule 1 Distinctive Ringtone -->
     <!-- # -1 - No Ringtone, 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent, 5 - Default Ringtone. Default is 0. -->
@@ -3203,7 +3205,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2618></P2618>
+    <P2618>{if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}</P2618>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -3543,7 +3545,7 @@
 {if isset($grandstream_dial_plan) }
     <P659>{$grandstream_dial_plan}</P659>
 {else}
-    <P659>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P659>
+    <P659>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P659>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -4153,7 +4155,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2718></P2718>
+    <P2718>{if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}</P2718>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -4491,7 +4493,7 @@
 {if isset($grandstream_dial_plan) }
     <P1759>{$grandstream_dial_plan}</P1759>
 {else}
-    <P1759>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P1759>
+    <P1759>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P1759>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -5103,7 +5105,7 @@
 
     <!-- # Conference URI -->
     <!-- # String -->
-    <P2818></P2818>
+    <P2818>{if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}</P2818>
 
     <!-- # Music On Hold URI -->
     <!-- # String -->
@@ -5443,7 +5445,7 @@
 {if isset($grandstream_dial_plan) }
     <P1859>{$grandstream_dial_plan}</P1859>
 {else}
-    <P1859>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P1859>
+    <P1859>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P1859>
 {/if}
 
     <!-- # Bypass Dial Plan -->
@@ -6054,50 +6056,66 @@
     <!-- # OpenVPN Enable.  0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1  -->
     <!-- # Mandatory -->
+{if isset($grandstream_openvpn_enable)}
+    <P7050>{$grandstream_openvpn_enable}</P7050>
+{else}
     <P7050>0</P7050>
+{/if}
 
     <!-- # OpenVPN Server Address -->
     <!-- # String -->
-    <P7051></P7051>
+    <P7051>{$grandstream_openvpn_server}</P7051>
 
     <!-- # OpenVPN Port. Default is 1194 -->
-    <!-- # Number -->
+    <!-- # Number -->   
     <!-- # Mandatory -->
+{if isset($grandstream_openvpn_port)}  
+    <P7052>{$grandstream_openvpn_port}</P7052>
+{else}
     <P7052>1194</P7052>
+{/if}
 
     <!-- # OpenVPN Transport.  0 - UDP, 1 - TCP. Default is 0 -->
     <!-- #Number: 0, 1  -->
     <!-- #Mandatory -->
+{if isset($grandstream_openvpn_transport)}
+    <P2912>{$grandstream_openvpn_transport}</P2912>
+{else}
     <P2912>0</P2912>
+{/if}
 
     <!-- # OpenVPN CA -->
     <!-- # String -->
-    <P9902></P9902>
+    <P9902>{$grandstream_openvpn_ca}</P9902>
 
     <!-- # OpenVPN Certificate -->
     <!-- # String -->
-    <P9903></P9903>
+    <P9903>{$grandstream_openvpn_cert}</P9903>
 
     <!-- # OpenVPN Client Key -->
     <!-- # String -->
-    <P9904></P9904>
+    <P9904>{$grandstream_openvpn_key}</P9904>
 
     <!-- # OpenVPN Cipher Method. 0 - Blowfish, 1 - AES-128, 2 - AES-256, 3 - Triple-DES. Default is 0 -->
     <!-- # Number: 0, 1, 2, 3  -->
     <!-- # Mandatory -->
+{if isset($grandstream_openvpn_cipher)}
+    <P8396>{$grandstream_openvpn_cipher}</P8396>
+{else}
     <P8396>0</P8396>
+{/if}
 
     <!-- # OpenVPN Username -->
     <!-- # String -->
-    <P8394></P8394>
+    <P8394>{$grandstream_openvpn_username}</P8394>
 
     <!-- # OpenVPN Password -->
     <!-- # String -->
-    <P8395></P8395>
+    <P8395>{$grandstream_openvpn_password}</P8395>
 
     <!-- # Additional Options -->
     <!-- # String -->
-    <P8460></P8460>
+    <P8460>{$grandstream_openvpn_options}</P8460>
 
     <!-- ############################################################################## -->
     <!-- ## Network/SNMP Settings                     ## -->
@@ -6233,18 +6251,18 @@
     <!-- # When set to Yes(1), it will override the configured provision path and method -->
     <!-- # Number: 0, 1, 2 -->
     <!-- # Mandatory -->
-    <P145>1</P145>
+    {if isset($grandstream_dhcp_option_override)}<P145>{$grandstream_dhcp_option_override}</P145>{else}<P145>1</P145>{/if}
 
     <!-- # Additional Override DHCP Option. 0 - None,  1 - Option 150,  2 - Option 160. Default is 0 -->
     <!-- # Number: 0, 1, 2 -->
     <!-- # Mandatory -->
-    <P8337>0</P8337>
+    {if isset($grandstream_dhcp_option_additional_override)}<P8337>{$grandstream_dhcp_option_additional_override}</P8337>{else}<P8337>0</P8337>{/if}
 
     <!-- # Allow DHCP Option 120 to Override SIP Server -->
     <!-- # 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1411>0</P1411>
+    {if isset($grandstream_dhcp_option_override_sip_server)}<P1411>{$grandstream_dhcp_option_override_sip_server}</P1411>{else}<P1411>0</P1411>{/if}
 
     <!-- # 3CX Auto Provision. 0 - No, 1 - Yes. Default is Yes -->
     <!-- # Number: 0, 1 -->
@@ -6305,7 +6323,7 @@
     <P237></P237>
 {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
@@ -7581,7 +7599,7 @@
     <!-- # Hide BLF Remote Status. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P8374>0</P8374>
+    <P8374>{$grandstream_blf_remote_status}</P8374>
 
     <!-- # Show SIP Error Response. 0 - No, 1 - Yes. Default is 1 -->
     <!-- # Number: 0, 1 -->
@@ -7908,17 +7926,21 @@
     <!-- # HEADSET Key Mode. 0 - Default Mode, 1 - Toggle Headset/Speaker. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1312>0</P1312>
+{if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
 
     <!-- # Headset Type. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P6779>0</P6779>
+{if isset($grandstream_headset_type)}
+    <P6779>{$grandstream_headset_type}</P6779>
 
     <!-- # EHS Headset Ring Tone. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1487>0</P1487>
+    <P1487>{$grandstream_headset_type}</P1487>
+{/if}
 
     <!-- # Always Ring Speaker. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
@@ -8123,9 +8145,7 @@
 {if isset($grandstream_wallpaper_url)}
     <P2916>1</P2916>
     <P2917>{$grandstream_wallpaper_url}</P2917>
-{else}
-    <P2916>0</P2916>
-    <P2917></P2917>
+
 {/if}
 
     <!-- # Color Background. Default is #000000. -->
@@ -8137,8 +8157,6 @@
     <!-- # Mandatory -->
 {if isset($grandstream_screensaver)}
     <P2918>{$grandstream_screensaver}</P2918>
-{else}
-    <P2918>1</P2918>
 {/if}
 
     <!-- # Screensaver Source.  0 - Default, 1 - USB, 2 - Download. Default is 0. ~~for GXP2140/2160/2170 only -->
@@ -8146,8 +8164,6 @@
     <!-- # Mandatory -->
 {if isset($grandstream_screensaver_source)}
     <P6759>{$grandstream_screensaver_source}</P6759>
-{else}
-    <P6759>0</P6759>
 {/if}
 
     <!-- # Show Date and Time. 0 - No, 1 - Yes. Default is 1 -->
@@ -8256,7 +8272,9 @@
     <!-- # Speaker Ring Volume -->
     <!-- # Number: 0-7. Default is 5. -->
     <!-- # Mandatory -->
-    <P8352>5</P8352>
+{if isset($grandstream_speaker_ring_volume)}
+    <P8352>{$grandstream_speaker_ring_volume}</P8352>
+{/if} 
 
     <!-- # Notification Tone Volume -->
     <!-- # Number: 0-7. Default is 5. -->
diff --git a/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml
index 41ed4aeb41..932b41e83e 100644
--- a/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <gs_provision version="1">
   <config version="1">
     <!-- Configuration Template For GXP21xx Firmware Version 1.0.5.32 -->
@@ -110,7 +110,9 @@
     <!-- Feature Key Synchronization. 0 - Disabled, 1 - Enabled. Default is 0 -->
     <!-- Number: 0, 1 -->
     <!-- Mandatory -->
-    <P2325>0</P2325>
+{if isset($grandstream_feature_key_sync)}
+    <P2325>{$grandstream_feature_key_sync}</P2325>
+{/if}
     <!-- Line-Seize Timeout (in seconds). Default is 15 -->
     <!-- Number: 15 - 60 -->
     <!-- Mandatory -->
@@ -120,7 +122,7 @@
     <P134></P134>
     <!-- Conference URI -->
     <!-- String -->
-    <P2318></P2318>
+    <P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
     <!-- Music On Hold URI -->
     <!-- String -->
     <P2350></P2350>
@@ -301,7 +303,7 @@
     {if isset($grandstream_dial_plan) }
     <P290>{$grandstream_dial_plan}</P290>
     {else}
-    <P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P290>
+    <P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P290>
     {/if}
     
     <!-- Delayed Call Forward Wait Time (in seconds). Default is 20 -->
@@ -322,28 +324,28 @@
     <P104>0</P104>
     <!-- Matching Incoming Caller ID. Matching Rule 1 -->
     <!-- String -->
-    <P1488></P1488>
+    <P1488>{$grandstream_distinctive_ringtone_name_1}</P1488>
     <!-- Matching Rule 1 Distinctive Ringtone -->
     <!-- 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3. Default is 0. -->
     <!-- Number: 0, 1, 2, 3 -->
     <!-- Mandatory -->
-    <P1489>0</P1489>
+    <P1489>{$grandstream_distinctive_ringtone_1}</P1489>
     <!-- Matching Incoming Caller ID. Matching Rule 2 -->
     <!-- String -->
-    <P1490></P1490>
+    <P1490>{$grandstream_distinctive_ringtone_name_2}</P1490>
     <!-- Matching Rule 2 Distinctive Ringtone -->
     <!-- 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3. Default is 0 -->
     <!-- Number: 0, 1, 2, 3 -->
     <!-- Mandatory -->
-    <P1491>0</P1491>
+    <P1491>{$grandstream_distinctive_ringtone_2}</P1491>
     <!-- Matching Incoming Caller ID. Matching Rule 3 -->
     <!-- String -->
-    <P1492></P1492>
+    <P1492>{$grandstream_distinctive_ringtone_name_3}</P1492>
     <!-- Matching Rule 3 Distinctive Ringtone -->
     <!-- 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3. Default is 0 -->
     <!-- Number: 0, 1, 2, 3 -->
     <!-- Mandatory -->
-    <P1493>0</P1493>
+    <P1493>{$grandstream_distinctive_ringtone_3}</P1493>
     <!-- Ring Timeout (in seconds). Default is 60 -->
     <!-- Number: 30 - 3600 -->
     <!-- Mandatory -->
@@ -557,7 +559,7 @@
     <P444></P444>
     <!-- Conference URI -->
     <!-- String -->
-    <P2418></P2418>
+    <P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
     <!-- Music On Hold URI -->
     <!-- String -->
     <P2450></P2450>
@@ -989,7 +991,7 @@
     <P544></P544>
     <!-- Conference URI -->
     <!-- String -->
-    <P2518></P2518>
+    <P2518>{if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}</P2518>
     <!-- Music On Hold URI -->
     <!-- String -->
     <P2550></P2550>
@@ -1183,7 +1185,7 @@
     <P523>0</P523>
     <!-- Matching Incoming Caller ID. Matching Rule 1 -->
     <!-- String -->
-    <P1500></P1500>
+    <P1500>{$grandstream_distinctive_ringtone_name_1}</P1500>
     <!-- Matching Rule 1 Distinctive Ringtone -->
     <!-- 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3. Default is 0 -->
     <!-- Number: 0, 1, 2, 3 -->
@@ -1419,7 +1421,7 @@
     <P644></P644>
     <!-- Conference URI -->
     <!-- String -->
-    <P2618></P2618>
+    <P2618>{if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}</P2618>
     <!-- Music On Hold URI -->
     <!-- String -->
     <P2650></P2650>
@@ -1843,7 +1845,7 @@
     <P1744></P1744>
     <!-- Conference URI -->
     <!-- String -->
-    <P2718></P2718>
+    <P2718>{if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}</P2718>
     <!-- Music On Hold URI -->
     <!-- String -->
     <P2750></P2750>
@@ -2274,7 +2276,7 @@
     <P1844></P1844>
     <!-- Conference URI -->
     <!-- String -->
-    <P2818></P2818>
+    <P2818>{if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}</P2818>
     <!-- Music On Hold URI -->
     <!-- String -->
     <P2850></P2850>
@@ -2714,7 +2716,7 @@
     <P237></P237>
     {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-    {else}
+    {elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
     {/if}
     
@@ -2734,12 +2736,12 @@
     <!-- When set to Yes(1), it will override the configured provision path and method -->
     <!-- Number: 0, 1 -->
     <!-- Mandatory -->
-    <P145>0</P145>
+    {if isset($grandstream_dhcp_option_override)}<P145>{$grandstream_dhcp_option_override}</P145>{else}<P145>1</P145>{/if}
     <!-- Allow DHCP Option 120 to Override SIP Server -->
     <!-- 0 - No, 1 - Yes. Default is 0 -->
     <!-- Number: 0, 1 -->
     <!-- Mandatory -->
-    <P1411>0</P1411>
+    {if isset($grandstream_dhcp_option_override_sip_server)}<P1411>{$grandstream_dhcp_option_override_sip_server}</P1411>{else}<P1411>0</P1411>{/if}
     <!-- Automatic Upgrade. 0 - No, 1 - Yes. Default is No -->
     <!-- Number: 0, 1 -->
     <!-- Mandatory -->
@@ -3060,7 +3062,21 @@ Outgoing calls. 0 - No, 1 - Yes. Default is 0 -->
     <!-- HEADSET Key Mode. 0 = Default Mode, 1 = Toggle Headset/Speaker. Default is 0 -->
     <!-- Number: 0, 1 -->
     <!-- Mandatory -->
-    <P1312>0</P1312>
+{if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
+
+    <!-- # Headset Type. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
+    <!-- # Number: 0, 1 -->
+    <!-- # Mandatory -->
+{if isset($grandstream_headset_type)}
+    <P6779>{$grandstream_headset_type}</P6779>
+
+    <!-- # EHS Headset Ring Tone. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
+    <!-- # Number: 0, 1 -->
+    <!-- # Mandatory -->
+    <P1487>{$grandstream_headset_type}</P1487>
+{/if}
     <!-- Always Ring Speaker. 0 - No, 1 - Yes. Default is 0 -->
     <!-- Number: 0, 1 -->
     <!-- Mandatory -->
diff --git a/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml b/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml
index c706818fd9..fb21b136ec 100644
--- a/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml
@@ -48,7 +48,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
@@ -72,13 +72,13 @@
 <!-- When set to Yes(1), it will override the configured provision path and method -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P145>1</P145>
+{if isset($grandstream_dhcp_option_override)}<P145>{$grandstream_dhcp_option_override}</P145>{else}<P145>1</P145>{/if}
 
 <!-- Allow DHCP Option 120 to Override SIP Server -->
 <!-- 0 - No, 1 - Yes. Default is 0 -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P1411>0</P1411>
+{if isset($grandstream_dhcp_option_override_sip_server)}<P1411>{$grandstream_dhcp_option_override_sip_server}</P1411>{else}<P1411>0</P1411>{/if}
 
 <!-- Automatic Upgrade. 0 - No, 1 - Yes. Default is No -->
 <!-- Number: 0, 1 -->
@@ -272,7 +272,7 @@
 
 <!-- Conference URI -->
 <!-- String -->
-<P2318></P2318>
+<P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
 
 <!-- Music On Hold URI -->
 <!-- String -->
@@ -503,7 +503,7 @@
 {if isset($grandstream_dial_plan) }
 <P290>{$grandstream_dial_plan}</P290>
 {else}
-<P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P290>
+<P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P290>
 {/if}
 
 
@@ -530,33 +530,33 @@
 <!-- Matching Incoming Caller ID. Matching Rule 1 -->
 <!-- String -->
 
-<P1488></P1488>
+<P1488>{$grandstream_distinctive_ringtone_name_1}</P1488>
 
 <!-- Matching Rule 1 Distinctive Ringtone -->
 <!-- 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3. Default is 0. -->
 <!-- Number: 0, 1, 2, 3 -->
 <!-- Mandatory -->
-<P1489>0</P1489>
+<P1489>{$grandstream_distinctive_ringtone_1}</P1489>
 
 <!-- Matching Incoming Caller ID. Matching Rule 2 -->
 <!-- String -->
-<P1490></P1490>
+<P1490>{$grandstream_distinctive_ringtone_name_2}</P1490>
 
 <!-- Matching Rule 2 Distinctive Ringtone -->
 <!-- 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3. Default is 0 -->
 <!-- Number: 0, 1, 2, 3 -->
 <!-- Mandatory -->
-<P1491>0</P1491>
+<P1491>{$grandstream_distinctive_ringtone_2}</P1491>
 
 <!-- Matching Incoming Caller ID. Matching Rule 3 -->
 <!-- String -->
-<P1492></P1492>
+<P1492>{$grandstream_distinctive_ringtone_name_3}</P1492>
 
 <!-- Matching Rule 3 Distinctive Ringtone -->
 <!-- 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3. Default is 0 -->
 <!-- Number: 0, 1, 2, 3 -->
 <!-- Mandatory -->
-<P1493>0</P1493>
+<P1493>{$grandstream_distinctive_ringtone_3}</P1493>
 
 <!-- Ring Timeout (in seconds). Default is 60 -->
 <!-- Number: 30 - 3600 -->
@@ -836,7 +836,7 @@
 
 <!-- Conference URI -->
 <!-- String -->
-<P2418></P2418>
+<P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
 
 <!-- Music On Hold URI -->
 <!-- String -->
@@ -1067,7 +1067,7 @@
 {if isset($grandstream_dial_plan) }
 <P459>{$grandstream_dial_plan}</P459>
 {else}
-<P459>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P459>
+<P459>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P459>
 {/if}  
 
 <!-- Delayed Call Forward Wait Time (in seconds). Default 20 -->
@@ -1399,7 +1399,7 @@
 
 <!-- Conference URI -->
 <!-- String -->
-<P2518></P2518>
+<P2518>{if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}</P2518>
 
 <!-- Music On Hold URI -->
 <!-- String -->
@@ -1647,7 +1647,7 @@
 
 <!-- Matching Incoming Caller ID. Matching Rule 1 -->
 <!-- String -->
-<P1500></P1500>
+<P1500>{$grandstream_distinctive_ringtone_name_1}</P1500>
 
 <!-- Matching Rule 1 Distinctive Ringtone -->
 <!-- 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3. Default is 0 -->
@@ -1955,7 +1955,7 @@
 
 <!-- Conference URI -->
 <!-- String -->
-<P2618></P2618>
+<P2618>{if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}</P2618>
 
 <!-- Music On Hold URI -->
 <!-- String -->
@@ -2505,7 +2505,7 @@
 
 <!-- Conference URI -->
 <!-- String -->
-<P2718></P2718>
+<P2718>{if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}</P2718>
 
 <!-- Music On Hold URI -->
 <!-- String -->
@@ -3062,7 +3062,7 @@
 
 <!-- Conference URI -->
 <!-- String -->
-<P2818></P2818>
+<P2818>{if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}</P2818>
 
 <!-- Music On Hold URI -->
 <!-- String -->
@@ -3772,7 +3772,21 @@ Outgoing calls. 0 - No, 1 - Yes. Default is 0 -->
 <!-- HEADSET Key Mode. 0 = Default Mode, 1 = Toggle Headset/Speaker. Default is 0 -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P1312>0</P1312>
+{if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
+
+    <!-- # Headset Type. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
+    <!-- # Number: 0, 1 -->
+    <!-- # Mandatory -->
+{if isset($grandstream_headset_type)}
+    <P6779>{$grandstream_headset_type}</P6779>
+
+    <!-- # EHS Headset Ring Tone. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
+    <!-- # Number: 0, 1 -->
+    <!-- # Mandatory -->
+    <P1487>{$grandstream_headset_type}</P1487>
+{/if}
 
 <!-- Always Ring Speaker. 0 - No, 1 - Yes. Default is 0 -->
 <!-- Number: 0, 1 -->
diff --git a/resources/templates/provision/grandstream/gxp2200/{$mac}.xml b/resources/templates/provision/grandstream/gxp2200/{$mac}.xml
index 6c0051972a..3daed2bfba 100644
--- a/resources/templates/provision/grandstream/gxp2200/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2200/{$mac}.xml
@@ -344,7 +344,7 @@
 
 <!-- Conference-URI -->
 <!-- String -->
-<P2318></P2318>
+<P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
 
 <!-- Broadsoft Call Center. 0 - No, 1 - Yes. Default value is 0 -->
 <!-- Number: 0, 1 -->
@@ -367,7 +367,7 @@
 
 <!-- Matching Incoming Caller ID. Matching Rule 1 -->
 <!-- String -->
-<P1488></P1488>
+<P1488>{$grandstream_distinctive_ringtone_name_1}</P1488>
 
 <!-- Matching Rule 1 Distinctive Ringtone. See ring tone options and value in the Ring Tone Value Table below -->
 <!-- String -->
@@ -375,7 +375,7 @@
 
 <!-- Matching Incoming Caller ID. Matching Rule 2 -->
 <!-- String -->
-<P1490></P1490>
+<P1490>{$grandstream_distinctive_ringtone_name_2}</P1490>
 
 <!-- Matching Rule 2 Distinctive Ringtone. See ring tone options and value in the Ring Tone Value Table below -->
 <!-- String -->
@@ -383,7 +383,7 @@
 
 <!-- Matching Incoming Caller ID. Matching Rule 3 -->
 <!-- String -->
-<P1492></P1492>
+<P1492>{$grandstream_distinctive_ringtone_name_3}</P1492>
 
 <!-- Matching Rule 3 Distinctive Ringtone. See ring tone options and value in the Ring Tone Value Table below -->
 <!-- String -->
@@ -762,7 +762,7 @@
 
 <!-- Conference-URI -->
 <!-- String -->
-<P2418></P2418>
+<P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
 
 <!-- Broadsoft Call Center. 0 - No, 1 - Yes. Default value is 0 -->
 <!-- Number: 0, 1 -->
@@ -1190,7 +1190,7 @@ VNumber: 0, 1, 2. -->
 
 <!-- Conference-URI -->
 <!-- String -->
-<P2518></P2518>
+<P2518>{if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}</P2518>
 
 <!-- Broadsoft Call Center. 0 - No, 1 - Yes. Default value is 0 -->
 <!-- Number: 0, 1 -->
@@ -1214,7 +1214,7 @@ VNumber: 0, 1, 2. -->
 
 <!-- Matching Incoming Caller ID. Matching Rule 1 -->
 <!-- String -->
-<P1500></P1500>
+<P1500>{$grandstream_distinctive_ringtone_name_1}</P1500>
 
 <!-- Matching Rule 1 Distinctive Ringtone. See ring tone options and value in the Ring Tone value table below -->
 <!-- String -->
@@ -1620,7 +1620,7 @@ VNumber: 0, 1, 2. -->
 
 <!-- Conference-URI -->
 <!-- String -->
-<P2618></P2618>
+<P2618>{if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}</P2618>
 
 <!-- Account Ring Tone. See ring tone options and value in the Ring Tone value table below -->
 <P623>content://settings/system/ringtone</P623>
@@ -2045,7 +2045,7 @@ Account 5 Codec Settings
 
 <!-- Conference-URI -->
 <!-- String -->
-<P2718></P2718>
+<P2718>{if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}</P2718>
 
 <!-- Broadsoft Call Center. 0 - No, 1 - Yes. Default value is 0 -->
 <!-- Number: 0, 1 -->
@@ -2471,7 +2471,7 @@ Account 5 Codec Settings
 
 <!-- Conference-URI -->
 <!-- String -->
-<P2818></P2818>
+<P2818>{if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}</P2818>
 
 <!-- Broadsoft Call Center. 0 - No, 1 - Yes. Default value is 0 -->
 <!-- Number: 0, 1 -->
@@ -3016,7 +3016,7 @@ Account 5 Codec Settings
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
@@ -3039,11 +3039,11 @@ Account 5 Codec Settings
 <!-- DHCP Option 66 Override server. 0 - No, 1 - Yes. Default value is 1 -->
 <!-- When set to Yes(1), it will override the configured provision path and method -->
 <!-- Number: 0, 1 -->
-<P145>1</P145>
+{if isset($grandstream_dhcp_option_override)}<P145>{$grandstream_dhcp_option_override}</P145>{else}<P145>1</P145>{/if}
 
 <!-- DHCP Option 120 Override SIP Server.0 - No, 1 - Yes. Default value is 1 -->
 <!-- Number: 0, 1 -->
-<P1411>1</P1411>
+{if isset($grandstream_dhcp_option_override_sip_server)}<P1411>{$grandstream_dhcp_option_override_sip_server}</P1411>{else}{if isset($grandstream_dhcp_option_override_sip_server)}<P1411>{$grandstream_dhcp_option_override_sip_server}</P1411>{else}<P1411>0</P1411>{/if}{/if}
 
 <!-- 3CX Auto Provision. 0 - No, 1 - Yes. Default value is 1 -->
 <!-- Number: 0, 1 -->
@@ -3337,13 +3337,23 @@ Account 5 Codec Settings
 <P1302>0</P1302>
 {/if}
 
-<!-- Headset Type. 0 - Normal Headset, 1 - Plantronics EHS. Default value is 0 -->
-<!-- Number: 0, 1 -->
-<P1487>0</P1487>
-
 <!-- Headset Key Mode. 0 - Default Mode, 1 - Toggle Headset/Speaker. Default value is 0 -->
 <!-- Number: 0, 1 -->
-<P1312>0</P1312>
+{if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
+
+    <!-- # Headset Type. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
+    <!-- # Number: 0, 1 -->
+    <!-- # Mandatory -->
+{if isset($grandstream_headset_type)}
+    <P6779>{$grandstream_headset_type}</P6779>
+
+    <!-- # EHS Headset Ring Tone. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
+    <!-- # Number: 0, 1 -->
+    <!-- # Mandatory -->
+    <P1487>{$grandstream_headset_type}</P1487>
+{/if}
 
 <!-- Advanced Settings - MPK LCD Settings -->
 
diff --git a/resources/templates/provision/grandstream/gxp3240/{$mac}.xml b/resources/templates/provision/grandstream/gxp3240/{$mac}.xml
index 71dd325f17..c2123cf046 100644
--- a/resources/templates/provision/grandstream/gxp3240/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp3240/{$mac}.xml
@@ -555,7 +555,7 @@
 
 <!-- Conference-URI -->
 <!-- String -->
-<P2318></P2318>
+<P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
 
 <!-- Broadsoft Call Center. 0 - No, 1 - Yes. Default value is 0 -->
 <!-- Number: 0, 1 -->
@@ -578,7 +578,7 @@
 
 <!-- Matching Incoming Caller ID. Matching Rule 1 -->
 <!-- String -->
-<P1488></P1488>
+<P1488>{$grandstream_distinctive_ringtone_name_1}</P1488>
 
 <!-- Matching Rule 1 Distinctive Ringtone. See ring tone options and value in the Ring Tone Value Table below -->
 <!-- String -->
@@ -586,7 +586,7 @@
 
 <!-- Matching Incoming Caller ID. Matching Rule 2 -->
 <!-- String -->
-<P1490></P1490>
+<P1490>{$grandstream_distinctive_ringtone_name_2}</P1490>
 
 <!-- Matching Rule 2 Distinctive Ringtone. See ring tone options and value in the Ring Tone Value Table below -->
 <!-- String -->
@@ -594,7 +594,7 @@
 
 <!-- Matching Incoming Caller ID. Matching Rule 3 -->
 <!-- String -->
-<P1492></P1492>
+<P1492>{$grandstream_distinctive_ringtone_name_3}</P1492>
 
 <!-- Matching Rule 3 Distinctive Ringtone. See ring tone options and value in the Ring Tone Value Table below -->
 <!-- String -->
@@ -973,7 +973,7 @@
 
 <!-- Conference-URI -->
 <!-- String -->
-<P2418></P2418>
+<P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
 
 <!-- Broadsoft Call Center. 0 - No, 1 - Yes. Default value is 0 -->
 <!-- Number: 0, 1 -->
@@ -1401,7 +1401,7 @@ VNumber: 0, 1, 2. -->
 
 <!-- Conference-URI -->
 <!-- String -->
-<P2518></P2518>
+<P2518>{if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}</P2518>
 
 <!-- Broadsoft Call Center. 0 - No, 1 - Yes. Default value is 0 -->
 <!-- Number: 0, 1 -->
@@ -1425,7 +1425,7 @@ VNumber: 0, 1, 2. -->
 
 <!-- Matching Incoming Caller ID. Matching Rule 1 -->
 <!-- String -->
-<P1500></P1500>
+<P1500>{$grandstream_distinctive_ringtone_name_1}</P1500>
 
 <!-- Matching Rule 1 Distinctive Ringtone. See ring tone options and value in the Ring Tone value table below -->
 <!-- String -->
@@ -1831,7 +1831,7 @@ VNumber: 0, 1, 2. -->
 
 <!-- Conference-URI -->
 <!-- String -->
-<P2618></P2618>
+<P2618>{if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}</P2618>
 
 <!-- Account Ring Tone. See ring tone options and value in the Ring Tone value table below -->
 <P623>content://settings/system/ringtone</P623>
@@ -2256,7 +2256,7 @@ Account 5 Codec Settings
 
 <!-- Conference-URI -->
 <!-- String -->
-<P2718></P2718>
+<P2718>{if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}</P2718>
 
 <!-- Broadsoft Call Center. 0 - No, 1 - Yes. Default value is 0 -->
 <!-- Number: 0, 1 -->
@@ -2682,7 +2682,7 @@ Account 5 Codec Settings
 
 <!-- Conference-URI -->
 <!-- String -->
-<P2818></P2818>
+<P2818>{if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}</P2818>
 
 <!-- Broadsoft Call Center. 0 - No, 1 - Yes. Default value is 0 -->
 <!-- Number: 0, 1 -->
@@ -3226,7 +3226,7 @@ Account 5 Codec Settings
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
@@ -3249,11 +3249,11 @@ Account 5 Codec Settings
 <!-- DHCP Option 66 Override server. 0 - No, 1 - Yes. Default value is 1 -->
 <!-- When set to Yes(1), it will override the configured provision path and method -->
 <!-- Number: 0, 1 -->
-<P145>1</P145>
+{if isset($grandstream_dhcp_option_override)}<P145>{$grandstream_dhcp_option_override}</P145>{else}<P145>1</P145>{/if}
 
 <!-- DHCP Option 120 Override SIP Server.0 - No, 1 - Yes. Default value is 1 -->
 <!-- Number: 0, 1 -->
-<P1411>1</P1411>
+{if isset($grandstream_dhcp_option_override_sip_server)}<P1411>{$grandstream_dhcp_option_override_sip_server}</P1411>{else}{if isset($grandstream_dhcp_option_override_sip_server)}<P1411>{$grandstream_dhcp_option_override_sip_server}</P1411>{else}<P1411>0</P1411>{/if}{/if}
 
 <!-- 3CX Auto Provision. 0 - No, 1 - Yes. Default value is 1 -->
 <!-- Number: 0, 1 -->
@@ -3547,13 +3547,23 @@ Account 5 Codec Settings
 <P1302>0</P1302>
 {/if}
 
-<!-- Headset Type. 0 - Normal Headset, 1 - Plantronics EHS. Default value is 0 -->
-<!-- Number: 0, 1 -->
-<P1487>0</P1487>
-
 <!-- Headset Key Mode. 0 - Default Mode, 1 - Toggle Headset/Speaker. Default value is 0 -->
 <!-- Number: 0, 1 -->
-<P1312>0</P1312>
+{if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
+
+    <!-- # Headset Type. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
+    <!-- # Number: 0, 1 -->
+    <!-- # Mandatory -->
+{if isset($grandstream_headset_type)}
+    <P6779>{$grandstream_headset_type}</P6779>
+
+    <!-- # EHS Headset Ring Tone. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
+    <!-- # Number: 0, 1 -->
+    <!-- # Mandatory -->
+    <P1487>{$grandstream_headset_type}</P1487>
+{/if}
 
 <!-- Advanced Settings - MPK LCD Settings -->
 
diff --git a/resources/templates/provision/grandstream/gxv300x/{$mac}.xml b/resources/templates/provision/grandstream/gxv300x/{$mac}.xml
index ddb2fcbce3..6cdf2c2fa3 100644
--- a/resources/templates/provision/grandstream/gxv300x/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxv300x/{$mac}.xml
@@ -78,7 +78,7 @@
     <P237></P237>
     {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-    {else}
+    {elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
     {/if}
     
@@ -92,7 +92,7 @@
     <P235></P235>
     <!-- Allow DHCP Option 66 to override server. 0 - No, 1 - Yes. Default is Yes. -->
     <!-- When set to Yes(1), it will override the configured provision path and method. -->
-    <P145>1</P145>
+    {if isset($grandstream_dhcp_option_override)}<P145>{$grandstream_dhcp_option_override}</P145>{else}<P145>1</P145>{/if}
     <!-- Automatic Upgrade. 0 - No, 1 - Yes. Default is No. -->
     <P194>0</P194>
     <!-- Check for new firmware every () minutes, unit is in minute, minimnu 60 minutes, default is 7 days. -->
@@ -251,7 +251,7 @@
     <!-- Dial Plan Prefix (dial plan prefix string) -->
     <P66></P66>
     <!-- Dial Plan. Maxlength = 128 character. Defalut is allow all  -->
-    <P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P290>
+    <P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P290>
     <!-- Delayed Call Forward Wait Time. Default is 20 seconds, maxlength = 5  -->
     <P139>20</P139>
     <!-- Enable Call Features.  0 - no, 1 - yes -->
diff --git a/resources/templates/provision/grandstream/gxv3140/{$mac}.xml b/resources/templates/provision/grandstream/gxv3140/{$mac}.xml
index 01a3cc3cfe..18d4da6a42 100644
--- a/resources/templates/provision/grandstream/gxv3140/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxv3140/{$mac}.xml
@@ -1385,7 +1385,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
@@ -1403,10 +1403,10 @@
 
 <!--  DHCP Option 66 Override server. 0 - No, 1 - Yes. Default is  Yes. -->
 <!--  When set to Yes(1), it will override the configured provision path and method. -->
-<P145>1</P145>
+{if isset($grandstream_dhcp_option_override)}<P145>{$grandstream_dhcp_option_override}</P145>{else}<P145>1</P145>{/if}
 
 <!--  DHCP Option 120 Override SIP Server.  0 - No, 1 - Yes. Default is  Yes. -->
-<P1411>1</P1411>
+{if isset($grandstream_dhcp_option_override_sip_server)}<P1411>{$grandstream_dhcp_option_override_sip_server}</P1411>{else}{if isset($grandstream_dhcp_option_override_sip_server)}<P1411>{$grandstream_dhcp_option_override_sip_server}</P1411>{else}<P1411>0</P1411>{/if}{/if}
 
 <!--  Automatic Upgrade. 0 - No, 1 - Check every day, 2 - Check every week, 3 - Check at a Period Time. Default is 0. -->
 <P194>0</P194>
diff --git a/resources/templates/provision/grandstream/gxv3175/{$mac}.xml b/resources/templates/provision/grandstream/gxv3175/{$mac}.xml
index 6da83e7eb9..9f467c5d79 100644
--- a/resources/templates/provision/grandstream/gxv3175/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxv3175/{$mac}.xml
@@ -248,7 +248,7 @@
 <P66></P66>
 
 <!-- Dial Plan Maxlength: unlimited, default is allow all  -->
-<P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P290>
+<P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P290>
 
 <!-- Early Dial. 0 - No, 1 - Yes. -->
 <P29>0</P29>
@@ -1268,7 +1268,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
@@ -1286,10 +1286,10 @@
 
 <!-- DHCP Option 66 Override server. 0 - No, 1 - Yes. Default is Yes. -->
 <!-- When set to Yes(1), it will override the configured provision path and method. -->
-<P145>1</P145>
+{if isset($grandstream_dhcp_option_override)}<P145>{$grandstream_dhcp_option_override}</P145>{else}<P145>1</P145>{/if}
 
 <!-- DHCP Option 120 Override SIP Server.  0 - No, 1 - Yes. Default is Yes. -->
-<P1411>1</P1411>
+{if isset($grandstream_dhcp_option_override_sip_server)}<P1411>{$grandstream_dhcp_option_override_sip_server}</P1411>{else}{if isset($grandstream_dhcp_option_override_sip_server)}<P1411>{$grandstream_dhcp_option_override_sip_server}</P1411>{else}<P1411>0</P1411>{/if}{/if}
 
 <!-- Automatic Upgrade. 0 - No, 1 - Check every day, 2 - Check every week, 3 - Check at a Period Time. Default is 0. -->
 <P194>0</P194>
diff --git a/resources/templates/provision/grandstream/gxv3175v2/{$mac}.xml b/resources/templates/provision/grandstream/gxv3175v2/{$mac}.xml
index 331264c920..a07f8794f2 100644
--- a/resources/templates/provision/grandstream/gxv3175v2/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxv3175v2/{$mac}.xml
@@ -208,7 +208,7 @@
     <!-- Dial Plan Prefix, MaxLength 32 -->
     <P66></P66>
     <!-- Dial Plan Maxlength = unlimited, default is allow all  -->
-    <P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P290>
+    <P290>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P290>
     <!-- Early Dial. 0 - No, 1 - Yes -->
     <P29>0</P29>
     <!-- Refer-To Use Target Contact. 0 - No, 1 - Yes -->
@@ -222,7 +222,9 @@
     <!-- SPecial Feature.  100-Standard, 108-CBCOM, 109-RNK, 113-China Mobile, 114-ZTE IMS, 115-Mobotix, 116-ZTE NGN, 117-Huawei IMS. -->
     <P198>100</P198>
     <!-- Feature Key Synchronization.   0 - Disable (default),  1 - Broadsoft. -->
-    <P2325>0</P2325>
+{if isset($grandstream_feature_key_sync)}
+    <P2325>{$grandstream_feature_key_sync}</P2325>
+{/if}
     <!-- Enable Call Features. 0 - No, 1 - Yes. -->
     <P191>1</P191>
     <!-- Delayed Call Forward Wait Time (s). Default is 20 seconds, maxlength = 5 -->
@@ -767,7 +769,7 @@
     <P237></P237>
     {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-    {else}
+    {elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
     {/if}
     
@@ -787,9 +789,9 @@
     <P235></P235>
     <!-- DHCP OPtion 66 Override server. 0 - No, 1 - Yes. Default is Yes. -->
     <!-- When set to Yes(1), it will override the configured Provision Path and method. -->
-    <P145>1</P145>
+    {if isset($grandstream_dhcp_option_override)}<P145>{$grandstream_dhcp_option_override}</P145>{else}<P145>1</P145>{/if}
     <!-- DHCP OPtion 120 Override SIP Server. 0 - No, 1 - Yes. Default is Yes. -->
-    <P1411>1</P1411>
+    {if isset($grandstream_dhcp_option_override_sip_server)}<P1411>{$grandstream_dhcp_option_override_sip_server}</P1411>{else}{if isset($grandstream_dhcp_option_override_sip_server)}<P1411>{$grandstream_dhcp_option_override_sip_server}</P1411>{else}<P1411>0</P1411>{/if}{/if}
     <!-- 3CX Auto Provision. 0 - No, 1 - Yes. Default is No. -->
     <P1414>0</P1414>
     <!-- Automatic UPgrade. 0 - No, 1 - Check every day, 2 - Check every week, 3 - Check at a Period Time. Default is 0. -->
diff --git a/resources/templates/provision/grandstream/gxv3240/{$mac}.xml b/resources/templates/provision/grandstream/gxv3240/{$mac}.xml
index 158da35e69..aac3d95b55 100644
--- a/resources/templates/provision/grandstream/gxv3240/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxv3240/{$mac}.xml
@@ -600,7 +600,7 @@
 
 <!-- Conference URI -->
 <!-- String -->
-<P2318></P2318>
+<P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
 
 <!-- Broadsoft Call Center. 0 - No, 1 - Yes. Default value is 0 -->
 <!-- Number: 0, 1 -->
@@ -1183,7 +1183,7 @@
 <P2482>0</P2482>
 
 <!-- Dial Plan. Default value is { x+ | \+x+ | *x+ | *xx*x+ } -->
-<P459>{ x+ | *x+ | *xx | *xxx | *xxxx | *xxxxx | *xxxxxx | **xx | **xxx | **xxxx | **xxxxx | **xxxxxx | **xxxxxxx | **xxxxxxxx | *xx*x+ | \+x+ | \p\a\r\k\+*x+ }</P459>
+<P459>{ x+ | *x+ | *xx | *xxx | *xxxx | *xxxxx | *xxxxxx | **xx | **xxx | **xxxx | **xxxxx | **xxxxxx | **xxxxxxx | **xxxxxxxx | *xx*x+ | \+x+ | \p\a\r\k\+*x+ | \p\a\r\k\+x+ }</P459>
 
 <!-- Refer-To Use Target Contact. 0 - No, 1 - Yes. Default value is 0 -->
 <!-- Number: 0, 1 -->
@@ -1255,7 +1255,7 @@
 
 <!-- Conference-URI -->
 <!-- String -->
-<P2418></P2418>
+<P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
 
 <!-- Broadsoft Call Center. 0 - No, 1 - Yes. Default value is 0 -->
 <!-- Number: 0, 1 -->
@@ -1821,7 +1821,7 @@
 <P2582>0</P2582>
 
 <!-- Dial Plan. Default value is { x+ | \+x+ | *x+ | *xx*x+ } -->
-<P559>{ x+ | *x+ | *xx | *xxx | *xxxx | *xxxxx | *xxxxxx | **xx | **xxx | **xxxx | **xxxxx | **xxxxxx | **xxxxxxx | **xxxxxxxx | *xx*x+ | \+x+ | \p\a\r\k\+*x+ }</P559>
+<P559>{ x+ | *x+ | *xx | *xxx | *xxxx | *xxxxx | *xxxxxx | **xx | **xxx | **xxxx | **xxxxx | **xxxxxx | **xxxxxxx | **xxxxxxxx | *xx*x+ | \+x+ | \p\a\r\k\+*x+ | \p\a\r\k\+x+ }</P559>
 
 <!-- Refer-To Use Target Contact. 0 - No, 1 - Yes. Default value is 0 -->
 <!-- Number: 0, 1 -->
@@ -1893,7 +1893,7 @@
 
 <!-- Conference-URI -->
 <!-- String -->
-<P2518></P2518>
+<P2518>{if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}</P2518>
 
 <!-- Broadsoft Call Center. 0 - No, 1 - Yes. Default value is 0 -->
 <!-- Number: 0, 1 -->
@@ -1924,7 +1924,7 @@
 
 <!-- Matching Incoming Caller ID. Matching Rule 1 -->
 <!-- String -->
-<P1500></P1500>
+<P1500>{$grandstream_distinctive_ringtone_name_1}</P1500>
 
 <!-- Matching Rule 1 Distinctive Ringtone. See ring tone options and value in the Ring Tone value table below -->
 <!-- String -->
@@ -2462,7 +2462,7 @@
 <P2682>0</P2682>
 
 <!-- Dial Plan. Default value is { x+ | \+x+ | *x+ | *xx*x+ } -->
-<P659>{ x+ | *x+ | *xx | *xxx | *xxxx | *xxxxx | *xxxxxx | **xx | **xxx | **xxxx | **xxxxx | **xxxxxx | **xxxxxxx | **xxxxxxxx | *xx*x+ | \+x+ | \p\a\r\k\+*x+ }</P659>
+<P659>{ x+ | *x+ | *xx | *xxx | *xxxx | *xxxxx | *xxxxxx | **xx | **xxx | **xxxx | **xxxxx | **xxxxxx | **xxxxxxx | **xxxxxxxx | *xx*x+ | \+x+ | \p\a\r\k\+*x+ | \p\a\r\k\+x+ }</P659>
 
 <!-- Refer-To Use Target Contact. 0 - No, 1 - Yes. Default value is 0 -->
 <!-- Number: 0, 1 -->
@@ -2534,7 +2534,7 @@
 
 <!-- Conference-URI -->
 <!-- String -->
-<P2618></P2618>
+<P2618>{if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}</P2618>
 
 <!-- Broadsoft Call Center. 0 - No, 1 - Yes. Default value is 0 -->
 <!-- Number: 0, 1 -->
@@ -3101,7 +3101,7 @@
 <P2782>0</P2782>
 
 <!-- Dial Plan Maxlength: unlimited, default is allow all { x+ | *x+ | *xx*x+ } -->
-<P1759>{ x+ | *x+ | *xx | *xxx | *xxxx | *xxxxx | *xxxxxx | **xx | **xxx | **xxxx | **xxxxx | **xxxxxx | **xxxxxxx | **xxxxxxxx | *xx*x+ | \+x+ | \p\a\r\k\+*x+ }</P1759>
+<P1759>{ x+ | *x+ | *xx | *xxx | *xxxx | *xxxxx | *xxxxxx | **xx | **xxx | **xxxx | **xxxxx | **xxxxxx | **xxxxxxx | **xxxxxxxx | *xx*x+ | \+x+ | \p\a\r\k\+*x+ | \p\a\r\k\+x+ }</P1759>
 
 <!-- Refer-To Use Target Contact. 0 - No, 1 - Yes. Default value is 0 -->
 <!-- Number: 0, 1 -->
@@ -3173,7 +3173,7 @@
 
 <!-- Conference-URI -->
 <!-- String -->
-<P2718></P2718>
+<P2718>{if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}</P2718>
 
 <!-- Broadsoft Call Center. 0 - No, 1 - Yes. Default value is 0 -->
 <!-- Number: 0, 1 -->
@@ -3742,7 +3742,7 @@
 <P2882>0</P2882>
 
 <!-- Dial Plan. Default value is { x+ | \+x+ | *x+ | *xx*x+ } -->
-<P1859>{ x+ | *x+ | *xx | *xxx | *xxxx | *xxxxx | *xxxxxx | **xx | **xxx | **xxxx | **xxxxx | **xxxxxx | **xxxxxxx | **xxxxxxxx | *xx*x+ | \+x+ | \p\a\r\k\+*x+ }</P1859>
+<P1859>{ x+ | *x+ | *xx | *xxx | *xxxx | *xxxxx | *xxxxxx | **xx | **xxx | **xxxx | **xxxxx | **xxxxxx | **xxxxxxx | **xxxxxxxx | *xx*x+ | \+x+ | \p\a\r\k\+*x+ | \p\a\r\k\+x+ }</P1859>
 
 <!-- Refer-To Use Target Contact. 0 - No, 1 - Yes. Default value is 0 -->
 <!-- Number: 0, 1 -->
@@ -3814,7 +3814,7 @@
 
 <!-- Conference-URI -->
 <!-- String -->
-<P2818></P2818>
+<P2818>{if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}</P2818>
 
 <!-- Broadsoft Call Center. 0 - No, 1 - Yes. Default value is 0 -->
 <!-- Number: 0, 1 -->
@@ -4820,7 +4820,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
@@ -4883,11 +4883,11 @@
 <!-- Allow DHCP Option 43 and Option 66 to Override Server. 0 - No, 1 - Yes. Default value is 1 -->
 <!-- When set to Yes(1), it will override the configured provision path and method -->
 <!-- Number: 0, 1 -->
-<P145>1</P145>
+{if isset($grandstream_dhcp_option_override)}<P145>{$grandstream_dhcp_option_override}</P145>{else}<P145>1</P145>{/if}
 
 <!-- DHCP Option 120 Override SIP Server.  0 - No, 1 - Yes. Default value is 1 -->
 <!-- Number: 0, 1 -->
-<P1411>1</P1411>
+{if isset($grandstream_dhcp_option_override_sip_server)}<P1411>{$grandstream_dhcp_option_override_sip_server}</P1411>{else}{if isset($grandstream_dhcp_option_override_sip_server)}<P1411>{$grandstream_dhcp_option_override_sip_server}</P1411>{else}<P1411>0</P1411>{/if}{/if}
 
 <!-- Allow DHCP Option 242 (Avaya IP Phones). 0 - No, 1 - Yes. Default value is 1 -->
 <!-- Number: 0, 1 -->
@@ -5408,14 +5408,18 @@
 <!-- Headset Type. 0 - Normal Headset, 1 - Plantronics EHS, 2 - Jabra EHS. Default value is 0 -->
 <!-- Number: 0, 1 -->
 {if isset($grandstream_headset_type)}
+<P6779>{$grandstream_headset_type}</P6779>
+<!-- # EHS Headset Ring Tone. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
+<!-- # Number: 0, 1 -->
+<!-- # Mandatory -->
 <P1487>{$grandstream_headset_type}</P1487>
-{else}
-<P1487>0</P1487>
 {/if}
 
 <!-- Headset Key Mode. 0 - Default Mode, 1 - Toggle Headset/Speaker. Default value is 0 -->
 <!-- Number: 0, 1 -->
-<P1312>0</P1312>
+{if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
 
 <!-- Handset TX Gain (dB). 0 - 0, 1 - -6, 2 - +6. Default value is 0 -->
 <!-- Number: 0, 1, 2 -->
diff --git a/resources/templates/provision/grandstream/gxv3275/{$mac}.xml b/resources/templates/provision/grandstream/gxv3275/{$mac}.xml
index 16a159f70e..8afee5dfec 100644
--- a/resources/templates/provision/grandstream/gxv3275/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxv3275/{$mac}.xml
@@ -359,7 +359,12 @@
 <!-- SIP Transport -->
 <!-- 0 - UDP , 1 - TCP, 2 - TLS. Default value is 0 -->
 <!-- Number: 0, 1, 2 -->
-<P130>0</P130>
+{$tp=0}
+{if $account.1.sip_transport == 'udp'}{$tp=0}{/if}
+{if $account.1.sip_transport == 'tcp'}{$tp=1}{/if}
+{if $account.1.sip_transport == 'tls'}{$tp=2}{/if}
+{if $account.1.sip_transport == 'dns srv'}{$tp=1}{/if}
+<P130>{$tp}</P130>
 
 <!-- Symmetric RTP. 0 - No, 1 - Yes. Default value is 0 -->
 <!-- Number: 0, 1 -->
@@ -555,7 +560,7 @@
 
 <!-- Conference-URI -->
 <!-- String -->
-<P2318></P2318>
+<P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
 
 <!-- Broadsoft Call Center. 0 - No, 1 - Yes. Default value is 0 -->
 <!-- Number: 0, 1 -->
@@ -578,7 +583,7 @@
 
 <!-- Matching Incoming Caller ID. Matching Rule 1 -->
 <!-- String -->
-<P1488></P1488>
+<P1488>{$grandstream_distinctive_ringtone_name_1}</P1488>
 
 <!-- Matching Rule 1 Distinctive Ringtone. See ring tone options and value in the Ring Tone Value Table below -->
 <!-- String -->
@@ -586,7 +591,7 @@
 
 <!-- Matching Incoming Caller ID. Matching Rule 2 -->
 <!-- String -->
-<P1490></P1490>
+<P1490>{$grandstream_distinctive_ringtone_name_2}</P1490>
 
 <!-- Matching Rule 2 Distinctive Ringtone. See ring tone options and value in the Ring Tone Value Table below -->
 <!-- String -->
@@ -594,7 +599,7 @@
 
 <!-- Matching Incoming Caller ID. Matching Rule 3 -->
 <!-- String -->
-<P1492></P1492>
+<P1492>{$grandstream_distinctive_ringtone_name_3}</P1492>
 
 <!-- Matching Rule 3 Distinctive Ringtone. See ring tone options and value in the Ring Tone Value Table below -->
 <!-- String -->
@@ -973,7 +978,7 @@
 
 <!-- Conference-URI -->
 <!-- String -->
-<P2418></P2418>
+<P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
 
 <!-- Broadsoft Call Center. 0 - No, 1 - Yes. Default value is 0 -->
 <!-- Number: 0, 1 -->
@@ -1401,7 +1406,7 @@ VNumber: 0, 1, 2. -->
 
 <!-- Conference-URI -->
 <!-- String -->
-<P2518></P2518>
+<P2518>{if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}</P2518>
 
 <!-- Broadsoft Call Center. 0 - No, 1 - Yes. Default value is 0 -->
 <!-- Number: 0, 1 -->
@@ -1425,7 +1430,7 @@ VNumber: 0, 1, 2. -->
 
 <!-- Matching Incoming Caller ID. Matching Rule 1 -->
 <!-- String -->
-<P1500></P1500>
+<P1500>{$grandstream_distinctive_ringtone_name_1}</P1500>
 
 <!-- Matching Rule 1 Distinctive Ringtone. See ring tone options and value in the Ring Tone value table below -->
 <!-- String -->
@@ -1831,7 +1836,7 @@ VNumber: 0, 1, 2. -->
 
 <!-- Conference-URI -->
 <!-- String -->
-<P2618></P2618>
+<P2618>{if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}</P2618>
 
 <!-- Account Ring Tone. See ring tone options and value in the Ring Tone value table below -->
 <P623>content://settings/system/ringtone</P623>
@@ -2256,7 +2261,7 @@ Account 5 Codec Settings
 
 <!-- Conference-URI -->
 <!-- String -->
-<P2718></P2718>
+<P2718>{if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}</P2718>
 
 <!-- Broadsoft Call Center. 0 - No, 1 - Yes. Default value is 0 -->
 <!-- Number: 0, 1 -->
@@ -2682,7 +2687,7 @@ Account 5 Codec Settings
 
 <!-- Conference-URI -->
 <!-- String -->
-<P2818></P2818>
+<P2818>{if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}</P2818>
 
 <!-- Broadsoft Call Center. 0 - No, 1 - Yes. Default value is 0 -->
 <!-- Number: 0, 1 -->
@@ -3225,7 +3230,7 @@ Account 5 Codec Settings
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
@@ -3248,11 +3253,11 @@ Account 5 Codec Settings
 <!-- DHCP Option 66 Override server. 0 - No, 1 - Yes. Default value is 1 -->
 <!-- When set to Yes(1), it will override the configured provision path and method -->
 <!-- Number: 0, 1 -->
-<P145>1</P145>
+{if isset($grandstream_dhcp_option_override)}<P145>{$grandstream_dhcp_option_override}</P145>{else}<P145>1</P145>{/if}
 
 <!-- DHCP Option 120 Override SIP Server.0 - No, 1 - Yes. Default value is 1 -->
 <!-- Number: 0, 1 -->
-<P1411>1</P1411>
+{if isset($grandstream_dhcp_option_override_sip_server)}<P1411>{$grandstream_dhcp_option_override_sip_server}</P1411>{else}{if isset($grandstream_dhcp_option_override_sip_server)}<P1411>{$grandstream_dhcp_option_override_sip_server}</P1411>{else}<P1411>0</P1411>{/if}{/if}
 
 <!-- 3CX Auto Provision. 0 - No, 1 - Yes. Default value is 1 -->
 <!-- Number: 0, 1 -->
@@ -3546,13 +3551,23 @@ Account 5 Codec Settings
 <P1302>0</P1302>
 {/if}
 
-<!-- Headset Type. 0 - Normal Headset, 1 - Plantronics EHS. Default value is 0 -->
-<!-- Number: 0, 1 -->
-<P1487>0</P1487>
-
 <!-- Headset Key Mode. 0 - Default Mode, 1 - Toggle Headset/Speaker. Default value is 0 -->
 <!-- Number: 0, 1 -->
-<P1312>0</P1312>
+{if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
+
+    <!-- # Headset Type. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
+    <!-- # Number: 0, 1 -->
+    <!-- # Mandatory -->
+{if isset($grandstream_headset_type)}
+    <P6779>{$grandstream_headset_type}</P6779>
+
+    <!-- # EHS Headset Ring Tone. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
+    <!-- # Number: 0, 1 -->
+    <!-- # Mandatory -->
+    <P1487>{$grandstream_headset_type}</P1487>
+{/if}
 
 <!-- Advanced Settings - MPK LCD Settings -->
 
diff --git a/resources/templates/provision/grandstream/gxv3370/{$mac}.xml b/resources/templates/provision/grandstream/gxv3370/{$mac}.xml
index 59ed9860b2..3875638899 100644
--- a/resources/templates/provision/grandstream/gxv3370/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxv3370/{$mac}.xml
@@ -27,425 +27,471 @@
 		<!-- Web/SSH Access SSH Port has no alias yet -->
 
 		<!-- Account General Settings -->
-
+		{for $line=1 to 16}
+		{$row=$lines.$line}
 		<!-- Account Active -->
 		<!-- Yes, No -->
-		<item name="account.1.enable">Yes</item>
+		<item name="account.{$line}.enable">{if filter_var($row.enabled, FILTER_VALIDATE_BOOLEAN)}Yes{else}No{/if}</item>
 
 		<!-- Account Name -->
-		<item name="account.1.name">{$account.1.display_name}</item>
+		<item name="account.{$line}.name">{$row.display_name}</item>
 
 		<!-- SIP Server -->
-		<item name="account.1.sip.server.1.address">{$account.1.server_address}</item>
+		<item name="account.{$line}.sip.server.1.address">{$row.server_address}</item>
 
 		<!-- SIP User ID -->
-		<item name="account.1.sip.userid">{$account.1.user_id}</item>
+		<item name="account.{$line}.sip.userid">{$row.user_id}</item>
 
 		<!-- SIP Authentication ID -->
-		<item name="account.1.sip.subscriber.userId">{$account.1.auth_id}</item>
+		<item name="account.{$line}.sip.subscriber.userId">{$row.auth_id}</item>
 
 		<!-- SIP Authentication Password -->
-		<item name="account.1.sip.subscriber.password">{$account.1.password}</item>
+		<item name="account.{$line}.sip.subscriber.password">{$row.password}</item>
 		<!-- Voice Mail Access Number -->
-		<item name="account.1.sip.voicemail.number">*97</item>
+		<item name="account.{$line}.sip.voicemail.number">*97</item>
 		<!-- Display Name -->
-		<item name="account.1.sip.subscriber.name">{$account.1.display_name}</item>
+		<item name="account.{$line}.sip.subscriber.name">{$row.display_name}</item>
 		<!-- Tel URI -->
 		<!-- Disabled, UserIsPhone, Enabled -->
-		<item name="account.1.sip.telUri">Disabled</item>
+		<item name="account.{$line}.sip.telUri">Disabled</item>
 		<!-- Account 1 Network Settings -->
 		<!-- Outbound Proxy -->
-		<item name="account.1.sip.outboundProxy.1.address">{$account.1.outbound_proxy_primary}</item>
+		<item name="account.{$line}.sip.outboundProxy.1.address">{$row.outbound_proxy_primary}</item>
 		<!-- Secondary Outbound Proxy -->
-		<item name="account.1.sip.outboundProxy.2.address">{$account.1.outbound_proxy_secondary}</item>
+		<item name="account.{$line}.sip.outboundProxy.2.address">{$row.outbound_proxy_secondary}</item>
 		<!-- DNS Mode -->
 		<!-- ARecord, SRV, NaptrOrSrv -->
-		<item name="account.1.network.dnsMode">ARecord</item>
+		<item name="account.{$line}.network.dnsMode">ARecord</item>
 		<!-- DNS SRV Fail-over Mode -->
 		<!-- Default, SavedOneUntilDNSTTL, SavedOneUntilNoResponse -->
-		<item name="account.1.network.dnsSRVFailoverMode">Default</item>
+		<item name="account.{$line}.network.dnsSRVFailoverMode">Default</item>
 		<!-- NAT Traversal -->
 		<!-- No, STUN, KeepAlive, UPnP, Auto, VPN -->
-		<item name="account.1.network.natTraversal">Auto</item>
+		<item name="account.{$line}.network.natTraversal">Auto</item>
 		<!-- Proxy-Require -->
-		<item name="account.1.network.proxyRequire"></item>
+		<item name="account.{$line}.network.proxyRequire"></item>
 		<!-- SIP Registration -->
 		<!-- Yes, No -->
-		<item name="account.1.sip.registration">Yes</item>
+		<item name="account.{$line}.sip.registration">Yes</item>
 		<!-- Unregister Before New Registration -->
 		<!-- No, Yes - All, Instance -->
-		<item name="account.1.sip.unregisterOnReboot">Instance</item>
+		<item name="account.{$line}.sip.unregisterOnReboot">Instance</item>
 		<!-- Register Expiration (m) -->
-		<item name="account.1.sip.registerExpiration">{$account.1.register_expires}</item>
+		<item name="account.{$line}.sip.registerExpiration">{$row.register_expires}</item>
 		<!-- Re-register before Expiration (s)  -->
-		<item name="account.1.sip.registerBeforeExpiration">0</item>
+		<item name="account.{$line}.sip.registerBeforeExpiration">0</item>
 		<!-- Registration Retry Wait Time (s) -->
-		<item name="account.1.sip.registrationFailureRetryWaitTime">20</item>
+		<item name="account.{$line}.sip.registrationFailureRetryWaitTime">20</item>
 		<!-- Add Auth Header On RE-REGISTER tobetested -->
 		<!-- Yes, No -->
-		<item name="account.1.sip.header.authOnInitialRegister">Yes</item>
+		<item name="account.{$line}.sip.header.authOnInitialRegister">Yes</item>
 		<!-- Enable SIP OPTIONS Keep Alive -->
-		<item name="account.1.sip.keepAlive.enable">No</item>
+		<item name="account.{$line}.sip.keepAlive.enable">No</item>
 		<!-- SIP OPTIONS Keep Alive Interval (s)  -->
-		<item name="account.1.sip.keepAlive.interval">30</item>
+		<item name="account.{$line}.sip.keepAlive.interval">30</item>
 		<!-- SIP OPTIONS Keep Alive Maximum Tries -->
-		<item name="account.1.sip.keepAlive.maxLost">3</item>
+		<item name="account.{$line}.sip.keepAlive.maxLost">3</item>
 		<!-- Subscribe for MWI -->
 		<!-- Yes, No -->
-		<item name="account.1.sip.subscribe.forMwi">No</item>
+		<item name="account.{$line}.sip.subscribe.forMwi">No</item>
 		<!-- Use Privacy Header -->
 		<!-- Default, No, Yes -->
-		<item name="account.1.sip.header.privacy">Default</item>
+		<item name="account.{$line}.sip.header.privacy">Default</item>
 		<!-- Use P-Preferred-Identity Header  -->
 		<!-- Default, No, Yes -->
-		<item name="account.1.sip.header.ppi">Default</item>
+		<item name="account.{$line}.sip.header.ppi">Default</item>
 		<!-- SIP Transport -->
 		<!-- UDP, TCP, TlsOrTcp -->
-		<item name="account.1.sip.transport">{$account.1.sip_transport}</item>
+		<item name="account.{$line}.sip.transport">{if $row.sip_transport=='tcp'}TCP{elseif $row.sip_transport=='tls'}TlsOrTcp{else}UDP{/if}</item>
 		<!-- Local SIP Port -->
-		<item name="account.1.sip.localPort">5060</item>
+		<item name="account.{$line}.sip.localPort">{$row.sip_port}</item>
 		<!-- SIP URI Scheme When Using TLS -->
 		<!-- sip, sips -->
-		<item name="account.1.sip.uriSchemeWhenUsingTls">sip</item>
+		<item name="account.{$line}.sip.uriSchemeWhenUsingTls">sip</item>
 		<!-- Use Actual Ephemeral Port in Contact with TCP/TLS -->
 		<!-- No, Yes -->
-		<item name="account.1.sip.useActualEphemeralPortInContactWithTcpTls">No</item>
+		<item name="account.{$line}.sip.useActualEphemeralPortInContactWithTcpTls">No</item>
 		<!-- Support SIP Instance ID -->
 		<!-- No, Yes -->
-		<item name="account.1.sip.supportInstanceId">Yes</item>
+		<item name="account.{$line}.sip.supportInstanceId">Yes</item>
 		<!-- SIP T1 Timeout -->
 		<!-- 0.5 sec - 0_5sec, 1 sec - 1sec, 2 sec - 2sec -->
-		<item name="account.1.sip.timer.t1">0_5sec</item>
+		<item name="account.{$line}.sip.timer.t1">0_5sec</item>
 		<!-- SIP T2 Interval -->
 		<!-- 2 sec - 2sec, 4 sec - 4sec, 8 sec - 8sec -->
-		<item name="account.1.sip.timer.t2">4sec</item>
+		<item name="account.{$line}.sip.timer.t2">4sec</item>
 		<!-- SIP Timer D Interval (Seconds) -->
-		<item name="account.1.sip.timerd.interval">0</item>
+		<item name="account.{$line}.sip.timerd.interval">0</item>
 		<!-- Remove OBP from Route -->
 		<!-- Disable - InRoute, Enable - NotInRoute, Always - AlwaysSentTo -->
-		<item name="account.1.sip.outboundProxy.mode">InRoute</item>
+		<item name="account.{$line}.sip.outboundProxy.mode">InRoute</item>
 		<!-- Enable 100rel -->
 		<!-- No, Yes -->
-		<item name="account.1.sip.header.100rel">No</item>
+		<item name="account.{$line}.sip.header.100rel">No</item>
 		<!-- Enable Session Timer/Session Expiration (s) -->
 		<!-- Session Timer is disabled if the value is 0 -->
-		<item name="account.1.sip.sessionTimer.expiration">180</item>
+		<item name="account.{$line}.sip.sessionTimer.expiration">180</item>
 		<!-- Min-SE(s) -->
-		<item name="account.1.sip.minimumSE">90</item>
+		<item name="account.{$line}.sip.minimumSE">90</item>
 		<!-- UAC Specify Refresher -->
 		<!-- Omit, UAC, UAS -->
-		<item name="account.1.sip.sessionTimer.refresher.uacSpecify">Omit</item>
+		<item name="account.{$line}.sip.sessionTimer.refresher.uacSpecify">Omit</item>
 		<!-- UAS Specify Refresher -->
 		<!--UAC, UAS -->
-		<item name="account.1.sip.sessionTimer.refresher.uasSpecify">UAC</item>
+		<item name="account.{$line}.sip.sessionTimer.refresher.uasSpecify">UAC</item>
 		<!-- Caller Request Timer -->
 		<!-- No, Yes -->
-		<item name="account.1.sip.sessionTimer.requestTimer.caller">No</item>
+		<item name="account.{$line}.sip.sessionTimer.requestTimer.caller">No</item>
 		<!-- Callee Request Timer -->
 		<!-- No, Yes -->
-		<item name="account.1.sip.sessionTimer.requestTimer.callee">No</item>
+		<item name="account.{$line}.sip.sessionTimer.requestTimer.callee">No</item>
 		<!-- Force Timer -->
 		<!-- No, Yes -->
-		<item name="account.1.sip.sessionTimer.force">No</item>
+		<item name="account.{$line}.sip.sessionTimer.force">No</item>
 		<!-- Force INVITE -->
 		<!-- No, Yes -->
-		<item name="account.1.sip.sessionTimer.forceInvite">No</item>
+		<item name="account.{$line}.sip.sessionTimer.forceInvite">No</item>
 		<!-- Codec Settings -->
 		<!-- Preferred Vocoder -->
 		<!-- PCMU, PCMA, G_726_32, G_722, G_729AOrB, iLBC, OPUS -->
-		<item name="account.1.codec.choice.1">PCMU</item>
-		<item name="account.1.codec.choice.2">PCMA</item>
-		<item name="account.1.codec.choice.3">G_726_32</item>
-		<item name="account.1.codec.choice.4">G_722</item>
-		<item name="account.1.codec.choice.5">G_729AOrB</item>
-		<item name="account.1.codec.choice.6">iLBC</item>
-		<item name="account.1.codec.choice.7">OPUS</item>
+		<item name="account.{$line}.codec.choice.1">PCMU</item>
+		<item name="account.{$line}.codec.choice.2">PCMA</item>
+		<item name="account.{$line}.codec.choice.3">G_726_32</item>
+		<item name="account.{$line}.codec.choice.4">G_722</item>
+		<item name="account.{$line}.codec.choice.5">G_729AOrB</item>
+		<item name="account.{$line}.codec.choice.6">iLBC</item>
+		<item name="account.{$line}.codec.choice.7">OPUS</item>
 		<!-- Codec Negotiation Priority -->
 		<!-- Caller, Callee -->
-		<item name="account.1.codec.negotiatePriority">Callee</item>
+		<item name="account.{$line}.codec.negotiatePriority">Callee</item>
 		<!-- Use First Matching Vocoder in 200OK SDP -->
 		<!-- No, Yes -->
-		<item name="account.1.codec.useFirstMatch">No</item>
+		<item name="account.{$line}.codec.useFirstMatch">No</item>
 		<!-- iLBC Frame Size -->
 		<!-- 20ms, 30ms -->
-		<item name="account.1.codec.iLBC.frameSize">30ms</item>
+		<item name="account.{$line}.codec.iLBC.frameSize">30ms</item>
 		<!-- G726-32 ITU Payload -->
 		<!-- 2 - 0, Dynamic - 1 -->
-		<item name="account.1.codec.payloadType.g72632.ITU">1</item>
+		<item name="account.{$line}.codec.payloadType.g72632.ITU">1</item>
 		<!-- G726-32 Dynamic PT -->
 		<!-- Range: 96-126, default: 126 -->
-		<item name="account.1.codec.payloadType.g72632">126</item>
+		<item name="account.{$line}.codec.payloadType.g72632">126</item>
 		<!-- Opus Payload Type -->
-		<item name="account.1.codec.payloadType.opus">123</item>
+		<item name="account.{$line}.codec.payloadType.opus">123</item>
 		<!-- DTMF -->
 		<!-- No, Yes -->
-		<item name="account.1.dtmf.sendInAudio">No</item>
-		<item name="account.1.dtmf.sendInRtp">Yes</item>
-		<item name="account.1.dtmf.sendInSip">No</item>
+		<item name="account.{$line}.dtmf.sendInAudio">No</item>
+		<item name="account.{$line}.dtmf.sendInRtp">Yes</item>
+		<item name="account.{$line}.dtmf.sendInSip">No</item>
 		<!-- DTMF Payload Type -->
-		<item name="account.1.codec.payoadType.dtmf">101</item>
+		<item name="account.{$line}.codec.payoadType.dtmf">101</item>
 		<!-- Jitter Buffer Type -->
 		<!-- Fixed, Adaptive -->
-		<item name="account.1.audio.jitterBufferType">Adaptive</item>
+		<item name="account.{$line}.audio.jitterBufferType">Adaptive</item>
 		<!-- Enable Audio RED with FEC -->
 		<!-- No, Yes -->
-		<item name="account.1.audio.fec.enable">No</item>
+		<item name="account.{$line}.audio.fec.enable">No</item>
 		<!-- Audio FEC Payload Type -->
 		<!-- Range: 96-126, default: 121 -->
-		<item name="account.1.codec.payloadType.fec.audio">121</item>
+		<item name="account.{$line}.codec.payloadType.fec.audio">121</item>
 		<!-- Audio RED Payload Type -->
 		<!-- Range: 96-126, default: 124 -->
-		<item name="account.1.codec.payloadType.red">124</item>
+		<item name="account.{$line}.codec.payloadType.red">124</item>
 		<!-- Silence Suppression -->
 		<!-- No, Yes -->
-		<item name="account.1.audio.silenceSuppression">No</item>
+		<item name="account.{$line}.audio.silenceSuppression">No</item>
 		<!-- Voice Frames Per TX -->
-		<item name="account.1.audio.voiceFramePerTX">2</item>
+		<item name="account.{$line}.audio.voiceFramePerTX">2</item>
 		<!-- Enable Video FEC -->
 		<!-- No, Yes -->
-		<item name="account.1.video.fec.enable">Yes</item>
+		<item name="account.{$line}.video.fec.enable">Yes</item>
 		<!-- Enable RFC5168 Support -->
 		<!-- No, Yes -->
-		<item name="account.1.codec.rfc5168.enable">No</item>
+		<item name="account.{$line}.codec.rfc5168.enable">No</item>
 		<!-- Video FEC Mode  -->
 		<!-- 0 , 1 -->
-		<item name="account.1.video.fec.mode">0</item>
+		<item name="account.{$line}.video.fec.mode">0</item>
 		<!-- FEC Payload Type -->
 		<!-- Range: 96-126, default: 120 -->
-		<item name="account.1.codec.payloadType.fec.video">120</item>
+		<item name="account.{$line}.codec.payloadType.fec.video">120</item>
 		<!-- Packetization mode -->
 		<!-- SingleNALUnit, Non-Interleaved -->
 		<!-- [Note] Prefer Non-Interleaved Mode is not supported yet -->
-		<item name="account.1.codec.packetizationMode">Non-Interleaved</item>
+		<item name="account.{$line}.codec.packetizationMode">Non-Interleaved</item>
 		<!-- H.264 Image Size -->
 		<!-- 720P, 4CIF, VGA, CIF, QVGA, QCIF -->
-		<item name="account.1.video.h264.imagesize">720P</item>
+		<item name="account.{$line}.video.h264.imagesize">720P</item>
 		<!-- Use H.264 Constrained Profiles -->
 		<!-- No, Yes -->
-		<item name="account.1.codec.h264.CBP.enable">No</item>
+		<item name="account.{$line}.codec.h264.CBP.enable">No</item>
 		<!-- H.264 Profile Type -->
 		<!-- Baseline, Main, High, BP&amp;MP&amp;HP -->
-		<item name="account.1.codec.H264ProfileType">BP&amp;MP&amp;HP</item>
+		<item name="account.{$line}.codec.H264ProfileType">BP&amp;MP&amp;HP</item>
 		<!-- Video Bit Rate -->
 		<!-- 32 - 32 kbps, 64 - 64 kbps, 96 - 96 kbps, 128 - 128 kbps, 160 - 160 kbps, 192 - 192 kbps -->
 		<!-- # 210 - 210 kbps, 256 - 256 kbps, 384 - 384 kbps, 512 - 512 kbps, 640 - 640 kbps, 768 - 768 kbps -->
 		<!-- # 1024 - 1024 kbps, 1280 - 1280 kbps, 1536 - 1536 kbps, 2048 - 2048 kbps. -->
-		<item name="account.1.video.bitRate">2048</item>
+		<item name="account.{$line}.video.bitRate">2048</item>
 		<!-- SDP Bandwidth Attribute -->
 		<!-- Standard, MediaLevel, SessionLevel, None -->
-		<item name="account.1.codec.SDPBandwidthAttr">MediaLevel</item>
+		<item name="account.{$line}.codec.SDPBandwidthAttr">MediaLevel</item>
 		<!-- H.264 Payload Type -->
 		<!-- Range: 96-126, default: 99 -->
-		<item name="account.1.codec.payloadType.h264">99</item>
+		<item name="account.{$line}.codec.payloadType.h264">99</item>
 		<!-- Disable BFCP -->
 		<!-- No, Yes -->
-		<item name="account.1.presentation.BFCP.enable">Yes</item>
+		<item name="account.{$line}.presentation.BFCP.enable">Yes</item>
 		<!-- Presentation H.264 Image Size -->
 		<!-- 1080P, 720P -->
-		<item name="account.1.presentation.h264.imagesize">1080P</item>
+		<item name="account.{$line}.presentation.h264.imagesize">1080P</item>
 		<!-- Presentation H.264 Profile Type -->
 		<!-- Baseline, Main, High, BP&amp;MP&amp;HP -->
-		<item name="account.1.presentation.H264ProfileType">BP&amp;MP&amp;HP</item>
+		<item name="account.{$line}.presentation.H264ProfileType">BP&amp;MP&amp;HP</item>
 		<!-- Presentation Video Bit Rate -->
 		<!-- 32 - 32 kbps, 64 - 64 kbps, 96 - 96 kbps, 128 - 128 kbps, 160 - 160 kbps, 192 - 192 kbps -->
 		<!-- # 210 - 210 kbps, 256 - 256 kbps, 384 - 384 kbps, 512 - 512 kbps, 640 - 640 kbps, 768 - 768 kbps -->
 		<!-- # 1024 - 1024 kbps, 1280 - 1280 kbps, 1536 - 1536 kbps, 2048 - 2048 kbps. -->
-		<item name="account.1.presentation.bitRate">1024</item>
+		<item name="account.{$line}.presentation.bitRate">1024</item>
 		<!-- Presentation Video Frame Rate -->
 		<!-- 5, 10, 15 -->
-		<item name="account.1.presentation.frameRate">15</item>
+		<item name="account.{$line}.presentation.frameRate">15</item>
 		<!-- BFCP Transport Protocol -->
 		<!-- Automatic, UDP, TCP -->
-		<item name="account.1.presentation.BFCP.transportProtocol">UDP</item>
+		<item name="account.{$line}.presentation.BFCP.transportProtocol">UDP</item>
 		<!-- SRTP Mode -->
 		<!-- Disabled, EnabledButNotForced, EnabledAndForced -->
-		<item name="account.1.audio.srtpMode">Disabled</item>
+		<item name="account.{$line}.audio.srtpMode">Disabled</item>
 		<!-- SRTP Key Length -->
 		<!-- AES128And256Bit, AES128Bit, AES256Bit -->
-		<item name="account.1.audio.srtpKeyLength">AES128And256Bit</item>
+		<item name="account.{$line}.audio.srtpKeyLength">AES128And256Bit</item>
 		<!-- Enable SRTP Key Life Time -->
 		<!-- No, Yes -->
-		<item name="account.1.audio.cryptoLifeTime">Yes</item>
+		<item name="account.{$line}.audio.cryptoLifeTime">Yes</item>
 		<!-- RTCP Destination -->
-		<item name="account.1.rtcp.destination"></item>
+		<item name="account.{$line}.rtcp.destination"></item>
 		<!-- Symmetric RTP -->
 		<!-- No, Yes -->
-		<item name="account.1.audio.symmetricRTP">No</item>
+		<item name="account.{$line}.audio.symmetricRTP">No</item>
 		<!-- RTP IP Filter -->
 		<!-- Disable, IPOnly, IPandPort -->
-		<item name="account.1.rtp.filter">Disable</item>
+		<item name="account.{$line}.rtp.filter">Disable</item>
 		<!-- Call Settings -->
 		<!-- Start Video Automatically -->
 		<!-- No, Yes -->
-		<item name="account.1.video.startAuto.enable">Yes</item>
+		<item name="account.{$line}.video.startAuto.enable">Yes</item>
 		<!-- Remote Video Request -->
 		<!-- Prompt, Accept, Deny -->
-		<item name="account.1.video.request">Prompt</item>
+		<item name="account.{$line}.video.request">Prompt</item>
 		<!-- Auto Answer -->
 		<!-- No, Yes, EnableIntercom/Paging -->
-		<item name="account.1.call.autoAnswer">EnableIntercom/Paging</item>
+		<item name="account.{$line}.call.autoAnswer">EnableIntercom/Paging</item>
 		<!-- Play Warning Tone for Auto Answer Intercom  -->
 		<!-- No, Yes -->
-		<item name="account.1.intercom.playWarningToneForAutoAnswer">Yes</item>
+		<item name="account.{$line}.intercom.playWarningToneForAutoAnswer">Yes</item>
 		<!-- Intercom Barging -->
 		<!-- No, Yes -->
-		<item name="account.1.intercom.allowBargingByCallInfo">No</item>
+		<item name="account.{$line}.intercom.allowBargingByCallInfo">No</item>
 		<!-- Auto Preview -->
 		<!-- No, Yes, YeswithRinging -->
-		<item name="account.1.call.autoPreview">Yes</item>
+		<item name="account.{$line}.call.autoPreview">Yes</item>
 		<!-- Send Anonymous -->
 		<!-- No, Yes -->
-		<item name="account.1.call.sendAnonymous">No</item>
+		<item name="account.{$line}.call.sendAnonymous">No</item>
 		<!-- Anonymous Call Rejection -->
 		<!-- No, Yes -->
-		<item name="account.1.call.rejectAnonymousCall">No</item>
+		<item name="account.{$line}.call.rejectAnonymousCall">No</item>
 		<!-- Call Log -->
 		<!-- All, IncomingAndOutgoing, Disable, DonotPromptMissedCall -->
-		<item name="account.1.call.callLog">All</item>
+		<item name="account.{$line}.call.callLog">All</item>
 		<!-- Enable Call Features -->
 		<!-- No, Yes -->
-		<item name="account.1.featureCodes.callFeatures">No</item>
+		<item name="account.{$line}.featureCodes.callFeatures">No</item>
 		<!-- Transfer on 3 Way Conference Hangup -->
 		<!-- No, Yes -->
-		<item name="account.1.call.transferOnConferenceHangup">No</item>
+		<item name="account.{$line}.call.transferOnConferenceHangup">No</item>
 		<!-- Use # as Dial Key  -->
 		<!-- Yes, No -->
-		<item name="account.1.call.keyAsSend">Yes</item>
+		<item name="account.{$line}.call.keyAsSend">Yes</item>
 		<!-- DND Call Feature On -->
-		<item name="account.1.featureCodes.dndOn"></item>
+		<item name="account.{$line}.featureCodes.dndOn"></item>
 		<!-- DND Call Feature Off  -->
-		<item name="account.1.featureCodes.dndOff"></item>
+		<item name="account.{$line}.featureCodes.dndOff"></item>
 		<!-- No Key Entry Timeout (s) -->
 		<!-- Number: 4 - 15 -->
-		<item name="account.1.call.noKeyEntryTimeout">4</item>
+		<item name="account.{$line}.call.noKeyEntryTimeout">4</item>
 		<!-- Ring Timeout -->
 		<!-- Number: 10 - 300 -->
-		<item name="account.1.ring.timeout">60</item>
+		<item name="account.{$line}.ring.timeout">60</item>
 		<!-- Refer-To Use Target Contact -->
 		<!-- Yes, No -->
-		<item name="account.1.call.referToUseTargetContact">No</item>
+		<item name="account.{$line}.call.referToUseTargetContact">No</item>
 		<!-- RFC2543 Hold -->
 		<!-- Yes, No -->
-		<item name="account.1.sip.rfc2543Hold">Yes</item>
+		<item name="account.{$line}.sip.rfc2543Hold">Yes</item>
 		<!-- Dial Plan Prefix -->
-		<item name="account.1.call.dialplanPrefix"></item>
+		<item name="account.{$line}.call.dialplanPrefix"></item>
 		<!-- Disable DialPlan -->
 		<!-- # Disable DialPlan. 0 - No Selection, 1 - Dial Page, 2 - Contact, 4 - Incoming Call History, 8 -  Outgoing Call History, 16 - MPK & Click2Dial.  -->
 		<!-- # If need to check multiple selections, add the specific values for each selections together. Default value is 0 -->
-		<item name="account.1.call.dialplan.disableMode">0</item>
+		<item name="account.{$line}.call.dialplan.disableMode">0</item>
 		<!-- DialPlan -->
-		<item name="account.1.call.dialplan">{$grandstream_dial_plan}</item>
+		<item name="account.{$line}.call.dialplan">{$grandstream_dial_plan}</item>
 		<!-- Caller ID Display -->
 		<!-- Auto, Disabled, Header, PAIHeader -->
 		<!-- [Note] PAI Header is not supported yet -->
-		<item name="account.1.sip.callerIdDisplay">Auto</item>
+		<item name="account.{$line}.sip.callerIdDisplay">Auto</item>
 		<!-- Account Ring Tone -->
-		<item name="account.1.ring.ringtone">content://settings/system/ringtone</item>
+		<item name="account.{$line}.ring.ringtone">content://settings/system/ringtone</item>
 		<!-- Ignore Alert-Info Header -->
 		<!-- Yes, No -->
-		<item name="account.1.ring.ignoreSipAlertInfo">No</item>
+		<item name="account.{$line}.ring.ignoreSipAlertInfo">No</item>
 		<!-- Match Incoming Caller ID -->
-		<item name="account.1.ring.match.1.callerId"></item>
+		<item name="account.{$line}.ring.match.1.callerId"></item>
 		<!-- Distinctive Ring Tone -->
-		<item name="account.1.ring.match.1.ringtone">content://settings/system/ringtone</item>
+		<item name="account.{$line}.ring.match.1.ringtone">content://settings/system/ringtone</item>
 		<!-- Match Incoming Caller ID -->
-		<item name="account.1.ring.match.2.callerId"></item>
+		<item name="account.{$line}.ring.match.2.callerId"></item>
 		<!-- Distinctive Ring Tone -->
-		<item name="account.1.ring.match.2.ringtone">content://settings/system/ringtone</item>
+		<item name="account.{$line}.ring.match.2.ringtone">content://settings/system/ringtone</item>
 		<!-- Match Incoming Caller ID -->
-		<item name="account.1.ring.match.3.callerId"></item>
+		<item name="account.{$line}.ring.match.3.callerId"></item>
 		<!-- Distinctive Ring Tone -->
-		<item name="account.1.ring.match.3.ringtone">content://settings/system/ringtone</item>
+		<item name="account.{$line}.ring.match.3.ringtone">content://settings/system/ringtone</item>
 		<!-- ############Ring Tone Value Table###############
-				# Web GUI Option                            Value
-				# Use System Ring tone                      content://settings/system/ringtone 
-				# Silent                                    ringtone_silence
-				# Ring2_OrganDub                            /system/media/audio/ringtones/Ring2_OrganDub.ogg
-				# Big_Easy                                  /system/media/audio/ringtones/Big_Easy.ogg
-				# DonMessWivlt                              /system/media/audio/ringtones/DonMessWivIt.ogg
-				# Club_Cubano                               /system/media/audio/ringtones/Club_Cubano.ogg
-				# Growl                                     /system/media/audio/ringtones/Growl.ogg
-				# CrayonRock                                /system/media/audio/ringtones/CrayonRock.ogg
-				# Ring9_Nairobi                             /system/media/audio/ringtones/Ring9_Nairobi.ogg
-				# Ring10_Nassau                             /system/media/audio/ringtones/Ring10_Nassau.ogg
-				# Third_Eye                                 /system/media/audio/ringtones/Third_Eye.ogg
-				# Ring1_Ding                                /system/media/audio/ringtones/Ring1_Ding.ogg
-				# Road_Trip                                 /system/media/audio/ringtones/Road_Trip.ogg
-				# bellcore-dr2                              /system/media/audio/ringtones/bellcore-dr2.ogg
-				# Ring_Digital_02                           /system/media/audio/ringtones/Ring_Digital_02.ogg
-				# bellcore-dr3                              /system/media/audio/ringtones/bellcore-dr3.ogg
-				# DancinFool                                /system/media/audio/ringtones/DancinFool.ogg
-				# Ring_Classic_02                           /system/media/audio/ringtones/Ring_Classic_02.ogg
-				# Ring5_FreeFlight                          /system/media/audio/ringtones/Ring5_FreeFlight.ogg
-				# Funk_Yall                                 /system/media/audio/ringtones/Funk_Yall.ogg
-				# World                                     /system/media/audio/ringtones/World.ogg
-				# Ring8_MidEvilJaunt                        /system/media/audio/ringtones/Ring8_MidEvilJaunt.ogg
-				# TwirlAway                                 /system/media/audio/ringtones/TwirlAway.ogg
-				# bellcore-dr4                              /system/media/audio/ringtones/bellcore-dr4.ogg
-				# Ring6_Glacial_Groove                      /system/media/audio/ringtones/Ring6_Glacial_Groove.ogg
-				# Shes_All_That                             /system/media/audio/ringtones/Shes_All_That.ogg
-				# Ring4_EtherShake                          /system/media/audio/ringtones/Ring4_EtherShake.ogg
-				# Seville                                   /system/media/audio/ringtones/Seville.ogg
-				# BussaMove                                 /system/media/audio/ringtones/BussaMove.ogg
-				# Default_ringtone                          /system/media/audio/ringtones/Default_ringtone.ogg
-				# BirdLoop                                  /system/media/audio/ringtones/BirdLoop.ogg
-				# MildlyAlarming                            /system/media/audio/ringtones/MildlyAlarming.ogg
-				# Terminated                                /system/media/audio/ringtones/Terminated.ogg
-				# Calypso_Steel                             /system/media/audio/ringtones/Calypso_Steel.ogg
-				# Safari                                    /system/media/audio/ringtones/Safari.ogg
-				# Ring_Synth_04                             /system/media/audio/ringtones/Ring_Synth_04.ogg
-				# Ring_Synth_02                             /system/media/audio/ringtones/Ring_Synth_02.ogg
-				# CurveBall                                 /system/media/audio/ringtones/CurveBall.ogg
-				# Enter_the_Nexus                           /system/media/audio/ringtones/Enter_the_Nexus.ogg
-				# Bollywood                                 /system/media/audio/ringtones/Bollywood.ogg
-				# Champagne_Edition                         /system/media/audio/ringtones/Champagne_Edition.ogg
-				# Steppin_Out                               /system/media/audio/ringtones/Steppin_Out.ogg
-				# Ring3_Paradise_Island                     /system/media/audio/ringtones/Ring3_Paradise_Island.ogg
-				# Playa                                     /system/media/audio/ringtones/Playa.ogg
-				# No_Limits                                 /system/media/audio/ringtones/No_Limits.ogg
-				# LoopyLounge                               /system/media/audio/ringtones/LoopyLounge.ogg
-				# Cairo                                     /system/media/audio/ringtones/Cairo.ogg
-				# Ring7_HalfwayHome                         /system/media/audio/ringtones/Ring7_HalfwayHome.ogg
-				# SilkyWay                                  /system/media/audio/ringtones/SilkyWay.ogg
-				# LoveFlute                                 /system/media/audio/ringtones/LoveFlute.ogg
-				# Eastern_Sky                               /system/media/audio/ringtones/Eastern_Sky.ogg
-				# bellcore-dr5                              /system/media/audio/ringtones/bellcore-dr5.ogg
-				# Gimme_Mo_Town                             /system/media/audio/ringtones/Gimme_Mo_Town.ogg
-				# bellcore-dr1                              /system/media/audio/ringtones/bellcore-dr1.ogg
-				# Backroad                                  /system/media/audio/ringtones/Backroad.ogg -->
+                # Web GUI Option                            Value
+                # Use System Ring tone                      content://settings/system/ringtone
+                # Silent                                    ringtone_silence
+                # Ring2_OrganDub                            /system/media/audio/ringtones/Ring2_OrganDub.ogg
+                # Big_Easy                                  /system/media/audio/ringtones/Big_Easy.ogg
+                # DonMessWivlt                              /system/media/audio/ringtones/DonMessWivIt.ogg
+                # Club_Cubano                               /system/media/audio/ringtones/Club_Cubano.ogg
+                # Growl                                     /system/media/audio/ringtones/Growl.ogg
+                # CrayonRock                                /system/media/audio/ringtones/CrayonRock.ogg
+                # Ring9_Nairobi                             /system/media/audio/ringtones/Ring9_Nairobi.ogg
+                # Ring10_Nassau                             /system/media/audio/ringtones/Ring10_Nassau.ogg
+                # Third_Eye                                 /system/media/audio/ringtones/Third_Eye.ogg
+                # Ring1_Ding                                /system/media/audio/ringtones/Ring1_Ding.ogg
+                # Road_Trip                                 /system/media/audio/ringtones/Road_Trip.ogg
+                # bellcore-dr2                              /system/media/audio/ringtones/bellcore-dr2.ogg
+                # Ring_Digital_02                           /system/media/audio/ringtones/Ring_Digital_02.ogg
+                # bellcore-dr3                              /system/media/audio/ringtones/bellcore-dr3.ogg
+                # DancinFool                                /system/media/audio/ringtones/DancinFool.ogg
+                # Ring_Classic_02                           /system/media/audio/ringtones/Ring_Classic_02.ogg
+                # Ring5_FreeFlight                          /system/media/audio/ringtones/Ring5_FreeFlight.ogg
+                # Funk_Yall                                 /system/media/audio/ringtones/Funk_Yall.ogg
+                # World                                     /system/media/audio/ringtones/World.ogg
+                # Ring8_MidEvilJaunt                        /system/media/audio/ringtones/Ring8_MidEvilJaunt.ogg
+                # TwirlAway                                 /system/media/audio/ringtones/TwirlAway.ogg
+                # bellcore-dr4                              /system/media/audio/ringtones/bellcore-dr4.ogg
+                # Ring6_Glacial_Groove                      /system/media/audio/ringtones/Ring6_Glacial_Groove.ogg
+                # Shes_All_That                             /system/media/audio/ringtones/Shes_All_That.ogg
+                # Ring4_EtherShake                          /system/media/audio/ringtones/Ring4_EtherShake.ogg
+                # Seville                                   /system/media/audio/ringtones/Seville.ogg
+                # BussaMove                                 /system/media/audio/ringtones/BussaMove.ogg
+                # Default_ringtone                          /system/media/audio/ringtones/Default_ringtone.ogg
+                # BirdLoop                                  /system/media/audio/ringtones/BirdLoop.ogg
+                # MildlyAlarming                            /system/media/audio/ringtones/MildlyAlarming.ogg
+                # Terminated                                /system/media/audio/ringtones/Terminated.ogg
+                # Calypso_Steel                             /system/media/audio/ringtones/Calypso_Steel.ogg
+                # Safari                                    /system/media/audio/ringtones/Safari.ogg
+                # Ring_Synth_04                             /system/media/audio/ringtones/Ring_Synth_04.ogg
+                # Ring_Synth_02                             /system/media/audio/ringtones/Ring_Synth_02.ogg
+                # CurveBall                                 /system/media/audio/ringtones/CurveBall.ogg
+                # Enter_the_Nexus                           /system/media/audio/ringtones/Enter_the_Nexus.ogg
+                # Bollywood                                 /system/media/audio/ringtones/Bollywood.ogg
+                # Champagne_Edition                         /system/media/audio/ringtones/Champagne_Edition.ogg
+                # Steppin_Out                               /system/media/audio/ringtones/Steppin_Out.ogg
+                # Ring3_Paradise_Island                     /system/media/audio/ringtones/Ring3_Paradise_Island.ogg
+                # Playa                                     /system/media/audio/ringtones/Playa.ogg
+                # No_Limits                                 /system/media/audio/ringtones/No_Limits.ogg
+                # LoopyLounge                               /system/media/audio/ringtones/LoopyLounge.ogg
+                # Cairo                                     /system/media/audio/ringtones/Cairo.ogg
+                # Ring7_HalfwayHome                         /system/media/audio/ringtones/Ring7_HalfwayHome.ogg
+                # SilkyWay                                  /system/media/audio/ringtones/SilkyWay.ogg
+                # LoveFlute                                 /system/media/audio/ringtones/LoveFlute.ogg
+                # Eastern_Sky                               /system/media/audio/ringtones/Eastern_Sky.ogg
+                # bellcore-dr5                              /system/media/audio/ringtones/bellcore-dr5.ogg
+                # Gimme_Mo_Town                             /system/media/audio/ringtones/Gimme_Mo_Town.ogg
+                # bellcore-dr1                              /system/media/audio/ringtones/bellcore-dr1.ogg
+                # Backroad                                  /system/media/audio/ringtones/Backroad.ogg -->
 		<!-- Account Advanced Settings -->
 		<!-- Check Domain Certificates		 -->
 		<!-- Yes, No -->
-		<item name="account.1.sip.validate.domainCertificates">No</item>
+		<item name="account.{$line}.sip.validate.domainCertificates">No</item>
 		<!-- Validate Certification Chain 	 -->
 		<!-- Yes, No -->
-		<item name="account.1.sip.validate.certificationChain">No</item>
+		<item name="account.{$line}.sip.validate.certificationChain">No</item>
 		<!-- Validate Incoming SIP Messages -->
 		<!-- Yes, No -->
-		<item name="account.1.sip.validate.incomingMessage">No</item>
+		<item name="account.{$line}.sip.validate.incomingMessage">No</item>
 		<!-- Allow Unsolicited REFER -->
 		<!-- Disabled, Enabled, EnabledOrForceAuth -->
-		<item name="account.1.sip.allowUnsolicitedRefer">Disabled</item>
+		<item name="account.{$line}.sip.allowUnsolicitedRefer">Disabled</item>
 		<!-- Only Accept SIP Requests from Known Servers -->
 		<!-- Yes, No -->
-		<item name="account.1.sip.validate.incomingServer">No</item>
+		<item name="account.{$line}.sip.validate.incomingServer">No</item>
 		<!-- Check SIP User ID for Incoming INVITE  -->
 		<!-- Yes, No -->
-		<item name="account.1.sip.validate.userIdforInvite">No</item>
+		<item name="account.{$line}.sip.validate.userIdforInvite">No</item>
 		<!-- Allow SIP Reset  -->
 		<!-- Yes, No -->
-		<item name="account.1.sip.allowSipReset">No</item>
+		<item name="account.{$line}.sip.allowSipReset">No</item>
 		<!-- Authenticate Incoming INVITE -->
 		<!-- Yes, No -->
-		<item name="account.1.sip.authenticateIncomingInvite">No</item>
+		<item name="account.{$line}.sip.authenticateIncomingInvite">No</item>
 		<!-- SIP Realm Used for Challenge INVITE & NOTIFY -->
-		<item name="account.1.sipRealmForChallengeINVITE"></item>
+		<item name="account.{$line}.sipRealmForChallengeINVITE"></item>
 		<!-- Virtual Account Group -->
 		<!-- -1 - Default, 0 - 15 - Virtual Account Group 1 - 16 -->
-		<item name="account.1.virtualGroup">-1</item>
+		<item name="account.{$line}.virtualGroup">-1</item>
 		<!-- Special Feature -->
 		<!-- 100 - Standard, 102 - Broadsoft, 113 - China Mobile, 114 - ZTE IMS, 115 - Mobotix, 116 - ZTE NGN, 117 - Huawei IMS, 123 - NEC, 125 - Worldstone -->
-		<item name="account.1.sip.specialFeature">100</item>
+		<item name="account.{$line}.sip.specialFeature">100</item>
+		<!-- BLF Call-pickup Prefix  -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.sip.blf.callPickup.forcePrefix">No</item>
+		<!-- EventList BLF URI -->
+		<item name="account.{$line}.sip.blf.eventlist.uri"></item>
+		<!-- Force BLF Call-pickup by Prefix -->
+		<item name="account.{$line}.sip.blf.callPickup.prefix">**</item>
+		<!-- Value-added Service - Broadsoft Settings - Braodsoft Call Features -->
+		<!-- Feature Key Synchronization -->
+		<!-- No - Disable, Yes - Broadsoft -->
+		<item name="account.{$line}.broadsoft.syncFeatureKey">{if filter_var($grandstream_feature_key_sync, FILTER_VALIDATE_BOOLEAN)}Yes{else}No{/if}</item>
+		<!-- Enable BroadSoft Call Park -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.broadsoft.callPark">No</item>
+		<!-- Conference URI -->
+		<item name="account.{$line}.sip.conferenceUri"></item>
+		<!-- BroadSoft Call Center -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.broadsoft.callCenter">No</item>
+
+		<!-- Hoteling Event -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.broadsoft.hoteling">No</item>
+
+		<!-- Call Center Status -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.broadsoft.callCenterStatus">No</item>
+
+		<!-- Value-added Service - Broadsoft Settings - SCA -->
+		<!-- Enable SCA (Shared Call Appearance) -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.sca.enable">{if isset($row.shared_line)}Yes{else}No{/if}</item>
+
+		<!-- Enable BargeIn -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.sca.bargein.enable">{if isset($row.shared_line)}Yes{else}No{/if}</item>
+		<!-- Auto-filling Pickup Feature Code -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.sca.autoPickup.enable">Yes</item>
+		<!-- Pickup Feature Code -->
+		<item name="account.{$line}.sca.pickupFeatureCode"></item>
+		<!-- Line-seize Timeout -->
+		<!-- Range: 15 - 60. Default: 15 -->
+		<item name="account.{$line}.sip.lineSeizeTimeout">15</item>
+		{/for}
 		<!-- Phone Settings - General Settings -->
 		<!-- Local RTP Port -->
 		<!-- Number: 50040 - 65535 -->
@@ -686,17 +732,21 @@
 		<item name="network.md5Password"></item>
 		<!-- Wi-Fi Settings -->
 		<!-- Wi-Fi Function -->
+		{if isset($grandstream_wifi_enable)}
 		<!-- No, Yes -->
-		<item name="wifi.enable">No</item>
+		<item name="wifi.enable">{if filter_var($grandstream_wifi_enable, FILTER_VALIDATE_BOOLEAN)}Yes{else}No{/if}</item>
 		<!-- ESSID -->
-		<item name="wifi.essidname"></item>
+		{if isset($grandstream_wifi_essid)}
+		<item name="wifi.essidname">{$grandstream_wifi_essid}</item>
 		<!-- Password -->
-		<item name="wifi.essidpassword"></item>
+		<item name="wifi.essidpassword">{$grandstream_wifi_password}</item>
 		<!-- Security Mode for Hidden SSID -->
 		<!-- None, WEP, WPA/WPA2_PSK, 802.1X_EAP -->
-		<item name="wifi.hiddenessid.securitymode">None</item>
+		<item name="wifi.hiddenessid.securitymode">{$grandstream_wifi_hidden_security}</item>
+		{/if}
 		<!-- Layer 2 QoS 802.1p Priority Value (Wi-Fi) -->
 		<item name="wifi.layer2qos.priority">0</item>
+		{/if}
 		<!-- OpenVPN Settings -->
 		<!-- Enable OpenVPN -->
 		<!-- Yes, No -->
@@ -899,9 +949,9 @@
 		<!-- Allow, RequireAdminPassword, RequireAdminPasswordIfSrcUnknown, NotAllow -->
 		<item name="security.installThirdApp.permission">Allow</item>
 		<!-- Admin Password -->
-		<item name="users.admin.password">admin1</item>
+		<item name="users.admin.password">{if isset($admin_password)}{$admin_password}{else}admin{/if}</item>
 		<!-- User Password -->
-		<item name="users.user.password">user</item>
+		<item name="users.user.password">{if isset($device_password)}{$device_password}{else}user{/if}</item>
 		<!-- SIP TLS Certificate -->
 		<!-- <item name="security.certificate"></item> -->
 		<!-- SIP TLS Private Key  -->
@@ -986,11 +1036,17 @@
 		<!-- TFTP, HTTP, HTTPS -->
 		<item name="provisioning.firmware.protocol">HTTP</item>
 		<!-- Firmware Server Path -->
-		<item name="provisioning.firmware.serverPath"></item>
+		{if isset($grandstream_firmware_path) && isset($firmware_version)}
+		<item name="provisioning.firmware.serverPath">{$grandstream_firmware_path}/{$firmware_version}</item>
+		{elseif isset($grandstream_firmware_path)}
+		<item name="provisioning.firmware.serverPath">{$grandstream_firmware_path}</item>
+		{else}
+		<item name="provisioning.firmware.serverPath">{$domain_name}{$project_path}/app/provision/resources/firmware/</item>
+		{/if}
 		<!-- HTTP/HTTPS User Name -->
-		<item name="provisioning.firmware.username"></item>
+		<item name="provisioning.firmware.username">{$http_auth_username}</item>
 		<!-- HTTP/HTTPS Password -->
-		<item name="provisioning.firmware.password"></item>
+		<item name="provisioning.firmware.password">{$http_auth_password}</item>
 		<!-- Firmware File Prefix -->
 		<item name="provisioning.firmware.filePrefix"></item>
 		<!-- Firmware File Postfix -->
@@ -999,11 +1055,17 @@
 		<!-- TFTP, HTTP, HTTPS -->
 		<item name="provisioning.config.protocol">HTTP</item>
 		<!-- Config Server Path -->
+		{if $grandstream_config_server_path=="none"}
 		<item name="provisioning.config.serverPath"></item>
+		{elseif isset($grandstream_config_server_path)}
+		<item name="provisioning.config.serverPath">{$grandstream_config_server_path}</item>
+		{else}
+		<item name="provisioning.config.serverPath">{$domain_name}{$project_path}/app/provision</item>
+		{/if}
 		<!-- HTTP/HTTPS User Name -->
-		<item name="provisioning.config.username"></item>
+		<item name="provisioning.config.username">{$http_auth_username}</item>
 		<!-- HTTP/HTTPS Password -->
-		<item name="provisioning.config.password"></item>
+		<item name="provisioning.config.password">{$http_auth_password}</item>
 		<!-- Config File Prefix -->
 		<item name="provisioning.config.filePrefix"></item>
 		<!-- Config File Postfix -->
@@ -1081,58 +1143,6 @@
 		<!-- Show Display Name from Server -->
 		<!-- Yes, No -->
 		<item name="pks.mpk.showNamefromServer.enable">No</item>
-		<!-- BLF Call-pickup Prefix  -->
-		<!-- Yes, No -->
-		<item name="account.1.sip.blf.callPickup.forcePrefix">No</item>
-		<item name="account.2.sip.blf.callPickup.forcePrefix">No</item>
-		<item name="account.3.sip.blf.callPickup.forcePrefix">No</item>
-		<item name="account.4.sip.blf.callPickup.forcePrefix">No</item>
-		<item name="account.5.sip.blf.callPickup.forcePrefix">No</item>
-		<item name="account.6.sip.blf.callPickup.forcePrefix">No</item>
-		<item name="account.7.sip.blf.callPickup.forcePrefix">No</item>
-		<item name="account.8.sip.blf.callPickup.forcePrefix">No</item>
-		<item name="account.9.sip.blf.callPickup.forcePrefix">No</item>
-		<item name="account.10.sip.blf.callPickup.forcePrefix">No</item>
-		<item name="account.11.sip.blf.callPickup.forcePrefix">No</item>
-		<item name="account.12.sip.blf.callPickup.forcePrefix">No</item>
-		<item name="account.13.sip.blf.callPickup.forcePrefix">No</item>
-		<item name="account.14.sip.blf.callPickup.forcePrefix">No</item>
-		<item name="account.15.sip.blf.callPickup.forcePrefix">No</item>
-		<item name="account.16.sip.blf.callPickup.forcePrefix">No</item>
-		<!-- EventList BLF URI -->
-		<item name="account.1.sip.blf.eventlist.uri"></item>
-		<item name="account.2.sip.blf.eventlist.uri"></item>
-		<item name="account.3.sip.blf.eventlist.uri"></item>
-		<item name="account.4.sip.blf.eventlist.uri"></item>
-		<item name="account.5.sip.blf.eventlist.uri"></item>
-		<item name="account.6.sip.blf.eventlist.uri"></item>
-		<item name="account.7.sip.blf.eventlist.uri"></item>
-		<item name="account.8.sip.blf.eventlist.uri"></item>
-		<item name="account.9.sip.blf.eventlist.uri"></item>
-		<item name="account.10.sip.blf.eventlist.uri"></item>
-		<item name="account.11.sip.blf.eventlist.uri"></item>
-		<item name="account.12.sip.blf.eventlist.uri"></item>
-		<item name="account.13.sip.blf.eventlist.uri"></item>
-		<item name="account.14.sip.blf.eventlist.uri"></item>
-		<item name="account.15.sip.blf.eventlist.uri"></item>
-		<item name="account.16.sip.blf.eventlist.uri"></item>
-		<!-- Force BLF Call-pickup by Prefix -->
-		<item name="account.1.sip.blf.callPickup.prefix">**</item>
-		<item name="account.2.sip.blf.callPickup.prefix">**</item>
-		<item name="account.3.sip.blf.callPickup.prefix">**</item>
-		<item name="account.4.sip.blf.callPickup.prefix">**</item>
-		<item name="account.5.sip.blf.callPickup.prefix">**</item>
-		<item name="account.6.sip.blf.callPickup.prefix">**</item>
-		<item name="account.7.sip.blf.callPickup.prefix">**</item>
-		<item name="account.8.sip.blf.callPickup.prefix">**</item>
-		<item name="account.9.sip.blf.callPickup.prefix">**</item>
-		<item name="account.10.sip.blf.callPickup.prefix">**</item>
-		<item name="account.11.sip.blf.callPickup.prefix">**</item>
-		<item name="account.12.sip.blf.callPickup.prefix">**</item>
-		<item name="account.13.sip.blf.callPickup.prefix">**</item>
-		<item name="account.14.sip.blf.callPickup.prefix">**</item>
-		<item name="account.15.sip.blf.callPickup.prefix">**</item>
-		<item name="account.16.sip.blf.callPickup.prefix">**</item>
 		<!-- Applications - Contacts - General settings -->
 		<!-- Sort Phonebook by -->
 		<!-- LastName, FirstName -->
@@ -1208,65 +1218,31 @@
 		<!-- LDAP Dialing Default Account -->
 		<!-- Default - 0, Account 1 - 1, Account 2 - 2 ... -->
 		<item name="ldap.defalutAccount">0</item>
-		<!-- Value-added Service - Broadsoft Settings - Braodsoft Call Features -->
-		<!-- Feature Key Synchronization -->
-		<!-- No - Disable, Yes - Broadsoft -->
-		<item name="account.1.broadsoft.syncFeatureKey">No</item>
-		<!-- Enable BroadSoft Call Park -->
-		<!-- Yes, No -->
-		<item name="account.1.broadsoft.callPark">No</item>
-		<!-- Conference URI -->
-		<item name="account.1.sip.conferenceUri"></item>
-		<!-- BroadSoft Call Center -->
-		<!-- Yes, No -->
-		<item name="account.1.broadsoft.callCenter">No</item>
-		
-		<!-- Hoteling Event -->
-		<!-- Yes, No -->
-		<item name="account.1.broadsoft.hoteling">No</item>
-
-		<!-- Call Center Status -->
-		<!-- Yes, No -->
-		<item name="account.1.broadsoft.callCenterStatus">No</item>
-
-		<!-- Value-added Service - Broadsoft Settings - SCA -->
-		<!-- Enable SCA (Shared Call Appearance) -->
-		<!-- Yes, No -->
-		<item name="account.1.sca.enable">No</item>
-
-		<!-- Enable BargeIn -->
-		<!-- Yes, No -->
-		<item name="account.1.sca.bargein.enable">No</item>
-		<!-- Auto-filling Pickup Feature Code -->
-		<!-- Yes, No -->
-		<item name="account.1.sca.autoPickup.enable">Yes</item>
-		<!-- Pickup Feature Code -->
-		<item name="account.1.sca.pickupFeatureCode"></item>
-		<!-- Line-seize Timeout -->
-		<!-- Range: 15 - 60. Default: 15 -->
-		<item name="account.1.sip.lineSeizeTimeout">15</item>
 		
 		<!--#############################################-->
 		<!--# 160 MPKs can be configured via MPK APP    #-->
 		<!--#############################################-->
 		<!-- [Note] MPK provision needs reboot to take effect -->
+		{$keyIndex=1}
 		<!-- MPK Key Mode -->
 		<!-- SpeedDial, BLF, SpeedDialViaActiveAccount, DialDTMF, Intercom, Transfer, CallPark, MulticastPaging, Conference, DialPrefix -->
-		<item name="pks.mpk.1.mode">SpeedDial</item>
+		{$key_types=["none"=>"","speed dial"=>"SpeedDial","blf"=>"BLF","speed dial active"=>"SpeedDialViaActiveAccount","dial dtmf"=>"DialDTMF","intercom"=>"Intercom","transfer"=>"Transfer","call park"=>"CallPark","multicast paging"=>"MulticastPaging","conference"=>"Conference"]}
+		{foreach $keys as $category => $rows}
+		{foreach $rows as $row}
+		{if isset($row.device_key_type)}
+		<item name="pks.mpk.{$keyIndex}.mode">{$key_types[$row.device_key_type]}</item>
 		<!-- MPK Account -->
 		<!-- Account1, Account2, ... , Account16 -->
-		<item name="pks.mpk.1.account">Account1</item>
+		<item name="pks.mpk.{$keyIndex}.account">Account{$row.device_key_line}</item>
 		<!-- MPK Display Name -->
-		<item name="pks.mpk.1.description"></item>
+		<item name="pks.mpk.{$keyIndex}.description">{$row.device_key_label}</item>
 		<!-- MPK User ID -->
 		<!-- extendValue may be used based on MPK mode -->
-		<item name="pks.mpk.1.value"></item>
-		<item name="pks.mpk.1.extendValue"></item>
-
-		<item name="pks.mpk.2.mode">SpeedDial</item>
-		<item name="pks.mpk.2.account">Account1</item>
-		<item name="pks.mpk.2.description"></item>
-		<item name="pks.mpk.2.value"></item>
-		<item name="pks.mpk.2.extendValue"></item>
+		<item name="pks.mpk.{$keyIndex}.value">{$row.device_key_value}</item>
+		<item name="pks.mpk.{$keyIndex}.extendValue">device_key_extension</item>
+		{$keyIndex=$keyIndex+1}
+		{/if}
+		{/foreach}
+		{/foreach}
 	</config>
 </gs_provision>
diff --git a/resources/templates/provision/grandstream/gxv3380 b/resources/templates/provision/grandstream/gxv3380
new file mode 100644
index 0000000000..5552562721
--- /dev/null
+++ b/resources/templates/provision/grandstream/gxv3380
@@ -0,0 +1,1711 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gs_provision version="1">
+	<config version="2">
+		<!-- Configuration Template for GXV3380 Firmware Version 1.0.3.21 -->
+		<!-- Instruction -->
+		<!-- The new type of config template gives better understanding than P-value numbers to match the setting name from web UI or device, by using names that are similar from web UI. -->
+		<!-- 1. This config template includes settings for account 1 only. To update item name to "account.{i}...", where {i} is the account index. For example, to update Account 12 SIP server address, include the following in config template: -->
+		<!-- GXV3370 can support up to 16 SIP accounts and 160 MPKs -->
+		<!-- Example, <item name="account.12.sip.server.1.address">sipserver.net</item> -->
+		<!-- 2. The template uses alias name to represent drop-down options. For example, Tel URI uses "Disabled, UserIsPhone, Enabled". To update this setting to "User=Phone", include the following in config template: -->
+		<!-- Example, <item name="account.1.sip.telUri">UserIsPhone</item> -->
+		<!-- 3. For those settings without alias, numbers are informed to match drop-down options.  -->
+		<!-- End of Instruction -->
+
+		<!-- Known issue / Notes:  -->
+		<!-- MPK provision needs reboot to take effect -->
+
+		<!-- Account General Settings -->
+		{for $line=1 to 16}
+		{$row=$lines.$line}
+		<!-- Account Active -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.enable">{if filter_var($row.enabled, FILTER_VALIDATE_BOOLEAN)}Yes{else}No{/if}</item>
+
+		<!-- Account Name -->
+		<item name="account.{$line}.name">{$row.display_name}</item>
+
+		<!-- SIP Server -->
+		<item name="account.{$line}.sip.server.1.address">{$row.server_address}:{$row.sip_port}</item>
+
+		<!-- SIP User ID -->
+		<item name="account.{$line}.sip.userid">{$row.user_id}</item>
+
+		<!-- SIP Authentication ID -->
+		<item name="account.{$line}.sip.subscriber.userId">{$row.auth_id}</item>
+
+		<!-- SIP Authentication Password -->
+		<item name="account.{$line}.sip.subscriber.password">{$row.password}</item>
+		<!-- Voice Mail Access Number -->
+		<item name="account.{$line}.sip.voicemail.number">*97</item>
+		<!-- Display Name -->
+		<item name="account.{$line}.sip.subscriber.name">{$row.display_name}</item>
+		<!-- Tel URI -->
+		<!-- Disabled, UserIsPhone, Enabled -->
+		<item name="account.{$line}.sip.telUri">Disabled</item>
+		<!-- Account 1 Network Settings -->
+		<!-- Outbound Proxy -->
+		<item name="account.{$line}.sip.outboundProxy.1.address">{$row.outbound_proxy_primary}</item>
+		<!-- Secondary Outbound Proxy -->
+		<item name="account.{$line}.sip.outboundProxy.2.address">{$row.outbound_proxy_secondary}</item>
+		<!-- DNS Mode -->
+		<!-- ARecord, SRV, NaptrOrSrv -->
+		<item name="account.{$line}.network.dnsMode">ARecord</item>
+		<!-- DNS SRV Failover Mode -->
+		<!-- Default, SavedOneUntilDNSTTL, SavedOneUntilNoResponse, SavedWhenFallback -->
+		<item name="account.{$line}.network.dnsSRVFailoverMode">Default</item>
+		<!-- Register Before DNS SRV Fail-over -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.network.dnsSRVRegisterBeforeFailover">No</item>
+		<!-- NAT Traversal -->
+		<!-- No, STUN, KeepAlive, UPnP, Auto, VPN -->
+		<item name="account.{$line}.network.natTraversal">Auto</item>
+		<!-- Proxy-Require -->
+		<item name="account.{$line}.network.proxyRequire"></item>
+		<!-- SIP Registration -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.sip.registration">Yes</item>
+		<!-- Unregister Before New Registration -->
+		<!-- No, Yes - All, Instance -->
+		<item name="account.1.sip.unregisterOnReboot">Instance</item>
+		<!-- Register Expiration (m) -->
+		<item name="account.{$line}.sip.registerExpiration">{$row.register_expires}</item>
+		<!-- Subscribe Expiration (m) -->
+		<!-- NUmber: 0 - 64800 -->
+		<item name="account.{$line}.sip.subscribe.expiration">60</item>
+		<!-- Re-register before Expiration (s)  -->
+		<item name="account.{$line}.sip.registerBeforeExpiration">0</item>
+		<!-- Registration Retry Wait Time (s) -->
+		<item name="account.{$line}.sip.registrationFailureRetryWaitTime">20</item>
+		<!-- Add Auth Header On RE-REGISTER tobetested -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.sip.header.authOnInitialRegister">Yes</item>
+		<!-- Enable SIP OPTIONS Keep Alive -->
+		<item name="account.{$line}.sip.keepAlive.enable">No</item>
+		<!-- SIP OPTIONS Keep Alive Interval (s)  -->
+		<item name="account.{$line}.sip.keepAlive.interval">30</item>
+		<!-- SIP OPTIONS Keep Alive Maximum Tries -->
+		<item name="account.{$line}.sip.keepAlive.maxLost">3</item>
+		<!-- Subscribe for MWI -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.sip.subscribe.forMwi">No</item>
+		<!-- Use Privacy Header -->
+		<!-- Default, No, Yes -->
+		<item name="account.{$line}.sip.header.privacy">Default</item>
+		<!-- Use P-Preferred-Identity Header  -->
+		<!-- Default, No, Yes -->
+		<item name="account.{$line}.sip.header.ppi">Default</item>
+		<!-- SIP Transport -->
+		<!-- Use P-Access-Network-Info Header -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.sip.header.pani">Yes</item>
+		<!-- Use P-Emergency-Info Header -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.sip.header.pei">Yes</item>
+		<!-- Use Mac Header -->
+		<!-- No, YesForRegisterOnly, YesToAllSip -->
+		<item name="account.{$line}.sip.header.mac">No</item>
+		<!-- Add MAC in User-Agent -->
+		<!-- No, YesExceptRegister, YesToAllSip -->
+		<item name="account.{$line}.sip.useragent.mac">No</item>
+		<!-- UDP, TCP, TlsOrTcp -->
+		<item name="account.{$line}.sip.transport">{if $row.sip_transport=='tcp'}TCP{elseif $row.sip_transport=='tls'}TlsOrTcp{else}UDP{/if}</item>
+		<!-- Local SIP Port -->
+		<item name="account.{$line}.sip.localPort">{$row.sip_port}</item>
+		<!-- SIP URI Scheme When Using TLS -->
+		<!-- sip, sips -->
+		<item name="account.{$line}.sip.uriSchemeWhenUsingTls">sip</item>
+		<!-- Use Actual Ephemeral Port in Contact with TCP/TLS -->
+		<!-- No, Yes -->
+		<item name="account.{$line}.sip.useActualEphemeralPortInContactWithTcpTls">No</item>
+		<!-- Support SIP Instance ID -->
+		<!-- No, Yes -->
+		<item name="account.{$line}.sip.supportInstanceId">Yes</item>
+		<!-- SIP T1 Timeout -->
+		<!-- 0.5 sec - 0_5sec, 1 sec - 1sec, 2 sec - 2sec -->
+		<item name="account.{$line}.sip.timer.t1">0_5sec</item>
+		<!-- SIP T2 Interval -->
+		<!-- 2 sec - 2sec, 4 sec - 4sec, 8 sec - 8sec -->
+		<item name="account.{$line}.sip.timer.t2">4sec</item>
+		<!-- SIP Timer D Interval (Seconds) -->
+		<item name="account.{$line}.sip.timerd.interval">0</item>
+		<!-- Remove OBP from Route -->
+		<!-- Disable - InRoute, Enable - NotInRoute, Always - AlwaysSentTo -->
+		<item name="account.{$line}.sip.outboundProxy.mode">InRoute</item>
+		<!-- Enable 100rel -->
+		<!-- No, Yes -->
+		<item name="account.{$line}.sip.header.100rel">No</item>
+		<!-- Enable Session Timer/Session Expiration (s) -->
+		<!-- Session Timer is disabled if the value is 0 -->
+		<item name="account.{$line}.sip.sessionTimer.expiration">180</item>
+		<!-- Min-SE(s) -->
+		<item name="account.{$line}.sip.minimumSE">90</item>
+		<!-- UAC Specify Refresher -->
+		<!-- Omit, UAC, UAS -->
+		<item name="account.{$line}.sip.sessionTimer.refresher.uacSpecify">Omit</item>
+		<!-- UAS Specify Refresher -->
+		<!--UAC, UAS -->
+		<item name="account.{$line}.sip.sessionTimer.refresher.uasSpecify">UAC</item>
+		<!-- Caller Request Timer -->
+		<!-- No, Yes -->
+		<item name="account.{$line}.sip.sessionTimer.requestTimer.caller">No</item>
+		<!-- Callee Request Timer -->
+		<!-- No, Yes -->
+		<item name="account.{$line}.sip.sessionTimer.requestTimer.callee">No</item>
+		<!-- Force Timer -->
+		<!-- No, Yes -->
+		<item name="account.{$line}.sip.sessionTimer.force">No</item>
+		<!-- Force INVITE -->
+		<!-- No, Yes -->
+		<item name="account.{$line}.sip.sessionTimer.forceInvite">No</item>
+		<!-- Codec Settings -->
+		<!-- Preferred Vocoder -->
+		<!-- PCMU, PCMA, G_726_32, G_722, G_729AOrB, iLBC, OPUS -->
+		<item name="account.{$line}.codec.choice.1">PCMU</item>
+		<item name="account.{$line}.codec.choice.2">PCMA</item>
+		<item name="account.{$line}.codec.choice.3">G_726_32</item>
+		<item name="account.{$line}.codec.choice.4">G_722</item>
+		<item name="account.{$line}.codec.choice.5">G_729AOrB</item>
+		<item name="account.{$line}.codec.choice.6">iLBC</item>
+		<item name="account.{$line}.codec.choice.7">OPUS</item>
+		<!-- Codec Negotiation Priority -->
+		<!-- Caller, Callee -->
+		<item name="account.{$line}.codec.negotiatePriority">Callee</item>
+		<!-- Use First Matching Vocoder in 200OK SDP -->
+		<!-- No, Yes -->
+		<item name="account.{$line}.codec.useFirstMatch">No</item>
+		<!-- iLBC Frame Size -->
+		<!-- 20ms, 30ms -->
+		<item name="account.{$line}.codec.iLBC.frameSize">30ms</item>
+		<!-- G726-32 ITU Payload -->
+		<!-- 2 - 0, Dynamic - 1 -->
+		<item name="account.{$line}.codec.payloadType.g72632.ITU">1</item>
+		<!-- G726-32 Dynamic PT -->
+		<!-- Range: 96-126, default: 126 -->
+		<item name="account.{$line}.codec.payloadType.g72632">126</item>
+		<!-- Opus Payload Type -->
+		<item name="account.{$line}.codec.payloadType.opus">123</item>
+		<!-- DTMF -->
+		<!-- No, Yes -->
+		<item name="account.{$line}.dtmf.sendInAudio">No</item>
+		<item name="account.{$line}.dtmf.sendInRtp">Yes</item>
+		<item name="account.{$line}.dtmf.sendInSip">No</item>
+		<!-- DTMF Payload Type -->
+		<item name="account.{$line}.codec.payoadType.dtmf">101</item>
+		<!-- Jitter Buffer Type -->
+		<!-- Fixed, Adaptive -->
+		<item name="account.{$line}.audio.jitterBufferType">Adaptive</item>
+		<!-- Enable Audio RED with FEC -->
+		<!-- No, Yes -->
+		<item name="account.{$line}.audio.fec.enable">No</item>
+		<!-- Audio FEC Payload Type -->
+		<!-- Range: 96-126, default: 121 -->
+		<item name="account.{$line}.codec.payloadType.fec.audio">121</item>
+		<!-- Audio RED Payload Type -->
+		<!-- Range: 96-126, default: 124 -->
+		<item name="account.{$line}.codec.payloadType.red">124</item>
+		<!-- Silence Suppression -->
+		<!-- No, Yes -->
+		<item name="account.{$line}.audio.silenceSuppression">No</item>
+		<!-- Voice Frames Per TX -->
+		<item name="account.{$line}.audio.voiceFramePerTX">2</item>
+		<!-- Enable Video FEC -->
+		<!-- No, Yes -->
+		<item name="account.{$line}.video.fec.enable">Yes</item>
+		<!-- Enable RFC5168 Support -->
+		<!-- No, Yes -->
+		<item name="account.{$line}.codec.rfc5168.enable">No</item>
+		<!-- FEC Payload Type -->
+		<!-- Range: 96-126, default: 120 -->
+		<item name="account.{$line}.codec.payloadType.fec.video">120</item>
+		<!-- Packetization mode -->
+		<!-- SingleNALUnit, Non-Interleaved -->
+		<!-- [Note] Prefer Non-Interleaved Mode is not supported yet -->
+		<item name="account.{$line}.codec.packetizationMode">Non-Interleaved</item>
+		<!-- H.264 Image Size -->
+		<!-- 720P, 4CIF, VGA, CIF, QVGA, QCIF -->
+		<item name="account.{$line}.video.h264.imagesize">720P</item>
+		<!-- Use H.264 Constrained Profiles -->
+		<!-- No, Yes -->
+		<item name="account.{$line}.codec.h264.CBP.enable">No</item>
+		<!-- H.264 Profile Type -->
+		<!-- Baseline, Main, High, BP&amp;MP&amp;HP -->
+		<item name="account.{$line}.codec.H264ProfileType">BP&amp;MP&amp;HP</item>
+		<!-- Video Bit Rate -->
+		<!-- 32 - 32 kbps, 64 - 64 kbps, 96 - 96 kbps, 128 - 128 kbps, 160 - 160 kbps, 192 - 192 kbps -->
+		<!-- # 210 - 210 kbps, 256 - 256 kbps, 384 - 384 kbps, 512 - 512 kbps, 640 - 640 kbps, 768 - 768 kbps -->
+		<!-- # 1024 - 1024 kbps, 1280 - 1280 kbps, 1536 - 1536 kbps, 2048 - 2048 kbps. -->
+		<item name="account.{$line}.video.bitRate">2048</item>
+		<!-- SDP Bandwidth Attribute -->
+		<!-- Standard, MediaLevel, SessionLevel, None -->
+		<item name="account.{$line}.codec.SDPBandwidthAttr">MediaLevel</item>
+		<!-- H.264 Payload Type -->
+		<!-- Range: 96-126, default: 99 -->
+		<item name="account.{$line}.codec.payloadType.h264">99</item>
+		<!-- Disable BFCP -->
+		<!-- No, Yes -->
+		<item name="account.{$line}.presentation.BFCP.enable">Yes</item>
+		<!-- Presentation H.264 Image Size -->
+		<!-- 1080P, 720P -->
+		<item name="account.{$line}.presentation.h264.imagesize">1080P</item>
+		<!-- Presentation H.264 Profile Type -->
+		<!-- Baseline, Main, High, BP&amp;MP&amp;HP -->
+		<item name="account.{$line}.presentation.H264ProfileType">BP&amp;MP&amp;HP</item>
+		<!-- Presentation Video Bit Rate -->
+		<!-- 32 - 32 kbps, 64 - 64 kbps, 96 - 96 kbps, 128 - 128 kbps, 160 - 160 kbps, 192 - 192 kbps -->
+		<!-- # 210 - 210 kbps, 256 - 256 kbps, 384 - 384 kbps, 512 - 512 kbps, 640 - 640 kbps, 768 - 768 kbps -->
+		<!-- # 1024 - 1024 kbps, 1280 - 1280 kbps, 1536 - 1536 kbps, 2048 - 2048 kbps. -->
+		<item name="account.{$line}.presentation.bitRate">1024</item>
+		<!-- Presentation Video Frame Rate -->
+		<!-- 5, 10, 15 -->
+		<item name="account.{$line}.presentation.frameRate">15</item>
+		<!-- BFCP Transport Protocol -->
+		<!-- Automatic, UDP, TCP -->
+		<item name="account.{$line}.presentation.BFCP.transportProtocol">UDP</item>
+		<!-- SRTP Mode -->
+		<!-- Disabled, EnabledButNotForced, EnabledAndForced -->
+		<item name="account.{$line}.audio.srtpMode">Disabled</item>
+		<!-- SRTP Key Length -->
+		<!-- AES128And256Bit, AES128Bit, AES256Bit -->
+		<item name="account.{$line}.audio.srtpKeyLength">AES128And256Bit</item>
+		<!-- Enable SRTP Key Life Time -->
+		<!-- No, Yes -->
+		<item name="account.{$line}.audio.cryptoLifeTime">Yes</item>
+		<!-- RTCP Destination -->
+		<item name="account.{$line}.rtcp.destination"></item>
+		<!-- Symmetric RTP -->
+		<!-- No, Yes -->
+		<item name="account.{$line}.audio.symmetricRTP">No</item>
+		<!-- RTP IP Filter -->
+		<!-- Disable, IPOnly, IPandPort -->
+		<item name="account.{$line}.rtp.filter">Disable</item>
+		<!-- RTP Timeout (s) -->
+		<!-- Range: 0 - 600 -->
+		<item name="account.{$line}.rtp.timeout">0</item>
+		<!-- Call Settings -->
+		<!-- Enable Video Call -->
+		<!-- Default, No, Yes -->
+		<item name="account.{$line}.call.video.enable">Default</item>
+		<!-- Start Video Automatically -->
+		<!-- No, Yes -->
+		<item name="account.{$line}.video.startAuto.enable">Yes</item>
+		<!-- Remote Video Request -->
+		<!-- Prompt, Accept, Deny -->
+		<item name="account.{$line}.video.request">Prompt</item>
+		<!-- Video Layout -->
+		<!-- Default, Fullscreen, EqualSplitScreen, OnlyRemoteScreen -->
+		<item name="account.1.video.layout">Default</item>
+		<!-- Auto Answer -->
+		<!-- No, Yes, EnableIntercom/Paging -->
+		<item name="account.{$line}.call.autoAnswer">No</item>
+		<!-- Play Warning Tone for Auto Answer Intercom  -->
+		<!-- No, Yes -->
+		<item name="account.{$line}.intercom.playWarningToneForAutoAnswer">Yes</item>
+		<!-- Intercom Barging -->
+		<!-- No, Yes -->
+		<item name="account.{$line}.intercom.allowBargingByCallInfo">No</item>
+		<!-- Auto Preview -->
+		<!-- No, Yes, YeswithRinging -->
+		<item name="account.{$line}.call.autoPreview">Yes</item>
+		<!-- Send Anonymous -->
+		<!-- No, Yes -->
+		<item name="account.{$line}.call.sendAnonymous">No</item>
+		<!-- Anonymous Call Rejection -->
+		<!-- No, Yes -->
+		<item name="account.{$line}.call.rejectAnonymousCall">No</item>
+		<!-- Call Log -->
+		<!-- All, IncomingAndOutgoing, Disable, DonotPromptMissedCall -->
+		<item name="account.{$line}.call.callLog">All</item>
+		<!-- Enable Call Features -->
+		<!-- No, Yes -->
+		<item name="account.{$line}.featureCodes.callFeatures">No</item>
+		<!-- Enable Call Waiting -->
+		<!-- Default, No, Yes -->
+		<item name="account.{$line}.call.callWaiting">Default</item>
+		<!-- Mute on Answer Intercom Call -->
+		<!-- No, Yes -->		
+		<item name="account.{$line}.intercom.muteOnAnswerIntercom">No</item>
+		<!-- Transfer on 3 Way Conference Hangup -->
+		<!-- No, Yes -->
+		<item name="account.{$line}.call.transferOnConferenceHangup">No</item>
+		<!-- Use # as Dial Key  -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.call.keyAsSend">Yes</item>
+		<!-- Use # as Redial Key  -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.call.poundAsRedial.enable">Yes</item>
+		<!-- DND Call Feature On -->
+		<item name="account.{$line}.featureCodes.dndOn"></item>
+		<!-- DND Call Feature Off  -->
+		<item name="account.{$line}.featureCodes.dndOff"></item>
+		<!-- No Key Entry Timeout (s) -->
+		<!-- Number: 4 - 15 -->
+		<item name="account.{$line}.call.noKeyEntryTimeout">4</item>
+		<!-- Ring Timeout -->
+		<!-- Number: 10 - 300 -->
+		<item name="account.{$line}.ring.timeout">60</item>
+		<!-- Refer-To Use Target Contact -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.call.referToUseTargetContact">No</item>
+		<!-- RFC2543 Hold -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.sip.rfc2543Hold">Yes</item>
+		<!-- Dial Plan Prefix -->
+		<item name="account.{$line}.call.dialplanPrefix"></item>
+		<!-- Disable DialPlan -->
+		<!-- # Disable DialPlan. 0 - No Selection, 1 - Dial Page, 2 - Contact, 4 - Incoming Call History, 8 -  Outgoing Call History, 16 - MPK & Click2Dial.  -->
+		<!-- # If need to check multiple selections, add the specific values for each selections together. Default value is 0 -->
+		<item name="account.{$line}.call.dialplan.disableMode">0</item>
+		<!-- DialPlan -->
+		<item name="account.{$line}.call.dialplan">{$grandstream_dial_plan}</item>
+		<!-- Caller ID Display -->
+		<!-- Auto, Disabled, Header, PAIHeader -->
+		<!-- [Note] PAI Header is not supported yet -->
+		<item name="account.{$line}.sip.callerIdDisplay">Auto</item>
+		<!-- Account Ring Tone -->
+		<item name="account.{$line}.ring.ringtone">content://settings/system/ringtone</item>
+		<!-- Ignore Alert-Info Header -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.ring.ignoreSipAlertInfo">No</item>
+		<!-- Match Incoming Caller ID -->
+		<item name="account.{$line}.ring.match.1.callerId"></item>
+		<!-- Distinctive Ring Tone -->
+		<item name="account.{$line}.ring.match.1.ringtone">content://settings/system/ringtone</item>
+		<!-- Match Incoming Caller ID -->
+		<item name="account.{$line}.ring.match.2.callerId"></item>
+		<!-- Distinctive Ring Tone -->
+		<item name="account.{$line}.ring.match.2.ringtone">content://settings/system/ringtone</item>
+		<!-- Match Incoming Caller ID -->
+		<item name="account.{$line}.ring.match.3.callerId"></item>
+		<!-- Distinctive Ring Tone -->
+		<item name="account.{$line}.ring.match.3.ringtone">content://settings/system/ringtone</item>
+		<!-- Match Incoming Caller ID -->
+		<item name="account.{$line}.ring.match.4.callerId"></item>
+		<!-- Distinctive Ring Tone -->
+		<item name="account.{$line}.ring.match.4.ringtone">content://settings/system/ringtone</item>
+		<!-- Match Incoming Caller ID -->
+		<item name="account.{$line}.ring.match.5.callerId"></item>
+		<!-- Distinctive Ring Tone -->
+		<item name="account.{$line}.ring.match.5.ringtone">content://settings/system/ringtone</item>
+		<!-- Match Incoming Caller ID -->
+		<item name="account.{$line}.ring.match.6.callerId"></item>
+		<!-- Distinctive Ring Tone -->
+		<item name="account.{$line}.ring.match.6.ringtone">content://settings/system/ringtone</item>
+		<!-- Match Incoming Caller ID -->
+		<item name="account.{$line}.ring.match.7.callerId"></item>
+		<!-- Distinctive Ring Tone -->
+		<item name="account.{$line}.ring.match.7.ringtone">content://settings/system/ringtone</item>
+		<!-- Match Incoming Caller ID -->
+		<item name="account.{$line}.ring.match.8.callerId"></item>
+		<!-- Distinctive Ring Tone -->
+		<item name="account.{$line}.ring.match.8.ringtone">content://settings/system/ringtone</item>
+		<!-- Match Incoming Caller ID -->
+		<item name="account.{$line}.ring.match.9.callerId"></item>
+		<!-- Distinctive Ring Tone -->
+		<item name="account.{$line}.ring.match.9.ringtone">content://settings/system/ringtone</item>
+		<!-- Match Incoming Caller ID -->
+		<item name="account.{$line}.ring.match.10.callerId"></item>
+		<!-- Distinctive Ring Tone -->
+		<item name="account.1{$line}.ring.match.10.ringtone">content://settings/system/ringtone</item>
+		<!-- ############Ring Tone Value Table###############
+				# Web GUI Option                            Value
+				# Use System Ring tone                      content://settings/system/ringtone 
+				# Andromeda					/system/media/audio/ringtones/ANDROMEDA.ogg
+				# Aquila					/system/media/audio/ringtones/Aquila.ogg
+				# Argo Navis					/system/media/audio/ringtones/ArgoNavis.ogg
+				# Atria					/system/media/audio/ringtones/Atria.ogg
+				# Backroad					/system/media/audio/ringtones/Backroad.ogg
+				# Beat Plucker					/system/media/audio/ringtones/BeatPlucker.ogg
+				# Bell Phone					/system/media/audio/ringtones/Ring_Classic_02.ogg
+				# Bentley Dubs					/system/media/audio/ringtones/BentleyDubs.ogg
+				# Big Easy					/system/media/audio/ringtones/Big_Easy.ogg
+				# Bird Loop					/system/media/audio/ringtones/BirdLoop.ogg
+				# Bollywood					/system/media/audio/ringtones/Bollywood.ogg
+				# Boötes					/system/media/audio/ringtones/BOOTES.ogg
+				# Bus' a Move					/system/media/audio/ringtones/BussaMove.ogg
+				# Cairo					/system/media/audio/ringtones/Cairo.ogg
+				# Calypso Steel					/system/media/audio/ringtones/Calypso_Steel.ogg
+				# Canis Major					/system/media/audio/ringtones/CANISMAJOR.ogg
+				# Caribbean Ice					/system/media/audio/ringtones/CaribbeanIce.ogg
+				# Carina					/system/media/audio/ringtones/Carina.ogg
+				# Cassiopeia					/system/media/audio/ringtones/CASSIOPEIA.ogg
+				# Centaurus					/system/media/audio/ringtones/Centaurus.ogg
+				# Champagne Edition					/system/media/audio/ringtones/Champagne_Edition.ogg
+				# Chimey Phone					/system/media/audio/ringtones/Ring_Synth_02.ogg
+				# Club Cubano					/system/media/audio/ringtones/Club_Cubano.ogg
+				# Crayon Rock					/system/media/audio/ringtones/CrayonRock.ogg
+				# Crazy Dream					/system/media/audio/ringtones/CrazyDream.ogg
+				# Curve Ball Blend					/system/media/audio/ringtones/CurveBall.ogg
+				# Cygnus					/system/media/audio/ringtones/Cygnus.ogg
+				# Dancin' Fool					/system/media/audio/ringtones/DancinFool.ogg
+				# Digital Phone					/system/media/audio/ringtones/Ring_Digital_02.ogg
+				# Ding					/system/media/audio/ringtones/Ding.ogg
+				# DingDong					/system/media/audio/ringtones/DingDong.wav
+				# Don' Mess Wiv It					/system/media/audio/ringtones/DonMessWivIt.ogg
+				# Draco					/system/media/audio/ringtones/Draco.ogg
+				# Dream Theme					/system/media/audio/ringtones/DreamTheme.ogg
+				# Eastern Sky					/system/media/audio/ringtones/Eastern_Sky.ogg
+				# Enter the Nexus					/system/media/audio/ringtones/Enter_the_Nexus.ogg
+				# Eridani					/system/media/audio/ringtones/Eridani.ogg
+				# Ether Shake					/system/media/audio/ringtones/EtherShake.ogg
+				# Flutey Phone					/system/media/audio/ringtones/Ring_Synth_04.ogg
+				# Free Flight					/system/media/audio/ringtones/FreeFlight.ogg
+				# Friendly Ghost					/system/media/audio/ringtones/FriendlyGhost.ogg
+				# Funk Y'all					/system/media/audio/ringtones/Funk_Yall.ogg
+				# Game Over Guitar					/system/media/audio/ringtones/GameOverGuitar.ogg
+				# Gimme Mo' Town					/system/media/audio/ringtones/Gimme_Mo_Town.ogg
+				# Girtab					/system/media/audio/ringtones/Girtab.ogg
+				# Glacial Groove					/system/media/audio/ringtones/Glacial_Groove.ogg
+				# Growl					/system/media/audio/ringtones/Growl.ogg
+				# Halfway Home					/system/media/audio/ringtones/HalfwayHome.ogg
+				# Hydra					/system/media/audio/ringtones/Hydra.ogg
+				# Insert Coin					/system/media/audio/ringtones/InsertCoin.ogg
+				# Kuma					/system/media/audio/ringtones/Kuma.ogg
+				# Loopy Lounge					/system/media/audio/ringtones/LoopyLounge.ogg
+				# Love Flute					/system/media/audio/ringtones/LoveFlute.ogg
+				# Lyra					/system/media/audio/ringtones/Lyra.ogg
+				# Machina					/system/media/audio/ringtones/Machina.ogg
+				# Medieval Jaunt					/system/media/audio/ringtones/MidEvilJaunt.ogg
+				# Mildly Alarming					/system/media/audio/ringtones/MildlyAlarming.ogg
+				# Nairobi					/system/media/audio/ringtones/Nairobi.ogg
+				# Nassau					/system/media/audio/ringtones/Nassau.ogg
+				# New Player					/system/media/audio/ringtones/NewPlayer.ogg
+				# No Limits					/system/media/audio/ringtones/No_Limits.ogg
+				# Noisey One					/system/media/audio/ringtones/Noises1.ogg
+				# Organ Dub					/system/media/audio/ringtones/OrganDub.ogg
+				# Orion					/system/media/audio/ringtones/Orion.ogg
+				# Paradise Island					/system/media/audio/ringtones/Paradise_Island.ogg
+				# Pegasus					/system/media/audio/ringtones/Pegasus.ogg
+				# Perseus					/system/media/audio/ringtones/PERSEUS.ogg
+				# Playa					/system/media/audio/ringtones/Playa.ogg
+				# Pyxis					/system/media/audio/ringtones/Pyxis.ogg
+				# Rasalas					/system/media/audio/ringtones/Rasalas.ogg
+				# Revelation					/system/media/audio/ringtones/Revelation.ogg
+				# Rigel					/system/media/audio/ringtones/Rigel.ogg
+				# Road Trip					/system/media/audio/ringtones/Road_Trip.ogg
+				# Romancing The Tone					/system/media/audio/ringtones/RomancingTheTone.ogg
+				# Safari					/system/media/audio/ringtones/Safari.ogg
+				# Savannah					/system/media/audio/ringtones/Savannah.ogg
+				# Scarabaeus					/system/media/audio/ringtones/Scarabaeus.ogg
+				# Sceptrum					/system/media/audio/ringtones/Sceptrum.ogg
+				# Seville					/system/media/audio/ringtones/Seville.ogg
+				# She's All That					/system/media/audio/ringtones/Shes_All_That.ogg
+				# Silky Way					/system/media/audio/ringtones/SilkyWay.ogg
+				# Sitar Versus Sitar					/system/media/audio/ringtones/SitarVsSitar.ogg
+				# Solarium					/system/media/audio/ringtones/Solarium.ogg
+				# Springy Jalopy					/system/media/audio/ringtones/SpringyJalopy.ogg
+				# Steppin' Out					/system/media/audio/ringtones/Steppin_Out.ogg
+				# Terminated					/system/media/audio/ringtones/Terminated.ogg
+				# Terrible Twos					/system/media/audio/ringtones/Noises2.ogg
+				# Testudo					/system/media/audio/ringtones/Testudo.ogg
+				# Themos					/system/media/audio/ringtones/Themos.ogg
+				# Third Eye					/system/media/audio/ringtones/Third_Eye.ogg
+				# Thriller Three					/system/media/audio/ringtones/Noises3.ogg
+				# Thunderfoot					/system/media/audio/ringtones/Thunderfoot.ogg
+				# Twirl Away					/system/media/audio/ringtones/TwirlAway.ogg
+				# Ursa Minor					/system/media/audio/ringtones/URSAMINOR.ogg
+				# UrsaMinor					/system/media/audio/ringtones/UrsaMinor.ogg
+				# Very Alarmed					/system/media/audio/ringtones/VeryAlarmed.ogg
+				# Vespa					/system/media/audio/ringtones/Vespa.ogg
+				# World					/system/media/audio/ringtones/World.ogg
+				# Zeta					/system/media/audio/ringtones/Zeta.ogg
+				# bellcore-dr1					/system/media/audio/ringtones/bellcore-dr1.ogg
+				# bellcore-dr2					/system/media/audio/ringtones/bellcore-dr2.ogg
+				# bellcore-dr3					/system/media/audio/ringtones/bellcore-dr3.ogg
+				# bellcore-dr4					/system/media/audio/ringtones/bellcore-dr4.ogg
+				# bellcore-dr5					/system/media/audio/ringtones/bellcore-dr5.ogg
+				# speaker					/system/media/audio/ringtones/speaker.wav -->
+		<!-- Account Advanced Settings -->
+		<!-- Check Domain Certificates		 -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.sip.validate.domainCertificates">No</item>
+		<!-- Validate Certification Chain 	 -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.sip.validate.certificationChain">No</item>
+		<!-- Validate Incoming SIP Messages -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.sip.validate.incomingMessage">No</item>
+		<!-- Allow Unsolicited REFER -->
+		<!-- Disabled, Enabled, EnabledOrForceAuth -->
+		<item name="account.{$line}.sip.allowUnsolicitedRefer">Disabled</item>
+		<!-- Only Accept SIP Requests from Known Servers -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.sip.validate.incomingServer">No</item>
+		<!-- Check SIP User ID for Incoming INVITE  -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.sip.validate.userIdforInvite">No</item>
+		<!-- Allow SIP Reset  -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.sip.allowSipReset">No</item>
+		<!-- Authenticate Incoming INVITE -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.sip.authenticateIncomingInvite">No</item>
+		<!-- SIP Realm Used for Challenge INVITE & NOTIFY -->
+		<item name="account.{$line}.sipRealmForChallengeINVITE"></item>
+		<!-- Enable Local MOH -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.call.moh.enable">No</item>
+		<!-- Virtual Account Group -->
+		<!-- -1 - Default, 0 - 15 - Virtual Account Group 1 - 16 -->
+		<item name="account.{$line}.virtualGroup">-1</item>
+		<!-- Special Feature -->
+		<!-- 100 - Standard, 102 - Broadsoft, 113 - China Mobile, 114 - ZTE IMS, 115 - Mobotix, 116 - ZTE NGN, 117 - Huawei IMS, 123 - NEC, 125 - Worldstone -->
+		<item name="account.{$line}.sip.specialFeature">100</item>
+		<!-- Allow Sync Phonebook via SIP Notify -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.sip.notify.phonebook">Yes</item>
+		{/for}
+		<!-- Phone Settings - General Settings -->
+		<!-- Local RTP Port -->
+		<!-- Number: 50040 - 65535 -->
+		<item name="network.rtp.local.port">50040</item>
+		<!-- Use Random Port -->
+		<!-- Yes, No -->
+		<item name="network.rtp.useRandomPort">No</item>
+		<!-- Disable In-call DTMF Display -->
+		<!-- Yes, No -->
+		<item name="call.display.dtmfInCall">Yes</item>
+		<!-- Enable Enterprise Contacts Timeout Auto Search -->
+		<!-- Yes, No -->
+		<item name="call.general.enterpriseContactsSearch">Yes</item>
+		<!-- Keep-alive Interval (s) -->
+		<!-- Number: 10 - 160 -->
+		<item name="sip.keepAliveInterval">20</item>
+		<!-- STUN Server -->
+		<item name="network.stunServer">stun.ipvideotalk.com</item>
+		<!-- TURN Server Username -->
+		<item name="network.stunUsername"></item>
+		<!-- TURN Server Password -->
+		<item name="network.stunPassword"></item>
+		<!-- Use NAT IP -->
+		<item name="sip.userNatIp"></item>
+		<!-- Phone Settings - Call Settings -->
+		<!-- Enable Video Call Feature -->
+		<!-- Yes - unchecked, No - checked -->
+		<item name="call.video.enable">Yes</item>
+		<!-- Use Direct IP Call Mode -->
+		<!-- Yes - unchecked, No - checked -->
+		<item name="call.ipcall.allowDirectDialing">Yes</item>
+		<!-- Use Paging Call Mode -->
+		<!-- Yes - unchecked, No - checked -->
+		<item name="call.pagingcall.enable">Yes</item>
+		<!-- Enable Call-Waiting -->
+		<!-- Yes - unchecked, No - checked -->
+		<item name="call.callWaiting.enable">Yes</item>
+		<!-- Enable Call-Waiting Tone -->
+		<!-- Yes - unchecked, No - checked -->
+		<item name="call.callWaiting.enableTone">Yes</item>
+		<!-- Enable DND Reminder Ring -->
+		<!-- Yes - unchecked, No - checked -->
+		<item name="call.dnd.reminder.enable">Yes</item>
+		<!-- Enable Transfer -->
+		<!-- Yes - unchecked, No - checked -->
+		<item name="call.transfer.enable">Yes</item>
+		<!-- Hold Call Before Completing Transfer -->
+		<item name="call.holdBeforeTransfer">Yes</item>
+		<!-- Default Transfer Mode -->
+		<!-- BlindTransfer, AttendedTransfer, AttendedTransferOnly -->
+		<item name="call.transfer.mode">BlindTransfer</item>
+		<!-- Enable transfer via non-Transfer Programmable Key.-->
+		<!-- Yes, No (default) -->
+		<item name="call.transfer.viampk.enable">No</item>
+		<!-- Enable Function for Incoming Call -->
+		<!-- None, Preview, CallTransfer -->
+		<item name="call.incomingcall.function">None</item>
+		<!-- Enable Conference -->
+		<!-- Yes - unchecked, No - checked -->
+		<item name="call.conference.enable">Yes</item>
+		<!-- Auto Conference -->
+		<!-- No, Yes -->
+		<item name="call.autoConf.enable">No</item>
+		<!-- Attended Conference -->
+		<!-- No, Yes -->
+		<item name="call.attendedconf.enable">No</item>
+		<!-- Auto Mute on Entry -->
+		<!-- Disable, Incoming, Outgoing, IncomingOutgoing -->
+		<item name="call.automute.mode">Disable</item>
+		<!-- Always Ring Speaker -->
+		<!-- Yes, No -->
+		<item name="audio.alwaysRingSpeaker">No</item>
+		<!-- Offhook Auto Dial -->
+		<item name="call.dial.offhook.autoDial.number"></item>
+		<!-- Offhook Auto Dial Delay (s) -->
+		<item name="call.dial.offhook.autoDial.delay"></item>
+		<!-- Offhook/Onhook Timeout (s) -->
+		<item name="call.dial.offhook.timeout">30</item>
+		<!-- Handset Option -->
+		<!-- Enable, Disable, Auto (default) -->
+		<item name="call.dial.offhook.timeout">Auto</item>
+		<!-- Auto Unhold When Pressing the Line Key -->
+		<!-- No, Yes -->
+		<item name="call.autoUnhold.enable">No</item>
+		<!-- Virtual Account Group Avaya Mode -->
+		<!-- No, Yes -->
+		<item name="call.virtualgroup.avayamode.enable">No</item>
+		<!-- Number Of Accounts The Virtual Account Group Register -->
+		<!-- Range: 1 - 4 -->
+		<item name="call.virtualgroup.mainregister.number">2</item>
+		<!-- Filter Characters -->
+		<item name="call.filter.character">[()- ]</item>
+		<!-- Escape '#' as %23 in SIP URI -->
+		<!-- No, Yes -->
+		<item name="sip.escapeUrl">No</item>
+		<!-- 3rd Party App Package Name issue -->
+		<item name="call.thirddialer.packagename"></item>
+		<!-- Record Mode -->
+		<!-- Local, PortaOne, UCM, BroadSoft -->
+		<item name="call.recording.local.enable">Local</item>
+		<!-- Enable Auto Record When Call Established -->
+		<!-- Yes, No -->
+		<item name="call.autoRecording.enable">No</item>
+		<!-- Rejected Call Notification -->
+		<!-- Yes, No -->
+		<item name="features.history.missedCallNotification">Yes</item>
+		<!-- Group Listen with Speaker -->
+		<!-- Yes, No -->
+		<item name="call.grouplistenwithspeaker.enable">No</item>
+		<!-- Phone Settings - Ring Tone -->
+		<!-- Auto Config CPT by Region -->
+		<!-- No, Yes -->
+		<item name="audio.tone.autoCPTbyRegion">No</item>
+		<!-- Dial Tone -->
+		<item name="audio.tone.dial">f1=350,f2=440,c=0/0;</item>
+		<!-- Second Dial Tone -->
+		<item name="audio.tone.secondDial">f1=350,f2=440,c=0/0;</item>
+		<!-- Ring Back Tone -->
+		<item name="audio.tone.ringBack">f1=440,f2=480,c=2000/4000;</item>
+		<!-- Busy Tone -->
+		<item name="audio.tone.busy">f1=480,f2=620,c=500/500;</item>
+		<!-- Reorder Tone -->
+		<item name="audio.tone.reorder">f1=480,f2=620,c=250/250;</item>
+		<!-- Confirmation Tone -->
+		<item name="audio.tone.confirmation">f1=350,f2=440,c=100/100-100/100-100/100;</item>
+		<!-- Call-Waiting Tone -->
+		<item name="audio.tone.callWaiting">f1=440,c=300/2000-300/2000-0/0;</item>
+		<!-- Call-Waiting Tone Gain -->
+		<!-- Low, Medium, High -->
+		<item name="audio.tone.callWaiting.gain">Low</item>
+		<!-- Default Ring Cadence -->
+		<item name="audio.tone.defaultRingCadence">c=2000/4000;</item>
+		<!-- Phone Settings - Video Settings -->
+		<!-- Video Frame Rate -->
+		<!-- 5, 15, 25, 30 -->
+		<item name="video.frameRate">15</item>
+		<!-- Video Display Mode -->
+		<!-- OriginalProportion, EqualProportionalCutting, ProportionalAddBlackEdge -->
+		<item name="video.displayMode">EqualProportionalCutting</item>
+		<!-- Enable Frame Skipping in Video Decoder -->
+		<!-- Yes, No -->
+		<item name="video.frameSkipping.enable">Yes</item>
+		<!-- Phone Settings - Multicast Paging - Multicast Paging -->
+		<!-- Paging Barge -->
+		<!-- Disable-0, priority1-1, priority2-2, priority3-3, priority4-4, priority5-5, priority6-6, priority7-7, priority8-8, priority9-9, priority10-10 -->
+		<item name="multicast.paginBarge">Disable</item>
+		<!-- Paging Priority Active -->
+		<!-- Yes, No -->
+		<item name="multicast.pagingPriorityActive">No</item>
+		<!-- Multicast Paging Codec -->
+		<!-- PCMU, PCMA, G_726_32, G_722, G_729AOrB, iLBC, OPUS -->
+		<item name="multicast.multicastPagingCodec">PCMU</item>
+		<!-- Enable Multicast Paging Video -->
+		<!-- No, Yes -->
+		<item name="multicast.multicastPagingVideo.enable">No</item>
+		<!-- Multicast Paging Video Codec -->
+		<!-- H.264 - H264 -->
+		<item name="multicast.multicastPagingVideo.codec">H264</item>
+		<!-- Multicast Paging Image Size -->
+		<!-- VGA, QVGA, 4CIF, CIF, QCIF, 720P -->
+		<item name="multicast.multicastPagingImageSize">VGA</item>
+		<!-- Multicast Paging Video Bit Rate -->
+		<!-- 32 - 32kbps, 64 - 64kbps, 96 - 96kbps, 128 - 128kbps, 160 - 160kbps -->
+		<!--  192 - 192kbps, 210 - 210kbps, 256 - 256kbps, 384 - 384kbps, 512 - 512kbps,  640 - 640kbps, 768 - 768kbps -->
+		<!--  1024 - 1024kbps, 1280 - 1280kbps, 1536 - 1536kbps, 2048 - 2048kbps. Default Value is 256 -->
+		<item name="multicast.multicastPagingVideoBitRate">256</item>
+		<!-- Multicast Paging Video Frame Rate -->
+		<!-- 15, 25, 30, Variable frame rate - 29 -->
+		<item name="multicast.multicastPagingVideoFrameRate">15</item>
+		<!-- Multicast Paging H.264 Profile Type -->
+		<!-- Baseline, Main, High -->
+		<item name="multicast.multicastPagingH264ProfileType">Baseline</item>
+		<!-- Multicast Paging H.264 Payload Type -->
+		<!-- Range: 96-127, Default: 99 -->
+		<item name="multicast.multicastPagingH264PayloadType">99</item>
+		<!-- Phone Settings - Multicast Paging - Multicast Listening -->
+		<item name="multicast.listening.1.address"></item>
+		<item name="multicast.listening.1.label"></item>
+		<item name="multicast.listening.2.address"></item>
+		<item name="multicast.listening.2.label"></item>
+		<item name="multicast.listening.3.address"></item>
+		<item name="multicast.listening.3.label"></item>
+		<item name="multicast.listening.4.address"></item>
+		<item name="multicast.listening.4.label"></item>
+		<item name="multicast.listening.5.address"></item>
+		<item name="multicast.listening.5.label"></item>
+		<item name="multicast.listening.6.address"></item>
+		<item name="multicast.listening.6.label"></item>
+		<item name="multicast.listening.7.address"></item>
+		<item name="multicast.listening.7.label"></item>
+		<item name="multicast.listening.8.address"></item>
+		<item name="multicast.listening.8.label"></item>
+		<item name="multicast.listening.9.address"></item>
+		<item name="multicast.listening.9.label"></item>
+		<item name="multicast.listening.10.address"></item>
+		<item name="multicast.listening.10.label"></item>
+
+		<!-- Ethernet Settings -->
+		<!-- Preferred Internet Protocol -->
+		<!-- BothAndPreferIPv4, BothAndPreferIPv6, IPv4Only, IPv6Only -->
+		<item name="network.internetProtocol">BothAndPreferIPv4</item>
+		<!-- Different Networks for Data and VoIP Calls -->
+		<!-- No, Yes -->
+		<item name="network.diffnetwork.voip.enable">No</item>
+		<!-- IPv4 Address Type -->
+		<!-- DHCP, StaticIP, PPPoE -->
+		<item name="network.port.eth.1.type">DHCP</item>
+		<!-- DHCP VLAN Override -->
+		<!-- Disable, DHCPOption132and133, EncapsulatedinDHCPOption43 -->
+		<item name="network.dhcp.enableVlan">Disable</item>
+		<!-- Host Name(Option 12) -->
+		<item name="network.dhcp.hostName"></item>
+		<!-- Vendor Class ID(Option 60) -->
+		<item name="network.dhcp.vendorID"></item>
+		<!-- IP Address -->
+		<item name="network.port.eth.1.address.1">0</item>
+		<item name="network.port.eth.1.address.2">0</item>
+		<item name="network.port.eth.1.address.3">0</item>
+		<item name="network.port.eth.1.address.4">0</item>
+		<!-- Subnet Mask -->
+		<item name="network.port.eth.1.mask.1">0</item>
+		<item name="network.port.eth.1.mask.2">0</item>
+		<item name="network.port.eth.1.mask.3">0</item>
+		<item name="network.port.eth.1.mask.4">0</item>
+		<!-- Default Gateway -->
+		<item name="network.port.eth.1.gateway.1">0</item>
+		<item name="network.port.eth.1.gateway.2">0</item>
+		<item name="network.port.eth.1.gateway.3">0</item>
+		<item name="network.port.eth.1.gateway.4">0</item>
+		<!-- DNS Server 1 -->
+		<item name="network.dns.1.ip.1">0</item>
+		<item name="network.dns.1.ip.2">0</item>
+		<item name="network.dns.1.ip.3">0</item>
+		<item name="network.dns.1.ip.4">0</item>
+		<!-- DNS Server 2 -->
+		<item name="network.dns.2.ip.1">0</item>
+		<item name="network.dns.2.ip.2">0</item>
+		<item name="network.dns.2.ip.3">0</item>
+		<item name="network.dns.2.ip.4">0</item>
+		<!-- PPPoE Account ID -->
+		<item name="network.port.eth.1.pppoe.account"></item>
+		<!-- PPPoE Password -->
+		<item name="network.port.eth.1.pppoe.password"></item>
+		<!-- Layer 2 QoS 802.1Q/VLAN Tag (Ethernet) -->
+		<!-- Number: 0 - 4095 -->
+		<item name="network.port.eth.1.vlan.tag">0</item>
+		<!-- Layer 2 QoS 802.1p Priority Value (Ethernet) -->
+		<!-- Number: 0 - 7 -->
+		<item name="network.port.eth.1.vlan.priorit">0</item>
+		<!-- IPv6 Address  -->
+		<!-- AutoConfigured, StaticallyConfigured -->
+		<item name="network.port.eth.1.ipv6.type">AutoConfigured</item>
+		<!-- Static IPv6 Address -->
+		<item name="network.port.eth.1.ipv6.static.address"></item>
+		<!-- IPv6 Prefix Length -->
+		<item name="network.port.eth.1.ipv6.static.prefixLength">64</item>
+		<!-- DNS Server 1 -->
+		<item name="network.dns.1.ipv6"></item>
+		<!-- DNS Server 2 -->
+		<item name="network.dns.2.ipv6"></item>
+		<!-- Preferred IPv6 DNS Server -->
+		<item name="network.dns.preferred.ipv6"></item>
+
+		<!-- Network Configuration of VoIP Calls -->
+		<!-- IPv4 Address Type -->
+		<!-- DHCP, StaticIP -->
+		<item name="network.voip.ipv4.type">DHCP</item>
+		<!-- IP Address -->
+		<item name="network.voip.ipv4.static.address"></item>
+		<!-- Subnet Mask -->
+		<item name="network.voip.ipv4.static.mask"></item>
+		<!-- Default Gateway -->
+		<item name="network.voip.ipv4.static.gateway"></item>
+		<!-- DNS Server 1 -->
+		<item name="network.voip.ipv4.static.dns1"></item>
+		<!-- DNS Server 2 -->
+		<item name="network.voip.ipv4.static.dns2"></item>
+		<!-- Layer 2 QoS 802.1Q/VLAN Tag (Ethernet) for VoIP Calls -->
+		<item name="network.voip.vlan.tag"></item>
+		<!-- Layer 2 QoS 802.1p Priority Value (Ethernet) for VoIP Calls -->
+		<item name="network.voip.vlan.priority"></item>
+		<!-- IPv6 Address Type -->
+		<!-- AutoConfigured, StaticallyConfigured -->
+		<item name="network.voip.ipv6.type">AutoConfigured</item>
+		<!-- IP Address -->
+		<item name="network.voip.ipv6.static.address"></item>
+		<!-- Subnet Mask -->
+		<item name="network.voip.ipv6.static.prefixLength"></item>
+		<!-- 802.1x Mode -->
+		<!-- Disable, EAP_MD5, EAP_TLS, EAP_PEAPv0OrMSCHAPv2 -->
+		<item name="network.802.1x.mode">Disable</item>
+		<!-- 802.1x Identity -->
+		<item name="network.802.1x.identity"></item>
+		<!-- 802.1x Secret -->
+		<item name="network.md5Password"></item>
+		<!-- CA Certificate -->
+		<item name="network.802.1x.cert.root"></item>
+		<!-- Client Certificate -->
+		<item name="network.802.1x.cert.client"></item>
+		<!-- Wi-Fi Settings -->
+		<!-- Wi-Fi Function -->
+		{if isset($grandstream_wifi_enable)}
+		<!-- No, Yes -->
+		<item name="wifi.enable">{if filter_var($grandstream_wifi_enable, FILTER_VALIDATE_BOOLEAN)}Yes{else}No{/if}</item>
+		<!-- Wi-Fi band -->
+		<!-- Yes, No -->
+		<item name="wifi.24G.enable">Yes</item>
+		<item name="wifi.5G.enable">Yes</item>
+		<!-- ESSID -->
+		{if isset($grandstream_wifi_essid)}
+		<item name="wifi.essidname">{$grandstream_wifi_essid}</item>
+		<!-- Password -->
+		<item name="wifi.essidpassword">{$grandstream_wifi_password}</item>
+		<!-- Security Mode for Hidden SSID -->
+		<!-- None, WEP, WPA/WPA2_PSK -->
+		<item name="wifi.hiddenessid.securitymode">{$grandstream_wifi_hidden_security}</item>
+		{/if}
+		<!-- Layer 2 QoS 802.1p Priority Value (Wi-Fi) -->
+		<item name="wifi.layer2qos.priority">0</item>
+		{/if}
+		<!-- OpenVPN Settings -->
+		<!-- Enable OpenVPN -->
+		<!-- Yes, No -->
+		<item name="network.openvpn.enable">No</item>
+		<!-- Enable OpenVPN® Comp-lzo -->
+		<!-- Yes, No -->
+		<item name="network.openvpn.complzo.enable">No</item>
+		<!-- OpenVPN Server Address -->
+		<item name="network.openvpn.server"></item>
+		<!-- OpenVPN Port -->
+		<item name="network.openvpn.port">1194</item>
+		<!-- OpenVPN Transport -->
+		<!-- UDP, TCP -->
+		<item name="network.openvpn.transport">UDP</item>
+		<!-- OpenVPN® CA -->
+		<item name="network.openvpn.ca"></item>
+		<!-- OpenVPN® Client Certificate -->
+		<item name="network.openvpn.cert"></item>
+		<!-- OpenVPN® Client Key -->
+		<item name="network.openvpn.clientKey"></item>
+		<!-- OpenVPN® Cipher Method -->
+		<!-- Blowfish, AES128, AES256, TripleDES -->
+		<item name="network.openvpn.ciperMethod">Blowfish</item>
+		<!-- OpenVPN® Username -->
+		<item name="network.openvpn.transport"></item>
+		<!-- OpenVPN® Password -->
+		<item name="network.openvpn.password"></item>
+		<!-- Advanced Network Settings -->
+		<!-- DNS Refresh Time (m). Default 0. -->
+		<!-- Number 0 - 1440 -->
+		<item name="network.dns.refreshTime">0</item>
+		<!-- DNS Failure Cache Duration (m).  Default 0. -->
+		<!-- Number 0 - 1440 -->
+		<item name="network.dns.failureCacheDuration">0</item>
+		<!-- Alternate DNS Server -->
+		<item name="network.dns.preferred.ip.1">0</item>
+		<item name="network.dns.preferred.ip.2">0</item>
+		<item name="network.dns.preferred.ip.3">0</item>
+		<item name="network.dns.preferred.ip.4">0</item>
+		<!-- Second Alternate DNS Server -->
+		<item name="network.dns.second.preferred.ip.1"></item>
+		<item name="network.dns.second.preferred.ip.2"></item>
+		<item name="network.dns.second.preferred.ip.3"></item>
+		<item name="network.dns.second.preferred.ip.4"></item>
+		<!-- Enable LLDP -->
+		<!-- Yes, No -->
+		<item name="network.lldp.enable">Yes</item>
+		<!-- LLDP TX Interval (s)  -->
+		<item name="network.lldp.txInterval">30</item>
+		<!-- Enable CDP -->
+		<!-- Yes, No -->
+		<item name="network.cdp">No</item>
+		<!-- Layer 3 QoS for SIP -->
+		<item name="network.qos.forSip">26</item>
+		<!-- Layer 3 QoS for Audio -->
+		<item name="network.qos.forRtp">46</item>
+		<!-- Layer 3 QoS for Video -->
+		<item name="network.qos.forVideo">34</item>
+		<!-- HTTP/HTTPS User-Agent -->
+		<item name="network.useragent.httporhttps"></item>
+		<!-- SIP User-Agent -->
+		<item name="network.useragent.sip">Grandstream GXV3370 $version</item>
+		<!-- PC Port Mode -->
+		<!-- Enabled, Disabled, Mirrored -->
+		<item name="network.port.pc.mode">Enabled</item>
+		<!-- PC Port VLAN Tag  -->
+		<item name="network.port.pc.vlan.tag">0</item>
+		<!-- PC Port Priority Value -->
+		<item name="network.port.pc.vlan.priority">0</item>
+		<!-- HTTP/HTTPS Proxy Hostname -->
+		<!-- Must include port number -->
+		<item name="network.proxy.httporhttps"></item>
+		 <!-- Bypass Proxy For -->
+		 <item name="network.proxy.bypassAddress"></item>
+		 <!-- CSTA Control -->
+		<!-- Yes, No -->
+		<item name="remoteControl.csta.enable">No</item>
+		<!-- Action URI Support -->
+		<!-- Yes, No -->
+		<item name="remoteControl.enable">Yes</item>
+		<!-- Remote Control Pop up Window Support -->
+		<!-- Yes, No -->
+		<item name="remoteControl.confirmWindow.enable">Yes</item>
+		<!-- Action URI Allow IP List -->
+		<!-- String -->
+		<item name="remoteControl.allowList"></item>
+		<!-- System Settings -->
+		<!-- Assign NTP Server Address -->
+		<item name="dateTime.ntp.server.1">pool.ntp.org</item>
+		<!-- DHCP Option 42 Override NTP Server -->
+		<!-- Yes, No -->
+		<item name="dateTime.override.dhcp.allowOption42">Yes</item>
+		<!-- DHCP Option 2 to Override Time Zone Setting -->
+		<!-- Yes, No -->
+		<item name="dateTime.override.dhcp.allowOption2">Yes</item>
+		<!-- Value                  Time Zone -->
+		<!-- # Pacific/Midway					Midway,GMT-11:00,                           
+		# Pacific/Honolulu					Honolulu,GMT-10:00,                         
+		# America/Anchorage					Alaska Daylight Time/Anchorage,GMT-08:00,        
+		# America/Los_Angeles				Pacific Daylight Time/Los Angeles,GMT-07:00,    
+		# America/Tijuana					Tijuana,GMT-07:00,                            
+		# America/Phoenix					Mountain Standard Time/Phoenix,GMT-07:00,  
+		# America/Chihuahua					Chihuahua,GMT-07:00,                        
+		# America/Denver					Mountain Daylight Time/Denver,GMT-06:00,                  
+		# America/Costa_Rica				Costa Rica,GMT-06:00,
+		# America/Mexico_City				Mexico City,GMT-06:00,   
+		# America/Regina					Regina,GMT-06:00,                       
+		# America/Chicago					Central Daylight Time/Chicago,GMT-05:00,            
+		# America/Bogota					Bogota,GMT-05:00,                              
+		# America/New_York					New York,GMT-04:00,             
+		# America/Caracas					Caracas,GMT-04:00,                            
+		# America/Barbados					Barbados,GMT-04:00,                             
+		# America/Manaus					Manaus,GMT-04:00, 
+		# America/Halifax					Halifax,GMT-03:00,               
+		# America/Santiago					Santiago,GMT-03:00,                            
+		# America/Recife					Recife,GMT-03:00,                                
+		# America/Sao_Paulo					Sao Paulo,GMT-03:00,                          
+		# America/Buenos_Aires				Buenos Aires,GMT-03:00,                    
+		# America/Godthab					Nuuk,GMT-03:00,                                  
+		# America/Montevideo				Montevideo,GMT-03:00, 
+		# America/St_Johns					St. John’s,GMT-02:30,                           
+		# Atlantic/South_Georgia			South Georgia,GMT-02:00,                  
+		# Atlantic/Azores					Azores,GMT-01:00,                                 
+		# Atlantic/Cape_Verde				Cape Verde,GMT-01:00,                         
+		# Africa/Casablanca					Casablanca,GMT+00:00,                           
+		# Europe/London						London,GMT+00:00,                                   
+		# Europe/Amsterdam					Amsterdam,GMT+01:00,                            
+		# Europe/Belgrade					Belgrade,GMT+01:00,                              
+		# Europe/Brussels					Brussels,GMT+01:00,                              
+		# Europe/Madrid						Madrid,GMT+01:00,                                  
+		# Europe/Sarajevo					Sarajevo,GMT+01:00,                              
+		# Africa/Brazzaville				Brazzaville,GMT+01:00,                       
+		# Africa/Windhoek					Windhoek,GMT+02:00,                              
+		# Asia/Amman						Amman,GMT+02:00,                                      
+		# Europe/Athens						Athens,GMT+02:00,                                  
+		# Asia/Beirut						Beirut,GMT+02:00,                                    
+		# Africa/Cairo						Cairo,GMT+02:00,                                   
+		# Europe/Helsinki					Helsinki,GMT+02:00,                            
+		# Asia/Jerusalem					Jerusalem,GMT+02:00,                            
+		# Africa/Harare						Harare,GMT+02:00,                                
+		# Europe/Istanbul					Istanbul,GMT+03:00,                         
+		# Europe/Minsk						Minsk,GMT+03:00,   
+		# Europe/Kiev                       Eastern European Summer Time
+		# Asia/Baghdad						Baghdad,GMT+03:00,                               
+		# Europe/Moscow						Moscow,GMT+03:00,                                
+		# Asia/Kuwait						Kuwait,GMT+03:00,                                 
+		# Africa/Nairobi					Nairobi,GMT+03:00,          
+		# Asia/Baku							Baku,GMT+04:00,                                     
+		# Asia/Tbilisi						Tbilisi,GMT+04:00,                               
+		# Asia/Yerevan						Yerevan,GMT+04:00,                               
+		# Asia/Dubai						Dubai,GMT+04:00, 
+		# Asia/Tehran						Tehran,GMT+04:30,                                   
+		# Asia/Kabul						Kabul,GMT+04:30,                                   
+		# Asia/Karachi						Karachi,GMT+05:00,                               
+		# Asia/Oral							Oral,GMT+05:00,                                     
+		# Asia/Yekaterinburg				Yekaterinburg,GMT+05:00,                   
+		# Asia/Calcutta						Kolkata,GMT+05:30,                              
+		# Asia/Colombo						Colombo,GMT+05:30,                               
+		# Asia/Katmandu						Kathmandu,GMT+05:45,                            
+		# Asia/Almaty						Almaty,GMT+06:00,                                 
+		# Asia/Rangoon						Rangoon,GMT+06:30,                               
+		# Asia/Krasnoyarsk					Krasnoyarsk,GMT+07:00,                       
+		# Asia/Bangkok						Bangkok,GMT+07:00,                               
+		# Asia/Jakarta						Jakarta,GMT+07:00,                               
+		# Asia/Shanghai						Shanghai,GMT+08:00,                             
+		# Asia/Hong_Kong					Hong Kong,GMT+08:00,                           
+		# Asia/Irkutsk						Irkutsk,GMT+08:00,                               
+		# Asia/Kuala_Lumpur					Kuala Lumpur,GMT+08:00,                     
+		# Australia/Perth					Perth,GMT+08:00,                              
+		# Asia/Taipei						Taipei,GMT+08:00,                                 
+		# Asia/Seoul						Seoul,GMT+09:00,                                   
+		# Asia/Tokyo						Tokyo,GMT+09:00,                                   
+		# Asia/Yakutsk						Yakutsk,GMT+09:00,                               
+		# Australia/Darwin					Darwin,GMT+09:30,                            
+		# Australia/Brisbane				Brisbane,GMT+10:00,                        
+		# Asia/Vladivostok					Vladivostok,GMT+10:00,                       
+		# Pacific/Guam						Guam,GMT+10:00,                                  
+		# Australia/Adelaide				Adelaide,GMT+10:30,                        
+		# Australia/Hobart					Hobart,GMT+11:00,                            
+		# Australia/Sydney					Sydney,GMT+11:00,                            
+		# Asia/Magadan						Magadan,GMT+11:00,                               
+		# Pacific/Noumea					Noumea,GMT+11:00,                              
+		# Pacific/Majuro					Majuro,GMT+12:00,                              
+		# Pacific/Fiji						Fiji,GMT+12:00,                                  
+		# Pacific/Auckland					Auckland,GMT+13:00,                          
+		# Pacific/Tongatapu					Tongatapu,GMT+13:00 -->
+		<item name="dateTime.timezone">PST8PDT</item>
+		<!-- Time Display Format -->
+		<!-- 12Hour, 24Hour -->
+		<item name="dateTime.format.time">24Hour</item>
+		<!-- Date Display Format -->
+		<!-- yyyy-mm-dd, mm-dd-yyyy, dd-mm-yyyy, Normal -->
+		<item name="dateTime.format.date">Normal</item>
+		<!-- Language -->
+		<!-- Arabic - ar, Czech - cz, Deutsh - de, English - en, Spanish - es, Francais - fr, Hebrew - he, Hrvatski - hr, Magyar - hu, Italiano - it, japanese - ja, korean - ko, latvian - lv, Dutch - nl, Polski - pl, Portugue - pt, Russian - ru, Slovenian - sl, Svenska - sv, Turkish - tr, Ukrainian - uk, traditional_chinese - zh-tw, simplified_chinese - zh -->
+		<item name="language.gui">en</item>
+		<!-- Screen Timeout -->
+		<!-- Never, 2Mins, 3Mins, 5Mins, 10Mins, 20Mins, 30Mins, 1Hour -->
+		<item name="lcd.blacklight.activeTimeout.sec">2Mins</item>
+		<!-- Screensaver Timeout -->
+		<!-- Never, 15Secs, 30Secs, 1Min, 2Mins, 5Mins, 10Mins, 20Mins, 30Mins -->
+		<item name="lcd.screensaver.timeout.sec">3Mins</item>
+		<!-- System settings - Security Settings -->
+		<!-- Disable SSH -->
+		<!-- No, Yes -->
+		<item name="security.ssh">No</item>
+		<!-- Disable SSH -->
+		<!-- No, Yes -->
+		<item name="security.ssh">No</item>
+		<!-- Access Method -->
+		<!-- HTTP, HTTPS -->
+		<item name="security.webAccessMode">HTTP</item>
+		<!-- Port -->
+		<!-- By default, HTTP uses port 80 and HTTPS uses port 443. This field is for customizing the web port -->
+		<item name="security.webAccess.port">80</item>
+		<!-- Configuration via Keypad Menu -->
+		<!-- Unrestricted, BasicSettingsOnly, ConstraintMode -->
+		<item name="security.configurationViaKeypadMenu">No</item>
+		<!-- Permission to Install/Uninstall Apps -->
+		<!-- Allow, RequireAdminPassword, RequireAdminPasswordIfSrcUnknown, NotAllow -->
+		<item name="security.installThirdApp.permission">Allow</item>
+		<!-- Admin Password -->
+		<item name="users.admin.password">{if isset($admin_password)}{$admin_password}{else}admin{/if}</item>
+		<!-- User Password -->
+		<item name="users.user.password">{if isset($device_password)}{$device_password}{else}user{/if}</item>
+		<!-- Minimum TLS Version -->
+		<!-- TLS1.0, TLS1.1, TLS1.2 -->
+		<item name="security.tls.minversion">TLS1.2</item> 
+		<!-- Maximum TLS Version -->
+		<!-- TLS1.0, TLS1.1, TLS1.2, NoLimit -->
+		<item name="security.tls.maxversion">NoLimit</item> 	
+		<!-- Enable Weak TLS Cipher Suites -->
+		<!-- Enable, Disable_RC4/DES/3DES -->
+		<item name="security.tls.weeksiphersuites">Disable_RC4/DES/3DES</item>
+		<!-- SIP TLS Certificate -->
+		<!-- <item name="security.certificate"></item> -->
+		<!-- SIP TLS Private Key  -->
+		<!-- <item name="security.key"></item> -->
+		<!-- SIP TLS Private Key Password -->
+		<!-- <item name="security.password">s1pphone</item> -->
+		<!-- Certificate Management - Trusted CA Certificates -->
+		<item name="CACertificates.1"></item>
+		<!-- Custom Certificate -->
+		<item name="security.customcertificate"></item>
+		<!-- Perferences - LCD & LED Management -->
+		<!-- Enable Missed Call Backlight -->
+		<item name="lcd.backlight.missedCall">No</item>
+		<!-- Enable Missed Call Indicator -->
+		<!-- Checked - No, Unchecked - Yes -->
+		<item name="ledControl.missedCall">No</item>
+		<!-- Enable MWI Indicator -->
+		<!-- Checked - No, Unchecked - Yes -->
+		<item name="ledControl.mwi">No</item>
+		<!-- Enable New Message Indicator -->
+		<!-- Checked - No, Unchecked - Yes -->
+		<item name="ledControl.newMessage">No</item>
+		<!-- Enable Contact Full Indicator -->
+		<!-- Checked - No, Unchecked - Yes -->
+		<item name="ledControl.contactFull">No</item>
+		<!-- Enable Indicator When LCD is Off -->
+		<!-- Checked - No, Unchecked - Yes -->
+		<item name="ledControl.LCDOff">No</item>
+		<!-- Font size -->
+		<!-- Small, Default, Large, Largest -->
+		<item name="lcd.font.size">Default</item>
+		<!-- Enable HDMI audio -->
+		<!-- Yes, No -->
+		<item name="audio.HDMI.enable">Yes</item>
+		<!-- Echo Delay -->
+		<!-- 0, 10, 20, ..., 190 -->
+		<item name="audio.HDMI.echoDelay">0</item>
+		<!-- RJ9 Headset TX Gain (dB) -->
+		<!-- -24, -18, -12, -6, 0, +6, +12, +18, +24 -->
+		<item name="audio.headset.txGain">0</item>
+		<!-- RJ9 Headset RX Gain (dB) -->
+		<!-- -9, -6, 0, +6, +9 -->
+		<item name="audio.headset.rxGain">0</item>
+		<!-- 3.5mm Earphone TX Gain (dB) -->
+		<!-- -24, -18, -12, -6, 0, +6, +12, +18, +24 -->
+		<item name="audio.3.5mmearphone.txGain">0</item>
+		<!-- 3.5mm Earphone RX Gain (dB) -->
+		<!-- -9, -6, 0, +6, +9 -->
+		<item name="audio.3.5mmearphone.rxGain">0</item>
+		<!-- Headset Type -->
+		<!-- PlantronicsEHS, Normal -->
+		<item name="audio.headset.ehs.ringtone">Normal</item>
+		<!-- Enable 3.5mm Headset Control -->
+		<!-- Yes, No -->
+		<item name="audio.3.5mheadsetControl.enable">No</item>
+		<!-- Handset TX Gain (dB) -->
+		<!-- 0, -6, 6 -->
+		<item name="audio.handset.txGain">-6</item>
+		<!-- Handset RX Gain (dB) -->
+		<!-- 0, -6, 6 -->
+		<item name="audio.handset.rxGain">-6</item>
+		<!-- Ringtone volume -->
+		<!-- 0 - 15 -->
+		<item name="audio.volume.ring">7</item>
+		<!-- Media volume -->
+		<!-- 0 - 15 -->
+		<item name="audio.volume.media">7</item>
+		<!-- Alarm volume -->
+		<!-- 0 - 15 -->
+		<item name="audio.volume.alarm">7</item>
+		<!-- Call volume -->
+		<!-- 1 - 8 -->
+		<item name="audio.volume.call">4</item>
+		<!-- Plug in RJ9/EHS headset no working yet-->
+		<!-- Yes, No -->
+		<item name="audio.headset.ehs.enable">No</item>
+		<!-- System Settings - TR069 -->
+		<!-- Enable TR-069 -->
+		<!-- Yes, No -->
+		<item name="tr069.enable">No</item>
+		<!-- ACS URL -->
+		<item name="tr069.url"></item>
+		<!-- ACS Username -->
+		<item name="tr069.username"></item>
+		<!-- ACS Password -->
+		<item name="tr069.password"></item>
+		<!-- Periodic Inform Enable -->
+		<!-- Yes, No -->
+		<item name="tr069.periodicInform">No</item>
+		<!-- Periodic Inform Interval (s) -->
+		<item name="tr069.periodicInformInterval">86400</item>
+		<!-- Connection Request Username -->
+		<item name="tr069.connectionRequestUsername"></item>
+		<!-- Connection Request Password -->
+		<item name="tr069.connectionRequestPassword"></item>
+		<!-- Connection Request Port -->
+		<item name="tr069.connectionRequestPort"></item>
+		<!-- CPE Cert File -->
+		<item name="tr069.ssl.certificate"></item>
+		<!-- CPE Cert Key -->
+		<item name="tr069.ssl.privateKey"></item>
+		<!-- Maintenance - Upgrade -->
+		<!-- Firmware Upgrade Mode -->
+		<!-- TFTP, HTTP, HTTPS -->
+		<item name="provisioning.firmware.protocol">HTTP</item>
+		<!-- Firmware Server Path -->
+		{if isset($grandstream_firmware_path) && isset($firmware_version)}
+		<item name="provisioning.firmware.serverPath">{$grandstream_firmware_path}/{$firmware_version}</item>
+		{elseif isset($grandstream_firmware_path)}
+		<item name="provisioning.firmware.serverPath">{$grandstream_firmware_path}</item>
+		{else}
+		<item name="provisioning.firmware.serverPath">{$domain_name}{$project_path}/app/provision/resources/firmware/</item>
+		{/if}
+		<!-- HTTP/HTTPS User Name -->
+		<item name="provisioning.firmware.username">{$http_auth_username}</item>
+		<!-- HTTP/HTTPS Password -->
+		<item name="provisioning.firmware.password">{$http_auth_password}</item>
+		<!-- Firmware File Prefix -->
+		<item name="provisioning.firmware.filePrefix"></item>
+		<!-- Firmware File Postfix -->
+		<item name="provisioning.firmware.filePostfix"></item>
+		<!-- Config Upgrade Via -->
+		<!-- TFTP, HTTP, HTTPS -->
+		<item name="provisioning.config.protocol">HTTP</item>
+		<!-- Config Server Path -->
+		{if $grandstream_config_server_path=="none"}
+		<item name="provisioning.config.serverPath"></item>
+		{elseif isset($grandstream_config_server_path)}
+		<item name="provisioning.config.serverPath">{$grandstream_config_server_path}</item>
+		{else}
+		<item name="provisioning.config.serverPath">{$domain_name}{$project_path}/app/provision</item>
+		{/if}
+		<!-- HTTP/HTTPS User Name -->
+		<item name="provisioning.config.username">{$http_auth_username}</item>
+		<!-- HTTP/HTTPS Password -->
+		<item name="provisioning.config.password">{$http_auth_password}</item>
+		<!-- Config File Prefix -->
+		<item name="provisioning.config.filePrefix"></item>
+		<!-- Config File Postfix -->
+		<item name="provisioning.config.filePostfix"></item>
+		<!-- Authenticate Conf File -->
+		<!-- Yes, No -->
+		<item name="provisioning.config.authenticateFile">No</item>
+		<!-- XML Config File Password -->
+		<item name="provisioning.config.filePassword"></item>
+		<!-- GUI Customization File Download Mode -->
+		<!-- TFTP, HTTP, HTTPS -->
+		<item name="provisioning.cust.protocol">TFTP</item>
+		<!-- GUI Customization File URL -->
+		<item name="provisioning.cust.serverPath"></item>
+		<!-- GUI Customization File HTTP/HTTPS Username -->
+		<item name="provisioning.cust.username"></item>
+		<!-- GUI Customization File HTTP/HTTPS Password -->
+		<item name="provisioning.cust.password"></item>
+		<!-- Use Configurations of Config File Server -->
+		<!-- 0 - No, 1 - Yes -->
+		<item name="provisioning.cust.sameasconfig">0</item>
+
+		<!-- Maintenance - Upgrade - Provision -->
+		<!-- Automatic Upgrade -->
+		<!-- No - No (default), Check Every Day - CheckEveryDay, Check Every Week - CheckEveryWeek, Check at a Period Time - CheckbyPeriod -->
+		<item name="provisioning.auto.mode">No</item>
+		<!-- Enable Randomized Automatic Upgrade -->
+		<item name="provisioning.randomized.enable">No</item>
+		<!-- Starting - Ending Hour of the Day (0-23) -->
+		<item name="provisioning.auto.hour">22</item>
+		<item name="provisioning.auto.endHour">23</item>
+		<!-- Day of the Week -->
+		<!-- 0, 1 (default), 2, 3, 4, 5, 6 -->
+		<!-- Multiple days example: 0/1/2/3/4 -->
+		<item name="provisioning.auto.day">1</item>
+		<!-- Automatic Upgrade Check Interval (m) -->
+		<!-- Number: 60 - 5256000. Default value is 10080 -->
+		<item name="provisioning.auto.minute">10080</item>
+		<!-- Firmware Upgrade and Provisioning -->
+		<!-- AlwaysCheck (default), CheckWhenChange, SkipCheck -->
+		<item name="provisioning.firmware.checkCondition">AlwaysCheck</item>
+		<!-- Upgrade Without Prompt -->
+		<!-- No (default), Yes -->
+		<item name="provisioning.prompt.enable">No</item>
+		<!-- Allow DHCP Option 43 and Option 66 to Override Server -->
+		<!-- No (default), Yes -->
+		<item name="provisioning.override.dhcp.allowCommonOptions">No</item>
+		<!-- DHCP Option 120 Override SIP Server -->
+		<!-- No, Yes (default) -->
+		<item name="sip.override.dhcp.allowOption120">Yes</item>
+		<!-- Allow DHCP Option 242 (Avaya IP Phones) -->
+		<!-- No, Yes (default) -->
+		<item name="provisioning.override.dhcp.allowOptions242">Yes</item>
+		<!-- Download and Process All Available Config Files -->
+		<!-- No (default), Yes -->
+		<item name="provisioning.config.processAll.enable">No</item>
+		<!-- Config Provision -->
+		<!-- Order1 - cfg.xml;cfg$mac;cfg$mac.xml;cfg$product.xml -->
+		<!-- Order2 - cfg.xml;cfg$mac;cfg$product.xml;cfg$mac.xml -->
+		<!-- Order3 - cfg.xml;cfg$mac.xml;cfg.xml;cfg$product.xml -->
+		<!-- Order4 - cfg.xml;cfg$mac.xml;cfg$product.xml;cfg.xml -->
+		<!-- Order5 - cfg.xml;cfg$product.xml;cfg.xml;cfg$mac.xml -->
+		<!-- Order6 - cfg.xml;cfg$product.xml;cfg$mac.xml;cfg.xml -->
+		<!-- Order7 - cfg$mac;cfg.xml;cfg$mac.xml;cfg$product.xml -->
+		<!-- Order8 - cfg$mac;cfg.xml;cfg$product.xml;cfg$mac.xml -->
+		<!-- Order9 - cfg$mac;cfg$mac.xml;cfg.xml;cfg$product.xml -->
+		<!-- Order10 - cfg$mac;cfg$mac.xml;cfg$product.xml;cfg.xml -->
+		<!-- Order11 - cfg$mac;cfg$product.xml;cfg$mac.xml;cfg.xml -->
+		<!-- Order12 - cfg$mac;cfg$product.xml;cfg.xml;cfg$mac.xml -->
+		<!-- Order13 - cfg$mac.xml;cfg.xml;cfg$mac;cfg$product.xml -->
+		<!-- Order14 - cfg$mac.xml;cfg.xml;cfg$product.xml;cfg$mac -->
+		<!-- Order15 - cfg$mac.xml;cfg$mac;cfg.xml;cfg$product.xml -->
+		<!-- Order16 - cfg$mac.xml;cfg$mac;cfg$product.xml;cfg.xml -->
+		<!-- Order17 - cfg$mac.xml;cfg$product.xml;cfg$mac;cfg.xml -->
+		<!-- Order18 - cfg$mac.xml;cfg$product.xml;cfg.xml;cfg$mac -->
+		<!-- Order19 - cfg$product.xml;cfg.xml;cfg$mac;cfg$mac.xml -->
+		<!-- Order20 - cfg$product.xml;cfg.xml;cfg$mac.xml;cfg$mac -->
+		<!-- Order21 - cfg$product.xml;cfg$mac;cfg.xml;cfg$mac.xml -->
+		<!-- Order22 - cfg$product.xml;cfg$mac;cfg$mac.xml;cfg.xml -->
+		<!-- Order23 - cfg$product.xml;cfg$mac.xml;cfg$mac;cfg.xml -->
+		<!-- Order24 - cfg$product.xml;cfg$mac.xml;cfg.xml;cfg$mac -->
+		<item name="provisioning.config.order">Order10</item>
+		<!-- Enable PNP Feature -->
+		<!-- No (default), Yes -->
+		<item name="provisioning.pnp.enable">No</item>
+		<!-- PNP URL -->
+		<item name="provisioning.pnp.url"></item>
+		<!-- PnP(3CX) Auto Provision -->
+		<item name="provisioning.3cxAutoProvision">Yes</item>
+		<!-- Enable SIP NOTIFY Authentication -->
+		<!-- Yes - No (default), No - Yes -->
+		<item name="sip.notify.challenge">No</item>
+		<!-- Validate Certification Chain -->
+		<!-- No (default), Yes -->
+		<item name="provisioning.validateCertificationChain.enable">No</item>
+		<!-- Enable EEE Mode -->
+		<!-- Yes, No (default) -->
+		<item name="EEE.mode.enable">No</item>
+		<!-- mDNS Override Server -->
+		<!-- Disable, UseTypeA, UseTypeSRV -->
+		<item name="provisioning.mDNSOverride.type">UseTypeA</item>
+		
+		<!-- Maintenance - System Diagnosis -->
+		<!-- Syslog Protocol -->
+		<!-- UDP, SSL_TLS -->
+		<item name="maintain.syslog.protocol">UDP</item>
+		<!-- Syslog Server -->
+		<item name="maintain.syslog.server">log.ipvideotalk.com</item>
+		<!-- Syslog Level -->
+		<!-- None, Debug, Info, Warning, Error -->
+		<item name="maintain.syslog.level">None</item>
+		<!-- Send SIP Log -->
+		<!-- Yes (default), No -->
+		<item name="maintain.syslog.sendSipLog">Yes</item>
+		<!-- Syslog Keyword Filter -->
+		<item name="maintain.syslog.keywrodFiltering"></item>
+		<!-- Enable Core Dump Generation -->
+		<!-- Yes, No (default) -->
+		<item name="debug.coredump.enable">No</item>
+
+		<!-- Applications - MPK Settings -->
+		<!-- Display Format -->
+		<!-- Name, UserID, NameUserID, NameUserIDKeymode -->
+		<item name="pks.mpk.displayFormat">NameUserIDKeymode</item>
+		<!-- Show Display Name from Server -->
+		<!-- Yes, No -->
+		<item name="pks.mpk.showNamefromServer.enable">No</item>
+		<!-- BLF Call-pickup Prefix  -->
+		<!-- Yes, No -->
+		<item name="account.1.sip.blf.callPickup.forcePrefix">No</item>
+		<item name="account.2.sip.blf.callPickup.forcePrefix">No</item>
+		<item name="account.3.sip.blf.callPickup.forcePrefix">No</item>
+		<item name="account.4.sip.blf.callPickup.forcePrefix">No</item>
+		<item name="account.5.sip.blf.callPickup.forcePrefix">No</item>
+		<item name="account.6.sip.blf.callPickup.forcePrefix">No</item>
+		<item name="account.7.sip.blf.callPickup.forcePrefix">No</item>
+		<item name="account.8.sip.blf.callPickup.forcePrefix">No</item>
+		<item name="account.9.sip.blf.callPickup.forcePrefix">No</item>
+		<item name="account.10.sip.blf.callPickup.forcePrefix">No</item>
+		<item name="account.11.sip.blf.callPickup.forcePrefix">No</item>
+		<item name="account.12.sip.blf.callPickup.forcePrefix">No</item>
+		<item name="account.13.sip.blf.callPickup.forcePrefix">No</item>
+		<item name="account.14.sip.blf.callPickup.forcePrefix">No</item>
+		<item name="account.15.sip.blf.callPickup.forcePrefix">No</item>
+		<item name="account.16.sip.blf.callPickup.forcePrefix">No</item>
+		<!-- EventList BLF URI -->
+		<item name="account.1.sip.blf.eventlist.uri"></item>
+		<item name="account.2.sip.blf.eventlist.uri"></item>
+		<item name="account.3.sip.blf.eventlist.uri"></item>
+		<item name="account.4.sip.blf.eventlist.uri"></item>
+		<item name="account.5.sip.blf.eventlist.uri"></item>
+		<item name="account.6.sip.blf.eventlist.uri"></item>
+		<item name="account.7.sip.blf.eventlist.uri"></item>
+		<item name="account.8.sip.blf.eventlist.uri"></item>
+		<item name="account.9.sip.blf.eventlist.uri"></item>
+		<item name="account.10.sip.blf.eventlist.uri"></item>
+		<item name="account.11.sip.blf.eventlist.uri"></item>
+		<item name="account.12.sip.blf.eventlist.uri"></item>
+		<item name="account.13.sip.blf.eventlist.uri"></item>
+		<item name="account.14.sip.blf.eventlist.uri"></item>
+		<item name="account.15.sip.blf.eventlist.uri"></item>
+		<item name="account.16.sip.blf.eventlist.uri"></item>
+		<!-- Force BLF Call-pickup by Prefix -->
+		<item name="account.1.sip.blf.callPickup.prefix">**</item>
+		<item name="account.2.sip.blf.callPickup.prefix">**</item>
+		<item name="account.3.sip.blf.callPickup.prefix">**</item>
+		<item name="account.4.sip.blf.callPickup.prefix">**</item>
+		<item name="account.5.sip.blf.callPickup.prefix">**</item>
+		<item name="account.6.sip.blf.callPickup.prefix">**</item>
+		<item name="account.7.sip.blf.callPickup.prefix">**</item>
+		<item name="account.8.sip.blf.callPickup.prefix">**</item>
+		<item name="account.9.sip.blf.callPickup.prefix">**</item>
+		<item name="account.10.sip.blf.callPickup.prefix">**</item>
+		<item name="account.11.sip.blf.callPickup.prefix">**</item>
+		<item name="account.12.sip.blf.callPickup.prefix">**</item>
+		<item name="account.13.sip.blf.callPickup.prefix">**</item>
+		<item name="account.14.sip.blf.callPickup.prefix">**</item>
+		<item name="account.15.sip.blf.callPickup.prefix">**</item>
+		<item name="account.16.sip.blf.callPickup.prefix">**</item>
+		<!-- Applications - Contacts - General settings -->
+		<!-- Sort Phonebook by -->
+		<!-- 1 - LastName, 0 - FirstName -->
+		<item name="phonebook.sortBy">1</item>
+		<!-- Default Contacts Tab -->
+		<!-- Default, LDAPSearch, LocalPhonebook, LocalGroup, BroadsoftPhonebook, 5 - Keep -->
+		<item name="phonebook.keyFunction">Default</item>
+		<!-- Emergency Call Numbers -->
+		<!-- Example for multiple numbers: 911,999,110 -->
+		<item name="phonebook.emergencyCallNumber">911</item>
+		<!-- Applications - Contacts - Download Contacts -->
+		<!-- Clear The Old List -->
+		<!-- No, Yes option missing???? -->
+		<item name="phonebook.clearOld.enable">No</item>
+		<!-- Replace Duplicate Items -->
+		<!-- No, Yes option missing???? -->
+		<item name="phonebook.removeDuplicate.enable">Yes</item>
+		<!-- Download Mode -->
+		<!-- Disabled, EnabledUseHTTP, EnabledUseTFTP, EnabledUseHTTPS -->
+		<item name="phonebook.download.mode">Disabled</item>
+		<!-- File Encoding -->
+		<!-- GBK, UTF-8, UTF-16, UTF-32, Big5, Big5-HKSCS,  Shift-JIS, ISO 2022-JP, KOI8-R, ISO8859-1, ISO8859-15, Windows-1251, EUC-KR  -->
+		<item name="phonebook.download.encode">UTF</item>
+		<!-- Download Server -->
+		<item name="phonebook.download.server"></item>
+		<!-- HTTP/HTTPS User Name  -->
+		<item name="phonebook.download.username"></item>
+		<!-- HTTP/HTTPS Password  -->
+		<item name="phonebook.download.password"></item>
+		<!-- Automatic Download Interval  -->
+		<!-- 0, 120, 240, 360, 480, 720 -->
+		<item name="phonebook.download.interval">0</item>
+		<!-- Applications - LDAP Book -->
+		<!-- Connection Mode -->
+		<!-- LDAP, LDAPS -->
+		<item name="ldap.protocol">LDAP</item>
+		<!-- Server Address -->
+		<item name="ldap.server"></item>
+		<!-- Port -->
+		<item name="ldap.port">389</item>
+		<!-- Base DN -->
+		<!-- # Example 1: dc=grandstream,dc=com -->
+		<!-- # Example 2: ou=Boston, dc=grandstream,dc=com -->
+		<item name="ldap.base"></item>
+		<!-- User Name -->
+		<item name="ldap.username"></item>
+		<!-- Password -->
+		<item name="ldap.password"></item>
+		<!-- LDAP Name Attributes  -->
+		<item name="ldap.ldapNameAttributes"></item>
+		<!-- LDAP Number Attributes -->
+		<item name="ldap.ldapNumberAttributes"></item>
+		<!-- LDAP Mail Attributes -->
+		<item name="ldap.ldapMailAttributes"></item>
+		<!-- LDAP Name Filter -->
+		<item name="ldap.ldapNameFilter"></item>
+		<!-- LDAP Number Filter -->
+		<item name="ldap.ldapNumberFilter"></item>
+		<!-- LDAP Mail Filter -->
+		<item name="ldap.ldapMailFilter"></item>
+		<!-- LDAP Displaying Name Attributes -->
+		<item name="ldap.ldapDisplayName"></item>
+		<!-- Max Hits -->
+		<item name="ldap.maxHits">50</item>
+		<!-- Search Timeout (s) -->
+		<item name="ldap.searchTimeout">4</item>
+		<!-- LDAP Lookup For Dial -->
+		<!-- Yes, No -->
+		<item name="ldap.outgoingCalls">No</item>
+		<!-- LDAP Lookup For Incoming Call -->
+		<!-- Yes, No -->
+		<item name="ldap.ldapLookup">No</item>
+		<!-- LDAP Dialing Default Account -->
+		<!-- Default - 0, Account 1 - 1, Account 2 - 2 ... -->
+		<item name="ldap.defalutAccount">0</item>
+
+		<!-- Value-added Service - Value-added Service -->
+		<!-- Service Type -->
+		<!-- 0 - Door System, 1 - DTMF -->
+		<item name="externalService.1.type">0</item>
+		<!-- Door System Type -->
+		<!-- 0 - GDS, 1 - Others, 2 - Baudisch -->
+		<item name="externalService.1.account">0</item>
+		<!-- Display Name -->
+		<item name="externalService.1.systemId"></item>
+		<!-- System Number -->
+		<item name="externalService.1.systemNumber"></item>
+		<!-- Access Password / DTMF Content -->
+		<item name="externalService.1.password"></item>
+		<!-- System Ringtone -->
+		<item name="externalService.1.ringtone">/system/media/audio/ringtones/DingDong.wav</item>
+		<!-- Display Open Door Button when Calling -->
+		<!-- Yes, No -->
+		<item name="externalService.general.doorButton.display">Yes</item>
+		<!-- Enable Preview -->
+		<!-- Yes, No -->
+		<item name="externalService.general.preview.enable">Yes</item>
+
+		<!-- Value-added Service - Broadsoft Settings - Braodsoft Call Features -->
+		<!-- Feature Key Synchronization -->
+		<!-- No - Disable, Yes - Broadsoft -->
+		<item name="account.1.broadsoft.syncFeatureKey">No</item>
+		<!-- Enable BroadSoft Call Park -->
+		<!-- Yes, No -->
+		<item name="account.1.broadsoft.callPark">No</item>
+		<!-- Conference URI -->
+		<item name="account.1.sip.conferenceUri"></item>
+		<!-- BroadSoft Call Center -->
+		<!-- Yes, No -->
+		<item name="account.1.broadsoft.callCenter">No</item>
+		
+		<!-- Hoteling Event -->
+		<!-- Yes, No -->
+		<item name="account.1.broadsoft.hoteling">No</item>
+
+		<!-- Call Center Status -->
+		<!-- Yes, No -->
+		<item name="account.1.broadsoft.callCenterStatus">No</item>
+
+		<!-- Value-added Service - Broadsoft Settings - SCA -->
+		<!-- Enable SCA (Shared Call Appearance) -->
+		<!-- Yes, No -->
+		<item name="account.1.sca.enable">No</item>
+
+		<!-- Enable BargeIn -->
+		<!-- Yes, No -->
+		<item name="account.1.sca.bargein.enable">No</item>
+		<!-- Auto-filling Pickup Feature Code -->
+		<!-- Yes, No -->
+		<item name="account.1.sca.autoPickup.enable">Yes</item>
+		<!-- Pickup Feature Code -->
+		<item name="account.1.sca.pickupFeatureCode"></item>
+		<!-- Line-seize Timeout -->
+		<!-- Range: 15 - 60. Default: 15 -->
+		<item name="account.1.sip.lineSeizeTimeout">15</item>
+		
+		<!-- Value-added Service - BroadSoft Directories -->
+		<!-- Authentication Type. -->
+		<!-- SIPCredentials, LoginCredentials -->
+		<item name="broadsoftXsi.authenticationType">SIPCredentials</item>
+
+		<!-- Server -->
+		<item name="broadsoftXsi.server"></item>
+
+		<!-- Port -->
+		<item name="broadsoftXsi.port"></item>
+
+		<!-- Action Path.  -->
+		<item name="broadsoftXsi.actionsPath"></item>
+
+		<!-- BroadWorks User ID.  -->
+		<item name="broadsoftXsi.sip.userId"></item>
+
+		<!-- SIP Authentication ID (for SIP credentials) -->
+		<item name="broadsoftXsi.credential.username"></item>
+
+		<!-- SIP Authentication Password (for SIP credentials) -->
+		<item name="broadsoftXsi.credential.password"></item>
+
+		<!-- Login Password (for login credential P22103) -->
+
+		<!-- BroadSoft Directory Hits -->
+		<!-- Range: 1 - 1000 -->
+		<item name="broadsoftXsi.directory.maxHits"></item>
+
+		<!-- Network Directories -->
+		<!-- Group Directory -->
+		<!-- Yes, No -->
+		<item name="broadsoftXsi.directory.groupDirectory">Yes</item>
+
+		<!-- Group Directory Name -->
+		<item name="broadsoftXsi.directory.groupDirectoryName"></item>
+
+		<!-- Enterprise Directory  -->
+		<!-- Yes, No -->
+		<item name="broadsoftXsi.directory.enterpriseDirectory">Yes</item>
+
+		<!-- Enterprise Directory Name -->
+		<item name="broadsoftXsi.directory.enterpriseDirectoryName"></item>
+
+		<!-- Group Common -->
+		<!-- Yes, No -->
+		<item name="broadsoftXsi.directory.groupCommon">Yes</item>
+
+		<!-- Group Common Name -->
+		<item name="broadsoftXsi.directory.groupCommonName"></item>
+
+		<!-- Enterprise Common -->
+		<!-- Yes, No -->
+		<item name="broadsoftXsi.directory.enterpriseCommon">Yes</item>
+
+		<!-- Enterprise Common Name -->
+		<item name="broadsoftXsi.directory.enterpriseCommonName"></item>
+
+		<!-- Personal Directory -->
+		<!-- Yes, No -->
+		<item name="broadsoftXsi.directory.personalDirectory">Yes</item>
+
+		<!-- Personal Directory Name -->
+		<item name="broadsoftXsi.directory.personalDirectoryName"></item>
+
+		<!-- Polycom Phonebook -->
+		<!-- Yes, No -->
+		<item name="broadsoftXsi.directory.polycomPhonebook">Yes</item>
+
+		<!-- Polycome Phonebook Name -->
+		<item name="broadsoftXsi.directory.polycomPhonebookName"></item>
+
+		<!-- Missed Call Log -->
+		<!-- Yes, No -->
+		<item name="broadsoftXsi.directory.missedCallLog">Yes</item>
+
+		<!-- Missed Call Log Name -->
+		<item name="broadsoftXsi.directory.missedCallLogName"></item>
+
+		<!-- Placed Call Log -->
+		<!-- Yes, No -->
+		<item name="bbroadsoftXsi.directory.placedCallLog">Yes</item>
+
+		<!-- Placed Call Log Name -->
+		<item name="broadsoftXsi.directory.placedCallLogName"></item>
+
+		<!-- Received Call Log -->
+		<!-- Yes, No -->
+		<item name="broadsoftXsi.directory.receivedCallLog">Yes</item>
+
+		<!-- Received Call Log Name -->
+		<item name="broadsoftXsi.directory.receivedCallLogName"></item>
+
+		<!-- Value-added Service - BroadSoft IM&P -->
+		<!-- Server -->
+		<item name="broadsoftIMP.server"></item>
+
+		<!-- Port -->
+		<item name="broadsoftIMP.port"></item>
+
+		<!-- User Name -->
+		<item name="broadsoftIMP.username"></item>
+
+		<!-- Password -->
+		<item name="broadsoftIMP.password"></item>
+
+		<!-- Enable Broadsoft IM&P -->
+		<!-- Yes, No -->
+		<item name="broadsoftIMP.enable">No</item>
+
+		<!-- Associated Broadsoft Account -->
+		<!-- Account1, Account2, ... , Account16 -->
+		<item name="broadsoftIMP.associatedAccount"></item>
+
+		<!-- Auto Login -->
+		<!-- Yes, No -->
+		<item name="broadsoftIMP.autoLogin">No</item>
+
+		<!-- Display Non-XMPP Contacts -->
+		<!-- Yes, No -->
+		<item name="broadbroadsoftIMP.displayNonXMPPContacts">No</item>
+
+		<!--#############################################-->
+		<!--# 160 MPKs can be configured via MPK APP    #-->
+		<!--#############################################-->
+		<!-- [Note] MPK provision needs reboot to take effect -->
+		{$keyIndex=1}
+		<!-- MPK Key Mode -->
+		<!-- SpeedDial, BLF, SpeedDialViaActiveAccount, DialDTMF, Intercom, Transfer, CallPark, MulticastPaging, Conference, DialPrefix -->
+		{$key_types=["none"=>"","speed dial"=>"SpeedDial","blf"=>"BLF","speed dial active"=>"SpeedDialViaActiveAccount","dial dtmf"=>"DialDTMF","intercom"=>"Intercom","transfer"=>"Transfer","call park"=>"CallPark","multicast paging"=>"MulticastPaging","conference"=>"Conference"]}
+		{foreach $keys as $category => $rows}
+		{foreach $rows as $row}
+		{if isset($row.device_key_type)}
+		<item name="pks.mpk.{$keyIndex}.mode">{$key_types[$row.device_key_type]}</item>
+		<!-- MPK Account -->
+		<!-- Account1, Account2, ... , Account16 -->
+		<item name="pks.mpk.{$keyIndex}.account">Account{$row.device_key_line}</item>
+		<!-- MPK Display Name -->
+		<item name="pks.mpk.{$keyIndex}.description">{$row.device_key_label}</item>
+		<!-- MPK User ID -->
+		<!-- extendValue may be used based on MPK mode -->
+		<item name="pks.mpk.{$keyIndex}.value">{$row.device_key_value}</item>
+		<item name="pks.mpk.{$keyIndex}.extendValue">device_key_extension</item>
+		{$keyIndex=$keyIndex+1}
+		{/if}
+		{/foreach}
+		{/foreach}
+	</config>
+</gs_provision>
diff --git a/resources/templates/provision/grandstream/gxv3504/{$mac}.xml b/resources/templates/provision/grandstream/gxv3504/{$mac}.xml
index a72548ece3..e27719804d 100644
--- a/resources/templates/provision/grandstream/gxv3504/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxv3504/{$mac}.xml
@@ -580,7 +580,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
diff --git a/resources/templates/provision/grandstream/gxw4004/{$mac}.xml b/resources/templates/provision/grandstream/gxw4004/{$mac}.xml
index 582a506f5b..4e0771d049 100644
--- a/resources/templates/provision/grandstream/gxw4004/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxw4004/{$mac}.xml
@@ -26,7 +26,7 @@
                 <P237></P237>
                 {elseif isset($grandstream_config_server_path)}
                 <P237>{$grandstream_config_server_path}</P237>
-                {else}
+                {elseif isset($domain_name)}
                 <P237>{$domain_name}{$project_path}/app/provision</P237>
                 {/if}
 
diff --git a/resources/templates/provision/grandstream/gxw4008/{$mac}.xml b/resources/templates/provision/grandstream/gxw4008/{$mac}.xml
index 835a1e4725..99a5b06450 100644
--- a/resources/templates/provision/grandstream/gxw4008/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxw4008/{$mac}.xml
@@ -26,7 +26,7 @@
                 <P237></P237>
                 {elseif isset($grandstream_config_server_path)}
                 <P237>{$grandstream_config_server_path}</P237>
-                {else}
+                {elseif isset($domain_name)}
                 <P237>{$domain_name}{$project_path}/app/provision</P237>
                 {/if}
 
diff --git a/resources/templates/provision/grandstream/gxw40xx/{$mac}.xml b/resources/templates/provision/grandstream/gxw40xx/{$mac}.xml
index e79d12eec1..48dd982ba8 100644
--- a/resources/templates/provision/grandstream/gxw40xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxw40xx/{$mac}.xml
@@ -63,7 +63,7 @@
     <P237></P237>
     {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-    {else}
+    {elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
     {/if}
     
@@ -98,7 +98,7 @@
     <!-- Number: 0,1 -->
     <!-- Mandatory -->
     <!-- Reboot required -->
-    <P145>1</P145>
+    {if isset($grandstream_dhcp_option_override)}<P145>{$grandstream_dhcp_option_override}</P145>{else}<P145>1</P145>{/if}
     <!-- Automatic Upgrade. 0 - No, 1 - Check daily, 2 - Check weekly, 3 - Check every () minutes. Default is No. -->
     <!-- Number: 0,1,2,3 -->
     <!-- Mandatory -->
@@ -539,7 +539,7 @@
     {if isset($grandstream_dial_plan) }
     <P4200>{$grandstream_dial_plan}</P4200>
     {else}
-    <P4200>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P4200>
+    <P4200>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P4200>
     {/if}
     
     <!-- SUBSCRIBE for MWI. 0 - No, 1 - Yes. -->
diff --git a/resources/templates/provision/grandstream/gxw410x/{$mac}.xml b/resources/templates/provision/grandstream/gxw410x/{$mac}.xml
index 895ea6cd13..97afa5ccd9 100644
--- a/resources/templates/provision/grandstream/gxw410x/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxw410x/{$mac}.xml
@@ -43,7 +43,7 @@
     <P237></P237>
     {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-    {else}
+    {elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
     {/if}
     
@@ -57,7 +57,7 @@
     <P235></P235>
     <!--  Allow DHCP Option 66 to override server. 0 - No, 1 - Yes. Default is Yes. -->
     <!--  When set to Yes(1), it will override the configured provision path and method. -->
-    <P145>1</P145>
+    {if isset($grandstream_dhcp_option_override)}<P145>{$grandstream_dhcp_option_override}</P145>{else}<P145>1</P145>{/if}
     <!--  Automatic Upgrade. 0 - No, 1 - Yes. Default is No. -->
     <P194>0</P194>
     <!--  Check for new firmware every () minutes, unit is in minute, minimnu 60 minutes, default is 7 days. -->
@@ -567,7 +567,7 @@
     {if isset($grandstream_dial_plan) }
     <P3331>{$grandstream_dial_plan}</P3331>
     {else}
-    <P3331>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P3331>
+    <P3331>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P3331>
     {/if}
     
     <!--  Hookflash Duration (X10ms). Default 60. -->
diff --git a/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml b/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml
index e2b556976a..10ebb70589 100644
--- a/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml
@@ -171,7 +171,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
@@ -196,7 +196,7 @@
 <!-- Number: 0,1 -->
 <!-- Mandatory -->
 <!-- Reboot required -->
-<P145>1</P145>
+{if isset($grandstream_dhcp_option_override)}<P145>{$grandstream_dhcp_option_override}</P145>{else}<P145>1</P145>{/if}
 
 <!-- Automatic Upgrade. 0 - No, 1 - Check daily, 2 - Check weekly, 3 - Check every () minutes. Default is No. -->
 <!-- Number: 0,1,2,3 -->
@@ -1021,7 +1021,7 @@
 {if isset($grandstream_dial_plan) }
 <P4200>{$grandstream_dial_plan}</P4200>
 {else}
-<P4200>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P4200>
+<P4200>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P4200>
 {/if}
 
 <!-- Use # as Dial Key (if set to Yes, "#" will function as the "(Re-)Dial" key). 0 - no, 1 - yes -->
diff --git a/resources/templates/provision/grandstream/ht502/{$mac}.xml b/resources/templates/provision/grandstream/ht502/{$mac}.xml
index 4f849515a1..4e0759bcd2 100644
--- a/resources/templates/provision/grandstream/ht502/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht502/{$mac}.xml
@@ -53,7 +53,7 @@
                 <P237></P237>
                 {elseif isset($grandstream_config_server_path)}
                 <P237>{$grandstream_config_server_path}</P237>
-                {else}
+                {elseif isset($domain_name)}
                 <P237>{$domain_name}{$project_path}/app/provision</P237>
                 {/if}
 		
@@ -73,7 +73,7 @@
 		<P235></P235>
 		<!-- Allow DHCP Option 66 to override server. 0 - No, 1 - Yes. Default is Yes. -->
 		<!-- When set to Yes(1), it will override the configured provision path and method. -->
-		<P145>1</P145>
+		{if isset($grandstream_dhcp_option_override)}<P145>{$grandstream_dhcp_option_override}</P145>{else}<P145>1</P145>{/if}
 		<!-- Automatic Upgrade. 0 - No, 1 - Check daily, 2 - Check weekly, 3 - Check every () minutes. Default is No. -->
 		<P194>0</P194>
 		<!-- Check for new firmware/config file every () minutes, unit is in minute, minimum 60 minutes, default is 7 days. -->
@@ -334,7 +334,7 @@
 		{if isset($grandstream_dial_plan) }
 		<P4200>{$grandstream_dial_plan}</P4200>
 		{else}
-		<P4200>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P4200>
+		<P4200>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P4200>
 		{/if}
 		
 		<!-- SUBSCRIBE for MWI. 0 - No, 1 - Yes -->
diff --git a/resources/templates/provision/grandstream/ht503/{$mac}.xml b/resources/templates/provision/grandstream/ht503/{$mac}.xml
index e8ee007b2b..c56315f8db 100644
--- a/resources/templates/provision/grandstream/ht503/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht503/{$mac}.xml
@@ -150,7 +150,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
@@ -187,7 +187,7 @@
 <!--  Number: 0, 1 -->
 <!--  Mandatory -->
 <!--  Reboot required -->
-<P145>1</P145>
+{if isset($grandstream_dhcp_option_override)}<P145>{$grandstream_dhcp_option_override}</P145>{else}<P145>1</P145>{/if}
 
 <!--  Automatic Upgrade. 0 - No, 1 - Check daily, 2 - Check weekly, 3 - Check every () minutes. Default is No. -->
 <!--  Number: 0, 1, 2, 3 -->
@@ -693,7 +693,7 @@
 {if isset($grandstream_dial_plan) }
 <P4200>{$grandstream_dial_plan}</P4200>
 {else}
-<P4200>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P4200>
+<P4200>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P4200>
 {/if}
 
 <!--  SUBSCRIBE for MWI. 0 - No, 1 - Yes -->
diff --git a/resources/templates/provision/grandstream/ht701/{$mac}.xml b/resources/templates/provision/grandstream/ht701/{$mac}.xml
index abcbef51d8..15bf7d9282 100644
--- a/resources/templates/provision/grandstream/ht701/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht701/{$mac}.xml
@@ -75,7 +75,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
@@ -112,7 +112,7 @@
 <!-- When set to Yes(1), it will override the configured provision path and method. -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P145>1</P145>
+{if isset($grandstream_dhcp_option_override)}<P145>{$grandstream_dhcp_option_override}</P145>{else}<P145>1</P145>{/if}
 
 <!-- Automatic Upgrade. 0 - No, 1 - Check daily, 2 - Check weekly, 3 - Check every () minutes. Default is No. -->
 <!-- Number: 0, 1, 2, 3 -->
@@ -300,7 +300,7 @@
 <!-- Allow DHCP Option 120( override SIP server )  0 - No, 1 - Yes. -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P1411>0</P1411>
+{if isset($grandstream_dhcp_option_override_sip_server)}<P1411>{$grandstream_dhcp_option_override_sip_server}</P1411>{else}<P1411>0</P1411>{/if}
 
 <!-- SIP Transport 0 - UDP, 1 - TCP, 2 - TLS -->
 <!-- Number: 0, 1, 2 -->
@@ -620,7 +620,7 @@
 {if isset($grandstream_dial_plan) }
 <P4200>{$grandstream_dial_plan}</P4200>
 {else}
-<P4200>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P4200>
+<P4200>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P4200>
 {/if}
 
 <!-- SUBSCRIBE for MWI. 0 - No, 1 - Yes -->
diff --git a/resources/templates/provision/grandstream/ht702/{$mac}.xml b/resources/templates/provision/grandstream/ht702/{$mac}.xml
index 8589ea4b32..bc15b6e432 100644
--- a/resources/templates/provision/grandstream/ht702/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht702/{$mac}.xml
@@ -86,7 +86,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
@@ -123,7 +123,7 @@
 <!-- When set to Yes(1), it will override the configured provision path and method. -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P145>1</P145>
+{if isset($grandstream_dhcp_option_override)}<P145>{$grandstream_dhcp_option_override}</P145>{else}<P145>1</P145>{/if}
 
 <!-- Automatic Upgrade. 0 - No, 1 - Check daily, 2 - Check weekly, 3 - Check every () minutes. Default is No. -->
 <!-- Number: 0, 1, 2, 3 -->
@@ -299,7 +299,7 @@
 <!-- Allow DHCP Option 120( override SIP server )  0 - No, 1 - Yes. -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P1411>0</P1411>
+{if isset($grandstream_dhcp_option_override_sip_server)}<P1411>{$grandstream_dhcp_option_override_sip_server}</P1411>{else}<P1411>0</P1411>{/if}
 
 <!-- SIP Transport 0 - UDP, 1 - TCP, 2 - TLS -->
 <!-- Number: 0, 1, 2 -->
@@ -612,7 +612,7 @@
 {if isset($grandstream_dial_plan) }
 <P4200>{$grandstream_dial_plan}</P4200>
 {else}
-<P4200>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P4200>
+<P4200>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P4200>
 {/if}
 
 <!-- SUBSCRIBE for MWI. 0 - No, 1 - Yes -->
diff --git a/resources/templates/provision/grandstream/ht704/{$mac}.xml b/resources/templates/provision/grandstream/ht704/{$mac}.xml
index 6e0727c8d8..69a61175db 100644
--- a/resources/templates/provision/grandstream/ht704/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht704/{$mac}.xml
@@ -81,7 +81,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
@@ -117,7 +117,7 @@
 <!-- When set to Yes(1), it will override the configured provision path and method.-->
 <!-- Number: 0, 1-->
 <!-- Mandatory-->
-<P145>1</P145>
+{if isset($grandstream_dhcp_option_override)}<P145>{$grandstream_dhcp_option_override}</P145>{else}<P145>1</P145>{/if}
 
 <!-- Automatic Upgrade. 0 - No, 1 - Check daily, 2 - Check weekly, 3 - Check every () minutes. Default is No.-->
 <!-- Number: 0, 1, 2, 3-->
@@ -355,7 +355,7 @@
 <!-- Allow DHCP Option 120( override SIP server )  0 - No, 1 - Yes.-->
 <!-- Number: 0, 1-->
 <!-- Mandatory-->
-<P1411>0</P1411>
+{if isset($grandstream_dhcp_option_override_sip_server)}<P1411>{$grandstream_dhcp_option_override_sip_server}</P1411>{else}<P1411>0</P1411>{/if}
 
 <!-- SIP Transport 0 - UDP, 1 - TCP, 2 - TLS-->
 <!-- Number: 0, 1, 2-->
@@ -666,7 +666,7 @@
 {if isset($grandstream_dial_plan) }
 <P4200>{$grandstream_dial_plan}</P4200>
 {else}
-<P4200>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P4200>
+<P4200>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P4200>
 {/if}
 
 <!-- SUBSCRIBE for MWI. 0 - No, 1 - Yes -->
diff --git a/resources/templates/provision/grandstream/ht802/{$mac}.xml b/resources/templates/provision/grandstream/ht802/{$mac}.xml
index 1478b0aedc..63526f3143 100644
--- a/resources/templates/provision/grandstream/ht802/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht802/{$mac}.xml
@@ -105,7 +105,7 @@
     <P237></P237>
     {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-    {else}
+    {elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
     {/if}
 
@@ -142,7 +142,7 @@
     <!-- # When set to Yes(1), it will override the configured provision path and method. -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P145>1</P145>
+    {if isset($grandstream_dhcp_option_override)}<P145>{$grandstream_dhcp_option_override}</P145>{else}<P145>1</P145>{/if}
 
     <!-- # 3CX Auto Provision. 0 - No, 1 - Yes. Default is Yes. -->
     <!-- # Number: 0, 1 -->
@@ -563,7 +563,7 @@
     <!-- # Allow DHCP Option 120( override SIP server )  0 - No, 1 - Yes. -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1411>0</P1411>
+    {if isset($grandstream_dhcp_option_override_sip_server)}<P1411>{$grandstream_dhcp_option_override_sip_server}</P1411>{else}<P1411>0</P1411>{/if}
 
     <!-- # SIP Transport 0 - UDP, 1 - TCP, 2 - TLS -->
     <!-- # Number: 0, 1, 2 -->
@@ -1013,13 +1013,13 @@
     <!-- # Mandatory -->
     <P72>1</P72>
 
-<!-- Dial Plan -->
-<!--  String -->
+    <!-- Dial Plan -->
+    <!--  String -->
 	
 {if isset($grandstream_dial_plan) }
-<P4200>{$grandstream_dial_plan}</P4200>
+    <P4200>{$grandstream_dial_plan}</P4200>
 {else}
-<P4200>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P4200>
+    <P4200>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P4200>
 {/if}
 
     <!-- # SUBSCRIBE for MWI. 0 - No, 1 - Yes -->
@@ -1052,7 +1052,11 @@
     <!-- # Enable Session Timer. 0 - No, 1 - Yes. -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P2395>1</P2395>
+    {if isset($grandstream_session_timer)}
+	<P2395>{$grandstream_session_timer}</P2395>
+    {else}
+	<P2395>1</P2395>
+    {/if}
 
     <!-- # Session Expiration (in seconds. default 180 seconds. Allowed value: 90-64800) -->
     <!-- # Number: 90-64800 -->
@@ -1105,7 +1109,7 @@
     <P2359>0</P2359>
 
     <!-- # Conference URI -->
-    <P2318></P2318>
+    <P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
 
     <!-- ################################################################################# -->
     <!-- # Codec/Voice Quality settings                                                  # -->
@@ -1289,7 +1293,11 @@
     <!-- # Loop Current Disconnect. 0 - No, 1 - Yes -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
+    {if isset($grandstream_loop_current_disconnect)}
+    <P892>{$grandstream_loop_current_disconnect}</P892>
+    {else}
     <P892>0</P892>
+    {/if}
 
     <!-- # Play busy/reorder tone before Loop Current Disconnect. 0 - No, 1 - Yes. Default is 0.  -->
     <!-- # Number: 0, 1 -->
@@ -1896,7 +1904,12 @@
 
     <!-- # Dial Plan  -->
     <!-- # String -->
-    <P4201>{ x+ | \+x+ | *x+ | *xx*x+ }</P4201>
+
+{if isset($grandstream_dial_plan) }
+    <P4201>{$grandstream_dial_plan}</P4201>
+{else}
+    <P4201>{literal}{x+|*x+|*++|\p\a\r\k\+*x+|\p\a\r\k\+x+|\f\l\o\w\+*x+}{/literal}</P4201>
+{/if}	  
 
     <!-- # SUBSCRIBE for MWI. 0 - No, 1 - Yes -->
     <!-- # Number: 0, 1 -->
@@ -1974,7 +1987,7 @@
     <P2459>0</P2459>
 
     <!-- #Conference URI -->
-    <P2418></P2418>
+    <P2418>{if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}</P2418>
 
     <!-- ################################################################################# -->
     <!-- # Codec/Voice Quality settings                                                  # -->
diff --git a/resources/templates/provision/grandstream/ht818/{$mac}.xml b/resources/templates/provision/grandstream/ht818/{$mac}.xml
index aef0fff087..88f170f8d4 100644
--- a/resources/templates/provision/grandstream/ht818/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht818/{$mac}.xml
@@ -94,7 +94,7 @@
     <P237></P237>
     {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-    {else}
+    {elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
     {/if}
 
@@ -131,7 +131,7 @@
     <!-- # When set to Yes(1), it will override the configured provision path and method. -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P145>0</P145>
+    {if isset($grandstream_dhcp_option_override)}<P145>{$grandstream_dhcp_option_override}</P145>{else}<P145>1</P145>{/if}
 
     <!-- # 3CX Auto Provision. 0 - No, 1 - Yes. Default is Yes. -->
     <!-- # Number: 0, 1 -->
@@ -531,7 +531,7 @@
     <!-- # Allow DHCP Option 120( override SIP server )  0 - No, 1 - Yes. -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1411>0</P1411>
+    {if isset($grandstream_dhcp_option_override_sip_server)}<P1411>{$grandstream_dhcp_option_override_sip_server}</P1411>{else}<P1411>0</P1411>{/if}
 
     <!-- # SIP Transport 0 - UDP, 1 - TCP, 2 - TLS -->
     <!-- # Number: 0, 1, 2 -->
@@ -1048,7 +1048,7 @@
     <P2359>0</P2359>
 
     <!-- # Conference URI -->
-    <P2318></P2318>
+    <P2318>{if $nway_conference == true}nway{$account.1.user_id}@{$account.1.server_address}{/if}</P2318>
 
     <!-- ################################################################################# -->
     <!-- # Codec/Voice Quality settings                                                  # -->
diff --git a/resources/templates/provision/grandstream/htx86/{$mac}.xml b/resources/templates/provision/grandstream/htx86/{$mac}.xml
index 35e64e54f0..68441bc895 100644
--- a/resources/templates/provision/grandstream/htx86/{$mac}.xml
+++ b/resources/templates/provision/grandstream/htx86/{$mac}.xml
@@ -57,7 +57,7 @@
     <P237></P237>
     {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-    {else}
+    {elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
     {/if}
 
diff --git a/resources/templates/provision/grandstream/wp820/{$mac}.xml b/resources/templates/provision/grandstream/wp820/{$mac}.xml
index ffa7d518cb..d6ac56350b 100644
--- a/resources/templates/provision/grandstream/wp820/{$mac}.xml
+++ b/resources/templates/provision/grandstream/wp820/{$mac}.xml
@@ -26,31 +26,35 @@
 
 <!-- # Account Name -->
 <!-- # String -->
-<P270>{$display_name_1}</P270>
+<P270>{$account.1.display_name}</P270>
 
 <!-- # SIP Server -->
 <!-- # String -->
-<P47>{$server_address_1}</P47>
+<P47>{$account.1.server_address}:{$account.1.sip_port}</P47>
 
 <!-- # Secondary SIP Server -->
 <!-- # String -->
-<P2312>{$secondary_server_address_1}</P2312>
-
+    
+{if isset($account.1.server_address_secondary)}
+    <P2312>{$account.1.server_address_secondary}:{$account.1.sip_port}</P2312>
+{else}
+    <P2312>{$account.1.server_address_secondary}</P2312>
+{/if}
 <!-- # SIP User ID -->
 <!-- # String -->
-<P35>{$user_id_1}</P35>
+<P35>{$account.1.user_id}</P35>
 
 <!-- # SIP Authenticate ID -->
 <!-- # String -->
-<P36>{$auth_id_1}</P36>
+<P36>{$account.1.auth_id}</P36>
 
 <!-- # SIP Authenticate Password -->
 <!-- # String -->
-<P34>{$user_password_1}</P34>
+<P34>{$account.1.password}</P34>
 
 <!-- # Name -->
 <!-- # String -->
-<P3>{$display_name_1}</P3>
+<P3>{$account.1.display_name}</P3>
 
 <!-- # TEL URI. 0 - Disabled, 1 - User=Phone, 2 - Enabled. Default is 0 -->
 <!-- # Number: 0, 1, 2 -->
@@ -65,19 +69,28 @@
 
 <!-- # Outbound Proxy -->
 <!-- # String -->
-<P48>{$outbound_proxy_1}</P48>
+{if isset($account.1.outbound_proxy_primary)}
+    <P48>{$account.1.outbound_proxy_primary}:{$account.1.sip_port}</P48>
+{else}
+    <P48>{$account.1.outbound_proxy_primary}</P48>
+{/if}
 
 <!-- # Secondary Outbound Proxy -->
 <!-- # String -->
-<P2333></P2333>
+    
+{if isset($account.1.outbound_proxy_secondary)}
+    <P2333>{$account.1.outbound_proxy_secondary}:{$account.1.sip_port}</P2333>
+{else}
+    <P2333>{$account.1.outbound_proxy_secondary}</P2333>
+{/if}
 
 <!-- # DNS Mode. 0 - A Record, 1 - SRV, 2 - NAPTR/SRV. Default is 0 -->
 <!-- # Number: 0, 1, 2, 3 -->
 <!-- # Mandatory -->
 {if isset($grandstream_dns_mode)}
-<P103>{$grandstream_dns_mode}</P103>
+    <P103>{$grandstream_dns_mode}</P103>
 {else}
-<P103>0</P103>
+    <P103>0</P103>
 {/if}
 
 <!-- # DNS SRV Fail-over Mode. 0 - Default, 1 - Saved one until DNS TTL, 2 - Saved one until no response. Default is 0 -->
@@ -88,10 +101,11 @@
 <!-- # NAT Traversal. 0 - No, 1 - STUN, 2 - keep alive, 3 - UPnP, 4 - Auto, 5 - VPN. Default is 0. -->
 <!-- # Number: 0, 1, 2, 3, 4, 5 -->
 <!-- # Mandatory -->
+
 {if isset($grandstream_nat_traversal)}
-<P52>{$grandstream_nat_traversal}</P52>
+    <P52>{$grandstream_nat_traversal}</P52>
 {else}
-<P52>0</P52>
+    <P52>0</P52>
 {/if}
 
 <!-- # Proxy-Require (A SIP extension to enable firewall penetration). Max length is 64 characters -->
@@ -116,10 +130,10 @@
 <!-- # Register Expiration (in minutes). Default is 60. Max about 45 days -->
 <!-- # Number: 1 - 64800 -->
 <!-- # Mandatory -->
-{if isset($register_expires_1)}
-<P32>{$register_expires_1}</P32>
+{if isset($account.1.register_expires)}
+    <P32>{$account.1.register_expires}</P32>
 {else}
-<P32>2</P32>
+    <P32>2</P32>
 {/if}
 
 <!-- # Re-register Before Expiration (in seconds). Default is 0 second -->
@@ -157,9 +171,9 @@
 <!-- # Number: 0, 1 -->
 <!-- # Mandatory -->
 {if isset($subscribe_mwi)}
-<P99>1</P99>
+    <P99>1</P99>
 {else}
-<P99>0</P99>
+    <P99>0</P99>
 {/if}
 
 <!-- # Use Privacy Header -->
@@ -403,9 +417,9 @@
 <!-- # Number: 0, 1, 2, 3 -->
 <!-- # Mandatory -->
 {if isset($grandstream_srtp)}
-<P443>{$grandstream_srtp}</P443>
+    <P443>{$grandstream_srtp}</P443>
 {else}
-<P443>0</P443>
+    <P443>0</P443>
 {/if}
 
 <!-- # SRTP Key Length. 0 - AES 128&256 bit, 1 - AES 128 bit, 2 - AES 256 bit. Default is 0 -->
@@ -542,19 +556,19 @@
 
 <!-- # Matching Incoming Caller ID. Matching Rule 1 -->
 <!-- # String -->
-<P1488></P1488>
+<P1488>{$grandstream_distinctive_ringtone_name_1}</P1488>
 
 <!-- # Matching Rule 1 Distinctive Ringtone (Cannot be provisioned by config template currently) -->
 
 <!-- # Matching Incoming Caller ID. Matching Rule 2 -->
 <!-- # String -->
-<P1490></P1490>
+<P1490>{$grandstream_distinctive_ringtone_name_2}</P1490>
 
 <!-- # Matching Rule 2 Distinctive Ringtone (Cannot be provisioned by config template currently) -->
 
 <!-- # Matching Incoming Caller ID. Matching Rule 3 -->
 <!-- # String -->
-<P1492></P1492>
+<P1492>{$grandstream_distinctive_ringtone_name_3}</P1492>
 
 <!-- # Matching Rule 3 Distinctive Ringtone (Cannot be provisioned by config template currently) -->
 
@@ -636,39 +650,42 @@
 <!-- # Account Active. 0 - No, 1 - Yes. Default is 1 -->
 <!-- # Number: 0, 1 -->
 <!-- # Mandatory -->
-{if isset($user_password_2)}
-<P401>1</P401>
+{if isset($account.2.password)}
+    <P401>1</P401>
 {else}
-<P401>0</P401>
+    <P401>0</P401>
 {/if}
 
 <!-- # Account Name -->
 <!-- # String -->
-<P417>{$display_name_2}</P417>
+<P417>{$account.2.display_name}</P417>
 
 <!-- # SIP Server -->
 <!-- # String -->
-<P402>{$server_address_2}</P402>
+<P402>{$account.2.server_address}:{$account.2.sip_port}</P402>
 
 <!-- # Secondary SIP Server -->
 <!-- # String -->
-<P2412></P2412>
-
+{if isset($account.2.server_address_secondary)}
+    <P2412>{$account.2.server_address_secondary}:{$account.2.sip_port}</P2412>
+{else}
+    <P2412>{$account.2.server_address_secondary}</P2412>
+{/if}
 <!-- # SIP User ID -->
 <!-- # String -->
-<P404>{$user_id_2}</P404>
+<P404>{$account.2.user_id}</P404>
 
 <!-- # SIP Authenticate ID -->
 <!-- # String -->
-<P405>{$auth_id_2}</P405>
+<P405>{$account.2.auth_id}</P405>
 
 <!-- # SIP Authenticate Password -->
 <!-- # String -->
-<P406>{$user_password_2}</P406>
+<P406>{$account.2.password}</P406>
 
 <!-- # Name -->
 <!-- # String -->
-<P407>{$display_name_2}</P407>
+<P407>{$account.2.display_name}</P407>
 
 <!-- # TEL URI. 0 - Disabled, 1 - User=Phone, 2 - Enabled. Default is 0 -->
 <!-- # Number: 0, 1, 2 -->
@@ -683,19 +700,27 @@
 
 <!-- # Outbound Proxy -->
 <!-- # String -->
-<P403>{$outbound_proxy_2}</P403>
+{if isset($account.2.outbound_proxy_primary)}
+    <P403>{$account.2.outbound_proxy_primary}:{$account.2.sip_port}</P403>
+{else}
+    <P403>{$account.2.outbound_proxy_primary}</P403>
+{/if}
 
 <!-- # Backup Outbound Proxy -->
 <!-- # String -->
-<P2433></P2433>
+{if isset($account.2.outbound_proxy_secondary)}
+    <P2433>{$account.2.outbound_proxy_secondary}:{$account.2.sip_port}</P2433>
+{else}
+    <P2433>{$account.2.outbound_proxy_secondary}</P2433>
+{/if}
 
 <!-- # DNS Mode. 0 - A Record, 1 - SRV, 2 - NAPTR/SRV. Default is 0 -->
 <!-- # Number: 0, 1, 2, 3 -->
 <!-- # Mandatory -->
 {if isset($grandstream_dns_mode)}
-<P408>{$grandstream_dns_mode}</P408>
+    <P408>{$grandstream_dns_mode}</P408>
 {else}
-<P408>0</P408>
+    <P408>0</P408>
 {/if}
 
 <!-- # DNS SRV Fail-over Mode. 0 - Default, 1 - Saved one until DNS TTL, 2 - Saved one until no response. Default is 0 -->
@@ -707,9 +732,9 @@
 <!-- # Number: 0, 1, 2, 3, 4, 5 -->
 <!-- # Mandatory -->
 {if isset($grandstream_nat_traversal)}
-<P414>{$grandstream_nat_traversal}</P414>
+    <P414>{$grandstream_nat_traversal}</P414>
 {else}
-<P414>0</P414>
+    <P414>0</P414>
 {/if}
 
 <!-- # Proxy-Require (A SIP extension to enable firewall penetration). Max length is 64 characters -->
@@ -734,10 +759,10 @@
 <!-- # Register Expiration (in minutes). Default is 60. Max about 45 days -->
 <!-- # Number: 1 - 64800 -->
 <!-- # Mandatory -->
-{if isset($register_expires_2)}
-<P412>{$register_expires_2}</P412>
+{if isset($account.2.register_expires)}
+    <P412>{$account.2.register_expires}</P412>
 {else}
-<P412>2</P412>
+    <P412>2</P412>
 {/if}
 
 <!-- # Re-register Before Expiration (in seconds). Default is 0 second -->
@@ -775,9 +800,9 @@
 <!-- # Number: 0, 1 -->
 <!-- # Mandatory -->
 {if isset($subscribe_mwi)}
-<P415>1</P415>
+    <P415>1</P415>
 {else}
-<P415>0</P415>
+    <P415>0</P415>
 {/if}
 
 <!-- # Use Privacy Header -->
@@ -1021,9 +1046,9 @@
 <!-- # Number: 0, 1, 2, 3 -->
 <!-- # Mandatory -->
 {if isset($grandstream_srtp)}
-<P183>{$grandstream_srtp}</P183>
+    <P183>{$grandstream_srtp}</P183>
 {else}
-<P183>0</P183>
+    <P183>0</P183>
 {/if}
 
 <!-- # SRTP Key Length. 0 - AES 128&256 bit, 1 - AES 128 bit, 2 - AES 256 bit. Default is 0 -->
@@ -1160,7 +1185,7 @@
 
 <!-- # Match Incoming Caller ID. Matching Rule 1 -->
 <!-- # String -->
-<P1488></P1488>
+<P1488>{$grandstream_distinctive_ringtone_name_1}</P1488>
 
 <!-- # Matching Rule 1 Distinctive Ringtone -->
 <!-- # -1 - No Ringtone. Default is 0. -->
@@ -1170,23 +1195,23 @@
 
 <!-- # Matching Incoming Caller ID. Matching Rule 2 -->
 <!-- # String -->
-<P1490></P1490>
+<P1490>{$grandstream_distinctive_ringtone_name_2}</P1490>
 
 <!-- # Matching Rule 2 Distinctive Ringtone -->
 <!-- # -1 - No Rington Default is 0. -->
 <!-- # Number: -->
 <!-- # Mandatory -->
-<P1491>0</P1491>
+<P1491>{$grandstream_distinctive_ringtone_2}</P1491>
 
 <!-- # Matching Incoming Caller ID. Matching Rule 3 -->
 <!-- # String -->
-<P1492></P1492>
+<P1492>{$grandstream_distinctive_ringtone_name_3}</P1492>
 
 <!-- # Matching Rule 3 Distinctive Ringtone -->
 <!-- # -1 - No Ringtone Default is 0. -->
 <!-- # Number: -->
 <!-- # Mandatory -->
-<P1493>0</P1493>
+<P1493>{$grandstream_distinctive_ringtone_3}</P1493>
 
 <!-- ############################################################### -->
 <!-- # Account 2/Advanced Settings -->
@@ -1849,9 +1874,9 @@
 <!-- # Assign NTP Server Address  -->
 <!-- # String -->
 {if isset($ntp_server_primary)}
-<P30>{$ntp_server_primary}</P30>
+    <P30>{$ntp_server_primary}</P30>
 {else}
-<P30>pool.ntp.org</P30>
+    <P30>pool.ntp.org</P30>
 {/if}
 
 <!-- # DHCP Option 42 to override NTP server. 0 - No, 1 - Yes. Default is 1 -->
@@ -1963,9 +1988,11 @@
 
 <!-- # Time Zone -->
 {if isset($grandstream_timezone) }
-<P64>{$grandstream_timezone}</P64>
+    <P64>{$grandstream_timezone}</P64>
+{elseif isset($grandstream_gxp_time_zone) }
+    <P64>{$grandstream_gxp_time_zone}</P64>
 {else}
-<!-- # P64 = PST8PDT -->
+    <P64>auto</P64>
 {/if}
 
 <!-- # Time Display Format. 0 - 12 Hour, 1 - 24 Hour -->
@@ -2074,7 +2101,11 @@
 <!-- #################################################################### -->
 <!-- # New Admin Password  Default value is admin -->
 <!-- # String -->
-<P2>{$admin_password}</P2>
+{if isset($admin_password)}
+    <P2>{$admin_password}</P2>
+{else}
+    <P2>{$mac|replace:'-':''}</P2>
+{/if}
 
 <!-- #################################################################### -->
 <!-- # System Settings/Security Settings/SIP TLS                       ## -->
@@ -2235,7 +2266,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
@@ -2312,13 +2343,13 @@
 <!-- # When set to Yes(1), it will override the configured provision path and method -->
 <!-- # Number: 0, 1 -->
 <!-- # Mandatory -->
-<P145>1</P145>
+{if isset($grandstream_dhcp_option_override)}<P145>{$grandstream_dhcp_option_override}</P145>{else}<P145>1</P145>{/if}
 
 <!-- # Allow DHCP Option 120 to Override SIP Server -->
 <!-- # 0 - No, 1 - Yes. Default is 0 -->
 <!-- # Number: 0, 1 -->
 <!-- # Mandatory -->
-<P1411>0</P1411>
+{if isset($grandstream_dhcp_option_override_sip_server)}<P1411>{$grandstream_dhcp_option_override_sip_server}</P1411>{else}<P1411>0</P1411>{/if}
 
 <!-- # Allow DHCP Option 242 (Avaya IP Phones). 0 - Disabled, 1 - Enabled. Default value is 1. -->
 <!-- # Number: 0, 1 -->
@@ -2360,9 +2391,9 @@
 <!-- # Number: 0, 1 , 2, 3, 4 -->
 <!-- # Mandatory -->
 {if isset($grandstream_syslog_level)}
-<P208>{$grandstream_syslog_level}</P208>
+    <P208>{$grandstream_syslog_level}</P208>
 {else}
-<P208>0</P208>
+    <P208>0</P208>
 {/if}
 
 <!-- # Syslog Keyword Filtering -->
@@ -2487,9 +2518,9 @@
 <!-- # Number: 0, 120, 240, 360, 480, 720 -->
 <!-- # Mandatory -->
 {if isset($grandstream_phonebook_download_interval)}
-<P332>{$grandstream_phonebook_download_interval}</P332>
+    <P332>{$grandstream_phonebook_download_interval}</P332>
 {else}
-<P332>0</P332>
+    <P332>0</P332>
 {/if}
 
 <!-- ################## -->
diff --git a/resources/templates/provision/htek/uc903/{$mac}.cfg b/resources/templates/provision/htek/uc903/{$mac}.cfg
index f757d49868..cefab4f206 100644
--- a/resources/templates/provision/htek/uc903/{$mac}.cfg
+++ b/resources/templates/provision/htek/uc903/{$mac}.cfg
@@ -689,25 +689,25 @@
         <P20220 para="LineKey9.Type">{$line_key_type_9}</P20220>
         <P20221 para="LineKey9.Value">{$line_key_value_9}</P20221>
         <P20222 para="LineKey9.Label">{$line_key_label_9}</P20222>
-        <P20223 para="LineKey9.Account">0</P20223>
+        <P20223 para="LineKey9.Account">{$line_key_line_9}</P20223>
         <P20224 para="LineKey9.PickupCode" />
         <!--FunctionKeys/LineKey10-->
         <P20225 para="LineKey10.Type">{$line_key_type_10}</P20225>
         <P20226 para="LineKey10.Value">{$line_key_value_10}</P20226>
         <P20227 para="LineKey10.Label">{$line_key_label_10}</P20227>
-        <P20228 para="LineKey10.Account">0</P20228>
+        <P20228 para="LineKey10.Account">{$line_key_line_10}</P20228>
         <P20229 para="LineKey10.PickupCode" />
         <!--FunctionKeys/LineKey11-->
         <P20230 para="LineKey11.Type">{$line_key_type_11}</P20230>
         <P20231 para="LineKey11.Value">{$line_key_value_11}</P20231>
         <P20232 para="LineKey11.Label">{$line_key_label_11}</P20232>
-        <P20233 para="LineKey11.Account">0</P20233>
+        <P20233 para="LineKey11.Account">{$line_key_line_11}</P20233>
         <P20234 para="LineKey11.PickupCode" />
         <!--FunctionKeys/LineKey12-->
         <P20235 para="LineKey12.Type">{$line_key_type_12}</P20235>
         <P20236 para="LineKey12.Value">{$line_key_value_12}</P20236>
         <P20237 para="LineKey12.Label">{$line_key_label_12}</P20237>
-        <P20238 para="LineKey12.Account">0</P20238>
+        <P20238 para="LineKey12.Account">{$line_key_line_12}</P20238>
         <P20239 para="LineKey12.PickupCode" />
         
         <!--FunctionKeys/MemoryKey-->        
diff --git a/resources/templates/provision/htek/uc923/{$mac}.cfg b/resources/templates/provision/htek/uc923/{$mac}.cfg
index f757d49868..cefab4f206 100644
--- a/resources/templates/provision/htek/uc923/{$mac}.cfg
+++ b/resources/templates/provision/htek/uc923/{$mac}.cfg
@@ -689,25 +689,25 @@
         <P20220 para="LineKey9.Type">{$line_key_type_9}</P20220>
         <P20221 para="LineKey9.Value">{$line_key_value_9}</P20221>
         <P20222 para="LineKey9.Label">{$line_key_label_9}</P20222>
-        <P20223 para="LineKey9.Account">0</P20223>
+        <P20223 para="LineKey9.Account">{$line_key_line_9}</P20223>
         <P20224 para="LineKey9.PickupCode" />
         <!--FunctionKeys/LineKey10-->
         <P20225 para="LineKey10.Type">{$line_key_type_10}</P20225>
         <P20226 para="LineKey10.Value">{$line_key_value_10}</P20226>
         <P20227 para="LineKey10.Label">{$line_key_label_10}</P20227>
-        <P20228 para="LineKey10.Account">0</P20228>
+        <P20228 para="LineKey10.Account">{$line_key_line_10}</P20228>
         <P20229 para="LineKey10.PickupCode" />
         <!--FunctionKeys/LineKey11-->
         <P20230 para="LineKey11.Type">{$line_key_type_11}</P20230>
         <P20231 para="LineKey11.Value">{$line_key_value_11}</P20231>
         <P20232 para="LineKey11.Label">{$line_key_label_11}</P20232>
-        <P20233 para="LineKey11.Account">0</P20233>
+        <P20233 para="LineKey11.Account">{$line_key_line_11}</P20233>
         <P20234 para="LineKey11.PickupCode" />
         <!--FunctionKeys/LineKey12-->
         <P20235 para="LineKey12.Type">{$line_key_type_12}</P20235>
         <P20236 para="LineKey12.Value">{$line_key_value_12}</P20236>
         <P20237 para="LineKey12.Label">{$line_key_label_12}</P20237>
-        <P20238 para="LineKey12.Account">0</P20238>
+        <P20238 para="LineKey12.Account">{$line_key_line_12}</P20238>
         <P20239 para="LineKey12.PickupCode" />
         
         <!--FunctionKeys/MemoryKey-->        
diff --git a/resources/templates/provision/htek/uc924/{$mac}.cfg b/resources/templates/provision/htek/uc924/{$mac}.cfg
index 6ff80a679b..cd99dd4198 100644
--- a/resources/templates/provision/htek/uc924/{$mac}.cfg
+++ b/resources/templates/provision/htek/uc924/{$mac}.cfg
@@ -689,25 +689,25 @@
         <P20220 para="LineKey9.Type">{$line_key_type_9}</P20220>
         <P20221 para="LineKey9.Value">{$line_key_value_9}</P20221>
         <P20222 para="LineKey9.Label">{$line_key_label_9}</P20222>
-        <P20223 para="LineKey9.Account">0</P20223>
+        <P20223 para="LineKey9.Account">{$line_key_label_9}</P20223>
         <P20224 para="LineKey9.PickupCode" />
         <!--FunctionKeys/LineKey10-->
         <P20225 para="LineKey10.Type">{$line_key_type_10}</P20225>
         <P20226 para="LineKey10.Value">{$line_key_value_10}</P20226>
         <P20227 para="LineKey10.Label">{$line_key_label_10}</P20227>
-        <P20228 para="LineKey10.Account">0</P20228>
+        <P20228 para="LineKey10.Account">{$line_key_label_10}</P20228>
         <P20229 para="LineKey10.PickupCode" />
         <!--FunctionKeys/LineKey11-->
         <P20230 para="LineKey11.Type">{$line_key_type_11}</P20230>
         <P20231 para="LineKey11.Value">{$line_key_value_11}</P20231>
         <P20232 para="LineKey11.Label">{$line_key_label_11}</P20232>
-        <P20233 para="LineKey11.Account">0</P20233>
+        <P20233 para="LineKey11.Account">{$line_key_label_11}</P20233>
         <P20234 para="LineKey11.PickupCode" />
         <!--FunctionKeys/LineKey12-->
         <P20235 para="LineKey12.Type">{$line_key_type_12}</P20235>
         <P20236 para="LineKey12.Value">{$line_key_value_12}</P20236>
         <P20237 para="LineKey12.Label">{$line_key_label_12}</P20237>
-        <P20238 para="LineKey12.Account">0</P20238>
+        <P20238 para="LineKey12.Account">{$line_key_label_12}</P20238>
         <P20239 para="LineKey12.PickupCode" />
         
         <!--FunctionKeys/MemoryKey-->        
diff --git a/resources/templates/provision/htek/uc926/{$mac}.cfg b/resources/templates/provision/htek/uc926/{$mac}.cfg
index 9935d1a9b1..b318d7e40b 100644
--- a/resources/templates/provision/htek/uc926/{$mac}.cfg
+++ b/resources/templates/provision/htek/uc926/{$mac}.cfg
@@ -689,25 +689,25 @@
         <P20220 para="LineKey9.Type">{$line_key_type_9}</P20220>
         <P20221 para="LineKey9.Value">{$line_key_value_9}</P20221>
         <P20222 para="LineKey9.Label">{$line_key_label_9}</P20222>
-        <P20223 para="LineKey9.Account">0</P20223>
+        <P20223 para="LineKey9.Account">{$line_key_line_9}</P20223>
         <P20224 para="LineKey9.PickupCode" />
         <!--FunctionKeys/LineKey10-->
         <P20225 para="LineKey10.Type">{$line_key_type_10}</P20225>
         <P20226 para="LineKey10.Value">{$line_key_value_10}</P20226>
         <P20227 para="LineKey10.Label">{$line_key_label_10}</P20227>
-        <P20228 para="LineKey10.Account">0</P20228>
+        <P20228 para="LineKey10.Account">{$line_key_line_10}</P20228>
         <P20229 para="LineKey10.PickupCode" />
         <!--FunctionKeys/LineKey11-->
         <P20230 para="LineKey11.Type">{$line_key_type_11}</P20230>
         <P20231 para="LineKey11.Value">{$line_key_value_11}</P20231>
         <P20232 para="LineKey11.Label">{$line_key_label_11}</P20232>
-        <P20233 para="LineKey11.Account">0</P20233>
+        <P20233 para="LineKey11.Account">{$line_key_line_11}</P20233>
         <P20234 para="LineKey11.PickupCode" />
         <!--FunctionKeys/LineKey12-->
         <P20235 para="LineKey12.Type">{$line_key_type_12}</P20235>
         <P20236 para="LineKey12.Value">{$line_key_value_12}</P20236>
         <P20237 para="LineKey12.Label">{$line_key_label_12}</P20237>
-        <P20238 para="LineKey12.Account">0</P20238>
+        <P20238 para="LineKey12.Account">{$line_key_line_12}</P20238>
         <P20239 para="LineKey12.PickupCode" />
         
         <!--FunctionKeys/MemoryKey-->        
diff --git a/resources/templates/provision/polycom/3.x/{$mac}.cfg b/resources/templates/provision/polycom/3.x/{$mac}.cfg
index d90ce262b1..c049239c40 100644
--- a/resources/templates/provision/polycom/3.x/{$mac}.cfg
+++ b/resources/templates/provision/polycom/3.x/{$mac}.cfg
@@ -1,17 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <PHONE>
 	<REGISTRATION
-
-		reg.{$row.line_number}.serverFeatureControl.cf="{$polycom_feature_key_sync}"
-        	reg.{$row.line_number}.serverFeatureControl.dnd="{$polycom_feature_key_sync}"
-		
-		{foreach $lines as $row}reg.{$row.line_number}.displayName="{$row.display_name}"
+		{foreach $lines as $row}
+		reg.{$row.line_number}.displayName="{$row.display_name}"
 		reg.{$row.line_number}.address="{$row.user_id}@{$row.server_address}"
 		reg.{$row.line_number}.label="{$row.display_name}"
+
+		reg.{$row.line_number}.serverFeatureControl.cf="{$polycom_feature_key_sync}"
+		reg.{$row.line_number}.serverFeatureControl.dnd="{$polycom_feature_key_sync}"
+
 		reg.{$row.line_number}.type="private"
 		reg.{$row.line_number}.auth.userId="{$row.user_id}"
 		reg.{$row.line_number}.auth.password="{$row.password}"
 		{if isset($line_key_value_{$row.line_number})}reg.{$row.line_number}.lineKeys="{$line_key_value_{$row.line_number}}"{else}reg.{$row.line_number}.lineKeys="1"{/if}
+
 		{if isset($row.outbound_proxy)}reg.{$row.line_number}.outboundProxy.address = "{$row.outbound_proxy}"{/if}
 		{if isset($row.sip_port)}reg.{$row.line_number}.outboundProxy.port="{$row.sip_port}"{else}reg.{$row.line_number}.outboundProxy.port="5060"{/if}
 
@@ -34,34 +36,11 @@
 
 		{/foreach}
 	/>
-	<DEVICE_SETTINGS
-		device.set="1"
-		device.sntp.serverName="pool.ntp.org"
-		device.sntp.gmtOffset="{$polycom_gmt_offset}"
-		{if isset($admin_password)}
-		device.auth.localUserPassword.set="1" 
-		device.auth.localUserPassword="{$admin_password}"
-		{/if}
-		{if isset($admin_password)}
-		device.auth.localAdminPassword.set="1"
-		device.auth.localAdminPassword="{$admin_password}"
-		{/if}
-		{if isset($dns_server_primary)}device.dns.serverAddress="{$dns_server_primary}"{/if}
-		{if isset($dns_server_secondary)}device.dns.altSrvAddress="{$dns_server_secondary}"{/if}
-		{if isset($polycom_provision_url)}
-		device.prov.serverName="{$polycom_provision_url}"
-		{else}
-		device.prov.serverName="{$domain_name}"
-		{/if}
-		device.prov.serverType="{$polycom_server_type}"
-		device.prov.user="{$http_auth_username}"
-		device.prov.password="{$http_auth_password}"
-	/>
 	<SNTP
+		tcpIpApp.sntp.gmtOffset="{$polycom_gmt_offset}"
 		tcpIpApp.sntp.resyncPeriod="86400"
 		tcpIpApp.sntp.address="{$ntp_server_primary}"
 		tcpIpApp.sntp.gmtOffset.overrideDHCP="0"
-		tcpIpApp.sntp.gmtOffset="{$polycom_gmt_offset}"
 		tcpIpApp.sntp.daylightSavings.enable="1"
 		tcpIpApp.sntp.daylightSavings.fixedDayEnable="0"
 		tcpIpApp.sntp.daylightSavings.start.month="{$daylight_savings_start_month}"
@@ -100,60 +79,40 @@
 		{else}
 			attendant.behaviors.display.spontaneousCallAppearances.normal="0"
 		{/if}
-		feature.enhancedFeatureKeys.enabled="1"
 		{foreach $keys["line"] as $row}
 			{if $row.device_key_type == "automata" || $row.device_key_type == "normal"}
 				attendant.resourceList.{$row.device_key_id}.address="{$row.device_key_value}"
-				attendant.resourceList.{$row.device_key_id}.callAddress=""
 				attendant.resourceList.{$row.device_key_id}.label="{$row.device_key_label}"
-				attendant.resourceList.{$row.device_key_id}.proceedingIsRecipient="0"
 				attendant.resourceList.{$row.device_key_id}.type="{$row.device_key_type}"
-			{else}
-				{if $row.device_key_type != "line"}
-					{if $row.device_key_type == "URL"}
-						key.{$row.device_key_id}.function.prim="{$row.device_key_value}"
-					{else}
-						key.{$row.device_key_id}.function.prim="{$row.device_key_type}"
-						key.{$row.device_key_id}.subPoint.prim="{$row.device_key_value}"
-					{/if}
-				{/if}
 			{/if}
 		{/foreach}
 	/>
-	<MULTICAST_PAGING
-		ptt.pageMode.enable="0"
-		ptt.pageMode.displayName="INTERCOM"
-	/>
-	<REMOTE_PACKET_CAPTURE
-		diags.pcap.enabled="0"
-		diags.pcap.remote.enabled="0"
-	/>
 	<GENERAL
-		nat.keepalive.interval="30"
+		httpd.cfg.enabled="1"
+		httpd.cfg.port="80"
+		tcpIpApp.keepalive.tcp.idleTransmitInterval="30" 
+		tcpIpApp.keepalive.tcp.noResponseTrasmitInterval="300" 
 		voIpProt.SIP.specialEvent.checkSync.alwaysReboot="1"
 		voIpProt.SIP.requestValidation.1.request="INVITE" 
 		voIpProt.SIP.requestValidation.1.method="source"
-		feature.broadsoftUcOne.enabled="0"
 		voice.volume.persist.handset="1"
+		voice.volume.persist.headset="1"
 		voice.volume.persist.handsfree="1"
-		feature.nonVolatileRingerVolume.enabled="1"
-		{if $headset_mode != ''}up.handsfreeMode="1"
-		up.headsetMode="{$headset_mode}"{/if}
+		{if $headset_mode != ''}
+		up.handsfreeMode="1"
+		up.headsetMode="{$headset_mode}"
+		{/if}
 		{if $analog_headset_option != ''}up.analogHeadsetOption="{$analog_headset_option}"{/if}
 		{if isset($polycom_onetouchvoicemail)}
 			up.oneTouchVoiceMail="{$polycom_onetouchvoicemail}"
-			{else}
+		{else}
 			up.oneTouchVoiceMail="0"
 		{/if}
-		exchange.server.url="0.0.0.0"
 	/>
 	<SOFT_KEYS
 		softkey.1.label="VMTransfer"
 		softkey.1.action="^*99$P1N4$$Trefer$"
 		softkey.1.enable="1"
 		softkey.1.use.active="1"
-		efk.efkprompt.1.label="Voice Mail ID to transfer to:"
-		efk.efkprompt.1.status="1"
-		efk.efkprompt.1.type="numeric"
 	/>
 </PHONE>
diff --git a/resources/templates/provision/polycom/4.x/{$mac}.cfg b/resources/templates/provision/polycom/4.x/{$mac}.cfg
index aa328ea3ff..7a5ed10116 100644
--- a/resources/templates/provision/polycom/4.x/{$mac}.cfg
+++ b/resources/templates/provision/polycom/4.x/{$mac}.cfg
@@ -61,7 +61,12 @@
 		sec.srtp.enable="{$polycom_srtp_enable}"
 		sec.srtp.offer="{$polycom_srtp_offer}"
 		sec.srtp.require="{$polycom_srtp_require}"
-		sec.TLS.SIP.strictCertCommonNameValidation="0"
+		{if isset($polycom_root_cert)}sec.TLS.customCaCert.5="{$polycom_root_cert}"{/if}
+		{if isset($polycom_cert_validation)}sec.TLS.SIP.strictCertCommonNameValidation="{$polycom_cert_validation}"{/if}
+		{if isset($polycom_provision_cert_validate)}
+		device.sec.TLS.prov.strictCertCommonNameValidation.set ="1" 
+		device.sec.TLS.prov.strictCertCommonNameValidation="{$polycom_provision_cert_validate}"
+		{/if}
 	/>
 	<DEVICE_SETTINGS
 		device.set="1"
@@ -212,9 +217,12 @@
 		up.headsetMode="1"
 		voice.aec.hf.enable="1"
 		voice.aec.hs.enable="1"
-
-		msg.mwi.{$row.line_number}.callBackMode="contact"
-		msg.mwi.{$row.line_number}.callBack="{$voicemail_number}"
+		{foreach $lines as $row}
+			msg.mwi.{$row.line_number}.callBackMode="contact"
+			msg.mwi.{$row.line_number}.callBack="{$voicemail_number}"
+		{/foreach}
+		reg.1.server.1.subscribe.expires="2592000"
+		{if isset($polycom_contacts_directory)}contacts_directory="{$polycom_contacts_directory}/{$domain_name}/"{/if}
 	/>
 
 	<SOFT_KEYS
@@ -226,4 +234,7 @@
 		efk.efkprompt.1.status="1"
 		efk.efkprompt.1.type="numeric"
 	/>
+	<LANGUAGE
+		lcl.ml.lang="{$polycom_display_language}"
+	/>
 </PHONE>
diff --git a/resources/templates/provision/polycom/5.x/{$mac}.cfg b/resources/templates/provision/polycom/5.x/{$mac}.cfg
index 6433654407..2e7c70ce85 100644
--- a/resources/templates/provision/polycom/5.x/{$mac}.cfg
+++ b/resources/templates/provision/polycom/5.x/{$mac}.cfg
@@ -51,11 +51,20 @@
 		sec.srtp.enable="{$polycom_srtp_enable}"
 		sec.srtp.offer="{$polycom_srtp_offer}"
 		sec.srtp.require="{$polycom_srtp_require}"
-		{if isset($polycom_cert_validation)}sec.TLS.SIP.strictCertCommonNameValidation="{$polycom_cert_validation}"{/if}
 		{if isset($polycom_root_cert)}sec.TLS.customCaCert.5="{$polycom_root_cert}"{/if}
-		{if isset($polycom_provision_cert_validate)}device.sec.TLS.prov.strictCertCommonNameValidation="{$polycom_provision_cert_validate}"{/if}
-		{if isset($polycom_provision_cert_validate)}sec.TLS.SIP.strictCertCommonNameValidation="{$polycom_provision_cert_validate}"{/if}
+		{if isset($polycom_cert_validation)}sec.TLS.SIP.strictCertCommonNameValidation="{$polycom_cert_validation}"{/if}
+		{if isset($polycom_provision_cert_validate)} 
+		device.sec.TLS.prov.strictCertCommonNameValidation.set ="1" 
+		device.sec.TLS.prov.strictCertCommonNameValidation="{$polycom_provision_cert_validate}"
+		{/if}
+		{if isset($polycom_platform_profile_cipher_suite)} 
+		device.sec.TLS.profile.cipherSuiteDefault1.set="1"
+		device.sec.TLS.profile.cipherSuiteDefault1="0"
+		device.sec.TLS.profile.cipherSuite1.set="1"
+		device.sec.TLS.profile.cipherSuite1="{$polycom_platform_profile_cipher_suite}"
+		{/if}		
 	/>
+
 	<DEVICE_SETTINGS
 		device.set="1"
 		device.baseProfile.set="1"
@@ -89,6 +98,12 @@
 		device.prov.password="{$http_auth_password}"
 		device.prov.tagSerialNo.set="1"
 		device.prov.tagSerialNo="1"
+		device.prov.redunAttemptLimit.set="1"
+		device.prov.redunAttemptLimit="10"
+		device.prov.redunInterAttemptDelay.set="1"
+		device.prov.redunInterAttemptDelay="150"
+		device.prov.abortSWUpgradeAfterFailures.set="1"
+		device.prov.abortSWUpgradeAfterFailures="3"
 		{if isset($polycom_syslog_server)}
 		device.syslog.serverName.set="1"
 		device.syslog.serverName="{$polycom_syslog_server}"
@@ -172,6 +187,7 @@
 	/>
 	<MULTICAST_PAGING
 		ptt.pageMode.enable="{$polycom_page_enable}"
+		ptt.pageMode.group.1.label="Page All"
 	/>
 	<REMOTE_PACKET_CAPTURE
 		diags.pcap.enabled="0"
@@ -181,7 +197,8 @@
 		{if isset($polycom_nat_ip)}
 		nat.ip="{$polycom_nat_ip}"
 		{/if}
-		nat.keepalive.interval="30"
+		{if isset($polycom_keep_alive)}nat.keepalive.interval="{$polycom_keep_alive}"
+		{else}nat.keepalive.interval="30"{/if}
 		voIpProt.SIP.specialEvent.checkSync.alwaysReboot="1"
 		voIpProt.SIP.requestValidation.1.method="{$polycom_request_validation_method}"
 		voIpProt.SIP.requestValidation.1.request="{$polycom_request_validation_request}"
@@ -200,6 +217,9 @@
 		voice.volume.persist.handset="1"
 		voice.volume.persist.handsfree="1"
 		voice.volume.persist.headset="1"
+		voice.volume.persist.usbHeadset="1"
+		voice.volume.persist.bluetooth.headset="1"
+		voice.volume.persist.usb.handsfree="1"
 		feature.nonVolatileRingerVolume.enabled="1"
 		up.headsetMode="{$polycom_headset_mode}"
 		{if isset($polycom_analog_headset_option)}up.analogHeadsetOption="{$polycom_analog_headset_option}"{/if}
@@ -222,22 +242,92 @@
 		{if isset($polycom_video_enable)}video.enable="{$polycom_video_enable}"{/if}
 		{if isset($polycom_video_audio_call_mode)}video.callMode.default="{$polycom_video_audio_call_mode}"	{/if}
 		{if isset($polycom_video_audio_toggle)}feature.audioVideoToggle.enabled="{$polycom_video_audio_toggle}"	{/if}
-		msg.mwi.{$row.line_number}.callBackMode="contact"
-		msg.mwi.{$row.line_number}.callBack="{$voicemail_number}"
-		feature.intercom.enable="{$polycom_intercom_enable}"
+		{foreach $lines as $row}
+			msg.mwi.{$row.line_number}.callBackMode="contact"
+			msg.mwi.{$row.line_number}.callBack="{$voicemail_number}"
+		{/foreach}
+		{if isset($polycom_diversion_header)}voIpProt.SIP.header.diversion.enable="{$polycom_diversion_header}"{/if}
+		reg.1.server.1.subscribe.expires="2592000"
+		{if isset($polycom_contacts_directory)}contacts_directory="{$polycom_contacts_directory}/{$domain_name}/"{/if}
+		{if isset($polycom_pagination_enabled)}up.Pagination.enabled="{$polycom_pagination_enabled}"{/if}
 	/>
 	<SOFT_KEYS
 		softkey.1.label="VMTransfer"
 		softkey.1.action="^*99$P1N4$$Trefer$"
 		softkey.1.enable="1"
 		softkey.1.use.active="1"
+		softkey.1.precede="1"
 		efk.efkprompt.1.label="Voice Mail ID to transfer to:"
 		efk.efkprompt.1.status="1"
 		efk.efkprompt.1.type="numeric"
+		{if isset($polycom_intercom_enable)}
+		softkey.2.label="Intercom"
+		softkey.2.action="^*8$P2N4$$Tinvite$"
+		softkey.2.enable="1"
+		softkey.2.use.idle="1"
+		efk.efkprompt.2.label="Enter destination"
+		efk.efkprompt.2.status="1"
+		efk.efkprompt.2.type="numeric"
+		efk.efkprompt.2.userfeedback="visible"
+		efk.efkprompt.2.digitmatching="none"
+		{/if}
+		{if isset($polycom_pickup_enable)}
+		softkey.3.label="Pick up"
+		softkey.3.action="^**$P3N4$$Tinvite$"
+		softkey.3.enable="1"
+		softkey.3.use.idle="1"
+		efk.efkprompt.3.label="Enter ext to intercept"
+		efk.efkprompt.3.status="1"
+		efk.efkprompt.3.type="numeric"
+		efk.efkprompt.3.userfeedback="visible"
+		efk.efkprompt.3.digitmatching="none"
+		{/if}
 		{if isset($polycom_softkey_do_not_disturb)}softkey.feature.doNotDisturb="{$polycom_softkey_do_not_disturb}"{/if}
 		{if isset($polycom_softkey_forward)}softkey.feature.forward="{$polycom_softkey_forward}"{/if}
+		{if isset($polycom_softkey_newcall)}softkey.feature.newcall="{$polycom_softkey_newcall}"{/if}
+		{if isset($polycom_softkey_directories)}softkey.feature.directories="{$polycom_softkey_directories}"{/if}
+		{if isset($polycom_basic_call_management_redundant)}
+		softkey.feature.basicCallManagement.redundant="{$polycom_basic_call_management_redundant}"
+		efk.softkey.alignleft="1"
+		{/if}
+	/>
+	<HOME_SCREEN
+		{if isset($polycom_homescreen_do_not_disturb)}homeScreen.doNotDisturb.enable="{$polycom_homescreen_do_not_disturb}"{/if}
+		{if isset($polycom_homescreen_forward)}homeScreen.forward.enable="{$polycom_homescreen_forward}"{/if}
+		{if isset($polycom_homescreen_directories)}homeScreen.directories.enable="{$polycom_homescreen_directories}"{/if}
+		homeScreen.intercom.enable="0"
 	/>
 	<USB 
 		feature.callRecording.enabled="0"
 	/>
+	<LANGUAGE
+		lcl.ml.lang="{$polycom_display_language}"
+	/>
+	
+	<NETWORK_SETTINGS
+		{if isset($polycom_dns_server)} 
+		device.dns.serverAddress.set="1"
+		device.dns.serverAddress="{$polycom_dns_server}"
+		{/if}
+		{if isset($polycom_dns_alt_server)} 
+		device.dns.altSrvAddress.set="1"
+		device.dns.altSrvAddress="{$polycom_dns_alt_server}"
+		{/if}
+		{if isset($polycom_boot_server_option)}
+		device.dhcp.bootSrvUseOpt.set="1"
+		device.dhcp.bootSrvUseOpt="{$polycom_boot_server_option}"
+		{/if}
+		{if isset($polycom_lldp_enabled)}
+		device.net.lldpEnabled.set="1"
+		device.net.lldpEnabled="{$polycom_lldp_enabled}"
+		{/if}
+		{if isset($polycom_cdp_enabled)}
+		device.net.cdpEnabled.set="1"
+		device.net.cdpEnabled="{$polycom_cdp_enabled}"
+		{/if}
+		{if isset($polycom_dhcp_vlan_discovery)}
+		device.dhcp.dhcpVlanDiscUseOpt.set="1"
+		device.dhcp.dhcpVlanDiscUseOpt="{$polycom_dhcp_vlan_discovery}"
+		{/if}
+	/>
 </PHONE>
diff --git a/resources/templates/provision/polycom/6.x/{$mac}-directory.xml b/resources/templates/provision/polycom/6.x/{$mac}-directory.xml
new file mode 100644
index 0000000000..bbc5b1624b
--- /dev/null
+++ b/resources/templates/provision/polycom/6.x/{$mac}-directory.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<directory>
+	<item_list>
+		{assign var=x value=1}
+		{foreach $contacts as $row}
+		<item>
+			{if $row.contact_name_given != ""}
+			<ln>{$row.contact_name_family}</ln>
+			<fn>{$row.contact_name_given}</fn>
+			{else}
+			<ln>{$row.contact_organization}</ln>
+			{/if}
+			{if $row.phone_number != ""}
+			<ct>{$row.phone_number}</ct>
+			{else}
+			<ct>{$row.phone_extension}</ct>
+			{/if}
+			<rt>7</rt>
+			<dc/>
+			<ad>0</ad>
+			<ar>0</ar>
+			<bw>0</bw>
+			<bb>0</bb>
+		</item>
+		{assign var=x value=$x+1}
+		{/foreach}
+	</item_list>
+</directory>
diff --git a/resources/templates/provision/polycom/6.x/{$mac}.cfg b/resources/templates/provision/polycom/6.x/{$mac}.cfg
new file mode 100644
index 0000000000..2e7c70ce85
--- /dev/null
+++ b/resources/templates/provision/polycom/6.x/{$mac}.cfg
@@ -0,0 +1,333 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<PHONE>
+	<REGISTRATION
+	{foreach $lines as $row}reg.{$row.line_number}.displayName="{$row.display_name}"
+		reg.{$row.line_number}.address="{$row.user_id}@{$row.server_address}"
+		reg.{$row.line_number}.label="{$row.display_name}"
+		reg.{$row.line_number}.serverFeatureControl.cf="{$polycom_feature_key_sync}"
+		reg.{$row.line_number}.serverFeatureControl.dnd="{$polycom_feature_key_sync}"
+		{if isset($row.shared_line)}reg.{$row.line_number}.type="{$row.shared_line}"{else}reg.{$row.line_number}.type="private"{/if}
+		reg.{$row.line_number}.thirdPartyName=""
+		reg.{$row.line_number}.auth.userId="{$row.user_id}"
+		reg.{$row.line_number}.auth.password="{$row.password}"
+                {if isset($line_key_value_{$row.line_number})}reg.{$row.line_number}.lineKeys="{$line_key_value_{$row.line_number}}"{else}reg.{$row.line_number}.lineKeys="1"{/if}
+		{if isset($row.outbound_proxy)}reg.{$row.line_number}.outboundProxy.address = "{$row.outbound_proxy}"{/if}
+		{if isset($row.sip_port)}reg.{$row.line_number}.outboundProxy.port="{$row.sip_port}"{else}reg.{$row.line_number}.outboundProxy.port="5060"{/if}
+		{if $row.sip_transport == ''}reg.{$row.line_number}.outboundProxy.transport="TCPOnly"{/if}
+		{if $row.sip_transport == 'tcp'}reg.{$row.line_number}.outboundProxy.transport="TCPOnly"{/if}
+		{if $row.sip_transport == 'udp'}reg.{$row.line_number}.outboundProxy.transport="UDPOnly"{/if}
+		{if $row.sip_transport == 'tls'}reg.{$row.line_number}.outboundProxy.transport="TLS" {/if}
+		{if $row.sip_transport == 'dns srv'}reg.{$row.line_number}.outboundProxy.transport="DNSnaptr"{/if}
+		{if isset($row.server_address_primary)}
+		reg.{$row.line_number}.server.1.address="{$row.server_address_primary}"
+		{else}
+		reg.{$row.line_number}.server.1.address="{$row.server_address}"
+		{/if}
+		{if isset($row.sip_port)}
+		reg.{$row.line_number}.server.1.port="{$row.sip_port}"
+		{else}
+		reg.{$row.line_number}.server.1.port="5060"
+		{/if}
+		{if $row.sip_transport == ''}reg.{$row.line_number}.server.1.transport="TCPOnly"{/if}
+		{if $row.sip_transport == 'tcp'}reg.{$row.line_number}.server.1.transport="TCPOnly"{/if}
+		{if $row.sip_transport == 'udp'}reg.{$row.line_number}.server.1.transport="UDPOnly"{/if}
+		{if $row.sip_transport == 'tls'}reg.{$row.line_number}.server.1.transport="TLS" {/if}
+		{if $row.sip_transport == 'dns srv'}reg.{$row.line_number}.server.1.transport="DNSnaptr"{/if}
+		{if isset($row.register_expires)}reg.{$row.line_number}.server.1.expires="{$row.register_expires}"{else}reg.{$row.line_number}.server.1.expires="{$row.register_expires}"{/if}
+		reg.{$row.line_number}.server.2.address="{$row.server_address_secondary}"
+		{if isset($row.sip_port)}
+		reg.{$row.line_number}.server.2.port="{$row.sip_port}"
+		{else}reg.{$row.line_number}.server.1.port="5060"
+		{/if}
+		{if $row.sip_transport == ''}reg.{$row.line_number}.server.2.transport="TCPOnly"{/if}
+		{if $row.sip_transport == 'tcp'}reg.{$row.line_number}.server.2.transport="TCPOnly"{/if}
+		{if $row.sip_transport == 'udp'}reg.{$row.line_number}.server.2.transport="UDPOnly"{/if}
+		{if $row.sip_transport == 'tls'}reg.{$row.line_number}.server.2.transport="TLS" {/if}
+		{if $row.sip_transport == 'dns srv'}reg.{$row.line_number}.server.2.transport="DNSnaptr"{/if}
+		{if isset($row.register_expires)}reg.{$row.line_number}.server.2.expires="{$row.register_expires}"{else}reg.{$row.line_number}.server.2.expires="{$row.register_expires}"{/if}
+	{/foreach}
+	/>
+	<SECURITY
+		sec.srtp.enable="{$polycom_srtp_enable}"
+		sec.srtp.offer="{$polycom_srtp_offer}"
+		sec.srtp.require="{$polycom_srtp_require}"
+		{if isset($polycom_root_cert)}sec.TLS.customCaCert.5="{$polycom_root_cert}"{/if}
+		{if isset($polycom_cert_validation)}sec.TLS.SIP.strictCertCommonNameValidation="{$polycom_cert_validation}"{/if}
+		{if isset($polycom_provision_cert_validate)} 
+		device.sec.TLS.prov.strictCertCommonNameValidation.set ="1" 
+		device.sec.TLS.prov.strictCertCommonNameValidation="{$polycom_provision_cert_validate}"
+		{/if}
+		{if isset($polycom_platform_profile_cipher_suite)} 
+		device.sec.TLS.profile.cipherSuiteDefault1.set="1"
+		device.sec.TLS.profile.cipherSuiteDefault1="0"
+		device.sec.TLS.profile.cipherSuite1.set="1"
+		device.sec.TLS.profile.cipherSuite1="{$polycom_platform_profile_cipher_suite}"
+		{/if}		
+	/>
+
+	<DEVICE_SETTINGS
+		device.set="1"
+		device.baseProfile.set="1"
+		device.baseProfile="Generic"
+		device.sntp.serverName="{$ntp_server_primary}"
+		device.sntp.gmtOffset="{$polycom_gmt_offset}"
+		device.prov.upgradeServer.set="1"
+		device.prov.upgradeServer="{$polycom_firmware_url}"
+		{if isset($admin_password)}
+		device.auth.localUserPassword.set="1" 
+		device.auth.localUserPassword="{$admin_password}"
+		{/if}
+		{if isset($admin_password)}
+		device.auth.localAdminPassword.set="1"
+		device.auth.localAdminPassword="{$admin_password}"
+		{/if}
+		{if isset($dns_server_primary)}device.dns.serverAddress="{$dns_server_primary}"{/if}
+		{if isset($dns_server_secondary)}device.dns.altSrvAddress="{$dns_server_secondary}"{/if}
+		{if isset($polycom_provision_url)}
+		device.prov.serverName.set="1"
+		device.prov.serverName="{$polycom_provision_url}"
+		{else}
+		device.prov.serverName.set="1"
+		device.prov.serverName="{$domain_name}/app/provision/"
+		{/if}
+		device.prov.serverType.set="1"
+		device.prov.serverType="{$polycom_server_type}"
+		device.prov.user.set="1"
+		device.prov.user="{$http_auth_username}"
+		device.prov.password.set="1"
+		device.prov.password="{$http_auth_password}"
+		device.prov.tagSerialNo.set="1"
+		device.prov.tagSerialNo="1"
+		device.prov.redunAttemptLimit.set="1"
+		device.prov.redunAttemptLimit="10"
+		device.prov.redunInterAttemptDelay.set="1"
+		device.prov.redunInterAttemptDelay="150"
+		device.prov.abortSWUpgradeAfterFailures.set="1"
+		device.prov.abortSWUpgradeAfterFailures="3"
+		{if isset($polycom_syslog_server)}
+		device.syslog.serverName.set="1"
+		device.syslog.serverName="{$polycom_syslog_server}"
+		device.syslog.transport.set="1"
+		device.syslog.transport="{$polycom_syslog_transport}"
+		device.syslog.facility.set="1"
+		device.syslog.facility="{$polycom_syslog_facility}"
+		device.syslog.renderLevel.set="1"
+		device.syslog.renderLevel="{$polycom_syslog_renderlevel}"
+		device.syslog.prependMac.set="1"
+		device.syslog.prependMac="{$polycom_syslog_prependmac}"
+		{/if}
+	/>
+	<SNTP
+		tcpIpApp.sntp.resyncPeriod="86400"
+		tcpIpApp.sntp.address="{$ntp_server_primary}"
+		tcpIpApp.sntp.gmtOffset.overrideDHCP="1"
+		tcpIpApp.sntp.gmtOffset="{$polycom_gmt_offset}"
+		{if $daylight_savings_enabled == "false"}
+		tcpIpApp.sntp.daylightSavings.enable="0"
+		{else}
+		tcpIpApp.sntp.daylightSavings.enable="1"
+		{/if}
+		tcpIpApp.sntp.daylightSavings.fixedDayEnable="0"
+		tcpIpApp.sntp.daylightSavings.start.month="{$daylight_savings_start_month}"
+		tcpIpApp.sntp.daylightSavings.start.date="{$daylight_savings_start_day}"
+		tcpIpApp.sntp.daylightSavings.start.time="{$daylight_savings_start_time}"
+		tcpIpApp.sntp.daylightSavings.start.dayOfWeek="1"
+		tcpIpApp.sntp.daylightSavings.start.dayOfWeek.lastInMonth="0"
+		tcpIpApp.sntp.daylightSavings.stop.month="{$daylight_savings_stop_month}"
+		tcpIpApp.sntp.daylightSavings.stop.date="{$daylight_savings_stop_day}"
+		tcpIpApp.sntp.daylightSavings.stop.time="{$daylight_savings_stop_time}"
+		tcpIpApp.sntp.daylightSavings.stop.dayOfWeek="1"
+		tcpIpApp.sntp.daylightSavings.stop.dayOfWeek.lastInMonth="0"
+	/>
+	<DIALPLAN
+		{if isset($polycom_digitmap)}dialplan.digitmap="{$polycom_digitmap}"{else}dialplan.digitmap=""{/if}
+		{if isset($polycom_digitmap_timeout)}dialplan.digitmap.timeOut="{$polycom_digitmap_timeout}"{else}dialplan.digitmap.timeOut=""{/if}
+	/>
+	<DEVICE_KEYS
+		attendant.uri=""
+		{if isset($polycom_remotecallerid_automata)}
+			attendant.behaviors.display.remoteCallerID.automata="{$polycom_remotecallerid_automata}"
+		{else}
+			attendant.behaviors.display.remoteCallerID.automata="0"
+		{/if}
+		{if isset($polycom_remotecallerid_normal)}
+			attendant.behaviors.display.remoteCallerID.normal="{$polycom_remotecallerid_normal}"
+		{else}
+			attendant.behaviors.display.remoteCallerID.normal="0"
+		{/if}
+		{if isset($polycom_spontaneouscallappearances_automata)}
+			attendant.behaviors.display.spontaneousCallAppearances.automata="{$polycom_spontaneouscallappearances_automata}"
+		{else}
+			attendant.behaviors.display.spontaneousCallAppearances.automata="0"
+		{/if}
+		{if isset($polycom_spontaneouscallappearances_normal)}
+			attendant.behaviors.display.spontaneousCallAppearances.normal="{$polycom_spontaneouscallappearances_normal}"
+		{else}
+			attendant.behaviors.display.spontaneousCallAppearances.normal="0"
+		{/if}
+		feature.enhancedFeatureKeys.enabled="1"
+		{foreach $keys["line"] as $row}
+			{if $row.device_key_type == "automata" || $row.device_key_type == "normal"}
+				attendant.resourceList.{$row.device_key_id}.address="{$row.device_key_value}"
+				attendant.resourceList.{$row.device_key_id}.callAddress=""
+				attendant.resourceList.{$row.device_key_id}.label="{$row.device_key_label}"
+				attendant.resourceList.{$row.device_key_id}.proceedingIsRecipient="0"
+				attendant.resourceList.{$row.device_key_id}.type="{$row.device_key_type}"
+			{else}
+				{if $row.device_key_type != "line"}
+					{if $row.device_key_type == "URL"}
+						key.{$row.device_key_id}.function.prim="{$row.device_key_value}"
+					{else}
+						key.{$row.device_key_id}.function.prim="{$row.device_key_type}"
+						key.{$row.device_key_id}.subPoint.prim="{$row.device_key_value}"
+					{/if}
+				{/if}
+			{/if}
+		{/foreach}
+	/>
+	<MULTICAST_PAGING
+		ptt.pageMode.enable="{$polycom_page_enable}"
+		ptt.pageMode.group.1.label="Page All"
+	/>
+	<REMOTE_PACKET_CAPTURE
+		diags.pcap.enabled="0"
+		diags.pcap.remote.enabled="0"
+	/>
+	<GENERAL
+		{if isset($polycom_nat_ip)}
+		nat.ip="{$polycom_nat_ip}"
+		{/if}
+		{if isset($polycom_keep_alive)}nat.keepalive.interval="{$polycom_keep_alive}"
+		{else}nat.keepalive.interval="30"{/if}
+		voIpProt.SIP.specialEvent.checkSync.alwaysReboot="1"
+		voIpProt.SIP.requestValidation.1.method="{$polycom_request_validation_method}"
+		voIpProt.SIP.requestValidation.1.request="{$polycom_request_validation_request}"
+		voIpProt.server.1.failOver.reRegisterOn="1"
+		voIpProt.server.1.failOver.failRegistrationOn="1"
+		voIpProt.server.1.failOver.onlySignalWithRegistered="1" 
+		voIpProt.server.1.failOver.failBack.mode="duration"
+		voIpProt.server.1.failOver.failBack.timeout="120"
+		voIpProt.server.2.failOver.reRegisterOn="1"
+		voIpProt.server.2.failOver.failRegistrationOn="1"
+		voIpProt.server.2.failOver.onlySignalWithRegistered="1" 
+		voIpProt.server.2.failOver.failBack.mode="duration"
+		voIpProt.server.2.failOver.failBack.timeout="120"
+		{if isset($polycom_bluetooth_radio_on)}feature.bluetooth.radioOn="{$polycom_bluetooth_radio_on}"{/if}
+		feature.broadsoftUcOne.enabled="0"
+		voice.volume.persist.handset="1"
+		voice.volume.persist.handsfree="1"
+		voice.volume.persist.headset="1"
+		voice.volume.persist.usbHeadset="1"
+		voice.volume.persist.bluetooth.headset="1"
+		voice.volume.persist.usb.handsfree="1"
+		feature.nonVolatileRingerVolume.enabled="1"
+		up.headsetMode="{$polycom_headset_mode}"
+		{if isset($polycom_analog_headset_option)}up.analogHeadsetOption="{$polycom_analog_headset_option}"{/if}
+		up.oneTouchVoiceMail="{$polycom_one_touch_voicemail}"
+		exchange.server.url="0.0.0.0"
+		up.warningLevel="2"
+		call.defaultTransferType="{$polycom_default_transfer_method}"
+		call.callWaiting.enable="{$polycom_call_waiting}"
+		call.callWaiting.ring="beep"
+		call.callsPerLineKey="{$polycom_calls_per_line_key}"
+		up.OffHookLineView.enabled="{$polycom_offhook_line_view_enabled}"
+		prov.polling.enabled="{$polycom_provision_polling_enabled}"
+		prov.polling.time="{$polycom_provision_polling_time}"
+		feature.urlDialing.enabled="0"
+		feature.logUpload.enabled="{$polycom_log_upload_enabled}"
+		powerSaving.enable="{$polycom_power_saving_enable}"
+		voice.aec.hf.enable="1"
+		voice.aec.hs.enable="1"
+		dir.local.readonly="{$polycom_contact_list_readonly}"
+		{if isset($polycom_video_enable)}video.enable="{$polycom_video_enable}"{/if}
+		{if isset($polycom_video_audio_call_mode)}video.callMode.default="{$polycom_video_audio_call_mode}"	{/if}
+		{if isset($polycom_video_audio_toggle)}feature.audioVideoToggle.enabled="{$polycom_video_audio_toggle}"	{/if}
+		{foreach $lines as $row}
+			msg.mwi.{$row.line_number}.callBackMode="contact"
+			msg.mwi.{$row.line_number}.callBack="{$voicemail_number}"
+		{/foreach}
+		{if isset($polycom_diversion_header)}voIpProt.SIP.header.diversion.enable="{$polycom_diversion_header}"{/if}
+		reg.1.server.1.subscribe.expires="2592000"
+		{if isset($polycom_contacts_directory)}contacts_directory="{$polycom_contacts_directory}/{$domain_name}/"{/if}
+		{if isset($polycom_pagination_enabled)}up.Pagination.enabled="{$polycom_pagination_enabled}"{/if}
+	/>
+	<SOFT_KEYS
+		softkey.1.label="VMTransfer"
+		softkey.1.action="^*99$P1N4$$Trefer$"
+		softkey.1.enable="1"
+		softkey.1.use.active="1"
+		softkey.1.precede="1"
+		efk.efkprompt.1.label="Voice Mail ID to transfer to:"
+		efk.efkprompt.1.status="1"
+		efk.efkprompt.1.type="numeric"
+		{if isset($polycom_intercom_enable)}
+		softkey.2.label="Intercom"
+		softkey.2.action="^*8$P2N4$$Tinvite$"
+		softkey.2.enable="1"
+		softkey.2.use.idle="1"
+		efk.efkprompt.2.label="Enter destination"
+		efk.efkprompt.2.status="1"
+		efk.efkprompt.2.type="numeric"
+		efk.efkprompt.2.userfeedback="visible"
+		efk.efkprompt.2.digitmatching="none"
+		{/if}
+		{if isset($polycom_pickup_enable)}
+		softkey.3.label="Pick up"
+		softkey.3.action="^**$P3N4$$Tinvite$"
+		softkey.3.enable="1"
+		softkey.3.use.idle="1"
+		efk.efkprompt.3.label="Enter ext to intercept"
+		efk.efkprompt.3.status="1"
+		efk.efkprompt.3.type="numeric"
+		efk.efkprompt.3.userfeedback="visible"
+		efk.efkprompt.3.digitmatching="none"
+		{/if}
+		{if isset($polycom_softkey_do_not_disturb)}softkey.feature.doNotDisturb="{$polycom_softkey_do_not_disturb}"{/if}
+		{if isset($polycom_softkey_forward)}softkey.feature.forward="{$polycom_softkey_forward}"{/if}
+		{if isset($polycom_softkey_newcall)}softkey.feature.newcall="{$polycom_softkey_newcall}"{/if}
+		{if isset($polycom_softkey_directories)}softkey.feature.directories="{$polycom_softkey_directories}"{/if}
+		{if isset($polycom_basic_call_management_redundant)}
+		softkey.feature.basicCallManagement.redundant="{$polycom_basic_call_management_redundant}"
+		efk.softkey.alignleft="1"
+		{/if}
+	/>
+	<HOME_SCREEN
+		{if isset($polycom_homescreen_do_not_disturb)}homeScreen.doNotDisturb.enable="{$polycom_homescreen_do_not_disturb}"{/if}
+		{if isset($polycom_homescreen_forward)}homeScreen.forward.enable="{$polycom_homescreen_forward}"{/if}
+		{if isset($polycom_homescreen_directories)}homeScreen.directories.enable="{$polycom_homescreen_directories}"{/if}
+		homeScreen.intercom.enable="0"
+	/>
+	<USB 
+		feature.callRecording.enabled="0"
+	/>
+	<LANGUAGE
+		lcl.ml.lang="{$polycom_display_language}"
+	/>
+	
+	<NETWORK_SETTINGS
+		{if isset($polycom_dns_server)} 
+		device.dns.serverAddress.set="1"
+		device.dns.serverAddress="{$polycom_dns_server}"
+		{/if}
+		{if isset($polycom_dns_alt_server)} 
+		device.dns.altSrvAddress.set="1"
+		device.dns.altSrvAddress="{$polycom_dns_alt_server}"
+		{/if}
+		{if isset($polycom_boot_server_option)}
+		device.dhcp.bootSrvUseOpt.set="1"
+		device.dhcp.bootSrvUseOpt="{$polycom_boot_server_option}"
+		{/if}
+		{if isset($polycom_lldp_enabled)}
+		device.net.lldpEnabled.set="1"
+		device.net.lldpEnabled="{$polycom_lldp_enabled}"
+		{/if}
+		{if isset($polycom_cdp_enabled)}
+		device.net.cdpEnabled.set="1"
+		device.net.cdpEnabled="{$polycom_cdp_enabled}"
+		{/if}
+		{if isset($polycom_dhcp_vlan_discovery)}
+		device.dhcp.dhcpVlanDiscUseOpt.set="1"
+		device.dhcp.dhcpVlanDiscUseOpt="{$polycom_dhcp_vlan_discovery}"
+		{/if}
+	/>
+</PHONE>
diff --git a/resources/templates/provision/snom/D745/{$mac}.xml b/resources/templates/provision/snom/D745/{$mac}.xml
index 67399e7219..c381d5372c 100644
--- a/resources/templates/provision/snom/D745/{$mac}.xml
+++ b/resources/templates/provision/snom/D745/{$mac}.xml
@@ -59,6 +59,11 @@
     <user_server_type idx="{$row.line_number}" perm="R">Default</user_server_type>
     <user_srtp idx="{$row.line_number}" perm="R">off</user_srtp>
     <user_mailbox idx="{$row.line_number}" perm="R">{if isset($voicemail_number)}{$voicemail_number}{else}*97{/if}</user_mailbox>
+	{if isset($account.{$row.line_number}.shared_line) }
+	<user_shared_line idx="{$row.line_number}" perm="RW">{$account.{$row.line_number}.shared_line}</user_shared_line>
+	{else}
+	<user_shared_line idx="{$row.line_number}" perm="RW">off</user_shared_line>
+	{/if}
     <user_symmetrical_rtp idx="{$row.line_number}" perm="">on</user_symmetrical_rtp>
     <user_ice idx="{$row.line_number}" perm="">off</user_ice>
     <stun_server idx="{$row.line_number}" perm="R">{$stun_server}{if isset($stun_port)}:{$stun_port}{/if}</stun_server>
diff --git a/resources/templates/provision/yealink/cp860/y000000000037.cfg b/resources/templates/provision/yealink/cp860/y000000000037.cfg
index 0ffcc89df9..bf30a462fa 100644
--- a/resources/templates/provision/yealink/cp860/y000000000037.cfg
+++ b/resources/templates/provision/yealink/cp860/y000000000037.cfg
@@ -487,7 +487,7 @@ local_time.interval =
 local_time.summer_time = {$yealink_summer_time}
 
 #Configure the DST type when the DST feature is enabled; 0-By Date (default), 1-By Week;
-local_time.dst_time_type =
+local_time.dst_time_type = {$yealink_dst_type}
 
 #Configure the start time of DST. The default value is 1/1/0.
 #If the DST type is configured as By Date, the value format is Month/Day/Hour. For example, the value 5/20/10 means the start time is at 10:00 on May 20.
@@ -879,6 +879,7 @@ features.password_dial.length =
 #######################################################################################
 #Enable or disable the phone to save the call history; 0-Disabled, 1-Enabled (default);
 features.save_call_history =
+features.save_init_num_to_history.enable = 0
 
 #######################################################################################
 ##                                   Features Pickup                                 ##
diff --git a/resources/templates/provision/yealink/cp860/{$mac}.cfg b/resources/templates/provision/yealink/cp860/{$mac}.cfg
index 331a27a825..e07671ec6a 100644
--- a/resources/templates/provision/yealink/cp860/{$mac}.cfg
+++ b/resources/templates/provision/yealink/cp860/{$mac}.cfg
@@ -381,10 +381,10 @@ account.1.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.1.conf_type =
+account.1.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.1.conf_uri =
+account.1.conf_uri = {if $nway_conference == true}nway{$account.1.auth_id}@{$account.1.server_address}{/if}
 
 #######################################################################################
 ##                            cid_source                                             ##
@@ -852,10 +852,10 @@ account.2.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.2.conf_type =
+account.2.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.2.conf_uri =
+account.2.conf_uri = {if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -1367,10 +1367,10 @@ account.3.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.3.conf_type =
+account.3.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.3.conf_uri =
+account.3.conf_uri = {if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -1867,10 +1867,10 @@ account.4.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.4.conf_type =
+account.4.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.4.conf_uri =
+account.4.conf_uri = {if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -2364,10 +2364,10 @@ account.5.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.5.conf_type =
+account.5.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.5.conf_uri =
+account.5.conf_uri = {if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -2860,10 +2860,10 @@ account.6.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.6.conf_type =
+account.6.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.6.conf_uri =
+account.6.conf_uri = {if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
diff --git a/resources/templates/provision/yealink/cp920/y000000000000.boot b/resources/templates/provision/yealink/cp920/y000000000000.boot
index 809b702a33..580b26c95e 100644
--- a/resources/templates/provision/yealink/cp920/y000000000000.boot
+++ b/resources/templates/provision/yealink/cp920/y000000000000.boot
@@ -1,7 +1,7 @@
 #!version:1.0.0.1
 ## The header above must appear as-is in the first line
 
-include:config "y000000000000.cfg"
+include:config "y000000000078.cfg"
 include:config "{$mac}.cfg"
 
 overwrite_mode = {$yealink_overwrite_mode}
diff --git a/resources/templates/provision/yealink/cp920/y000000000000.cfg b/resources/templates/provision/yealink/cp920/y000000000078.cfg
similarity index 98%
rename from resources/templates/provision/yealink/cp920/y000000000000.cfg
rename to resources/templates/provision/yealink/cp920/y000000000078.cfg
index a746c06f71..541523f8f6 100644
--- a/resources/templates/provision/yealink/cp920/y000000000000.cfg
+++ b/resources/templates/provision/yealink/cp920/y000000000078.cfg
@@ -78,15 +78,15 @@ network.vlan.dhcp_option =
 #######################################################################################
 ##                                    VLAN  DISABLED                                ##
 #######################################################################################
-network.vlan.internet_port_enable = 0
+{if isset($yealink_vlan_enable)}network.vlan.internet_port_enable = {$yealink_vlan_enable}{else}network.vlan.internet_port_enable = 0{/if}
 
 #Configure the VLAN ID, it ranges from 1 to 4094, the default value is 1.
 #Require reboot;
-network.vlan.internet_port_vid =
+network.vlan.internet_port_vid = {$yealink_vlan_id}
 
 #Configure the VLAN priority, it ranges from 0 (default) to 7.
 #Require reboot;
-network.vlan.internet_port_priority =
+network.vlan.internet_port_priority = {$yealink_vlan_cos}
 
 #Enable or disable the VLAN of PC port; 0-Disabled (default), 1-Enabled;
 #Require reboot;
@@ -94,11 +94,11 @@ network.vlan.pc_port_enable =
 
 #Configure the VLAN ID, it ranges from 1 to 4094, the default value is 1.
 #Require reboot;
-network.vlan.pc_port_vid =
+network.vlan.pc_port_vid = {$yealink_vlan_pc_id}
 
 #Configure the VLAN priority, it ranges from 0 (default) to 7.
 #Require reboot;
-network.vlan.pc_port_priority =
+network.vlan.pc_port_priority = {$yealink_vlan_pc_cos}
 
 #Enable or disable the DHCP to obtain the information of the VLAN; 0-Disabled; 1-Enabled (default);
 #Require reboot;
@@ -111,7 +111,6 @@ network.vlan.dhcp_option =
 
 {/if}
 
-
 #######################################################################################
 ##                                   WEB Port                                        ##
 #######################################################################################
@@ -337,7 +336,7 @@ watch_dog.enable =
 sip.use_23_as_pound =
 
 #Enable or disable the RFC2543 Hold feature; 0-Disabled (default), 1-Enabled;
-sip.rfc2543_hold =
+sip.rfc2543_hold = {$yealink_rfc2543_hold}
 
 #Enable or disable the phone to keep sending the SIP messages to the outbound server; 0-Disabled, 1-Enabled (default);
 sip.use_out_bound_in_dialog =
@@ -480,13 +479,13 @@ local_time.ntp_server1 = {$ntp_server_primary}
 local_time.ntp_server2 = {$ntp_server_secondary}
 
 #Configure the update interval (in seconds) when using the NTP server. The default value is 1000.
-local_time.interval =
+local_time.interval = {$yealink_time_update}
 
 #Configure the daylight saving time feature; 0-Disabled, 1-Enabled, 2-Automatic (default);
 local_time.summer_time = {$yealink_summer_time}
 
 #Configure the DST type when the DST feature is enabled; 0-By Date (default), 1-By Week;
-local_time.dst_time_type =
+local_time.dst_time_type = {$yealink_dst_type}
 
 #Configure the start time of DST. The default value is 1/1/0.
 #If the DST type is configured as By Date, the value format is Month/Day/Hour. For example, the value 5/20/10 means the start time is at 10:00 on May 20.
@@ -510,7 +509,7 @@ local_time.date_format = {$yealink_date_format}
 local_time.dhcp_time = {$yealink_dhcp_time}
 
 #Enable or disable the manual time; 0-NTP time, 1-manual time. The default value is 0.
-local_time.manual_time_enable =
+local_time.manual_time_enable = 0
 
 #######################################################################################
 ##                                   Auto Redial                                     ##
@@ -742,8 +741,8 @@ features.fwd_diversion_enable =
 #######################################################################################
 #Configure the DND key mode; 0-Phone mode (default), 1-Custom mode.
 features.dnd_mode =
-features.dnd.on_code =
-features.dnd.off_code =
+features.dnd.on_code = *78
+features.dnd.off_code = *79
 features.dnd.emergency_enable = 1
 features.dnd.emergency_authorized_number =
 
@@ -751,7 +750,7 @@ features.dnd.emergency_authorized_number =
 ##                                   Features BLF                                    ##
 #######################################################################################
 #Configure the LED flashing mode of the BLF key (line key). The value is 0(default) or 1.
-features.blf_led_mode =
+features.blf_led_mode = {$yealink_blf_led_mode}
 
 features.blf_list_version = 0
 features.blf_and_callpark_idle_led_enable = 0
@@ -782,7 +781,7 @@ features.hotline_delay =
 ##                                   Features DTMF                                   ##
 #######################################################################################
 #Enable or disable the phone to suppress the display of DTMF digits; 0-Disabled (default), 1-Enabled;
-features.dtmf.hide =
+features.dtmf.hide = {$yealink_dtmf_hide}
 
 #Enables or disables the IP phone to display the DTMF digits for a short period before displaying as asterisks; 0-Disabled (default), 1-Enabled;
 features.dtmf.hide_delay =
@@ -878,6 +877,7 @@ features.password_dial.length =
 #######################################################################################
 #Enable or disable the phone to save the call history; 0-Disabled, 1-Enabled (default);
 features.save_call_history =
+features.save_init_num_to_history.enable = 0
 
 #######################################################################################
 ##                                   Features Pickup                                 ##
@@ -918,7 +918,7 @@ phone_setting.show_code403 =
 phone_setting.dialnow_delay =
 
 #Configure the emergency number, each separated by a comma. The default value is 112,911,110.
-phone_setting.emergency.number =
+phone_setting.emergency.number = {$yealink_emergency_number}
 
 #Configure the using mode of the headset key. The value is 0 or 1(default).
 phone_setting.page_tip =
@@ -959,20 +959,19 @@ phone_setting.blf_list_sequence_type =
 ##                                   Key Lock                                        ##
 #######################################################################################
 #Configure the keypad lock type; 0-Disabled (default), 1-Enable
-phone_setting.lock =
+phone_setting.lock = {$yealink_lock_enable}
 
 #Configure the unlock password for the phone. The default value is 123.
-phone_setting.phone_lock.unlock_pin =
-
+phone_setting.phone_lock.unlock_pin = {$yealink_lock_pin}
 
 #Configures the interval (in seconds) to automatically lock the IP phone. It ranges from 0 to 3600, the default value is 0.
-phone_setting.phone_lock.lock_time_out =
+phone_setting.phone_lock.lock_time_out = {$yealink_lock_timeout}
 
 #Configure the keypad lock type;0-All Keys(default), 1-Function Key, 2-Menu Key
-phone_setting.phone_lock.lock_key_type =
+phone_setting.phone_lock.lock_key_type = {$yealink_lock_key_type}
 
 #Configure the backlight time (in seconds). The valid values are: 0-Always on, 1-Always off, 15-15s, 30-30s (default), 60-60s, 120-120s.
-phone_setting.backlight_time = 0
+phone_setting.backlight_time = {$yealink_backlight_time}
 
 #######################################################################################
 ##                                   Wallpaper                                       ##
@@ -1056,10 +1055,12 @@ security.trust_certificates = {if $yealink_trust_certificates == "false"}0{elsei
 security.user_name.user = {$user_name}
 security.user_password = {$user_name}:{$user_password}
 {/if}
+
 {if isset($admin_name) }
 security.user_name.admin = {$admin_name}
 security.user_password = {$admin_name}:{$admin_password}
 {/if}
+
 {if isset($var_name) }
 security.user_name.var = {$var_name}
 security.user_password = {$var_name}:{$var_password}
@@ -1222,7 +1223,6 @@ linekey.20.type =
 linekey.20.xml_phonebook =
 linekey.20.label =
 
-
 linekey.21.line =
 linekey.21.value =
 linekey.21.extension =
@@ -1230,7 +1230,6 @@ linekey.21.type =
 linekey.21.xml_phonebook =
 linekey.21.label =
 
-
 linekey.22.line =
 linekey.22.value =
 linekey.22.extension =
@@ -1273,7 +1272,7 @@ linekey.27.type =
 linekey.27.xml_phonebook =
 linekey.27.label =
 #######################################################################################
-##                                   Programablekey                                  ##
+##                                   Programmable key                                ##
 #######################################################################################
 #X ranges from 1 to 13.
 #programablekey.x.type--Customize the programmable key type.
@@ -1628,4 +1627,3 @@ directory_setting.url = https://{if isset($http_auth_username)}{$http_auth_usern
 #######################################################################################
 #Before using this parameter, you should store the desired firmware (x.71.x.x.rom) to the provisioning server.
 firmware.url = {$yealink_firmware_url}/{$yealink_firmware_cp920}
-
diff --git a/resources/templates/provision/yealink/cp920/{$mac}.cfg b/resources/templates/provision/yealink/cp920/{$mac}.cfg
index 73aad3eea1..587aef24b3 100644
--- a/resources/templates/provision/yealink/cp920/{$mac}.cfg
+++ b/resources/templates/provision/yealink/cp920/{$mac}.cfg
@@ -24,10 +24,10 @@ account.1.user_name = {$account.1.user_id}
 {/if}
 account.1.sip_server_host = {$account.1.server_address}
 account.1.sip_server_port = {$account.1.sip_port}
-
 account.1.outbound_host = {$account.1.outbound_proxy}
 account.1.outbound_port = {$account.1.sip_port}
-account.1.sip_listen_port = {$account.1.sip_port}
+{if isset($yealink_sip_listen_port)}account.1.sip_listen_port = {$yealink_sip_listen_port}{else}account.1.sip_listen_port = 5060{/if}
+
 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
 {if $account.1.sip_transport == 'udp'}account.1.transport = 0{/if}
 {if $account.1.sip_transport == 'tcp'}account.1.transport = 1{/if}
@@ -49,7 +49,6 @@ account.1.outbound_proxy.2.port = {$outbound_proxy_2_port}
 account.1.outbound_proxy.2.port = {$account.1.sip_port}
 {/if}
 
-
 #######################################################################################
 ##                          Failback                                                 ##
 #######################################################################################
@@ -177,7 +176,7 @@ account.1.subscribe_mwi = 1
 account.1.subscribe_mwi_expires = 3600
 
 #Enable or disable the phone to subscribe to the voicemail through the message waiting indicator; 0-Disabled (default), 1-Enabled;
-account.1.subscribe_mwi_to_vm = 1
+account.1.subscribe_mwi_to_vm = {$yealink_subscribe_mwi_to_vm}
 
 account.1.subscribe_acd_expires= 3600
 
@@ -322,7 +321,6 @@ account.1.codec.13.rtpmap = 106
 
 
 
-
 #######################################################################################
 ##                            Audio Advanced                                         ##
 #######################################################################################
@@ -382,10 +380,10 @@ account.1.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.1.conf_type =
+account.1.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.1.conf_uri =
+account.1.conf_uri = {if $nway_conference == true}nway{$account.1.auth_id}@{$account.1.server_address}{/if}
 
 #######################################################################################
 ##                            cid_source                                             ##
@@ -435,7 +433,7 @@ account.1.100rel_enable = {$yealink_retransmission}
 #Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled;
 account.1.enable_user_equal_phone =
 
-#Enbale or diable the simplified header field feature; 0-Disabled, 1-Enabled (default);
+#Enable or disable the simplified header field feature; 0-Disabled, 1-Enabled (default);
 account.1.compact_header_enable =
 
 #######################################################################################
@@ -539,10 +537,11 @@ account.2.user_name = {$account.2.user_id}
 {/if}
 account.2.sip_server_host = {$account.2.server_address}
 account.2.sip_server_port = {$account.2.sip_port}
-
 account.2.outbound_host = {$account.2.outbound_proxy}
+
 account.2.outbound_port = {$account.2.sip_port}
-account.2.sip_listen_port = 5060
+{if isset($yealink_sip_listen_port)}account.2.sip_listen_port = {$yealink_sip_listen_port}{else}account.2.sip_listen_port = 5060{/if}
+
 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
 {if $account.2.sip_transport == 'udp'}account.2.transport = 0{/if}
 {if $account.2.sip_transport == 'tcp'}account.2.transport = 1{/if}
@@ -553,7 +552,6 @@ account.2.outbound_proxy.1.address = {$account.2.outbound_proxy_primary}
 account.2.outbound_proxy.2.address = {$account.2.outbound_proxy_secondary}
 account.2.outbound_proxy_enable = {if isset($account.2.outbound_proxy_primary)}1{else}0{/if}
 
-
 #######################################################################################
 ##                          Failback                                                 ##
 #######################################################################################
@@ -681,7 +679,7 @@ account.2.subscribe_mwi = 1
 account.2.subscribe_mwi_expires = 3600
 
 #Enable or disable the phone to subscribe to the voicemail through the message waiting indicator; 0-Disabled (default), 1-Enabled;
-account.2.subscribe_mwi_to_vm = 1
+account.2.subscribe_mwi_to_vm = {$yealink_subscribe_mwi_to_vm}
 
 account.2.subscribe_acd_expires= 3600
 
@@ -853,10 +851,10 @@ account.2.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.2.conf_type =
+account.2.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.2.conf_uri =
+account.2.conf_uri = {if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -906,7 +904,7 @@ account.2.100rel_enable = {$yealink_retransmission}
 #Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled;
 account.2.enable_user_equal_phone =
 
-#Enbale or diable the simplified header field feature; 0-Disabled, 1-Enabled (default);
+#Enable or disable the simplified header field feature; 0-Disabled, 1-Enabled (default);
 account.2.compact_header_enable =
 
 #######################################################################################
@@ -1057,7 +1055,9 @@ account.3.sip_server_port = {$account.3.sip_port}
 
 account.3.outbound_host = {$account.3.outbound_proxy}
 account.3.outbound_port = {$account.3.sip_port}
-account.3.sip_listen_port = 5060
+{if isset($yealink_sip_listen_port)}account.3.sip_listen_port = {$yealink_sip_listen_port}{else}account.3.sip_listen_port = 5060{/if}
+
+
 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
 {if $account.3.sip_transport == 'udp'}account.3.transport = 0{/if}
 {if $account.3.sip_transport == 'tcp'}account.3.transport = 1{/if}
@@ -1068,7 +1068,6 @@ account.3.outbound_proxy.1.address = {$account.3.outbound_proxy_primary}
 account.3.outbound_proxy.2.address = {$account.3.outbound_proxy_secondary}
 account.3.outbound_proxy_enable = {if isset($account.3.outbound_proxy_primary)}1{else}0{/if}
 
-
 #######################################################################################
 ##                          Failback                                                 ##
 #######################################################################################
@@ -1196,7 +1195,7 @@ account.3.subscribe_mwi = 1
 account.3.subscribe_mwi_expires = 3600
 
 #Enable or disable the phone to subscribe to the voicemail through the message waiting indicator; 0-Disabled (default), 1-Enabled;
-account.3.subscribe_mwi_to_vm = 1
+account.3.subscribe_mwi_to_vm = {$yealink_subscribe_mwi_to_vm}
 
 account.3.subscribe_acd_expires= 3600
 
@@ -1368,10 +1367,10 @@ account.3.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.3.conf_type =
+account.3.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.3.conf_uri =
+account.3.conf_uri = {if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -1421,7 +1420,7 @@ account.3.100rel_enable = {$yealink_retransmission}
 #Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled;
 account.3.enable_user_equal_phone =
 
-#Enbale or diable the simplified header field feature; 0-Disabled, 1-Enabled (default);
+#Enable or disable the simplified header field feature; 0-Disabled, 1-Enabled (default);
 account.3.compact_header_enable =
 
 #######################################################################################
@@ -1558,7 +1557,9 @@ account.4.sip_server_port = {$account.4.sip_port}
 
 account.4.outbound_host = {$account.4.outbound_proxy}
 account.4.outbound_port = {$account.4.sip_port}
-account.4.sip_listen_port = 5060
+{if isset($yealink_sip_listen_port)}account.4.sip_listen_port = {$yealink_sip_listen_port}{else}account.4.sip_listen_port = 5060{/if}
+
+
 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
 {if $account.4.sip_transport == 'udp'}account.4.transport = 0{/if}
 {if $account.4.sip_transport == 'tcp'}account.4.transport = 1{/if}
@@ -1696,7 +1697,7 @@ account.4.subscribe_mwi = 1
 account.4.subscribe_mwi_expires = 3600
 
 #Enable or disable the phone to subscribe to the voicemail through the message waiting indicator; 0-Disabled (default), 1-Enabled;
-account.4.subscribe_mwi_to_vm = 1
+account.4.subscribe_mwi_to_vm = {$yealink_subscribe_mwi_to_vm}
 
 account.4.subscribe_acd_expires= 3600
 
@@ -1868,10 +1869,10 @@ account.4.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.4.conf_type =
+account.4.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.4.conf_uri =
+account.4.conf_uri = {if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -1921,7 +1922,7 @@ account.4.100rel_enable = {$yealink_retransmission}
 #Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled;
 account.4.enable_user_equal_phone =
 
-#Enbale or diable the simplified header field feature; 0-Disabled, 1-Enabled (default);
+#Enable or disable the simplified header field feature; 0-Disabled, 1-Enabled (default);
 account.4.compact_header_enable =
 
 #######################################################################################
@@ -2055,7 +2056,8 @@ account.5.sip_server_port = {$account.5.sip_port}
 
 account.5.outbound_host = {$account.5.outbound_proxy}
 account.5.outbound_port = {$account.5.sip_port}
-account.5.sip_listen_port = 5060
+{if isset($yealink_sip_listen_port)}account.5.sip_listen_port = {$yealink_sip_listen_port}{else}account.5.sip_listen_port = 5060{/if}
+
 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
 {if $account.5.sip_transport == 'udp'}account.5.transport = 0{/if}
 {if $account.5.sip_transport == 'tcp'}account.5.transport = 1{/if}
@@ -2193,7 +2195,7 @@ account.5.subscribe_mwi = 1
 account.5.subscribe_mwi_expires = 3600
 
 #Enable or disable the phone to subscribe to the voicemail through the message waiting indicator; 0-Disabled (default), 1-Enabled;
-account.5.subscribe_mwi_to_vm = 1
+account.5.subscribe_mwi_to_vm = {$yealink_subscribe_mwi_to_vm}
 
 account.5.subscribe_acd_expires= 3600
 
@@ -2365,10 +2367,10 @@ account.5.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.5.conf_type =
+account.5.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.5.conf_uri =
+account.5.conf_uri = {if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -2418,7 +2420,7 @@ account.5.100rel_enable = {$yealink_retransmission}
 #Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled;
 account.5.enable_user_equal_phone =
 
-#Enbale or diable the simplified header field feature; 0-Disabled, 1-Enabled (default);
+#Enable or disable the simplified header field feature; 0-Disabled, 1-Enabled (default);
 account.5.compact_header_enable =
 
 #######################################################################################
@@ -2552,7 +2554,8 @@ account.6.sip_server_port = {$account.6.sip_port}
 
 account.6.outbound_host = {$account.6.outbound_proxy}
 account.6.outbound_port = {$account.6.sip_port}
-account.6.sip_listen_port = 5060
+{if isset($yealink_sip_listen_port)}account.6.sip_listen_port = {$yealink_sip_listen_port}{else}account.6.sip_listen_port = 5060{/if}
+
 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
 {if $account.6.sip_transport == 'udp'}account.6.transport = 0{/if}
 {if $account.6.sip_transport == 'tcp'}account.6.transport = 1{/if}
@@ -2689,7 +2692,7 @@ account.6.subscribe_mwi = 0
 account.6.subscribe_mwi_expires = 3600
 
 #Enable or disable the phone to subscribe to the voicemail through the message waiting indicator; 0-Disabled (default), 1-Enabled;
-account.6.subscribe_mwi_to_vm = 0
+account.6.subscribe_mwi_to_vm = {$yealink_subscribe_mwi_to_vm}
 
 account.6.subscribe_acd_expires= 3600
 
@@ -2861,10 +2864,10 @@ account.6.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.6.conf_type =
+account.6.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.6.conf_uri =
+account.6.conf_uri = {if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -2914,7 +2917,7 @@ account.6.100rel_enable = {$yealink_retransmission}
 #Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled;
 account.6.enable_user_equal_phone =
 
-#Enbale or diable the simplified header field feature; 0-Disabled, 1-Enabled (default);
+#Enable or disable the simplified header field feature; 0-Disabled, 1-Enabled (default);
 account.6.compact_header_enable =
 
 #######################################################################################
diff --git a/resources/templates/provision/yealink/cp960/y000000000000.boot b/resources/templates/provision/yealink/cp960/y000000000000.boot
index 809b702a33..746d3e9943 100644
--- a/resources/templates/provision/yealink/cp960/y000000000000.boot
+++ b/resources/templates/provision/yealink/cp960/y000000000000.boot
@@ -1,7 +1,7 @@
 #!version:1.0.0.1
 ## The header above must appear as-is in the first line
 
-include:config "y000000000000.cfg"
+include:config "y000000000073.cfg"
 include:config "{$mac}.cfg"
 
 overwrite_mode = {$yealink_overwrite_mode}
diff --git a/resources/templates/provision/yealink/cp960/y000000000000.cfg b/resources/templates/provision/yealink/cp960/y000000000073.cfg
similarity index 99%
rename from resources/templates/provision/yealink/cp960/y000000000000.cfg
rename to resources/templates/provision/yealink/cp960/y000000000073.cfg
index 09b73e62f4..00f7d0a349 100644
--- a/resources/templates/provision/yealink/cp960/y000000000000.cfg
+++ b/resources/templates/provision/yealink/cp960/y000000000073.cfg
@@ -486,7 +486,7 @@ local_time.interval =
 local_time.summer_time = {$yealink_summer_time}
 
 #Configure the DST type when the DST feature is enabled; 0-By Date (default), 1-By Week;
-local_time.dst_time_type =
+local_time.dst_time_type = {$yealink_dst_type}
 
 #Configure the start time of DST. The default value is 1/1/0.
 #If the DST type is configured as By Date, the value format is Month/Day/Hour. For example, the value 5/20/10 means the start time is at 10:00 on May 20.
@@ -878,6 +878,7 @@ features.password_dial.length =
 #######################################################################################
 #Enable or disable the phone to save the call history; 0-Disabled, 1-Enabled (default);
 features.save_call_history =
+features.save_init_num_to_history.enable = 0
 
 #######################################################################################
 ##                                   Features Pickup                                 ##
diff --git a/resources/templates/provision/yealink/cp960/{$mac}.cfg b/resources/templates/provision/yealink/cp960/{$mac}.cfg
index 4f429d9c2b..b2f5cba8c1 100644
--- a/resources/templates/provision/yealink/cp960/{$mac}.cfg
+++ b/resources/templates/provision/yealink/cp960/{$mac}.cfg
@@ -382,10 +382,10 @@ account.1.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.1.conf_type =
+account.1.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.1.conf_uri =
+account.1.conf_uri = {if $nway_conference == true}nway{$account.1.auth_id}@{$account.1.server_address}{/if}
 
 #######################################################################################
 ##                            cid_source                                             ##
@@ -853,10 +853,10 @@ account.2.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.2.conf_type =
+account.2.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.2.conf_uri =
+account.2.conf_uri = {if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -1368,10 +1368,10 @@ account.3.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.3.conf_type =
+account.3.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.3.conf_uri =
+account.3.conf_uri = {if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -1867,10 +1867,10 @@ account.4.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.4.conf_type =
+account.4.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.4.conf_uri =
+account.4.conf_uri = {if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -2364,10 +2364,10 @@ account.5.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.5.conf_type =
+account.5.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.5.conf_uri =
+account.5.conf_uri = {if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -2860,10 +2860,10 @@ account.6.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.6.conf_type =
+account.6.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.6.conf_uri =
+account.6.conf_uri = {if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
diff --git a/resources/templates/provision/yealink/t19p/y000000000053.cfg b/resources/templates/provision/yealink/t19p/y000000000053.cfg
index 055eb6b5f2..8953e66e61 100644
--- a/resources/templates/provision/yealink/t19p/y000000000053.cfg
+++ b/resources/templates/provision/yealink/t19p/y000000000053.cfg
@@ -719,7 +719,7 @@ local_time.interval =
 local_time.summer_time = {$yealink_summer_time}
 
 #Configure the DST type when the DST feature is enabled; 0-By Date (default), 1-By Week;
-local_time.dst_time_type =
+local_time.dst_time_type = {$yealink_dst_type}
 
 #Configure the start time of DST. The default value is 1/1/0.
 #If the DST type is configured as By Date, the value format is Month/Day/Hour. For example, the value 5/20/10 means the start time is at 10:00 on May 20.
@@ -1104,6 +1104,7 @@ features.redial_tone =
 
 #Enable or disable the phone to save the call history; 0-Disabled, 1-Enabled (default);
 features.save_call_history =
+features.save_init_num_to_history.enable = 0
 
 #Configure the phone to receive the action URI request from the specified IP address(es) or any IP address;
 #Enter multiple IP addresses (separated by comma) or "any"(stands for any IP address);
diff --git a/resources/templates/provision/yealink/t19p/{$mac}.cfg b/resources/templates/provision/yealink/t19p/{$mac}.cfg
index b7b4a26622..b98e90ced6 100644
--- a/resources/templates/provision/yealink/t19p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t19p/{$mac}.cfg
@@ -186,10 +186,10 @@ account.1.register_line =
 account.1.reg_fail_retry_interval =
 
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.1.conf_type =
+account.1.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.1.conf_uri =
+account.1.conf_uri = {if $nway_conference == true}nway{$account.1.auth_id}@{$account.1.server_address}{/if}
 
 #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist".
 account.1.blf.blf_list_uri =
@@ -539,10 +539,10 @@ account.2.register_line =
 account.2.reg_fail_retry_interval =
 
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.2.conf_type =
+account.2.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.2.conf_uri =
+account.2.conf_uri = {if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}
 
 #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist".
 account.2.blf.blf_list_uri =
@@ -864,10 +864,10 @@ account.3.register_line =
 account.3.reg_fail_retry_interval =
 
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.3.conf_type =
+account.3.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.3.conf_uri =
+account.3.conf_uri = {if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}
 
 #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist".
 account.3.blf.blf_list_uri =
@@ -1190,10 +1190,10 @@ account.4.register_line =
 account.4.reg_fail_retry_interval =
 
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.4.conf_type =
+account.4.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.4.conf_uri =
+account.4.conf_uri = {if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}
 
 #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist".
 account.4.blf.blf_list_uri =
@@ -1516,10 +1516,10 @@ account.5.register_line =
 account.5.reg_fail_retry_interval =
 
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.5.conf_type =
+account.5.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.5.conf_uri =
+account.5.conf_uri = {if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}
 
 #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist".
 account.5.blf.blf_list_uri =
@@ -1839,10 +1839,10 @@ account.6.register_line =
 account.6.reg_fail_retry_interval =
 
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.6.conf_type =
+account.6.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.6.conf_uri =
+account.6.conf_uri = {if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}
 
 #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist".
 account.6.blf.blf_list_uri =
diff --git a/resources/templates/provision/yealink/t20p/y000000000007.cfg b/resources/templates/provision/yealink/t20p/y000000000007.cfg
index 6588b61c52..4ead3db9d9 100644
--- a/resources/templates/provision/yealink/t20p/y000000000007.cfg
+++ b/resources/templates/provision/yealink/t20p/y000000000007.cfg
@@ -719,7 +719,7 @@ local_time.interval =
 local_time.summer_time = {$yealink_summer_time}
 
 #Configure the DST type when the DST feature is enabled; 0-By Date (default), 1-By Week;
-local_time.dst_time_type =
+local_time.dst_time_type = {$yealink_dst_type}
 
 #Configure the start time of DST. The default value is 1/1/0.
 #If the DST type is configured as By Date, the value format is Month/Day/Hour. For example, the value 5/20/10 means the start time is at 10:00 on May 20.
@@ -1104,6 +1104,7 @@ features.redial_tone =
 
 #Enable or disable the phone to save the call history; 0-Disabled, 1-Enabled (default);
 features.save_call_history =
+features.save_init_num_to_history.enable = 0
 
 #Configure the phone to receive the action URI request from the specified IP address(es) or any IP address;
 #Enter multiple IP addresses (separated by comma) or "any"(stands for any IP address);
diff --git a/resources/templates/provision/yealink/t20p/{$mac}.cfg b/resources/templates/provision/yealink/t20p/{$mac}.cfg
index 079cfc60f0..0ebbb1d451 100644
--- a/resources/templates/provision/yealink/t20p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t20p/{$mac}.cfg
@@ -186,10 +186,10 @@ account.1.register_line =
 account.1.reg_fail_retry_interval =
 
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.1.conf_type =
+account.1.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.1.conf_uri =
+account.1.conf_uri = {if $nway_conference == true}nway{$account.1.auth_id}@{$account.1.server_address}{/if}
 
 #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist".
 account.1.blf.blf_list_uri =
@@ -541,10 +541,10 @@ account.2.register_line =
 account.2.reg_fail_retry_interval =
 
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.2.conf_type =
+account.2.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.2.conf_uri =
+account.2.conf_uri = {if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}
 
 #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist".
 account.2.blf.blf_list_uri =
@@ -866,10 +866,10 @@ account.3.register_line =
 account.3.reg_fail_retry_interval =
 
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.3.conf_type =
+account.3.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.3.conf_uri =
+account.3.conf_uri = {if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}
 
 #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist".
 account.3.blf.blf_list_uri =
@@ -1191,10 +1191,10 @@ account.4.register_line =
 account.4.reg_fail_retry_interval =
 
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.4.conf_type =
+account.4.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.4.conf_uri =
+account.4.conf_uri = {if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}
 
 #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist".
 account.4.blf.blf_list_uri =
@@ -1517,10 +1517,10 @@ account.5.register_line =
 account.5.reg_fail_retry_interval =
 
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.5.conf_type =
+account.5.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.5.conf_uri =
+account.5.conf_uri = {if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}
 
 #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist".
 account.5.blf.blf_list_uri =
@@ -1840,10 +1840,10 @@ account.6.register_line =
 account.6.reg_fail_retry_interval =
 
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.6.conf_type =
+account.6.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.6.conf_uri =
+account.6.conf_uri = {if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}
 
 #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist".
 account.6.blf.blf_list_uri =
diff --git a/resources/templates/provision/yealink/t21p/y000000000052.cfg b/resources/templates/provision/yealink/t21p/y000000000052.cfg
index 749f5f4701..523d9eff18 100644
--- a/resources/templates/provision/yealink/t21p/y000000000052.cfg
+++ b/resources/templates/provision/yealink/t21p/y000000000052.cfg
@@ -828,6 +828,7 @@ features.password_dial.length =
 #######################################################################################
 #Enable or disable the phone to save the call history; 0-Disabled, 1-Enabled (default);
 features.save_call_history =
+features.save_init_num_to_history.enable = 0
 
 #######################################################################################
 ##                                   Features Pickup                                 ##
diff --git a/resources/templates/provision/yealink/t21p/{$mac}.cfg b/resources/templates/provision/yealink/t21p/{$mac}.cfg
index 591168db1c..0dc54939fb 100644
--- a/resources/templates/provision/yealink/t21p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t21p/{$mac}.cfg
@@ -382,10 +382,10 @@ account.1.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.1.conf_type =
+account.1.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.1.conf_uri =
+account.1.conf_uri = {if $nway_conference == true}nway{$account.1.auth_id}@{$account.1.server_address}{/if}
 
 #######################################################################################
 ##                            cid_source                                             ##
@@ -851,10 +851,10 @@ account.2.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.2.conf_type =
+account.2.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.2.conf_uri =
+account.2.conf_uri = {if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -1364,10 +1364,10 @@ account.3.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.3.conf_type =
+account.3.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.3.conf_uri =
+account.3.conf_uri = {if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -1860,10 +1860,10 @@ account.4.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.4.conf_type =
+account.4.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.4.conf_uri =
+account.4.conf_uri = {if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -2356,10 +2356,10 @@ account.5.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.5.conf_type =
+account.5.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.5.conf_uri =
+account.5.conf_uri = {if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -2851,10 +2851,10 @@ account.6.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.6.conf_type =
+account.6.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.6.conf_uri =
+account.6.conf_uri = {if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
diff --git a/resources/templates/provision/yealink/t22p/y000000000005.cfg b/resources/templates/provision/yealink/t22p/y000000000005.cfg
index 6152713777..33a6f9d7db 100644
--- a/resources/templates/provision/yealink/t22p/y000000000005.cfg
+++ b/resources/templates/provision/yealink/t22p/y000000000005.cfg
@@ -719,7 +719,7 @@ local_time.interval =
 local_time.summer_time = {$yealink_summer_time}
 
 #Configure the DST type when the DST feature is enabled; 0-By Date (default), 1-By Week;
-local_time.dst_time_type =
+local_time.dst_time_type = {$yealink_dst_type}
 
 #Configure the start time of DST. The default value is 1/1/0.
 #If the DST type is configured as By Date, the value format is Month/Day/Hour. For example, the value 5/20/10 means the start time is at 10:00 on May 20.
@@ -1104,6 +1104,7 @@ features.redial_tone =
 
 #Enable or disable the phone to save the call history; 0-Disabled, 1-Enabled (default);
 features.save_call_history =
+features.save_init_num_to_history.enable = 0
 
 #Configure the phone to receive the action URI request from the specified IP address(es) or any IP address;
 #Enter multiple IP addresses (separated by comma) or "any"(stands for any IP address);
diff --git a/resources/templates/provision/yealink/t22p/{$mac}.cfg b/resources/templates/provision/yealink/t22p/{$mac}.cfg
index b7b4a26622..b98e90ced6 100644
--- a/resources/templates/provision/yealink/t22p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t22p/{$mac}.cfg
@@ -186,10 +186,10 @@ account.1.register_line =
 account.1.reg_fail_retry_interval =
 
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.1.conf_type =
+account.1.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.1.conf_uri =
+account.1.conf_uri = {if $nway_conference == true}nway{$account.1.auth_id}@{$account.1.server_address}{/if}
 
 #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist".
 account.1.blf.blf_list_uri =
@@ -539,10 +539,10 @@ account.2.register_line =
 account.2.reg_fail_retry_interval =
 
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.2.conf_type =
+account.2.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.2.conf_uri =
+account.2.conf_uri = {if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}
 
 #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist".
 account.2.blf.blf_list_uri =
@@ -864,10 +864,10 @@ account.3.register_line =
 account.3.reg_fail_retry_interval =
 
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.3.conf_type =
+account.3.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.3.conf_uri =
+account.3.conf_uri = {if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}
 
 #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist".
 account.3.blf.blf_list_uri =
@@ -1190,10 +1190,10 @@ account.4.register_line =
 account.4.reg_fail_retry_interval =
 
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.4.conf_type =
+account.4.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.4.conf_uri =
+account.4.conf_uri = {if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}
 
 #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist".
 account.4.blf.blf_list_uri =
@@ -1516,10 +1516,10 @@ account.5.register_line =
 account.5.reg_fail_retry_interval =
 
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.5.conf_type =
+account.5.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.5.conf_uri =
+account.5.conf_uri = {if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}
 
 #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist".
 account.5.blf.blf_list_uri =
@@ -1839,10 +1839,10 @@ account.6.register_line =
 account.6.reg_fail_retry_interval =
 
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.6.conf_type =
+account.6.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.6.conf_uri =
+account.6.conf_uri = {if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}
 
 #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist".
 account.6.blf.blf_list_uri =
diff --git a/resources/templates/provision/yealink/t23g/y000000000044.cfg b/resources/templates/provision/yealink/t23g/y000000000044.cfg
index 6d72471634..71886cf31d 100644
--- a/resources/templates/provision/yealink/t23g/y000000000044.cfg
+++ b/resources/templates/provision/yealink/t23g/y000000000044.cfg
@@ -868,6 +868,7 @@ features.password_dial.length =
 #######################################################################################
 #Enable or disable the phone to save the call history; 0-Disabled, 1-Enabled (default);
 features.save_call_history =
+features.save_init_num_to_history.enable = 0
 
 #######################################################################################
 ##                                   Features Pickup                                 ##
diff --git a/resources/templates/provision/yealink/t23g/{$mac}.cfg b/resources/templates/provision/yealink/t23g/{$mac}.cfg
index 22bcabf0b5..0831a350df 100644
--- a/resources/templates/provision/yealink/t23g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t23g/{$mac}.cfg
@@ -395,10 +395,10 @@ account.1.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.1.conf_type =
+account.1.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.1.conf_uri =
+account.1.conf_uri = {if $nway_conference == true}nway{$account.1.auth_id}@{$account.1.server_address}{/if}
 
 #######################################################################################
 ##                            cid_source                                             ##
@@ -867,10 +867,10 @@ account.2.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.2.conf_type =
+account.2.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.2.conf_uri =
+account.2.conf_uri = {if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -1353,10 +1353,10 @@ account.3.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.3.conf_type =
+account.3.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.3.conf_uri =
+account.3.conf_uri = {if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -1829,10 +1829,10 @@ account.4.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.4.conf_type =
+account.4.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.4.conf_uri =
+account.4.conf_uri = {if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -2305,10 +2305,10 @@ account.5.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.5.conf_type =
+account.5.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.5.conf_uri =
+account.5.conf_uri = {if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -2780,10 +2780,10 @@ account.6.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.6.conf_type =
+account.6.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.6.conf_uri =
+account.6.conf_uri = {if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
diff --git a/resources/templates/provision/yealink/t23p/y000000000044.cfg b/resources/templates/provision/yealink/t23p/y000000000044.cfg
index adf39cd5de..518181dda7 100644
--- a/resources/templates/provision/yealink/t23p/y000000000044.cfg
+++ b/resources/templates/provision/yealink/t23p/y000000000044.cfg
@@ -868,7 +868,7 @@ features.password_dial.length =
 #######################################################################################
 #Enable or disable the phone to save the call history; 0-Disabled, 1-Enabled (default);
 features.save_call_history =
-
+features.save_init_num_to_history.enable = 0
 #######################################################################################
 ##                                   Features Pickup                                 ##
 #######################################################################################
diff --git a/resources/templates/provision/yealink/t23p/{$mac}.cfg b/resources/templates/provision/yealink/t23p/{$mac}.cfg
index 5ee10e1442..66191de1ac 100644
--- a/resources/templates/provision/yealink/t23p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t23p/{$mac}.cfg
@@ -381,10 +381,10 @@ account.1.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.1.conf_type =
+account.1.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.1.conf_uri =
+account.1.conf_uri = {if $nway_conference == true}nway{$account.1.auth_id}@{$account.1.server_address}{/if}
 
 #######################################################################################
 ##                            cid_source                                             ##
@@ -853,10 +853,10 @@ account.2.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.2.conf_type =
+account.2.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.2.conf_uri =
+account.2.conf_uri = {if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -1339,10 +1339,10 @@ account.3.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.3.conf_type =
+account.3.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.3.conf_uri =
+account.3.conf_uri = {if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -1815,10 +1815,10 @@ account.4.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.4.conf_type =
+account.4.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.4.conf_uri =
+account.4.conf_uri = {if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -2291,10 +2291,10 @@ account.5.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.5.conf_type =
+account.5.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.5.conf_uri =
+account.5.conf_uri = {if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -2766,10 +2766,10 @@ account.6.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.6.conf_type =
+account.6.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.6.conf_uri =
+account.6.conf_uri = {if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
diff --git a/resources/templates/provision/yealink/t26p/y000000000004.cfg b/resources/templates/provision/yealink/t26p/y000000000004.cfg
index 4417f41e8f..738aca3cef 100644
--- a/resources/templates/provision/yealink/t26p/y000000000004.cfg
+++ b/resources/templates/provision/yealink/t26p/y000000000004.cfg
@@ -719,7 +719,7 @@ local_time.interval =
 local_time.summer_time = {$yealink_summer_time}
 
 #Configure the DST type when the DST feature is enabled; 0-By Date (default), 1-By Week;
-local_time.dst_time_type =
+local_time.dst_time_type = {$yealink_dst_type}
 
 #Configure the start time of DST. The default value is 1/1/0.
 #If the DST type is configured as By Date, the value format is Month/Day/Hour. For example, the value 5/20/10 means the start time is at 10:00 on May 20.
@@ -1104,6 +1104,7 @@ features.redial_tone =
 
 #Enable or disable the phone to save the call history; 0-Disabled, 1-Enabled (default);
 features.save_call_history =
+features.save_init_num_to_history.enable = 0
 
 #Configure the phone to receive the action URI request from the specified IP address(es) or any IP address;
 #Enter multiple IP addresses (separated by comma) or "any"(stands for any IP address);
diff --git a/resources/templates/provision/yealink/t26p/{$mac}.cfg b/resources/templates/provision/yealink/t26p/{$mac}.cfg
index 3881c77d03..fd23f97426 100644
--- a/resources/templates/provision/yealink/t26p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t26p/{$mac}.cfg
@@ -186,10 +186,10 @@ account.1.register_line =
 account.1.reg_fail_retry_interval =
 
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.1.conf_type =
+account.1.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.1.conf_uri =
+account.1.conf_uri = {if $nway_conference == true}nway{$account.1.auth_id}@{$account.1.server_address}{/if}
 
 #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist".
 account.1.blf.blf_list_uri =
@@ -539,10 +539,10 @@ account.2.register_line =
 account.2.reg_fail_retry_interval =
 
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.2.conf_type =
+account.2.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.2.conf_uri =
+account.2.conf_uri = {if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}
 
 #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist".
 account.2.blf.blf_list_uri =
@@ -865,10 +865,10 @@ account.3.register_line =
 account.3.reg_fail_retry_interval =
 
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.3.conf_type =
+account.3.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.3.conf_uri =
+account.3.conf_uri = {if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}
 
 #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist".
 account.3.blf.blf_list_uri =
@@ -1190,10 +1190,10 @@ account.4.register_line =
 account.4.reg_fail_retry_interval =
 
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.4.conf_type =
+account.4.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.4.conf_uri =
+account.4.conf_uri = {if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}
 
 #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist".
 account.4.blf.blf_list_uri =
@@ -1516,10 +1516,10 @@ account.5.register_line =
 account.5.reg_fail_retry_interval =
 
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.5.conf_type =
+account.5.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.5.conf_uri =
+account.5.conf_uri = {if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}
 
 #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist".
 account.5.blf.blf_list_uri =
@@ -1839,10 +1839,10 @@ account.6.register_line =
 account.6.reg_fail_retry_interval =
 
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.6.conf_type =
+account.6.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.6.conf_uri =
+account.6.conf_uri = {if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}
 
 #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist".
 account.6.blf.blf_list_uri =
diff --git a/resources/templates/provision/yealink/t27g/y000000000069.cfg b/resources/templates/provision/yealink/t27g/y000000000069.cfg
index 6d95c2f5f9..82c094f31f 100644
--- a/resources/templates/provision/yealink/t27g/y000000000069.cfg
+++ b/resources/templates/provision/yealink/t27g/y000000000069.cfg
@@ -867,6 +867,7 @@ features.password_dial.length =
 #######################################################################################
 #Enable or disable the phone to save the call history; 0-Disabled, 1-Enabled (default);
 features.save_call_history =
+features.save_init_num_to_history.enable = 0
 
 #######################################################################################
 ##                                   Features Pickup                                 ##
diff --git a/resources/templates/provision/yealink/t27g/{$mac}.cfg b/resources/templates/provision/yealink/t27g/{$mac}.cfg
index 9afe7884bc..f816877a78 100644
--- a/resources/templates/provision/yealink/t27g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t27g/{$mac}.cfg
@@ -395,10 +395,10 @@ account.1.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.1.conf_type =
+account.1.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.1.conf_uri =
+account.1.conf_uri = {if $nway_conference == true}nway{$account.1.auth_id}@{$account.1.server_address}{/if}
 
 #######################################################################################
 ##                            cid_source                                             ##
@@ -866,10 +866,10 @@ account.2.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.2.conf_type =
+account.2.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.2.conf_uri =
+account.2.conf_uri = {if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -1351,10 +1351,10 @@ account.3.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.3.conf_type =
+account.3.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.3.conf_uri =
+account.3.conf_uri = {if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -1826,10 +1826,10 @@ account.4.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.4.conf_type =
+account.4.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.4.conf_uri =
+account.4.conf_uri = {if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -2301,10 +2301,10 @@ account.5.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.5.conf_type =
+account.5.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.5.conf_uri =
+account.5.conf_uri = {if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -2775,10 +2775,10 @@ account.6.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.6.conf_type =
+account.6.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.6.conf_uri =
+account.6.conf_uri = {if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
diff --git a/resources/templates/provision/yealink/t27p/y000000000045.cfg b/resources/templates/provision/yealink/t27p/y000000000045.cfg
index defe312497..43c6e1b4fc 100644
--- a/resources/templates/provision/yealink/t27p/y000000000045.cfg
+++ b/resources/templates/provision/yealink/t27p/y000000000045.cfg
@@ -868,6 +868,7 @@ features.password_dial.length =
 #######################################################################################
 #Enable or disable the phone to save the call history; 0-Disabled, 1-Enabled (default);
 features.save_call_history =
+features.save_init_num_to_history.enable = 0
 
 #######################################################################################
 ##                                   Features Pickup                                 ##
diff --git a/resources/templates/provision/yealink/t27p/{$mac}.cfg b/resources/templates/provision/yealink/t27p/{$mac}.cfg
index d2bc1a563a..b28bbb439f 100644
--- a/resources/templates/provision/yealink/t27p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t27p/{$mac}.cfg
@@ -395,10 +395,10 @@ account.1.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.1.conf_type =
+account.1.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.1.conf_uri =
+account.1.conf_uri = {if $nway_conference == true}nway{$account.1.auth_id}@{$account.1.server_address}{/if}
 
 #######################################################################################
 ##                            cid_source                                             ##
@@ -866,10 +866,10 @@ account.2.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.2.conf_type =
+account.2.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.2.conf_uri =
+account.2.conf_uri = {if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -1351,10 +1351,10 @@ account.3.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.3.conf_type =
+account.3.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.3.conf_uri =
+account.3.conf_uri = {if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -1826,10 +1826,10 @@ account.4.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.4.conf_type =
+account.4.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.4.conf_uri =
+account.4.conf_uri = {if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -2301,10 +2301,10 @@ account.5.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.5.conf_type =
+account.5.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.5.conf_uri =
+account.5.conf_uri = {if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -2775,10 +2775,10 @@ account.6.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.6.conf_type =
+account.6.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.6.conf_uri =
+account.6.conf_uri = {if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
diff --git a/resources/templates/provision/yealink/t28p/y000000000000.cfg b/resources/templates/provision/yealink/t28p/y000000000000.cfg
index 6c15005011..b4448e58e5 100644
--- a/resources/templates/provision/yealink/t28p/y000000000000.cfg
+++ b/resources/templates/provision/yealink/t28p/y000000000000.cfg
@@ -719,7 +719,7 @@ local_time.interval =
 local_time.summer_time = {$yealink_summer_time}
 
 #Configure the DST type when the DST feature is enabled; 0-By Date (default), 1-By Week;
-local_time.dst_time_type =
+local_time.dst_time_type = {$yealink_dst_type}
 
 #Configure the start time of DST. The default value is 1/1/0.
 #If the DST type is configured as By Date, the value format is Month/Day/Hour. For example, the value 5/20/10 means the start time is at 10:00 on May 20.
@@ -1086,6 +1086,7 @@ features.redial_tone =
 
 #Enable or disable the phone to save the call history; 0-Disabled, 1-Enabled (default);
 features.save_call_history =
+features.save_init_num_to_history.enable = 0
 
 #Configure the phone to receive the action URI request from the specified IP address(es) or any IP address;
 #Enter multiple IP addresses (separated by comma) or "any"(stands for any IP address);
diff --git a/resources/templates/provision/yealink/t28p/{$mac}.cfg b/resources/templates/provision/yealink/t28p/{$mac}.cfg
index 3881c77d03..fd23f97426 100644
--- a/resources/templates/provision/yealink/t28p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t28p/{$mac}.cfg
@@ -186,10 +186,10 @@ account.1.register_line =
 account.1.reg_fail_retry_interval =
 
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.1.conf_type =
+account.1.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.1.conf_uri =
+account.1.conf_uri = {if $nway_conference == true}nway{$account.1.auth_id}@{$account.1.server_address}{/if}
 
 #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist".
 account.1.blf.blf_list_uri =
@@ -539,10 +539,10 @@ account.2.register_line =
 account.2.reg_fail_retry_interval =
 
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.2.conf_type =
+account.2.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.2.conf_uri =
+account.2.conf_uri = {if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}
 
 #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist".
 account.2.blf.blf_list_uri =
@@ -865,10 +865,10 @@ account.3.register_line =
 account.3.reg_fail_retry_interval =
 
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.3.conf_type =
+account.3.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.3.conf_uri =
+account.3.conf_uri = {if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}
 
 #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist".
 account.3.blf.blf_list_uri =
@@ -1190,10 +1190,10 @@ account.4.register_line =
 account.4.reg_fail_retry_interval =
 
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.4.conf_type =
+account.4.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.4.conf_uri =
+account.4.conf_uri = {if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}
 
 #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist".
 account.4.blf.blf_list_uri =
@@ -1516,10 +1516,10 @@ account.5.register_line =
 account.5.reg_fail_retry_interval =
 
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.5.conf_type =
+account.5.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.5.conf_uri =
+account.5.conf_uri = {if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}
 
 #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist".
 account.5.blf.blf_list_uri =
@@ -1839,10 +1839,10 @@ account.6.register_line =
 account.6.reg_fail_retry_interval =
 
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.6.conf_type =
+account.6.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.6.conf_uri =
+account.6.conf_uri = {if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}
 
 #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist".
 account.6.blf.blf_list_uri =
diff --git a/resources/templates/provision/yealink/t29g/y000000000046.cfg b/resources/templates/provision/yealink/t29g/y000000000046.cfg
index 1342a76869..78f704a8db 100644
--- a/resources/templates/provision/yealink/t29g/y000000000046.cfg
+++ b/resources/templates/provision/yealink/t29g/y000000000046.cfg
@@ -733,6 +733,7 @@ features.fwd_diversion_enable =
 #######################################################################################
 #Configure the DND key mode; 0-Phone mode (default), 1-Custom mode.
 features.dnd_mode =
+features.dnd.allow= {$yealink_dnd_allow}
 features.dnd.on_code = *78
 features.dnd.off_code = *79
 features.dnd.emergency_enable = 1
@@ -869,6 +870,7 @@ features.password_dial.length =
 #######################################################################################
 #Enable or disable the phone to save the call history; 0-Disabled, 1-Enabled (default);
 features.save_call_history =
+features.save_init_num_to_history.enable = 0
 
 #######################################################################################
 ##                                   Features Pickup                                 ##
diff --git a/resources/templates/provision/yealink/t29g/{$mac}.cfg b/resources/templates/provision/yealink/t29g/{$mac}.cfg
index 992d3648de..da1122289b 100644
--- a/resources/templates/provision/yealink/t29g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t29g/{$mac}.cfg
@@ -395,10 +395,10 @@ account.1.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.1.conf_type =
+account.1.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.1.conf_uri =
+account.1.conf_uri = {if $nway_conference == true}nway{$account.1.auth_id}@{$account.1.server_address}{/if}
 
 #######################################################################################
 ##                            cid_source                                             ##
@@ -867,10 +867,10 @@ account.2.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.2.conf_type =
+account.2.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.2.conf_uri =
+account.2.conf_uri = {if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -1353,10 +1353,10 @@ account.3.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.3.conf_type =
+account.3.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.3.conf_uri =
+account.3.conf_uri = {if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -1829,10 +1829,10 @@ account.4.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.4.conf_type =
+account.4.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.4.conf_uri =
+account.4.conf_uri = {if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -2305,10 +2305,10 @@ account.5.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.5.conf_type =
+account.5.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.5.conf_uri =
+account.5.conf_uri = {if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -2780,10 +2780,10 @@ account.6.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.6.conf_type =
+account.6.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.6.conf_uri =
+account.6.conf_uri = {if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
diff --git a/resources/templates/provision/yealink/t2x/y000000000044.cfg b/resources/templates/provision/yealink/t2x/y000000000044.cfg
index cf48317e75..e885d26a2d 100644
--- a/resources/templates/provision/yealink/t2x/y000000000044.cfg
+++ b/resources/templates/provision/yealink/t2x/y000000000044.cfg
@@ -868,6 +868,7 @@ features.password_dial.length =
 #######################################################################################
 #Enable or disable the phone to save the call history; 0-Disabled, 1-Enabled (default);
 features.save_call_history =
+features.save_init_num_to_history.enable = 0
 
 #######################################################################################
 ##                                   Features Pickup                                 ##
diff --git a/resources/templates/provision/yealink/t2x/y000000000052.cfg b/resources/templates/provision/yealink/t2x/y000000000052.cfg
index b7dbf147df..e416c962ef 100644
--- a/resources/templates/provision/yealink/t2x/y000000000052.cfg
+++ b/resources/templates/provision/yealink/t2x/y000000000052.cfg
@@ -828,6 +828,7 @@ features.password_dial.length =
 #######################################################################################
 #Enable or disable the phone to save the call history; 0-Disabled, 1-Enabled (default);
 features.save_call_history =
+features.save_init_num_to_history.enable = 0
 
 #######################################################################################
 ##                                   Features Pickup                                 ##
diff --git a/resources/templates/provision/yealink/t2x/y000000000053.cfg b/resources/templates/provision/yealink/t2x/y000000000053.cfg
index c04f28cf02..6b5cfabc77 100644
--- a/resources/templates/provision/yealink/t2x/y000000000053.cfg
+++ b/resources/templates/provision/yealink/t2x/y000000000053.cfg
@@ -723,7 +723,7 @@ local_time.interval =
 local_time.summer_time = {$yealink_summer_time}
 
 #Configure the DST type when the DST feature is enabled; 0-By Date (default), 1-By Week;
-local_time.dst_time_type =
+local_time.dst_time_type = {$yealink_dst_type}
 
 #Configure the start time of DST. The default value is 1/1/0.
 #If the DST type is configured as By Date, the value format is Month/Day/Hour. For example, the value 5/20/10 means the start time is at 10:00 on May 20.
@@ -1109,6 +1109,8 @@ features.redial_tone =
 #Enable or disable the phone to save the call history; 0-Disabled, 1-Enabled (default);
 features.save_call_history =
 
+features.save_init_num_to_history.enable = 0
+
 #Configure the phone to receive the action URI request from the specified IP address(es) or any IP address;
 #Enter multiple IP addresses (separated by comma) or "any"(stands for any IP address);
 features.action_uri_limit_ip =
diff --git a/resources/templates/provision/yealink/t2x/y000000000069.cfg b/resources/templates/provision/yealink/t2x/y000000000069.cfg
index f9408d464c..000d141949 100644
--- a/resources/templates/provision/yealink/t2x/y000000000069.cfg
+++ b/resources/templates/provision/yealink/t2x/y000000000069.cfg
@@ -867,6 +867,7 @@ features.password_dial.length =
 #######################################################################################
 #Enable or disable the phone to save the call history; 0-Disabled, 1-Enabled (default);
 features.save_call_history =
+features.save_init_num_to_history.enable = 0
 
 #######################################################################################
 ##                                   Features Pickup                                 ##
diff --git a/resources/templates/provision/yealink/t2x/{$mac}.cfg b/resources/templates/provision/yealink/t2x/{$mac}.cfg
index f4734a28d1..2271b5ad1b 100644
--- a/resources/templates/provision/yealink/t2x/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t2x/{$mac}.cfg
@@ -342,10 +342,10 @@ account.{$row.line_number}.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type 0-Local (default), 2-Network Conference
-account.{$row.line_number}.conf_type =
+account.{$row.line_number}.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.{$row.line_number}.conf_uri =
+account.{$row.line_number}.conf_uri = {if $nway_conference == true}nway{$account.{$row.line_number}.user_id}@{$account.{$row.line_number}.server_address}{/if}
 
 #######################################################################################
 ##                            cid_source                                             ##
diff --git a/resources/templates/provision/yealink/t31g/directory.xml b/resources/templates/provision/yealink/t31g/directory.xml
new file mode 100644
index 0000000000..8dd8e49035
--- /dev/null
+++ b/resources/templates/provision/yealink/t31g/directory.xml
@@ -0,0 +1,84 @@
+<YealinkIPPhoneDirectory>
+{foreach $contacts as $row}
+{if $smarty.get.contacts == "users" && $row.category == "users"}
+<DirectoryEntry>
+{if $row.contact_name_given != ""}
+{if $row.contact_organization != ""}
+	<Name>{$row.contact_organization} {$row.contact_name_given} {$row.contact_name_family}</Name>
+{else}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{/if}
+{else}
+<Name>{$row.effective_caller_id_name}</Name>
+{/if}
+{foreach $row.numbers as $number}
+{if $number.phone_number != ""}
+	<Telephone>{$number.phone_number}</Telephone>
+{else}		
+	<Telephone>{$number.phone_extension}</Telephone>
+{/if}
+{/foreach}
+</DirectoryEntry>
+{elseif $smarty.get.contacts == "groups" && $row.category == "groups"}
+<DirectoryEntry>
+{if $row.contact_name_given != ""}
+{if $row.contact_organization != ""}
+	<Name>{$row.contact_organization} {$row.contact_name_given} {$row.contact_name_family}</Name>
+{else}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{/if}
+{else}
+	<Name>{$row.effective_caller_id_name}</Name>
+{/if}
+{foreach $row.numbers as $number}
+{if $number.phone_number != ""}
+	<Telephone>{$number.phone_number}</Telephone>
+{else}		
+	<Telephone>{$number.phone_extension}</Telephone>
+{/if}
+{/foreach}
+</DirectoryEntry>
+{elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
+<DirectoryEntry>
+{if $row.contact_name_given != ""}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{else}
+	<Name>{$row.effective_caller_id_name}</Name>
+{/if}
+{if $row.phone_number != ""}
+	<Telephone>{$row.phone_number}</Telephone>
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
+{/if}
+</DirectoryEntry>
+{elseif $smarty.get.contacts == "all"}
+<DirectoryEntry>
+{if $row.contact_name_given != ""}
+{if $row.contact_organization != ""}
+	<Name>{$row.contact_organization} {$row.contact_name_given} {$row.contact_name_family}</Name>
+{else}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{/if}
+{else}
+	<Name>{$row.effective_caller_id_name}</Name>
+{/if}
+{if $row.category == "extensions"}
+{if $row.phone_number != ""}
+	<Telephone>{$row.phone_number}</Telephone>
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
+{/if}
+{else}
+{foreach $row.numbers as $number}
+{if $number.phone_number != ""}
+	<Telephone>{$number.phone_number}</Telephone>
+{else}		
+	<Telephone>{$number.phone_extension}</Telephone>
+{/if}
+{/foreach}
+{/if}
+</DirectoryEntry>
+{/if}
+{/foreach}
+</YealinkIPPhoneDirectory>
+
diff --git a/resources/templates/provision/yealink/t31g/favorite_setting.xml b/resources/templates/provision/yealink/t31g/favorite_setting.xml
new file mode 100644
index 0000000000..ba7275358e
--- /dev/null
+++ b/resources/templates/provision/yealink/t31g/favorite_setting.xml
@@ -0,0 +1,8 @@
+<root_favorite_set>
+<item id_name="localdirectory" display_name="Local Directory" priority="2" enable="0" />
+<item id_name="history" display_name="History" priority="3" enable="1" />
+<item id_name="networkcalllog" display_name="Network CallLog" priority="4" enable="0" />
+<item id_name="remotedirectory" display_name="Remote Phone Book" priority="5" enable="1" />
+<item id_name="ldap" display_name="LDAP" priority="1" enable="0" />
+<item id_name="networkdirectory" display_name="Network Directory" priority="6" enable="0" />
+</root_favorite_set>
diff --git a/resources/templates/provision/yealink/t31g/y000000000000.boot b/resources/templates/provision/yealink/t31g/y000000000000.boot
new file mode 100644
index 0000000000..40e10b1e07
--- /dev/null
+++ b/resources/templates/provision/yealink/t31g/y000000000000.boot
@@ -0,0 +1,7 @@
+#!version:1.0.0.1
+## The header above must appear as-is in the first line
+
+include:config "y000000000123.cfg"
+include:config "{$mac}.cfg"
+
+overwrite_mode = {$yealink_overwrite_mode}
diff --git a/resources/templates/provision/yealink/t31g/y000000000123.cfg b/resources/templates/provision/yealink/t31g/y000000000123.cfg
new file mode 100644
index 0000000000..0aab453268
--- /dev/null
+++ b/resources/templates/provision/yealink/t31g/y000000000123.cfg
@@ -0,0 +1,1336 @@
+#!version:1.0.0.1
+## The header above must appear as-is in the first line
+
+include:config "y000000000123.cfg"
+include:config "{$mac}.cfg"
+
+overwrite_mode = {$yealink_overwrite_mode}
+root@hvox3:/var/www/fusionpbx/resources/templates/provision/yealink/t31g# cat y000000000123.cfg 
+#!version:1.0.0.1
+
+##File header "#!version:1.0.0.1" can not be edited or deleted.##
+
+#######################################################################################
+##                          Network                                                  ##
+#######################################################################################
+
+#Configure the WAN port type; 0-DHCP (default), 1-PPPoE, 2-Static IP Address;
+#Require reboot;
+network.internet_port.type =
+
+#Configure the static IP address, subnet mask, gateway and DNS server.
+#Require Reboot;
+network.internet_port.ip =
+network.internet_port.mask =
+network.internet_port.gateway =
+network.primary_dns= {$dns_server_primary}
+network.secondary_dns = {$dns_server_secondary}
+
+#Configure the username and password for PPPOE connection.
+#Require reboot;
+network.pppoe.user =
+network.pppoe.password =
+
+#Configure the PC port type; 0-Router, 1-Bridge (default);
+#Require reboot;
+network.bridge_mode =
+
+#Configure the IP address and mask when the PC port is configured as Router.
+#Require reboot;
+network.pc_port.ip =
+network.pc_port.mask =
+
+#Enable or disable the DHCP server when the PC port is configured as Router; 0-Disabled, 1-Enabled (default);
+#Require reboot;
+network.pc_port.dhcp_server =
+
+#Define the DHCP IP address range. The default is from 10.0.0.10 to 10.0.0.100.
+network.dhcp.start_ip =
+network.dhcp.end_ip =
+
+#Enable or disable the VLAN of WAN port; 0-Disabled (default), 1-Enabled;
+#Require reboot;
+network.vlan.internet_port_enable =
+
+#Configure the VLAN ID, it ranges from 0 to 4094, the default value is 1.
+#Require reboot;
+network.vlan.internet_port_vid =
+
+#Configure the VLAN priority, it ranges from 0 (default) to 7.
+#Require reboot;
+network.vlan.internet_port_priority =
+
+#Enable or disable the VLAN of PC port; 0-Disabled (default), 1-Enabled;
+#Require reboot;
+network.vlan.pc_port_enable =
+
+#Configure the VLAN ID, it ranges from 0 to 4094, the default value is 1.
+#Require reboot;
+network.vlan.pc_port_vid = {$yealink_vlan_pc_id}
+
+#Configure the VLAN priority, it ranges from 0 (default) to 7.
+#Require reboot;
+network.vlan.pc_port_priority = {$yealink_vlan_pc_cos}
+
+#Configure the access type of the web server; 0-Disabled, 1-HTTP & HTTPS (default), 2-HTTP Only, 3-HTTPS Only;
+#Require reboot;
+network.web_server_type =
+
+#Configure the HTTP port (80 by default) and the HTTPS port (443 by default) of the web server. Both range from 1 to 65535.
+#Require reboot;
+network.port.http =
+network.port.https =
+
+#Configure the maximum local RTP port. It ranges from 0 to 65535, the default value is 11800.
+#Require reboot;
+network.port.max_rtpport =
+
+#Configure the minimum local RTP port. It ranges from 0 to 65535, the default value is 11780.
+#Require reboot;
+network.port.min_rtpport =
+
+#Configure the voice QOS. It ranges from 0 to 63, the default value is 46.
+#Require reboot;
+network.qos.rtptos =
+
+#Configure the SIP QOS. It ranges from 0 to 63, the default value is 46.
+#Require reboot;
+network.qos.signaltos =
+
+#Configure the 802.1x mode; 0-Disabled (default), 1-EAP-MD5, 2-EAP-TLS, 3-PEAP-MSCHAPV2;
+#Require reboot;
+network.802_1x.mode =
+
+#Configure the username and password for 802.1x authentication.
+#Require reboot;
+network.802_1x.identity =
+network.802_1x.md5_password =
+
+#Enable or disable the VPN feature; 0-Disabled (default), 1-Enabled;
+#Require reboot;
+network.vpn_enable = {$yealink_network_vpn_enable}
+
+#Enable or disable the LLDP feature; 0-Disabled, 1-Enabled (default);
+#Require reboot;
+network.lldp.enable =
+
+#Configure the interval (in seconds) the phone broadcasts the LLDP request. It ranges from 1 to 3600, the default value is 120.
+#Require reboot;
+network.lldp.packet_interval =
+
+#Enable or disable the phone to obtain DNS from DHCP; 0-Disabled, 1-Enabled (default);
+#Require reboot;
+{if isset($dns_server_primary)}network.static_dns_enable = 1{else}network.static_dns_enable = 0{/if}
+
+#######################################################################################
+##                Syslog Server                                                      ##
+#######################################################################################
+
+#Configure the IP address of the syslog server.
+#Require reboot;
+syslog.server =
+
+#Configure the syslog level. It ranges from 0 to 6, the default value is 3.
+#Require reboot;
+syslog.log_level =
+
+#######################################################################################
+##                 TR069                                                             ##
+#######################################################################################
+
+#The TR069 feature is only applicable to some designated firmware versions.
+#All settings of TR069 require reboot.
+#Enable or disable the TR069 feature; 0-Disabled (default), 1-Enabled;
+managementserver.enable =
+
+#Configure the username and password for the phone to authenticate with the ACS.
+managementserver.username =
+managementserver.password =
+
+#Configure the access URL of the ACS.
+managementserver.url =
+
+#Configure the username and password for the phone to authenticate the connection requests.
+managementserver.connection_request_username =
+managementserver.connection_request_password =
+
+#Enable or disable the phone to inform the ACS of its configuration; 0-Disabled (default), 1-Enabled;
+managementserver.periodic_inform_enable =
+
+#Configure the interval (in seconds) the phone to inform the ACS of its configuration. The default value is 60.
+managementserver.periodic_inform_interval =
+
+#######################################################################################
+##                 Auto Provisioning                                                 ##
+#######################################################################################
+
+#Enable or disable the Plug and Play feature; 0-Disabled, 1-Enabled (default);
+auto_provision.pnp_enable =
+
+#Enable or disable the phone to check new configuration when powered on; 0-Disabled, 1-Enabled (default);
+auto_provision.mode =
+
+#Enable or disable the phone to check the new configuration repeatedly; 0-Disabled (default), 1-Enabled;
+auto_provision.repeat.enable =
+
+#Configure the interval (in minutes) the phone repeatedly checks the new configuration. The default is 1440.
+auto_provision.repeat.minutes =
+
+#Enable or disable the phone to check the new configuration weekly; 0-Disabled (default), 1-Enabled;
+auto_provision.weekly.enable =
+
+#Configure the week time the phone checks the new configuration. Applicable when the auto provisioning mode is configured as weekly or power on + weekly;
+#auto_provision.weekly.mask = 0123456
+#auto_provision.weekly.begin_time = 00:00
+#auto_provision.weekly.end_time = 00:00
+
+auto_provision.weekly.mask =
+auto_provision.weekly.begin_time =
+auto_provision.weekly.end_time =
+
+#Configure the URL of the auto provisioning server.
+auto_provision.server.url = {$yealink_provision_url}
+
+#Configure the domain name of the PNP server.
+auto_provision.pnp_domain_name =
+
+#Configure the PNP vendor information.
+auto_provision.pnp_event_vendor =
+
+#Configure the name of the Common configuration file.
+auto_provision.common_file_name =
+
+#Configure the username and password for downloading.
+auto_provision.server.username = {$http_auth_username}
+auto_provision.server.password = {$http_auth_password}
+
+#Enable or disable the DHCP option mode; 0-Disabled, 1-Enabled (default);
+auto_provision.dhcp_option.enable =
+
+#Configure the value (manufacturer of the device) of DHCP option 60.
+auto_provision.dhcp_option.option60_value =
+
+#Configure the custom DHCP option number. It ranges from 128 to 254.
+auto_provision.dhcp_option.list_user_options =
+
+#Configure AES key (16 characters) for decrypting the common CFG file.
+auto_provision.aes_key_16.com =
+
+#Configure AES key (16 characters) for decrypting the MAC-Oriented CFG file.
+auto_provision.aes_key_16.mac =
+
+#######################################################################################
+##	               Auto Provisioning Code                                            ##
+#######################################################################################
+
+#This feature allows user to trigger the auto provisioning by dialing a predefined string on the phone, when there is no available accounts.
+#Require reboot;
+#"X" ranges from 1 to 50
+
+#Configure the auto provisioning name.
+#The valid value is a string, the maximum length is 100.
+#autoprovision.x.name =
+
+#Configure the auto provisioning code.
+#The valid value is a string, the maximum length is 100.
+#autoprovision.x.code =
+
+#Configure the URL of the auto provisioning server.
+#The valid value is a string, the maximum length is 256.
+#autoprovision.x.url =
+
+#Configure the username and password for downloading.
+#The valid value is a string, the maximum length is 100.
+#autoprovision.x.user =
+#autoprovision.x.password =
+
+#Configure AES key (16 characters) for decrypting the common CFG file and MAC-Oriented CFG file.
+#autoprovision.x.com_aes =
+#autoprovision.x.mac_aes =
+
+autoprovision.1.name =
+autoprovision.1.code =
+autoprovision.1.url =
+autoprovision.1.user =
+autoprovision.1.password =
+autoprovision.1.com_aes =
+autoprovision.1.mac_aes =
+
+autoprovision.2.name =
+autoprovision.2.code =
+autoprovision.2.url =
+autoprovision.2.user =
+autoprovision.2.password =
+autoprovision.2.com_aes =
+autoprovision.2.mac_aes =
+
+#######################################################################################
+##	                Phone Features                                                   ##
+#######################################################################################
+
+#Enable or disable the phone to escape the pound key as percent sign followed by 23 when dialing out; 0-Disabled, 1-Enabled (default);
+sip.use_23_as_pound =
+
+#Enable or disable the RFC2543 Hold feature; 0-Disabled (default), 1-Enabled;
+sip.rfc2543_hold =
+
+#Enable or disable the phone to keep sending the SIP messages to the outbound server; 0-Disabled, 1-Enabled (default);
+sip.use_out_bound_in_dialog =
+
+#Configure the registration random time (in seconds). It ranges from 0 (default) to 60.
+sip.reg_surge_prevention =
+
+sip.check_autop_result_before_register =
+
+sip.send_response_by_request =
+
+#Enable or disable the phone to reboot when receiving SIP notify messages; 0-Disabled, 1-Enabled (default);
+sip.notify_reboot_enable =
+
+#Enable or disable the WatchDog feature; 0-Disabled, 1-Enabled (default);
+watch_dog.enable =
+
+#Enable or disable the redirect feature; 0-Disabled (default), 1-Enabled;
+redirect.enable =
+
+#Enable or disable the transferee to display the missed call prompt when receiving a semi_attended transfer call;
+#0-Disabled, 1-Enabled (default);
+transfer.semi_attend_tran_enable = {$yealink_transfer_semi_attended}
+
+#Enable or disable the phone to complete the blind or attended transfer through on-hook;
+#0-Disabled,1-Enabled(default);
+transfer.blind_tran_on_hook_enable =
+transfer.on_hook_trans_enable =
+
+#Define the way of DSS key when configuring as a transfer key; 0-Display Number, 1-Attended Transfer, 2-Blind Transfer (default);
+transfer.dsskey_deal_type = {$yealink_dsskey_transfer_mode}
+
+#Enable or disable the conference initiator to transfer the call when hanging up;
+#0-Disabled(default),1-Enabled;
+transfer.tran_others_after_conf_enable =
+
+#######################################################################################
+##                                Voice                                              ##
+#######################################################################################
+
+#Enable or disable the voice activity detection feature; 0-Disbaled (default), 1-Enabled;
+voice.vad =
+
+#Enable or disable the comfortable noise generator; 0-Disabled, 1-Enabled (default);
+voice.cng =
+
+#Enable or disable the echo canceller; 0-Disabled, 1-Enabled (default);
+voice.echo_cancellation =
+
+#Configure the volume of the side tone. It ranges from -48 to 0, the default value is -3.
+voice.side_tone=
+
+#Configure the sending volume of Speaker, Handset and Headset. It ranges from 1 to 53, the default values are 25, 35, 29.
+#Require reboot;
+voice.handfree_send =
+voice.handset_send =
+voice.headset_send =
+
+#Configure the type of jitter buffer; 0-Fixed, 1-Adaptive (default);
+voice.jib.adaptive =
+
+#Configure the minimum delay, maximum delay and normal delay. The default values are 0, 300, 120.
+voice.jib.min =
+voice.jib.max =
+voice.jib.normal =
+
+#Define the voice tone, the valid values can be Custom (default) or voice tone of different countries. For example, United States, France, Germany and so on.
+#voice.tone.country = Custom
+voice.tone.country =
+
+#Customize the tone when the "voice.tone.country" is configured as Custom.
+#The value format: Frequency/Duration.
+#Frequency ranges from 200 to 7000. When 0 is used to define the frequency, it means a pause between tones.
+#A tone can be composited at most four different frequencies (the value format is: F1+F2+F3+F4).
+#Duration is the time duration (in milliseconds) of ringing the tone. It ranges from 0 to 30000ms.
+#At most eight tones can be configured for dial, ring, busy and so on, each tone is separated by comma.
+#For example, voice.tone.dial = 100/200,200/150,300+400+500+1200/1000,0/1200,500+900/800,5000+2000+3000/6000,0/1500,3600/1800
+voice.tone.dial =
+voice.tone.ring =
+voice.tone.busy =
+voice.tone.congestion =
+voice.tone.callwaiting =
+voice.tone.dialrecall =
+voice.tone.record=
+voice.tone.info =
+voice.tone.stutter =
+voice.tone.message =
+voice.tone.autoanswer =
+
+#Configure the receiving volume of Speaker, Handset and Headset. It ranges from 0 to 15, the default value is 8.
+voice.handfree.spk_vol =
+voice.handset.spk_vol =
+voice.headset.spk_vol =
+
+#Configure the dial tone volume of Speaker, Handset and Headset. It ranges from 0 to 15, the default value is 8.
+voice.handfree.tone_vol =
+voice.handset.tone_vol =
+voice.headset.tone_vol =
+
+#Configure the ring volume. It ranges from 0 to 15, the default value is 8.
+voice.ring_vol=
+
+#Configure the Speaker volume when in the group listening mode. It ranges from 0 to 15, the default value is 8.
+voice.group_spk_vol =
+
+#######################################################################################
+##         	                   Security Settings                                     ##
+#######################################################################################
+
+#Enable or disable the phone to only accept the certificates in the Trusted Certificates list;
+#0-Disabled, 1-Enabled (default);
+security.trust_certificates = {if $yealink_trust_certificates == "false"}0{elseif $yealink_trust_certificates == "true"}1{/if}
+
+#Define the login username and password of the user, var and administrator.
+#If your username is defined as: security.user_name.admin = adminuser.
+#and your password must like this: security.user_password = adminuser:adminpassword.
+#adminuser is the value of "security.user_name.admin"; adminpassword is the password you want to set.
+{if isset($user_name) }
+security.user_name.user = {$user_name}
+security.user_password = {$user_name}:{$user_password}
+{/if}
+{if isset($admin_name) }
+security.user_name.admin = {$admin_name}
+security.user_password = {$admin_name}:{$admin_password}
+{/if}
+{if isset($var_name) }
+security.user_name.var = {$var_name}
+security.user_password = {$var_name}:{$var_password}
+{/if}
+
+#Enable or disable the 3-level permissions (open var); 0-Disabled (default), 1-Enabled;
+#Require reboot;
+security.var_enable =
+
+#######################################################################################
+##                   Customize the softkey                                           ##
+#######################################################################################
+#Customize the softkeys presented on the phone LCD screen when Callfailed, Callin, Connecting, Dialing, Ringback and Talking.
+custom_softkey_call_failed.url =
+custom_softkey_call_in.url =
+custom_softkey_connecting.url =
+custom_softkey_dialing.url =
+custom_softkey_ring_back.url =
+custom_softkey_talking.url =
+
+#######################################################################################
+##         	                  Memory Key (For T38G only)                             ##
+#######################################################################################
+#X ranges from 1 to 10;
+#memorykey.x.line--Configure the desired line to apply the key feature. It ranges from 0 to 6.
+#The value 0 of the "memorykey.x.line" stands for Auto, it means the first available line.
+#But, when the DSS key is configured as BLF, BLF List, Shared Line, Call Park, Pick Up, ACD or Voice Mail feature, the value 0 stands for line 1.
+#memorykey.x.value--Enter the value of some features. E.g. When configuring the DSS key to be BLF, enter the number of the monitored user.
+#memorykey.x.pickup_value--Enter the pickup code, this parameter is only appilicable to BLF.
+#memorykey.x.type--Assign the desired feature to the memory key.
+#Valid types are:  0-N/A(default for memory key)  1-Conference 		 2-Forward    3-Transfer      4-Hold        5-DND             6-Redial                        7-Call Return     8-SMS
+#                  9-Call Pickup                  10-Call Park     11-DTMF      12-Voicemail    13-SpeedDial  14-Intercom       15-Line(default for line key)   16-BLF            17-URL
+#                  18-Group Listening             19-Public Hold   20-Private   21-Shared Line  22-XML Group  23-Group Pickup   24-Paging                       25-Record         27-XML Browser
+#                  34-Hot Desking                 35-URL Record    38-LDAP      39-BLF List     40-Prefix     41-Zero-Sp-Touch  42-ACD                          45-Local Group    46-Broadsoft Group
+#memorykey.x.xml_phonebook--Specify the desired remote phonebook/local group/BSFT phonebook for the DSS key. This parameter is only appilicable to the feature XML Group/Local Group/Broadsoft Group.
+#memorykey.x.sub_type =
+
+# Configure Memory Key1
+memorykey.1.line =
+memorykey.1.value =
+memorykey.1.pickup_value =
+memorykey.1.type =
+memorykey.1.xml_phonebook =
+memorykey.1.sub_type =
+
+# Configure Memory Key2
+memorykey.2.line =
+memorykey.2.value =
+memorykey.2.pickup_value =
+memorykey.2.type =
+memorykey.2.xml_phonebook =
+memorykey.2.sub_type =
+
+# Configure Memory Key3
+memorykey.3.line =
+memorykey.3.value =
+memorykey.3.pickup_value =
+memorykey.3.type =
+memorykey.3.xml_phonebook =
+memorykey.3.sub_type =
+
+# Configure DSS Key4
+memorykey.4.line =
+memorykey.4.value =
+memorykey.4.pickup_value =
+memorykey.4.type =
+memorykey.4.xml_phonebook =
+memorykey.4.sub_type =
+
+# Configure Memory Key5
+memorykey.5.line =
+memorykey.5.value =
+memorykey.5.pickup_value =
+memorykey.5.type =
+memorykey.5.xml_phonebook =
+memorykey.5.sub_type =
+
+# Configure Memory Key6
+memorykey.6.line =
+memorykey.6.value =
+memorykey.6.pickup_value =
+memorykey.6.type =
+memorykey.6.xml_phonebook =
+memorykey.6.sub_type =
+
+# Configure Memory Key7
+memorykey.7.line =
+memorykey.7.value =
+memorykey.7.pickup_value =
+memorykey.7.type =
+memorykey.7.xml_phonebook =
+memorykey.7.sub_type =
+
+# Configure Memory Key8
+memorykey.8.line =
+memorykey.8.value =
+memorykey.8.pickup_value =
+memorykey.8.type =
+memorykey.8.xml_phonebook =
+memorykey.8.sub_type =
+
+# Configure Memory Key9
+memorykey.9.line =
+memorykey.9.value =
+memorykey.9.pickup_value =
+memorykey.9.type =
+memorykey.9.xml_phonebook =
+memorykey.9.sub_type =
+
+# Configure Memory Key10
+memorykey.10.line =
+memorykey.10.value =
+memorykey.10.pickup_value =
+memorykey.10.type =
+memorykey.10.xml_phonebook =
+memorykey.10.sub_type =
+
+#######################################################################################
+##         	                   Line Key                                              ##
+#######################################################################################
+
+#The x of the parameter "linekey.x.line" ranges from 1 to 6.
+#The default value equals to the value of x. For example, the default value of the parameter "linekey.1.line" is 1.
+#linekey.x.lable--Define the label for each line key.
+
+#Configure Line Key1
+linekey.1.line =
+linekey.1.value =
+linekey.1.pickup_value =
+linekey.1.type =
+linekey.1.xml_phonebook =
+linekey.1.label =
+
+#Configure Line Key2
+linekey.2.line =
+linekey.2.value =
+linekey.2.pickup_value =
+linekey.2.type =
+linekey.2.xml_phonebook =
+linekey.2.label =
+
+#Configure Line Key3
+linekey.3.line =
+linekey.3.value =
+linekey.3.pickup_value =
+linekey.3.type =
+linekey.3.xml_phonebook =
+linekey.3.label =
+
+#Configure Line Key4 (for T38G only)
+linekey.4.line =
+linekey.4.value =
+linekey.4.pickup_value =
+linekey.4.type =
+linekey.4.xml_phonebook =
+linekey.4.label =
+
+#Configure Line Key5  (for T38G only)
+linekey.5.line =
+linekey.5.value =
+linekey.5.pickup_value =
+linekey.5.type =
+linekey.5.xml_phonebook =
+linekey.5.label =
+
+#Configure Line Key6  (for T38G only)
+linekey.6.line =
+linekey.6.value =
+linekey.6.pickup_value =
+linekey.6.type =
+linekey.6.xml_phonebook =
+linekey.6.label =
+
+##########################################################################################
+##         	               Programmable Key (For T38G only)                             ##
+##########################################################################################
+#X ranges from 1 to 15.
+#programablekey.x.type--Customize the programmable key type.
+#The valid types are:
+#0-N/A         2-Forward        5-DND           6-Redial     7-Call Return    8-SMS      9-Call Pickup  13-Spead Dial  14-Intercom
+#22-XML Group  23-Group Pickup  27-XML Browser  28-History   29-Directory     30-Menu    32-New SMS     33-Status      43-Local Phonebook
+#44-Broadsoft Phonebook    45-Local Group    46-Broadsoft Group   47-XML Phonebook   48-Switch Account Up   49-Switch Account Down    50-Keypad Lock
+#programablekey.x.line--Configure the desired line to apply the key feature. It ranges from 0 to 6.
+#The value 0 of the "proramablekey.x.line" stands for Auto, it means the first available line.
+#But, when the programmable key is configured as Pick Up, the value 0 stands for line 1.
+
+{foreach $keys["programmable"] as $row}
+programablekey.{$row.device_key_id}.type = {$row.device_key_type}
+{if $row.device_key_type == "22" || $row.device_key_type == "47"}
+programablekey.{$row.device_key_id}.xml_phonebook = {$row.device_key_line}
+{else}
+programablekey.{$row.device_key_id}.line = {$row.device_key_line}
+programablekey.{$row.device_key_id}.value = {$row.device_key_value}
+{/if}
+programablekey.{$row.device_key_id}.extension = {$row.device_key_extension}
+programablekey.{$row.device_key_id}.label = {$row.device_key_label}
+programablekey.1.pickup_value ={$row.device_key_extension}
+programablekey.1.history_type =
+{/foreach}
+
+##########################################################################################
+##         	              Expansion Key   £¨For T38G only£©                             ##
+##########################################################################################
+#X ranges from 1 to 6, Y ranges from 1 to 39.
+#expansion_module.x.key.y.type = 37 (Switch by default)
+#expansion_module.x.key.y.line = 0
+#expansion_module.x.key.y.value =
+#expansion_module.x.key.y.pickup_value =
+#expansion_module.x.key.y.label =
+
+{foreach $keys["expansion"] as $row}
+expansion_module.1.key.{$row.device_key_id}.type = {$row.device_key_type}
+expansion_module.1.key.{$row.device_key_id}.line = {$row.device_key_line}
+expansion_module.1.key.{$row.device_key_id}.value = {$row.device_key_value}
+expansion_module.1.key.{$row.device_key_id}.extension = {$row.device_key_extension}
+expansion_module.1.key.{$row.device_key_id}.label = {$row.device_key_label}
+expansion_module.1.key.{$row.device_key_id}.xml_phonebook =
+{/foreach}
+{foreach $keys["expansion-1"] as $row}
+expansion_module.1.key.{$row.device_key_id}.type = {$row.device_key_type}
+expansion_module.1.key.{$row.device_key_id}.line = {$row.device_key_line}
+expansion_module.1.key.{$row.device_key_id}.value = {$row.device_key_value}
+expansion_module.1.key.{$row.device_key_id}.extension = {$row.device_key_extension}
+expansion_module.1.key.{$row.device_key_id}.label = {$row.device_key_label}
+expansion_module.1.key.{$row.device_key_id}.xml_phonebook =
+{/foreach}
+{foreach $keys["expansion-2"] as $row}
+expansion_module.2.key.{$row.device_key_id}.type = {$row.device_key_type}
+expansion_module.2.key.{$row.device_key_id}.line = {$row.device_key_line}
+expansion_module.2.key.{$row.device_key_id}.value = {$row.device_key_value}
+expansion_module.2.key.{$row.device_key_id}.extension = {$row.device_key_extension}
+expansion_module.2.key.{$row.device_key_id}.label = {$row.device_key_label}
+expansion_module.2.key.{$row.device_key_id}.xml_phonebook =
+{/foreach}
+
+#######################################################################################
+##           Automatic Call Distribute                                               ##
+#######################################################################################
+#Enable or disable the phone to automatically change the phone status to available; 0-Disabled (default), 1-Enabled;
+acd.auto_available =
+
+#Configure the interval (in seconds) to automatically turn the state of the ACD agent to available. It ranges from 0 to 120, the default value is 60.
+acd.auto_available_timer =
+
+#######################################################################################
+#         	                   Action URL Settings                                   ##
+#######################################################################################
+
+#action_url.setup_completed--Inform the server that the phone has completed the startup.
+#action_url.dnd_on-- Inform the server that the DND is activated on the phone.
+#The value format is: http://IP address of server/help.xml?variable name=variable value.
+#The valid variable values are: $mac--MAC address of phone, $ip--The current IP address of phone, $model--Phone model, $firmware--Phone firmware version.
+#$active_url--The SIP URI of the current account when the phone is in the incoming state, outgoing state or during conversation.
+#$active_user--The username of the current account when the phone is in the incoming state, outgoing state or during conversation.
+#$active_host--The host name of the current account when the phone is in the incoming state, the outgoing state or during conversation.
+#$local--The SIP URI of the caller when outgoing calls or the SIP URI of the callee when receiving calls.
+#$remote--The SIP URI of the callee when outgoing calls or the SIP URI of the caller when receiving calls.
+#$display_local--The display name of the caller when outgoing calls or the display name of the callee when receiving calls.
+#$display_remote--The display name of the callee when outgoing calls or the display name of the caller when receiving calls.
+#$call_id--The caller ID when in the incoming state, the outgoing state or during conversation.
+#For example, action_url.log_on = http://192.168.1.20/help.xml?mac=$mac
+
+action_url.setup_completed =
+action_url.log_on =
+action_url.log_off =
+action_url.register_failed =
+action_url.off_hook =
+action_url.on_hook =
+action_url.incoming_call =
+action_url.outgoing_call =
+action_url.call_established =
+action_url.dnd_on =
+action_url.dnd_off =
+action_url.always_fwd_on =
+action_url.always_fwd_off =
+action_url.busy_fwd_on =
+action_url.busy_fwd_off =
+action_url.no_answer_fwd_on =
+action_url.no_answer_fwd_off =
+action_url.transfer_call =
+action_url.blind_transfer_call =
+action_url.attended_transfer_call =
+action_url.hold =
+action_url.unhold =
+action_url.mute =
+action_url.unmute =
+action_url.missed_call =
+action_url.call_terminated =
+action_url.busy_to_idle =
+action_url.idle_to_busy =
+action_url.forward_incoming_call =
+action_url.reject_incoming_call =
+action_url.answer_new_incoming_call =
+action_url.transfer_finished =
+action_url.transfer_failed =
+
+#######################################################################################
+##                             Language Settings                                     ##
+#######################################################################################
+
+#Specify the web language, the valid values are: English, Chinese_S, Turkish, Portuguese, Spanish, Italian, French, Russian, Deutsch and Czech.
+lang.wui =
+
+#Specify the LCD language, the valid values are: English (default), Chinese_S, Chinese_T, German, French, Turkish, Italian, Polish, Spanish and Portuguese.
+#lang.gui = English
+lang.gui = {$yealink_language_gui}
+
+#######################################################################################
+##                             Time Settings                                         ##
+#######################################################################################
+
+#Configure the time zone and time zone name. The time zone ranges from -11 to +12, the default value is +8.
+#The default time zone name is China(Beijing).
+#local_time.time_zone = +8
+#local_time.time_zone_name = China(Beijing)
+local_time.time_zone = {$yealink_time_zone}
+local_time.time_zone_name = {$yealink_time_zone_name}
+
+#Configure the domain name or the IP address of the NTP server. The default value is cn.pool.ntp.org.
+local_time.ntp_server1 = {$ntp_server_primary}
+local_time.ntp_server2 = {$ntp_server_secondary}
+
+#Configure the update interval (in seconds) when using the NTP server. The default value is 1000.
+local_time.interval =
+
+#Configure the daylight saving time feature; 0-Disabled, 1-Enabled, 2-Automatic (default);
+local_time.summer_time = {$yealink_summer_time}
+
+#Configure the DST type when the DST feature is enabled; 0-By Date (default), 1-By Week;
+local_time.dst_time_type = {$yealink_dst_type}
+
+#Configure the start time of DST. The default value is 1/1/0.
+#If the DST type is configured as By Date, the value format is Month/Day/Hour. For example, the value 5/20/10 means the start time is at 10:00 on May 20.
+#If the DST type is configured as By Week, the value format is Month/Day of Week/Day of Week Last in Month/Hour of Day.
+#For example, the value 1/4/2/5 means the start time is at 5 o'clock on Tuesday of the 4th week in January.
+local_time.start_time = {$yealink_time_zone_start_time}
+
+#Configure the end time of DST. The default value is 12/31/23. The value format is the same to the start time.
+local_time.end_time = {$yealink_time_zone_end_time}
+
+#Configure the offset time (in seconds). It ranges from -300 to 300, the default value is blank.
+local_time.offset_time = {$yealink_offset_time}
+
+#Configure the time format; 0-12 Hour, 1-24 Hour (default);
+local_time.time_format = {$yealink_time_format}
+
+#Configure the date format; 0-WWW MMM DD (default), 1-DD-MMM-YY, 2-YYYY-MM-DD, 3-DD/MM/YYYY, 4-MM/DD/YY, 5-DD MMM YYYY, 6-WWW DD MMM;
+local_time.date_format = {$yealink_date_format}
+
+#Enable or disable the DHCP Time; 0-Disabled (default), 1-Enabled;
+local_time.dhcp_time = {$yealink_dhcp_time}
+
+#Enable or disable the manual time; 0-NTP time, 1-manual time. The default value is 0.
+local_time.manual_time_enable =
+
+#######################################################################################
+##                      Hot Desking                                                      ##
+#######################################################################################
+#Enable or disable the phone to show the following items on the login wizard during startup; 0-Disabled, 1-Enabled;
+#hotdesking.startup_register_name_enable = 0 (default)
+#hotdesking.startup_username_enable = 1 (default)
+#hotdesking.startup_password_enable = 1 (default)
+#hotdesking.startup_sip_server_enable = 1 (default)
+#hotdesking.startup_outbound_enable = 0 (default)
+
+hotdesking.startup_register_name_enable =
+hotdesking.startup_username_enable =
+hotdesking.startup_password_enable =
+hotdesking.startup_sip_server_enable =
+hotdesking.startup_outbound_enable =
+
+#Enable or disable the phone to show the following items on the login wizard when pressing the Hot Desking DSS key;
+#0-Disabled, 1-Enabled;
+#hotdesking.dsskey_register_name_enable = 0 (default)
+#hotdesking.dsskey_username_enable = 1 (default)
+#hotdesking.dsskey_password_enable = 1 (default)
+#hotdesking.dsskey_sip_server_enable = 1 (default)
+#hotdesking.dsskey_outbound_enable = 0 (default)
+
+hotdesking.dsskey_register_name_enable =
+hotdesking.dsskey_username_enable =
+hotdesking.dsskey_password_enable =
+hotdesking.dsskey_sip_server_enable =
+hotdesking.dsskey_outbound_enable =
+
+#######################################################################################
+##         	           Distinctive Ring Tones                                        ##
+#######################################################################################
+
+#"X" ranges from 1 to 10;
+#Configure the text to map the keywords contained in the "Alert-info" header.
+#distinctive_ring_tones.alert_info.X.text = family
+distinctive_ring_tones.alert_info.1.text = {$yealink_ring_text_1}
+distinctive_ring_tones.alert_info.2.text = {$yealink_ring_text_2}
+distinctive_ring_tones.alert_info.3.text = {$yealink_ring_text_3}
+distinctive_ring_tones.alert_info.4.text = {$yealink_ring_text_4}
+distinctive_ring_tones.alert_info.5.text = {$yealink_ring_text_5}
+distinctive_ring_tones.alert_info.6.text = {$yealink_ring_text_6}
+distinctive_ring_tones.alert_info.7.text = {$yealink_ring_text_7}
+distinctive_ring_tones.alert_info.8.text = {$yealink_ring_text_8}
+distinctive_ring_tones.alert_info.9.text = {$yealink_ring_text_9}
+distinctive_ring_tones.alert_info.10.text = {$yealink_ring_text_10}
+
+#Specify the ring tone for each text. It ranges from 1 to 8. The default value 1 stands for Ring1.wav.
+#distinctive_ring_tones.alert_info.X.ringer = 1
+distinctive_ring_tones.alert_info.1.ringer = {$yealink_ring_file_1}
+distinctive_ring_tones.alert_info.2.ringer = {$yealink_ring_file_2}
+distinctive_ring_tones.alert_info.3.ringer = {$yealink_ring_file_3}
+distinctive_ring_tones.alert_info.4.ringer = {$yealink_ring_file_4}
+distinctive_ring_tones.alert_info.5.ringer = {$yealink_ring_file_5}
+distinctive_ring_tones.alert_info.6.ringer = {$yealink_ring_file_6}
+distinctive_ring_tones.alert_info.7.ringer = {$yealink_ring_file_7}
+distinctive_ring_tones.alert_info.8.ringer = {$yealink_ring_file_8}
+distinctive_ring_tones.alert_info.9.ringer = {$yealink_ring_file_9}
+distinctive_ring_tones.alert_info.10.ringer = {$yealink_ring_file_10}
+
+#######################################################################################
+##         	               Auto Redial                                               ##
+#######################################################################################
+
+#Enable or disable the auto redial feature; 0-Disabled (default), 1-Enabled;
+auto_redial.enable =
+
+#Configure the interval (in seconds) to wait before redial. It ranges from 1 to 300. The default value is 10.
+auto_redial.interval =
+
+#Configure the times of auto redialing . It ranges from 1 to 300. The default value is 10.
+auto_redial.times =
+
+#######################################################################################
+##         	               Zero Touch                                                ##
+#######################################################################################
+#Enable or disable the zero-sp-touch; 0-Disabled (default), 1-Enabled;
+zero_touch.enable =
+
+#Configure the waiting time (in seconds) before canceling the zero-sp-touch. It ranges from 0 to 100, the default value is 5.
+zero_touch.wait_time =
+
+#######################################################################################
+##         	               Push XML                                                  ##
+#######################################################################################
+
+push_xml.server =
+
+#Enable or disable the phone to display the push XML interface when receiving an incoming call; 0-Disabled (default), 1-Enabled;
+push_xml.block_in_calling =
+
+#Enable or disable the phone to use the push XML via SIP Notify message; 0-Disabled (default), 1-Enabled;
+push_xml.sip_notify =
+
+#######################################################################################
+##         	              Dial Plan                                                  ##
+#######################################################################################
+
+#Configure the area code.
+dialplan.area_code.code =
+dialplan.area_code.min_len = 1
+dialplan.area_code.max_len = 15
+
+#When applying the rule to multiple lines, each line ID separated by comma.
+#e.g. dialplan.area_code.line_id = 1, 2, 3
+dialplan.area_code.line_id =
+
+#Configure the block out number. X ranges from 1 to 10.
+#dialplan.block_out.number.x =
+
+dialplan.block_out.number.1 =
+
+#When applying the rule to multiple lines, each line ID separated by comma. E.g. 1,2,3.
+#dialplan.block_out.line_id.x =
+dialplan.block_out.line_id.1 =
+
+#Configure the dialnow rule. X ranges from 1 to 20.
+#dialplan.dialnow.rule.x =
+dialplan.dialnow.rule.1 = {$yealink_dialplan_dialnow_rule_1}
+dialplan.dialnow.rule.2 = {$yealink_dialplan_dialnow_rule_2}
+dialplan.dialnow.rule.3 = {$yealink_dialplan_dialnow_rule_3}
+dialplan.dialnow.rule.4 = {$yealink_dialplan_dialnow_rule_4}
+dialplan.dialnow.rule.5 = {$yealink_dialplan_dialnow_rule_5}
+#dialplan.dialnow.line_id.x =
+
+dialplan.dialnow.rule.1 =
+dialplan.dialnow.line_id.1 =
+
+#Configure the replace rule. X ranges from 1 to 20.
+#dialplan.replace.prefix.x =
+#dialplan.replace.replace.x =
+#dialplan.replace.line_id.x =
+
+dialplan.replace.prefix.1 =
+dialplan.replace.replace.1 =
+dialplan.replace.line_id.1 =
+
+#######################################################################################
+##         	    BSFT Phonebook                                                       ##
+#######################################################################################
+
+#Configuration of BW phonebook. X ranges from 1 to 6.
+#bw_phonebook.data.x.server =
+#bw_phonebook.data.x.port =
+#bw_phonebook.data.x.username =
+#bw_phonebook.data.x.password =
+#bw_phonebook.data.x.name =
+
+bw_phonebook.data.1.server =
+bw_phonebook.data.1.port =
+bw_phonebook.data.1.username =
+bw_phonebook.data.1.password =
+bw_phonebook.data.1.name =
+
+#######################################################################################
+##                    BSFT Call Log                                                  ##
+#######################################################################################
+
+#Configuration of the BW call log. X ranges from 1 to 3.
+#bw_call_log.data.x.server =
+#bw_call_log.data.x.port =
+#bw_call_log.data.x.username =
+#bw_call_log.data.x.password =
+#bw_call_log.data.x.name =
+
+bw_call_log.data.1.server =
+bw_call_log.data.1.port =
+bw_call_log.data.1.username =
+bw_call_log.data.1.password =
+bw_call_log.data.1.name =
+
+#Enable or disable the phone to access the BSFT call log/phonebook directly when pressing the History/Directory soft keys;
+#0-Disabled (default), 1-Enabled;
+#Require reboot;
+bw.calllog_and_dir =
+
+#Specify whether to display the BSFT call log on the web user interface; 0-Disabled, 1-Enabled (default);
+#Require reboot;
+bw.behave_calllog =
+
+#Specify whether to display the BSFT directory on the web user interface; 0-Disabled, 1-Enable (default);
+#Require reboot;
+bw.behave_bw_dir =
+
+#Enable or disable the feature key synchronization; 0-Disabled (default), 1-Enabled;
+bw.feature_key_sync = {$yealink_feature_key_sync}
+
+#######################################################################################  
+##                                  Dsskey                                           ##  
+####################################################################################### 
+features.block_linekey_in_menu.enable =
+features.shorten_linekey_label.enable =
+features.flash_url_dsskey_led.enable =
+features.config_dsskey_length = {$yealink_dsskey_length}
+phone_setting.page_tip =
+features.keep_switch_page_key.enable=
+
+##phone_setting.idle_dsskey_and_title.transparency(Only support T54S/T52S/T48G/T48S)
+phone_setting.idle_dsskey_and_title.transparency=
+
+##V83 Add
+phone_setting.keytype_sequence =
+phone_setting.dsskey_label.display_method =
+local.dsskey_type_config.mode =
+
+#######################################################################################
+##         	    Remote phonebook                                                     ##
+#######################################################################################
+
+#Configure the access URL and dispaly name of the remote phonebook. X ranges from 1 to 5.
+#remote_phonebook.data.x.url =
+#remote_phonebook.data.x.name =
+
+{if isset($yealink_remote_phonebook_1_name) }
+remote_phonebook.data.1.name = {$yealink_remote_phonebook_1_name}
+{else}
+remote_phonebook.data.1.name = Users
+{/if}
+{if isset($yealink_remote_phonebook_1_url) }
+remote_phonebook.data.1.url =  {$yealink_remote_phonebook_1_url}
+{else}
+remote_phonebook.data.1.url = https://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=users
+{/if}
+
+{if isset($yealink_remote_phonebook_2_name) }
+remote_phonebook.data.2.name = {$yealink_remote_phonebook_2_name}
+{else}
+remote_phonebook.data.2.name = Groups
+{/if}
+{if isset($yealink_remote_phonebook_2_url) }
+remote_phonebook.data.2.url =  {$yealink_remote_phonebook_2_url}
+{else}
+remote_phonebook.data.2.url = https://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=groups
+{/if}
+
+{if isset($yealink_remote_phonebook_3_name) }
+remote_phonebook.data.3.name = {$yealink_remote_phonebook_3_name}
+{else}
+remote_phonebook.data.3.name = Extensions
+{/if}
+{if isset($yealink_remote_phonebook_3_url) }
+remote_phonebook.data.3.url =  {$yealink_remote_phonebook_3_url}
+{else}
+remote_phonebook.data.3.url = https://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
+{/if}
+
+remote_phonebook.data.4.name = {$yealink_remote_phonebook_4_name}
+remote_phonebook.data.4.url =  {$yealink_remote_phonebook_4_url}
+
+remote_phonebook.data.5.name = {$yealink_remote_phonebook_5_name}
+remote_phonebook.data.5.url =  {$yealink_remote_phonebook_5_url}
+
+#######################################################################################
+##         	              LDAP Settings                                              ##
+#######################################################################################
+ldap.enable = {$ldap_enable}
+
+#Configure the search criteria for name and number lookups.
+ldap.name_filter = {$ldap_name_filter}
+ldap.number_filter = {$ldap_number_filter}
+
+ldap.host = {$ldap_host}
+ldap.port = {$ldap_port}
+
+ldap.base = {$ldap_base}
+ldap.user = {$ldap_user}
+ldap.password = {$ldap_password}
+
+#Specify the maximum of the displayed search results. It ranges from 1 to 32000, the default value is 50.
+ldap.max_hits = {$ldap_max_hits}
+
+ldap.name_attr = {$ldap_name_attr}
+ldap.numb_attr = {$ldap_numb_attr}
+ldap.display_name = {$ldap_display_name}
+
+#Configure the LDAP version. The valid value is 2 or 3 (default).
+ldap.version = {$ldap_version}
+
+#Conifugre the search delay time. It ranges from 0 to 2000 (default).
+ldap.search_delay =
+
+#Enable or disable the phone to query the contact name from the LDAP server when receiving an incoming call; 0-Disabled (default), 1-Enabled;
+ldap.call_in_lookup = {$ldap_call_in_lookup}
+
+#Enable or disable the phone to sort the search results in alphabetical order; 0-Disabled (default), 1-Enabled;
+ldap.ldap_sort =  {$ldap_sort}
+
+#Enable or disable the phone to query the LDAP server when in the pre-dialing or the dialing state; 0-Disabled (default), 1-Enabled;
+ldap.dial_lookup =  {$ldap_dial_lookup}
+
+#######################################################################################
+##         	              Phone Features                                             ##
+#######################################################################################
+
+#Configure the return code when activating DND; 404-No Found, 480-Temporarily not available (default), 486-Busy here;
+#features.dnd_refuse_code = 480
+features.dnd_refuse_code =
+
+#Configure the return code when refusing a call. The valid values are 404, 480, 486 (default).
+features.normal_refuse_code =
+
+#Enable or disable the call completion feature; 0-Disabled (default), 1-Enabled;
+features.call_completion_enable =
+
+features.dnd.on_code =
+features.dnd.off_code =
+
+#Enable or disable the phone to receive the emergency call when in the DND mode; 0-Disabled, 1-Enabled (default);
+features.dnd.emergency_enable =
+
+#Specify the emergency number, multiple numbers (at most three) are separated by comma.
+features.dnd.emergency_authorized_number =
+
+#Enable or disable the call waiting feature; 0-Disabled, 1-Enabled (default);
+call_waiting.enable = {$yealink_call_waiting}
+
+#Enable or disable the playing of call waiting tone; 0-Disabled, 1-Enabled (default);
+call_waiting.tone = {$yealink_call_waiting_tone}
+
+#Enable or disable the intercom feature; 0-Disabled, 1-Enabled (default);
+features.intercom.allow =
+
+#Enable or disable the phone to mute the Speaker when answering an intercom call; 0-Disabled (default), 1-Enabled;
+features.intercom.mute =
+
+#Enable or disable the phone to play the intercom warning tone; 0-Disabled, 1-Enabled (default);
+features.intercom.tone =
+
+#Enable or disable the phone to barge in an intercom call; 0-Disabled, 1-Enabled (default);
+features.intercom.barge =
+
+#Specify whether to display the contact name in the remote phonebook; 0-Disabled (default), 1-Enabled;
+features.remote_phonebook.enable = {$yealink_remote_phonebook_enable}
+
+#Set the interval (in seconds) the phone updates the remote phonebook. The default value is 3600.
+features.remote_phonebook.flash_time =
+
+#Configure the hotline number and delay time (in seconds). It ranges from 0 to 180, the default value of delay time is 2.
+features.hotline_number =
+features.hotline_delay =
+
+#Configure the repetition times of DTMF end packet. The valid values are 1, 2, 3 (default).
+features.dtmf.repetition =
+
+#Configure the delay time (in seconds) of playing busy tone when rejecting a call. The valid values are 0 (default), 3 and 5.
+features.busy_tone_delay =
+
+#Define the "#" or "*" key as the send key; 0-Disabled, 1-# key(default), 2-* key;
+features.pound_key.mode =
+
+#Enable or disable the phone to play tone when pressing the digit key; 0-Disabled, 1-Enabled (default);
+features.send_key_tone =
+features.key_tone =
+
+features.redial_tone =
+
+#Enable or disable the phone to save the call history; 0-Disabled, 1-Enabled (default);
+features.save_call_history =
+
+#Configure the phone to receive the action URI request from the specified IP address(es) or any IP address;
+#Enter multiple IP addresses (separated by comma) or "any"(stands for any IP address);
+features.action_uri_limit_ip =
+
+#Enable or disable the transfer DSS key to perform the blind transfer; 0-Disabled, 1-Enabled (default);
+features.dsskey_blind_tran =
+
+#Configure the overtime (in minutes) of logging web user interface. It ranges from 1 to 1000, the default value is 5.
+features.relog_offtime =
+
+#Enable or disable the phone to dial the IP address directly; 0-Disabled, 1-Enabled (default);
+#Require reboot;
+features.direct_ip_call_enable = 0
+sip.trust_ctrl=1
+
+#Specify the ring device when the phone is in the Headset mode; 0-use Speaker (default), 1-use Headset;
+features.ringer_device.is_use_headset =
+
+#Enable or disable the phone to pick up the call using the group pickup soft key; 0-Disabled (default), 1-Enabled;
+features.pickup.group_pickup_enable =
+
+#Configure the group pickup code.
+features.pickup.group_pickup_code =
+
+#Enable or disable the phone to pick up the call using the directed pickup soft key; 0-Disabled (default), 1-Enabled;
+features.pickup.direct_pickup_enable = {$yealink_direct_pickup_enable}
+
+#Configure the directed pickup code.
+features.pickup.direct_pickup_code = **
+
+#Specify the way to notify the phone of the incoming call of the monitored user by visual or audio indicator;
+#0-Disabled (default), 1-Enabled;
+features.pickup.blf_visual_enable =
+features.pickup.blf_audio_enable =
+
+#Enable or disable the phone to turn off the indicator LEDs of BLF and Call Park keys when the monitored states is idle.
+#0-Disabled (default), 1-Enabled;
+features.blf_and_callpark_idle_led_enable =
+
+#Configure the time (in seconds) the phone automatically dial out the dialed digits. It ranges from 1 to 14, the default value is 4.
+phone_setting.inter_digit_time = {$yealink_inter_digit_time}
+
+#Configure the flash hook time (in milliseconds). It ranges from 0 to 799, the default value is 1.
+phone_setting.flash_hook_timer =
+
+#Configure the keypad lock type; 0-Disabled (default), 1-Menu Key, 2-Function Key, 3-All Keys, 4-Lock&Answer;
+phone_setting.lock =
+
+#Set the unlock password and expiry time (in seconds) of phone lock. It ranges from 0 to 3600, the default value of expiry time is 10.
+phone_setting.phone_lock.unlock_pin =
+phone_setting.phone_lock.lock_time_out =
+
+#Configure the ring tone for the phone. System ring tones are: Ring1.wav (default), Ring2.wav¡­¡­Ring8.wav.
+#You can configure the custom ring tone (Busy.wav) for the phone, the value is: phone_setting.ring_type = Busy.wav
+phone_setting.ring_type = {$yealink_ring_type}
+
+#Configure the active backlight level. It ranges from 1 to 10, the default value is 2.
+#The same level for different phones may result in different backlight intensities.
+#The backlight level of T2xP ranges from 1 to 3.
+phone_setting.active_backlight_level =
+
+#Configure the inactive backlight level. It ranges from 1 to 10, the default value is 1.
+phone_setting.inactive_backlight_level =
+
+#Configure the backlight time (in seconds). The valid values are: 1-Always on, 60 (default), 120, 300, 600, 1800.
+phone_setting.backlight_time =
+
+#Configure the screen saver time (in seconds). The valid values are 1, 60 (default), 120, 300, 600, 1800.
+phone_setting.screen_saver_time =
+
+#Configure the ring tone when the transfer fails. The valid values are: Ring1.wav.... Ring8.wav.
+#phone_setting.ring_for_tranfailed = Ring1.wav
+phone_setting.ring_for_tranfailed =
+
+#Enable or disable the phone to show the logon wizard during startup; 0-Disabled (default), 1-Enabled;
+phone_setting.logon_wizard =
+
+#Enable or disable the phone to automatically dial out the dialed digits in the pre-dial interface; 0-Disabled (default), 1-Enabled;
+phone_setting.predial_autodial = 1
+
+#Enable or disable the phone to deal the 180 SIP message after the 183 SIP message; 0-Disabled, 1-Enabled (default);
+phone_setting.is_deal180 =
+
+#Configure the delay time (in seconds) for the dialnow rule. It ranges from 1 to 14, the default value is 1.
+phone_setting.dialnow_delay =
+
+#Enable or disable the user to customize the softkey layout; 0-Disabled (default), 1-Enabled;
+phone_setting.custom_softkey_enable =
+
+#Configure the phone theme; 0-Theme1 (default), 1-Theme2, 2-Theme3, 3-Theme4;
+phone_setting.theme =
+
+#Configure the emergency number, each separated by comma. The default value is 112,911,110.
+phone_setting.emergency.number =
+
+#Enable or disable the  phone to display the short message automatically; 0-Disabled, 1-Enabled (default);
+phone_setting.sms_popup_enable =
+
+#Enable or disable the phone to turn off the power LED when it is idle; 0-Disabled (default), 1-Enabled;
+phone_setting.common_power_led_enable =
+
+#Enable or disable the phone to flash the power LED when receiving new voice mail or message; 0-Disabled (default), 1-Enabled;
+phone_setting.mail_power_led_flash_enable =
+
+#Enable or disable the phone to flash the power LED when muting a call; 0-Disabled (default), 1-Enabled;
+phone_setting.mute_power_led_flash_enable =
+
+#Enable or disable the phone to flash the power LED when placing a calll on hold; 0-Disabled (default), 1-Enabled;
+phone_setting.hold_power_led_flash_enable =
+
+#Disable missed call power led flash 0-Disabled, 1-Enabled
+phone_setting.missed_call_power_led_flash.enable = 0
+
+#######################################################################################
+##                     Configure the access URL of firmware                          ##
+#######################################################################################
+firmware.url = {$yealink_firmware_url}/{$yealink_firmware_t31g}
+
+#######################################################################################
+##                     Configure the access URL of the customized  ringtones         ##
+#######################################################################################
+ringtone.url = {$yealink_ringtone_url}
+
+#ringtone.delete = http://localhost/all,delete all the customized ring tones.
+ringtone.delete = {$yealink_ringtone_delete}
+
+#######################################################################################
+##            Configure the access  URL of language file                             ##
+#######################################################################################
+gui_lang.url =
+
+#gui_lang.delete =http://localhost/all, delete all the customized languages.
+gui_lang.delete =
+
+#######################################################################################
+##                     Certificates                                                  ##
+#######################################################################################
+trusted_certificates.url =
+
+#trusted_certificates.delete = http://localhost/all,delete all the trusted certificates.
+trusted_certificates.delete =
+
+server_certificates.url =
+
+#server_certificates.delete = http://localhost/all, delete the server certificate.
+server_certificates.delete =
+
+#######################################################################################
+##  Local Contact/DST Time/Dialnow Rule/Replace Rule                                 ##
+#######################################################################################
+local_contact.data.url =
+auto_dst.url =
+dialplan_dialnow.url =
+dialplan_replace_rule.url =
+
+#######################################################################################
+##      Customized Factory Configurations                                            ##
+#######################################################################################
+#Configure the access URL for downloading the customized factory configurations.
+custom_factory_configuration.url =
+
+#######################################################################################
+##          Call List                                                                ##
+#######################################################################################
+#Configure the access URL for downloading the call list.
+#Require reboot
+call_list.url =
+
+#######################################################################################
+##            OpenVPN                                                                ##
+#######################################################################################
+#Configure the access URL for downloading the open VPN tar.
+openvpn.url = {$yealink_openvpn_url}
+
+#######################################################################################
+##                                   Super Search URL                                ##
+#######################################################################################
+super_search.url =
+
+#######################################################################################
+##                                   Directory Setting                               ##
+#######################################################################################
+#Configure the access URL of the directory setting file.
+directory_setting.url = https://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=favorite_setting.xml
+
+#######################################################################################
+##            Configure the access URL of the  Wallpaper                             ##
+#######################################################################################
+
+wallpaper_upload.url = {$yealink_t31g_wallpaper}
+{if isset($yealink_t31g_wallpaper_filename)}
+phone_setting.backgrounds =  Config:{$yealink_t31g_wallpaper_filename}
+{else}
+phone_setting.backgrounds =  Config:yealink_t31g_wallpaper.png
+{/if}
+
+#Configure the phone background.
+#If you set the custom image (new.png) as phone backgroup, the value is: phone_setting.backgrounds = Config:new.png
+#If you set the system image (pictures(01).png) as phone backgroup, the value is: phone_setting.backgrounds = Resource:pictures(01).png
+#phone_setting.backgrounds = Config:yealink_t31g_wallpaper.png
+
+#######################################################################################
+##     Configure the access URL of the Screensaver                                   ##
+#######################################################################################
+#Configure the access URL for downloading the customized wallpaper.
+screen_saver.pic.url = {$yealink_t31g_screen_saver}
+
+#######################################################################################
+##     Configuration files for Var                                                   ##
+#######################################################################################
+#Configure the access URL for downloading the files for var.
+#Require reboot
+web_item_level.url =
+
+#######################################################################################
+##                                   SIP Advanced                                    ##
+#######################################################################################
+
+sip.call_fail_use_reason.enable = {$yealink_sip_call_fail_use_reason_enable}
+
+
diff --git a/resources/templates/provision/yealink/t31g/{$mac}.cfg b/resources/templates/provision/yealink/t31g/{$mac}.cfg
new file mode 100644
index 0000000000..94f2815d83
--- /dev/null
+++ b/resources/templates/provision/yealink/t31g/{$mac}.cfg
@@ -0,0 +1,2089 @@
+#!version:1.0.0.1
+#{$microtime}
+
+##File header "#!version:1.0.0.1" can not be edited or deleted.##
+
+#######################################################################################
+##                           Account1 Settings                                       ##
+#######################################################################################
+
+#Enable or disable the account 1; 0-Disabled (default), 1-Enabled;
+{if isset($account.1.password) }
+account.1.enable = 1
+{else}
+account.1.enable = 0
+{/if}
+
+#Configure the label displayed on the LCD screen for account 1.
+account.1.label = {$account.1.display_name}
+
+#Configure the display name of account 1.
+account.1.display_name = {$account.1.display_name}
+
+#Configure the username and password for register authentication.
+account.1.auth_name = {$account.1.auth_id}
+account.1.password = {$account.1.password}
+
+#Configure the register user name.
+{if isset($account.1.server.1.address)}
+account.1.user_name = {$account.1.user_id}@{$account.1.server_address}
+{else}
+account.1.user_name = {$account.1.user_id}
+{/if}
+
+#Enable or disable the phone to receive the messages from the server only; 0-Disabled (default), 1-Enabled;
+account.1.sip_trust_ctrl = 1
+
+#Configure the SIP server address.
+account.1.sip_server_host = {$account.1.server_address}
+
+#Specify the port for the SIP server. The default value is 5060.
+account.1.sip_server_port = {$account.1.sip_port}
+
+#Enable or disable the use of the outbound proxy server; 0-Disabled (default), 1-Enabled;
+account.1.outbound_proxy_enable = {if isset($account.1.outbound_proxy_primary)}1{else}0{/if}
+
+#Specify the IP address or domain name of the outbound proxy server.
+account.1.outbound_host = {$account.1.outbound_proxy_primary}
+
+#Specify the server port, the default value is 5060.
+account.1.outbound_port = {$account.1.sip_port}
+{if isset($yealink_sip_listen_port)}account.1.sip_listen_port = {$yealink_sip_listen_port}{else}account.1.sip_listen_port = 5060{/if}
+
+#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
+{if $account.1.sip_transport == 'udp'}account.1.transport = 0{/if}
+{if $account.1.sip_transport == 'tcp'}account.1.transport = 1{/if}
+{if $account.1.sip_transport == 'tls'}account.1.transport = 2{/if}
+{if $account.1.sip_transport == 'dns srv'}account.1.transport = 3{/if}
+
+
+#Configure the address of the backup outbound proxy server.
+account.1.backup_outbound_host = {$account.1.outbound_proxy_secondary}
+
+#Specify the port of the backup outbound proxy server, the default value is 5060.
+{if isset($outbound_proxy_1_port)}
+account.1.backup_outbound_port = $account.1.outbound_proxy_secondary
+{else}
+account.1.backup_outbound_port = {$account.1.sip_port}
+{/if}
+
+#Configure the voice mail number of account 1.
+voice_mail.number.1 = {$voicemail_number}
+
+#Configure the proxy server to account 1.
+account.1.proxy_require =
+
+#Enable or disable the use of the timer to periodically refresh the DNS-SRV query result; 0-Disabled (default), 1-Enabled;
+#Require reboot;
+account.1.srv_ttl_timer_enable =
+
+#Configure the type of DNS-SRV query; 0-UDP, TCP and TLS (default), 1-UDP, 2-TCP, 3-TLS;
+#Require reboot;
+
+{if $account.1.sip_transport == 'udp'}account.1.dns_srv_type = 0{/if}
+{if $account.1.sip_transport == 'tcp'}account.1.dns_srv_type = 2{/if}
+{if $account.1.sip_transport == 'tls'}account.1.dns_srv_type = 3{/if}
+
+
+#Enable or disable the anonymous call feature; 0-Disabled (default), 1-Enabled;
+account.1.anonymous_call =
+
+#Configure the on code and off code of the anonymous call feature.
+account.1.anonymous_call_oncode =
+account.1.anonymous_call_offcode =
+
+#Enable or disable the reject anonymous call feature; 0-Disabled (default), 1-Enabled;
+account.1.reject_anonymous_call =
+
+#Configure the on code and off code of the reject anonymous call feature.
+account.1.anonymous_reject_oncode =
+account.1.anonymous_reject_offcode =
+
+#Configure the SIP port for account 1, the default value is 5060.
+account.1.sip_listen_port =
+
+#Configure the register expiry time (in seconds), the default value is 3600.
+account.1.expires = {$account.1.register_expires}
+
+#Enable or disable the 100 reliable retransmission; 0-Disabled, 1-Enabled (default);
+account.1.100rel_enable = {$yealink_retransmission}
+
+#Enable or disable the resource reservation; 0-Disabled (default), 1-Enabled;
+account.1.precondition =
+
+#Enable or disable the phone to subscribe the register status; 0-Disabled (default), 1-Enabled;
+account.1.subscribe_register =
+
+#Enable or disable the phone to subscribe the message waiting indicator; 0-Disabled (default), 1-Enabled;
+account.1.subscribe_mwi =
+
+#Configure MWI subscribe expiry time (in seconds). It ranges from 0 to 84600, the default value is 3600.
+account.1.subscribe_mwi_expires =
+
+#Configure the type of SIP header(s) to carry the caller ID; 0-FROM (default), 1-PAI 2-PAI-FROM, 3-PRID-PAI-FROM, 4-PAI-RPID-FROM, 5-RPID-FROM;
+account.1.cid_source = {$yealink_cid_source}
+
+#Configure the presentation of the callee ID; 0-PAI-PRID, 1-DIALED DIGITS (default), 2-RFC4916;
+account.1.cp_source = 2
+
+#Enable or disable the session timer; 0-Disabled (default), 1-Enabled;
+account.1.session_timer.enable = {$yealink_session_timer}
+
+#Configure the refresh session timer interval (in seconds). It ranges from 1 to 9999.
+account.1.session_timer.expires =
+
+#Configure the session timer refresher; 0-Uac (default), 1-Uas;
+account.1.session_timer.refresher =
+
+#Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled;
+account.1.enable_user_equal_phone =
+
+#Specify whether to encrypt the SIP messages; 0-Disabled, 1-Forced, 2-Negotiated;
+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 =
+
+#Assign account 1 as shared line; 0-Disabled (default), 1-BSFT shared line, 2-Draft bridge line appearance;
+account.1.shared_line =
+
+#Configure BLA number for account 1 and the subscribe period (in seconds). It ranges from 60 to 7200, the default value is 300.
+account.1.bla_number =
+account.1.bla_subscribe_period =
+
+#Enable or disable call pickup using dialog-info SIP header; 0-Disabled (default), 1-Enabled;
+account.1.dialoginfo_callpickup =
+
+#Configure the directed and group pickup codes for account 1, the settings on a per-account basis take precedence over the settings on the phone.
+account.1.group_pickup_code =
+account.1.direct_pickup_code =
+
+#Enable or disable the auto answer feature; 0-Disabled (default), 1-Enabled;
+account.1.auto_answer =
+
+#Enable or disable the phone to record the missed call; 0-Disabled, 1-Enabled (default);
+account.1.missed_calllog = {if isset($yealink_account_1_missed_calllog)}{$yealink_account_1_missed_calllog}{/if}
+
+#Enable or disable the phone to subscribe to the voicemail through the message waiting indicator; 0-Disabled (default), 1-Enabled;
+account.1.subscribe_mwi_to_vm =
+
+#Enable or disable the phone to send the MAC address and line number in the Register message; 0-Disabled (default), 1-Enabled;
+account.1.register_mac =
+
+#Enable or disable the phone to send the line number in the Register message; 0-Disabled, 1-Enabled (default);
+account.1.register_line =
+
+#Configure the interval (in seconds) the phone retries to register when account 1 fails to register. It ranges from 0 to 1800, the default value is 30.
+account.1.reg_fail_retry_interval =
+
+#Configure the conference type; 0-Local (default), 2-Network Conference;
+account.1.conf_type = {if $nway_conference == true}2{/if}
+
+#Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
+account.1.conf_uri = {if $nway_conference == true}nway{$account.1.auth_id}@{$account.1.server_address}{/if}
+
+#Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist".
+account.1.blf.blf_list_uri =
+
+#Configure the pickup code of BLF List.
+account.1.blf_list_code =
+
+#Configure the bargein code.
+account.1.blf_list_barge_in_code =
+
+#Configure the BLF subscribe period (in seconds), the default value is 1800.
+account.1.blf.subscribe_period =
+
+#Configure the ACD subscribe period (in seconds). It ranges from 120 to 3600 (default).
+account.1.subscribe_acd_expires =
+
+#Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom;
+account.1.sip_server_type =
+
+#Enable or disable the phone to use the customized theme; 0-Disabled (default), 1-Enabled;
+account.1.idle_screen_enable =
+
+#Define the access URL of the customized theme.
+account.1.idle_screen_url =
+
+#Enable or disable the SIP signal encode; 0-Disabled (default), 1-Enabled (RC 4);
+account.1.enable_signal_encode =
+
+#Configure the key for encoding.
+account.1.signal_encode_key =
+
+#Configure the DTMF type; 0-INBAND, 1-RFC2833 (default), 2-SIP INFO, 3-AUTO+SIP INFO;
+account.1.dtmf.type = {$yealink_dtmf_type}
+
+#Configure the RFC2833 payload. It ranges from 96 to 225, the default value is 101.
+account.1.dtmf.dtmf_payload =
+
+#Configure the DTMF info type when using the SIP INFO; 0-Disabled (default), 1-DTMF-Relay, 2-DTMF, 3-Telephone-Event;
+account.1.dtmf.info_type =
+
+#Enable or disable the phone to support the simplified SIP header; 0-Disabled (default), 1-Enabled;
+account.1.compact_header_enable =
+
+#########################################################################
+##                     NAT Settings                                    ##
+#########################################################################
+
+#Enable or disable the NAT traversal; 0-Disabled (default), 1-STUN;
+account.1.nat.nat_traversal = {if isset($stun_server)}1{else}0{/if}
+
+#Configure the STUN server address.
+account.1.nat.stun_server = {$stun_server}
+
+#Configure the STUN server port, the default value is 3478.
+account.1.nat.stun_port = {if isset($stun_port)}{$stun_port}{else}3478{/if}
+
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.1.nat.udp_update_enable = 3
+
+#Specify the keep-alive interval (in seconds), the default value is 30.
+account.1.nat.udp_update_time =
+
+#Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
+account.1.nat.rport = {$yealink_rport}
+
+#Configure the session timer (in seconds), the default values of T1, T2, T3 are 0.5, 4, 5.
+account.1.advanced.timer_t1 =
+account.1.advanced.timer_t2 =
+account.1.advanced.timer_t4 =
+
+#Assign a ringtone for account 1. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav - ­Ring8.wav.
+#If you configure the custom ring tone (Family.wav) for the account, the value format is: Family.wav
+#If you configure the system ring tone (Ring2.wav) for the account, the value format is: Ring2.wav
+account.1.ringtone.ring_type =
+
+#Enable or disable the phone to display the picture when receiving the specified SIP message; 0-Disabled, 1-Enabled (default);
+account.1.picture_info_enable =
+
+#Audio codecs for account 1 (Y ranges from 1 to 13).
+#account.1.codec.y.enable =
+#account.1.codec.y.payload_type =
+#account.1.codec.y.priority =
+#account.1.codec.y.rtpmap =
+
+account.1.codec.1.enable = {if isset($yealink_codec_pcmu_enable)}1{else}0{/if}
+
+account.1.codec.1.payload_type = PCMU
+account.1.codec.1.priority = {if isset($yealink_codec_pcmu_priority)}{$yealink_codec_pcmu_priority}{else}0{/if}
+
+account.1.codec.1.rtpmap = 0
+
+account.1.codec.2.enable = {if isset($yealink_codec_pcma_enable)}1{else}0{/if}
+
+account.1.codec.2.payload_type = PCMA
+account.1.codec.2.priority = {if isset($yealink_codec_pcma_priority)}{$yealink_codec_pcma_priority}{else}0{/if}
+
+account.1.codec.2.rtpmap = 8
+
+account.1.codec.3.enable = {if isset($yealink_codec_g723_53_enable)}1{else}0{/if}
+
+account.1.codec.3.payload_type = G723_53
+account.1.codec.3.priority ={if isset($yealink_codec_g723_53_priority)}{$yealink_codec_g723_53_priority}{else}0{/if}
+
+account.1.codec.3.rtpmap = 4
+
+account.1.codec.4.enable = {if isset($yealink_codec_g723_63_enable)}1{else}0{/if}
+
+account.1.codec.4.payload_type = G723_63
+account.1.codec.4.priority = {if isset($yealink_codec_g723_63_priority)}{$yealink_codec_g723_63_priority}{else}0{/if}
+
+account.1.codec.4.rtpmap = 4
+
+account.1.codec.5.enable = {if isset($yealink_codec_g729_enable)}1{else}0{/if}
+
+account.1.codec.5.payload_type = G729
+account.1.codec.5.priority = {if isset($yealink_codec_g729_priority)}{$yealink_codec_g729_priority}{else}0{/if}
+
+account.1.codec.5.rtpmap = 18
+
+account.1.codec.6.enable = {if isset($yealink_codec_g722_enable)}1{else}0{/if}
+
+account.1.codec.6.payload_type = G722
+account.1.codec.6.priority = {if isset($yealink_codec_g722_priority)}{$yealink_codec_g722_priority}{else}0{/if}
+
+account.1.codec.6.rtpmap = 9
+
+account.1.codec.7.enable = {if isset($yealink_codec_iLBC_enable)}1{else}0{/if}
+
+account.1.codec.7.payload_type = iLBC
+account.1.codec.7.priority =  {if isset($yealink_codec_iLBC_priority)}{$yealink_codec_iLBC_priority}{else}0{/if}
+
+account.1.codec.7.rtpmap = 106
+
+account.1.codec.8.enable = {if isset($yealink_codec_g726_16_enable)}1{else}0{/if}
+
+account.1.codec.8.payload_type = G726-16
+account.1.codec.8.priority = {if isset($yealink_codec_g726_16_priority)}{$yealink_codec_g726_16_priority}{else}0{/if}
+
+account.1.codec.8.rtpmap = 103
+
+account.1.codec.9.enable = {if isset($yealink_codec_g726_24_enable)}1{else}0{/if}
+
+account.1.codec.9.payload_type = G726-24
+account.1.codec.9.priority = {if isset($yealink_codec_g726_24_priority)}{$yealink_codec_g726_24_priority}{else}0{/if}
+
+account.1.codec.9.rtpmap = 104
+
+account.1.codec.10.enable = {if isset($yealink_codec_g726_32_enable)}1{else}0{/if}
+
+account.1.codec.10.payload_type = G726-32
+account.1.codec.10.priority = {if isset($yealink_codec_g726_32_priority)}{$yealink_codec_g726_32_priority}{else}0{/if}
+
+account.1.codec.10.rtpmap = 102
+
+account.1.codec.11.enable = {if isset($yealink_codec_g726_40_enable)}1{else}0{/if}
+
+account.1.codec.11.payload_type = G726-40
+account.1.codec.11.priority = {if isset($yealink_codec_g726_40_priority)}{$yealink_codec_g726_40_priority}{else}0{/if}
+
+account.1.codec.11.rtpmap = 105
+
+account.1.codec.12.enable = {if isset($yealink_codec_gsm_enable)}1{else}0{/if}
+
+account.1.codec.12.payload_type = GSM
+account.1.codec.12.priority = {if isset($yealink_codec_gsm_priority)}{$yealink_codec_gsm_priority}{else}0{/if}
+
+account.1.codec.12.rtpmap = 3
+
+account.1.codec.13.enable = {if isset($yealink_codec_opus_enable)}1{else}0{/if}
+
+account.1.codec.13.payload_type = opus
+account.1.codec.13.priority = {if isset($yealink_codec_opus_priority)}{$yealink_codec_opus_priority}{else}0{/if}
+
+account.1.codec.13.rtpmap = 106
+
+
+
+#######################################################################################
+##                        Account2 Settings                                          ##
+#######################################################################################
+
+#Enable or disable the account 2; 0-Disabled (default), 1-Enabled;
+{if isset($account.2.password) }
+account.2.enable = 1
+{else}
+account.2.enable = 0
+{/if}
+
+#Configure the label displayed on the LCD screen for account 2.
+account.2.label = {$account.2.display_name}
+
+#Configure the display name of account 2.
+account.2.display_name = {$account.2.display_name}
+
+#Configure the username and password for register authentication.
+account.2.auth_name = {$account.2.auth_id}
+account.2.password = {$account.2.password}
+
+#Configure the register user name.
+{if isset($account.2.server.1.address)}
+account.2.user_name = {$account.2.user_id}@{$account.2.server_address}
+{else}
+account.2.user_name = {$account.2.user_id}
+{/if}
+
+#Enable or disable the phone to receive the messages from the server only; 0-Disabled (default), 1-Enabled;
+account.2.sip_trust_ctrl = 1
+
+#Configure the SIP server address.
+account.2.sip_server_host = {$account.2.server_address}
+
+#Specify the port for the SIP server. The default value is 5060.
+account.2.sip_server_port = {$account.2.sip_port}
+
+#Enable or disable the use of the outbound proxy server; 0-Disabled (default), 1-Enabled;
+account.2.outbound_proxy_enable =
+
+#Specify the IP address or domain name of the outbound proxy server.
+account.2.outbound_host = {$account.2.outbound_proxy}
+
+#Specify the server port, the default value is 5060.
+account.2.outbound_port = {$account.2.sip_port}
+
+#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
+{if $account.2.sip_transport == 'udp'}account.2.transport = 0{/if}
+{if $account.2.sip_transport == 'tcp'}account.2.transport = 1{/if}
+{if $account.2.sip_transport == 'tls'}account.2.transport = 2{/if}
+{if $account.2.sip_transport == 'dns srv'}account.2.transport = 3{/if}
+
+#Configure the address of the backup outbound proxy server.
+account.2.backup_outbound_host =
+
+#Specify the port of the backup outbound proxy server, the default value is 5060.
+account.2.backup_outbound_port =
+
+#Configure the voice mail number of account 2.
+voice_mail.number.2 = *97
+
+#Configure the proxy server to account 2.
+account.2.proxy_require =
+
+#Enable or disable the use of the timer to periodically refresh the DNS-SRV query result; 0-Disabled (default), 1-Enabled;
+#Require reboot;
+account.2.srv_ttl_timer_enable =
+
+#Configure the type of DNS-SRV query; 0-UDP, TCP and TLS (default), 1-UDP, 2-TCP, 3-TLS;
+#Require reboot;
+account.2.dns_srv_type =
+
+#Enable or disable the anonymous call feature; 0-Disabled (default), 1-Enabled;
+account.2.anonymous_call =
+
+#Configure the on code and off code of the anonymous call feature.
+account.2.anonymous_call_oncode =
+account.2.anonymous_call_offcode =
+
+#Enable or disable the reject anonymous call feature; 0-Disabled (default), 1-Enabled;
+account.2.reject_anonymous_call =
+
+#Configure the on code and off code of the reject anonymous call feature.
+account.2.anonymous_reject_oncode =
+account.2.anonymous_reject_offcode =
+
+#Configure the SIP port for account 2, the default value is 5060.
+account.2.sip_listen_port =
+
+#Configure the register expiry time (in seconds), the default value is 3600.
+account.2.expires = {$account.2.register_expires}
+
+#Enable or disable the 100 reliable retransmission; 0-Disabled (default), 1-Enabled;
+account.2.100rel_enable = {$yealink_retransmission}
+
+#Enable or disable the resource reservation; 0-Disabled (default), 1-Enabled;
+account.2.precondition =
+
+#Enable or disable the phone to subscribe the register status; 0-Disabled (default), 1-Enabled;
+account.2.subscribe_register =
+
+#Enable or disable the phone to subscribe the message waiting indicator; 0-Disabled (default), 1-Enabled;
+account.2.subscribe_mwi =
+
+#Configure MWI subscribe expiry time (in seconds). It ranges from 0 to 84600, the default value is 3600.
+account.2.subscribe_mwi_expires =
+
+#Configure the type of SIP header(s) to carry the caller ID; 0-FROM (default), 1-PAI 2-PAI-FROM, 3-PRID-PAI-FROM, 4-PAI-RPID-FROM, 5-RPID-FROM;
+account.2.cid_source = {$yealink_cid_source}
+
+#Configure the presentation of the callee ID; 0-PAI-PRID, 1-DIALED DIGITS (default), 2-RFC4916;
+account.2.cp_source = 2
+
+#Enable or disable the session timer; 0-Disabled (default), 1-Enabled;
+account.2.session_timer.enable = {$yealink_session_timer}
+
+#Configure the refresh session timer interval (in seconds). It ranges from 1 to 9999.
+account.2.session_timer.expires =
+
+#Configure the session timer refresher; 0-Uac (default), 1-Uas;
+account.2.session_timer.refresher =
+
+#Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled;
+account.2.enable_user_equal_phone =
+
+#Specify whether to encrypt the SIP messages; 0-Disabled, 1-Forced, 2-Negotiated;
+account.2.srtp_encryption =
+
+#Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60.
+account.2.ptime =
+
+#Assign account 2 as shared line; 0-Disabled (default), 1-BSFT shared line, 2-Draft bridge line appearance;
+account.2.shared_line =
+
+#Configure BLA number for account 2 and the subscribe period (in seconds). It ranges from 60 to 7200, the default value is 300.
+account.2.bla_number =
+account.2.bla_subscribe_period =
+
+#Enable or disable call pickup using dialog-info SIP header; 0-Disabled (default), 1-Enabled;
+account.2.dialoginfo_callpickup =
+
+#Configure the directed and group pickup codes for account 2, the settings on a per-account basis take precedence over the settings on the phone.
+account.2.group_pickup_code =
+account.2.direct_pickup_code =
+
+#Enable or disable the auto answer feature; 0-Disabled (default), 1-Enabled;
+account.2.auto_answer =
+
+#Enable or disable the phone to record the missed call; 0-Disabled, 1-Enabled (default);
+account.2.missed_calllog =
+
+#Enable or disable the phone to subscribe to the voicemail through the message waiting indicator; 0-Disabled (default), 1-Enabled;
+account.2.subscribe_mwi_to_vm =
+
+#Enable or disable the phone to send the MAC address in the Register message; 0-Disabled (default), 1-Enabled;
+account.2.register_mac =
+
+#Enable or disable the phone to send the line number in the Register message; 0-Disabled, 1-Enabled (default);
+account.2.register_line =
+
+#Configure the interval (in seconds) the phone retries to register when account 2 fails to register. It ranges from 0 to 1800, the default value is 30.
+account.2.reg_fail_retry_interval =
+
+#Configure the conference type; 0-Local (default), 2-Network Conference;
+account.2.conf_type = {if $nway_conference == true}2{/if}
+
+#Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
+account.2.conf_uri = {if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}
+
+#Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist".
+account.2.blf.blf_list_uri =
+
+#Configure the pickup code of BLF List.
+account.2.blf_list_code =
+
+#Configure the bargein code.
+account.2.blf_list_barge_in_code =
+
+#Configure the BLF subscribe period (in seconds), the default value is 1800.
+account.2.blf.subscribe_period =
+
+#Configure the ACD subscribe period (in seconds). It ranges from 120 to 3600 (default).
+account.2.subscribe_acd_expires =
+
+#Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom;
+account.2.sip_server_type =
+
+#Enable or disable the phone to use the customized theme; 0-Disabled (default), 1-Enabled;
+account.2.idle_screen_enable =
+
+#Define the access URL of the customized theme.
+account.2.idle_screen_url =
+
+#Enable or disable the SIP signal encode; 0-Disabled (default), 1-Enabled (RC 4);
+account.2.enable_signal_encode =
+
+#Configure the key for encoding.
+account.2.signal_encode_key =
+
+#Configure the DTMF type; 0-INBAND, 1-RFC2833 (default), 2-SIP INFO, 3-AUTO+SIP INFO;
+account.2.dtmf.type = {$yealink_dtmf_type}
+
+#Configure the RFC2833 payload. It ranges from 96 to 225, the default value is 101.
+account.2.dtmf.dtmf_payload =
+
+#Configure the DTMF info type when using the SIP INFO; 0-Disabled (default), 1-DTMF-Relay, 2-DTMF, 3-Telephone-Event;
+account.2.dtmf.info_type =
+
+#Enable or disable the phone to support the simplified SIP header; 0-Disabled (default), 1-Enabled;
+account.2.compact_header_enable =
+
+#########################################################################
+##                     NAT Settings                                    ##
+#########################################################################
+
+#Enable or disable the NAT traversal; 0-Disabled (default), 1-STUN;
+account.2.nat.nat_traversal = {if isset($stun_server)}1{else}0{/if}
+
+#Configure the STUN server address.
+account.2.nat.stun_server = {$stun_server}
+
+#Configure the STUN server port, the default value is 3478.
+account.2.nat.stun_port = {if isset($stun_port)}{$stun_port}{else}3478{/if}
+
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Enabled (default);
+account.2.nat.udp_update_enable =
+
+#Specify the keep-alive interval (in seconds), the default value is 30.
+account.2.nat.udp_update_time =
+
+#Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
+account.2.nat.rport = {$yealink_rport}
+
+#Configure the session timer (in seconds), the default values of T1, T2, T3 are 0.5, 4, 5.
+account.2.advanced.timer_t1 =
+account.2.advanced.timer_t2 =
+account.2.advanced.timer_t4 =
+
+#Assign a ringtone for account 2. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav - Ring8.wav.
+#If you configure the custom ring tone (Family.wav) for the account, the value format is: Family.wav
+#If you configure the system ring tone (Ring2.wav) for the account, the value format is: Ring2.wav
+account.2.ringtone.ring_type =
+
+#Enable or disable the phone to display the picture when receiving the specified SIP message; 0-Disabled, 1-Enabled (default);
+account.2.picture_info_enable =
+
+#Audio codecs for account 2 (Y ranges from 1 to 13).
+#account.2.codec.Y.enable =
+#account.2.codec.Y.payload_type =
+#account.2.codec.Y.priority =
+#account.2.codec.Y.rtpmap =
+
+account.2.codec.1.enable = 1
+account.2.codec.1.payload_type = PCMU
+account.2.codec.1.priority = 1
+account.2.codec.1.rtpmap = 0
+
+account.2.codec.2.enable = 1
+account.2.codec.2.payload_type = PCMA
+account.2.codec.2.priority = 2
+account.2.codec.2.rtpmap = 8
+
+account.2.codec.3.enable = 0
+account.2.codec.3.payload_type = G723_53
+account.2.codec.3.priority =4
+account.2.codec.3.rtpmap = 4
+
+account.2.codec.4.enable = 0
+account.2.codec.4.payload_type = G723_63
+account.2.codec.4.priority = 0
+account.2.codec.4.rtpmap = 4
+
+account.2.codec.5.enable = 1
+account.2.codec.5.payload_type = G729
+account.2.codec.5.priority = 3
+account.2.codec.5.rtpmap = 18
+
+account.2.codec.6.enable = 1
+account.2.codec.6.payload_type = G722
+account.2.codec.6.priority = 4
+account.2.codec.6.rtpmap = 9
+
+account.2.codec.7.enable =
+account.2.codec.7.payload_type =
+account.2.codec.7.priority =
+account.2.codec.7.rtpmap =
+
+account.2.codec.8.enable = 0
+account.2.codec.8.payload_type = G726-16
+account.2.codec.8.priority = 0
+account.2.codec.8.rtpmap = 112
+
+account.2.codec.9.enable = 0
+account.2.codec.9.payload_type = G726-24
+account.2.codec.9.priority = 0
+account.2.codec.9.rtpmap = 102
+
+account.2.codec.10.enable = 0
+account.2.codec.10.payload_type = G726-32
+account.2.codec.10.priority = 0
+account.2.codec.10.rtpmap = 2
+
+account.2.codec.11.enable = 0
+account.2.codec.11.payload_type = G726-40
+account.2.codec.11.priority = 0
+account.2.codec.11.rtpmap = 104
+
+account.2.codec.12.enable = 0
+account.2.codec.12.payload_type = iLBC_13_3
+account.2.codec.12.priority = 0
+account.2.codec.12.rtpmap = 97
+
+account.2.codec.13.enable = 0
+account.2.codec.13.payload_type = iLBC_15_2
+account.2.codec.13.priority = 0
+account.2.codec.13.rtpmap = 97
+
+#######################################################################################
+##    Account3 Settings                                                              ##
+#######################################################################################
+
+#Enable or disable the account 3; 0-Disabled (default), 1-Enabled;
+{if isset($account.3.password) }
+account.3.enable = 1
+{else}
+account.3.enable = 0
+{/if}
+
+#Configure the label displayed on the LCD screen for account 3.
+account.3.label = {$account.3.display_name}
+
+#Configure the display name of account 3.
+account.3.display_name = {$account.3.display_name}
+
+#Configure the username and password for register authentication.
+account.3.auth_name = {$account.3.auth_id}
+account.3.password = {$account.3.password}
+
+#Configure the register user name.
+{if isset($account.3.server.1.address)}
+account.3.user_name = {$account.3.user_id}@{$account.3.server_address}
+{else}
+account.3.user_name = {$account.3.user_id}
+{/if}
+
+#Enable or disable the phone to receive the messages from the server only; 0-Disabled (default), 1-Enabled;
+account.3.sip_trust_ctrl = 1
+
+#Configure the SIP server address.
+account.3.sip_server_host = {$account.3.server_address}
+
+#Specify the port for the SIP server. The default value is 5060.
+account.3.sip_server_port = {$account.3.sip_port}
+
+#Enable or disable the use of the outbound proxy server; 0-Disabled (default), 1-Enabled;
+account.3.outbound_proxy_enable =
+
+#Specify the IP address or domain name of the outbound proxy server.
+account.3.outbound_host = {$account.3.outbound_proxy}
+
+#Specify the server port, the default value is 5060.
+account.3.outbound_port = {$account.3.sip_port}
+
+#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
+{if $account.3.sip_transport == 'udp'}account.3.transport = 0{/if}
+{if $account.3.sip_transport == 'tcp'}account.3.transport = 1{/if}
+{if $account.3.sip_transport == 'tls'}account.3.transport = 2{/if}
+{if $account.3.sip_transport == 'dns srv'}account.3.transport = 3{/if}
+
+#Configure the address of the backup outbound proxy server.
+account.3.backup_outbound_host =
+
+#Specify the port of the backup outbound proxy server, the default value is 5060.
+account.3.backup_outbound_port =
+
+#Configure the voice mail number of account 3.
+voice_mail.number.3 =
+
+#Configure the proxy server to account 3.
+account.3.proxy_require =
+
+#Enable or disable the use of the timer to periodically refresh the DNS-SRV query result; 0-Disabled (default), 1-Enabled;
+#Require reboot;
+account.3.srv_ttl_timer_enable =
+
+#Configure the type of DNS-SRV query; 0-UDP, TCP and TLS (default), 1-UDP, 2-TCP, 3-TLS;
+#Require reboot;
+account.3.dns_srv_type =
+
+#Enable or disable the anonymous call feature; 0-Disabled (default), 1-Enabled;
+account.3.anonymous_call =
+
+#Configure the on code and off code of the anonymous call feature.
+account.3.anonymous_call_oncode =
+account.3.anonymous_call_offcode =
+
+#Enable or disable the reject anonymous call feature; 0-Disabled (default), 1-Enabled;
+account.3.reject_anonymous_call =
+
+#Configure the on code and off code of the reject anonymous call feature.
+account.3.anonymous_reject_oncode =
+account.3.anonymous_reject_offcode =
+
+#Configure the SIP port for account 3, the default value is 5060.
+account.3.sip_listen_port =
+
+#Configure the register expiry time (in seconds), the default value is 3600.
+account.3.expires = {$account.3.register_expires}
+
+#Enable or disable the 100 reliable retransmission; 0-Disabled (default), 1-Enabled;
+account.3.100rel_enable = {$yealink_retransmission}
+
+#Enable or disable the resource reservation; 0-Disabled (default), 1-Enabled;
+account.3.precondition =
+
+#Enable or disable the phone to subscribe the register status; 0-Disabled (default), 1-Enabled;
+account.3.subscribe_register =
+
+#Enable or disable the phone to subscribe the message waiting indicator; 0-Disabled (default), 1-Enabled;
+account.3.subscribe_mwi =
+
+#Configure MWI subscribe expiry time (in seconds). It ranges from 0 to 84600, the default value is 3600.
+account.3.subscribe_mwi_expires =
+
+#Configure the type of SIP header(s) to carry the caller ID; 0-FROM (default), 1-PAI 2-PAI-FROM, 3-PRID-PAI-FROM, 4-PAI-RPID-FROM, 5-RPID-FROM;
+account.3.cid_source = {$yealink_cid_source}
+
+#Configure the presentation of the callee ID; 0-PAI-PRID, 1-DIALED DIGITS (default), 2-RFC4916;
+account.3.cp_source = 2
+
+#Enable or disable the session timer; 0-Disabled (default), 1-Enabled;
+account.3.session_timer.enable = {$yealink_session_timer}
+
+#Configure the refresh session timer interval (in seconds). It ranges from 1 to 9999.
+account.3.session_timer.expires =
+
+#Configure the session timer refresher; 0-Uac (default), 1-Uas;
+account.3.session_timer.refresher =
+
+#Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled;
+account.3.enable_user_equal_phone =
+
+#Specify whether to encrypt the SIP messages; 0-Disabled, 1-Forced, 2-Negotiated;
+account.3.srtp_encryption =
+
+#Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60.
+account.3.ptime =
+
+#Assign account 3 as shared line; 0-Disabled (default), 1-BSFT shared line, 2-Draft bridge line appearance;
+account.3.shared_line =
+
+#Configure BLA number for account 3 and the subscribe period (in seconds). It ranges from 60 to 7200, the default value is 300.
+account.3.bla_number =
+account.3.bla_subscribe_period =
+
+#Enable or disable call pickup using dialog-info SIP header; 0-Disabled (default), 1-Enabled;
+account.3.dialoginfo_callpickup =
+
+#Configure the directed and group pickup codes for account 3, the settings on a per-account basis take precedence over the settings on the phone.
+account.3.group_pickup_code =
+account.3.direct_pickup_code =
+
+#Enable or disable the auto answer feature; 0-Disabled (default), 1-Enabled;
+account.3.auto_answer =
+
+#Enable or disable the phone to record the missed call; 0-Disabled, 1-Enabled (default);
+account.3.missed_calllog =
+
+#Enable or disable the phone to subscribe to the voicemail through the message waiting indicator; 0-Disabled (default), 1-Enabled;
+account.3.subscribe_mwi_to_vm =
+
+#Enable or disable the phone to send the MAC address in the Register message; 0-Disabled (default), 1-Enabled;
+account.3.register_mac =
+
+#Enable or disable the phone to send theline number in the Register message; 0-Disabled, 1-Enabled (default);
+account.3.register_line =
+
+#Configure the interval (in seconds) the phone retries to register when account 3 fails to register. It ranges from 0 to 1800, the default value is 30.
+account.3.reg_fail_retry_interval =
+
+#Configure the conference type; 0-Local (default), 2-Network Conference;
+account.3.conf_type = {if $nway_conference == true}2{/if}
+
+#Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
+account.3.conf_uri = {if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}
+
+#Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist".
+account.3.blf.blf_list_uri =
+
+#Configure the pickup code of BLF List.
+account.3.blf_list_code =
+
+#Configure the bargein code.
+account.3.blf_list_barge_in_code =
+
+#Configure the BLF subscribe period (in seconds), the default value is 1800.
+account.3.blf.subscribe_period =
+
+#Configure the ACD subscribe period (in seconds). It ranges from 120 to 3600 (default).
+account.3.subscribe_acd_expires =
+
+#Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom;
+account.3.sip_server_type =
+
+#Enable or disable the phone to use the customized theme; 0-Disabled (default), 1-Enabled;
+account.3.idle_screen_enable =
+
+#Define the access URL of the customized theme.
+account.3.idle_screen_url =
+
+#Enable or disable the SIP signal encode; 0-Disabled (default), 1-Enabled (RC 4);
+account.3.enable_signal_encode =
+
+#Configure the key for encoding.
+account.3.signal_encode_key =
+
+#Configure the DTMF type; 0-INBAND, 1-RFC2833 (default), 2-SIP INFO, 3-AUTO+SIP INFO;
+account.3.dtmf.type = {$yealink_dtmf_type}
+
+#Configure the RFC2833 payload. It ranges from 96 to 225, the default value is 101.
+account.3.dtmf.dtmf_payload =
+
+#Configure the DTMF info type when using the SIP INFO; 0-Disabled (default), 1-DTMF-Relay, 2-DTMF, 3-Telephone-Event;
+account.3.dtmf.info_type =
+
+#Enable or disable the phone to support the simplified SIP header; 0-Disabled (default), 1-Enabled;
+account.3.compact_header_enable =
+
+#########################################################################
+##                     NAT Settings                                    ##
+#########################################################################
+
+#Enable or disable the NAT traversal; 0-Disabled (default), 1-STUN;
+account.3.nat.nat_traversal = {if isset($stun_server)}1{else}0{/if}
+
+#Configure the STUN server address.
+account.3.nat.stun_server = {$stun_server}
+
+#Configure the STUN server port, the default value is 3478.
+account.3.nat.stun_port = {if isset($stun_port)}{$stun_port}{else}3478{/if}
+
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Enabled (default);
+account.3.nat.udp_update_enable =
+
+#Specify the keep-alive interval (in seconds), the default value is 30.
+account.3.nat.udp_update_time =
+
+#Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
+account.3.nat.rport = {$yealink_rport}
+
+#Configure the session timer (in seconds), the default values of T1, T2, T3 are 0.5, 4, 5.
+account.3.advanced.timer_t1 =
+account.3.advanced.timer_t2 =
+account.3.advanced.timer_t4 =
+
+#Assign a ringtone for account 3. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav - ­Ring8.wav.
+#If you configure the custom ring tone (Family.wav) for the account, the value format is: Family.wav
+#If you configure the system ring tone (Ring2.wav) for the account, the value format is: Ring2.wav
+account.3.ringtone.ring_type =
+
+#Enable or disable the phone to display the picture when receiving the specified SIP message; 0-Disabled, 1-Enabled (default);
+account.3.picture_info_enable =
+
+#Audio codecs for account 3 (Y ranges from 1 to 13).
+#account.3.codec.Y.enable =
+#account.3.codec.Y.payload_type =
+#account.3.codec.Y.priority =
+#account.3.codec.Y.rtpmap =
+
+account.3.codec.1.enable = 1
+account.3.codec.1.payload_type = PCMU
+account.3.codec.1.priority = 1
+account.3.codec.1.rtpmap = 0
+
+account.3.codec.2.enable = 1
+account.3.codec.2.payload_type = PCMA
+account.3.codec.2.priority = 2
+account.3.codec.2.rtpmap = 8
+
+account.3.codec.3.enable = 0
+account.3.codec.3.payload_type = G723_53
+account.3.codec.3.priority =4
+account.3.codec.3.rtpmap = 4
+
+account.3.codec.4.enable = 0
+account.3.codec.4.payload_type = G723_63
+account.3.codec.4.priority = 0
+account.3.codec.4.rtpmap = 4
+
+account.3.codec.5.enable = 1
+account.3.codec.5.payload_type = G729
+account.3.codec.5.priority = 3
+account.3.codec.5.rtpmap = 18
+
+account.3.codec.6.enable = 1
+account.3.codec.6.payload_type = G722
+account.3.codec.6.priority = 4
+account.3.codec.6.rtpmap = 9
+
+account.3.codec.7.enable =
+account.3.codec.7.payload_type =
+account.3.codec.7.priority =
+account.3.codec.7.rtpmap =
+
+account.3.codec.8.enable = 0
+account.3.codec.8.payload_type = G726-16
+account.3.codec.8.priority = 0
+account.3.codec.8.rtpmap = 112
+
+account.3.codec.9.enable = 0
+account.3.codec.9.payload_type = G726-24
+account.3.codec.9.priority = 0
+account.3.codec.9.rtpmap = 102
+
+account.3.codec.10.enable = 0
+account.3.codec.10.payload_type = G726-32
+account.3.codec.10.priority = 0
+account.3.codec.10.rtpmap = 2
+
+account.3.codec.11.enable = 0
+account.3.codec.11.payload_type = G726-40
+account.3.codec.11.priority = 0
+account.3.codec.11.rtpmap = 104
+
+account.3.codec.12.enable = 0
+account.3.codec.12.payload_type = iLBC_13_3
+account.3.codec.12.priority = 0
+account.3.codec.12.rtpmap = 97
+
+account.3.codec.13.enable = 0
+account.3.codec.13.payload_type = iLBC_15_2
+account.3.codec.13.priority = 0
+account.3.codec.13.rtpmap = 97
+
+#######################################################################################
+##              Account4 Settings (For T38G only)                                    ##
+#######################################################################################
+
+#Enable or disable the account 4; 0-Disabled (default), 1-Enabled;
+{if isset($account.4.password) }
+account.4.enable = 1
+{else}
+account.4.enable = 0
+{/if}
+
+#Configure the label displayed on the LCD screen for account 4.
+account.4.label = {$account.4.display_name}
+
+#Configure the display name of account 4.
+account.4.display_name = {$account.4.display_name}
+
+#Configure the username and password for register authentication.
+account.4.auth_name = {$account.4.auth_id}
+account.4.password = {$account.4.password}
+
+#Configure the register user name.
+{if isset($account.4.server.1.address)}
+account.4.user_name = {$account.4.user_id}@{$account.4.server_address}
+{else}
+account.4.user_name = {$account.4.user_id}
+{/if}
+
+#Enable or disable the phone to receive the messages from the server only; 0-Disabled (default), 1-Enabled;
+account.4.sip_trust_ctrl = 1
+
+#Configure the SIP server address.
+account.4.sip_server_host = {$account.4.server_address}
+
+#Specify the port for the SIP server. The default value is 5060.
+account.4.sip_server_port = {$account.4.sip_port}
+
+#Enable or disable the use of the outbound proxy server; 0-Disabled (default), 1-Enabled;
+account.4.outbound_proxy_enable =
+
+#Specify the IP address or domain name of the outbound proxy server.
+account.4.outbound_host = {$account.4.outbound_proxy}
+
+#Specify the server port, the default value is 5060.
+account.4.outbound_port = {$account.4.sip_port}
+
+#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
+{if $account.4.sip_transport == 'udp'}account.4.transport = 0{/if}
+{if $account.4.sip_transport == 'tcp'}account.4.transport = 1{/if}
+{if $account.4.sip_transport == 'tls'}account.4.transport = 2{/if}
+{if $account.4.sip_transport == 'dns srv'}account.4.transport = 3{/if}
+
+#Configure the address of the backup outbound proxy server.
+account.4.backup_outbound_host =
+
+#Specify the port of the backup outbound proxy server, the default value is 5060.
+account.4.backup_outbound_port =
+
+#Configure the voice mail number of account 4.
+voice_mail.number.4 =
+
+#Configure the proxy server to account 4.
+account.4.proxy_require =
+
+#Enable or disable the use of the timer to periodically refresh the DNS-SRV query result; 0-Disabled (default), 1-Enabled;
+#Require reboot;
+account.4.srv_ttl_timer_enable =
+
+#Configure the type of DNS-SRV query; 0-UDP, TCP and TLS (default), 1-UDP, 2-TCP, 3-TLS;
+#Require reboot;
+account.4.dns_srv_type =
+
+#Enable or disable the anonymous call feature; 0-Disabled (default), 1-Enabled;
+account.4.anonymous_call =
+
+#Configure the on code and off code of the anonymous call feature.
+account.4.anonymous_call_oncode =
+account.4.anonymous_call_offcode =
+
+#Enable or disable the reject anonymous call feature; 0-Disabled (default), 1-Enabled;
+account.4.reject_anonymous_call =
+
+#Configure the on code and off code of the reject anonymous call feature.
+account.4.anonymous_reject_oncode =
+account.4.anonymous_reject_offcode =
+
+#Configure the SIP port for account 4, the default value is 5060.
+account.4.sip_listen_port =
+
+#Configure the register expiry time (in seconds), the default value is 3600.
+account.4.expires = {$account.4.register_expires}
+
+#Enable or disable the 100 reliable retransmission; 0-Disabled (default), 1-Enabled;
+account.4.100rel_enable = {$yealink_retransmission}
+
+#Enable or disable the resource reservation; 0-Disabled (default), 1-Enabled;
+account.4.precondition =
+
+#Enable or disable the phone to subscribe the register status; 0-Disabled (default), 1-Enabled;
+account.4.subscribe_register =
+
+#Enable or disable the phone to subscribe the message waiting indicator; 0-Disabled (default), 1-Enabled;
+account.4.subscribe_mwi =
+
+#Configure MWI subscribe expiry time (in seconds). It ranges from 0 to 84600, the default value is 3600.
+account.4.subscribe_mwi_expires =
+
+#Configure the type of SIP header(s) to carry the caller ID; 0-FROM (default), 1-PAI 2-PAI-FROM, 3-PRID-PAI-FROM, 4-PAI-RPID-FROM, 5-RPID-FROM;
+account.4.cid_source = {$yealink_cid_source}
+
+#Configure the presentation of the callee ID; 0-PAI-PRID, 1-DIALED DIGITS (default), 2-RFC4916;
+account.4.cp_source = 2
+
+#Enable or disable the session timer; 0-Disabled (default), 1-Enabled;
+account.4.session_timer.enable = {$yealink_session_timer}
+
+#Configure the refresh session timer interval (in seconds). It ranges from 1 to 9999.
+account.4.session_timer.expires =
+
+#Configure the session timer refresher; 0-Uac (default), 1-Uas;
+account.4.session_timer.refresher =
+
+#Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled;
+account.4.enable_user_equal_phone =
+
+#Specify whether to encrypt the SIP messages; 0-Disabled, 1-Forced, 2-Negotiated;
+account.4.srtp_encryption =
+
+#Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60.
+account.4.ptime =
+
+#Assign account 4 as shared line; 0-Disabled (default), 1-BSFT shared line, 2-Draft bridge line appearance;
+account.4.shared_line =
+
+#Configure BLA number for account 4 and the subscribe period (in seconds). It ranges from 60 to 7200, the default value is 300.
+account.4.bla_number =
+account.4.bla_subscribe_period =
+
+#Enable or disable call pickup using dialog-info SIP header; 0-Disabled (default), 1-Enabled;
+account.4.dialoginfo_callpickup =
+
+#Configure the directed and group pickup codes for account 4, the settings on a per-account basis take precedence over the settings on the phone.
+account.4.group_pickup_code =
+account.4.direct_pickup_code =
+
+#Enable or disable the auto answer feature; 0-Disabled (default), 1-Enabled;
+account.4.auto_answer =
+
+#Enable or disable the phone to record the missed call; 0-Disabled, 1-Enabled (default);
+account.4.missed_calllog =
+
+#Enable or disable the phone to subscribe to the voicemail through the message waiting indicator; 0-Disabled (default), 1-Enabled;
+account.4.subscribe_mwi_to_vm =
+
+#Enable or disable the phone to send the MAC address in the Register message; 0-Disabled (default), 1-Enabled;
+account.4.register_mac =
+
+#Enable or disable the phone to send theline number in the Register message; 0-Disabled, 1-Enabled (default);
+account.4.register_line =
+
+#Configure the interval (in seconds) the phone retries to register when account 4 fails to register. It ranges from 0 to 1800, the default value is 30.
+account.4.reg_fail_retry_interval =
+
+#Configure the conference type; 0-Local (default), 2-Network Conference;
+account.4.conf_type = {if $nway_conference == true}2{/if}
+
+#Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
+account.4.conf_uri = {if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}
+
+#Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist".
+account.4.blf.blf_list_uri =
+
+#Configure the pickup code of BLF List.
+account.4.blf_list_code =
+
+#Configure the bargein code.
+account.4.blf_list_barge_in_code =
+
+#Configure the BLF subscribe period (in seconds), the default value is 1800.
+account.4.blf.subscribe_period =
+
+#Configure the ACD subscribe period (in seconds). It ranges from 120 to 3600 (default).
+account.4.subscribe_acd_expires =
+
+#Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom;
+account.4.sip_server_type =
+
+#Enable or disable the phone to use the customized theme; 0-Disabled (default), 1-Enabled;
+account.4.idle_screen_enable =
+
+#Define the access URL of the customized theme.
+account.4.idle_screen_url =
+
+#Enable or disable the SIP signal encode; 0-Disabled (default), 1-Enabled (RC 4);
+account.4.enable_signal_encode =
+
+#Configure the key for encoding.
+account.4.signal_encode_key =
+
+#Configure the DTMF type; 0-INBAND, 1-RFC2833 (default), 2-SIP INFO, 3-AUTO+SIP INFO;
+account.4.dtmf.type = {$yealink_dtmf_type}
+
+#Configure the RFC2833 payload. It ranges from 96 to 225, the default value is 101.
+account.4.dtmf.dtmf_payload =
+
+#Configure the DTMF info type when using the SIP INFO; 0-Disabled (default), 1-DTMF-Relay, 2-DTMF, 3-Telephone-Event;
+account.4.dtmf.info_type =
+
+#Enable or disable the phone to support the simplified SIP header; 0-Disabled (default), 1-Enabled;
+account.4.compact_header_enable =
+
+#########################################################################
+##                     NAT Settings                                    ##
+#########################################################################
+
+#Enable or disable the NAT traversal; 0-Disabled (default), 1-STUN;
+account.4.nat.nat_traversal = {if isset($stun_server)}1{else}0{/if}
+
+#Configure the STUN server address.
+account.4.nat.stun_server = {$stun_server}
+
+#Configure the STUN server port, the default value is 3478.
+account.4.nat.stun_port = {if isset($stun_port)}{$stun_port}{else}3478{/if}
+
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Enabled (default);
+account.4.nat.udp_update_enable =
+
+#Specify the keep-alive interval (in seconds), the default value is 30.
+account.4.nat.udp_update_time =
+
+#Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
+account.4.nat.rport = {$yealink_rport}
+
+#Configure the session timer (in seconds), the default values of T1, T2, T3 are 0.5, 4, 5.
+account.4.advanced.timer_t1 =
+account.4.advanced.timer_t2 =
+account.4.advanced.timer_t4 =
+
+#Assign a ringtone for account 4. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav - Ring8.wav.
+#If you configure the custom ring tone (Family.wav) for the account, the value format is: Family.wav
+#If you configure the system ring tone (Ring2.wav) for the account, the value format is: Ring2.wav
+account.4.ringtone.ring_type =
+
+#Enable or disable the phone to download the picture when receiving the specified SIP message; 0-Disabled, 1-Enabled (default);
+account.4.picture_info_enable =
+
+#Enable or disable the phone to display the picture when receiving the specified SIP message; 0-Disabled, 1-Enabled (default);
+account.4.picture_info_enable =
+
+#Audio codecs for account 4 (Y ranges from 1 to 13).
+#account.4.codec.Y.enable =
+#account.4.codec.Y.payload_type =
+#account.4.codec.Y.priority =
+#account.4.codec.Y.rtpmap =
+
+account.4.codec.1.enable = 1
+account.4.codec.1.payload_type = PCMU
+account.4.codec.1.priority = 1
+account.4.codec.1.rtpmap = 0
+
+account.4.codec.2.enable = 1
+account.4.codec.2.payload_type = PCMA
+account.4.codec.2.priority = 2
+account.4.codec.2.rtpmap = 8
+
+account.4.codec.3.enable = 0
+account.4.codec.3.payload_type = G723_53
+account.4.codec.3.priority =4
+account.4.codec.3.rtpmap = 4
+
+account.4.codec.4.enable = 0
+account.4.codec.4.payload_type = G723_63
+account.4.codec.4.priority = 0
+account.4.codec.4.rtpmap = 4
+
+account.4.codec.5.enable = 1
+account.4.codec.5.payload_type = G729
+account.4.codec.5.priority = 3
+account.4.codec.5.rtpmap = 18
+
+account.4.codec.6.enable = 1
+account.4.codec.6.payload_type = G722
+account.4.codec.6.priority = 4
+account.4.codec.6.rtpmap = 9
+
+account.4.codec.7.enable =
+account.4.codec.7.payload_type =
+account.4.codec.7.priority =
+account.4.codec.7.rtpmap =
+
+account.4.codec.8.enable = 0
+account.4.codec.8.payload_type = G726-16
+account.4.codec.8.priority = 0
+account.4.codec.8.rtpmap = 112
+
+account.4.codec.9.enable = 0
+account.4.codec.9.payload_type = G726-24
+account.4.codec.9.priority = 0
+account.4.codec.9.rtpmap = 102
+
+account.4.codec.10.enable = 0
+account.4.codec.10.payload_type = G726-32
+account.4.codec.10.priority = 0
+account.4.codec.10.rtpmap = 2
+
+account.4.codec.11.enable = 0
+account.4.codec.11.payload_type = G726-40
+account.4.codec.11.priority = 0
+account.4.codec.11.rtpmap = 104
+
+account.4.codec.12.enable = 0
+account.4.codec.12.payload_type = iLBC_13_3
+account.4.codec.12.priority = 0
+account.4.codec.12.rtpmap = 97
+
+account.4.codec.13.enable = 0
+account.4.codec.13.payload_type = iLBC_15_2
+account.4.codec.13.priority = 0
+account.4.codec.13.rtpmap = 97
+
+#######################################################################################
+##               Account5 Settings (For T38G only)                                   ##
+#######################################################################################
+
+#Enable or disable the account 5; 0-Disabled (default), 1-Enabled;
+{if isset($account.5.password) }
+account.5.enable = 1
+{else}
+account.5.enable = 0
+{/if}
+
+#Configure the label displayed on the LCD screen for account 5.
+account.5.label = {$account.5.display_name}
+
+#Configure the display name of account 5.
+account.5.display_name = {$account.5.display_name}
+
+#Configure the username and password for register authentication.
+account.5.auth_name = {$account.5.auth_id}
+account.5.password = {$account.5.password}
+
+#Configure the register user name.
+{if isset($account.5.server.1.address)}
+account.5.user_name = {$account.5.user_id}@{$account.5.server_address}
+{else}
+account.5.user_name = {$account.5.user_id}
+{/if}
+
+#Enable or disable the phone to receive the messages from the server only; 0-Disabled (default), 1-Enabled;
+account.5.sip_trust_ctrl = 1
+
+#Configure the SIP server address.
+account.5.sip_server_host = {$account.5.server_address}
+
+#Specify the port for the SIP server. The default value is 5060.
+account.5.sip_server_port = {$account.5.sip_port}
+
+#Enable or disable the use of the outbound proxy server; 0-Disabled (default), 1-Enabled;
+account.5.outbound_proxy_enable =
+
+#Specify the IP address or domain name of the outbound proxy server.
+account.5.outbound_host = {$account.5.outbound_proxy}
+
+#Specify the server port, the default value is 5060.
+account.5.outbound_port = {$account.5.sip_port}
+
+#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
+{if $account.5.sip_transport == 'udp'}account.5.transport = 0{/if}
+{if $account.5.sip_transport == 'tcp'}account.5.transport = 1{/if}
+{if $account.5.sip_transport == 'tls'}account.5.transport = 2{/if}
+{if $account.5.sip_transport == 'dns srv'}account.5.transport = 3{/if}
+
+#Configure the address of the backup outbound proxy server.
+account.5.backup_outbound_host =
+
+#Specify the port, the default value is 5060.
+account.5.backup_outbound_port =
+
+#Configure the voice mail number of account 5.
+voice_mail.number.5 =
+
+#Configure the proxy server to account 5.
+account.5.proxy_require =
+
+#Enable or disable the use of the timer to periodically refresh the DNS-SRV query result; 0-Disabled (default), 1-Enabled;
+#Require reboot;
+account.5.srv_ttl_timer_enable =
+
+#Configure the type of DNS-SRV query; 0-UDP, TCP and TLS (default), 1-UDP, 2-TCP, 3-TLS;
+#Require reboot;
+account.5.dns_srv_type =
+
+#Enable or disable the anonymous call feature; 0-Disabled (default), 1-Enabled;
+account.5.anonymous_call =
+
+#Configure the on code and off code of the anonymous call feature.
+account.5.anonymous_call_oncode =
+account.5.anonymous_call_offcode =
+
+#Enable or disable the reject anonymous call feature; 0-Disabled (default), 1-Enabled;
+account.5.reject_anonymous_call =
+
+#Configure the on code and off code of the reject anonymous call feature.
+account.5.anonymous_reject_oncode =
+account.5.anonymous_reject_offcode =
+
+#Configure the SIP port for account 5, the default value is 5060.
+account.5.sip_listen_port =
+
+#Configure the register expiry time (in seconds), the default value is 3600.
+account.5.expires = {$account.5.register_expires}
+
+#Enable or disable the 100 reliable retransmission; 0-Disabled (default), 1-Enabled;
+account.5.100rel_enable = {$yealink_retransmission}
+
+#Enable or disable the resource reservation; 0-Disabled (default), 1-Enabled;
+account.5.precondition =
+
+#Enable or disable the phone to subscribe the register status; 0-Disabled (default), 1-Enabled;
+account.5.subscribe_register =
+
+#Enable or disable the phone to subscribe the message waiting indicator; 0-Disabled (default), 1-Enabled;
+account.5.subscribe_mwi =
+
+#Configure MWI subscribe expiry time (in seconds). It ranges from 0 to 84600, the default value is 3600.
+account.5.subscribe_mwi_expires =
+
+#Configure the type of SIP header(s) to carry the caller ID; 0-FROM (default), 1-PAI 2-PAI-FROM, 3-PRID-PAI-FROM, 4-PAI-RPID-FROM, 5-RPID-FROM;
+account.5.cid_source = {$yealink_cid_source}
+
+#Configure the presentation of the callee ID; 0-PAI-PRID, 1-DIALED DIGITS (default), 2-RFC4916;
+account.5.cp_source = 2
+
+#Enable or disable the session timer; 0-Disabled (default), 1-Enabled;
+account.5.session_timer.enable = {$yealink_session_timer}
+
+#Configure the refresh session timer interval (in seconds). It ranges from 1 to 9999.
+account.5.session_timer.expires =
+
+#Configure the session timer refresher; 0-Uac (default), 1-Uas;
+account.5.session_timer.refresher =
+
+#Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled;
+account.5.enable_user_equal_phone =
+
+#Specify whether to encrypt the SIP messages; 0-Disabled, 1-Forced, 2-Negotiated;
+account.5.srtp_encryption =
+
+#Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60.
+account.5.ptime =
+
+#Assign account 5 as shared line; 0-Disabled (default), 1-BSFT shared line, 2-Draft bridge line appearance;
+account.5.shared_line =
+
+#Configure BLA number for account 5 and the subscribe period (in seconds). It ranges from 60 to 7200, the default value is 300.
+account.5.bla_number =
+account.5.bla_subscribe_period =
+
+#Enable or disable call pickup using dialog-info SIP header; 0-Disabled (default), 1-Enabled;
+account.5.dialoginfo_callpickup =
+
+#Configure the directed and group pickup codes for account 5, the settings on a per-account basis take precedence over the settings on the phone.
+account.5.group_pickup_code =
+account.5.direct_pickup_code =
+
+#Enable or disable the auto answer feature; 0-Disabled (default), 1-Enabled;
+account.5.auto_answer =
+
+#Enable or disable the phone to record the missed call; 0-Disabled, 1-Enabled (default);
+account.5.missed_calllog =
+
+#Enable or disable the phone to subscribe to the voicemail through the message waiting indicator; 0-Disabled (default), 1-Enabled;
+account.5.subscribe_mwi_to_vm =
+
+#Enable or disable the phone to send the MAC address and line number in the Register message; 0-Disabled (default), 1-Enabled;
+account.5.register_mac =
+account.5.register_line =
+
+#Configure the interval (in seconds) the phone retries to register when account 5 fails to register. It ranges from 0 to 1800, the default value is 30.
+account.5.reg_fail_retry_interval =
+
+#Configure the conference type; 0-Local (default), 2-Network Conference;
+account.5.conf_type = {if $nway_conference == true}2{/if}
+
+#Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
+account.5.conf_uri = {if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}
+
+#Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist".
+account.5.blf.blf_list_uri =
+
+#Configure the pickup code of BLF List.
+account.5.blf_list_code =
+
+#Configure the bargein code.
+account.5.blf_list_barge_in_code =
+
+#Configure the BLF subscribe period (in seconds), the default value is 1800.
+account.5.blf.subscribe_period =
+
+#Configure the ACD subscribe period (in seconds). It ranges from 120 to 3600 (default).
+account.5.subscribe_acd_expires =
+
+#Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom;
+account.5.sip_server_type =
+
+#Enable or disable the phone to use the customized theme; 0-Disabled (default), 1-Enabled;
+account.5.idle_screen_enable =
+
+#Define the access URL of the customized theme.
+account.5.idle_screen_url =
+
+#Enable or disable the SIP signal encode; 0-Disabled (default), 1-Enabled (RC 4);
+account.5.enable_signal_encode =
+
+#Configure the key for encoding.
+account.5.signal_encode_key =
+
+#Configure the DTMF type; 0-INBAND, 1-RFC2833 (default), 2-SIP INFO, 3-AUTO+SIP INFO;
+account.5.dtmf.type = {$yealink_dtmf_type}
+
+#Configure the RFC2833 payload. It ranges from 96 to 225, the default value is 101.
+account.5.dtmf.dtmf_payload =
+
+#Configure the DTMF info type when using the SIP INFO; 0-Disabled (default), 1-DTMF-Relay, 2-DTMF, 3-Telephone-Event;
+account.5.dtmf.info_type =
+
+#Enable or disable the phone to support the simplified SIP header; 0-Disabled (default), 1-Enabled;
+account.5.compact_header_enable =
+
+#########################################################################
+##                     NAT Settings                                    ##
+#########################################################################
+
+#Enable or disable the NAT traversal; 0-Disabled (default), 1-STUN;
+account.5.nat.nat_traversal = {if isset($stun_server)}1{else}0{/if}
+
+#Configure the STUN server address.
+account.5.nat.stun_server = {$stun_server}
+
+#Configure the STUN server port, the default value is 3478.
+account.5.nat.stun_port = {if isset($stun_port)}{$stun_port}{else}3478{/if}
+
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Enabled (default);
+account.5.nat.udp_update_enable =
+
+#Specify the keep-alive interval (in seconds), the default value is 30.
+account.5.nat.udp_update_time =
+
+#Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
+account.5.nat.rport = {$yealink_rport}
+
+#Configure the session timer (in seconds), the default value of T1, T2, T3 is 0.5, 4, 5.
+account.5.advanced.timer_t1 =
+account.5.advanced.timer_t2 =
+account.5.advanced.timer_t4 =
+
+#Assign a ringtone for account 5. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav - Ring8.wav.
+#If you configure the custom ring tone (Family.wav) for the account, the value format is: Family.wav
+#If you configure the system ring tone (Ring2.wav) for the account, the value format is: Ring2.wav
+account.5.ringtone.ring_type =
+
+#Enable or disable the phone to display the picture when receiving the specified SIP message; 0-Disabled, 1-Enabled (default);
+account.5.picture_info_enable =
+
+#Audio codecs for account5 (Y ranges from 1 to 13).
+#account.5.codec.Y.enable =
+#account.5.codec.Y.payload_type =
+#account.5.codec.Y.priority =
+#account.5.codec.Y.rtpmap =
+
+account.5.codec.1.enable = 1
+account.5.codec.1.payload_type = PCMU
+account.5.codec.1.priority = 1
+account.5.codec.1.rtpmap = 0
+
+account.5.codec.2.enable = 1
+account.5.codec.2.payload_type = PCMA
+account.5.codec.2.priority = 2
+account.5.codec.2.rtpmap = 8
+
+account.5.codec.3.enable = 0
+account.5.codec.3.payload_type = G723_53
+account.5.codec.3.priority =4
+account.5.codec.3.rtpmap = 4
+
+account.5.codec.4.enable = 0
+account.5.codec.4.payload_type = G723_63
+account.5.codec.4.priority = 0
+account.5.codec.4.rtpmap = 4
+
+account.5.codec.5.enable = 1
+account.5.codec.5.payload_type = G729
+account.5.codec.5.priority = 3
+account.5.codec.5.rtpmap = 18
+
+account.5.codec.6.enable = 1
+account.5.codec.6.payload_type = G722
+account.5.codec.6.priority = 4
+account.5.codec.6.rtpmap = 9
+
+account.5.codec.7.enable =
+account.5.codec.7.payload_type =
+account.5.codec.7.priority =
+account.5.codec.7.rtpmap =
+
+account.5.codec.8.enable = 0
+account.5.codec.8.payload_type = G726-16
+account.5.codec.8.priority = 0
+account.5.codec.8.rtpmap = 112
+
+account.5.codec.9.enable = 0
+account.5.codec.9.payload_type = G726-24
+account.5.codec.9.priority = 0
+account.5.codec.9.rtpmap = 102
+
+account.5.codec.10.enable = 0
+account.5.codec.10.payload_type = G726-32
+account.5.codec.10.priority = 0
+account.5.codec.10.rtpmap = 2
+
+account.5.codec.11.enable = 0
+account.5.codec.11.payload_type = G726-40
+account.5.codec.11.priority = 0
+account.5.codec.11.rtpmap = 104
+
+account.5.codec.12.enable = 0
+account.5.codec.12.payload_type = iLBC_13_3
+account.5.codec.12.priority = 0
+account.5.codec.12.rtpmap = 97
+
+account.5.codec.13.enable = 0
+account.5.codec.13.payload_type = iLBC_15_2
+account.5.codec.13.priority = 0
+account.5.codec.13.rtpmap = 97
+
+#######################################################################################
+##                 Account6 Settings (For T38G only)                                 ##
+#######################################################################################
+
+#Enable or disable the account 6; 0-Disabled (default), 1-Enabled;
+{if isset($account.6.password) }
+account.6.enable = 1
+{else}
+account.6.enable = 0
+{/if}
+
+#Configure the label displayed on the LCD screen for account 6.
+account.6.label = {$account.6.display_name}
+
+#Configure the display name of account 6.
+account.6.display_name = {$account.6.display_name}
+
+#Configure the username and password for register authentication.
+account.6.auth_name = {$account.6.auth_id}
+account.6.password = {$account.6.user_id}
+
+#Configure the register user name.
+{if isset($account.6.server.1.address)}
+account.6.user_name = {$account.6.user_id}@{$account.6.server_address}
+{else}
+account.6.user_name = {$account.6.user_id}
+{/if}
+
+#Enable or disable the phone to receive the messages from the server only; 0-Disabled (default), 1-Enabled;
+account.6.sip_trust_ctrl = 1
+
+#Configure the SIP server address.
+account.6.sip_server_host = {$account.6.server_address}
+
+#Specify the port for the SIP server. The default value is 5060.
+account.6.sip_server_port = {$account.6.sip_port}
+
+#Enable or disable the use of the outbound proxy server; 0-Disabled (default), 1-Enabled;
+account.6.outbound_proxy_enable =
+
+#Specify the IP address or domain name of the outbound proxy server.
+account.6.outbound_host = {$account.6.outbound_proxy}
+
+#Specify the server port, the default value is 5060.
+account.6.outbound_port = {$account.6.sip_port}
+
+#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
+{if $account.6.sip_transport == 'udp'}account.6.transport = 0{/if}
+{if $account.6.sip_transport == 'tcp'}account.6.transport = 1{/if}
+{if $account.6.sip_transport == 'tls'}account.6.transport = 2{/if}
+{if $account.6.sip_transport == 'dns srv'}account.6.transport = 3{/if}
+
+#Configure the address of the backup outbound proxy server.
+account.6.backup_outbound_host =
+
+#Specify the port, the default value is 5060.
+account.6.backup_outbound_port =
+
+#Configure the voice mail number of account 6.
+voice_mail.number.6 =
+
+#Configure the proxy server to account 6.
+account.6.proxy_require =
+
+#Enable or disable the use of the timer to periodically refresh the DNS-SRV query result; 0-Disabled (default), 1-Enabled;
+#Require reboot;
+account.6.srv_ttl_timer_enable =
+
+#Configure the type of DNS-SRV query; 0-UDP, TCP and TLS (default), 1-UDP, 2-TCP, 3-TLS;
+#Require reboot;
+account.6.dns_srv_type =
+
+#Enable or disable the anonymous call feature; 0-Disabled (default), 1-Enabled;
+account.6.anonymous_call =
+
+#Configure the on code and off code of the anonymous call feature.
+account.6.anonymous_call_oncode =
+account.6.anonymous_call_offcode =
+
+#Enable or disable the reject anonymous call feature; 0-Disabled (default), 1-Enabled;
+account.6.reject_anonymous_call =
+
+#Configure the on code and off code of the reject anonymous call feature.
+account.6.anonymous_reject_oncode =
+account.6.anonymous_reject_offcode =
+
+#Configure the SIP port for account 6, the default value is 5060.
+account.6.sip_listen_port =
+
+#Configure the register expiry time (in seconds), the default value is 3600.
+account.6.expires = {$account.6.register_expires}
+
+#Enable or disable the 100 reliable retransmission; 0-Disabled (default), 1-Enabled;
+account.6.100rel_enable = {$yealink_retransmission}
+
+#Enable or disable the resource reservation; 0-Disabled (default), 1-Enabled;
+account.6.precondition =
+
+#Enable or disable the phone to subscribe the register status; 0-Disabled (default), 1-Enabled;
+account.6.subscribe_register =
+
+#Enable or disable the phone to subscribe the message waiting indicator; 0-Disabled (default), 1-Enabled;
+account.6.subscribe_mwi =
+
+#Configure MWI subscribe expiry time (in seconds). It ranges from 0 to 84600, the default value is 3600.
+account.6.subscribe_mwi_expires =
+
+#Configure the type of SIP header(s) to carry the caller ID; 0-FROM (default), 1-PAI 2-PAI-FROM, 3-PRID-PAI-FROM, 4-PAI-RPID-FROM, 5-RPID-FROM;
+account.6.cid_source = {$yealink_cid_source}
+
+#Configure the presentation of the callee ID; 0-PAI-PRID, 1-DIALED DIGITS (default), 2-RFC4916;
+account.6.cp_source = 2
+
+#Enable or disable the session timer; 0-Disabled (default), 1-Enabled;
+account.6.session_timer.enable = {$yealink_session_timer}
+
+#Configure the refresh session timer interval (in seconds). It ranges from 1 to 9999.
+account.6.session_timer.expires =
+
+#Configure the session timer refresher; 0-Uac (default), 1-Uas;
+account.6.session_timer.refresher =
+
+#Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled;
+account.6.enable_user_equal_phone =
+
+#Specify whether to encrypt the SIP messages; 0-Disabled, 1-Forced, 2-Negotiated;
+account.6.srtp_encryption =
+
+#Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60.
+account.6.ptime =
+
+#Assign account 6 as shared line; 0-Disabled (default), 1-BSFT shared line, 2-Draft bridge line appearance;
+account.6.shared_line =
+
+#Configure BLA number for account 6 and the subscribe period (in seconds). It ranges from 60 to 7200, the default value is 300.
+account.6.bla_number =
+account.6.bla_subscribe_period =
+
+#Enable or disable call pickup using dialog-info SIP header; 0-Disabled (default), 1-Enabled;
+account.6.dialoginfo_callpickup =
+
+#Configure the directed and group pickup codes for account 6, the settings on a per-account basis take precedence over the settings on the phone.
+account.6.group_pickup_code =
+account.6.direct_pickup_code =
+
+#Enable or disable the auto answer feature; 0-Disabled (default), 1-Enabled;
+account.6.auto_answer =
+
+#Enable or disable the phone to record the missed call; 0-Disabled, 1-Enabled (default);
+account.6.missed_calllog =
+
+#Enable or disable the phone to subscribe to the voicemail through the message waiting indicator; 0-Disabled (default), 1-Enabled;
+account.6.subscribe_mwi_to_vm =
+
+#Enable or disable the phone to send the MAC address and line number in the Register message; 0-Disabled (default), 1-Enabled;
+account.6.register_mac =
+account.6.register_line =
+
+#Configure the interval (in seconds) the phone retries to register when account 6 fails to register. It ranges from 0 to 1800, the default value is 30.
+account.6.reg_fail_retry_interval =
+
+#Configure the conference type; 0-Local (default), 2-Network Conference;
+account.6.conf_type = {if $nway_conference == true}2{/if}
+
+#Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
+account.6.conf_uri = {if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}
+
+#Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist".
+account.6.blf.blf_list_uri =
+
+#Configure the pickup code of BLF List.
+account.6.blf_list_code =
+
+#Configure the bargein code.
+account.6.blf_list_barge_in_code =
+
+#Configure the BLF subscribe period (in seconds), the default value is 1800.
+account.6.blf.subscribe_period =
+
+#Configure the ACD subscribe period (in seconds). It ranges from 120 to 3600 (default).
+account.6.subscribe_acd_expires =
+
+#Configure the SIP server type; 0-Default (default), 2-BroadSoft, 4-Cosmocom;
+account.6.sip_server_type =
+
+#Enable or disable the phone to use the customized theme; 0-Disabled (default), 1-Enabled;
+account.6.idle_screen_enable =
+
+#Define the access URL of the customized theme.
+account.6.idle_screen_url =
+
+#Enable or disable the SIP signal encode; 0-Disabled (default), 1-Enabled (RC 4);
+account.6.enable_signal_encode =
+
+#Configure the key for encoding.
+account.6.signal_encode_key =
+
+#Configure the DTMF type; 0-INBAND, 1-RFC2833 (default), 2-SIP INFO, 3-AUTO+SIP INFO;
+account.6.dtmf.type = {$yealink_dtmf_type}
+
+#Configure the RFC2833 payload. It ranges from 96 to 225, the default value is 101.
+account.6.dtmf.dtmf_payload =
+
+#Configure the DTMF info type when using the SIP INFO; 0-Disabled (default), 1-DTMF-Relay, 2-DTMF, 3-Telephone-Event;
+account.6.dtmf.info_type =
+
+#Enable or disable the phone to support the simplified SIP header; 0-Disabled (default), 1-Enabled;
+account.6.compact_header_enable =
+
+#########################################################################
+##                     NAT Settings                                    ##
+#########################################################################
+
+#Enable or disable the NAT traversal; 0-Disabled (default), 1-STUN;
+account.6.nat.nat_traversal =
+
+#Configure the STUN server address.
+account.6.nat.stun_server =
+
+#Configure the STUN server port, the default value is 3478.
+account.6.nat.stun_port =
+
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Enabled (default);
+account.6.nat.udp_update_enable =
+
+#Specify the keep-alive interval (in seconds), the default value is 30.
+account.6.nat.udp_update_time =
+
+#Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
+account.6.nat.rport = {$yealink_rport}
+
+#Configure the session timer (in seconds), the default value of T1, T2, T3 is 0.5, 4, 5.
+account.6.advanced.timer_t1 =
+account.6.advanced.timer_t2 =
+account.6.advanced.timer_t4 =
+
+#Assign a ringtone for account 6. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav - ­Ring8.wav.
+#If you configure the custom ring tone (Family.wav) for the account, the value format is: Family.wav
+#If you configure the system ring tone (Ring2.wav) for the account, the value format is: Ring2.wav
+account.6.ringtone.ring_type =
+
+#Enable or disable the phone to display the picture when receiving the specified SIP message; 0-Disabled, 1-Enabled (default);
+account.6.picture_info_enable =
+
+#Audio codecs for account6 (Y ranges from 1 to 13).
+#account.6.codec.Y.enable =
+#account.6.codec.Y.payload_type =
+#account.6.codec.Y.priority =
+#account.6.codec.Y.rtpmap =
+
+account.6.codec.1.enable = 1
+account.6.codec.1.payload_type = PCMU
+account.6.codec.1.priority = 1
+account.6.codec.1.rtpmap = 0
+
+account.6.codec.2.enable = 1
+account.6.codec.2.payload_type = PCMA
+account.6.codec.2.priority = 2
+account.6.codec.2.rtpmap = 8
+
+account.6.codec.3.enable = 0
+account.6.codec.3.payload_type = G723_53
+account.6.codec.3.priority =4
+account.6.codec.3.rtpmap = 4
+
+account.6.codec.4.enable = 0
+account.6.codec.4.payload_type = G723_63
+account.6.codec.4.priority = 0
+account.6.codec.4.rtpmap = 4
+
+account.6.codec.5.enable = 1
+account.6.codec.5.payload_type = G729
+account.6.codec.5.priority = 3
+account.6.codec.5.rtpmap = 18
+
+account.6.codec.6.enable = 1
+account.6.codec.6.payload_type = G722
+account.6.codec.6.priority = 4
+account.6.codec.6.rtpmap = 9
+
+account.6.codec.7.enable =
+account.6.codec.7.payload_type =
+account.6.codec.7.priority =
+account.6.codec.7.rtpmap =
+
+account.6.codec.8.enable = 0
+account.6.codec.8.payload_type = G726-16
+account.6.codec.8.priority = 0
+account.6.codec.8.rtpmap = 112
+
+account.6.codec.9.enable = 0
+account.6.codec.9.payload_type = G726-24
+account.6.codec.9.priority = 0
+account.6.codec.9.rtpmap = 102
+
+account.6.codec.10.enable = 0
+account.6.codec.10.payload_type = G726-32
+account.6.codec.10.priority = 0
+account.6.codec.10.rtpmap = 2
+
+account.6.codec.11.enable = 0
+account.6.codec.11.payload_type = G726-40
+account.6.codec.11.priority = 0
+account.6.codec.11.rtpmap = 104
+
+account.6.codec.12.enable = 0
+account.6.codec.12.payload_type = iLBC_13_3
+account.6.codec.12.priority = 0
+account.6.codec.12.rtpmap = 97
+
+account.6.codec.13.enable = 0
+account.6.codec.13.payload_type = iLBC_15_2
+account.6.codec.13.priority = 0
+account.6.codec.13.rtpmap = 97
+
+#######################################################################################
+##                             Call Forward                                          ##
+#######################################################################################
+
+#Enable or disable the always forward; 0-Disabled (default), 1-Enabled;
+forward.always.enable =
+
+#Configure the target number that the phone will forward the call to.
+forward.always.target =
+
+#Configure the on code and off code to always forward.
+forward.always.on_code =
+forward.always.off_code =
+
+#Enable or disable the busy forward; 0-Disabled (default), 1-Enabled;
+forward.busy.enable =
+forward.busy.target =
+forward.busy.on_code =
+forward.busy.off_code =
+
+#Enable or disable the no answer forward; 0-Disabled (default), 1-Enabled;
+#Configure the waiting ring times before forwarding. It ranges from 0 to 20, the default value is 10.
+forward.no_answer.enable =
+forward.no_answer.target =
+forward.no_answer.timeout =
+forward.no_answer.on_code =
+forward.no_answer.off_code =
+
+#Enable or disable the phone to forward the call to the international number (the prefix is 00); 0-Disabled (default), 1-Enabled;
+forward.international.enable =
+
+#######################################################################################
+##                             Line Key                                              ##
+#######################################################################################
+
+#The x of the parameter "linekey.x.line" ranges from 1 to 6.
+#The default value equals to the value of x. For example, the default value of the parameter "linekey.1.line" is 1.
+#linekey.x.lable--Define the label for each line key.
+
+{foreach $keys['line'] as $row}
+
+#Configure Line Key {$row.device_key_id}
+linekey.{$row.device_key_id}.line = {$row.device_key_line}
+linekey.{$row.device_key_id}.value = {$row.device_key_value}
+{if $row.device_key_category == "blf"}
+linekey.{$row.device_key_id}.pickup_value = {$row.device_key_extension}
+{/if}
+linekey.{$row.device_key_id}.type = {$row.device_key_type}
+#linekey.{$row.device_key_id}.xml_phonebook =
+linekey.{$row.device_key_id}.label = {$row.device_key_label}
+
+
+{/foreach}
+
+
+#######################################################################################
+##                             Memory Key (For T38G only)                            ##
+#######################################################################################
+#X ranges from 1 to 10;
+#memorykey.x.line--Configure the desired line to apply the key feature. It ranges from 0 to 6.
+#The value 0 of the "memorykey.x.line" stands for Auto, it means the first available line.
+#But, when the DSS key is configured as BLF, BLF List, Shared Line, Call Park, Pick Up, ACD or Voice Mail feature, the value 0 stands for line 1.
+#memorykey.x.value--Enter the value of some features. E.g. When configuring the DSS key to be BLF, enter the number of the monitored user.
+#memorykey.x.pickup_value--Enter the pickup code, this parameter is only appilicable to BLF.
+#memorykey.x.type--Assign the desired feature to the memory key.
+#Valid types are:  0-N/A(default for memory key)  1-Conference     2-Forward    3-Transfer      4-Hold        5-DND             6-Redial                        7-Call Return     8-SMS
+#                  9-Call Pickup                  10-Call Park     11-DTMF      12-Voicemail    13-SpeedDial  14-Intercom       15-Line(default for line key)   16-BLF            17-URL
+#                  18-Group Listening             19-Public Hold   20-Private   21-Shared Line  22-XML Group  23-Group Pickup   24-Paging                       25-Record         27-XML Browser
+#                  34-Hot Desking                 35-URL Record    38-LDAP      39-BLF List     40-Prefix     41-Zero-Sp-Touch  42-ACD                          45-Local Group    46-Broadsoft Group
+#memorykey.x.xml_phonebook--Specify the desired remote phonebook/local group/BSFT phonebook for the DSS key. This parameter is only appilicable to the feature XML Group/Local Group/Broadsoft Group.
+#memorykey.x.sub_type =
+
+{foreach $keys["memory"] as $row}
+
+#Expansion Memory Key {$row.device_key_id}
+memorykey.{$row.device_key_id}.type = {$row.device_key_type}
+memorykey.{$row.device_key_id}.line = {$row.device_key_line}
+memorykey.{$row.device_key_id}.value = {$row.device_key_value}
+{if $row.device_key_type == "blf"}
+memorykey.{$row.device_key_id}.pickup_value = {$row.device_key_extension}
+{/if}
+memorykey.{$row.device_key_id}.label = {$row.device_key_label}
+#memorykey.{$row.device_key_id}.xml_phonebook =
+#memorykey.{$row.device_key_id}.sub_type =
+
+
+{/foreach}
+
+
+
+##########################################################################################
+##                                  Expansion Module 1                                  ##
+##########################################################################################
+#X ranges from 1 to 16, Y ranges from 1 to 40.
+#expansion_module.x.key.y.type = 37 (Switch by default)
+#expansion_module.x.key.y.line = 0
+#expansion_module.x.key.y.value =
+#expansion_module.x.key.y.extension =
+#expansion_module.x.key.y.label =
+#expansion_module.X.key.Y.xml_phonebook =
+
+{foreach $keys["expansion-1"] as $row}
+expansion_module.1.key.{$row.device_key_id}.type = {$row.device_key_type}
+expansion_module.1.key.{$row.device_key_id}.line = {$row.device_key_line}
+expansion_module.1.key.{$row.device_key_id}.value = {$row.device_key_value}
+expansion_module.1.key.{$row.device_key_id}.extension = {$row.device_key_extension}
+expansion_module.1.key.{$row.device_key_id}.label = {$row.device_key_label}
+expansion_module.1.key.{$row.device_key_id}.xml_phonebook =
+
+{/foreach}
+
+
+##########################################################################################
+##                                  Expansion Module 2                                  ##
+##########################################################################################
+
+#Expansion module 2 key 1
+#expansion_module.2.key.1.type =
+#expansion_module.2.key.1.line =
+#expansion_module.2.key.1.value =
+#expansion_module.2.key.1.extension =
+#expansion_module.2.key.1.label =
+#expansion_module.2.key.1.xml_phonebook =
+#expansion_module.2.key.1.type =
+#expansion_module.2.key.1.label =
+
+{foreach $keys["expansion-2"] as $row}
+expansion_module.2.key.{$row.device_key_id}.type = {$row.device_key_type}
+expansion_module.2.key.{$row.device_key_id}.line = {$row.device_key_line}
+expansion_module.2.key.{$row.device_key_id}.value = {$row.device_key_value}
+expansion_module.2.key.{$row.device_key_id}.extension = {$row.device_key_extension}
+expansion_module.2.key.{$row.device_key_id}.label = {$row.device_key_label}
+expansion_module.2.key.{$row.device_key_id}.xml_phonebook =
+
+{/foreach}
+
+# for T31 only ################
+#Enable or disable the NAT traversal; 0-Disabled (default), 1-STUN;
+sip.nat_stun.enable = {if isset($stun_server)}1{else}0{/if}
+
+{if isset($stun_server)}
+sip.nat_stun.server = {$stun_server}
+{/if}
+
+###############################
diff --git a/resources/templates/provision/yealink/t32g/y000000000032.cfg b/resources/templates/provision/yealink/t32g/y000000000032.cfg
index 383557dd2d..34456fdd54 100644
--- a/resources/templates/provision/yealink/t32g/y000000000032.cfg
+++ b/resources/templates/provision/yealink/t32g/y000000000032.cfg
@@ -719,7 +719,7 @@ local_time.interval =
 local_time.summer_time = {$yealink_summer_time}
 
 #Configure the DST type when the DST feature is enabled; 0-By Date (default), 1-By Week;
-local_time.dst_time_type =
+local_time.dst_time_type = {$yealink_dst_type}
 
 #Configure the start time of DST. The default value is 1/1/0.
 #If the DST type is configured as By Date, the value format is Month/Day/Hour. For example, the value 5/20/10 means the start time is at 10:00 on May 20.
@@ -1104,6 +1104,7 @@ features.redial_tone =
 
 #Enable or disable the phone to save the call history; 0-Disabled, 1-Enabled (default);
 features.save_call_history =
+features.save_init_num_to_history.enable = 0
 
 #Configure the phone to receive the action URI request from the specified IP address(es) or any IP address;
 #Enter multiple IP addresses (separated by comma) or "any"(stands for any IP address);
diff --git a/resources/templates/provision/yealink/t32g/{$mac}.cfg b/resources/templates/provision/yealink/t32g/{$mac}.cfg
index e72c1e6a80..b211adf22c 100644
--- a/resources/templates/provision/yealink/t32g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t32g/{$mac}.cfg
@@ -177,10 +177,10 @@ account.1.register_line =
 account.1.reg_fail_retry_interval =
 
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.1.conf_type =
+account.1.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.1.conf_uri =
+account.1.conf_uri = {if $nway_conference == true}nway{$account.1.auth_id}@{$account.1.server_address}{/if}
 
 #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist".
 account.1.blf.blf_list_uri =
@@ -522,10 +522,10 @@ account.2.register_line =
 account.2.reg_fail_retry_interval =
 
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.2.conf_type =
+account.2.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.2.conf_uri =
+account.2.conf_uri = {if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}
 
 #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist".
 account.2.blf.blf_list_uri =
@@ -839,10 +839,10 @@ account.3.register_line =
 account.3.reg_fail_retry_interval =
 
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.3.conf_type =
+account.3.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.3.conf_uri =
+account.3.conf_uri = {if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}
 
 #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist".
 account.3.blf.blf_list_uri =
@@ -1156,10 +1156,10 @@ account.4.register_line =
 account.4.reg_fail_retry_interval =
 
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.4.conf_type =
+account.4.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.4.conf_uri =
+account.4.conf_uri = {if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}
 
 #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist".
 account.4.blf.blf_list_uri =
@@ -1474,10 +1474,10 @@ account.5.register_line =
 account.5.reg_fail_retry_interval =
 
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.5.conf_type =
+account.5.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.5.conf_uri =
+account.5.conf_uri = {if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}
 
 #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist".
 account.5.blf.blf_list_uri =
@@ -1789,10 +1789,10 @@ account.6.register_line =
 account.6.reg_fail_retry_interval =
 
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.6.conf_type =
+account.6.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.6.conf_uri =
+account.6.conf_uri = {if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}
 
 #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist".
 account.6.blf.blf_list_uri =
diff --git a/resources/templates/provision/yealink/t33g/directory.xml b/resources/templates/provision/yealink/t33g/directory.xml
new file mode 100644
index 0000000000..297b9e4108
--- /dev/null
+++ b/resources/templates/provision/yealink/t33g/directory.xml
@@ -0,0 +1,83 @@
+<YealinkIPPhoneDirectory>
+{foreach $contacts as $row}
+{if $smarty.get.contacts == "users" && $row.category == "users"}
+<DirectoryEntry>
+{if $row.contact_name_given != ""}
+{if $row.contact_organization != ""}
+	<Name>{$row.contact_organization} {$row.contact_name_given} {$row.contact_name_family}</Name>
+{else}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{/if}
+{else}
+<Name>{$row.effective_caller_id_name}</Name>
+{/if}
+{foreach $row.numbers as $number}
+{if $number.phone_number != ""}
+	<Telephone>{$number.phone_number}</Telephone>
+{else}		
+	<Telephone>{$number.phone_extension}</Telephone>
+{/if}
+{/foreach}
+</DirectoryEntry>
+{elseif $smarty.get.contacts == "groups" && $row.category == "groups"}
+<DirectoryEntry>
+{if $row.contact_name_given != ""}
+{if $row.contact_organization != ""}
+	<Name>{$row.contact_organization} {$row.contact_name_given} {$row.contact_name_family}</Name>
+{else}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{/if}
+{else}
+	<Name>{$row.effective_caller_id_name}</Name>
+{/if}
+{foreach $row.numbers as $number}
+{if $number.phone_number != ""}
+	<Telephone>{$number.phone_number}</Telephone>
+{else}		
+	<Telephone>{$number.phone_extension}</Telephone>
+{/if}
+{/foreach}
+</DirectoryEntry>
+{elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
+<DirectoryEntry>
+{if $row.contact_name_given != ""}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{else}
+	<Name>{$row.effective_caller_id_name}</Name>
+{/if}
+{if $row.phone_number != ""}
+	<Telephone>{$row.phone_number}</Telephone>
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
+{/if}
+</DirectoryEntry>
+{elseif $smarty.get.contacts == "all"}
+<DirectoryEntry>
+{if $row.contact_name_given != ""}
+{if $row.contact_organization != ""}
+	<Name>{$row.contact_organization} {$row.contact_name_given} {$row.contact_name_family}</Name>
+{else}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{/if}
+{else}
+	<Name>{$row.effective_caller_id_name}</Name>
+{/if}
+{if $row.category == "extensions"}
+{if $row.phone_number != ""}
+	<Telephone>{$row.phone_number}</Telephone>
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
+{/if}
+{else}
+{foreach $row.numbers as $number}
+{if $number.phone_number != ""}
+	<Telephone>{$number.phone_number}</Telephone>
+{else}		
+	<Telephone>{$number.phone_extension}</Telephone>
+{/if}
+{/foreach}
+{/if}
+</DirectoryEntry>
+{/if}
+{/foreach}
+</YealinkIPPhoneDirectory>
diff --git a/resources/templates/provision/yealink/t33g/favorite_setting.xml b/resources/templates/provision/yealink/t33g/favorite_setting.xml
new file mode 100644
index 0000000000..ba7275358e
--- /dev/null
+++ b/resources/templates/provision/yealink/t33g/favorite_setting.xml
@@ -0,0 +1,8 @@
+<root_favorite_set>
+<item id_name="localdirectory" display_name="Local Directory" priority="2" enable="0" />
+<item id_name="history" display_name="History" priority="3" enable="1" />
+<item id_name="networkcalllog" display_name="Network CallLog" priority="4" enable="0" />
+<item id_name="remotedirectory" display_name="Remote Phone Book" priority="5" enable="1" />
+<item id_name="ldap" display_name="LDAP" priority="1" enable="0" />
+<item id_name="networkdirectory" display_name="Network Directory" priority="6" enable="0" />
+</root_favorite_set>
diff --git a/resources/templates/provision/yealink/t33g/y000000000000.boot b/resources/templates/provision/yealink/t33g/y000000000000.boot
new file mode 100644
index 0000000000..124f68a98f
--- /dev/null
+++ b/resources/templates/provision/yealink/t33g/y000000000000.boot
@@ -0,0 +1,7 @@
+#!version:1.0.0.1
+## The header above must appear as-is in the first line
+
+include:config "y000000000124.cfg"
+include:config "{$mac}.cfg"
+
+overwrite_mode = {$yealink_overwrite_mode}
diff --git a/resources/templates/provision/yealink/t33g/y000000000124.cfg b/resources/templates/provision/yealink/t33g/y000000000124.cfg
new file mode 100644
index 0000000000..c8bc8e1ef9
--- /dev/null
+++ b/resources/templates/provision/yealink/t33g/y000000000124.cfg
@@ -0,0 +1,2004 @@
+#!version:1.0.0.1
+
+##File header "#!version:1.0.0.1" can not be edited or deleted, and must be placed in the first line.##
+
+#######################################################################################
+##                                    Network CDP                                    ##       
+#######################################################################################
+static.network.cdp.enable =
+static.network.cdp.packet_interval =
+
+
+
+#######################################################################################
+##                                    Network IPv6                                   ##       
+#######################################################################################
+static.network.ipv6_static_dns_enable =
+static.network.ipv6_icmp_v6.enable =
+static.network.ipv6_secondary_dns =
+static.network.ipv6_primary_dns =
+static.network.ipv6_internet_port.gateway =
+static.network.ipv6_internet_port.ip =
+static.network.ipv6_internet_port.type =
+static.network.ipv6_prefix =
+
+
+
+#######################################################################################
+##                                    Network WiFi                                   ##       
+#######################################################################################
+
+##static.wifi.X.ssid=
+##static.wifi.X.priority=
+##static.wifi.X.security_mode=
+##static.wifi.X.password=
+##static.wifi.X.eap_type=
+##static.wifi.X.eap_user_name=
+##static.wifi.x.eap_password=
+##(X ranges from 1 to 5)
+##Only T5XW/T54S/T52S/T48G/T48S/T46G/T46S/T42S/T41S/T29G/T27G/T4XU Models support these parameters.
+
+static.wifi.enable =
+static.wifi.1.label =
+static.wifi.1.ssid =
+static.wifi.1.priority =
+static.wifi.1.security_mode =
+static.wifi.1.cipher_type =
+static.wifi.1.password =
+static.wifi.1.eap_type =
+static.wifi.1.eap_user_name =
+static.wifi.1.eap_password =
+static.wifi.show_scan_prompt =
+
+##V83 Add
+static.wifi.function.enable =
+
+
+##V84 SP4 ADD
+static.network.wifi.ip_address_mode=
+static.network.wifi.preference =
+static.network.wifi.internet_port.type =
+static.network.wifi.internet_port.ip=
+static.network.wifi.internet_port.mask=
+static.network.wifi.internet_port.gateway=
+static.network.wifi.static_dns_enable=
+static.network.wifi.primary_dns=
+static.network.wifi.secondary_dns=
+static.network.wifi.ipv6_internet_port.type=
+static.network.wifi.ipv6_internet_port.ip=
+static.network.wifi.ipv6_prefix=
+static.network.wifi.ipv6_internet_port.gateway=
+static.network.wifi.ipv6_static_dns_enable=
+static.network.wifi.ipv6_primary_dns=
+static.network.wifi.ipv6_secondary_dns=
+static.network.wifi.ipv6_icmp_v6.enable=
+
+
+#######################################################################################
+##                                 Network Internet                                  ##       
+#######################################################################################
+static.network.ip_address_mode = {$yealink_ip_address_mode}
+static.network.span_to_pc_port =
+static.network.vlan.pc_port_mode =
+static.network.static_dns_enable =
+static.network.pc_port.enable =
+{if isset($dns_server_primary)}static.network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}static.network.secondary_dns = {$dns_server_secondary}{/if}
+static.network.internet_port.gateway =
+static.network.internet_port.mask =
+static.network.internet_port.ip =
+static.network.internet_port.type =
+
+##V83 Add
+static.network.preference =
+
+
+#######################################################################################
+##                               Network Advanced                                    ##       
+#######################################################################################
+static.network.dhcp_host_name =
+static.network.dhcp.option60type =
+static.network.mtu_value =
+static.network.qos.audiotos =
+static.network.port.min_rtpport =
+static.network.port.max_rtpport =
+static.network.qos.signaltos =
+
+static.wui.http_enable =
+static.wui.https_enable =
+static.network.port.https =
+static.network.port.http =
+
+static.network.pc_port.speed_duplex =
+static.network.internet_port.speed_duplex =
+
+##V83 Add
+static.network.redundancy.mode =
+static.network.redundancy.failback.timeout =
+
+
+
+#######################################################################################
+##                                   Network LLDP                                    ##       
+#######################################################################################
+static.network.lldp.enable = {$yealink_lldp_enable}
+static.network.lldp.packet_interval =
+
+
+
+#######################################################################################
+##                                   Network VLAN                                    ##       
+#######################################################################################
+static.network.vlan.dhcp_enable =
+static.network.vlan.dhcp_option =
+static.network.vlan.vlan_change.enable =
+
+static.network.vlan.pc_port_priority = {$yealink_vlan_pc_cos}
+static.network.vlan.pc_port_vid = {$yealink_vlan_pc_id}
+
+{if isset($yealink_vlan_pc_enable)}static.network.vlan.pc_port_enable = {$yealink_vlan_pc_enable}{else}static.network.vlan.pc_port_enable = 0{/if}
+
+#static.network.vlan.pc_port_enable =
+
+static.network.vlan.internet_port_priority = {$yealink_vlan_cos}
+static.network.vlan.internet_port_vid = {$yealink_vlan_id}
+
+{if isset($yealink_vlan_enable)}static.network.vlan.internet_port_enable = {$yealink_vlan_enable}{else}static.network.vlan.internet_port_enable = 0{/if}
+
+
+#######################################################################################
+##                                    Network VPN                                    ##       
+#######################################################################################
+static.network.vpn_enable = {$yealink_network_vpn_enable}
+static.openvpn.url = {$yealink_openvpn_url}
+
+
+#######################################################################################
+##                                 Network 802.1x                                    ##       
+#######################################################################################
+static.network.802_1x.mode =
+static.network.802_1x.identity =
+static.network.802_1x.md5_password =
+static.network.802_1x.client_cert_url =
+static.network.802_1x.root_cert_url =
+static.network.802_1x.eap_fast_provision_mode =
+static.network.802_1x.anonymous_identity =
+static.network.802_1x.proxy_eap_logoff.enable =
+
+
+static.auto_provision.custom.protect =
+static.auto_provision.custom.sync =
+static.auto_provision.custom.sync.path =
+static.auto_provision.custom.upload_method =
+
+
+
+
+#######################################################################################
+##                                    ZERO Touch                                     ##       
+#######################################################################################
+static.zero_touch.enable =
+static.zero_touch.wait_time =
+static.features.hide_zero_touch_url.enable =
+static.zero_touch.network_fail_delay_times =
+static.zero_touch.network_fail_wait_times =
+
+
+#######################################################################################
+##                                   Autop URL                                       ##       
+#######################################################################################
+static.auto_provision.server.url = {$yealink_provision_url}
+static.auto_provision.server.username = {$http_auth_username}
+static.auto_provision.server.password = {$http_auth_password}
+
+
+#######################################################################################
+##                                   Autop Weekly                                    ##       
+#######################################################################################
+static.auto_provision.weekly.enable =
+static.auto_provision.weekly.dayofweek =
+static.auto_provision.weekly.end_time =
+static.auto_provision.weekly.begin_time =
+static.auto_provision.weekly_upgrade_interval =
+
+#######################################################################################
+##                                   Autop Repeat                                    ##       
+#######################################################################################
+static.auto_provision.repeat.enable =
+static.auto_provision.repeat.minutes =
+
+#######################################################################################
+##                                   Autop DHCP                                      ##       
+#######################################################################################
+static.auto_provision.dhcp_option.list_user_options =
+static.auto_provision.dhcp_option.enable =
+
+##V83 Add
+static.auto_provision.dhcp_option.list_user6_options =
+
+#######################################################################################
+##                                   Autop Mode                                      ##       
+#######################################################################################
+static.auto_provision.power_on =
+
+
+
+#######################################################################################
+##                               Flexible Autop                                      ##       
+#######################################################################################
+static.auto_provision.flexible.end_time =
+static.auto_provision.flexible.begin_time =
+static.auto_provision.flexible.interval =
+static.auto_provision.flexible.enable =
+
+#######################################################################################
+##                                 Autoprovision  Other                              ##       
+#######################################################################################
+static.auto_provision.prompt.enable =
+static.auto_provision.attempt_expired_time =
+static.auto_provision.attempt_before_failed =
+static.network.attempt_expired_time =
+static.auto_provision.update_file_mode =
+static.auto_provision.retry_delay_after_file_transfer_failed=
+static.auto_provision.inactivity_time_expire =
+static.auto_provision.dns_resolv_timeout =
+static.auto_provision.dns_resolv_nretry =
+static.auto_provision.dns_resolv_nosys =
+static.auto_provision.user_agent_mac.enable =
+static.auto_provision.server.type =
+features.action_uri_force_autop =
+static.auto_provision.url_wildcard.pn =
+static.auto_provision.reboot_force.enable =
+static.auto_provision.dhcp_option.option60_value =
+static.custom_mac_cfg.url =
+static.auto_provision.aes_key_in_file =
+features.custom_version_info =
+##V83 Add
+static.auto_provision.authentication.expired_time =
+static.auto_provision.connect.keep_alive =
+
+##V84 Add
+static.auto_provision.config_version.mac=
+static.auto_provision.config_version.com=
+
+
+#######################################################################################
+##                                   Autop PNP                                       ##       
+#######################################################################################
+static.auto_provision.pnp_enable =
+
+
+
+#######################################################################################
+##                                  Autop Code                                       ##       
+#######################################################################################
+##static.autoprovision.X.name
+##static.autoprovision.X.code
+##static.autoprovision.X.url
+##static.autoprovision.X.user
+##static.autoprovision.X.password
+##static.autoprovision.X.com_aes
+##static.autoprovision.X.mac_aes
+##Autop Code(X ranges from 1 to 50)
+
+static.autoprovision.1.name =
+static.autoprovision.1.code =
+static.autoprovision.1.url =
+static.autoprovision.1.user =
+static.autoprovision.1.password =
+static.autoprovision.1.com_aes =
+static.autoprovision.1.mac_aes =
+
+
+
+#######################################################################################
+##                                   TR069                                           ##       
+#######################################################################################
+
+static.managementserver.enable =
+static.managementserver.username =
+static.managementserver.password =
+static.managementserver.url =
+static.managementserver.periodic_inform_enable = 0
+static.managementserver.periodic_inform_interval = 60
+static.managementserver.connection_request_password =
+static.managementserver.connection_request_username =
+
+
+
+#######################################################################################
+##                            Firmware Update                                        ##       
+#######################################################################################
+static.firmware.url = {$yealink_firmware_url}/{$yealink_firmware_t33g}
+
+
+#######################################################################################
+##                            Confguration                                           ##       
+#######################################################################################
+features.reset_by_long_press_enable =
+features.factory_pwd_enable =
+static.configuration.url =
+static.features.custom_factory_config.enable =
+static.custom_factory_configuration.url =
+
+
+#######################################################################################
+##                               SYSLOG                                              ##       
+#######################################################################################
+static.syslog.enable =
+static.syslog.server =
+static.syslog.level =
+static.syslog.server_port =
+static.syslog.transport_type =
+static.syslog.facility =
+static.syslog.prepend_mac_address.enable =
+static.local_log.enable =
+static.local_log.level =
+static.local_log.max_file_size =
+
+
+
+#######################################################################################
+##                               Log Backup                                          ##       
+#######################################################################################
+static.auto_provision.local_log.backup.enable =
+static.auto_provision.local_log.backup.path =
+static.auto_provision.local_log.backup.upload_period =
+static.auto_provision.local_log.backup.append =
+static.auto_provision.local_log.backup.bootlog.upload_wait_time=
+static.auto_provision.local_log.backup.append.max_file_size =
+static.auto_provision.local_log.backup.append.limit_mode=
+
+
+
+#######################################################################################
+##                                   User Mode                                       ##       
+#######################################################################################
+static.security.var_enable = 
+static.web_item_level.url =
+
+
+#######################################################################################
+##                                  Quick Login                                      ##       
+#######################################################################################
+wui.quick_login = 
+
+
+#######################################################################################
+##                               Security                                            ##       
+#######################################################################################
+static.phone_setting.reserve_certs_enable = 
+features.relog_offtime = 
+static.security.default_ssl_method = {$yealink_security_default_ssl_method}
+static.security.cn_validation = 
+static.security.dev_cert = 
+static.security.ca_cert = 
+static.security.trust_certificates = {if $yealink_trust_certificates == "false"}0{elseif $yealink_trust_certificates == "true"}1{/if}
+
+static.security.user_password = {$var_name}:{$var_password}
+static.security.user_password = {$admin_name}:{$admin_password}
+static.security.user_password = {$user_name}:{$user_password}
+static.security.user_name.var = {$var_name}
+static.security.user_name.admin = {$admin_name}
+static.security.user_name.user = {$user_name}
+
+##V83 Add
+static.security.default_access_level =
+phone_setting.reserve_certs_config.enable =
+
+
+#######################################################################################
+##                               Watch Dog                                           ##       
+#######################################################################################
+static.watch_dog.enable =
+
+#######################################################################################
+##                                   Server Certificates                             ##       
+#######################################################################################
+static.server_certificates.url =
+static.server_certificates.delete = 
+
+#######################################################################################
+##                           Trusted Certificates                                    ##       
+#######################################################################################
+static.trusted_certificates.url =
+static.trusted_certificates.delete =
+
+
+
+#######################################################################################
+##                           Secure Domain List                                      ##       
+#######################################################################################
+wui.secure_domain_list = 
+
+
+#######################################################################################
+##                               Encryption                                          ##       
+#######################################################################################
+static.auto_provision.encryption.directory = 
+static.auto_provision.encryption.call_log = 
+static.auto_provision.encryption.config = 
+
+
+
+
+#######################################################################################
+##                                   Trnasfer                                        ##       
+#######################################################################################
+dialplan.transfer.mode = {$yealink_transfer_mode}
+transfer.on_hook_trans_enable = {$yealink_transfer_onhook}
+transfer.tran_others_after_conf_enable = {$yealink_transfer_after_conf}
+transfer.blind_tran_on_hook_enable = {$yealink_transfer_blind_on_hook}
+transfer.semi_attend_tran_enable = {$yealink_transfer_semi_attended}
+phone_setting.call_appearance.transfer_via_new_linekey= {$yealink_transfer_via_new_linekey}
+
+
+#######################################################################################
+##                                   Conference                                      ##       
+#######################################################################################
+features.conference.with_previous_call.enable =
+features.local_conf.combine_with_one_press.enable=
+phone_setting.call_appearance.conference_via_new_linekey=
+
+
+
+#######################################################################################
+##                                   Anonymous                                       ##       
+#######################################################################################
+features.anonymous_response_code=
+
+
+
+#######################################################################################
+##                          Call Configuration                                       ##       
+#######################################################################################
+phone_setting.incoming_call_when_dialing.priority=
+phone_setting.hold_or_swap.mode=
+features.play_held_tone.interval=
+features.play_held_tone.delay=
+features.play_held_tone.enable=
+features.play_hold_tone.interval=
+features.ignore_incoming_call.enable=
+force.voice.ring_vol=
+features.mute.autoanswer_mute.enable=
+features.play_hold_tone.delay =
+phone_setting.end_call_net_disconnect.enable =
+features.custom_auto_answer_tone.enable=
+default_input_method.dialing=
+features.speaker_mode.enable=
+features.headset_mode.enable=
+features.handset_mode.enable=
+features.conference.local.enable =
+features.off_hook_answer.enable=
+features.caller_name_type_on_dialing=
+phone_setting.show_code403=
+phone_setting.ring_for_tranfailed=
+features.password_dial.length=
+features.password_dial.prefix=
+features.password_dial.enable=
+features.group_listen_in_talking_enable=
+phone_setting.call_info_display_method = 0
+phone_setting.called_party_info_display.enable = 1
+features.headset_training=
+features.headset_prior=
+features.dtmf.replace_tran =
+features.dtmf.transfer =
+phone_setting.ringing_timeout=
+phone_setting.ringback_timeout=
+
+features.keep_mute.enable=
+linekey.1.shortlabel=
+features.config_dsskey_length.shorten =
+transfer.dsskey_deal_type = {$yealink_dsskey_transfer_mode}
+features.auto_linekeys.enable=
+phone_setting.call_appearance.calls_per_linekey=
+features.linekey_call_with_default_account=
+##V83 Add
+features.station_name.value =
+features.station_name.scrolling_display =
+voice.headset.autoreset_spk_vol =
+voice.handset.autoreset_spk_vol =
+voice.handfree.autoreset_spk_vol =
+features.headset.ctrl_call.enable = 
+phone_setting.incoming_call.reject.enable =
+
+features.play_mute_tone.enable=
+features.play_mute_tone.interval=
+
+features.call_out_directory_by_off_hook.enable=
+features.congestion_tone.codelist=
+
+
+##V84 Add
+phone_setting.icon.delete=
+phone_setting.icon.url=
+
+##V84 SP4 Add
+voice.handset.tia4965.enable = 
+voice.headset.tia4965.enable = 
+
+#######################################################################################
+##                           Custom Softkey                                          ##       
+#######################################################################################
+phone_setting.custom_softkey_enable=
+custom_softkey_talking.url=
+custom_softkey_ring_back.url=
+custom_softkey_dialing.url=
+custom_softkey_connecting.url=
+custom_softkey_call_in.url=
+custom_softkey_call_failed.url=
+
+##V83 Add
+features.homescreen_softkey.acd.enable =
+features.homescreen_softkey.hoteling.enable =
+phone_setting.custom_softkey.apply_to_states =
+features.custom_softkey_dynamic.enable =
+
+
+#######################################################################################
+##                                   Features Bluetooth                              ##       
+#######################################################################################
+##Only T5XW/T54S/T52S/T48G/T48S/T46G/T46S/T42S/T41S/T29G/T27G/T4XU Models support the parameter.
+features.bluetooth_enable=
+features.bluetooth_adapter_name=
+##V83 Add
+static.bluetooth.function.enable =
+
+##V84 Add
+bluetooth.a2dp_sink=
+bluetooth.connect_confirm.enable=
+
+#######################################################################################
+##                                  Features USB Record                              ##       
+#######################################################################################
+##Only T5XW/T54S/T52S/T48G/T48S/T46G/T46S/T42S/T41S/T29G/T27G/T4XU Models support the parameter.
+features.usb_call_recording.enable = {$yealink_usb_record_enable}
+features.auto_recording.enable =
+
+features.idle_recording.enable=
+
+#######################################################################################
+##                                  Features USB                                     ##       
+#######################################################################################
+##V83 Add
+static.usb.power.enable =
+
+##V84 Add
+static.usbdisk.function.enable=
+
+#######################################################################################
+##                                    Codec                                          ##       
+#######################################################################################
+voice.g726.aal2.enable=
+
+
+#######################################################################################
+##                                   DTMF                                            ##       
+#######################################################################################
+features.dtmf.min_interval=
+features.dtmf.volume=
+features.dtmf.duration =
+
+#######################################################################################
+##                                   Tones                                           ##       
+#######################################################################################
+voice.tone.autoanswer =
+voice.tone.message =
+voice.tone.stutter =
+voice.tone.info =
+voice.tone.dialrecall =
+voice.tone.callwaiting =
+voice.tone.congestion =
+voice.tone.busy =
+voice.tone.ring =
+voice.tone.dial =
+voice.tone.country =
+voice.side_tone =
+features.partition_tone =
+voice.tone.secondary_dial=
+#######################################################################################
+##  Tones V83 stutterdial dnd fwd vm      ##       
+#######################################################################################
+
+voice.tone.stutterdial=
+voice.tone.stutter_dial_tone.apply_to_dnd.enable=
+voice.tone.stutter_dial_tone.apply_to_fwd.enable=
+voice.tone.stutter_dial_tone.apply_to_fwd.enable=
+
+#######################################################################################
+##                                   Jitter Buffer                                   ##       
+#######################################################################################
+voice.jib.normal=
+voice.jib.max =
+voice.jib.min =
+voice.jib.adaptive =
+
+voice.jib.wifi.normal=
+voice.jib.wifi.max=
+voice.jib.wifi.min=
+voice.jib.wifi.adaptive=
+
+#######################################################################################
+##                                   Echo Cancellation                               ##       
+#######################################################################################
+voice.echo_cancellation =
+voice.cng =
+voice.vad =
+
+##V84 Add
+voice.ans_nb.enable=
+voice.tns.enable=
+
+################################################################
+#                        SIP Backup Server                    ##
+################################################################
+static.network.dns.ttl_enable =
+static.network.dns.last_cache_expired.enable=
+static.network.dns.last_cache_expired
+static.network.dns.query_timeout =
+static.network.dns.retry_times =
+sip.dns_transport_type=
+sip.skip_redundant_failover_addr=
+
+
+################################################################
+#                        SIP Basic Config                     ##
+################################################################
+sip.use_out_bound_in_dialog=
+sip.unreg_with_socket_close=
+phone_setting.disable_account_without_username.enable=
+features.auto_answer.first_call_only=
+
+##V84 Add
+phone_setting.call_display_name.mode=
+
+################################################################
+#                        SIP Advanced config                  ##
+################################################################
+sip.request_validation.event=
+sip.sdp_early_answer_or_offer=
+sip.cid_source.preference=
+sip.request_validation.digest.realm=
+sip.request_validation.digest.list=
+sip.request_validation.source.list=
+sip.send_keepalive_by_socket=
+sip.reliable_protocol.timerae.enable=
+sip.requesturi.e164.addglobalprefix=
+sip.trust_ctrl = {$yealink_trust_ctrl}
+sip.mac_in_ua=
+
+sip.timer_t1=
+sip.timer_t2=
+sip.timer_t4=
+
+sip.listen_mode=
+
+{if isset($yealink_sip_listen_port)}sip.listen_port = {$yealink_sip_listen_port}{else}sip.listen_port = 5060{/if}
+
+sip.tls_listen_port=
+sip.tcp_port_random_mode=
+sip.escape_characters.enable=
+sip.notify_reboot_enable=
+sip.send_response_by_request=
+sip.disp_incall_to_info=
+features.call_invite_format=
+phone_setting.early_media.rtp_sniffer.timeout=
+sip.reg_surge_prevention =
+
+################################################################
+#    V84 new add     sip.escape_characters.enable=            ##
+################################################################
+sip.reserve_characters=
+
+
+##V83 Add
+sip.dhcp.option120.mode =
+
+################################################################
+#                        NAT&ICE                              ##
+################################################################
+static.sip.nat_turn.enable=
+static.sip.nat_turn.username=
+static.sip.nat_turn.password=
+static.sip.nat_turn.server=
+static.sip.nat_turn.port=
+
+static.sip.nat_stun.enable={if isset($stun_server)}1{else}0{/if}
+
+static.sip.nat_stun.server= {$stun_server}
+static.sip.nat_stun.port= {if isset($stun_port)}{$stun_port}{else}3478{/if}
+
+
+static.ice.enable=
+
+static.network.static_nat.enable= {if isset($yealink_static_nat)}1{else}0{/if}
+
+static.network.static_nat.addr= {$yealink_static_nat}
+
+#######################################################################################
+##                           DNS                                                     ##       
+#######################################################################################
+dns_cache_a.1.name =
+dns_cache_a.1.ip = 
+dns_cache_a.1.ttl =
+dns_cache_srv.1.name = 
+dns_cache_srv.1.port =
+dns_cache_srv.1.priority =
+dns_cache_srv.1.target =
+dns_cache_srv.1.weight =
+dns_cache_srv.1.ttl =
+dns_cache_naptr.1.name =
+dns_cache_naptr.1.order =
+dns_cache_naptr.1.preference =
+dns_cache_naptr.1.replace =
+dns_cache_naptr.1.service = 
+dns_cache_naptr.1.ttl = 
+
+#######################################################################################
+##                                 RTP                                               ##
+#######################################################################################
+features.rtp_symmetric.enable=
+
+
+#######################################################################################
+##                                 RTCP-XR                                           ##
+#######################################################################################
+voice.rtcp.enable=
+voice.rtcp_cname=
+voice.rtcp_xr.enable=
+phone_setting.vq_rtcpxr_display_symm_oneway_delay.enable=
+phone_setting.vq_rtcpxr_display_round_trip_delay.enable=
+phone_setting.vq_rtcpxr_display_moscq.enable=
+phone_setting.vq_rtcpxr_display_moslq.enable = 
+phone_setting.vq_rtcpxr_display_packets_lost.enable=
+phone_setting.vq_rtcpxr_display_jitter_buffer_max.enable=
+phone_setting.vq_rtcpxr_display_jitter.enable=
+phone_setting.vq_rtcpxr_display_remote_codec.enable=
+phone_setting.vq_rtcpxr_display_local_codec.enable=
+phone_setting.vq_rtcpxr_display_remote_call_id.enable=
+phone_setting.vq_rtcpxr_display_local_call_id.enable=
+phone_setting.vq_rtcpxr_display_stop_time.enable=
+phone_setting.vq_rtcpxr_display_start_time.enable=
+phone_setting.vq_rtcpxr_interval_period=
+phone_setting.vq_rtcpxr_delay_threshold_critical=
+phone_setting.vq_rtcpxr_delay_threshold_warning=
+phone_setting.vq_rtcpxr_moslq_threshold_critical=
+phone_setting.vq_rtcpxr_moslq_threshold_warning=
+phone_setting.vq_rtcpxr.interval_report.enable=
+phone_setting.vq_rtcpxr.states_show_on_gui.enable=
+phone_setting.vq_rtcpxr.states_show_on_web.enable=
+phone_setting.vq_rtcpxr.session_report.enable=
+
+
+#######################################################################################
+##                                   Contact                                         ##       
+#######################################################################################
+static.directory_setting.url=
+super_search.url=
+
+local_contact.data.url=
+local_contact.data.delete=
+
+##Only T5XW/T54S/T52S/T48G/T48S/T46G/T46S/T29G/T46U/T48U/T3XU Models support the parameter
+phone_setting.contact_photo_display.enable=
+
+phone_setting.incoming_call.horizontal_roll_interval=
+
+##Only T5XW/T54S/T52S/T48G/T48S/T46G/T46S/T29G/T5XW Models support the parameter
+local_contact.data_photo_tar.url=
+local_contact.photo.url=
+local_contact.image.url=
+
+##Only T48G/S Models support the parameter
+local_contact.icon_image.url=
+local_contact.icon.url=
+
+search_in_dialing.local_directory.enable =
+search_in_dialing.local_directory.priority =
+
+#######################################################################################
+##                                 Remote Phonebook                                  ##       
+#######################################################################################
+##remote_phonebook.data.X.url
+##remote_phonebook.data.X.name 
+#remote_phonebook.data.X.username=
+#remote_phonebook.data.X.password=
+##(X ranges from 1 to 5)
+
+{if isset($yealink_remote_phonebook_1_name) }
+remote_phonebook.data.1.name = {$yealink_remote_phonebook_1_name}
+{else}
+remote_phonebook.data.1.name = Users
+{/if}
+{if isset($yealink_remote_phonebook_1_url) }
+remote_phonebook.data.1.url =  {$yealink_remote_phonebook_1_url}
+{else}
+remote_phonebook.data.1.url = https://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=users
+{/if}
+
+{if isset($yealink_remote_phonebook_2_name) }
+remote_phonebook.data.2.name = {$yealink_remote_phonebook_2_name}
+{else}
+remote_phonebook.data.2.name = Groups
+{/if}
+{if isset($yealink_remote_phonebook_2_url) }
+remote_phonebook.data.2.url =  {$yealink_remote_phonebook_2_url}
+{else}
+remote_phonebook.data.2.url = https://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=groups
+{/if}
+
+{if isset($yealink_remote_phonebook_3_name) }
+remote_phonebook.data.3.name = {$yealink_remote_phonebook_3_name}
+{else}
+remote_phonebook.data.3.name = Extensions
+{/if}
+{if isset($yealink_remote_phonebook_3_url) }
+remote_phonebook.data.3.url =  {$yealink_remote_phonebook_3_url}
+{else}
+remote_phonebook.data.3.url = https://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
+{/if}
+
+remote_phonebook.data.4.name = {$yealink_remote_phonebook_4_name}
+remote_phonebook.data.4.url =  {$yealink_remote_phonebook_4_url}
+
+remote_phonebook.data.5.name = {$yealink_remote_phonebook_5_name}
+remote_phonebook.data.5.url = {$yealink_remote_phonebook_5_url}
+
+features.remote_phonebook.enable = {$yealink_remote_phonebook_enable}
+
+#######################################################################################
+##                                 LDAP                                              ##       
+#######################################################################################
+ldap.enable = {$ldap_enable}
+ldap.user = {$ldap_user}
+ldap.password = {$ldap_password}
+ldap.base = {$ldap_base}
+ldap.port = {$ldap_port}
+ldap.host = {$ldap_host}
+ldap.customize_label=
+ldap.incoming_call_special_search.enable=
+ldap.tls_mode=
+ldap.search_type=
+ldap.numb_display_mode=
+ldap.ldap_sort = {$ldap_sort}
+ldap.call_in_lookup = {$ldap_call_in_lookup}
+ldap.version = {$ldap_version}
+ldap.display_name = {$ldap_display_name}
+ldap.numb_attr = {$ldap_numb_attr}
+ldap.name_attr = {$ldap_name_attr}
+ldap.max_hits = {$ldap_max_hits}
+ldap.number_filter = {$ldap_number_filter}
+ldap.name_filter = {$ldap_name_filter}
+ldap.call_out_lookup = {$ldap_dial_lookup}
+directory_setting.ldap.enable =
+directory_setting.ldap.priority =
+search_in_dialing.ldap.enable =
+search_in_dialing.ldap.priority =
+
+##V84 SP4 ADD
+ldap.custom_extra_attr_name=
+ldap.display_extra_attr=
+ldap.extra_attr=
+
+
+
+
+#######################################################################################
+##                                 History                                           ##       
+#######################################################################################
+static.auto_provision.local_calllog.write_delay.terminated=
+static.auto_provision.local_calllog.backup.path=
+static.auto_provision.local_calllog.backup.enable=
+super_search.recent_call=
+features.call_out_history_by_off_hook.enable=
+features.save_call_history=
+features.call_log_show_num=
+search_in_dialing.history.enable=
+search_in_dialing.history.priority=
+directory_setting.history.enable=
+directory_setting.history.priority
+features.save_init_num_to_history.enable= 0
+features.redial_via_local_sip_server.enable=
+
+##V83 Add
+features.calllog_detailed_information =
+
+##V84 Add
+features.call_log_merge.enable=
+
+
+#######################################################################################
+##                          Contact Backup                                           ##       
+#######################################################################################
+static.auto_provision.local_contact.backup.path =
+static.auto_provision.local_contact.backup.enable=
+
+
+#######################################################################################
+##                          Contact Other                                            ##       
+#######################################################################################
+directory.search_type=
+directory_setting.local_directory.enable =
+directory_setting.local_directory.priority =
+
+##V83 Add
+phone_setting.search.highlight_keywords.enable =
+
+#######################################################################################
+##                          Favorites                                                ##       
+#######################################################################################
+##V83 Add
+local_contact.favorite.enable =
+phone_setting.favorite_sequence_type =
+
+#######################################################################################  
+##                                  Programablekey                                   ##  
+####################################################################################### 
+#programablekey.X.type
+#programablekey.X.line
+#programablekey.X.value
+#programablekey.X.xml_phonebook
+#programablekey.X.history_type
+#programablekey.X.label(X ranges from 1 to 4)
+#programablekey.X.extension
+##Programablekey X ranges(T48G/T48S/T46G/T46S: X=1-10, 12-14;T42G/T42S/T41P/T41S/T40P/T40G: X=1-10, 13;T29G/T27P/T27G: X=1-14;T23P/T23G/T21(P) E2: 1-10, 14;T19(P) E2: X=1-9, 13, 14;)##
+
+{foreach $keys["programmable"] as $row}
+programablekey.{$row.device_key_id}.type = {$row.device_key_type}
+{if $row.device_key_type == "22" || $row.device_key_type == "47"}
+programablekey.{$row.device_key_id}.xml_phonebook = {$row.device_key_line}
+{else}
+programablekey.{$row.device_key_id}.line = {$row.device_key_line}
+programablekey.{$row.device_key_id}.value = {$row.device_key_value}
+{/if}
+programablekey.{$row.device_key_id}.extension = {$row.device_key_extension}
+programablekey.{$row.device_key_id}.label = {$row.device_key_label}
+programablekey.1.pickup_value ={$row.device_key_extension}
+programablekey.1.history_type =
+{/foreach}
+
+##V83 Add
+programablekey.type_range.custom =
+
+#######################################################################################  
+##                                  Linekey                                          ##  
+####################################################################################### 
+##linekey.X.line
+##linekey.X.value
+##linekey.X.extension
+##linekey.X.type
+##linekey.X.xml_phonebook
+##linekey.X.shortlabel
+##linekey.X.label
+##LineKeyX ranges(T48U/T57W/T48G/S: X ranges from 1 to 29. T53W/T54W/T54S/T46G/T46S/T29G/T46U: X ranges from 1 to 27. T42G/T42S/T41P/T41S/T41U/T42U: X ranges from 1 to 15. T40P/T40G/T23P/T23G: X ranges from 1 to 3. T52S/T27P/T27G/T43U: X ranges from 1 to 21. T21(P) E2/T31/T31P/T31G: X ranges from 1 to 2.)##
+##T33P/T33G: X ranges from 1 to 12
+## Not support T19P_E2,T30,T30P
+
+{foreach $keys['line'] as $row}
+#Configure Line Key {$row.device_key_id}
+linekey.{$row.device_key_id}.line = {$row.device_key_line}
+linekey.{$row.device_key_id}.value = {$row.device_key_value}
+{if $row.device_key_type == "1" || $row.device_key_type == "16"}
+linekey.{$row.device_key_id}.pickup_value = {$row.device_key_extension}
+{else}
+linekey.{$row.device_key_id}.extension = {$row.device_key_extension}
+{/if}
+linekey.{$row.device_key_id}.type = {$row.device_key_type}
+linekey.{$row.device_key_id}.xml_phonebook =
+linekey.{$row.device_key_id}.label = {$row.device_key_label}
+
+{/foreach}
+
+linekey.type_range.custom =
+
+
+#######################################################################################  
+##                                  Dsskey                                           ##  
+####################################################################################### 
+features.block_linekey_in_menu.enable =
+features.shorten_linekey_label.enable =
+features.flash_url_dsskey_led.enable =
+features.config_dsskey_length = {$yealink_dsskey_length}
+phone_setting.page_tip =
+features.keep_switch_page_key.enable=
+
+##phone_setting.idle_dsskey_and_title.transparency(Only support T5XW/T54S/T52S/T48G/T48S/T48U/T33G/T33P)
+phone_setting.idle_dsskey_and_title.transparency=
+
+##V83 Add
+phone_setting.keytype_sequence =
+phone_setting.dsskey_label.display_method =
+local.dsskey_type_config.mode =
+
+
+#######################################################################################  
+##                                Expansion Key                                      ##  
+####################################################################################### 
+##expansion_module.X.key.Y.type
+##expansion_module.X.key.Y.line
+##expansion_module.X.key.Y.value
+##expansion_module.X.key.Y.extension
+##expansion_module.X.key.Y.label
+##expansion_module.X.key.Y.xml_phonebook
+## Expansion Key X ranges(SIP-T5XW/T54S/T52S/T43U/T46U/T48U: X ranges from 1 to 3, Y ranges from 1 to 60; SIP-T48G/T48S/T46G/T46S:X ranges from 1 to 6, Y ranges from 1 to 40; SIP-T29G/T27P/T27G:X ranges from 1 to 6, Y ranges from 1 to 20, 22 to 40 (Ext key 21 cannot be configured).)##
+## Only SIP-T5XW/T54S/T52S/T48G/T48S/T46G/T46S/T29G/T27P/T27G/T43U/T46U/T48U Models support the parameter.
+
+#expansion_module.1.key.1.type =
+#expansion_module.1.key.1.label =
+#expansion_module.1.key.1.value =
+#expansion_module.1.key.1.line =
+#expansion_module.1.key.1.pickup_value =
+#expansion_module.1.key.1.extension =
+#expansion_module.1.key.1.xml_phonebook =
+#expansion_module.page_tip.blf_call_in.led =
+#expansion_module.page_tip.blf_call_in.enable =
+
+{foreach $keys["expansion"] as $row}
+expansion_module.1.key.{$row.device_key_id}.type = {$row.device_key_type}
+expansion_module.1.key.{$row.device_key_id}.line = {$row.device_key_line}
+expansion_module.1.key.{$row.device_key_id}.value = {$row.device_key_value}
+expansion_module.1.key.{$row.device_key_id}.extension = {$row.device_key_extension}
+expansion_module.1.key.{$row.device_key_id}.label = {$row.device_key_label}
+expansion_module.1.key.{$row.device_key_id}.xml_phonebook =
+{/foreach}
+{foreach $keys["expansion-1"] as $row}
+expansion_module.1.key.{$row.device_key_id}.type = {$row.device_key_type}
+expansion_module.1.key.{$row.device_key_id}.line = {$row.device_key_line}
+expansion_module.1.key.{$row.device_key_id}.value = {$row.device_key_value}
+expansion_module.1.key.{$row.device_key_id}.extension = {$row.device_key_extension}
+expansion_module.1.key.{$row.device_key_id}.label = {$row.device_key_label}
+expansion_module.1.key.{$row.device_key_id}.xml_phonebook =
+{/foreach}
+{foreach $keys["expansion-2"] as $row}
+expansion_module.2.key.{$row.device_key_id}.type = {$row.device_key_type}
+expansion_module.2.key.{$row.device_key_id}.line = {$row.device_key_line}
+expansion_module.2.key.{$row.device_key_id}.value = {$row.device_key_value}
+expansion_module.2.key.{$row.device_key_id}.extension = {$row.device_key_extension}
+expansion_module.2.key.{$row.device_key_id}.label = {$row.device_key_label}
+expansion_module.2.key.{$row.device_key_id}.xml_phonebook =
+{/foreach}
+
+expkey.type_range.custom =
+
+#######################################################################################  
+##                                EDK                                                ##  
+####################################################################################### 
+##EDK Soft Keys(X ranges from 1 to 10)
+
+features.enhanced_dss_keys.enable=
+edk.id_mode.enable=
+softkey.1.position=
+softkey.1.use.dialing=
+softkey.1.softkey_id=
+softkey.1.use.dialtone=
+softkey.1.use.conferenced=
+softkey.1.use.held=
+softkey.1.use.hold=
+softkey.1.use.transfer_ring_back=
+softkey.1.use.ring_back=
+softkey.1.use.call_failed=
+softkey.1.use.on_talk=
+softkey.1.use.transfer_connecting=
+softkey.1.use.connecting=
+softkey.1.use.incoming_call=
+softkey.1.use.idle=
+softkey.1.action=
+softkey.1.label=
+softkey.1.enable=
+edk.edklist.1.action=
+edk.edklist.1.mname=
+edk.edklist.1.enable=
+edk.edkprompt.1.enable=
+edk.edkprompt.1.label=
+edk.edkprompt.1.type=
+edk.edkprompt.1.userfeedback=
+
+##V84 Add
+##edk.edkprompt.X.title=
+(X ranges from 1 to 9)
+edk.edkprompt.1.title=
+
+
+#######################################################################################  
+##                                XML                                                ##  
+####################################################################################### 
+push_xml.server=
+push_xml.sip_notify=
+push_xml.block_in_calling=
+default_input_method.xml_browser_input_screen=
+
+##V83 Add
+hoteling.authentication_mode =
+push_xml.phonebook.search.delay =
+features.xml_browser.loading_tip.delay =
+features.xml_browser.pwd =
+features.xml_browser.user_name =
+push_xml.password =
+push_xml.username =
+
+
+#######################################################################################  
+##                                  Forward                                          ##  
+#######################################################################################  
+features.fwd.allow=
+features.fwd_mode=
+forward.no_answer.enable=
+forward.busy.enable=
+forward.always.enable=
+forward.no_answer.timeout=
+forward.no_answer.on_code=
+forward.no_answer.off_code=
+forward.busy.off_code=
+forward.busy.on_code=
+forward.always.off_code=
+forward.always.on_code=
+forward.no_answer.target=
+forward.busy.target=
+forward.always.target=
+
+features.forward.emergency.authorized_number=
+features.forward.emergency.enable=
+forward.idle_access_always_fwd.enable=
+features.forward_call_popup.enable=
+
+##V83 Add
+features.forward.no_answer.show_ring_times =
+
+##V84 Add
+features.no_answer_code=
+
+
+#######################################################################################  
+##                                  DND                                              ##  
+#######################################################################################
+features.dnd.allow=
+features.dnd_mode=
+features.dnd.enable=
+
+features.dnd.off_code = *79
+features.dnd.on_code = *78
+
+features.dnd.emergency_authorized_number=
+features.dnd.emergency_enable = 1
+features.dnd.large_icon.enable=
+
+##V83 Add
+features.keep_dnd.enable =
+
+#######################################################################################  
+##                               Phone Lock                                          ##  
+#######################################################################################
+phone_setting.phone_lock.enable = {$yealink_lock_enable}
+phone_setting.phone_lock.lock_key_type = {$yealink_lock_key_type}
+phone_setting.phone_lock.unlock_pin = {$yealink_lock_pin}
+phone_setting.emergency.number = {$yealink_emergency_number}
+phone_setting.phone_lock.lock_time_out = {$yealink_lock_timeout}
+
+
+#######################################################################################  
+##                               Hotdesking                                          ##  
+#######################################################################################
+phone_setting.logon_wizard=
+phone_setting.logon_wizard_forever_wait=
+
+hotdesking.startup_register_name_enable=
+hotdesking.startup_username_enable=
+hotdesking.startup_password_enable=
+hotdesking.startup_sip_server_enable=
+hotdesking.startup_outbound_enable=
+
+hotdesking.dsskey_register_name_enable=
+hotdesking.dsskey_username_enable=
+hotdesking.dsskey_password_enable=
+hotdesking.dsskey_sip_server_enable=
+hotdesking.dsskey_outbound_enable=
+
+
+#######################################################################################  
+##                               Voice Mail                                          ##  
+#######################################################################################
+features.voice_mail_alert.enable=
+features.voice_mail_popup.enable = {$yealink_voice_mail_popup_enable}
+features.voice_mail_tone_enable=
+features.hide_feature_access_codes.enable = {$yealink_hide_feature_access_codes_enable}
+
+
+
+#######################################################################################  
+##                               Text Message                                        ##  
+#######################################################################################
+features.text_message.enable=
+features.text_message_popup.enable=
+
+
+
+
+
+#######################################################################################  
+##                               Audio Intercom                                      ##  
+#######################################################################################
+features.intercom.mode=
+features.intercom.subscribe.enable=
+features.intercom.led.enable=
+features.intercom.feature_access_code=
+features.blf.intercom_mode.enable=
+features.intercom.ptt_mode.enable=
+
+features.redial_tone=
+features.key_tone=
+features.send_key_tone=
+
+features.intercom.allow=
+features.intercom.barge=
+features.intercom.tone=
+features.intercom.mute=
+
+
+voice.handset_send=
+voice.handfree_send =
+voice.headset_send =
+features.intercom.headset_prior.enable=
+features.ringer_device.is_use_headset=
+features.intercom.barge_in_dialing.enable=
+
+
+
+#######################################################################################  
+##                               Feature General                                     ##  
+#######################################################################################
+features.ip_call.auto_answer.enable=
+features.show_default_account=
+features.call.dialtone_time_out=
+features.missed_call_popup.enable = {$yealink_missed_call_popup_enable}
+features.auto_answer_tone.enable=
+features.play_hold_tone.enable=
+features.key_as_send=
+features.send_pound_key=
+features.busy_tone_delay=
+features.hotline_delay=
+features.hotline_number=
+features.direct_ip_call_enable = {$yealink_direct_ip_call_enable}
+features.call_num_filter=
+features.call_completion_enable=
+features.allow_mute=
+features.auto_answer_delay=
+features.normal_refuse_code=
+features.dnd_refuse_code=
+features.upload_server=
+features.dtmf.repetition=
+features.dtmf.hide_delay=
+features.dtmf.hide = {$yealink_dtmf_hide}
+features.play_local_dtmf_tone_enable =
+features.reboot_in_talk_enable =
+features.fwd_diversion_enable=
+
+call_waiting.enable = {$yealink_call_waiting}
+call_waiting.tone = {$yealink_call_waiting_tone}
+call_waiting.off_code=
+call_waiting.on_code=
+
+auto_redial.times=
+auto_redial.interval=
+auto_redial.enable=
+
+sip.rfc2543_hold = {$yealink_rfc2543_hold}
+sip.use_23_as_pound=
+forward.international.enable=
+phone_setting.headsetkey_mode=
+phone_setting.is_deal180=
+phone_setting.change_183_to_180=
+
+##V84 Add
+features.touch_tone=
+
+#######################################################################################  
+##                               Action URL&URI                                      ##  
+#######################################################################################
+features.csta_control.enable=
+features.action_uri.enable=
+features.action_uri_limit_ip=
+features.show_action_uri_option=
+action_url.call_remote_canceled=
+action_url.remote_busy=
+action_url.cancel_callout=
+action_url.handfree=
+action_url.headset=
+action_url.unheld=
+action_url.held=
+action_url.transfer_failed=
+action_url.transfer_finished=
+action_url.answer_new_incoming_call=
+action_url.reject_incoming_call=
+action_url.forward_incoming_call=
+action_url.ip_change=
+action_url.idle_to_busy=
+action_url.busy_to_idle=
+action_url.call_terminated=
+action_url.missed_call=
+action_url.unmute=
+action_url.mute=
+action_url.unhold=
+action_url.hold=
+action_url.always_fwd_off =
+action_url.always_fwd_on =
+action_url.attended_transfer_call =
+action_url.blind_transfer_call =
+action_url.busy_fwd_off =
+action_url.busy_fwd_on =
+action_url.call_established =
+action_url.call_waiting_off =
+action_url.call_waiting_on =
+action_url.dnd_off =
+action_url.dnd_on =
+action_url.incoming_call =
+action_url.no_answer_fwd_off =
+action_url.no_answer_fwd_on =
+action_url.off_hook =
+action_url.on_hook =
+action_url.outgoing_call =
+action_url.register_failed =
+action_url.registered =
+action_url.setup_autop_finish =
+action_url.setup_completed =
+action_url.transfer_call =
+action_url.unregistered =
+
+##V84 Add
+action_url.peripheral_information=
+
+
+
+#######################################################################################  
+##                               Power LED                                           ##  
+#######################################################################################
+phone_setting.hold_and_held_power_led_flash_enable=
+phone_setting.mute_power_led_flash_enable=
+phone_setting.talk_and_dial_power_led_enable=
+phone_setting.mail_power_led_flash_enable = 1
+phone_setting.ring_power_led_flash_enable=
+phone_setting.common_power_led_enable=
+phone_setting.missed_call_power_led_flash.enable = {$yealink_missed_call_power_led_flash_enable}
+
+
+#######################################################################################
+##                                  Time&Date                                        ##       
+#######################################################################################
+lcl.datetime.date.format =
+auto_dst.url = {$yealink_auto_dst_url}
+local_time.manual_time_enable =
+local_time.manual_ntp_srv_prior =
+local_time.time_format = {$yealink_time_format}
+local_time.date_format = {$yealink_date_format}
+local_time.dhcp_time = {$yealink_dhcp_time}
+
+local_time.summer_time = {$yealink_summer_time}
+local_time.dst_time_type = {$yealink_dst_type}
+local_time.start_time = {$yealink_time_zone_start_time}
+local_time.end_time = {$yealink_time_zone_end_time}
+local_time.offset_time = {$yealink_offset_time}
+local_time.interval = {$yealink_time_update}
+
+local_time.ntp_server1 = {$ntp_server_primary}
+local_time.ntp_server2 = {$ntp_server_secondary}
+local_time.time_zone = {$yealink_time_zone}
+local_time.time_zone_name = {$yealink_time_zone_name}
+
+
+#######################################################################################
+##                           Multicast Paging                                        ##       
+#######################################################################################
+##multicast.listen_address.X.label 
+##multicast.paging_address.X.channel
+##multicast.listen_address.X.ip_address 
+##multicast.paging_address.X.ip_address
+##multicast.paging_address.X.label
+##multicast.listen_address.X.channel
+##multicast.listen_address.X.volume
+##Multicast(X ranges from 1 to 31.)
+
+multicast.codec=
+
+multicast.paging_address.1.channel=
+multicast.paging_address.1.label=
+multicast.paging_address.1.ip_address=
+multicast.receive_priority.enable=
+multicast.receive_priority.priority=
+
+multicast.receive.use_speaker=
+multicast.receive.enhance_volume=
+multicast.receive.ignore_dnd.priority=
+
+multicast.listen_address.1.channel=
+multicast.listen_address.1.label=
+multicast.listen_address.1.ip_address=
+multicast.listen_address.1.volume=
+
+
+#######################################################################################
+##                           Preference&Status                                       ##       
+#######################################################################################
+##Not support T19P_E2/T30/T30P
+static.features.default_account=
+
+##Logo File Format: .dob
+##Resolution: SIP-T42G/T42S/T41P/T41S/T41U/T42U: <=192*64  2 gray scale;SIP-T43U/SIP-T27P/G: <=240*120  2 gray scale;SIP-T40P/T40G/T23P/T23G/T21(P)/T31P/T31/T31G  E2/T19(P) E2/T30/T30P: <=132*64  2 gray scale##
+phone_setting.lcd_logo.mode=
+lcd_logo.delete=
+lcd_logo.url=
+
+phone_setting.contrast=
+phone_setting.backlight_time = {$yealink_backlight_time}
+phone_setting.inactive_backlight_level = 1
+phone_setting.active_backlight_level=
+phone_setting.predial_autodial = 1
+
+ringtone.url= {$yealink_ringtone_url}
+ringtone.delete= {$yealink_ringtone_delete}
+phone_setting.ring_type= {$yealink_ring_type}
+phone_setting.inter_digit_time= {$yealink_inter_digit_time}
+
+##Only T54S Model supports the parameter
+phone_setting.idle_clock_display.enable =
+
+#######################################################################################
+##                           Digitmap                                                ##       
+#######################################################################################
+dialplan.digitmap.enable=
+dialplan.digitmap.string=
+dialplan.digitmap.no_match_action=
+dialplan.digitmap.interdigit_short_timer=
+dialplan.digitmap.interdigit_long_timer=
+dialplan.digitmap.apply_to.press_send=
+dialplan.digitmap.apply_to.forward=
+dialplan.digitmap.apply_to.history_dial=
+dialplan.digitmap.apply_to.directory_dial=
+dialplan.digitmap.apply_to.on_hook_dial=
+dialplan.digitmap.active.on_hook_dialing=
+
+##V83 Add
+dialplan.digitmap.apply_to.prefix_key =
+
+##V84 ADD
+features.local_calllog.received.replace_rule=
+
+
+
+
+#######################################################################################
+##                           Emergency Dialplan                                      ##       
+#######################################################################################
+dialplan.emergency.enable=
+dialplan.emergency.1.value=
+dialplan.emergency.server.1.address=
+dialplan.emergency.server.1.transport_type=
+dialplan.emergency.server.1.port=
+dialplan.emergency.1.server_priority=
+dialplan.emergency.custom_asserted_id=
+dialplan.emergency.asserted_id_source=
+dialplan.emergency.asserted_id.sip_account= 
+dialplan.emergency.held.request_element.1.name=
+dialplan.emergency.held.request_element.1.value= 
+dialplan.emergency.held.request_type=
+dialplan.emergency.held.server_url=
+
+
+
+#######################################################################################
+##                               Dialplan                                            ##       
+#######################################################################################
+dialplan_replace_rule.url=
+dialplan.replace.line_id.1=
+dialplan.replace.replace.1=
+dialplan.replace.prefix.1=
+phone_setting.dialnow_delay=
+dialplan_dialnow.url=
+dialplan.dialnow.line_id.1=
+dialplan.dialnow.rule.1 = {$yealink_dialplan_dialnow_rule_1}
+dialplan.block_out.line_id.1=
+dialplan.block_out.number.1=
+dialplan.area_code.line_id =
+dialplan.area_code.max_len = 15
+dialplan.area_code.min_len = 1
+dialplan.area_code.code=
+
+#######################################################################################
+##                                 Rings Settings                                    ##
+#######################################################################################
+distinctive_ring_tones.alert_info.1.ringer= {$yealink_ring_file_1}
+distinctive_ring_tones.alert_info.1.text= {$yealink_ring_text_1}
+
+#######################################################################################
+##                                   IME Settings                                    ##
+#######################################################################################
+directory.search_default_input_method=
+directory.edit_default_input_method=
+gui_input_method.url=
+
+##V83 Add
+##Only T48G/T48S Models support the parameter
+phone_setting.virtual_keyboard.enable =
+
+#######################################################################################
+##                                   Language Settings                               ##
+#######################################################################################
+wui_lang.url=
+wui_lang_note.url=
+wui_lang.delete=
+gui_input_method.delete=
+gui_lang.url=
+gui_lang.delete=
+lang.gui= {$yealink_language_gui}
+lang.wui=
+
+
+#######################################################################################
+##                                   Screensaver                                     ##
+#######################################################################################
+screensaver.type=
+screensaver.delete=
+screensaver.upload_url=
+features.blf_active_backlight.enable=
+screensaver.display_clock.enable=
+screensaver.clock_move_interval=
+screensaver.picture_change_interval=
+screensaver.wait_time=
+screensaver.xml_browser.url=
+
+
+
+#######################################################################################
+##                                  Power Saving                                     ##
+#######################################################################################
+features.power_saving.enable=
+features.power_saving.power_led_flash.on_time=
+features.power_saving.power_led_flash.off_time=
+features.power_saving.office_hour.monday=
+features.power_saving.office_hour.tuesday=
+features.power_saving.office_hour.wednesday=
+features.power_saving.office_hour.thursday=
+features.power_saving.office_hour.friday=
+features.power_saving.office_hour.saturday=
+features.power_saving.office_hour.sunday =
+features.power_saving.user_input_ext.idle_timeout=
+features.power_saving.off_hour.idle_timeout=
+features.power_saving.office_hour.idle_timeout=
+features.power_saving.intelligent_mode=
+
+
+#######################################################################################
+##                           Backgrounds  Settings                                   ##
+#######################################################################################
+##File Formate:
+##SIP-T57W/T54W/T54S/T52S/T48S/T48G/T46G/T46S/T29G/T46U/T48U/T33P/T33G: .jpg/.png/.bmp/.jpeg;
+##Resolution:
+##SIP-T57W/T48S/T48G/T48U/T46U:<=2.0 megapixels;
+##for SIP-T54W/T46G/T46S/T29G: <=1.8 megapixels;SIP-T54S/T52S/T33P/T33G:<=4.2 megapixels;
+##Single File Size: <=5MB 
+##2MB of space should bereserved for the phone
+
+wallpaper_upload.url = {$yealink_t33g_wallpaper}
+{if isset($yealink_t33g_wallpaper_filename)}
+phone_setting.backgrounds =  Config:{$yealink_t33g_wallpaper_filename}
+{else}
+phone_setting.backgrounds =  Config:yealink_t33g_wallpaper.png
+{/if}
+
+## phone_setting.backgrounds_with_dsskey_unfold(Only support T48U/T48G/S)
+phone_setting.backgrounds_with_dsskey_unfold=
+
+##expansion_module.backgrounds(Only support T5XW/T54S/T52S/T43U/T46U/T48U)
+expansion_module.backgrounds=
+
+
+#######################################################################################
+##                               BSFT Setting                                        ##       
+#######################################################################################
+bw.enable =
+
+
+#######################################################################################
+##                                  BLF/BLF List                                     ##       
+#######################################################################################
+phone_setting.auto_blf_list_enable = 1
+phone_setting.blf_list_sequence_type = 1
+
+blf.enhanced.parked.enable=
+blf.enhanced.parked.led =
+blf.enhanced.parked.talking.action =
+blf.enhanced.parked.callin.action =
+blf.enhanced.parked.idle.action =
+
+blf.enhanced.talking.enable=
+blf.enhanced.talking.led=
+blf.enhanced.talking.talking.action =
+blf.enhanced.talking.callin.action =
+blf.enhanced.talking.idle.action =
+
+blf.enhanced.callout.enable =
+blf.enhanced.callout.led=
+blf.enhanced.callout.talking.action =
+blf.enhanced.callout.callin.action =
+blf.enhanced.callout.idle.action =
+
+blf.enhanced.callin.enable =
+blf.enhanced.callin.led=
+blf.enhanced.callin.talking.action =
+blf.enhanced.callin.callin.action=
+blf.enhanced.callin.idle.action=
+
+blf.enhanced.idle.enable = 0
+blf.enhanced.idle.led=
+blf.enhanced.idle.talking.action=
+blf.enhanced.idle.callin.action=
+blf.enhanced.idle.idle.action=
+
+features.blf_list_version = 0
+sip.sub_refresh_random=
+sip.terminate_notify_sub_delay_time=
+
+features.blf_led_mode = {$yealink_blf_led_mode}
+features.blf_pickup_only_send_code=
+
+##V84 Add
+blf.enhanced.dnd.enable=
+blf.enhanced.dnd.led=
+blf.enhanced.hold.enable=
+blf.enhanced.hold.led=
+
+features.blf.show_callinfo.enable=
+
+##V84 SP4 ADD
+blf.normal_barge_in_code=
+blf.whisper_barge_in_code=
+blf.listen_barge_in_code=
+
+
+#######################################################################################
+##                                   SCA                                             ##       
+#######################################################################################
+features.auto_release_bla_line=
+features.barge_in_via_username.enable=
+
+
+
+#######################################################################################
+##                                   Call Park                                       ##       
+#######################################################################################
+features.call_park.enable=
+features.call_park.park_mode=
+features.call_park.park_code=
+features.call_park.park_retrieve_code=
+features.call_park.direct_send.enable=
+features.call_park.park_visual_notify_enable=
+features.call_park.park_ring=
+features.call_park.group_enable=
+features.call_park.group_park_code=
+sip.call_park_without_blf=
+features.call_park.line_restriction.enable=
+
+
+#######################################################################################
+##                                    Broadsoft ACD                                  ##       
+#######################################################################################
+acd.enable=
+acd.auto_available_timer=
+
+
+
+
+#######################################################################################
+##                              Broadsoft XSI                                        ##       
+#######################################################################################
+bw.xsi.enable=
+sip.authentication_for_xsi =
+default_input_method.xsi_password=
+
+
+#######################################################################################
+##                             Broadsoft Network Directory                           ##       
+#######################################################################################
+bw.xsi.directory.enable=
+bw.calllog_and_dir =
+bw.xsi.call_log.enable=
+bw_phonebook.custom=
+bw_phonebook.enterprise_common_enable=
+bw_phonebook.enterprise_common_displayname=
+bw_phonebook.enterprise_enable=
+bw_phonebook.enterprise_displayname=
+bw_phonebook.group_common_enable=
+bw_phonebook.group_common_displayname=
+bw_phonebook.personal_enable=
+bw_phonebook.personal_displayname=
+bw_phonebook.group_enable=
+bw_phonebook.group_displayname =
+directory.update_time_interval=
+bw.xsi.directory.alphabetized_by_lastname.enable=
+directory_setting.bw_directory.enable =
+directory_setting.bw_directory.priority =
+search_in_dialing.bw_directory.enable =
+search_in_dialing.bw_directory.priority =
+##V83 Add
+bw.xsi.directory.update.enable =
+
+#######################################################################################
+##                             Broadsoft Network Calllog                             ##       
+#######################################################################################
+##V83 Add
+bw.xsi.call_log.delete.enable =
+bw.xsi.call_log.multiple_accounts.enable =
+phone_setting.ring_duration =
+
+
+#######################################################################################
+##                                Call Pickup                                        ##       
+#######################################################################################
+features.pickup.direct_pickup_enable = {$yealink_direct_pickup_enable}
+features.pickup.group_pickup_enable =
+features.pickup.direct_pickup_code = **
+features.pickup.group_pickup_code =
+features.pickup.blf_audio_enable =
+features.pickup.blf_visual_enable =
+features.pickup_display.method =
+
+##V84 Add
+features.pickup.blf_audio.list=
+features.pickup.blf_visual.list=
+
+
+#######################################################################################
+##                                Alert Info                                         ##       
+#######################################################################################
+features.alert_info_tone =
+
+
+#######################################################################################
+##                       Broadsoft Visual Voice Mail                                 ##       
+#######################################################################################
+bw.voice_mail.visual.enable=
+voice_mail.message_key.mode=
+bw.voice_mail.visual.display_videomail.enable=
+
+
+
+#######################################################################################
+##                              Broadsoft Call Recording                             ##       
+#######################################################################################
+bw.call_recording.mode =
+
+
+#######################################################################################
+##                              Broadsoft Call Decline                               ##       
+#######################################################################################
+features.call_decline.enable =
+
+
+#######################################################################################
+##                         BLF Ring Type                                             ##       
+#######################################################################################
+features.blf.ring_type =
+
+
+
+#######################################################################################
+##                         Features Sync                                             ##       
+#######################################################################################
+features.feature_key_sync.enable = {$yealink_feature_key_sync}
+features.forward.feature_key_sync.local_processing.enable =
+features.forward.feature_key_sync.enable =
+features.dnd.feature_key_sync.local_processing.enable =
+features.dnd.feature_key_sync.enable =
+call_waiting.mode =
+
+
+#######################################################################################
+##                           Broadsoft  UC                                           ##       
+#######################################################################################
+##Only T5XW/T54S/T52S/T48G/T48S/T46G/T46S/T29G/T46U/T48U/T3XU Models support the parameter
+bw.xmpp.enable =
+features.uc_password =
+features.uc_username =
+bw.xmpp.presence_icon.mode =
+bw.xmpp.change_presence.force_manual.enable =
+bw.xmpp.change_presence.enable =
+phone_setting.dsskey_directory_auto.enable =
+features.uc_dir.match_tail_number=
+directory_setting.bw_uc_buddies.enable =
+directory_setting.bw_uc_buddies.priority =
+search_in_dialing.bw_uc_buddies.enable =
+search_in_dialing.bw_uc_buddies.priority =
+
+##V83 Add
+phone_setting.uc_favorite_sequence_type =
+
+#######################################################################################
+##                      Broadsoft  Emergency Call                                    ##       
+#######################################################################################
+##V83 Add
+bw.emergency_calling.enable  =
+
+
+
+#######################################################################################
+##                         Metaswitch Setting                                        ##       
+#######################################################################################
+meta.enable =
+meta.login_mode =
+meta.comm_portal.server.username =
+meta.comm_portal.server.password =
+meta.comm_portal.server.url =
+meta.comm_portal.enable =
+meta.comm_portal.contacts.update_interval =
+meta.comm_portal.acd.enable=
+meta.comm_portal.replace_local_call_list.enable=
+meta.comm_portal.contacts.group.mlhgs.label=
+meta.comm_portal.contacts.group.extensions.label=
+meta.comm_portal.contacts.group.contacts.label=
+meta.comm_portal.contacts.group.mlhgs.enable=
+meta.comm_portal.contacts.group.extensions.enable=
+meta.comm_portal.contacts.group.contacts.enable=
+meta.comm_portal.call_list.enable=
+meta.comm_portal.contacts.enable=
+meta.comm_portal.message.enable=
+meta.comm_portal.logout.enable =
+meta.comm_portal.keep_alive_interval_time =
+
+##V83 Add
+directory_setting.meta_directory.enable=
+directory_setting.meta_directory.priority=
+directory_setting.meta_call_log.enable=
+directory_setting.meta_call_log.priority=
+search_in_dialing.meta_call_log.priority =
+search_in_dialing.meta_call_log.enable =
+search_in_dialing.meta_directory.priority =
+search_in_dialing.meta_directory.enable =
+
+
+
+#######################################################################################
+##                                   Genbend Setting                                 ##       
+#######################################################################################
+gb.sopi.enable=
+gb.sopi.gab.enable=
+gb.sopi.pab.enable=
+features.pab.soupuser=
+features.pab.enable=
+gb.sopi.pab.match_in_calling.enable=
+gb.sopi.gab.retain_search_filter=
+gb.sopi.service_url=
+gb.sopi.password=
+gb.sopi.username=
+directory_setting.gb_gab_directory.priority =
+directory_setting.gb_gab_directory.enable =
+directory_setting.gb_pab_directory.enable =
+directory_setting.gb_pab_directory.priority =
+search_in_dialing.gb_pab_directory.priority =
+search_in_dialing.gb_pab_directory.enable =
+
+
+#######################################################################################
+##                                   Loopback Call                                   ##       
+#######################################################################################
+##V83 Add
+sip.loopback.enable =
+sip.loopback_type =
+sip.pkt_loopback_mode
+sip.loopback.auto_answer.mode =
+sip.pkt_loopback_encapsulated_payload =
+sip.pkt_loopback_directed_payload =
+
+
+#######################################################################################
+##                                   V84 add                                         ##       
+#######################################################################################
+google_contact_server.enable=
+
+static.features.network_test.check_policy=
+static.features.network_test.enable=
+static.features.network_test.host=
+static.features.network_test.period=
+static.features.network_unavailable_test.period=
+
+phone_setting.warnings_display.mode=
+
+bw.flexible_seating.remember_password.ldap.enable=
+
+vcaccount.enable=
+
+#######################################################################################
+##                       V84 T5XW add   VPM-Acoustic Shield                          ##       
+#######################################################################################
+features.acoustic_shield.level =
+features.acoustic_shield.mode = 
+
+
+
+#######################################################################################
+##                       V84 SP4 add                                                ##       
+#######################################################################################
+
+phone_setting.search_t9.enable =
+phone_setting.mail_power_led_flash_enable =
+ldap.anonymous_bind_operation.enable =
+google_contact_server.display_mode = 
+gb.presence.line = 
+gb.presence.enable =
+gb.emergency_instant_messages.enable = 
+gb.emergency_instant_messages.displaytimeout =
+features.transfer_keep_session2_after_failed.enable=
+features.intercom.mode = 
+features.emergency_instant_messages.ring_type =
+features.dtmf.transfer =
+features.dtmf.replace_tran =
+features.call_park.performby_holdhardkey.enable =
+features.blf_extension.mode =
+features.auto_answer.ring_type =
+directory_setting.presence_list.priority =
+directory_setting.presence_list.enable =
+dialplan.transfer.mode =
+dialplan.emergency.held.secondary.server_url = 
+custom.features.dsskey_lock_type = 
+blf.enhanced.dnd.led =
+blf.enhanced.dnd.enable = 
+auto_provision.pnp_check_url.enable = 
+
+acd.logout_fixed_display.enable=
+acd.available_fixed_display.enable =
+acd.disp_code_fixed_display.enable =
+acd.trace_fixed_display.enable = 
+
+features.parked_call_monitor.blf_visual_enable=
+features.parked_call_monitor.blf_audio_enable=
+features.parked_call_monitor.blf.ring_type=
+
+
+#######################################################################################
+##                               V85 add                                             ##       
+#######################################################################################
+
+auto_provision.allsettings.sync.path=
+auto_provision.allsettings.sync=
+bw.features.flash_time=
+bw.features_status.display_mode=
+bw.xsi.directory.server_search_type=
+features.dsskey_page_reset.call_established.enable=
+features.dsskey_page_reset.call_established.page=
+features.dsskey_page_reset.enable=
+features.dsskey_page_reset.page=
+features.headset.group_listen_in_talking_enable=
+features.noise_filtering_rev.enable=
+features.out_of_service_alert.enable=
+features.out_of_service_alert_time=
+features.paging_auto_resume.enable=
+features.voice_mail_key_lamp_field.enable=
+over_the_air.url.cp930w=
+phone_setting.autop_led_flash_enable=
+phone_setting.call_remote_end_when_hold.busy_tone.enable=
+phone_setting.retain_pin.enable=
+phone_setting.voice.ring_vol_min=
+static.auto_provision.rsa_pri_key.delete=
+static.auto_provision.rsa_pri_key.enable=
+static.auto_provision.rsa_pri_key.url=
+static.network.l2tp_server.address=
+static.network.l2tp_server.password=
+static.network.l2tp_server.username=
+static.network.openvpn_file.url=
+static.network.pc_port.mode=
+static.network.set_fragment.enable=
+static.network.vpn.mode=
+static.wifi.x.802_1x.anonymous_identity=
+static.auto_provision.aes_key.com=
+static.auto_provision.aes_key.mac=
+unify.enable=
+features.transfer_complete.prompt.enable =
+
+
+#######################################################################################
+##                               V85 T3XU add                                        ##       
+#######################################################################################
+
+directory.containing_search.additional_sorting_mode=
+phone_setting.login_note_text=
+phone_setting.lcd_logo.text=
+features.hide_unread_vm_number.enable=
+features.hotdesking_clear_calllog.enable=
+priv.auto_provision.screen.resolution=
diff --git a/resources/templates/provision/yealink/t33g/{$mac}.cfg b/resources/templates/provision/yealink/t33g/{$mac}.cfg
new file mode 100644
index 0000000000..656740c808
--- /dev/null
+++ b/resources/templates/provision/yealink/t33g/{$mac}.cfg
@@ -0,0 +1,2279 @@
+#!version:1.0.0.1
+
+##File header "#!version:1.0.0.1" can not be edited or deleted, and must be placed in the first line.##
+##account.X.*:(T5XW/T54S/T48G/T48S/T46G/T46S/T29G/T46U/T48U: X ranges from 1 to 16. T52S/T42G/T42S/T43U: X ranges from 1 to 12. T41P/T41S/T27P/T27G/T41U/T42U: X ranges from 1 to 6. T40P/T40G/T23P/T23G: X ranges from 1 to 3. T21(P) E2/T31/T31P/T31G: X ranges from 1 to 2.)##
+##T33P/T33G :X ranges from 1 to 4
+##T30/T30P Not Support
+#######################################################################################
+##                                   Trnasfer                                        ##       
+#######################################################################################
+account.1.phone_setting.call_appearance.transfer_via_new_linekey= {$yealink_transfer_via_new_linekey}
+
+
+#######################################################################################
+##                                   Conference                                      ##       
+#######################################################################################
+account.1.phone_setting.call_appearance.conference_via_new_linekey=
+
+
+###V85##
+account.X.networkconf_type=
+
+#######################################################################################
+##                                   Anonymous                                       ##       
+#######################################################################################
+account.1.anonymous_call.server_base_only =
+account.1.send_anonymous_rejection_code =
+account.1.anonymous_reject_offcode =
+account.1.anonymous_reject_oncode =
+account.1.reject_anonymous_call=
+account.1.anonymous_call_offcode =
+account.1.anonymous_call_oncode =
+account.1.anonymous_call =
+account.1.send_anonymous_code =
+
+
+
+#######################################################################################
+##                          Call Configuration                                       ##       
+#######################################################################################
+account.1.music_server_uri=
+account.1.music_on_hold_type=
+account.1.auto_label.rule=
+account.1.auto_label.enable=
+account.1.number_of_linekey=
+account.1.phone_setting.call_appearance.calls_per_linekey=
+
+
+#######################################################################################
+##                                    Codec                                          ##       
+#######################################################################################
+account.1.codec.ilbc_15_2kbps.priority=
+account.1.codec.ilbc_15_2kbps.enable=
+
+account.1.codec.ilbc_13_33kbps.priority= {if isset($yealink_codec_iLBC_priority)}{$yealink_codec_iLBC_priority}{else}0{/if}
+
+account.1.codec.ilbc_13_33kbps.enable = {if isset($yealink_codec_iLBC_enable)}1{else}0{/if}
+
+account.1.codec.pcma.enable= {if isset($yealink_codec_pcma_enable)}1{else}0{/if}
+
+account.1.codec.pcma.priority= {if isset($yealink_codec_pcma_priority)}{$yealink_codec_pcma_priority}{else}0{/if}
+
+account.1.codec.pcmu.enable= {if isset($yealink_codec_pcmu_enable)}1{else}0{/if}
+
+account.1.codec.pcmu.priority= {if isset($yealink_codec_pcmu_priority)}{$yealink_codec_pcmu_priority}{else}0{/if}
+
+account.1.codec.opus.priority= {if isset($yealink_codec_opus_priority)}{$yealink_codec_opus_priority}{else}0{/if}
+
+account.1.codec.opus.enable= {if isset($yealink_codec_opus_enable)}1{else}0{/if}
+
+account.1.codec.opus.para= 106
+
+account.1.codec.g726_40.enable= {if isset($yealink_codec_g726_40_enable)}1{else}0{/if}
+
+account.1.codec.g726_40.priority= {if isset($yealink_codec_g726_40_priority)}{$yealink_codec_g726_40_priority}{else}0{/if}
+
+account.1.codec.g726_32.enable= {if isset($yealink_codec_g726_32_enable)}1{else}0{/if}
+
+account.1.codec.g726_32.priority= {if isset($yealink_codec_g726_32_priority)}{$yealink_codec_g726_32_priority}{else}0{/if}
+
+account.1.codec.g726_24.enable= {if isset($yealink_codec_g726_24_enable)}1{else}0{/if}
+
+account.1.codec.g726_24.priority= {if isset($yealink_codec_g726_24_priority)}{$yealink_codec_g726_24_priority}{else}0{/if}
+
+account.1.codec.g726_16.enable= {if isset($yealink_codec_g726_16_enable)}1{else}0{/if}
+
+account.1.codec.g726_16.priority= {if isset($yealink_codec_g726_16_priority)}{$yealink_codec_g726_16_priority}{else}0{/if}
+
+account.1.codec.g723_63.priority= {if isset($yealink_codec_g723_63_priority)}{$yealink_codec_g723_63_priority}{else}0{/if}
+
+account.1.codec.g723_63.enable= {if isset($yealink_codec_g723_63_enable)}1{else}0{/if}
+
+account.1.codec.g723_53.priority= {if isset($yealink_codec_g723_53_priority)}{$yealink_codec_g723_53_priority}{else}0{/if}
+
+account.1.codec.g723_53.enable= {if isset($yealink_codec_g723_53_enable)}1{else}0{/if}
+
+account.1.codec.g729.priority= {if isset($yealink_codec_g729_priority)}{$yealink_codec_g729_priority}{else}0{/if}
+
+account.1.codec.g729.enable= {if isset($yealink_codec_g729_enable)}1{else}0{/if}
+
+account.1.codec.g722.priority= {if isset($yealink_codec_g722_priority)}{$yealink_codec_g722_priority}{else}0{/if}
+
+account.1.codec.g722.enable= {if isset($yealink_codec_g722_enable)}1{else}0{/if}
+
+account.1.codec.G722_1_24kpbs.priority=
+account.1.codec.G722_1_24kpbs.enable=
+account.1.codec.G722_1c_24kpbs.priority=
+account.1.codec.G722_1c_24kpbs.enable=
+account.1.codec.G722_1c_32kpbs.priority=
+account.1.codec.G722_1c_32kpbs.enable=
+account.1.codec.G722_1c_48kpbs.priority=
+account.1.codec.G722_1c_48kpbs.enable=
+
+################################################################
+#                      Account Register                       ##
+################################################################
+{if isset($account.1.password) }
+account.1.enable = 1
+{else}
+account.1.enable = 0
+{/if}
+account.1.label = {$account.1.display_name}
+account.1.display_name = {$account.1.display_name}
+account.1.auth_name = {$account.1.auth_id}
+
+{if isset($account.1.server.1.address)}
+account.1.user_name = {$account.1.user_id}@{$account.1.server_address}
+{else}
+account.1.user_name = {$account.1.user_id}
+{/if}
+
+account.1.password = {$account.1.password}
+account.1.sip_server.1.address= {$account.1.server_address}
+account.1.sip_server_port = {$account.1.sip_port}
+
+
+#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
+{if $account.1.sip_transport == 'udp'}account.1.sip_server.1.transport_type = 0{/if}
+{if $account.1.sip_transport == 'tcp'}account.1.sip_server.1.transport_type = 1{/if}
+{if $account.1.sip_transport == 'tls'}account.1.sip_server.1.transport_type = 2{/if}
+{if $account.1.sip_transport == 'dns srv'}account.1.sip_server.1.transport_type = 3{/if}
+
+account.1.sip_server.1.expires=  {$account.1.register_expires}
+account.1.sip_server.1.retry_counts= 3
+
+account.1.sip_server.2.address= {$account.1.server.2.address}
+account.1.sip_server.2.port= {$account.1.sip_port}
+
+#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS-NAPTR;
+{if $account.1.sip_transport == 'udp'}account.1.sip_server.2.transport_type = 0{/if}
+{if $account.1.sip_transport == 'tcp'}account.1.sip_server.2.transport_type = 1{/if}
+{if $account.1.sip_transport == 'tls'}account.1.sip_server.2.transport_type = 2{/if}
+{if $account.1.sip_transport == 'dns srv'}account.1.sip_server.2.transport_type = 3{/if}
+
+account.1.sip_server.2.expires= {$account.1.register_expires}
+account.1.sip_server.2.retry_counts= 3
+
+account.1.outbound_proxy_enable = {if isset($account.1.outbound_proxy_primary)}1{else}0{/if}
+
+account.1.outbound_proxy.1.address = {$account.1.outbound_proxy_primary}
+account.1.outbound_proxy.2.address = {$account.1.outbound_proxy_secondary}
+
+{if isset($outbound_proxy_1_port)}
+account.1.outbound_proxy.1.port = {$outbound_proxy_1_port}
+{else}
+account.1.outbound_proxy.1.port = {$account.1.sip_port}
+{/if}
+
+account.1.outbound_proxy.2.address= {$account.1.outbound_proxy_secondary}
+
+{if isset($outbound_proxy_1_port)}
+account.1.outbound_proxy.2.port = {$outbound_proxy_2_port}
+{else}
+account.1.outbound_proxy.2.port = {$account.1.sip_port}
+{/if}
+
+account.1.outbound_proxy_fallback_interval= {$yealink_outbound_proxy_fallback_interval}
+
+account.1.nat.nat_traversal= {if isset($stun_server)}1{else}0{/if}
+
+
+
+################################################################
+#                      Account Basic                          ##
+################################################################
+account.1.auto_answer=
+
+################################################################
+#                      Account Advanced                       ##
+################################################################
+account.1.nat.udp_update_enable=
+account.1.nat.udp_update_time=
+account.1.nat.rport= {$yealink_rport}
+
+account.1.dtmf.type= {$yealink_dtmf_type}
+account.1.dtmf.info_type=
+account.1.dtmf.dtmf_payload=
+account.1.100rel_enable=
+
+account.1.subscribe_register=
+account.1.cid_source= {$yealink_cid_source}
+account.1.enable_user_equal_phone=
+account.1.srtp_encryption= {$yealink_srtp_encryption}
+account.1.ptime=
+account.1.register_line=
+account.1.register_mac=
+account.1.reg_fail_retry_interval=
+account.1.unregister_on_reboot=
+
+account.1.session_timer.refresher=
+account.1.session_timer.expires=
+account.1.session_timer.enable= {$yealink_session_timer}
+
+account.1.conf_type = {if $nway_conference == true}2{/if}
+account.1.sip_server_type=
+
+##V83 Add
+account.1.srtp.unencrypted_rtcp.enable =
+account.1.srtp.unencrypted_rtp.enable =
+account.1.sip_server_mode =
+
+
+
+################################################################
+#                        SIP Backup Server                    ##
+################################################################
+account.1.outbound_proxy.1.register_on_enable=
+account.1.outbound_proxy.1.failback_timeout=
+account.1.outbound_proxy.1.failback_mode=
+account.1.outbound_proxy.1.retry_counts=
+account.1.outbound_proxy.1.only_signal_with_registered=
+account.1.outbound_proxy.1.failback_subscribe.enable=
+account.1.outbound_proxy.1.invite_retry_counts=
+
+account.1.sip_server.1.register_on_enable=
+account.1.sip_server.1.failback_timeout=
+account.1.sip_server.1.failback_mode=
+account.1.sip_server.1.failback_subscribe.enable=
+account.1.sip_server.1.only_signal_with_registered=
+account.1.sip_server.1.invite_retry_counts=
+
+account.1.outbound_proxy.2.register_on_enable=
+account.1.outbound_proxy.2.failback_timeout=
+account.1.outbound_proxy.2.failback_mode=
+account.1.outbound_proxy.2.retry_counts=
+account.1.outbound_proxy.2.only_signal_with_registered=
+account.1.outbound_proxy.2.failback_subscribe.enable=
+account.1.outbound_proxy.2.invite_retry_counts=
+
+account.1.sip_server.2.register_on_enable=
+account.1.sip_server.2.failback_timeout=
+account.1.sip_server.2.failback_mode=
+account.1.sip_server.2.failback_subscribe.enable=
+account.1.sip_server.2.only_signal_with_registered=
+account.1.sip_server.2.invite_retry_counts=
+
+account.1.static_cache_pri=
+account.1.dns_cache_type=
+account.1.naptr_build=
+account.1.fallback.timeout=
+account.1.fallback.redundancy_type=
+account.1.reg_failed_retry_max_time=
+account.1.reg_failed_retry_min_time=
+account.1.redundancy_with_reg_fail.enable =
+
+##V83 Add
+account.1.sip_server.1.outbound_proxy_enable =
+account.1.sip_server.2.outbound_proxy_enable =
+
+################################################################
+#                        SIP Basic config                     ##
+################################################################
+account.1.contact_take_line_param=
+account.1.update_ack_while_dialing=
+account.1.srtp_lifetime=
+account.1.third_part_request_with_route.enable=
+account.1.insert_outbound_in_route.enable=
+account.1.path.enable=
+account.1.sub_fail_retry_interval=
+account.1.transfer_refer_to_contact_header.enable=
+account.1.hold_use_inactive=
+account.1.gruu.enable=
+account.1.dial_tone=
+account.1.call_id_mode=
+account.1.subscribe_expires_overlap=
+account.1.register_expires_overlap=
+account.1.call_info=
+account.1.custom_ua=
+account.1.mwi_parse_terminated=
+account.1.check_cseq.enable=
+account.1.check_to_tag.enable=
+account.1.vq_rtcpxr.collector_server_port=
+account.1.vq_rtcpxr.collector_server_host=
+account.1.vq_rtcpxr.collector_name=
+account.1.compact_header_enable=
+account.1.cp_source= 2
+account.1.cid_source_ppi= 1
+account.1.cid_source_privacy= 1
+account.1.reg_with_pani_header.enable =
+account.1.alert_info=
+account.1.picture_info_enable= 1
+
+##V83 Add
+account.1.invite_with_pani_header.enable = 
+
+##V84 Add
+account.1.invite_with_rpid_header.enable=
+
+account.1.auto_answer_mute_enable
+
+##V84 SP4 Add
+account.1.share_line.enable_private_code =
+account.1.share_line.cancel_private_code =
+
+#######################################################################################
+##                                 History                                           ##       
+#######################################################################################
+account.1.missed_calllog=
+
+
+#######################################################################################  
+##                                  Forward                                          ##  
+####################################################################################### 
+account.1.timeout_fwd.off_code=
+account.1.timeout_fwd.on_code=
+account.1.timeout_fwd.timeout=
+account.1.timeout_fwd.target=
+account.1.timeout_fwd.enable=
+account.1.busy_fwd.off_code=
+account.1.busy_fwd.on_code=
+account.1.busy_fwd.target=
+account.1.busy_fwd.enable=
+account.1.always_fwd.off_code=
+account.1.always_fwd.on_code=
+account.1.always_fwd.target=
+account.1.always_fwd.enable=
+
+
+#######################################################################################  
+##                                  DND                                              ##  
+#######################################################################################
+account.1.dnd.enable=
+account.1.dnd.off_code=
+account.1.dnd.on_code=
+
+
+
+#######################################################################################  
+##                               Voice Mail                                          ##  
+#######################################################################################
+voice_mail.number.1= {$voicemail_number}
+account.1.subscribe_mwi= 1
+account.1.subscribe_mwi_to_vm= {$yealink_subscribe_mwi_to_vm}
+account.1.subscribe_mwi_expires= 3600
+account.1.display_mwi.enable=
+
+#######################################################################################  
+##                               Auto Dial                                           ##  
+#######################################################################################
+account.1.auto_dial_enable=
+account.1.auto_dial_num=
+
+
+#######################################################################################
+##                           Preference&Status                                       ##       
+#######################################################################################
+account.1.ringtone.ring_type=
+
+#######################################################################################
+##                           Digitmap                                                ##       
+#######################################################################################
+account.1.dialplan.digitmap.enable=
+account.1.dialplan.digitmap.string=
+account.1.dialplan.digitmap.no_match_action=
+account.1.dialplan.digitmap.interdigit_short_timer=
+account.1.dialplan.digitmap.interdigit_long_timer=
+account.1.dialplan.digitmap.apply_to.press_send=
+account.1.dialplan.digitmap.apply_to.forward=
+account.1.dialplan.digitmap.apply_to.history_dial=
+account.1.dialplan.digitmap.apply_to.directory_dial=
+account.1.dialplan.digitmap.apply_to.on_hook_dial=
+account.1.dialplan.digitmap.active.on_hook_dialing=
+
+
+#######################################################################################
+##                                 Rings Settings                                    ##
+#######################################################################################
+account.1.alert_info_url_enable=
+
+
+#######################################################################################
+##                                  BLF/BLF List                                     ##       
+#######################################################################################
+account.1.blf.blf_list_uri=
+account.1.blf_list_barge_in_code=
+account.1.blf_list_code=
+account.1.blf_list_retrieve_call_parked_code=
+account.1.blf.subscribe_period=
+account.1.blf.match_host.enable=
+account.1.out_dialog_blf_enable=
+account.1.blf.subscribe_event=
+
+##V84 Add
+account.1.blf_list_call_parked_code=
+account.1.blf_list_call_parked_list=
+
+##V84 SP4 ADD
+account.1.blf_list_whisper_code=
+account.1.blf_list_listen_in_code=
+
+
+#######################################################################################
+##                                   SCA                                             ##       
+#######################################################################################
+account.1.shared_line=
+account.1.line_seize.expires=
+account.1.shared_line_one_touch_bargein.enable=
+account.1.shared_line_one_touch_retrieve.enable=
+account.1.sca_manage_interface_display_time=
+account.1.shared_line_callpull_code=
+
+##V83 Add
+account.x.share_line.barge_in.enable
+
+###V85 add
+account.X.shared_line.idle_details=
+
+#######################################################################################
+##                                   BLA                                             ##       
+#######################################################################################
+account.1.bla_number=
+account.1.bla_subscribe_period=
+account.1.bla.notify_with_expire.enable=
+account.1.bla.subscribe_uri_build_type=
+
+#######################################################################################
+##                                   Call Park                                       ##       
+#######################################################################################
+account.1.callpark_enable=
+
+
+#######################################################################################
+##                                    Broadsoft ACD                                  ##       
+#######################################################################################
+account.1.acd.enable= 0
+account.1.acd.available= 0
+account.1.acd.unavailable_reason_enable= 0
+account.1.acd.initial_state= 1
+account.1.subscribe_acd_expires=
+
+
+#######################################################################################
+##                                 Broadsoft ACD Call Center                         ##       
+#######################################################################################
+##account.X.reason_code.Y=
+##account.X.reason_code_name.Y=
+##account.X.bw_disp_code.Y=
+##account.X.bw_disp_code_name.Y=
+##account.X.supervisor_info_code.Y=
+##account.X.supervisor_info_code_name.Y=
+##The value Y must be continuous.
+
+account.1.reason_code.1=
+account.1.reason_code_name.1= 0
+account.1.bw_disp_code.1=
+account.1.bw_disp_code_name.1=
+account.1.supervisor_info_code.1=
+account.1.supervisor_info_code_name.1=
+
+#######################################################################################
+##                                 Broadsoft Call Center                             ##       
+#######################################################################################
+account.1.call_center.call_info_enable= 0
+account.1.call_center.show_call_info_time= 30
+account.1.call_center.disp_code_enable= 0
+account.1.call_center.trace_enable= 0
+account.1.call_center.emergency_enable= 0
+account.1.call_center.queue_status_enable= 0
+account.1.call_center.queue_status_light_enable = 0
+
+
+
+#######################################################################################
+##                         Broadsoft Hoteling                                        ##       
+#######################################################################################
+account.1.hoteling.enable= 0
+account.1.hoteling.user_id= 0
+account.1.hoteling.password= 0
+account.1.hoteling.expires= 0
+account.1.hoteling.auto_login_enable= 0
+
+
+#######################################################################################
+##                              Broadsoft XSI                                        ##       
+#######################################################################################
+account.1.xsi.user =
+account.1.xsi.password =
+account.1.xsi.host =
+account.1.xsi.server_type =
+account.1.xsi.port =
+
+
+#######################################################################################
+##                                Call Pickup                                        ##       
+#######################################################################################
+account.1.direct_pickup_code =
+account.1.group_pickup_code =
+account.1.dialoginfo_callpickup = 0
+account.1.refresh_remote_id.enable =
+
+
+#######################################################################################
+##                              Broadsoft Call Recording                             ##       
+#######################################################################################
+account.1.call_recording.enable=
+
+#######################################################################################
+##                                Network Conference                                  ##
+#######################################################################################
+account.1.conf_uri = {if $nway_conference == true}nway{$account.1.auth_id}@{$account.1.server_address}{/if}
+
+
+#######################################################################################
+##                              Broadsoft Call Decline                               ##       
+#######################################################################################
+account.1.features.call_decline.enable =
+
+
+#######################################################################################
+##                       Broadsoft Security Classification                           ##       
+#######################################################################################
+account.1.security_classification.enable =
+
+
+
+#######################################################################################
+##                        Broadsoft Flexible Seating                                 ##       
+#######################################################################################
+account.1.flexible_seating.enable=
+account.1.hoteling.pin=
+account.1.hoteling.mode=
+
+#######################################################################################
+##                         Features Sync                                             ##       
+#######################################################################################
+account.1.features.forward.feature_key_sync.local_processing.enable=
+account.1.features.dnd.feature_key_sync.local_processing.enable =
+
+##V84 Add
+account.1.dnd.feature_key_sync.enable=
+account.1.feature_key_sync.enable=
+account.1.forward.feature_key_sync.enable=
+
+#######################################################################################
+##                                   ACD                                             ##       
+#######################################################################################
+account.1.acd.available_url=
+account.1.acd.away_url =
+account.1.acd.refresh_url =
+account.1.acd.call_information=
+
+
+
+#######################################################################################
+##                                  virtual_user                                     ##       
+#######################################################################################
+##V84 Add
+bw.virtual_user.1.enable=
+bw.virtual_user.1.label=
+bw.virtual_user.1.xsi.dnd.enable=
+bw.virtual_user.1.xsi.host=
+bw.virtual_user.1.xsi.password=
+bw.virtual_user.1.xsi.port=
+bw.virtual_user.1.xsi.server_type=
+bw.virtual_user.1.xsi.user=
+
+#!version:1.0.0.1
+
+##File header "#!version:1.0.0.1" can not be edited or deleted, and must be placed in the first line.##
+##account.X.*:(T5XW/T54S/T48G/T48S/T46G/T46S/T29G/T46U/T48U: X ranges from 1 to 16. T52S/T42G/T42S/T43U: X ranges from 1 to 12. T41P/T41S/T27P/T27G/T41U: X ranges from 1 to 6. T40P/T40G/T23P/T23G: X ranges from 1 to 3. T21(P) E2: X ranges from 1 to 2.)##
+
+#######################################################################################
+##                                   Transfer                                        ##
+#######################################################################################
+account.2.phone_setting.call_appearance.transfer_via_new_linekey= {$yealink_transfer_via_new_linekey}
+
+
+#######################################################################################
+##                                   Conference                                      ##
+#######################################################################################
+account.2.phone_setting.call_appearance.conference_via_new_linekey=
+
+
+#######################################################################################
+##                                   Anonymous                                       ##
+#######################################################################################
+account.2.anonymous_call.server_base_only =
+account.2.send_anonymous_rejection_code =
+account.2.anonymous_reject_offcode =
+account.2.anonymous_reject_oncode =
+account.2.reject_anonymous_call=
+account.2.anonymous_call_offcode =
+account.2.anonymous_call_oncode =
+account.2.anonymous_call = 0
+account.2.send_anonymous_code =
+
+
+
+#######################################################################################
+##                          Call Configuration                                       ##
+#######################################################################################
+account.2.music_server_uri=
+account.2.music_on_hold_type=
+account.2.auto_label.rule=
+account.2.auto_label.enable=
+account.2.number_of_linekey=
+account.2.phone_setting.call_appearance.calls_per_linekey=
+
+
+#######################################################################################
+##                                    Codec                                          ##
+#######################################################################################
+account.2.codec.ilbc_15_2kbps.priority=
+account.2.codec.ilbc_15_2kbps.enable=
+
+account.2.codec.ilbc_13_33kbps.priority= {if isset($yealink_codec_iLBC_priority)}{$yealink_codec_iLBC_priority}{else}0{/if}
+
+account.2.codec.ilbc_13_33kbps.enable = {if isset($yealink_codec_iLBC_enable)}1{else}0{/if}
+
+account.2.codec.pcma.enable= {if isset($yealink_codec_pcma_enable)}1{else}0{/if}
+
+account.2.codec.pcma.priority= {if isset($yealink_codec_pcma_priority)}{$yealink_codec_pcma_priority}{else}0{/if}
+
+account.2.codec.pcmu.enable= {if isset($yealink_codec_pcmu_enable)}1{else}0{/if}
+
+account.2.codec.pcmu.priority= {if isset($yealink_codec_pcmu_priority)}{$yealink_codec_pcmu_priority}{else}0{/if}
+
+account.2.codec.opus.priority= {if isset($yealink_codec_opus_priority)}{$yealink_codec_opus_priority}{else}0{/if}
+
+account.2.codec.opus.enable= {if isset($yealink_codec_opus_enable)}1{else}0{/if}
+
+account.2.codec.opus.para= 106
+
+account.2.codec.g726_40.enable= {if isset($yealink_codec_g726_40_enable)}1{else}0{/if}
+
+account.2.codec.g726_40.priority= {if isset($yealink_codec_g726_40_priority)}{$yealink_codec_g726_40_priority}{else}0{/if}
+
+account.2.codec.g726_32.enable= {if isset($yealink_codec_g726_32_enable)}1{else}0{/if}
+
+account.2.codec.g726_32.priority= {if isset($yealink_codec_g726_32_priority)}{$yealink_codec_g726_32_priority}{else}0{/if}
+
+account.2.codec.g726_24.enable= {if isset($yealink_codec_g726_24_enable)}1{else}0{/if}
+
+account.2.codec.g726_24.priority= {if isset($yealink_codec_g726_24_priority)}{$yealink_codec_g726_24_priority}{else}0{/if}
+
+account.2.codec.g726_16.enable= {if isset($yealink_codec_g726_16_enable)}1{else}0{/if}
+
+account.2.codec.g726_16.priority= {if isset($yealink_codec_g726_16_priority)}{$yealink_codec_g726_16_priority}{else}0{/if}
+
+account.2.codec.g723_63.priority= {if isset($yealink_codec_g723_63_priority)}{$yealink_codec_g723_63_priority}{else}0{/if}
+
+account.2.codec.g723_63.enable= {if isset($yealink_codec_g723_63_enable)}1{else}0{/if}
+
+account.2.codec.g723_53.priority= {if isset($yealink_codec_g723_53_priority)}{$yealink_codec_g723_53_priority}{else}0{/if}
+
+account.2.codec.g723_53.enable= {if isset($yealink_codec_g723_53_enable)}1{else}0{/if}
+
+account.2.codec.g729.priority= {if isset($yealink_codec_g729_priority)}{$yealink_codec_g729_priority}{else}0{/if}
+
+account.2.codec.g729.enable= {if isset($yealink_codec_g729_enable)}1{else}0{/if}
+
+account.2.codec.g722.priority= {if isset($yealink_codec_g722_priority)}{$yealink_codec_g722_priority}{else}0{/if}
+
+account.2.codec.g722.enable= {if isset($yealink_codec_g722_enable)}1{else}0{/if}
+
+account.2.codec.G722_1_24kpbs.priority=
+account.2.codec.G722_1_24kpbs.enable=
+account.2.codec.G722_1c_24kpbs.priority=
+account.2.codec.G722_1c_24kpbs.enable=
+account.2.codec.G722_1c_32kpbs.priority=
+account.2.codec.G722_1c_32kpbs.enable=
+account.2.codec.G722_1c_48kpbs.priority=
+account.2.codec.G722_1c_48kpbs.enable=
+
+################################################################
+#                      Account2 Register                       ##
+################################################################
+{if isset($account.2.password) }
+account.2.enable = 1
+{else}
+account.2.enable = 0
+{/if}
+account.2.label = {$account.2.display_name}
+account.2.display_name = {$account.2.display_name}
+account.2.auth_name = {$account.2.auth_id}
+
+{if isset($account.2.server.1.address)}
+account.2.user_name = {$account.2.user_id}@{$account.2.server_address}
+{else}
+account.2.user_name = {$account.2.user_id}
+{/if}
+
+account.2.password = {$account.2.password}
+account.2.sip_server.1.address= {$account.2.server_address}
+account.2.sip_server_port = {$account.2.sip_port}
+
+
+#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
+{if $account.2.sip_transport == 'udp'}account.2.sip_server.1.transport_type = 0{/if}
+{if $account.2.sip_transport == 'tcp'}account.2.sip_server.1.transport_type = 1{/if}
+{if $account.2.sip_transport == 'tls'}account.2.sip_server.1.transport_type = 2{/if}
+{if $account.2.sip_transport == 'dns srv'}account.2.sip_server.1.transport_type = 3{/if}
+
+account.2.sip_server.1.expires=  {$account.2.register_expires}
+account.2.sip_server.1.retry_counts= 3
+
+account.2.sip_server.2.address= {$account.2.server.2.address}
+account.2.sip_server.2.port= {$account.2.sip_port}
+
+#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS-NAPTR;
+{if $account.2.sip_transport == 'udp'}account.2.sip_server.2.transport_type = 0{/if}
+{if $account.2.sip_transport == 'tcp'}account.2.sip_server.2.transport_type = 1{/if}
+{if $account.2.sip_transport == 'tls'}account.2.sip_server.2.transport_type = 2{/if}
+{if $account.2.sip_transport == 'dns srv'}account.2.sip_server.2.transport_type = 3{/if}
+
+account.2.sip_server.2.expires= {$account.2.register_expires}
+account.2.sip_server.2.retry_counts= 3
+
+account.2.outbound_proxy_enable = {if isset($account.2.outbound_proxy_primary)}1{else}0{/if}
+
+account.2.outbound_proxy.1.address = {$account.2.outbound_proxy_primary}
+account.2.outbound_proxy.2.address = {$account.2.outbound_proxy_secondary}
+
+{if isset($outbound_proxy_1_port)}
+account.2.outbound_proxy.1.port = {$outbound_proxy_1_port}
+{else}
+account.2.outbound_proxy.1.port = {$account.2.sip_port}
+{/if}
+
+account.2.outbound_proxy.2.address= {$account.2.outbound_proxy_secondary}
+
+{if isset($outbound_proxy_1_port)}
+account.2.outbound_proxy.2.port = {$outbound_proxy_2_port}
+{else}
+account.2.outbound_proxy.2.port = {$account.2.sip_port}
+{/if}
+
+account.2.outbound_proxy_fallback_interval= {$yealink_outbound_proxy_fallback_interval}
+
+account.2.nat.nat_traversal= {if isset($stun_server)}1{else}0{/if}
+
+
+
+################################################################
+#                      Account Basic                          ##
+################################################################
+account.2.auto_answer=
+
+################################################################
+#                      Account Advanced                       ##
+################################################################
+account.2.nat.udp_update_enable=
+account.2.nat.udp_update_time=
+account.2.nat.rport=  {$yealink_rport}
+
+account.2.dtmf.type= {$yealink_dtmf_type}
+account.2.dtmf.info_type=
+account.2.dtmf.dtmf_payload=
+account.2.100rel_enable=
+
+account.2.subscribe_register=
+account.2.cid_source= {$yealink_cid_source}
+account.2.enable_user_equal_phone=
+account.2.srtp_encryption= {$yealink_srtp_encryption}
+account.2.ptime=
+account.2.register_line=
+account.2.register_mac=
+account.2.reg_fail_retry_interval=
+account.2.unregister_on_reboot=
+
+account.2.session_timer.refresher=
+account.2.session_timer.expires=
+account.2.session_timer.enable= {$yealink_session_timer}
+
+account.2.conf_type = {if $nway_conference == true}2{/if}
+account.2.sip_server_type=
+
+##V83 Add
+account.2.srtp.unencrypted_rtcp.enable =
+account.2.srtp.unencrypted_rtp.enable =
+account.2.sip_server_mode =
+
+
+
+################################################################
+#                        SIP Backup Server                    ##
+################################################################
+account.2.outbound_proxy.1.register_on_enable=
+account.2.outbound_proxy.1.failback_timeout=
+account.2.outbound_proxy.1.failback_mode=
+account.2.outbound_proxy.1.retry_counts=
+account.2.outbound_proxy.1.only_signal_with_registered=
+account.2.outbound_proxy.1.failback_subscribe.enable=
+account.2.outbound_proxy.1.invite_retry_counts=
+
+account.2.sip_server.1.register_on_enable=
+account.2.sip_server.1.failback_timeout=
+account.2.sip_server.1.failback_mode=
+account.2.sip_server.1.failback_subscribe.enable=
+account.2.sip_server.1.only_signal_with_registered=
+account.2.sip_server.1.invite_retry_counts=
+
+account.2.outbound_proxy.2.register_on_enable=
+account.2.outbound_proxy.2.failback_timeout=
+account.2.outbound_proxy.2.failback_mode=
+account.2.outbound_proxy.2.retry_counts=
+account.2.outbound_proxy.2.only_signal_with_registered=
+account.2.outbound_proxy.2.failback_subscribe.enable=
+account.2.outbound_proxy.2.invite_retry_counts=
+
+account.2.sip_server.2.register_on_enable=
+account.2.sip_server.2.failback_timeout=
+account.2.sip_server.2.failback_mode=
+account.2.sip_server.2.failback_subscribe.enable=
+account.2.sip_server.2.only_signal_with_registered=
+account.2.sip_server.2.invite_retry_counts=
+
+account.2.static_cache_pri=
+account.2.dns_cache_type=
+account.2.naptr_build=
+account.2.fallback.timeout=
+account.2.fallback.redundancy_type=
+account.2.reg_failed_retry_max_time=
+account.2.reg_failed_retry_min_time=
+account.2.redundancy_with_reg_fail.enable =
+
+##V83 Add
+account.2.sip_server.1.outbound_proxy_enable =
+account.2.sip_server.2.outbound_proxy_enable =
+
+################################################################
+#                        SIP Basic config                     ##
+################################################################
+account.2.contact_take_line_param=
+account.2.update_ack_while_dialing=
+account.2.srtp_lifetime=
+account.2.third_part_request_with_route.enable=
+account.2.insert_outbound_in_route.enable=
+account.2.path.enable=
+account.2.sub_fail_retry_interval=
+account.2.transfer_refer_to_contact_header.enable=
+account.2.hold_use_inactive=
+account.2.gruu.enable=
+account.2.dial_tone=
+account.2.call_id_mode=
+account.2.subscribe_expires_overlap=
+account.2.register_expires_overlap=
+account.2.call_info=
+account.2.custom_ua=
+account.2.mwi_parse_terminated=
+account.2.check_cseq.enable=
+account.2.check_to_tag.enable=
+account.2.vq_rtcpxr.collector_server_port=
+account.2.vq_rtcpxr.collector_server_host=
+account.2.vq_rtcpxr.collector_name=
+account.2.compact_header_enable=
+account.2.cp_source= 2
+account.2.cid_source_ppi= 1
+account.2.cid_source_privacy= 1
+account.2.reg_with_pani_header.enable =
+account.2.alert_info=
+account.2.picture_info_enable= 1
+
+##V83 Add
+account.2.invite_with_pani_header.enable = 
+
+##V84 Add
+account.2.invite_with_rpid_header.enable=
+
+account.2.auto_answer_mute_enable
+
+##V84 SP4 Add
+account.2.share_line.enable_private_code =
+account.2.share_line.cancel_private_code =
+
+#######################################################################################
+##                                 History                                           ##
+#######################################################################################
+account.2.missed_calllog=
+
+
+#######################################################################################
+##                                  Forward                                          ##
+#######################################################################################
+account.2.timeout_fwd.off_code=
+account.2.timeout_fwd.on_code=
+account.2.timeout_fwd.timeout=
+account.2.timeout_fwd.target=
+account.2.timeout_fwd.enable=
+account.2.busy_fwd.off_code=
+account.2.busy_fwd.on_code=
+account.2.busy_fwd.target=
+account.2.busy_fwd.enable=
+account.2.always_fwd.off_code=
+account.2.always_fwd.on_code=
+account.2.always_fwd.target=
+account.2.always_fwd.enable=
+
+
+#######################################################################################
+##                                  DND                                              ##
+#######################################################################################
+account.2.dnd.enable=
+account.2.dnd.off_code=
+account.2.dnd.on_code=
+
+
+
+#######################################################################################
+##                               Voice Mail                                          ##
+#######################################################################################
+voice_mail.number.1= {$voicemail_number}
+account.2.subscribe_mwi= 1
+account.2.subscribe_mwi_to_vm= {$yealink_subscribe_mwi_to_vm}
+account.2.subscribe_mwi_expires= 3600
+account.2.display_mwi.enable=
+
+#######################################################################################
+##                               Auto Dial                                           ##
+#######################################################################################
+account.2.auto_dial_enable=
+account.2.auto_dial_num=
+
+
+#######################################################################################
+##                           Preference&Status                                       ##
+#######################################################################################
+account.2.ringtone.ring_type=
+
+#######################################################################################
+##                           Digitmap                                                ##
+#######################################################################################
+account.2.dialplan.digitmap.enable=
+account.2.dialplan.digitmap.string=
+account.2.dialplan.digitmap.no_match_action=
+account.2.dialplan.digitmap.interdigit_short_timer=
+account.2.dialplan.digitmap.interdigit_long_timer=
+account.2.dialplan.digitmap.apply_to.press_send=
+account.2.dialplan.digitmap.apply_to.forward=
+account.2.dialplan.digitmap.apply_to.history_dial=
+account.2.dialplan.digitmap.apply_to.directory_dial=
+account.2.dialplan.digitmap.apply_to.on_hook_dial=
+account.2.dialplan.digitmap.active.on_hook_dialing=
+
+
+#######################################################################################
+##                                 Rings Settings                                    ##
+#######################################################################################
+account.2.alert_info_url_enable=
+
+
+#######################################################################################
+##                                  BLF/BLF List                                     ##
+#######################################################################################
+account.2.blf.blf_list_uri=
+account.2.blf_list_barge_in_code=
+account.2.blf_list_code=
+account.2.blf_list_retrieve_call_parked_code=
+account.2.blf.subscribe_period=
+account.2.blf.match_host.enable=
+account.2.out_dialog_blf_enable=
+account.2.blf.subscribe_event=
+
+##V84 Add
+account.2.blf_list_call_parked_code=
+account.2.blf_list_call_parked_list=
+
+##V84 SP4 ADD
+account.2.blf_list_whisper_code=
+account.2.blf_list_listen_in_code=
+
+
+#######################################################################################
+##                                   SCA                                             ##
+#######################################################################################
+account.2.shared_line=
+account.2.line_seize.expires=
+account.2.shared_line_one_touch_bargein.enable=
+account.2.shared_line_one_touch_retrieve.enable=
+account.2.sca_manage_interface_display_time=
+account.2.shared_line_callpull_code=
+
+##V83 Add
+account.x.share_line.barge_in.enable
+
+#######################################################################################
+##                                   BLA                                             ##
+#######################################################################################
+account.2.bla_number=
+account.2.bla_subscribe_period=
+account.2.bla.notify_with_expire.enable=
+account.2.bla.subscribe_uri_build_type=
+
+#######################################################################################
+##                                   Call Park                                       ##
+#######################################################################################
+account.2.callpark_enable=
+
+
+#######################################################################################
+##                                    Broadsoft ACD                                  ##
+#######################################################################################
+account.2.acd.enable= 0
+account.2.acd.available= 0
+account.2.acd.unavailable_reason_enable= 0
+account.2.acd.initial_state= 1
+account.2.subscribe_acd_expires=
+
+
+#######################################################################################
+##                                 Broadsoft ACD Call Center                         ##
+#######################################################################################
+##account.X.reason_code.Y=
+##account.X.reason_code_name.Y=
+##account.X.bw_disp_code.Y=
+##account.X.bw_disp_code_name.Y=
+##account.X.supervisor_info_code.Y=
+##account.X.supervisor_info_code_name.Y=
+##The value Y must be continuous.
+
+account.2.reason_code.1=
+account.2.reason_code_name.1= 0
+account.2.bw_disp_code.1=
+account.2.bw_disp_code_name.1=
+account.2.supervisor_info_code.1=
+account.2.supervisor_info_code_name.1=
+
+#######################################################################################
+##                                 Broadsoft Call Center                             ##
+#######################################################################################
+account.2.call_center.call_info_enable= 0
+account.2.call_center.show_call_info_time= 30
+account.2.call_center.disp_code_enable= 0
+account.2.call_center.trace_enable= 0
+account.2.call_center.emergency_enable= 0
+account.2.call_center.queue_status_enable= 0
+account.2.call_center.queue_status_light_enable = 0
+
+
+
+#######################################################################################
+##                         Broadsoft Hoteling                                        ##
+#######################################################################################
+account.2.hoteling.enable= 0
+account.2.hoteling.user_id= 0
+account.2.hoteling.password= 0
+account.2.hoteling.expires= 0
+account.2.hoteling.auto_login_enable= 0
+
+
+#######################################################################################
+##                              Broadsoft XSI                                        ##
+#######################################################################################
+account.2.xsi.user =
+account.2.xsi.password =
+account.2.xsi.host =
+account.2.xsi.server_type =
+account.2.xsi.port =
+
+
+#######################################################################################
+##                                Call Pickup                                        ##
+#######################################################################################
+account.2.direct_pickup_code =
+account.2.group_pickup_code =
+account.2.dialoginfo_callpickup = 0
+account.2.refresh_remote_id.enable =
+
+
+#######################################################################################
+##                              Broadsoft Call Recording                             ##
+#######################################################################################
+account.2.call_recording.enable=
+
+#######################################################################################
+##                                Network Conference                                  ##
+#######################################################################################
+account.2.conf_uri = {if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}
+
+
+#######################################################################################
+##                              Broadsoft Call Decline                               ##
+#######################################################################################
+account.2.features.call_decline.enable =
+
+
+#######################################################################################
+##                       Broadsoft Security Classification                           ##
+#######################################################################################
+account.2.security_classification.enable =
+
+
+
+#######################################################################################
+##                        Broadsoft Flexible Seating                                 ##
+#######################################################################################
+account.2.flexible_seating.enable=
+account.2.hoteling.pin=
+account.2.hoteling.mode=
+
+#######################################################################################
+##                         Features Sync                                             ##
+#######################################################################################
+account.2.features.forward.feature_key_sync.local_processing.enable=
+account.2.features.dnd.feature_key_sync.local_processing.enable =
+
+##V84 Add
+account.2.dnd.feature_key_sync.enable=
+account.2.feature_key_sync.enable=
+account.2.forward.feature_key_sync.enable=
+
+#######################################################################################
+##                                   ACD                                             ##
+#######################################################################################
+account.2.acd.available_url=
+account.2.acd.away_url =
+account.2.acd.refresh_url =
+account.2.acd.call_information=
+
+
+
+#######################################################################################
+##                                  virtual_user                                     ##
+#######################################################################################
+##V84 Add
+#bw.virtual_user.1.enable=
+#bw.virtual_user.1.label=
+#bw.virtual_user.1.xsi.dnd.enable=
+#bw.virtual_user.1.xsi.host=
+#bw.virtual_user.1.xsi.password=
+#bw.virtual_user.1.xsi.port=
+#bw.virtual_user.1.xsi.server_type=
+#bw.virtual_user.1.xsi.user=
+
+#!version:1.0.0.1
+
+##File header "#!version:1.0.0.1" can not be edited or deleted, and must be placed in the first line.##
+##account.X.*:(T5XW/T54S/T48G/T48S/T46G/T46S/T29G/T46U/T48U: X ranges from 1 to 16. T52S/T42G/T42S/T43U: X ranges from 1 to 12. T41P/T41S/T27P/T27G/T41U: X ranges from 1 to 6. T40P/T40G/T23P/T23G: X ranges from 1 to 3. T21(P) E2: X ranges from 1 to 2.)##
+
+#######################################################################################
+##                                   Transfer                                        ##
+#######################################################################################
+account.3.phone_setting.call_appearance.transfer_via_new_linekey= {$yealink_transfer_via_new_linekey}
+
+
+#######################################################################################
+##                                   Conference                                      ##
+#######################################################################################
+account.3.phone_setting.call_appearance.conference_via_new_linekey=
+
+
+#######################################################################################
+##                                   Anonymous                                       ##
+#######################################################################################
+account.3.anonymous_call.server_base_only =
+account.3.send_anonymous_rejection_code =
+account.3.anonymous_reject_offcode =
+account.3.anonymous_reject_oncode =
+account.3.reject_anonymous_call=
+account.3.anonymous_call_offcode =
+account.3.anonymous_call_oncode =
+account.3.anonymous_call = 0
+account.3.send_anonymous_code =
+
+
+
+#######################################################################################
+##                          Call Configuration                                       ##
+#######################################################################################
+account.3.music_server_uri=
+account.3.music_on_hold_type=
+account.3.auto_label.rule=
+account.3.auto_label.enable=
+account.3.number_of_linekey=
+account.3.phone_setting.call_appearance.calls_per_linekey=
+
+
+#######################################################################################
+##                                    Codec                                          ##
+#######################################################################################
+account.3.codec.ilbc_15_2kbps.priority=
+account.3.codec.ilbc_15_2kbps.enable=
+
+account.3.codec.ilbc_13_33kbps.priority= {if isset($yealink_codec_iLBC_priority)}{$yealink_codec_iLBC_priority}{else}0{/if}
+
+account.3.codec.ilbc_13_33kbps.enable = {if isset($yealink_codec_iLBC_enable)}1{else}0{/if}
+
+account.3.codec.pcma.enable= {if isset($yealink_codec_pcma_enable)}1{else}0{/if}
+
+account.3.codec.pcma.priority= {if isset($yealink_codec_pcma_priority)}{$yealink_codec_pcma_priority}{else}0{/if}
+
+account.3.codec.pcmu.enable= {if isset($yealink_codec_pcmu_enable)}1{else}0{/if}
+
+account.3.codec.pcmu.priority= {if isset($yealink_codec_pcmu_priority)}{$yealink_codec_pcmu_priority}{else}0{/if}
+
+account.3.codec.opus.priority= {if isset($yealink_codec_opus_priority)}{$yealink_codec_opus_priority}{else}0{/if}
+
+account.3.codec.opus.enable= {if isset($yealink_codec_opus_enable)}1{else}0{/if}
+
+account.3.codec.opus.para= 106
+
+account.3.codec.g726_40.enable= {if isset($yealink_codec_g726_40_enable)}1{else}0{/if}
+
+account.3.codec.g726_40.priority= {if isset($yealink_codec_g726_40_priority)}{$yealink_codec_g726_40_priority}{else}0{/if}
+
+account.3.codec.g726_32.enable= {if isset($yealink_codec_g726_32_enable)}1{else}0{/if}
+
+account.3.codec.g726_32.priority= {if isset($yealink_codec_g726_32_priority)}{$yealink_codec_g726_32_priority}{else}0{/if}
+
+account.3.codec.g726_24.enable= {if isset($yealink_codec_g726_24_enable)}1{else}0{/if}
+
+account.3.codec.g726_24.priority= {if isset($yealink_codec_g726_24_priority)}{$yealink_codec_g726_24_priority}{else}0{/if}
+
+account.3.codec.g726_16.enable= {if isset($yealink_codec_g726_16_enable)}1{else}0{/if}
+
+account.3.codec.g726_16.priority= {if isset($yealink_codec_g726_16_priority)}{$yealink_codec_g726_16_priority}{else}0{/if}
+
+account.3.codec.g723_63.priority= {if isset($yealink_codec_g723_63_priority)}{$yealink_codec_g723_63_priority}{else}0{/if}
+
+account.3.codec.g723_63.enable= {if isset($yealink_codec_g723_63_enable)}1{else}0{/if}
+
+account.3.codec.g723_53.priority= {if isset($yealink_codec_g723_53_priority)}{$yealink_codec_g723_53_priority}{else}0{/if}
+
+account.3.codec.g723_53.enable= {if isset($yealink_codec_g723_53_enable)}1{else}0{/if}
+
+account.3.codec.g729.priority= {if isset($yealink_codec_g729_priority)}{$yealink_codec_g729_priority}{else}0{/if}
+
+account.3.codec.g729.enable= {if isset($yealink_codec_g729_enable)}1{else}0{/if}
+
+account.3.codec.g722.priority= {if isset($yealink_codec_g722_priority)}{$yealink_codec_g722_priority}{else}0{/if}
+
+account.3.codec.g722.enable= {if isset($yealink_codec_g722_enable)}1{else}0{/if}
+
+account.3.codec.G722_1_24kpbs.priority=
+account.3.codec.G722_1_24kpbs.enable=
+account.3.codec.G722_1c_24kpbs.priority=
+account.3.codec.G722_1c_24kpbs.enable=
+account.3.codec.G722_1c_32kpbs.priority=
+account.3.codec.G722_1c_32kpbs.enable=
+account.3.codec.G722_1c_48kpbs.priority=
+account.3.codec.G722_1c_48kpbs.enable=
+
+################################################################
+#                      Account3 Register                       ##
+################################################################
+{if isset($account.3.password) }
+account.3.enable = 1
+{else}
+account.3.enable = 0
+{/if}
+account.3.label = {$account.3.display_name}
+account.3.display_name = {$account.3.display_name}
+account.3.auth_name = {$account.3.auth_id}
+
+{if isset($account.3.server.1.address)}
+account.3.user_name = {$account.3.user_id}@{$account.3.server_address}
+{else}
+account.3.user_name = {$account.3.user_id}
+{/if}
+
+account.3.password = {$account.3.password}
+account.3.sip_server.1.address= {$account.3.server_address}
+account.3.sip_server_port = {$account.3.sip_port}
+
+
+#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
+{if $account.3.sip_transport == 'udp'}account.3.sip_server.1.transport_type = 0{/if}
+{if $account.3.sip_transport == 'tcp'}account.3.sip_server.1.transport_type = 1{/if}
+{if $account.3.sip_transport == 'tls'}account.3.sip_server.1.transport_type = 2{/if}
+{if $account.3.sip_transport == 'dns srv'}account.3.sip_server.1.transport_type = 3{/if}
+
+account.3.sip_server.1.expires=  {$account.3.register_expires}
+account.3.sip_server.1.retry_counts= 3
+
+account.3.sip_server.2.address= {$account.3.server.2.address}
+account.3.sip_server.2.port= {$account.3.sip_port}
+
+#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS-NAPTR;
+{if $account.3.sip_transport == 'udp'}account.3.sip_server.2.transport_type = 0{/if}
+{if $account.3.sip_transport == 'tcp'}account.3.sip_server.2.transport_type = 1{/if}
+{if $account.3.sip_transport == 'tls'}account.3.sip_server.2.transport_type = 2{/if}
+{if $account.3.sip_transport == 'dns srv'}account.3.sip_server.2.transport_type = 3{/if}
+
+account.3.sip_server.2.expires= {$account.3.register_expires}
+account.3.sip_server.2.retry_counts= 3
+
+account.3.outbound_proxy_enable = {if isset($account.3.outbound_proxy_primary)}1{else}0{/if}
+
+account.3.outbound_proxy.1.address = {$account.3.outbound_proxy_primary}
+account.3.outbound_proxy.2.address = {$account.3.outbound_proxy_secondary}
+
+{if isset($outbound_proxy_1_port)}
+account.3.outbound_proxy.1.port = {$outbound_proxy_1_port}
+{else}
+account.3.outbound_proxy.1.port = {$account.3.sip_port}
+{/if}
+
+account.3.outbound_proxy.2.address= {$account.3.outbound_proxy_secondary}
+
+{if isset($outbound_proxy_1_port)}
+account.3.outbound_proxy.2.port = {$outbound_proxy_2_port}
+{else}
+account.3.outbound_proxy.2.port = {$account.3.sip_port}
+{/if}
+
+account.3.outbound_proxy_fallback_interval= {$yealink_outbound_proxy_fallback_interval}
+
+account.3.nat.nat_traversal= {if isset($stun_server)}1{else}0{/if}
+
+
+
+################################################################
+#                      Account Basic                          ##
+################################################################
+account.3.auto_answer=
+
+################################################################
+#                      Account Advanced                       ##
+################################################################
+account.3.nat.udp_update_enable=
+account.3.nat.udp_update_time=
+account.3.nat.rport= {$yealink_rport}
+
+account.3.dtmf.type= {$yealink_dtmf_type}
+account.3.dtmf.info_type=
+account.3.dtmf.dtmf_payload=
+account.3.100rel_enable=
+
+account.3.subscribe_register=
+account.3.cid_source= {$yealink_cid_source}
+account.3.enable_user_equal_phone=
+account.3.srtp_encryption= {$yealink_srtp_encryption}
+account.3.ptime=
+account.3.register_line=
+account.3.register_mac=
+account.3.reg_fail_retry_interval=
+account.3.unregister_on_reboot=
+
+account.3.session_timer.refresher=
+account.3.session_timer.expires=
+account.3.session_timer.enable= {$yealink_session_timer}
+
+account.3.conf_type = {if $nway_conference == true}2{/if}
+account.3.sip_server_type=
+
+##V83 Add
+account.3.srtp.unencrypted_rtcp.enable =
+account.3.srtp.unencrypted_rtp.enable =
+account.3.sip_server_mode =
+
+
+
+################################################################
+#                        SIP Backup Server                    ##
+################################################################
+account.3.outbound_proxy.1.register_on_enable=
+account.3.outbound_proxy.1.failback_timeout=
+account.3.outbound_proxy.1.failback_mode=
+account.3.outbound_proxy.1.retry_counts=
+account.3.outbound_proxy.1.only_signal_with_registered=
+account.3.outbound_proxy.1.failback_subscribe.enable=
+account.3.outbound_proxy.1.invite_retry_counts=
+
+account.3.sip_server.1.register_on_enable=
+account.3.sip_server.1.failback_timeout=
+account.3.sip_server.1.failback_mode=
+account.3.sip_server.1.failback_subscribe.enable=
+account.3.sip_server.1.only_signal_with_registered=
+account.3.sip_server.1.invite_retry_counts=
+
+account.3.outbound_proxy.2.register_on_enable=
+account.3.outbound_proxy.2.failback_timeout=
+account.3.outbound_proxy.2.failback_mode=
+account.3.outbound_proxy.2.retry_counts=
+account.3.outbound_proxy.2.only_signal_with_registered=
+account.3.outbound_proxy.2.failback_subscribe.enable=
+account.3.outbound_proxy.2.invite_retry_counts=
+
+account.3.sip_server.2.register_on_enable=
+account.3.sip_server.2.failback_timeout=
+account.3.sip_server.2.failback_mode=
+account.3.sip_server.2.failback_subscribe.enable=
+account.3.sip_server.2.only_signal_with_registered=
+account.3.sip_server.2.invite_retry_counts=
+
+account.3.static_cache_pri=
+account.3.dns_cache_type=
+account.3.naptr_build=
+account.3.fallback.timeout=
+account.3.fallback.redundancy_type=
+account.3.reg_failed_retry_max_time=
+account.3.reg_failed_retry_min_time=
+account.3.redundancy_with_reg_fail.enable =
+
+##V83 Add
+account.3.sip_server.1.outbound_proxy_enable =
+account.3.sip_server.2.outbound_proxy_enable =
+
+################################################################
+#                        SIP Basic config                     ##
+################################################################
+account.3.contact_take_line_param=
+account.3.update_ack_while_dialing=
+account.3.srtp_lifetime=
+account.3.third_part_request_with_route.enable=
+account.3.insert_outbound_in_route.enable=
+account.3.path.enable=
+account.3.sub_fail_retry_interval=
+account.3.transfer_refer_to_contact_header.enable=
+account.3.hold_use_inactive=
+account.3.gruu.enable=
+account.3.dial_tone=
+account.3.call_id_mode=
+account.3.subscribe_expires_overlap=
+account.3.register_expires_overlap=
+account.3.call_info=
+account.3.custom_ua=
+account.3.mwi_parse_terminated=
+account.3.check_cseq.enable=
+account.3.check_to_tag.enable=
+account.3.vq_rtcpxr.collector_server_port=
+account.3.vq_rtcpxr.collector_server_host=
+account.3.vq_rtcpxr.collector_name=
+account.3.compact_header_enable=
+account.3.cp_source= 2
+account.3.cid_source_ppi= 1
+account.3.cid_source_privacy= 1
+account.3.reg_with_pani_header.enable =
+account.3.alert_info=
+account.3.picture_info_enable= 1
+
+##V83 Add
+account.3.invite_with_pani_header.enable = 
+
+##V84 Add
+account.3.invite_with_rpid_header.enable=
+
+account.3.auto_answer_mute_enable
+
+##V84 SP4 Add
+account.3.share_line.enable_private_code =
+account.3.share_line.cancel_private_code =
+
+#######################################################################################
+##                                 History                                           ##
+#######################################################################################
+account.3.missed_calllog=
+
+
+#######################################################################################
+##                                  Forward                                          ##
+#######################################################################################
+account.3.timeout_fwd.off_code=
+account.3.timeout_fwd.on_code=
+account.3.timeout_fwd.timeout=
+account.3.timeout_fwd.target=
+account.3.timeout_fwd.enable=
+account.3.busy_fwd.off_code=
+account.3.busy_fwd.on_code=
+account.3.busy_fwd.target=
+account.3.busy_fwd.enable=
+account.3.always_fwd.off_code=
+account.3.always_fwd.on_code=
+account.3.always_fwd.target=
+account.3.always_fwd.enable=
+
+
+#######################################################################################
+##                                  DND                                              ##
+#######################################################################################
+account.3.dnd.enable=
+account.3.dnd.off_code=
+account.3.dnd.on_code=
+
+
+
+#######################################################################################
+##                               Voice Mail                                          ##
+#######################################################################################
+voice_mail.number.1= {$voicemail_number}
+account.3.subscribe_mwi= 1
+account.3.subscribe_mwi_to_vm= {$yealink_subscribe_mwi_to_vm}
+account.3.subscribe_mwi_expires= 3600
+account.3.display_mwi.enable=
+
+#######################################################################################
+##                               Auto Dial                                           ##
+#######################################################################################
+account.3.auto_dial_enable=
+account.3.auto_dial_num=
+
+
+#######################################################################################
+##                           Preference&Status                                       ##
+#######################################################################################
+account.3.ringtone.ring_type=
+
+#######################################################################################
+##                           Digitmap                                                ##
+#######################################################################################
+account.3.dialplan.digitmap.enable=
+account.3.dialplan.digitmap.string=
+account.3.dialplan.digitmap.no_match_action=
+account.3.dialplan.digitmap.interdigit_short_timer=
+account.3.dialplan.digitmap.interdigit_long_timer=
+account.3.dialplan.digitmap.apply_to.press_send=
+account.3.dialplan.digitmap.apply_to.forward=
+account.3.dialplan.digitmap.apply_to.history_dial=
+account.3.dialplan.digitmap.apply_to.directory_dial=
+account.3.dialplan.digitmap.apply_to.on_hook_dial=
+account.3.dialplan.digitmap.active.on_hook_dialing=
+
+
+#######################################################################################
+##                                 Rings Settings                                    ##
+#######################################################################################
+account.3.alert_info_url_enable=
+
+
+#######################################################################################
+##                                  BLF/BLF List                                     ##
+#######################################################################################
+account.3.blf.blf_list_uri=
+account.3.blf_list_barge_in_code=
+account.3.blf_list_code=
+account.3.blf_list_retrieve_call_parked_code=
+account.3.blf.subscribe_period=
+account.3.blf.match_host.enable=
+account.3.out_dialog_blf_enable=
+account.3.blf.subscribe_event=
+
+##V84 Add
+account.3.blf_list_call_parked_code=
+account.3.blf_list_call_parked_list=
+
+##V84 SP4 ADD
+account.3.blf_list_whisper_code=
+account.3.blf_list_listen_in_code=
+
+
+#######################################################################################
+##                                   SCA                                             ##
+#######################################################################################
+account.3.shared_line=
+account.3.line_seize.expires=
+account.3.shared_line_one_touch_bargein.enable=
+account.3.shared_line_one_touch_retrieve.enable=
+account.3.sca_manage_interface_display_time=
+account.3.shared_line_callpull_code=
+
+##V83 Add
+account.x.share_line.barge_in.enable
+
+#######################################################################################
+##                                   BLA                                             ##
+#######################################################################################
+account.3.bla_number=
+account.3.bla_subscribe_period=
+account.3.bla.notify_with_expire.enable=
+account.3.bla.subscribe_uri_build_type=
+
+#######################################################################################
+##                                   Call Park                                       ##
+#######################################################################################
+account.3.callpark_enable=
+
+
+#######################################################################################
+##                                    Broadsoft ACD                                  ##
+#######################################################################################
+account.3.acd.enable= 0
+account.3.acd.available= 0
+account.3.acd.unavailable_reason_enable= 0
+account.3.acd.initial_state= 1
+account.3.subscribe_acd_expires=
+
+
+#######################################################################################
+##                                 Broadsoft ACD Call Center                         ##
+#######################################################################################
+##account.X.reason_code.Y=
+##account.X.reason_code_name.Y=
+##account.X.bw_disp_code.Y=
+##account.X.bw_disp_code_name.Y=
+##account.X.supervisor_info_code.Y=
+##account.X.supervisor_info_code_name.Y=
+##The value Y must be continuous.
+
+account.3.reason_code.1=
+account.3.reason_code_name.1= 0
+account.3.bw_disp_code.1=
+account.3.bw_disp_code_name.1=
+account.3.supervisor_info_code.1=
+account.3.supervisor_info_code_name.1=
+
+#######################################################################################
+##                                 Broadsoft Call Center                             ##
+#######################################################################################
+account.3.call_center.call_info_enable= 0
+account.3.call_center.show_call_info_time= 30
+account.3.call_center.disp_code_enable= 0
+account.3.call_center.trace_enable= 0
+account.3.call_center.emergency_enable= 0
+account.3.call_center.queue_status_enable= 0
+account.3.call_center.queue_status_light_enable = 0
+
+
+
+#######################################################################################
+##                         Broadsoft Hoteling                                        ##
+#######################################################################################
+account.3.hoteling.enable= 0
+account.3.hoteling.user_id= 0
+account.3.hoteling.password= 0
+account.3.hoteling.expires= 0
+account.3.hoteling.auto_login_enable= 0
+
+
+#######################################################################################
+##                              Broadsoft XSI                                        ##
+#######################################################################################
+account.3.xsi.user =
+account.3.xsi.password =
+account.3.xsi.host =
+account.3.xsi.server_type =
+account.3.xsi.port =
+
+
+#######################################################################################
+##                                Call Pickup                                        ##
+#######################################################################################
+account.3.direct_pickup_code =
+account.3.group_pickup_code =
+account.3.dialoginfo_callpickup = 0
+account.3.refresh_remote_id.enable =
+
+
+#######################################################################################
+##                              Broadsoft Call Recording                             ##
+#######################################################################################
+account.3.call_recording.enable=
+
+#######################################################################################
+##                                Network Conference                                  ##
+#######################################################################################
+account.3.conf_uri = {if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}
+
+
+#######################################################################################
+##                              Broadsoft Call Decline                               ##
+#######################################################################################
+account.3.features.call_decline.enable =
+
+
+#######################################################################################
+##                       Broadsoft Security Classification                           ##
+#######################################################################################
+account.3.security_classification.enable =
+
+
+
+#######################################################################################
+##                        Broadsoft Flexible Seating                                 ##
+#######################################################################################
+account.3.flexible_seating.enable=
+account.3.hoteling.pin=
+account.3.hoteling.mode=
+
+#######################################################################################
+##                         Features Sync                                             ##
+#######################################################################################
+account.3.features.forward.feature_key_sync.local_processing.enable=
+account.3.features.dnd.feature_key_sync.local_processing.enable =
+
+##V84 Add
+account.3.dnd.feature_key_sync.enable=
+account.3.feature_key_sync.enable=
+account.3.forward.feature_key_sync.enable=
+
+#######################################################################################
+##                                   ACD                                             ##
+#######################################################################################
+account.3.acd.available_url=
+account.3.acd.away_url =
+account.3.acd.refresh_url =
+account.3.acd.call_information=
+
+
+
+#######################################################################################
+##                                  virtual_user                                     ##
+#######################################################################################
+##V84 Add
+#bw.virtual_user.1.enable=
+#bw.virtual_user.1.label=
+#bw.virtual_user.1.xsi.dnd.enable=
+#bw.virtual_user.1.xsi.host=
+#bw.virtual_user.1.xsi.password=
+#bw.virtual_user.1.xsi.port=
+#bw.virtual_user.1.xsi.server_type=
+#bw.virtual_user.1.xsi.user=
+
+#!version:1.0.0.1
+
+##File header "#!version:1.0.0.1" can not be edited or deleted, and must be placed in the first line.##
+##account.X.*:(T5XW/T54S/T48G/T48S/T46G/T46S/T29G/T46U/T48U: X ranges from 1 to 16. T52S/T42G/T42S/T43U: X ranges from 1 to 12. T41P/T41S/T27P/T27G/T41U: X ranges from 1 to 6. T40P/T40G/T23P/T23G: X ranges from 1 to 3. T21(P) E2: X ranges from 1 to 2.)##
+
+#######################################################################################
+##                                   Transfer                                        ##
+#######################################################################################
+account.4.phone_setting.call_appearance.transfer_via_new_linekey= {$yealink_transfer_via_new_linekey}
+
+
+#######################################################################################
+##                                   Conference                                      ##
+#######################################################################################
+account.4.phone_setting.call_appearance.conference_via_new_linekey=
+
+
+#######################################################################################
+##                                   Anonymous                                       ##
+#######################################################################################
+account.4.anonymous_call.server_base_only =
+account.4.send_anonymous_rejection_code =
+account.4.anonymous_reject_offcode =
+account.4.anonymous_reject_oncode =
+account.4.reject_anonymous_call=
+account.4.anonymous_call_offcode =
+account.4.anonymous_call_oncode =
+account.4.anonymous_call = 0
+account.4.send_anonymous_code =
+
+
+
+#######################################################################################
+##                          Call Configuration                                       ##
+#######################################################################################
+account.4.music_server_uri=
+account.4.music_on_hold_type=
+account.4.auto_label.rule=
+account.4.auto_label.enable=
+account.4.number_of_linekey=
+account.4.phone_setting.call_appearance.calls_per_linekey=
+
+
+#######################################################################################
+##                                    Codec                                          ##
+#######################################################################################
+account.4.codec.ilbc_15_2kbps.priority=
+account.4.codec.ilbc_15_2kbps.enable=
+
+account.4.codec.ilbc_13_33kbps.priority= {if isset($yealink_codec_iLBC_priority)}{$yealink_codec_iLBC_priority}{else}0{/if}
+
+account.4.codec.ilbc_13_33kbps.enable = {if isset($yealink_codec_iLBC_enable)}1{else}0{/if}
+
+account.4.codec.pcma.enable= {if isset($yealink_codec_pcma_enable)}1{else}0{/if}
+
+account.4.codec.pcma.priority= {if isset($yealink_codec_pcma_priority)}{$yealink_codec_pcma_priority}{else}0{/if}
+
+account.4.codec.pcmu.enable= {if isset($yealink_codec_pcmu_enable)}1{else}0{/if}
+
+account.4.codec.pcmu.priority= {if isset($yealink_codec_pcmu_priority)}{$yealink_codec_pcmu_priority}{else}0{/if}
+
+account.4.codec.opus.priority= {if isset($yealink_codec_opus_priority)}{$yealink_codec_opus_priority}{else}0{/if}
+
+account.4.codec.opus.enable= {if isset($yealink_codec_opus_enable)}1{else}0{/if}
+
+account.4.codec.opus.para= 106
+
+account.4.codec.g726_40.enable= {if isset($yealink_codec_g726_40_enable)}1{else}0{/if}
+
+account.4.codec.g726_40.priority= {if isset($yealink_codec_g726_40_priority)}{$yealink_codec_g726_40_priority}{else}0{/if}
+
+account.4.codec.g726_32.enable= {if isset($yealink_codec_g726_32_enable)}1{else}0{/if}
+
+account.4.codec.g726_32.priority= {if isset($yealink_codec_g726_32_priority)}{$yealink_codec_g726_32_priority}{else}0{/if}
+
+account.4.codec.g726_24.enable= {if isset($yealink_codec_g726_24_enable)}1{else}0{/if}
+
+account.4.codec.g726_24.priority= {if isset($yealink_codec_g726_24_priority)}{$yealink_codec_g726_24_priority}{else}0{/if}
+
+account.4.codec.g726_16.enable= {if isset($yealink_codec_g726_16_enable)}1{else}0{/if}
+
+account.4.codec.g726_16.priority= {if isset($yealink_codec_g726_16_priority)}{$yealink_codec_g726_16_priority}{else}0{/if}
+
+account.4.codec.g723_63.priority= {if isset($yealink_codec_g723_63_priority)}{$yealink_codec_g723_63_priority}{else}0{/if}
+
+account.4.codec.g723_63.enable= {if isset($yealink_codec_g723_63_enable)}1{else}0{/if}
+
+account.4.codec.g723_53.priority= {if isset($yealink_codec_g723_53_priority)}{$yealink_codec_g723_53_priority}{else}0{/if}
+
+account.4.codec.g723_53.enable= {if isset($yealink_codec_g723_53_enable)}1{else}0{/if}
+
+account.4.codec.g729.priority= {if isset($yealink_codec_g729_priority)}{$yealink_codec_g729_priority}{else}0{/if}
+
+account.4.codec.g729.enable= {if isset($yealink_codec_g729_enable)}1{else}0{/if}
+
+account.4.codec.g722.priority= {if isset($yealink_codec_g722_priority)}{$yealink_codec_g722_priority}{else}0{/if}
+
+account.4.codec.g722.enable= {if isset($yealink_codec_g722_enable)}1{else}0{/if}
+
+account.4.codec.G722_1_24kpbs.priority=
+account.4.codec.G722_1_24kpbs.enable=
+account.4.codec.G722_1c_24kpbs.priority=
+account.4.codec.G722_1c_24kpbs.enable=
+account.4.codec.G722_1c_32kpbs.priority=
+account.4.codec.G722_1c_32kpbs.enable=
+account.4.codec.G722_1c_48kpbs.priority=
+account.4.codec.G722_1c_48kpbs.enable=
+
+################################################################
+#                      Account4 Register                       ##
+################################################################
+{if isset($account.4.password) }
+account.4.enable = 1
+{else}
+account.4.enable = 0
+{/if}
+account.4.label = {$account.4.display_name}
+account.4.display_name = {$account.4.display_name}
+account.4.auth_name = {$account.4.auth_id}
+
+{if isset($account.4.server.1.address)}
+account.4.user_name = {$account.4.user_id}@{$account.4.server_address}
+{else}
+account.4.user_name = {$account.4.user_id}
+{/if}
+
+account.4.password = {$account.4.password}
+account.4.sip_server.1.address= {$account.4.server_address}
+account.4.sip_server_port = {$account.4.sip_port}
+
+
+#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
+{if $account.4.sip_transport == 'udp'}account.4.sip_server.1.transport_type = 0{/if}
+{if $account.4.sip_transport == 'tcp'}account.4.sip_server.1.transport_type = 1{/if}
+{if $account.4.sip_transport == 'tls'}account.4.sip_server.1.transport_type = 2{/if}
+{if $account.4.sip_transport == 'dns srv'}account.4.sip_server.1.transport_type = 3{/if}
+
+account.4.sip_server.1.expires=  {$account.4.register_expires}
+account.4.sip_server.1.retry_counts= 3
+
+account.4.sip_server.2.address= {$account.4.server.2.address}
+account.4.sip_server.2.port= {$account.4.sip_port}
+
+#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS-NAPTR;
+{if $account.4.sip_transport == 'udp'}account.4.sip_server.2.transport_type = 0{/if}
+{if $account.4.sip_transport == 'tcp'}account.4.sip_server.2.transport_type = 1{/if}
+{if $account.4.sip_transport == 'tls'}account.4.sip_server.2.transport_type = 2{/if}
+{if $account.4.sip_transport == 'dns srv'}account.4.sip_server.2.transport_type = 3{/if}
+
+account.4.sip_server.2.expires= {$account.4.register_expires}
+account.4.sip_server.2.retry_counts= 3
+
+account.4.outbound_proxy_enable = {if isset($account.4.outbound_proxy_primary)}1{else}0{/if}
+
+account.4.outbound_proxy.1.address = {$account.4.outbound_proxy_primary}
+account.4.outbound_proxy.2.address = {$account.4.outbound_proxy_secondary}
+
+{if isset($outbound_proxy_1_port)}
+account.4.outbound_proxy.1.port = {$outbound_proxy_1_port}
+{else}
+account.4.outbound_proxy.1.port = {$account.4.sip_port}
+{/if}
+
+account.4.outbound_proxy.2.address= {$account.4.outbound_proxy_secondary}
+
+{if isset($outbound_proxy_1_port)}
+account.4.outbound_proxy.2.port = {$outbound_proxy_2_port}
+{else}
+account.4.outbound_proxy.2.port = {$account.4.sip_port}
+{/if}
+
+account.4.outbound_proxy_fallback_interval= {$yealink_outbound_proxy_fallback_interval}
+
+account.4.nat.nat_traversal= {if isset($stun_server)}1{else}0{/if}
+
+
+
+################################################################
+#                      Account Basic                          ##
+################################################################
+account.4.auto_answer=
+
+################################################################
+#                      Account Advanced                       ##
+################################################################
+account.4.nat.udp_update_enable=
+account.4.nat.udp_update_time=
+account.4.nat.rport= {$yealink_rport}
+
+account.4.dtmf.type= {$yealink_dtmf_type}
+account.4.dtmf.info_type=
+account.4.dtmf.dtmf_payload=
+account.4.100rel_enable=
+
+account.4.subscribe_register=
+account.4.cid_source= {$yealink_cid_source}
+account.4.enable_user_equal_phone=
+account.4.srtp_encryption= {$yealink_srtp_encryption}
+account.4.ptime=
+account.4.register_line=
+account.4.register_mac=
+account.4.reg_fail_retry_interval=
+account.4.unregister_on_reboot=
+
+account.4.session_timer.refresher=
+account.4.session_timer.expires=
+account.4.session_timer.enable= {$yealink_session_timer}
+
+account.4.conf_type = {if $nway_conference == true}2{/if} 
+account.4.sip_server_type=
+
+##V83 Add
+account.4.srtp.unencrypted_rtcp.enable =
+account.4.srtp.unencrypted_rtp.enable =
+account.4.sip_server_mode =
+
+
+
+################################################################
+#                        SIP Backup Server                    ##
+################################################################
+account.4.outbound_proxy.1.register_on_enable=
+account.4.outbound_proxy.1.failback_timeout=
+account.4.outbound_proxy.1.failback_mode=
+account.4.outbound_proxy.1.retry_counts=
+account.4.outbound_proxy.1.only_signal_with_registered=
+account.4.outbound_proxy.1.failback_subscribe.enable=
+account.4.outbound_proxy.1.invite_retry_counts=
+
+account.4.sip_server.1.register_on_enable=
+account.4.sip_server.1.failback_timeout=
+account.4.sip_server.1.failback_mode=
+account.4.sip_server.1.failback_subscribe.enable=
+account.4.sip_server.1.only_signal_with_registered=
+account.4.sip_server.1.invite_retry_counts=
+
+account.4.outbound_proxy.2.register_on_enable=
+account.4.outbound_proxy.2.failback_timeout=
+account.4.outbound_proxy.2.failback_mode=
+account.4.outbound_proxy.2.retry_counts=
+account.4.outbound_proxy.2.only_signal_with_registered=
+account.4.outbound_proxy.2.failback_subscribe.enable=
+account.4.outbound_proxy.2.invite_retry_counts=
+
+account.4.sip_server.2.register_on_enable=
+account.4.sip_server.2.failback_timeout=
+account.4.sip_server.2.failback_mode=
+account.4.sip_server.2.failback_subscribe.enable=
+account.4.sip_server.2.only_signal_with_registered=
+account.4.sip_server.2.invite_retry_counts=
+
+account.4.static_cache_pri=
+account.4.dns_cache_type=
+account.4.naptr_build=
+account.4.fallback.timeout=
+account.4.fallback.redundancy_type=
+account.4.reg_failed_retry_max_time=
+account.4.reg_failed_retry_min_time=
+account.4.redundancy_with_reg_fail.enable =
+
+##V83 Add
+account.4.sip_server.1.outbound_proxy_enable =
+account.4.sip_server.2.outbound_proxy_enable =
+
+################################################################
+#                        SIP Basic config                     ##
+################################################################
+account.4.contact_take_line_param=
+account.4.update_ack_while_dialing=
+account.4.srtp_lifetime=
+account.4.third_part_request_with_route.enable=
+account.4.insert_outbound_in_route.enable=
+account.4.path.enable=
+account.4.sub_fail_retry_interval=
+account.4.transfer_refer_to_contact_header.enable=
+account.4.hold_use_inactive=
+account.4.gruu.enable=
+account.4.dial_tone=
+account.4.call_id_mode=
+account.4.subscribe_expires_overlap=
+account.4.register_expires_overlap=
+account.4.call_info=
+account.4.custom_ua=
+account.4.mwi_parse_terminated=
+account.4.check_cseq.enable=
+account.4.check_to_tag.enable=
+account.4.vq_rtcpxr.collector_server_port=
+account.4.vq_rtcpxr.collector_server_host=
+account.4.vq_rtcpxr.collector_name=
+account.4.compact_header_enable=
+account.4.cp_source= 2
+account.4.cid_source_ppi= 1
+account.4.cid_source_privacy= 1
+account.4.reg_with_pani_header.enable =
+account.4.alert_info=
+account.4.picture_info_enable= 1
+
+##V83 Add
+account.4.invite_with_pani_header.enable = 
+
+##V84 Add
+account.4.invite_with_rpid_header.enable=
+
+account.4.auto_answer_mute_enable
+
+##V84 SP4 Add
+account.4.share_line.enable_private_code =
+account.4.share_line.cancel_private_code =
+
+#######################################################################################
+##                                 History                                           ##
+#######################################################################################
+account.4.missed_calllog=
+
+
+#######################################################################################
+##                                  Forward                                          ##
+#######################################################################################
+account.4.timeout_fwd.off_code=
+account.4.timeout_fwd.on_code=
+account.4.timeout_fwd.timeout=
+account.4.timeout_fwd.target=
+account.4.timeout_fwd.enable=
+account.4.busy_fwd.off_code=
+account.4.busy_fwd.on_code=
+account.4.busy_fwd.target=
+account.4.busy_fwd.enable=
+account.4.always_fwd.off_code=
+account.4.always_fwd.on_code=
+account.4.always_fwd.target=
+account.4.always_fwd.enable=
+
+
+#######################################################################################
+##                                  DND                                              ##
+#######################################################################################
+account.4.dnd.enable=
+account.4.dnd.off_code=
+account.4.dnd.on_code=
+
+
+
+#######################################################################################
+##                               Voice Mail                                          ##
+#######################################################################################
+voice_mail.number.1= {$voicemail_number}
+account.4.subscribe_mwi= 1
+account.4.subscribe_mwi_to_vm= {$yealink_subscribe_mwi_to_vm}
+account.4.subscribe_mwi_expires= 3600
+account.4.display_mwi.enable=
+
+#######################################################################################
+##                               Auto Dial                                           ##
+#######################################################################################
+account.4.auto_dial_enable=
+account.4.auto_dial_num=
+
+
+#######################################################################################
+##                           Preference&Status                                       ##
+#######################################################################################
+account.4.ringtone.ring_type=
+
+#######################################################################################
+##                           Digitmap                                                ##
+#######################################################################################
+account.4.dialplan.digitmap.enable=
+account.4.dialplan.digitmap.string=
+account.4.dialplan.digitmap.no_match_action=
+account.4.dialplan.digitmap.interdigit_short_timer=
+account.4.dialplan.digitmap.interdigit_long_timer=
+account.4.dialplan.digitmap.apply_to.press_send=
+account.4.dialplan.digitmap.apply_to.forward=
+account.4.dialplan.digitmap.apply_to.history_dial=
+account.4.dialplan.digitmap.apply_to.directory_dial=
+account.4.dialplan.digitmap.apply_to.on_hook_dial=
+account.4.dialplan.digitmap.active.on_hook_dialing=
+
+
+#######################################################################################
+##                                 Rings Settings                                    ##
+#######################################################################################
+account.4.alert_info_url_enable=
+
+
+#######################################################################################
+##                                  BLF/BLF List                                     ##
+#######################################################################################
+account.4.blf.blf_list_uri=
+account.4.blf_list_barge_in_code=
+account.4.blf_list_code=
+account.4.blf_list_retrieve_call_parked_code=
+account.4.blf.subscribe_period=
+account.4.blf.match_host.enable=
+account.4.out_dialog_blf_enable=
+account.4.blf.subscribe_event=
+
+##V84 Add
+account.4.blf_list_call_parked_code=
+account.4.blf_list_call_parked_list=
+
+##V84 SP4 ADD
+account.4.blf_list_whisper_code=
+account.4.blf_list_listen_in_code=
+
+
+#######################################################################################
+##                                   SCA                                             ##
+#######################################################################################
+account.4.shared_line=
+account.4.line_seize.expires=
+account.4.shared_line_one_touch_bargein.enable=
+account.4.shared_line_one_touch_retrieve.enable=
+account.4.sca_manage_interface_display_time=
+account.4.shared_line_callpull_code=
+
+##V83 Add
+account.x.share_line.barge_in.enable
+
+#######################################################################################
+##                                   BLA                                             ##
+#######################################################################################
+account.4.bla_number=
+account.4.bla_subscribe_period=
+account.4.bla.notify_with_expire.enable=
+account.4.bla.subscribe_uri_build_type=
+
+#######################################################################################
+##                                   Call Park                                       ##
+#######################################################################################
+account.4.callpark_enable=
+
+
+#######################################################################################
+##                                    Broadsoft ACD                                  ##
+#######################################################################################
+account.4.acd.enable= 0
+account.4.acd.available= 0
+account.4.acd.unavailable_reason_enable= 0
+account.4.acd.initial_state= 1
+account.4.subscribe_acd_expires=
+
+
+#######################################################################################
+##                                 Broadsoft ACD Call Center                         ##
+#######################################################################################
+##account.X.reason_code.Y=
+##account.X.reason_code_name.Y=
+##account.X.bw_disp_code.Y=
+##account.X.bw_disp_code_name.Y=
+##account.X.supervisor_info_code.Y=
+##account.X.supervisor_info_code_name.Y=
+##The value Y must be continuous.
+
+account.4.reason_code.1=
+account.4.reason_code_name.1= 0
+account.4.bw_disp_code.1=
+account.4.bw_disp_code_name.1=
+account.4.supervisor_info_code.1=
+account.4.supervisor_info_code_name.1=
+
+#######################################################################################
+##                                 Broadsoft Call Center                             ##
+#######################################################################################
+account.4.call_center.call_info_enable= 0
+account.4.call_center.show_call_info_time= 30
+account.4.call_center.disp_code_enable= 0
+account.4.call_center.trace_enable= 0
+account.4.call_center.emergency_enable= 0
+account.4.call_center.queue_status_enable= 0
+account.4.call_center.queue_status_light_enable = 0
+
+
+
+#######################################################################################
+##                         Broadsoft Hoteling                                        ##
+#######################################################################################
+account.4.hoteling.enable= 0
+account.4.hoteling.user_id= 0
+account.4.hoteling.password= 0
+account.4.hoteling.expires= 0
+account.4.hoteling.auto_login_enable= 0
+
+
+#######################################################################################
+##                              Broadsoft XSI                                        ##
+#######################################################################################
+account.4.xsi.user =
+account.4.xsi.password =
+account.4.xsi.host =
+account.4.xsi.server_type =
+account.4.xsi.port =
+
+
+#######################################################################################
+##                                Call Pickup                                        ##
+#######################################################################################
+account.4.direct_pickup_code =
+account.4.group_pickup_code =
+account.4.dialoginfo_callpickup = 0
+account.4.refresh_remote_id.enable =
+
+
+#######################################################################################
+##                              Broadsoft Call Recording                             ##
+#######################################################################################
+account.4.call_recording.enable=
+
+#######################################################################################
+##                                Network Conference                                  ##
+#######################################################################################
+account.4.conf_uri = {if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}
+
+
+#######################################################################################
+##                              Broadsoft Call Decline                               ##
+#######################################################################################
+account.4.features.call_decline.enable =
+
+
+#######################################################################################
+##                       Broadsoft Security Classification                           ##
+#######################################################################################
+account.4.security_classification.enable =
+
+
+
+#######################################################################################
+##                        Broadsoft Flexible Seating                                 ##
+#######################################################################################
+account.4.flexible_seating.enable=
+account.4.hoteling.pin=
+account.4.hoteling.mode=
+
+#######################################################################################
+##                         Features Sync                                             ##
+#######################################################################################
+account.4.features.forward.feature_key_sync.local_processing.enable=
+account.4.features.dnd.feature_key_sync.local_processing.enable =
+
+##V84 Add
+account.4.dnd.feature_key_sync.enable=
+account.4.feature_key_sync.enable=
+account.4.forward.feature_key_sync.enable=
+
+#######################################################################################
+##                                   ACD                                             ##
+#######################################################################################
+account.4.acd.available_url=
+account.4.acd.away_url =
+account.4.acd.refresh_url =
+account.4.acd.call_information=
+
+
+
+#######################################################################################
+##                                  virtual_user                                     ##
+#######################################################################################
+##V84 Add
+#bw.virtual_user.1.enable=
+#bw.virtual_user.1.label=
+#bw.virtual_user.1.xsi.dnd.enable=
+#bw.virtual_user.1.xsi.host=
+#bw.virtual_user.1.xsi.password=
+#bw.virtual_user.1.xsi.port=
+#bw.virtual_user.1.xsi.server_type=
+#bw.virtual_user.1.xsi.user=
+
diff --git a/resources/templates/provision/yealink/t38g/y000000000038.cfg b/resources/templates/provision/yealink/t38g/y000000000038.cfg
index da0d703da3..1c3918f9a6 100644
--- a/resources/templates/provision/yealink/t38g/y000000000038.cfg
+++ b/resources/templates/provision/yealink/t38g/y000000000038.cfg
@@ -719,7 +719,7 @@ local_time.interval =
 local_time.summer_time = {$yealink_summer_time}
 
 #Configure the DST type when the DST feature is enabled; 0-By Date (default), 1-By Week;
-local_time.dst_time_type =
+local_time.dst_time_type = {$yealink_dst_type}
 
 #Configure the start time of DST. The default value is 1/1/0.
 #If the DST type is configured as By Date, the value format is Month/Day/Hour. For example, the value 5/20/10 means the start time is at 10:00 on May 20.
@@ -1104,6 +1104,7 @@ features.redial_tone =
 
 #Enable or disable the phone to save the call history; 0-Disabled, 1-Enabled (default);
 features.save_call_history =
+features.save_init_num_to_history.enable = 0
 
 #Configure the phone to receive the action URI request from the specified IP address(es) or any IP address;
 #Enter multiple IP addresses (separated by comma) or "any"(stands for any IP address);
diff --git a/resources/templates/provision/yealink/t38g/{$mac}.cfg b/resources/templates/provision/yealink/t38g/{$mac}.cfg
index e72c1e6a80..b211adf22c 100644
--- a/resources/templates/provision/yealink/t38g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t38g/{$mac}.cfg
@@ -177,10 +177,10 @@ account.1.register_line =
 account.1.reg_fail_retry_interval =
 
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.1.conf_type =
+account.1.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.1.conf_uri =
+account.1.conf_uri = {if $nway_conference == true}nway{$account.1.auth_id}@{$account.1.server_address}{/if}
 
 #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist".
 account.1.blf.blf_list_uri =
@@ -522,10 +522,10 @@ account.2.register_line =
 account.2.reg_fail_retry_interval =
 
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.2.conf_type =
+account.2.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.2.conf_uri =
+account.2.conf_uri = {if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}
 
 #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist".
 account.2.blf.blf_list_uri =
@@ -839,10 +839,10 @@ account.3.register_line =
 account.3.reg_fail_retry_interval =
 
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.3.conf_type =
+account.3.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.3.conf_uri =
+account.3.conf_uri = {if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}
 
 #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist".
 account.3.blf.blf_list_uri =
@@ -1156,10 +1156,10 @@ account.4.register_line =
 account.4.reg_fail_retry_interval =
 
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.4.conf_type =
+account.4.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.4.conf_uri =
+account.4.conf_uri = {if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}
 
 #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist".
 account.4.blf.blf_list_uri =
@@ -1474,10 +1474,10 @@ account.5.register_line =
 account.5.reg_fail_retry_interval =
 
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.5.conf_type =
+account.5.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.5.conf_uri =
+account.5.conf_uri = {if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}
 
 #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist".
 account.5.blf.blf_list_uri =
@@ -1789,10 +1789,10 @@ account.6.register_line =
 account.6.reg_fail_retry_interval =
 
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.6.conf_type =
+account.6.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.6.conf_uri =
+account.6.conf_uri = {if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}
 
 #Configure the BLF list URI (a SIP URI, or use part of the SIP URI). For example, "2300_blflist@domain.com" or "2300_blflist".
 account.6.blf.blf_list_uri =
diff --git a/resources/templates/provision/yealink/t40g/y000000000076.cfg b/resources/templates/provision/yealink/t40g/y000000000076.cfg
index d97c2c17dc..cff5540994 100644
--- a/resources/templates/provision/yealink/t40g/y000000000076.cfg
+++ b/resources/templates/provision/yealink/t40g/y000000000076.cfg
@@ -870,6 +870,7 @@ features.password_dial.length =
 #######################################################################################
 #Enable or disable the phone to save the call history; 0-Disabled, 1-Enabled (default);
 features.save_call_history =
+features.save_init_num_to_history.enable = 0
 
 #######################################################################################
 ##                                   Features Pickup                                 ##
diff --git a/resources/templates/provision/yealink/t40g/{$mac}.cfg b/resources/templates/provision/yealink/t40g/{$mac}.cfg
index 52315e4030..4dd43f9a6f 100644
--- a/resources/templates/provision/yealink/t40g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t40g/{$mac}.cfg
@@ -395,10 +395,10 @@ account.1.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.1.conf_type =
+account.1.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.1.conf_uri =
+account.1.conf_uri = {if $nway_conference == true}nway{$account.1.auth_id}@{$account.1.server_address}{/if}
 
 #######################################################################################
 ##                            cid_source                                             ##
@@ -867,10 +867,10 @@ account.2.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.2.conf_type =
+account.2.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.2.conf_uri =
+account.2.conf_uri = {if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -1383,10 +1383,10 @@ account.3.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.3.conf_type =
+account.3.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.3.conf_uri =
+account.3.conf_uri = {if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -1882,10 +1882,10 @@ account.4.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.4.conf_type =
+account.4.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.4.conf_uri =
+account.4.conf_uri = {if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -2381,10 +2381,10 @@ account.5.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.5.conf_type =
+account.5.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.5.conf_uri =
+account.5.conf_uri = {if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -2879,10 +2879,10 @@ account.6.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.6.conf_type =
+account.6.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.6.conf_uri =
+account.6.conf_uri = {if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
diff --git a/resources/templates/provision/yealink/t40p/y000000000054.cfg b/resources/templates/provision/yealink/t40p/y000000000054.cfg
index 468ad62189..5c943953dc 100644
--- a/resources/templates/provision/yealink/t40p/y000000000054.cfg
+++ b/resources/templates/provision/yealink/t40p/y000000000054.cfg
@@ -869,6 +869,7 @@ features.password_dial.length =
 #######################################################################################
 #Enable or disable the phone to save the call history; 0-Disabled, 1-Enabled (default);
 features.save_call_history =
+features.save_init_num_to_history.enable = 0
 
 #######################################################################################
 ##                                   Features Pickup                                 ##
diff --git a/resources/templates/provision/yealink/t40p/{$mac}.cfg b/resources/templates/provision/yealink/t40p/{$mac}.cfg
index bd15f01f07..a3f17d3516 100644
--- a/resources/templates/provision/yealink/t40p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t40p/{$mac}.cfg
@@ -382,10 +382,10 @@ account.1.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.1.conf_type =
+account.1.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.1.conf_uri =
+account.1.conf_uri = {if $nway_conference == true}nway{$account.1.auth_id}@{$account.1.server_address}{/if}
 
 #######################################################################################
 ##                            cid_source                                             ##
@@ -851,10 +851,10 @@ account.2.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.2.conf_type =
+account.2.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.2.conf_uri =
+account.2.conf_uri = {if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -1364,10 +1364,10 @@ account.3.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.3.conf_type =
+account.3.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.3.conf_uri =
+account.3.conf_uri = {if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -1860,10 +1860,10 @@ account.4.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.4.conf_type =
+account.4.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.4.conf_uri =
+account.4.conf_uri = {if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -2356,10 +2356,10 @@ account.5.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.5.conf_type =
+account.5.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.5.conf_uri =
+account.5.conf_uri = {if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -2851,10 +2851,10 @@ account.6.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.6.conf_type =
+account.6.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.6.conf_uri =
+account.6.conf_uri = {if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
diff --git a/resources/templates/provision/yealink/t41p/y000000000036.cfg b/resources/templates/provision/yealink/t41p/y000000000036.cfg
index 9a6f03b6cf..897ee2d462 100644
--- a/resources/templates/provision/yealink/t41p/y000000000036.cfg
+++ b/resources/templates/provision/yealink/t41p/y000000000036.cfg
@@ -869,6 +869,7 @@ features.password_dial.length =
 #######################################################################################
 #Enable or disable the phone to save the call history; 0-Disabled, 1-Enabled (default);
 features.save_call_history =
+features.save_init_num_to_history.enable = 0
 
 #######################################################################################
 ##                                   Features Pickup                                 ##
diff --git a/resources/templates/provision/yealink/t41p/{$mac}.cfg b/resources/templates/provision/yealink/t41p/{$mac}.cfg
index 9f5b1bc560..40ad80fe3e 100644
--- a/resources/templates/provision/yealink/t41p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t41p/{$mac}.cfg
@@ -381,10 +381,10 @@ account.1.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.1.conf_type =
+account.1.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.1.conf_uri =
+account.1.conf_uri = {if $nway_conference == true}nway{$account.1.auth_id}@{$account.1.server_address}{/if}
 
 #######################################################################################
 ##                            cid_source                                             ##
@@ -850,10 +850,10 @@ account.2.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.2.conf_type =
+account.2.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.2.conf_uri =
+account.2.conf_uri = {if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -1363,10 +1363,10 @@ account.3.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.3.conf_type =
+account.3.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.3.conf_uri =
+account.3.conf_uri = {if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -1859,10 +1859,10 @@ account.4.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.4.conf_type =
+account.4.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.4.conf_uri =
+account.4.conf_uri = {if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -2355,10 +2355,10 @@ account.5.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.5.conf_type =
+account.5.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.5.conf_uri =
+account.5.conf_uri = {if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -2850,10 +2850,10 @@ account.6.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.6.conf_type =
+account.6.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.6.conf_uri =
+account.6.conf_uri = {if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
diff --git a/resources/templates/provision/yealink/t41s/y000000000068.cfg b/resources/templates/provision/yealink/t41s/y000000000068.cfg
index d25710239b..a6806e5de7 100644
--- a/resources/templates/provision/yealink/t41s/y000000000068.cfg
+++ b/resources/templates/provision/yealink/t41s/y000000000068.cfg
@@ -791,7 +791,7 @@ features.save_call_history=
 features.call_log_show_num=
 search_in_dialing.history.enable=
 directory_setting.history.enable=
-features.save_init_num_to_history.enable=
+features.save_init_num_to_history.enable= 0
 features.redial_via_local_sip_server.enable=
 
 
@@ -806,7 +806,11 @@ static.auto_provision.local_contact.backup.enable=
 ##                          Contact Other                                            ##
 #######################################################################################
 directory.search_type=
+{if isset($yealink_local_directory_enable)}
+directory_setting.local_directory.enable = {$yealink_local_directory_enable}
+{else}
 directory_setting.local_directory.enable =
+{/if}
 directory_setting.local_directory.priority =
 
 
diff --git a/resources/templates/provision/yealink/t41s/{$mac}.cfg b/resources/templates/provision/yealink/t41s/{$mac}.cfg
index 620d65944e..9471fc1708 100644
--- a/resources/templates/provision/yealink/t41s/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t41s/{$mac}.cfg
@@ -3,6 +3,7 @@
 
 ##File header "#!version:1.0.0.1" can not be edited or deleted, and must be placed in the first line.##
 
+
 {foreach $lines as $row}
 
 #######################################################################################
@@ -242,6 +243,7 @@ account.{$row.line_number}.bla_subscribe_period = 300
 #The priority of the specified codec. It's available when the codec is enabled.
 #account.{$row.line_number}.codec.Y.priority =
 #The payload of the specified codec.
+
 #account.{$row.line_number}.codec.Y.rtpmap =
 
 account.{$row.line_number}.codec.1.enable = {if isset($yealink_codec_pcmu_enable)}1{else}0{/if}
@@ -398,6 +400,7 @@ account.{$row.line_number}.conf_type = {if $nway_conference == true}2{/if}
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
 account.{$row.line_number}.conf_uri = {if $nway_conference == true}nway{$account.{$row.line_number}.auth_id}@{$account.{$row.line_number}.server_address}{/if}
 
+
 #######################################################################################
 ##                            cid_source                                             ##
 #######################################################################################
diff --git a/resources/templates/provision/yealink/t42g/y000000000029.cfg b/resources/templates/provision/yealink/t42g/y000000000029.cfg
index a3c29dacd2..76c65ef6c7 100644
--- a/resources/templates/provision/yealink/t42g/y000000000029.cfg
+++ b/resources/templates/provision/yealink/t42g/y000000000029.cfg
@@ -868,6 +868,7 @@ features.password_dial.length =
 #######################################################################################
 #Enable or disable the phone to save the call history; 0-Disabled, 1-Enabled (default);
 features.save_call_history =
+features.save_init_num_to_history.enable = 0
 
 #######################################################################################
 ##                                   Features Pickup                                 ##
diff --git a/resources/templates/provision/yealink/t42g/{$mac}.cfg b/resources/templates/provision/yealink/t42g/{$mac}.cfg
index 70379f76bb..a02c16dfc4 100644
--- a/resources/templates/provision/yealink/t42g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t42g/{$mac}.cfg
@@ -395,10 +395,10 @@ account.1.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.1.conf_type =
+account.1.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.1.conf_uri =
+account.1.conf_uri = {if $nway_conference == true}nway{$account.1.auth_id}@{$account.1.server_address}{/if}
 
 #######################################################################################
 ##                            cid_source                                             ##
@@ -867,10 +867,10 @@ account.2.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.2.conf_type =
+account.2.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.2.conf_uri =
+account.2.conf_uri = {if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -1353,10 +1353,10 @@ account.3.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.3.conf_type =
+account.3.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.3.conf_uri =
+account.3.conf_uri = {if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -1829,10 +1829,10 @@ account.4.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.4.conf_type =
+account.4.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.4.conf_uri =
+account.4.conf_uri = {if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -2305,10 +2305,10 @@ account.5.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.5.conf_type =
+account.5.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.5.conf_uri =
+account.5.conf_uri = {if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -2780,10 +2780,10 @@ account.6.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.6.conf_type =
+account.6.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.6.conf_uri =
+account.6.conf_uri = {if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
diff --git a/resources/templates/provision/yealink/t42s/y000000000067.cfg b/resources/templates/provision/yealink/t42s/y000000000067.cfg
index d708d44d73..09585b8445 100644
--- a/resources/templates/provision/yealink/t42s/y000000000067.cfg
+++ b/resources/templates/provision/yealink/t42s/y000000000067.cfg
@@ -791,7 +791,7 @@ features.save_call_history=
 features.call_log_show_num=
 search_in_dialing.history.enable=
 directory_setting.history.enable=
-features.save_init_num_to_history.enable=
+features.save_init_num_to_history.enable= 0
 features.redial_via_local_sip_server.enable=
 
 
@@ -806,7 +806,11 @@ static.auto_provision.local_contact.backup.enable=
 ##                          Contact Other                                            ##
 #######################################################################################
 directory.search_type=
+{if isset($yealink_local_directory_enable)}
+directory_setting.local_directory.enable = {$yealink_local_directory_enable}
+{else}
 directory_setting.local_directory.enable =
+{/if}
 directory_setting.local_directory.priority =
 
 
diff --git a/resources/templates/provision/yealink/t42s/{$mac}.cfg b/resources/templates/provision/yealink/t42s/{$mac}.cfg
index 11cd1df6a1..068ce11f43 100644
--- a/resources/templates/provision/yealink/t42s/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t42s/{$mac}.cfg
@@ -394,10 +394,10 @@ account.1.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.1.conf_type =
+account.1.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.1.conf_uri =
+account.1.conf_uri = {if $nway_conference == true}nway{$account.1.auth_id}@{$account.1.server_address}{/if}
 
 #######################################################################################
 ##                            cid_source                                             ##
@@ -870,10 +870,10 @@ account.2.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.2.conf_type =
+account.2.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.2.conf_uri =
+account.2.conf_uri = {if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -1358,10 +1358,10 @@ account.3.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.3.conf_type =
+account.3.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.3.conf_uri =
+account.3.conf_uri = {if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -1829,10 +1829,10 @@ account.4.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.4.conf_type =
+account.4.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.4.conf_uri =
+account.4.conf_uri = {if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -2300,10 +2300,10 @@ account.5.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.5.conf_type =
+account.5.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.5.conf_uri =
+account.5.conf_uri = {if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -2770,10 +2770,10 @@ account.6.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.6.conf_type =
+account.6.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.6.conf_uri =
+account.6.conf_uri = {if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
diff --git a/resources/templates/provision/yealink/t43u/directory.xml b/resources/templates/provision/yealink/t43u/directory.xml
new file mode 100644
index 0000000000..297b9e4108
--- /dev/null
+++ b/resources/templates/provision/yealink/t43u/directory.xml
@@ -0,0 +1,83 @@
+<YealinkIPPhoneDirectory>
+{foreach $contacts as $row}
+{if $smarty.get.contacts == "users" && $row.category == "users"}
+<DirectoryEntry>
+{if $row.contact_name_given != ""}
+{if $row.contact_organization != ""}
+	<Name>{$row.contact_organization} {$row.contact_name_given} {$row.contact_name_family}</Name>
+{else}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{/if}
+{else}
+<Name>{$row.effective_caller_id_name}</Name>
+{/if}
+{foreach $row.numbers as $number}
+{if $number.phone_number != ""}
+	<Telephone>{$number.phone_number}</Telephone>
+{else}		
+	<Telephone>{$number.phone_extension}</Telephone>
+{/if}
+{/foreach}
+</DirectoryEntry>
+{elseif $smarty.get.contacts == "groups" && $row.category == "groups"}
+<DirectoryEntry>
+{if $row.contact_name_given != ""}
+{if $row.contact_organization != ""}
+	<Name>{$row.contact_organization} {$row.contact_name_given} {$row.contact_name_family}</Name>
+{else}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{/if}
+{else}
+	<Name>{$row.effective_caller_id_name}</Name>
+{/if}
+{foreach $row.numbers as $number}
+{if $number.phone_number != ""}
+	<Telephone>{$number.phone_number}</Telephone>
+{else}		
+	<Telephone>{$number.phone_extension}</Telephone>
+{/if}
+{/foreach}
+</DirectoryEntry>
+{elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
+<DirectoryEntry>
+{if $row.contact_name_given != ""}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{else}
+	<Name>{$row.effective_caller_id_name}</Name>
+{/if}
+{if $row.phone_number != ""}
+	<Telephone>{$row.phone_number}</Telephone>
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
+{/if}
+</DirectoryEntry>
+{elseif $smarty.get.contacts == "all"}
+<DirectoryEntry>
+{if $row.contact_name_given != ""}
+{if $row.contact_organization != ""}
+	<Name>{$row.contact_organization} {$row.contact_name_given} {$row.contact_name_family}</Name>
+{else}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{/if}
+{else}
+	<Name>{$row.effective_caller_id_name}</Name>
+{/if}
+{if $row.category == "extensions"}
+{if $row.phone_number != ""}
+	<Telephone>{$row.phone_number}</Telephone>
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
+{/if}
+{else}
+{foreach $row.numbers as $number}
+{if $number.phone_number != ""}
+	<Telephone>{$number.phone_number}</Telephone>
+{else}		
+	<Telephone>{$number.phone_extension}</Telephone>
+{/if}
+{/foreach}
+{/if}
+</DirectoryEntry>
+{/if}
+{/foreach}
+</YealinkIPPhoneDirectory>
diff --git a/resources/templates/provision/yealink/t43u/favorite_setting.xml b/resources/templates/provision/yealink/t43u/favorite_setting.xml
new file mode 100644
index 0000000000..ba7275358e
--- /dev/null
+++ b/resources/templates/provision/yealink/t43u/favorite_setting.xml
@@ -0,0 +1,8 @@
+<root_favorite_set>
+<item id_name="localdirectory" display_name="Local Directory" priority="2" enable="0" />
+<item id_name="history" display_name="History" priority="3" enable="1" />
+<item id_name="networkcalllog" display_name="Network CallLog" priority="4" enable="0" />
+<item id_name="remotedirectory" display_name="Remote Phone Book" priority="5" enable="1" />
+<item id_name="ldap" display_name="LDAP" priority="1" enable="0" />
+<item id_name="networkdirectory" display_name="Network Directory" priority="6" enable="0" />
+</root_favorite_set>
diff --git a/resources/templates/provision/yealink/t43u/y000000000000.boot b/resources/templates/provision/yealink/t43u/y000000000000.boot
new file mode 100644
index 0000000000..25d2329b63
--- /dev/null
+++ b/resources/templates/provision/yealink/t43u/y000000000000.boot
@@ -0,0 +1,7 @@
+#!version:1.0.0.1
+## The header above must appear as-is in the first line
+
+include:config "y000000000107.cfg"
+include:config "{$mac}.cfg"
+
+overwrite_mode = {$yealink_overwrite_mode}
diff --git a/resources/templates/provision/yealink/t43u/y000000000107.cfg b/resources/templates/provision/yealink/t43u/y000000000107.cfg
new file mode 100644
index 0000000000..2656cde24a
--- /dev/null
+++ b/resources/templates/provision/yealink/t43u/y000000000107.cfg
@@ -0,0 +1,1957 @@
+#!version:1.0.0.1
+
+##File header "#!version:1.0.0.1" can not be edited or deleted, and must be placed in the first line.##
+
+#######################################################################################
+##                                    Network CDP                                    ##
+#######################################################################################
+static.network.cdp.enable =
+static.network.cdp.packet_interval =
+
+
+
+#######################################################################################
+##                                    Network IPv6                                   ##
+#######################################################################################
+static.network.ipv6_static_dns_enable =
+static.network.ipv6_icmp_v6.enable =
+static.network.ipv6_secondary_dns =
+static.network.ipv6_primary_dns =
+static.network.ipv6_internet_port.gateway =
+static.network.ipv6_internet_port.ip =
+static.network.ipv6_internet_port.type =
+static.network.ipv6_prefix =
+
+
+
+#######################################################################################
+##                                    Network WiFi                                   ##
+#######################################################################################
+##static.wifi.X.label=
+##static.wifi.X.ssid=
+##static.wifi.X.priority=
+##static.wifi.X.security_mode=
+##static.wifi.X.cipher_type=
+##static.wifi.X.password=
+##static.wifi.X.eap_type=
+##static.wifi.X.eap_user_name=
+##static.wifi.x.eap_password=
+##(X ranges from 1 to 5)
+##Only T5XW/T54S/T52S/T48G/T48S/T46G/T46S/T42S/T41S/T29G/T27G/T4XU Models support these parameters.
+
+static.wifi.enable = {$yealink_wifi_enable}
+static.wifi.1.label = {$yealink_wifi_1_label}
+static.wifi.1.ssid = {$yealink_wifi_1_ssid}
+static.wifi.1.priority = {$yealink_wifi_1_priority}
+static.wifi.1.security_mode = {$yealink_wifi_1_security}
+static.wifi.1.cipher_type = {$yealink_wifi_1_cipher}
+static.wifi.1.password = {$yealink_wifi_1_password}
+static.wifi.1.eap_type = {$yealink_wifi_1_type}
+static.wifi.1.eap_user_name = {$yealink_wifi_1_username}
+static.wifi.1.eap_password = {$yealink_wifi_1_password}
+static.wifi.show_scan_prompt = {$yealink_wifi_scan_prompt}
+
+##V83 Add
+static.wifi.function.enable =
+
+
+##V84 SP4 ADD
+static.network.wifi.ip_address_mode=
+static.network.wifi.preference =
+static.network.wifi.internet_port.type =
+static.network.wifi.internet_port.ip=
+static.network.wifi.internet_port.mask=
+static.network.wifi.internet_port.gateway=
+static.network.wifi.static_dns_enable=
+static.network.wifi.primary_dns=
+static.network.wifi.secondary_dns=
+static.network.wifi.ipv6_internet_port.type=
+static.network.wifi.ipv6_internet_port.ip=
+static.network.wifi.ipv6_prefix=
+static.network.wifi.ipv6_internet_port.gateway=
+static.network.wifi.ipv6_static_dns_enable=
+static.network.wifi.ipv6_primary_dns=
+static.network.wifi.ipv6_secondary_dns=
+static.network.wifi.ipv6_icmp_v6.enable=
+#######################################################################################
+##                                 Network Internet                                  ##
+#######################################################################################
+static.network.ip_address_mode = {$yealink_ip_address_mode}
+static.network.span_to_pc_port =
+static.network.vlan.pc_port_mode =
+static.network.static_dns_enable =
+static.network.pc_port.enable =
+{if isset($dns_server_primary)}static.network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}static.network.secondary_dns = {$dns_server_secondary}{/if}
+static.network.internet_port.gateway =
+static.network.internet_port.mask =
+static.network.internet_port.ip =
+static.network.internet_port.type =
+
+##V83 Add
+static.network.preference =
+
+
+#######################################################################################
+##                               Network Advanced                                    ##
+#######################################################################################
+static.network.dhcp_host_name =
+static.network.dhcp.option60type =
+static.network.mtu_value =
+static.network.qos.audiotos =
+static.network.port.min_rtpport =
+static.network.port.max_rtpport =
+static.network.qos.signaltos =
+
+static.wui.http_enable =
+static.wui.https_enable =
+static.network.port.https =
+static.network.port.http =
+
+static.network.pc_port.speed_duplex =
+static.network.internet_port.speed_duplex =
+
+##V83 Add
+static.network.redundancy.mode =
+static.network.redundancy.failback.timeout =
+
+
+
+#######################################################################################
+##                                   Network LLDP                                    ##
+#######################################################################################
+static.network.lldp.enable = {$yealink_lldp_enable}
+static.network.lldp.packet_interval =
+
+
+
+#######################################################################################
+##                                   Network VLAN                                    ##
+#######################################################################################
+static.network.vlan.dhcp_enable =
+static.network.vlan.dhcp_option =
+static.network.vlan.vlan_change.enable =
+
+static.network.vlan.pc_port_priority = {$yealink_vlan_pc_cos}
+static.network.vlan.pc_port_vid = {$yealink_vlan_pc_id}
+
+{if isset($yealink_vlan_pc_enable)}static.network.vlan.pc_port_enable = {$yealink_vlan_pc_enable}{else}static.network.vlan.pc_port_enable = 0{/if}
+
+#static.network.vlan.pc_port_enable =
+
+static.network.vlan.internet_port_priority = {$yealink_vlan_cos}
+static.network.vlan.internet_port_vid = {$yealink_vlan_id}
+
+{if isset($yealink_vlan_enable)}static.network.vlan.internet_port_enable = {$yealink_vlan_enable}{else}static.network.vlan.internet_port_enable = 0{/if}
+
+
+#######################################################################################
+##                                    Network VPN                                    ##
+#######################################################################################
+static.network.vpn_enable = {$yealink_network_vpn_enable}
+static.openvpn.url = {$yealink_openvpn_url}
+
+
+#######################################################################################
+##                                 Network 802.1x                                    ##
+#######################################################################################
+static.network.802_1x.mode =
+static.network.802_1x.identity =
+static.network.802_1x.md5_password =
+static.network.802_1x.client_cert_url =
+static.network.802_1x.root_cert_url =
+static.network.802_1x.eap_fast_provision_mode =
+static.network.802_1x.anonymous_identity =
+static.network.802_1x.proxy_eap_logoff.enable =
+
+
+static.auto_provision.custom.protect =
+static.auto_provision.custom.sync =
+static.auto_provision.custom.sync.path =
+static.auto_provision.custom.upload_method =
+
+
+
+
+#######################################################################################
+##                                    ZERO Touch                                     ##
+#######################################################################################
+static.zero_touch.enable =
+static.zero_touch.wait_time =
+static.features.hide_zero_touch_url.enable =
+static.zero_touch.network_fail_delay_times =
+static.zero_touch.network_fail_wait_times =
+
+
+#######################################################################################
+##                                   Autop URL                                       ##
+#######################################################################################
+static.auto_provision.server.url = {$yealink_provision_url}
+static.auto_provision.server.username = {$http_auth_username}
+static.auto_provision.server.password = {$http_auth_password}
+
+
+#######################################################################################
+##                                   Autop Weekly                                    ##
+#######################################################################################
+static.auto_provision.weekly.enable =
+static.auto_provision.weekly.dayofweek =
+static.auto_provision.weekly.end_time =
+static.auto_provision.weekly.begin_time =
+static.auto_provision.weekly_upgrade_interval =
+
+#######################################################################################
+##                                   Autop Repeat                                    ##
+#######################################################################################
+static.auto_provision.repeat.enable =
+static.auto_provision.repeat.minutes =
+
+#######################################################################################
+##                                   Autop DHCP                                      ##
+#######################################################################################
+static.auto_provision.dhcp_option.list_user_options =
+static.auto_provision.dhcp_option.enable =
+
+##V83 Add
+static.auto_provision.dhcp_option.list_user6_options =
+
+#######################################################################################
+##                                   Autop Mode                                      ##
+#######################################################################################
+static.auto_provision.power_on =
+
+
+
+#######################################################################################
+##                               Flexible Autop                                      ##
+#######################################################################################
+static.auto_provision.flexible.end_time =
+static.auto_provision.flexible.begin_time =
+static.auto_provision.flexible.interval =
+static.auto_provision.flexible.enable =
+
+#######################################################################################
+##                                 Autoprovision  Other                              ##
+#######################################################################################
+static.auto_provision.prompt.enable =
+static.auto_provision.attempt_expired_time =
+static.auto_provision.attempt_before_failed =
+static.network.attempt_expired_time =
+static.auto_provision.update_file_mode =
+static.auto_provision.retry_delay_after_file_transfer_failed=
+static.auto_provision.inactivity_time_expire =
+static.auto_provision.dns_resolv_timeout =
+static.auto_provision.dns_resolv_nretry =
+static.auto_provision.dns_resolv_nosys =
+static.auto_provision.user_agent_mac.enable =
+static.auto_provision.server.type =
+features.action_uri_force_autop =
+static.auto_provision.url_wildcard.pn =
+static.auto_provision.reboot_force.enable =
+static.auto_provision.dhcp_option.option60_value =
+static.custom_mac_cfg.url =
+static.auto_provision.aes_key_in_file =
+static.auto_provision.aes_key_16.mac =
+static.auto_provision.aes_key_16.com =
+features.custom_version_info =
+##V83 Add
+static.auto_provision.authentication.expired_time =
+static.auto_provision.connect.keep_alive =
+
+##V84 Add
+static.auto_provision.config_version.mac=
+static.auto_provision.config_version.com=
+
+
+#######################################################################################
+##                                   Autop PNP                                       ##
+#######################################################################################
+static.auto_provision.pnp_enable =
+
+
+
+#######################################################################################
+##                                  Autop Code                                       ##
+#######################################################################################
+##static.autoprovision.X.name
+##static.autoprovision.X.code
+##static.autoprovision.X.url
+##static.autoprovision.X.user
+##static.autoprovision.X.password
+##static.autoprovision.X.com_aes
+##static.autoprovision.X.mac_aes
+##Autop Code(X ranges from 1 to 50)
+
+static.autoprovision.1.name =
+static.autoprovision.1.code =
+static.autoprovision.1.url =
+static.autoprovision.1.user =
+static.autoprovision.1.password =
+static.autoprovision.1.com_aes =
+static.autoprovision.1.mac_aes =
+
+
+
+#######################################################################################
+##                                   TR069                                           ##
+#######################################################################################
+
+static.managementserver.enable =
+static.managementserver.username =
+static.managementserver.password =
+static.managementserver.url =
+static.managementserver.periodic_inform_enable = 0
+static.managementserver.periodic_inform_interval = 60
+static.managementserver.connection_request_password =
+static.managementserver.connection_request_username =
+
+
+
+#######################################################################################
+##                            Firmware Update                                        ##
+#######################################################################################
+static.firmware.url = {$yealink_firmware_url}/{$yealink_firmware_t43u}
+
+
+#######################################################################################
+##                            Confguration                                           ##
+#######################################################################################
+features.reset_by_long_press_enable =
+features.factory_pwd_enable =
+static.configuration.url =
+static.features.custom_factory_config.enable =
+static.custom_factory_configuration.url =
+
+
+#######################################################################################
+##                               SYSLOG                                              ##
+#######################################################################################
+static.syslog.enable =
+static.syslog.server =
+static.syslog.level =
+static.syslog.server_port =
+static.syslog.transport_type =
+static.syslog.facility =
+static.syslog.prepend_mac_address.enable =
+static.local_log.enable =
+static.local_log.level =
+static.local_log.max_file_size =
+
+
+
+#######################################################################################
+##                               Log Backup                                          ##
+#######################################################################################
+static.auto_provision.local_log.backup.enable =
+static.auto_provision.local_log.backup.path =
+static.auto_provision.local_log.backup.upload_period =
+static.auto_provision.local_log.backup.append =
+static.auto_provision.local_log.backup.bootlog.upload_wait_time=
+static.auto_provision.local_log.backup.append.max_file_size =
+static.auto_provision.local_log.backup.append.limit_mode=
+
+
+
+#######################################################################################
+##                                   User Mode                                       ##
+#######################################################################################
+static.security.var_enable = 
+static.web_item_level.url =
+
+
+#######################################################################################
+##                                  Quick Login                                      ##
+#######################################################################################
+wui.quick_login = 
+
+
+#######################################################################################
+##                               Security                                            ##
+#######################################################################################
+static.phone_setting.reserve_certs_enable = 
+features.relog_offtime = 
+static.security.default_ssl_method = {$yealink_security_default_ssl_method}
+static.security.cn_validation = 
+static.security.dev_cert = 
+static.security.ca_cert = 
+static.security.trust_certificates = {if $yealink_trust_certificates == "false"}0{elseif $yealink_trust_certificates == "true"}1{/if}
+
+static.security.user_password = {$var_name}:{$var_password}
+static.security.user_password = {$admin_name}:{$admin_password}
+static.security.user_password = {$user_name}:{$user_password}
+static.security.user_name.var = {$var_name}
+static.security.user_name.admin = {$admin_name}
+static.security.user_name.user = {$user_name}
+
+##V83 Add
+static.security.default_access_level =
+phone_setting.reserve_certs_config.enable =
+
+
+#######################################################################################
+##                               Watch Dog                                           ##
+#######################################################################################
+static.watch_dog.enable =
+
+#######################################################################################
+##                                   Server Certificates                             ##
+#######################################################################################
+static.server_certificates.url =
+static.server_certificates.delete = 
+
+#######################################################################################
+##                           Trusted Certificates                                    ##
+#######################################################################################
+static.trusted_certificates.url =
+static.trusted_certificates.delete =
+
+
+
+#######################################################################################
+##                           Secure Domain List                                      ##
+#######################################################################################
+wui.secure_domain_list = 
+
+
+#######################################################################################
+##                               Encryption                                          ##
+#######################################################################################
+static.auto_provision.encryption.directory = 
+static.auto_provision.encryption.call_log = 
+static.auto_provision.encryption.config = 
+
+
+
+
+#######################################################################################
+##                                   Trnasfer                                        ##
+#######################################################################################
+dialplan.transfer.mode = {$yealink_transfer_mode}
+transfer.on_hook_trans_enable = {$yealink_transfer_onhook}
+transfer.tran_others_after_conf_enable = {$yealink_transfer_after_conf}
+transfer.blind_tran_on_hook_enable = {$yealink_transfer_blind_on_hook}
+transfer.semi_attend_tran_enable = {$yealink_transfer_semi_attended}
+phone_setting.call_appearance.transfer_via_new_linekey= {$yealink_transfer_via_new_linekey}
+
+
+#######################################################################################
+##                                   Conference                                      ##
+#######################################################################################
+features.conference.with_previous_call.enable =
+features.local_conf.combine_with_one_press.enable=
+phone_setting.call_appearance.conference_via_new_linekey=
+
+
+
+#######################################################################################
+##                                   Anonymous                                       ##
+#######################################################################################
+features.anonymous_response_code=
+
+
+
+#######################################################################################
+##                          Call Configuration                                       ##
+#######################################################################################
+phone_setting.incoming_call_when_dialing.priority=
+phone_setting.hold_or_swap.mode=
+features.play_held_tone.interval=
+features.play_held_tone.delay=
+features.play_held_tone.enable=
+features.play_hold_tone.interval=
+features.ignore_incoming_call.enable=
+force.voice.ring_vol=
+features.mute.autoanswer_mute.enable=
+features.play_hold_tone.delay =
+phone_setting.end_call_net_disconnect.enable =
+features.custom_auto_answer_tone.enable=
+default_input_method.dialing=
+features.speaker_mode.enable=
+features.headset_mode.enable=
+features.handset_mode.enable=
+features.conference.local.enable =
+features.off_hook_answer.enable=
+features.caller_name_type_on_dialing=
+phone_setting.show_code403=
+phone_setting.ring_for_tranfailed=
+features.password_dial.length=
+features.password_dial.prefix=
+features.password_dial.enable=
+features.group_listen_in_talking_enable=
+phone_setting.call_info_display_method = 0
+phone_setting.called_party_info_display.enable = 1
+features.headset_training=
+features.headset_prior=
+features.dtmf.replace_tran =
+features.dtmf.transfer =
+phone_setting.ringing_timeout=
+phone_setting.ringback_timeout=
+
+features.keep_mute.enable=
+linekey.1.shortlabel=
+features.config_dsskey_length.shorten =
+transfer.dsskey_deal_type = {$yealink_dsskey_transfer_mode}
+features.auto_linekeys.enable=
+phone_setting.call_appearance.calls_per_linekey=
+features.linekey_call_with_default_account=
+##V83 Add
+features.station_name.value =
+features.station_name.scrolling_display =
+voice.headset.autoreset_spk_vol =
+voice.handset.autoreset_spk_vol =
+voice.handfree.autoreset_spk_vol =
+features.headset.ctrl_call.enable = 
+phone_setting.incoming_call.reject.enable =
+
+features.play_mute_tone.enable=
+features.play_mute_tone.interval=
+
+features.call_out_directory_by_off_hook.enable=
+features.congestion_tone.codelist=
+
+
+##V84 Add
+phone_setting.icon.delete=
+phone_setting.icon.url=
+
+##V84 SP4 Add
+voice.handset.tia4965.enable = 
+voice.headset.tia4965.enable = 
+
+#######################################################################################
+##                           Custom Softkey                                          ##
+#######################################################################################
+phone_setting.custom_softkey_enable=
+custom_softkey_talking.url=
+custom_softkey_ring_back.url=
+custom_softkey_dialing.url=
+custom_softkey_connecting.url=
+custom_softkey_call_in.url=
+custom_softkey_call_failed.url=
+
+##V83 Add
+features.homescreen_softkey.acd.enable =
+features.homescreen_softkey.hoteling.enable =
+phone_setting.custom_softkey.apply_to_states =
+features.custom_softkey_dynamic.enable =
+
+
+#######################################################################################
+##                                   Features Bluetooth                              ##
+#######################################################################################
+##Only T5XW/T54S/T52S/T48G/T48S/T46G/T46S/T42S/T41S/T29G/T27G/T4XU Models support the parameter.
+features.bluetooth_enable=
+features.bluetooth_adapter_name=
+##V83 Add
+static.bluetooth.function.enable =
+
+##V84 Add
+bluetooth.a2dp_sink=
+bluetooth.connect_confirm.enable=
+
+#######################################################################################
+##                                  Features USB Record                              ##
+#######################################################################################
+##Only T5XW/T54S/T52S/T48G/T48S/T46G/T46S/T42S/T41S/T29G/T27G/T4XU Models support the parameter.
+features.usb_call_recording.enable = {$yealink_usb_record_enable}
+features.auto_recording.enable =
+
+features.idle_recording.enable=
+
+#######################################################################################
+##                                  Features USB                                     ##
+#######################################################################################
+##V83 Add
+static.usb.power.enable =
+
+##V84 Add
+static.usbdisk.function.enable=
+
+#######################################################################################
+##                                    Codec                                          ##
+#######################################################################################
+voice.g726.aal2.enable=
+
+
+#######################################################################################
+##                                   DTMF                                            ##
+#######################################################################################
+features.dtmf.min_interval=
+features.dtmf.volume=
+features.dtmf.duration =
+
+#######################################################################################
+##                                   Tones                                           ##
+#######################################################################################
+voice.tone.autoanswer =
+voice.tone.message =
+voice.tone.stutter =
+voice.tone.info =
+voice.tone.dialrecall =
+voice.tone.callwaiting =
+voice.tone.congestion =
+voice.tone.busy =
+voice.tone.ring =
+voice.tone.dial =
+voice.tone.country =
+voice.side_tone =
+features.partition_tone =
+voice.tone.secondary_dial=
+#######################################################################################
+##  Tones V83 stutterdial dnd fwd vm      ##       
+#######################################################################################
+
+voice.tone.stutterdial=
+voice.tone.stutter_dial_tone.apply_to_dnd.enable=
+voice.tone.stutter_dial_tone.apply_to_fwd.enable=
+voice.tone.stutter_dial_tone.apply_to_fwd.enable=
+
+#######################################################################################
+##                                   Jitter Buffer                                   ##
+#######################################################################################
+voice.jib.normal=
+voice.jib.max =
+voice.jib.min =
+voice.jib.adaptive =
+
+voice.jib.wifi.normal=
+voice.jib.wifi.max=
+voice.jib.wifi.min=
+voice.jib.wifi.adaptive=
+
+#######################################################################################
+##                                   Echo Cancellation                               ##
+#######################################################################################
+voice.echo_cancellation =
+voice.cng =
+voice.vad =
+
+##V84 Add
+voice.ans_nb.enable=
+voice.tns.enable=
+
+################################################################
+#                        SIP Backup Server                    ##
+################################################################
+static.network.dns.ttl_enable =
+static.network.dns.last_cache_expired.enable=
+static.network.dns.last_cache_expired
+static.network.dns.query_timeout =
+static.network.dns.retry_times =
+sip.dns_transport_type=
+sip.skip_redundant_failover_addr=
+
+
+################################################################
+#                        SIP Basic Config                     ##
+################################################################
+sip.use_out_bound_in_dialog=
+sip.unreg_with_socket_close=
+phone_setting.disable_account_without_username.enable=
+features.auto_answer.first_call_only=
+
+##V84 Add
+phone_setting.call_display_name.mode=
+
+################################################################
+#                        SIP Advanced config                  ##
+################################################################
+sip.request_validation.event=
+sip.sdp_early_answer_or_offer=
+sip.cid_source.preference=
+sip.request_validation.digest.realm=
+sip.request_validation.digest.list=
+sip.request_validation.source.list=
+sip.send_keepalive_by_socket=
+sip.reliable_protocol.timerae.enable=
+sip.requesturi.e164.addglobalprefix=
+sip.trust_ctrl = {$yealink_trust_ctrl}
+sip.mac_in_ua=
+
+sip.timer_t1=
+sip.timer_t2=
+sip.timer_t4=
+
+sip.listen_mode=
+
+{if isset($yealink_sip_listen_port)}sip.listen_port = {$yealink_sip_listen_port}{else}sip.listen_port = 5060{/if}
+
+sip.tls_listen_port=
+sip.tcp_port_random_mode=
+sip.escape_characters.enable=
+sip.notify_reboot_enable=
+sip.send_response_by_request=
+sip.disp_incall_to_info=
+features.call_invite_format=
+phone_setting.early_media.rtp_sniffer.timeout=
+sip.reg_surge_prevention =
+
+################################################################
+#    V84 new add    sip.escape_characters.enable=             ##
+################################################################
+sip.reserve_characters=
+
+
+##V83 Add
+sip.dhcp.option120.mode =
+
+################################################################
+#                        NAT&ICE                              ##
+################################################################
+static.sip.nat_turn.enable=
+static.sip.nat_turn.username=
+static.sip.nat_turn.password=
+static.sip.nat_turn.server=
+static.sip.nat_turn.port=
+
+static.sip.nat_stun.enable={if isset($stun_server)}1{else}0{/if}
+
+static.sip.nat_stun.server= {$stun_server}
+static.sip.nat_stun.port= {if isset($stun_port)}{$stun_port}{else}3478{/if}
+
+
+static.ice.enable=
+
+static.network.static_nat.enable= {if isset($yealink_static_nat)}1{else}0{/if}
+
+static.network.static_nat.addr= {$yealink_static_nat}
+
+#######################################################################################
+##                           DNS                                                     ##
+#######################################################################################
+dns_cache_a.1.name =
+dns_cache_a.1.ip = 
+dns_cache_a.1.ttl =
+dns_cache_srv.1.name = 
+dns_cache_srv.1.port =
+dns_cache_srv.1.priority =
+dns_cache_srv.1.target =
+dns_cache_srv.1.weight =
+dns_cache_srv.1.ttl =
+dns_cache_naptr.1.name =
+dns_cache_naptr.1.order =
+dns_cache_naptr.1.preference =
+dns_cache_naptr.1.replace =
+dns_cache_naptr.1.service = 
+dns_cache_naptr.1.ttl = 
+
+#######################################################################################
+##                                 RTP                                               ##
+#######################################################################################
+features.rtp_symmetric.enable=
+
+
+#######################################################################################
+##                                 RTCP-XR                                           ##
+#######################################################################################
+voice.rtcp.enable=
+voice.rtcp_cname=
+voice.rtcp_xr.enable=
+phone_setting.vq_rtcpxr_display_symm_oneway_delay.enable=
+phone_setting.vq_rtcpxr_display_round_trip_delay.enable=
+phone_setting.vq_rtcpxr_display_moscq.enable=
+phone_setting.vq_rtcpxr_display_moslq.enable = 
+phone_setting.vq_rtcpxr_display_packets_lost.enable=
+phone_setting.vq_rtcpxr_display_jitter_buffer_max.enable=
+phone_setting.vq_rtcpxr_display_jitter.enable=
+phone_setting.vq_rtcpxr_display_remote_codec.enable=
+phone_setting.vq_rtcpxr_display_local_codec.enable=
+phone_setting.vq_rtcpxr_display_remote_call_id.enable=
+phone_setting.vq_rtcpxr_display_local_call_id.enable=
+phone_setting.vq_rtcpxr_display_stop_time.enable=
+phone_setting.vq_rtcpxr_display_start_time.enable=
+phone_setting.vq_rtcpxr_interval_period=
+phone_setting.vq_rtcpxr_delay_threshold_critical=
+phone_setting.vq_rtcpxr_delay_threshold_warning=
+phone_setting.vq_rtcpxr_moslq_threshold_critical=
+phone_setting.vq_rtcpxr_moslq_threshold_warning=
+phone_setting.vq_rtcpxr.interval_report.enable=
+phone_setting.vq_rtcpxr.states_show_on_gui.enable=
+phone_setting.vq_rtcpxr.states_show_on_web.enable=
+phone_setting.vq_rtcpxr.session_report.enable=
+
+
+#######################################################################################
+##                                   Contact                                         ##
+#######################################################################################
+
+static.directory_setting.url= https://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=favorite_setting.xml
+
+super_search.url=
+
+local_contact.data.url=
+local_contact.data.delete=
+
+##Only T5XW/T54S/T52S/T48G/T48S/T46G/T46S/T29G/T46U/T48U Models support the parameter
+phone_setting.contact_photo_display.enable=
+
+phone_setting.incoming_call.horizontal_roll_interval=
+
+##Only T5XW/T54S/T52S/T48G/T48S/T46G/T46S/T29G/T5XW Models support the parameter
+local_contact.data_photo_tar.url=
+local_contact.photo.url=
+local_contact.image.url=
+
+##Only T48G/S Models support the parameter
+local_contact.icon_image.url=
+local_contact.icon.url=
+
+search_in_dialing.local_directory.enable =
+search_in_dialing.local_directory.priority =
+
+#######################################################################################
+##                                 Remote Phonebook                                  ##
+#######################################################################################
+##remote_phonebook.data.X.url
+##remote_phonebook.data.X.name 
+#remote_phonebook.data.X.username=
+#remote_phonebook.data.X.password=
+##(X ranges from 1 to 5)
+
+{if isset($yealink_remote_phonebook_1_name) }
+remote_phonebook.data.1.name = {$yealink_remote_phonebook_1_name}
+{else}
+remote_phonebook.data.1.name = Users
+{/if}
+{if isset($yealink_remote_phonebook_1_url) }
+remote_phonebook.data.1.url =  {$yealink_remote_phonebook_1_url}
+{else}
+remote_phonebook.data.1.url = https://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=users
+{/if}
+
+{if isset($yealink_remote_phonebook_2_name) }
+remote_phonebook.data.2.name = {$yealink_remote_phonebook_2_name}
+{else}
+remote_phonebook.data.2.name = Groups
+{/if}
+{if isset($yealink_remote_phonebook_2_url) }
+remote_phonebook.data.2.url =  {$yealink_remote_phonebook_2_url}
+{else}
+remote_phonebook.data.2.url = https://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=groups
+{/if}
+
+{if isset($yealink_remote_phonebook_3_name) }
+remote_phonebook.data.3.name = {$yealink_remote_phonebook_3_name}
+{else}
+remote_phonebook.data.3.name = Extensions
+{/if}
+{if isset($yealink_remote_phonebook_3_url) }
+remote_phonebook.data.3.url =  {$yealink_remote_phonebook_3_url}
+{else}
+remote_phonebook.data.3.url = https://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
+{/if}
+
+remote_phonebook.data.4.name = {$yealink_remote_phonebook_4_name}
+remote_phonebook.data.4.url =  {$yealink_remote_phonebook_4_url}
+
+remote_phonebook.data.5.name = {$yealink_remote_phonebook_5_name}
+remote_phonebook.data.5.url = {$yealink_remote_phonebook_5_url}
+
+features.remote_phonebook.enable = {$yealink_remote_phonebook_enable}
+
+#######################################################################################
+##                                 LDAP                                              ##
+#######################################################################################
+ldap.enable = {$ldap_enable}
+ldap.user = {$ldap_user}
+ldap.password = {$ldap_password}
+ldap.base = {$ldap_base}
+ldap.port = {$ldap_port}
+ldap.host = {$ldap_host}
+ldap.customize_label=
+ldap.incoming_call_special_search.enable=
+ldap.tls_mode=
+ldap.search_type=
+ldap.numb_display_mode=
+ldap.ldap_sort = {$ldap_sort}
+ldap.call_in_lookup = {$ldap_call_in_lookup}
+ldap.version = {$ldap_version}
+ldap.display_name = {$ldap_display_name}
+ldap.numb_attr = {$ldap_numb_attr}
+ldap.name_attr = {$ldap_name_attr}
+ldap.max_hits = {$ldap_max_hits}
+ldap.number_filter = {$ldap_number_filter}
+ldap.name_filter = {$ldap_name_filter}
+ldap.call_out_lookup = {$ldap_dial_lookup}
+directory_setting.ldap.enable =
+directory_setting.ldap.priority =
+search_in_dialing.ldap.enable =
+search_in_dialing.ldap.priority =
+
+##V84 SP4 ADD
+ldap.custom_extra_attr_name=
+ldap.display_extra_attr=
+ldap.extra_attr=
+
+
+
+
+#######################################################################################
+##                                 History                                           ##
+#######################################################################################
+static.auto_provision.local_calllog.write_delay.terminated=
+static.auto_provision.local_calllog.backup.path=
+static.auto_provision.local_calllog.backup.enable=
+super_search.recent_call=
+features.call_out_history_by_off_hook.enable=
+features.save_call_history=
+features.call_log_show_num=
+search_in_dialing.history.enable=
+search_in_dialing.history.priority=
+directory_setting.history.enable=
+directory_setting.history.priority
+features.save_init_num_to_history.enable= 0
+features.redial_via_local_sip_server.enable=
+
+##V83 Add
+features.calllog_detailed_information =
+
+##V84 Add
+features.call_log_merge.enable=
+
+
+#######################################################################################
+##                          Contact Backup                                           ##
+#######################################################################################
+static.auto_provision.local_contact.backup.path =
+static.auto_provision.local_contact.backup.enable=
+
+
+#######################################################################################
+##                          Contact Other                                            ##
+#######################################################################################
+directory.search_type=
+{if isset($yealink_local_directory_enable)}
+directory_setting.local_directory.enable = {$yealink_local_directory_enable}
+{else}
+directory_setting.local_directory.enable =
+{/if}
+directory_setting.local_directory.priority =
+
+##V83 Add
+phone_setting.search.highlight_keywords.enable =
+
+#######################################################################################
+##                          Favorites                                                ##
+#######################################################################################
+##V83 Add
+local_contact.favorite.enable =
+phone_setting.favorite_sequence_type =
+
+#######################################################################################
+##                                  Programablekey                                   ##
+#######################################################################################
+#programablekey.X.type
+#programablekey.X.line
+#programablekey.X.value
+#programablekey.X.xml_phonebook
+#programablekey.X.history_type
+#programablekey.X.label(X ranges from 1 to 4)
+#programablekey.X.extension
+##Programablekey X ranges(T48G/T48S/T46G/T46S: X=1-10, 12-14;T42G/T42S/T41P/T41S/T40P/T40G: X=1-10, 13;T29G/T27P/T27G: X=1-14;T23P/T23G/T21(P) E2: 1-10, 14;T19(P) E2: X=1-9, 13, 14;)##
+
+{foreach $keys["programmable"] as $row}
+programablekey.{$row.device_key_id}.type = {$row.device_key_type}
+{if $row.device_key_type == "22" || $row.device_key_type == "47"}
+programablekey.{$row.device_key_id}.xml_phonebook = {$row.device_key_line}
+{else}
+programablekey.{$row.device_key_id}.line = {$row.device_key_line}
+programablekey.{$row.device_key_id}.value = {$row.device_key_value}
+{/if}
+programablekey.{$row.device_key_id}.extension = {$row.device_key_extension}
+programablekey.{$row.device_key_id}.label = {$row.device_key_label}
+programablekey.1.pickup_value ={$row.device_key_extension}
+programablekey.1.history_type =
+{/foreach}
+
+##V83 Add
+programablekey.type_range.custom =
+
+#######################################################################################
+##                                  Linekey                                          ##
+#######################################################################################
+##linekey.X.line
+##linekey.X.value
+##linekey.X.extension
+##linekey.X.type
+##linekey.X.xml_phonebook
+##linekey.X.shortlabel
+##linekey.X.label
+##LineKeyX ranges(T48U/T57W/T48G/S: X ranges from 1 to 29. T53W/T54W/T54S/T46G/T46S/T29G/T46U: X ranges from 1 to 27. T42G/T42S/T41P/T41S/T41U: X ranges from 1 to 15. T40P/T40G/T23P/T23G: X ranges from 1 to 3. T52S/T27P/T27G/T43U: X ranges from 1 to 21. T21(P) E2: X ranges from 1 to 2.)##
+## Not support T19P_E2
+
+{foreach $keys['line'] as $row}
+#Configure Line Key {$row.device_key_id}
+linekey.{$row.device_key_id}.line = {$row.device_key_line}
+linekey.{$row.device_key_id}.value = {$row.device_key_value}
+{if $row.device_key_type == "1" || $row.device_key_type == "16"}
+linekey.{$row.device_key_id}.pickup_value = {$row.device_key_extension}
+{else}
+linekey.{$row.device_key_id}.extension = {$row.device_key_extension}
+{/if}
+linekey.{$row.device_key_id}.type = {$row.device_key_type}
+linekey.{$row.device_key_id}.xml_phonebook =
+linekey.{$row.device_key_id}.label = {$row.device_key_label}
+
+{/foreach}
+
+linekey.type_range.custom =
+
+
+#######################################################################################
+##                                  Dsskey                                           ##
+#######################################################################################
+features.block_linekey_in_menu.enable =
+features.shorten_linekey_label.enable =
+features.flash_url_dsskey_led.enable =
+features.config_dsskey_length = {$yealink_dsskey_length}
+phone_setting.page_tip =
+features.keep_switch_page_key.enable=
+
+##phone_setting.idle_dsskey_and_title.transparency(Only support T5XW/T54S/T52S/T48G/T48S/T48U)
+phone_setting.idle_dsskey_and_title.transparency=
+
+##V83 Add
+phone_setting.keytype_sequence =
+phone_setting.dsskey_label.display_method =
+local.dsskey_type_config.mode =
+
+
+#######################################################################################
+##                                Expansion Key                                      ##
+#######################################################################################
+##expansion_module.X.key.Y.type
+##expansion_module.X.key.Y.line
+##expansion_module.X.key.Y.value
+##expansion_module.X.key.Y.extension
+##expansion_module.X.key.Y.label
+##expansion_module.X.key.Y.xml_phonebook
+## Expansion Key X ranges(SIP-T5XW/T54S/T52S/T43U/T46U/T48U: X ranges from 1 to 3, Y ranges from 1 to 60; SIP-T48G/T48S/T46G/T46S:X ranges from 1 to 6, Y ranges from 1 to 40; SIP-T29G/T27P/T27G:X ranges from 1 to 6, Y ranges from 1 to 20, 22 to 40 (Ext key 21 cannot be configured).)##
+## Only SIP-T5XW/T54S/T52S/T48G/T48S/T46G/T46S/T29G/T27P/T27G/T43U/T46U/T48U Models support the parameter.
+
+#expansion_module.1.key.1.type =
+#expansion_module.1.key.1.label =
+#expansion_module.1.key.1.value =
+#expansion_module.1.key.1.line =
+#expansion_module.1.key.1.pickup_value =
+#expansion_module.1.key.1.extension =
+#expansion_module.1.key.1.xml_phonebook =
+#expansion_module.page_tip.blf_call_in.led =
+#expansion_module.page_tip.blf_call_in.enable =
+
+{foreach $keys["expansion"] as $row}
+expansion_module.1.key.{$row.device_key_id}.type = {$row.device_key_type}
+expansion_module.1.key.{$row.device_key_id}.line = {$row.device_key_line}
+expansion_module.1.key.{$row.device_key_id}.value = {$row.device_key_value}
+expansion_module.1.key.{$row.device_key_id}.extension = {$row.device_key_extension}
+expansion_module.1.key.{$row.device_key_id}.label = {$row.device_key_label}
+expansion_module.1.key.{$row.device_key_id}.xml_phonebook =
+{/foreach}
+{foreach $keys["expansion-1"] as $row}
+expansion_module.1.key.{$row.device_key_id}.type = {$row.device_key_type}
+expansion_module.1.key.{$row.device_key_id}.line = {$row.device_key_line}
+expansion_module.1.key.{$row.device_key_id}.value = {$row.device_key_value}
+expansion_module.1.key.{$row.device_key_id}.extension = {$row.device_key_extension}
+expansion_module.1.key.{$row.device_key_id}.label = {$row.device_key_label}
+expansion_module.1.key.{$row.device_key_id}.xml_phonebook =
+{/foreach}
+{foreach $keys["expansion-2"] as $row}
+expansion_module.2.key.{$row.device_key_id}.type = {$row.device_key_type}
+expansion_module.2.key.{$row.device_key_id}.line = {$row.device_key_line}
+expansion_module.2.key.{$row.device_key_id}.value = {$row.device_key_value}
+expansion_module.2.key.{$row.device_key_id}.extension = {$row.device_key_extension}
+expansion_module.2.key.{$row.device_key_id}.label = {$row.device_key_label}
+expansion_module.2.key.{$row.device_key_id}.xml_phonebook =
+{/foreach}
+
+
+#######################################################################################
+##                                EDK                                                ##
+#######################################################################################
+##EDK Soft Keys(X ranges from 1 to 10)
+
+features.enhanced_dss_keys.enable=
+edk.id_mode.enable=
+softkey.1.position=
+softkey.1.use.dialing=
+softkey.1.softkey_id=
+softkey.1.use.dialtone=
+softkey.1.use.conferenced=
+softkey.1.use.held=
+softkey.1.use.hold=
+softkey.1.use.transfer_ring_back=
+softkey.1.use.ring_back=
+softkey.1.use.call_failed=
+softkey.1.use.on_talk=
+softkey.1.use.transfer_connecting=
+softkey.1.use.connecting=
+softkey.1.use.incoming_call=
+softkey.1.use.idle=
+softkey.1.action=
+softkey.1.label=
+softkey.1.enable=
+edk.edklist.1.action=
+edk.edklist.1.mname=
+edk.edklist.1.enable=
+edk.edkprompt.1.enable=
+edk.edkprompt.1.label=
+edk.edkprompt.1.type=
+edk.edkprompt.1.userfeedback=
+
+##V84 Add
+##edk.edkprompt.X.title=
+(X ranges from 1 to 9)
+edk.edkprompt.1.title=
+
+
+#######################################################################################
+##                                XML                                                ##
+#######################################################################################
+push_xml.server=
+push_xml.sip_notify=
+push_xml.block_in_calling=
+default_input_method.xml_browser_input_screen=
+
+##V83 Add
+hoteling.authentication_mode =
+push_xml.phonebook.search.delay =
+features.xml_browser.loading_tip.delay =
+features.xml_browser.pwd =
+features.xml_browser.user_name =
+push_xml.password =
+push_xml.username =
+
+
+#######################################################################################
+##                                  Forward                                          ##
+#######################################################################################
+features.fwd.allow=
+features.fwd_mode=
+forward.no_answer.enable=
+forward.busy.enable=
+forward.always.enable=
+forward.no_answer.timeout=
+forward.no_answer.on_code=
+forward.no_answer.off_code=
+forward.busy.off_code=
+forward.busy.on_code=
+forward.always.off_code=
+forward.always.on_code=
+forward.no_answer.target=
+forward.busy.target=
+forward.always.target=
+
+features.forward.emergency.authorized_number=
+features.forward.emergency.enable=
+forward.idle_access_always_fwd.enable=
+features.forward_call_popup.enable=
+
+##V83 Add
+features.forward.no_answer.show_ring_times =
+
+##V84 Add
+features.no_answer_code=
+
+
+#######################################################################################
+##                                  DND                                              ##
+#######################################################################################
+features.dnd.allow=
+features.dnd_mode=
+features.dnd.enable=
+
+features.dnd.off_code = *79
+features.dnd.on_code = *78
+
+features.dnd.emergency_authorized_number=
+features.dnd.emergency_enable = 1
+features.dnd.large_icon.enable=
+
+##V83 Add
+features.keep_dnd.enable =
+
+#######################################################################################
+##                               Phone Lock                                          ##
+#######################################################################################
+phone_setting.phone_lock.enable = {$yealink_lock_enable}
+phone_setting.phone_lock.lock_key_type = {$yealink_lock_key_type}
+phone_setting.phone_lock.unlock_pin = {$yealink_lock_pin}
+phone_setting.emergency.number = {$yealink_emergency_number}
+phone_setting.phone_lock.lock_time_out = {$yealink_lock_timeout}
+
+
+#######################################################################################
+##                               Hotdesking                                          ##
+#######################################################################################
+phone_setting.logon_wizard=
+phone_setting.logon_wizard_forever_wait=
+
+hotdesking.startup_register_name_enable=
+hotdesking.startup_username_enable=
+hotdesking.startup_password_enable=
+hotdesking.startup_sip_server_enable=
+hotdesking.startup_outbound_enable=
+
+hotdesking.dsskey_register_name_enable=
+hotdesking.dsskey_username_enable=
+hotdesking.dsskey_password_enable=
+hotdesking.dsskey_sip_server_enable=
+hotdesking.dsskey_outbound_enable=
+
+
+#######################################################################################
+##                               Voice Mail                                          ##
+#######################################################################################
+features.voice_mail_alert.enable=
+features.voice_mail_popup.enable = {$yealink_voice_mail_popup_enable}
+features.voice_mail_tone_enable=
+features.hide_feature_access_codes.enable = {$yealink_hide_feature_access_codes_enable}
+
+
+
+#######################################################################################
+##                               Text Message                                        ##
+#######################################################################################
+features.text_message.enable=
+features.text_message_popup.enable=
+
+
+
+
+
+#######################################################################################
+##                               Audio Intercom                                      ##
+#######################################################################################
+features.intercom.mode=
+features.intercom.subscribe.enable=
+features.intercom.led.enable=
+features.intercom.feature_access_code=
+features.blf.intercom_mode.enable=
+features.intercom.ptt_mode.enable=
+
+features.redial_tone=
+features.key_tone=
+features.send_key_tone=
+
+features.intercom.allow=
+features.intercom.barge=
+features.intercom.tone=
+features.intercom.mute=
+
+
+voice.handset_send=
+voice.handfree_send =
+voice.headset_send =
+features.intercom.headset_prior.enable=
+features.ringer_device.is_use_headset=
+features.intercom.barge_in_dialing.enable=
+
+
+
+#######################################################################################
+##                               Feature General                                     ##
+#######################################################################################
+features.ip_call.auto_answer.enable=
+features.show_default_account=
+features.call.dialtone_time_out=
+features.missed_call_popup.enable = {$yealink_missed_call_popup_enable}
+features.auto_answer_tone.enable=
+features.play_hold_tone.enable=
+features.key_as_send=
+features.send_pound_key=
+features.busy_tone_delay=
+features.hotline_delay=
+features.hotline_number=
+features.direct_ip_call_enable = {$yealink_direct_ip_call_enable}
+features.call_num_filter=
+features.call_completion_enable=
+features.allow_mute=
+features.auto_answer_delay=
+features.normal_refuse_code=
+features.dnd_refuse_code=
+features.upload_server=
+features.dtmf.repetition=
+features.dtmf.hide_delay=
+features.dtmf.hide = {$yealink_dtmf_hide}
+features.play_local_dtmf_tone_enable =
+features.reboot_in_talk_enable =
+features.fwd_diversion_enable=
+
+call_waiting.enable = {$yealink_call_waiting}
+call_waiting.tone = {$yealink_call_waiting_tone}
+call_waiting.off_code=
+call_waiting.on_code=
+
+auto_redial.times=
+auto_redial.interval=
+auto_redial.enable=
+
+sip.rfc2543_hold = {$yealink_rfc2543_hold}
+sip.use_23_as_pound=
+forward.international.enable=
+phone_setting.headsetkey_mode=
+phone_setting.is_deal180=
+phone_setting.change_183_to_180=
+
+##V84 Add
+features.touch_tone=
+
+#######################################################################################
+##                               Action URL&URI                                      ##
+#######################################################################################
+features.csta_control.enable=
+features.action_uri.enable=
+features.action_uri_limit_ip=
+features.show_action_uri_option=
+action_url.call_remote_canceled=
+action_url.remote_busy=
+action_url.cancel_callout=
+action_url.handfree=
+action_url.headset=
+action_url.unheld=
+action_url.held=
+action_url.transfer_failed=
+action_url.transfer_finished=
+action_url.answer_new_incoming_call=
+action_url.reject_incoming_call=
+action_url.forward_incoming_call=
+action_url.ip_change=
+action_url.idle_to_busy=
+action_url.busy_to_idle=
+action_url.call_terminated=
+action_url.missed_call=
+action_url.unmute=
+action_url.mute=
+action_url.unhold=
+action_url.hold=
+action_url.always_fwd_off =
+action_url.always_fwd_on =
+action_url.attended_transfer_call =
+action_url.blind_transfer_call =
+action_url.busy_fwd_off =
+action_url.busy_fwd_on =
+action_url.call_established =
+action_url.call_waiting_off =
+action_url.call_waiting_on =
+action_url.dnd_off =
+action_url.dnd_on =
+action_url.incoming_call =
+action_url.no_answer_fwd_off =
+action_url.no_answer_fwd_on =
+action_url.off_hook =
+action_url.on_hook =
+action_url.outgoing_call =
+action_url.register_failed =
+action_url.registered =
+action_url.setup_autop_finish =
+action_url.setup_completed =
+action_url.transfer_call =
+action_url.unregistered =
+
+##V84 Add
+action_url.peripheral_information=
+
+
+
+#######################################################################################
+##                               Power LED                                           ##
+#######################################################################################
+phone_setting.hold_and_held_power_led_flash_enable=
+phone_setting.mute_power_led_flash_enable=
+phone_setting.talk_and_dial_power_led_enable=
+phone_setting.mail_power_led_flash_enable = 1
+phone_setting.ring_power_led_flash_enable=
+phone_setting.common_power_led_enable=
+phone_setting.missed_call_power_led_flash.enable = {$yealink_missed_call_power_led_flash_enable}
+
+
+#######################################################################################
+##                                  Time&Date                                        ##
+#######################################################################################
+lcl.datetime.date.format =
+auto_dst.url = {$yealink_auto_dst_url}
+local_time.manual_time_enable =
+local_time.manual_ntp_srv_prior =
+local_time.time_format = {$yealink_time_format}
+local_time.date_format = {$yealink_date_format}
+local_time.dhcp_time = {$yealink_dhcp_time}
+
+local_time.summer_time = {$yealink_summer_time}
+local_time.dst_time_type = {$yealink_dst_type}
+local_time.start_time = {$yealink_time_zone_start_time}
+local_time.end_time = {$yealink_time_zone_end_time}
+local_time.offset_time = {$yealink_offset_time}
+local_time.interval = {$yealink_time_update}
+
+local_time.ntp_server1 = {$ntp_server_primary}
+local_time.ntp_server2 = {$ntp_server_secondary}
+local_time.time_zone = {$yealink_time_zone}
+local_time.time_zone_name = {$yealink_time_zone_name}
+
+
+#######################################################################################
+##                           Multicast Paging                                        ##
+#######################################################################################
+##multicast.listen_address.X.label 
+##multicast.paging_address.X.channel
+##multicast.listen_address.X.ip_address 
+##multicast.paging_address.X.ip_address
+##multicast.paging_address.X.label
+##multicast.listen_address.X.channel
+##multicast.listen_address.X.volume
+##Multicast(X ranges from 1 to 31.)
+
+multicast.codec=
+
+multicast.paging_address.1.channel=
+multicast.paging_address.1.label=
+multicast.paging_address.1.ip_address=
+multicast.receive_priority.enable=
+multicast.receive_priority.priority=
+
+multicast.receive.use_speaker=
+multicast.receive.enhance_volume=
+multicast.receive.ignore_dnd.priority=
+
+multicast.listen_address.1.channel=
+multicast.listen_address.1.label=
+multicast.listen_address.1.ip_address=
+multicast.listen_address.1.volume=
+
+
+#######################################################################################
+##                           Preference&Status                                       ##
+#######################################################################################
+##Not support T19P_E2
+static.features.default_account=
+
+##Logo File Format: .dob
+##Resolution: SIP-T42G/T42S/T41P/T41S/T41U: <=192*64  2 gray scale;SIP-T43U/SIP-T27P/G: <=240*120  2 gray scale;SIP-T40P/T40G/T23P/T23G/T21(P) E2/T19(P) E2: <=132*64  2 gray scale##
+phone_setting.lcd_logo.mode=
+lcd_logo.delete=
+lcd_logo.url=
+
+phone_setting.contrast=
+phone_setting.backlight_time = {$yealink_backlight_time}
+phone_setting.inactive_backlight_level = 1
+phone_setting.active_backlight_level=
+phone_setting.predial_autodial = 1
+
+ringtone.url= {$yealink_ringtone_url}
+ringtone.delete= {$yealink_ringtone_delete}
+phone_setting.ring_type= {$yealink_ring_type}
+phone_setting.inter_digit_time= {$yealink_inter_digit_time}
+
+##Only T54S Model supports the parameter
+phone_setting.idle_clock_display.enable =
+
+#######################################################################################
+##                           Digitmap                                                ##
+#######################################################################################
+dialplan.digitmap.enable=
+dialplan.digitmap.string=
+dialplan.digitmap.no_match_action=
+dialplan.digitmap.interdigit_short_timer=
+dialplan.digitmap.interdigit_long_timer=
+dialplan.digitmap.apply_to.press_send=
+dialplan.digitmap.apply_to.forward=
+dialplan.digitmap.apply_to.history_dial=
+dialplan.digitmap.apply_to.directory_dial=
+dialplan.digitmap.apply_to.on_hook_dial=
+dialplan.digitmap.active.on_hook_dialing=
+
+##V83 Add
+dialplan.digitmap.apply_to.prefix_key =
+
+##V84 ADD
+features.local_calllog.received.replace_rule=
+
+
+
+
+#######################################################################################
+##                           Emergency Dialplan                                      ##
+#######################################################################################
+dialplan.emergency.enable=
+dialplan.emergency.1.value=
+dialplan.emergency.server.1.address=
+dialplan.emergency.server.1.transport_type=
+dialplan.emergency.server.1.port=
+dialplan.emergency.1.server_priority=
+dialplan.emergency.custom_asserted_id=
+dialplan.emergency.asserted_id_source=
+dialplan.emergency.asserted_id.sip_account= 
+dialplan.emergency.held.request_element.1.name=
+dialplan.emergency.held.request_element.1.value= 
+dialplan.emergency.held.request_type=
+dialplan.emergency.held.server_url=
+
+
+
+#######################################################################################
+##                               Dialplan                                            ##
+#######################################################################################
+dialplan_replace_rule.url=
+dialplan.replace.line_id.1=
+dialplan.replace.replace.1=
+dialplan.replace.prefix.1=
+phone_setting.dialnow_delay=
+dialplan_dialnow.url=
+dialplan.dialnow.line_id.1=
+dialplan.dialnow.rule.1 = {$yealink_dialplan_dialnow_rule_1}
+dialplan.block_out.line_id.1=
+dialplan.block_out.number.1=
+dialplan.area_code.line_id =
+dialplan.area_code.max_len = 15
+dialplan.area_code.min_len = 1
+dialplan.area_code.code=
+
+#######################################################################################
+##                                 Rings Settings                                    ##
+#######################################################################################
+distinctive_ring_tones.alert_info.1.ringer= {$yealink_ring_file_1}
+distinctive_ring_tones.alert_info.1.text= {$yealink_ring_text_1}
+
+#######################################################################################
+##                                   IME Settings                                    ##
+#######################################################################################
+directory.search_default_input_method=
+directory.edit_default_input_method=
+gui_input_method.url=
+
+##V83 Add
+##Only T48G/T48S Models support the parameter
+phone_setting.virtual_keyboard.enable =
+
+#######################################################################################
+##                                   Language Settings                               ##
+#######################################################################################
+wui_lang.url=
+wui_lang_note.url=
+wui_lang.delete=
+gui_input_method.delete=
+gui_lang.url=
+gui_lang.delete=
+lang.gui= {$yealink_language_gui}
+lang.wui=
+
+
+#######################################################################################
+##                                   Screensaver                                     ##
+#######################################################################################
+screensaver.type=
+screensaver.delete=
+screensaver.upload_url=
+features.blf_active_backlight.enable=
+screensaver.display_clock.enable=
+screensaver.clock_move_interval=
+screensaver.picture_change_interval=
+screensaver.wait_time=
+screensaver.xml_browser.url=
+
+
+
+#######################################################################################
+##                                  Power Saving                                     ##
+#######################################################################################
+features.power_saving.enable=
+features.power_saving.power_led_flash.on_time=
+features.power_saving.power_led_flash.off_time=
+features.power_saving.office_hour.monday=
+features.power_saving.office_hour.tuesday=
+features.power_saving.office_hour.wednesday=
+features.power_saving.office_hour.thursday=
+features.power_saving.office_hour.friday=
+features.power_saving.office_hour.saturday=
+features.power_saving.office_hour.sunday =
+features.power_saving.user_input_ext.idle_timeout=
+features.power_saving.off_hour.idle_timeout=
+features.power_saving.office_hour.idle_timeout=
+features.power_saving.intelligent_mode=
+
+
+#######################################################################################
+##                           Backgrounds  Settings                                   ##
+#######################################################################################
+##File Formate:
+##SIP-T57W/T54W/T54S/T52S/T48S/T48G/T46G/T46S/T29G/T46U/T48U: .jpg/.png/.bmp/.jpeg;
+##Resolution:
+##SIP-T57W/T48S/T48G/T48U/T46U:<=2.0 megapixels;
+##for SIP-T54W/T46G/T46S/T29G: <=1.8 megapixels;SIP-T54S/T52S:<=4.2 megapixels;
+##Single File Size: <=5MB 
+##2MB of space should bereserved for the phone
+
+wallpaper_upload.url = {$yealink_t43u_wallpaper}
+{if isset($yealink_t43u_wallpaper_filename)}
+phone_setting.backgrounds =  Config:{$yealink_t43u_wallpaper_filename}
+{else}
+phone_setting.backgrounds =  Config:yealink_t43u_wallpaper.png
+{/if}
+
+## phone_setting.backgrounds_with_dsskey_unfold(Only support T48U/T48G/S)
+phone_setting.backgrounds_with_dsskey_unfold=
+
+##expansion_module.backgrounds(Only support T5XW/T54S/T52S/T43U/T46U/T48U)
+expansion_module.backgrounds=
+
+
+#######################################################################################
+##                               BSFT Setting                                        ##
+#######################################################################################
+bw.enable =
+
+
+#######################################################################################
+##                                  BLF/BLF List                                     ##
+#######################################################################################
+phone_setting.auto_blf_list_enable = 1
+phone_setting.blf_list_sequence_type = 1
+
+blf.enhanced.parked.enable=
+blf.enhanced.parked.led =
+blf.enhanced.parked.talking.action =
+blf.enhanced.parked.callin.action =
+blf.enhanced.parked.idle.action =
+
+blf.enhanced.talking.enable=
+blf.enhanced.talking.led=
+blf.enhanced.talking.talking.action =
+blf.enhanced.talking.callin.action =
+blf.enhanced.talking.idle.action =
+
+blf.enhanced.callout.enable =
+blf.enhanced.callout.led=
+blf.enhanced.callout.talking.action =
+blf.enhanced.callout.callin.action =
+blf.enhanced.callout.idle.action =
+
+blf.enhanced.callin.enable =
+blf.enhanced.callin.led=
+blf.enhanced.callin.talking.action =
+blf.enhanced.callin.callin.action=
+blf.enhanced.callin.idle.action=
+
+blf.enhanced.idle.enable = 0
+blf.enhanced.idle.led=
+blf.enhanced.idle.talking.action=
+blf.enhanced.idle.callin.action=
+blf.enhanced.idle.idle.action=
+
+features.blf_list_version = 0
+sip.sub_refresh_random=
+sip.terminate_notify_sub_delay_time=
+
+features.blf_led_mode = {$yealink_blf_led_mode}
+features.blf_pickup_only_send_code=
+
+##V84 Add
+blf.enhanced.dnd.enable=
+blf.enhanced.dnd.led=
+blf.enhanced.hold.enable=
+blf.enhanced.hold.led=
+
+features.blf.show_callinfo.enable=
+
+##V84 SP4 ADD
+blf.normal_barge_in_code=
+blf.whisper_barge_in_code=
+blf.listen_barge_in_code=
+
+
+#######################################################################################
+##                                   SCA                                             ##
+#######################################################################################
+features.auto_release_bla_line=
+features.barge_in_via_username.enable=
+
+
+
+#######################################################################################
+##                                   Call Park                                       ##
+#######################################################################################
+features.call_park.enable=
+features.call_park.park_mode=
+features.call_park.park_code=
+features.call_park.park_retrieve_code=
+features.call_park.direct_send.enable=
+features.call_park.park_visual_notify_enable=
+features.call_park.park_ring=
+features.call_park.group_enable=
+features.call_park.group_park_code=
+sip.call_park_without_blf=
+features.call_park.line_restriction.enable=
+
+
+#######################################################################################
+##                                    Broadsoft ACD                                  ##
+#######################################################################################
+acd.enable=
+acd.auto_available_timer=
+
+
+
+
+#######################################################################################
+##                              Broadsoft XSI                                        ##
+#######################################################################################
+bw.xsi.enable=
+sip.authentication_for_xsi =
+default_input_method.xsi_password=
+
+
+#######################################################################################
+##                             Broadsoft Network Directory                           ##
+#######################################################################################
+bw.xsi.directory.enable=
+bw.calllog_and_dir =
+bw.xsi.call_log.enable=
+bw_phonebook.custom=
+bw_phonebook.enterprise_common_enable=
+bw_phonebook.enterprise_common_displayname=
+bw_phonebook.enterprise_enable=
+bw_phonebook.enterprise_displayname=
+bw_phonebook.group_common_enable=
+bw_phonebook.group_common_displayname=
+bw_phonebook.personal_enable=
+bw_phonebook.personal_displayname=
+bw_phonebook.group_enable=
+bw_phonebook.group_displayname =
+directory.update_time_interval=
+bw.xsi.directory.alphabetized_by_lastname.enable=
+directory_setting.bw_directory.enable =
+directory_setting.bw_directory.priority =
+search_in_dialing.bw_directory.enable =
+search_in_dialing.bw_directory.priority =
+##V83 Add
+bw.xsi.directory.update.enable =
+
+#######################################################################################
+##                             Broadsoft Network Calllog                             ##
+#######################################################################################
+##V83 Add
+bw.xsi.call_log.delete.enable =
+bw.xsi.call_log.multiple_accounts.enable =
+phone_setting.ring_duration =
+
+
+#######################################################################################
+##                                Call Pickup                                        ##
+#######################################################################################
+features.pickup.direct_pickup_enable = {$yealink_direct_pickup_enable}
+features.pickup.group_pickup_enable =
+features.pickup.direct_pickup_code = **
+features.pickup.group_pickup_code =
+features.pickup.blf_audio_enable =
+features.pickup.blf_visual_enable =
+features.pickup_display.method =
+
+##V84 Add
+features.pickup.blf_audio.list=
+features.pickup.blf_visual.list=
+
+
+#######################################################################################
+##                                Alert Info                                         ##
+#######################################################################################
+features.alert_info_tone =
+
+
+#######################################################################################
+##                       Broadsoft Visual Voice Mail                                 ##
+#######################################################################################
+bw.voice_mail.visual.enable=
+voice_mail.message_key.mode=
+bw.voice_mail.visual.display_videomail.enable=
+
+
+
+#######################################################################################
+##                              Broadsoft Call Recording                             ##
+#######################################################################################
+bw.call_recording.mode =
+
+
+#######################################################################################
+##                              Broadsoft Call Decline                               ##
+#######################################################################################
+features.call_decline.enable =
+
+
+#######################################################################################
+##                         BLF Ring Type                                             ##
+#######################################################################################
+features.blf.ring_type =
+
+
+
+#######################################################################################
+##                         Features Sync                                             ##
+#######################################################################################
+features.feature_key_sync.enable = {$yealink_feature_key_sync}
+features.forward.feature_key_sync.local_processing.enable =
+features.forward.feature_key_sync.enable =
+features.dnd.feature_key_sync.local_processing.enable =
+features.dnd.feature_key_sync.enable =
+call_waiting.mode =
+
+
+#######################################################################################
+##                           Broadsoft  UC                                           ##
+#######################################################################################
+##Only T5XW/T54S/T52S/T48G/T48S/T46G/T46S/T29G/T46U/T48U Models support the parameter
+bw.xmpp.enable =
+features.uc_password =
+features.uc_username =
+bw.xmpp.presence_icon.mode =
+bw.xmpp.change_presence.force_manual.enable =
+bw.xmpp.change_presence.enable =
+phone_setting.dsskey_directory_auto.enable =
+features.uc_dir.match_tail_number=
+directory_setting.bw_uc_buddies.enable =
+directory_setting.bw_uc_buddies.priority =
+search_in_dialing.bw_uc_buddies.enable =
+search_in_dialing.bw_uc_buddies.priority =
+
+##V83 Add
+phone_setting.uc_favorite_sequence_type =
+
+#######################################################################################
+##                      Broadsoft  Emergency Call                                    ##
+#######################################################################################
+##V83 Add
+bw.emergency_calling.enable  =
+
+
+
+#######################################################################################
+##                         Metaswitch Setting                                        ##
+#######################################################################################
+meta.enable =
+meta.login_mode =
+meta.comm_portal.server.username =
+meta.comm_portal.server.password =
+meta.comm_portal.server.url =
+meta.comm_portal.enable =
+meta.comm_portal.contacts.update_interval =
+meta.comm_portal.acd.enable=
+meta.comm_portal.replace_local_call_list.enable=
+meta.comm_portal.contacts.group.mlhgs.label=
+meta.comm_portal.contacts.group.extensions.label=
+meta.comm_portal.contacts.group.contacts.label=
+meta.comm_portal.contacts.group.mlhgs.enable=
+meta.comm_portal.contacts.group.extensions.enable=
+meta.comm_portal.contacts.group.contacts.enable=
+meta.comm_portal.call_list.enable=
+meta.comm_portal.contacts.enable=
+meta.comm_portal.message.enable=
+meta.comm_portal.logout.enable =
+meta.comm_portal.keep_alive_interval_time =
+
+##V83 Add
+directory_setting.meta_directory.enable=
+directory_setting.meta_directory.priority=
+directory_setting.meta_call_log.enable=
+directory_setting.meta_call_log.priority=
+search_in_dialing.meta_call_log.priority =
+search_in_dialing.meta_call_log.enable =
+search_in_dialing.meta_directory.priority =
+search_in_dialing.meta_directory.enable =
+
+
+
+#######################################################################################
+##                                   Genbend Setting                                 ##
+#######################################################################################
+gb.sopi.enable=
+gb.sopi.gab.enable=
+gb.sopi.pab.enable=
+features.pab.soupuser=
+features.pab.enable=
+gb.sopi.pab.match_in_calling.enable=
+gb.sopi.gab.retain_search_filter=
+gb.sopi.service_url=
+gb.sopi.password=
+gb.sopi.username=
+directory_setting.gb_gab_directory.priority =
+directory_setting.gb_gab_directory.enable =
+directory_setting.gb_pab_directory.enable =
+directory_setting.gb_pab_directory.priority =
+search_in_dialing.gb_pab_directory.priority =
+search_in_dialing.gb_pab_directory.enable =
+
+
+#######################################################################################
+##                                   Loopback Call                                   ##
+#######################################################################################
+##V83 Add
+sip.loopback.enable =
+sip.loopback_type =
+sip.pkt_loopback_mode
+sip.loopback.auto_answer.mode =
+sip.pkt_loopback_encapsulated_payload =
+sip.pkt_loopback_directed_payload =
+
+
+#######################################################################################
+##                                   V84 add                                         ##
+#######################################################################################
+google_contact_server.enable=
+
+static.features.network_test.check_policy=
+static.features.network_test.enable=
+static.features.network_test.host=
+static.features.network_test.period=
+static.features.network_unavailable_test.period=
+
+phone_setting.warnings_display.mode=
+
+bw.flexible_seating.remember_password.ldap.enable=
+
+vcaccount.enable=
+
+#######################################################################################
+##                       V84 T5XW add   VPM-Acoustic Shield                          ##
+#######################################################################################
+features.acoustic_shield.level =
+features.acoustic_shield.mode = 
+
+
+
+#######################################################################################
+##                       V84 SP4 add                                                 ##
+#######################################################################################
+
+phone_setting.search_t9.enable =
+phone_setting.mail_power_led_flash_enable =
+ldap.anonymous_bind_operation.enable =
+google_contact_server.display_mode = 
+gb.presence.line = 
+gb.presence.enable =
+gb.emergency_instant_messages.enable = 
+gb.emergency_instant_messages.displaytimeout =
+features.transfer_keep_session2_after_failed.enable=
+features.intercom.mode = 
+features.emergency_instant_messages.ring_type =
+features.dtmf.transfer =
+features.dtmf.replace_tran =
+features.call_park.performby_holdhardkey.enable =
+features.blf_extension.mode =
+features.auto_answer.ring_type =
+directory_setting.presence_list.priority =
+directory_setting.presence_list.enable =
+dialplan.transfer.mode =
+dialplan.emergency.held.secondary.server_url = 
+custom.features.dsskey_lock_type = 
+blf.enhanced.dnd.led =
+blf.enhanced.dnd.enable = 
+auto_provision.pnp_check_url.enable = 
+
+acd.logout_fixed_display.enable=
+acd.available_fixed_display.enable =
+acd.disp_code_fixed_display.enable =
+acd.trace_fixed_display.enable = 
+
+features.parked_call_monitor.blf_visual_enable=
+features.parked_call_monitor.blf_audio_enable=
+features.parked_call_monitor.blf.ring_type=
+
diff --git a/resources/templates/provision/yealink/t43u/{$mac}.cfg b/resources/templates/provision/yealink/t43u/{$mac}.cfg
new file mode 100644
index 0000000000..e99122c010
--- /dev/null
+++ b/resources/templates/provision/yealink/t43u/{$mac}.cfg
@@ -0,0 +1,3407 @@
+#!version:1.0.0.1
+
+##File header "#!version:1.0.0.1" can not be edited or deleted, and must be placed in the first line.##
+##account.X.*:(T5XW/T54S/T48G/T48S/T46G/T46S/T29G/T46U/T48U: X ranges from 1 to 16. T52S/T42G/T42S/T43U: X ranges from 1 to 12. T41P/T41S/T27P/T27G/T41U: X ranges from 1 to 6. T40P/T40G/T23P/T23G: X ranges from 1 to 3. T21(P) E2: X ranges from 1 to 2.)##
+
+#######################################################################################
+##                                   Transfer                                        ##
+#######################################################################################
+account.1.phone_setting.call_appearance.transfer_via_new_linekey= {$yealink_transfer_via_new_linekey}
+
+
+#######################################################################################
+##                                   Conference                                      ##
+#######################################################################################
+account.1.phone_setting.call_appearance.conference_via_new_linekey=
+
+
+#######################################################################################
+##                                   Anonymous                                       ##
+#######################################################################################
+account.1.anonymous_call.server_base_only =
+account.1.send_anonymous_rejection_code =
+account.1.anonymous_reject_offcode =
+account.1.anonymous_reject_oncode =
+account.1.reject_anonymous_call=
+account.1.anonymous_call_offcode =
+account.1.anonymous_call_oncode =
+account.1.anonymous_call = 0
+account.1.send_anonymous_code =
+
+
+
+#######################################################################################
+##                          Call Configuration                                       ##
+#######################################################################################
+account.1.music_server_uri=
+account.1.music_on_hold_type=
+account.1.auto_label.rule=
+account.1.auto_label.enable=
+account.1.number_of_linekey=
+account.1.phone_setting.call_appearance.calls_per_linekey=
+
+
+#######################################################################################
+##                                    Codec                                          ##
+#######################################################################################
+account.1.codec.ilbc_15_2kbps.priority=
+account.1.codec.ilbc_15_2kbps.enable=
+
+account.1.codec.ilbc_13_33kbps.priority= {if isset($yealink_codec_iLBC_priority)}{$yealink_codec_iLBC_priority}{else}0{/if}
+
+account.1.codec.ilbc_13_33kbps.enable = {if isset($yealink_codec_iLBC_enable)}1{else}0{/if}
+
+account.1.codec.pcma.enable= {if isset($yealink_codec_pcma_enable)}1{else}0{/if}
+
+account.1.codec.pcma.priority= {if isset($yealink_codec_pcma_priority)}{$yealink_codec_pcma_priority}{else}0{/if}
+
+account.1.codec.pcmu.enable= {if isset($yealink_codec_pcmu_enable)}1{else}0{/if}
+
+account.1.codec.pcmu.priority= {if isset($yealink_codec_pcmu_priority)}{$yealink_codec_pcmu_priority}{else}0{/if}
+
+account.1.codec.opus.priority= {if isset($yealink_codec_opus_priority)}{$yealink_codec_opus_priority}{else}0{/if}
+
+account.1.codec.opus.enable= {if isset($yealink_codec_opus_enable)}1{else}0{/if}
+
+account.1.codec.opus.para= 106
+
+account.1.codec.g726_40.enable= {if isset($yealink_codec_g726_40_enable)}1{else}0{/if}
+
+account.1.codec.g726_40.priority= {if isset($yealink_codec_g726_40_priority)}{$yealink_codec_g726_40_priority}{else}0{/if}
+
+account.1.codec.g726_32.enable= {if isset($yealink_codec_g726_32_enable)}1{else}0{/if}
+
+account.1.codec.g726_32.priority= {if isset($yealink_codec_g726_32_priority)}{$yealink_codec_g726_32_priority}{else}0{/if}
+
+account.1.codec.g726_24.enable= {if isset($yealink_codec_g726_24_enable)}1{else}0{/if}
+
+account.1.codec.g726_24.priority= {if isset($yealink_codec_g726_24_priority)}{$yealink_codec_g726_24_priority}{else}0{/if}
+
+account.1.codec.g726_16.enable= {if isset($yealink_codec_g726_16_enable)}1{else}0{/if}
+
+account.1.codec.g726_16.priority= {if isset($yealink_codec_g726_16_priority)}{$yealink_codec_g726_16_priority}{else}0{/if}
+
+account.1.codec.g723_63.priority= {if isset($yealink_codec_g723_63_priority)}{$yealink_codec_g723_63_priority}{else}0{/if}
+
+account.1.codec.g723_63.enable= {if isset($yealink_codec_g723_63_enable)}1{else}0{/if}
+
+account.1.codec.g723_53.priority= {if isset($yealink_codec_g723_53_priority)}{$yealink_codec_g723_53_priority}{else}0{/if}
+
+account.1.codec.g723_53.enable= {if isset($yealink_codec_g723_53_enable)}1{else}0{/if}
+
+account.1.codec.g729.priority= {if isset($yealink_codec_g729_priority)}{$yealink_codec_g729_priority}{else}0{/if}
+
+account.1.codec.g729.enable= {if isset($yealink_codec_g729_enable)}1{else}0{/if}
+
+account.1.codec.g722.priority= {if isset($yealink_codec_g722_priority)}{$yealink_codec_g722_priority}{else}0{/if}
+
+account.1.codec.g722.enable= {if isset($yealink_codec_g722_enable)}1{else}0{/if}
+
+account.1.codec.G722_1_24kpbs.priority=
+account.1.codec.G722_1_24kpbs.enable=
+account.1.codec.G722_1c_24kpbs.priority=
+account.1.codec.G722_1c_24kpbs.enable=
+account.1.codec.G722_1c_32kpbs.priority=
+account.1.codec.G722_1c_32kpbs.enable=
+account.1.codec.G722_1c_48kpbs.priority=
+account.1.codec.G722_1c_48kpbs.enable=
+
+################################################################
+#                      Account Register                       ##
+################################################################
+{if isset($account.1.password) }
+account.1.enable = 1
+{else}
+account.1.enable = 0
+{/if}
+account.1.label = {$account.1.display_name}
+account.1.display_name = {$account.1.display_name}
+account.1.auth_name = {$account.1.auth_id}
+
+{if isset($account.1.server.1.address)}
+account.1.user_name = {$account.1.user_id}@{$account.1.server_address}
+{else}
+account.1.user_name = {$account.1.user_id}
+{/if}
+
+account.1.password = {$account.1.password}
+account.1.sip_server.1.address= {$account.1.server_address}
+account.1.sip_server_port = {$account.1.sip_port}
+
+
+#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
+{if $account.1.sip_transport == 'udp'}account.1.sip_server.1.transport_type = 0{/if}
+{if $account.1.sip_transport == 'tcp'}account.1.sip_server.1.transport_type = 1{/if}
+{if $account.1.sip_transport == 'tls'}account.1.sip_server.1.transport_type = 2{/if}
+{if $account.1.sip_transport == 'dns srv'}account.1.sip_server.1.transport_type = 3{/if}
+
+account.1.sip_server.1.expires=  {$account.1.register_expires}
+account.1.sip_server.1.retry_counts= 3
+
+account.1.sip_server.2.address= {$account.1.server.2.address}
+account.1.sip_server.2.port= {$account.1.sip_port}
+
+#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS-NAPTR;
+{if $account.1.sip_transport == 'udp'}account.1.sip_server.2.transport_type = 0{/if}
+{if $account.1.sip_transport == 'tcp'}account.1.sip_server.2.transport_type = 1{/if}
+{if $account.1.sip_transport == 'tls'}account.1.sip_server.2.transport_type = 2{/if}
+{if $account.1.sip_transport == 'dns srv'}account.1.sip_server.2.transport_type = 3{/if}
+
+account.1.sip_server.2.expires= {$account.1.register_expires}
+account.1.sip_server.2.retry_counts= 3
+
+account.1.outbound_proxy_enable = {if isset($account.1.outbound_proxy_primary)}1{else}0{/if}
+
+account.1.outbound_proxy.1.address = {$account.1.outbound_proxy_primary}
+account.1.outbound_proxy.2.address = {$account.1.outbound_proxy_secondary}
+
+{if isset($outbound_proxy_1_port)}
+account.1.outbound_proxy.1.port = {$outbound_proxy_1_port}
+{else}
+account.1.outbound_proxy.1.port = {$account.1.sip_port}
+{/if}
+
+account.1.outbound_proxy.2.address= {$account.1.outbound_proxy_secondary}
+
+{if isset($outbound_proxy_1_port)}
+account.1.outbound_proxy.2.port = {$outbound_proxy_2_port}
+{else}
+account.1.outbound_proxy.2.port = {$account.1.sip_port}
+{/if}
+
+account.1.outbound_proxy_fallback_interval= {$yealink_outbound_proxy_fallback_interval}
+
+account.1.nat.nat_traversal= {if isset($stun_server)}1{else}0{/if}
+
+
+
+################################################################
+#                      Account Basic                          ##
+################################################################
+account.1.auto_answer=
+
+################################################################
+#                      Account Advanced                       ##
+################################################################
+account.1.nat.udp_update_enable=
+account.1.nat.udp_update_time=
+account.1.nat.rport= {$yealink_rport}
+
+account.1.dtmf.type= {$yealink_dtmf_type}
+account.1.dtmf.info_type=
+account.1.dtmf.dtmf_payload=
+account.1.100rel_enable=
+
+account.1.subscribe_register=
+account.1.cid_source= {$yealink_cid_source}
+account.1.enable_user_equal_phone=
+account.1.srtp_encryption= {$yealink_srtp_encryption}
+account.1.ptime=
+account.1.register_line=
+account.1.register_mac=
+account.1.reg_fail_retry_interval=
+account.1.unregister_on_reboot=
+
+account.1.session_timer.refresher=
+account.1.session_timer.expires=
+account.1.session_timer.enable= {$yealink_session_timer}
+
+account.1.conf_type = {if $nway_conference == true}2{/if}
+account.1.sip_server_type=
+
+##V83 Add
+account.1.srtp.unencrypted_rtcp.enable =
+account.1.srtp.unencrypted_rtp.enable =
+account.1.sip_server_mode =
+
+
+
+################################################################
+#                        SIP Backup Server                    ##
+################################################################
+account.1.outbound_proxy.1.register_on_enable=
+account.1.outbound_proxy.1.failback_timeout=
+account.1.outbound_proxy.1.failback_mode=
+account.1.outbound_proxy.1.retry_counts=
+account.1.outbound_proxy.1.only_signal_with_registered=
+account.1.outbound_proxy.1.failback_subscribe.enable=
+account.1.outbound_proxy.1.invite_retry_counts=
+
+account.1.sip_server.1.register_on_enable=
+account.1.sip_server.1.failback_timeout=
+account.1.sip_server.1.failback_mode=
+account.1.sip_server.1.failback_subscribe.enable=
+account.1.sip_server.1.only_signal_with_registered=
+account.1.sip_server.1.invite_retry_counts=
+
+account.1.outbound_proxy.2.register_on_enable=
+account.1.outbound_proxy.2.failback_timeout=
+account.1.outbound_proxy.2.failback_mode=
+account.1.outbound_proxy.2.retry_counts=
+account.1.outbound_proxy.2.only_signal_with_registered=
+account.1.outbound_proxy.2.failback_subscribe.enable=
+account.1.outbound_proxy.2.invite_retry_counts=
+
+account.1.sip_server.2.register_on_enable=
+account.1.sip_server.2.failback_timeout=
+account.1.sip_server.2.failback_mode=
+account.1.sip_server.2.failback_subscribe.enable=
+account.1.sip_server.2.only_signal_with_registered=
+account.1.sip_server.2.invite_retry_counts=
+
+account.1.static_cache_pri=
+account.1.dns_cache_type=
+account.1.naptr_build=
+account.1.fallback.timeout=
+account.1.fallback.redundancy_type=
+account.1.reg_failed_retry_max_time=
+account.1.reg_failed_retry_min_time=
+account.1.redundancy_with_reg_fail.enable =
+
+##V83 Add
+account.1.sip_server.1.outbound_proxy_enable =
+account.1.sip_server.2.outbound_proxy_enable =
+
+################################################################
+#                        SIP Basic config                     ##
+################################################################
+account.1.contact_take_line_param=
+account.1.update_ack_while_dialing=
+account.1.srtp_lifetime=
+account.1.third_part_request_with_route.enable=
+account.1.insert_outbound_in_route.enable=
+account.1.path.enable=
+account.1.sub_fail_retry_interval=
+account.1.transfer_refer_to_contact_header.enable=
+account.1.hold_use_inactive=
+account.1.gruu.enable=
+account.1.dial_tone=
+account.1.call_id_mode=
+account.1.subscribe_expires_overlap=
+account.1.register_expires_overlap=
+account.1.call_info=
+account.1.custom_ua=
+account.1.mwi_parse_terminated=
+account.1.check_cseq.enable=
+account.1.check_to_tag.enable=
+account.1.vq_rtcpxr.collector_server_port=
+account.1.vq_rtcpxr.collector_server_host=
+account.1.vq_rtcpxr.collector_name=
+account.1.compact_header_enable=
+account.1.cp_source= 2
+account.1.cid_source_ppi= 1
+account.1.cid_source_privacy= 1
+account.1.reg_with_pani_header.enable =
+account.1.alert_info=
+account.1.picture_info_enable= 1
+
+##V83 Add
+account.1.invite_with_pani_header.enable = 
+
+##V84 Add
+account.1.invite_with_rpid_header.enable=
+
+account.1.auto_answer_mute_enable
+
+##V84 SP4 Add
+account.1.share_line.enable_private_code =
+account.1.share_line.cancel_private_code =
+
+#######################################################################################
+##                                 History                                           ##
+#######################################################################################
+account.1.missed_calllog=
+
+
+#######################################################################################
+##                                  Forward                                          ##
+#######################################################################################
+account.1.timeout_fwd.off_code=
+account.1.timeout_fwd.on_code=
+account.1.timeout_fwd.timeout=
+account.1.timeout_fwd.target=
+account.1.timeout_fwd.enable=
+account.1.busy_fwd.off_code=
+account.1.busy_fwd.on_code=
+account.1.busy_fwd.target=
+account.1.busy_fwd.enable=
+account.1.always_fwd.off_code=
+account.1.always_fwd.on_code=
+account.1.always_fwd.target=
+account.1.always_fwd.enable=
+
+
+#######################################################################################
+##                                  DND                                              ##
+#######################################################################################
+account.1.dnd.enable=
+account.1.dnd.off_code=
+account.1.dnd.on_code=
+
+
+
+#######################################################################################
+##                               Voice Mail                                          ##
+#######################################################################################
+voice_mail.number.1= {$voicemail_number}
+account.1.subscribe_mwi= 1
+account.1.subscribe_mwi_to_vm= {$yealink_subscribe_mwi_to_vm}
+account.1.subscribe_mwi_expires= 3600
+account.1.display_mwi.enable=
+
+#######################################################################################
+##                               Auto Dial                                           ##
+#######################################################################################
+account.1.auto_dial_enable=
+account.1.auto_dial_num=
+
+
+#######################################################################################
+##                           Preference&Status                                       ##
+#######################################################################################
+account.1.ringtone.ring_type=
+
+#######################################################################################
+##                           Digitmap                                                ##
+#######################################################################################
+account.1.dialplan.digitmap.enable=
+account.1.dialplan.digitmap.string=
+account.1.dialplan.digitmap.no_match_action=
+account.1.dialplan.digitmap.interdigit_short_timer=
+account.1.dialplan.digitmap.interdigit_long_timer=
+account.1.dialplan.digitmap.apply_to.press_send=
+account.1.dialplan.digitmap.apply_to.forward=
+account.1.dialplan.digitmap.apply_to.history_dial=
+account.1.dialplan.digitmap.apply_to.directory_dial=
+account.1.dialplan.digitmap.apply_to.on_hook_dial=
+account.1.dialplan.digitmap.active.on_hook_dialing=
+
+
+#######################################################################################
+##                                 Rings Settings                                    ##
+#######################################################################################
+account.1.alert_info_url_enable=
+
+
+#######################################################################################
+##                                  BLF/BLF List                                     ##
+#######################################################################################
+account.1.blf.blf_list_uri=
+account.1.blf_list_barge_in_code=
+account.1.blf_list_code=
+account.1.blf_list_retrieve_call_parked_code=
+account.1.blf.subscribe_period=
+account.1.blf.match_host.enable=
+account.1.out_dialog_blf_enable=
+account.1.blf.subscribe_event=
+
+##V84 Add
+account.1.blf_list_call_parked_code=
+account.1.blf_list_call_parked_list=
+
+##V84 SP4 ADD
+account.1.blf_list_whisper_code=
+account.1.blf_list_listen_in_code=
+
+
+#######################################################################################
+##                                   SCA                                             ##
+#######################################################################################
+account.1.shared_line=
+account.1.line_seize.expires=
+account.1.shared_line_one_touch_bargein.enable=
+account.1.shared_line_one_touch_retrieve.enable=
+account.1.sca_manage_interface_display_time=
+account.1.shared_line_callpull_code=
+
+##V83 Add
+account.x.share_line.barge_in.enable
+
+#######################################################################################
+##                                   BLA                                             ##
+#######################################################################################
+account.1.bla_number=
+account.1.bla_subscribe_period=
+account.1.bla.notify_with_expire.enable=
+account.1.bla.subscribe_uri_build_type=
+
+#######################################################################################
+##                                   Call Park                                       ##
+#######################################################################################
+account.1.callpark_enable=
+
+
+#######################################################################################
+##                                    Broadsoft ACD                                  ##
+#######################################################################################
+account.1.acd.enable= 0
+account.1.acd.available= 0
+account.1.acd.unavailable_reason_enable= 0
+account.1.acd.initial_state= 1
+account.1.subscribe_acd_expires=
+
+
+#######################################################################################
+##                                 Broadsoft ACD Call Center                         ##
+#######################################################################################
+##account.X.reason_code.Y=
+##account.X.reason_code_name.Y=
+##account.X.bw_disp_code.Y=
+##account.X.bw_disp_code_name.Y=
+##account.X.supervisor_info_code.Y=
+##account.X.supervisor_info_code_name.Y=
+##The value Y must be continuous.
+
+account.1.reason_code.1=
+account.1.reason_code_name.1= 0
+account.1.bw_disp_code.1=
+account.1.bw_disp_code_name.1=
+account.1.supervisor_info_code.1=
+account.1.supervisor_info_code_name.1=
+
+#######################################################################################
+##                                 Broadsoft Call Center                             ##
+#######################################################################################
+account.1.call_center.call_info_enable= 0
+account.1.call_center.show_call_info_time= 30
+account.1.call_center.disp_code_enable= 0
+account.1.call_center.trace_enable= 0
+account.1.call_center.emergency_enable= 0
+account.1.call_center.queue_status_enable= 0
+account.1.call_center.queue_status_light_enable = 0
+
+
+
+#######################################################################################
+##                         Broadsoft Hoteling                                        ##
+#######################################################################################
+account.1.hoteling.enable= 0
+account.1.hoteling.user_id= 0
+account.1.hoteling.password= 0
+account.1.hoteling.expires= 0
+account.1.hoteling.auto_login_enable= 0
+
+
+#######################################################################################
+##                              Broadsoft XSI                                        ##
+#######################################################################################
+account.1.xsi.user =
+account.1.xsi.password =
+account.1.xsi.host =
+account.1.xsi.server_type =
+account.1.xsi.port =
+
+
+#######################################################################################
+##                                Call Pickup                                        ##
+#######################################################################################
+account.1.direct_pickup_code =
+account.1.group_pickup_code =
+account.1.dialoginfo_callpickup = 0
+account.1.refresh_remote_id.enable =
+
+
+#######################################################################################
+##                              Broadsoft Call Recording                             ##
+#######################################################################################
+account.1.call_recording.enable=
+
+#######################################################################################
+##                                Network Conference                                  ##
+#######################################################################################
+account.1.conf_uri = {if $nway_conference == true}nway{$account.1.auth_id}@{$account.1.server_address}{/if}
+
+
+#######################################################################################
+##                              Broadsoft Call Decline                               ##
+#######################################################################################
+account.1.features.call_decline.enable =
+
+
+#######################################################################################
+##                       Broadsoft Security Classification                           ##
+#######################################################################################
+account.1.security_classification.enable =
+
+
+
+#######################################################################################
+##                        Broadsoft Flexible Seating                                 ##
+#######################################################################################
+account.1.flexible_seating.enable=
+account.1.hoteling.pin=
+account.1.hoteling.mode=
+
+#######################################################################################
+##                         Features Sync                                             ##
+#######################################################################################
+account.1.features.forward.feature_key_sync.local_processing.enable=
+account.1.features.dnd.feature_key_sync.local_processing.enable =
+
+##V84 Add
+account.1.dnd.feature_key_sync.enable=
+account.1.feature_key_sync.enable=
+account.1.forward.feature_key_sync.enable=
+
+#######################################################################################
+##                                   ACD                                             ##
+#######################################################################################
+account.1.acd.available_url=
+account.1.acd.away_url =
+account.1.acd.refresh_url =
+account.1.acd.call_information=
+
+
+
+#######################################################################################
+##                                  virtual_user                                     ##
+#######################################################################################
+##V84 Add
+bw.virtual_user.1.enable=
+bw.virtual_user.1.label=
+bw.virtual_user.1.xsi.dnd.enable=
+bw.virtual_user.1.xsi.host=
+bw.virtual_user.1.xsi.password=
+bw.virtual_user.1.xsi.port=
+bw.virtual_user.1.xsi.server_type=
+bw.virtual_user.1.xsi.user=
+
+#!version:1.0.0.1
+
+##File header "#!version:1.0.0.1" can not be edited or deleted, and must be placed in the first line.##
+##account.X.*:(T5XW/T54S/T48G/T48S/T46G/T46S/T29G/T46U/T48U: X ranges from 1 to 16. T52S/T42G/T42S/T43U: X ranges from 1 to 12. T41P/T41S/T27P/T27G/T41U: X ranges from 1 to 6. T40P/T40G/T23P/T23G: X ranges from 1 to 3. T21(P) E2: X ranges from 1 to 2.)##
+
+#######################################################################################
+##                                   Transfer                                        ##
+#######################################################################################
+account.2.phone_setting.call_appearance.transfer_via_new_linekey= {$yealink_transfer_via_new_linekey}
+
+
+#######################################################################################
+##                                   Conference                                      ##
+#######################################################################################
+account.2.phone_setting.call_appearance.conference_via_new_linekey=
+
+
+#######################################################################################
+##                                   Anonymous                                       ##
+#######################################################################################
+account.2.anonymous_call.server_base_only =
+account.2.send_anonymous_rejection_code =
+account.2.anonymous_reject_offcode =
+account.2.anonymous_reject_oncode =
+account.2.reject_anonymous_call=
+account.2.anonymous_call_offcode =
+account.2.anonymous_call_oncode =
+account.2.anonymous_call = 0
+account.2.send_anonymous_code =
+
+
+
+#######################################################################################
+##                          Call Configuration                                       ##
+#######################################################################################
+account.2.music_server_uri=
+account.2.music_on_hold_type=
+account.2.auto_label.rule=
+account.2.auto_label.enable=
+account.2.number_of_linekey=
+account.2.phone_setting.call_appearance.calls_per_linekey=
+
+
+#######################################################################################
+##                                    Codec                                          ##
+#######################################################################################
+account.2.codec.ilbc_15_2kbps.priority=
+account.2.codec.ilbc_15_2kbps.enable=
+
+account.2.codec.ilbc_13_33kbps.priority= {if isset($yealink_codec_iLBC_priority)}{$yealink_codec_iLBC_priority}{else}0{/if}
+
+account.2.codec.ilbc_13_33kbps.enable = {if isset($yealink_codec_iLBC_enable)}1{else}0{/if}
+
+account.2.codec.pcma.enable= {if isset($yealink_codec_pcma_enable)}1{else}0{/if}
+
+account.2.codec.pcma.priority= {if isset($yealink_codec_pcma_priority)}{$yealink_codec_pcma_priority}{else}0{/if}
+
+account.2.codec.pcmu.enable= {if isset($yealink_codec_pcmu_enable)}1{else}0{/if}
+
+account.2.codec.pcmu.priority= {if isset($yealink_codec_pcmu_priority)}{$yealink_codec_pcmu_priority}{else}0{/if}
+
+account.2.codec.opus.priority= {if isset($yealink_codec_opus_priority)}{$yealink_codec_opus_priority}{else}0{/if}
+
+account.2.codec.opus.enable= {if isset($yealink_codec_opus_enable)}1{else}0{/if}
+
+account.2.codec.opus.para= 106
+
+account.2.codec.g726_40.enable= {if isset($yealink_codec_g726_40_enable)}1{else}0{/if}
+
+account.2.codec.g726_40.priority= {if isset($yealink_codec_g726_40_priority)}{$yealink_codec_g726_40_priority}{else}0{/if}
+
+account.2.codec.g726_32.enable= {if isset($yealink_codec_g726_32_enable)}1{else}0{/if}
+
+account.2.codec.g726_32.priority= {if isset($yealink_codec_g726_32_priority)}{$yealink_codec_g726_32_priority}{else}0{/if}
+
+account.2.codec.g726_24.enable= {if isset($yealink_codec_g726_24_enable)}1{else}0{/if}
+
+account.2.codec.g726_24.priority= {if isset($yealink_codec_g726_24_priority)}{$yealink_codec_g726_24_priority}{else}0{/if}
+
+account.2.codec.g726_16.enable= {if isset($yealink_codec_g726_16_enable)}1{else}0{/if}
+
+account.2.codec.g726_16.priority= {if isset($yealink_codec_g726_16_priority)}{$yealink_codec_g726_16_priority}{else}0{/if}
+
+account.2.codec.g723_63.priority= {if isset($yealink_codec_g723_63_priority)}{$yealink_codec_g723_63_priority}{else}0{/if}
+
+account.2.codec.g723_63.enable= {if isset($yealink_codec_g723_63_enable)}1{else}0{/if}
+
+account.2.codec.g723_53.priority= {if isset($yealink_codec_g723_53_priority)}{$yealink_codec_g723_53_priority}{else}0{/if}
+
+account.2.codec.g723_53.enable= {if isset($yealink_codec_g723_53_enable)}1{else}0{/if}
+
+account.2.codec.g729.priority= {if isset($yealink_codec_g729_priority)}{$yealink_codec_g729_priority}{else}0{/if}
+
+account.2.codec.g729.enable= {if isset($yealink_codec_g729_enable)}1{else}0{/if}
+
+account.2.codec.g722.priority= {if isset($yealink_codec_g722_priority)}{$yealink_codec_g722_priority}{else}0{/if}
+
+account.2.codec.g722.enable= {if isset($yealink_codec_g722_enable)}1{else}0{/if}
+
+account.2.codec.G722_1_24kpbs.priority=
+account.2.codec.G722_1_24kpbs.enable=
+account.2.codec.G722_1c_24kpbs.priority=
+account.2.codec.G722_1c_24kpbs.enable=
+account.2.codec.G722_1c_32kpbs.priority=
+account.2.codec.G722_1c_32kpbs.enable=
+account.2.codec.G722_1c_48kpbs.priority=
+account.2.codec.G722_1c_48kpbs.enable=
+
+################################################################
+#                      Account2 Register                       ##
+################################################################
+{if isset($account.2.password) }
+account.2.enable = 1
+{else}
+account.2.enable = 0
+{/if}
+account.2.label = {$account.2.display_name}
+account.2.display_name = {$account.2.display_name}
+account.2.auth_name = {$account.2.auth_id}
+
+{if isset($account.2.server.1.address)}
+account.2.user_name = {$account.2.user_id}@{$account.2.server_address}
+{else}
+account.2.user_name = {$account.2.user_id}
+{/if}
+
+account.2.password = {$account.2.password}
+account.2.sip_server.1.address= {$account.2.server_address}
+account.2.sip_server_port = {$account.2.sip_port}
+
+
+#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
+{if $account.2.sip_transport == 'udp'}account.2.sip_server.1.transport_type = 0{/if}
+{if $account.2.sip_transport == 'tcp'}account.2.sip_server.1.transport_type = 1{/if}
+{if $account.2.sip_transport == 'tls'}account.2.sip_server.1.transport_type = 2{/if}
+{if $account.2.sip_transport == 'dns srv'}account.2.sip_server.1.transport_type = 3{/if}
+
+account.2.sip_server.1.expires=  {$account.2.register_expires}
+account.2.sip_server.1.retry_counts= 3
+
+account.2.sip_server.2.address= {$account.2.server.2.address}
+account.2.sip_server.2.port= {$account.2.sip_port}
+
+#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS-NAPTR;
+{if $account.2.sip_transport == 'udp'}account.2.sip_server.2.transport_type = 0{/if}
+{if $account.2.sip_transport == 'tcp'}account.2.sip_server.2.transport_type = 1{/if}
+{if $account.2.sip_transport == 'tls'}account.2.sip_server.2.transport_type = 2{/if}
+{if $account.2.sip_transport == 'dns srv'}account.2.sip_server.2.transport_type = 3{/if}
+
+account.2.sip_server.2.expires= {$account.2.register_expires}
+account.2.sip_server.2.retry_counts= 3
+
+account.2.outbound_proxy_enable = {if isset($account.2.outbound_proxy_primary)}1{else}0{/if}
+
+account.2.outbound_proxy.1.address = {$account.2.outbound_proxy_primary}
+account.2.outbound_proxy.2.address = {$account.2.outbound_proxy_secondary}
+
+{if isset($outbound_proxy_1_port)}
+account.2.outbound_proxy.1.port = {$outbound_proxy_1_port}
+{else}
+account.2.outbound_proxy.1.port = {$account.2.sip_port}
+{/if}
+
+account.2.outbound_proxy.2.address= {$account.2.outbound_proxy_secondary}
+
+{if isset($outbound_proxy_1_port)}
+account.2.outbound_proxy.2.port = {$outbound_proxy_2_port}
+{else}
+account.2.outbound_proxy.2.port = {$account.2.sip_port}
+{/if}
+
+account.2.outbound_proxy_fallback_interval= {$yealink_outbound_proxy_fallback_interval}
+
+account.2.nat.nat_traversal= {if isset($stun_server)}1{else}0{/if}
+
+
+
+################################################################
+#                      Account Basic                          ##
+################################################################
+account.2.auto_answer=
+
+################################################################
+#                      Account Advanced                       ##
+################################################################
+account.2.nat.udp_update_enable=
+account.2.nat.udp_update_time=
+account.2.nat.rport=  {$yealink_rport}
+
+account.2.dtmf.type= {$yealink_dtmf_type}
+account.2.dtmf.info_type=
+account.2.dtmf.dtmf_payload=
+account.2.100rel_enable=
+
+account.2.subscribe_register=
+account.2.cid_source= {$yealink_cid_source}
+account.2.enable_user_equal_phone=
+account.2.srtp_encryption= {$yealink_srtp_encryption}
+account.2.ptime=
+account.2.register_line=
+account.2.register_mac=
+account.2.reg_fail_retry_interval=
+account.2.unregister_on_reboot=
+
+account.2.session_timer.refresher=
+account.2.session_timer.expires=
+account.2.session_timer.enable= {$yealink_session_timer}
+
+account.2.conf_type = {if $nway_conference == true}2{/if}
+account.2.sip_server_type=
+
+##V83 Add
+account.2.srtp.unencrypted_rtcp.enable =
+account.2.srtp.unencrypted_rtp.enable =
+account.2.sip_server_mode =
+
+
+
+################################################################
+#                        SIP Backup Server                    ##
+################################################################
+account.2.outbound_proxy.1.register_on_enable=
+account.2.outbound_proxy.1.failback_timeout=
+account.2.outbound_proxy.1.failback_mode=
+account.2.outbound_proxy.1.retry_counts=
+account.2.outbound_proxy.1.only_signal_with_registered=
+account.2.outbound_proxy.1.failback_subscribe.enable=
+account.2.outbound_proxy.1.invite_retry_counts=
+
+account.2.sip_server.1.register_on_enable=
+account.2.sip_server.1.failback_timeout=
+account.2.sip_server.1.failback_mode=
+account.2.sip_server.1.failback_subscribe.enable=
+account.2.sip_server.1.only_signal_with_registered=
+account.2.sip_server.1.invite_retry_counts=
+
+account.2.outbound_proxy.2.register_on_enable=
+account.2.outbound_proxy.2.failback_timeout=
+account.2.outbound_proxy.2.failback_mode=
+account.2.outbound_proxy.2.retry_counts=
+account.2.outbound_proxy.2.only_signal_with_registered=
+account.2.outbound_proxy.2.failback_subscribe.enable=
+account.2.outbound_proxy.2.invite_retry_counts=
+
+account.2.sip_server.2.register_on_enable=
+account.2.sip_server.2.failback_timeout=
+account.2.sip_server.2.failback_mode=
+account.2.sip_server.2.failback_subscribe.enable=
+account.2.sip_server.2.only_signal_with_registered=
+account.2.sip_server.2.invite_retry_counts=
+
+account.2.static_cache_pri=
+account.2.dns_cache_type=
+account.2.naptr_build=
+account.2.fallback.timeout=
+account.2.fallback.redundancy_type=
+account.2.reg_failed_retry_max_time=
+account.2.reg_failed_retry_min_time=
+account.2.redundancy_with_reg_fail.enable =
+
+##V83 Add
+account.2.sip_server.1.outbound_proxy_enable =
+account.2.sip_server.2.outbound_proxy_enable =
+
+################################################################
+#                        SIP Basic config                     ##
+################################################################
+account.2.contact_take_line_param=
+account.2.update_ack_while_dialing=
+account.2.srtp_lifetime=
+account.2.third_part_request_with_route.enable=
+account.2.insert_outbound_in_route.enable=
+account.2.path.enable=
+account.2.sub_fail_retry_interval=
+account.2.transfer_refer_to_contact_header.enable=
+account.2.hold_use_inactive=
+account.2.gruu.enable=
+account.2.dial_tone=
+account.2.call_id_mode=
+account.2.subscribe_expires_overlap=
+account.2.register_expires_overlap=
+account.2.call_info=
+account.2.custom_ua=
+account.2.mwi_parse_terminated=
+account.2.check_cseq.enable=
+account.2.check_to_tag.enable=
+account.2.vq_rtcpxr.collector_server_port=
+account.2.vq_rtcpxr.collector_server_host=
+account.2.vq_rtcpxr.collector_name=
+account.2.compact_header_enable=
+account.2.cp_source= 2
+account.2.cid_source_ppi= 1
+account.2.cid_source_privacy= 1
+account.2.reg_with_pani_header.enable =
+account.2.alert_info=
+account.2.picture_info_enable= 1
+
+##V83 Add
+account.2.invite_with_pani_header.enable = 
+
+##V84 Add
+account.2.invite_with_rpid_header.enable=
+
+account.2.auto_answer_mute_enable
+
+##V84 SP4 Add
+account.2.share_line.enable_private_code =
+account.2.share_line.cancel_private_code =
+
+#######################################################################################
+##                                 History                                           ##
+#######################################################################################
+account.2.missed_calllog=
+
+
+#######################################################################################
+##                                  Forward                                          ##
+#######################################################################################
+account.2.timeout_fwd.off_code=
+account.2.timeout_fwd.on_code=
+account.2.timeout_fwd.timeout=
+account.2.timeout_fwd.target=
+account.2.timeout_fwd.enable=
+account.2.busy_fwd.off_code=
+account.2.busy_fwd.on_code=
+account.2.busy_fwd.target=
+account.2.busy_fwd.enable=
+account.2.always_fwd.off_code=
+account.2.always_fwd.on_code=
+account.2.always_fwd.target=
+account.2.always_fwd.enable=
+
+
+#######################################################################################
+##                                  DND                                              ##
+#######################################################################################
+account.2.dnd.enable=
+account.2.dnd.off_code=
+account.2.dnd.on_code=
+
+
+
+#######################################################################################
+##                               Voice Mail                                          ##
+#######################################################################################
+voice_mail.number.1= {$voicemail_number}
+account.2.subscribe_mwi= 1
+account.2.subscribe_mwi_to_vm= {$yealink_subscribe_mwi_to_vm}
+account.2.subscribe_mwi_expires= 3600
+account.2.display_mwi.enable=
+
+#######################################################################################
+##                               Auto Dial                                           ##
+#######################################################################################
+account.2.auto_dial_enable=
+account.2.auto_dial_num=
+
+
+#######################################################################################
+##                           Preference&Status                                       ##
+#######################################################################################
+account.2.ringtone.ring_type=
+
+#######################################################################################
+##                           Digitmap                                                ##
+#######################################################################################
+account.2.dialplan.digitmap.enable=
+account.2.dialplan.digitmap.string=
+account.2.dialplan.digitmap.no_match_action=
+account.2.dialplan.digitmap.interdigit_short_timer=
+account.2.dialplan.digitmap.interdigit_long_timer=
+account.2.dialplan.digitmap.apply_to.press_send=
+account.2.dialplan.digitmap.apply_to.forward=
+account.2.dialplan.digitmap.apply_to.history_dial=
+account.2.dialplan.digitmap.apply_to.directory_dial=
+account.2.dialplan.digitmap.apply_to.on_hook_dial=
+account.2.dialplan.digitmap.active.on_hook_dialing=
+
+
+#######################################################################################
+##                                 Rings Settings                                    ##
+#######################################################################################
+account.2.alert_info_url_enable=
+
+
+#######################################################################################
+##                                  BLF/BLF List                                     ##
+#######################################################################################
+account.2.blf.blf_list_uri=
+account.2.blf_list_barge_in_code=
+account.2.blf_list_code=
+account.2.blf_list_retrieve_call_parked_code=
+account.2.blf.subscribe_period=
+account.2.blf.match_host.enable=
+account.2.out_dialog_blf_enable=
+account.2.blf.subscribe_event=
+
+##V84 Add
+account.2.blf_list_call_parked_code=
+account.2.blf_list_call_parked_list=
+
+##V84 SP4 ADD
+account.2.blf_list_whisper_code=
+account.2.blf_list_listen_in_code=
+
+
+#######################################################################################
+##                                   SCA                                             ##
+#######################################################################################
+account.2.shared_line=
+account.2.line_seize.expires=
+account.2.shared_line_one_touch_bargein.enable=
+account.2.shared_line_one_touch_retrieve.enable=
+account.2.sca_manage_interface_display_time=
+account.2.shared_line_callpull_code=
+
+##V83 Add
+account.x.share_line.barge_in.enable
+
+#######################################################################################
+##                                   BLA                                             ##
+#######################################################################################
+account.2.bla_number=
+account.2.bla_subscribe_period=
+account.2.bla.notify_with_expire.enable=
+account.2.bla.subscribe_uri_build_type=
+
+#######################################################################################
+##                                   Call Park                                       ##
+#######################################################################################
+account.2.callpark_enable=
+
+
+#######################################################################################
+##                                    Broadsoft ACD                                  ##
+#######################################################################################
+account.2.acd.enable= 0
+account.2.acd.available= 0
+account.2.acd.unavailable_reason_enable= 0
+account.2.acd.initial_state= 1
+account.2.subscribe_acd_expires=
+
+
+#######################################################################################
+##                                 Broadsoft ACD Call Center                         ##
+#######################################################################################
+##account.X.reason_code.Y=
+##account.X.reason_code_name.Y=
+##account.X.bw_disp_code.Y=
+##account.X.bw_disp_code_name.Y=
+##account.X.supervisor_info_code.Y=
+##account.X.supervisor_info_code_name.Y=
+##The value Y must be continuous.
+
+account.2.reason_code.1=
+account.2.reason_code_name.1= 0
+account.2.bw_disp_code.1=
+account.2.bw_disp_code_name.1=
+account.2.supervisor_info_code.1=
+account.2.supervisor_info_code_name.1=
+
+#######################################################################################
+##                                 Broadsoft Call Center                             ##
+#######################################################################################
+account.2.call_center.call_info_enable= 0
+account.2.call_center.show_call_info_time= 30
+account.2.call_center.disp_code_enable= 0
+account.2.call_center.trace_enable= 0
+account.2.call_center.emergency_enable= 0
+account.2.call_center.queue_status_enable= 0
+account.2.call_center.queue_status_light_enable = 0
+
+
+
+#######################################################################################
+##                         Broadsoft Hoteling                                        ##
+#######################################################################################
+account.2.hoteling.enable= 0
+account.2.hoteling.user_id= 0
+account.2.hoteling.password= 0
+account.2.hoteling.expires= 0
+account.2.hoteling.auto_login_enable= 0
+
+
+#######################################################################################
+##                              Broadsoft XSI                                        ##
+#######################################################################################
+account.2.xsi.user =
+account.2.xsi.password =
+account.2.xsi.host =
+account.2.xsi.server_type =
+account.2.xsi.port =
+
+
+#######################################################################################
+##                                Call Pickup                                        ##
+#######################################################################################
+account.2.direct_pickup_code =
+account.2.group_pickup_code =
+account.2.dialoginfo_callpickup = 0
+account.2.refresh_remote_id.enable =
+
+
+#######################################################################################
+##                              Broadsoft Call Recording                             ##
+#######################################################################################
+account.2.call_recording.enable=
+
+#######################################################################################
+##                                Network Conference                                  ##
+#######################################################################################
+account.2.conf_uri = {if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}
+
+
+#######################################################################################
+##                              Broadsoft Call Decline                               ##
+#######################################################################################
+account.2.features.call_decline.enable =
+
+
+#######################################################################################
+##                       Broadsoft Security Classification                           ##
+#######################################################################################
+account.2.security_classification.enable =
+
+
+
+#######################################################################################
+##                        Broadsoft Flexible Seating                                 ##
+#######################################################################################
+account.2.flexible_seating.enable=
+account.2.hoteling.pin=
+account.2.hoteling.mode=
+
+#######################################################################################
+##                         Features Sync                                             ##
+#######################################################################################
+account.2.features.forward.feature_key_sync.local_processing.enable=
+account.2.features.dnd.feature_key_sync.local_processing.enable =
+
+##V84 Add
+account.2.dnd.feature_key_sync.enable=
+account.2.feature_key_sync.enable=
+account.2.forward.feature_key_sync.enable=
+
+#######################################################################################
+##                                   ACD                                             ##
+#######################################################################################
+account.2.acd.available_url=
+account.2.acd.away_url =
+account.2.acd.refresh_url =
+account.2.acd.call_information=
+
+
+
+#######################################################################################
+##                                  virtual_user                                     ##
+#######################################################################################
+##V84 Add
+#bw.virtual_user.1.enable=
+#bw.virtual_user.1.label=
+#bw.virtual_user.1.xsi.dnd.enable=
+#bw.virtual_user.1.xsi.host=
+#bw.virtual_user.1.xsi.password=
+#bw.virtual_user.1.xsi.port=
+#bw.virtual_user.1.xsi.server_type=
+#bw.virtual_user.1.xsi.user=
+
+#!version:1.0.0.1
+
+##File header "#!version:1.0.0.1" can not be edited or deleted, and must be placed in the first line.##
+##account.X.*:(T5XW/T54S/T48G/T48S/T46G/T46S/T29G/T46U/T48U: X ranges from 1 to 16. T52S/T42G/T42S/T43U: X ranges from 1 to 12. T41P/T41S/T27P/T27G/T41U: X ranges from 1 to 6. T40P/T40G/T23P/T23G: X ranges from 1 to 3. T21(P) E2: X ranges from 1 to 2.)##
+
+#######################################################################################
+##                                   Transfer                                        ##
+#######################################################################################
+account.3.phone_setting.call_appearance.transfer_via_new_linekey= {$yealink_transfer_via_new_linekey}
+
+
+#######################################################################################
+##                                   Conference                                      ##
+#######################################################################################
+account.3.phone_setting.call_appearance.conference_via_new_linekey=
+
+
+#######################################################################################
+##                                   Anonymous                                       ##
+#######################################################################################
+account.3.anonymous_call.server_base_only =
+account.3.send_anonymous_rejection_code =
+account.3.anonymous_reject_offcode =
+account.3.anonymous_reject_oncode =
+account.3.reject_anonymous_call=
+account.3.anonymous_call_offcode =
+account.3.anonymous_call_oncode =
+account.3.anonymous_call = 0
+account.3.send_anonymous_code =
+
+
+
+#######################################################################################
+##                          Call Configuration                                       ##
+#######################################################################################
+account.3.music_server_uri=
+account.3.music_on_hold_type=
+account.3.auto_label.rule=
+account.3.auto_label.enable=
+account.3.number_of_linekey=
+account.3.phone_setting.call_appearance.calls_per_linekey=
+
+
+#######################################################################################
+##                                    Codec                                          ##
+#######################################################################################
+account.3.codec.ilbc_15_2kbps.priority=
+account.3.codec.ilbc_15_2kbps.enable=
+
+account.3.codec.ilbc_13_33kbps.priority= {if isset($yealink_codec_iLBC_priority)}{$yealink_codec_iLBC_priority}{else}0{/if}
+
+account.3.codec.ilbc_13_33kbps.enable = {if isset($yealink_codec_iLBC_enable)}1{else}0{/if}
+
+account.3.codec.pcma.enable= {if isset($yealink_codec_pcma_enable)}1{else}0{/if}
+
+account.3.codec.pcma.priority= {if isset($yealink_codec_pcma_priority)}{$yealink_codec_pcma_priority}{else}0{/if}
+
+account.3.codec.pcmu.enable= {if isset($yealink_codec_pcmu_enable)}1{else}0{/if}
+
+account.3.codec.pcmu.priority= {if isset($yealink_codec_pcmu_priority)}{$yealink_codec_pcmu_priority}{else}0{/if}
+
+account.3.codec.opus.priority= {if isset($yealink_codec_opus_priority)}{$yealink_codec_opus_priority}{else}0{/if}
+
+account.3.codec.opus.enable= {if isset($yealink_codec_opus_enable)}1{else}0{/if}
+
+account.3.codec.opus.para= 106
+
+account.3.codec.g726_40.enable= {if isset($yealink_codec_g726_40_enable)}1{else}0{/if}
+
+account.3.codec.g726_40.priority= {if isset($yealink_codec_g726_40_priority)}{$yealink_codec_g726_40_priority}{else}0{/if}
+
+account.3.codec.g726_32.enable= {if isset($yealink_codec_g726_32_enable)}1{else}0{/if}
+
+account.3.codec.g726_32.priority= {if isset($yealink_codec_g726_32_priority)}{$yealink_codec_g726_32_priority}{else}0{/if}
+
+account.3.codec.g726_24.enable= {if isset($yealink_codec_g726_24_enable)}1{else}0{/if}
+
+account.3.codec.g726_24.priority= {if isset($yealink_codec_g726_24_priority)}{$yealink_codec_g726_24_priority}{else}0{/if}
+
+account.3.codec.g726_16.enable= {if isset($yealink_codec_g726_16_enable)}1{else}0{/if}
+
+account.3.codec.g726_16.priority= {if isset($yealink_codec_g726_16_priority)}{$yealink_codec_g726_16_priority}{else}0{/if}
+
+account.3.codec.g723_63.priority= {if isset($yealink_codec_g723_63_priority)}{$yealink_codec_g723_63_priority}{else}0{/if}
+
+account.3.codec.g723_63.enable= {if isset($yealink_codec_g723_63_enable)}1{else}0{/if}
+
+account.3.codec.g723_53.priority= {if isset($yealink_codec_g723_53_priority)}{$yealink_codec_g723_53_priority}{else}0{/if}
+
+account.3.codec.g723_53.enable= {if isset($yealink_codec_g723_53_enable)}1{else}0{/if}
+
+account.3.codec.g729.priority= {if isset($yealink_codec_g729_priority)}{$yealink_codec_g729_priority}{else}0{/if}
+
+account.3.codec.g729.enable= {if isset($yealink_codec_g729_enable)}1{else}0{/if}
+
+account.3.codec.g722.priority= {if isset($yealink_codec_g722_priority)}{$yealink_codec_g722_priority}{else}0{/if}
+
+account.3.codec.g722.enable= {if isset($yealink_codec_g722_enable)}1{else}0{/if}
+
+account.3.codec.G722_1_24kpbs.priority=
+account.3.codec.G722_1_24kpbs.enable=
+account.3.codec.G722_1c_24kpbs.priority=
+account.3.codec.G722_1c_24kpbs.enable=
+account.3.codec.G722_1c_32kpbs.priority=
+account.3.codec.G722_1c_32kpbs.enable=
+account.3.codec.G722_1c_48kpbs.priority=
+account.3.codec.G722_1c_48kpbs.enable=
+
+################################################################
+#                      Account3 Register                       ##
+################################################################
+{if isset($account.3.password) }
+account.3.enable = 1
+{else}
+account.3.enable = 0
+{/if}
+account.3.label = {$account.3.display_name}
+account.3.display_name = {$account.3.display_name}
+account.3.auth_name = {$account.3.auth_id}
+
+{if isset($account.3.server.1.address)}
+account.3.user_name = {$account.3.user_id}@{$account.3.server_address}
+{else}
+account.3.user_name = {$account.3.user_id}
+{/if}
+
+account.3.password = {$account.3.password}
+account.3.sip_server.1.address= {$account.3.server_address}
+account.3.sip_server_port = {$account.3.sip_port}
+
+
+#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
+{if $account.3.sip_transport == 'udp'}account.3.sip_server.1.transport_type = 0{/if}
+{if $account.3.sip_transport == 'tcp'}account.3.sip_server.1.transport_type = 1{/if}
+{if $account.3.sip_transport == 'tls'}account.3.sip_server.1.transport_type = 2{/if}
+{if $account.3.sip_transport == 'dns srv'}account.3.sip_server.1.transport_type = 3{/if}
+
+account.3.sip_server.1.expires=  {$account.3.register_expires}
+account.3.sip_server.1.retry_counts= 3
+
+account.3.sip_server.2.address= {$account.3.server.2.address}
+account.3.sip_server.2.port= {$account.3.sip_port}
+
+#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS-NAPTR;
+{if $account.3.sip_transport == 'udp'}account.3.sip_server.2.transport_type = 0{/if}
+{if $account.3.sip_transport == 'tcp'}account.3.sip_server.2.transport_type = 1{/if}
+{if $account.3.sip_transport == 'tls'}account.3.sip_server.2.transport_type = 2{/if}
+{if $account.3.sip_transport == 'dns srv'}account.3.sip_server.2.transport_type = 3{/if}
+
+account.3.sip_server.2.expires= {$account.3.register_expires}
+account.3.sip_server.2.retry_counts= 3
+
+account.3.outbound_proxy_enable = {if isset($account.3.outbound_proxy_primary)}1{else}0{/if}
+
+account.3.outbound_proxy.1.address = {$account.3.outbound_proxy_primary}
+account.3.outbound_proxy.2.address = {$account.3.outbound_proxy_secondary}
+
+{if isset($outbound_proxy_1_port)}
+account.3.outbound_proxy.1.port = {$outbound_proxy_1_port}
+{else}
+account.3.outbound_proxy.1.port = {$account.3.sip_port}
+{/if}
+
+account.3.outbound_proxy.2.address= {$account.3.outbound_proxy_secondary}
+
+{if isset($outbound_proxy_1_port)}
+account.3.outbound_proxy.2.port = {$outbound_proxy_2_port}
+{else}
+account.3.outbound_proxy.2.port = {$account.3.sip_port}
+{/if}
+
+account.3.outbound_proxy_fallback_interval= {$yealink_outbound_proxy_fallback_interval}
+
+account.3.nat.nat_traversal= {if isset($stun_server)}1{else}0{/if}
+
+
+
+################################################################
+#                      Account Basic                          ##
+################################################################
+account.3.auto_answer=
+
+################################################################
+#                      Account Advanced                       ##
+################################################################
+account.3.nat.udp_update_enable=
+account.3.nat.udp_update_time=
+account.3.nat.rport= {$yealink_rport}
+
+account.3.dtmf.type= {$yealink_dtmf_type}
+account.3.dtmf.info_type=
+account.3.dtmf.dtmf_payload=
+account.3.100rel_enable=
+
+account.3.subscribe_register=
+account.3.cid_source= {$yealink_cid_source}
+account.3.enable_user_equal_phone=
+account.3.srtp_encryption= {$yealink_srtp_encryption}
+account.3.ptime=
+account.3.register_line=
+account.3.register_mac=
+account.3.reg_fail_retry_interval=
+account.3.unregister_on_reboot=
+
+account.3.session_timer.refresher=
+account.3.session_timer.expires=
+account.3.session_timer.enable= {$yealink_session_timer}
+
+account.3.conf_type = {if $nway_conference == true}2{/if}
+account.3.sip_server_type=
+
+##V83 Add
+account.3.srtp.unencrypted_rtcp.enable =
+account.3.srtp.unencrypted_rtp.enable =
+account.3.sip_server_mode =
+
+
+
+################################################################
+#                        SIP Backup Server                    ##
+################################################################
+account.3.outbound_proxy.1.register_on_enable=
+account.3.outbound_proxy.1.failback_timeout=
+account.3.outbound_proxy.1.failback_mode=
+account.3.outbound_proxy.1.retry_counts=
+account.3.outbound_proxy.1.only_signal_with_registered=
+account.3.outbound_proxy.1.failback_subscribe.enable=
+account.3.outbound_proxy.1.invite_retry_counts=
+
+account.3.sip_server.1.register_on_enable=
+account.3.sip_server.1.failback_timeout=
+account.3.sip_server.1.failback_mode=
+account.3.sip_server.1.failback_subscribe.enable=
+account.3.sip_server.1.only_signal_with_registered=
+account.3.sip_server.1.invite_retry_counts=
+
+account.3.outbound_proxy.2.register_on_enable=
+account.3.outbound_proxy.2.failback_timeout=
+account.3.outbound_proxy.2.failback_mode=
+account.3.outbound_proxy.2.retry_counts=
+account.3.outbound_proxy.2.only_signal_with_registered=
+account.3.outbound_proxy.2.failback_subscribe.enable=
+account.3.outbound_proxy.2.invite_retry_counts=
+
+account.3.sip_server.2.register_on_enable=
+account.3.sip_server.2.failback_timeout=
+account.3.sip_server.2.failback_mode=
+account.3.sip_server.2.failback_subscribe.enable=
+account.3.sip_server.2.only_signal_with_registered=
+account.3.sip_server.2.invite_retry_counts=
+
+account.3.static_cache_pri=
+account.3.dns_cache_type=
+account.3.naptr_build=
+account.3.fallback.timeout=
+account.3.fallback.redundancy_type=
+account.3.reg_failed_retry_max_time=
+account.3.reg_failed_retry_min_time=
+account.3.redundancy_with_reg_fail.enable =
+
+##V83 Add
+account.3.sip_server.1.outbound_proxy_enable =
+account.3.sip_server.2.outbound_proxy_enable =
+
+################################################################
+#                        SIP Basic config                     ##
+################################################################
+account.3.contact_take_line_param=
+account.3.update_ack_while_dialing=
+account.3.srtp_lifetime=
+account.3.third_part_request_with_route.enable=
+account.3.insert_outbound_in_route.enable=
+account.3.path.enable=
+account.3.sub_fail_retry_interval=
+account.3.transfer_refer_to_contact_header.enable=
+account.3.hold_use_inactive=
+account.3.gruu.enable=
+account.3.dial_tone=
+account.3.call_id_mode=
+account.3.subscribe_expires_overlap=
+account.3.register_expires_overlap=
+account.3.call_info=
+account.3.custom_ua=
+account.3.mwi_parse_terminated=
+account.3.check_cseq.enable=
+account.3.check_to_tag.enable=
+account.3.vq_rtcpxr.collector_server_port=
+account.3.vq_rtcpxr.collector_server_host=
+account.3.vq_rtcpxr.collector_name=
+account.3.compact_header_enable=
+account.3.cp_source= 2
+account.3.cid_source_ppi= 1
+account.3.cid_source_privacy= 1
+account.3.reg_with_pani_header.enable =
+account.3.alert_info=
+account.3.picture_info_enable= 1
+
+##V83 Add
+account.3.invite_with_pani_header.enable = 
+
+##V84 Add
+account.3.invite_with_rpid_header.enable=
+
+account.3.auto_answer_mute_enable
+
+##V84 SP4 Add
+account.3.share_line.enable_private_code =
+account.3.share_line.cancel_private_code =
+
+#######################################################################################
+##                                 History                                           ##
+#######################################################################################
+account.3.missed_calllog=
+
+
+#######################################################################################
+##                                  Forward                                          ##
+#######################################################################################
+account.3.timeout_fwd.off_code=
+account.3.timeout_fwd.on_code=
+account.3.timeout_fwd.timeout=
+account.3.timeout_fwd.target=
+account.3.timeout_fwd.enable=
+account.3.busy_fwd.off_code=
+account.3.busy_fwd.on_code=
+account.3.busy_fwd.target=
+account.3.busy_fwd.enable=
+account.3.always_fwd.off_code=
+account.3.always_fwd.on_code=
+account.3.always_fwd.target=
+account.3.always_fwd.enable=
+
+
+#######################################################################################
+##                                  DND                                              ##
+#######################################################################################
+account.3.dnd.enable=
+account.3.dnd.off_code=
+account.3.dnd.on_code=
+
+
+
+#######################################################################################
+##                               Voice Mail                                          ##
+#######################################################################################
+voice_mail.number.1= {$voicemail_number}
+account.3.subscribe_mwi= 1
+account.3.subscribe_mwi_to_vm= {$yealink_subscribe_mwi_to_vm}
+account.3.subscribe_mwi_expires= 3600
+account.3.display_mwi.enable=
+
+#######################################################################################
+##                               Auto Dial                                           ##
+#######################################################################################
+account.3.auto_dial_enable=
+account.3.auto_dial_num=
+
+
+#######################################################################################
+##                           Preference&Status                                       ##
+#######################################################################################
+account.3.ringtone.ring_type=
+
+#######################################################################################
+##                           Digitmap                                                ##
+#######################################################################################
+account.3.dialplan.digitmap.enable=
+account.3.dialplan.digitmap.string=
+account.3.dialplan.digitmap.no_match_action=
+account.3.dialplan.digitmap.interdigit_short_timer=
+account.3.dialplan.digitmap.interdigit_long_timer=
+account.3.dialplan.digitmap.apply_to.press_send=
+account.3.dialplan.digitmap.apply_to.forward=
+account.3.dialplan.digitmap.apply_to.history_dial=
+account.3.dialplan.digitmap.apply_to.directory_dial=
+account.3.dialplan.digitmap.apply_to.on_hook_dial=
+account.3.dialplan.digitmap.active.on_hook_dialing=
+
+
+#######################################################################################
+##                                 Rings Settings                                    ##
+#######################################################################################
+account.3.alert_info_url_enable=
+
+
+#######################################################################################
+##                                  BLF/BLF List                                     ##
+#######################################################################################
+account.3.blf.blf_list_uri=
+account.3.blf_list_barge_in_code=
+account.3.blf_list_code=
+account.3.blf_list_retrieve_call_parked_code=
+account.3.blf.subscribe_period=
+account.3.blf.match_host.enable=
+account.3.out_dialog_blf_enable=
+account.3.blf.subscribe_event=
+
+##V84 Add
+account.3.blf_list_call_parked_code=
+account.3.blf_list_call_parked_list=
+
+##V84 SP4 ADD
+account.3.blf_list_whisper_code=
+account.3.blf_list_listen_in_code=
+
+
+#######################################################################################
+##                                   SCA                                             ##
+#######################################################################################
+account.3.shared_line=
+account.3.line_seize.expires=
+account.3.shared_line_one_touch_bargein.enable=
+account.3.shared_line_one_touch_retrieve.enable=
+account.3.sca_manage_interface_display_time=
+account.3.shared_line_callpull_code=
+
+##V83 Add
+account.x.share_line.barge_in.enable
+
+#######################################################################################
+##                                   BLA                                             ##
+#######################################################################################
+account.3.bla_number=
+account.3.bla_subscribe_period=
+account.3.bla.notify_with_expire.enable=
+account.3.bla.subscribe_uri_build_type=
+
+#######################################################################################
+##                                   Call Park                                       ##
+#######################################################################################
+account.3.callpark_enable=
+
+
+#######################################################################################
+##                                    Broadsoft ACD                                  ##
+#######################################################################################
+account.3.acd.enable= 0
+account.3.acd.available= 0
+account.3.acd.unavailable_reason_enable= 0
+account.3.acd.initial_state= 1
+account.3.subscribe_acd_expires=
+
+
+#######################################################################################
+##                                 Broadsoft ACD Call Center                         ##
+#######################################################################################
+##account.X.reason_code.Y=
+##account.X.reason_code_name.Y=
+##account.X.bw_disp_code.Y=
+##account.X.bw_disp_code_name.Y=
+##account.X.supervisor_info_code.Y=
+##account.X.supervisor_info_code_name.Y=
+##The value Y must be continuous.
+
+account.3.reason_code.1=
+account.3.reason_code_name.1= 0
+account.3.bw_disp_code.1=
+account.3.bw_disp_code_name.1=
+account.3.supervisor_info_code.1=
+account.3.supervisor_info_code_name.1=
+
+#######################################################################################
+##                                 Broadsoft Call Center                             ##
+#######################################################################################
+account.3.call_center.call_info_enable= 0
+account.3.call_center.show_call_info_time= 30
+account.3.call_center.disp_code_enable= 0
+account.3.call_center.trace_enable= 0
+account.3.call_center.emergency_enable= 0
+account.3.call_center.queue_status_enable= 0
+account.3.call_center.queue_status_light_enable = 0
+
+
+
+#######################################################################################
+##                         Broadsoft Hoteling                                        ##
+#######################################################################################
+account.3.hoteling.enable= 0
+account.3.hoteling.user_id= 0
+account.3.hoteling.password= 0
+account.3.hoteling.expires= 0
+account.3.hoteling.auto_login_enable= 0
+
+
+#######################################################################################
+##                              Broadsoft XSI                                        ##
+#######################################################################################
+account.3.xsi.user =
+account.3.xsi.password =
+account.3.xsi.host =
+account.3.xsi.server_type =
+account.3.xsi.port =
+
+
+#######################################################################################
+##                                Call Pickup                                        ##
+#######################################################################################
+account.3.direct_pickup_code =
+account.3.group_pickup_code =
+account.3.dialoginfo_callpickup = 0
+account.3.refresh_remote_id.enable =
+
+
+#######################################################################################
+##                              Broadsoft Call Recording                             ##
+#######################################################################################
+account.3.call_recording.enable=
+
+#######################################################################################
+##                                Network Conference                                  ##
+#######################################################################################
+account.3.conf_uri = {if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}
+
+
+#######################################################################################
+##                              Broadsoft Call Decline                               ##
+#######################################################################################
+account.3.features.call_decline.enable =
+
+
+#######################################################################################
+##                       Broadsoft Security Classification                           ##
+#######################################################################################
+account.3.security_classification.enable =
+
+
+
+#######################################################################################
+##                        Broadsoft Flexible Seating                                 ##
+#######################################################################################
+account.3.flexible_seating.enable=
+account.3.hoteling.pin=
+account.3.hoteling.mode=
+
+#######################################################################################
+##                         Features Sync                                             ##
+#######################################################################################
+account.3.features.forward.feature_key_sync.local_processing.enable=
+account.3.features.dnd.feature_key_sync.local_processing.enable =
+
+##V84 Add
+account.3.dnd.feature_key_sync.enable=
+account.3.feature_key_sync.enable=
+account.3.forward.feature_key_sync.enable=
+
+#######################################################################################
+##                                   ACD                                             ##
+#######################################################################################
+account.3.acd.available_url=
+account.3.acd.away_url =
+account.3.acd.refresh_url =
+account.3.acd.call_information=
+
+
+
+#######################################################################################
+##                                  virtual_user                                     ##
+#######################################################################################
+##V84 Add
+#bw.virtual_user.1.enable=
+#bw.virtual_user.1.label=
+#bw.virtual_user.1.xsi.dnd.enable=
+#bw.virtual_user.1.xsi.host=
+#bw.virtual_user.1.xsi.password=
+#bw.virtual_user.1.xsi.port=
+#bw.virtual_user.1.xsi.server_type=
+#bw.virtual_user.1.xsi.user=
+
+#!version:1.0.0.1
+
+##File header "#!version:1.0.0.1" can not be edited or deleted, and must be placed in the first line.##
+##account.X.*:(T5XW/T54S/T48G/T48S/T46G/T46S/T29G/T46U/T48U: X ranges from 1 to 16. T52S/T42G/T42S/T43U: X ranges from 1 to 12. T41P/T41S/T27P/T27G/T41U: X ranges from 1 to 6. T40P/T40G/T23P/T23G: X ranges from 1 to 3. T21(P) E2: X ranges from 1 to 2.)##
+
+#######################################################################################
+##                                   Transfer                                        ##
+#######################################################################################
+account.4.phone_setting.call_appearance.transfer_via_new_linekey= {$yealink_transfer_via_new_linekey}
+
+
+#######################################################################################
+##                                   Conference                                      ##
+#######################################################################################
+account.4.phone_setting.call_appearance.conference_via_new_linekey=
+
+
+#######################################################################################
+##                                   Anonymous                                       ##
+#######################################################################################
+account.4.anonymous_call.server_base_only =
+account.4.send_anonymous_rejection_code =
+account.4.anonymous_reject_offcode =
+account.4.anonymous_reject_oncode =
+account.4.reject_anonymous_call=
+account.4.anonymous_call_offcode =
+account.4.anonymous_call_oncode =
+account.4.anonymous_call = 0
+account.4.send_anonymous_code =
+
+
+
+#######################################################################################
+##                          Call Configuration                                       ##
+#######################################################################################
+account.4.music_server_uri=
+account.4.music_on_hold_type=
+account.4.auto_label.rule=
+account.4.auto_label.enable=
+account.4.number_of_linekey=
+account.4.phone_setting.call_appearance.calls_per_linekey=
+
+
+#######################################################################################
+##                                    Codec                                          ##
+#######################################################################################
+account.4.codec.ilbc_15_2kbps.priority=
+account.4.codec.ilbc_15_2kbps.enable=
+
+account.4.codec.ilbc_13_33kbps.priority= {if isset($yealink_codec_iLBC_priority)}{$yealink_codec_iLBC_priority}{else}0{/if}
+
+account.4.codec.ilbc_13_33kbps.enable = {if isset($yealink_codec_iLBC_enable)}1{else}0{/if}
+
+account.4.codec.pcma.enable= {if isset($yealink_codec_pcma_enable)}1{else}0{/if}
+
+account.4.codec.pcma.priority= {if isset($yealink_codec_pcma_priority)}{$yealink_codec_pcma_priority}{else}0{/if}
+
+account.4.codec.pcmu.enable= {if isset($yealink_codec_pcmu_enable)}1{else}0{/if}
+
+account.4.codec.pcmu.priority= {if isset($yealink_codec_pcmu_priority)}{$yealink_codec_pcmu_priority}{else}0{/if}
+
+account.4.codec.opus.priority= {if isset($yealink_codec_opus_priority)}{$yealink_codec_opus_priority}{else}0{/if}
+
+account.4.codec.opus.enable= {if isset($yealink_codec_opus_enable)}1{else}0{/if}
+
+account.4.codec.opus.para= 106
+
+account.4.codec.g726_40.enable= {if isset($yealink_codec_g726_40_enable)}1{else}0{/if}
+
+account.4.codec.g726_40.priority= {if isset($yealink_codec_g726_40_priority)}{$yealink_codec_g726_40_priority}{else}0{/if}
+
+account.4.codec.g726_32.enable= {if isset($yealink_codec_g726_32_enable)}1{else}0{/if}
+
+account.4.codec.g726_32.priority= {if isset($yealink_codec_g726_32_priority)}{$yealink_codec_g726_32_priority}{else}0{/if}
+
+account.4.codec.g726_24.enable= {if isset($yealink_codec_g726_24_enable)}1{else}0{/if}
+
+account.4.codec.g726_24.priority= {if isset($yealink_codec_g726_24_priority)}{$yealink_codec_g726_24_priority}{else}0{/if}
+
+account.4.codec.g726_16.enable= {if isset($yealink_codec_g726_16_enable)}1{else}0{/if}
+
+account.4.codec.g726_16.priority= {if isset($yealink_codec_g726_16_priority)}{$yealink_codec_g726_16_priority}{else}0{/if}
+
+account.4.codec.g723_63.priority= {if isset($yealink_codec_g723_63_priority)}{$yealink_codec_g723_63_priority}{else}0{/if}
+
+account.4.codec.g723_63.enable= {if isset($yealink_codec_g723_63_enable)}1{else}0{/if}
+
+account.4.codec.g723_53.priority= {if isset($yealink_codec_g723_53_priority)}{$yealink_codec_g723_53_priority}{else}0{/if}
+
+account.4.codec.g723_53.enable= {if isset($yealink_codec_g723_53_enable)}1{else}0{/if}
+
+account.4.codec.g729.priority= {if isset($yealink_codec_g729_priority)}{$yealink_codec_g729_priority}{else}0{/if}
+
+account.4.codec.g729.enable= {if isset($yealink_codec_g729_enable)}1{else}0{/if}
+
+account.4.codec.g722.priority= {if isset($yealink_codec_g722_priority)}{$yealink_codec_g722_priority}{else}0{/if}
+
+account.4.codec.g722.enable= {if isset($yealink_codec_g722_enable)}1{else}0{/if}
+
+account.4.codec.G722_1_24kpbs.priority=
+account.4.codec.G722_1_24kpbs.enable=
+account.4.codec.G722_1c_24kpbs.priority=
+account.4.codec.G722_1c_24kpbs.enable=
+account.4.codec.G722_1c_32kpbs.priority=
+account.4.codec.G722_1c_32kpbs.enable=
+account.4.codec.G722_1c_48kpbs.priority=
+account.4.codec.G722_1c_48kpbs.enable=
+
+################################################################
+#                      Account4 Register                       ##
+################################################################
+{if isset($account.4.password) }
+account.4.enable = 1
+{else}
+account.4.enable = 0
+{/if}
+account.4.label = {$account.4.display_name}
+account.4.display_name = {$account.4.display_name}
+account.4.auth_name = {$account.4.auth_id}
+
+{if isset($account.4.server.1.address)}
+account.4.user_name = {$account.4.user_id}@{$account.4.server_address}
+{else}
+account.4.user_name = {$account.4.user_id}
+{/if}
+
+account.4.password = {$account.4.password}
+account.4.sip_server.1.address= {$account.4.server_address}
+account.4.sip_server_port = {$account.4.sip_port}
+
+
+#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
+{if $account.4.sip_transport == 'udp'}account.4.sip_server.1.transport_type = 0{/if}
+{if $account.4.sip_transport == 'tcp'}account.4.sip_server.1.transport_type = 1{/if}
+{if $account.4.sip_transport == 'tls'}account.4.sip_server.1.transport_type = 2{/if}
+{if $account.4.sip_transport == 'dns srv'}account.4.sip_server.1.transport_type = 3{/if}
+
+account.4.sip_server.1.expires=  {$account.4.register_expires}
+account.4.sip_server.1.retry_counts= 3
+
+account.4.sip_server.2.address= {$account.4.server.2.address}
+account.4.sip_server.2.port= {$account.4.sip_port}
+
+#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS-NAPTR;
+{if $account.4.sip_transport == 'udp'}account.4.sip_server.2.transport_type = 0{/if}
+{if $account.4.sip_transport == 'tcp'}account.4.sip_server.2.transport_type = 1{/if}
+{if $account.4.sip_transport == 'tls'}account.4.sip_server.2.transport_type = 2{/if}
+{if $account.4.sip_transport == 'dns srv'}account.4.sip_server.2.transport_type = 3{/if}
+
+account.4.sip_server.2.expires= {$account.4.register_expires}
+account.4.sip_server.2.retry_counts= 3
+
+account.4.outbound_proxy_enable = {if isset($account.4.outbound_proxy_primary)}1{else}0{/if}
+
+account.4.outbound_proxy.1.address = {$account.4.outbound_proxy_primary}
+account.4.outbound_proxy.2.address = {$account.4.outbound_proxy_secondary}
+
+{if isset($outbound_proxy_1_port)}
+account.4.outbound_proxy.1.port = {$outbound_proxy_1_port}
+{else}
+account.4.outbound_proxy.1.port = {$account.4.sip_port}
+{/if}
+
+account.4.outbound_proxy.2.address= {$account.4.outbound_proxy_secondary}
+
+{if isset($outbound_proxy_1_port)}
+account.4.outbound_proxy.2.port = {$outbound_proxy_2_port}
+{else}
+account.4.outbound_proxy.2.port = {$account.4.sip_port}
+{/if}
+
+account.4.outbound_proxy_fallback_interval= {$yealink_outbound_proxy_fallback_interval}
+
+account.4.nat.nat_traversal= {if isset($stun_server)}1{else}0{/if}
+
+
+
+################################################################
+#                      Account Basic                          ##
+################################################################
+account.4.auto_answer=
+
+################################################################
+#                      Account Advanced                       ##
+################################################################
+account.4.nat.udp_update_enable=
+account.4.nat.udp_update_time=
+account.4.nat.rport= {$yealink_rport}
+
+account.4.dtmf.type= {$yealink_dtmf_type}
+account.4.dtmf.info_type=
+account.4.dtmf.dtmf_payload=
+account.4.100rel_enable=
+
+account.4.subscribe_register=
+account.4.cid_source= {$yealink_cid_source}
+account.4.enable_user_equal_phone=
+account.4.srtp_encryption= {$yealink_srtp_encryption}
+account.4.ptime=
+account.4.register_line=
+account.4.register_mac=
+account.4.reg_fail_retry_interval=
+account.4.unregister_on_reboot=
+
+account.4.session_timer.refresher=
+account.4.session_timer.expires=
+account.4.session_timer.enable= {$yealink_session_timer}
+
+account.4.conf_type = {if $nway_conference == true}2{/if} 
+account.4.sip_server_type=
+
+##V83 Add
+account.4.srtp.unencrypted_rtcp.enable =
+account.4.srtp.unencrypted_rtp.enable =
+account.4.sip_server_mode =
+
+
+
+################################################################
+#                        SIP Backup Server                    ##
+################################################################
+account.4.outbound_proxy.1.register_on_enable=
+account.4.outbound_proxy.1.failback_timeout=
+account.4.outbound_proxy.1.failback_mode=
+account.4.outbound_proxy.1.retry_counts=
+account.4.outbound_proxy.1.only_signal_with_registered=
+account.4.outbound_proxy.1.failback_subscribe.enable=
+account.4.outbound_proxy.1.invite_retry_counts=
+
+account.4.sip_server.1.register_on_enable=
+account.4.sip_server.1.failback_timeout=
+account.4.sip_server.1.failback_mode=
+account.4.sip_server.1.failback_subscribe.enable=
+account.4.sip_server.1.only_signal_with_registered=
+account.4.sip_server.1.invite_retry_counts=
+
+account.4.outbound_proxy.2.register_on_enable=
+account.4.outbound_proxy.2.failback_timeout=
+account.4.outbound_proxy.2.failback_mode=
+account.4.outbound_proxy.2.retry_counts=
+account.4.outbound_proxy.2.only_signal_with_registered=
+account.4.outbound_proxy.2.failback_subscribe.enable=
+account.4.outbound_proxy.2.invite_retry_counts=
+
+account.4.sip_server.2.register_on_enable=
+account.4.sip_server.2.failback_timeout=
+account.4.sip_server.2.failback_mode=
+account.4.sip_server.2.failback_subscribe.enable=
+account.4.sip_server.2.only_signal_with_registered=
+account.4.sip_server.2.invite_retry_counts=
+
+account.4.static_cache_pri=
+account.4.dns_cache_type=
+account.4.naptr_build=
+account.4.fallback.timeout=
+account.4.fallback.redundancy_type=
+account.4.reg_failed_retry_max_time=
+account.4.reg_failed_retry_min_time=
+account.4.redundancy_with_reg_fail.enable =
+
+##V83 Add
+account.4.sip_server.1.outbound_proxy_enable =
+account.4.sip_server.2.outbound_proxy_enable =
+
+################################################################
+#                        SIP Basic config                     ##
+################################################################
+account.4.contact_take_line_param=
+account.4.update_ack_while_dialing=
+account.4.srtp_lifetime=
+account.4.third_part_request_with_route.enable=
+account.4.insert_outbound_in_route.enable=
+account.4.path.enable=
+account.4.sub_fail_retry_interval=
+account.4.transfer_refer_to_contact_header.enable=
+account.4.hold_use_inactive=
+account.4.gruu.enable=
+account.4.dial_tone=
+account.4.call_id_mode=
+account.4.subscribe_expires_overlap=
+account.4.register_expires_overlap=
+account.4.call_info=
+account.4.custom_ua=
+account.4.mwi_parse_terminated=
+account.4.check_cseq.enable=
+account.4.check_to_tag.enable=
+account.4.vq_rtcpxr.collector_server_port=
+account.4.vq_rtcpxr.collector_server_host=
+account.4.vq_rtcpxr.collector_name=
+account.4.compact_header_enable=
+account.4.cp_source= 2
+account.4.cid_source_ppi= 1
+account.4.cid_source_privacy= 1
+account.4.reg_with_pani_header.enable =
+account.4.alert_info=
+account.4.picture_info_enable= 1
+
+##V83 Add
+account.4.invite_with_pani_header.enable = 
+
+##V84 Add
+account.4.invite_with_rpid_header.enable=
+
+account.4.auto_answer_mute_enable
+
+##V84 SP4 Add
+account.4.share_line.enable_private_code =
+account.4.share_line.cancel_private_code =
+
+#######################################################################################
+##                                 History                                           ##
+#######################################################################################
+account.4.missed_calllog=
+
+
+#######################################################################################
+##                                  Forward                                          ##
+#######################################################################################
+account.4.timeout_fwd.off_code=
+account.4.timeout_fwd.on_code=
+account.4.timeout_fwd.timeout=
+account.4.timeout_fwd.target=
+account.4.timeout_fwd.enable=
+account.4.busy_fwd.off_code=
+account.4.busy_fwd.on_code=
+account.4.busy_fwd.target=
+account.4.busy_fwd.enable=
+account.4.always_fwd.off_code=
+account.4.always_fwd.on_code=
+account.4.always_fwd.target=
+account.4.always_fwd.enable=
+
+
+#######################################################################################
+##                                  DND                                              ##
+#######################################################################################
+account.4.dnd.enable=
+account.4.dnd.off_code=
+account.4.dnd.on_code=
+
+
+
+#######################################################################################
+##                               Voice Mail                                          ##
+#######################################################################################
+voice_mail.number.1= {$voicemail_number}
+account.4.subscribe_mwi= 1
+account.4.subscribe_mwi_to_vm= {$yealink_subscribe_mwi_to_vm}
+account.4.subscribe_mwi_expires= 3600
+account.4.display_mwi.enable=
+
+#######################################################################################
+##                               Auto Dial                                           ##
+#######################################################################################
+account.4.auto_dial_enable=
+account.4.auto_dial_num=
+
+
+#######################################################################################
+##                           Preference&Status                                       ##
+#######################################################################################
+account.4.ringtone.ring_type=
+
+#######################################################################################
+##                           Digitmap                                                ##
+#######################################################################################
+account.4.dialplan.digitmap.enable=
+account.4.dialplan.digitmap.string=
+account.4.dialplan.digitmap.no_match_action=
+account.4.dialplan.digitmap.interdigit_short_timer=
+account.4.dialplan.digitmap.interdigit_long_timer=
+account.4.dialplan.digitmap.apply_to.press_send=
+account.4.dialplan.digitmap.apply_to.forward=
+account.4.dialplan.digitmap.apply_to.history_dial=
+account.4.dialplan.digitmap.apply_to.directory_dial=
+account.4.dialplan.digitmap.apply_to.on_hook_dial=
+account.4.dialplan.digitmap.active.on_hook_dialing=
+
+
+#######################################################################################
+##                                 Rings Settings                                    ##
+#######################################################################################
+account.4.alert_info_url_enable=
+
+
+#######################################################################################
+##                                  BLF/BLF List                                     ##
+#######################################################################################
+account.4.blf.blf_list_uri=
+account.4.blf_list_barge_in_code=
+account.4.blf_list_code=
+account.4.blf_list_retrieve_call_parked_code=
+account.4.blf.subscribe_period=
+account.4.blf.match_host.enable=
+account.4.out_dialog_blf_enable=
+account.4.blf.subscribe_event=
+
+##V84 Add
+account.4.blf_list_call_parked_code=
+account.4.blf_list_call_parked_list=
+
+##V84 SP4 ADD
+account.4.blf_list_whisper_code=
+account.4.blf_list_listen_in_code=
+
+
+#######################################################################################
+##                                   SCA                                             ##
+#######################################################################################
+account.4.shared_line=
+account.4.line_seize.expires=
+account.4.shared_line_one_touch_bargein.enable=
+account.4.shared_line_one_touch_retrieve.enable=
+account.4.sca_manage_interface_display_time=
+account.4.shared_line_callpull_code=
+
+##V83 Add
+account.x.share_line.barge_in.enable
+
+#######################################################################################
+##                                   BLA                                             ##
+#######################################################################################
+account.4.bla_number=
+account.4.bla_subscribe_period=
+account.4.bla.notify_with_expire.enable=
+account.4.bla.subscribe_uri_build_type=
+
+#######################################################################################
+##                                   Call Park                                       ##
+#######################################################################################
+account.4.callpark_enable=
+
+
+#######################################################################################
+##                                    Broadsoft ACD                                  ##
+#######################################################################################
+account.4.acd.enable= 0
+account.4.acd.available= 0
+account.4.acd.unavailable_reason_enable= 0
+account.4.acd.initial_state= 1
+account.4.subscribe_acd_expires=
+
+
+#######################################################################################
+##                                 Broadsoft ACD Call Center                         ##
+#######################################################################################
+##account.X.reason_code.Y=
+##account.X.reason_code_name.Y=
+##account.X.bw_disp_code.Y=
+##account.X.bw_disp_code_name.Y=
+##account.X.supervisor_info_code.Y=
+##account.X.supervisor_info_code_name.Y=
+##The value Y must be continuous.
+
+account.4.reason_code.1=
+account.4.reason_code_name.1= 0
+account.4.bw_disp_code.1=
+account.4.bw_disp_code_name.1=
+account.4.supervisor_info_code.1=
+account.4.supervisor_info_code_name.1=
+
+#######################################################################################
+##                                 Broadsoft Call Center                             ##
+#######################################################################################
+account.4.call_center.call_info_enable= 0
+account.4.call_center.show_call_info_time= 30
+account.4.call_center.disp_code_enable= 0
+account.4.call_center.trace_enable= 0
+account.4.call_center.emergency_enable= 0
+account.4.call_center.queue_status_enable= 0
+account.4.call_center.queue_status_light_enable = 0
+
+
+
+#######################################################################################
+##                         Broadsoft Hoteling                                        ##
+#######################################################################################
+account.4.hoteling.enable= 0
+account.4.hoteling.user_id= 0
+account.4.hoteling.password= 0
+account.4.hoteling.expires= 0
+account.4.hoteling.auto_login_enable= 0
+
+
+#######################################################################################
+##                              Broadsoft XSI                                        ##
+#######################################################################################
+account.4.xsi.user =
+account.4.xsi.password =
+account.4.xsi.host =
+account.4.xsi.server_type =
+account.4.xsi.port =
+
+
+#######################################################################################
+##                                Call Pickup                                        ##
+#######################################################################################
+account.4.direct_pickup_code =
+account.4.group_pickup_code =
+account.4.dialoginfo_callpickup = 0
+account.4.refresh_remote_id.enable =
+
+
+#######################################################################################
+##                              Broadsoft Call Recording                             ##
+#######################################################################################
+account.4.call_recording.enable=
+
+#######################################################################################
+##                                Network Conference                                  ##
+#######################################################################################
+account.4.conf_uri = {if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}
+
+
+#######################################################################################
+##                              Broadsoft Call Decline                               ##
+#######################################################################################
+account.4.features.call_decline.enable =
+
+
+#######################################################################################
+##                       Broadsoft Security Classification                           ##
+#######################################################################################
+account.4.security_classification.enable =
+
+
+
+#######################################################################################
+##                        Broadsoft Flexible Seating                                 ##
+#######################################################################################
+account.4.flexible_seating.enable=
+account.4.hoteling.pin=
+account.4.hoteling.mode=
+
+#######################################################################################
+##                         Features Sync                                             ##
+#######################################################################################
+account.4.features.forward.feature_key_sync.local_processing.enable=
+account.4.features.dnd.feature_key_sync.local_processing.enable =
+
+##V84 Add
+account.4.dnd.feature_key_sync.enable=
+account.4.feature_key_sync.enable=
+account.4.forward.feature_key_sync.enable=
+
+#######################################################################################
+##                                   ACD                                             ##
+#######################################################################################
+account.4.acd.available_url=
+account.4.acd.away_url =
+account.4.acd.refresh_url =
+account.4.acd.call_information=
+
+
+
+#######################################################################################
+##                                  virtual_user                                     ##
+#######################################################################################
+##V84 Add
+#bw.virtual_user.1.enable=
+#bw.virtual_user.1.label=
+#bw.virtual_user.1.xsi.dnd.enable=
+#bw.virtual_user.1.xsi.host=
+#bw.virtual_user.1.xsi.password=
+#bw.virtual_user.1.xsi.port=
+#bw.virtual_user.1.xsi.server_type=
+#bw.virtual_user.1.xsi.user=
+
+#!version:1.0.0.1
+
+##File header "#!version:1.0.0.1" can not be edited or deleted, and must be placed in the first line.##
+##account.X.*:(T5XW/T54S/T48G/T48S/T46G/T46S/T29G/T46U/T48U: X ranges from 1 to 16. T52S/T42G/T42S/T43U: X ranges from 1 to 12. T41P/T41S/T27P/T27G/T41U: X ranges from 1 to 6. T40P/T40G/T23P/T23G: X ranges from 1 to 3. T21(P) E2: X ranges from 1 to 2.)##
+
+#######################################################################################
+##                                   Transfer                                        ##
+#######################################################################################
+account.5.phone_setting.call_appearance.transfer_via_new_linekey= {$yealink_transfer_via_new_linekey}
+
+
+#######################################################################################
+##                                   Conference                                      ##
+#######################################################################################
+account.5.phone_setting.call_appearance.conference_via_new_linekey=
+
+
+#######################################################################################
+##                                   Anonymous                                       ##
+#######################################################################################
+account.5.anonymous_call.server_base_only =
+account.5.send_anonymous_rejection_code =
+account.5.anonymous_reject_offcode =
+account.5.anonymous_reject_oncode =
+account.5.reject_anonymous_call=
+account.5.anonymous_call_offcode =
+account.5.anonymous_call_oncode =
+account.5.anonymous_call = 0
+account.5.send_anonymous_code =
+
+
+
+#######################################################################################
+##                          Call Configuration                                       ##
+#######################################################################################
+account.5.music_server_uri=
+account.5.music_on_hold_type=
+account.5.auto_label.rule=
+account.5.auto_label.enable=
+account.5.number_of_linekey=
+account.5.phone_setting.call_appearance.calls_per_linekey=
+
+
+#######################################################################################
+##                                    Codec                                          ##
+#######################################################################################
+account.5.codec.ilbc_15_2kbps.priority=
+account.5.codec.ilbc_15_2kbps.enable=
+
+account.5.codec.ilbc_13_33kbps.priority= {if isset($yealink_codec_iLBC_priority)}{$yealink_codec_iLBC_priority}{else}0{/if}
+
+account.5.codec.ilbc_13_33kbps.enable = {if isset($yealink_codec_iLBC_enable)}1{else}0{/if}
+
+account.5.codec.pcma.enable= {if isset($yealink_codec_pcma_enable)}1{else}0{/if}
+
+account.5.codec.pcma.priority= {if isset($yealink_codec_pcma_priority)}{$yealink_codec_pcma_priority}{else}0{/if}
+
+account.5.codec.pcmu.enable= {if isset($yealink_codec_pcmu_enable)}1{else}0{/if}
+
+account.5.codec.pcmu.priority= {if isset($yealink_codec_pcmu_priority)}{$yealink_codec_pcmu_priority}{else}0{/if}
+
+account.5.codec.opus.priority= {if isset($yealink_codec_opus_priority)}{$yealink_codec_opus_priority}{else}0{/if}
+
+account.5.codec.opus.enable= {if isset($yealink_codec_opus_enable)}1{else}0{/if}
+
+account.5.codec.opus.para= 106
+
+account.5.codec.g726_40.enable= {if isset($yealink_codec_g726_40_enable)}1{else}0{/if}
+
+account.5.codec.g726_40.priority= {if isset($yealink_codec_g726_40_priority)}{$yealink_codec_g726_40_priority}{else}0{/if}
+
+account.5.codec.g726_32.enable= {if isset($yealink_codec_g726_32_enable)}1{else}0{/if}
+
+account.5.codec.g726_32.priority= {if isset($yealink_codec_g726_32_priority)}{$yealink_codec_g726_32_priority}{else}0{/if}
+
+account.5.codec.g726_24.enable= {if isset($yealink_codec_g726_24_enable)}1{else}0{/if}
+
+account.5.codec.g726_24.priority= {if isset($yealink_codec_g726_24_priority)}{$yealink_codec_g726_24_priority}{else}0{/if}
+
+account.5.codec.g726_16.enable= {if isset($yealink_codec_g726_16_enable)}1{else}0{/if}
+
+account.5.codec.g726_16.priority= {if isset($yealink_codec_g726_16_priority)}{$yealink_codec_g726_16_priority}{else}0{/if}
+
+account.5.codec.g723_63.priority= {if isset($yealink_codec_g723_63_priority)}{$yealink_codec_g723_63_priority}{else}0{/if}
+
+account.5.codec.g723_63.enable= {if isset($yealink_codec_g723_63_enable)}1{else}0{/if}
+
+account.5.codec.g723_53.priority= {if isset($yealink_codec_g723_53_priority)}{$yealink_codec_g723_53_priority}{else}0{/if}
+
+account.5.codec.g723_53.enable= {if isset($yealink_codec_g723_53_enable)}1{else}0{/if}
+
+account.5.codec.g729.priority= {if isset($yealink_codec_g729_priority)}{$yealink_codec_g729_priority}{else}0{/if}
+
+account.5.codec.g729.enable= {if isset($yealink_codec_g729_enable)}1{else}0{/if}
+
+account.5.codec.g722.priority= {if isset($yealink_codec_g722_priority)}{$yealink_codec_g722_priority}{else}0{/if}
+
+account.5.codec.g722.enable= {if isset($yealink_codec_g722_enable)}1{else}0{/if}
+
+account.5.codec.G722_1_24kpbs.priority=
+account.5.codec.G722_1_24kpbs.enable=
+account.5.codec.G722_1c_24kpbs.priority=
+account.5.codec.G722_1c_24kpbs.enable=
+account.5.codec.G722_1c_32kpbs.priority=
+account.5.codec.G722_1c_32kpbs.enable=
+account.5.codec.G722_1c_48kpbs.priority=
+account.5.codec.G722_1c_48kpbs.enable=
+
+################################################################
+#                      Account5 Register                       ##
+################################################################
+{if isset($account.5.password) }
+account.5.enable = 1
+{else}
+account.5.enable = 0
+{/if}
+account.5.label = {$account.5.display_name}
+account.5.display_name = {$account.5.display_name}
+account.5.auth_name = {$account.5.auth_id}
+
+{if isset($account.5.server.1.address)}
+account.5.user_name = {$account.5.user_id}@{$account.5.server_address}
+{else}
+account.5.user_name = {$account.5.user_id}
+{/if}
+
+account.5.password = {$account.5.password}
+account.5.sip_server.1.address= {$account.5.server_address}
+account.5.sip_server_port = {$account.5.sip_port}
+
+
+#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
+{if $account.5.sip_transport == 'udp'}account.5.sip_server.1.transport_type = 0{/if}
+{if $account.5.sip_transport == 'tcp'}account.5.sip_server.1.transport_type = 1{/if}
+{if $account.5.sip_transport == 'tls'}account.5.sip_server.1.transport_type = 2{/if}
+{if $account.5.sip_transport == 'dns srv'}account.5.sip_server.1.transport_type = 3{/if}
+
+account.5.sip_server.1.expires=  {$account.5.register_expires}
+account.5.sip_server.1.retry_counts= 3
+
+account.5.sip_server.2.address= {$account.5.server.2.address}
+account.5.sip_server.2.port= {$account.5.sip_port}
+
+#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS-NAPTR;
+{if $account.5.sip_transport == 'udp'}account.5.sip_server.2.transport_type = 0{/if}
+{if $account.5.sip_transport == 'tcp'}account.5.sip_server.2.transport_type = 1{/if}
+{if $account.5.sip_transport == 'tls'}account.5.sip_server.2.transport_type = 2{/if}
+{if $account.5.sip_transport == 'dns srv'}account.5.sip_server.2.transport_type = 3{/if}
+
+account.5.sip_server.2.expires= {$account.5.register_expires}
+account.5.sip_server.2.retry_counts= 3
+
+account.5.outbound_proxy_enable = {if isset($account.5.outbound_proxy_primary)}1{else}0{/if}
+
+account.5.outbound_proxy.1.address = {$account.5.outbound_proxy_primary}
+account.5.outbound_proxy.2.address = {$account.5.outbound_proxy_secondary}
+
+{if isset($outbound_proxy_1_port)}
+account.5.outbound_proxy.1.port = {$outbound_proxy_1_port}
+{else}
+account.5.outbound_proxy.1.port = {$account.5.sip_port}
+{/if}
+
+account.5.outbound_proxy.2.address= {$account.5.outbound_proxy_secondary}
+
+{if isset($outbound_proxy_1_port)}
+account.5.outbound_proxy.2.port = {$outbound_proxy_2_port}
+{else}
+account.5.outbound_proxy.2.port = {$account.5.sip_port}
+{/if}
+
+account.5.outbound_proxy_fallback_interval= {$yealink_outbound_proxy_fallback_interval}
+
+account.5.nat.nat_traversal= {if isset($stun_server)}1{else}0{/if}
+
+
+
+################################################################
+#                      Account Basic                          ##
+################################################################
+account.5.auto_answer=
+
+################################################################
+#                      Account Advanced                       ##
+################################################################
+account.5.nat.udp_update_enable=
+account.5.nat.udp_update_time=
+account.5.nat.rport= {$yealink_rport}
+
+account.5.dtmf.type= {$yealink_dtmf_type}
+account.5.dtmf.info_type=
+account.5.dtmf.dtmf_payload=
+account.5.100rel_enable=
+
+account.5.subscribe_register=
+account.5.cid_source= {$yealink_cid_source}
+account.5.enable_user_equal_phone=
+account.5.srtp_encryption= {$yealink_srtp_encryption}
+account.5.ptime=
+account.5.register_line=
+account.5.register_mac=
+account.5.reg_fail_retry_interval=
+account.5.unregister_on_reboot=
+
+account.5.session_timer.refresher=
+account.5.session_timer.expires=
+account.5.session_timer.enable= {$yealink_session_timer}
+
+account.5.conf_type = {if $nway_conference == true}2{/if}
+account.5.sip_server_type=
+
+##V83 Add
+account.5.srtp.unencrypted_rtcp.enable =
+account.5.srtp.unencrypted_rtp.enable =
+account.5.sip_server_mode =
+
+
+
+################################################################
+#                        SIP Backup Server                    ##
+################################################################
+account.5.outbound_proxy.1.register_on_enable=
+account.5.outbound_proxy.1.failback_timeout=
+account.5.outbound_proxy.1.failback_mode=
+account.5.outbound_proxy.1.retry_counts=
+account.5.outbound_proxy.1.only_signal_with_registered=
+account.5.outbound_proxy.1.failback_subscribe.enable=
+account.5.outbound_proxy.1.invite_retry_counts=
+
+account.5.sip_server.1.register_on_enable=
+account.5.sip_server.1.failback_timeout=
+account.5.sip_server.1.failback_mode=
+account.5.sip_server.1.failback_subscribe.enable=
+account.5.sip_server.1.only_signal_with_registered=
+account.5.sip_server.1.invite_retry_counts=
+
+account.5.outbound_proxy.2.register_on_enable=
+account.5.outbound_proxy.2.failback_timeout=
+account.5.outbound_proxy.2.failback_mode=
+account.5.outbound_proxy.2.retry_counts=
+account.5.outbound_proxy.2.only_signal_with_registered=
+account.5.outbound_proxy.2.failback_subscribe.enable=
+account.5.outbound_proxy.2.invite_retry_counts=
+
+account.5.sip_server.2.register_on_enable=
+account.5.sip_server.2.failback_timeout=
+account.5.sip_server.2.failback_mode=
+account.5.sip_server.2.failback_subscribe.enable=
+account.5.sip_server.2.only_signal_with_registered=
+account.5.sip_server.2.invite_retry_counts=
+
+account.5.static_cache_pri=
+account.5.dns_cache_type=
+account.5.naptr_build=
+account.5.fallback.timeout=
+account.5.fallback.redundancy_type=
+account.5.reg_failed_retry_max_time=
+account.5.reg_failed_retry_min_time=
+account.5.redundancy_with_reg_fail.enable =
+
+##V83 Add
+account.5.sip_server.1.outbound_proxy_enable =
+account.5.sip_server.2.outbound_proxy_enable =
+
+################################################################
+#                        SIP Basic config                     ##
+################################################################
+account.5.contact_take_line_param=
+account.5.update_ack_while_dialing=
+account.5.srtp_lifetime=
+account.5.third_part_request_with_route.enable=
+account.5.insert_outbound_in_route.enable=
+account.5.path.enable=
+account.5.sub_fail_retry_interval=
+account.5.transfer_refer_to_contact_header.enable=
+account.5.hold_use_inactive=
+account.5.gruu.enable=
+account.5.dial_tone=
+account.5.call_id_mode=
+account.5.subscribe_expires_overlap=
+account.5.register_expires_overlap=
+account.5.call_info=
+account.5.custom_ua=
+account.5.mwi_parse_terminated=
+account.5.check_cseq.enable=
+account.5.check_to_tag.enable=
+account.5.vq_rtcpxr.collector_server_port=
+account.5.vq_rtcpxr.collector_server_host=
+account.5.vq_rtcpxr.collector_name=
+account.5.compact_header_enable=
+account.5.cp_source= 2
+account.5.cid_source_ppi= 1
+account.5.cid_source_privacy= 1
+account.5.reg_with_pani_header.enable =
+account.5.alert_info=
+account.5.picture_info_enable= 1
+
+##V83 Add
+account.5.invite_with_pani_header.enable = 
+
+##V84 Add
+account.5.invite_with_rpid_header.enable=
+
+account.5.auto_answer_mute_enable
+
+##V84 SP4 Add
+account.5.share_line.enable_private_code =
+account.5.share_line.cancel_private_code =
+
+#######################################################################################
+##                                 History                                           ##
+#######################################################################################
+account.5.missed_calllog=
+
+
+#######################################################################################
+##                                  Forward                                          ##
+#######################################################################################
+account.5.timeout_fwd.off_code=
+account.5.timeout_fwd.on_code=
+account.5.timeout_fwd.timeout=
+account.5.timeout_fwd.target=
+account.5.timeout_fwd.enable=
+account.5.busy_fwd.off_code=
+account.5.busy_fwd.on_code=
+account.5.busy_fwd.target=
+account.5.busy_fwd.enable=
+account.5.always_fwd.off_code=
+account.5.always_fwd.on_code=
+account.5.always_fwd.target=
+account.5.always_fwd.enable=
+
+
+#######################################################################################
+##                                  DND                                              ##
+#######################################################################################
+account.5.dnd.enable=
+account.5.dnd.off_code=
+account.5.dnd.on_code=
+
+
+
+#######################################################################################
+##                               Voice Mail                                          ##
+#######################################################################################
+voice_mail.number.1= {$voicemail_number}
+account.5.subscribe_mwi= 1
+account.5.subscribe_mwi_to_vm= {$yealink_subscribe_mwi_to_vm}
+account.5.subscribe_mwi_expires= 3600
+account.5.display_mwi.enable=
+
+#######################################################################################
+##                               Auto Dial                                           ##
+#######################################################################################
+account.5.auto_dial_enable=
+account.5.auto_dial_num=
+
+
+#######################################################################################
+##                           Preference&Status                                       ##
+#######################################################################################
+account.5.ringtone.ring_type=
+
+#######################################################################################
+##                           Digitmap                                                ##
+#######################################################################################
+account.5.dialplan.digitmap.enable=
+account.5.dialplan.digitmap.string=
+account.5.dialplan.digitmap.no_match_action=
+account.5.dialplan.digitmap.interdigit_short_timer=
+account.5.dialplan.digitmap.interdigit_long_timer=
+account.5.dialplan.digitmap.apply_to.press_send=
+account.5.dialplan.digitmap.apply_to.forward=
+account.5.dialplan.digitmap.apply_to.history_dial=
+account.5.dialplan.digitmap.apply_to.directory_dial=
+account.5.dialplan.digitmap.apply_to.on_hook_dial=
+account.5.dialplan.digitmap.active.on_hook_dialing=
+
+
+#######################################################################################
+##                                 Rings Settings                                    ##
+#######################################################################################
+account.5.alert_info_url_enable=
+
+
+#######################################################################################
+##                                  BLF/BLF List                                     ##
+#######################################################################################
+account.5.blf.blf_list_uri=
+account.5.blf_list_barge_in_code=
+account.5.blf_list_code=
+account.5.blf_list_retrieve_call_parked_code=
+account.5.blf.subscribe_period=
+account.5.blf.match_host.enable=
+account.5.out_dialog_blf_enable=
+account.5.blf.subscribe_event=
+
+##V84 Add
+account.5.blf_list_call_parked_code=
+account.5.blf_list_call_parked_list=
+
+##V84 SP4 ADD
+account.5.blf_list_whisper_code=
+account.5.blf_list_listen_in_code=
+
+
+#######################################################################################
+##                                   SCA                                             ##
+#######################################################################################
+account.5.shared_line=
+account.5.line_seize.expires=
+account.5.shared_line_one_touch_bargein.enable=
+account.5.shared_line_one_touch_retrieve.enable=
+account.5.sca_manage_interface_display_time=
+account.5.shared_line_callpull_code=
+
+##V83 Add
+account.x.share_line.barge_in.enable
+
+#######################################################################################
+##                                   BLA                                             ##
+#######################################################################################
+account.5.bla_number=
+account.5.bla_subscribe_period=
+account.5.bla.notify_with_expire.enable=
+account.5.bla.subscribe_uri_build_type=
+
+#######################################################################################
+##                                   Call Park                                       ##
+#######################################################################################
+account.5.callpark_enable=
+
+
+#######################################################################################
+##                                    Broadsoft ACD                                  ##
+#######################################################################################
+account.5.acd.enable= 0
+account.5.acd.available= 0
+account.5.acd.unavailable_reason_enable= 0
+account.5.acd.initial_state= 1
+account.5.subscribe_acd_expires=
+
+
+#######################################################################################
+##                                 Broadsoft ACD Call Center                         ##
+#######################################################################################
+##account.X.reason_code.Y=
+##account.X.reason_code_name.Y=
+##account.X.bw_disp_code.Y=
+##account.X.bw_disp_code_name.Y=
+##account.X.supervisor_info_code.Y=
+##account.X.supervisor_info_code_name.Y=
+##The value Y must be continuous.
+
+account.5.reason_code.1=
+account.5.reason_code_name.1= 0
+account.5.bw_disp_code.1=
+account.5.bw_disp_code_name.1=
+account.5.supervisor_info_code.1=
+account.5.supervisor_info_code_name.1=
+
+#######################################################################################
+##                                 Broadsoft Call Center                             ##
+#######################################################################################
+account.5.call_center.call_info_enable= 0
+account.5.call_center.show_call_info_time= 30
+account.5.call_center.disp_code_enable= 0
+account.5.call_center.trace_enable= 0
+account.5.call_center.emergency_enable= 0
+account.5.call_center.queue_status_enable= 0
+account.5.call_center.queue_status_light_enable = 0
+
+
+
+#######################################################################################
+##                         Broadsoft Hoteling                                        ##
+#######################################################################################
+account.5.hoteling.enable= 0
+account.5.hoteling.user_id= 0
+account.5.hoteling.password= 0
+account.5.hoteling.expires= 0
+account.5.hoteling.auto_login_enable= 0
+
+
+#######################################################################################
+##                              Broadsoft XSI                                        ##
+#######################################################################################
+account.5.xsi.user =
+account.5.xsi.password =
+account.5.xsi.host =
+account.5.xsi.server_type =
+account.5.xsi.port =
+
+
+#######################################################################################
+##                                Call Pickup                                        ##
+#######################################################################################
+account.5.direct_pickup_code =
+account.5.group_pickup_code =
+account.5.dialoginfo_callpickup = 0
+account.5.refresh_remote_id.enable =
+
+
+#######################################################################################
+##                              Broadsoft Call Recording                             ##
+#######################################################################################
+account.5.call_recording.enable=
+
+#######################################################################################
+##                                Network Conference                                  ##
+#######################################################################################
+account.5.conf_uri = {if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}
+
+
+#######################################################################################
+##                              Broadsoft Call Decline                               ##
+#######################################################################################
+account.5.features.call_decline.enable =
+
+
+#######################################################################################
+##                       Broadsoft Security Classification                           ##
+#######################################################################################
+account.5.security_classification.enable =
+
+
+
+#######################################################################################
+##                        Broadsoft Flexible Seating                                 ##
+#######################################################################################
+account.5.flexible_seating.enable=
+account.5.hoteling.pin=
+account.5.hoteling.mode=
+
+#######################################################################################
+##                         Features Sync                                             ##
+#######################################################################################
+account.5.features.forward.feature_key_sync.local_processing.enable=
+account.5.features.dnd.feature_key_sync.local_processing.enable =
+
+##V84 Add
+account.5.dnd.feature_key_sync.enable=
+account.5.feature_key_sync.enable=
+account.5.forward.feature_key_sync.enable=
+
+#######################################################################################
+##                                   ACD                                             ##
+#######################################################################################
+account.5.acd.available_url=
+account.5.acd.away_url =
+account.5.acd.refresh_url =
+account.5.acd.call_information=
+
+
+
+#######################################################################################
+##                                  virtual_user                                     ##
+#######################################################################################
+##V84 Add
+#bw.virtual_user.1.enable=
+#bw.virtual_user.1.label=
+#bw.virtual_user.1.xsi.dnd.enable=
+#bw.virtual_user.1.xsi.host=
+#bw.virtual_user.1.xsi.password=
+#bw.virtual_user.1.xsi.port=
+#bw.virtual_user.1.xsi.server_type=
+#bw.virtual_user.1.xsi.user=
+
+#!version:1.0.0.1
+
+##File header "#!version:1.0.0.1" can not be edited or deleted, and must be placed in the first line.##
+##account.X.*:(T5XW/T54S/T48G/T48S/T46G/T46S/T29G/T46U/T48U: X ranges from 1 to 16. T52S/T42G/T42S/T43U: X ranges from 1 to 12. T41P/T41S/T27P/T27G/T41U: X ranges from 1 to 6. T40P/T40G/T23P/T23G: X ranges from 1 to 3. T21(P) E2: X ranges from 1 to 2.)##
+
+#######################################################################################
+##                                   Transfer                                        ##
+#######################################################################################
+account.6.phone_setting.call_appearance.transfer_via_new_linekey= {$yealink_transfer_via_new_linekey}
+
+
+#######################################################################################
+##                                   Conference                                      ##
+#######################################################################################
+account.6.phone_setting.call_appearance.conference_via_new_linekey=
+
+
+#######################################################################################
+##                                   Anonymous                                       ##
+#######################################################################################
+account.6.anonymous_call.server_base_only =
+account.6.send_anonymous_rejection_code =
+account.6.anonymous_reject_offcode =
+account.6.anonymous_reject_oncode =
+account.6.reject_anonymous_call=
+account.6.anonymous_call_offcode =
+account.6.anonymous_call_oncode =
+account.6.anonymous_call = 0
+account.6.send_anonymous_code =
+
+
+
+#######################################################################################
+##                          Call Configuration                                       ##
+#######################################################################################
+account.6.music_server_uri=
+account.6.music_on_hold_type=
+account.6.auto_label.rule=
+account.6.auto_label.enable=
+account.6.number_of_linekey=
+account.6.phone_setting.call_appearance.calls_per_linekey=
+
+
+#######################################################################################
+##                                    Codec                                          ##
+#######################################################################################
+account.6.codec.ilbc_15_2kbps.priority=
+account.6.codec.ilbc_15_2kbps.enable=
+
+account.6.codec.ilbc_13_33kbps.priority= {if isset($yealink_codec_iLBC_priority)}{$yealink_codec_iLBC_priority}{else}0{/if}
+
+account.6.codec.ilbc_13_33kbps.enable = {if isset($yealink_codec_iLBC_enable)}1{else}0{/if}
+
+account.6.codec.pcma.enable= {if isset($yealink_codec_pcma_enable)}1{else}0{/if}
+
+account.6.codec.pcma.priority= {if isset($yealink_codec_pcma_priority)}{$yealink_codec_pcma_priority}{else}0{/if}
+
+account.6.codec.pcmu.enable= {if isset($yealink_codec_pcmu_enable)}1{else}0{/if}
+
+account.6.codec.pcmu.priority= {if isset($yealink_codec_pcmu_priority)}{$yealink_codec_pcmu_priority}{else}0{/if}
+
+account.6.codec.opus.priority= {if isset($yealink_codec_opus_priority)}{$yealink_codec_opus_priority}{else}0{/if}
+
+account.6.codec.opus.enable= {if isset($yealink_codec_opus_enable)}1{else}0{/if}
+
+account.6.codec.opus.para= 106
+
+account.6.codec.g726_40.enable= {if isset($yealink_codec_g726_40_enable)}1{else}0{/if}
+
+account.6.codec.g726_40.priority= {if isset($yealink_codec_g726_40_priority)}{$yealink_codec_g726_40_priority}{else}0{/if}
+
+account.6.codec.g726_32.enable= {if isset($yealink_codec_g726_32_enable)}1{else}0{/if}
+
+account.6.codec.g726_32.priority= {if isset($yealink_codec_g726_32_priority)}{$yealink_codec_g726_32_priority}{else}0{/if}
+
+account.6.codec.g726_24.enable= {if isset($yealink_codec_g726_24_enable)}1{else}0{/if}
+
+account.6.codec.g726_24.priority= {if isset($yealink_codec_g726_24_priority)}{$yealink_codec_g726_24_priority}{else}0{/if}
+
+account.6.codec.g726_16.enable= {if isset($yealink_codec_g726_16_enable)}1{else}0{/if}
+
+account.6.codec.g726_16.priority= {if isset($yealink_codec_g726_16_priority)}{$yealink_codec_g726_16_priority}{else}0{/if}
+
+account.6.codec.g723_63.priority= {if isset($yealink_codec_g723_63_priority)}{$yealink_codec_g723_63_priority}{else}0{/if}
+
+account.6.codec.g723_63.enable= {if isset($yealink_codec_g723_63_enable)}1{else}0{/if}
+
+account.6.codec.g723_53.priority= {if isset($yealink_codec_g723_53_priority)}{$yealink_codec_g723_53_priority}{else}0{/if}
+
+account.6.codec.g723_53.enable= {if isset($yealink_codec_g723_53_enable)}1{else}0{/if}
+
+account.6.codec.g729.priority= {if isset($yealink_codec_g729_priority)}{$yealink_codec_g729_priority}{else}0{/if}
+
+account.6.codec.g729.enable= {if isset($yealink_codec_g729_enable)}1{else}0{/if}
+
+account.6.codec.g722.priority= {if isset($yealink_codec_g722_priority)}{$yealink_codec_g722_priority}{else}0{/if}
+
+account.6.codec.g722.enable= {if isset($yealink_codec_g722_enable)}1{else}0{/if}
+
+account.6.codec.G722_1_24kpbs.priority=
+account.6.codec.G722_1_24kpbs.enable=
+account.6.codec.G722_1c_24kpbs.priority=
+account.6.codec.G722_1c_24kpbs.enable=
+account.6.codec.G722_1c_32kpbs.priority=
+account.6.codec.G722_1c_32kpbs.enable=
+account.6.codec.G722_1c_48kpbs.priority=
+account.6.codec.G722_1c_48kpbs.enable=
+
+################################################################
+#                      Account6 Register                       ##
+################################################################
+{if isset($account.6.password) }
+account.6.enable = 1
+{else}
+account.6.enable = 0
+{/if}
+account.6.label = {$account.6.display_name}
+account.6.display_name = {$account.6.display_name}
+account.6.auth_name = {$account.6.auth_id}
+
+{if isset($account.6.server.1.address)}
+account.6.user_name = {$account.6.user_id}@{$account.6.server_address}
+{else}
+account.6.user_name = {$account.6.user_id}
+{/if}
+
+account.6.password = {$account.6.password}
+account.6.sip_server.1.address= {$account.6.server_address}
+account.6.sip_server_port = {$account.6.sip_port}
+
+
+#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
+{if $account.6.sip_transport == 'udp'}account.6.sip_server.1.transport_type = 0{/if}
+{if $account.6.sip_transport == 'tcp'}account.6.sip_server.1.transport_type = 1{/if}
+{if $account.6.sip_transport == 'tls'}account.6.sip_server.1.transport_type = 2{/if}
+{if $account.6.sip_transport == 'dns srv'}account.6.sip_server.1.transport_type = 3{/if}
+
+account.6.sip_server.1.expires=  {$account.6.register_expires}
+account.6.sip_server.1.retry_counts= 3
+
+account.6.sip_server.2.address= {$account.6.server.2.address}
+account.6.sip_server.2.port= {$account.6.sip_port}
+
+#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS-NAPTR;
+{if $account.6.sip_transport == 'udp'}account.6.sip_server.2.transport_type = 0{/if}
+{if $account.6.sip_transport == 'tcp'}account.6.sip_server.2.transport_type = 1{/if}
+{if $account.6.sip_transport == 'tls'}account.6.sip_server.2.transport_type = 2{/if}
+{if $account.6.sip_transport == 'dns srv'}account.6.sip_server.2.transport_type = 3{/if}
+
+account.6.sip_server.2.expires= {$account.6.register_expires}
+account.6.sip_server.2.retry_counts= 3
+
+account.6.outbound_proxy_enable = {if isset($account.6.outbound_proxy_primary)}1{else}0{/if}
+
+account.6.outbound_proxy.1.address = {$account.6.outbound_proxy_primary}
+account.6.outbound_proxy.2.address = {$account.6.outbound_proxy_secondary}
+
+{if isset($outbound_proxy_1_port)}
+account.6.outbound_proxy.1.port = {$outbound_proxy_1_port}
+{else}
+account.6.outbound_proxy.1.port = {$account.6.sip_port}
+{/if}
+
+account.6.outbound_proxy.2.address= {$account.6.outbound_proxy_secondary}
+
+{if isset($outbound_proxy_1_port)}
+account.6.outbound_proxy.2.port = {$outbound_proxy_2_port}
+{else}
+account.6.outbound_proxy.2.port = {$account.6.sip_port}
+{/if}
+
+account.6.outbound_proxy_fallback_interval= {$yealink_outbound_proxy_fallback_interval}
+
+account.6.nat.nat_traversal= {if isset($stun_server)}1{else}0{/if}
+
+
+
+################################################################
+#                      Account Basic                          ##
+################################################################
+account.6.auto_answer=
+
+################################################################
+#                      Account Advanced                       ##
+################################################################
+account.6.nat.udp_update_enable=
+account.6.nat.udp_update_time=
+account.6.nat.rport= {$yealink_rport}
+
+account.6.dtmf.type= {$yealink_dtmf_type}
+account.6.dtmf.info_type=
+account.6.dtmf.dtmf_payload=
+account.6.100rel_enable=
+
+account.6.subscribe_register=
+account.6.cid_source= {$yealink_cid_source}
+account.6.enable_user_equal_phone=
+account.6.srtp_encryption= {$yealink_srtp_encryption}
+account.6.ptime=
+account.6.register_line=
+account.6.register_mac=
+account.6.reg_fail_retry_interval=
+account.6.unregister_on_reboot=
+
+account.6.session_timer.refresher=
+account.6.session_timer.expires=
+account.6.session_timer.enable= {$yealink_session_timer}
+
+account.6.conf_type = {if $nway_conference == true}2{/if}
+account.6.sip_server_type=
+
+##V83 Add
+account.6.srtp.unencrypted_rtcp.enable =
+account.6.srtp.unencrypted_rtp.enable =
+account.6.sip_server_mode =
+
+
+
+################################################################
+#                        SIP Backup Server                    ##
+################################################################
+account.6.outbound_proxy.1.register_on_enable=
+account.6.outbound_proxy.1.failback_timeout=
+account.6.outbound_proxy.1.failback_mode=
+account.6.outbound_proxy.1.retry_counts=
+account.6.outbound_proxy.1.only_signal_with_registered=
+account.6.outbound_proxy.1.failback_subscribe.enable=
+account.6.outbound_proxy.1.invite_retry_counts=
+
+account.6.sip_server.1.register_on_enable=
+account.6.sip_server.1.failback_timeout=
+account.6.sip_server.1.failback_mode=
+account.6.sip_server.1.failback_subscribe.enable=
+account.6.sip_server.1.only_signal_with_registered=
+account.6.sip_server.1.invite_retry_counts=
+
+account.6.outbound_proxy.2.register_on_enable=
+account.6.outbound_proxy.2.failback_timeout=
+account.6.outbound_proxy.2.failback_mode=
+account.6.outbound_proxy.2.retry_counts=
+account.6.outbound_proxy.2.only_signal_with_registered=
+account.6.outbound_proxy.2.failback_subscribe.enable=
+account.6.outbound_proxy.2.invite_retry_counts=
+
+account.6.sip_server.2.register_on_enable=
+account.6.sip_server.2.failback_timeout=
+account.6.sip_server.2.failback_mode=
+account.6.sip_server.2.failback_subscribe.enable=
+account.6.sip_server.2.only_signal_with_registered=
+account.6.sip_server.2.invite_retry_counts=
+
+account.6.static_cache_pri=
+account.6.dns_cache_type=
+account.6.naptr_build=
+account.6.fallback.timeout=
+account.6.fallback.redundancy_type=
+account.6.reg_failed_retry_max_time=
+account.6.reg_failed_retry_min_time=
+account.6.redundancy_with_reg_fail.enable =
+
+##V83 Add
+account.6.sip_server.1.outbound_proxy_enable =
+account.6.sip_server.2.outbound_proxy_enable =
+
+################################################################
+#                        SIP Basic config                     ##
+################################################################
+account.6.contact_take_line_param=
+account.6.update_ack_while_dialing=
+account.6.srtp_lifetime=
+account.6.third_part_request_with_route.enable=
+account.6.insert_outbound_in_route.enable=
+account.6.path.enable=
+account.6.sub_fail_retry_interval=
+account.6.transfer_refer_to_contact_header.enable=
+account.6.hold_use_inactive=
+account.6.gruu.enable=
+account.6.dial_tone=
+account.6.call_id_mode=
+account.6.subscribe_expires_overlap=
+account.6.register_expires_overlap=
+account.6.call_info=
+account.6.custom_ua=
+account.6.mwi_parse_terminated=
+account.6.check_cseq.enable=
+account.6.check_to_tag.enable=
+account.6.vq_rtcpxr.collector_server_port=
+account.6.vq_rtcpxr.collector_server_host=
+account.6.vq_rtcpxr.collector_name=
+account.6.compact_header_enable=
+account.6.cp_source= 2
+account.6.cid_source_ppi= 1
+account.6.cid_source_privacy= 1
+account.6.reg_with_pani_header.enable =
+account.6.alert_info=
+account.6.picture_info_enable= 1
+
+##V83 Add
+account.6.invite_with_pani_header.enable = 
+
+##V84 Add
+account.6.invite_with_rpid_header.enable=
+
+account.6.auto_answer_mute_enable
+
+##V84 SP4 Add
+account.6.share_line.enable_private_code =
+account.6.share_line.cancel_private_code =
+
+#######################################################################################
+##                                 History                                           ##
+#######################################################################################
+account.6.missed_calllog=
+
+
+#######################################################################################
+##                                  Forward                                          ##
+#######################################################################################
+account.6.timeout_fwd.off_code=
+account.6.timeout_fwd.on_code=
+account.6.timeout_fwd.timeout=
+account.6.timeout_fwd.target=
+account.6.timeout_fwd.enable=
+account.6.busy_fwd.off_code=
+account.6.busy_fwd.on_code=
+account.6.busy_fwd.target=
+account.6.busy_fwd.enable=
+account.6.always_fwd.off_code=
+account.6.always_fwd.on_code=
+account.6.always_fwd.target=
+account.6.always_fwd.enable=
+
+
+#######################################################################################
+##                                  DND                                              ##
+#######################################################################################
+account.6.dnd.enable=
+account.6.dnd.off_code=
+account.6.dnd.on_code=
+
+
+
+#######################################################################################
+##                               Voice Mail                                          ##
+#######################################################################################
+voice_mail.number.1= {$voicemail_number}
+account.6.subscribe_mwi= 1
+account.6.subscribe_mwi_to_vm= {$yealink_subscribe_mwi_to_vm}
+account.6.subscribe_mwi_expires= 3600
+account.6.display_mwi.enable=
+
+#######################################################################################
+##                               Auto Dial                                           ##
+#######################################################################################
+account.6.auto_dial_enable=
+account.6.auto_dial_num=
+
+
+#######################################################################################
+##                           Preference&Status                                       ##
+#######################################################################################
+account.6.ringtone.ring_type=
+
+#######################################################################################
+##                           Digitmap                                                ##
+#######################################################################################
+account.6.dialplan.digitmap.enable=
+account.6.dialplan.digitmap.string=
+account.6.dialplan.digitmap.no_match_action=
+account.6.dialplan.digitmap.interdigit_short_timer=
+account.6.dialplan.digitmap.interdigit_long_timer=
+account.6.dialplan.digitmap.apply_to.press_send=
+account.6.dialplan.digitmap.apply_to.forward=
+account.6.dialplan.digitmap.apply_to.history_dial=
+account.6.dialplan.digitmap.apply_to.directory_dial=
+account.6.dialplan.digitmap.apply_to.on_hook_dial=
+account.6.dialplan.digitmap.active.on_hook_dialing=
+
+
+#######################################################################################
+##                                 Rings Settings                                    ##
+#######################################################################################
+account.6.alert_info_url_enable=
+
+
+#######################################################################################
+##                                  BLF/BLF List                                     ##
+#######################################################################################
+account.6.blf.blf_list_uri=
+account.6.blf_list_barge_in_code=
+account.6.blf_list_code=
+account.6.blf_list_retrieve_call_parked_code=
+account.6.blf.subscribe_period=
+account.6.blf.match_host.enable=
+account.6.out_dialog_blf_enable=
+account.6.blf.subscribe_event=
+
+##V84 Add
+account.6.blf_list_call_parked_code=
+account.6.blf_list_call_parked_list=
+
+##V84 SP4 ADD
+account.6.blf_list_whisper_code=
+account.6.blf_list_listen_in_code=
+
+
+#######################################################################################
+##                                   SCA                                             ##
+#######################################################################################
+account.6.shared_line=
+account.6.line_seize.expires=
+account.6.shared_line_one_touch_bargein.enable=
+account.6.shared_line_one_touch_retrieve.enable=
+account.6.sca_manage_interface_display_time=
+account.6.shared_line_callpull_code=
+
+##V83 Add
+account.x.share_line.barge_in.enable
+
+#######################################################################################
+##                                   BLA                                             ##
+#######################################################################################
+account.6.bla_number=
+account.6.bla_subscribe_period=
+account.6.bla.notify_with_expire.enable=
+account.6.bla.subscribe_uri_build_type=
+
+#######################################################################################
+##                                   Call Park                                       ##
+#######################################################################################
+account.6.callpark_enable=
+
+
+#######################################################################################
+##                                    Broadsoft ACD                                  ##
+#######################################################################################
+account.6.acd.enable= 0
+account.6.acd.available= 0
+account.6.acd.unavailable_reason_enable= 0
+account.6.acd.initial_state= 1
+account.6.subscribe_acd_expires=
+
+
+#######################################################################################
+##                                 Broadsoft ACD Call Center                         ##
+#######################################################################################
+##account.X.reason_code.Y=
+##account.X.reason_code_name.Y=
+##account.X.bw_disp_code.Y=
+##account.X.bw_disp_code_name.Y=
+##account.X.supervisor_info_code.Y=
+##account.X.supervisor_info_code_name.Y=
+##The value Y must be continuous.
+
+account.6.reason_code.1=
+account.6.reason_code_name.1= 0
+account.6.bw_disp_code.1=
+account.6.bw_disp_code_name.1=
+account.6.supervisor_info_code.1=
+account.6.supervisor_info_code_name.1=
+
+#######################################################################################
+##                                 Broadsoft Call Center                             ##
+#######################################################################################
+account.6.call_center.call_info_enable= 0
+account.6.call_center.show_call_info_time= 30
+account.6.call_center.disp_code_enable= 0
+account.6.call_center.trace_enable= 0
+account.6.call_center.emergency_enable= 0
+account.6.call_center.queue_status_enable= 0
+account.6.call_center.queue_status_light_enable = 0
+
+
+
+#######################################################################################
+##                         Broadsoft Hoteling                                        ##
+#######################################################################################
+account.6.hoteling.enable= 0
+account.6.hoteling.user_id= 0
+account.6.hoteling.password= 0
+account.6.hoteling.expires= 0
+account.6.hoteling.auto_login_enable= 0
+
+
+#######################################################################################
+##                              Broadsoft XSI                                        ##
+#######################################################################################
+account.6.xsi.user =
+account.6.xsi.password =
+account.6.xsi.host =
+account.6.xsi.server_type =
+account.6.xsi.port =
+
+
+#######################################################################################
+##                                Call Pickup                                        ##
+#######################################################################################
+account.6.direct_pickup_code =
+account.6.group_pickup_code =
+account.6.dialoginfo_callpickup = 0
+account.6.refresh_remote_id.enable =
+
+
+#######################################################################################
+##                              Broadsoft Call Recording                             ##
+#######################################################################################
+account.6.call_recording.enable=
+
+#######################################################################################
+##                                Network Conference                                  ##
+#######################################################################################
+account.6.conf_uri = {if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}
+
+
+#######################################################################################
+##                              Broadsoft Call Decline                               ##
+#######################################################################################
+account.6.features.call_decline.enable =
+
+
+#######################################################################################
+##                       Broadsoft Security Classification                           ##
+#######################################################################################
+account.6.security_classification.enable =
+
+
+
+#######################################################################################
+##                        Broadsoft Flexible Seating                                 ##
+#######################################################################################
+account.6.flexible_seating.enable=
+account.6.hoteling.pin=
+account.6.hoteling.mode=
+
+#######################################################################################
+##                         Features Sync                                             ##
+#######################################################################################
+account.6.features.forward.feature_key_sync.local_processing.enable=
+account.6.features.dnd.feature_key_sync.local_processing.enable =
+
+##V84 Add
+account.6.dnd.feature_key_sync.enable=
+account.6.feature_key_sync.enable=
+account.6.forward.feature_key_sync.enable=
+
+#######################################################################################
+##                                   ACD                                             ##
+#######################################################################################
+account.6.acd.available_url=
+account.6.acd.away_url =
+account.6.acd.refresh_url =
+account.6.acd.call_information=
+
+
+
+#######################################################################################
+##                                  virtual_user                                     ##
+#######################################################################################
+##V84 Add
+#bw.virtual_user.1.enable=
+#bw.virtual_user.1.label=
+#bw.virtual_user.1.xsi.dnd.enable=
+#bw.virtual_user.1.xsi.host=
+#bw.virtual_user.1.xsi.password=
+#bw.virtual_user.1.xsi.port=
+#bw.virtual_user.1.xsi.server_type=
+#bw.virtual_user.1.xsi.user=
diff --git a/resources/templates/provision/yealink/t46g/y000000000028.cfg b/resources/templates/provision/yealink/t46g/y000000000028.cfg
index 2a4430c558..05bca74e1a 100644
--- a/resources/templates/provision/yealink/t46g/y000000000028.cfg
+++ b/resources/templates/provision/yealink/t46g/y000000000028.cfg
@@ -869,6 +869,7 @@ features.password_dial.length =
 #######################################################################################
 #Enable or disable the phone to save the call history; 0-Disabled, 1-Enabled (default);
 features.save_call_history =
+features.save_init_num_to_history.enable = 0
 
 #######################################################################################
 ##                                   Features Pickup                                 ##
@@ -980,7 +981,13 @@ phone_setting.backlight_time = {$yealink_backlight_time}
 #######################################################################################
 ##                                   Wallpaper                                       ##
 #######################################################################################
+## Resolution: 480 x 272
+## Max Size: 1MB
+
+## Confgure the url to download an image from
 wallpaper_upload.url = {$yealink_t46g_wallpaper}
+
+## Setting yealink_t46g_wallpaper_filename with the filename will make that wallpaper active.
 {if isset($yealink_t46g_wallpaper_filename)}
 phone_setting.backgrounds =  Config:{$yealink_t46g_wallpaper_filename}
 {else}
@@ -1278,6 +1285,8 @@ linekey.27.label =
 features.block_linekey_in_menu.enable =
 features.shorten_linekey_label.enable =
 features.flash_url_dsskey_led.enable =
+
+## 0-Default, 1-Extended
 features.config_dsskey_length = {$yealink_dsskey_length}
 phone_setting.page_tip =
 features.keep_switch_page_key.enable=
diff --git a/resources/templates/provision/yealink/t46g/{$mac}.cfg b/resources/templates/provision/yealink/t46g/{$mac}.cfg
index c18c50dc0f..ec23e8dea1 100644
--- a/resources/templates/provision/yealink/t46g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t46g/{$mac}.cfg
@@ -395,10 +395,11 @@ account.1.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.1.conf_type =
+
+account.1.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.1.conf_uri =
+account.1.conf_uri = {if $nway_conference == true}nway{$account.1.auth_id}@{$account.1.server_address}{/if}
 
 #######################################################################################
 ##                            cid_source                                             ##
@@ -867,10 +868,10 @@ account.2.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.2.conf_type =
+account.2.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.2.conf_uri =
+account.2.conf_uri = {if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -1353,10 +1354,10 @@ account.3.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.3.conf_type =
+account.3.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.3.conf_uri =
+account.3.conf_uri = {if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -1829,10 +1830,10 @@ account.4.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.4.conf_type =
+account.4.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.4.conf_uri =
+account.4.conf_uri = {if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -2305,10 +2306,10 @@ account.5.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.5.conf_type =
+account.5.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.5.conf_uri =
+account.5.conf_uri = {if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -2780,10 +2781,10 @@ account.6.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.6.conf_type =
+account.6.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.6.conf_uri =
+account.6.conf_uri = {if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
diff --git a/resources/templates/provision/yealink/t46s/y000000000066.cfg b/resources/templates/provision/yealink/t46s/y000000000066.cfg
index d1652f69b1..b75a509304 100644
--- a/resources/templates/provision/yealink/t46s/y000000000066.cfg
+++ b/resources/templates/provision/yealink/t46s/y000000000066.cfg
@@ -791,7 +791,7 @@ features.save_call_history=
 features.call_log_show_num=
 search_in_dialing.history.enable=
 directory_setting.history.enable=
-features.save_init_num_to_history.enable=
+features.save_init_num_to_history.enable= 0
 features.redial_via_local_sip_server.enable=
 
 
@@ -806,7 +806,11 @@ static.auto_provision.local_contact.backup.enable=
 ##                          Contact Other                                            ##
 #######################################################################################
 directory.search_type=
+{if isset($yealink_local_directory_enable)}
+directory_setting.local_directory.enable = {$yealink_local_directory_enable}
+{else}
 directory_setting.local_directory.enable =
+{/if}
 directory_setting.local_directory.priority =
 
 
diff --git a/resources/templates/provision/yealink/t46s/{$mac}.cfg b/resources/templates/provision/yealink/t46s/{$mac}.cfg
index a15250035c..5809110892 100644
--- a/resources/templates/provision/yealink/t46s/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t46s/{$mac}.cfg
@@ -394,10 +394,10 @@ account.1.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.1.conf_type =
+account.1.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.1.conf_uri =
+account.1.conf_uri = {if $nway_conference == true}nway{$account.1.auth_id}@{$account.1.server_address}{/if}
 
 #######################################################################################
 ##                            cid_source                                             ##
@@ -870,10 +870,10 @@ account.2.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.2.conf_type =
+account.2.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.2.conf_uri =
+account.2.conf_uri = {if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -1361,10 +1361,10 @@ account.3.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.3.conf_type =
+account.3.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.3.conf_uri =
+account.3.conf_uri = {if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -1837,10 +1837,10 @@ account.4.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.4.conf_type =
+account.4.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.4.conf_uri =
+account.4.conf_uri = {if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -2313,10 +2313,10 @@ account.5.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.5.conf_type =
+account.5.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.5.conf_uri =
+account.5.conf_uri = {if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -2788,10 +2788,10 @@ account.6.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.6.conf_type =
+account.6.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.6.conf_uri =
+account.6.conf_uri = {if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
diff --git a/resources/templates/provision/yealink/t46u/favorite_setting.xml b/resources/templates/provision/yealink/t46u/favorite_setting.xml
new file mode 100644
index 0000000000..ba7275358e
--- /dev/null
+++ b/resources/templates/provision/yealink/t46u/favorite_setting.xml
@@ -0,0 +1,8 @@
+<root_favorite_set>
+<item id_name="localdirectory" display_name="Local Directory" priority="2" enable="0" />
+<item id_name="history" display_name="History" priority="3" enable="1" />
+<item id_name="networkcalllog" display_name="Network CallLog" priority="4" enable="0" />
+<item id_name="remotedirectory" display_name="Remote Phone Book" priority="5" enable="1" />
+<item id_name="ldap" display_name="LDAP" priority="1" enable="0" />
+<item id_name="networkdirectory" display_name="Network Directory" priority="6" enable="0" />
+</root_favorite_set>
diff --git a/resources/templates/provision/yealink/t46u/y000000000000.boot b/resources/templates/provision/yealink/t46u/y000000000000.boot
new file mode 100644
index 0000000000..f937e7d73d
--- /dev/null
+++ b/resources/templates/provision/yealink/t46u/y000000000000.boot
@@ -0,0 +1,7 @@
+#!version:1.0.0.1
+## The header above must appear as-is in the first line
+
+include:config "y000000000108.cfg"
+include:config "{$mac}.cfg"
+
+overwrite_mode = {$yealink_overwrite_mode}
diff --git a/resources/templates/provision/yealink/t46u/y000000000108.cfg b/resources/templates/provision/yealink/t46u/y000000000108.cfg
new file mode 100644
index 0000000000..a1e9d2d5b6
--- /dev/null
+++ b/resources/templates/provision/yealink/t46u/y000000000108.cfg
@@ -0,0 +1,1953 @@
+#!version:1.0.0.1
+
+##File header "#!version:1.0.0.1" can not be edited or deleted, and must be placed in the first line.##
+
+#######################################################################################
+##                                    Network CDP                                    ##
+#######################################################################################
+static.network.cdp.enable =
+static.network.cdp.packet_interval =
+
+
+
+#######################################################################################
+##                                    Network IPv6                                   ##
+#######################################################################################
+static.network.ipv6_static_dns_enable =
+static.network.ipv6_icmp_v6.enable =
+static.network.ipv6_secondary_dns =
+static.network.ipv6_primary_dns =
+static.network.ipv6_internet_port.gateway =
+static.network.ipv6_internet_port.ip =
+static.network.ipv6_internet_port.type =
+static.network.ipv6_prefix =
+
+
+
+#######################################################################################
+##                                    Network WiFi                                   ##
+#######################################################################################
+##static.wifi.X.label=
+##static.wifi.X.ssid=
+##static.wifi.X.priority=
+##static.wifi.X.security_mode=
+##static.wifi.X.cipher_type=
+##static.wifi.X.password=
+##static.wifi.X.eap_type=
+##static.wifi.X.eap_user_name=
+##static.wifi.x.eap_password=
+##(X ranges from 1 to 5)
+##Only T5XW/T54S/T52S/T48G/T48S/T46G/T46S/T42S/T41S/T29G/T27G/T4XU Models support these parameters.
+
+static.wifi.enable = {$yealink_wifi_enable}
+static.wifi.1.label = {$yealink_wifi_1_label}
+static.wifi.1.ssid = {$yealink_wifi_1_ssid}
+static.wifi.1.priority = {$yealink_wifi_1_priority}
+static.wifi.1.security_mode = {$yealink_wifi_1_security}
+static.wifi.1.cipher_type = {$yealink_wifi_1_cipher}
+static.wifi.1.password = {$yealink_wifi_1_password}
+static.wifi.1.eap_type = {$yealink_wifi_1_type}
+static.wifi.1.eap_user_name = {$yealink_wifi_1_username}
+static.wifi.1.eap_password = {$yealink_wifi_1_password}
+static.wifi.show_scan_prompt = {$yealink_wifi_scan_prompt}
+
+##V83 Add
+static.wifi.function.enable =
+
+
+##V84 SP4 ADD
+static.network.wifi.ip_address_mode=
+static.network.wifi.preference =
+static.network.wifi.internet_port.type =
+static.network.wifi.internet_port.ip=
+static.network.wifi.internet_port.mask=
+static.network.wifi.internet_port.gateway=
+static.network.wifi.static_dns_enable=
+static.network.wifi.primary_dns=
+static.network.wifi.secondary_dns=
+static.network.wifi.ipv6_internet_port.type=
+static.network.wifi.ipv6_internet_port.ip=
+static.network.wifi.ipv6_prefix=
+static.network.wifi.ipv6_internet_port.gateway=
+static.network.wifi.ipv6_static_dns_enable=
+static.network.wifi.ipv6_primary_dns=
+static.network.wifi.ipv6_secondary_dns=
+static.network.wifi.ipv6_icmp_v6.enable=
+#######################################################################################
+##                                 Network Internet                                  ##
+#######################################################################################
+static.network.ip_address_mode = {$yealink_ip_address_mode}
+static.network.span_to_pc_port =
+static.network.vlan.pc_port_mode =
+static.network.static_dns_enable =
+static.network.pc_port.enable =
+{if isset($dns_server_primary)}static.network.primary_dns = {$dns_server_primary}{/if}
+{if isset($dns_server_secondary)}static.network.secondary_dns = {$dns_server_secondary}{/if}
+static.network.internet_port.gateway =
+static.network.internet_port.mask =
+static.network.internet_port.ip =
+static.network.internet_port.type =
+
+##V83 Add
+static.network.preference =
+
+
+#######################################################################################
+##                               Network Advanced                                    ##
+#######################################################################################
+static.network.dhcp_host_name =
+static.network.dhcp.option60type =
+static.network.mtu_value =
+static.network.qos.audiotos =
+static.network.port.min_rtpport =
+static.network.port.max_rtpport =
+static.network.qos.signaltos =
+
+static.wui.http_enable =
+static.wui.https_enable =
+static.network.port.https =
+static.network.port.http =
+
+static.network.pc_port.speed_duplex =
+static.network.internet_port.speed_duplex =
+
+##V83 Add
+static.network.redundancy.mode =
+static.network.redundancy.failback.timeout =
+
+
+
+#######################################################################################
+##                                   Network LLDP                                    ##
+#######################################################################################
+static.network.lldp.enable = {$yealink_lldp_enable}
+static.network.lldp.packet_interval =
+
+
+
+#######################################################################################
+##                                   Network VLAN                                    ##
+#######################################################################################
+static.network.vlan.dhcp_enable =
+static.network.vlan.dhcp_option =
+static.network.vlan.vlan_change.enable =
+
+static.network.vlan.pc_port_priority = {$yealink_vlan_pc_cos}
+static.network.vlan.pc_port_vid = {$yealink_vlan_pc_id}
+
+{if isset($yealink_vlan_pc_enable)}static.network.vlan.pc_port_enable = {$yealink_vlan_pc_enable}{else}static.network.vlan.pc_port_enable = 0{/if}
+
+#static.network.vlan.pc_port_enable =
+
+static.network.vlan.internet_port_priority = {$yealink_vlan_cos}
+static.network.vlan.internet_port_vid = {$yealink_vlan_id}
+
+{if isset($yealink_vlan_enable)}static.network.vlan.internet_port_enable = {$yealink_vlan_enable}{else}static.network.vlan.internet_port_enable = 0{/if}
+
+
+#######################################################################################
+##                                    Network VPN                                    ##
+#######################################################################################
+static.network.vpn_enable = {$yealink_network_vpn_enable}
+static.openvpn.url = {$yealink_openvpn_url}
+
+
+#######################################################################################
+##                                 Network 802.1x                                    ##
+#######################################################################################
+static.network.802_1x.mode =
+static.network.802_1x.identity =
+static.network.802_1x.md5_password =
+static.network.802_1x.client_cert_url =
+static.network.802_1x.root_cert_url =
+static.network.802_1x.eap_fast_provision_mode =
+static.network.802_1x.anonymous_identity =
+static.network.802_1x.proxy_eap_logoff.enable =
+
+
+static.auto_provision.custom.protect =
+static.auto_provision.custom.sync =
+static.auto_provision.custom.sync.path =
+static.auto_provision.custom.upload_method =
+
+
+
+
+#######################################################################################
+##                                    ZERO Touch                                     ##
+#######################################################################################
+static.zero_touch.enable =
+static.zero_touch.wait_time =
+static.features.hide_zero_touch_url.enable =
+static.zero_touch.network_fail_delay_times =
+static.zero_touch.network_fail_wait_times =
+
+
+#######################################################################################
+##                                   Autop URL                                       ##
+#######################################################################################
+static.auto_provision.server.url = {$yealink_provision_url}
+static.auto_provision.server.username = {$http_auth_username}
+static.auto_provision.server.password = {$http_auth_password}
+
+
+#######################################################################################
+##                                   Autop Weekly                                    ##
+#######################################################################################
+static.auto_provision.weekly.enable =
+static.auto_provision.weekly.dayofweek =
+static.auto_provision.weekly.end_time =
+static.auto_provision.weekly.begin_time =
+static.auto_provision.weekly_upgrade_interval =
+
+#######################################################################################
+##                                   Autop Repeat                                    ##
+#######################################################################################
+static.auto_provision.repeat.enable =
+static.auto_provision.repeat.minutes =
+
+#######################################################################################
+##                                   Autop DHCP                                      ##
+#######################################################################################
+static.auto_provision.dhcp_option.list_user_options =
+static.auto_provision.dhcp_option.enable =
+
+##V83 Add
+static.auto_provision.dhcp_option.list_user6_options =
+
+#######################################################################################
+##                                   Autop Mode                                      ##
+#######################################################################################
+static.auto_provision.power_on =
+
+
+
+#######################################################################################
+##                               Flexible Autop                                      ##
+#######################################################################################
+static.auto_provision.flexible.end_time =
+static.auto_provision.flexible.begin_time =
+static.auto_provision.flexible.interval =
+static.auto_provision.flexible.enable =
+
+#######################################################################################
+##                                 Autoprovision  Other                              ##
+#######################################################################################
+static.auto_provision.prompt.enable =
+static.auto_provision.attempt_expired_time =
+static.auto_provision.attempt_before_failed =
+static.network.attempt_expired_time =
+static.auto_provision.update_file_mode =
+static.auto_provision.retry_delay_after_file_transfer_failed=
+static.auto_provision.inactivity_time_expire =
+static.auto_provision.dns_resolv_timeout =
+static.auto_provision.dns_resolv_nretry =
+static.auto_provision.dns_resolv_nosys =
+static.auto_provision.user_agent_mac.enable =
+static.auto_provision.server.type =
+features.action_uri_force_autop =
+static.auto_provision.url_wildcard.pn =
+static.auto_provision.reboot_force.enable =
+static.auto_provision.dhcp_option.option60_value =
+static.custom_mac_cfg.url =
+static.auto_provision.aes_key_in_file =
+static.auto_provision.aes_key_16.mac =
+static.auto_provision.aes_key_16.com =
+features.custom_version_info =
+##V83 Add
+static.auto_provision.authentication.expired_time =
+static.auto_provision.connect.keep_alive =
+
+##V84 Add
+static.auto_provision.config_version.mac=
+static.auto_provision.config_version.com=
+
+
+#######################################################################################
+##                                   Autop PNP                                       ##
+#######################################################################################
+static.auto_provision.pnp_enable =
+
+
+
+#######################################################################################
+##                                  Autop Code                                       ##
+#######################################################################################
+##static.autoprovision.X.name
+##static.autoprovision.X.code
+##static.autoprovision.X.url
+##static.autoprovision.X.user
+##static.autoprovision.X.password
+##static.autoprovision.X.com_aes
+##static.autoprovision.X.mac_aes
+##Autop Code(X ranges from 1 to 50)
+
+static.autoprovision.1.name =
+static.autoprovision.1.code =
+static.autoprovision.1.url =
+static.autoprovision.1.user =
+static.autoprovision.1.password =
+static.autoprovision.1.com_aes =
+static.autoprovision.1.mac_aes =
+
+
+
+#######################################################################################
+##                                   TR069                                           ##
+#######################################################################################
+
+static.managementserver.enable =
+static.managementserver.username =
+static.managementserver.password =
+static.managementserver.url =
+static.managementserver.periodic_inform_enable = 0
+static.managementserver.periodic_inform_interval = 60
+static.managementserver.connection_request_password =
+static.managementserver.connection_request_username =
+
+
+
+#######################################################################################
+##                            Firmware Update                                        ##
+#######################################################################################
+static.firmware.url = {$yealink_firmware_url}/{$yealink_firmware_t43u}
+
+
+#######################################################################################
+##                            Confguration                                           ##
+#######################################################################################
+features.reset_by_long_press_enable =
+features.factory_pwd_enable =
+static.configuration.url =
+static.features.custom_factory_config.enable =
+static.custom_factory_configuration.url =
+
+
+#######################################################################################
+##                               SYSLOG                                              ##
+#######################################################################################
+static.syslog.enable =
+static.syslog.server =
+static.syslog.level =
+static.syslog.server_port =
+static.syslog.transport_type =
+static.syslog.facility =
+static.syslog.prepend_mac_address.enable =
+static.local_log.enable =
+static.local_log.level =
+static.local_log.max_file_size =
+
+
+
+#######################################################################################
+##                               Log Backup                                          ##
+#######################################################################################
+static.auto_provision.local_log.backup.enable =
+static.auto_provision.local_log.backup.path =
+static.auto_provision.local_log.backup.upload_period =
+static.auto_provision.local_log.backup.append =
+static.auto_provision.local_log.backup.bootlog.upload_wait_time=
+static.auto_provision.local_log.backup.append.max_file_size =
+static.auto_provision.local_log.backup.append.limit_mode=
+
+
+
+#######################################################################################
+##                                   User Mode                                       ##
+#######################################################################################
+static.security.var_enable = 
+static.web_item_level.url =
+
+
+#######################################################################################
+##                                  Quick Login                                      ##
+#######################################################################################
+wui.quick_login = 
+
+
+#######################################################################################
+##                               Security                                            ##
+#######################################################################################
+static.phone_setting.reserve_certs_enable = 
+features.relog_offtime = 
+static.security.default_ssl_method = {$yealink_security_default_ssl_method}
+static.security.cn_validation = 
+static.security.dev_cert = 
+static.security.ca_cert = 
+static.security.trust_certificates = {if $yealink_trust_certificates == "false"}0{elseif $yealink_trust_certificates == "true"}1{/if}
+
+static.security.user_password = {$var_name}:{$var_password}
+static.security.user_password = {$admin_name}:{$admin_password}
+static.security.user_password = {$user_name}:{$user_password}
+static.security.user_name.var = {$var_name}
+static.security.user_name.admin = {$admin_name}
+static.security.user_name.user = {$user_name}
+
+##V83 Add
+static.security.default_access_level =
+phone_setting.reserve_certs_config.enable =
+
+
+#######################################################################################
+##                               Watch Dog                                           ##
+#######################################################################################
+static.watch_dog.enable =
+
+#######################################################################################
+##                                   Server Certificates                             ##
+#######################################################################################
+static.server_certificates.url =
+static.server_certificates.delete = 
+
+#######################################################################################
+##                           Trusted Certificates                                    ##
+#######################################################################################
+static.trusted_certificates.url =
+static.trusted_certificates.delete =
+
+
+
+#######################################################################################
+##                           Secure Domain List                                      ##
+#######################################################################################
+wui.secure_domain_list = 
+
+
+#######################################################################################
+##                               Encryption                                          ##
+#######################################################################################
+static.auto_provision.encryption.directory = 
+static.auto_provision.encryption.call_log = 
+static.auto_provision.encryption.config = 
+
+
+
+
+#######################################################################################
+##                                   Trnasfer                                        ##
+#######################################################################################
+dialplan.transfer.mode = {$yealink_transfer_mode}
+transfer.on_hook_trans_enable = {$yealink_transfer_onhook}
+transfer.tran_others_after_conf_enable = {$yealink_transfer_after_conf}
+transfer.blind_tran_on_hook_enable = {$yealink_transfer_blind_on_hook}
+transfer.semi_attend_tran_enable = {$yealink_transfer_semi_attended}
+phone_setting.call_appearance.transfer_via_new_linekey= {$yealink_transfer_via_new_linekey}
+
+
+#######################################################################################
+##                                   Conference                                      ##
+#######################################################################################
+features.conference.with_previous_call.enable =
+features.local_conf.combine_with_one_press.enable=
+phone_setting.call_appearance.conference_via_new_linekey=
+
+
+
+#######################################################################################
+##                                   Anonymous                                       ##
+#######################################################################################
+features.anonymous_response_code=
+
+
+
+#######################################################################################
+##                          Call Configuration                                       ##
+#######################################################################################
+phone_setting.incoming_call_when_dialing.priority=
+phone_setting.hold_or_swap.mode=
+features.play_held_tone.interval=
+features.play_held_tone.delay=
+features.play_held_tone.enable=
+features.play_hold_tone.interval=
+features.ignore_incoming_call.enable=
+force.voice.ring_vol=
+features.mute.autoanswer_mute.enable=
+features.play_hold_tone.delay =
+phone_setting.end_call_net_disconnect.enable =
+features.custom_auto_answer_tone.enable=
+default_input_method.dialing=
+features.speaker_mode.enable=
+features.headset_mode.enable=
+features.handset_mode.enable=
+features.conference.local.enable =
+features.off_hook_answer.enable=
+features.caller_name_type_on_dialing=
+phone_setting.show_code403=
+phone_setting.ring_for_tranfailed=
+features.password_dial.length=
+features.password_dial.prefix=
+features.password_dial.enable=
+features.group_listen_in_talking_enable=
+phone_setting.call_info_display_method = 0
+phone_setting.called_party_info_display.enable = 1
+features.headset_training=
+features.headset_prior=
+features.dtmf.replace_tran =
+features.dtmf.transfer =
+phone_setting.ringing_timeout=
+phone_setting.ringback_timeout=
+
+features.keep_mute.enable=
+linekey.1.shortlabel=
+features.config_dsskey_length.shorten =
+transfer.dsskey_deal_type = {$yealink_dsskey_transfer_mode}
+features.auto_linekeys.enable=
+phone_setting.call_appearance.calls_per_linekey=
+features.linekey_call_with_default_account=
+##V83 Add
+features.station_name.value =
+features.station_name.scrolling_display =
+voice.headset.autoreset_spk_vol =
+voice.handset.autoreset_spk_vol =
+voice.handfree.autoreset_spk_vol =
+features.headset.ctrl_call.enable = 
+phone_setting.incoming_call.reject.enable =
+
+features.play_mute_tone.enable=
+features.play_mute_tone.interval=
+
+features.call_out_directory_by_off_hook.enable=
+features.congestion_tone.codelist=
+
+
+##V84 Add
+phone_setting.icon.delete=
+phone_setting.icon.url=
+
+##V84 SP4 Add
+voice.handset.tia4965.enable = 
+voice.headset.tia4965.enable = 
+
+#######################################################################################
+##                           Custom Softkey                                          ##
+#######################################################################################
+phone_setting.custom_softkey_enable=
+custom_softkey_talking.url=
+custom_softkey_ring_back.url=
+custom_softkey_dialing.url=
+custom_softkey_connecting.url=
+custom_softkey_call_in.url=
+custom_softkey_call_failed.url=
+
+##V83 Add
+features.homescreen_softkey.acd.enable =
+features.homescreen_softkey.hoteling.enable =
+phone_setting.custom_softkey.apply_to_states =
+features.custom_softkey_dynamic.enable =
+
+
+#######################################################################################
+##                                   Features Bluetooth                              ##
+#######################################################################################
+##Only T5XW/T54S/T52S/T48G/T48S/T46G/T46S/T42S/T41S/T29G/T27G/T4XU Models support the parameter.
+features.bluetooth_enable=
+features.bluetooth_adapter_name=
+##V83 Add
+static.bluetooth.function.enable =
+
+##V84 Add
+bluetooth.a2dp_sink=
+bluetooth.connect_confirm.enable=
+
+#######################################################################################
+##                                  Features USB Record                              ##
+#######################################################################################
+##Only T5XW/T54S/T52S/T48G/T48S/T46G/T46S/T42S/T41S/T29G/T27G/T4XU Models support the parameter.
+features.usb_call_recording.enable = {$yealink_usb_record_enable}
+features.auto_recording.enable =
+
+features.idle_recording.enable=
+
+#######################################################################################
+##                                  Features USB                                     ##
+#######################################################################################
+##V83 Add
+static.usb.power.enable =
+
+##V84 Add
+static.usbdisk.function.enable=
+
+#######################################################################################
+##                                    Codec                                          ##
+#######################################################################################
+voice.g726.aal2.enable=
+
+
+#######################################################################################
+##                                   DTMF                                            ##
+#######################################################################################
+features.dtmf.min_interval=
+features.dtmf.volume=
+features.dtmf.duration =
+
+#######################################################################################
+##                                   Tones                                           ##
+#######################################################################################
+voice.tone.autoanswer =
+voice.tone.message =
+voice.tone.stutter =
+voice.tone.info =
+voice.tone.dialrecall =
+voice.tone.callwaiting =
+voice.tone.congestion =
+voice.tone.busy =
+voice.tone.ring =
+voice.tone.dial =
+voice.tone.country =
+voice.side_tone =
+features.partition_tone =
+voice.tone.secondary_dial=
+#######################################################################################
+##  Tones V83 stutterdial dnd fwd vm      ##       
+#######################################################################################
+
+voice.tone.stutterdial=
+voice.tone.stutter_dial_tone.apply_to_dnd.enable=
+voice.tone.stutter_dial_tone.apply_to_fwd.enable=
+voice.tone.stutter_dial_tone.apply_to_fwd.enable=
+
+#######################################################################################
+##                                   Jitter Buffer                                   ##
+#######################################################################################
+voice.jib.normal=
+voice.jib.max =
+voice.jib.min =
+voice.jib.adaptive =
+
+voice.jib.wifi.normal=
+voice.jib.wifi.max=
+voice.jib.wifi.min=
+voice.jib.wifi.adaptive=
+
+#######################################################################################
+##                                   Echo Cancellation                               ##
+#######################################################################################
+voice.echo_cancellation =
+voice.cng =
+voice.vad =
+
+##V84 Add
+voice.ans_nb.enable=
+voice.tns.enable=
+
+################################################################
+#                        SIP Backup Server                    ##
+################################################################
+static.network.dns.ttl_enable =
+static.network.dns.last_cache_expired.enable=
+static.network.dns.last_cache_expired
+static.network.dns.query_timeout =
+static.network.dns.retry_times =
+sip.dns_transport_type=
+sip.skip_redundant_failover_addr=
+
+
+################################################################
+#                        SIP Basic Config                     ##
+################################################################
+sip.use_out_bound_in_dialog=
+sip.unreg_with_socket_close=
+phone_setting.disable_account_without_username.enable=
+features.auto_answer.first_call_only=
+
+##V84 Add
+phone_setting.call_display_name.mode=
+
+################################################################
+#                        SIP Advanced config                  ##
+################################################################
+sip.request_validation.event=
+sip.sdp_early_answer_or_offer=
+sip.cid_source.preference=
+sip.request_validation.digest.realm=
+sip.request_validation.digest.list=
+sip.request_validation.source.list=
+sip.send_keepalive_by_socket=
+sip.reliable_protocol.timerae.enable=
+sip.requesturi.e164.addglobalprefix=
+sip.trust_ctrl = {$yealink_trust_ctrl}
+sip.mac_in_ua=
+
+sip.timer_t1=
+sip.timer_t2=
+sip.timer_t4=
+
+sip.listen_mode=
+
+{if isset($yealink_sip_listen_port)}sip.listen_port = {$yealink_sip_listen_port}{else}sip.listen_port = 5060{/if}
+
+sip.tls_listen_port=
+sip.tcp_port_random_mode=
+sip.escape_characters.enable=
+sip.notify_reboot_enable=
+sip.send_response_by_request=
+sip.disp_incall_to_info=
+features.call_invite_format=
+phone_setting.early_media.rtp_sniffer.timeout=
+sip.reg_surge_prevention =
+
+################################################################
+#    V84 new add    sip.escape_characters.enable=             ##
+################################################################
+sip.reserve_characters=
+
+
+##V83 Add
+sip.dhcp.option120.mode =
+
+################################################################
+#                        NAT&ICE                              ##
+################################################################
+static.sip.nat_turn.enable=
+static.sip.nat_turn.username=
+static.sip.nat_turn.password=
+static.sip.nat_turn.server=
+static.sip.nat_turn.port=
+
+static.sip.nat_stun.enable={if isset($stun_server)}1{else}0{/if}
+
+static.sip.nat_stun.server= {$stun_server}
+static.sip.nat_stun.port= {if isset($stun_port)}{$stun_port}{else}3478{/if}
+
+
+static.ice.enable=
+
+static.network.static_nat.enable= {if isset($yealink_static_nat)}1{else}0{/if}
+
+static.network.static_nat.addr= {$yealink_static_nat}
+
+#######################################################################################
+##                           DNS                                                     ##
+#######################################################################################
+dns_cache_a.1.name =
+dns_cache_a.1.ip = 
+dns_cache_a.1.ttl =
+dns_cache_srv.1.name = 
+dns_cache_srv.1.port =
+dns_cache_srv.1.priority =
+dns_cache_srv.1.target =
+dns_cache_srv.1.weight =
+dns_cache_srv.1.ttl =
+dns_cache_naptr.1.name =
+dns_cache_naptr.1.order =
+dns_cache_naptr.1.preference =
+dns_cache_naptr.1.replace =
+dns_cache_naptr.1.service = 
+dns_cache_naptr.1.ttl = 
+
+#######################################################################################
+##                                 RTP                                               ##
+#######################################################################################
+features.rtp_symmetric.enable=
+
+
+#######################################################################################
+##                                 RTCP-XR                                           ##
+#######################################################################################
+voice.rtcp.enable=
+voice.rtcp_cname=
+voice.rtcp_xr.enable=
+phone_setting.vq_rtcpxr_display_symm_oneway_delay.enable=
+phone_setting.vq_rtcpxr_display_round_trip_delay.enable=
+phone_setting.vq_rtcpxr_display_moscq.enable=
+phone_setting.vq_rtcpxr_display_moslq.enable = 
+phone_setting.vq_rtcpxr_display_packets_lost.enable=
+phone_setting.vq_rtcpxr_display_jitter_buffer_max.enable=
+phone_setting.vq_rtcpxr_display_jitter.enable=
+phone_setting.vq_rtcpxr_display_remote_codec.enable=
+phone_setting.vq_rtcpxr_display_local_codec.enable=
+phone_setting.vq_rtcpxr_display_remote_call_id.enable=
+phone_setting.vq_rtcpxr_display_local_call_id.enable=
+phone_setting.vq_rtcpxr_display_stop_time.enable=
+phone_setting.vq_rtcpxr_display_start_time.enable=
+phone_setting.vq_rtcpxr_interval_period=
+phone_setting.vq_rtcpxr_delay_threshold_critical=
+phone_setting.vq_rtcpxr_delay_threshold_warning=
+phone_setting.vq_rtcpxr_moslq_threshold_critical=
+phone_setting.vq_rtcpxr_moslq_threshold_warning=
+phone_setting.vq_rtcpxr.interval_report.enable=
+phone_setting.vq_rtcpxr.states_show_on_gui.enable=
+phone_setting.vq_rtcpxr.states_show_on_web.enable=
+phone_setting.vq_rtcpxr.session_report.enable=
+
+
+#######################################################################################
+##                                   Contact                                         ##
+#######################################################################################
+
+static.directory_setting.url= https://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=favorite_setting.xml
+
+super_search.url=
+
+local_contact.data.url=
+local_contact.data.delete=
+
+##Only T5XW/T54S/T52S/T48G/T48S/T46G/T46S/T29G/T46U/T48U Models support the parameter
+phone_setting.contact_photo_display.enable=
+
+phone_setting.incoming_call.horizontal_roll_interval=
+
+##Only T5XW/T54S/T52S/T48G/T48S/T46G/T46S/T29G/T5XW Models support the parameter
+local_contact.data_photo_tar.url=
+local_contact.photo.url=
+local_contact.image.url=
+
+##Only T48G/S Models support the parameter
+local_contact.icon_image.url=
+local_contact.icon.url=
+
+search_in_dialing.local_directory.enable =
+search_in_dialing.local_directory.priority =
+
+#######################################################################################
+##                                 Remote Phonebook                                  ##
+#######################################################################################
+##remote_phonebook.data.X.url
+##remote_phonebook.data.X.name 
+#remote_phonebook.data.X.username=
+#remote_phonebook.data.X.password=
+##(X ranges from 1 to 5)
+
+{if isset($yealink_remote_phonebook_1_name) }
+remote_phonebook.data.1.name = {$yealink_remote_phonebook_1_name}
+{else}
+remote_phonebook.data.1.name = Users
+{/if}
+{if isset($yealink_remote_phonebook_1_url) }
+remote_phonebook.data.1.url =  {$yealink_remote_phonebook_1_url}
+{else}
+remote_phonebook.data.1.url = https://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=users
+{/if}
+
+{if isset($yealink_remote_phonebook_2_name) }
+remote_phonebook.data.2.name = {$yealink_remote_phonebook_2_name}
+{else}
+remote_phonebook.data.2.name = Groups
+{/if}
+{if isset($yealink_remote_phonebook_2_url) }
+remote_phonebook.data.2.url =  {$yealink_remote_phonebook_2_url}
+{else}
+remote_phonebook.data.2.url = https://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=groups
+{/if}
+
+{if isset($yealink_remote_phonebook_3_name) }
+remote_phonebook.data.3.name = {$yealink_remote_phonebook_3_name}
+{else}
+remote_phonebook.data.3.name = Extensions
+{/if}
+{if isset($yealink_remote_phonebook_3_url) }
+remote_phonebook.data.3.url =  {$yealink_remote_phonebook_3_url}
+{else}
+remote_phonebook.data.3.url = https://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
+{/if}
+
+remote_phonebook.data.4.name = {$yealink_remote_phonebook_4_name}
+remote_phonebook.data.4.url =  {$yealink_remote_phonebook_4_url}
+
+remote_phonebook.data.5.name = {$yealink_remote_phonebook_5_name}
+remote_phonebook.data.5.url = {$yealink_remote_phonebook_5_url}
+
+features.remote_phonebook.enable = {$yealink_remote_phonebook_enable}
+
+#######################################################################################
+##                                 LDAP                                              ##
+#######################################################################################
+ldap.enable = {$ldap_enable}
+ldap.user = {$ldap_user}
+ldap.password = {$ldap_password}
+ldap.base = {$ldap_base}
+ldap.port = {$ldap_port}
+ldap.host = {$ldap_host}
+ldap.customize_label=
+ldap.incoming_call_special_search.enable=
+ldap.tls_mode=
+ldap.search_type=
+ldap.numb_display_mode=
+ldap.ldap_sort = {$ldap_sort}
+ldap.call_in_lookup = {$ldap_call_in_lookup}
+ldap.version = {$ldap_version}
+ldap.display_name = {$ldap_display_name}
+ldap.numb_attr = {$ldap_numb_attr}
+ldap.name_attr = {$ldap_name_attr}
+ldap.max_hits = {$ldap_max_hits}
+ldap.number_filter = {$ldap_number_filter}
+ldap.name_filter = {$ldap_name_filter}
+ldap.call_out_lookup = {$ldap_dial_lookup}
+directory_setting.ldap.enable =
+directory_setting.ldap.priority =
+search_in_dialing.ldap.enable =
+search_in_dialing.ldap.priority =
+
+##V84 SP4 ADD
+ldap.custom_extra_attr_name=
+ldap.display_extra_attr=
+ldap.extra_attr=
+
+
+
+
+#######################################################################################
+##                                 History                                           ##
+#######################################################################################
+static.auto_provision.local_calllog.write_delay.terminated=
+static.auto_provision.local_calllog.backup.path=
+static.auto_provision.local_calllog.backup.enable=
+super_search.recent_call=
+features.call_out_history_by_off_hook.enable=
+features.save_call_history=
+features.call_log_show_num=
+search_in_dialing.history.enable=
+search_in_dialing.history.priority=
+directory_setting.history.enable=
+directory_setting.history.priority
+features.save_init_num_to_history.enable= 0
+features.redial_via_local_sip_server.enable=
+
+##V83 Add
+features.calllog_detailed_information =
+
+##V84 Add
+features.call_log_merge.enable=
+
+
+#######################################################################################
+##                          Contact Backup                                           ##
+#######################################################################################
+static.auto_provision.local_contact.backup.path =
+static.auto_provision.local_contact.backup.enable=
+
+
+#######################################################################################
+##                          Contact Other                                            ##
+#######################################################################################
+directory.search_type=
+directory_setting.local_directory.enable =
+directory_setting.local_directory.priority =
+
+##V83 Add
+phone_setting.search.highlight_keywords.enable =
+
+#######################################################################################
+##                          Favorites                                                ##
+#######################################################################################
+##V83 Add
+local_contact.favorite.enable =
+phone_setting.favorite_sequence_type =
+
+#######################################################################################
+##                                  Programablekey                                   ##
+#######################################################################################
+#programablekey.X.type
+#programablekey.X.line
+#programablekey.X.value
+#programablekey.X.xml_phonebook
+#programablekey.X.history_type
+#programablekey.X.label(X ranges from 1 to 4)
+#programablekey.X.extension
+##Programablekey X ranges(T48G/T48S/T46G/T46S: X=1-10, 12-14;T42G/T42S/T41P/T41S/T40P/T40G: X=1-10, 13;T29G/T27P/T27G: X=1-14;T23P/T23G/T21(P) E2: 1-10, 14;T19(P) E2: X=1-9, 13, 14;)##
+
+{foreach $keys["programmable"] as $row}
+programablekey.{$row.device_key_id}.type = {$row.device_key_type}
+{if $row.device_key_type == "22" || $row.device_key_type == "47"}
+programablekey.{$row.device_key_id}.xml_phonebook = {$row.device_key_line}
+{else}
+programablekey.{$row.device_key_id}.line = {$row.device_key_line}
+programablekey.{$row.device_key_id}.value = {$row.device_key_value}
+{/if}
+programablekey.{$row.device_key_id}.extension = {$row.device_key_extension}
+programablekey.{$row.device_key_id}.label = {$row.device_key_label}
+programablekey.1.pickup_value ={$row.device_key_extension}
+programablekey.1.history_type =
+{/foreach}
+
+##V83 Add
+programablekey.type_range.custom =
+
+#######################################################################################
+##                                  Linekey                                          ##
+#######################################################################################
+##linekey.X.line
+##linekey.X.value
+##linekey.X.extension
+##linekey.X.type
+##linekey.X.xml_phonebook
+##linekey.X.shortlabel
+##linekey.X.label
+##LineKeyX ranges(T48U/T57W/T48G/S: X ranges from 1 to 29. T53W/T54W/T54S/T46G/T46S/T29G/T46U: X ranges from 1 to 27. T42G/T42S/T41P/T41S/T41U: X ranges from 1 to 15. T40P/T40G/T23P/T23G: X ranges from 1 to 3. T52S/T27P/T27G/T43U: X ranges from 1 to 21. T21(P) E2: X ranges from 1 to 2.)##
+## Not support T19P_E2
+
+{foreach $keys['line'] as $row}
+#Configure Line Key {$row.device_key_id}
+linekey.{$row.device_key_id}.line = {$row.device_key_line}
+linekey.{$row.device_key_id}.value = {$row.device_key_value}
+{if $row.device_key_type == "1" || $row.device_key_type == "16"}
+linekey.{$row.device_key_id}.pickup_value = {$row.device_key_extension}
+{else}
+linekey.{$row.device_key_id}.extension = {$row.device_key_extension}
+{/if}
+linekey.{$row.device_key_id}.type = {$row.device_key_type}
+linekey.{$row.device_key_id}.xml_phonebook =
+linekey.{$row.device_key_id}.label = {$row.device_key_label}
+
+{/foreach}
+
+linekey.type_range.custom =
+
+
+#######################################################################################
+##                                  Dsskey                                           ##
+#######################################################################################
+features.block_linekey_in_menu.enable =
+features.shorten_linekey_label.enable =
+features.flash_url_dsskey_led.enable =
+features.config_dsskey_length = {$yealink_dsskey_length}
+phone_setting.page_tip =
+features.keep_switch_page_key.enable=
+
+##phone_setting.idle_dsskey_and_title.transparency(Only support T5XW/T54S/T52S/T48G/T48S/T48U)
+phone_setting.idle_dsskey_and_title.transparency=
+
+##V83 Add
+phone_setting.keytype_sequence =
+phone_setting.dsskey_label.display_method =
+local.dsskey_type_config.mode =
+
+
+#######################################################################################
+##                                Expansion Key                                      ##
+#######################################################################################
+##expansion_module.X.key.Y.type
+##expansion_module.X.key.Y.line
+##expansion_module.X.key.Y.value
+##expansion_module.X.key.Y.extension
+##expansion_module.X.key.Y.label
+##expansion_module.X.key.Y.xml_phonebook
+## Expansion Key X ranges(SIP-T5XW/T54S/T52S/T43U/T46U/T48U: X ranges from 1 to 3, Y ranges from 1 to 60; SIP-T48G/T48S/T46G/T46S:X ranges from 1 to 6, Y ranges from 1 to 40; SIP-T29G/T27P/T27G:X ranges from 1 to 6, Y ranges from 1 to 20, 22 to 40 (Ext key 21 cannot be configured).)##
+## Only SIP-T5XW/T54S/T52S/T48G/T48S/T46G/T46S/T29G/T27P/T27G/T43U/T46U/T48U Models support the parameter.
+
+#expansion_module.1.key.1.type =
+#expansion_module.1.key.1.label =
+#expansion_module.1.key.1.value =
+#expansion_module.1.key.1.line =
+#expansion_module.1.key.1.pickup_value =
+#expansion_module.1.key.1.extension =
+#expansion_module.1.key.1.xml_phonebook =
+#expansion_module.page_tip.blf_call_in.led =
+#expansion_module.page_tip.blf_call_in.enable =
+
+{foreach $keys["expansion"] as $row}
+expansion_module.1.key.{$row.device_key_id}.type = {$row.device_key_type}
+expansion_module.1.key.{$row.device_key_id}.line = {$row.device_key_line}
+expansion_module.1.key.{$row.device_key_id}.value = {$row.device_key_value}
+expansion_module.1.key.{$row.device_key_id}.extension = {$row.device_key_extension}
+expansion_module.1.key.{$row.device_key_id}.label = {$row.device_key_label}
+expansion_module.1.key.{$row.device_key_id}.xml_phonebook =
+{/foreach}
+{foreach $keys["expansion-1"] as $row}
+expansion_module.1.key.{$row.device_key_id}.type = {$row.device_key_type}
+expansion_module.1.key.{$row.device_key_id}.line = {$row.device_key_line}
+expansion_module.1.key.{$row.device_key_id}.value = {$row.device_key_value}
+expansion_module.1.key.{$row.device_key_id}.extension = {$row.device_key_extension}
+expansion_module.1.key.{$row.device_key_id}.label = {$row.device_key_label}
+expansion_module.1.key.{$row.device_key_id}.xml_phonebook =
+{/foreach}
+{foreach $keys["expansion-2"] as $row}
+expansion_module.2.key.{$row.device_key_id}.type = {$row.device_key_type}
+expansion_module.2.key.{$row.device_key_id}.line = {$row.device_key_line}
+expansion_module.2.key.{$row.device_key_id}.value = {$row.device_key_value}
+expansion_module.2.key.{$row.device_key_id}.extension = {$row.device_key_extension}
+expansion_module.2.key.{$row.device_key_id}.label = {$row.device_key_label}
+expansion_module.2.key.{$row.device_key_id}.xml_phonebook =
+{/foreach}
+
+
+#######################################################################################
+##                                EDK                                                ##
+#######################################################################################
+##EDK Soft Keys(X ranges from 1 to 10)
+
+features.enhanced_dss_keys.enable=
+edk.id_mode.enable=
+softkey.1.position=
+softkey.1.use.dialing=
+softkey.1.softkey_id=
+softkey.1.use.dialtone=
+softkey.1.use.conferenced=
+softkey.1.use.held=
+softkey.1.use.hold=
+softkey.1.use.transfer_ring_back=
+softkey.1.use.ring_back=
+softkey.1.use.call_failed=
+softkey.1.use.on_talk=
+softkey.1.use.transfer_connecting=
+softkey.1.use.connecting=
+softkey.1.use.incoming_call=
+softkey.1.use.idle=
+softkey.1.action=
+softkey.1.label=
+softkey.1.enable=
+edk.edklist.1.action=
+edk.edklist.1.mname=
+edk.edklist.1.enable=
+edk.edkprompt.1.enable=
+edk.edkprompt.1.label=
+edk.edkprompt.1.type=
+edk.edkprompt.1.userfeedback=
+
+##V84 Add
+##edk.edkprompt.X.title=
+(X ranges from 1 to 9)
+edk.edkprompt.1.title=
+
+
+#######################################################################################
+##                                XML                                                ##
+#######################################################################################
+push_xml.server=
+push_xml.sip_notify=
+push_xml.block_in_calling=
+default_input_method.xml_browser_input_screen=
+
+##V83 Add
+hoteling.authentication_mode =
+push_xml.phonebook.search.delay =
+features.xml_browser.loading_tip.delay =
+features.xml_browser.pwd =
+features.xml_browser.user_name =
+push_xml.password =
+push_xml.username =
+
+
+#######################################################################################
+##                                  Forward                                          ##
+#######################################################################################
+features.fwd.allow=
+features.fwd_mode=
+forward.no_answer.enable=
+forward.busy.enable=
+forward.always.enable=
+forward.no_answer.timeout=
+forward.no_answer.on_code=
+forward.no_answer.off_code=
+forward.busy.off_code=
+forward.busy.on_code=
+forward.always.off_code=
+forward.always.on_code=
+forward.no_answer.target=
+forward.busy.target=
+forward.always.target=
+
+features.forward.emergency.authorized_number=
+features.forward.emergency.enable=
+forward.idle_access_always_fwd.enable=
+features.forward_call_popup.enable=
+
+##V83 Add
+features.forward.no_answer.show_ring_times =
+
+##V84 Add
+features.no_answer_code=
+
+
+#######################################################################################
+##                                  DND                                              ##
+#######################################################################################
+features.dnd.allow=
+features.dnd_mode=
+features.dnd.enable=
+
+features.dnd.off_code = *79
+features.dnd.on_code = *78
+
+features.dnd.emergency_authorized_number=
+features.dnd.emergency_enable = 1
+features.dnd.large_icon.enable=
+
+##V83 Add
+features.keep_dnd.enable =
+
+#######################################################################################
+##                               Phone Lock                                          ##
+#######################################################################################
+phone_setting.phone_lock.enable = {$yealink_lock_enable}
+phone_setting.phone_lock.lock_key_type = {$yealink_lock_key_type}
+phone_setting.phone_lock.unlock_pin = {$yealink_lock_pin}
+phone_setting.emergency.number = {$yealink_emergency_number}
+phone_setting.phone_lock.lock_time_out = {$yealink_lock_timeout}
+
+
+#######################################################################################
+##                               Hotdesking                                          ##
+#######################################################################################
+phone_setting.logon_wizard=
+phone_setting.logon_wizard_forever_wait=
+
+hotdesking.startup_register_name_enable=
+hotdesking.startup_username_enable=
+hotdesking.startup_password_enable=
+hotdesking.startup_sip_server_enable=
+hotdesking.startup_outbound_enable=
+
+hotdesking.dsskey_register_name_enable=
+hotdesking.dsskey_username_enable=
+hotdesking.dsskey_password_enable=
+hotdesking.dsskey_sip_server_enable=
+hotdesking.dsskey_outbound_enable=
+
+
+#######################################################################################
+##                               Voice Mail                                          ##
+#######################################################################################
+features.voice_mail_alert.enable=
+features.voice_mail_popup.enable = {$yealink_voice_mail_popup_enable}
+features.voice_mail_tone_enable=
+features.hide_feature_access_codes.enable = {$yealink_hide_feature_access_codes_enable}
+
+
+
+#######################################################################################
+##                               Text Message                                        ##
+#######################################################################################
+features.text_message.enable=
+features.text_message_popup.enable=
+
+
+
+
+
+#######################################################################################
+##                               Audio Intercom                                      ##
+#######################################################################################
+features.intercom.mode=
+features.intercom.subscribe.enable=
+features.intercom.led.enable=
+features.intercom.feature_access_code=
+features.blf.intercom_mode.enable=
+features.intercom.ptt_mode.enable=
+
+features.redial_tone=
+features.key_tone=
+features.send_key_tone=
+
+features.intercom.allow=
+features.intercom.barge=
+features.intercom.tone=
+features.intercom.mute=
+
+
+voice.handset_send=
+voice.handfree_send =
+voice.headset_send =
+features.intercom.headset_prior.enable=
+features.ringer_device.is_use_headset=
+features.intercom.barge_in_dialing.enable=
+
+
+
+#######################################################################################
+##                               Feature General                                     ##
+#######################################################################################
+features.ip_call.auto_answer.enable=
+features.show_default_account=
+features.call.dialtone_time_out=
+features.missed_call_popup.enable = {$yealink_missed_call_popup_enable}
+features.auto_answer_tone.enable=
+features.play_hold_tone.enable=
+features.key_as_send=
+features.send_pound_key=
+features.busy_tone_delay=
+features.hotline_delay=
+features.hotline_number=
+features.direct_ip_call_enable = {$yealink_direct_ip_call_enable}
+features.call_num_filter=
+features.call_completion_enable=
+features.allow_mute=
+features.auto_answer_delay=
+features.normal_refuse_code=
+features.dnd_refuse_code=
+features.upload_server=
+features.dtmf.repetition=
+features.dtmf.hide_delay=
+features.dtmf.hide = {$yealink_dtmf_hide}
+features.play_local_dtmf_tone_enable =
+features.reboot_in_talk_enable =
+features.fwd_diversion_enable=
+
+call_waiting.enable = {$yealink_call_waiting}
+call_waiting.tone = {$yealink_call_waiting_tone}
+call_waiting.off_code=
+call_waiting.on_code=
+
+auto_redial.times=
+auto_redial.interval=
+auto_redial.enable=
+
+sip.rfc2543_hold = {$yealink_rfc2543_hold}
+sip.use_23_as_pound=
+forward.international.enable=
+phone_setting.headsetkey_mode=
+phone_setting.is_deal180=
+phone_setting.change_183_to_180=
+
+##V84 Add
+features.touch_tone=
+
+#######################################################################################
+##                               Action URL&URI                                      ##
+#######################################################################################
+features.csta_control.enable=
+features.action_uri.enable=
+features.action_uri_limit_ip=
+features.show_action_uri_option=
+action_url.call_remote_canceled=
+action_url.remote_busy=
+action_url.cancel_callout=
+action_url.handfree=
+action_url.headset=
+action_url.unheld=
+action_url.held=
+action_url.transfer_failed=
+action_url.transfer_finished=
+action_url.answer_new_incoming_call=
+action_url.reject_incoming_call=
+action_url.forward_incoming_call=
+action_url.ip_change=
+action_url.idle_to_busy=
+action_url.busy_to_idle=
+action_url.call_terminated=
+action_url.missed_call=
+action_url.unmute=
+action_url.mute=
+action_url.unhold=
+action_url.hold=
+action_url.always_fwd_off =
+action_url.always_fwd_on =
+action_url.attended_transfer_call =
+action_url.blind_transfer_call =
+action_url.busy_fwd_off =
+action_url.busy_fwd_on =
+action_url.call_established =
+action_url.call_waiting_off =
+action_url.call_waiting_on =
+action_url.dnd_off =
+action_url.dnd_on =
+action_url.incoming_call =
+action_url.no_answer_fwd_off =
+action_url.no_answer_fwd_on =
+action_url.off_hook =
+action_url.on_hook =
+action_url.outgoing_call =
+action_url.register_failed =
+action_url.registered =
+action_url.setup_autop_finish =
+action_url.setup_completed =
+action_url.transfer_call =
+action_url.unregistered =
+
+##V84 Add
+action_url.peripheral_information=
+
+
+
+#######################################################################################
+##                               Power LED                                           ##
+#######################################################################################
+phone_setting.hold_and_held_power_led_flash_enable=
+phone_setting.mute_power_led_flash_enable=
+phone_setting.talk_and_dial_power_led_enable=
+phone_setting.mail_power_led_flash_enable = 1
+phone_setting.ring_power_led_flash_enable=
+phone_setting.common_power_led_enable=
+phone_setting.missed_call_power_led_flash.enable = {$yealink_missed_call_power_led_flash_enable}
+
+
+#######################################################################################
+##                                  Time&Date                                        ##
+#######################################################################################
+lcl.datetime.date.format =
+auto_dst.url = {$yealink_auto_dst_url}
+local_time.manual_time_enable =
+local_time.manual_ntp_srv_prior =
+local_time.time_format = {$yealink_time_format}
+local_time.date_format = {$yealink_date_format}
+local_time.dhcp_time = {$yealink_dhcp_time}
+
+local_time.summer_time = {$yealink_summer_time}
+local_time.dst_time_type = {$yealink_dst_type}
+local_time.start_time = {$yealink_time_zone_start_time}
+local_time.end_time = {$yealink_time_zone_end_time}
+local_time.offset_time = {$yealink_offset_time}
+local_time.interval = {$yealink_time_update}
+
+local_time.ntp_server1 = {$ntp_server_primary}
+local_time.ntp_server2 = {$ntp_server_secondary}
+local_time.time_zone = {$yealink_time_zone}
+local_time.time_zone_name = {$yealink_time_zone_name}
+
+
+#######################################################################################
+##                           Multicast Paging                                        ##
+#######################################################################################
+##multicast.listen_address.X.label 
+##multicast.paging_address.X.channel
+##multicast.listen_address.X.ip_address 
+##multicast.paging_address.X.ip_address
+##multicast.paging_address.X.label
+##multicast.listen_address.X.channel
+##multicast.listen_address.X.volume
+##Multicast(X ranges from 1 to 31.)
+
+multicast.codec=
+
+multicast.paging_address.1.channel=
+multicast.paging_address.1.label=
+multicast.paging_address.1.ip_address=
+multicast.receive_priority.enable=
+multicast.receive_priority.priority=
+
+multicast.receive.use_speaker=
+multicast.receive.enhance_volume=
+multicast.receive.ignore_dnd.priority=
+
+multicast.listen_address.1.channel=
+multicast.listen_address.1.label=
+multicast.listen_address.1.ip_address=
+multicast.listen_address.1.volume=
+
+
+#######################################################################################
+##                           Preference&Status                                       ##
+#######################################################################################
+##Not support T19P_E2
+static.features.default_account=
+
+##Logo File Format: .dob
+##Resolution: SIP-T42G/T42S/T41P/T41S/T41U: <=192*64  2 gray scale;SIP-T43U/SIP-T27P/G: <=240*120  2 gray scale;SIP-T40P/T40G/T23P/T23G/T21(P) E2/T19(P) E2: <=132*64  2 gray scale##
+phone_setting.lcd_logo.mode=
+lcd_logo.delete=
+lcd_logo.url=
+
+phone_setting.contrast=
+phone_setting.backlight_time = {$yealink_backlight_time}
+phone_setting.inactive_backlight_level = 1
+phone_setting.active_backlight_level=
+phone_setting.predial_autodial = 1
+
+ringtone.url= {$yealink_ringtone_url}
+ringtone.delete= {$yealink_ringtone_delete}
+phone_setting.ring_type= {$yealink_ring_type}
+phone_setting.inter_digit_time= {$yealink_inter_digit_time}
+
+##Only T54S Model supports the parameter
+phone_setting.idle_clock_display.enable =
+
+#######################################################################################
+##                           Digitmap                                                ##
+#######################################################################################
+dialplan.digitmap.enable=
+dialplan.digitmap.string=
+dialplan.digitmap.no_match_action=
+dialplan.digitmap.interdigit_short_timer=
+dialplan.digitmap.interdigit_long_timer=
+dialplan.digitmap.apply_to.press_send=
+dialplan.digitmap.apply_to.forward=
+dialplan.digitmap.apply_to.history_dial=
+dialplan.digitmap.apply_to.directory_dial=
+dialplan.digitmap.apply_to.on_hook_dial=
+dialplan.digitmap.active.on_hook_dialing=
+
+##V83 Add
+dialplan.digitmap.apply_to.prefix_key =
+
+##V84 ADD
+features.local_calllog.received.replace_rule=
+
+
+
+
+#######################################################################################
+##                           Emergency Dialplan                                      ##
+#######################################################################################
+dialplan.emergency.enable=
+dialplan.emergency.1.value=
+dialplan.emergency.server.1.address=
+dialplan.emergency.server.1.transport_type=
+dialplan.emergency.server.1.port=
+dialplan.emergency.1.server_priority=
+dialplan.emergency.custom_asserted_id=
+dialplan.emergency.asserted_id_source=
+dialplan.emergency.asserted_id.sip_account= 
+dialplan.emergency.held.request_element.1.name=
+dialplan.emergency.held.request_element.1.value= 
+dialplan.emergency.held.request_type=
+dialplan.emergency.held.server_url=
+
+
+
+#######################################################################################
+##                               Dialplan                                            ##
+#######################################################################################
+dialplan_replace_rule.url=
+dialplan.replace.line_id.1=
+dialplan.replace.replace.1=
+dialplan.replace.prefix.1=
+phone_setting.dialnow_delay=
+dialplan_dialnow.url=
+dialplan.dialnow.line_id.1=
+dialplan.dialnow.rule.1 = {$yealink_dialplan_dialnow_rule_1}
+dialplan.block_out.line_id.1=
+dialplan.block_out.number.1=
+dialplan.area_code.line_id =
+dialplan.area_code.max_len = 15
+dialplan.area_code.min_len = 1
+dialplan.area_code.code=
+
+#######################################################################################
+##                                 Rings Settings                                    ##
+#######################################################################################
+distinctive_ring_tones.alert_info.1.ringer= {$yealink_ring_file_1}
+distinctive_ring_tones.alert_info.1.text= {$yealink_ring_text_1}
+
+#######################################################################################
+##                                   IME Settings                                    ##
+#######################################################################################
+directory.search_default_input_method=
+directory.edit_default_input_method=
+gui_input_method.url=
+
+##V83 Add
+##Only T48G/T48S Models support the parameter
+phone_setting.virtual_keyboard.enable =
+
+#######################################################################################
+##                                   Language Settings                               ##
+#######################################################################################
+wui_lang.url=
+wui_lang_note.url=
+wui_lang.delete=
+gui_input_method.delete=
+gui_lang.url=
+gui_lang.delete=
+lang.gui= {$yealink_language_gui}
+lang.wui=
+
+
+#######################################################################################
+##                                   Screensaver                                     ##
+#######################################################################################
+screensaver.type=
+screensaver.delete=
+screensaver.upload_url=
+features.blf_active_backlight.enable=
+screensaver.display_clock.enable=
+screensaver.clock_move_interval=
+screensaver.picture_change_interval=
+screensaver.wait_time=
+screensaver.xml_browser.url=
+
+
+
+#######################################################################################
+##                                  Power Saving                                     ##
+#######################################################################################
+features.power_saving.enable=
+features.power_saving.power_led_flash.on_time=
+features.power_saving.power_led_flash.off_time=
+features.power_saving.office_hour.monday=
+features.power_saving.office_hour.tuesday=
+features.power_saving.office_hour.wednesday=
+features.power_saving.office_hour.thursday=
+features.power_saving.office_hour.friday=
+features.power_saving.office_hour.saturday=
+features.power_saving.office_hour.sunday =
+features.power_saving.user_input_ext.idle_timeout=
+features.power_saving.off_hour.idle_timeout=
+features.power_saving.office_hour.idle_timeout=
+features.power_saving.intelligent_mode=
+
+
+#######################################################################################
+##                           Backgrounds  Settings                                   ##
+#######################################################################################
+##File Formate:
+##SIP-T57W/T54W/T54S/T52S/T48S/T48G/T46G/T46S/T29G/T46U/T48U: .jpg/.png/.bmp/.jpeg;
+##Resolution:
+##SIP-T57W/T48S/T48G/T48U/T46U:<=2.0 megapixels;
+##for SIP-T54W/T46G/T46S/T29G: <=1.8 megapixels;SIP-T54S/T52S:<=4.2 megapixels;
+##Single File Size: <=5MB 
+##2MB of space should bereserved for the phone
+
+wallpaper_upload.url = {$yealink_t43u_wallpaper}
+{if isset($yealink_t43u_wallpaper_filename)}
+phone_setting.backgrounds =  Config:{$yealink_t43u_wallpaper_filename}
+{else}
+phone_setting.backgrounds =  Config:yealink_t43u_wallpaper.png
+{/if}
+
+## phone_setting.backgrounds_with_dsskey_unfold(Only support T48U/T48G/S)
+phone_setting.backgrounds_with_dsskey_unfold=
+
+##expansion_module.backgrounds(Only support T5XW/T54S/T52S/T43U/T46U/T48U)
+expansion_module.backgrounds=
+
+
+#######################################################################################
+##                               BSFT Setting                                        ##
+#######################################################################################
+bw.enable =
+
+
+#######################################################################################
+##                                  BLF/BLF List                                     ##
+#######################################################################################
+phone_setting.auto_blf_list_enable = 1
+phone_setting.blf_list_sequence_type = 1
+
+blf.enhanced.parked.enable=
+blf.enhanced.parked.led =
+blf.enhanced.parked.talking.action =
+blf.enhanced.parked.callin.action =
+blf.enhanced.parked.idle.action =
+
+blf.enhanced.talking.enable=
+blf.enhanced.talking.led=
+blf.enhanced.talking.talking.action =
+blf.enhanced.talking.callin.action =
+blf.enhanced.talking.idle.action =
+
+blf.enhanced.callout.enable =
+blf.enhanced.callout.led=
+blf.enhanced.callout.talking.action =
+blf.enhanced.callout.callin.action =
+blf.enhanced.callout.idle.action =
+
+blf.enhanced.callin.enable =
+blf.enhanced.callin.led=
+blf.enhanced.callin.talking.action =
+blf.enhanced.callin.callin.action=
+blf.enhanced.callin.idle.action=
+
+blf.enhanced.idle.enable = 0
+blf.enhanced.idle.led=
+blf.enhanced.idle.talking.action=
+blf.enhanced.idle.callin.action=
+blf.enhanced.idle.idle.action=
+
+features.blf_list_version = 0
+sip.sub_refresh_random=
+sip.terminate_notify_sub_delay_time=
+
+features.blf_led_mode = {$yealink_blf_led_mode}
+features.blf_pickup_only_send_code=
+
+##V84 Add
+blf.enhanced.dnd.enable=
+blf.enhanced.dnd.led=
+blf.enhanced.hold.enable=
+blf.enhanced.hold.led=
+
+features.blf.show_callinfo.enable=
+
+##V84 SP4 ADD
+blf.normal_barge_in_code=
+blf.whisper_barge_in_code=
+blf.listen_barge_in_code=
+
+
+#######################################################################################
+##                                   SCA                                             ##
+#######################################################################################
+features.auto_release_bla_line=
+features.barge_in_via_username.enable=
+
+
+
+#######################################################################################
+##                                   Call Park                                       ##
+#######################################################################################
+features.call_park.enable=
+features.call_park.park_mode=
+features.call_park.park_code=
+features.call_park.park_retrieve_code=
+features.call_park.direct_send.enable=
+features.call_park.park_visual_notify_enable=
+features.call_park.park_ring=
+features.call_park.group_enable=
+features.call_park.group_park_code=
+sip.call_park_without_blf=
+features.call_park.line_restriction.enable=
+
+
+#######################################################################################
+##                                    Broadsoft ACD                                  ##
+#######################################################################################
+acd.enable=
+acd.auto_available_timer=
+
+
+
+
+#######################################################################################
+##                              Broadsoft XSI                                        ##
+#######################################################################################
+bw.xsi.enable=
+sip.authentication_for_xsi =
+default_input_method.xsi_password=
+
+
+#######################################################################################
+##                             Broadsoft Network Directory                           ##
+#######################################################################################
+bw.xsi.directory.enable=
+bw.calllog_and_dir =
+bw.xsi.call_log.enable=
+bw_phonebook.custom=
+bw_phonebook.enterprise_common_enable=
+bw_phonebook.enterprise_common_displayname=
+bw_phonebook.enterprise_enable=
+bw_phonebook.enterprise_displayname=
+bw_phonebook.group_common_enable=
+bw_phonebook.group_common_displayname=
+bw_phonebook.personal_enable=
+bw_phonebook.personal_displayname=
+bw_phonebook.group_enable=
+bw_phonebook.group_displayname =
+directory.update_time_interval=
+bw.xsi.directory.alphabetized_by_lastname.enable=
+directory_setting.bw_directory.enable =
+directory_setting.bw_directory.priority =
+search_in_dialing.bw_directory.enable =
+search_in_dialing.bw_directory.priority =
+##V83 Add
+bw.xsi.directory.update.enable =
+
+#######################################################################################
+##                             Broadsoft Network Calllog                             ##
+#######################################################################################
+##V83 Add
+bw.xsi.call_log.delete.enable =
+bw.xsi.call_log.multiple_accounts.enable =
+phone_setting.ring_duration =
+
+
+#######################################################################################
+##                                Call Pickup                                        ##
+#######################################################################################
+features.pickup.direct_pickup_enable = {$yealink_direct_pickup_enable}
+features.pickup.group_pickup_enable =
+features.pickup.direct_pickup_code = **
+features.pickup.group_pickup_code =
+features.pickup.blf_audio_enable =
+features.pickup.blf_visual_enable =
+features.pickup_display.method =
+
+##V84 Add
+features.pickup.blf_audio.list=
+features.pickup.blf_visual.list=
+
+
+#######################################################################################
+##                                Alert Info                                         ##
+#######################################################################################
+features.alert_info_tone =
+
+
+#######################################################################################
+##                       Broadsoft Visual Voice Mail                                 ##
+#######################################################################################
+bw.voice_mail.visual.enable=
+voice_mail.message_key.mode=
+bw.voice_mail.visual.display_videomail.enable=
+
+
+
+#######################################################################################
+##                              Broadsoft Call Recording                             ##
+#######################################################################################
+bw.call_recording.mode =
+
+
+#######################################################################################
+##                              Broadsoft Call Decline                               ##
+#######################################################################################
+features.call_decline.enable =
+
+
+#######################################################################################
+##                         BLF Ring Type                                             ##
+#######################################################################################
+features.blf.ring_type =
+
+
+
+#######################################################################################
+##                         Features Sync                                             ##
+#######################################################################################
+features.feature_key_sync.enable = {$yealink_feature_key_sync}
+features.forward.feature_key_sync.local_processing.enable =
+features.forward.feature_key_sync.enable =
+features.dnd.feature_key_sync.local_processing.enable =
+features.dnd.feature_key_sync.enable =
+call_waiting.mode =
+
+
+#######################################################################################
+##                           Broadsoft  UC                                           ##
+#######################################################################################
+##Only T5XW/T54S/T52S/T48G/T48S/T46G/T46S/T29G/T46U/T48U Models support the parameter
+bw.xmpp.enable =
+features.uc_password =
+features.uc_username =
+bw.xmpp.presence_icon.mode =
+bw.xmpp.change_presence.force_manual.enable =
+bw.xmpp.change_presence.enable =
+phone_setting.dsskey_directory_auto.enable =
+features.uc_dir.match_tail_number=
+directory_setting.bw_uc_buddies.enable =
+directory_setting.bw_uc_buddies.priority =
+search_in_dialing.bw_uc_buddies.enable =
+search_in_dialing.bw_uc_buddies.priority =
+
+##V83 Add
+phone_setting.uc_favorite_sequence_type =
+
+#######################################################################################
+##                      Broadsoft  Emergency Call                                    ##
+#######################################################################################
+##V83 Add
+bw.emergency_calling.enable  =
+
+
+
+#######################################################################################
+##                         Metaswitch Setting                                        ##
+#######################################################################################
+meta.enable =
+meta.login_mode =
+meta.comm_portal.server.username =
+meta.comm_portal.server.password =
+meta.comm_portal.server.url =
+meta.comm_portal.enable =
+meta.comm_portal.contacts.update_interval =
+meta.comm_portal.acd.enable=
+meta.comm_portal.replace_local_call_list.enable=
+meta.comm_portal.contacts.group.mlhgs.label=
+meta.comm_portal.contacts.group.extensions.label=
+meta.comm_portal.contacts.group.contacts.label=
+meta.comm_portal.contacts.group.mlhgs.enable=
+meta.comm_portal.contacts.group.extensions.enable=
+meta.comm_portal.contacts.group.contacts.enable=
+meta.comm_portal.call_list.enable=
+meta.comm_portal.contacts.enable=
+meta.comm_portal.message.enable=
+meta.comm_portal.logout.enable =
+meta.comm_portal.keep_alive_interval_time =
+
+##V83 Add
+directory_setting.meta_directory.enable=
+directory_setting.meta_directory.priority=
+directory_setting.meta_call_log.enable=
+directory_setting.meta_call_log.priority=
+search_in_dialing.meta_call_log.priority =
+search_in_dialing.meta_call_log.enable =
+search_in_dialing.meta_directory.priority =
+search_in_dialing.meta_directory.enable =
+
+
+
+#######################################################################################
+##                                   Genbend Setting                                 ##
+#######################################################################################
+gb.sopi.enable=
+gb.sopi.gab.enable=
+gb.sopi.pab.enable=
+features.pab.soupuser=
+features.pab.enable=
+gb.sopi.pab.match_in_calling.enable=
+gb.sopi.gab.retain_search_filter=
+gb.sopi.service_url=
+gb.sopi.password=
+gb.sopi.username=
+directory_setting.gb_gab_directory.priority =
+directory_setting.gb_gab_directory.enable =
+directory_setting.gb_pab_directory.enable =
+directory_setting.gb_pab_directory.priority =
+search_in_dialing.gb_pab_directory.priority =
+search_in_dialing.gb_pab_directory.enable =
+
+
+#######################################################################################
+##                                   Loopback Call                                   ##
+#######################################################################################
+##V83 Add
+sip.loopback.enable =
+sip.loopback_type =
+sip.pkt_loopback_mode
+sip.loopback.auto_answer.mode =
+sip.pkt_loopback_encapsulated_payload =
+sip.pkt_loopback_directed_payload =
+
+
+#######################################################################################
+##                                   V84 add                                         ##
+#######################################################################################
+google_contact_server.enable=
+
+static.features.network_test.check_policy=
+static.features.network_test.enable=
+static.features.network_test.host=
+static.features.network_test.period=
+static.features.network_unavailable_test.period=
+
+phone_setting.warnings_display.mode=
+
+bw.flexible_seating.remember_password.ldap.enable=
+
+vcaccount.enable=
+
+#######################################################################################
+##                       V84 T5XW add   VPM-Acoustic Shield                          ##
+#######################################################################################
+features.acoustic_shield.level =
+features.acoustic_shield.mode = 
+
+
+
+#######################################################################################
+##                       V84 SP4 add                                                 ##
+#######################################################################################
+
+phone_setting.search_t9.enable =
+phone_setting.mail_power_led_flash_enable =
+ldap.anonymous_bind_operation.enable =
+google_contact_server.display_mode = 
+gb.presence.line = 
+gb.presence.enable =
+gb.emergency_instant_messages.enable = 
+gb.emergency_instant_messages.displaytimeout =
+features.transfer_keep_session2_after_failed.enable=
+features.intercom.mode = 
+features.emergency_instant_messages.ring_type =
+features.dtmf.transfer =
+features.dtmf.replace_tran =
+features.call_park.performby_holdhardkey.enable =
+features.blf_extension.mode =
+features.auto_answer.ring_type =
+directory_setting.presence_list.priority =
+directory_setting.presence_list.enable =
+dialplan.transfer.mode =
+dialplan.emergency.held.secondary.server_url = 
+custom.features.dsskey_lock_type = 
+blf.enhanced.dnd.led =
+blf.enhanced.dnd.enable = 
+auto_provision.pnp_check_url.enable = 
+
+acd.logout_fixed_display.enable=
+acd.available_fixed_display.enable =
+acd.disp_code_fixed_display.enable =
+acd.trace_fixed_display.enable = 
+
+features.parked_call_monitor.blf_visual_enable=
+features.parked_call_monitor.blf_audio_enable=
+features.parked_call_monitor.blf.ring_type=
+
diff --git a/resources/templates/provision/yealink/t46u/{$mac}.cfg b/resources/templates/provision/yealink/t46u/{$mac}.cfg
new file mode 100644
index 0000000000..e5d8ce4669
--- /dev/null
+++ b/resources/templates/provision/yealink/t46u/{$mac}.cfg
@@ -0,0 +1,3382 @@
+#!version:1.0.0.1
+
+##File header "#!version:1.0.0.1" can not be edited or deleted, and must be placed in the first line.##
+##account.X.*:(T5XW/T54S/T48G/T48S/T46G/T46S/T29G/T46U/T48U: X ranges from 1 to 16. T52S/T42G/T42S/T43U: X ranges from 1 to 12. T41P/T41S/T27P/T27G/T41U: X ranges from 1 to 6. T40P/T40G/T23P/T23G: X ranges from 1 to 3. T21(P) E2: X ranges from 1 to 2.)##
+
+#######################################################################################
+##                                   Transfer                                        ##
+#######################################################################################
+account.1.phone_setting.call_appearance.transfer_via_new_linekey= {$yealink_transfer_via_new_linekey}
+
+
+#######################################################################################
+##                                   Conference                                      ##
+#######################################################################################
+account.1.phone_setting.call_appearance.conference_via_new_linekey=
+
+
+#######################################################################################
+##                                   Anonymous                                       ##
+#######################################################################################
+account.1.anonymous_call.server_base_only =
+account.1.send_anonymous_rejection_code =
+account.1.anonymous_reject_offcode =
+account.1.anonymous_reject_oncode =
+account.1.reject_anonymous_call=
+account.1.anonymous_call_offcode =
+account.1.anonymous_call_oncode =
+account.1.anonymous_call = 0
+account.1.send_anonymous_code =
+
+
+
+#######################################################################################
+##                          Call Configuration                                       ##
+#######################################################################################
+account.1.music_server_uri=
+account.1.music_on_hold_type=
+account.1.auto_label.rule=
+account.1.auto_label.enable=
+account.1.number_of_linekey=
+account.1.phone_setting.call_appearance.calls_per_linekey=
+
+
+#######################################################################################
+##                                    Codec                                          ##
+#######################################################################################
+account.1.codec.ilbc_15_2kbps.priority=
+account.1.codec.ilbc_15_2kbps.enable=
+
+account.1.codec.ilbc_13_33kbps.priority= {if isset($yealink_codec_iLBC_priority)}{$yealink_codec_iLBC_priority}{else}0{/if}
+
+account.1.codec.ilbc_13_33kbps.enable = {if isset($yealink_codec_iLBC_enable)}1{else}0{/if}
+
+account.1.codec.pcma.enable= {if isset($yealink_codec_pcma_enable)}1{else}0{/if}
+
+account.1.codec.pcma.priority= {if isset($yealink_codec_pcma_priority)}{$yealink_codec_pcma_priority}{else}0{/if}
+
+account.1.codec.pcmu.enable= {if isset($yealink_codec_pcmu_enable)}1{else}0{/if}
+
+account.1.codec.pcmu.priority= {if isset($yealink_codec_pcmu_priority)}{$yealink_codec_pcmu_priority}{else}0{/if}
+
+account.1.codec.opus.priority= {if isset($yealink_codec_opus_priority)}{$yealink_codec_opus_priority}{else}0{/if}
+
+account.1.codec.opus.enable= {if isset($yealink_codec_opus_enable)}1{else}0{/if}
+
+account.1.codec.opus.para= 106
+
+account.1.codec.g726_40.enable= {if isset($yealink_codec_g726_40_enable)}1{else}0{/if}
+
+account.1.codec.g726_40.priority= {if isset($yealink_codec_g726_40_priority)}{$yealink_codec_g726_40_priority}{else}0{/if}
+
+account.1.codec.g726_32.enable= {if isset($yealink_codec_g726_32_enable)}1{else}0{/if}
+
+account.1.codec.g726_32.priority= {if isset($yealink_codec_g726_32_priority)}{$yealink_codec_g726_32_priority}{else}0{/if}
+
+account.1.codec.g726_24.enable= {if isset($yealink_codec_g726_24_enable)}1{else}0{/if}
+
+account.1.codec.g726_24.priority= {if isset($yealink_codec_g726_24_priority)}{$yealink_codec_g726_24_priority}{else}0{/if}
+
+account.1.codec.g726_16.enable= {if isset($yealink_codec_g726_16_enable)}1{else}0{/if}
+
+account.1.codec.g726_16.priority= {if isset($yealink_codec_g726_16_priority)}{$yealink_codec_g726_16_priority}{else}0{/if}
+
+account.1.codec.g723_63.priority= {if isset($yealink_codec_g723_63_priority)}{$yealink_codec_g723_63_priority}{else}0{/if}
+
+account.1.codec.g723_63.enable= {if isset($yealink_codec_g723_63_enable)}1{else}0{/if}
+
+account.1.codec.g723_53.priority= {if isset($yealink_codec_g723_53_priority)}{$yealink_codec_g723_53_priority}{else}0{/if}
+
+account.1.codec.g723_53.enable= {if isset($yealink_codec_g723_53_enable)}1{else}0{/if}
+
+account.1.codec.g729.priority= {if isset($yealink_codec_g729_priority)}{$yealink_codec_g729_priority}{else}0{/if}
+
+account.1.codec.g729.enable= {if isset($yealink_codec_g729_enable)}1{else}0{/if}
+
+account.1.codec.g722.priority= {if isset($yealink_codec_g722_priority)}{$yealink_codec_g722_priority}{else}0{/if}
+
+account.1.codec.g722.enable= {if isset($yealink_codec_g722_enable)}1{else}0{/if}
+
+account.1.codec.G722_1_24kpbs.priority=
+account.1.codec.G722_1_24kpbs.enable=
+account.1.codec.G722_1c_24kpbs.priority=
+account.1.codec.G722_1c_24kpbs.enable=
+account.1.codec.G722_1c_32kpbs.priority=
+account.1.codec.G722_1c_32kpbs.enable=
+account.1.codec.G722_1c_48kpbs.priority=
+account.1.codec.G722_1c_48kpbs.enable=
+
+################################################################
+#                      Account Register                       ##
+################################################################
+{if isset($account.1.password) }
+account.1.enable = 1
+{else}
+account.1.enable = 0
+{/if}
+account.1.label = {$account.1.display_name}
+account.1.display_name = {$account.1.display_name}
+account.1.auth_name = {$account.1.auth_id}
+
+{if isset($account.1.server.1.address)}
+account.1.user_name = {$account.1.user_id}@{$account.1.server_address}
+{else}
+account.1.user_name = {$account.1.user_id}
+{/if}
+
+account.1.password = {$account.1.password}
+account.1.sip_server.1.address= {$account.1.server_address}
+account.1.sip_server_port = {$account.1.sip_port}
+
+
+#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
+{if $account.1.sip_transport == 'udp'}account.1.sip_server.1.transport_type = 0{/if}
+{if $account.1.sip_transport == 'tcp'}account.1.sip_server.1.transport_type = 1{/if}
+{if $account.1.sip_transport == 'tls'}account.1.sip_server.1.transport_type = 2{/if}
+{if $account.1.sip_transport == 'dns srv'}account.1.sip_server.1.transport_type = 3{/if}
+
+account.1.sip_server.1.expires=  {$account.1.register_expires}
+account.1.sip_server.1.retry_counts= 3
+
+account.1.sip_server.2.address= {$account.1.server.2.address}
+account.1.sip_server.2.port= {$account.1.sip_port}
+
+#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS-NAPTR;
+{if $account.1.sip_transport == 'udp'}account.1.sip_server.2.transport_type = 0{/if}
+{if $account.1.sip_transport == 'tcp'}account.1.sip_server.2.transport_type = 1{/if}
+{if $account.1.sip_transport == 'tls'}account.1.sip_server.2.transport_type = 2{/if}
+{if $account.1.sip_transport == 'dns srv'}account.1.sip_server.2.transport_type = 3{/if}
+
+account.1.sip_server.2.expires= {$account.1.register_expires}
+account.1.sip_server.2.retry_counts= 3
+
+account.1.outbound_proxy_enable = {if isset($account.1.outbound_proxy_primary)}1{else}0{/if}
+
+account.1.outbound_proxy.1.address = {$account.1.outbound_proxy_primary}
+account.1.outbound_proxy.2.address = {$account.1.outbound_proxy_secondary}
+
+{if isset($outbound_proxy_1_port)}
+account.1.outbound_proxy.1.port = {$outbound_proxy_1_port}
+{else}
+account.1.outbound_proxy.1.port = {$account.1.sip_port}
+{/if}
+
+account.1.outbound_proxy.2.address= {$account.1.outbound_proxy_secondary}
+
+{if isset($outbound_proxy_1_port)}
+account.1.outbound_proxy.2.port = {$outbound_proxy_2_port}
+{else}
+account.1.outbound_proxy.2.port = {$account.1.sip_port}
+{/if}
+
+account.1.outbound_proxy_fallback_interval= {$yealink_outbound_proxy_fallback_interval}
+
+account.1.nat.nat_traversal= {if isset($stun_server)}1{else}0{/if}
+
+
+
+################################################################
+#                      Account Basic                          ##
+################################################################
+account.1.auto_answer=
+
+################################################################
+#                      Account Advanced                       ##
+################################################################
+account.1.nat.udp_update_enable=
+account.1.nat.udp_update_time=
+account.1.nat.rport= {$yealink_rport}
+
+account.1.dtmf.type= {$yealink_dtmf_type}
+account.1.dtmf.info_type=
+account.1.dtmf.dtmf_payload=
+account.1.100rel_enable=
+
+account.1.subscribe_register=
+account.1.cid_source= {$yealink_cid_source}
+account.1.enable_user_equal_phone=
+account.1.srtp_encryption= {$yealink_srtp_encryption}
+account.1.ptime=
+account.1.register_line=
+account.1.register_mac=
+account.1.reg_fail_retry_interval=
+account.1.unregister_on_reboot=
+
+account.1.session_timer.refresher=
+account.1.session_timer.expires=
+account.1.session_timer.enable= {$yealink_session_timer}
+
+account.1.conf_type = {if $nway_conference == true}2{/if}
+account.1.sip_server_type=
+
+##V83 Add
+account.1.srtp.unencrypted_rtcp.enable =
+account.1.srtp.unencrypted_rtp.enable =
+account.1.sip_server_mode =
+
+
+
+################################################################
+#                        SIP Backup Server                    ##
+################################################################
+account.1.outbound_proxy.1.register_on_enable=
+account.1.outbound_proxy.1.failback_timeout=
+account.1.outbound_proxy.1.failback_mode=
+account.1.outbound_proxy.1.retry_counts=
+account.1.outbound_proxy.1.only_signal_with_registered=
+account.1.outbound_proxy.1.failback_subscribe.enable=
+account.1.outbound_proxy.1.invite_retry_counts=
+
+account.1.sip_server.1.register_on_enable=
+account.1.sip_server.1.failback_timeout=
+account.1.sip_server.1.failback_mode=
+account.1.sip_server.1.failback_subscribe.enable=
+account.1.sip_server.1.only_signal_with_registered=
+account.1.sip_server.1.invite_retry_counts=
+
+account.1.outbound_proxy.2.register_on_enable=
+account.1.outbound_proxy.2.failback_timeout=
+account.1.outbound_proxy.2.failback_mode=
+account.1.outbound_proxy.2.retry_counts=
+account.1.outbound_proxy.2.only_signal_with_registered=
+account.1.outbound_proxy.2.failback_subscribe.enable=
+account.1.outbound_proxy.2.invite_retry_counts=
+
+account.1.sip_server.2.register_on_enable=
+account.1.sip_server.2.failback_timeout=
+account.1.sip_server.2.failback_mode=
+account.1.sip_server.2.failback_subscribe.enable=
+account.1.sip_server.2.only_signal_with_registered=
+account.1.sip_server.2.invite_retry_counts=
+
+account.1.static_cache_pri=
+account.1.dns_cache_type=
+account.1.naptr_build=
+account.1.fallback.timeout=
+account.1.fallback.redundancy_type=
+account.1.reg_failed_retry_max_time=
+account.1.reg_failed_retry_min_time=
+account.1.redundancy_with_reg_fail.enable =
+
+##V83 Add
+account.1.sip_server.1.outbound_proxy_enable =
+account.1.sip_server.2.outbound_proxy_enable =
+
+################################################################
+#                        SIP Basic config                     ##
+################################################################
+account.1.contact_take_line_param=
+account.1.update_ack_while_dialing=
+account.1.srtp_lifetime=
+account.1.third_part_request_with_route.enable=
+account.1.insert_outbound_in_route.enable=
+account.1.path.enable=
+account.1.sub_fail_retry_interval=
+account.1.transfer_refer_to_contact_header.enable=
+account.1.hold_use_inactive=
+account.1.gruu.enable=
+account.1.dial_tone=
+account.1.call_id_mode=
+account.1.subscribe_expires_overlap=
+account.1.register_expires_overlap=
+account.1.call_info=
+account.1.custom_ua=
+account.1.mwi_parse_terminated=
+account.1.check_cseq.enable=
+account.1.check_to_tag.enable=
+account.1.vq_rtcpxr.collector_server_port=
+account.1.vq_rtcpxr.collector_server_host=
+account.1.vq_rtcpxr.collector_name=
+account.1.compact_header_enable=
+account.1.cp_source= 2
+account.1.cid_source_ppi= 1
+account.1.cid_source_privacy= 1
+account.1.reg_with_pani_header.enable =
+account.1.alert_info=
+account.1.picture_info_enable= 1
+
+##V83 Add
+account.1.invite_with_pani_header.enable = 
+
+##V84 Add
+account.1.invite_with_rpid_header.enable=
+
+account.1.auto_answer_mute_enable
+
+##V84 SP4 Add
+account.1.share_line.enable_private_code =
+account.1.share_line.cancel_private_code =
+
+#######################################################################################
+##                                 History                                           ##
+#######################################################################################
+account.1.missed_calllog=
+
+
+#######################################################################################
+##                                  Forward                                          ##
+#######################################################################################
+account.1.timeout_fwd.off_code=
+account.1.timeout_fwd.on_code=
+account.1.timeout_fwd.timeout=
+account.1.timeout_fwd.target=
+account.1.timeout_fwd.enable=
+account.1.busy_fwd.off_code=
+account.1.busy_fwd.on_code=
+account.1.busy_fwd.target=
+account.1.busy_fwd.enable=
+account.1.always_fwd.off_code=
+account.1.always_fwd.on_code=
+account.1.always_fwd.target=
+account.1.always_fwd.enable=
+
+
+#######################################################################################
+##                                  DND                                              ##
+#######################################################################################
+account.1.dnd.enable=
+account.1.dnd.off_code=
+account.1.dnd.on_code=
+
+
+
+#######################################################################################
+##                               Voice Mail                                          ##
+#######################################################################################
+voice_mail.number.1= {$voicemail_number}
+account.1.subscribe_mwi= 1
+account.1.subscribe_mwi_to_vm= {$yealink_subscribe_mwi_to_vm}
+account.1.subscribe_mwi_expires= 3600
+account.1.display_mwi.enable=
+
+#######################################################################################
+##                               Auto Dial                                           ##
+#######################################################################################
+account.1.auto_dial_enable=
+account.1.auto_dial_num=
+
+
+#######################################################################################
+##                           Preference&Status                                       ##
+#######################################################################################
+account.1.ringtone.ring_type=
+
+#######################################################################################
+##                           Digitmap                                                ##
+#######################################################################################
+account.1.dialplan.digitmap.enable=
+account.1.dialplan.digitmap.string=
+account.1.dialplan.digitmap.no_match_action=
+account.1.dialplan.digitmap.interdigit_short_timer=
+account.1.dialplan.digitmap.interdigit_long_timer=
+account.1.dialplan.digitmap.apply_to.press_send=
+account.1.dialplan.digitmap.apply_to.forward=
+account.1.dialplan.digitmap.apply_to.history_dial=
+account.1.dialplan.digitmap.apply_to.directory_dial=
+account.1.dialplan.digitmap.apply_to.on_hook_dial=
+account.1.dialplan.digitmap.active.on_hook_dialing=
+
+
+#######################################################################################
+##                                 Rings Settings                                    ##
+#######################################################################################
+account.1.alert_info_url_enable=
+
+
+#######################################################################################
+##                                  BLF/BLF List                                     ##
+#######################################################################################
+account.1.blf.blf_list_uri=
+account.1.blf_list_barge_in_code=
+account.1.blf_list_code=
+account.1.blf_list_retrieve_call_parked_code=
+account.1.blf.subscribe_period=
+account.1.blf.match_host.enable=
+account.1.out_dialog_blf_enable=
+account.1.blf.subscribe_event=
+
+##V84 Add
+account.1.blf_list_call_parked_code=
+account.1.blf_list_call_parked_list=
+
+##V84 SP4 ADD
+account.1.blf_list_whisper_code=
+account.1.blf_list_listen_in_code=
+
+
+#######################################################################################
+##                                   SCA                                             ##
+#######################################################################################
+account.1.shared_line=
+account.1.line_seize.expires=
+account.1.shared_line_one_touch_bargein.enable=
+account.1.shared_line_one_touch_retrieve.enable=
+account.1.sca_manage_interface_display_time=
+account.1.shared_line_callpull_code=
+
+##V83 Add
+account.x.share_line.barge_in.enable
+
+#######################################################################################
+##                                   BLA                                             ##
+#######################################################################################
+account.1.bla_number=
+account.1.bla_subscribe_period=
+account.1.bla.notify_with_expire.enable=
+account.1.bla.subscribe_uri_build_type=
+
+#######################################################################################
+##                                   Call Park                                       ##
+#######################################################################################
+account.1.callpark_enable=
+
+
+#######################################################################################
+##                                    Broadsoft ACD                                  ##
+#######################################################################################
+account.1.acd.enable= 0
+account.1.acd.available= 0
+account.1.acd.unavailable_reason_enable= 0
+account.1.acd.initial_state= 1
+account.1.subscribe_acd_expires=
+
+
+#######################################################################################
+##                                 Broadsoft ACD Call Center                         ##
+#######################################################################################
+##account.X.reason_code.Y=
+##account.X.reason_code_name.Y=
+##account.X.bw_disp_code.Y=
+##account.X.bw_disp_code_name.Y=
+##account.X.supervisor_info_code.Y=
+##account.X.supervisor_info_code_name.Y=
+##The value Y must be continuous.
+
+account.1.reason_code.1=
+account.1.reason_code_name.1= 0
+account.1.bw_disp_code.1=
+account.1.bw_disp_code_name.1=
+account.1.supervisor_info_code.1=
+account.1.supervisor_info_code_name.1=
+
+#######################################################################################
+##                                 Broadsoft Call Center                             ##
+#######################################################################################
+account.1.call_center.call_info_enable= 0
+account.1.call_center.show_call_info_time= 30
+account.1.call_center.disp_code_enable= 0
+account.1.call_center.trace_enable= 0
+account.1.call_center.emergency_enable= 0
+account.1.call_center.queue_status_enable= 0
+account.1.call_center.queue_status_light_enable = 0
+
+
+
+#######################################################################################
+##                         Broadsoft Hoteling                                        ##
+#######################################################################################
+account.1.hoteling.enable= 0
+account.1.hoteling.user_id= 0
+account.1.hoteling.password= 0
+account.1.hoteling.expires= 0
+account.1.hoteling.auto_login_enable= 0
+
+
+#######################################################################################
+##                              Broadsoft XSI                                        ##
+#######################################################################################
+account.1.xsi.user =
+account.1.xsi.password =
+account.1.xsi.host =
+account.1.xsi.server_type =
+account.1.xsi.port =
+
+
+#######################################################################################
+##                                Call Pickup                                        ##
+#######################################################################################
+account.1.direct_pickup_code =
+account.1.group_pickup_code =
+account.1.dialoginfo_callpickup = 0
+account.1.refresh_remote_id.enable =
+
+
+#######################################################################################
+##                              Broadsoft Call Recording                             ##
+#######################################################################################
+account.1.call_recording.enable=
+
+#######################################################################################
+##                                Network Conference                                  ##
+#######################################################################################
+account.1.conf_uri = {if $nway_conference == true}nway{$account.1.auth_id}@{$account.1.server_address}{/if}
+
+
+#######################################################################################
+##                              Broadsoft Call Decline                               ##
+#######################################################################################
+account.1.features.call_decline.enable =
+
+
+#######################################################################################
+##                       Broadsoft Security Classification                           ##
+#######################################################################################
+account.1.security_classification.enable =
+
+
+
+#######################################################################################
+##                        Broadsoft Flexible Seating                                 ##
+#######################################################################################
+account.1.flexible_seating.enable=
+account.1.hoteling.pin=
+account.1.hoteling.mode=
+
+#######################################################################################
+##                         Features Sync                                             ##
+#######################################################################################
+account.1.features.forward.feature_key_sync.local_processing.enable=
+account.1.features.dnd.feature_key_sync.local_processing.enable =
+
+##V84 Add
+account.1.dnd.feature_key_sync.enable=
+account.1.feature_key_sync.enable=
+account.1.forward.feature_key_sync.enable=
+
+#######################################################################################
+##                                   ACD                                             ##
+#######################################################################################
+account.1.acd.available_url=
+account.1.acd.away_url =
+account.1.acd.refresh_url =
+account.1.acd.call_information=
+
+
+
+#######################################################################################
+##                                  virtual_user                                     ##
+#######################################################################################
+##V84 Add
+bw.virtual_user.1.enable=
+bw.virtual_user.1.label=
+bw.virtual_user.1.xsi.dnd.enable=
+bw.virtual_user.1.xsi.host=
+bw.virtual_user.1.xsi.password=
+bw.virtual_user.1.xsi.port=
+bw.virtual_user.1.xsi.server_type=
+bw.virtual_user.1.xsi.user=
+
+#######################################################################################
+##                                   Transfer                                        ##
+#######################################################################################
+account.2.phone_setting.call_appearance.transfer_via_new_linekey= {$yealink_transfer_via_new_linekey}
+
+
+#######################################################################################
+##                                   Conference                                      ##
+#######################################################################################
+account.2.phone_setting.call_appearance.conference_via_new_linekey=
+
+
+#######################################################################################
+##                                   Anonymous                                       ##
+#######################################################################################
+account.2.anonymous_call.server_base_only =
+account.2.send_anonymous_rejection_code =
+account.2.anonymous_reject_offcode =
+account.2.anonymous_reject_oncode =
+account.2.reject_anonymous_call=
+account.2.anonymous_call_offcode =
+account.2.anonymous_call_oncode =
+account.2.anonymous_call = 0
+account.2.send_anonymous_code =
+
+
+
+#######################################################################################
+##                          Call Configuration                                       ##
+#######################################################################################
+account.2.music_server_uri=
+account.2.music_on_hold_type=
+account.2.auto_label.rule=
+account.2.auto_label.enable=
+account.2.number_of_linekey=
+account.2.phone_setting.call_appearance.calls_per_linekey=
+
+
+#######################################################################################
+##                                    Codec                                          ##
+#######################################################################################
+account.2.codec.ilbc_15_2kbps.priority=
+account.2.codec.ilbc_15_2kbps.enable=
+
+account.2.codec.ilbc_13_33kbps.priority= {if isset($yealink_codec_iLBC_priority)}{$yealink_codec_iLBC_priority}{else}0{/if}
+
+account.2.codec.ilbc_13_33kbps.enable = {if isset($yealink_codec_iLBC_enable)}1{else}0{/if}
+
+account.2.codec.pcma.enable= {if isset($yealink_codec_pcma_enable)}1{else}0{/if}
+
+account.2.codec.pcma.priority= {if isset($yealink_codec_pcma_priority)}{$yealink_codec_pcma_priority}{else}0{/if}
+
+account.2.codec.pcmu.enable= {if isset($yealink_codec_pcmu_enable)}1{else}0{/if}
+
+account.2.codec.pcmu.priority= {if isset($yealink_codec_pcmu_priority)}{$yealink_codec_pcmu_priority}{else}0{/if}
+
+account.2.codec.opus.priority= {if isset($yealink_codec_opus_priority)}{$yealink_codec_opus_priority}{else}0{/if}
+
+account.2.codec.opus.enable= {if isset($yealink_codec_opus_enable)}1{else}0{/if}
+
+account.2.codec.opus.para= 106
+
+account.2.codec.g726_40.enable= {if isset($yealink_codec_g726_40_enable)}1{else}0{/if}
+
+account.2.codec.g726_40.priority= {if isset($yealink_codec_g726_40_priority)}{$yealink_codec_g726_40_priority}{else}0{/if}
+
+account.2.codec.g726_32.enable= {if isset($yealink_codec_g726_32_enable)}1{else}0{/if}
+
+account.2.codec.g726_32.priority= {if isset($yealink_codec_g726_32_priority)}{$yealink_codec_g726_32_priority}{else}0{/if}
+
+account.2.codec.g726_24.enable= {if isset($yealink_codec_g726_24_enable)}1{else}0{/if}
+
+account.2.codec.g726_24.priority= {if isset($yealink_codec_g726_24_priority)}{$yealink_codec_g726_24_priority}{else}0{/if}
+
+account.2.codec.g726_16.enable= {if isset($yealink_codec_g726_16_enable)}1{else}0{/if}
+
+account.2.codec.g726_16.priority= {if isset($yealink_codec_g726_16_priority)}{$yealink_codec_g726_16_priority}{else}0{/if}
+
+account.2.codec.g723_63.priority= {if isset($yealink_codec_g723_63_priority)}{$yealink_codec_g723_63_priority}{else}0{/if}
+
+account.2.codec.g723_63.enable= {if isset($yealink_codec_g723_63_enable)}1{else}0{/if}
+
+account.2.codec.g723_53.priority= {if isset($yealink_codec_g723_53_priority)}{$yealink_codec_g723_53_priority}{else}0{/if}
+
+account.2.codec.g723_53.enable= {if isset($yealink_codec_g723_53_enable)}1{else}0{/if}
+
+account.2.codec.g729.priority= {if isset($yealink_codec_g729_priority)}{$yealink_codec_g729_priority}{else}0{/if}
+
+account.2.codec.g729.enable= {if isset($yealink_codec_g729_enable)}1{else}0{/if}
+
+account.2.codec.g722.priority= {if isset($yealink_codec_g722_priority)}{$yealink_codec_g722_priority}{else}0{/if}
+
+account.2.codec.g722.enable= {if isset($yealink_codec_g722_enable)}1{else}0{/if}
+
+account.2.codec.G722_1_24kpbs.priority=
+account.2.codec.G722_1_24kpbs.enable=
+account.2.codec.G722_1c_24kpbs.priority=
+account.2.codec.G722_1c_24kpbs.enable=
+account.2.codec.G722_1c_32kpbs.priority=
+account.2.codec.G722_1c_32kpbs.enable=
+account.2.codec.G722_1c_48kpbs.priority=
+account.2.codec.G722_1c_48kpbs.enable=
+
+################################################################
+#                      Account2 Register                       ##
+################################################################
+{if isset($account.2.password) }
+account.2.enable = 1
+{else}
+account.2.enable = 0
+{/if}
+account.2.label = {$account.2.display_name}
+account.2.display_name = {$account.2.display_name}
+account.2.auth_name = {$account.2.auth_id}
+
+{if isset($account.2.server.1.address)}
+account.2.user_name = {$account.2.user_id}@{$account.2.server_address}
+{else}
+account.2.user_name = {$account.2.user_id}
+{/if}
+
+account.2.password = {$account.2.password}
+account.2.sip_server.1.address= {$account.2.server_address}
+account.2.sip_server_port = {$account.2.sip_port}
+
+
+#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
+{if $account.2.sip_transport == 'udp'}account.2.sip_server.1.transport_type = 0{/if}
+{if $account.2.sip_transport == 'tcp'}account.2.sip_server.1.transport_type = 1{/if}
+{if $account.2.sip_transport == 'tls'}account.2.sip_server.1.transport_type = 2{/if}
+{if $account.2.sip_transport == 'dns srv'}account.2.sip_server.1.transport_type = 3{/if}
+
+account.2.sip_server.1.expires=  {$account.2.register_expires}
+account.2.sip_server.1.retry_counts= 3
+
+account.2.sip_server.2.address= {$account.2.server.2.address}
+account.2.sip_server.2.port= {$account.2.sip_port}
+
+#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS-NAPTR;
+{if $account.2.sip_transport == 'udp'}account.2.sip_server.2.transport_type = 0{/if}
+{if $account.2.sip_transport == 'tcp'}account.2.sip_server.2.transport_type = 1{/if}
+{if $account.2.sip_transport == 'tls'}account.2.sip_server.2.transport_type = 2{/if}
+{if $account.2.sip_transport == 'dns srv'}account.2.sip_server.2.transport_type = 3{/if}
+
+account.2.sip_server.2.expires= {$account.2.register_expires}
+account.2.sip_server.2.retry_counts= 3
+
+account.2.outbound_proxy_enable = {if isset($account.2.outbound_proxy_primary)}1{else}0{/if}
+
+account.2.outbound_proxy.1.address = {$account.2.outbound_proxy_primary}
+account.2.outbound_proxy.2.address = {$account.2.outbound_proxy_secondary}
+
+{if isset($outbound_proxy_1_port)}
+account.2.outbound_proxy.1.port = {$outbound_proxy_1_port}
+{else}
+account.2.outbound_proxy.1.port = {$account.2.sip_port}
+{/if}
+
+account.2.outbound_proxy.2.address= {$account.2.outbound_proxy_secondary}
+
+{if isset($outbound_proxy_1_port)}
+account.2.outbound_proxy.2.port = {$outbound_proxy_2_port}
+{else}
+account.2.outbound_proxy.2.port = {$account.2.sip_port}
+{/if}
+
+account.2.outbound_proxy_fallback_interval= {$yealink_outbound_proxy_fallback_interval}
+
+account.2.nat.nat_traversal= {if isset($stun_server)}1{else}0{/if}
+
+
+
+################################################################
+#                      Account Basic                          ##
+################################################################
+account.2.auto_answer=
+
+################################################################
+#                      Account Advanced                       ##
+################################################################
+account.2.nat.udp_update_enable=
+account.2.nat.udp_update_time=
+account.2.nat.rport=  {$yealink_rport}
+
+account.2.dtmf.type= {$yealink_dtmf_type}
+account.2.dtmf.info_type=
+account.2.dtmf.dtmf_payload=
+account.2.100rel_enable=
+
+account.2.subscribe_register=
+account.2.cid_source= {$yealink_cid_source}
+account.2.enable_user_equal_phone=
+account.2.srtp_encryption= {$yealink_srtp_encryption}
+account.2.ptime=
+account.2.register_line=
+account.2.register_mac=
+account.2.reg_fail_retry_interval=
+account.2.unregister_on_reboot=
+
+account.2.session_timer.refresher=
+account.2.session_timer.expires=
+account.2.session_timer.enable= {$yealink_session_timer}
+
+account.2.conf_type = {if $nway_conference == true}2{/if}
+account.2.sip_server_type=
+
+##V83 Add
+account.2.srtp.unencrypted_rtcp.enable =
+account.2.srtp.unencrypted_rtp.enable =
+account.2.sip_server_mode =
+
+
+
+################################################################
+#                        SIP Backup Server                    ##
+################################################################
+account.2.outbound_proxy.1.register_on_enable=
+account.2.outbound_proxy.1.failback_timeout=
+account.2.outbound_proxy.1.failback_mode=
+account.2.outbound_proxy.1.retry_counts=
+account.2.outbound_proxy.1.only_signal_with_registered=
+account.2.outbound_proxy.1.failback_subscribe.enable=
+account.2.outbound_proxy.1.invite_retry_counts=
+
+account.2.sip_server.1.register_on_enable=
+account.2.sip_server.1.failback_timeout=
+account.2.sip_server.1.failback_mode=
+account.2.sip_server.1.failback_subscribe.enable=
+account.2.sip_server.1.only_signal_with_registered=
+account.2.sip_server.1.invite_retry_counts=
+
+account.2.outbound_proxy.2.register_on_enable=
+account.2.outbound_proxy.2.failback_timeout=
+account.2.outbound_proxy.2.failback_mode=
+account.2.outbound_proxy.2.retry_counts=
+account.2.outbound_proxy.2.only_signal_with_registered=
+account.2.outbound_proxy.2.failback_subscribe.enable=
+account.2.outbound_proxy.2.invite_retry_counts=
+
+account.2.sip_server.2.register_on_enable=
+account.2.sip_server.2.failback_timeout=
+account.2.sip_server.2.failback_mode=
+account.2.sip_server.2.failback_subscribe.enable=
+account.2.sip_server.2.only_signal_with_registered=
+account.2.sip_server.2.invite_retry_counts=
+
+account.2.static_cache_pri=
+account.2.dns_cache_type=
+account.2.naptr_build=
+account.2.fallback.timeout=
+account.2.fallback.redundancy_type=
+account.2.reg_failed_retry_max_time=
+account.2.reg_failed_retry_min_time=
+account.2.redundancy_with_reg_fail.enable =
+
+##V83 Add
+account.2.sip_server.1.outbound_proxy_enable =
+account.2.sip_server.2.outbound_proxy_enable =
+
+################################################################
+#                        SIP Basic config                     ##
+################################################################
+account.2.contact_take_line_param=
+account.2.update_ack_while_dialing=
+account.2.srtp_lifetime=
+account.2.third_part_request_with_route.enable=
+account.2.insert_outbound_in_route.enable=
+account.2.path.enable=
+account.2.sub_fail_retry_interval=
+account.2.transfer_refer_to_contact_header.enable=
+account.2.hold_use_inactive=
+account.2.gruu.enable=
+account.2.dial_tone=
+account.2.call_id_mode=
+account.2.subscribe_expires_overlap=
+account.2.register_expires_overlap=
+account.2.call_info=
+account.2.custom_ua=
+account.2.mwi_parse_terminated=
+account.2.check_cseq.enable=
+account.2.check_to_tag.enable=
+account.2.vq_rtcpxr.collector_server_port=
+account.2.vq_rtcpxr.collector_server_host=
+account.2.vq_rtcpxr.collector_name=
+account.2.compact_header_enable=
+account.2.cp_source= 2
+account.2.cid_source_ppi= 1
+account.2.cid_source_privacy= 1
+account.2.reg_with_pani_header.enable =
+account.2.alert_info=
+account.2.picture_info_enable= 1
+
+##V83 Add
+account.2.invite_with_pani_header.enable = 
+
+##V84 Add
+account.2.invite_with_rpid_header.enable=
+
+account.2.auto_answer_mute_enable
+
+##V84 SP4 Add
+account.2.share_line.enable_private_code =
+account.2.share_line.cancel_private_code =
+
+#######################################################################################
+##                                 History                                           ##
+#######################################################################################
+account.2.missed_calllog=
+
+
+#######################################################################################
+##                                  Forward                                          ##
+#######################################################################################
+account.2.timeout_fwd.off_code=
+account.2.timeout_fwd.on_code=
+account.2.timeout_fwd.timeout=
+account.2.timeout_fwd.target=
+account.2.timeout_fwd.enable=
+account.2.busy_fwd.off_code=
+account.2.busy_fwd.on_code=
+account.2.busy_fwd.target=
+account.2.busy_fwd.enable=
+account.2.always_fwd.off_code=
+account.2.always_fwd.on_code=
+account.2.always_fwd.target=
+account.2.always_fwd.enable=
+
+
+#######################################################################################
+##                                  DND                                              ##
+#######################################################################################
+account.2.dnd.enable=
+account.2.dnd.off_code=
+account.2.dnd.on_code=
+
+
+
+#######################################################################################
+##                               Voice Mail                                          ##
+#######################################################################################
+voice_mail.number.1= {$voicemail_number}
+account.2.subscribe_mwi= 1
+account.2.subscribe_mwi_to_vm= {$yealink_subscribe_mwi_to_vm}
+account.2.subscribe_mwi_expires= 3600
+account.2.display_mwi.enable=
+
+#######################################################################################
+##                               Auto Dial                                           ##
+#######################################################################################
+account.2.auto_dial_enable=
+account.2.auto_dial_num=
+
+
+#######################################################################################
+##                           Preference&Status                                       ##
+#######################################################################################
+account.2.ringtone.ring_type=
+
+#######################################################################################
+##                           Digitmap                                                ##
+#######################################################################################
+account.2.dialplan.digitmap.enable=
+account.2.dialplan.digitmap.string=
+account.2.dialplan.digitmap.no_match_action=
+account.2.dialplan.digitmap.interdigit_short_timer=
+account.2.dialplan.digitmap.interdigit_long_timer=
+account.2.dialplan.digitmap.apply_to.press_send=
+account.2.dialplan.digitmap.apply_to.forward=
+account.2.dialplan.digitmap.apply_to.history_dial=
+account.2.dialplan.digitmap.apply_to.directory_dial=
+account.2.dialplan.digitmap.apply_to.on_hook_dial=
+account.2.dialplan.digitmap.active.on_hook_dialing=
+
+
+#######################################################################################
+##                                 Rings Settings                                    ##
+#######################################################################################
+account.2.alert_info_url_enable=
+
+
+#######################################################################################
+##                                  BLF/BLF List                                     ##
+#######################################################################################
+account.2.blf.blf_list_uri=
+account.2.blf_list_barge_in_code=
+account.2.blf_list_code=
+account.2.blf_list_retrieve_call_parked_code=
+account.2.blf.subscribe_period=
+account.2.blf.match_host.enable=
+account.2.out_dialog_blf_enable=
+account.2.blf.subscribe_event=
+
+##V84 Add
+account.2.blf_list_call_parked_code=
+account.2.blf_list_call_parked_list=
+
+##V84 SP4 ADD
+account.2.blf_list_whisper_code=
+account.2.blf_list_listen_in_code=
+
+
+#######################################################################################
+##                                   SCA                                             ##
+#######################################################################################
+account.2.shared_line=
+account.2.line_seize.expires=
+account.2.shared_line_one_touch_bargein.enable=
+account.2.shared_line_one_touch_retrieve.enable=
+account.2.sca_manage_interface_display_time=
+account.2.shared_line_callpull_code=
+
+##V83 Add
+account.x.share_line.barge_in.enable
+
+#######################################################################################
+##                                   BLA                                             ##
+#######################################################################################
+account.2.bla_number=
+account.2.bla_subscribe_period=
+account.2.bla.notify_with_expire.enable=
+account.2.bla.subscribe_uri_build_type=
+
+#######################################################################################
+##                                   Call Park                                       ##
+#######################################################################################
+account.2.callpark_enable=
+
+
+#######################################################################################
+##                                    Broadsoft ACD                                  ##
+#######################################################################################
+account.2.acd.enable= 0
+account.2.acd.available= 0
+account.2.acd.unavailable_reason_enable= 0
+account.2.acd.initial_state= 1
+account.2.subscribe_acd_expires=
+
+
+#######################################################################################
+##                                 Broadsoft ACD Call Center                         ##
+#######################################################################################
+##account.X.reason_code.Y=
+##account.X.reason_code_name.Y=
+##account.X.bw_disp_code.Y=
+##account.X.bw_disp_code_name.Y=
+##account.X.supervisor_info_code.Y=
+##account.X.supervisor_info_code_name.Y=
+##The value Y must be continuous.
+
+account.2.reason_code.1=
+account.2.reason_code_name.1= 0
+account.2.bw_disp_code.1=
+account.2.bw_disp_code_name.1=
+account.2.supervisor_info_code.1=
+account.2.supervisor_info_code_name.1=
+
+#######################################################################################
+##                                 Broadsoft Call Center                             ##
+#######################################################################################
+account.2.call_center.call_info_enable= 0
+account.2.call_center.show_call_info_time= 30
+account.2.call_center.disp_code_enable= 0
+account.2.call_center.trace_enable= 0
+account.2.call_center.emergency_enable= 0
+account.2.call_center.queue_status_enable= 0
+account.2.call_center.queue_status_light_enable = 0
+
+
+
+#######################################################################################
+##                         Broadsoft Hoteling                                        ##
+#######################################################################################
+account.2.hoteling.enable= 0
+account.2.hoteling.user_id= 0
+account.2.hoteling.password= 0
+account.2.hoteling.expires= 0
+account.2.hoteling.auto_login_enable= 0
+
+
+#######################################################################################
+##                              Broadsoft XSI                                        ##
+#######################################################################################
+account.2.xsi.user =
+account.2.xsi.password =
+account.2.xsi.host =
+account.2.xsi.server_type =
+account.2.xsi.port =
+
+
+#######################################################################################
+##                                Call Pickup                                        ##
+#######################################################################################
+account.2.direct_pickup_code =
+account.2.group_pickup_code =
+account.2.dialoginfo_callpickup = 0
+account.2.refresh_remote_id.enable =
+
+
+#######################################################################################
+##                              Broadsoft Call Recording                             ##
+#######################################################################################
+account.2.call_recording.enable=
+
+#######################################################################################
+##                                Network Conference                                  ##
+#######################################################################################
+account.2.conf_uri = {if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}
+
+
+#######################################################################################
+##                              Broadsoft Call Decline                               ##
+#######################################################################################
+account.2.features.call_decline.enable =
+
+
+#######################################################################################
+##                       Broadsoft Security Classification                           ##
+#######################################################################################
+account.2.security_classification.enable =
+
+
+
+#######################################################################################
+##                        Broadsoft Flexible Seating                                 ##
+#######################################################################################
+account.2.flexible_seating.enable=
+account.2.hoteling.pin=
+account.2.hoteling.mode=
+
+#######################################################################################
+##                         Features Sync                                             ##
+#######################################################################################
+account.2.features.forward.feature_key_sync.local_processing.enable=
+account.2.features.dnd.feature_key_sync.local_processing.enable =
+
+##V84 Add
+account.2.dnd.feature_key_sync.enable=
+account.2.feature_key_sync.enable=
+account.2.forward.feature_key_sync.enable=
+
+#######################################################################################
+##                                   ACD                                             ##
+#######################################################################################
+account.2.acd.available_url=
+account.2.acd.away_url =
+account.2.acd.refresh_url =
+account.2.acd.call_information=
+
+
+
+#######################################################################################
+##                                  virtual_user                                     ##
+#######################################################################################
+##V84 Add
+#bw.virtual_user.1.enable=
+#bw.virtual_user.1.label=
+#bw.virtual_user.1.xsi.dnd.enable=
+#bw.virtual_user.1.xsi.host=
+#bw.virtual_user.1.xsi.password=
+#bw.virtual_user.1.xsi.port=
+#bw.virtual_user.1.xsi.server_type=
+#bw.virtual_user.1.xsi.user=
+
+#######################################################################################
+##                                   Transfer                                        ##
+#######################################################################################
+account.3.phone_setting.call_appearance.transfer_via_new_linekey= {$yealink_transfer_via_new_linekey}
+
+
+#######################################################################################
+##                                   Conference                                      ##
+#######################################################################################
+account.3.phone_setting.call_appearance.conference_via_new_linekey=
+
+
+#######################################################################################
+##                                   Anonymous                                       ##
+#######################################################################################
+account.3.anonymous_call.server_base_only =
+account.3.send_anonymous_rejection_code =
+account.3.anonymous_reject_offcode =
+account.3.anonymous_reject_oncode =
+account.3.reject_anonymous_call=
+account.3.anonymous_call_offcode =
+account.3.anonymous_call_oncode =
+account.3.anonymous_call = 0
+account.3.send_anonymous_code =
+
+
+
+#######################################################################################
+##                          Call Configuration                                       ##
+#######################################################################################
+account.3.music_server_uri=
+account.3.music_on_hold_type=
+account.3.auto_label.rule=
+account.3.auto_label.enable=
+account.3.number_of_linekey=
+account.3.phone_setting.call_appearance.calls_per_linekey=
+
+
+#######################################################################################
+##                                    Codec                                          ##
+#######################################################################################
+account.3.codec.ilbc_15_2kbps.priority=
+account.3.codec.ilbc_15_2kbps.enable=
+
+account.3.codec.ilbc_13_33kbps.priority= {if isset($yealink_codec_iLBC_priority)}{$yealink_codec_iLBC_priority}{else}0{/if}
+
+account.3.codec.ilbc_13_33kbps.enable = {if isset($yealink_codec_iLBC_enable)}1{else}0{/if}
+
+account.3.codec.pcma.enable= {if isset($yealink_codec_pcma_enable)}1{else}0{/if}
+
+account.3.codec.pcma.priority= {if isset($yealink_codec_pcma_priority)}{$yealink_codec_pcma_priority}{else}0{/if}
+
+account.3.codec.pcmu.enable= {if isset($yealink_codec_pcmu_enable)}1{else}0{/if}
+
+account.3.codec.pcmu.priority= {if isset($yealink_codec_pcmu_priority)}{$yealink_codec_pcmu_priority}{else}0{/if}
+
+account.3.codec.opus.priority= {if isset($yealink_codec_opus_priority)}{$yealink_codec_opus_priority}{else}0{/if}
+
+account.3.codec.opus.enable= {if isset($yealink_codec_opus_enable)}1{else}0{/if}
+
+account.3.codec.opus.para= 106
+
+account.3.codec.g726_40.enable= {if isset($yealink_codec_g726_40_enable)}1{else}0{/if}
+
+account.3.codec.g726_40.priority= {if isset($yealink_codec_g726_40_priority)}{$yealink_codec_g726_40_priority}{else}0{/if}
+
+account.3.codec.g726_32.enable= {if isset($yealink_codec_g726_32_enable)}1{else}0{/if}
+
+account.3.codec.g726_32.priority= {if isset($yealink_codec_g726_32_priority)}{$yealink_codec_g726_32_priority}{else}0{/if}
+
+account.3.codec.g726_24.enable= {if isset($yealink_codec_g726_24_enable)}1{else}0{/if}
+
+account.3.codec.g726_24.priority= {if isset($yealink_codec_g726_24_priority)}{$yealink_codec_g726_24_priority}{else}0{/if}
+
+account.3.codec.g726_16.enable= {if isset($yealink_codec_g726_16_enable)}1{else}0{/if}
+
+account.3.codec.g726_16.priority= {if isset($yealink_codec_g726_16_priority)}{$yealink_codec_g726_16_priority}{else}0{/if}
+
+account.3.codec.g723_63.priority= {if isset($yealink_codec_g723_63_priority)}{$yealink_codec_g723_63_priority}{else}0{/if}
+
+account.3.codec.g723_63.enable= {if isset($yealink_codec_g723_63_enable)}1{else}0{/if}
+
+account.3.codec.g723_53.priority= {if isset($yealink_codec_g723_53_priority)}{$yealink_codec_g723_53_priority}{else}0{/if}
+
+account.3.codec.g723_53.enable= {if isset($yealink_codec_g723_53_enable)}1{else}0{/if}
+
+account.3.codec.g729.priority= {if isset($yealink_codec_g729_priority)}{$yealink_codec_g729_priority}{else}0{/if}
+
+account.3.codec.g729.enable= {if isset($yealink_codec_g729_enable)}1{else}0{/if}
+
+account.3.codec.g722.priority= {if isset($yealink_codec_g722_priority)}{$yealink_codec_g722_priority}{else}0{/if}
+
+account.3.codec.g722.enable= {if isset($yealink_codec_g722_enable)}1{else}0{/if}
+
+account.3.codec.G722_1_24kpbs.priority=
+account.3.codec.G722_1_24kpbs.enable=
+account.3.codec.G722_1c_24kpbs.priority=
+account.3.codec.G722_1c_24kpbs.enable=
+account.3.codec.G722_1c_32kpbs.priority=
+account.3.codec.G722_1c_32kpbs.enable=
+account.3.codec.G722_1c_48kpbs.priority=
+account.3.codec.G722_1c_48kpbs.enable=
+
+################################################################
+#                      Account3 Register                       ##
+################################################################
+{if isset($account.3.password) }
+account.3.enable = 1
+{else}
+account.3.enable = 0
+{/if}
+account.3.label = {$account.3.display_name}
+account.3.display_name = {$account.3.display_name}
+account.3.auth_name = {$account.3.auth_id}
+
+{if isset($account.3.server.1.address)}
+account.3.user_name = {$account.3.user_id}@{$account.3.server_address}
+{else}
+account.3.user_name = {$account.3.user_id}
+{/if}
+
+account.3.password = {$account.3.password}
+account.3.sip_server.1.address= {$account.3.server_address}
+account.3.sip_server_port = {$account.3.sip_port}
+
+
+#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
+{if $account.3.sip_transport == 'udp'}account.3.sip_server.1.transport_type = 0{/if}
+{if $account.3.sip_transport == 'tcp'}account.3.sip_server.1.transport_type = 1{/if}
+{if $account.3.sip_transport == 'tls'}account.3.sip_server.1.transport_type = 2{/if}
+{if $account.3.sip_transport == 'dns srv'}account.3.sip_server.1.transport_type = 3{/if}
+
+account.3.sip_server.1.expires=  {$account.3.register_expires}
+account.3.sip_server.1.retry_counts= 3
+
+account.3.sip_server.2.address= {$account.3.server.2.address}
+account.3.sip_server.2.port= {$account.3.sip_port}
+
+#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS-NAPTR;
+{if $account.3.sip_transport == 'udp'}account.3.sip_server.2.transport_type = 0{/if}
+{if $account.3.sip_transport == 'tcp'}account.3.sip_server.2.transport_type = 1{/if}
+{if $account.3.sip_transport == 'tls'}account.3.sip_server.2.transport_type = 2{/if}
+{if $account.3.sip_transport == 'dns srv'}account.3.sip_server.2.transport_type = 3{/if}
+
+account.3.sip_server.2.expires= {$account.3.register_expires}
+account.3.sip_server.2.retry_counts= 3
+
+account.3.outbound_proxy_enable = {if isset($account.3.outbound_proxy_primary)}1{else}0{/if}
+
+account.3.outbound_proxy.1.address = {$account.3.outbound_proxy_primary}
+account.3.outbound_proxy.2.address = {$account.3.outbound_proxy_secondary}
+
+{if isset($outbound_proxy_1_port)}
+account.3.outbound_proxy.1.port = {$outbound_proxy_1_port}
+{else}
+account.3.outbound_proxy.1.port = {$account.3.sip_port}
+{/if}
+
+account.3.outbound_proxy.2.address= {$account.3.outbound_proxy_secondary}
+
+{if isset($outbound_proxy_1_port)}
+account.3.outbound_proxy.2.port = {$outbound_proxy_2_port}
+{else}
+account.3.outbound_proxy.2.port = {$account.3.sip_port}
+{/if}
+
+account.3.outbound_proxy_fallback_interval= {$yealink_outbound_proxy_fallback_interval}
+
+account.3.nat.nat_traversal= {if isset($stun_server)}1{else}0{/if}
+
+
+
+################################################################
+#                      Account Basic                          ##
+################################################################
+account.3.auto_answer=
+
+################################################################
+#                      Account Advanced                       ##
+################################################################
+account.3.nat.udp_update_enable=
+account.3.nat.udp_update_time=
+account.3.nat.rport= {$yealink_rport}
+
+account.3.dtmf.type= {$yealink_dtmf_type}
+account.3.dtmf.info_type=
+account.3.dtmf.dtmf_payload=
+account.3.100rel_enable=
+
+account.3.subscribe_register=
+account.3.cid_source= {$yealink_cid_source}
+account.3.enable_user_equal_phone=
+account.3.srtp_encryption= {$yealink_srtp_encryption}
+account.3.ptime=
+account.3.register_line=
+account.3.register_mac=
+account.3.reg_fail_retry_interval=
+account.3.unregister_on_reboot=
+
+account.3.session_timer.refresher=
+account.3.session_timer.expires=
+account.3.session_timer.enable= {$yealink_session_timer}
+
+account.3.conf_type = {if $nway_conference == true}2{/if}
+account.3.sip_server_type=
+
+##V83 Add
+account.3.srtp.unencrypted_rtcp.enable =
+account.3.srtp.unencrypted_rtp.enable =
+account.3.sip_server_mode =
+
+
+
+################################################################
+#                        SIP Backup Server                    ##
+################################################################
+account.3.outbound_proxy.1.register_on_enable=
+account.3.outbound_proxy.1.failback_timeout=
+account.3.outbound_proxy.1.failback_mode=
+account.3.outbound_proxy.1.retry_counts=
+account.3.outbound_proxy.1.only_signal_with_registered=
+account.3.outbound_proxy.1.failback_subscribe.enable=
+account.3.outbound_proxy.1.invite_retry_counts=
+
+account.3.sip_server.1.register_on_enable=
+account.3.sip_server.1.failback_timeout=
+account.3.sip_server.1.failback_mode=
+account.3.sip_server.1.failback_subscribe.enable=
+account.3.sip_server.1.only_signal_with_registered=
+account.3.sip_server.1.invite_retry_counts=
+
+account.3.outbound_proxy.2.register_on_enable=
+account.3.outbound_proxy.2.failback_timeout=
+account.3.outbound_proxy.2.failback_mode=
+account.3.outbound_proxy.2.retry_counts=
+account.3.outbound_proxy.2.only_signal_with_registered=
+account.3.outbound_proxy.2.failback_subscribe.enable=
+account.3.outbound_proxy.2.invite_retry_counts=
+
+account.3.sip_server.2.register_on_enable=
+account.3.sip_server.2.failback_timeout=
+account.3.sip_server.2.failback_mode=
+account.3.sip_server.2.failback_subscribe.enable=
+account.3.sip_server.2.only_signal_with_registered=
+account.3.sip_server.2.invite_retry_counts=
+
+account.3.static_cache_pri=
+account.3.dns_cache_type=
+account.3.naptr_build=
+account.3.fallback.timeout=
+account.3.fallback.redundancy_type=
+account.3.reg_failed_retry_max_time=
+account.3.reg_failed_retry_min_time=
+account.3.redundancy_with_reg_fail.enable =
+
+##V83 Add
+account.3.sip_server.1.outbound_proxy_enable =
+account.3.sip_server.2.outbound_proxy_enable =
+
+################################################################
+#                        SIP Basic config                     ##
+################################################################
+account.3.contact_take_line_param=
+account.3.update_ack_while_dialing=
+account.3.srtp_lifetime=
+account.3.third_part_request_with_route.enable=
+account.3.insert_outbound_in_route.enable=
+account.3.path.enable=
+account.3.sub_fail_retry_interval=
+account.3.transfer_refer_to_contact_header.enable=
+account.3.hold_use_inactive=
+account.3.gruu.enable=
+account.3.dial_tone=
+account.3.call_id_mode=
+account.3.subscribe_expires_overlap=
+account.3.register_expires_overlap=
+account.3.call_info=
+account.3.custom_ua=
+account.3.mwi_parse_terminated=
+account.3.check_cseq.enable=
+account.3.check_to_tag.enable=
+account.3.vq_rtcpxr.collector_server_port=
+account.3.vq_rtcpxr.collector_server_host=
+account.3.vq_rtcpxr.collector_name=
+account.3.compact_header_enable=
+account.3.cp_source= 2
+account.3.cid_source_ppi= 1
+account.3.cid_source_privacy= 1
+account.3.reg_with_pani_header.enable =
+account.3.alert_info=
+account.3.picture_info_enable= 1
+
+##V83 Add
+account.3.invite_with_pani_header.enable = 
+
+##V84 Add
+account.3.invite_with_rpid_header.enable=
+
+account.3.auto_answer_mute_enable
+
+##V84 SP4 Add
+account.3.share_line.enable_private_code =
+account.3.share_line.cancel_private_code =
+
+#######################################################################################
+##                                 History                                           ##
+#######################################################################################
+account.3.missed_calllog=
+
+
+#######################################################################################
+##                                  Forward                                          ##
+#######################################################################################
+account.3.timeout_fwd.off_code=
+account.3.timeout_fwd.on_code=
+account.3.timeout_fwd.timeout=
+account.3.timeout_fwd.target=
+account.3.timeout_fwd.enable=
+account.3.busy_fwd.off_code=
+account.3.busy_fwd.on_code=
+account.3.busy_fwd.target=
+account.3.busy_fwd.enable=
+account.3.always_fwd.off_code=
+account.3.always_fwd.on_code=
+account.3.always_fwd.target=
+account.3.always_fwd.enable=
+
+
+#######################################################################################
+##                                  DND                                              ##
+#######################################################################################
+account.3.dnd.enable=
+account.3.dnd.off_code=
+account.3.dnd.on_code=
+
+
+
+#######################################################################################
+##                               Voice Mail                                          ##
+#######################################################################################
+voice_mail.number.1= {$voicemail_number}
+account.3.subscribe_mwi= 1
+account.3.subscribe_mwi_to_vm= {$yealink_subscribe_mwi_to_vm}
+account.3.subscribe_mwi_expires= 3600
+account.3.display_mwi.enable=
+
+#######################################################################################
+##                               Auto Dial                                           ##
+#######################################################################################
+account.3.auto_dial_enable=
+account.3.auto_dial_num=
+
+
+#######################################################################################
+##                           Preference&Status                                       ##
+#######################################################################################
+account.3.ringtone.ring_type=
+
+#######################################################################################
+##                           Digitmap                                                ##
+#######################################################################################
+account.3.dialplan.digitmap.enable=
+account.3.dialplan.digitmap.string=
+account.3.dialplan.digitmap.no_match_action=
+account.3.dialplan.digitmap.interdigit_short_timer=
+account.3.dialplan.digitmap.interdigit_long_timer=
+account.3.dialplan.digitmap.apply_to.press_send=
+account.3.dialplan.digitmap.apply_to.forward=
+account.3.dialplan.digitmap.apply_to.history_dial=
+account.3.dialplan.digitmap.apply_to.directory_dial=
+account.3.dialplan.digitmap.apply_to.on_hook_dial=
+account.3.dialplan.digitmap.active.on_hook_dialing=
+
+
+#######################################################################################
+##                                 Rings Settings                                    ##
+#######################################################################################
+account.3.alert_info_url_enable=
+
+
+#######################################################################################
+##                                  BLF/BLF List                                     ##
+#######################################################################################
+account.3.blf.blf_list_uri=
+account.3.blf_list_barge_in_code=
+account.3.blf_list_code=
+account.3.blf_list_retrieve_call_parked_code=
+account.3.blf.subscribe_period=
+account.3.blf.match_host.enable=
+account.3.out_dialog_blf_enable=
+account.3.blf.subscribe_event=
+
+##V84 Add
+account.3.blf_list_call_parked_code=
+account.3.blf_list_call_parked_list=
+
+##V84 SP4 ADD
+account.3.blf_list_whisper_code=
+account.3.blf_list_listen_in_code=
+
+
+#######################################################################################
+##                                   SCA                                             ##
+#######################################################################################
+account.3.shared_line=
+account.3.line_seize.expires=
+account.3.shared_line_one_touch_bargein.enable=
+account.3.shared_line_one_touch_retrieve.enable=
+account.3.sca_manage_interface_display_time=
+account.3.shared_line_callpull_code=
+
+##V83 Add
+account.x.share_line.barge_in.enable
+
+#######################################################################################
+##                                   BLA                                             ##
+#######################################################################################
+account.3.bla_number=
+account.3.bla_subscribe_period=
+account.3.bla.notify_with_expire.enable=
+account.3.bla.subscribe_uri_build_type=
+
+#######################################################################################
+##                                   Call Park                                       ##
+#######################################################################################
+account.3.callpark_enable=
+
+
+#######################################################################################
+##                                    Broadsoft ACD                                  ##
+#######################################################################################
+account.3.acd.enable= 0
+account.3.acd.available= 0
+account.3.acd.unavailable_reason_enable= 0
+account.3.acd.initial_state= 1
+account.3.subscribe_acd_expires=
+
+
+#######################################################################################
+##                                 Broadsoft ACD Call Center                         ##
+#######################################################################################
+##account.X.reason_code.Y=
+##account.X.reason_code_name.Y=
+##account.X.bw_disp_code.Y=
+##account.X.bw_disp_code_name.Y=
+##account.X.supervisor_info_code.Y=
+##account.X.supervisor_info_code_name.Y=
+##The value Y must be continuous.
+
+account.3.reason_code.1=
+account.3.reason_code_name.1= 0
+account.3.bw_disp_code.1=
+account.3.bw_disp_code_name.1=
+account.3.supervisor_info_code.1=
+account.3.supervisor_info_code_name.1=
+
+#######################################################################################
+##                                 Broadsoft Call Center                             ##
+#######################################################################################
+account.3.call_center.call_info_enable= 0
+account.3.call_center.show_call_info_time= 30
+account.3.call_center.disp_code_enable= 0
+account.3.call_center.trace_enable= 0
+account.3.call_center.emergency_enable= 0
+account.3.call_center.queue_status_enable= 0
+account.3.call_center.queue_status_light_enable = 0
+
+
+
+#######################################################################################
+##                         Broadsoft Hoteling                                        ##
+#######################################################################################
+account.3.hoteling.enable= 0
+account.3.hoteling.user_id= 0
+account.3.hoteling.password= 0
+account.3.hoteling.expires= 0
+account.3.hoteling.auto_login_enable= 0
+
+
+#######################################################################################
+##                              Broadsoft XSI                                        ##
+#######################################################################################
+account.3.xsi.user =
+account.3.xsi.password =
+account.3.xsi.host =
+account.3.xsi.server_type =
+account.3.xsi.port =
+
+
+#######################################################################################
+##                                Call Pickup                                        ##
+#######################################################################################
+account.3.direct_pickup_code =
+account.3.group_pickup_code =
+account.3.dialoginfo_callpickup = 0
+account.3.refresh_remote_id.enable =
+
+
+#######################################################################################
+##                              Broadsoft Call Recording                             ##
+#######################################################################################
+account.3.call_recording.enable=
+
+#######################################################################################
+##                                Network Conference                                  ##
+#######################################################################################
+account.3.conf_uri = {if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}
+
+
+#######################################################################################
+##                              Broadsoft Call Decline                               ##
+#######################################################################################
+account.3.features.call_decline.enable =
+
+
+#######################################################################################
+##                       Broadsoft Security Classification                           ##
+#######################################################################################
+account.3.security_classification.enable =
+
+
+
+#######################################################################################
+##                        Broadsoft Flexible Seating                                 ##
+#######################################################################################
+account.3.flexible_seating.enable=
+account.3.hoteling.pin=
+account.3.hoteling.mode=
+
+#######################################################################################
+##                         Features Sync                                             ##
+#######################################################################################
+account.3.features.forward.feature_key_sync.local_processing.enable=
+account.3.features.dnd.feature_key_sync.local_processing.enable =
+
+##V84 Add
+account.3.dnd.feature_key_sync.enable=
+account.3.feature_key_sync.enable=
+account.3.forward.feature_key_sync.enable=
+
+#######################################################################################
+##                                   ACD                                             ##
+#######################################################################################
+account.3.acd.available_url=
+account.3.acd.away_url =
+account.3.acd.refresh_url =
+account.3.acd.call_information=
+
+
+
+#######################################################################################
+##                                  virtual_user                                     ##
+#######################################################################################
+##V84 Add
+#bw.virtual_user.1.enable=
+#bw.virtual_user.1.label=
+#bw.virtual_user.1.xsi.dnd.enable=
+#bw.virtual_user.1.xsi.host=
+#bw.virtual_user.1.xsi.password=
+#bw.virtual_user.1.xsi.port=
+#bw.virtual_user.1.xsi.server_type=
+#bw.virtual_user.1.xsi.user=
+
+#######################################################################################
+##                                   Transfer                                        ##
+#######################################################################################
+account.4.phone_setting.call_appearance.transfer_via_new_linekey= {$yealink_transfer_via_new_linekey}
+
+
+#######################################################################################
+##                                   Conference                                      ##
+#######################################################################################
+account.4.phone_setting.call_appearance.conference_via_new_linekey=
+
+
+#######################################################################################
+##                                   Anonymous                                       ##
+#######################################################################################
+account.4.anonymous_call.server_base_only =
+account.4.send_anonymous_rejection_code =
+account.4.anonymous_reject_offcode =
+account.4.anonymous_reject_oncode =
+account.4.reject_anonymous_call=
+account.4.anonymous_call_offcode =
+account.4.anonymous_call_oncode =
+account.4.anonymous_call = 0
+account.4.send_anonymous_code =
+
+
+
+#######################################################################################
+##                          Call Configuration                                       ##
+#######################################################################################
+account.4.music_server_uri=
+account.4.music_on_hold_type=
+account.4.auto_label.rule=
+account.4.auto_label.enable=
+account.4.number_of_linekey=
+account.4.phone_setting.call_appearance.calls_per_linekey=
+
+
+#######################################################################################
+##                                    Codec                                          ##
+#######################################################################################
+account.4.codec.ilbc_15_2kbps.priority=
+account.4.codec.ilbc_15_2kbps.enable=
+
+account.4.codec.ilbc_13_33kbps.priority= {if isset($yealink_codec_iLBC_priority)}{$yealink_codec_iLBC_priority}{else}0{/if}
+
+account.4.codec.ilbc_13_33kbps.enable = {if isset($yealink_codec_iLBC_enable)}1{else}0{/if}
+
+account.4.codec.pcma.enable= {if isset($yealink_codec_pcma_enable)}1{else}0{/if}
+
+account.4.codec.pcma.priority= {if isset($yealink_codec_pcma_priority)}{$yealink_codec_pcma_priority}{else}0{/if}
+
+account.4.codec.pcmu.enable= {if isset($yealink_codec_pcmu_enable)}1{else}0{/if}
+
+account.4.codec.pcmu.priority= {if isset($yealink_codec_pcmu_priority)}{$yealink_codec_pcmu_priority}{else}0{/if}
+
+account.4.codec.opus.priority= {if isset($yealink_codec_opus_priority)}{$yealink_codec_opus_priority}{else}0{/if}
+
+account.4.codec.opus.enable= {if isset($yealink_codec_opus_enable)}1{else}0{/if}
+
+account.4.codec.opus.para= 106
+
+account.4.codec.g726_40.enable= {if isset($yealink_codec_g726_40_enable)}1{else}0{/if}
+
+account.4.codec.g726_40.priority= {if isset($yealink_codec_g726_40_priority)}{$yealink_codec_g726_40_priority}{else}0{/if}
+
+account.4.codec.g726_32.enable= {if isset($yealink_codec_g726_32_enable)}1{else}0{/if}
+
+account.4.codec.g726_32.priority= {if isset($yealink_codec_g726_32_priority)}{$yealink_codec_g726_32_priority}{else}0{/if}
+
+account.4.codec.g726_24.enable= {if isset($yealink_codec_g726_24_enable)}1{else}0{/if}
+
+account.4.codec.g726_24.priority= {if isset($yealink_codec_g726_24_priority)}{$yealink_codec_g726_24_priority}{else}0{/if}
+
+account.4.codec.g726_16.enable= {if isset($yealink_codec_g726_16_enable)}1{else}0{/if}
+
+account.4.codec.g726_16.priority= {if isset($yealink_codec_g726_16_priority)}{$yealink_codec_g726_16_priority}{else}0{/if}
+
+account.4.codec.g723_63.priority= {if isset($yealink_codec_g723_63_priority)}{$yealink_codec_g723_63_priority}{else}0{/if}
+
+account.4.codec.g723_63.enable= {if isset($yealink_codec_g723_63_enable)}1{else}0{/if}
+
+account.4.codec.g723_53.priority= {if isset($yealink_codec_g723_53_priority)}{$yealink_codec_g723_53_priority}{else}0{/if}
+
+account.4.codec.g723_53.enable= {if isset($yealink_codec_g723_53_enable)}1{else}0{/if}
+
+account.4.codec.g729.priority= {if isset($yealink_codec_g729_priority)}{$yealink_codec_g729_priority}{else}0{/if}
+
+account.4.codec.g729.enable= {if isset($yealink_codec_g729_enable)}1{else}0{/if}
+
+account.4.codec.g722.priority= {if isset($yealink_codec_g722_priority)}{$yealink_codec_g722_priority}{else}0{/if}
+
+account.4.codec.g722.enable= {if isset($yealink_codec_g722_enable)}1{else}0{/if}
+
+account.4.codec.G722_1_24kpbs.priority=
+account.4.codec.G722_1_24kpbs.enable=
+account.4.codec.G722_1c_24kpbs.priority=
+account.4.codec.G722_1c_24kpbs.enable=
+account.4.codec.G722_1c_32kpbs.priority=
+account.4.codec.G722_1c_32kpbs.enable=
+account.4.codec.G722_1c_48kpbs.priority=
+account.4.codec.G722_1c_48kpbs.enable=
+
+################################################################
+#                      Account4 Register                       ##
+################################################################
+{if isset($account.4.password) }
+account.4.enable = 1
+{else}
+account.4.enable = 0
+{/if}
+account.4.label = {$account.4.display_name}
+account.4.display_name = {$account.4.display_name}
+account.4.auth_name = {$account.4.auth_id}
+
+{if isset($account.4.server.1.address)}
+account.4.user_name = {$account.4.user_id}@{$account.4.server_address}
+{else}
+account.4.user_name = {$account.4.user_id}
+{/if}
+
+account.4.password = {$account.4.password}
+account.4.sip_server.1.address= {$account.4.server_address}
+account.4.sip_server_port = {$account.4.sip_port}
+
+
+#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
+{if $account.4.sip_transport == 'udp'}account.4.sip_server.1.transport_type = 0{/if}
+{if $account.4.sip_transport == 'tcp'}account.4.sip_server.1.transport_type = 1{/if}
+{if $account.4.sip_transport == 'tls'}account.4.sip_server.1.transport_type = 2{/if}
+{if $account.4.sip_transport == 'dns srv'}account.4.sip_server.1.transport_type = 3{/if}
+
+account.4.sip_server.1.expires=  {$account.4.register_expires}
+account.4.sip_server.1.retry_counts= 3
+
+account.4.sip_server.2.address= {$account.4.server.2.address}
+account.4.sip_server.2.port= {$account.4.sip_port}
+
+#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS-NAPTR;
+{if $account.4.sip_transport == 'udp'}account.4.sip_server.2.transport_type = 0{/if}
+{if $account.4.sip_transport == 'tcp'}account.4.sip_server.2.transport_type = 1{/if}
+{if $account.4.sip_transport == 'tls'}account.4.sip_server.2.transport_type = 2{/if}
+{if $account.4.sip_transport == 'dns srv'}account.4.sip_server.2.transport_type = 3{/if}
+
+account.4.sip_server.2.expires= {$account.4.register_expires}
+account.4.sip_server.2.retry_counts= 3
+
+account.4.outbound_proxy_enable = {if isset($account.4.outbound_proxy_primary)}1{else}0{/if}
+
+account.4.outbound_proxy.1.address = {$account.4.outbound_proxy_primary}
+account.4.outbound_proxy.2.address = {$account.4.outbound_proxy_secondary}
+
+{if isset($outbound_proxy_1_port)}
+account.4.outbound_proxy.1.port = {$outbound_proxy_1_port}
+{else}
+account.4.outbound_proxy.1.port = {$account.4.sip_port}
+{/if}
+
+account.4.outbound_proxy.2.address= {$account.4.outbound_proxy_secondary}
+
+{if isset($outbound_proxy_1_port)}
+account.4.outbound_proxy.2.port = {$outbound_proxy_2_port}
+{else}
+account.4.outbound_proxy.2.port = {$account.4.sip_port}
+{/if}
+
+account.4.outbound_proxy_fallback_interval= {$yealink_outbound_proxy_fallback_interval}
+
+account.4.nat.nat_traversal= {if isset($stun_server)}1{else}0{/if}
+
+
+
+################################################################
+#                      Account Basic                          ##
+################################################################
+account.4.auto_answer=
+
+################################################################
+#                      Account Advanced                       ##
+################################################################
+account.4.nat.udp_update_enable=
+account.4.nat.udp_update_time=
+account.4.nat.rport= {$yealink_rport}
+
+account.4.dtmf.type= {$yealink_dtmf_type}
+account.4.dtmf.info_type=
+account.4.dtmf.dtmf_payload=
+account.4.100rel_enable=
+
+account.4.subscribe_register=
+account.4.cid_source= {$yealink_cid_source}
+account.4.enable_user_equal_phone=
+account.4.srtp_encryption= {$yealink_srtp_encryption}
+account.4.ptime=
+account.4.register_line=
+account.4.register_mac=
+account.4.reg_fail_retry_interval=
+account.4.unregister_on_reboot=
+
+account.4.session_timer.refresher=
+account.4.session_timer.expires=
+account.4.session_timer.enable= {$yealink_session_timer}
+
+account.4.conf_type = {if $nway_conference == true}2{/if} 
+account.4.sip_server_type=
+
+##V83 Add
+account.4.srtp.unencrypted_rtcp.enable =
+account.4.srtp.unencrypted_rtp.enable =
+account.4.sip_server_mode =
+
+
+
+################################################################
+#                        SIP Backup Server                    ##
+################################################################
+account.4.outbound_proxy.1.register_on_enable=
+account.4.outbound_proxy.1.failback_timeout=
+account.4.outbound_proxy.1.failback_mode=
+account.4.outbound_proxy.1.retry_counts=
+account.4.outbound_proxy.1.only_signal_with_registered=
+account.4.outbound_proxy.1.failback_subscribe.enable=
+account.4.outbound_proxy.1.invite_retry_counts=
+
+account.4.sip_server.1.register_on_enable=
+account.4.sip_server.1.failback_timeout=
+account.4.sip_server.1.failback_mode=
+account.4.sip_server.1.failback_subscribe.enable=
+account.4.sip_server.1.only_signal_with_registered=
+account.4.sip_server.1.invite_retry_counts=
+
+account.4.outbound_proxy.2.register_on_enable=
+account.4.outbound_proxy.2.failback_timeout=
+account.4.outbound_proxy.2.failback_mode=
+account.4.outbound_proxy.2.retry_counts=
+account.4.outbound_proxy.2.only_signal_with_registered=
+account.4.outbound_proxy.2.failback_subscribe.enable=
+account.4.outbound_proxy.2.invite_retry_counts=
+
+account.4.sip_server.2.register_on_enable=
+account.4.sip_server.2.failback_timeout=
+account.4.sip_server.2.failback_mode=
+account.4.sip_server.2.failback_subscribe.enable=
+account.4.sip_server.2.only_signal_with_registered=
+account.4.sip_server.2.invite_retry_counts=
+
+account.4.static_cache_pri=
+account.4.dns_cache_type=
+account.4.naptr_build=
+account.4.fallback.timeout=
+account.4.fallback.redundancy_type=
+account.4.reg_failed_retry_max_time=
+account.4.reg_failed_retry_min_time=
+account.4.redundancy_with_reg_fail.enable =
+
+##V83 Add
+account.4.sip_server.1.outbound_proxy_enable =
+account.4.sip_server.2.outbound_proxy_enable =
+
+################################################################
+#                        SIP Basic config                     ##
+################################################################
+account.4.contact_take_line_param=
+account.4.update_ack_while_dialing=
+account.4.srtp_lifetime=
+account.4.third_part_request_with_route.enable=
+account.4.insert_outbound_in_route.enable=
+account.4.path.enable=
+account.4.sub_fail_retry_interval=
+account.4.transfer_refer_to_contact_header.enable=
+account.4.hold_use_inactive=
+account.4.gruu.enable=
+account.4.dial_tone=
+account.4.call_id_mode=
+account.4.subscribe_expires_overlap=
+account.4.register_expires_overlap=
+account.4.call_info=
+account.4.custom_ua=
+account.4.mwi_parse_terminated=
+account.4.check_cseq.enable=
+account.4.check_to_tag.enable=
+account.4.vq_rtcpxr.collector_server_port=
+account.4.vq_rtcpxr.collector_server_host=
+account.4.vq_rtcpxr.collector_name=
+account.4.compact_header_enable=
+account.4.cp_source= 2
+account.4.cid_source_ppi= 1
+account.4.cid_source_privacy= 1
+account.4.reg_with_pani_header.enable =
+account.4.alert_info=
+account.4.picture_info_enable= 1
+
+##V83 Add
+account.4.invite_with_pani_header.enable = 
+
+##V84 Add
+account.4.invite_with_rpid_header.enable=
+
+account.4.auto_answer_mute_enable
+
+##V84 SP4 Add
+account.4.share_line.enable_private_code =
+account.4.share_line.cancel_private_code =
+
+#######################################################################################
+##                                 History                                           ##
+#######################################################################################
+account.4.missed_calllog=
+
+
+#######################################################################################
+##                                  Forward                                          ##
+#######################################################################################
+account.4.timeout_fwd.off_code=
+account.4.timeout_fwd.on_code=
+account.4.timeout_fwd.timeout=
+account.4.timeout_fwd.target=
+account.4.timeout_fwd.enable=
+account.4.busy_fwd.off_code=
+account.4.busy_fwd.on_code=
+account.4.busy_fwd.target=
+account.4.busy_fwd.enable=
+account.4.always_fwd.off_code=
+account.4.always_fwd.on_code=
+account.4.always_fwd.target=
+account.4.always_fwd.enable=
+
+
+#######################################################################################
+##                                  DND                                              ##
+#######################################################################################
+account.4.dnd.enable=
+account.4.dnd.off_code=
+account.4.dnd.on_code=
+
+
+
+#######################################################################################
+##                               Voice Mail                                          ##
+#######################################################################################
+voice_mail.number.1= {$voicemail_number}
+account.4.subscribe_mwi= 1
+account.4.subscribe_mwi_to_vm= {$yealink_subscribe_mwi_to_vm}
+account.4.subscribe_mwi_expires= 3600
+account.4.display_mwi.enable=
+
+#######################################################################################
+##                               Auto Dial                                           ##
+#######################################################################################
+account.4.auto_dial_enable=
+account.4.auto_dial_num=
+
+
+#######################################################################################
+##                           Preference&Status                                       ##
+#######################################################################################
+account.4.ringtone.ring_type=
+
+#######################################################################################
+##                           Digitmap                                                ##
+#######################################################################################
+account.4.dialplan.digitmap.enable=
+account.4.dialplan.digitmap.string=
+account.4.dialplan.digitmap.no_match_action=
+account.4.dialplan.digitmap.interdigit_short_timer=
+account.4.dialplan.digitmap.interdigit_long_timer=
+account.4.dialplan.digitmap.apply_to.press_send=
+account.4.dialplan.digitmap.apply_to.forward=
+account.4.dialplan.digitmap.apply_to.history_dial=
+account.4.dialplan.digitmap.apply_to.directory_dial=
+account.4.dialplan.digitmap.apply_to.on_hook_dial=
+account.4.dialplan.digitmap.active.on_hook_dialing=
+
+
+#######################################################################################
+##                                 Rings Settings                                    ##
+#######################################################################################
+account.4.alert_info_url_enable=
+
+
+#######################################################################################
+##                                  BLF/BLF List                                     ##
+#######################################################################################
+account.4.blf.blf_list_uri=
+account.4.blf_list_barge_in_code=
+account.4.blf_list_code=
+account.4.blf_list_retrieve_call_parked_code=
+account.4.blf.subscribe_period=
+account.4.blf.match_host.enable=
+account.4.out_dialog_blf_enable=
+account.4.blf.subscribe_event=
+
+##V84 Add
+account.4.blf_list_call_parked_code=
+account.4.blf_list_call_parked_list=
+
+##V84 SP4 ADD
+account.4.blf_list_whisper_code=
+account.4.blf_list_listen_in_code=
+
+
+#######################################################################################
+##                                   SCA                                             ##
+#######################################################################################
+account.4.shared_line=
+account.4.line_seize.expires=
+account.4.shared_line_one_touch_bargein.enable=
+account.4.shared_line_one_touch_retrieve.enable=
+account.4.sca_manage_interface_display_time=
+account.4.shared_line_callpull_code=
+
+##V83 Add
+account.x.share_line.barge_in.enable
+
+#######################################################################################
+##                                   BLA                                             ##
+#######################################################################################
+account.4.bla_number=
+account.4.bla_subscribe_period=
+account.4.bla.notify_with_expire.enable=
+account.4.bla.subscribe_uri_build_type=
+
+#######################################################################################
+##                                   Call Park                                       ##
+#######################################################################################
+account.4.callpark_enable=
+
+
+#######################################################################################
+##                                    Broadsoft ACD                                  ##
+#######################################################################################
+account.4.acd.enable= 0
+account.4.acd.available= 0
+account.4.acd.unavailable_reason_enable= 0
+account.4.acd.initial_state= 1
+account.4.subscribe_acd_expires=
+
+
+#######################################################################################
+##                                 Broadsoft ACD Call Center                         ##
+#######################################################################################
+##account.X.reason_code.Y=
+##account.X.reason_code_name.Y=
+##account.X.bw_disp_code.Y=
+##account.X.bw_disp_code_name.Y=
+##account.X.supervisor_info_code.Y=
+##account.X.supervisor_info_code_name.Y=
+##The value Y must be continuous.
+
+account.4.reason_code.1=
+account.4.reason_code_name.1= 0
+account.4.bw_disp_code.1=
+account.4.bw_disp_code_name.1=
+account.4.supervisor_info_code.1=
+account.4.supervisor_info_code_name.1=
+
+#######################################################################################
+##                                 Broadsoft Call Center                             ##
+#######################################################################################
+account.4.call_center.call_info_enable= 0
+account.4.call_center.show_call_info_time= 30
+account.4.call_center.disp_code_enable= 0
+account.4.call_center.trace_enable= 0
+account.4.call_center.emergency_enable= 0
+account.4.call_center.queue_status_enable= 0
+account.4.call_center.queue_status_light_enable = 0
+
+
+
+#######################################################################################
+##                         Broadsoft Hoteling                                        ##
+#######################################################################################
+account.4.hoteling.enable= 0
+account.4.hoteling.user_id= 0
+account.4.hoteling.password= 0
+account.4.hoteling.expires= 0
+account.4.hoteling.auto_login_enable= 0
+
+
+#######################################################################################
+##                              Broadsoft XSI                                        ##
+#######################################################################################
+account.4.xsi.user =
+account.4.xsi.password =
+account.4.xsi.host =
+account.4.xsi.server_type =
+account.4.xsi.port =
+
+
+#######################################################################################
+##                                Call Pickup                                        ##
+#######################################################################################
+account.4.direct_pickup_code =
+account.4.group_pickup_code =
+account.4.dialoginfo_callpickup = 0
+account.4.refresh_remote_id.enable =
+
+
+#######################################################################################
+##                              Broadsoft Call Recording                             ##
+#######################################################################################
+account.4.call_recording.enable=
+
+#######################################################################################
+##                                Network Conference                                  ##
+#######################################################################################
+account.4.conf_uri = {if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}
+
+
+#######################################################################################
+##                              Broadsoft Call Decline                               ##
+#######################################################################################
+account.4.features.call_decline.enable =
+
+
+#######################################################################################
+##                       Broadsoft Security Classification                           ##
+#######################################################################################
+account.4.security_classification.enable =
+
+
+
+#######################################################################################
+##                        Broadsoft Flexible Seating                                 ##
+#######################################################################################
+account.4.flexible_seating.enable=
+account.4.hoteling.pin=
+account.4.hoteling.mode=
+
+#######################################################################################
+##                         Features Sync                                             ##
+#######################################################################################
+account.4.features.forward.feature_key_sync.local_processing.enable=
+account.4.features.dnd.feature_key_sync.local_processing.enable =
+
+##V84 Add
+account.4.dnd.feature_key_sync.enable=
+account.4.feature_key_sync.enable=
+account.4.forward.feature_key_sync.enable=
+
+#######################################################################################
+##                                   ACD                                             ##
+#######################################################################################
+account.4.acd.available_url=
+account.4.acd.away_url =
+account.4.acd.refresh_url =
+account.4.acd.call_information=
+
+
+
+#######################################################################################
+##                                  virtual_user                                     ##
+#######################################################################################
+##V84 Add
+#bw.virtual_user.1.enable=
+#bw.virtual_user.1.label=
+#bw.virtual_user.1.xsi.dnd.enable=
+#bw.virtual_user.1.xsi.host=
+#bw.virtual_user.1.xsi.password=
+#bw.virtual_user.1.xsi.port=
+#bw.virtual_user.1.xsi.server_type=
+#bw.virtual_user.1.xsi.user=
+
+#######################################################################################
+##                                   Transfer                                        ##
+#######################################################################################
+account.5.phone_setting.call_appearance.transfer_via_new_linekey= {$yealink_transfer_via_new_linekey}
+
+
+#######################################################################################
+##                                   Conference                                      ##
+#######################################################################################
+account.5.phone_setting.call_appearance.conference_via_new_linekey=
+
+
+#######################################################################################
+##                                   Anonymous                                       ##
+#######################################################################################
+account.5.anonymous_call.server_base_only =
+account.5.send_anonymous_rejection_code =
+account.5.anonymous_reject_offcode =
+account.5.anonymous_reject_oncode =
+account.5.reject_anonymous_call=
+account.5.anonymous_call_offcode =
+account.5.anonymous_call_oncode =
+account.5.anonymous_call = 0
+account.5.send_anonymous_code =
+
+
+
+#######################################################################################
+##                          Call Configuration                                       ##
+#######################################################################################
+account.5.music_server_uri=
+account.5.music_on_hold_type=
+account.5.auto_label.rule=
+account.5.auto_label.enable=
+account.5.number_of_linekey=
+account.5.phone_setting.call_appearance.calls_per_linekey=
+
+
+#######################################################################################
+##                                    Codec                                          ##
+#######################################################################################
+account.5.codec.ilbc_15_2kbps.priority=
+account.5.codec.ilbc_15_2kbps.enable=
+
+account.5.codec.ilbc_13_33kbps.priority= {if isset($yealink_codec_iLBC_priority)}{$yealink_codec_iLBC_priority}{else}0{/if}
+
+account.5.codec.ilbc_13_33kbps.enable = {if isset($yealink_codec_iLBC_enable)}1{else}0{/if}
+
+account.5.codec.pcma.enable= {if isset($yealink_codec_pcma_enable)}1{else}0{/if}
+
+account.5.codec.pcma.priority= {if isset($yealink_codec_pcma_priority)}{$yealink_codec_pcma_priority}{else}0{/if}
+
+account.5.codec.pcmu.enable= {if isset($yealink_codec_pcmu_enable)}1{else}0{/if}
+
+account.5.codec.pcmu.priority= {if isset($yealink_codec_pcmu_priority)}{$yealink_codec_pcmu_priority}{else}0{/if}
+
+account.5.codec.opus.priority= {if isset($yealink_codec_opus_priority)}{$yealink_codec_opus_priority}{else}0{/if}
+
+account.5.codec.opus.enable= {if isset($yealink_codec_opus_enable)}1{else}0{/if}
+
+account.5.codec.opus.para= 106
+
+account.5.codec.g726_40.enable= {if isset($yealink_codec_g726_40_enable)}1{else}0{/if}
+
+account.5.codec.g726_40.priority= {if isset($yealink_codec_g726_40_priority)}{$yealink_codec_g726_40_priority}{else}0{/if}
+
+account.5.codec.g726_32.enable= {if isset($yealink_codec_g726_32_enable)}1{else}0{/if}
+
+account.5.codec.g726_32.priority= {if isset($yealink_codec_g726_32_priority)}{$yealink_codec_g726_32_priority}{else}0{/if}
+
+account.5.codec.g726_24.enable= {if isset($yealink_codec_g726_24_enable)}1{else}0{/if}
+
+account.5.codec.g726_24.priority= {if isset($yealink_codec_g726_24_priority)}{$yealink_codec_g726_24_priority}{else}0{/if}
+
+account.5.codec.g726_16.enable= {if isset($yealink_codec_g726_16_enable)}1{else}0{/if}
+
+account.5.codec.g726_16.priority= {if isset($yealink_codec_g726_16_priority)}{$yealink_codec_g726_16_priority}{else}0{/if}
+
+account.5.codec.g723_63.priority= {if isset($yealink_codec_g723_63_priority)}{$yealink_codec_g723_63_priority}{else}0{/if}
+
+account.5.codec.g723_63.enable= {if isset($yealink_codec_g723_63_enable)}1{else}0{/if}
+
+account.5.codec.g723_53.priority= {if isset($yealink_codec_g723_53_priority)}{$yealink_codec_g723_53_priority}{else}0{/if}
+
+account.5.codec.g723_53.enable= {if isset($yealink_codec_g723_53_enable)}1{else}0{/if}
+
+account.5.codec.g729.priority= {if isset($yealink_codec_g729_priority)}{$yealink_codec_g729_priority}{else}0{/if}
+
+account.5.codec.g729.enable= {if isset($yealink_codec_g729_enable)}1{else}0{/if}
+
+account.5.codec.g722.priority= {if isset($yealink_codec_g722_priority)}{$yealink_codec_g722_priority}{else}0{/if}
+
+account.5.codec.g722.enable= {if isset($yealink_codec_g722_enable)}1{else}0{/if}
+
+account.5.codec.G722_1_24kpbs.priority=
+account.5.codec.G722_1_24kpbs.enable=
+account.5.codec.G722_1c_24kpbs.priority=
+account.5.codec.G722_1c_24kpbs.enable=
+account.5.codec.G722_1c_32kpbs.priority=
+account.5.codec.G722_1c_32kpbs.enable=
+account.5.codec.G722_1c_48kpbs.priority=
+account.5.codec.G722_1c_48kpbs.enable=
+
+################################################################
+#                      Account5 Register                       ##
+################################################################
+{if isset($account.5.password) }
+account.5.enable = 1
+{else}
+account.5.enable = 0
+{/if}
+account.5.label = {$account.5.display_name}
+account.5.display_name = {$account.5.display_name}
+account.5.auth_name = {$account.5.auth_id}
+
+{if isset($account.5.server.1.address)}
+account.5.user_name = {$account.5.user_id}@{$account.5.server_address}
+{else}
+account.5.user_name = {$account.5.user_id}
+{/if}
+
+account.5.password = {$account.5.password}
+account.5.sip_server.1.address= {$account.5.server_address}
+account.5.sip_server_port = {$account.5.sip_port}
+
+
+#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
+{if $account.5.sip_transport == 'udp'}account.5.sip_server.1.transport_type = 0{/if}
+{if $account.5.sip_transport == 'tcp'}account.5.sip_server.1.transport_type = 1{/if}
+{if $account.5.sip_transport == 'tls'}account.5.sip_server.1.transport_type = 2{/if}
+{if $account.5.sip_transport == 'dns srv'}account.5.sip_server.1.transport_type = 3{/if}
+
+account.5.sip_server.1.expires=  {$account.5.register_expires}
+account.5.sip_server.1.retry_counts= 3
+
+account.5.sip_server.2.address= {$account.5.server.2.address}
+account.5.sip_server.2.port= {$account.5.sip_port}
+
+#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS-NAPTR;
+{if $account.5.sip_transport == 'udp'}account.5.sip_server.2.transport_type = 0{/if}
+{if $account.5.sip_transport == 'tcp'}account.5.sip_server.2.transport_type = 1{/if}
+{if $account.5.sip_transport == 'tls'}account.5.sip_server.2.transport_type = 2{/if}
+{if $account.5.sip_transport == 'dns srv'}account.5.sip_server.2.transport_type = 3{/if}
+
+account.5.sip_server.2.expires= {$account.5.register_expires}
+account.5.sip_server.2.retry_counts= 3
+
+account.5.outbound_proxy_enable = {if isset($account.5.outbound_proxy_primary)}1{else}0{/if}
+
+account.5.outbound_proxy.1.address = {$account.5.outbound_proxy_primary}
+account.5.outbound_proxy.2.address = {$account.5.outbound_proxy_secondary}
+
+{if isset($outbound_proxy_1_port)}
+account.5.outbound_proxy.1.port = {$outbound_proxy_1_port}
+{else}
+account.5.outbound_proxy.1.port = {$account.5.sip_port}
+{/if}
+
+account.5.outbound_proxy.2.address= {$account.5.outbound_proxy_secondary}
+
+{if isset($outbound_proxy_1_port)}
+account.5.outbound_proxy.2.port = {$outbound_proxy_2_port}
+{else}
+account.5.outbound_proxy.2.port = {$account.5.sip_port}
+{/if}
+
+account.5.outbound_proxy_fallback_interval= {$yealink_outbound_proxy_fallback_interval}
+
+account.5.nat.nat_traversal= {if isset($stun_server)}1{else}0{/if}
+
+
+
+################################################################
+#                      Account Basic                          ##
+################################################################
+account.5.auto_answer=
+
+################################################################
+#                      Account Advanced                       ##
+################################################################
+account.5.nat.udp_update_enable=
+account.5.nat.udp_update_time=
+account.5.nat.rport= {$yealink_rport}
+
+account.5.dtmf.type= {$yealink_dtmf_type}
+account.5.dtmf.info_type=
+account.5.dtmf.dtmf_payload=
+account.5.100rel_enable=
+
+account.5.subscribe_register=
+account.5.cid_source= {$yealink_cid_source}
+account.5.enable_user_equal_phone=
+account.5.srtp_encryption= {$yealink_srtp_encryption}
+account.5.ptime=
+account.5.register_line=
+account.5.register_mac=
+account.5.reg_fail_retry_interval=
+account.5.unregister_on_reboot=
+
+account.5.session_timer.refresher=
+account.5.session_timer.expires=
+account.5.session_timer.enable= {$yealink_session_timer}
+
+account.5.conf_type = {if $nway_conference == true}2{/if}
+account.5.sip_server_type=
+
+##V83 Add
+account.5.srtp.unencrypted_rtcp.enable =
+account.5.srtp.unencrypted_rtp.enable =
+account.5.sip_server_mode =
+
+
+
+################################################################
+#                        SIP Backup Server                    ##
+################################################################
+account.5.outbound_proxy.1.register_on_enable=
+account.5.outbound_proxy.1.failback_timeout=
+account.5.outbound_proxy.1.failback_mode=
+account.5.outbound_proxy.1.retry_counts=
+account.5.outbound_proxy.1.only_signal_with_registered=
+account.5.outbound_proxy.1.failback_subscribe.enable=
+account.5.outbound_proxy.1.invite_retry_counts=
+
+account.5.sip_server.1.register_on_enable=
+account.5.sip_server.1.failback_timeout=
+account.5.sip_server.1.failback_mode=
+account.5.sip_server.1.failback_subscribe.enable=
+account.5.sip_server.1.only_signal_with_registered=
+account.5.sip_server.1.invite_retry_counts=
+
+account.5.outbound_proxy.2.register_on_enable=
+account.5.outbound_proxy.2.failback_timeout=
+account.5.outbound_proxy.2.failback_mode=
+account.5.outbound_proxy.2.retry_counts=
+account.5.outbound_proxy.2.only_signal_with_registered=
+account.5.outbound_proxy.2.failback_subscribe.enable=
+account.5.outbound_proxy.2.invite_retry_counts=
+
+account.5.sip_server.2.register_on_enable=
+account.5.sip_server.2.failback_timeout=
+account.5.sip_server.2.failback_mode=
+account.5.sip_server.2.failback_subscribe.enable=
+account.5.sip_server.2.only_signal_with_registered=
+account.5.sip_server.2.invite_retry_counts=
+
+account.5.static_cache_pri=
+account.5.dns_cache_type=
+account.5.naptr_build=
+account.5.fallback.timeout=
+account.5.fallback.redundancy_type=
+account.5.reg_failed_retry_max_time=
+account.5.reg_failed_retry_min_time=
+account.5.redundancy_with_reg_fail.enable =
+
+##V83 Add
+account.5.sip_server.1.outbound_proxy_enable =
+account.5.sip_server.2.outbound_proxy_enable =
+
+################################################################
+#                        SIP Basic config                     ##
+################################################################
+account.5.contact_take_line_param=
+account.5.update_ack_while_dialing=
+account.5.srtp_lifetime=
+account.5.third_part_request_with_route.enable=
+account.5.insert_outbound_in_route.enable=
+account.5.path.enable=
+account.5.sub_fail_retry_interval=
+account.5.transfer_refer_to_contact_header.enable=
+account.5.hold_use_inactive=
+account.5.gruu.enable=
+account.5.dial_tone=
+account.5.call_id_mode=
+account.5.subscribe_expires_overlap=
+account.5.register_expires_overlap=
+account.5.call_info=
+account.5.custom_ua=
+account.5.mwi_parse_terminated=
+account.5.check_cseq.enable=
+account.5.check_to_tag.enable=
+account.5.vq_rtcpxr.collector_server_port=
+account.5.vq_rtcpxr.collector_server_host=
+account.5.vq_rtcpxr.collector_name=
+account.5.compact_header_enable=
+account.5.cp_source= 2
+account.5.cid_source_ppi= 1
+account.5.cid_source_privacy= 1
+account.5.reg_with_pani_header.enable =
+account.5.alert_info=
+account.5.picture_info_enable= 1
+
+##V83 Add
+account.5.invite_with_pani_header.enable = 
+
+##V84 Add
+account.5.invite_with_rpid_header.enable=
+
+account.5.auto_answer_mute_enable
+
+##V84 SP4 Add
+account.5.share_line.enable_private_code =
+account.5.share_line.cancel_private_code =
+
+#######################################################################################
+##                                 History                                           ##
+#######################################################################################
+account.5.missed_calllog=
+
+
+#######################################################################################
+##                                  Forward                                          ##
+#######################################################################################
+account.5.timeout_fwd.off_code=
+account.5.timeout_fwd.on_code=
+account.5.timeout_fwd.timeout=
+account.5.timeout_fwd.target=
+account.5.timeout_fwd.enable=
+account.5.busy_fwd.off_code=
+account.5.busy_fwd.on_code=
+account.5.busy_fwd.target=
+account.5.busy_fwd.enable=
+account.5.always_fwd.off_code=
+account.5.always_fwd.on_code=
+account.5.always_fwd.target=
+account.5.always_fwd.enable=
+
+
+#######################################################################################
+##                                  DND                                              ##
+#######################################################################################
+account.5.dnd.enable=
+account.5.dnd.off_code=
+account.5.dnd.on_code=
+
+
+
+#######################################################################################
+##                               Voice Mail                                          ##
+#######################################################################################
+voice_mail.number.1= {$voicemail_number}
+account.5.subscribe_mwi= 1
+account.5.subscribe_mwi_to_vm= {$yealink_subscribe_mwi_to_vm}
+account.5.subscribe_mwi_expires= 3600
+account.5.display_mwi.enable=
+
+#######################################################################################
+##                               Auto Dial                                           ##
+#######################################################################################
+account.5.auto_dial_enable=
+account.5.auto_dial_num=
+
+
+#######################################################################################
+##                           Preference&Status                                       ##
+#######################################################################################
+account.5.ringtone.ring_type=
+
+#######################################################################################
+##                           Digitmap                                                ##
+#######################################################################################
+account.5.dialplan.digitmap.enable=
+account.5.dialplan.digitmap.string=
+account.5.dialplan.digitmap.no_match_action=
+account.5.dialplan.digitmap.interdigit_short_timer=
+account.5.dialplan.digitmap.interdigit_long_timer=
+account.5.dialplan.digitmap.apply_to.press_send=
+account.5.dialplan.digitmap.apply_to.forward=
+account.5.dialplan.digitmap.apply_to.history_dial=
+account.5.dialplan.digitmap.apply_to.directory_dial=
+account.5.dialplan.digitmap.apply_to.on_hook_dial=
+account.5.dialplan.digitmap.active.on_hook_dialing=
+
+
+#######################################################################################
+##                                 Rings Settings                                    ##
+#######################################################################################
+account.5.alert_info_url_enable=
+
+
+#######################################################################################
+##                                  BLF/BLF List                                     ##
+#######################################################################################
+account.5.blf.blf_list_uri=
+account.5.blf_list_barge_in_code=
+account.5.blf_list_code=
+account.5.blf_list_retrieve_call_parked_code=
+account.5.blf.subscribe_period=
+account.5.blf.match_host.enable=
+account.5.out_dialog_blf_enable=
+account.5.blf.subscribe_event=
+
+##V84 Add
+account.5.blf_list_call_parked_code=
+account.5.blf_list_call_parked_list=
+
+##V84 SP4 ADD
+account.5.blf_list_whisper_code=
+account.5.blf_list_listen_in_code=
+
+
+#######################################################################################
+##                                   SCA                                             ##
+#######################################################################################
+account.5.shared_line=
+account.5.line_seize.expires=
+account.5.shared_line_one_touch_bargein.enable=
+account.5.shared_line_one_touch_retrieve.enable=
+account.5.sca_manage_interface_display_time=
+account.5.shared_line_callpull_code=
+
+##V83 Add
+account.x.share_line.barge_in.enable
+
+#######################################################################################
+##                                   BLA                                             ##
+#######################################################################################
+account.5.bla_number=
+account.5.bla_subscribe_period=
+account.5.bla.notify_with_expire.enable=
+account.5.bla.subscribe_uri_build_type=
+
+#######################################################################################
+##                                   Call Park                                       ##
+#######################################################################################
+account.5.callpark_enable=
+
+
+#######################################################################################
+##                                    Broadsoft ACD                                  ##
+#######################################################################################
+account.5.acd.enable= 0
+account.5.acd.available= 0
+account.5.acd.unavailable_reason_enable= 0
+account.5.acd.initial_state= 1
+account.5.subscribe_acd_expires=
+
+
+#######################################################################################
+##                                 Broadsoft ACD Call Center                         ##
+#######################################################################################
+##account.X.reason_code.Y=
+##account.X.reason_code_name.Y=
+##account.X.bw_disp_code.Y=
+##account.X.bw_disp_code_name.Y=
+##account.X.supervisor_info_code.Y=
+##account.X.supervisor_info_code_name.Y=
+##The value Y must be continuous.
+
+account.5.reason_code.1=
+account.5.reason_code_name.1= 0
+account.5.bw_disp_code.1=
+account.5.bw_disp_code_name.1=
+account.5.supervisor_info_code.1=
+account.5.supervisor_info_code_name.1=
+
+#######################################################################################
+##                                 Broadsoft Call Center                             ##
+#######################################################################################
+account.5.call_center.call_info_enable= 0
+account.5.call_center.show_call_info_time= 30
+account.5.call_center.disp_code_enable= 0
+account.5.call_center.trace_enable= 0
+account.5.call_center.emergency_enable= 0
+account.5.call_center.queue_status_enable= 0
+account.5.call_center.queue_status_light_enable = 0
+
+
+
+#######################################################################################
+##                         Broadsoft Hoteling                                        ##
+#######################################################################################
+account.5.hoteling.enable= 0
+account.5.hoteling.user_id= 0
+account.5.hoteling.password= 0
+account.5.hoteling.expires= 0
+account.5.hoteling.auto_login_enable= 0
+
+
+#######################################################################################
+##                              Broadsoft XSI                                        ##
+#######################################################################################
+account.5.xsi.user =
+account.5.xsi.password =
+account.5.xsi.host =
+account.5.xsi.server_type =
+account.5.xsi.port =
+
+
+#######################################################################################
+##                                Call Pickup                                        ##
+#######################################################################################
+account.5.direct_pickup_code =
+account.5.group_pickup_code =
+account.5.dialoginfo_callpickup = 0
+account.5.refresh_remote_id.enable =
+
+
+#######################################################################################
+##                              Broadsoft Call Recording                             ##
+#######################################################################################
+account.5.call_recording.enable=
+
+#######################################################################################
+##                                Network Conference                                  ##
+#######################################################################################
+account.5.conf_uri = {if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}
+
+
+#######################################################################################
+##                              Broadsoft Call Decline                               ##
+#######################################################################################
+account.5.features.call_decline.enable =
+
+
+#######################################################################################
+##                       Broadsoft Security Classification                           ##
+#######################################################################################
+account.5.security_classification.enable =
+
+
+
+#######################################################################################
+##                        Broadsoft Flexible Seating                                 ##
+#######################################################################################
+account.5.flexible_seating.enable=
+account.5.hoteling.pin=
+account.5.hoteling.mode=
+
+#######################################################################################
+##                         Features Sync                                             ##
+#######################################################################################
+account.5.features.forward.feature_key_sync.local_processing.enable=
+account.5.features.dnd.feature_key_sync.local_processing.enable =
+
+##V84 Add
+account.5.dnd.feature_key_sync.enable=
+account.5.feature_key_sync.enable=
+account.5.forward.feature_key_sync.enable=
+
+#######################################################################################
+##                                   ACD                                             ##
+#######################################################################################
+account.5.acd.available_url=
+account.5.acd.away_url =
+account.5.acd.refresh_url =
+account.5.acd.call_information=
+
+
+
+#######################################################################################
+##                                  virtual_user                                     ##
+#######################################################################################
+##V84 Add
+#bw.virtual_user.1.enable=
+#bw.virtual_user.1.label=
+#bw.virtual_user.1.xsi.dnd.enable=
+#bw.virtual_user.1.xsi.host=
+#bw.virtual_user.1.xsi.password=
+#bw.virtual_user.1.xsi.port=
+#bw.virtual_user.1.xsi.server_type=
+#bw.virtual_user.1.xsi.user=
+
+#######################################################################################
+##                                   Transfer                                        ##
+#######################################################################################
+account.6.phone_setting.call_appearance.transfer_via_new_linekey= {$yealink_transfer_via_new_linekey}
+
+
+#######################################################################################
+##                                   Conference                                      ##
+#######################################################################################
+account.6.phone_setting.call_appearance.conference_via_new_linekey=
+
+
+#######################################################################################
+##                                   Anonymous                                       ##
+#######################################################################################
+account.6.anonymous_call.server_base_only =
+account.6.send_anonymous_rejection_code =
+account.6.anonymous_reject_offcode =
+account.6.anonymous_reject_oncode =
+account.6.reject_anonymous_call=
+account.6.anonymous_call_offcode =
+account.6.anonymous_call_oncode =
+account.6.anonymous_call = 0
+account.6.send_anonymous_code =
+
+
+
+#######################################################################################
+##                          Call Configuration                                       ##
+#######################################################################################
+account.6.music_server_uri=
+account.6.music_on_hold_type=
+account.6.auto_label.rule=
+account.6.auto_label.enable=
+account.6.number_of_linekey=
+account.6.phone_setting.call_appearance.calls_per_linekey=
+
+
+#######################################################################################
+##                                    Codec                                          ##
+#######################################################################################
+account.6.codec.ilbc_15_2kbps.priority=
+account.6.codec.ilbc_15_2kbps.enable=
+
+account.6.codec.ilbc_13_33kbps.priority= {if isset($yealink_codec_iLBC_priority)}{$yealink_codec_iLBC_priority}{else}0{/if}
+
+account.6.codec.ilbc_13_33kbps.enable = {if isset($yealink_codec_iLBC_enable)}1{else}0{/if}
+
+account.6.codec.pcma.enable= {if isset($yealink_codec_pcma_enable)}1{else}0{/if}
+
+account.6.codec.pcma.priority= {if isset($yealink_codec_pcma_priority)}{$yealink_codec_pcma_priority}{else}0{/if}
+
+account.6.codec.pcmu.enable= {if isset($yealink_codec_pcmu_enable)}1{else}0{/if}
+
+account.6.codec.pcmu.priority= {if isset($yealink_codec_pcmu_priority)}{$yealink_codec_pcmu_priority}{else}0{/if}
+
+account.6.codec.opus.priority= {if isset($yealink_codec_opus_priority)}{$yealink_codec_opus_priority}{else}0{/if}
+
+account.6.codec.opus.enable= {if isset($yealink_codec_opus_enable)}1{else}0{/if}
+
+account.6.codec.opus.para= 106
+
+account.6.codec.g726_40.enable= {if isset($yealink_codec_g726_40_enable)}1{else}0{/if}
+
+account.6.codec.g726_40.priority= {if isset($yealink_codec_g726_40_priority)}{$yealink_codec_g726_40_priority}{else}0{/if}
+
+account.6.codec.g726_32.enable= {if isset($yealink_codec_g726_32_enable)}1{else}0{/if}
+
+account.6.codec.g726_32.priority= {if isset($yealink_codec_g726_32_priority)}{$yealink_codec_g726_32_priority}{else}0{/if}
+
+account.6.codec.g726_24.enable= {if isset($yealink_codec_g726_24_enable)}1{else}0{/if}
+
+account.6.codec.g726_24.priority= {if isset($yealink_codec_g726_24_priority)}{$yealink_codec_g726_24_priority}{else}0{/if}
+
+account.6.codec.g726_16.enable= {if isset($yealink_codec_g726_16_enable)}1{else}0{/if}
+
+account.6.codec.g726_16.priority= {if isset($yealink_codec_g726_16_priority)}{$yealink_codec_g726_16_priority}{else}0{/if}
+
+account.6.codec.g723_63.priority= {if isset($yealink_codec_g723_63_priority)}{$yealink_codec_g723_63_priority}{else}0{/if}
+
+account.6.codec.g723_63.enable= {if isset($yealink_codec_g723_63_enable)}1{else}0{/if}
+
+account.6.codec.g723_53.priority= {if isset($yealink_codec_g723_53_priority)}{$yealink_codec_g723_53_priority}{else}0{/if}
+
+account.6.codec.g723_53.enable= {if isset($yealink_codec_g723_53_enable)}1{else}0{/if}
+
+account.6.codec.g729.priority= {if isset($yealink_codec_g729_priority)}{$yealink_codec_g729_priority}{else}0{/if}
+
+account.6.codec.g729.enable= {if isset($yealink_codec_g729_enable)}1{else}0{/if}
+
+account.6.codec.g722.priority= {if isset($yealink_codec_g722_priority)}{$yealink_codec_g722_priority}{else}0{/if}
+
+account.6.codec.g722.enable= {if isset($yealink_codec_g722_enable)}1{else}0{/if}
+
+account.6.codec.G722_1_24kpbs.priority=
+account.6.codec.G722_1_24kpbs.enable=
+account.6.codec.G722_1c_24kpbs.priority=
+account.6.codec.G722_1c_24kpbs.enable=
+account.6.codec.G722_1c_32kpbs.priority=
+account.6.codec.G722_1c_32kpbs.enable=
+account.6.codec.G722_1c_48kpbs.priority=
+account.6.codec.G722_1c_48kpbs.enable=
+
+################################################################
+#                      Account6 Register                       ##
+################################################################
+{if isset($account.6.password) }
+account.6.enable = 1
+{else}
+account.6.enable = 0
+{/if}
+account.6.label = {$account.6.display_name}
+account.6.display_name = {$account.6.display_name}
+account.6.auth_name = {$account.6.auth_id}
+
+{if isset($account.6.server.1.address)}
+account.6.user_name = {$account.6.user_id}@{$account.6.server_address}
+{else}
+account.6.user_name = {$account.6.user_id}
+{/if}
+
+account.6.password = {$account.6.password}
+account.6.sip_server.1.address= {$account.6.server_address}
+account.6.sip_server_port = {$account.6.sip_port}
+
+
+#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
+{if $account.6.sip_transport == 'udp'}account.6.sip_server.1.transport_type = 0{/if}
+{if $account.6.sip_transport == 'tcp'}account.6.sip_server.1.transport_type = 1{/if}
+{if $account.6.sip_transport == 'tls'}account.6.sip_server.1.transport_type = 2{/if}
+{if $account.6.sip_transport == 'dns srv'}account.6.sip_server.1.transport_type = 3{/if}
+
+account.6.sip_server.1.expires=  {$account.6.register_expires}
+account.6.sip_server.1.retry_counts= 3
+
+account.6.sip_server.2.address= {$account.6.server.2.address}
+account.6.sip_server.2.port= {$account.6.sip_port}
+
+#Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS-NAPTR;
+{if $account.6.sip_transport == 'udp'}account.6.sip_server.2.transport_type = 0{/if}
+{if $account.6.sip_transport == 'tcp'}account.6.sip_server.2.transport_type = 1{/if}
+{if $account.6.sip_transport == 'tls'}account.6.sip_server.2.transport_type = 2{/if}
+{if $account.6.sip_transport == 'dns srv'}account.6.sip_server.2.transport_type = 3{/if}
+
+account.6.sip_server.2.expires= {$account.6.register_expires}
+account.6.sip_server.2.retry_counts= 3
+
+account.6.outbound_proxy_enable = {if isset($account.6.outbound_proxy_primary)}1{else}0{/if}
+
+account.6.outbound_proxy.1.address = {$account.6.outbound_proxy_primary}
+account.6.outbound_proxy.2.address = {$account.6.outbound_proxy_secondary}
+
+{if isset($outbound_proxy_1_port)}
+account.6.outbound_proxy.1.port = {$outbound_proxy_1_port}
+{else}
+account.6.outbound_proxy.1.port = {$account.6.sip_port}
+{/if}
+
+account.6.outbound_proxy.2.address= {$account.6.outbound_proxy_secondary}
+
+{if isset($outbound_proxy_1_port)}
+account.6.outbound_proxy.2.port = {$outbound_proxy_2_port}
+{else}
+account.6.outbound_proxy.2.port = {$account.6.sip_port}
+{/if}
+
+account.6.outbound_proxy_fallback_interval= {$yealink_outbound_proxy_fallback_interval}
+
+account.6.nat.nat_traversal= {if isset($stun_server)}1{else}0{/if}
+
+
+
+################################################################
+#                      Account Basic                          ##
+################################################################
+account.6.auto_answer=
+
+################################################################
+#                      Account Advanced                       ##
+################################################################
+account.6.nat.udp_update_enable=
+account.6.nat.udp_update_time=
+account.6.nat.rport= {$yealink_rport}
+
+account.6.dtmf.type= {$yealink_dtmf_type}
+account.6.dtmf.info_type=
+account.6.dtmf.dtmf_payload=
+account.6.100rel_enable=
+
+account.6.subscribe_register=
+account.6.cid_source= {$yealink_cid_source}
+account.6.enable_user_equal_phone=
+account.6.srtp_encryption= {$yealink_srtp_encryption}
+account.6.ptime=
+account.6.register_line=
+account.6.register_mac=
+account.6.reg_fail_retry_interval=
+account.6.unregister_on_reboot=
+
+account.6.session_timer.refresher=
+account.6.session_timer.expires=
+account.6.session_timer.enable= {$yealink_session_timer}
+
+account.6.conf_type = {if $nway_conference == true}2{/if}
+account.6.sip_server_type=
+
+##V83 Add
+account.6.srtp.unencrypted_rtcp.enable =
+account.6.srtp.unencrypted_rtp.enable =
+account.6.sip_server_mode =
+
+
+
+################################################################
+#                        SIP Backup Server                    ##
+################################################################
+account.6.outbound_proxy.1.register_on_enable=
+account.6.outbound_proxy.1.failback_timeout=
+account.6.outbound_proxy.1.failback_mode=
+account.6.outbound_proxy.1.retry_counts=
+account.6.outbound_proxy.1.only_signal_with_registered=
+account.6.outbound_proxy.1.failback_subscribe.enable=
+account.6.outbound_proxy.1.invite_retry_counts=
+
+account.6.sip_server.1.register_on_enable=
+account.6.sip_server.1.failback_timeout=
+account.6.sip_server.1.failback_mode=
+account.6.sip_server.1.failback_subscribe.enable=
+account.6.sip_server.1.only_signal_with_registered=
+account.6.sip_server.1.invite_retry_counts=
+
+account.6.outbound_proxy.2.register_on_enable=
+account.6.outbound_proxy.2.failback_timeout=
+account.6.outbound_proxy.2.failback_mode=
+account.6.outbound_proxy.2.retry_counts=
+account.6.outbound_proxy.2.only_signal_with_registered=
+account.6.outbound_proxy.2.failback_subscribe.enable=
+account.6.outbound_proxy.2.invite_retry_counts=
+
+account.6.sip_server.2.register_on_enable=
+account.6.sip_server.2.failback_timeout=
+account.6.sip_server.2.failback_mode=
+account.6.sip_server.2.failback_subscribe.enable=
+account.6.sip_server.2.only_signal_with_registered=
+account.6.sip_server.2.invite_retry_counts=
+
+account.6.static_cache_pri=
+account.6.dns_cache_type=
+account.6.naptr_build=
+account.6.fallback.timeout=
+account.6.fallback.redundancy_type=
+account.6.reg_failed_retry_max_time=
+account.6.reg_failed_retry_min_time=
+account.6.redundancy_with_reg_fail.enable =
+
+##V83 Add
+account.6.sip_server.1.outbound_proxy_enable =
+account.6.sip_server.2.outbound_proxy_enable =
+
+################################################################
+#                        SIP Basic config                     ##
+################################################################
+account.6.contact_take_line_param=
+account.6.update_ack_while_dialing=
+account.6.srtp_lifetime=
+account.6.third_part_request_with_route.enable=
+account.6.insert_outbound_in_route.enable=
+account.6.path.enable=
+account.6.sub_fail_retry_interval=
+account.6.transfer_refer_to_contact_header.enable=
+account.6.hold_use_inactive=
+account.6.gruu.enable=
+account.6.dial_tone=
+account.6.call_id_mode=
+account.6.subscribe_expires_overlap=
+account.6.register_expires_overlap=
+account.6.call_info=
+account.6.custom_ua=
+account.6.mwi_parse_terminated=
+account.6.check_cseq.enable=
+account.6.check_to_tag.enable=
+account.6.vq_rtcpxr.collector_server_port=
+account.6.vq_rtcpxr.collector_server_host=
+account.6.vq_rtcpxr.collector_name=
+account.6.compact_header_enable=
+account.6.cp_source= 2
+account.6.cid_source_ppi= 1
+account.6.cid_source_privacy= 1
+account.6.reg_with_pani_header.enable =
+account.6.alert_info=
+account.6.picture_info_enable= 1
+
+##V83 Add
+account.6.invite_with_pani_header.enable = 
+
+##V84 Add
+account.6.invite_with_rpid_header.enable=
+
+account.6.auto_answer_mute_enable
+
+##V84 SP4 Add
+account.6.share_line.enable_private_code =
+account.6.share_line.cancel_private_code =
+
+#######################################################################################
+##                                 History                                           ##
+#######################################################################################
+account.6.missed_calllog=
+
+
+#######################################################################################
+##                                  Forward                                          ##
+#######################################################################################
+account.6.timeout_fwd.off_code=
+account.6.timeout_fwd.on_code=
+account.6.timeout_fwd.timeout=
+account.6.timeout_fwd.target=
+account.6.timeout_fwd.enable=
+account.6.busy_fwd.off_code=
+account.6.busy_fwd.on_code=
+account.6.busy_fwd.target=
+account.6.busy_fwd.enable=
+account.6.always_fwd.off_code=
+account.6.always_fwd.on_code=
+account.6.always_fwd.target=
+account.6.always_fwd.enable=
+
+
+#######################################################################################
+##                                  DND                                              ##
+#######################################################################################
+account.6.dnd.enable=
+account.6.dnd.off_code=
+account.6.dnd.on_code=
+
+
+
+#######################################################################################
+##                               Voice Mail                                          ##
+#######################################################################################
+voice_mail.number.1= {$voicemail_number}
+account.6.subscribe_mwi= 1
+account.6.subscribe_mwi_to_vm= {$yealink_subscribe_mwi_to_vm}
+account.6.subscribe_mwi_expires= 3600
+account.6.display_mwi.enable=
+
+#######################################################################################
+##                               Auto Dial                                           ##
+#######################################################################################
+account.6.auto_dial_enable=
+account.6.auto_dial_num=
+
+
+#######################################################################################
+##                           Preference&Status                                       ##
+#######################################################################################
+account.6.ringtone.ring_type=
+
+#######################################################################################
+##                           Digitmap                                                ##
+#######################################################################################
+account.6.dialplan.digitmap.enable=
+account.6.dialplan.digitmap.string=
+account.6.dialplan.digitmap.no_match_action=
+account.6.dialplan.digitmap.interdigit_short_timer=
+account.6.dialplan.digitmap.interdigit_long_timer=
+account.6.dialplan.digitmap.apply_to.press_send=
+account.6.dialplan.digitmap.apply_to.forward=
+account.6.dialplan.digitmap.apply_to.history_dial=
+account.6.dialplan.digitmap.apply_to.directory_dial=
+account.6.dialplan.digitmap.apply_to.on_hook_dial=
+account.6.dialplan.digitmap.active.on_hook_dialing=
+
+
+#######################################################################################
+##                                 Rings Settings                                    ##
+#######################################################################################
+account.6.alert_info_url_enable=
+
+
+#######################################################################################
+##                                  BLF/BLF List                                     ##
+#######################################################################################
+account.6.blf.blf_list_uri=
+account.6.blf_list_barge_in_code=
+account.6.blf_list_code=
+account.6.blf_list_retrieve_call_parked_code=
+account.6.blf.subscribe_period=
+account.6.blf.match_host.enable=
+account.6.out_dialog_blf_enable=
+account.6.blf.subscribe_event=
+
+##V84 Add
+account.6.blf_list_call_parked_code=
+account.6.blf_list_call_parked_list=
+
+##V84 SP4 ADD
+account.6.blf_list_whisper_code=
+account.6.blf_list_listen_in_code=
+
+
+#######################################################################################
+##                                   SCA                                             ##
+#######################################################################################
+account.6.shared_line=
+account.6.line_seize.expires=
+account.6.shared_line_one_touch_bargein.enable=
+account.6.shared_line_one_touch_retrieve.enable=
+account.6.sca_manage_interface_display_time=
+account.6.shared_line_callpull_code=
+
+##V83 Add
+account.x.share_line.barge_in.enable
+
+#######################################################################################
+##                                   BLA                                             ##
+#######################################################################################
+account.6.bla_number=
+account.6.bla_subscribe_period=
+account.6.bla.notify_with_expire.enable=
+account.6.bla.subscribe_uri_build_type=
+
+#######################################################################################
+##                                   Call Park                                       ##
+#######################################################################################
+account.6.callpark_enable=
+
+
+#######################################################################################
+##                                    Broadsoft ACD                                  ##
+#######################################################################################
+account.6.acd.enable= 0
+account.6.acd.available= 0
+account.6.acd.unavailable_reason_enable= 0
+account.6.acd.initial_state= 1
+account.6.subscribe_acd_expires=
+
+
+#######################################################################################
+##                                 Broadsoft ACD Call Center                         ##
+#######################################################################################
+##account.X.reason_code.Y=
+##account.X.reason_code_name.Y=
+##account.X.bw_disp_code.Y=
+##account.X.bw_disp_code_name.Y=
+##account.X.supervisor_info_code.Y=
+##account.X.supervisor_info_code_name.Y=
+##The value Y must be continuous.
+
+account.6.reason_code.1=
+account.6.reason_code_name.1= 0
+account.6.bw_disp_code.1=
+account.6.bw_disp_code_name.1=
+account.6.supervisor_info_code.1=
+account.6.supervisor_info_code_name.1=
+
+#######################################################################################
+##                                 Broadsoft Call Center                             ##
+#######################################################################################
+account.6.call_center.call_info_enable= 0
+account.6.call_center.show_call_info_time= 30
+account.6.call_center.disp_code_enable= 0
+account.6.call_center.trace_enable= 0
+account.6.call_center.emergency_enable= 0
+account.6.call_center.queue_status_enable= 0
+account.6.call_center.queue_status_light_enable = 0
+
+
+
+#######################################################################################
+##                         Broadsoft Hoteling                                        ##
+#######################################################################################
+account.6.hoteling.enable= 0
+account.6.hoteling.user_id= 0
+account.6.hoteling.password= 0
+account.6.hoteling.expires= 0
+account.6.hoteling.auto_login_enable= 0
+
+
+#######################################################################################
+##                              Broadsoft XSI                                        ##
+#######################################################################################
+account.6.xsi.user =
+account.6.xsi.password =
+account.6.xsi.host =
+account.6.xsi.server_type =
+account.6.xsi.port =
+
+
+#######################################################################################
+##                                Call Pickup                                        ##
+#######################################################################################
+account.6.direct_pickup_code =
+account.6.group_pickup_code =
+account.6.dialoginfo_callpickup = 0
+account.6.refresh_remote_id.enable =
+
+
+#######################################################################################
+##                              Broadsoft Call Recording                             ##
+#######################################################################################
+account.6.call_recording.enable=
+
+#######################################################################################
+##                                Network Conference                                  ##
+#######################################################################################
+account.6.conf_uri = {if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}
+
+
+#######################################################################################
+##                              Broadsoft Call Decline                               ##
+#######################################################################################
+account.6.features.call_decline.enable =
+
+
+#######################################################################################
+##                       Broadsoft Security Classification                           ##
+#######################################################################################
+account.6.security_classification.enable =
+
+
+
+#######################################################################################
+##                        Broadsoft Flexible Seating                                 ##
+#######################################################################################
+account.6.flexible_seating.enable=
+account.6.hoteling.pin=
+account.6.hoteling.mode=
+
+#######################################################################################
+##                         Features Sync                                             ##
+#######################################################################################
+account.6.features.forward.feature_key_sync.local_processing.enable=
+account.6.features.dnd.feature_key_sync.local_processing.enable =
+
+##V84 Add
+account.6.dnd.feature_key_sync.enable=
+account.6.feature_key_sync.enable=
+account.6.forward.feature_key_sync.enable=
+
+#######################################################################################
+##                                   ACD                                             ##
+#######################################################################################
+account.6.acd.available_url=
+account.6.acd.away_url =
+account.6.acd.refresh_url =
+account.6.acd.call_information=
+
+
+
+#######################################################################################
+##                                  virtual_user                                     ##
+#######################################################################################
+##V84 Add
+#bw.virtual_user.1.enable=
+#bw.virtual_user.1.label=
+#bw.virtual_user.1.xsi.dnd.enable=
+#bw.virtual_user.1.xsi.host=
+#bw.virtual_user.1.xsi.password=
+#bw.virtual_user.1.xsi.port=
+#bw.virtual_user.1.xsi.server_type=
+#bw.virtual_user.1.xsi.user=
diff --git a/resources/templates/provision/yealink/t48g/y000000000035.cfg b/resources/templates/provision/yealink/t48g/y000000000035.cfg
index 2ff25a4395..d771862895 100644
--- a/resources/templates/provision/yealink/t48g/y000000000035.cfg
+++ b/resources/templates/provision/yealink/t48g/y000000000035.cfg
@@ -868,6 +868,7 @@ features.password_dial.length =
 #######################################################################################
 #Enable or disable the phone to save the call history; 0-Disabled, 1-Enabled (default);
 features.save_call_history =
+features.save_init_num_to_history.enable = 0
 
 #######################################################################################
 ##                                   Features Pickup                                 ##
diff --git a/resources/templates/provision/yealink/t48g/{$mac}.cfg b/resources/templates/provision/yealink/t48g/{$mac}.cfg
index bea7494984..0c1386190a 100644
--- a/resources/templates/provision/yealink/t48g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t48g/{$mac}.cfg
@@ -395,10 +395,10 @@ account.1.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.1.conf_type =
+account.1.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.1.conf_uri =
+account.1.conf_uri = {if $nway_conference == true}nway{$account.1.auth_id}@{$account.1.server_address}{/if}
 
 #######################################################################################
 ##                            cid_source                                             ##
@@ -867,10 +867,10 @@ account.2.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.2.conf_type =
+account.2.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.2.conf_uri =
+account.2.conf_uri = {if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -1353,10 +1353,10 @@ account.3.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.3.conf_type =
+account.3.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.3.conf_uri =
+account.3.conf_uri = {if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -1829,10 +1829,10 @@ account.4.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.4.conf_type =
+account.4.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.4.conf_uri =
+account.4.conf_uri = {if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -2305,10 +2305,10 @@ account.5.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.5.conf_type =
+account.5.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.5.conf_uri =
+account.5.conf_uri = {if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -2780,10 +2780,10 @@ account.6.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.6.conf_type =
+account.6.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.6.conf_uri =
+account.6.conf_uri = {if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
diff --git a/resources/templates/provision/yealink/t48s/y000000000065.cfg b/resources/templates/provision/yealink/t48s/y000000000065.cfg
index 30a55e4775..afcc6a5766 100644
--- a/resources/templates/provision/yealink/t48s/y000000000065.cfg
+++ b/resources/templates/provision/yealink/t48s/y000000000065.cfg
@@ -832,7 +832,7 @@ features.save_call_history=
 features.call_log_show_num=
 search_in_dialing.history.enable=
 directory_setting.history.enable=
-features.save_init_num_to_history.enable=
+features.save_init_num_to_history.enable= 0
 features.redial_via_local_sip_server.enable=
 
 
@@ -847,7 +847,11 @@ static.auto_provision.local_contact.backup.enable=
 ##                          Contact Other                                            ##
 #######################################################################################
 directory.search_type=
+{if isset($yealink_local_directory_enable)}
+directory_setting.local_directory.enable = {$yealink_local_directory_enable}
+{else}
 directory_setting.local_directory.enable =
+{/if}
 directory_setting.local_directory.priority =
 
 
diff --git a/resources/templates/provision/yealink/t48s/{$mac}.cfg b/resources/templates/provision/yealink/t48s/{$mac}.cfg
index ee4a0a2dda..69b95c2eb8 100644
--- a/resources/templates/provision/yealink/t48s/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t48s/{$mac}.cfg
@@ -394,10 +394,10 @@ account.1.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.1.conf_type =
+account.1.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.1.conf_uri =
+account.1.conf_uri = {if $nway_conference == true}nway{$account.1.auth_id}@{$account.1.server_address}{/if}
 
 #######################################################################################
 ##                            cid_source                                             ##
@@ -870,10 +870,10 @@ account.2.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.2.conf_type =
+account.2.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.2.conf_uri =
+account.2.conf_uri = {if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -1357,10 +1357,10 @@ account.3.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.3.conf_type =
+account.3.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.3.conf_uri =
+account.3.conf_uri = {if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -1829,10 +1829,10 @@ account.4.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.4.conf_type =
+account.4.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.4.conf_uri =
+account.4.conf_uri = {if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -2301,10 +2301,10 @@ account.5.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.5.conf_type =
+account.5.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.5.conf_uri =
+account.5.conf_uri = {if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -2772,10 +2772,10 @@ account.6.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.6.conf_type =
+account.6.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.6.conf_uri =
+account.6.conf_uri = {if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
diff --git a/resources/templates/provision/yealink/t49g/y000000000051.cfg b/resources/templates/provision/yealink/t49g/y000000000051.cfg
index 724e46f934..4e0bfcd2ce 100644
--- a/resources/templates/provision/yealink/t49g/y000000000051.cfg
+++ b/resources/templates/provision/yealink/t49g/y000000000051.cfg
@@ -828,6 +828,7 @@ features.password_dial.length =
 #######################################################################################
 #Enable or disable the phone to save the call history; 0-Disabled, 1-Enabled (default);
 features.save_call_history =
+features.save_init_num_to_history.enable = 0
 
 #######################################################################################
 ##                                   Features Pickup                                 ##
diff --git a/resources/templates/provision/yealink/t49g/{$mac}.cfg b/resources/templates/provision/yealink/t49g/{$mac}.cfg
index 94de919f95..b82007dae9 100644
--- a/resources/templates/provision/yealink/t49g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t49g/{$mac}.cfg
@@ -395,10 +395,10 @@ account.1.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.1.conf_type =
+account.1.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.1.conf_uri =
+account.1.conf_uri = {if $nway_conference == true}nway{$account.1.auth_id}@{$account.1.server_address}{/if}
 
 #######################################################################################
 ##                            cid_source                                             ##
@@ -867,10 +867,10 @@ account.2.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.2.conf_type =
+account.2.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.2.conf_uri =
+account.2.conf_uri = {if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -1392,10 +1392,10 @@ account.3.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.3.conf_type =
+account.3.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.3.conf_uri =
+account.3.conf_uri = {if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -1891,10 +1891,10 @@ account.4.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.4.conf_type =
+account.4.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.4.conf_uri =
+account.4.conf_uri = {if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -2390,10 +2390,10 @@ account.5.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.5.conf_type =
+account.5.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.5.conf_uri =
+account.5.conf_uri = {if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -2888,10 +2888,10 @@ account.6.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.6.conf_type =
+account.6.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.6.conf_uri =
+account.6.conf_uri = {if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
diff --git a/resources/templates/provision/yealink/t4x/y000000000028.cfg b/resources/templates/provision/yealink/t4x/y000000000028.cfg
index 98f22aaefd..eb1be1dcf4 100644
--- a/resources/templates/provision/yealink/t4x/y000000000028.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000028.cfg
@@ -868,6 +868,7 @@ features.password_dial.length =
 #######################################################################################
 #Enable or disable the phone to save the call history; 0-Disabled, 1-Enabled (default);
 features.save_call_history =
+features.save_init_num_to_history.enable = 0
 
 #######################################################################################
 ##                                   Features Pickup                                 ##
diff --git a/resources/templates/provision/yealink/t4x/y000000000029.cfg b/resources/templates/provision/yealink/t4x/y000000000029.cfg
index 9293f3bca3..7b502116b3 100644
--- a/resources/templates/provision/yealink/t4x/y000000000029.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000029.cfg
@@ -868,6 +868,7 @@ features.password_dial.length =
 #######################################################################################
 #Enable or disable the phone to save the call history; 0-Disabled, 1-Enabled (default);
 features.save_call_history =
+features.save_init_num_to_history.enable = 0
 
 #######################################################################################
 ##                                   Features Pickup                                 ##
diff --git a/resources/templates/provision/yealink/t4x/y000000000035.cfg b/resources/templates/provision/yealink/t4x/y000000000035.cfg
index cff8c9b0e9..4007034d1e 100644
--- a/resources/templates/provision/yealink/t4x/y000000000035.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000035.cfg
@@ -868,6 +868,7 @@ features.password_dial.length =
 #######################################################################################
 #Enable or disable the phone to save the call history; 0-Disabled, 1-Enabled (default);
 features.save_call_history =
+features.save_init_num_to_history.enable = 0
 
 #######################################################################################
 ##                                   Features Pickup                                 ##
diff --git a/resources/templates/provision/yealink/t4x/y000000000036.cfg b/resources/templates/provision/yealink/t4x/y000000000036.cfg
index dff9ca83df..13da6ebc60 100644
--- a/resources/templates/provision/yealink/t4x/y000000000036.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000036.cfg
@@ -869,6 +869,7 @@ features.password_dial.length =
 #######################################################################################
 #Enable or disable the phone to save the call history; 0-Disabled, 1-Enabled (default);
 features.save_call_history =
+features.save_init_num_to_history.enable = 0
 
 #######################################################################################
 ##                                   Features Pickup                                 ##
diff --git a/resources/templates/provision/yealink/t4x/y000000000054.cfg b/resources/templates/provision/yealink/t4x/y000000000054.cfg
index d07147017e..a5f872e62d 100644
--- a/resources/templates/provision/yealink/t4x/y000000000054.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000054.cfg
@@ -869,6 +869,7 @@ features.password_dial.length =
 #######################################################################################
 #Enable or disable the phone to save the call history; 0-Disabled, 1-Enabled (default);
 features.save_call_history =
+features.save_init_num_to_history.enable = 0
 
 #######################################################################################
 ##                                   Features Pickup                                 ##
diff --git a/resources/templates/provision/yealink/t4x/y000000000065.cfg b/resources/templates/provision/yealink/t4x/y000000000065.cfg
index 1f4bb7a0e5..5881bc637d 100644
--- a/resources/templates/provision/yealink/t4x/y000000000065.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000065.cfg
@@ -831,7 +831,7 @@ features.save_call_history=
 features.call_log_show_num=
 search_in_dialing.history.enable=
 directory_setting.history.enable=
-features.save_init_num_to_history.enable=
+features.save_init_num_to_history.enable= 0
 features.redial_via_local_sip_server.enable=
 
 
@@ -846,7 +846,11 @@ static.auto_provision.local_contact.backup.enable=
 ##                          Contact Other                                            ##
 #######################################################################################
 directory.search_type=
+{if isset($yealink_local_directory_enable)}
+directory_setting.local_directory.enable = {$yealink_local_directory_enable}
+{else}
 directory_setting.local_directory.enable =
+{/if}
 directory_setting.local_directory.priority =
 
 
diff --git a/resources/templates/provision/yealink/t4x/y000000000066.cfg b/resources/templates/provision/yealink/t4x/y000000000066.cfg
index c6edb16fbc..06e9d7c3e9 100644
--- a/resources/templates/provision/yealink/t4x/y000000000066.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000066.cfg
@@ -789,7 +789,7 @@ features.save_call_history=
 features.call_log_show_num=
 search_in_dialing.history.enable=
 directory_setting.history.enable=
-features.save_init_num_to_history.enable=
+features.save_init_num_to_history.enable= 0
 features.redial_via_local_sip_server.enable=
 
 
@@ -804,7 +804,11 @@ static.auto_provision.local_contact.backup.enable=
 ##                          Contact Other                                            ##
 #######################################################################################
 directory.search_type=
+{if isset($yealink_local_directory_enable)}
+directory_setting.local_directory.enable = {$yealink_local_directory_enable}
+{else}
 directory_setting.local_directory.enable =
+{/if}
 directory_setting.local_directory.priority =
 
 
diff --git a/resources/templates/provision/yealink/t4x/y000000000067.cfg b/resources/templates/provision/yealink/t4x/y000000000067.cfg
index 7a4b7da648..fb69b1db62 100644
--- a/resources/templates/provision/yealink/t4x/y000000000067.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000067.cfg
@@ -789,7 +789,7 @@ features.save_call_history=
 features.call_log_show_num=
 search_in_dialing.history.enable=
 directory_setting.history.enable=
-features.save_init_num_to_history.enable=
+features.save_init_num_to_history.enable= 0
 features.redial_via_local_sip_server.enable=
 
 
@@ -804,7 +804,11 @@ static.auto_provision.local_contact.backup.enable=
 ##                          Contact Other                                            ##
 #######################################################################################
 directory.search_type=
+{if isset($yealink_local_directory_enable)}
+directory_setting.local_directory.enable = {$yealink_local_directory_enable}
+{else}
 directory_setting.local_directory.enable =
+{/if}
 directory_setting.local_directory.priority =
 
 
diff --git a/resources/templates/provision/yealink/t4x/y000000000068.cfg b/resources/templates/provision/yealink/t4x/y000000000068.cfg
index 5a91a12b24..31a29b42e2 100644
--- a/resources/templates/provision/yealink/t4x/y000000000068.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000068.cfg
@@ -790,7 +790,7 @@ features.save_call_history=
 features.call_log_show_num=
 search_in_dialing.history.enable=
 directory_setting.history.enable=
-features.save_init_num_to_history.enable=
+features.save_init_num_to_history.enable= 0
 features.redial_via_local_sip_server.enable=
 
 
@@ -805,7 +805,11 @@ static.auto_provision.local_contact.backup.enable=
 ##                          Contact Other                                            ##
 #######################################################################################
 directory.search_type=
+{if isset($yealink_local_directory_enable)}
+directory_setting.local_directory.enable = {$yealink_local_directory_enable}
+{else}
 directory_setting.local_directory.enable =
+{/if}
 directory_setting.local_directory.priority =
 
 
diff --git a/resources/templates/provision/yealink/t4x/y000000000076.cfg b/resources/templates/provision/yealink/t4x/y000000000076.cfg
index 8ea3e5446e..267fa1e5fa 100644
--- a/resources/templates/provision/yealink/t4x/y000000000076.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000076.cfg
@@ -869,6 +869,7 @@ features.password_dial.length =
 #######################################################################################
 #Enable or disable the phone to save the call history; 0-Disabled, 1-Enabled (default);
 features.save_call_history =
+features.save_init_num_to_history.enable = 0
 
 #######################################################################################
 ##                                   Features Pickup                                 ##
diff --git a/resources/templates/provision/yealink/t4x/y000000000107.cfg b/resources/templates/provision/yealink/t4x/y000000000107.cfg
index 1f4bb7a0e5..5881bc637d 100644
--- a/resources/templates/provision/yealink/t4x/y000000000107.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000107.cfg
@@ -831,7 +831,7 @@ features.save_call_history=
 features.call_log_show_num=
 search_in_dialing.history.enable=
 directory_setting.history.enable=
-features.save_init_num_to_history.enable=
+features.save_init_num_to_history.enable= 0
 features.redial_via_local_sip_server.enable=
 
 
@@ -846,7 +846,11 @@ static.auto_provision.local_contact.backup.enable=
 ##                          Contact Other                                            ##
 #######################################################################################
 directory.search_type=
+{if isset($yealink_local_directory_enable)}
+directory_setting.local_directory.enable = {$yealink_local_directory_enable}
+{else}
 directory_setting.local_directory.enable =
+{/if}
 directory_setting.local_directory.priority =
 
 
diff --git a/resources/templates/provision/yealink/t4x/y000000000108.cfg b/resources/templates/provision/yealink/t4x/y000000000108.cfg
index a004af0251..9dca7962bb 100644
--- a/resources/templates/provision/yealink/t4x/y000000000108.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000108.cfg
@@ -789,7 +789,7 @@ features.save_call_history=
 features.call_log_show_num=
 search_in_dialing.history.enable=
 directory_setting.history.enable=
-features.save_init_num_to_history.enable=
+features.save_init_num_to_history.enable= 0
 features.redial_via_local_sip_server.enable=
 
 
@@ -804,7 +804,11 @@ static.auto_provision.local_contact.backup.enable=
 ##                          Contact Other                                            ##
 #######################################################################################
 directory.search_type=
+{if isset($yealink_local_directory_enable)}
+directory_setting.local_directory.enable = {$yealink_local_directory_enable}
+{else}
 directory_setting.local_directory.enable =
+{/if}
 directory_setting.local_directory.priority =
 
 
diff --git a/resources/templates/provision/yealink/t4x/y000000000109.cfg b/resources/templates/provision/yealink/t4x/y000000000109.cfg
index 1f4bb7a0e5..5881bc637d 100644
--- a/resources/templates/provision/yealink/t4x/y000000000109.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000109.cfg
@@ -831,7 +831,7 @@ features.save_call_history=
 features.call_log_show_num=
 search_in_dialing.history.enable=
 directory_setting.history.enable=
-features.save_init_num_to_history.enable=
+features.save_init_num_to_history.enable= 0
 features.redial_via_local_sip_server.enable=
 
 
@@ -846,7 +846,11 @@ static.auto_provision.local_contact.backup.enable=
 ##                          Contact Other                                            ##
 #######################################################################################
 directory.search_type=
+{if isset($yealink_local_directory_enable)}
+directory_setting.local_directory.enable = {$yealink_local_directory_enable}
+{else}
 directory_setting.local_directory.enable =
+{/if}
 directory_setting.local_directory.priority =
 
 
diff --git a/resources/templates/provision/yealink/t4x/y000000000116.cfg b/resources/templates/provision/yealink/t4x/y000000000116.cfg
index 7a4b7da648..fb69b1db62 100644
--- a/resources/templates/provision/yealink/t4x/y000000000116.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000116.cfg
@@ -789,7 +789,7 @@ features.save_call_history=
 features.call_log_show_num=
 search_in_dialing.history.enable=
 directory_setting.history.enable=
-features.save_init_num_to_history.enable=
+features.save_init_num_to_history.enable= 0
 features.redial_via_local_sip_server.enable=
 
 
@@ -804,7 +804,11 @@ static.auto_provision.local_contact.backup.enable=
 ##                          Contact Other                                            ##
 #######################################################################################
 directory.search_type=
+{if isset($yealink_local_directory_enable)}
+directory_setting.local_directory.enable = {$yealink_local_directory_enable}
+{else}
 directory_setting.local_directory.enable =
+{/if}
 directory_setting.local_directory.priority =
 
 
diff --git a/resources/templates/provision/yealink/t4x/{$mac}.cfg b/resources/templates/provision/yealink/t4x/{$mac}.cfg
index ee89400b48..3b510772bd 100644
--- a/resources/templates/provision/yealink/t4x/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t4x/{$mac}.cfg
@@ -347,10 +347,10 @@ account.{$row.line_number}.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type 0-Local (default), 2-Network Conference
-account.{$row.line_number}.conf_type =
+account.{$row.line_number}.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.{$row.line_number}.conf_uri =
+account.{$row.line_number}.conf_uri = {if $nway_conference == true}nway{$account.{$row.line_number}.user_id}@{$account.{$row.line_number}.server_address}{/if}
 
 #######################################################################################
 ##                            cid_source                                             ##
diff --git a/resources/templates/provision/yealink/t52s/y000000000074.cfg b/resources/templates/provision/yealink/t52s/y000000000074.cfg
index f8bceed792..dc6ec756d8 100644
--- a/resources/templates/provision/yealink/t52s/y000000000074.cfg
+++ b/resources/templates/provision/yealink/t52s/y000000000074.cfg
@@ -789,7 +789,7 @@ features.save_call_history=
 features.call_log_show_num=
 search_in_dialing.history.enable=
 directory_setting.history.enable=
-features.save_init_num_to_history.enable=
+features.save_init_num_to_history.enable= 0
 features.redial_via_local_sip_server.enable=
 
 
@@ -804,7 +804,11 @@ static.auto_provision.local_contact.backup.enable=
 ##                          Contact Other                                            ##
 #######################################################################################
 directory.search_type=
+{if isset($yealink_local_directory_enable)}
+directory_setting.local_directory.enable = {$yealink_local_directory_enable}
+{else}
 directory_setting.local_directory.enable =
+{/if}
 directory_setting.local_directory.priority =
 
 
diff --git a/resources/templates/provision/yealink/t52s/{$mac}.cfg b/resources/templates/provision/yealink/t52s/{$mac}.cfg
index 0577888397..615fc24765 100644
--- a/resources/templates/provision/yealink/t52s/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t52s/{$mac}.cfg
@@ -361,7 +361,7 @@ account.1.session_timer.refresher=
 account.1.session_timer.expires=
 account.1.session_timer.enable= {$yealink_session_timer}
 
-account.1.conf_type=
+account.1.conf_type = {if $nway_conference == true}2{/if}
 account.1.sip_server_type=
 
 account.2.nat.udp_update_enable= 3
@@ -387,7 +387,8 @@ account.2.session_timer.refresher=
 account.2.session_timer.expires=
 account.2.session_timer.enable= {$yealink_session_timer}
 
-account.2.conf_type=
+account.2.conf_type = {if $nway_conference == true}2{/if}
+account.2.conf_uri = {if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}
 account.2.sip_server_type=
 
 
@@ -668,7 +669,7 @@ account.1.refresh_remote_id.enable =
 #######################################################################################
 ##                                Network Conferene                                  ##       
 #######################################################################################
-account.1.conf_uri=
+account.1.conf_uri = {if $nway_conference == true}nway{$account.1.auth_id}@{$account.1.server_address}{/if}
 
 
 #######################################################################################
diff --git a/resources/templates/provision/yealink/t53/directory.xml b/resources/templates/provision/yealink/t53/directory.xml
new file mode 100644
index 0000000000..297b9e4108
--- /dev/null
+++ b/resources/templates/provision/yealink/t53/directory.xml
@@ -0,0 +1,83 @@
+<YealinkIPPhoneDirectory>
+{foreach $contacts as $row}
+{if $smarty.get.contacts == "users" && $row.category == "users"}
+<DirectoryEntry>
+{if $row.contact_name_given != ""}
+{if $row.contact_organization != ""}
+	<Name>{$row.contact_organization} {$row.contact_name_given} {$row.contact_name_family}</Name>
+{else}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{/if}
+{else}
+<Name>{$row.effective_caller_id_name}</Name>
+{/if}
+{foreach $row.numbers as $number}
+{if $number.phone_number != ""}
+	<Telephone>{$number.phone_number}</Telephone>
+{else}		
+	<Telephone>{$number.phone_extension}</Telephone>
+{/if}
+{/foreach}
+</DirectoryEntry>
+{elseif $smarty.get.contacts == "groups" && $row.category == "groups"}
+<DirectoryEntry>
+{if $row.contact_name_given != ""}
+{if $row.contact_organization != ""}
+	<Name>{$row.contact_organization} {$row.contact_name_given} {$row.contact_name_family}</Name>
+{else}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{/if}
+{else}
+	<Name>{$row.effective_caller_id_name}</Name>
+{/if}
+{foreach $row.numbers as $number}
+{if $number.phone_number != ""}
+	<Telephone>{$number.phone_number}</Telephone>
+{else}		
+	<Telephone>{$number.phone_extension}</Telephone>
+{/if}
+{/foreach}
+</DirectoryEntry>
+{elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
+<DirectoryEntry>
+{if $row.contact_name_given != ""}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{else}
+	<Name>{$row.effective_caller_id_name}</Name>
+{/if}
+{if $row.phone_number != ""}
+	<Telephone>{$row.phone_number}</Telephone>
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
+{/if}
+</DirectoryEntry>
+{elseif $smarty.get.contacts == "all"}
+<DirectoryEntry>
+{if $row.contact_name_given != ""}
+{if $row.contact_organization != ""}
+	<Name>{$row.contact_organization} {$row.contact_name_given} {$row.contact_name_family}</Name>
+{else}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{/if}
+{else}
+	<Name>{$row.effective_caller_id_name}</Name>
+{/if}
+{if $row.category == "extensions"}
+{if $row.phone_number != ""}
+	<Telephone>{$row.phone_number}</Telephone>
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
+{/if}
+{else}
+{foreach $row.numbers as $number}
+{if $number.phone_number != ""}
+	<Telephone>{$number.phone_number}</Telephone>
+{else}		
+	<Telephone>{$number.phone_extension}</Telephone>
+{/if}
+{/foreach}
+{/if}
+</DirectoryEntry>
+{/if}
+{/foreach}
+</YealinkIPPhoneDirectory>
diff --git a/resources/templates/provision/yealink/t53/favorite_setting.xml b/resources/templates/provision/yealink/t53/favorite_setting.xml
new file mode 100644
index 0000000000..ba7275358e
--- /dev/null
+++ b/resources/templates/provision/yealink/t53/favorite_setting.xml
@@ -0,0 +1,8 @@
+<root_favorite_set>
+<item id_name="localdirectory" display_name="Local Directory" priority="2" enable="0" />
+<item id_name="history" display_name="History" priority="3" enable="1" />
+<item id_name="networkcalllog" display_name="Network CallLog" priority="4" enable="0" />
+<item id_name="remotedirectory" display_name="Remote Phone Book" priority="5" enable="1" />
+<item id_name="ldap" display_name="LDAP" priority="1" enable="0" />
+<item id_name="networkdirectory" display_name="Network Directory" priority="6" enable="0" />
+</root_favorite_set>
diff --git a/resources/templates/provision/yealink/t53/y000000000000.boot b/resources/templates/provision/yealink/t53/y000000000000.boot
new file mode 100644
index 0000000000..0e9e03d6b5
--- /dev/null
+++ b/resources/templates/provision/yealink/t53/y000000000000.boot
@@ -0,0 +1,7 @@
+#!version:1.0.0.1
+## The header above must appear as-is in the first line
+
+include:config "y000000000095.cfg"
+include:config "{$mac}.cfg"
+
+overwrite_mode = {$yealink_overwrite_mode}
diff --git a/resources/templates/provision/yealink/t53/y000000000095.cfg b/resources/templates/provision/yealink/t53/y000000000095.cfg
new file mode 100644
index 0000000000..7e4a736a6c
--- /dev/null
+++ b/resources/templates/provision/yealink/t53/y000000000095.cfg
@@ -0,0 +1,1971 @@
+#!version:1.0.0.1
+
+##File header "#!version:1.0.0.1" can not be edited or deleted, and must be placed in the first line.##
+
+#######################################################################################
+##                                    Network CDP                                    ##       
+#######################################################################################
+static.network.cdp.enable = {$yealink_cdp_enable}
+static.network.cdp.packet_interval = {$yealink_cdp_packet_interval}
+
+
+
+#######################################################################################
+##                                    Network IPv6                                   ##       
+#######################################################################################
+static.network.ipv6_static_dns_enable =
+static.network.ipv6_icmp_v6.enable =
+static.network.ipv6_secondary_dns =
+static.network.ipv6_primary_dns =
+static.network.ipv6_internet_port.gateway =
+static.network.ipv6_internet_port.ip =
+static.network.ipv6_internet_port.type =
+static.network.ipv6_prefix =
+
+#######################################################################################
+##                                    Network WiFi                                   ##       
+#######################################################################################
+##static.wifi.X.label=
+##static.wifi.X.ssid=
+##static.wifi.X.priority=
+##static.wifi.X.security_mode=
+##static.wifi.X.cipher_type=
+##static.wifi.X.password=
+##static.wifi.X.eap_type=
+##static.wifi.X.eap_user_name=
+##static.wifi.x.eap_password=
+##(X ranges from 1 to 5)
+##Only T54S/T52S/T48G/T48S/T46G/T46S/T42S/T41S/T29G/T27G Models support these parameters.
+
+static.wifi.enable = {$yealink_wifi_enable}
+static.wifi.1.label = {$yealink_wifi_1_label}
+static.wifi.1.ssid = {$yealink_wifi_1_ssid}
+static.wifi.1.priority = {$yealink_wifi_1_priority}
+static.wifi.1.security_mode = {$yealink_wifi_1_security}
+static.wifi.1.cipher_type = {$yealink_wifi_1_cipher}
+static.wifi.1.password = {$yealink_wifi_1_password}
+static.wifi.1.eap_type = {$yealink_wifi_1_type}
+static.wifi.1.eap_user_name = {$yealink_wifi_1_username}
+static.wifi.1.eap_password = {$yealink_wifi_1_password}
+static.wifi.show_scan_prompt = {$yealink_wifi_scan_prompt}
+
+
+##V83 Add
+static.wifi.function.enable =
+
+#######################################################################################
+##                                 Network Internet                                  ##       
+#######################################################################################
+static.network.ip_address_mode = {$yealink_ip_address_mode}
+static.network.span_to_pc_port =
+static.network.vlan.pc_port_mode =
+{if isset($dns_server_primary)}static.network.static_dns_enable = 1{else}static.network.static_dns_enable = 0{/if}
+static.network.pc_port.enable = 1
+static.network.primary_dns = {$dns_server_primary}
+static.network.secondary_dns = {$dns_server_secondary}
+static.network.internet_port.gateway =
+static.network.internet_port.mask =
+static.network.internet_port.ip =
+static.network.internet_port.type =
+
+##V83 Add
+static.network.preference =
+
+
+#######################################################################################
+##                               Network Advanced                                    ##       
+#######################################################################################
+static.network.dhcp_host_name =
+static.network.dhcp.option60type =
+static.network.mtu_value =
+static.network.qos.audiotos =
+static.network.port.min_rtpport =
+static.network.port.max_rtpport =
+static.network.qos.signaltos =
+
+static.wui.http_enable =
+static.wui.https_enable =
+static.network.port.https =
+static.network.port.http =
+
+static.network.pc_port.speed_duplex =
+static.network.internet_port.speed_duplex =
+
+##V83 Add
+static.network.redundancy.mode =
+static.network.redundancy.failback.timeout =
+
+
+
+#######################################################################################
+##                                   Network LLDP                                    ##       
+#######################################################################################
+static.network.lldp.enable = {$yealink_lldp_enable}
+static.network.lldp.packet_interval = {$yealink_lldp_packet_interval}
+
+
+
+
+#######################################################################################
+##                                   Network VLAN                                    ##       
+#######################################################################################
+static.network.vlan.dhcp_enable =
+static.network.vlan.dhcp_option =
+static.network.vlan.vlan_change.enable =
+
+static.network.vlan.pc_port_priority = {$yealink_vlan_pc_cos}
+static.network.vlan.pc_port_vid = {$yealink_vlan_pc_id}
+static.network.vlan.pc_port_enable =
+
+static.network.vlan.internet_port_priority = {$yealink_vlan_cos}
+static.network.vlan.internet_port_vid = {$yealink_vlan_id}
+{if isset($yealink_vlan_enable)}static.network.vlan.internet_port_enable = {$yealink_vlan_enable}{else}static.network.vlan.internet_port_enable = 0{/if}
+
+
+
+#######################################################################################
+##                                    Network VPN                                    ##       
+#######################################################################################
+static.network.vpn_enable = {$yealink_network_vpn_enable}
+static.openvpn.url = {$yealink_openvpn_url}
+
+
+
+#######################################################################################
+##                                 Network 802.1x                                    ##       
+#######################################################################################
+static.network.802_1x.mode =
+static.network.802_1x.identity =
+static.network.802_1x.md5_password =
+static.network.802_1x.client_cert_url =
+static.network.802_1x.root_cert_url =
+static.network.802_1x.eap_fast_provision_mode =
+static.network.802_1x.anonymous_identity =
+static.network.802_1x.proxy_eap_logoff.enable =
+
+
+static.auto_provision.custom.protect =
+static.auto_provision.custom.sync =
+static.auto_provision.custom.sync.path =
+static.auto_provision.custom.upload_method =
+
+
+
+
+#######################################################################################
+##                                    ZERO Touch                                     ##       
+#######################################################################################
+static.zero_touch.enable = {$yealink_zero_touch_enable}
+static.zero_touch.wait_time = {$yealink_zero_touch_wait_time}
+static.features.hide_zero_touch_url.enable = {$yealink_zero_touch_hide}
+static.zero_touch.network_fail_delay_times = {$yealink_zero_touch_delay}
+static.zero_touch.network_fail_wait_times = {$yealink_zero_touch_wait}
+
+
+#######################################################################################
+##                                   Autop URL                                       ##       
+#######################################################################################
+static.auto_provision.server.url = {$yealink_provision_url}
+static.auto_provision.server.username = {$http_auth_username}
+static.auto_provision.server.password = {$http_auth_password}
+
+
+#######################################################################################
+##                                   Autop Weekly                                    ##       
+#######################################################################################
+static.auto_provision.weekly.enable = {$yealink_autop_weekly_enable}
+static.auto_provision.weekly.dayofweek = {$yealink_autop_weekly_dayofweek}
+static.auto_provision.weekly.end_time = {$yealink_autop_weekly_end_time}
+static.auto_provision.weekly.begin_time = {$yealink_autop_weekly_begin_time}
+static.auto_provision.weekly_upgrade_interval = {$yealink_autop_weekly_interval}
+
+#######################################################################################
+##                                   Autop Repeat                                    ##       
+#######################################################################################
+static.auto_provision.repeat.enable = {$yealink_autop_repeat_enable}
+static.auto_provision.repeat.minutes = {$yealink_autop_repeat_minutes}
+
+
+#######################################################################################
+##                                   Autop DHCP                                      ##       
+#######################################################################################
+static.auto_provision.dhcp_option.list_user_options =
+static.auto_provision.dhcp_option.enable =
+
+##V83 Add
+static.auto_provision.dhcp_option.list_user6_options =
+
+#######################################################################################
+##                                   Autop Mode                                      ##       
+#######################################################################################
+static.auto_provision.power_on = {$yealink_autop_power_on}
+
+
+
+#######################################################################################
+##                               Flexible Autop                                      ##       
+#######################################################################################
+static.auto_provision.flexible.end_time =
+static.auto_provision.flexible.begin_time =
+static.auto_provision.flexible.interval =
+static.auto_provision.flexible.enable =
+
+#######################################################################################
+##                                 Autoprovision  Other                              ##       
+#######################################################################################
+static.auto_provision.prompt.enable =
+static.auto_provision.attempt_expired_time =
+static.auto_provision.attempt_before_failed =
+static.network.attempt_expired_time =
+static.auto_provision.update_file_mode =
+static.auto_provision.retry_delay_after_file_transfer_failed=
+static.auto_provision.inactivity_time_expire =
+static.auto_provision.dns_resolv_timeout =
+static.auto_provision.dns_resolv_nretry =
+static.auto_provision.dns_resolv_nosys =
+static.auto_provision.user_agent_mac.enable =
+static.auto_provision.server.type =
+features.action_uri_force_autop =
+static.auto_provision.url_wildcard.pn =
+static.auto_provision.reboot_force.enable =
+static.auto_provision.dhcp_option.option60_value =
+static.custom_mac_cfg.url =
+static.auto_provision.aes_key_in_file =
+static.auto_provision.aes_key_16.mac =
+static.auto_provision.aes_key_16.com =
+features.custom_version_info =
+##V83 Add
+static.auto_provision.authentication.expired_time =
+static.auto_provision.connect.keep_alive =
+
+##V84 Add
+static.auto_provision.config_version.mac=
+static.auto_provision.config_version.com=
+
+
+#######################################################################################
+##                                   Autop PNP                                       ##       
+#######################################################################################
+static.auto_provision.pnp_enable = {$yealink_autop_pnp}
+
+
+
+#######################################################################################
+##                                  Autop Code                                       ##       
+#######################################################################################
+##static.autoprovision.X.name
+##static.autoprovision.X.code
+##static.autoprovision.X.url
+##static.autoprovision.X.user
+##static.autoprovision.X.password
+##static.autoprovision.X.com_aes
+##static.autoprovision.X.mac_aes
+##Autop Code(X ranges from 1 to 50)
+
+static.autoprovision.1.name =
+static.autoprovision.1.code =
+static.autoprovision.1.url =
+static.autoprovision.1.user =
+static.autoprovision.1.password =
+static.autoprovision.1.com_aes =
+static.autoprovision.1.mac_aes =
+
+
+
+#######################################################################################
+##                                   TR069                                           ##       
+#######################################################################################
+
+static.managementserver.enable =
+static.managementserver.username =
+static.managementserver.password =
+static.managementserver.url =
+static.managementserver.periodic_inform_enable =
+static.managementserver.periodic_inform_interval =
+static.managementserver.connection_request_password =
+static.managementserver.connection_request_username =
+
+
+
+#######################################################################################
+##                            Firmware Update                                        ##       
+#######################################################################################
+static.firmware.url = {$yealink_firmware_url}/{$yealink_firmware_t53w}
+
+
+#######################################################################################
+##                            Confguration                                           ##       
+#######################################################################################
+features.reset_by_long_press_enable =
+features.factory_pwd_enable =
+static.configuration.url =
+static.features.custom_factory_config.enable =
+static.custom_factory_configuration.url =
+
+
+#######################################################################################
+##                               SYSLOG                                              ##       
+#######################################################################################
+static.syslog.enable =
+static.syslog.server =
+static.syslog.level =
+static.syslog.server_port =
+static.syslog.transport_type =
+static.syslog.facility =
+static.syslog.prepend_mac_address.enable =
+static.local_log.enable =
+static.local_log.level =
+static.local_log.max_file_size =
+
+
+
+#######################################################################################
+##                               Log Backup                                          ##       
+#######################################################################################
+static.auto_provision.local_log.backup.enable =
+static.auto_provision.local_log.backup.path =
+static.auto_provision.local_log.backup.upload_period =
+static.auto_provision.local_log.backup.append =
+static.auto_provision.local_log.backup.bootlog.upload_wait_time=
+static.auto_provision.local_log.backup.append.max_file_size =
+static.auto_provision.local_log.backup.append.limit_mode=
+
+
+
+#######################################################################################
+##                                   User Mode                                       ##       
+#######################################################################################
+static.security.var_enable = 
+static.web_item_level.url =
+
+
+#######################################################################################
+##                                  Quick Login                                      ##       
+#######################################################################################
+wui.quick_login = 
+
+
+#######################################################################################
+##                               Security                                            ##       
+#######################################################################################
+static.phone_setting.reserve_certs_enable = 
+features.relog_offtime = 
+static.security.default_ssl_method = {$yealink_security_default_ssl_method}
+static.security.cn_validation = 
+static.security.dev_cert = 
+static.security.ca_cert = 
+
+static.security.trust_certificates = {if $yealink_trust_certificates == "false"}0{elseif $yealink_trust_certificates == "true"}1{/if}
+
+security.tls_cipher_list = {$yealink_security_tls_cipher_list}
+
+{if isset($user_name) }
+static.security.user_name.user = {$user_name}
+static.security.user_password = {$user_name}:{$user_password}
+{/if}
+
+{if isset($admin_name) }
+static.security.user_name.admin = {$admin_name}
+static.security.user_password = {$admin_name}:{$admin_password}
+{/if}
+
+{if isset($var_name) }
+static.security.user_name.var = {$var_name}
+static.security.user_password = {$var_name}:{$var_password}
+{/if}
+
+
+##V83 Add
+static.security.default_access_level =
+phone_setting.reserve_certs_config.enable =
+
+
+#######################################################################################
+##                               Watch Dog                                           ##       
+#######################################################################################
+static.watch_dog.enable =
+
+#######################################################################################
+##                                   Server Certificates                             ##       
+#######################################################################################
+static.server_certificates.url =
+static.server_certificates.delete = 
+
+#######################################################################################
+##                           Trusted Certificates                                    ##       
+#######################################################################################
+static.trusted_certificates.url =
+static.trusted_certificates.delete =
+
+
+
+#######################################################################################
+##                           Secure Domain List                                      ##       
+#######################################################################################
+wui.secure_domain_list = 
+
+
+#######################################################################################
+##                               Encryption                                          ##       
+#######################################################################################
+static.auto_provision.encryption.directory = 
+static.auto_provision.encryption.call_log = 
+static.auto_provision.encryption.config = 
+
+
+
+
+#######################################################################################
+##                                   Trnasfer                                        ##       
+#######################################################################################
+features.transfer_type= {$yealink_transfer_type}
+dialplan.transfer.mode = {$yealink_transfer_mode}
+transfer.on_hook_trans_enable = {$yealink_transfer_onhook}
+transfer.tran_others_after_conf_enable = {$yealink_transfer_after_conf}
+transfer.blind_tran_on_hook_enable = {$yealink_transfer_blind_on_hook}
+transfer.semi_attend_tran_enable = {$yealink_transfer_semi_attended}
+phone_setting.call_appearance.transfer_via_new_linekey= {$yealink_transfer_via_new_linekey}
+
+
+#######################################################################################
+##                                   Conference                                      ##       
+#######################################################################################
+features.conference.with_previous_call.enable =
+features.local_conf.combine_with_one_press.enable=
+phone_setting.call_appearance.conference_via_new_linekey=
+
+
+
+#######################################################################################
+##                                   Anonymous                                       ##       
+#######################################################################################
+features.anonymous_response_code=
+
+
+
+#######################################################################################
+##                          Call Configuration                                       ##       
+#######################################################################################
+phone_setting.incoming_call_when_dialing.priority=
+phone_setting.hold_or_swap.mode=
+features.play_held_tone.interval=
+features.play_held_tone.delay=
+features.play_held_tone.enable=
+features.play_hold_tone.interval=
+features.ignore_incoming_call.enable=
+force.voice.ring_vol=
+features.mute.autoanswer_mute.enable=
+features.play_hold_tone.delay =
+phone_setting.end_call_net_disconnect.enable =
+features.custom_auto_answer_tone.enable=
+default_input_method.dialing=
+features.speaker_mode.enable=
+features.headset_mode.enable=
+features.handset_mode.enable=
+features.conference.local.enable =
+features.off_hook_answer.enable=
+features.caller_name_type_on_dialing=
+phone_setting.show_code403=
+phone_setting.ring_for_tranfailed=
+features.password_dial.length=
+features.password_dial.prefix=
+features.password_dial.enable=
+features.group_listen_in_talking_enable=
+phone_setting.call_info_display_method=
+phone_setting.called_party_info_display.enable =
+features.headset_training=
+features.headset_prior=
+features.dtmf.replace_tran =
+features.dtmf.transfer =
+phone_setting.ringing_timeout=
+phone_setting.ringback_timeout=
+
+features.keep_mute.enable=
+linekey.1.shortlabel=
+features.config_dsskey_length.shorten =
+transfer.dsskey_deal_type = {$yealink_dsskey_transfer_mode}
+features.auto_linekeys.enable=
+phone_setting.call_appearance.calls_per_linekey=
+features.linekey_call_with_default_account=
+##V83 Add
+features.station_name.value =
+features.station_name.scrolling_display =
+voice.headset.autoreset_spk_vol =
+voice.handset.autoreset_spk_vol =
+voice.handfree.autoreset_spk_vol =
+features.headset.ctrl_call.enable = 
+phone_setting.incoming_call.reject.enable =
+
+features.play_mute_tone.enable=
+features.play_mute_tone.interval=
+
+features.call_out_directory_by_off_hook.enable=
+features.congestion_tone.codelist=
+
+
+##V84 Add
+phone_setting.icon.delete=
+phone_setting.icon.url=
+
+
+
+#######################################################################################
+##                           Custom Softkey                                          ##       
+#######################################################################################
+phone_setting.custom_softkey_enable=
+custom_softkey_talking.url=
+custom_softkey_ring_back.url=
+custom_softkey_dialing.url=
+custom_softkey_connecting.url=
+custom_softkey_call_in.url=
+custom_softkey_call_failed.url=
+
+##V83 Add
+features.homescreen_softkey.acd.enable =
+features.homescreen_softkey.hoteling.enable =
+phone_setting.custom_softkey.apply_to_states =
+features.custom_softkey_dynamic.enable =
+
+
+#######################################################################################
+##                                   Features Bluetooth                              ##       
+#######################################################################################
+##Only T54S/T52S/T48G/T48S/T46G/T46S/T42S/T41S/T29G/T27G Models support the parameter.
+features.bluetooth_enable= {$yealink_bluetooth_enable}
+features.bluetooth_adapter_name= {$yealink_bluetooth_name}
+
+##V84 Add
+bluetooth.a2dp_sink=
+bluetooth.connect_confirm.enable=
+
+#######################################################################################
+##                                  Features USB Record                              ##       
+#######################################################################################
+##Only T54S/T52S/T48G/T48S/T46G/T46S/T42S/T41S/T29G/T27G Models support the parameter.
+features.usb_call_recording.enable = {$yealink_usb_record_enable}
+
+features.idle_recording.enable=
+
+#######################################################################################
+##                                  Features USB                                     ##       
+#######################################################################################
+##V83 Add
+static.usb.power.enable =
+
+##V84 Add
+static.usbdisk.function.enable=
+
+#######################################################################################
+##                                    Codec                                          ##       
+#######################################################################################
+voice.g726.aal2.enable=
+
+
+#######################################################################################
+##                                   DTMF                                            ##       
+#######################################################################################
+features.dtmf.min_interval=
+features.dtmf.volume=
+features.dtmf.duration =
+
+#######################################################################################
+##                                   Tones                                           ##       
+#######################################################################################
+voice.tone.autoanswer =
+voice.tone.message =
+voice.tone.stutter =
+voice.tone.info =
+voice.tone.dialrecall =
+voice.tone.callwaiting =
+voice.tone.congestion =
+voice.tone.busy =
+voice.tone.ring =
+voice.tone.dial =
+voice.tone.country =
+voice.side_tone =
+features.partition_tone =
+voice.tone.secondary_dial=
+#######################################################################################
+##  Tones                                                                            ##       
+#######################################################################################
+
+voice.tone.stutterdial=
+voice.tone.stutter_dial_tone.apply_to_dnd.enable=
+voice.tone.stutter_dial_tone.apply_to_fwd.enable=
+voice.tone.stutter_dial_tone.apply_to_fwd.enable=
+
+#######################################################################################
+##                                   Jitter Buffer                                   ##       
+#######################################################################################
+voice.jib.normal= {$yealink_jib_normal}
+voice.jib.max = {$yealink_jib_max}
+voice.jib.min = {$yealink_jib_min}
+voice.jib.adaptive = {$yealink_jib_adaptive}
+
+voice.jib.wifi.normal= {$yealink_jib_wifi_normal}
+voice.jib.wifi.max= {$yealink_jib_wifi_max}
+voice.jib.wifi.min= {$yealink_jib_wifi_min}
+voice.jib.wifi.adaptive= {$yealink_jib_wifi_adaptive}
+
+
+#######################################################################################
+##                                   Echo Cancellation                               ##       
+#######################################################################################
+voice.echo_cancellation = {$yealink_echo_cancellation}
+voice.cng = {$yealink_cng}
+voice.vad = {$yealink_vad}
+
+
+##V84 Add
+voice.ans_nb.enable=
+voice.tns.enable=
+
+################################################################
+#                        SIP Backup Server                    ##
+################################################################
+static.network.dns.ttl_enable =
+static.network.dns.last_cache_expired.enable=
+static.network.dns.last_cache_expired
+static.network.dns.query_timeout =
+static.network.dns.retry_times =
+sip.dns_transport_type=
+sip.skip_redundant_failover_addr=
+
+
+################################################################
+#                        SIP Basic Config                     ##
+################################################################
+sip.use_out_bound_in_dialog=
+sip.unreg_with_socket_close=
+phone_setting.disable_account_without_username.enable=
+features.auto_answer.first_call_only=
+
+##V84 Add
+phone_setting.call_display_name.mode=
+
+################################################################
+#                        SIP Advanced config                  ##
+################################################################
+sip.request_validation.event=
+sip.sdp_early_answer_or_offer=
+sip.cid_source.preference=
+sip.request_validation.digest.realm=
+sip.request_validation.digest.list=
+sip.request_validation.source.list=
+sip.send_keepalive_by_socket=
+sip.reliable_protocol.timerae.enable=
+sip.requesturi.e164.addglobalprefix=
+sip.trust_ctrl = {$yealink_trust_ctrl}
+sip.mac_in_ua=
+
+sip.timer_t1=
+sip.timer_t2=
+sip.timer_t4=
+
+sip.listen_mode= {if isset($yealink_sip_listen_port)}sip.listen_port = {$yealink_sip_listen_port}{else}sip.listen_port = 5060{/if}
+
+sip.listen_port=
+sip.tls_listen_port=
+sip.tcp_port_random_mode=
+sip.escape_characters.enable=
+sip.notify_reboot_enable=
+sip.send_response_by_request=
+sip.disp_incall_to_info=
+features.call_invite_format=
+phone_setting.early_media.rtp_sniffer.timeout=
+sip.reg_surge_prevention =
+
+################################################################
+#    V84 new add ÅäºÏsip.escape_characters.enable=ʹÓà        ##
+################################################################
+sip.reserve_characters=
+sip.call_fail_use_reason.enable = {$yealink_sip_call_fail_use_reason_enable}
+
+##V83 Add
+sip.dhcp.option120.mode =
+
+################################################################
+#                        NAT&ICE                              ##
+################################################################
+static.sip.nat_turn.enable=
+static.sip.nat_turn.username=
+static.sip.nat_turn.password=
+static.sip.nat_turn.server=
+static.sip.nat_turn.port=
+
+static.sip.nat_stun.enable=
+static.sip.nat_stun.server=
+static.sip.nat_stun.port= {if isset($stun_port)}{$stun_port}{else}3478{/if}
+
+
+
+
+static.ice.enable=
+static.network.static_nat.enable= {if isset($yealink_static_nat)}1{else}0{/if}
+static.network.static_nat.addr= {$yealink_static_nat}
+
+#######################################################################################
+##                           DNS                                                     ##       
+#######################################################################################
+dns_cache_a.1.name =
+dns_cache_a.1.ip = 
+dns_cache_a.1.ttl =
+dns_cache_srv.1.name = 
+dns_cache_srv.1.port =
+dns_cache_srv.1.priority =
+dns_cache_srv.1.target =
+dns_cache_srv.1.weight =
+dns_cache_srv.1.ttl =
+dns_cache_naptr.1.name =
+dns_cache_naptr.1.order =
+dns_cache_naptr.1.preference =
+dns_cache_naptr.1.replace =
+dns_cache_naptr.1.service = 
+dns_cache_naptr.1.ttl = 
+
+#######################################################################################
+##                                 RTP                                               ##
+#######################################################################################
+features.rtp_symmetric.enable=
+
+
+#######################################################################################
+##                                 RTCP-XR                                           ##
+#######################################################################################
+voice.rtcp.enable= {$yealink_rtcp_enable}
+voice.rtcp_cname= {$yealink_rtcp_cname}
+voice.rtcp_xr.enable= {$yealink_rtcpxr_enable}
+phone_setting.vq_rtcpxr_display_symm_oneway_delay.enable= {$yealink_rtcpxr_disp_enable}
+phone_setting.vq_rtcpxr_display_round_trip_delay.enable= {$yealink_rtcpxr_disp_enable}
+phone_setting.vq_rtcpxr_display_moscq.enable= {$yealink_rtcpxr_disp_enable}
+phone_setting.vq_rtcpxr_display_moslq.enable = {$yealink_rtcpxr_disp_enable}
+phone_setting.vq_rtcpxr_display_packets_lost.enable= {$yealink_rtcpxr_disp_enable}
+phone_setting.vq_rtcpxr_display_jitter_buffer_max.enable= {$yealink_rtcpxr_disp_enable}
+phone_setting.vq_rtcpxr_display_jitter.enable= {$yealink_rtcpxr_disp_enable}
+phone_setting.vq_rtcpxr_display_remote_codec.enable= {$yealink_rtcpxr_disp_enable}
+phone_setting.vq_rtcpxr_display_local_codec.enable= {$yealink_rtcpxr_disp_enable}
+phone_setting.vq_rtcpxr_display_remote_call_id.enable= {$yealink_rtcpxr_disp_enable}
+phone_setting.vq_rtcpxr_display_local_call_id.enable= {$yealink_rtcpxr_disp_enable}
+phone_setting.vq_rtcpxr_display_stop_time.enable= {$yealink_rtcpxr_disp_enable}
+phone_setting.vq_rtcpxr_display_start_time.enable= {$yealink_rtcpxr_disp_enable}
+phone_setting.vq_rtcpxr_interval_period= {$yealink_rtcpxr_interval}
+phone_setting.vq_rtcpxr_delay_threshold_critical= {$yealink_rtcpxr_delay_threshold_critical}
+phone_setting.vq_rtcpxr_delay_threshold_warning= {$yealink_rtcpxr_delay_threshold_warning}
+phone_setting.vq_rtcpxr_moslq_threshold_critical= {$yealink_rtcpxr_mos_threshold_critical}
+phone_setting.vq_rtcpxr_moslq_threshold_warning= {$yealink_rtcpxr_mos_threshold_warning}
+phone_setting.vq_rtcpxr.interval_report.enable= {$yealink_rtcpxr_interval_report_enable}
+phone_setting.vq_rtcpxr.states_show_on_gui.enable= {$yealink_rtcpxr_show_gui_enable}
+phone_setting.vq_rtcpxr.states_show_on_web.enable= {$yealink_rtcpxr_show_web_enable}
+phone_setting.vq_rtcpxr.session_report.enable= {$yealink_rtcpxr_report_enable}
+
+
+#######################################################################################
+##                                   Contact                                         ##       
+#######################################################################################
+static.directory_setting.url= https://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=favorite_setting.xml
+
+super_search.url=
+
+local_contact.data.url=
+local_contact.data.delete=
+
+##Only T54S/T52S/T48G/T48S/T46G/T46S/T29G Models support the parameter
+phone_setting.contact_photo_display.enable= {$yealink_contact_photo_enable}
+
+phone_setting.incoming_call.horizontal_roll_interval=
+
+##Only T54S/T52S/T48G/T48S/T46G/T46S/T29G Models support the parameter
+local_contact.data_photo_tar.url=
+local_contact.photo.url=
+local_contact.image.url=
+
+##Only T48G/S Models support the parameter
+local_contact.icon_image.url=
+local_contact.icon.url=
+
+search_in_dialing.local_directory.enable =
+search_in_dialing.local_directory.priority =
+
+#######################################################################################
+##                                 Remote Phonebook                                  ##       
+#######################################################################################
+##remote_phonebook.data.X.url
+##remote_phonebook.data.X.name 
+#remote_phonebook.data.X.username=
+#remote_phonebook.data.X.password=
+##(X ranges from 1 to 5)
+
+{if isset($yealink_remote_phonebook_1_name) }
+remote_phonebook.data.1.name = {$yealink_remote_phonebook_1_name}
+{else}
+remote_phonebook.data.1.name = Users
+{/if}
+{if isset($yealink_remote_phonebook_1_url) }
+remote_phonebook.data.1.url =  {$yealink_remote_phonebook_1_url}
+{else}
+remote_phonebook.data.1.url = https://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=users
+{/if}
+
+{if isset($yealink_remote_phonebook_2_name) }
+remote_phonebook.data.2.name = {$yealink_remote_phonebook_2_name}
+{else}
+remote_phonebook.data.2.name = Groups
+{/if}
+{if isset($yealink_remote_phonebook_2_url) }
+remote_phonebook.data.2.url =  {$yealink_remote_phonebook_2_url}
+{else}
+remote_phonebook.data.2.url = https://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=groups
+{/if}
+
+{if isset($yealink_remote_phonebook_3_name) }
+remote_phonebook.data.3.name = {$yealink_remote_phonebook_3_name}
+{else}
+remote_phonebook.data.3.name = Extensions
+{/if}
+{if isset($yealink_remote_phonebook_3_url) }
+remote_phonebook.data.3.url =  {$yealink_remote_phonebook_3_url}
+{else}
+remote_phonebook.data.3.url = https://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
+{/if}
+
+remote_phonebook.data.4.name = {$yealink_remote_phonebook_4_name}
+remote_phonebook.data.4.url =  {$yealink_remote_phonebook_4_url}
+
+remote_phonebook.data.5.name = {$yealink_remote_phonebook_5_name}
+remote_phonebook.data.5.url = {$yealink_remote_phonebook_5_url}
+
+
+#######################################################################################
+##                                 LDAP                                              ##       
+#######################################################################################
+ldap.enable = {$ldap_enable}
+ldap.user = {$ldap_user}
+ldap.password = {$ldap_password}
+ldap.base = {$ldap_base}
+ldap.port = {$ldap_port}
+ldap.host = {$ldap_host}
+ldap.customize_label=
+ldap.incoming_call_special_search.enable=
+ldap.tls_mode=
+ldap.search_type=
+ldap.numb_display_mode=
+ldap.ldap_sort = {$ldap_sort}
+ldap.call_in_lookup = {$ldap_call_in_lookup}
+ldap.version = {$ldap_version}
+ldap.display_name = {$ldap_display_name}
+ldap.numb_attr = {$ldap_numb_attr}
+ldap.name_attr = {$ldap_name_attr}
+ldap.max_hits = {$ldap_max_hits}
+ldap.number_filter = {$ldap_number_filter}
+ldap.name_filter = {$ldap_name_filter}
+ldap.call_out_lookup = {$ldap_dial_lookup}
+
+directory_setting.ldap.enable =
+directory_setting.ldap.priority =
+search_in_dialing.ldap.enable =
+search_in_dialing.ldap.priority =
+
+
+
+#######################################################################################
+##                                 History                                           ##       
+#######################################################################################
+static.auto_provision.local_calllog.write_delay.terminated=
+static.auto_provision.local_calllog.backup.path=
+static.auto_provision.local_calllog.backup.enable=
+super_search.recent_call=
+features.call_out_history_by_off_hook.enable=
+features.save_call_history=
+features.call_log_show_num=
+search_in_dialing.history.enable=
+search_in_dialing.history.priority=
+directory_setting.history.enable=
+directory_setting.history.priority
+features.save_init_num_to_history.enable= 0
+features.redial_via_local_sip_server.enable=
+
+##V83 Add
+features.calllog_detailed_information =
+
+##V84 Add
+features.call_log_merge.enable=
+
+
+#######################################################################################
+##                          Contact Backup                                           ##       
+#######################################################################################
+static.auto_provision.local_contact.backup.path =
+static.auto_provision.local_contact.backup.enable=
+
+
+#######################################################################################
+##                          Contact Other                                            ##       
+#######################################################################################
+directory.search_type=
+directory_setting.local_directory.enable =
+directory_setting.local_directory.priority =
+
+##V83 Add
+phone_setting.search.highlight_keywords.enable =
+
+#######################################################################################
+##                          Favorites                                                ##       
+#######################################################################################
+##V83 Add
+local_contact.favorite.enable =
+phone_setting.favorite_sequence_type =
+
+#######################################################################################  
+##                                  Programablekey                                   ##  
+####################################################################################### 
+#programablekey.X.type
+#programablekey.X.line
+#programablekey.X.value
+#programablekey.X.xml_phonebook
+#programablekey.X.history_type
+#programablekey.X.label(X ranges from 1 to 4)
+#programablekey.X.extension
+##Programablekey X ranges(T48G/T48S/T46G/T46S: X=1-10, 12-14;T42G/T42S/T41P/T41S/T40P/T40G: X=1-10, 13;T29G/T27P/T27G: X=1-14;T23P/T23G/T21(P) E2: 1-10, 14;T19(P) E2: X=1-9, 13, 14;)##
+
+{foreach $keys["programmable"] as $row}
+programablekey.{$row.device_key_id}.type = {$row.device_key_type}
+{if $row.device_key_type == "22" || $row.device_key_type == "47"}
+programablekey.{$row.device_key_id}.xml_phonebook = {$row.device_key_line}
+{else}
+programablekey.{$row.device_key_id}.line = {$row.device_key_line}
+programablekey.{$row.device_key_id}.value = {$row.device_key_value}
+{/if}
+programablekey.{$row.device_key_id}.extension = {$row.device_key_extension}
+programablekey.{$row.device_key_id}.label = {$row.device_key_label}
+programablekey.1.pickup_value ={$row.device_key_extension}
+programablekey.1.history_type =
+
+{/foreach}
+
+##V83 Add
+programablekey.type_range.custom =
+
+#######################################################################################  
+##                                  Linekey                                          ##  
+####################################################################################### 
+##linekey.X.line
+##linekey.X.value
+##linekey.X.extension
+##linekey.X.type
+##linekey.X.xml_phonebook
+##linekey.X.shortlabel
+##linekey.X.label
+##LineKeyX ranges(T48G/S: X ranges from 1 to 29. T54S/T46G/T46S/T29G: X ranges from 1 to 27. T42G/T42S/T41P/T41S: X ranges from 1 to 15. T40P/T40G/T23P/T23G: X ranges from 1 to 3. T52S/T27P/T27G: X ranges from 1 to 21. T21(P) E2: X ranges from 1 to 2.)##
+## Not support T19P_E2
+
+{foreach $keys['line'] as $row}
+#Configure Line Key {$row.device_key_id}
+linekey.{$row.device_key_id}.line = {$row.device_key_line}
+linekey.{$row.device_key_id}.value = {$row.device_key_value}
+{if $row.device_key_type == "1" || $row.device_key_type == "16"}
+linekey.{$row.device_key_id}.pickup_value = {$row.device_key_extension}
+{else}
+linekey.{$row.device_key_id}.extension = {$row.device_key_extension}
+{/if}
+linekey.{$row.device_key_id}.type = {$row.device_key_type}
+linekey.{$row.device_key_id}.xml_phonebook =
+linekey.{$row.device_key_id}.label = {$row.device_key_label}
+{/foreach}
+
+##V83 Add
+linekey.type_range.custom =
+
+#######################################################################################  
+##                                  Dsskey                                           ##  
+####################################################################################### 
+features.block_linekey_in_menu.enable =
+features.shorten_linekey_label.enable =
+features.flash_url_dsskey_led.enable =
+features.config_dsskey_length = {$yealink_dsskey_length}
+phone_setting.page_tip =
+features.keep_switch_page_key.enable=
+
+##phone_setting.idle_dsskey_and_title.transparency(Only support T54S/T52S/T48G/T48S)
+phone_setting.idle_dsskey_and_title.transparency=
+
+##V83 Add
+phone_setting.keytype_sequence =
+phone_setting.dsskey_label.display_method =
+local.dsskey_type_config.mode =
+
+
+#######################################################################################  
+##                                Expansion Key                                      ##  
+####################################################################################### 
+##expansion_module.X.key.Y.type
+##expansion_module.X.key.Y.line
+##expansion_module.X.key.Y.value
+##expansion_module.X.key.Y.extension
+##expansion_module.X.key.Y.label
+##expansion_module.X.key.Y.xml_phonebook
+## Expansion Key X ranges(SIP-T54S/T52S: X ranges from 1 to 3, Y ranges from 1 to 60; SIP-T48G/T48S/T46G/T46S:X ranges from 1 to 6, Y ranges from 1 to 40; SIP-T29G/T27P/T27G:X ranges from 1 to 6, Y ranges from 1 to 20, 22 to 40 (Ext key 21 cannot be configured).)##
+## Only SIP-T54S/T52S/T48G/T48S/T46G/T46S/T29G/T27P/T27G Models support the parameter.
+
+#expansion_module.1.key.1.type =
+#expansion_module.1.key.1.label =
+#expansion_module.1.key.1.value =
+#expansion_module.1.key.1.line =
+#expansion_module.1.key.1.pickup_value =
+#expansion_module.1.key.1.extension =
+#expansion_module.1.key.1.xml_phonebook =
+#expansion_module.page_tip.blf_call_in.led =
+#expansion_module.page_tip.blf_call_in.enable =
+
+{foreach $keys["expansion"] as $row}
+expansion_module.1.key.{$row.device_key_id}.type = {$row.device_key_type}
+expansion_module.1.key.{$row.device_key_id}.line = {$row.device_key_line}
+expansion_module.1.key.{$row.device_key_id}.value = {$row.device_key_value}
+expansion_module.1.key.{$row.device_key_id}.extension = {$row.device_key_extension}
+expansion_module.1.key.{$row.device_key_id}.label = {$row.device_key_label}
+expansion_module.1.key.{$row.device_key_id}.xml_phonebook =
+{/foreach}
+{foreach $keys["expansion-1"] as $row}
+expansion_module.1.key.{$row.device_key_id}.type = {$row.device_key_type}
+expansion_module.1.key.{$row.device_key_id}.line = {$row.device_key_line}
+expansion_module.1.key.{$row.device_key_id}.value = {$row.device_key_value}
+expansion_module.1.key.{$row.device_key_id}.extension = {$row.device_key_extension}
+expansion_module.1.key.{$row.device_key_id}.label = {$row.device_key_label}
+expansion_module.1.key.{$row.device_key_id}.xml_phonebook =
+{/foreach}
+{foreach $keys["expansion-2"] as $row}
+expansion_module.2.key.{$row.device_key_id}.type = {$row.device_key_type}
+expansion_module.2.key.{$row.device_key_id}.line = {$row.device_key_line}
+expansion_module.2.key.{$row.device_key_id}.value = {$row.device_key_value}
+expansion_module.2.key.{$row.device_key_id}.extension = {$row.device_key_extension}
+expansion_module.2.key.{$row.device_key_id}.label = {$row.device_key_label}
+expansion_module.2.key.{$row.device_key_id}.xml_phonebook =
+{/foreach}
+
+##V83 Add
+expkey.type_range.custom =
+
+#######################################################################################  
+##                                EDK                                                ##  
+####################################################################################### 
+##EDK Soft Keys(X ranges from 1 to 10)
+
+features.enhanced_dss_keys.enable=
+edk.id_mode.enable=
+softkey.1.position=
+softkey.1.use.dialing=
+softkey.1.softkey_id=
+softkey.1.use.dialtone=
+softkey.1.use.conferenced=
+softkey.1.use.held=
+softkey.1.use.hold=
+softkey.1.use.transfer_ring_back=
+softkey.1.use.ring_back=
+softkey.1.use.call_failed=
+softkey.1.use.on_talk=
+softkey.1.use.transfer_connecting=
+softkey.1.use.connecting=
+softkey.1.use.incoming_call=
+softkey.1.use.idle=
+softkey.1.action=
+softkey.1.label=
+softkey.1.enable=
+edk.edklist.1.action=
+edk.edklist.1.mname=
+edk.edklist.1.enable=
+edk.edkprompt.1.enable=
+edk.edkprompt.1.label=
+edk.edkprompt.1.type=
+edk.edkprompt.1.userfeedback=
+
+##V84 Add
+##edk.edkprompt.X.title=
+(X ranges from 1 to 9)
+edk.edkprompt.1.title=
+
+
+#######################################################################################  
+##                                XML                                                ##  
+####################################################################################### 
+push_xml.server=
+push_xml.sip_notify=
+push_xml.block_in_calling=
+default_input_method.xml_browser_input_screen=
+
+##V83 Add
+hoteling.authentication_mode =
+push_xml.phonebook.search.delay =
+features.xml_browser.loading_tip.delay =
+features.xml_browser.pwd =
+features.xml_browser.user_name =
+push_xml.password =
+push_xml.username =
+
+
+#######################################################################################  
+##                                  Forward                                          ##  
+#######################################################################################  
+features.fwd.allow=
+features.fwd_mode=
+forward.no_answer.enable=
+forward.busy.enable=
+forward.always.enable=
+forward.no_answer.timeout=
+forward.no_answer.on_code=
+forward.no_answer.off_code=
+forward.busy.off_code=
+forward.busy.on_code=
+forward.always.off_code=
+forward.always.on_code=
+forward.no_answer.target=
+forward.busy.target=
+forward.always.target=
+
+features.forward.emergency.authorized_number=
+features.forward.emergency.enable=
+forward.idle_access_always_fwd.enable=
+features.forward_call_popup.enable=
+
+##V83 Add
+features.forward.no_answer.show_ring_times =
+
+##V84 Add
+features.no_answer_code=
+
+
+#######################################################################################  
+##                                  DND                                              ##  
+#######################################################################################
+features.dnd.allow=
+features.dnd_mode=
+features.dnd.enable=
+
+features.dnd.off_code= *79
+features.dnd.on_code= *78
+
+features.dnd.emergency_authorized_number=
+features.dnd.emergency_enable= 1
+features.dnd.large_icon.enable=
+
+##V83 Add
+features.keep_dnd.enable =
+
+#######################################################################################  
+##                               Phone Lock                                          ##  
+#######################################################################################
+phone_setting.phone_lock.enable = {$yealink_lock_enable}
+phone_setting.phone_lock.lock_key_type = {$yealink_lock_key_type}
+phone_setting.phone_lock.unlock_pin = {$yealink_lock_pin}
+phone_setting.emergency.number = {$yealink_emergency_number}
+phone_setting.phone_lock.lock_time_out = {$yealink_lock_timeout}
+
+
+#######################################################################################  
+##                               Hotdesking                                          ##  
+#######################################################################################
+phone_setting.logon_wizard=
+phone_setting.logon_wizard_forever_wait=
+
+hotdesking.startup_register_name_enable=
+hotdesking.startup_username_enable=
+hotdesking.startup_password_enable=
+hotdesking.startup_sip_server_enable=
+hotdesking.startup_outbound_enable=
+
+hotdesking.dsskey_register_name_enable=
+hotdesking.dsskey_username_enable=
+hotdesking.dsskey_password_enable=
+hotdesking.dsskey_sip_server_enable=
+hotdesking.dsskey_outbound_enable=
+
+
+#######################################################################################  
+##                               Voice Mail                                          ##  
+#######################################################################################
+features.voice_mail_alert.enable=
+features.voice_mail_popup.enable = {$yealink_voice_mail_popup_enable}
+features.voice_mail_tone_enable=
+features.hide_feature_access_codes.enable = {$yealink_hide_feature_access_codes_enable}
+voice_mail.number.1=
+
+
+#######################################################################################  
+##                               Text Message                                        ##  
+#######################################################################################
+features.text_message.enable=
+features.text_message_popup.enable=
+
+
+
+
+
+#######################################################################################  
+##                               Audio Intercom                                      ##  
+#######################################################################################
+features.intercom.mode=
+features.intercom.subscribe.enable=
+features.intercom.led.enable=
+features.intercom.feature_access_code=
+features.blf.intercom_mode.enable=
+features.intercom.ptt_mode.enable=
+
+features.redial_tone=
+features.key_tone=
+features.send_key_tone=
+
+features.intercom.allow=
+features.intercom.barge=
+features.intercom.tone=
+features.intercom.mute=
+
+
+voice.handset_send=
+voice.handfree_send =
+voice.headset_send =
+features.intercom.headset_prior.enable=
+features.ringer_device.is_use_headset=
+features.intercom.barge_in_dialing.enable=
+
+
+
+#######################################################################################  
+##                               Feature General                                     ##  
+#######################################################################################
+features.ip_call.auto_answer.enable=
+features.show_default_account=
+features.call.dialtone_time_out=
+features.missed_call_popup.enable = {$yealink_missed_call_popup_enable}
+features.auto_answer_tone.enable=
+features.play_hold_tone.enable=
+features.key_as_send=
+features.send_pound_key=
+features.busy_tone_delay=
+features.hotline_delay=
+features.hotline_number=
+features.direct_ip_call_enable = {$yealink_direct_ip_call_enable}
+features.call_num_filter=
+features.call_completion_enable=
+features.allow_mute=
+features.auto_answer_delay=
+features.normal_refuse_code=
+features.dnd_refuse_code=
+features.upload_server=
+features.dtmf.repetition=
+features.dtmf.hide_delay=
+features.dtmf.hide = {$yealink_dtmf_hide}
+features.play_local_dtmf_tone_enable =
+features.reboot_in_talk_enable =
+features.fwd_diversion_enable=
+
+call_waiting.enable = {$yealink_call_waiting}
+call_waiting.tone = {$yealink_call_waiting_tone}
+call_waiting.off_code=
+call_waiting.on_code=
+
+auto_redial.times=
+auto_redial.interval=
+auto_redial.enable=
+
+sip.rfc2543_hold = {$yealink_rfc2543_hold}
+sip.use_23_as_pound=
+forward.international.enable=
+phone_setting.headsetkey_mode=
+phone_setting.is_deal180=
+phone_setting.change_183_to_180=
+
+##V84 Add
+features.touch_tone=
+
+#######################################################################################  
+##                               Action URL&URI                                      ##  
+#######################################################################################
+features.csta_control.enable=
+features.action_uri.enable=
+features.action_uri_limit_ip=
+features.show_action_uri_option=
+action_url.call_remote_canceled=
+action_url.remote_busy=
+action_url.cancel_callout=
+action_url.handfree=
+action_url.headset=
+action_url.unheld=
+action_url.held=
+action_url.transfer_failed=
+action_url.transfer_finished=
+action_url.answer_new_incoming_call=
+action_url.reject_incoming_call=
+action_url.forward_incoming_call=
+action_url.ip_change=
+action_url.idle_to_busy=
+action_url.busy_to_idle=
+action_url.call_terminated=
+action_url.missed_call=
+action_url.unmute=
+action_url.mute=
+action_url.unhold=
+action_url.hold=
+action_url.always_fwd_off =
+action_url.always_fwd_on =
+action_url.attended_transfer_call =
+action_url.blind_transfer_call =
+action_url.busy_fwd_off =
+action_url.busy_fwd_on =
+action_url.call_established =
+action_url.call_waiting_off =
+action_url.call_waiting_on =
+action_url.dnd_off =
+action_url.dnd_on =
+action_url.incoming_call =
+action_url.no_answer_fwd_off =
+action_url.no_answer_fwd_on =
+action_url.off_hook =
+action_url.on_hook =
+action_url.outgoing_call =
+action_url.register_failed =
+action_url.registered =
+action_url.setup_autop_finish =
+action_url.setup_completed =
+action_url.transfer_call =
+action_url.unregistered =
+
+##V84 Add
+action_url.peripheral_information=
+
+
+
+#######################################################################################  
+##                               Power LED                                           ##  
+#######################################################################################
+phone_setting.hold_and_held_power_led_flash_enable=
+phone_setting.mute_power_led_flash_enable=
+phone_setting.talk_and_dial_power_led_enable=
+phone_setting.mail_power_led_flash_enable = 1
+phone_setting.ring_power_led_flash_enable=
+phone_setting.common_power_led_enable=
+phone_setting.missed_call_power_led_flash.enable = {$yealink_missed_call_power_led_flash_enable}
+
+
+#######################################################################################
+##                                  Time&Date                                        ##       
+#######################################################################################
+lcl.datetime.date.format =
+auto_dst.url = {$yealink_auto_dst_url}
+local_time.manual_time_enable =
+local_time.manual_ntp_srv_prior =
+local_time.time_format = {$yealink_time_format}
+local_time.date_format = {$yealink_date_format}
+local_time.dhcp_time = {$yealink_dhcp_time}
+
+local_time.summer_time = {$yealink_summer_time}
+local_time.dst_time_type = {$yealink_dst_type}
+local_time.start_time = {$yealink_time_zone_start_time}
+local_time.end_time = {$yealink_time_zone_end_time}
+local_time.offset_time = {$yealink_offset_time}
+local_time.interval = {$yealink_time_update}
+
+local_time.ntp_server1 = {$ntp_server_primary}
+local_time.ntp_server2 = {$ntp_server_secondary}
+local_time.time_zone = {$yealink_time_zone}
+local_time.time_zone_name = {$yealink_time_zone_name}
+
+
+#######################################################################################
+##                           Multicast Paging                                        ##       
+#######################################################################################
+##multicast.listen_address.X.label 
+##multicast.paging_address.X.channel
+##multicast.listen_address.X.ip_address 
+##multicast.paging_address.X.ip_address
+##multicast.paging_address.X.label
+##multicast.listen_address.X.channel
+##multicast.listen_address.X.volume
+##Multicast(X ranges from 1 to 31.)
+
+multicast.codec=
+
+multicast.paging_address.1.channel=
+multicast.paging_address.1.label=
+multicast.paging_address.1.ip_address=
+multicast.receive_priority.enable=
+multicast.receive_priority.priority=
+
+multicast.receive.use_speaker=
+multicast.receive.enhance_volume=
+multicast.receive.ignore_dnd.priority=
+
+multicast.listen_address.1.channel=
+multicast.listen_address.1.label=
+multicast.listen_address.1.ip_address=
+multicast.listen_address.1.volume=
+
+
+#######################################################################################
+##                           Preference&Status                                       ##       
+#######################################################################################
+##Not support T19P_E2
+static.features.default_account=
+
+##Logo File Format: .dob
+##Resolution: SIP-T42G/T42S/T41P/T41S: <=192*64  2 gray scale;SIP-T27P/G: <=240*120  2 gray scale;SIP-T40P/T40G/T23P/T23G/T21(P) E2/T19(P) E2: <=132*64  2 gray scale##
+phone_setting.lcd_logo.mode=
+lcd_logo.delete=
+lcd_logo.url=
+
+phone_setting.contrast=
+phone_setting.backlight_time = {$yealink_backlight_time}
+phone_setting.inactive_backlight_level = 1
+phone_setting.active_backlight_level=
+phone_setting.predial_autodial = 1
+
+ringtone.url= {$yealink_ringtone_url}
+ringtone.delete= {$yealink_ringtone_delete}
+phone_setting.ring_type= {$yealink_ring_type}
+phone_setting.inter_digit_time= {$yealink_inter_digit_time}
+
+##Only T54S Model supports the parameter
+phone_setting.idle_clock_display.enable =
+
+#######################################################################################
+##                           Digitmap                                                ##       
+#######################################################################################
+dialplan.digitmap.enable=
+dialplan.digitmap.string=
+dialplan.digitmap.no_match_action=
+dialplan.digitmap.interdigit_short_timer=
+dialplan.digitmap.interdigit_long_timer=
+dialplan.digitmap.apply_to.press_send=
+dialplan.digitmap.apply_to.forward=
+dialplan.digitmap.apply_to.history_dial=
+dialplan.digitmap.apply_to.directory_dial=
+dialplan.digitmap.apply_to.on_hook_dial=
+dialplan.digitmap.active.on_hook_dialing=
+
+##V83 Add
+dialplan.digitmap.apply_to.prefix_key =
+
+##V84 ADD
+features.local_calllog.received.replace_rule=
+
+
+
+
+#######################################################################################
+##                           Emergency Dialplan                                      ##       
+#######################################################################################
+dialplan.emergency.enable=
+dialplan.emergency.1.value=
+dialplan.emergency.server.1.address=
+dialplan.emergency.server.1.transport_type=
+dialplan.emergency.server.1.port=
+dialplan.emergency.1.server_priority=
+dialplan.emergency.custom_asserted_id=
+dialplan.emergency.asserted_id_source=
+dialplan.emergency.asserted_id.sip_account= 
+dialplan.emergency.held.request_element.1.name=
+dialplan.emergency.held.request_element.1.value= 
+dialplan.emergency.held.request_type=
+dialplan.emergency.held.server_url=
+
+
+
+#######################################################################################
+##                               Dialplan                                            ##       
+#######################################################################################
+dialplan_replace_rule.url=
+dialplan.replace.line_id.1=
+dialplan.replace.replace.1=
+dialplan.replace.prefix.1=
+phone_setting.dialnow_delay=
+dialplan_dialnow.url=
+dialplan.dialnow.line_id.1=
+
+dialplan.dialnow.rule.1 = {$yealink_dialplan_dialnow_rule_1}
+dialplan.dialnow.rule.2 = {$yealink_dialplan_dialnow_rule_2}
+dialplan.dialnow.rule.3 = {$yealink_dialplan_dialnow_rule_3}
+dialplan.dialnow.rule.4 = {$yealink_dialplan_dialnow_rule_4}
+dialplan.dialnow.rule.5 = {$yealink_dialplan_dialnow_rule_5}
+
+dialplan.block_out.line_id.1=
+dialplan.block_out.number.1=
+dialplan.area_code.line_id =
+dialplan.area_code.max_len =
+dialplan.area_code.min_len=
+dialplan.area_code.code=
+
+#######################################################################################
+##                                 Rings Settings                                    ##
+#######################################################################################
+distinctive_ring_tones.alert_info.1.text = {$yealink_ring_text_1}
+distinctive_ring_tones.alert_info.2.text = {$yealink_ring_text_2}
+distinctive_ring_tones.alert_info.3.text = {$yealink_ring_text_3}
+distinctive_ring_tones.alert_info.4.text = {$yealink_ring_text_4}
+distinctive_ring_tones.alert_info.5.text = {$yealink_ring_text_5}
+distinctive_ring_tones.alert_info.6.text = {$yealink_ring_text_6}
+distinctive_ring_tones.alert_info.7.text = {$yealink_ring_text_7}
+distinctive_ring_tones.alert_info.8.text = {$yealink_ring_text_8}
+distinctive_ring_tones.alert_info.9.text = {$yealink_ring_text_9}
+distinctive_ring_tones.alert_info.10.text = {$yealink_ring_text_10}
+
+distinctive_ring_tones.alert_info.1.ringer = {$yealink_ring_file_1}
+distinctive_ring_tones.alert_info.2.ringer = {$yealink_ring_file_2}
+distinctive_ring_tones.alert_info.3.ringer = {$yealink_ring_file_3}
+distinctive_ring_tones.alert_info.4.ringer = {$yealink_ring_file_4}
+distinctive_ring_tones.alert_info.5.ringer = {$yealink_ring_file_5}
+distinctive_ring_tones.alert_info.6.ringer = {$yealink_ring_file_6}
+distinctive_ring_tones.alert_info.7.ringer = {$yealink_ring_file_7}
+distinctive_ring_tones.alert_info.8.ringer = {$yealink_ring_file_8}
+distinctive_ring_tones.alert_info.9.ringer = {$yealink_ring_file_9}
+distinctive_ring_tones.alert_info.10.ringer = {$yealink_ring_file_10}
+
+
+#######################################################################################
+##                                   IME Settings                                    ##
+#######################################################################################
+directory.search_default_input_method=
+directory.edit_default_input_method=
+gui_input_method.url=
+
+##V83 Add
+##Only T48G/T48S Models support the parameter
+phone_setting.virtual_keyboard.enable =
+
+#######################################################################################
+##                                   Language Settings                               ##
+#######################################################################################
+wui_lang.url=
+wui_lang_note.url=
+wui_lang.delete=
+gui_input_method.delete=
+gui_lang.url=
+gui_lang.delete=
+lang.gui=
+lang.wui=
+
+
+#######################################################################################
+##                                   Screensaver                                     ##
+#######################################################################################
+screensaver.type= {$yealink_screensaver_type}
+screensaver.delete= {$yealink_screensaver_delete}
+screensaver.upload_url= {$yealink_screensaver_upload_url}
+features.blf_active_backlight.enable= 
+screensaver.display_clock.enable= {$yealink_screensaver_clock}
+screensaver.clock_move_interval= {$yealink_screensaver_clock_interval}
+screensaver.picture_change_interval= {$yealink_screensaver_pic_interval}
+screensaver.wait_time= {$yealink_screensaver_wait}
+screensaver.xml_browser.url= {$yealink_screensaver_xml_url}
+
+
+
+#######################################################################################
+##                                  Power Saving                                     ##
+#######################################################################################
+features.power_saving.enable= {$yealink_powersave_enable}
+features.power_saving.power_led_flash.on_time= {$yealink_powersave_led_on_time}
+features.power_saving.power_led_flash.off_time= {$yealink_powersave_led_off_time}
+features.power_saving.office_hour.monday= {$yealink_powersave_hour_mon}
+features.power_saving.office_hour.tuesday= {$yealink_powersave_hour_tue}
+features.power_saving.office_hour.wednesday= {$yealink_powersave_wed}
+features.power_saving.office_hour.thursday= {$yealink_powersave_thu}
+features.power_saving.office_hour.friday= {$yealink_powersave_fri}
+features.power_saving.office_hour.saturday= {$yealink_powersave_sat}
+features.power_saving.office_hour.sunday = {$yealink_powersave_sun}
+features.power_saving.user_input_ext.idle_timeout= {$yealink_powersave_user_input_timeout}
+features.power_saving.off_hour.idle_timeout= {$yealink_powersave_off_hour_timeout}
+features.power_saving.office_hour.idle_timeout= {$yealink_powersave_office_hour_timeout}
+features.power_saving.intelligent_mode= {$yealink_powersave_intelligent_mode}
+
+
+#######################################################################################
+##                           Backgrounds  Settings                                   ##
+#######################################################################################
+##File Formate:
+##SIP-T54S/T52S/T48S/T48G/T46G/T46S/T29G: .jpg/.png/.bmp/.jpeg;
+##Resolution:
+##SIP-T48S/T48G:<=2.0 megapixels;
+##for SIP-T46G/T46S/T29G: <=1.8 megapixels;SIP-T54S/T52S:<=4.2 megapixels;
+##Single File Size: <=5MB 
+##2MB of space should bereserved for the phone
+
+wallpaper_upload.url = {$yealink_t53w_wallpaper}
+{if isset($yealink_t53w_wallpaper_filename)}
+phone_setting.backgrounds =  Config:{$yealink_t53w_wallpaper_filename}
+{else}
+phone_setting.backgrounds =  Config:yealink_t53w_wallpaper.png
+{/if}
+
+## phone_setting.backgrounds_with_dsskey_unfold(Only support T48G/S)
+phone_setting.backgrounds_with_dsskey_unfold= {$yealink_wallpaper_dsskey_unfold}
+
+##expansion_module.backgrounds(Only support T54S/T52S)
+expansion_module.backgrounds= {$yealink_wallpaper_expansion}
+
+
+#######################################################################################
+##                               BSFT Setting                                        ##       
+#######################################################################################
+bw.enable =
+
+
+#######################################################################################
+##                                  BLF/BLF List                                     ##       
+#######################################################################################
+phone_setting.auto_blf_list_enable=
+phone_setting.blf_list_sequence_type=
+
+blf.enhanced.parked.enable=
+blf.enhanced.parked.led =
+blf.enhanced.parked.talking.action =
+blf.enhanced.parked.callin.action =
+blf.enhanced.parked.idle.action =
+
+blf.enhanced.talking.enable=
+blf.enhanced.talking.led=
+blf.enhanced.talking.talking.action =
+blf.enhanced.talking.callin.action =
+blf.enhanced.talking.idle.action =
+
+blf.enhanced.callout.enable =
+blf.enhanced.callout.led=
+blf.enhanced.callout.talking.action =
+blf.enhanced.callout.callin.action =
+blf.enhanced.callout.idle.action =
+
+blf.enhanced.callin.enable =
+blf.enhanced.callin.led=
+blf.enhanced.callin.talking.action =
+blf.enhanced.callin.callin.action=
+blf.enhanced.callin.idle.action=
+
+blf.enhanced.idle.enable=
+blf.enhanced.idle.led=
+blf.enhanced.idle.talking.action=
+blf.enhanced.idle.callin.action=
+blf.enhanced.idle.idle.action=
+
+features.blf_list_version=
+sip.sub_refresh_random=
+sip.terminate_notify_sub_delay_time=
+
+features.blf_led_mode = {$yealink_blf_led_mode}
+features.blf_pickup_only_send_code=
+
+##V84 Add
+blf.enhanced.dnd.enable=
+blf.enhanced.dnd.led=
+blf.enhanced.hold.enable=
+blf.enhanced.hold.led=
+
+features.blf.show_callinfo.enable=
+
+#######################################################################################
+##                                   SCA                                             ##       
+#######################################################################################
+features.auto_release_bla_line=
+features.barge_in_via_username.enable=
+
+
+
+#######################################################################################
+##                                   Call Park                                       ##       
+#######################################################################################
+features.call_park.enable=
+features.call_park.park_mode=
+features.call_park.park_code=
+features.call_park.park_retrieve_code=
+features.call_park.direct_send.enable=
+features.call_park.park_visual_notify_enable=
+features.call_park.park_ring=
+features.call_park.group_enable=
+features.call_park.group_park_code=
+sip.call_park_without_blf=
+features.call_park.line_restriction.enable=
+
+
+#######################################################################################
+##                                    Broadsoft ACD                                  ##       
+#######################################################################################
+acd.enable=
+acd.auto_available_timer=
+
+
+
+
+#######################################################################################
+##                              Broadsoft XSI                                        ##       
+#######################################################################################
+bw.xsi.enable=
+sip.authentication_for_xsi =
+default_input_method.xsi_password=
+
+
+#######################################################################################
+##                             Broadsoft Network Directory                           ##       
+#######################################################################################
+bw.xsi.directory.enable=
+bw.calllog_and_dir =
+bw.xsi.call_log.enable=
+bw_phonebook.custom=
+bw_phonebook.enterprise_common_enable=
+bw_phonebook.enterprise_common_displayname=
+bw_phonebook.enterprise_enable=
+bw_phonebook.enterprise_displayname=
+bw_phonebook.group_common_enable=
+bw_phonebook.group_common_displayname=
+bw_phonebook.personal_enable=
+bw_phonebook.personal_displayname=
+bw_phonebook.group_enable=
+bw_phonebook.group_displayname =
+directory.update_time_interval=
+bw.xsi.directory.alphabetized_by_lastname.enable=
+directory_setting.bw_directory.enable =
+directory_setting.bw_directory.priority =
+search_in_dialing.bw_directory.enable =
+search_in_dialing.bw_directory.priority =
+##V83 Add
+bw.xsi.directory.update.enable =
+
+#######################################################################################
+##                             Broadsoft Network Calllog                             ##       
+#######################################################################################
+##V83 Add
+bw.xsi.call_log.delete.enable =
+bw.xsi.call_log.multiple_accounts.enable =
+phone_setting.ring_duration =
+
+
+#######################################################################################
+##                                Call Pickup                                        ##       
+#######################################################################################
+features.pickup.direct_pickup_enable = {$yealink_direct_pickup_enable}
+features.pickup.group_pickup_enable =
+features.pickup.direct_pickup_code = **
+features.pickup.group_pickup_code =
+features.pickup.blf_audio_enable =
+features.pickup.blf_visual_enable =
+features.pickup_display.method =
+
+##V84 Add
+features.pickup.blf_audio.list=
+features.pickup.blf_visual.list=
+
+
+#######################################################################################
+##                                Alert Info                                         ##       
+#######################################################################################
+features.alert_info_tone =
+
+
+#######################################################################################
+##                       Broadsoft Visual Voice Mail                                 ##       
+#######################################################################################
+bw.voice_mail.visual.enable=
+voice_mail.message_key.mode=
+bw.voice_mail.visual.display_videomail.enable=
+
+
+
+#######################################################################################
+##                              Broadsoft Call Recording                             ##       
+#######################################################################################
+bw.call_recording.mode =
+
+
+#######################################################################################
+##                              Broadsoft Call Decline                               ##       
+#######################################################################################
+features.call_decline.enable =
+
+
+#######################################################################################
+##                         BLF Ring Type                                             ##       
+#######################################################################################
+features.blf.ring_type = {$yealink_blf_ring_type}
+
+
+
+#######################################################################################
+##                         Features Sync                                             ##       
+#######################################################################################
+features.feature_key_sync.enable = {$yealink_feature_key_sync}
+features.forward.feature_key_sync.local_processing.enable =
+features.forward.feature_key_sync.enable =
+features.dnd.feature_key_sync.local_processing.enable =
+features.dnd.feature_key_sync.enable =
+call_waiting.mode =
+
+
+#######################################################################################
+##                           Broadsoft  UC                                           ##       
+#######################################################################################
+##Only T54S/T52S/T48G/T48S/T46G/T46S/T29G Models support the parameter
+bw.xmpp.enable =
+features.uc_password =
+features.uc_username =
+bw.xmpp.presence_icon.mode =
+bw.xmpp.change_presence.force_manual.enable =
+bw.xmpp.change_presence.enable =
+phone_setting.dsskey_directory_auto.enable =
+features.uc_dir.match_tail_number=
+directory_setting.bw_uc_buddies.enable =
+directory_setting.bw_uc_buddies.priority =
+search_in_dialing.bw_uc_buddies.enable =
+search_in_dialing.bw_uc_buddies.priority =
+
+##V83 Add
+phone_setting.uc_favorite_sequence_type =
+
+#######################################################################################
+##                      Broadsoft  Emergency Call                                    ##       
+#######################################################################################
+##V83 Add
+bw.emergency_calling.enable  =
+
+
+
+#######################################################################################
+##                         Metaswitch Setting                                        ##       
+#######################################################################################
+meta.enable =
+meta.login_mode =
+meta.comm_portal.server.username =
+meta.comm_portal.server.password =
+meta.comm_portal.server.url =
+meta.comm_portal.enable =
+meta.comm_portal.contacts.update_interval =
+meta.comm_portal.acd.enable=
+meta.comm_portal.replace_local_call_list.enable=
+meta.comm_portal.contacts.group.mlhgs.label=
+meta.comm_portal.contacts.group.extensions.label=
+meta.comm_portal.contacts.group.contacts.label=
+meta.comm_portal.contacts.group.mlhgs.enable=
+meta.comm_portal.contacts.group.extensions.enable=
+meta.comm_portal.contacts.group.contacts.enable=
+meta.comm_portal.call_list.enable=
+meta.comm_portal.contacts.enable=
+meta.comm_portal.message.enable=
+meta.comm_portal.logout.enable =
+meta.comm_portal.keep_alive_interval_time =
+
+##V83 Add
+directory_setting.meta_directory.enable=
+directory_setting.meta_directory.priority=
+directory_setting.meta_call_log.enable=
+directory_setting.meta_call_log.priority=
+search_in_dialing.meta_call_log.priority =
+search_in_dialing.meta_call_log.enable =
+search_in_dialing.meta_directory.priority =
+search_in_dialing.meta_directory.enable =
+
+
+
+#######################################################################################
+##                                   Genbend Setting                                 ##       
+#######################################################################################
+gb.sopi.enable=
+gb.sopi.gab.enable=
+gb.sopi.pab.enable=
+features.pab.soupuser=
+features.pab.enable=
+gb.sopi.pab.match_in_calling.enable=
+gb.sopi.gab.retain_search_filter=
+gb.sopi.service_url=
+gb.sopi.password=
+gb.sopi.username=
+directory_setting.gb_gab_directory.priority =
+directory_setting.gb_gab_directory.enable =
+directory_setting.gb_pab_directory.enable =
+directory_setting.gb_pab_directory.priority =
+search_in_dialing.gb_pab_directory.priority =
+search_in_dialing.gb_pab_directory.enable =
+
+
+#######################################################################################
+##                                   Loopback Call                                   ##       
+#######################################################################################
+##V83 Add
+sip.loopback.enable =
+sip.loopback_type =
+sip.pkt_loopback_mode
+sip.loopback.auto_answer.mode =
+sip.pkt_loopback_encapsulated_payload =
+sip.pkt_loopback_directed_payload =
+
+
+#######################################################################################
+##                                   V84 add                                         ##       
+#######################################################################################
+google_contact_server.enable=
+
+static.features.network_test.check_policy=
+static.features.network_test.enable=
+static.features.network_test.host=
+static.features.network_test.period=
+static.features.network_unavailable_test.period=
+
+phone_setting.warnings_display.mode=
+
+bw.flexible_seating.remember_password.ldap.enable=
+
+vcaccount.enable=
+
+#######################################################################################
+##                       V84 T5XW add   VPM-Acoustic Shield                          ##       
+#######################################################################################
+features.acoustic_shield.level =
+features.acoustic_shield.mode = 
+
+
+#######################################################################################
+##                       V84 T5XW add   ×                                            ##       
+#######################################################################################
+
+base.active_handset.number=
+base.pin_code=
+base.repeater_mode.enable=
+base.pin_code_for_register=
+base.double_pin_code.enable=
+
+
+custom.handset.auto_answer.enable=
+custom.handset.auto_intercom=
+custom.handset.backlight_out_of_charger.enable=
+custom.handset.backlight_in_charger.enable=
+custom.handset.color_scheme=
+custom.handset.confirmation_tone.enable=
+custom.handset.date_format=
+custom.handset.eco_mode.enable=
+custom.handset.keypad_light.enable=
+custom.handset.keypad_tone.enable=
+custom.handset.language=
+custom.handset.low_battery_tone.enable=
+custom.handset.missed_call_notify_light.enable=
+custom.handset.screen_saver.enable=
+custom.handset.time_format=
+custom.handset.voice_mail_notify_light.enable=
+custom.handset.wallpaper=
+
+
+handset.x.dial_out_default_line=
+handset.x.dial_out_lines=
+handset.x.hac.enable=
+handset.x.incoming_lines=
+handset.x.name=
+
+
+over_the_air.base_trigger=
+over_the_air.handset_tip=
+over_the_air.handset_trigger=
+over_the_air.url=
+over_the_air.url.w52h=
+over_the_air.url.w56h=
+
+
+
+
+auto_provision.custom.handset.protect=
+auto_provision.handset_configured.enable=
+phone_setting.end_call_on_hook.enable=
+
+directory_setting.shared_contact.enable=
+shared_contact_list.url=
+
diff --git a/resources/templates/provision/yealink/t53/{$mac}.cfg b/resources/templates/provision/yealink/t53/{$mac}.cfg
new file mode 100644
index 0000000000..80ca513c1f
--- /dev/null
+++ b/resources/templates/provision/yealink/t53/{$mac}.cfg
@@ -0,0 +1,5318 @@
+#!version:1.0.0.1
+#{$microtime}
+##File header "#!version:1.0.0.1" can not be edited or deleted, and must be placed in the first line.##
+##account.X.*:(T54S/T48G/T48S/T46G/T46S/T29G: X ranges from 1 to 16. T52S/T42G/T42S: X ranges from 1 to 12. T41P/T41S/T27P/T27G: X ranges from 1 to 6. T40P/T40G/T23P/T23G: X ranges from 1 to 3. T21(P) E2: X ranges from 1 to 2.)##
+
+#######################################################################################
+##                                   Trnasfer                                        ##       
+#######################################################################################
+account.1.phone_setting.call_appearance.transfer_via_new_linekey=
+
+
+#######################################################################################
+##                                   Conference                                      ##       
+#######################################################################################
+account.1.phone_setting.call_appearance.conference_via_new_linekey=
+
+
+#######################################################################################
+##                                   Anonymous                                       ##       
+#######################################################################################
+account.1.anonymous_call.server_base_only =
+account.1.send_anonymous_rejection_code =
+account.1.anonymous_reject_offcode =
+account.1.anonymous_reject_oncode =
+account.1.reject_anonymous_call=
+account.1.anonymous_call_offcode =
+account.1.anonymous_call_oncode =
+account.1.anonymous_call =
+account.1.send_anonymous_code =
+
+
+
+#######################################################################################
+##                          Call Configuration                                       ##       
+#######################################################################################
+account.1.music_server_uri=
+account.1.music_on_hold_type=
+account.1.auto_label.rule=
+account.1.auto_label.enable=
+account.1.number_of_linekey=
+account.1.phone_setting.call_appearance.calls_per_linekey=
+
+
+#######################################################################################
+##                                    Codec                                          ##       
+#######################################################################################
+account.1.codec.ilbc_15_2kbps.priority= 0
+account.1.codec.ilbc_15_2kbps.enable= 0
+account.1.codec.ilbc_13_33kbps.priority= {if isset($yealink_codec_iLBC_priority)}{$yealink_codec_iLBC_priority}{else}0{/if}
+
+account.1.codec.ilbc_13_33kbps.enable = {if isset($yealink_codec_iLBC_enable)}1{else}0{/if}
+
+account.1.codec.pcma.enable= {if isset($yealink_codec_pcma_enable)}1{else}0{/if}
+
+account.1.codec.pcma.priority= {if isset($yealink_codec_pcma_priority)}{$yealink_codec_pcma_priority}{else}0{/if}
+
+account.1.codec.pcmu.enable= {if isset($yealink_codec_pcmu_enable)}1{else}0{/if}
+
+account.1.codec.pcmu.priority= {if isset($yealink_codec_pcmu_priority)}{$yealink_codec_pcmu_priority}{else}0{/if}
+
+account.1.codec.opus.priority = {if isset($yealink_codec_opus_priority)}{$yealink_codec_opus_priority}{else}0{/if}
+
+account.1.codec.opus.enable= {if isset($yealink_codec_opus_enable)}1{else}0{/if}
+
+account.1.codec.opus.para=
+
+account.1.codec.g726_40.enable= {if isset($yealink_codec_g726_40_enable)}1{else}0{/if}
+
+account.1.codec.g726_40.priority= {if isset($yealink_codec_g726_40_priority)}{$yealink_codec_g726_40_priority}{else}0{/if}
+
+account.1.codec.g726_32.enable= {if isset($yealink_codec_g726_32_enable)}1{else}0{/if}
+
+account.1.codec.g726_32.priority= {if isset($yealink_codec_g726_32_priority)}{$yealink_codec_g726_32_priority}{else}0{/if}
+
+account.1.codec.g726_24.enable= {if isset($yealink_codec_g726_24_enable)}1{else}0{/if}
+
+account.1.codec.g726_24.priority= {if isset($yealink_codec_g726_24_priority)}{$yealink_codec_g726_24_priority}{else}0{/if}
+
+account.1.codec.g726_16.enable= {if isset($yealink_codec_g726_16_enable)}1{else}0{/if}
+
+account.1.codec.g726_16.priority= {if isset($yealink_codec_g726_16_priority)}{$yealink_codec_g726_16_priority}{else}0{/if}
+
+account.1.codec.g723_63.priority= {if isset($yealink_codec_g723_63_priority)}{$yealink_codec_g723_63_priority}{else}0{/if}
+
+account.1.codec.g723_63.enable= {if isset($yealink_codec_g723_63_enable)}1{else}0{/if}
+
+account.1.codec.g723_53.priority= {if isset($yealink_codec_g723_53_priority)}{$yealink_codec_g723_53_priority}{else}0{/if}
+
+account.1.codec.g723_53.enable= {if isset($yealink_codec_g723_53_enable)}1{else}0{/if}
+
+account.1.codec.g729.priority= {if isset($yealink_codec_g729_priority)}{$yealink_codec_g729_priority}{else}0{/if}
+
+account.1.codec.g729.enable= {if isset($yealink_codec_g729_enable)}1{else}0{/if}
+
+account.1.codec.g722.priority= {if isset($yealink_codec_g722_priority)}{$yealink_codec_g722_priority}{else}0{/if}
+
+account.1.codec.g722.enable= {if isset($yealink_codec_g722_enable)}1{else}0{/if}
+
+account.1.codec.G722_1_24kpbs.priority=
+account.1.codec.G722_1_24kpbs.enable=
+account.1.codec.G722_1c_24kpbs.priority=
+account.1.codec.G722_1c_24kpbs.enable=
+account.1.codec.G722_1c_32kpbs.priority=
+account.1.codec.G722_1c_32kpbs.enable=
+account.1.codec.G722_1c_48kpbs.priority=
+account.1.codec.G722_1c_48kpbs.enable=
+
+################################################################
+#                      Account Register                       ##
+################################################################
+{if isset($account.1.password) }
+account.1.enable = 1
+{else}
+account.1.enable = 0
+{/if}
+account.1.label = {$account.1.display_name}
+account.1.display_name = {$account.1.display_name}
+account.1.auth_name = {$account.1.auth_id}
+account.1.password = {$account.1.password}
+{if isset($account.1.server.1.address)}
+account.1.user_name = {$account.1.user_id}@{$account.1.server_address}
+{else}
+account.1.user_name = {$account.1.user_id}
+{/if}
+
+account.1.sip_server.1.address= {$account.1.server_address}
+account.1.sip_server.1.port= {$account.1.sip_port}
+
+
+{if $account.1.sip_transport == 'udp'}account.1.sip_server.1.transport_type = 0{/if}
+{if $account.1.sip_transport == 'tcp'}account.1.sip_server.1.transport_type = 1{/if}
+{if $account.1.sip_transport == 'tls'}account.1.sip_server.1.transport_type = 2{/if}
+{if $account.1.sip_transport == 'dns srv'}account.1.sip_server.1.transport_type = 3{/if}
+
+account.1.sip_server.1.expires= {$account.1.register_expires}
+account.1.sip_server.1.retry_counts= 3
+
+account.1.sip_server.2.address= {$account.1.server.2.address}
+account.1.sip_server.2.port= {$account.1.sip_port}
+
+
+{if $account.1.sip_transport == 'udp'}account.1.sip_server.2.transport_type = 0{/if}
+{if $account.1.sip_transport == 'tcp'}account.1.sip_server.2.transport_type = 1{/if}
+{if $account.1.sip_transport == 'tls'}account.1.sip_server.2.transport_type = 2{/if}
+{if $account.1.sip_transport == 'dns srv'}account.1.sip_server.2.transport_type = 3{/if}
+
+account.1.sip_server.2.expires= {$account.1.register_expires}
+account.1.sip_server.2.retry_counts= 3
+
+account.1.outbound_proxy_enable= {if isset($account.1.outbound_proxy_primary)}1{else}0{/if}
+
+account.1.outbound_proxy.1.address= {$account.1.outbound_proxy_primary}
+
+{if isset($outbound_proxy_1_port)}
+account.1.outbound_proxy.1.port = {$outbound_proxy_1_port}
+{else}
+account.1.outbound_proxy.1.port = {$account.1.sip_port}
+{/if}
+
+account.1.outbound_proxy.2.address= {$account.1.outbound_proxy_secondary}
+
+{if isset($outbound_proxy_1_port)}
+account.1.outbound_proxy.2.port = {$outbound_proxy_2_port}
+{else}
+account.1.outbound_proxy.2.port = {$account.1.sip_port}
+{/if}
+
+{if isset($outbound_proxy_fallback_interval)}
+account.1.outbound_proxy_fallback_interval = {$outbound_proxy_fallback_interval}
+{else}
+account.1.outbound_proxy_fallback_interval = 120
+{/if}
+
+account.1.nat.nat_traversal=
+
+
+################################################################
+#                      Account Basic                          ##
+################################################################
+account.1.auto_answer=
+
+################################################################
+#                      Account Advanced                       ##
+################################################################
+account.1.nat.udp_update_enable= 3
+account.1.nat.udp_update_time= 30
+account.1.nat.rport= {$yealink_rport}
+
+account.1.dtmf.type= {$yealink_dtmf_type}
+account.1.dtmf.info_type=
+account.1.dtmf.dtmf_payload=
+account.1.100rel_enable= {$yealink_retransmission}
+
+account.1.subscribe_register=
+account.1.cid_source= {$yealink_cid_source}
+account.1.enable_user_equal_phone=
+account.1.srtp_encryption= {$yealink_srtp_encryption}
+account.1.ptime= 20
+account.1.register_line=
+account.1.register_mac=
+account.1.reg_fail_retry_interval=
+account.1.unregister_on_reboot=
+
+account.1.session_timer.refresher=
+account.1.session_timer.expires=
+account.1.session_timer.enable= {$yealink_session_timer}
+
+account.1.conf_type = {if $nway_conference == true}2{/if}
+account.1.sip_server_type=
+
+##V83 Add
+account.1.srtp.unencrypted_rtcp.enable =
+account.1.srtp.unencrypted_rtp.enable =
+account.1.sip_server_mode =
+
+
+
+################################################################
+#                        SIP Backup Server                    ##
+################################################################
+account.1.outbound_proxy.1.register_on_enable=
+account.1.outbound_proxy.1.failback_timeout=
+account.1.outbound_proxy.1.failback_mode=
+account.1.outbound_proxy.1.retry_counts=
+account.1.outbound_proxy.1.only_signal_with_registered=
+account.1.outbound_proxy.1.failback_subscribe.enable=
+account.1.outbound_proxy.1.invite_retry_counts=
+
+account.1.sip_server.1.register_on_enable= 0
+account.1.sip_server.1.failback_timeout= 3600
+account.1.sip_server.1.failback_mode= 0
+account.1.sip_server.1.failback_subscribe.enable= 
+account.1.sip_server.1.only_signal_with_registered=
+account.1.sip_server.1.invite_retry_counts=
+
+account.1.outbound_proxy.2.register_on_enable=
+account.1.outbound_proxy.2.failback_timeout=
+account.1.outbound_proxy.2.failback_mode=
+account.1.outbound_proxy.2.retry_counts=
+account.1.outbound_proxy.2.only_signal_with_registered=
+account.1.outbound_proxy.2.failback_subscribe.enable=
+account.1.outbound_proxy.2.invite_retry_counts=
+
+account.1.sip_server.2.register_on_enable=
+account.1.sip_server.2.failback_timeout=
+account.1.sip_server.2.failback_mode=
+account.1.sip_server.2.failback_subscribe.enable=
+account.1.sip_server.2.only_signal_with_registered=
+account.1.sip_server.2.invite_retry_counts=
+
+account.1.static_cache_pri=
+account.1.dns_cache_type=
+account.1.naptr_build=
+account.1.fallback.timeout = {$yealink_outbound_proxy_fallback_interval}
+account.1.fallback.redundancy_type=
+account.1.reg_failed_retry_max_time=
+account.1.reg_failed_retry_min_time=
+account.1.redundancy_with_reg_fail.enable =
+
+##V83 Add
+account.1.sip_server.1.outbound_proxy_enable =
+account.1.sip_server.2.outbound_proxy_enable =
+
+################################################################
+#                        SIP Basic config                     ##
+################################################################
+account.1.contact_take_line_param=
+account.1.update_ack_while_dialing=
+account.1.srtp_lifetime=
+account.1.third_part_request_with_route.enable=
+account.1.insert_outbound_in_route.enable=
+account.1.path.enable=
+account.1.sub_fail_retry_interval=
+account.1.transfer_refer_to_contact_header.enable=
+account.1.hold_use_inactive=
+account.1.gruu.enable=
+account.1.dial_tone=
+account.1.call_id_mode=
+account.1.subscribe_expires_overlap=
+account.1.register_expires_overlap=
+account.1.call_info=
+account.1.custom_ua=
+account.1.mwi_parse_terminated=
+account.1.check_cseq.enable=
+account.1.check_to_tag.enable=
+account.1.vq_rtcpxr.collector_server_port=
+account.1.vq_rtcpxr.collector_server_host=
+account.1.vq_rtcpxr.collector_name=
+account.1.compact_header_enable=
+account.1.cp_source=
+account.1.cid_source_ppi=
+account.1.cid_source_privacy=
+account.1.reg_with_pani_header.enable =
+account.1.alert_info=
+account.1.picture_info_enable=
+
+##V83 Add
+account.1.invite_with_pani_header.enable = 
+
+##V84 Add
+account.1.invite_with_rpid_header.enable=
+
+account.1.auto_answer_mute_enable
+
+#######################################################################################
+##                                 History                                           ##       
+#######################################################################################
+account.1.missed_calllog=
+
+
+#######################################################################################  
+##                                  Forward                                          ##  
+####################################################################################### 
+account.1.timeout_fwd.off_code=
+account.1.timeout_fwd.on_code=
+account.1.timeout_fwd.timeout=
+account.1.timeout_fwd.target=
+account.1.timeout_fwd.enable=
+account.1.busy_fwd.off_code=
+account.1.busy_fwd.on_code=
+account.1.busy_fwd.target=
+account.1.busy_fwd.enable=
+account.1.always_fwd.off_code=
+account.1.always_fwd.on_code=
+account.1.always_fwd.target=
+account.1.always_fwd.enable=
+
+
+#######################################################################################  
+##                                  DND                                              ##  
+#######################################################################################
+account.1.dnd.enable=
+account.1.dnd.off_code=
+account.1.dnd.on_code=
+
+
+
+#######################################################################################  
+##                               Voice Mail                                          ##  
+#######################################################################################
+voice_mail.number.1= {$voicemail_number}
+account.1.subscribe_mwi=
+account.1.subscribe_mwi_to_vm=
+account.1.subscribe_mwi_expires=
+account.1.display_mwi.enable=
+
+#######################################################################################  
+##                               Auto Dial                                           ##  
+#######################################################################################
+account.1.auto_dial_enable=
+account.1.auto_dial_num=
+
+
+#######################################################################################
+##                           Preference&Status                                       ##       
+#######################################################################################
+account.1.ringtone.ring_type=
+
+#######################################################################################
+##                           Digitmap                                                ##       
+#######################################################################################
+account.1.dialplan.digitmap.enable=
+account.1.dialplan.digitmap.string=
+account.1.dialplan.digitmap.no_match_action=
+account.1.dialplan.digitmap.interdigit_short_timer=
+account.1.dialplan.digitmap.interdigit_long_timer=
+account.1.dialplan.digitmap.apply_to.press_send=
+account.1.dialplan.digitmap.apply_to.forward=
+account.1.dialplan.digitmap.apply_to.history_dial=
+account.1.dialplan.digitmap.apply_to.directory_dial=
+account.1.dialplan.digitmap.apply_to.on_hook_dial=
+account.1.dialplan.digitmap.active.on_hook_dialing=
+
+
+#######################################################################################
+##                                 Rings Settings                                    ##
+#######################################################################################
+account.1.alert_info_url_enable=
+
+
+#######################################################################################
+##                                  BLF/BLF List                                     ##       
+#######################################################################################
+account.1.blf.blf_list_uri=
+account.1.blf_list_barge_in_code=
+account.1.blf_list_code=
+account.1.blf_list_retrieve_call_parked_code=
+account.1.blf.subscribe_period=
+account.1.blf.match_host.enable=
+account.1.out_dialog_blf_enable=
+account.1.blf.subscribe_event=
+
+##V84 Add
+account.1.blf_list_call_parked_code=
+account.1.blf_list_call_parked_list=
+
+#######################################################################################
+##                                   SCA                                             ##       
+#######################################################################################
+account.1.shared_line= {$shared_line_1}
+account.1.line_seize.expires=
+account.1.shared_line_one_touch_bargein.enable=
+account.1.shared_line_one_touch_retrieve.enable=
+account.1.sca_manage_interface_display_time=
+account.1.shared_line_callpull_code=
+
+##V83 Add
+account.x.share_line.barge_in.enable
+
+#######################################################################################
+##                                   BLA                                             ##       
+#######################################################################################
+account.1.bla_number=
+account.1.bla_subscribe_period=
+account.1.bla.notify_with_expire.enable=
+account.1.bla.subscribe_uri_build_type=
+
+#######################################################################################
+##                                   Call Park                                       ##       
+#######################################################################################
+account.1.callpark_enable=
+
+
+#######################################################################################
+##                                    Broadsoft ACD                                  ##       
+#######################################################################################
+account.1.acd.enable=
+account.1.acd.available=
+account.1.acd.unavailable_reason_enable=
+account.1.acd.initial_state=
+account.1.subscribe_acd_expires=
+
+
+#######################################################################################
+##                                 Broadsoft ACD Call Center                         ##       
+#######################################################################################
+##account.X.reason_code.Y=
+##account.X.reason_code_name.Y=
+##account.X.bw_disp_code.Y=
+##account.X.bw_disp_code_name.Y=
+##account.X.supervisor_info_code.Y=
+##account.X.supervisor_info_code_name.Y=
+##The value Y must be continuous.
+
+account.1.reason_code.1=
+account.1.reason_code_name.1=
+account.1.bw_disp_code.1=
+account.1.bw_disp_code_name.1=
+account.1.supervisor_info_code.1=
+account.1.supervisor_info_code_name.1=
+
+#######################################################################################
+##                                 Broadsoft Call Center                             ##       
+#######################################################################################
+account.1.call_center.call_info_enable=
+account.1.call_center.show_call_info_time=
+account.1.call_center.disp_code_enable=
+account.1.call_center.trace_enable=
+account.1.call_center.emergency_enable=
+account.1.call_center.queue_status_enable=
+account.1.call_center.queue_status_light_enable =
+
+
+
+#######################################################################################
+##                         Broadsoft Hoteling                                        ##       
+#######################################################################################
+account.1.hoteling.enable=
+account.1.hoteling.user_id=
+account.1.hoteling.password=
+account.1.hoteling.expires=
+account.1.hoteling.auto_login_enable=
+
+
+#######################################################################################
+##                              Broadsoft XSI                                        ##       
+#######################################################################################
+account.1.xsi.user =
+account.1.xsi.password =
+account.1.xsi.host =
+account.1.xsi.server_type =
+account.1.xsi.port =
+
+
+#######################################################################################
+##                                Call Pickup                                        ##       
+#######################################################################################
+account.1.direct_pickup_code =
+account.1.group_pickup_code =
+account.1.dialoginfo_callpickup =
+account.1.refresh_remote_id.enable =
+
+
+#######################################################################################
+##                              Broadsoft Call Recording                             ##       
+#######################################################################################
+account.1.call_recording.enable=
+
+#######################################################################################
+##                                Network Conferene                                  ##       
+#######################################################################################
+account.1.conf_uri = {if $nway_conference == true}nway{$account.1.auth_id}@{$account.1.server_address}{/if}
+
+
+#######################################################################################
+##                              Broadsoft Call Decline                               ##       
+#######################################################################################
+account.1.features.call_decline.enable =
+
+
+#######################################################################################
+##                       Broadsoft Security Classification                           ##       
+#######################################################################################
+account.1.security_classification.enable =
+
+
+
+#######################################################################################
+##                        Broadsoft Flexible Seating                                 ##       
+#######################################################################################
+account.1.flexible_seating.enable=
+account.1.hoteling.pin=
+account.1.hoteling.mode=
+
+#######################################################################################
+##                         Features Sync                                             ##       
+#######################################################################################
+account.1.features.forward.feature_key_sync.local_processing.enable=
+account.1.features.dnd.feature_key_sync.local_processing.enable =
+
+##V84 Add
+account.1.dnd.feature_key_sync.enable=
+account.1.feature_key_sync.enable=
+account.1.forward.feature_key_sync.enable=
+
+#######################################################################################
+##                                   ACD                                             ##       
+#######################################################################################
+account.1.acd.available_url=
+account.1.acd.away_url =
+account.1.acd.refresh_url =
+account.1.acd.call_information=
+
+
+#######################################################################################
+##                                   PSTN                                            ##       
+#######################################################################################
+pstn.account.1.enable=
+pstn.account.1.label=
+
+
+#######################################################################################
+##                                  virtual_user                                     ##       
+#######################################################################################
+##V84 Add
+bw.virtual_user.1.enable=
+bw.virtual_user.1.label=
+bw.virtual_user.1.xsi.dnd.enable=
+bw.virtual_user.1.xsi.host=
+bw.virtual_user.1.xsi.password=
+bw.virtual_user.1.xsi.port=
+bw.virtual_user.1.xsi.server_type=
+bw.virtual_user.1.xsi.user=
+
+
+#######################################################################################
+##                                   Trnasfer                                        ##       
+#######################################################################################
+account.2.phone_setting.call_appearance.transfer_via_new_linekey=
+
+
+#######################################################################################
+##                                   Conference                                      ##       
+#######################################################################################
+account.2.phone_setting.call_appearance.conference_via_new_linekey=
+
+
+#######################################################################################
+##                                   Anonymous                                       ##       
+#######################################################################################
+account.2.anonymous_call.server_base_only =
+account.2.send_anonymous_rejection_code =
+account.2.anonymous_reject_offcode =
+account.2.anonymous_reject_oncode =
+account.2.reject_anonymous_call=
+account.2.anonymous_call_offcode =
+account.2.anonymous_call_oncode =
+account.2.anonymous_call =
+account.2.send_anonymous_code =
+
+
+
+#######################################################################################
+##                          Call Configuration                                       ##       
+#######################################################################################
+account.2.music_server_uri=
+account.2.music_on_hold_type=
+account.2.auto_label.rule=
+account.2.auto_label.enable=
+account.2.number_of_linekey=
+account.2.phone_setting.call_appearance.calls_per_linekey=
+
+
+#######################################################################################
+##                                    Codec                                          ##       
+#######################################################################################
+account.2.codec.ilbc_15_2kbps.priority=
+account.2.codec.ilbc_15_2kbps.enable=
+account.2.codec.ilbc_13_33kbps.priority=
+account.2.codec.ilbc_13_33kbps.enable =
+account.2.codec.pcma.enable =  1
+account.2.codec.pcma.priority = {$yealink_codec_5_priority}
+
+account.2.codec.pcmu.enable = 1
+account.2.codec.pcmu.priority = {$yealink_codec_4_priority}
+
+account.2.codec.opus.enable = 1
+account.2.codec.opus.priority = {$yealink_codec_1_priority}
+account.2.codec.opus.para=
+account.2.codec.g726_40.enable=
+account.2.codec.g726_40.priority=
+account.2.codec.g726_32.enable=
+account.2.codec.g726_32.priority=
+account.2.codec.g726_24.enable=
+account.2.codec.g726_24.priority=
+account.2.codec.g726_16.enable=
+account.2.codec.g726_16.priority=
+account.2.codec.g723_63.priority=
+account.2.codec.g723_63.enable=
+account.2.codec.g723_53.priority=
+account.2.codec.g723_53.enable=
+account.2.codec.g729.enable = 1
+account.2.codec.g729.priority = {$yealink_codec_3_priority}
+
+account.2.codec.g722.enable = 1
+account.2.codec.g722.priority = {$yealink_codec_2_priority}
+
+account.2.codec.G722_1_24kpbs.priority=
+account.2.codec.G722_1_24kpbs.enable=
+account.2.codec.G722_1c_24kpbs.priority=
+account.2.codec.G722_1c_24kpbs.enable=
+account.2.codec.G722_1c_32kpbs.priority=
+account.2.codec.G722_1c_32kpbs.enable=
+account.2.codec.G722_1c_48kpbs.priority=
+account.2.codec.G722_1c_48kpbs.enable=
+
+################################################################
+#                      Account Register                       ##
+################################################################
+{if isset($account.2.password) }
+account.2.enable = 1
+{else}
+account.2.enable = 0
+{/if}
+account.2.label = {$account.2.display_name}
+account.2.display_name = {$account.2.display_name}
+account.2.auth_name = {$account.2.auth_id}
+account.2.password = {$account.2.password}
+{if isset($account.2.server.1.address)}
+account.2.user_name = {$account.2.user_id}@{$account.2.server_address}
+{else}
+account.2.user_name = {$account.2.user_id}
+{/if}
+
+account.2.sip_server.1.address= {$account.2.server_address}
+account.2.sip_server.1.port= {$account.2.sip_port}
+
+
+{if $account.2.sip_transport == 'udp'}account.2.sip_server.1.transport_type = 0{/if}
+{if $account.2.sip_transport == 'tcp'}account.2.sip_server.1.transport_type = 1{/if}
+{if $account.2.sip_transport == 'tls'}account.2.sip_server.1.transport_type = 2{/if}
+{if $account.2.sip_transport == 'dns srv'}account.2.sip_server.1.transport_type = 3{/if}
+
+account.2.sip_server.1.expires= {$account.2.register_expires}
+account.2.sip_server.1.retry_counts= 3
+
+account.2.sip_server.2.address= {$account.2.server.2.address}
+account.2.sip_server.2.port= {$account.2.sip_port}
+
+
+{if $account.2.sip_transport == 'udp'}account.2.sip_server.2.transport_type = 0{/if}
+{if $account.2.sip_transport == 'tcp'}account.2.sip_server.2.transport_type = 1{/if}
+{if $account.2.sip_transport == 'tls'}account.2.sip_server.2.transport_type = 2{/if}
+{if $account.2.sip_transport == 'dns srv'}account.2.sip_server.2.transport_type = 3{/if}
+
+account.2.sip_server.2.expires= {$account.2.register_expires}
+account.2.sip_server.2.retry_counts= 3
+
+account.2.outbound_proxy_enable= {if isset($account.2.outbound_proxy_primary)}1{else}0{/if}
+
+account.2.outbound_proxy.1.address= {$account.2.outbound_proxy_primary}
+
+{if isset($outbound_proxy_1_port)}
+account.2.outbound_proxy.1.port = {$outbound_proxy_1_port}
+{else}
+account.2.outbound_proxy.1.port = {$account.2.sip_port}
+{/if}
+
+account.2.outbound_proxy.2.address= {$account.2.outbound_proxy_secondary}
+
+{if isset($outbound_proxy_1_port)}
+account.2.outbound_proxy.2.port = {$outbound_proxy_2_port}
+{else}
+account.2.outbound_proxy.2.port = {$account.2.sip_port}
+{/if}
+
+{if isset($outbound_proxy_fallback_interval)}
+account.2.outbound_proxy_fallback_interval = {$outbound_proxy_fallback_interval}
+{else}
+account.2.outbound_proxy_fallback_interval = 120
+{/if}
+
+account.2.nat.nat_traversal=
+
+
+################################################################
+#                      Account Basic                          ##
+################################################################
+account.2.auto_answer=
+
+################################################################
+#                      Account Advanced                       ##
+################################################################
+account.2.nat.udp_update_enable= 3
+account.2.nat.udp_update_time= 30
+account.2.nat.rport= {$yealink_rport}
+
+account.2.dtmf.type= {$yealink_dtmf_type}
+account.2.dtmf.info_type=
+account.2.dtmf.dtmf_payload=
+account.2.100rel_enable= {$yealink_retransmission}
+
+account.2.subscribe_register=
+account.2.cid_source= {$yealink_cid_source}
+account.2.enable_user_equal_phone=
+account.2.srtp_encryption= {$yealink_srtp_encryption}
+account.2.ptime= 20
+account.2.register_line=
+account.2.register_mac=
+account.2.reg_fail_retry_interval=
+account.2.unregister_on_reboot=
+
+account.2.session_timer.refresher=
+account.2.session_timer.expires=
+account.2.session_timer.enable= {$yealink_session_timer}
+
+account.2.conf_type = {if $nway_conference == true}2{/if}
+account.2.sip_server_type=
+
+##V83 Add
+account.2.srtp.unencrypted_rtcp.enable =
+account.2.srtp.unencrypted_rtp.enable =
+account.2.sip_server_mode =
+
+
+
+################################################################
+#                        SIP Backup Server                    ##
+################################################################
+account.2.outbound_proxy.1.register_on_enable=
+account.2.outbound_proxy.1.failback_timeout=
+account.2.outbound_proxy.1.failback_mode=
+account.2.outbound_proxy.1.retry_counts=
+account.2.outbound_proxy.1.only_signal_with_registered=
+account.2.outbound_proxy.1.failback_subscribe.enable=
+account.2.outbound_proxy.1.invite_retry_counts=
+
+account.2.sip_server.1.register_on_enable= 0
+account.2.sip_server.1.failback_timeout= 3600
+account.2.sip_server.1.failback_mode= 0
+account.2.sip_server.1.failback_subscribe.enable= 
+account.2.sip_server.1.only_signal_with_registered=
+account.2.sip_server.1.invite_retry_counts=
+
+account.2.outbound_proxy.2.register_on_enable=
+account.2.outbound_proxy.2.failback_timeout=
+account.2.outbound_proxy.2.failback_mode=
+account.2.outbound_proxy.2.retry_counts=
+account.2.outbound_proxy.2.only_signal_with_registered=
+account.2.outbound_proxy.2.failback_subscribe.enable=
+account.2.outbound_proxy.2.invite_retry_counts=
+
+account.2.sip_server.2.register_on_enable=
+account.2.sip_server.2.failback_timeout=
+account.2.sip_server.2.failback_mode=
+account.2.sip_server.2.failback_subscribe.enable=
+account.2.sip_server.2.only_signal_with_registered=
+account.2.sip_server.2.invite_retry_counts=
+
+account.2.static_cache_pri=
+account.2.dns_cache_type=
+account.2.naptr_build=
+account.2.fallback.timeout = {$yealink_outbound_proxy_fallback_interval}
+account.2.fallback.redundancy_type=
+account.2.reg_failed_retry_max_time=
+account.2.reg_failed_retry_min_time=
+account.2.redundancy_with_reg_fail.enable =
+
+##V83 Add
+account.2.sip_server.1.outbound_proxy_enable =
+account.2.sip_server.2.outbound_proxy_enable =
+
+################################################################
+#                        SIP Basic config                     ##
+################################################################
+account.2.contact_take_line_param=
+account.2.update_ack_while_dialing=
+account.2.srtp_lifetime=
+account.2.third_part_request_with_route.enable=
+account.2.insert_outbound_in_route.enable=
+account.2.path.enable=
+account.2.sub_fail_retry_interval=
+account.2.transfer_refer_to_contact_header.enable=
+account.2.hold_use_inactive=
+account.2.gruu.enable=
+account.2.dial_tone=
+account.2.call_id_mode=
+account.2.subscribe_expires_overlap=
+account.2.register_expires_overlap=
+account.2.call_info=
+account.2.custom_ua=
+account.2.mwi_parse_terminated=
+account.2.check_cseq.enable=
+account.2.check_to_tag.enable=
+account.2.vq_rtcpxr.collector_server_port=
+account.2.vq_rtcpxr.collector_server_host=
+account.2.vq_rtcpxr.collector_name=
+account.2.compact_header_enable=
+account.2.cp_source=
+account.2.cid_source_ppi=
+account.2.cid_source_privacy=
+account.2.reg_with_pani_header.enable =
+account.2.alert_info=
+account.2.picture_info_enable=
+
+##V83 Add
+account.2.invite_with_pani_header.enable = 
+
+##V84 Add
+account.2.invite_with_rpid_header.enable=
+
+account.2.auto_answer_mute_enable
+
+#######################################################################################
+##                                 History                                           ##       
+#######################################################################################
+account.2.missed_calllog=
+
+
+#######################################################################################  
+##                                  Forward                                          ##  
+####################################################################################### 
+account.2.timeout_fwd.off_code=
+account.2.timeout_fwd.on_code=
+account.2.timeout_fwd.timeout=
+account.2.timeout_fwd.target=
+account.2.timeout_fwd.enable=
+account.2.busy_fwd.off_code=
+account.2.busy_fwd.on_code=
+account.2.busy_fwd.target=
+account.2.busy_fwd.enable=
+account.2.always_fwd.off_code=
+account.2.always_fwd.on_code=
+account.2.always_fwd.target=
+account.2.always_fwd.enable=
+
+
+#######################################################################################  
+##                                  DND                                              ##  
+#######################################################################################
+account.2.dnd.enable=
+account.2.dnd.off_code=
+account.2.dnd.on_code=
+
+
+
+#######################################################################################  
+##                               Voice Mail                                          ##  
+#######################################################################################
+voice_mail.number.1= {$voicemail_number}
+account.2.subscribe_mwi=
+account.2.subscribe_mwi_to_vm=
+account.2.subscribe_mwi_expires=
+account.2.display_mwi.enable=
+
+#######################################################################################  
+##                               Auto Dial                                           ##  
+#######################################################################################
+account.2.auto_dial_enable=
+account.2.auto_dial_num=
+
+
+#######################################################################################
+##                           Preference&Status                                       ##       
+#######################################################################################
+account.2.ringtone.ring_type=
+
+#######################################################################################
+##                           Digitmap                                                ##       
+#######################################################################################
+account.2.dialplan.digitmap.enable=
+account.2.dialplan.digitmap.string=
+account.2.dialplan.digitmap.no_match_action=
+account.2.dialplan.digitmap.interdigit_short_timer=
+account.2.dialplan.digitmap.interdigit_long_timer=
+account.2.dialplan.digitmap.apply_to.press_send=
+account.2.dialplan.digitmap.apply_to.forward=
+account.2.dialplan.digitmap.apply_to.history_dial=
+account.2.dialplan.digitmap.apply_to.directory_dial=
+account.2.dialplan.digitmap.apply_to.on_hook_dial=
+account.2.dialplan.digitmap.active.on_hook_dialing=
+
+
+#######################################################################################
+##                                 Rings Settings                                    ##
+#######################################################################################
+account.2.alert_info_url_enable=
+
+
+#######################################################################################
+##                                  BLF/BLF List                                     ##       
+#######################################################################################
+account.2.blf.blf_list_uri=
+account.2.blf_list_barge_in_code=
+account.2.blf_list_code=
+account.2.blf_list_retrieve_call_parked_code=
+account.2.blf.subscribe_period=
+account.2.blf.match_host.enable=
+account.2.out_dialog_blf_enable=
+account.2.blf.subscribe_event=
+
+##V84 Add
+account.2.blf_list_call_parked_code=
+account.2.blf_list_call_parked_list=
+
+#######################################################################################
+##                                   SCA                                             ##       
+#######################################################################################
+account.2.shared_line= {$shared_line_1}
+account.2.line_seize.expires=
+account.2.shared_line_one_touch_bargein.enable=
+account.2.shared_line_one_touch_retrieve.enable=
+account.2.sca_manage_interface_display_time=
+account.2.shared_line_callpull_code=
+
+##V83 Add
+account.x.share_line.barge_in.enable
+
+#######################################################################################
+##                                   BLA                                             ##       
+#######################################################################################
+account.2.bla_number=
+account.2.bla_subscribe_period=
+account.2.bla.notify_with_expire.enable=
+account.2.bla.subscribe_uri_build_type=
+
+#######################################################################################
+##                                   Call Park                                       ##       
+#######################################################################################
+account.2.callpark_enable=
+
+
+#######################################################################################
+##                                    Broadsoft ACD                                  ##       
+#######################################################################################
+account.2.acd.enable=
+account.2.acd.available=
+account.2.acd.unavailable_reason_enable=
+account.2.acd.initial_state=
+account.2.subscribe_acd_expires=
+
+
+#######################################################################################
+##                                 Broadsoft ACD Call Center                         ##       
+#######################################################################################
+##account.X.reason_code.Y=
+##account.X.reason_code_name.Y=
+##account.X.bw_disp_code.Y=
+##account.X.bw_disp_code_name.Y=
+##account.X.supervisor_info_code.Y=
+##account.X.supervisor_info_code_name.Y=
+##The value Y must be continuous.
+
+account.2.reason_code.1=
+account.2.reason_code_name.1=
+account.2.bw_disp_code.1=
+account.2.bw_disp_code_name.1=
+account.2.supervisor_info_code.1=
+account.2.supervisor_info_code_name.1=
+
+#######################################################################################
+##                                 Broadsoft Call Center                             ##       
+#######################################################################################
+account.2.call_center.call_info_enable=
+account.2.call_center.show_call_info_time=
+account.2.call_center.disp_code_enable=
+account.2.call_center.trace_enable=
+account.2.call_center.emergency_enable=
+account.2.call_center.queue_status_enable=
+account.2.call_center.queue_status_light_enable =
+
+
+
+#######################################################################################
+##                         Broadsoft Hoteling                                        ##       
+#######################################################################################
+account.2.hoteling.enable=
+account.2.hoteling.user_id=
+account.2.hoteling.password=
+account.2.hoteling.expires=
+account.2.hoteling.auto_login_enable=
+
+
+#######################################################################################
+##                              Broadsoft XSI                                        ##       
+#######################################################################################
+account.2.xsi.user =
+account.2.xsi.password =
+account.2.xsi.host =
+account.2.xsi.server_type =
+account.2.xsi.port =
+
+
+#######################################################################################
+##                                Call Pickup                                        ##       
+#######################################################################################
+account.2.direct_pickup_code =
+account.2.group_pickup_code =
+account.2.dialoginfo_callpickup =
+account.2.refresh_remote_id.enable =
+
+
+#######################################################################################
+##                              Broadsoft Call Recording                             ##       
+#######################################################################################
+account.2.call_recording.enable=
+
+#######################################################################################
+##                                Network Conferene                                  ##       
+#######################################################################################
+account.2.conf_uri = {if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}
+
+
+#######################################################################################
+##                              Broadsoft Call Decline                               ##       
+#######################################################################################
+account.2.features.call_decline.enable =
+
+
+#######################################################################################
+##                       Broadsoft Security Classification                           ##       
+#######################################################################################
+account.2.security_classification.enable =
+
+
+
+#######################################################################################
+##                        Broadsoft Flexible Seating                                 ##       
+#######################################################################################
+account.2.flexible_seating.enable=
+account.2.hoteling.pin=
+account.2.hoteling.mode=
+
+#######################################################################################
+##                         Features Sync                                             ##       
+#######################################################################################
+account.2.features.forward.feature_key_sync.local_processing.enable=
+account.2.features.dnd.feature_key_sync.local_processing.enable =
+
+##V84 Add
+account.2.dnd.feature_key_sync.enable=
+account.2.feature_key_sync.enable=
+account.2.forward.feature_key_sync.enable=
+
+#######################################################################################
+##                                   ACD                                             ##       
+#######################################################################################
+account.2.acd.available_url=
+account.2.acd.away_url =
+account.2.acd.refresh_url =
+account.2.acd.call_information=
+
+
+#######################################################################################
+##                                   PSTN                                            ##       
+#######################################################################################
+pstn.account.2.enable=
+pstn.account.2.label=
+
+
+
+#######################################################################################
+##                                   Trnasfer                                        ##       
+#######################################################################################
+account.1.phone_setting.call_appearance.transfer_via_new_linekey=
+
+
+#######################################################################################
+##                                   Conference                                      ##       
+#######################################################################################
+account.3.phone_setting.call_appearance.conference_via_new_linekey=
+
+
+#######################################################################################
+##                                   Anonymous                                       ##       
+#######################################################################################
+account.3.anonymous_call.server_base_only =
+account.3.send_anonymous_rejection_code =
+account.3.anonymous_reject_offcode =
+account.3.anonymous_reject_oncode =
+account.3.reject_anonymous_call=
+account.3.anonymous_call_offcode =
+account.3.anonymous_call_oncode =
+account.3.anonymous_call =
+account.3.send_anonymous_code =
+
+
+
+#######################################################################################
+##                          Call Configuration                                       ##       
+#######################################################################################
+account.3.music_server_uri=
+account.3.music_on_hold_type=
+account.3.auto_label.rule=
+account.3.auto_label.enable=
+account.3.number_of_linekey=
+account.3.phone_setting.call_appearance.calls_per_linekey=
+
+
+#######################################################################################
+##                                    Codec                                          ##       
+#######################################################################################
+account.3.codec.ilbc_15_2kbps.priority=
+account.3.codec.ilbc_15_2kbps.enable=
+account.3.codec.ilbc_13_33kbps.priority=
+account.3.codec.ilbc_13_33kbps.enable =
+account.3.codec.pcma.enable =  1
+account.3.codec.pcma.priority = {$yealink_codec_5_priority}
+
+account.3.codec.pcmu.enable = 1
+account.3.codec.pcmu.priority = {$yealink_codec_4_priority}
+
+account.3.codec.opus.enable = 1
+account.3.codec.opus.priority = {$yealink_codec_1_priority}
+account.3.codec.opus.para=
+account.3.codec.g726_40.enable=
+account.3.codec.g726_40.priority=
+account.3.codec.g726_32.enable=
+account.3.codec.g726_32.priority=
+account.3.codec.g726_24.enable=
+account.3.codec.g726_24.priority=
+account.3.codec.g726_16.enable=
+account.3.codec.g726_16.priority=
+account.3.codec.g723_63.priority=
+account.3.codec.g723_63.enable=
+account.3.codec.g723_53.priority=
+account.3.codec.g723_53.enable=
+account.3.codec.g729.enable = 1
+account.3.codec.g729.priority = {$yealink_codec_3_priority}
+
+account.3.codec.g722.enable = 1
+account.3.codec.g722.priority = {$yealink_codec_2_priority}
+
+account.3.codec.G722_1_24kpbs.priority=
+account.3.codec.G722_1_24kpbs.enable=
+account.3.codec.G722_1c_24kpbs.priority=
+account.3.codec.G722_1c_24kpbs.enable=
+account.3.codec.G722_1c_32kpbs.priority=
+account.3.codec.G722_1c_32kpbs.enable=
+account.3.codec.G722_1c_48kpbs.priority=
+account.3.codec.G722_1c_48kpbs.enable=
+
+
+################################################################
+#                      Account Register                       ##
+################################################################
+{if isset($account.3.password) }
+account.3.enable = 1
+{else}
+account.3.enable = 0
+{/if}
+account.3.label = {$account.3.display_name}
+account.3.display_name = {$account.3.display_name}
+account.3.auth_name = {$account.3.auth_id}
+account.3.password = {$account.3.password}
+{if isset($account.3.server.1.address)}
+account.3.user_name = {$account.3.user_id}@{$account.3.server_address}
+{else}
+account.3.user_name = {$account.3.user_id}
+{/if}
+
+account.3.sip_server.1.address= {$account.3.server_address}
+account.3.sip_server.1.port= {$account.3.sip_port}
+
+
+{if $account.3.sip_transport == 'udp'}account.3.sip_server.1.transport_type = 0{/if}
+{if $account.3.sip_transport == 'tcp'}account.3.sip_server.1.transport_type = 1{/if}
+{if $account.3.sip_transport == 'tls'}account.3.sip_server.1.transport_type = 2{/if}
+{if $account.3.sip_transport == 'dns srv'}account.3.sip_server.1.transport_type = 3{/if}
+
+account.3.sip_server.1.expires= {$account.3.register_expires}
+account.3.sip_server.1.retry_counts= 3
+
+account.3.sip_server.2.address= {$account.3.server.2.address}
+account.3.sip_server.2.port= {$account.3.sip_port}
+
+
+{if $account.3.sip_transport == 'udp'}account.3.sip_server.2.transport_type = 0{/if}
+{if $account.3.sip_transport == 'tcp'}account.3.sip_server.2.transport_type = 1{/if}
+{if $account.3.sip_transport == 'tls'}account.3.sip_server.2.transport_type = 2{/if}
+{if $account.3.sip_transport == 'dns srv'}account.3.sip_server.2.transport_type = 3{/if}
+
+account.3.sip_server.2.expires= {$account.3.register_expires}
+account.3.sip_server.2.retry_counts= 3
+
+account.3.outbound_proxy_enable= {if isset($account.3.outbound_proxy_primary)}1{else}0{/if}
+
+account.3.outbound_proxy.1.address= {$account.3.outbound_proxy_primary}
+
+{if isset($outbound_proxy_1_port)}
+account.3.outbound_proxy.1.port = {$outbound_proxy_1_port}
+{else}
+account.3.outbound_proxy.1.port = {$account.3.sip_port}
+{/if}
+
+account.3.outbound_proxy.2.address= {$account.3.outbound_proxy_secondary}
+
+{if isset($outbound_proxy_1_port)}
+account.3.outbound_proxy.2.port = {$outbound_proxy_2_port}
+{else}
+account.3.outbound_proxy.2.port = {$account.3.sip_port}
+{/if}
+
+{if isset($outbound_proxy_fallback_interval)}
+account.3.outbound_proxy_fallback_interval = {$outbound_proxy_fallback_interval}
+{else}
+account.3.outbound_proxy_fallback_interval = 120
+{/if}
+
+account.3.nat.nat_traversal=
+
+
+################################################################
+#                      Account Basic                          ##
+################################################################
+account.3.auto_answer=
+
+################################################################
+#                      Account Advanced                       ##
+################################################################
+account.3.nat.udp_update_enable= 3
+account.3.nat.udp_update_time= 30
+account.3.nat.rport= {$yealink_rport}
+
+account.3.dtmf.type= {$yealink_dtmf_type}
+account.3.dtmf.info_type=
+account.3.dtmf.dtmf_payload=
+account.3.100rel_enable= {$yealink_retransmission}
+
+account.3.subscribe_register=
+account.3.cid_source= {$yealink_cid_source}
+account.3.enable_user_equal_phone=
+account.3.srtp_encryption= {$yealink_srtp_encryption}
+account.3.ptime= 20
+account.3.register_line=
+account.3.register_mac=
+account.3.reg_fail_retry_interval=
+account.3.unregister_on_reboot=
+
+account.3.session_timer.refresher=
+account.3.session_timer.expires=
+account.3.session_timer.enable= {$yealink_session_timer}
+
+account.3.conf_type = {if $nway_conference == true}2{/if}
+account.3.sip_server_type=
+
+##V83 Add
+account.3.srtp.unencrypted_rtcp.enable =
+account.3.srtp.unencrypted_rtp.enable =
+account.3.sip_server_mode =
+
+
+
+################################################################
+#                        SIP Backup Server                    ##
+################################################################
+account.3.outbound_proxy.1.register_on_enable=
+account.3.outbound_proxy.1.failback_timeout=
+account.3.outbound_proxy.1.failback_mode=
+account.3.outbound_proxy.1.retry_counts=
+account.3.outbound_proxy.1.only_signal_with_registered=
+account.3.outbound_proxy.1.failback_subscribe.enable=
+account.3.outbound_proxy.1.invite_retry_counts=
+
+account.3.sip_server.1.register_on_enable= 0
+account.3.sip_server.1.failback_timeout= 3600
+account.3.sip_server.1.failback_mode= 0
+account.3.sip_server.1.failback_subscribe.enable= 
+account.3.sip_server.1.only_signal_with_registered=
+account.3.sip_server.1.invite_retry_counts=
+
+account.3.outbound_proxy.2.register_on_enable=
+account.3.outbound_proxy.2.failback_timeout=
+account.3.outbound_proxy.2.failback_mode=
+account.3.outbound_proxy.2.retry_counts=
+account.3.outbound_proxy.2.only_signal_with_registered=
+account.3.outbound_proxy.2.failback_subscribe.enable=
+account.3.outbound_proxy.2.invite_retry_counts=
+
+account.3.sip_server.2.register_on_enable=
+account.3.sip_server.2.failback_timeout=
+account.3.sip_server.2.failback_mode=
+account.3.sip_server.2.failback_subscribe.enable=
+account.3.sip_server.2.only_signal_with_registered=
+account.3.sip_server.2.invite_retry_counts=
+
+account.3.static_cache_pri=
+account.3.dns_cache_type=
+account.3.naptr_build=
+account.3.fallback.timeout = {$yealink_outbound_proxy_fallback_interval}
+account.3.fallback.redundancy_type=
+account.3.reg_failed_retry_max_time=
+account.3.reg_failed_retry_min_time=
+account.3.redundancy_with_reg_fail.enable =
+
+##V83 Add
+account.3.sip_server.1.outbound_proxy_enable =
+account.3.sip_server.2.outbound_proxy_enable =
+
+################################################################
+#                        SIP Basic config                     ##
+################################################################
+account.3.contact_take_line_param=
+account.3.update_ack_while_dialing=
+account.3.srtp_lifetime=
+account.3.third_part_request_with_route.enable=
+account.3.insert_outbound_in_route.enable=
+account.3.path.enable=
+account.3.sub_fail_retry_interval=
+account.3.transfer_refer_to_contact_header.enable=
+account.3.hold_use_inactive=
+account.3.gruu.enable=
+account.3.dial_tone=
+account.3.call_id_mode=
+account.3.subscribe_expires_overlap=
+account.3.register_expires_overlap=
+account.3.call_info=
+account.3.custom_ua=
+account.3.mwi_parse_terminated=
+account.3.check_cseq.enable=
+account.3.check_to_tag.enable=
+account.3.vq_rtcpxr.collector_server_port=
+account.3.vq_rtcpxr.collector_server_host=
+account.3.vq_rtcpxr.collector_name=
+account.3.compact_header_enable=
+account.3.cp_source=
+account.3.cid_source_ppi=
+account.3.cid_source_privacy=
+account.3.reg_with_pani_header.enable =
+account.3.alert_info=
+account.3.picture_info_enable=
+
+##V83 Add
+account.3.invite_with_pani_header.enable = 
+
+##V84 Add
+account.3.invite_with_rpid_header.enable=
+
+account.3.auto_answer_mute_enable
+
+#######################################################################################
+##                                 History                                           ##       
+#######################################################################################
+account.3.missed_calllog=
+
+
+#######################################################################################  
+##                                  Forward                                          ##  
+####################################################################################### 
+account.3.timeout_fwd.off_code=
+account.3.timeout_fwd.on_code=
+account.3.timeout_fwd.timeout=
+account.3.timeout_fwd.target=
+account.3.timeout_fwd.enable=
+account.3.busy_fwd.off_code=
+account.3.busy_fwd.on_code=
+account.3.busy_fwd.target=
+account.3.busy_fwd.enable=
+account.3.always_fwd.off_code=
+account.3.always_fwd.on_code=
+account.3.always_fwd.target=
+account.3.always_fwd.enable=
+
+
+#######################################################################################  
+##                                  DND                                              ##  
+#######################################################################################
+account.3.dnd.enable=
+account.3.dnd.off_code=
+account.3.dnd.on_code=
+
+
+
+#######################################################################################  
+##                               Voice Mail                                          ##  
+#######################################################################################
+voice_mail.number.1= {$voicemail_number}
+account.3.subscribe_mwi=
+account.3.subscribe_mwi_to_vm=
+account.3.subscribe_mwi_expires=
+account.3.display_mwi.enable=
+
+#######################################################################################  
+##                               Auto Dial                                           ##  
+#######################################################################################
+account.3.auto_dial_enable=
+account.3.auto_dial_num=
+
+
+#######################################################################################
+##                           Preference&Status                                       ##       
+#######################################################################################
+account.3.ringtone.ring_type=
+
+#######################################################################################
+##                           Digitmap                                                ##       
+#######################################################################################
+account.3.dialplan.digitmap.enable=
+account.3.dialplan.digitmap.string=
+account.3.dialplan.digitmap.no_match_action=
+account.3.dialplan.digitmap.interdigit_short_timer=
+account.3.dialplan.digitmap.interdigit_long_timer=
+account.3.dialplan.digitmap.apply_to.press_send=
+account.3.dialplan.digitmap.apply_to.forward=
+account.3.dialplan.digitmap.apply_to.history_dial=
+account.3.dialplan.digitmap.apply_to.directory_dial=
+account.3.dialplan.digitmap.apply_to.on_hook_dial=
+account.3.dialplan.digitmap.active.on_hook_dialing=
+
+
+#######################################################################################
+##                                 Rings Settings                                    ##
+#######################################################################################
+account.3.alert_info_url_enable=
+
+
+#######################################################################################
+##                                  BLF/BLF List                                     ##       
+#######################################################################################
+account.3.blf.blf_list_uri=
+account.3.blf_list_barge_in_code=
+account.3.blf_list_code=
+account.3.blf_list_retrieve_call_parked_code=
+account.3.blf.subscribe_period=
+account.3.blf.match_host.enable=
+account.3.out_dialog_blf_enable=
+account.3.blf.subscribe_event=
+
+##V84 Add
+account.3.blf_list_call_parked_code=
+account.3.blf_list_call_parked_list=
+
+#######################################################################################
+##                                   SCA                                             ##       
+#######################################################################################
+account.3.shared_line= {$shared_line_1}
+account.3.line_seize.expires=
+account.3.shared_line_one_touch_bargein.enable=
+account.3.shared_line_one_touch_retrieve.enable=
+account.3.sca_manage_interface_display_time=
+account.3.shared_line_callpull_code=
+
+##V83 Add
+account.x.share_line.barge_in.enable
+
+#######################################################################################
+##                                   BLA                                             ##       
+#######################################################################################
+account.3.bla_number=
+account.3.bla_subscribe_period=
+account.3.bla.notify_with_expire.enable=
+account.3.bla.subscribe_uri_build_type=
+
+#######################################################################################
+##                                   Call Park                                       ##       
+#######################################################################################
+account.3.callpark_enable=
+
+
+#######################################################################################
+##                                    Broadsoft ACD                                  ##       
+#######################################################################################
+account.3.acd.enable=
+account.3.acd.available=
+account.3.acd.unavailable_reason_enable=
+account.3.acd.initial_state=
+account.3.subscribe_acd_expires=
+
+
+#######################################################################################
+##                                 Broadsoft ACD Call Center                         ##       
+#######################################################################################
+##account.X.reason_code.Y=
+##account.X.reason_code_name.Y=
+##account.X.bw_disp_code.Y=
+##account.X.bw_disp_code_name.Y=
+##account.X.supervisor_info_code.Y=
+##account.X.supervisor_info_code_name.Y=
+##The value Y must be continuous.
+
+account.3.reason_code.1=
+account.3.reason_code_name.1=
+account.3.bw_disp_code.1=
+account.3.bw_disp_code_name.1=
+account.3.supervisor_info_code.1=
+account.3.supervisor_info_code_name.1=
+
+#######################################################################################
+##                                 Broadsoft Call Center                             ##       
+#######################################################################################
+account.3.call_center.call_info_enable=
+account.3.call_center.show_call_info_time=
+account.3.call_center.disp_code_enable=
+account.3.call_center.trace_enable=
+account.3.call_center.emergency_enable=
+account.3.call_center.queue_status_enable=
+account.3.call_center.queue_status_light_enable =
+
+
+
+#######################################################################################
+##                         Broadsoft Hoteling                                        ##       
+#######################################################################################
+account.3.hoteling.enable=
+account.3.hoteling.user_id=
+account.3.hoteling.password=
+account.3.hoteling.expires=
+account.3.hoteling.auto_login_enable=
+
+
+#######################################################################################
+##                              Broadsoft XSI                                        ##       
+#######################################################################################
+account.3.xsi.user =
+account.3.xsi.password =
+account.3.xsi.host =
+account.3.xsi.server_type =
+account.3.xsi.port =
+
+
+#######################################################################################
+##                                Call Pickup                                        ##       
+#######################################################################################
+account.3.direct_pickup_code =
+account.3.group_pickup_code =
+account.3.dialoginfo_callpickup =
+account.3.refresh_remote_id.enable =
+
+
+#######################################################################################
+##                              Broadsoft Call Recording                             ##       
+#######################################################################################
+account.3.call_recording.enable=
+
+#######################################################################################
+##                                Network Conferene                                  ##       
+#######################################################################################
+account.3.conf_uri = {if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}
+
+
+#######################################################################################
+##                              Broadsoft Call Decline                               ##       
+#######################################################################################
+account.3.features.call_decline.enable =
+
+
+#######################################################################################
+##                       Broadsoft Security Classification                           ##       
+#######################################################################################
+account.3.security_classification.enable =
+
+
+
+#######################################################################################
+##                        Broadsoft Flexible Seating                                 ##       
+#######################################################################################
+account.3.flexible_seating.enable=
+account.3.hoteling.pin=
+account.3.hoteling.mode=
+
+#######################################################################################
+##                         Features Sync                                             ##       
+#######################################################################################
+account.3.features.forward.feature_key_sync.local_processing.enable=
+account.3.features.dnd.feature_key_sync.local_processing.enable =
+
+##V84 Add
+account.3.dnd.feature_key_sync.enable=
+account.3.feature_key_sync.enable=
+account.3.forward.feature_key_sync.enable=
+
+#######################################################################################
+##                                   ACD                                             ##       
+#######################################################################################
+account.3.acd.available_url=
+account.3.acd.away_url =
+account.3.acd.refresh_url =
+account.3.acd.call_information=
+
+
+#######################################################################################
+##                                   PSTN                                            ##       
+#######################################################################################
+pstn.account.3.enable=
+pstn.account.3.label=
+
+
+
+#######################################################################################
+##                                   Trnasfer                                        ##       
+#######################################################################################
+account.4.phone_setting.call_appearance.transfer_via_new_linekey=
+
+
+#######################################################################################
+##                                   Conference                                      ##       
+#######################################################################################
+account.4.phone_setting.call_appearance.conference_via_new_linekey=
+
+
+#######################################################################################
+##                                   Anonymous                                       ##       
+#######################################################################################
+account.4.anonymous_call.server_base_only =
+account.4.send_anonymous_rejection_code =
+account.4.anonymous_reject_offcode =
+account.4.anonymous_reject_oncode =
+account.4.reject_anonymous_call=
+account.4.anonymous_call_offcode =
+account.4.anonymous_call_oncode =
+account.4.anonymous_call =
+account.4.send_anonymous_code =
+
+
+
+#######################################################################################
+##                          Call Configuration                                       ##       
+#######################################################################################
+account.4.music_server_uri=
+account.4.music_on_hold_type=
+account.4.auto_label.rule=
+account.4.auto_label.enable=
+account.4.number_of_linekey=
+account.4.phone_setting.call_appearance.calls_per_linekey=
+
+
+#######################################################################################
+##                                    Codec                                          ##       
+#######################################################################################
+account.4.codec.ilbc_15_2kbps.priority=
+account.4.codec.ilbc_15_2kbps.enable=
+account.4.codec.ilbc_13_33kbps.priority=
+account.4.codec.ilbc_13_33kbps.enable =
+account.4.codec.pcma.enable =  1
+account.4.codec.pcma.priority = {$yealink_codec_5_priority}
+
+account.4.codec.pcmu.enable = 1
+account.4.codec.pcmu.priority = {$yealink_codec_4_priority}
+
+account.4.codec.opus.enable = 1
+account.4.codec.opus.priority = {$yealink_codec_1_priority}
+account.4.codec.opus.para=
+account.4.codec.g726_40.enable=
+account.4.codec.g726_40.priority=
+account.4.codec.g726_32.enable=
+account.4.codec.g726_32.priority=
+account.4.codec.g726_24.enable=
+account.4.codec.g726_24.priority=
+account.4.codec.g726_16.enable=
+account.4.codec.g726_16.priority=
+account.4.codec.g723_63.priority=
+account.4.codec.g723_63.enable=
+account.4.codec.g723_53.priority=
+account.4.codec.g723_53.enable=
+account.4.codec.g729.enable = 1
+account.4.codec.g729.priority = {$yealink_codec_3_priority}
+
+account.4.codec.g722.enable = 1
+account.4.codec.g722.priority = {$yealink_codec_2_priority}
+
+account.4.codec.G722_1_24kpbs.priority=
+account.4.codec.G722_1_24kpbs.enable=
+account.4.codec.G722_1c_24kpbs.priority=
+account.4.codec.G722_1c_24kpbs.enable=
+account.4.codec.G722_1c_32kpbs.priority=
+account.4.codec.G722_1c_32kpbs.enable=
+account.4.codec.G722_1c_48kpbs.priority=
+account.4.codec.G722_1c_48kpbs.enable=
+
+
+################################################################
+#                      Account Register                       ##
+################################################################
+{if isset($account.4.password) }
+account.4.enable = 1
+{else}
+account.4.enable = 0
+{/if}
+account.4.label = {$account.4.display_name}
+account.4.display_name = {$account.4.display_name}
+account.4.auth_name = {$account.4.auth_id}
+account.4.password = {$account.4.password}
+{if isset($account.4.server.1.address)}
+account.4.user_name = {$account.4.user_id}@{$account.4.server_address}
+{else}
+account.4.user_name = {$account.4.user_id}
+{/if}
+
+account.4.sip_server.1.address= {$account.4.server_address}
+account.4.sip_server.1.port= {$account.4.sip_port}
+
+
+{if $account.4.sip_transport == 'udp'}account.4.sip_server.1.transport_type = 0{/if}
+{if $account.4.sip_transport == 'tcp'}account.4.sip_server.1.transport_type = 1{/if}
+{if $account.4.sip_transport == 'tls'}account.4.sip_server.1.transport_type = 2{/if}
+{if $account.4.sip_transport == 'dns srv'}account.4.sip_server.1.transport_type = 3{/if}
+
+account.4.sip_server.1.expires= {$account.4.register_expires}
+account.4.sip_server.1.retry_counts= 3
+
+account.4.sip_server.2.address= {$account.4.server.2.address}
+account.4.sip_server.2.port= {$account.4.sip_port}
+
+
+{if $account.4.sip_transport == 'udp'}account.4.sip_server.2.transport_type = 0{/if}
+{if $account.4.sip_transport == 'tcp'}account.4.sip_server.2.transport_type = 1{/if}
+{if $account.4.sip_transport == 'tls'}account.4.sip_server.2.transport_type = 2{/if}
+{if $account.4.sip_transport == 'dns srv'}account.4.sip_server.2.transport_type = 3{/if}
+
+account.4.sip_server.2.expires= {$account.4.register_expires}
+account.4.sip_server.2.retry_counts= 3
+
+account.4.outbound_proxy_enable= {if isset($account.4.outbound_proxy_primary)}1{else}0{/if}
+
+account.4.outbound_proxy.1.address= {$account.4.outbound_proxy_primary}
+
+{if isset($outbound_proxy_1_port)}
+account.4.outbound_proxy.1.port = {$outbound_proxy_1_port}
+{else}
+account.4.outbound_proxy.1.port = {$account.4.sip_port}
+{/if}
+
+account.4.outbound_proxy.2.address= {$account.4.outbound_proxy_secondary}
+
+{if isset($outbound_proxy_1_port)}
+account.4.outbound_proxy.2.port = {$outbound_proxy_2_port}
+{else}
+account.4.outbound_proxy.2.port = {$account.4.sip_port}
+{/if}
+
+{if isset($outbound_proxy_fallback_interval)}
+account.4.outbound_proxy_fallback_interval = {$outbound_proxy_fallback_interval}
+{else}
+account.4.outbound_proxy_fallback_interval = 120
+{/if}
+
+account.4.nat.nat_traversal=
+
+
+################################################################
+#                      Account Basic                          ##
+################################################################
+account.4.auto_answer=
+
+################################################################
+#                      Account Advanced                       ##
+################################################################
+account.4.nat.udp_update_enable= 3
+account.4.nat.udp_update_time= 30
+account.4.nat.rport= {$yealink_rport}
+
+account.4.dtmf.type= {$yealink_dtmf_type}
+account.4.dtmf.info_type=
+account.4.dtmf.dtmf_payload=
+account.4.100rel_enable= {$yealink_retransmission}
+
+account.4.subscribe_register=
+account.4.cid_source= {$yealink_cid_source}
+account.4.enable_user_equal_phone=
+account.4.srtp_encryption= {$yealink_srtp_encryption}
+account.4.ptime= 20
+account.4.register_line=
+account.4.register_mac=
+account.4.reg_fail_retry_interval=
+account.4.unregister_on_reboot=
+
+account.4.session_timer.refresher=
+account.4.session_timer.expires=
+account.4.session_timer.enable= {$yealink_session_timer}
+
+account.4.conf_type = {if $nway_conference == true}2{/if} 
+account.4.sip_server_type=
+
+##V83 Add
+account.4.srtp.unencrypted_rtcp.enable =
+account.4.srtp.unencrypted_rtp.enable =
+account.4.sip_server_mode =
+
+
+
+################################################################
+#                        SIP Backup Server                    ##
+################################################################
+account.4.outbound_proxy.1.register_on_enable=
+account.4.outbound_proxy.1.failback_timeout=
+account.4.outbound_proxy.1.failback_mode=
+account.4.outbound_proxy.1.retry_counts=
+account.4.outbound_proxy.1.only_signal_with_registered=
+account.4.outbound_proxy.1.failback_subscribe.enable=
+account.4.outbound_proxy.1.invite_retry_counts=
+
+account.4.sip_server.1.register_on_enable= 0
+account.4.sip_server.1.failback_timeout= 3600
+account.4.sip_server.1.failback_mode= 0
+account.4.sip_server.1.failback_subscribe.enable= 
+account.4.sip_server.1.only_signal_with_registered=
+account.4.sip_server.1.invite_retry_counts=
+
+account.4.outbound_proxy.2.register_on_enable=
+account.4.outbound_proxy.2.failback_timeout=
+account.4.outbound_proxy.2.failback_mode=
+account.4.outbound_proxy.2.retry_counts=
+account.4.outbound_proxy.2.only_signal_with_registered=
+account.4.outbound_proxy.2.failback_subscribe.enable=
+account.4.outbound_proxy.2.invite_retry_counts=
+
+account.4.sip_server.2.register_on_enable=
+account.4.sip_server.2.failback_timeout=
+account.4.sip_server.2.failback_mode=
+account.4.sip_server.2.failback_subscribe.enable=
+account.4.sip_server.2.only_signal_with_registered=
+account.4.sip_server.2.invite_retry_counts=
+
+account.4.static_cache_pri=
+account.4.dns_cache_type=
+account.4.naptr_build=
+account.4.fallback.timeout = {$yealink_outbound_proxy_fallback_interval}
+account.4.fallback.redundancy_type=
+account.4.reg_failed_retry_max_time=
+account.4.reg_failed_retry_min_time=
+account.4.redundancy_with_reg_fail.enable =
+
+##V83 Add
+account.4.sip_server.1.outbound_proxy_enable =
+account.4.sip_server.2.outbound_proxy_enable =
+
+################################################################
+#                        SIP Basic config                     ##
+################################################################
+account.4.contact_take_line_param=
+account.4.update_ack_while_dialing=
+account.4.srtp_lifetime=
+account.4.third_part_request_with_route.enable=
+account.4.insert_outbound_in_route.enable=
+account.4.path.enable=
+account.4.sub_fail_retry_interval=
+account.4.transfer_refer_to_contact_header.enable=
+account.4.hold_use_inactive=
+account.4.gruu.enable=
+account.4.dial_tone=
+account.4.call_id_mode=
+account.4.subscribe_expires_overlap=
+account.4.register_expires_overlap=
+account.4.call_info=
+account.4.custom_ua=
+account.4.mwi_parse_terminated=
+account.4.check_cseq.enable=
+account.4.check_to_tag.enable=
+account.4.vq_rtcpxr.collector_server_port=
+account.4.vq_rtcpxr.collector_server_host=
+account.4.vq_rtcpxr.collector_name=
+account.4.compact_header_enable=
+account.4.cp_source=
+account.4.cid_source_ppi=
+account.4.cid_source_privacy=
+account.4.reg_with_pani_header.enable =
+account.4.alert_info=
+account.4.picture_info_enable=
+
+##V83 Add
+account.4.invite_with_pani_header.enable = 
+
+##V84 Add
+account.4.invite_with_rpid_header.enable=
+
+account.4.auto_answer_mute_enable
+
+#######################################################################################
+##                                 History                                           ##       
+#######################################################################################
+account.4.missed_calllog=
+
+
+#######################################################################################  
+##                                  Forward                                          ##  
+####################################################################################### 
+account.4.timeout_fwd.off_code=
+account.4.timeout_fwd.on_code=
+account.4.timeout_fwd.timeout=
+account.4.timeout_fwd.target=
+account.4.timeout_fwd.enable=
+account.4.busy_fwd.off_code=
+account.4.busy_fwd.on_code=
+account.4.busy_fwd.target=
+account.4.busy_fwd.enable=
+account.4.always_fwd.off_code=
+account.4.always_fwd.on_code=
+account.4.always_fwd.target=
+account.4.always_fwd.enable=
+
+
+#######################################################################################  
+##                                  DND                                              ##  
+#######################################################################################
+account.4.dnd.enable=
+account.4.dnd.off_code=
+account.4.dnd.on_code=
+
+
+
+#######################################################################################  
+##                               Voice Mail                                          ##  
+#######################################################################################
+voice_mail.number.1= {$voicemail_number}
+account.4.subscribe_mwi=
+account.4.subscribe_mwi_to_vm=
+account.4.subscribe_mwi_expires=
+account.4.display_mwi.enable=
+
+#######################################################################################  
+##                               Auto Dial                                           ##  
+#######################################################################################
+account.4.auto_dial_enable=
+account.4.auto_dial_num=
+
+
+#######################################################################################
+##                           Preference&Status                                       ##       
+#######################################################################################
+account.4.ringtone.ring_type=
+
+#######################################################################################
+##                           Digitmap                                                ##       
+#######################################################################################
+account.4.dialplan.digitmap.enable=
+account.4.dialplan.digitmap.string=
+account.4.dialplan.digitmap.no_match_action=
+account.4.dialplan.digitmap.interdigit_short_timer=
+account.4.dialplan.digitmap.interdigit_long_timer=
+account.4.dialplan.digitmap.apply_to.press_send=
+account.4.dialplan.digitmap.apply_to.forward=
+account.4.dialplan.digitmap.apply_to.history_dial=
+account.4.dialplan.digitmap.apply_to.directory_dial=
+account.4.dialplan.digitmap.apply_to.on_hook_dial=
+account.4.dialplan.digitmap.active.on_hook_dialing=
+
+
+#######################################################################################
+##                                 Rings Settings                                    ##
+#######################################################################################
+account.4.alert_info_url_enable=
+
+
+#######################################################################################
+##                                  BLF/BLF List                                     ##       
+#######################################################################################
+account.4.blf.blf_list_uri=
+account.4.blf_list_barge_in_code=
+account.4.blf_list_code=
+account.4.blf_list_retrieve_call_parked_code=
+account.4.blf.subscribe_period=
+account.4.blf.match_host.enable=
+account.4.out_dialog_blf_enable=
+account.4.blf.subscribe_event=
+
+##V84 Add
+account.4.blf_list_call_parked_code=
+account.4.blf_list_call_parked_list=
+
+#######################################################################################
+##                                   SCA                                             ##       
+#######################################################################################
+account.4.shared_line= {$shared_line_1}
+account.4.line_seize.expires=
+account.4.shared_line_one_touch_bargein.enable=
+account.4.shared_line_one_touch_retrieve.enable=
+account.4.sca_manage_interface_display_time=
+account.4.shared_line_callpull_code=
+
+##V83 Add
+account.x.share_line.barge_in.enable
+
+#######################################################################################
+##                                   BLA                                             ##       
+#######################################################################################
+account.4.bla_number=
+account.4.bla_subscribe_period=
+account.4.bla.notify_with_expire.enable=
+account.4.bla.subscribe_uri_build_type=
+
+#######################################################################################
+##                                   Call Park                                       ##       
+#######################################################################################
+account.4.callpark_enable=
+
+
+#######################################################################################
+##                                    Broadsoft ACD                                  ##       
+#######################################################################################
+account.4.acd.enable=
+account.4.acd.available=
+account.4.acd.unavailable_reason_enable=
+account.4.acd.initial_state=
+account.4.subscribe_acd_expires=
+
+
+#######################################################################################
+##                                 Broadsoft ACD Call Center                         ##       
+#######################################################################################
+##account.X.reason_code.Y=
+##account.X.reason_code_name.Y=
+##account.X.bw_disp_code.Y=
+##account.X.bw_disp_code_name.Y=
+##account.X.supervisor_info_code.Y=
+##account.X.supervisor_info_code_name.Y=
+##The value Y must be continuous.
+
+account.4.reason_code.1=
+account.4.reason_code_name.1=
+account.4.bw_disp_code.1=
+account.4.bw_disp_code_name.1=
+account.4.supervisor_info_code.1=
+account.4.supervisor_info_code_name.1=
+
+#######################################################################################
+##                                 Broadsoft Call Center                             ##       
+#######################################################################################
+account.4.call_center.call_info_enable=
+account.4.call_center.show_call_info_time=
+account.4.call_center.disp_code_enable=
+account.4.call_center.trace_enable=
+account.4.call_center.emergency_enable=
+account.4.call_center.queue_status_enable=
+account.4.call_center.queue_status_light_enable =
+
+
+
+#######################################################################################
+##                         Broadsoft Hoteling                                        ##       
+#######################################################################################
+account.4.hoteling.enable=
+account.4.hoteling.user_id=
+account.4.hoteling.password=
+account.4.hoteling.expires=
+account.4.hoteling.auto_login_enable=
+
+
+#######################################################################################
+##                              Broadsoft XSI                                        ##       
+#######################################################################################
+account.4.xsi.user =
+account.4.xsi.password =
+account.4.xsi.host =
+account.4.xsi.server_type =
+account.4.xsi.port =
+
+
+#######################################################################################
+##                                Call Pickup                                        ##       
+#######################################################################################
+account.4.direct_pickup_code =
+account.4.group_pickup_code =
+account.4.dialoginfo_callpickup =
+account.4.refresh_remote_id.enable =
+
+
+#######################################################################################
+##                              Broadsoft Call Recording                             ##       
+#######################################################################################
+account.4.call_recording.enable=
+
+#######################################################################################
+##                                Network Conferene                                  ##       
+#######################################################################################
+account.4.conf_uri = {if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}
+
+
+#######################################################################################
+##                              Broadsoft Call Decline                               ##       
+#######################################################################################
+account.4.features.call_decline.enable =
+
+
+#######################################################################################
+##                       Broadsoft Security Classification                           ##       
+#######################################################################################
+account.4.security_classification.enable =
+
+
+
+#######################################################################################
+##                        Broadsoft Flexible Seating                                 ##       
+#######################################################################################
+account.4.flexible_seating.enable=
+account.4.hoteling.pin=
+account.4.hoteling.mode=
+
+#######################################################################################
+##                         Features Sync                                             ##       
+#######################################################################################
+account.4.features.forward.feature_key_sync.local_processing.enable=
+account.4.features.dnd.feature_key_sync.local_processing.enable =
+
+##V84 Add
+account.4.dnd.feature_key_sync.enable=
+account.4.feature_key_sync.enable=
+account.4.forward.feature_key_sync.enable=
+
+#######################################################################################
+##                                   ACD                                             ##       
+#######################################################################################
+account.4.acd.available_url=
+account.4.acd.away_url =
+account.4.acd.refresh_url =
+account.4.acd.call_information=
+
+
+#######################################################################################
+##                                   PSTN                                            ##       
+#######################################################################################
+pstn.account.4.enable=
+pstn.account.4.label=
+
+
+#######################################################################################
+##                                   Trnasfer                                        ##       
+#######################################################################################
+account.5.phone_setting.call_appearance.transfer_via_new_linekey=
+
+
+#######################################################################################
+##                                   Conference                                      ##       
+#######################################################################################
+account.5.phone_setting.call_appearance.conference_via_new_linekey=
+
+
+#######################################################################################
+##                                   Anonymous                                       ##       
+#######################################################################################
+account.5.anonymous_call.server_base_only =
+account.5.send_anonymous_rejection_code =
+account.5.anonymous_reject_offcode =
+account.5.anonymous_reject_oncode =
+account.5.reject_anonymous_call=
+account.5.anonymous_call_offcode =
+account.5.anonymous_call_oncode =
+account.5.anonymous_call =
+account.5.send_anonymous_code =
+
+
+
+#######################################################################################
+##                          Call Configuration                                       ##       
+#######################################################################################
+account.5.music_server_uri=
+account.5.music_on_hold_type=
+account.5.auto_label.rule=
+account.5.auto_label.enable=
+account.5.number_of_linekey=
+account.5.phone_setting.call_appearance.calls_per_linekey=
+
+
+#######################################################################################
+##                                    Codec                                          ##       
+#######################################################################################
+account.5.codec.ilbc_15_2kbps.priority=
+account.5.codec.ilbc_15_2kbps.enable=
+account.5.codec.ilbc_13_33kbps.priority=
+account.5.codec.ilbc_13_33kbps.enable =
+account.5.codec.pcma.enable =  1
+account.5.codec.pcma.priority = {$yealink_codec_5_priority}
+
+account.5.codec.pcmu.enable = 1
+account.5.codec.pcmu.priority = {$yealink_codec_4_priority}
+
+account.5.codec.opus.enable = 1
+account.5.codec.opus.priority = {$yealink_codec_1_priority}
+account.5.codec.opus.para=
+account.5.codec.g726_40.enable=
+account.5.codec.g726_40.priority=
+account.5.codec.g726_32.enable=
+account.5.codec.g726_32.priority=
+account.5.codec.g726_24.enable=
+account.5.codec.g726_24.priority=
+account.5.codec.g726_16.enable=
+account.5.codec.g726_16.priority=
+account.5.codec.g723_63.priority=
+account.5.codec.g723_63.enable=
+account.5.codec.g723_53.priority=
+account.5.codec.g723_53.enable=
+account.5.codec.g729.enable = 1
+account.5.codec.g729.priority = {$yealink_codec_3_priority}
+
+account.5.codec.g722.enable = 1
+account.5.codec.g722.priority = {$yealink_codec_2_priority}
+
+account.5.codec.G722_1_24kpbs.priority=
+account.5.codec.G722_1_24kpbs.enable=
+account.5.codec.G722_1c_24kpbs.priority=
+account.5.codec.G722_1c_24kpbs.enable=
+account.5.codec.G722_1c_32kpbs.priority=
+account.5.codec.G722_1c_32kpbs.enable=
+account.5.codec.G722_1c_48kpbs.priority=
+account.5.codec.G722_1c_48kpbs.enable=
+
+
+################################################################
+#                      Account Register                       ##
+################################################################
+{if isset($account.5.password) }
+account.5.enable = 1
+{else}
+account.5.enable = 0
+{/if}
+account.5.label = {$account.5.display_name}
+account.5.display_name = {$account.5.display_name}
+account.5.auth_name = {$account.5.auth_id}
+account.5.password = {$account.5.password}
+{if isset($account.5.server.1.address)}
+account.5.user_name = {$account.5.user_id}@{$account.5.server_address}
+{else}
+account.5.user_name = {$account.5.user_id}
+{/if}
+
+account.5.sip_server.1.address= {$account.5.server_address}
+account.5.sip_server.1.port= {$account.5.sip_port}
+
+
+{if $account.5.sip_transport == 'udp'}account.5.sip_server.1.transport_type = 0{/if}
+{if $account.5.sip_transport == 'tcp'}account.5.sip_server.1.transport_type = 1{/if}
+{if $account.5.sip_transport == 'tls'}account.5.sip_server.1.transport_type = 2{/if}
+{if $account.5.sip_transport == 'dns srv'}account.5.sip_server.1.transport_type = 3{/if}
+
+account.5.sip_server.1.expires= {$account.5.register_expires}
+account.5.sip_server.1.retry_counts= 3
+
+account.5.sip_server.2.address= {$account.5.server.2.address}
+account.5.sip_server.2.port= {$account.5.sip_port}
+
+
+{if $account.5.sip_transport == 'udp'}account.5.sip_server.2.transport_type = 0{/if}
+{if $account.5.sip_transport == 'tcp'}account.5.sip_server.2.transport_type = 1{/if}
+{if $account.5.sip_transport == 'tls'}account.5.sip_server.2.transport_type = 2{/if}
+{if $account.5.sip_transport == 'dns srv'}account.5.sip_server.2.transport_type = 3{/if}
+
+account.5.sip_server.2.expires= {$account.5.register_expires}
+account.5.sip_server.2.retry_counts= 3
+
+account.5.outbound_proxy_enable= {if isset($account.5.outbound_proxy_primary)}1{else}0{/if}
+
+account.5.outbound_proxy.1.address= {$account.5.outbound_proxy_primary}
+
+{if isset($outbound_proxy_1_port)}
+account.5.outbound_proxy.1.port = {$outbound_proxy_1_port}
+{else}
+account.5.outbound_proxy.1.port = {$account.5.sip_port}
+{/if}
+
+account.5.outbound_proxy.2.address= {$account.5.outbound_proxy_secondary}
+
+{if isset($outbound_proxy_1_port)}
+account.5.outbound_proxy.2.port = {$outbound_proxy_2_port}
+{else}
+account.5.outbound_proxy.2.port = {$account.5.sip_port}
+{/if}
+
+{if isset($outbound_proxy_fallback_interval)}
+account.5.outbound_proxy_fallback_interval = {$outbound_proxy_fallback_interval}
+{else}
+account.5.outbound_proxy_fallback_interval = 120
+{/if}
+
+account.5.nat.nat_traversal=
+
+
+################################################################
+#                      Account Basic                          ##
+################################################################
+account.5.auto_answer=
+
+################################################################
+#                      Account Advanced                       ##
+################################################################
+account.5.nat.udp_update_enable= 3
+account.5.nat.udp_update_time= 30
+account.5.nat.rport= {$yealink_rport}
+
+account.5.dtmf.type= {$yealink_dtmf_type}
+account.5.dtmf.info_type=
+account.5.dtmf.dtmf_payload=
+account.5.100rel_enable= {$yealink_retransmission}
+
+account.5.subscribe_register=
+account.5.cid_source= {$yealink_cid_source}
+account.5.enable_user_equal_phone=
+account.5.srtp_encryption= {$yealink_srtp_encryption}
+account.5.ptime= 20
+account.5.register_line=
+account.5.register_mac=
+account.5.reg_fail_retry_interval=
+account.5.unregister_on_reboot=
+
+account.5.session_timer.refresher=
+account.5.session_timer.expires=
+account.5.session_timer.enable= {$yealink_session_timer}
+
+account.5.conf_type = {if $nway_conference == true}2{/if}
+account.5.sip_server_type=
+
+##V83 Add
+account.5.srtp.unencrypted_rtcp.enable =
+account.5.srtp.unencrypted_rtp.enable =
+account.5.sip_server_mode =
+
+
+
+################################################################
+#                        SIP Backup Server                    ##
+################################################################
+account.5.outbound_proxy.1.register_on_enable=
+account.5.outbound_proxy.1.failback_timeout=
+account.5.outbound_proxy.1.failback_mode=
+account.5.outbound_proxy.1.retry_counts=
+account.5.outbound_proxy.1.only_signal_with_registered=
+account.5.outbound_proxy.1.failback_subscribe.enable=
+account.5.outbound_proxy.1.invite_retry_counts=
+
+account.5.sip_server.1.register_on_enable= 0
+account.5.sip_server.1.failback_timeout= 3600
+account.5.sip_server.1.failback_mode= 0
+account.5.sip_server.1.failback_subscribe.enable= 
+account.5.sip_server.1.only_signal_with_registered=
+account.5.sip_server.1.invite_retry_counts=
+
+account.5.outbound_proxy.2.register_on_enable=
+account.5.outbound_proxy.2.failback_timeout=
+account.5.outbound_proxy.2.failback_mode=
+account.5.outbound_proxy.2.retry_counts=
+account.5.outbound_proxy.2.only_signal_with_registered=
+account.5.outbound_proxy.2.failback_subscribe.enable=
+account.5.outbound_proxy.2.invite_retry_counts=
+
+account.5.sip_server.2.register_on_enable=
+account.5.sip_server.2.failback_timeout=
+account.5.sip_server.2.failback_mode=
+account.5.sip_server.2.failback_subscribe.enable=
+account.5.sip_server.2.only_signal_with_registered=
+account.5.sip_server.2.invite_retry_counts=
+
+account.5.static_cache_pri=
+account.5.dns_cache_type=
+account.5.naptr_build=
+account.5.fallback.timeout = {$yealink_outbound_proxy_fallback_interval}
+account.5.fallback.redundancy_type=
+account.5.reg_failed_retry_max_time=
+account.5.reg_failed_retry_min_time=
+account.5.redundancy_with_reg_fail.enable =
+
+##V83 Add
+account.5.sip_server.1.outbound_proxy_enable =
+account.5.sip_server.2.outbound_proxy_enable =
+
+################################################################
+#                        SIP Basic config                     ##
+################################################################
+account.5.contact_take_line_param=
+account.5.update_ack_while_dialing=
+account.5.srtp_lifetime=
+account.5.third_part_request_with_route.enable=
+account.5.insert_outbound_in_route.enable=
+account.5.path.enable=
+account.5.sub_fail_retry_interval=
+account.5.transfer_refer_to_contact_header.enable=
+account.5.hold_use_inactive=
+account.5.gruu.enable=
+account.5.dial_tone=
+account.5.call_id_mode=
+account.5.subscribe_expires_overlap=
+account.5.register_expires_overlap=
+account.5.call_info=
+account.5.custom_ua=
+account.5.mwi_parse_terminated=
+account.5.check_cseq.enable=
+account.5.check_to_tag.enable=
+account.5.vq_rtcpxr.collector_server_port=
+account.5.vq_rtcpxr.collector_server_host=
+account.5.vq_rtcpxr.collector_name=
+account.5.compact_header_enable=
+account.5.cp_source=
+account.5.cid_source_ppi=
+account.5.cid_source_privacy=
+account.5.reg_with_pani_header.enable =
+account.5.alert_info=
+account.5.picture_info_enable=
+
+##V83 Add
+account.5.invite_with_pani_header.enable = 
+
+##V84 Add
+account.5.invite_with_rpid_header.enable=
+
+account.5.auto_answer_mute_enable
+
+#######################################################################################
+##                                 History                                           ##       
+#######################################################################################
+account.5.missed_calllog=
+
+
+#######################################################################################  
+##                                  Forward                                          ##  
+####################################################################################### 
+account.5.timeout_fwd.off_code=
+account.5.timeout_fwd.on_code=
+account.5.timeout_fwd.timeout=
+account.5.timeout_fwd.target=
+account.5.timeout_fwd.enable=
+account.5.busy_fwd.off_code=
+account.5.busy_fwd.on_code=
+account.5.busy_fwd.target=
+account.5.busy_fwd.enable=
+account.5.always_fwd.off_code=
+account.5.always_fwd.on_code=
+account.5.always_fwd.target=
+account.5.always_fwd.enable=
+
+
+#######################################################################################  
+##                                  DND                                              ##  
+#######################################################################################
+account.5.dnd.enable=
+account.5.dnd.off_code=
+account.5.dnd.on_code=
+
+
+
+#######################################################################################  
+##                               Voice Mail                                          ##  
+#######################################################################################
+voice_mail.number.1= {$voicemail_number}
+account.5.subscribe_mwi=
+account.5.subscribe_mwi_to_vm=
+account.5.subscribe_mwi_expires=
+account.5.display_mwi.enable=
+
+#######################################################################################  
+##                               Auto Dial                                           ##  
+#######################################################################################
+account.5.auto_dial_enable=
+account.5.auto_dial_num=
+
+
+#######################################################################################
+##                           Preference&Status                                       ##       
+#######################################################################################
+account.5.ringtone.ring_type=
+
+#######################################################################################
+##                           Digitmap                                                ##       
+#######################################################################################
+account.5.dialplan.digitmap.enable=
+account.5.dialplan.digitmap.string=
+account.5.dialplan.digitmap.no_match_action=
+account.5.dialplan.digitmap.interdigit_short_timer=
+account.5.dialplan.digitmap.interdigit_long_timer=
+account.5.dialplan.digitmap.apply_to.press_send=
+account.5.dialplan.digitmap.apply_to.forward=
+account.5.dialplan.digitmap.apply_to.history_dial=
+account.5.dialplan.digitmap.apply_to.directory_dial=
+account.5.dialplan.digitmap.apply_to.on_hook_dial=
+account.5.dialplan.digitmap.active.on_hook_dialing=
+
+
+#######################################################################################
+##                                 Rings Settings                                    ##
+#######################################################################################
+account.5.alert_info_url_enable=
+
+
+#######################################################################################
+##                                  BLF/BLF List                                     ##       
+#######################################################################################
+account.5.blf.blf_list_uri=
+account.5.blf_list_barge_in_code=
+account.5.blf_list_code=
+account.5.blf_list_retrieve_call_parked_code=
+account.5.blf.subscribe_period=
+account.5.blf.match_host.enable=
+account.5.out_dialog_blf_enable=
+account.5.blf.subscribe_event=
+
+##V84 Add
+account.5.blf_list_call_parked_code=
+account.5.blf_list_call_parked_list=
+
+#######################################################################################
+##                                   SCA                                             ##       
+#######################################################################################
+account.5.shared_line= {$shared_line_1}
+account.5.line_seize.expires=
+account.5.shared_line_one_touch_bargein.enable=
+account.5.shared_line_one_touch_retrieve.enable=
+account.5.sca_manage_interface_display_time=
+account.5.shared_line_callpull_code=
+
+##V83 Add
+account.x.share_line.barge_in.enable
+
+#######################################################################################
+##                                   BLA                                             ##       
+#######################################################################################
+account.5.bla_number=
+account.5.bla_subscribe_period=
+account.5.bla.notify_with_expire.enable=
+account.5.bla.subscribe_uri_build_type=
+
+#######################################################################################
+##                                   Call Park                                       ##       
+#######################################################################################
+account.5.callpark_enable=
+
+
+#######################################################################################
+##                                    Broadsoft ACD                                  ##       
+#######################################################################################
+account.5.acd.enable=
+account.5.acd.available=
+account.5.acd.unavailable_reason_enable=
+account.5.acd.initial_state=
+account.5.subscribe_acd_expires=
+
+
+#######################################################################################
+##                                 Broadsoft ACD Call Center                         ##       
+#######################################################################################
+##account.X.reason_code.Y=
+##account.X.reason_code_name.Y=
+##account.X.bw_disp_code.Y=
+##account.X.bw_disp_code_name.Y=
+##account.X.supervisor_info_code.Y=
+##account.X.supervisor_info_code_name.Y=
+##The value Y must be continuous.
+
+account.5.reason_code.1=
+account.5.reason_code_name.1=
+account.5.bw_disp_code.1=
+account.5.bw_disp_code_name.1=
+account.5.supervisor_info_code.1=
+account.5.supervisor_info_code_name.1=
+
+#######################################################################################
+##                                 Broadsoft Call Center                             ##       
+#######################################################################################
+account.5.call_center.call_info_enable=
+account.5.call_center.show_call_info_time=
+account.5.call_center.disp_code_enable=
+account.5.call_center.trace_enable=
+account.5.call_center.emergency_enable=
+account.5.call_center.queue_status_enable=
+account.5.call_center.queue_status_light_enable =
+
+
+
+#######################################################################################
+##                         Broadsoft Hoteling                                        ##       
+#######################################################################################
+account.5.hoteling.enable=
+account.5.hoteling.user_id=
+account.5.hoteling.password=
+account.5.hoteling.expires=
+account.5.hoteling.auto_login_enable=
+
+
+#######################################################################################
+##                              Broadsoft XSI                                        ##       
+#######################################################################################
+account.5.xsi.user =
+account.5.xsi.password =
+account.5.xsi.host =
+account.5.xsi.server_type =
+account.5.xsi.port =
+
+
+#######################################################################################
+##                                Call Pickup                                        ##       
+#######################################################################################
+account.5.direct_pickup_code =
+account.5.group_pickup_code =
+account.5.dialoginfo_callpickup =
+account.5.refresh_remote_id.enable =
+
+
+#######################################################################################
+##                              Broadsoft Call Recording                             ##       
+#######################################################################################
+account.5.call_recording.enable=
+
+#######################################################################################
+##                                Network Conferene                                  ##       
+#######################################################################################
+account.5.conf_uri = {if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}
+
+
+#######################################################################################
+##                              Broadsoft Call Decline                               ##       
+#######################################################################################
+account.5.features.call_decline.enable =
+
+
+#######################################################################################
+##                       Broadsoft Security Classification                           ##       
+#######################################################################################
+account.5.security_classification.enable =
+
+
+
+#######################################################################################
+##                        Broadsoft Flexible Seating                                 ##       
+#######################################################################################
+account.5.flexible_seating.enable=
+account.5.hoteling.pin=
+account.5.hoteling.mode=
+
+#######################################################################################
+##                         Features Sync                                             ##       
+#######################################################################################
+account.5.features.forward.feature_key_sync.local_processing.enable=
+account.5.features.dnd.feature_key_sync.local_processing.enable =
+
+##V84 Add
+account.5.dnd.feature_key_sync.enable=
+account.5.feature_key_sync.enable=
+account.5.forward.feature_key_sync.enable=
+
+#######################################################################################
+##                                   ACD                                             ##       
+#######################################################################################
+account.5.acd.available_url=
+account.5.acd.away_url =
+account.5.acd.refresh_url =
+account.5.acd.call_information=
+
+
+#######################################################################################
+##                                   PSTN                                            ##       
+#######################################################################################
+pstn.account.5.enable=
+pstn.account.5.label=
+
+
+#######################################################################################
+##                                  virtual_user                                     ##       
+#######################################################################################
+##V84 Add
+bw.virtual_user.1.enable=
+bw.virtual_user.1.label=
+bw.virtual_user.1.xsi.dnd.enable=
+bw.virtual_user.1.xsi.host=
+bw.virtual_user.1.xsi.password=
+bw.virtual_user.1.xsi.port=
+bw.virtual_user.1.xsi.server_type=
+bw.virtual_user.1.xsi.user=
+
+
+#######################################################################################
+##                                   Trnasfer                                        ##       
+#######################################################################################
+account.6.phone_setting.call_appearance.transfer_via_new_linekey=
+
+
+#######################################################################################
+##                                   Conference                                      ##       
+#######################################################################################
+account.6.phone_setting.call_appearance.conference_via_new_linekey=
+
+
+#######################################################################################
+##                                   Anonymous                                       ##       
+#######################################################################################
+account.6.anonymous_call.server_base_only =
+account.6.send_anonymous_rejection_code =
+account.6.anonymous_reject_offcode =
+account.6.anonymous_reject_oncode =
+account.6.reject_anonymous_call=
+account.6.anonymous_call_offcode =
+account.6.anonymous_call_oncode =
+account.6.anonymous_call =
+account.6.send_anonymous_code =
+
+
+
+#######################################################################################
+##                          Call Configuration                                       ##       
+#######################################################################################
+account.6.music_server_uri=
+account.6.music_on_hold_type=
+account.6.auto_label.rule=
+account.6.auto_label.enable=
+account.6.number_of_linekey=
+account.6.phone_setting.call_appearance.calls_per_linekey=
+
+
+#######################################################################################
+##                                    Codec                                          ##       
+#######################################################################################
+account.6.codec.ilbc_15_2kbps.priority=
+account.6.codec.ilbc_15_2kbps.enable=
+account.6.codec.ilbc_13_33kbps.priority=
+account.6.codec.ilbc_13_33kbps.enable =
+account.6.codec.pcma.enable =  1
+account.6.codec.pcma.priority = {$yealink_codec_5_priority}
+
+account.6.codec.pcmu.enable = 1
+account.6.codec.pcmu.priority = {$yealink_codec_4_priority}
+
+account.6.codec.opus.enable = 1
+account.6.codec.opus.priority = {$yealink_codec_1_priority}
+account.6.codec.opus.para=
+account.6.codec.g726_40.enable=
+account.6.codec.g726_40.priority=
+account.6.codec.g726_32.enable=
+account.6.codec.g726_32.priority=
+account.6.codec.g726_24.enable=
+account.6.codec.g726_24.priority=
+account.6.codec.g726_16.enable=
+account.6.codec.g726_16.priority=
+account.6.codec.g723_63.priority=
+account.6.codec.g723_63.enable=
+account.6.codec.g723_53.priority=
+account.6.codec.g723_53.enable=
+account.6.codec.g729.enable = 1
+account.6.codec.g729.priority = {$yealink_codec_3_priority}
+
+account.6.codec.g722.enable = 1
+account.6.codec.g722.priority = {$yealink_codec_2_priority}
+
+account.6.codec.G722_1_24kpbs.priority=
+account.6.codec.G722_1_24kpbs.enable=
+account.6.codec.G722_1c_24kpbs.priority=
+account.6.codec.G722_1c_24kpbs.enable=
+account.6.codec.G722_1c_32kpbs.priority=
+account.6.codec.G722_1c_32kpbs.enable=
+account.6.codec.G722_1c_48kpbs.priority=
+account.6.codec.G722_1c_48kpbs.enable=
+
+
+################################################################
+#                      Account Register                       ##
+################################################################
+{if isset($account.6.password) }
+account.6.enable = 1
+{else}
+account.6.enable = 0
+{/if}
+account.6.label = {$account.6.display_name}
+account.6.display_name = {$account.6.display_name}
+account.6.auth_name = {$account.6.auth_id}
+account.6.password = {$account.6.password}
+{if isset($account.6.server.1.address)}
+account.6.user_name = {$account.6.user_id}@{$account.6.server_address}
+{else}
+account.6.user_name = {$account.6.user_id}
+{/if}
+
+account.6.sip_server.1.address= {$account.6.server_address}
+account.6.sip_server.1.port= {$account.6.sip_port}
+
+
+{if $account.6.sip_transport == 'udp'}account.6.sip_server.1.transport_type = 0{/if}
+{if $account.6.sip_transport == 'tcp'}account.6.sip_server.1.transport_type = 1{/if}
+{if $account.6.sip_transport == 'tls'}account.6.sip_server.1.transport_type = 2{/if}
+{if $account.6.sip_transport == 'dns srv'}account.6.sip_server.1.transport_type = 3{/if}
+
+account.6.sip_server.1.expires= {$account.6.register_expires}
+account.6.sip_server.1.retry_counts= 3
+
+account.6.sip_server.2.address= {$account.6.server.2.address}
+account.6.sip_server.2.port= {$account.6.sip_port}
+
+
+{if $account.6.sip_transport == 'udp'}account.6.sip_server.2.transport_type = 0{/if}
+{if $account.6.sip_transport == 'tcp'}account.6.sip_server.2.transport_type = 1{/if}
+{if $account.6.sip_transport == 'tls'}account.6.sip_server.2.transport_type = 2{/if}
+{if $account.6.sip_transport == 'dns srv'}account.6.sip_server.2.transport_type = 3{/if}
+
+account.6.sip_server.2.expires= {$account.6.register_expires}
+account.6.sip_server.2.retry_counts= 3
+
+account.6.outbound_proxy_enable= {if isset($account.6.outbound_proxy_primary)}1{else}0{/if}
+
+account.6.outbound_proxy.1.address= {$account.6.outbound_proxy_primary}
+
+{if isset($outbound_proxy_1_port)}
+account.6.outbound_proxy.1.port = {$outbound_proxy_1_port}
+{else}
+account.6.outbound_proxy.1.port = {$account.6.sip_port}
+{/if}
+
+account.6.outbound_proxy.2.address= {$account.6.outbound_proxy_secondary}
+
+{if isset($outbound_proxy_1_port)}
+account.6.outbound_proxy.2.port = {$outbound_proxy_2_port}
+{else}
+account.6.outbound_proxy.2.port = {$account.6.sip_port}
+{/if}
+
+{if isset($outbound_proxy_fallback_interval)}
+account.6.outbound_proxy_fallback_interval = {$outbound_proxy_fallback_interval}
+{else}
+account.6.outbound_proxy_fallback_interval = 120
+{/if}
+
+account.6.nat.nat_traversal=
+
+
+################################################################
+#                      Account Basic                          ##
+################################################################
+account.6.auto_answer=
+
+################################################################
+#                      Account Advanced                       ##
+################################################################
+account.6.nat.udp_update_enable= 3
+account.6.nat.udp_update_time= 30
+account.6.nat.rport= {$yealink_rport}
+
+account.6.dtmf.type= {$yealink_dtmf_type}
+account.6.dtmf.info_type=
+account.6.dtmf.dtmf_payload=
+account.6.100rel_enable= {$yealink_retransmission}
+
+account.6.subscribe_register=
+account.6.cid_source= {$yealink_cid_source}
+account.6.enable_user_equal_phone=
+account.6.srtp_encryption= {$yealink_srtp_encryption}
+account.6.ptime= 20
+account.6.register_line=
+account.6.register_mac=
+account.6.reg_fail_retry_interval=
+account.6.unregister_on_reboot=
+
+account.6.session_timer.refresher=
+account.6.session_timer.expires=
+account.6.session_timer.enable= {$yealink_session_timer}
+
+account.6.conf_type = {if $nway_conference == true}2{/if}
+account.6.sip_server_type=
+
+##V83 Add
+account.6.srtp.unencrypted_rtcp.enable =
+account.6.srtp.unencrypted_rtp.enable =
+account.6.sip_server_mode =
+
+
+
+################################################################
+#                        SIP Backup Server                    ##
+################################################################
+account.6.outbound_proxy.1.register_on_enable=
+account.6.outbound_proxy.1.failback_timeout=
+account.6.outbound_proxy.1.failback_mode=
+account.6.outbound_proxy.1.retry_counts=
+account.6.outbound_proxy.1.only_signal_with_registered=
+account.6.outbound_proxy.1.failback_subscribe.enable=
+account.6.outbound_proxy.1.invite_retry_counts=
+
+account.6.sip_server.1.register_on_enable= 0
+account.6.sip_server.1.failback_timeout= 3600
+account.6.sip_server.1.failback_mode= 0
+account.6.sip_server.1.failback_subscribe.enable= 
+account.6.sip_server.1.only_signal_with_registered=
+account.6.sip_server.1.invite_retry_counts=
+
+account.6.outbound_proxy.2.register_on_enable=
+account.6.outbound_proxy.2.failback_timeout=
+account.6.outbound_proxy.2.failback_mode=
+account.6.outbound_proxy.2.retry_counts=
+account.6.outbound_proxy.2.only_signal_with_registered=
+account.6.outbound_proxy.2.failback_subscribe.enable=
+account.6.outbound_proxy.2.invite_retry_counts=
+
+account.6.sip_server.2.register_on_enable=
+account.6.sip_server.2.failback_timeout=
+account.6.sip_server.2.failback_mode=
+account.6.sip_server.2.failback_subscribe.enable=
+account.6.sip_server.2.only_signal_with_registered=
+account.6.sip_server.2.invite_retry_counts=
+
+account.6.static_cache_pri=
+account.6.dns_cache_type=
+account.6.naptr_build=
+account.6.fallback.timeout = {$yealink_outbound_proxy_fallback_interval}
+account.6.fallback.redundancy_type=
+account.6.reg_failed_retry_max_time=
+account.6.reg_failed_retry_min_time=
+account.6.redundancy_with_reg_fail.enable =
+
+##V83 Add
+account.6.sip_server.1.outbound_proxy_enable =
+account.6.sip_server.2.outbound_proxy_enable =
+
+################################################################
+#                        SIP Basic config                     ##
+################################################################
+account.6.contact_take_line_param=
+account.6.update_ack_while_dialing=
+account.6.srtp_lifetime=
+account.6.third_part_request_with_route.enable=
+account.6.insert_outbound_in_route.enable=
+account.6.path.enable=
+account.6.sub_fail_retry_interval=
+account.6.transfer_refer_to_contact_header.enable=
+account.6.hold_use_inactive=
+account.6.gruu.enable=
+account.6.dial_tone=
+account.6.call_id_mode=
+account.6.subscribe_expires_overlap=
+account.6.register_expires_overlap=
+account.6.call_info=
+account.6.custom_ua=
+account.6.mwi_parse_terminated=
+account.6.check_cseq.enable=
+account.6.check_to_tag.enable=
+account.6.vq_rtcpxr.collector_server_port=
+account.6.vq_rtcpxr.collector_server_host=
+account.6.vq_rtcpxr.collector_name=
+account.6.compact_header_enable=
+account.6.cp_source=
+account.6.cid_source_ppi=
+account.6.cid_source_privacy=
+account.6.reg_with_pani_header.enable =
+account.6.alert_info=
+account.6.picture_info_enable=
+
+##V83 Add
+account.6.invite_with_pani_header.enable = 
+
+##V84 Add
+account.6.invite_with_rpid_header.enable=
+
+account.6.auto_answer_mute_enable
+
+#######################################################################################
+##                                 History                                           ##       
+#######################################################################################
+account.6.missed_calllog=
+
+
+#######################################################################################  
+##                                  Forward                                          ##  
+####################################################################################### 
+account.6.timeout_fwd.off_code=
+account.6.timeout_fwd.on_code=
+account.6.timeout_fwd.timeout=
+account.6.timeout_fwd.target=
+account.6.timeout_fwd.enable=
+account.6.busy_fwd.off_code=
+account.6.busy_fwd.on_code=
+account.6.busy_fwd.target=
+account.6.busy_fwd.enable=
+account.6.always_fwd.off_code=
+account.6.always_fwd.on_code=
+account.6.always_fwd.target=
+account.6.always_fwd.enable=
+
+
+#######################################################################################  
+##                                  DND                                              ##  
+#######################################################################################
+account.6.dnd.enable=
+account.6.dnd.off_code=
+account.6.dnd.on_code=
+
+
+
+#######################################################################################  
+##                               Voice Mail                                          ##  
+#######################################################################################
+voice_mail.number.1= {$voicemail_number}
+account.6.subscribe_mwi=
+account.6.subscribe_mwi_to_vm=
+account.6.subscribe_mwi_expires=
+account.6.display_mwi.enable=
+
+#######################################################################################  
+##                               Auto Dial                                           ##  
+#######################################################################################
+account.6.auto_dial_enable=
+account.6.auto_dial_num=
+
+
+#######################################################################################
+##                           Preference&Status                                       ##       
+#######################################################################################
+account.6.ringtone.ring_type=
+
+#######################################################################################
+##                           Digitmap                                                ##       
+#######################################################################################
+account.6.dialplan.digitmap.enable=
+account.6.dialplan.digitmap.string=
+account.6.dialplan.digitmap.no_match_action=
+account.6.dialplan.digitmap.interdigit_short_timer=
+account.6.dialplan.digitmap.interdigit_long_timer=
+account.6.dialplan.digitmap.apply_to.press_send=
+account.6.dialplan.digitmap.apply_to.forward=
+account.6.dialplan.digitmap.apply_to.history_dial=
+account.6.dialplan.digitmap.apply_to.directory_dial=
+account.6.dialplan.digitmap.apply_to.on_hook_dial=
+account.6.dialplan.digitmap.active.on_hook_dialing=
+
+
+#######################################################################################
+##                                 Rings Settings                                    ##
+#######################################################################################
+account.6.alert_info_url_enable=
+
+
+#######################################################################################
+##                                  BLF/BLF List                                     ##       
+#######################################################################################
+account.6.blf.blf_list_uri=
+account.6.blf_list_barge_in_code=
+account.6.blf_list_code=
+account.6.blf_list_retrieve_call_parked_code=
+account.6.blf.subscribe_period=
+account.6.blf.match_host.enable=
+account.6.out_dialog_blf_enable=
+account.6.blf.subscribe_event=
+
+##V84 Add
+account.6.blf_list_call_parked_code=
+account.6.blf_list_call_parked_list=
+
+#######################################################################################
+##                                   SCA                                             ##       
+#######################################################################################
+account.6.shared_line= {$shared_line_1}
+account.6.line_seize.expires=
+account.6.shared_line_one_touch_bargein.enable=
+account.6.shared_line_one_touch_retrieve.enable=
+account.6.sca_manage_interface_display_time=
+account.6.shared_line_callpull_code=
+
+##V83 Add
+account.x.share_line.barge_in.enable
+
+#######################################################################################
+##                                   BLA                                             ##       
+#######################################################################################
+account.6.bla_number=
+account.6.bla_subscribe_period=
+account.6.bla.notify_with_expire.enable=
+account.6.bla.subscribe_uri_build_type=
+
+#######################################################################################
+##                                   Call Park                                       ##       
+#######################################################################################
+account.6.callpark_enable=
+
+
+#######################################################################################
+##                                    Broadsoft ACD                                  ##       
+#######################################################################################
+account.6.acd.enable=
+account.6.acd.available=
+account.6.acd.unavailable_reason_enable=
+account.6.acd.initial_state=
+account.6.subscribe_acd_expires=
+
+
+#######################################################################################
+##                                 Broadsoft ACD Call Center                         ##       
+#######################################################################################
+##account.X.reason_code.Y=
+##account.X.reason_code_name.Y=
+##account.X.bw_disp_code.Y=
+##account.X.bw_disp_code_name.Y=
+##account.X.supervisor_info_code.Y=
+##account.X.supervisor_info_code_name.Y=
+##The value Y must be continuous.
+
+account.6.reason_code.1=
+account.6.reason_code_name.1=
+account.6.bw_disp_code.1=
+account.6.bw_disp_code_name.1=
+account.6.supervisor_info_code.1=
+account.6.supervisor_info_code_name.1=
+
+#######################################################################################
+##                                 Broadsoft Call Center                             ##       
+#######################################################################################
+account.6.call_center.call_info_enable=
+account.6.call_center.show_call_info_time=
+account.6.call_center.disp_code_enable=
+account.6.call_center.trace_enable=
+account.6.call_center.emergency_enable=
+account.6.call_center.queue_status_enable=
+account.6.call_center.queue_status_light_enable =
+
+
+
+#######################################################################################
+##                         Broadsoft Hoteling                                        ##       
+#######################################################################################
+account.6.hoteling.enable=
+account.6.hoteling.user_id=
+account.6.hoteling.password=
+account.6.hoteling.expires=
+account.6.hoteling.auto_login_enable=
+
+
+#######################################################################################
+##                              Broadsoft XSI                                        ##       
+#######################################################################################
+account.6.xsi.user =
+account.6.xsi.password =
+account.6.xsi.host =
+account.6.xsi.server_type =
+account.6.xsi.port =
+
+
+#######################################################################################
+##                                Call Pickup                                        ##       
+#######################################################################################
+account.6.direct_pickup_code =
+account.6.group_pickup_code =
+account.6.dialoginfo_callpickup =
+account.6.refresh_remote_id.enable =
+
+
+#######################################################################################
+##                              Broadsoft Call Recording                             ##       
+#######################################################################################
+account.6.call_recording.enable=
+
+#######################################################################################
+##                                Network Conferene                                  ##       
+#######################################################################################
+account.6.conf_uri = {if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}
+
+
+#######################################################################################
+##                              Broadsoft Call Decline                               ##       
+#######################################################################################
+account.6.features.call_decline.enable =
+
+
+#######################################################################################
+##                       Broadsoft Security Classification                           ##       
+#######################################################################################
+account.6.security_classification.enable =
+
+
+
+#######################################################################################
+##                        Broadsoft Flexible Seating                                 ##       
+#######################################################################################
+account.6.flexible_seating.enable=
+account.6.hoteling.pin=
+account.6.hoteling.mode=
+
+#######################################################################################
+##                         Features Sync                                             ##       
+#######################################################################################
+account.6.features.forward.feature_key_sync.local_processing.enable=
+account.6.features.dnd.feature_key_sync.local_processing.enable =
+
+##V84 Add
+account.6.dnd.feature_key_sync.enable=
+account.6.feature_key_sync.enable=
+account.6.forward.feature_key_sync.enable=
+
+#######################################################################################
+##                                   ACD                                             ##       
+#######################################################################################
+account.6.acd.available_url=
+account.6.acd.away_url =
+account.6.acd.refresh_url =
+account.6.acd.call_information=
+
+
+#######################################################################################
+##                                   PSTN                                            ##       
+#######################################################################################
+pstn.account.6.enable=
+pstn.account.6.label=
+
+
+
+#######################################################################################
+##                                   Trnasfer                                        ##       
+#######################################################################################
+account.7.phone_setting.call_appearance.transfer_via_new_linekey=
+
+
+#######################################################################################
+##                                   Conference                                      ##       
+#######################################################################################
+account.7.phone_setting.call_appearance.conference_via_new_linekey=
+
+
+#######################################################################################
+##                                   Anonymous                                       ##       
+#######################################################################################
+account.7.anonymous_call.server_base_only =
+account.7.send_anonymous_rejection_code =
+account.7.anonymous_reject_offcode =
+account.7.anonymous_reject_oncode =
+account.7.reject_anonymous_call=
+account.7.anonymous_call_offcode =
+account.7.anonymous_call_oncode =
+account.7.anonymous_call =
+account.7.send_anonymous_code =
+
+
+
+#######################################################################################
+##                          Call Configuration                                       ##       
+#######################################################################################
+account.7.music_server_uri=
+account.7.music_on_hold_type=
+account.7.auto_label.rule=
+account.7.auto_label.enable=
+account.7.number_of_linekey=
+account.7.phone_setting.call_appearance.calls_per_linekey=
+
+
+#######################################################################################
+##                                    Codec                                          ##       
+#######################################################################################
+account.7.codec.ilbc_15_2kbps.priority=
+account.7.codec.ilbc_15_2kbps.enable=
+account.7.codec.ilbc_13_33kbps.priority=
+account.7.codec.ilbc_13_33kbps.enable =
+account.7.codec.pcma.enable =  1
+account.7.codec.pcma.priority = {$yealink_codec_5_priority}
+
+account.7.codec.pcmu.enable = 1
+account.7.codec.pcmu.priority = {$yealink_codec_4_priority}
+
+account.7.codec.opus.enable = 1
+account.7.codec.opus.priority = {$yealink_codec_1_priority}
+account.7.codec.opus.para=
+account.7.codec.g726_40.enable=
+account.7.codec.g726_40.priority=
+account.7.codec.g726_32.enable=
+account.7.codec.g726_32.priority=
+account.7.codec.g726_24.enable=
+account.7.codec.g726_24.priority=
+account.7.codec.g726_16.enable=
+account.7.codec.g726_16.priority=
+account.7.codec.g723_63.priority=
+account.7.codec.g723_63.enable=
+account.7.codec.g723_53.priority=
+account.7.codec.g723_53.enable=
+account.7.codec.g729.enable = 1
+account.7.codec.g729.priority = {$yealink_codec_3_priority}
+
+account.7.codec.g722.enable = 1
+account.7.codec.g722.priority = {$yealink_codec_2_priority}
+
+account.7.codec.G722_1_24kpbs.priority=
+account.7.codec.G722_1_24kpbs.enable=
+account.7.codec.G722_1c_24kpbs.priority=
+account.7.codec.G722_1c_24kpbs.enable=
+account.7.codec.G722_1c_32kpbs.priority=
+account.7.codec.G722_1c_32kpbs.enable=
+account.7.codec.G722_1c_48kpbs.priority=
+account.7.codec.G722_1c_48kpbs.enable=
+
+
+################################################################
+#                      Account Register                       ##
+################################################################
+{if isset($account.7.password) }
+account.7.enable = 1
+{else}
+account.7.enable = 0
+{/if}
+account.7.label = {$account.7.display_name}
+account.7.display_name = {$account.7.display_name}
+account.7.auth_name = {$account.7.auth_id}
+account.7.password = {$account.7.password}
+{if isset($account.7.server.1.address)}
+account.7.user_name = {$account.7.user_id}@{$account.7.server_address}
+{else}
+account.7.user_name = {$account.7.user_id}
+{/if}
+
+account.7.sip_server.1.address= {$account.7.server_address}
+account.7.sip_server.1.port= {$account.7.sip_port}
+
+
+{if $account.7.sip_transport == 'udp'}account.7.sip_server.1.transport_type = 0{/if}
+{if $account.7.sip_transport == 'tcp'}account.7.sip_server.1.transport_type = 1{/if}
+{if $account.7.sip_transport == 'tls'}account.7.sip_server.1.transport_type = 2{/if}
+{if $account.7.sip_transport == 'dns srv'}account.7.sip_server.1.transport_type = 3{/if}
+
+account.7.sip_server.1.expires= {$account.7.register_expires}
+account.7.sip_server.1.retry_counts= 3
+
+account.7.sip_server.2.address= {$account.7.server.2.address}
+account.7.sip_server.2.port= {$account.7.sip_port}
+
+
+{if $account.7.sip_transport == 'udp'}account.7.sip_server.2.transport_type = 0{/if}
+{if $account.7.sip_transport == 'tcp'}account.7.sip_server.2.transport_type = 1{/if}
+{if $account.7.sip_transport == 'tls'}account.7.sip_server.2.transport_type = 2{/if}
+{if $account.7.sip_transport == 'dns srv'}account.7.sip_server.2.transport_type = 3{/if}
+
+account.7.sip_server.2.expires= {$account.7.register_expires}
+account.7.sip_server.2.retry_counts= 3
+
+account.7.outbound_proxy_enable= {if isset($account.7.outbound_proxy_primary)}1{else}0{/if}
+
+account.7.outbound_proxy.1.address= {$account.7.outbound_proxy_primary}
+
+{if isset($outbound_proxy_1_port)}
+account.7.outbound_proxy.1.port = {$outbound_proxy_1_port}
+{else}
+account.7.outbound_proxy.1.port = {$account.7.sip_port}
+{/if}
+
+account.7.outbound_proxy.2.address= {$account.7.outbound_proxy_secondary}
+
+{if isset($outbound_proxy_1_port)}
+account.7.outbound_proxy.2.port = {$outbound_proxy_2_port}
+{else}
+account.7.outbound_proxy.2.port = {$account.7.sip_port}
+{/if}
+
+{if isset($outbound_proxy_fallback_interval)}
+account.7.outbound_proxy_fallback_interval = {$outbound_proxy_fallback_interval}
+{else}
+account.7.outbound_proxy_fallback_interval = 120
+{/if}
+
+account.7.nat.nat_traversal=
+
+
+################################################################
+#                      Account Basic                          ##
+################################################################
+account.7.auto_answer=
+
+################################################################
+#                      Account Advanced                       ##
+################################################################
+account.7.nat.udp_update_enable= 3
+account.7.nat.udp_update_time= 30
+account.7.nat.rport= {$yealink_rport}
+
+account.7.dtmf.type= {$yealink_dtmf_type}
+account.7.dtmf.info_type=
+account.7.dtmf.dtmf_payload=
+account.7.100rel_enable= {$yealink_retransmission}
+
+account.7.subscribe_register=
+account.7.cid_source= {$yealink_cid_source}
+account.7.enable_user_equal_phone=
+account.7.srtp_encryption= {$yealink_srtp_encryption}
+account.7.ptime= 20
+account.7.register_line=
+account.7.register_mac=
+account.7.reg_fail_retry_interval=
+account.7.unregister_on_reboot=
+
+account.7.session_timer.refresher=
+account.7.session_timer.expires=
+account.7.session_timer.enable= {$yealink_session_timer}
+
+account.7.conf_type=
+account.7.sip_server_type=
+
+##V83 Add
+account.7.srtp.unencrypted_rtcp.enable =
+account.7.srtp.unencrypted_rtp.enable =
+account.7.sip_server_mode =
+
+
+
+################################################################
+#                        SIP Backup Server                    ##
+################################################################
+account.7.outbound_proxy.1.register_on_enable=
+account.7.outbound_proxy.1.failback_timeout=
+account.7.outbound_proxy.1.failback_mode=
+account.7.outbound_proxy.1.retry_counts=
+account.7.outbound_proxy.1.only_signal_with_registered=
+account.7.outbound_proxy.1.failback_subscribe.enable=
+account.7.outbound_proxy.1.invite_retry_counts=
+
+account.7.sip_server.1.register_on_enable= 0
+account.7.sip_server.1.failback_timeout= 3600
+account.7.sip_server.1.failback_mode= 0
+account.7.sip_server.1.failback_subscribe.enable= 
+account.7.sip_server.1.only_signal_with_registered=
+account.7.sip_server.1.invite_retry_counts=
+
+account.7.outbound_proxy.2.register_on_enable=
+account.7.outbound_proxy.2.failback_timeout=
+account.7.outbound_proxy.2.failback_mode=
+account.7.outbound_proxy.2.retry_counts=
+account.7.outbound_proxy.2.only_signal_with_registered=
+account.7.outbound_proxy.2.failback_subscribe.enable=
+account.7.outbound_proxy.2.invite_retry_counts=
+
+account.7.sip_server.2.register_on_enable=
+account.7.sip_server.2.failback_timeout=
+account.7.sip_server.2.failback_mode=
+account.7.sip_server.2.failback_subscribe.enable=
+account.7.sip_server.2.only_signal_with_registered=
+account.7.sip_server.2.invite_retry_counts=
+
+account.7.static_cache_pri=
+account.7.dns_cache_type=
+account.7.naptr_build=
+account.7.fallback.timeout = {$yealink_outbound_proxy_fallback_interval}
+account.7.fallback.redundancy_type=
+account.7.reg_failed_retry_max_time=
+account.7.reg_failed_retry_min_time=
+account.7.redundancy_with_reg_fail.enable =
+
+##V83 Add
+account.7.sip_server.1.outbound_proxy_enable =
+account.7.sip_server.2.outbound_proxy_enable =
+
+################################################################
+#                        SIP Basic config                     ##
+################################################################
+account.7.contact_take_line_param=
+account.7.update_ack_while_dialing=
+account.7.srtp_lifetime=
+account.7.third_part_request_with_route.enable=
+account.7.insert_outbound_in_route.enable=
+account.7.path.enable=
+account.7.sub_fail_retry_interval=
+account.7.transfer_refer_to_contact_header.enable=
+account.7.hold_use_inactive=
+account.7.gruu.enable=
+account.7.dial_tone=
+account.7.call_id_mode=
+account.7.subscribe_expires_overlap=
+account.7.register_expires_overlap=
+account.7.call_info=
+account.7.custom_ua=
+account.7.mwi_parse_terminated=
+account.7.check_cseq.enable=
+account.7.check_to_tag.enable=
+account.7.vq_rtcpxr.collector_server_port=
+account.7.vq_rtcpxr.collector_server_host=
+account.7.vq_rtcpxr.collector_name=
+account.7.compact_header_enable=
+account.7.cp_source=
+account.7.cid_source_ppi=
+account.7.cid_source_privacy=
+account.7.reg_with_pani_header.enable =
+account.7.alert_info=
+account.7.picture_info_enable=
+
+##V83 Add
+account.7.invite_with_pani_header.enable = 
+
+##V84 Add
+account.7.invite_with_rpid_header.enable=
+
+account.7.auto_answer_mute_enable
+
+#######################################################################################
+##                                 History                                           ##       
+#######################################################################################
+account.7.missed_calllog=
+
+
+#######################################################################################  
+##                                  Forward                                          ##  
+####################################################################################### 
+account.7.timeout_fwd.off_code=
+account.7.timeout_fwd.on_code=
+account.7.timeout_fwd.timeout=
+account.7.timeout_fwd.target=
+account.7.timeout_fwd.enable=
+account.7.busy_fwd.off_code=
+account.7.busy_fwd.on_code=
+account.7.busy_fwd.target=
+account.7.busy_fwd.enable=
+account.7.always_fwd.off_code=
+account.7.always_fwd.on_code=
+account.7.always_fwd.target=
+account.7.always_fwd.enable=
+
+
+#######################################################################################  
+##                                  DND                                              ##  
+#######################################################################################
+account.7.dnd.enable=
+account.7.dnd.off_code=
+account.7.dnd.on_code=
+
+
+
+#######################################################################################  
+##                               Voice Mail                                          ##  
+#######################################################################################
+voice_mail.number.1= {$voicemail_number}
+account.7.subscribe_mwi=
+account.7.subscribe_mwi_to_vm=
+account.7.subscribe_mwi_expires=
+account.7.display_mwi.enable=
+
+#######################################################################################  
+##                               Auto Dial                                           ##  
+#######################################################################################
+account.7.auto_dial_enable=
+account.7.auto_dial_num=
+
+
+#######################################################################################
+##                           Preference&Status                                       ##       
+#######################################################################################
+account.7.ringtone.ring_type=
+
+#######################################################################################
+##                           Digitmap                                                ##       
+#######################################################################################
+account.7.dialplan.digitmap.enable=
+account.7.dialplan.digitmap.string=
+account.7.dialplan.digitmap.no_match_action=
+account.7.dialplan.digitmap.interdigit_short_timer=
+account.7.dialplan.digitmap.interdigit_long_timer=
+account.7.dialplan.digitmap.apply_to.press_send=
+account.7.dialplan.digitmap.apply_to.forward=
+account.7.dialplan.digitmap.apply_to.history_dial=
+account.7.dialplan.digitmap.apply_to.directory_dial=
+account.7.dialplan.digitmap.apply_to.on_hook_dial=
+account.7.dialplan.digitmap.active.on_hook_dialing=
+
+
+#######################################################################################
+##                                 Rings Settings                                    ##
+#######################################################################################
+account.7.alert_info_url_enable=
+
+
+#######################################################################################
+##                                  BLF/BLF List                                     ##       
+#######################################################################################
+account.7.blf.blf_list_uri=
+account.7.blf_list_barge_in_code=
+account.7.blf_list_code=
+account.7.blf_list_retrieve_call_parked_code=
+account.7.blf.subscribe_period=
+account.7.blf.match_host.enable=
+account.7.out_dialog_blf_enable=
+account.7.blf.subscribe_event=
+
+##V84 Add
+account.7.blf_list_call_parked_code=
+account.7.blf_list_call_parked_list=
+
+#######################################################################################
+##                                   SCA                                             ##       
+#######################################################################################
+account.7.shared_line= {$shared_line_1}
+account.7.line_seize.expires=
+account.7.shared_line_one_touch_bargein.enable=
+account.7.shared_line_one_touch_retrieve.enable=
+account.7.sca_manage_interface_display_time=
+account.7.shared_line_callpull_code=
+
+##V83 Add
+account.x.share_line.barge_in.enable
+
+#######################################################################################
+##                                   BLA                                             ##       
+#######################################################################################
+account.7.bla_number=
+account.7.bla_subscribe_period=
+account.7.bla.notify_with_expire.enable=
+account.7.bla.subscribe_uri_build_type=
+
+#######################################################################################
+##                                   Call Park                                       ##       
+#######################################################################################
+account.7.callpark_enable=
+
+
+#######################################################################################
+##                                    Broadsoft ACD                                  ##       
+#######################################################################################
+account.7.acd.enable=
+account.7.acd.available=
+account.7.acd.unavailable_reason_enable=
+account.7.acd.initial_state=
+account.7.subscribe_acd_expires=
+
+
+#######################################################################################
+##                                 Broadsoft ACD Call Center                         ##       
+#######################################################################################
+##account.X.reason_code.Y=
+##account.X.reason_code_name.Y=
+##account.X.bw_disp_code.Y=
+##account.X.bw_disp_code_name.Y=
+##account.X.supervisor_info_code.Y=
+##account.X.supervisor_info_code_name.Y=
+##The value Y must be continuous.
+
+account.7.reason_code.1=
+account.7.reason_code_name.1=
+account.7.bw_disp_code.1=
+account.7.bw_disp_code_name.1=
+account.7.supervisor_info_code.1=
+account.7.supervisor_info_code_name.1=
+
+#######################################################################################
+##                                 Broadsoft Call Center                             ##       
+#######################################################################################
+account.7.call_center.call_info_enable=
+account.7.call_center.show_call_info_time=
+account.7.call_center.disp_code_enable=
+account.7.call_center.trace_enable=
+account.7.call_center.emergency_enable=
+account.7.call_center.queue_status_enable=
+account.7.call_center.queue_status_light_enable =
+
+
+
+#######################################################################################
+##                         Broadsoft Hoteling                                        ##       
+#######################################################################################
+account.7.hoteling.enable=
+account.7.hoteling.user_id=
+account.7.hoteling.password=
+account.7.hoteling.expires=
+account.7.hoteling.auto_login_enable=
+
+
+#######################################################################################
+##                              Broadsoft XSI                                        ##       
+#######################################################################################
+account.7.xsi.user =
+account.7.xsi.password =
+account.7.xsi.host =
+account.7.xsi.server_type =
+account.7.xsi.port =
+
+
+#######################################################################################
+##                                Call Pickup                                        ##       
+#######################################################################################
+account.7.direct_pickup_code =
+account.7.group_pickup_code =
+account.7.dialoginfo_callpickup =
+account.7.refresh_remote_id.enable =
+
+
+#######################################################################################
+##                              Broadsoft Call Recording                             ##       
+#######################################################################################
+account.7.call_recording.enable=
+
+#######################################################################################
+##                                Network Conferene                                  ##       
+#######################################################################################
+account.7.conf_uri=
+
+
+#######################################################################################
+##                              Broadsoft Call Decline                               ##       
+#######################################################################################
+account.7.features.call_decline.enable =
+
+
+#######################################################################################
+##                       Broadsoft Security Classification                           ##       
+#######################################################################################
+account.7.security_classification.enable =
+
+
+
+#######################################################################################
+##                        Broadsoft Flexible Seating                                 ##       
+#######################################################################################
+account.7.flexible_seating.enable=
+account.7.hoteling.pin=
+account.7.hoteling.mode=
+
+#######################################################################################
+##                         Features Sync                                             ##       
+#######################################################################################
+account.7.features.forward.feature_key_sync.local_processing.enable=
+account.7.features.dnd.feature_key_sync.local_processing.enable =
+
+##V84 Add
+account.7.dnd.feature_key_sync.enable=
+account.7.feature_key_sync.enable=
+account.7.forward.feature_key_sync.enable=
+
+#######################################################################################
+##                                   ACD                                             ##       
+#######################################################################################
+account.7.acd.available_url=
+account.7.acd.away_url =
+account.7.acd.refresh_url =
+account.7.acd.call_information=
+
+
+#######################################################################################
+##                                   PSTN                                            ##       
+#######################################################################################
+pstn.account.7.enable=
+pstn.account.7.label=
+
+
+
+#######################################################################################
+##                                   Trnasfer                                        ##       
+#######################################################################################
+account.8.phone_setting.call_appearance.transfer_via_new_linekey=
+
+
+#######################################################################################
+##                                   Conference                                      ##       
+#######################################################################################
+account.8.phone_setting.call_appearance.conference_via_new_linekey=
+
+
+#######################################################################################
+##                                   Anonymous                                       ##       
+#######################################################################################
+account.8.anonymous_call.server_base_only =
+account.8.send_anonymous_rejection_code =
+account.8.anonymous_reject_offcode =
+account.8.anonymous_reject_oncode =
+account.8.reject_anonymous_call=
+account.8.anonymous_call_offcode =
+account.8.anonymous_call_oncode =
+account.8.anonymous_call =
+account.8.send_anonymous_code =
+
+
+
+#######################################################################################
+##                          Call Configuration                                       ##       
+#######################################################################################
+account.8.music_server_uri=
+account.8.music_on_hold_type=
+account.8.auto_label.rule=
+account.8.auto_label.enable=
+account.8.number_of_linekey=
+account.8.phone_setting.call_appearance.calls_per_linekey=
+
+
+#######################################################################################
+##                                    Codec                                          ##       
+#######################################################################################
+account.8.codec.ilbc_15_2kbps.priority=
+account.8.codec.ilbc_15_2kbps.enable=
+account.8.codec.ilbc_13_33kbps.priority=
+account.8.codec.ilbc_13_33kbps.enable =
+account.8.codec.pcma.enable =  1
+account.8.codec.pcma.priority = {$yealink_codec_5_priority}
+
+account.8.codec.pcmu.enable = 1
+account.8.codec.pcmu.priority = {$yealink_codec_4_priority}
+
+account.8.codec.opus.enable = 1
+account.8.codec.opus.priority = {$yealink_codec_1_priority}
+account.8.codec.opus.para=
+account.8.codec.g726_40.enable=
+account.8.codec.g726_40.priority=
+account.8.codec.g726_32.enable=
+account.8.codec.g726_32.priority=
+account.8.codec.g726_24.enable=
+account.8.codec.g726_24.priority=
+account.8.codec.g726_16.enable=
+account.8.codec.g726_16.priority=
+account.8.codec.g723_63.priority=
+account.8.codec.g723_63.enable=
+account.8.codec.g723_53.priority=
+account.8.codec.g723_53.enable=
+account.8.codec.g729.enable = 1
+account.8.codec.g729.priority = {$yealink_codec_3_priority}
+
+account.8.codec.g722.enable = 1
+account.8.codec.g722.priority = {$yealink_codec_2_priority}
+
+account.8.codec.G722_1_24kpbs.priority=
+account.8.codec.G722_1_24kpbs.enable=
+account.8.codec.G722_1c_24kpbs.priority=
+account.8.codec.G722_1c_24kpbs.enable=
+account.8.codec.G722_1c_32kpbs.priority=
+account.8.codec.G722_1c_32kpbs.enable=
+account.8.codec.G722_1c_48kpbs.priority=
+account.8.codec.G722_1c_48kpbs.enable=
+
+
+################################################################
+#                      Account Register                       ##
+################################################################
+{if isset($account.8.password) }
+account.8.enable = 1
+{else}
+account.8.enable = 0
+{/if}
+account.8.label = {$account.8.display_name}
+account.8.display_name = {$account.8.display_name}
+account.8.auth_name = {$account.8.auth_id}
+account.8.password = {$account.8.password}
+{if isset($account.8.server.1.address)}
+account.8.user_name = {$account.8.user_id}@{$account.8.server_address}
+{else}
+account.8.user_name = {$account.8.user_id}
+{/if}
+
+account.8.sip_server.1.address= {$account.8.server_address}
+account.8.sip_server.1.port= {$account.8.sip_port}
+
+
+{if $account.8.sip_transport == 'udp'}account.8.sip_server.1.transport_type = 0{/if}
+{if $account.8.sip_transport == 'tcp'}account.8.sip_server.1.transport_type = 1{/if}
+{if $account.8.sip_transport == 'tls'}account.8.sip_server.1.transport_type = 2{/if}
+{if $account.8.sip_transport == 'dns srv'}account.8.sip_server.1.transport_type = 3{/if}
+
+account.8.sip_server.1.expires= {$account.8.register_expires}
+account.8.sip_server.1.retry_counts= 3
+
+account.8.sip_server.2.address= {$account.8.server.2.address}
+account.8.sip_server.2.port= {$account.8.sip_port}
+
+
+{if $account.8.sip_transport == 'udp'}account.8.sip_server.2.transport_type = 0{/if}
+{if $account.8.sip_transport == 'tcp'}account.8.sip_server.2.transport_type = 1{/if}
+{if $account.8.sip_transport == 'tls'}account.8.sip_server.2.transport_type = 2{/if}
+{if $account.8.sip_transport == 'dns srv'}account.8.sip_server.2.transport_type = 3{/if}
+
+account.8.sip_server.2.expires= {$account.8.register_expires}
+account.8.sip_server.2.retry_counts= 3
+
+account.8.outbound_proxy_enable= {if isset($account.8.outbound_proxy_primary)}1{else}0{/if}
+
+account.8.outbound_proxy.1.address= {$account.8.outbound_proxy_primary}
+
+{if isset($outbound_proxy_1_port)}
+account.8.outbound_proxy.1.port = {$outbound_proxy_1_port}
+{else}
+account.8.outbound_proxy.1.port = {$account.8.sip_port}
+{/if}
+
+account.8.outbound_proxy.2.address= {$account.8.outbound_proxy_secondary}
+
+{if isset($outbound_proxy_1_port)}
+account.8.outbound_proxy.2.port = {$outbound_proxy_2_port}
+{else}
+account.8.outbound_proxy.2.port = {$account.8.sip_port}
+{/if}
+
+{if isset($outbound_proxy_fallback_interval)}
+account.8.outbound_proxy_fallback_interval = {$outbound_proxy_fallback_interval}
+{else}
+account.8.outbound_proxy_fallback_interval = 120
+{/if}
+
+account.8.nat.nat_traversal=
+
+
+################################################################
+#                      Account Basic                          ##
+################################################################
+account.8.auto_answer=
+
+################################################################
+#                      Account Advanced                       ##
+################################################################
+account.8.nat.udp_update_enable= 3
+account.8.nat.udp_update_time= 30
+account.8.nat.rport= {$yealink_rport}
+
+account.8.dtmf.type= {$yealink_dtmf_type}
+account.8.dtmf.info_type=
+account.8.dtmf.dtmf_payload=
+account.8.100rel_enable= {$yealink_retransmission}
+
+account.8.subscribe_register=
+account.8.cid_source= {$yealink_cid_source}
+account.8.enable_user_equal_phone=
+account.8.srtp_encryption= {$yealink_srtp_encryption}
+account.8.ptime= 20
+account.8.register_line=
+account.8.register_mac=
+account.8.reg_fail_retry_interval=
+account.8.unregister_on_reboot=
+
+account.8.session_timer.refresher=
+account.8.session_timer.expires=
+account.8.session_timer.enable= {$yealink_session_timer}
+
+account.8.conf_type=
+account.8.sip_server_type=
+
+##V83 Add
+account.8.srtp.unencrypted_rtcp.enable =
+account.8.srtp.unencrypted_rtp.enable =
+account.8.sip_server_mode =
+
+
+
+################################################################
+#                        SIP Backup Server                    ##
+################################################################
+account.8.outbound_proxy.1.register_on_enable=
+account.8.outbound_proxy.1.failback_timeout=
+account.8.outbound_proxy.1.failback_mode=
+account.8.outbound_proxy.1.retry_counts=
+account.8.outbound_proxy.1.only_signal_with_registered=
+account.8.outbound_proxy.1.failback_subscribe.enable=
+account.8.outbound_proxy.1.invite_retry_counts=
+
+account.8.sip_server.1.register_on_enable= 0
+account.8.sip_server.1.failback_timeout= 3600
+account.8.sip_server.1.failback_mode= 0
+account.8.sip_server.1.failback_subscribe.enable= 
+account.8.sip_server.1.only_signal_with_registered=
+account.8.sip_server.1.invite_retry_counts=
+
+account.8.outbound_proxy.2.register_on_enable=
+account.8.outbound_proxy.2.failback_timeout=
+account.8.outbound_proxy.2.failback_mode=
+account.8.outbound_proxy.2.retry_counts=
+account.8.outbound_proxy.2.only_signal_with_registered=
+account.8.outbound_proxy.2.failback_subscribe.enable=
+account.8.outbound_proxy.2.invite_retry_counts=
+
+account.8.sip_server.2.register_on_enable=
+account.8.sip_server.2.failback_timeout=
+account.8.sip_server.2.failback_mode=
+account.8.sip_server.2.failback_subscribe.enable=
+account.8.sip_server.2.only_signal_with_registered=
+account.8.sip_server.2.invite_retry_counts=
+
+account.8.static_cache_pri=
+account.8.dns_cache_type=
+account.8.naptr_build=
+account.8.fallback.timeout = {$yealink_outbound_proxy_fallback_interval}
+account.8.fallback.redundancy_type=
+account.8.reg_failed_retry_max_time=
+account.8.reg_failed_retry_min_time=
+account.8.redundancy_with_reg_fail.enable =
+
+##V83 Add
+account.8.sip_server.1.outbound_proxy_enable =
+account.8.sip_server.2.outbound_proxy_enable =
+
+################################################################
+#                        SIP Basic config                     ##
+################################################################
+account.8.contact_take_line_param=
+account.8.update_ack_while_dialing=
+account.8.srtp_lifetime=
+account.8.third_part_request_with_route.enable=
+account.8.insert_outbound_in_route.enable=
+account.8.path.enable=
+account.8.sub_fail_retry_interval=
+account.8.transfer_refer_to_contact_header.enable=
+account.8.hold_use_inactive=
+account.8.gruu.enable=
+account.8.dial_tone=
+account.8.call_id_mode=
+account.8.subscribe_expires_overlap=
+account.8.register_expires_overlap=
+account.8.call_info=
+account.8.custom_ua=
+account.8.mwi_parse_terminated=
+account.8.check_cseq.enable=
+account.8.check_to_tag.enable=
+account.8.vq_rtcpxr.collector_server_port=
+account.8.vq_rtcpxr.collector_server_host=
+account.8.vq_rtcpxr.collector_name=
+account.8.compact_header_enable=
+account.8.cp_source=
+account.8.cid_source_ppi=
+account.8.cid_source_privacy=
+account.8.reg_with_pani_header.enable =
+account.8.alert_info=
+account.8.picture_info_enable=
+
+##V83 Add
+account.8.invite_with_pani_header.enable = 
+
+##V84 Add
+account.8.invite_with_rpid_header.enable=
+
+account.8.auto_answer_mute_enable
+
+#######################################################################################
+##                                 History                                           ##       
+#######################################################################################
+account.8.missed_calllog=
+
+
+#######################################################################################  
+##                                  Forward                                          ##  
+####################################################################################### 
+account.8.timeout_fwd.off_code=
+account.8.timeout_fwd.on_code=
+account.8.timeout_fwd.timeout=
+account.8.timeout_fwd.target=
+account.8.timeout_fwd.enable=
+account.8.busy_fwd.off_code=
+account.8.busy_fwd.on_code=
+account.8.busy_fwd.target=
+account.8.busy_fwd.enable=
+account.8.always_fwd.off_code=
+account.8.always_fwd.on_code=
+account.8.always_fwd.target=
+account.8.always_fwd.enable=
+
+
+#######################################################################################  
+##                                  DND                                              ##  
+#######################################################################################
+account.8.dnd.enable=
+account.8.dnd.off_code=
+account.8.dnd.on_code=
+
+
+
+#######################################################################################  
+##                               Voice Mail                                          ##  
+#######################################################################################
+voice_mail.number.1= {$voicemail_number}
+account.8.subscribe_mwi=
+account.8.subscribe_mwi_to_vm=
+account.8.subscribe_mwi_expires=
+account.8.display_mwi.enable=
+
+#######################################################################################  
+##                               Auto Dial                                           ##  
+#######################################################################################
+account.8.auto_dial_enable=
+account.8.auto_dial_num=
+
+
+#######################################################################################
+##                           Preference&Status                                       ##       
+#######################################################################################
+account.8.ringtone.ring_type=
+
+#######################################################################################
+##                           Digitmap                                                ##       
+#######################################################################################
+account.8.dialplan.digitmap.enable=
+account.8.dialplan.digitmap.string=
+account.8.dialplan.digitmap.no_match_action=
+account.8.dialplan.digitmap.interdigit_short_timer=
+account.8.dialplan.digitmap.interdigit_long_timer=
+account.8.dialplan.digitmap.apply_to.press_send=
+account.8.dialplan.digitmap.apply_to.forward=
+account.8.dialplan.digitmap.apply_to.history_dial=
+account.8.dialplan.digitmap.apply_to.directory_dial=
+account.8.dialplan.digitmap.apply_to.on_hook_dial=
+account.8.dialplan.digitmap.active.on_hook_dialing=
+
+
+#######################################################################################
+##                                 Rings Settings                                    ##
+#######################################################################################
+account.8.alert_info_url_enable=
+
+
+#######################################################################################
+##                                  BLF/BLF List                                     ##       
+#######################################################################################
+account.8.blf.blf_list_uri=
+account.8.blf_list_barge_in_code=
+account.8.blf_list_code=
+account.8.blf_list_retrieve_call_parked_code=
+account.8.blf.subscribe_period=
+account.8.blf.match_host.enable=
+account.8.out_dialog_blf_enable=
+account.8.blf.subscribe_event=
+
+##V84 Add
+account.8.blf_list_call_parked_code=
+account.8.blf_list_call_parked_list=
+
+#######################################################################################
+##                                   SCA                                             ##       
+#######################################################################################
+account.8.shared_line= {$shared_line_1}
+account.8.line_seize.expires=
+account.8.shared_line_one_touch_bargein.enable=
+account.8.shared_line_one_touch_retrieve.enable=
+account.8.sca_manage_interface_display_time=
+account.8.shared_line_callpull_code=
+
+##V83 Add
+account.x.share_line.barge_in.enable
+
+#######################################################################################
+##                                   BLA                                             ##       
+#######################################################################################
+account.8.bla_number=
+account.8.bla_subscribe_period=
+account.8.bla.notify_with_expire.enable=
+account.8.bla.subscribe_uri_build_type=
+
+#######################################################################################
+##                                   Call Park                                       ##       
+#######################################################################################
+account.8.callpark_enable=
+
+
+#######################################################################################
+##                                    Broadsoft ACD                                  ##       
+#######################################################################################
+account.8.acd.enable=
+account.8.acd.available=
+account.8.acd.unavailable_reason_enable=
+account.8.acd.initial_state=
+account.8.subscribe_acd_expires=
+
+
+#######################################################################################
+##                                 Broadsoft ACD Call Center                         ##       
+#######################################################################################
+##account.X.reason_code.Y=
+##account.X.reason_code_name.Y=
+##account.X.bw_disp_code.Y=
+##account.X.bw_disp_code_name.Y=
+##account.X.supervisor_info_code.Y=
+##account.X.supervisor_info_code_name.Y=
+##The value Y must be continuous.
+
+account.8.reason_code.1=
+account.8.reason_code_name.1=
+account.8.bw_disp_code.1=
+account.8.bw_disp_code_name.1=
+account.8.supervisor_info_code.1=
+account.8.supervisor_info_code_name.1=
+
+#######################################################################################
+##                                 Broadsoft Call Center                             ##       
+#######################################################################################
+account.8.call_center.call_info_enable=
+account.8.call_center.show_call_info_time=
+account.8.call_center.disp_code_enable=
+account.8.call_center.trace_enable=
+account.8.call_center.emergency_enable=
+account.8.call_center.queue_status_enable=
+account.8.call_center.queue_status_light_enable =
+
+
+
+#######################################################################################
+##                         Broadsoft Hoteling                                        ##       
+#######################################################################################
+account.8.hoteling.enable=
+account.8.hoteling.user_id=
+account.8.hoteling.password=
+account.8.hoteling.expires=
+account.8.hoteling.auto_login_enable=
+
+
+#######################################################################################
+##                              Broadsoft XSI                                        ##       
+#######################################################################################
+account.8.xsi.user =
+account.8.xsi.password =
+account.8.xsi.host =
+account.8.xsi.server_type =
+account.8.xsi.port =
+
+
+#######################################################################################
+##                                Call Pickup                                        ##       
+#######################################################################################
+account.8.direct_pickup_code =
+account.8.group_pickup_code =
+account.8.dialoginfo_callpickup =
+account.8.refresh_remote_id.enable =
+
+
+#######################################################################################
+##                              Broadsoft Call Recording                             ##       
+#######################################################################################
+account.8.call_recording.enable=
+
+#######################################################################################
+##                                Network Conferene                                  ##       
+#######################################################################################
+account.8.conf_uri=
+
+
+#######################################################################################
+##                              Broadsoft Call Decline                               ##       
+#######################################################################################
+account.8.features.call_decline.enable =
+
+
+#######################################################################################
+##                       Broadsoft Security Classification                           ##       
+#######################################################################################
+account.8.security_classification.enable =
+
+
+
+#######################################################################################
+##                        Broadsoft Flexible Seating                                 ##       
+#######################################################################################
+account.8.flexible_seating.enable=
+account.8.hoteling.pin=
+account.8.hoteling.mode=
+
+#######################################################################################
+##                         Features Sync                                             ##       
+#######################################################################################
+account.8.features.forward.feature_key_sync.local_processing.enable=
+account.8.features.dnd.feature_key_sync.local_processing.enable =
+
+##V84 Add
+account.8.dnd.feature_key_sync.enable=
+account.8.feature_key_sync.enable=
+account.8.forward.feature_key_sync.enable=
+
+#######################################################################################
+##                                   ACD                                             ##       
+#######################################################################################
+account.8.acd.available_url=
+account.8.acd.away_url =
+account.8.acd.refresh_url =
+account.8.acd.call_information=
+
+
+#######################################################################################
+##                                   PSTN                                            ##       
+#######################################################################################
+pstn.account.8.enable=
+pstn.account.8.label=
+
+
+
+#######################################################################################
+##                                   Trnasfer                                        ##       
+#######################################################################################
+account.9.phone_setting.call_appearance.transfer_via_new_linekey=
+
+
+#######################################################################################
+##                                   Conference                                      ##       
+#######################################################################################
+account.9.phone_setting.call_appearance.conference_via_new_linekey=
+
+
+#######################################################################################
+##                                   Anonymous                                       ##       
+#######################################################################################
+account.9.anonymous_call.server_base_only =
+account.9.send_anonymous_rejection_code =
+account.9.anonymous_reject_offcode =
+account.9.anonymous_reject_oncode =
+account.9.reject_anonymous_call=
+account.9.anonymous_call_offcode =
+account.9.anonymous_call_oncode =
+account.9.anonymous_call =
+account.9.send_anonymous_code =
+
+
+
+#######################################################################################
+##                          Call Configuration                                       ##       
+#######################################################################################
+account.9.music_server_uri=
+account.9.music_on_hold_type=
+account.9.auto_label.rule=
+account.9.auto_label.enable=
+account.9.number_of_linekey=
+account.9.phone_setting.call_appearance.calls_per_linekey=
+
+
+#######################################################################################
+##                                    Codec                                          ##       
+#######################################################################################
+account.9.codec.ilbc_15_2kbps.priority=
+account.9.codec.ilbc_15_2kbps.enable=
+account.9.codec.ilbc_13_33kbps.priority=
+account.9.codec.ilbc_13_33kbps.enable =
+account.9.codec.pcma.enable =  1
+account.9.codec.pcma.priority = {$yealink_codec_5_priority}
+
+account.9.codec.pcmu.enable = 1
+account.9.codec.pcmu.priority = {$yealink_codec_4_priority}
+
+account.9.codec.opus.enable = 1
+account.9.codec.opus.priority = {$yealink_codec_1_priority}
+account.9.codec.opus.para=
+account.9.codec.g726_40.enable=
+account.9.codec.g726_40.priority=
+account.9.codec.g726_32.enable=
+account.9.codec.g726_32.priority=
+account.9.codec.g726_24.enable=
+account.9.codec.g726_24.priority=
+account.9.codec.g726_16.enable=
+account.9.codec.g726_16.priority=
+account.9.codec.g723_63.priority=
+account.9.codec.g723_63.enable=
+account.9.codec.g723_53.priority=
+account.9.codec.g723_53.enable=
+account.9.codec.g729.enable = 1
+account.9.codec.g729.priority = {$yealink_codec_3_priority}
+
+account.9.codec.g722.enable = 1
+account.9.codec.g722.priority = {$yealink_codec_2_priority}
+
+account.9.codec.G722_1_24kpbs.priority=
+account.9.codec.G722_1_24kpbs.enable=
+account.9.codec.G722_1c_24kpbs.priority=
+account.9.codec.G722_1c_24kpbs.enable=
+account.9.codec.G722_1c_32kpbs.priority=
+account.9.codec.G722_1c_32kpbs.enable=
+account.9.codec.G722_1c_48kpbs.priority=
+account.9.codec.G722_1c_48kpbs.enable=
+
+
+################################################################
+#                      Account Register                       ##
+################################################################
+{if isset($account.9.password) }
+account.9.enable = 1
+{else}
+account.9.enable = 0
+{/if}
+account.9.label = {$account.9.display_name}
+account.9.display_name = {$account.9.display_name}
+account.9.auth_name = {$account.9.auth_id}
+account.9.password = {$account.9.password}
+{if isset($account.9.server.1.address)}
+account.9.user_name = {$account.9.user_id}@{$account.9.server_address}
+{else}
+account.9.user_name = {$account.9.user_id}
+{/if}
+
+account.9.sip_server.1.address= {$account.9.server_address}
+account.9.sip_server.1.port= {$account.9.sip_port}
+
+
+{if $account.9.sip_transport == 'udp'}account.9.sip_server.1.transport_type = 0{/if}
+{if $account.9.sip_transport == 'tcp'}account.9.sip_server.1.transport_type = 1{/if}
+{if $account.9.sip_transport == 'tls'}account.9.sip_server.1.transport_type = 2{/if}
+{if $account.9.sip_transport == 'dns srv'}account.9.sip_server.1.transport_type = 3{/if}
+
+account.9.sip_server.1.expires= {$account.9.register_expires}
+account.9.sip_server.1.retry_counts= 3
+
+account.9.sip_server.2.address= {$account.9.server.2.address}
+account.9.sip_server.2.port= {$account.9.sip_port}
+
+
+{if $account.9.sip_transport == 'udp'}account.9.sip_server.2.transport_type = 0{/if}
+{if $account.9.sip_transport == 'tcp'}account.9.sip_server.2.transport_type = 1{/if}
+{if $account.9.sip_transport == 'tls'}account.9.sip_server.2.transport_type = 2{/if}
+{if $account.9.sip_transport == 'dns srv'}account.9.sip_server.2.transport_type = 3{/if}
+
+account.9.sip_server.2.expires= {$account.9.register_expires}
+account.9.sip_server.2.retry_counts= 3
+
+account.9.outbound_proxy_enable= {if isset($account.9.outbound_proxy_primary)}1{else}0{/if}
+
+account.9.outbound_proxy.1.address= {$account.9.outbound_proxy_primary}
+
+{if isset($outbound_proxy_1_port)}
+account.9.outbound_proxy.1.port = {$outbound_proxy_1_port}
+{else}
+account.9.outbound_proxy.1.port = {$account.9.sip_port}
+{/if}
+
+account.9.outbound_proxy.2.address= {$account.9.outbound_proxy_secondary}
+
+{if isset($outbound_proxy_1_port)}
+account.9.outbound_proxy.2.port = {$outbound_proxy_2_port}
+{else}
+account.9.outbound_proxy.2.port = {$account.9.sip_port}
+{/if}
+
+{if isset($outbound_proxy_fallback_interval)}
+account.9.outbound_proxy_fallback_interval = {$outbound_proxy_fallback_interval}
+{else}
+account.9.outbound_proxy_fallback_interval = 120
+{/if}
+
+account.9.nat.nat_traversal=
+
+
+################################################################
+#                      Account Basic                          ##
+################################################################
+account.9.auto_answer=
+
+################################################################
+#                      Account Advanced                       ##
+################################################################
+account.9.nat.udp_update_enable= 3
+account.9.nat.udp_update_time= 30
+account.9.nat.rport= {$yealink_rport}
+
+account.9.dtmf.type= {$yealink_dtmf_type}
+account.9.dtmf.info_type=
+account.9.dtmf.dtmf_payload=
+account.9.100rel_enable= {$yealink_retransmission}
+
+account.9.subscribe_register=
+account.9.cid_source= {$yealink_cid_source}
+account.9.enable_user_equal_phone=
+account.9.srtp_encryption= {$yealink_srtp_encryption}
+account.9.ptime= 20
+account.9.register_line=
+account.9.register_mac=
+account.9.reg_fail_retry_interval=
+account.9.unregister_on_reboot=
+
+account.9.session_timer.refresher=
+account.9.session_timer.expires=
+account.9.session_timer.enable= {$yealink_session_timer}
+
+account.9.conf_type=
+account.9.sip_server_type=
+
+##V83 Add
+account.9.srtp.unencrypted_rtcp.enable =
+account.9.srtp.unencrypted_rtp.enable =
+account.9.sip_server_mode =
+
+
+
+################################################################
+#                        SIP Backup Server                    ##
+################################################################
+account.9.outbound_proxy.1.register_on_enable=
+account.9.outbound_proxy.1.failback_timeout=
+account.9.outbound_proxy.1.failback_mode=
+account.9.outbound_proxy.1.retry_counts=
+account.9.outbound_proxy.1.only_signal_with_registered=
+account.9.outbound_proxy.1.failback_subscribe.enable=
+account.9.outbound_proxy.1.invite_retry_counts=
+
+account.9.sip_server.1.register_on_enable= 0
+account.9.sip_server.1.failback_timeout= 3600
+account.9.sip_server.1.failback_mode= 0
+account.9.sip_server.1.failback_subscribe.enable= 
+account.9.sip_server.1.only_signal_with_registered=
+account.9.sip_server.1.invite_retry_counts=
+
+account.9.outbound_proxy.2.register_on_enable=
+account.9.outbound_proxy.2.failback_timeout=
+account.9.outbound_proxy.2.failback_mode=
+account.9.outbound_proxy.2.retry_counts=
+account.9.outbound_proxy.2.only_signal_with_registered=
+account.9.outbound_proxy.2.failback_subscribe.enable=
+account.9.outbound_proxy.2.invite_retry_counts=
+
+account.9.sip_server.2.register_on_enable=
+account.9.sip_server.2.failback_timeout=
+account.9.sip_server.2.failback_mode=
+account.9.sip_server.2.failback_subscribe.enable=
+account.9.sip_server.2.only_signal_with_registered=
+account.9.sip_server.2.invite_retry_counts=
+
+account.9.static_cache_pri=
+account.9.dns_cache_type=
+account.9.naptr_build=
+account.9.fallback.timeout = {$yealink_outbound_proxy_fallback_interval}
+account.9.fallback.redundancy_type=
+account.9.reg_failed_retry_max_time=
+account.9.reg_failed_retry_min_time=
+account.9.redundancy_with_reg_fail.enable =
+
+##V83 Add
+account.9.sip_server.1.outbound_proxy_enable =
+account.9.sip_server.2.outbound_proxy_enable =
+
+################################################################
+#                        SIP Basic config                     ##
+################################################################
+account.9.contact_take_line_param=
+account.9.update_ack_while_dialing=
+account.9.srtp_lifetime=
+account.9.third_part_request_with_route.enable=
+account.9.insert_outbound_in_route.enable=
+account.9.path.enable=
+account.9.sub_fail_retry_interval=
+account.9.transfer_refer_to_contact_header.enable=
+account.9.hold_use_inactive=
+account.9.gruu.enable=
+account.9.dial_tone=
+account.9.call_id_mode=
+account.9.subscribe_expires_overlap=
+account.9.register_expires_overlap=
+account.9.call_info=
+account.9.custom_ua=
+account.9.mwi_parse_terminated=
+account.9.check_cseq.enable=
+account.9.check_to_tag.enable=
+account.9.vq_rtcpxr.collector_server_port=
+account.9.vq_rtcpxr.collector_server_host=
+account.9.vq_rtcpxr.collector_name=
+account.9.compact_header_enable=
+account.9.cp_source=
+account.9.cid_source_ppi=
+account.9.cid_source_privacy=
+account.9.reg_with_pani_header.enable =
+account.9.alert_info=
+account.9.picture_info_enable=
+
+##V83 Add
+account.9.invite_with_pani_header.enable = 
+
+##V84 Add
+account.9.invite_with_rpid_header.enable=
+
+account.9.auto_answer_mute_enable
+
+#######################################################################################
+##                                 History                                           ##       
+#######################################################################################
+account.9.missed_calllog=
+
+
+#######################################################################################  
+##                                  Forward                                          ##  
+####################################################################################### 
+account.9.timeout_fwd.off_code=
+account.9.timeout_fwd.on_code=
+account.9.timeout_fwd.timeout=
+account.9.timeout_fwd.target=
+account.9.timeout_fwd.enable=
+account.9.busy_fwd.off_code=
+account.9.busy_fwd.on_code=
+account.9.busy_fwd.target=
+account.9.busy_fwd.enable=
+account.9.always_fwd.off_code=
+account.9.always_fwd.on_code=
+account.9.always_fwd.target=
+account.9.always_fwd.enable=
+
+
+#######################################################################################  
+##                                  DND                                              ##  
+#######################################################################################
+account.9.dnd.enable=
+account.9.dnd.off_code=
+account.9.dnd.on_code=
+
+
+
+#######################################################################################  
+##                               Voice Mail                                          ##  
+#######################################################################################
+voice_mail.number.1= {$voicemail_number}
+account.9.subscribe_mwi=
+account.9.subscribe_mwi_to_vm=
+account.9.subscribe_mwi_expires=
+account.9.display_mwi.enable=
+
+#######################################################################################  
+##                               Auto Dial                                           ##  
+#######################################################################################
+account.9.auto_dial_enable=
+account.9.auto_dial_num=
+
+
+#######################################################################################
+##                           Preference&Status                                       ##       
+#######################################################################################
+account.9.ringtone.ring_type=
+
+#######################################################################################
+##                           Digitmap                                                ##       
+#######################################################################################
+account.9.dialplan.digitmap.enable=
+account.9.dialplan.digitmap.string=
+account.9.dialplan.digitmap.no_match_action=
+account.9.dialplan.digitmap.interdigit_short_timer=
+account.9.dialplan.digitmap.interdigit_long_timer=
+account.9.dialplan.digitmap.apply_to.press_send=
+account.9.dialplan.digitmap.apply_to.forward=
+account.9.dialplan.digitmap.apply_to.history_dial=
+account.9.dialplan.digitmap.apply_to.directory_dial=
+account.9.dialplan.digitmap.apply_to.on_hook_dial=
+account.9.dialplan.digitmap.active.on_hook_dialing=
+
+
+#######################################################################################
+##                                 Rings Settings                                    ##
+#######################################################################################
+account.9.alert_info_url_enable=
+
+
+#######################################################################################
+##                                  BLF/BLF List                                     ##       
+#######################################################################################
+account.9.blf.blf_list_uri=
+account.9.blf_list_barge_in_code=
+account.9.blf_list_code=
+account.9.blf_list_retrieve_call_parked_code=
+account.9.blf.subscribe_period=
+account.9.blf.match_host.enable=
+account.9.out_dialog_blf_enable=
+account.9.blf.subscribe_event=
+
+##V84 Add
+account.9.blf_list_call_parked_code=
+account.9.blf_list_call_parked_list=
+
+#######################################################################################
+##                                   SCA                                             ##       
+#######################################################################################
+account.9.shared_line= {$shared_line_1}
+account.9.line_seize.expires=
+account.9.shared_line_one_touch_bargein.enable=
+account.9.shared_line_one_touch_retrieve.enable=
+account.9.sca_manage_interface_display_time=
+account.9.shared_line_callpull_code=
+
+##V83 Add
+account.x.share_line.barge_in.enable
+
+#######################################################################################
+##                                   BLA                                             ##       
+#######################################################################################
+account.9.bla_number=
+account.9.bla_subscribe_period=
+account.9.bla.notify_with_expire.enable=
+account.9.bla.subscribe_uri_build_type=
+
+#######################################################################################
+##                                   Call Park                                       ##       
+#######################################################################################
+account.9.callpark_enable=
+
+
+#######################################################################################
+##                                    Broadsoft ACD                                  ##       
+#######################################################################################
+account.9.acd.enable=
+account.9.acd.available=
+account.9.acd.unavailable_reason_enable=
+account.9.acd.initial_state=
+account.9.subscribe_acd_expires=
+
+
+#######################################################################################
+##                                 Broadsoft ACD Call Center                         ##       
+#######################################################################################
+##account.X.reason_code.Y=
+##account.X.reason_code_name.Y=
+##account.X.bw_disp_code.Y=
+##account.X.bw_disp_code_name.Y=
+##account.X.supervisor_info_code.Y=
+##account.X.supervisor_info_code_name.Y=
+##The value Y must be continuous.
+
+account.9.reason_code.1=
+account.9.reason_code_name.1=
+account.9.bw_disp_code.1=
+account.9.bw_disp_code_name.1=
+account.9.supervisor_info_code.1=
+account.9.supervisor_info_code_name.1=
+
+#######################################################################################
+##                                 Broadsoft Call Center                             ##       
+#######################################################################################
+account.9.call_center.call_info_enable=
+account.9.call_center.show_call_info_time=
+account.9.call_center.disp_code_enable=
+account.9.call_center.trace_enable=
+account.9.call_center.emergency_enable=
+account.9.call_center.queue_status_enable=
+account.9.call_center.queue_status_light_enable =
+
+
+
+#######################################################################################
+##                         Broadsoft Hoteling                                        ##       
+#######################################################################################
+account.9.hoteling.enable=
+account.9.hoteling.user_id=
+account.9.hoteling.password=
+account.9.hoteling.expires=
+account.9.hoteling.auto_login_enable=
+
+
+#######################################################################################
+##                              Broadsoft XSI                                        ##       
+#######################################################################################
+account.9.xsi.user =
+account.9.xsi.password =
+account.9.xsi.host =
+account.9.xsi.server_type =
+account.9.xsi.port =
+
+
+#######################################################################################
+##                                Call Pickup                                        ##       
+#######################################################################################
+account.9.direct_pickup_code =
+account.9.group_pickup_code =
+account.9.dialoginfo_callpickup =
+account.9.refresh_remote_id.enable =
+
+
+#######################################################################################
+##                              Broadsoft Call Recording                             ##       
+#######################################################################################
+account.9.call_recording.enable=
+
+#######################################################################################
+##                                Network Conferene                                  ##       
+#######################################################################################
+account.9.conf_uri=
+
+
+#######################################################################################
+##                              Broadsoft Call Decline                               ##       
+#######################################################################################
+account.9.features.call_decline.enable =
+
+
+#######################################################################################
+##                       Broadsoft Security Classification                           ##       
+#######################################################################################
+account.9.security_classification.enable =
+
+
+
+#######################################################################################
+##                        Broadsoft Flexible Seating                                 ##       
+#######################################################################################
+account.9.flexible_seating.enable=
+account.9.hoteling.pin=
+account.9.hoteling.mode=
+
+#######################################################################################
+##                         Features Sync                                             ##       
+#######################################################################################
+account.9.features.forward.feature_key_sync.local_processing.enable=
+account.9.features.dnd.feature_key_sync.local_processing.enable =
+
+##V84 Add
+account.9.dnd.feature_key_sync.enable=
+account.9.feature_key_sync.enable=
+account.9.forward.feature_key_sync.enable=
+
+#######################################################################################
+##                                   ACD                                             ##       
+#######################################################################################
+account.9.acd.available_url=
+account.9.acd.away_url =
+account.9.acd.refresh_url =
+account.9.acd.call_information=
+
+
+#######################################################################################
+##                                   PSTN                                            ##       
+#######################################################################################
+pstn.account.9.enable=
+pstn.account.9.label=
+
+
+
+#######################################################################################
+##                                   Trnasfer                                        ##       
+#######################################################################################
+account.10.phone_setting.call_appearance.transfer_via_new_linekey=
+
+
+#######################################################################################
+##                                   Conference                                      ##       
+#######################################################################################
+account.10.phone_setting.call_appearance.conference_via_new_linekey=
+
+
+#######################################################################################
+##                                   Anonymous                                       ##       
+#######################################################################################
+account.10.anonymous_call.server_base_only =
+account.10.send_anonymous_rejection_code =
+account.10.anonymous_reject_offcode =
+account.10.anonymous_reject_oncode =
+account.10.reject_anonymous_call=
+account.10.anonymous_call_offcode =
+account.10.anonymous_call_oncode =
+account.10.anonymous_call =
+account.10.send_anonymous_code =
+
+
+
+#######################################################################################
+##                          Call Configuration                                       ##       
+#######################################################################################
+account.10.music_server_uri=
+account.10.music_on_hold_type=
+account.10.auto_label.rule=
+account.10.auto_label.enable=
+account.10.number_of_linekey=
+account.10.phone_setting.call_appearance.calls_per_linekey=
+
+
+#######################################################################################
+##                                    Codec                                          ##       
+#######################################################################################
+account.10.codec.ilbc_15_2kbps.priority=
+account.10.codec.ilbc_15_2kbps.enable=
+account.10.codec.ilbc_13_33kbps.priority=
+account.10.codec.ilbc_13_33kbps.enable =
+account.10.codec.pcma.enable =  1
+account.10.codec.pcma.priority = {$yealink_codec_5_priority}
+
+account.10.codec.pcmu.enable = 1
+account.10.codec.pcmu.priority = {$yealink_codec_4_priority}
+
+account.10.codec.opus.enable = 1
+account.10.codec.opus.priority = {$yealink_codec_1_priority}
+account.10.codec.opus.para=
+account.10.codec.g726_40.enable=
+account.10.codec.g726_40.priority=
+account.10.codec.g726_32.enable=
+account.10.codec.g726_32.priority=
+account.10.codec.g726_24.enable=
+account.10.codec.g726_24.priority=
+account.10.codec.g726_16.enable=
+account.10.codec.g726_16.priority=
+account.10.codec.g723_63.priority=
+account.10.codec.g723_63.enable=
+account.10.codec.g723_53.priority=
+account.10.codec.g723_53.enable=
+account.10.codec.g729.enable = 1
+account.10.codec.g729.priority = {$yealink_codec_3_priority}
+
+account.10.codec.g722.enable = 1
+account.10.codec.g722.priority = {$yealink_codec_2_priority}
+
+account.10.codec.G722_1_24kpbs.priority=
+account.10.codec.G722_1_24kpbs.enable=
+account.10.codec.G722_1c_24kpbs.priority=
+account.10.codec.G722_1c_24kpbs.enable=
+account.10.codec.G722_1c_32kpbs.priority=
+account.10.codec.G722_1c_32kpbs.enable=
+account.10.codec.G722_1c_48kpbs.priority=
+account.10.codec.G722_1c_48kpbs.enable=
+
+
+################################################################
+#                      Account Register                       ##
+################################################################
+{if isset($account.10.password) }
+account.10.enable = 1
+{else}
+account.10.enable = 0
+{/if}
+account.10.label = {$account.10.display_name}
+account.10.display_name = {$account.10.display_name}
+account.10.auth_name = {$account.10.auth_id}
+account.10.password = {$account.10.password}
+{if isset($account.10.server.1.address)}
+account.10.user_name = {$account.10.user_id}@{$account.10.server_address}
+{else}
+account.10.user_name = {$account.10.user_id}
+{/if}
+
+account.10.sip_server.1.address= {$account.10.server_address}
+account.10.sip_server.1.port= {$account.10.sip_port}
+
+
+{if $account.10.sip_transport == 'udp'}account.10.sip_server.1.transport_type = 0{/if}
+{if $account.10.sip_transport == 'tcp'}account.10.sip_server.1.transport_type = 1{/if}
+{if $account.10.sip_transport == 'tls'}account.10.sip_server.1.transport_type = 2{/if}
+{if $account.10.sip_transport == 'dns srv'}account.10.sip_server.1.transport_type = 3{/if}
+
+account.10.sip_server.1.expires= {$account.10.register_expires}
+account.10.sip_server.1.retry_counts= 3
+
+account.10.sip_server.2.address= {$account.10.server.2.address}
+account.10.sip_server.2.port= {$account.10.sip_port}
+
+
+{if $account.10.sip_transport == 'udp'}account.10.sip_server.2.transport_type = 0{/if}
+{if $account.10.sip_transport == 'tcp'}account.10.sip_server.2.transport_type = 1{/if}
+{if $account.10.sip_transport == 'tls'}account.10.sip_server.2.transport_type = 2{/if}
+{if $account.10.sip_transport == 'dns srv'}account.10.sip_server.2.transport_type = 3{/if}
+
+account.10.sip_server.2.expires= {$account.10.register_expires}
+account.10.sip_server.2.retry_counts= 3
+
+account.10.outbound_proxy_enable= {if isset($account.10.outbound_proxy_primary)}1{else}0{/if}
+
+account.10.outbound_proxy.1.address= {$account.10.outbound_proxy_primary}
+
+{if isset($outbound_proxy_1_port)}
+account.10.outbound_proxy.1.port = {$outbound_proxy_1_port}
+{else}
+account.10.outbound_proxy.1.port = {$account.10.sip_port}
+{/if}
+
+account.10.outbound_proxy.2.address= {$account.10.outbound_proxy_secondary}
+
+{if isset($outbound_proxy_1_port)}
+account.10.outbound_proxy.2.port = {$outbound_proxy_2_port}
+{else}
+account.10.outbound_proxy.2.port = {$account.10.sip_port}
+{/if}
+
+{if isset($outbound_proxy_fallback_interval)}
+account.10.outbound_proxy_fallback_interval = {$outbound_proxy_fallback_interval}
+{else}
+account.10.outbound_proxy_fallback_interval = 120
+{/if}
+
+account.10.nat.nat_traversal=
+
+
+################################################################
+#                      Account Basic                          ##
+################################################################
+account.10.auto_answer=
+
+################################################################
+#                      Account Advanced                       ##
+################################################################
+account.10.nat.udp_update_enable= 3
+account.10.nat.udp_update_time= 30
+account.10.nat.rport= {$yealink_rport}
+
+account.10.dtmf.type= {$yealink_dtmf_type}
+account.10.dtmf.info_type=
+account.10.dtmf.dtmf_payload=
+account.10.100rel_enable= {$yealink_retransmission}
+
+account.10.subscribe_register=
+account.10.cid_source= {$yealink_cid_source}
+account.10.enable_user_equal_phone=
+account.10.srtp_encryption= {$yealink_srtp_encryption}
+account.10.ptime= 20
+account.10.register_line=
+account.10.register_mac=
+account.10.reg_fail_retry_interval=
+account.10.unregister_on_reboot=
+
+account.10.session_timer.refresher=
+account.10.session_timer.expires=
+account.10.session_timer.enable= {$yealink_session_timer}
+
+account.10.conf_type=
+account.10.sip_server_type=
+
+##V83 Add
+account.10.srtp.unencrypted_rtcp.enable =
+account.10.srtp.unencrypted_rtp.enable =
+account.10.sip_server_mode =
+
+
+
+################################################################
+#                        SIP Backup Server                    ##
+################################################################
+account.10.outbound_proxy.1.register_on_enable=
+account.10.outbound_proxy.1.failback_timeout=
+account.10.outbound_proxy.1.failback_mode=
+account.10.outbound_proxy.1.retry_counts=
+account.10.outbound_proxy.1.only_signal_with_registered=
+account.10.outbound_proxy.1.failback_subscribe.enable=
+account.10.outbound_proxy.1.invite_retry_counts=
+
+account.10.sip_server.1.register_on_enable= 0
+account.10.sip_server.1.failback_timeout= 3600
+account.10.sip_server.1.failback_mode= 0
+account.10.sip_server.1.failback_subscribe.enable= 
+account.10.sip_server.1.only_signal_with_registered=
+account.10.sip_server.1.invite_retry_counts=
+
+account.10.outbound_proxy.2.register_on_enable=
+account.10.outbound_proxy.2.failback_timeout=
+account.10.outbound_proxy.2.failback_mode=
+account.10.outbound_proxy.2.retry_counts=
+account.10.outbound_proxy.2.only_signal_with_registered=
+account.10.outbound_proxy.2.failback_subscribe.enable=
+account.10.outbound_proxy.2.invite_retry_counts=
+
+account.10.sip_server.2.register_on_enable=
+account.10.sip_server.2.failback_timeout=
+account.10.sip_server.2.failback_mode=
+account.10.sip_server.2.failback_subscribe.enable=
+account.10.sip_server.2.only_signal_with_registered=
+account.10.sip_server.2.invite_retry_counts=
+
+account.10.static_cache_pri=
+account.10.dns_cache_type=
+account.10.naptr_build=
+account.10.fallback.timeout = {$yealink_outbound_proxy_fallback_interval}
+account.10.fallback.redundancy_type=
+account.10.reg_failed_retry_max_time=
+account.10.reg_failed_retry_min_time=
+account.10.redundancy_with_reg_fail.enable =
+
+##V83 Add
+account.10.sip_server.1.outbound_proxy_enable =
+account.10.sip_server.2.outbound_proxy_enable =
+
+################################################################
+#                        SIP Basic config                     ##
+################################################################
+account.10.contact_take_line_param=
+account.10.update_ack_while_dialing=
+account.10.srtp_lifetime=
+account.10.third_part_request_with_route.enable=
+account.10.insert_outbound_in_route.enable=
+account.10.path.enable=
+account.10.sub_fail_retry_interval=
+account.10.transfer_refer_to_contact_header.enable=
+account.10.hold_use_inactive=
+account.10.gruu.enable=
+account.10.dial_tone=
+account.10.call_id_mode=
+account.10.subscribe_expires_overlap=
+account.10.register_expires_overlap=
+account.10.call_info=
+account.10.custom_ua=
+account.10.mwi_parse_terminated=
+account.10.check_cseq.enable=
+account.10.check_to_tag.enable=
+account.10.vq_rtcpxr.collector_server_port=
+account.10.vq_rtcpxr.collector_server_host=
+account.10.vq_rtcpxr.collector_name=
+account.10.compact_header_enable=
+account.10.cp_source=
+account.10.cid_source_ppi=
+account.10.cid_source_privacy=
+account.10.reg_with_pani_header.enable =
+account.10.alert_info=
+account.10.picture_info_enable=
+
+##V83 Add
+account.10.invite_with_pani_header.enable = 
+
+##V84 Add
+account.10.invite_with_rpid_header.enable=
+
+account.10.auto_answer_mute_enable
+
+#######################################################################################
+##                                 History                                           ##       
+#######################################################################################
+account.10.missed_calllog=
+
+
+#######################################################################################  
+##                                  Forward                                          ##  
+####################################################################################### 
+account.10.timeout_fwd.off_code=
+account.10.timeout_fwd.on_code=
+account.10.timeout_fwd.timeout=
+account.10.timeout_fwd.target=
+account.10.timeout_fwd.enable=
+account.10.busy_fwd.off_code=
+account.10.busy_fwd.on_code=
+account.10.busy_fwd.target=
+account.10.busy_fwd.enable=
+account.10.always_fwd.off_code=
+account.10.always_fwd.on_code=
+account.10.always_fwd.target=
+account.10.always_fwd.enable=
+
+
+#######################################################################################  
+##                                  DND                                              ##  
+#######################################################################################
+account.10.dnd.enable=
+account.10.dnd.off_code=
+account.10.dnd.on_code=
+
+
+
+#######################################################################################  
+##                               Voice Mail                                          ##  
+#######################################################################################
+voice_mail.number.1= {$voicemail_number}
+account.10.subscribe_mwi=
+account.10.subscribe_mwi_to_vm=
+account.10.subscribe_mwi_expires=
+account.10.display_mwi.enable=
+
+#######################################################################################  
+##                               Auto Dial                                           ##  
+#######################################################################################
+account.10.auto_dial_enable=
+account.10.auto_dial_num=
+
+
+#######################################################################################
+##                           Preference&Status                                       ##       
+#######################################################################################
+account.10.ringtone.ring_type=
+
+#######################################################################################
+##                           Digitmap                                                ##       
+#######################################################################################
+account.10.dialplan.digitmap.enable=
+account.10.dialplan.digitmap.string=
+account.10.dialplan.digitmap.no_match_action=
+account.10.dialplan.digitmap.interdigit_short_timer=
+account.10.dialplan.digitmap.interdigit_long_timer=
+account.10.dialplan.digitmap.apply_to.press_send=
+account.10.dialplan.digitmap.apply_to.forward=
+account.10.dialplan.digitmap.apply_to.history_dial=
+account.10.dialplan.digitmap.apply_to.directory_dial=
+account.10.dialplan.digitmap.apply_to.on_hook_dial=
+account.10.dialplan.digitmap.active.on_hook_dialing=
+
+
+#######################################################################################
+##                                 Rings Settings                                    ##
+#######################################################################################
+account.10.alert_info_url_enable=
+
+
+#######################################################################################
+##                                  BLF/BLF List                                     ##       
+#######################################################################################
+account.10.blf.blf_list_uri=
+account.10.blf_list_barge_in_code=
+account.10.blf_list_code=
+account.10.blf_list_retrieve_call_parked_code=
+account.10.blf.subscribe_period=
+account.10.blf.match_host.enable=
+account.10.out_dialog_blf_enable=
+account.10.blf.subscribe_event=
+
+##V84 Add
+account.10.blf_list_call_parked_code=
+account.10.blf_list_call_parked_list=
+
+#######################################################################################
+##                                   SCA                                             ##       
+#######################################################################################
+account.10.shared_line= {$shared_line_1}
+account.10.line_seize.expires=
+account.10.shared_line_one_touch_bargein.enable=
+account.10.shared_line_one_touch_retrieve.enable=
+account.10.sca_manage_interface_display_time=
+account.10.shared_line_callpull_code=
+
+##V83 Add
+account.x.share_line.barge_in.enable
+
+#######################################################################################
+##                                   BLA                                             ##       
+#######################################################################################
+account.10.bla_number=
+account.10.bla_subscribe_period=
+account.10.bla.notify_with_expire.enable=
+account.10.bla.subscribe_uri_build_type=
+
+#######################################################################################
+##                                   Call Park                                       ##       
+#######################################################################################
+account.10.callpark_enable=
+
+
+#######################################################################################
+##                                    Broadsoft ACD                                  ##       
+#######################################################################################
+account.10.acd.enable=
+account.10.acd.available=
+account.10.acd.unavailable_reason_enable=
+account.10.acd.initial_state=
+account.10.subscribe_acd_expires=
+
+
+#######################################################################################
+##                                 Broadsoft ACD Call Center                         ##       
+#######################################################################################
+##account.X.reason_code.Y=
+##account.X.reason_code_name.Y=
+##account.X.bw_disp_code.Y=
+##account.X.bw_disp_code_name.Y=
+##account.X.supervisor_info_code.Y=
+##account.X.supervisor_info_code_name.Y=
+##The value Y must be continuous.
+
+account.10.reason_code.1=
+account.10.reason_code_name.1=
+account.10.bw_disp_code.1=
+account.10.bw_disp_code_name.1=
+account.10.supervisor_info_code.1=
+account.10.supervisor_info_code_name.1=
+
+#######################################################################################
+##                                 Broadsoft Call Center                             ##       
+#######################################################################################
+account.10.call_center.call_info_enable=
+account.10.call_center.show_call_info_time=
+account.10.call_center.disp_code_enable=
+account.10.call_center.trace_enable=
+account.10.call_center.emergency_enable=
+account.10.call_center.queue_status_enable=
+account.10.call_center.queue_status_light_enable =
+
+
+
+#######################################################################################
+##                         Broadsoft Hoteling                                        ##       
+#######################################################################################
+account.10.hoteling.enable=
+account.10.hoteling.user_id=
+account.10.hoteling.password=
+account.10.hoteling.expires=
+account.10.hoteling.auto_login_enable=
+
+
+#######################################################################################
+##                              Broadsoft XSI                                        ##       
+#######################################################################################
+account.10.xsi.user =
+account.10.xsi.password =
+account.10.xsi.host =
+account.10.xsi.server_type =
+account.10.xsi.port =
+
+
+#######################################################################################
+##                                Call Pickup                                        ##       
+#######################################################################################
+account.10.direct_pickup_code =
+account.10.group_pickup_code =
+account.10.dialoginfo_callpickup =
+account.10.refresh_remote_id.enable =
+
+
+#######################################################################################
+##                              Broadsoft Call Recording                             ##       
+#######################################################################################
+account.10.call_recording.enable=
+
+#######################################################################################
+##                                Network Conferene                                  ##       
+#######################################################################################
+account.10.conf_uri=
+
+
+#######################################################################################
+##                              Broadsoft Call Decline                               ##       
+#######################################################################################
+account.10.features.call_decline.enable =
+
+
+#######################################################################################
+##                       Broadsoft Security Classification                           ##       
+#######################################################################################
+account.10.security_classification.enable =
+
+
+
+#######################################################################################
+##                        Broadsoft Flexible Seating                                 ##       
+#######################################################################################
+account.10.flexible_seating.enable=
+account.10.hoteling.pin=
+account.10.hoteling.mode=
+
+#######################################################################################
+##                         Features Sync                                             ##       
+#######################################################################################
+account.10.features.forward.feature_key_sync.local_processing.enable=
+account.10.features.dnd.feature_key_sync.local_processing.enable =
+
+##V84 Add
+account.10.dnd.feature_key_sync.enable=
+account.10.feature_key_sync.enable=
+account.10.forward.feature_key_sync.enable=
+
+#######################################################################################
+##                                   ACD                                             ##       
+#######################################################################################
+account.10.acd.available_url=
+account.10.acd.away_url =
+account.10.acd.refresh_url =
+account.10.acd.call_information=
+
+
+#######################################################################################
+##                                   PSTN                                            ##       
+#######################################################################################
+pstn.account.10.enable=
+pstn.account.10.label=
+
+
diff --git a/resources/templates/provision/yealink/t53w/y000000000095.cfg b/resources/templates/provision/yealink/t53w/y000000000095.cfg
index a576003307..45c61a1b97 100644
--- a/resources/templates/provision/yealink/t53w/y000000000095.cfg
+++ b/resources/templates/provision/yealink/t53w/y000000000095.cfg
@@ -881,7 +881,7 @@ search_in_dialing.history.enable=
 search_in_dialing.history.priority=
 directory_setting.history.enable=
 directory_setting.history.priority
-features.save_init_num_to_history.enable=
+features.save_init_num_to_history.enable= 0
 features.redial_via_local_sip_server.enable=
 
 ##V83 Add
@@ -902,7 +902,11 @@ static.auto_provision.local_contact.backup.enable=
 ##                          Contact Other                                            ##       
 #######################################################################################
 directory.search_type=
+{if isset($yealink_local_directory_enable)}
+directory_setting.local_directory.enable = {$yealink_local_directory_enable}
+{else}
 directory_setting.local_directory.enable =
+{/if}
 directory_setting.local_directory.priority =
 
 ##V83 Add
diff --git a/resources/templates/provision/yealink/t53w/{$mac}.cfg b/resources/templates/provision/yealink/t53w/{$mac}.cfg
index 734c94d05b..28fa1c8b84 100644
--- a/resources/templates/provision/yealink/t53w/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t53w/{$mac}.cfg
@@ -123,7 +123,8 @@ account.1.user_name = {$account.1.user_id}@{$account.1.server_address}
 account.1.user_name = {$account.1.user_id}
 {/if}
 
-account.1.sip_server.1.address= {$account.1.server_address}
+{if isset($account.1.server.1.address)} account.1.sip_server.1.address= {$account.1.server.1.address} {else} account.1.sip_server.1.address= {$account.1.server_address} {/if}
+
 account.1.sip_server.1.port= {$account.1.sip_port}
 
 
@@ -199,13 +200,13 @@ account.1.ptime= 20
 account.1.register_line=
 account.1.register_mac=
 account.1.reg_fail_retry_interval=
-account.1.unregister_on_reboot=
+account.1.unregister_on_reboot=1
 
 account.1.session_timer.refresher=
 account.1.session_timer.expires=
 account.1.session_timer.enable= {$yealink_session_timer}
 
-account.1.conf_type=
+account.1.conf_type = {if $nway_conference == true}2{/if}
 account.1.sip_server_type=
 
 ##V83 Add
@@ -499,7 +500,7 @@ account.1.call_recording.enable=
 #######################################################################################
 ##                                Network Conferene                                  ##       
 #######################################################################################
-account.1.conf_uri=
+account.1.conf_uri = {if $nway_conference == true}nway{$account.1.auth_id}@{$account.1.server_address}{/if}
 
 
 #######################################################################################
@@ -662,7 +663,8 @@ account.2.user_name = {$account.2.user_id}@{$account.2.server_address}
 account.2.user_name = {$account.2.user_id}
 {/if}
 
-account.2.sip_server.1.address= {$account.2.server_address}
+{if isset($account.2.server.1.address)} account.2.sip_server.1.address= {$account.2.server.1.address} {else} account.2.sip_server.1.address= {$account.2.server_address} {/if}
+
 account.2.sip_server.1.port= {$account.2.sip_port}
 
 
@@ -744,7 +746,7 @@ account.2.session_timer.refresher=
 account.2.session_timer.expires=
 account.2.session_timer.enable= {$yealink_session_timer}
 
-account.2.conf_type=
+account.2.conf_type = {if $nway_conference == true}2{/if}
 account.2.sip_server_type=
 
 ##V83 Add
@@ -1038,7 +1040,7 @@ account.2.call_recording.enable=
 #######################################################################################
 ##                                Network Conferene                                  ##       
 #######################################################################################
-account.2.conf_uri=
+account.2.conf_uri = {if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}
 
 
 #######################################################################################
@@ -1189,7 +1191,8 @@ account.3.user_name = {$account.3.user_id}@{$account.3.server_address}
 account.3.user_name = {$account.3.user_id}
 {/if}
 
-account.3.sip_server.1.address= {$account.3.server_address}
+{if isset($account.3.server.1.address)} account.3.sip_server.1.address= {$account.3.server.1.address} {else} account.3.sip_server.1.address= {$account.3.server_address} {/if}
+
 account.3.sip_server.1.port= {$account.3.sip_port}
 
 
@@ -1271,7 +1274,7 @@ account.3.session_timer.refresher=
 account.3.session_timer.expires=
 account.3.session_timer.enable= {$yealink_session_timer}
 
-account.3.conf_type=
+account.3.conf_type = {if $nway_conference == true}2{/if}
 account.3.sip_server_type=
 
 ##V83 Add
@@ -1565,7 +1568,7 @@ account.3.call_recording.enable=
 #######################################################################################
 ##                                Network Conferene                                  ##       
 #######################################################################################
-account.3.conf_uri=
+account.3.conf_uri = {if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}
 
 
 #######################################################################################
@@ -1716,7 +1719,8 @@ account.4.user_name = {$account.4.user_id}@{$account.4.server_address}
 account.4.user_name = {$account.4.user_id}
 {/if}
 
-account.4.sip_server.1.address= {$account.4.server_address}
+{if isset($account.4.server.1.address)} account.4.sip_server.1.address= {$account.4.server.1.address} {else} account.4.sip_server.1.address= {$account.4.server_address} {/if}
+
 account.4.sip_server.1.port= {$account.4.sip_port}
 
 
@@ -1798,7 +1802,7 @@ account.4.session_timer.refresher=
 account.4.session_timer.expires=
 account.4.session_timer.enable= {$yealink_session_timer}
 
-account.4.conf_type=
+account.4.conf_type = {if $nway_conference == true}2{/if} 
 account.4.sip_server_type=
 
 ##V83 Add
@@ -2092,7 +2096,7 @@ account.4.call_recording.enable=
 #######################################################################################
 ##                                Network Conferene                                  ##       
 #######################################################################################
-account.4.conf_uri=
+account.4.conf_uri = {if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}
 
 
 #######################################################################################
@@ -2242,7 +2246,8 @@ account.5.user_name = {$account.5.user_id}@{$account.5.server_address}
 account.5.user_name = {$account.5.user_id}
 {/if}
 
-account.5.sip_server.1.address= {$account.5.server_address}
+{if isset($account.5.server.1.address)} account.5.sip_server.1.address= {$account.5.server.1.address} {else} account.5.sip_server.1.address= {$account.5.server_address} {/if}
+
 account.5.sip_server.1.port= {$account.5.sip_port}
 
 
@@ -2324,7 +2329,7 @@ account.5.session_timer.refresher=
 account.5.session_timer.expires=
 account.5.session_timer.enable= {$yealink_session_timer}
 
-account.5.conf_type=
+account.5.conf_type = {if $nway_conference == true}2{/if}
 account.5.sip_server_type=
 
 ##V83 Add
@@ -2618,7 +2623,7 @@ account.5.call_recording.enable=
 #######################################################################################
 ##                                Network Conferene                                  ##       
 #######################################################################################
-account.5.conf_uri=
+account.5.conf_uri = {if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}
 
 
 #######################################################################################
@@ -2782,7 +2787,8 @@ account.6.user_name = {$account.6.user_id}@{$account.6.server_address}
 account.6.user_name = {$account.6.user_id}
 {/if}
 
-account.6.sip_server.1.address= {$account.6.server_address}
+{if isset($account.6.server.1.address)} account.6.sip_server.1.address= {$account.6.server.1.address} {else} account.6.sip_server.1.address= {$account.6.server_address} {/if}
+
 account.6.sip_server.1.port= {$account.6.sip_port}
 
 
@@ -2864,7 +2870,7 @@ account.6.session_timer.refresher=
 account.6.session_timer.expires=
 account.6.session_timer.enable= {$yealink_session_timer}
 
-account.6.conf_type=
+account.6.conf_type = {if $nway_conference == true}2{/if}
 account.6.sip_server_type=
 
 ##V83 Add
@@ -3158,7 +3164,7 @@ account.6.call_recording.enable=
 #######################################################################################
 ##                                Network Conferene                                  ##       
 #######################################################################################
-account.6.conf_uri=
+account.6.conf_uri = {if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}
 
 
 #######################################################################################
@@ -3309,7 +3315,8 @@ account.7.user_name = {$account.7.user_id}@{$account.7.server_address}
 account.7.user_name = {$account.7.user_id}
 {/if}
 
-account.7.sip_server.1.address= {$account.7.server_address}
+{if isset($account.7.server.1.address)} account.7.sip_server.1.address= {$account.7.server.1.address} {else} account.7.sip_server.1.address= {$account.7.server_address} {/if}
+
 account.7.sip_server.1.port= {$account.7.sip_port}
 
 
@@ -3836,7 +3843,8 @@ account.8.user_name = {$account.8.user_id}@{$account.8.server_address}
 account.8.user_name = {$account.8.user_id}
 {/if}
 
-account.8.sip_server.1.address= {$account.8.server_address}
+{if isset($account.8.server.1.address)} account.8.sip_server.1.address= {$account.8.server.1.address} {else} account.8.sip_server.1.address= {$account.8.server_address} {/if}
+
 account.8.sip_server.1.port= {$account.8.sip_port}
 
 
@@ -4363,7 +4371,8 @@ account.9.user_name = {$account.9.user_id}@{$account.9.server_address}
 account.9.user_name = {$account.9.user_id}
 {/if}
 
-account.9.sip_server.1.address= {$account.9.server_address}
+{if isset($account.9.server.1.address)} account.9.sip_server.1.address= {$account.9.server.1.address} {else} account.9.sip_server.1.address= {$account.9.server_address} {/if}
+
 account.9.sip_server.1.port= {$account.9.sip_port}
 
 
@@ -4890,7 +4899,8 @@ account.10.user_name = {$account.10.user_id}@{$account.10.server_address}
 account.10.user_name = {$account.10.user_id}
 {/if}
 
-account.10.sip_server.1.address= {$account.10.server_address}
+{if isset($account.10.server.1.address)} account.10.sip_server.1.address= {$account.10.server.1.address} {else} account.10.sip_server.1.address= {$account.10.server_address} {/if}
+
 account.10.sip_server.1.port= {$account.10.sip_port}
 
 
diff --git a/resources/templates/provision/yealink/t54s/y000000000070.cfg b/resources/templates/provision/yealink/t54s/y000000000070.cfg
index 56bd5517dc..274da69c00 100644
--- a/resources/templates/provision/yealink/t54s/y000000000070.cfg
+++ b/resources/templates/provision/yealink/t54s/y000000000070.cfg
@@ -788,7 +788,7 @@ features.save_call_history=
 features.call_log_show_num=
 search_in_dialing.history.enable=
 directory_setting.history.enable=
-features.save_init_num_to_history.enable=
+features.save_init_num_to_history.enable= 0
 features.redial_via_local_sip_server.enable=
 
 
@@ -803,7 +803,11 @@ static.auto_provision.local_contact.backup.enable=
 ##                          Contact Other                                            ##
 #######################################################################################
 directory.search_type=
+{if isset($yealink_local_directory_enable)}
+directory_setting.local_directory.enable = {$yealink_local_directory_enable}
+{else}
 directory_setting.local_directory.enable =
+{/if}
 directory_setting.local_directory.priority =
 
 
diff --git a/resources/templates/provision/yealink/t54s/{$mac}.cfg b/resources/templates/provision/yealink/t54s/{$mac}.cfg
index 67e92e3c82..ba2895a193 100644
--- a/resources/templates/provision/yealink/t54s/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t54s/{$mac}.cfg
@@ -362,7 +362,7 @@ account.1.session_timer.refresher=
 account.1.session_timer.expires=
 account.1.session_timer.enable= {$yealink_session_timer}
 
-account.1.conf_type=
+account.1.conf_type = {if $nway_conference == true}2{/if}
 account.1.sip_server_type=
 
 account.2.nat.udp_update_enable= 3
@@ -388,7 +388,8 @@ account.2.session_timer.refresher=
 account.2.session_timer.expires=
 account.2.session_timer.enable= {$yealink_session_timer}
 
-account.2.conf_type=
+account.2.conf_type = {if $nway_conference == true}2{/if}
+account.2.conf_uri = {if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}
 account.2.sip_server_type=
 
 
@@ -669,7 +670,7 @@ account.1.refresh_remote_id.enable =
 #######################################################################################
 ##                                Network Conferene                                  ##       
 #######################################################################################
-account.1.conf_uri=
+account.1.conf_uri = {if $nway_conference == true}nway{$account.1.auth_id}@{$account.1.server_address}{/if}
 
 
 #######################################################################################
diff --git a/resources/templates/provision/yealink/t54w/y000000000096.cfg b/resources/templates/provision/yealink/t54w/y000000000096.cfg
index 4652f61806..63b5109e67 100644
--- a/resources/templates/provision/yealink/t54w/y000000000096.cfg
+++ b/resources/templates/provision/yealink/t54w/y000000000096.cfg
@@ -834,6 +834,8 @@ remote_phonebook.data.4.url =  {$yealink_remote_phonebook_4_url}
 remote_phonebook.data.5.name = {$yealink_remote_phonebook_5_name}
 remote_phonebook.data.5.url = {$yealink_remote_phonebook_5_url}
 
+features.remote_phonebook.enable = {$yealink_remote_phonebook_enable}
+
 
 #######################################################################################
 ##                                 LDAP                                              ##       
@@ -881,7 +883,7 @@ search_in_dialing.history.enable=
 search_in_dialing.history.priority=
 directory_setting.history.enable=
 directory_setting.history.priority
-features.save_init_num_to_history.enable=
+features.save_init_num_to_history.enable= 0
 features.redial_via_local_sip_server.enable=
 
 ##V83 Add
@@ -902,7 +904,11 @@ static.auto_provision.local_contact.backup.enable=
 ##                          Contact Other                                            ##       
 #######################################################################################
 directory.search_type=
+{if isset($yealink_local_directory_enable)}
+directory_setting.local_directory.enable = {$yealink_local_directory_enable}
+{else}
 directory_setting.local_directory.enable =
+{/if}
 directory_setting.local_directory.priority =
 
 ##V83 Add
@@ -1135,7 +1141,7 @@ features.no_answer_code=
 #######################################################################################  
 ##                                  DND                                              ##  
 #######################################################################################
-features.dnd.allow=
+features.dnd.allow= {$yealink_dnd_allow}
 features.dnd_mode=
 features.dnd.enable=
 
diff --git a/resources/templates/provision/yealink/t54w/{$mac}.cfg b/resources/templates/provision/yealink/t54w/{$mac}.cfg
index 734c94d05b..bd1dfd51b2 100644
--- a/resources/templates/provision/yealink/t54w/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t54w/{$mac}.cfg
@@ -123,7 +123,8 @@ account.1.user_name = {$account.1.user_id}@{$account.1.server_address}
 account.1.user_name = {$account.1.user_id}
 {/if}
 
-account.1.sip_server.1.address= {$account.1.server_address}
+{if isset($account.1.server.1.address)} account.1.sip_server.1.address= {$account.1.server.1.address} {else} account.1.sip_server.1.address= {$account.1.server_address} {/if}
+
 account.1.sip_server.1.port= {$account.1.sip_port}
 
 
@@ -199,13 +200,13 @@ account.1.ptime= 20
 account.1.register_line=
 account.1.register_mac=
 account.1.reg_fail_retry_interval=
-account.1.unregister_on_reboot=
+account.1.unregister_on_reboot=1
 
 account.1.session_timer.refresher=
 account.1.session_timer.expires=
 account.1.session_timer.enable= {$yealink_session_timer}
 
-account.1.conf_type=
+account.1.conf_type = {if $nway_conference == true}2{/if}
 account.1.sip_server_type=
 
 ##V83 Add
@@ -499,7 +500,7 @@ account.1.call_recording.enable=
 #######################################################################################
 ##                                Network Conferene                                  ##       
 #######################################################################################
-account.1.conf_uri=
+account.1.conf_uri = {if $nway_conference == true}nway{$account.1.auth_id}@{$account.1.server_address}{/if}
 
 
 #######################################################################################
@@ -662,7 +663,8 @@ account.2.user_name = {$account.2.user_id}@{$account.2.server_address}
 account.2.user_name = {$account.2.user_id}
 {/if}
 
-account.2.sip_server.1.address= {$account.2.server_address}
+{if isset($account.2.server.1.address)} account.2.sip_server.1.address= {$account.2.server.1.address} {else} account.2.sip_server.1.address= {$account.2.server_address} {/if}
+
 account.2.sip_server.1.port= {$account.2.sip_port}
 
 
@@ -738,13 +740,13 @@ account.2.ptime= 20
 account.2.register_line=
 account.2.register_mac=
 account.2.reg_fail_retry_interval=
-account.2.unregister_on_reboot=
+account.2.unregister_on_reboot=1
 
 account.2.session_timer.refresher=
 account.2.session_timer.expires=
 account.2.session_timer.enable= {$yealink_session_timer}
 
-account.2.conf_type=
+account.2.conf_type = {if $nway_conference == true}2{/if}
 account.2.sip_server_type=
 
 ##V83 Add
@@ -1038,7 +1040,7 @@ account.2.call_recording.enable=
 #######################################################################################
 ##                                Network Conferene                                  ##       
 #######################################################################################
-account.2.conf_uri=
+account.2.conf_uri = {if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}
 
 
 #######################################################################################
@@ -1189,7 +1191,8 @@ account.3.user_name = {$account.3.user_id}@{$account.3.server_address}
 account.3.user_name = {$account.3.user_id}
 {/if}
 
-account.3.sip_server.1.address= {$account.3.server_address}
+{if isset($account.3.server.1.address)} account.3.sip_server.1.address= {$account.3.server.1.address} {else} account.3.sip_server.1.address= {$account.3.server_address} {/if}
+
 account.3.sip_server.1.port= {$account.3.sip_port}
 
 
@@ -1271,7 +1274,7 @@ account.3.session_timer.refresher=
 account.3.session_timer.expires=
 account.3.session_timer.enable= {$yealink_session_timer}
 
-account.3.conf_type=
+account.3.conf_type = {if $nway_conference == true}2{/if}
 account.3.sip_server_type=
 
 ##V83 Add
@@ -1565,7 +1568,7 @@ account.3.call_recording.enable=
 #######################################################################################
 ##                                Network Conferene                                  ##       
 #######################################################################################
-account.3.conf_uri=
+account.3.conf_uri = {if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}
 
 
 #######################################################################################
@@ -1716,7 +1719,8 @@ account.4.user_name = {$account.4.user_id}@{$account.4.server_address}
 account.4.user_name = {$account.4.user_id}
 {/if}
 
-account.4.sip_server.1.address= {$account.4.server_address}
+{if isset($account.4.server.1.address)} account.4.sip_server.1.address= {$account.4.server.1.address} {else} account.4.sip_server.1.address= {$account.4.server_address} {/if}
+
 account.4.sip_server.1.port= {$account.4.sip_port}
 
 
@@ -1798,7 +1802,7 @@ account.4.session_timer.refresher=
 account.4.session_timer.expires=
 account.4.session_timer.enable= {$yealink_session_timer}
 
-account.4.conf_type=
+account.4.conf_type = {if $nway_conference == true}2{/if} 
 account.4.sip_server_type=
 
 ##V83 Add
@@ -2092,7 +2096,7 @@ account.4.call_recording.enable=
 #######################################################################################
 ##                                Network Conferene                                  ##       
 #######################################################################################
-account.4.conf_uri=
+account.4.conf_uri = {if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}
 
 
 #######################################################################################
@@ -2242,7 +2246,8 @@ account.5.user_name = {$account.5.user_id}@{$account.5.server_address}
 account.5.user_name = {$account.5.user_id}
 {/if}
 
-account.5.sip_server.1.address= {$account.5.server_address}
+{if isset($account.5.server.1.address)} account.5.sip_server.1.address= {$account.5.server.1.address} {else} account.5.sip_server.1.address= {$account.5.server_address} {/if}
+
 account.5.sip_server.1.port= {$account.5.sip_port}
 
 
@@ -2324,7 +2329,7 @@ account.5.session_timer.refresher=
 account.5.session_timer.expires=
 account.5.session_timer.enable= {$yealink_session_timer}
 
-account.5.conf_type=
+account.5.conf_type = {if $nway_conference == true}2{/if}
 account.5.sip_server_type=
 
 ##V83 Add
@@ -2618,7 +2623,7 @@ account.5.call_recording.enable=
 #######################################################################################
 ##                                Network Conferene                                  ##       
 #######################################################################################
-account.5.conf_uri=
+account.5.conf_uri = {if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}
 
 
 #######################################################################################
@@ -2782,7 +2787,8 @@ account.6.user_name = {$account.6.user_id}@{$account.6.server_address}
 account.6.user_name = {$account.6.user_id}
 {/if}
 
-account.6.sip_server.1.address= {$account.6.server_address}
+{if isset($account.6.server.1.address)} account.6.sip_server.1.address= {$account.6.server.1.address} {else} account.6.sip_server.1.address= {$account.6.server_address} {/if}
+
 account.6.sip_server.1.port= {$account.6.sip_port}
 
 
@@ -2864,7 +2870,7 @@ account.6.session_timer.refresher=
 account.6.session_timer.expires=
 account.6.session_timer.enable= {$yealink_session_timer}
 
-account.6.conf_type=
+account.6.conf_type = {if $nway_conference == true}2{/if}
 account.6.sip_server_type=
 
 ##V83 Add
@@ -3158,7 +3164,7 @@ account.6.call_recording.enable=
 #######################################################################################
 ##                                Network Conferene                                  ##       
 #######################################################################################
-account.6.conf_uri=
+account.6.conf_uri = {if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}
 
 
 #######################################################################################
@@ -3309,7 +3315,8 @@ account.7.user_name = {$account.7.user_id}@{$account.7.server_address}
 account.7.user_name = {$account.7.user_id}
 {/if}
 
-account.7.sip_server.1.address= {$account.7.server_address}
+{if isset($account.7.server.1.address)} account.7.sip_server.1.address= {$account.7.server.1.address} {else} account.7.sip_server.1.address= {$account.7.server_address} {/if}
+
 account.7.sip_server.1.port= {$account.7.sip_port}
 
 
@@ -3836,7 +3843,8 @@ account.8.user_name = {$account.8.user_id}@{$account.8.server_address}
 account.8.user_name = {$account.8.user_id}
 {/if}
 
-account.8.sip_server.1.address= {$account.8.server_address}
+{if isset($account.8.server.1.address)} account.8.sip_server.1.address= {$account.8.server.1.address} {else} account.8.sip_server.1.address= {$account.8.server_address} {/if}
+
 account.8.sip_server.1.port= {$account.8.sip_port}
 
 
@@ -4363,7 +4371,8 @@ account.9.user_name = {$account.9.user_id}@{$account.9.server_address}
 account.9.user_name = {$account.9.user_id}
 {/if}
 
-account.9.sip_server.1.address= {$account.9.server_address}
+{if isset($account.9.server.1.address)} account.9.sip_server.1.address= {$account.9.server.1.address} {else} account.9.sip_server.1.address= {$account.9.server_address} {/if}
+
 account.9.sip_server.1.port= {$account.9.sip_port}
 
 
@@ -4890,7 +4899,8 @@ account.10.user_name = {$account.10.user_id}@{$account.10.server_address}
 account.10.user_name = {$account.10.user_id}
 {/if}
 
-account.10.sip_server.1.address= {$account.10.server_address}
+{if isset($account.10.server.1.address)} account.10.sip_server.1.address= {$account.10.server.1.address} {else} account.10.sip_server.1.address= {$account.10.server_address} {/if}
+
 account.10.sip_server.1.port= {$account.10.sip_port}
 
 
diff --git a/resources/templates/provision/yealink/t56a/y000000000056.cfg b/resources/templates/provision/yealink/t56a/y000000000056.cfg
index 24b5571e36..95e4a3c416 100644
--- a/resources/templates/provision/yealink/t56a/y000000000056.cfg
+++ b/resources/templates/provision/yealink/t56a/y000000000056.cfg
@@ -843,7 +843,8 @@ features.password_dial.length =
 #######################################################################################
 ##                                   Features History                                ##
 #######################################################################################
-features.save_call_history = 
+features.save_call_history =
+features.save_init_num_to_history.enable = 0
 
 
 #######################################################################################
diff --git a/resources/templates/provision/yealink/t56a/{$mac}.cfg b/resources/templates/provision/yealink/t56a/{$mac}.cfg
index ed14c9ca0f..a9fb33366c 100644
--- a/resources/templates/provision/yealink/t56a/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t56a/{$mac}.cfg
@@ -369,11 +369,11 @@ account.1.picture_info_enable =
 #######################################################################################
 ##It configures the conference type for account X.0-Local Conference,2-Network Conference.
 ##The default value is 0.
-account.1.conf_type = 
+account.1.conf_type = {if $nway_conference == true}2{/if} 
 
 ##It configures the network conference URI for account X.
 ##The default value is blank.
-account.1.conf_uri = 
+account.1.conf_uri = {if $nway_conference == true}nway{$account.1.auth_id}@{$account.1.server_address}{/if} 
 
 
 #######################################################################################
@@ -833,10 +833,10 @@ account.2.picture_info_enable =
 #######################################################################################
 ##It configures the conference type for account X.0-Local Conference,2-Network Conference.
 ##The default value is 0.
-account.2.conf_type = 
+account.2.conf_type = {if $nway_conference == true}2{/if} 
 ##It configures the network conference URI for account X.
 ##The default value is blank.
-account.2.conf_uri = 
+account.2.conf_uri = {if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if} 
 
 
 #######################################################################################
@@ -1296,10 +1296,10 @@ account.3.picture_info_enable =
 #######################################################################################
 ##It configures the conference type for account X.0-Local Conference,2-Network Conference.
 ##The default value is 0.
-account.3.conf_type = 
+account.3.conf_type = {if $nway_conference == true}2{/if} 
 ##It configures the network conference URI for account X.
 ##The default value is blank.
-account.3.conf_uri = 
+account.3.conf_uri = {if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if} 
 
 
 #######################################################################################
@@ -1762,11 +1762,11 @@ account.4.picture_info_enable =
 #######################################################################################
 ##It configures the conference type for account X.0-Local Conference,2-Network Conference.
 ##The default value is 0.
-account.4.conf_type = 
+account.4.conf_type = {if $nway_conference == true}2{/if} 
 
 ##It configures the network conference URI for account X.
 ##The default value is blank.
-account.4.conf_uri = 
+account.4.conf_uri = {if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if} 
 
 
 #######################################################################################
@@ -2230,11 +2230,11 @@ account.5.picture_info_enable =
 #######################################################################################
 ##It configures the conference type for account X.0-Local Conference,2-Network Conference.
 ##The default value is 0.
-account.5.conf_type = 
+account.5.conf_type = {if $nway_conference == true}2{/if} 
 
 ##It configures the network conference URI for account X.
 ##The default value is blank.
-account.5.conf_uri =
+account.5.conf_uri = {if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}
 
 
 #######################################################################################
@@ -2701,10 +2701,10 @@ account.6.picture_info_enable =
 #######################################################################################
 ##It configures the conference type for account X.0-Local Conference,2-Network Conference.
 ##The default value is 0.
-account.6.conf_type = 
+account.6.conf_type = {if $nway_conference == true}2{/if} 
 ##It configures the network conference URI for account X.
 ##The default value is blank.
-account.6.conf_uri = 
+account.6.conf_uri = {if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if} 
 
 
 #######################################################################################
@@ -2955,7 +2955,7 @@ local_time.ntp_server2 = {$ntp_server_secondary}
 
 ##It configures the update interval (in seconds) when using the NTP server.
 ##The default value is 1000.Integer from 15 to 86400
-local_time.interval = 
+local_time.interval = {$yealink_time_update}
 
 ##It enables or disables daylight saving time (DST) feature.
 ##0-Disabled,1-Enabled,2-Automatic.
@@ -2965,17 +2965,17 @@ local_time.summer_time = {$yealink_summer_time}
 ##It configures the way DST works when DST feature is enabled.
 ##0-DST By Date ,1-DST By Week.
 ##The default value is 0.
-local_time.dst_time_type = 
+local_time.dst_time_type = {$yealink_dst_type}
 
 ##It configures the start time of the DST.
 ##Value formats are:Month/Day/Hour (for By Date),Month/ Day of Week/ Day of Week Last in Month/ Hour of Day (for By Week)
 ##The default value is 1/1/0.
-local_time.start_time = 
+local_time.start_time = {$yealink_time_zone_start_time}
 
 ##It configures the end time of the DST.
 ##Value formats are:Month/Day/Hour (for By Date),Month/ Day of Week/ Day of Week Last in Month/ Hour of Day (for By Week)
 ##The default value is 12/31/23.
-local_time.end_time = 
+local_time.end_time = {$yealink_time_zone_end_time}
 
 ##It configures the offset time (in minutes).
 ##The default value is blank.Integer from -300 to 300
@@ -2991,7 +2991,7 @@ local_time.date_format = {$yealink_date_format}
 ##It enables or disables the phone to update time with the offset time obtained from the DHCP server.
 ##It is only available to offset from GMT 0.0-Disabled,1-Enabled.
 ##The default value is 0.
-local_time.dhcp_time = 
+local_time.dhcp_time = {$yealink_dhcp_time}
 
 ##It configures the phone to obtain time from NTP server or manual settings.0-Manual,1-NTP
 ##The default value is 1.
diff --git a/resources/templates/provision/yealink/t57w/y000000000097.cfg b/resources/templates/provision/yealink/t57w/y000000000097.cfg
index ee5eb1e18c..a0a210aaca 100644
--- a/resources/templates/provision/yealink/t57w/y000000000097.cfg
+++ b/resources/templates/provision/yealink/t57w/y000000000097.cfg
@@ -881,7 +881,7 @@ search_in_dialing.history.enable=
 search_in_dialing.history.priority=
 directory_setting.history.enable=
 directory_setting.history.priority
-features.save_init_num_to_history.enable=
+features.save_init_num_to_history.enable= 0
 features.redial_via_local_sip_server.enable=
 
 ##V83 Add
@@ -902,7 +902,11 @@ static.auto_provision.local_contact.backup.enable=
 ##                          Contact Other                                            ##       
 #######################################################################################
 directory.search_type=
+{if isset($yealink_local_directory_enable)}
+directory_setting.local_directory.enable = {$yealink_local_directory_enable}
+{else}
 directory_setting.local_directory.enable =
+{/if}
 directory_setting.local_directory.priority =
 
 ##V83 Add
diff --git a/resources/templates/provision/yealink/t57w/{$mac}.cfg b/resources/templates/provision/yealink/t57w/{$mac}.cfg
index e77fd7a558..aef343b5a6 100644
--- a/resources/templates/provision/yealink/t57w/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t57w/{$mac}.cfg
@@ -206,7 +206,7 @@ account.1.session_timer.refresher=
 account.1.session_timer.expires=
 account.1.session_timer.enable= {$yealink_session_timer}
 
-account.1.conf_type=
+account.1.conf_type = {if $nway_conference == true}2{/if}
 account.1.sip_server_type=
 
 ##V83 Add
@@ -500,7 +500,7 @@ account.1.call_recording.enable=
 #######################################################################################
 ##                                Network Conferene                                  ##       
 #######################################################################################
-account.1.conf_uri=
+account.1.conf_uri = {if $nway_conference == true}nway{$account.1.auth_id}@{$account.1.server_address}{/if}
 
 
 #######################################################################################
@@ -745,7 +745,7 @@ account.2.session_timer.refresher=
 account.2.session_timer.expires=
 account.2.session_timer.enable= {$yealink_session_timer}
 
-account.2.conf_type=
+account.2.conf_type = {if $nway_conference == true}2{/if}
 account.2.sip_server_type=
 
 ##V83 Add
@@ -1039,7 +1039,7 @@ account.2.call_recording.enable=
 #######################################################################################
 ##                                Network Conferene                                  ##       
 #######################################################################################
-account.2.conf_uri=
+account.2.conf_uri = {if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}
 
 
 #######################################################################################
@@ -1272,7 +1272,7 @@ account.3.session_timer.refresher=
 account.3.session_timer.expires=
 account.3.session_timer.enable= {$yealink_session_timer}
 
-account.3.conf_type=
+account.3.conf_type = {if $nway_conference == true}2{/if}
 account.3.sip_server_type=
 
 ##V83 Add
@@ -1566,7 +1566,7 @@ account.3.call_recording.enable=
 #######################################################################################
 ##                                Network Conferene                                  ##       
 #######################################################################################
-account.3.conf_uri=
+account.3.conf_uri = {if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}
 
 
 #######################################################################################
@@ -1799,7 +1799,7 @@ account.4.session_timer.refresher=
 account.4.session_timer.expires=
 account.4.session_timer.enable= {$yealink_session_timer}
 
-account.4.conf_type=
+account.4.conf_type = {if $nway_conference == true}2{/if} 
 account.4.sip_server_type=
 
 ##V83 Add
@@ -2093,7 +2093,7 @@ account.4.call_recording.enable=
 #######################################################################################
 ##                                Network Conferene                                  ##       
 #######################################################################################
-account.4.conf_uri=
+account.4.conf_uri = {if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}
 
 
 #######################################################################################
@@ -2325,7 +2325,7 @@ account.5.session_timer.refresher=
 account.5.session_timer.expires=
 account.5.session_timer.enable= {$yealink_session_timer}
 
-account.5.conf_type=
+account.5.conf_type = {if $nway_conference == true}2{/if}
 account.5.sip_server_type=
 
 ##V83 Add
@@ -2619,7 +2619,7 @@ account.5.call_recording.enable=
 #######################################################################################
 ##                                Network Conferene                                  ##       
 #######################################################################################
-account.5.conf_uri=
+account.5.conf_uri = {if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}
 
 
 #######################################################################################
@@ -2865,7 +2865,7 @@ account.6.session_timer.refresher=
 account.6.session_timer.expires=
 account.6.session_timer.enable= {$yealink_session_timer}
 
-account.6.conf_type=
+account.6.conf_type = {if $nway_conference == true}2{/if}
 account.6.sip_server_type=
 
 ##V83 Add
@@ -3159,7 +3159,7 @@ account.6.call_recording.enable=
 #######################################################################################
 ##                                Network Conferene                                  ##       
 #######################################################################################
-account.6.conf_uri=
+account.6.conf_uri = {if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}
 
 
 #######################################################################################
diff --git a/resources/templates/provision/yealink/t58a/directory.xml b/resources/templates/provision/yealink/t58a/directory.xml
new file mode 100644
index 0000000000..297b9e4108
--- /dev/null
+++ b/resources/templates/provision/yealink/t58a/directory.xml
@@ -0,0 +1,83 @@
+<YealinkIPPhoneDirectory>
+{foreach $contacts as $row}
+{if $smarty.get.contacts == "users" && $row.category == "users"}
+<DirectoryEntry>
+{if $row.contact_name_given != ""}
+{if $row.contact_organization != ""}
+	<Name>{$row.contact_organization} {$row.contact_name_given} {$row.contact_name_family}</Name>
+{else}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{/if}
+{else}
+<Name>{$row.effective_caller_id_name}</Name>
+{/if}
+{foreach $row.numbers as $number}
+{if $number.phone_number != ""}
+	<Telephone>{$number.phone_number}</Telephone>
+{else}		
+	<Telephone>{$number.phone_extension}</Telephone>
+{/if}
+{/foreach}
+</DirectoryEntry>
+{elseif $smarty.get.contacts == "groups" && $row.category == "groups"}
+<DirectoryEntry>
+{if $row.contact_name_given != ""}
+{if $row.contact_organization != ""}
+	<Name>{$row.contact_organization} {$row.contact_name_given} {$row.contact_name_family}</Name>
+{else}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{/if}
+{else}
+	<Name>{$row.effective_caller_id_name}</Name>
+{/if}
+{foreach $row.numbers as $number}
+{if $number.phone_number != ""}
+	<Telephone>{$number.phone_number}</Telephone>
+{else}		
+	<Telephone>{$number.phone_extension}</Telephone>
+{/if}
+{/foreach}
+</DirectoryEntry>
+{elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
+<DirectoryEntry>
+{if $row.contact_name_given != ""}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{else}
+	<Name>{$row.effective_caller_id_name}</Name>
+{/if}
+{if $row.phone_number != ""}
+	<Telephone>{$row.phone_number}</Telephone>
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
+{/if}
+</DirectoryEntry>
+{elseif $smarty.get.contacts == "all"}
+<DirectoryEntry>
+{if $row.contact_name_given != ""}
+{if $row.contact_organization != ""}
+	<Name>{$row.contact_organization} {$row.contact_name_given} {$row.contact_name_family}</Name>
+{else}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{/if}
+{else}
+	<Name>{$row.effective_caller_id_name}</Name>
+{/if}
+{if $row.category == "extensions"}
+{if $row.phone_number != ""}
+	<Telephone>{$row.phone_number}</Telephone>
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
+{/if}
+{else}
+{foreach $row.numbers as $number}
+{if $number.phone_number != ""}
+	<Telephone>{$number.phone_number}</Telephone>
+{else}		
+	<Telephone>{$number.phone_extension}</Telephone>
+{/if}
+{/foreach}
+{/if}
+</DirectoryEntry>
+{/if}
+{/foreach}
+</YealinkIPPhoneDirectory>
diff --git a/resources/templates/provision/yealink/t58a/favorite_setting.xml b/resources/templates/provision/yealink/t58a/favorite_setting.xml
new file mode 100644
index 0000000000..ba7275358e
--- /dev/null
+++ b/resources/templates/provision/yealink/t58a/favorite_setting.xml
@@ -0,0 +1,8 @@
+<root_favorite_set>
+<item id_name="localdirectory" display_name="Local Directory" priority="2" enable="0" />
+<item id_name="history" display_name="History" priority="3" enable="1" />
+<item id_name="networkcalllog" display_name="Network CallLog" priority="4" enable="0" />
+<item id_name="remotedirectory" display_name="Remote Phone Book" priority="5" enable="1" />
+<item id_name="ldap" display_name="LDAP" priority="1" enable="0" />
+<item id_name="networkdirectory" display_name="Network Directory" priority="6" enable="0" />
+</root_favorite_set>
diff --git a/resources/templates/provision/yealink/t58a/y000000000000.boot b/resources/templates/provision/yealink/t58a/y000000000000.boot
new file mode 100644
index 0000000000..098ad811b9
--- /dev/null
+++ b/resources/templates/provision/yealink/t58a/y000000000000.boot
@@ -0,0 +1,7 @@
+#!version:1.0.0.1
+## The header above must appear as-is in the first line
+
+include:config "y000000000058.cfg"
+include:config "{$mac}.cfg"
+
+overwrite_mode = {$yealink_overwrite_mode}
diff --git a/resources/templates/provision/yealink/t58a/y000000000058.cfg b/resources/templates/provision/yealink/t58a/y000000000058.cfg
new file mode 100644
index 0000000000..4ad9ac7f28
--- /dev/null
+++ b/resources/templates/provision/yealink/t58a/y000000000058.cfg
@@ -0,0 +1,1568 @@
+#!version:1.0.0.1
+
+##File header "#!version:1.0.0.1" can not be edited or deleted, and must be placed in the first line.##
+
+#######################################################################################
+##                                    Hostname                                       ##
+#######################################################################################
+static.network.dhcp_host_name =
+
+
+#######################################################################################
+##                                    PPPoE                                          ##
+#######################################################################################
+network.pppoe.user = 
+network.pppoe.password = 
+
+
+#######################################################################################
+##                                   Network Advanced                                ##
+#######################################################################################
+##It enables or disables the PC port.0-Disabled,1-Auto Negotiation.
+##The default value is 1.It takes effect after a reboot.
+static.network.pc_port.enable =
+
+##It configures the transmission mode and speed of the Internet (WAN) port.
+##0-Auto Negotiate
+##1-Full Duplex 10Mbps
+##2-Full Duplex 100Mbps
+##3-Half Duplex 10Mbps
+##4-Half Duplex 100Mbps
+##5-Full Duplex 1000Mbps (only applicable to SIP-T42G and SIP-T46G IP phones)
+##The default value is 0.It takes effect after a reboot.
+static.network.internet_port.speed_duplex = 
+
+##It configures the transmission mode and speed of the PC (LAN) port.
+##0-Auto Negotiate
+##1-Full Duplex 10Mbps
+##2-Full Duplex 100Mbps
+##3-Half Duplex 10Mbps
+##4-Half Duplex 100Mbps
+##5-Full Duplex 1000Mbps (only applicable to SIP-T42G and SIP-T46G IP phones)
+##The default value is 0.It takes effect after a reboot.
+static.network.pc_port.speed_duplex = 
+
+##It enables or disables the phone to use manually configured static IPv4 DNS when Internet (WAN) port type for IPv4 is configured as DHCP.
+##0-Disabled (use the IPv4 DNS obtained by DHCP)   1-Enabled
+##The default value is 0.It takes effect after a reboot.
+
+{if isset($dns_server_primary)}static.network.static_dns_enable = 1{else}static.network.static_dns_enable = 0{/if}
+
+static.network.ipv6_static_dns_enable = 
+static.network.vlan.pc_port_mode =
+
+##It enable or disable to use A record of TTL 
+##The defalue value is 1;0-Disable   1-Enable 
+static.network.dns.ttl_enable =
+
+##It configures the LAN MTU 
+##The default value is 1500,.Integer from 128 to 1500.It takes effect after a reboot.
+static.network.mtu_value = 
+
+network.attempt_expired_time = 
+network.dhcp.server_mac1 = 
+network.dhcp.server_mac2 =
+
+
+#######################################################################################
+##                                    VLAN                                           ##
+#######################################################################################
+static.network.vlan.internet_port_enable = 
+{if isset($yealink_vlan_enable)}static.network.vlan.internet_port_enable = {$yealink_vlan_enable}{else}static.network.vlan.internet_port_enable = 0{/if}
+static.network.vlan.internet_port_vid = {$yealink_vlan_id}
+static.network.vlan.internet_port_priority = {$yealink_vlan_cos}
+static.network.vlan.pc_port_enable = 
+static.network.vlan.pc_port_vid = {$yealink_vlan_pc_id}
+static.network.vlan.pc_port_priority = {$yealink_vlan_pc_cos}
+static.network.vlan.dhcp_enable = 
+static.network.vlan.dhcp_option =
+##It configures LLDP or manually VLAN can't obtain IP, whether to switch to other methods of VLAN or closed VLAN to get IP
+##(Except T19P/T21P Models) 0-Disable   1-Enable 
+static.network.vlan.vlan_change.enable = 
+
+
+#######################################################################################
+##                                   WEB Port                                        ##
+#######################################################################################
+##It configures the HTTP port for web server access.
+##The default value is 80.It takes effect after a reboot.
+static.network.port.http = 
+
+##It configures the HTTPS port for web server access.
+##The default value is 443.It takes effect after a reboot.
+static.network.port.https = 
+
+static.wui.https_enable = 
+static.wui.http_enable = 
+
+
+#######################################################################################
+##                                   QoS                                             ##
+#######################################################################################
+##It configures the voice QoS.
+##The default value is 46.It takes effect after a reboot.Integer from 0 to 63
+static.network.qos.rtptos = 
+
+##It configures the SIP QoS.
+##The default value is 26.It takes effect after a reboot.Integer from 0 to 63
+static.network.qos.signaltos = 
+
+
+#######################################################################################
+##                                   802.1X                                          ##
+#######################################################################################
+static.network.802_1x.mode = 
+static.network.802_1x.identity = 
+static.network.802_1x.md5_password = 
+static.network.802_1x.root_cert_url =
+static.network.802_1x.client_cert_url = 
+
+##It configure the mouth of the PC 802.1 x - logoff function.It takes effect after a reboot.
+##The default value is 0-Dsable ,    1-Enable
+static.network.802_1x.proxy_eap_logoff.enable = 
+
+
+#######################################################################################
+##                                   OpenVPN(Except T19P Model)                      ##
+#######################################################################################
+static.network.vpn_enable = {$yealink_network_vpn_enable}
+static.openvpn.url = {$yealink_openvpn_url}
+
+
+#######################################################################################
+##                                   LLDP                                            ##
+#######################################################################################
+static.network.lldp.enable = static.network.lldp.enable = {$yealink_lldp_enable}
+static.network.lldp.packet_interval = {$yealink_lldp_packet_interval}
+
+
+#######################################################################################
+##                                   CDP                                            ##
+#######################################################################################
+static.network.cdp.enable =  static.network.cdp.enable = {$yealink_cdp_enable}
+static.network.cdp.packet_interval = {$yealink_cdp_packet_interval}
+
+
+#######################################################################################
+##                                   Span to PC                                      ##
+#######################################################################################
+static.network.span_to_pc_port = 
+
+
+#######################################################################################
+##                                   RTP Port                                        ##
+#######################################################################################
+sip.min_udp_port=
+sip.max_udp_port=
+sip.min_tcp_port=
+sip.max_tcp_port=
+
+
+#######################################################################################
+##                                   Syslog                                          ##
+#######################################################################################
+static.syslog.mode =
+
+##It configures the IP address or domain name of the syslog server when exporting log to the syslog server.
+##It takes effect only if the parameter °∞static.syslog.mode°± is configured as Server.
+##The default value is blank.It takes effect after a reboot.
+static.syslog.server = 
+
+##It configures the detail level of syslog information to be exported.0 means nothing and 6 means all.
+##The default value is 3.It takes effect after a reboot.Integer from 0 to 6
+static.syslog.log_level = 
+
+static.syslog.bootlog_upload_wait_time =
+static.syslog.ftp.append_limit_mode = 
+static.syslog.ftp.max_logfile = 
+static.syslog.ftp.post_mode = 
+static.syslog.log_upload_period = 
+
+
+#######################################################################################
+##                                   TR069                                           ##
+#######################################################################################
+static.managementserver.enable = 
+static.managementserver.username = 
+static.managementserver.password = 
+static.managementserver.url = 
+static.managementserver.connection_request_username = 
+static.managementserver.connection_request_password = 
+static.managementserver.periodic_inform_enable = 
+static.managementserver.periodic_inform_interval = 
+
+
+#######################################################################################
+##                                   Autoprovision            ##                     ##
+#######################################################################################
+### It enables or disables the phone to synchronize personalized configuration settings with the auto provisioning server.
+### If it is set to 1 (Enabled), personalized configuration settings via web/phone user interface are saved in the MAC-local.cfg file on the phone, 
+### and then the phone will upload the MAC-local.cfg file to the provisioning server. During auto provisioning, the phone requests to download the MAC-local.cfg file on the provisioning server.
+### 0-Disabled, 1-Enabled. The default value is 0.
+static.auto_provision.custom.sync =
+
+### It enables or disables the phone to protect personalized configuration settings even after auto provisioning.
+### If it is set to 1 (Enabled), personalized configuration settings via web/phone user interface will be protected and remained after auto provisioning.
+### 0-Disabled, 1-Enabled. The default value is 0.
+static.auto_provision.custom.protect = 
+
+static.auto_provision.custom.upload_method=
+
+auto_provision.attempt_expired_time =
+
+
+#######################################################################################
+##                                   Autop Mode                                      ##
+#######################################################################################
+static.auto_provision.power_on =
+
+
+#######################################################################################
+##                                   Autop PNP                                       ##
+#######################################################################################
+static.auto_provision.pnp_enable = 
+
+
+#######################################################################################
+##                                   Autop DHCP                                      ##
+#######################################################################################
+static.auto_provision.dhcp_option.enable = 
+static.auto_provision.dhcp_option.list_user_options = 
+
+
+#######################################################################################
+##                                   Autop Repeat                                    ##
+#######################################################################################
+static.auto_provision.repeat.enable = 
+static.auto_provision.repeat.minutes = 
+
+
+#######################################################################################
+##                                   Autop Weekly                                    ##
+#######################################################################################
+static.auto_provision.weekly.enable =
+static.auto_provision.weekly.dayofweek = 
+static.auto_provision.weekly.begin_time = 
+static.auto_provision.weekly.end_time = 
+
+
+#######################################################################################
+##                                   Autop URL                                       ##
+#######################################################################################
+static.auto_provision.server.url = {$yealink_provision_url}
+static.auto_provision.server.username = {$http_auth_username}
+static.auto_provision.server.password = {$http_auth_password}
+
+
+#######################################################################################
+##                                   Autop AES Key                                   ##
+#######################################################################################
+##It configures the AES key for decrypting the Common CFG file. The valid characters contain: 0 ~ 9, A ~ Z, a ~ z.
+##The default value is blank.
+static.auto_provision.aes_key_16.com = 
+
+##It configures the AES key for decrypting the MAC-Oriented CFG file. The valid characters contain: 0 ~ 9, A ~ Z, a ~ z.
+##The default value is blank.
+static.auto_provision.aes_key_16.mac = 
+
+static.auto_provision.aes_key_in_file =
+
+##It configures the access URL of the custom MAC-Oriented CFG file.
+##The default value is blank.
+static.custom_mac_cfg.url =
+
+##It configures the value (vendor name of the device) of DHCP option 60.
+##The default value is yealink.
+static.auto_provision.dhcp_option.option60_value = 
+##It configuration phone update to restart automatically.It takes effect after a reboot.
+##0-Disable    1-Enable
+static.auto_provision.reboot_force.enable = 
+
+
+#######################################################################################
+##                                   Autop wildcard                                  ##
+#######################################################################################
+
+static.auto_provision.url_wildcard.pn = 
+
+#######################################################################################
+##                                   Autop Code                                      ##
+#######################################################################################
+##It configures the name of the code for triggering auto provisioning.
+##The default value is blank.It takes effect after a reboot.
+static.autoprovision.1.name = 
+
+##It configures the code for triggering auto provisioning.
+##Valid characters are digits, # and *.Example:static.autoprovision.1.code = *99The default value is blank.
+##It takes effect after a reboot.
+static.autoprovision.1.code = 
+
+##It configures the access URL of auto provisioning server.The default value is blank.
+##It takes effect after a reboot.
+static.autoprovision.1.url = 
+
+##It configures the user name for authentication during auto provisioning.
+##The default value is blank.It takes effect after a reboot.
+static.autoprovision.1.user = 
+
+##It configures the password for authentication during auto provisioning.
+##The default value is blank.It takes effect after a reboot.
+static.autoprovision.1.password = 
+
+##It configures the AES key for decrypting the Common CFG file.
+##The default value is blank.It takes effect after a reboot.
+static.autoprovision.1.com_aes = 
+
+##It configures the AES key for decrypting the MAC-Oriented CFG file.
+##The default value is blank.It takes effect after a reboot.
+static.autoprovision.1.mac_aes = 
+
+
+#######################################################################################
+##                                   Watch Dog                                       ##
+#######################################################################################
+static.watch_dog.enable = 
+
+
+#######################################################################################
+##                                   SIP Advanced                                    ##
+#######################################################################################
+sip.use_23_as_pound = 
+sip.rfc2543_hold = {$yealink_rfc2543_hold}
+sip.use_out_bound_in_dialog =  
+sip.reg_surge_prevention = 
+sip.send_response_by_request = 
+sip.notify_reboot_enable = 
+sip.disp_incall_to_info =
+sip.limit_server_name =
+sip.limit_server_reason =
+{if isset($yealink_sip_listen_port)}sip.listen_port = {$yealink_sip_listen_port}{else}sip.listen_port = 5060{/if}
+
+#sip.tls_listen_port =
+{if isset($yealink_sip_listen_port)}sip.tls_listen_port = {$yealink_sip_listen_port}{else}sip.tls_listen_port = 5061{/if}
+
+sip.trust_ctrl = {$yealink_trust_ctrl}
+sip.nat_stun.enable = {if isset($stun_server)}1{else}0{/if}
+
+sip.nat_stun.server = {$stun_server}
+sip.nat_stun.port = {if isset($stun_port)}{$stun_port}{else}3478{/if}
+
+sip.timer_t1 =
+sip.timer_t2 =
+sip.timer_t4 =
+
+##It is XSI authentication mode.0-Disable  1-Enable (Except T19P/T21P Models)
+sip.authentication_for_xsi =
+##It is DSS KEY to call park type, whether the trigger BLF function.It takes effect after a reboot.
+##The default value is 0-Disable(DSS KEY to call park type,triggering BLF function)   1-Enable
+sip.call_park_without_blf =
+##It is ASCII conversion into corresponding symbols.
+##The defalult value is blank. 0-Disable   1-Enable
+sip.escape_characters.enable = 
+##The default value is 0 ( said according to the transmission mode configured to listen on port),1-
+##1-said at the same time to monitor TCP and UDP
+##2-said to monitor TCP and UDP at the same time, and from the BLF - the LIST to subscribe to the contact with a transport = TCP parameters
+sip.listen_mode = {if isset($yealink_sip_listen_port)}sip.listen_port = {$yealink_sip_listen_port}{else}sip.listen_port = 5060{/if}
+
+##The default value is 0-Disable, 1-Enable.It takes effect after a reboot.
+##0-registered according to the uri of the tectonic refer - by domain
+##1-according to refer the from header fields to construct refer - by domain
+
+sip.refer_by_header_auto_build =
+##The default is blank.The Valid characters are digits - _.! ~ * # '() & Q462 = + R452 $,;?/ \ 0
+##It is username needs to be preserved in a special notation.
+sip.reserve_characters = 
+##The default value is 0.(contracting out the random contact, via port to carry fixed port).It takes effect after a reboot.
+##1-the out-contracting port random contact, via port to carry
+##2-the out-contracting ports fixed contact, via carry fix
+sip.tcp_port_random_mode = 
+
+sip.call_fail_use_reason.enable = {$yealink_sip_call_fail_use_reason_enable}
+
+
+#######################################################################################
+##                                   Echo Cancellation                               ##
+#######################################################################################
+voice.vad = {$yealink_vad}
+voice.cng = {$yealink_cng}
+voice.echo_cancellation = {$yealink_echo_cancellation} 
+
+
+#######################################################################################
+##                                   Jitter Buffer                                   ##
+#######################################################################################
+voice.jib.adaptive = {$yealink_jib_adaptive}
+voice.jib.min = {$yealink_jib_min}
+voice.jib.max = {$yealink_jib_max}
+voice.jib.normal = {$yealink_jib_normal}
+
+
+#######################################################################################
+##                                   Tones                                           ##
+#######################################################################################
+voice.tone.country =
+voice.tone.dial = 
+voice.tone.ring = 
+voice.tone.busy = 
+voice.tone.congestion = 
+voice.tone.callwaiting = 
+voice.tone.dialrecall = 
+voice.tone.info = 
+voice.tone.stutter = 
+voice.tone.autoanswer = 
+voice.tone.message =
+
+
+#######################################################################################
+##                                   Volume                                          ##
+#######################################################################################
+
+voice.handfree.spk_vol = 
+voice.handfree.tone_vol = 
+voice.handset.spk_vol = 
+voice.handset.tone_vol = 
+voice.headset.spk_vol = 
+voice.headset.tone_vol = 
+voice.group_spk_vol = 
+
+voice.handfree_send = 
+voice.handset_send = 
+voice.headset_send = 
+
+
+#######################################################################################
+##                                   Transfer                                        ##
+#######################################################################################
+##It enables or disables the transferee party°Øs phone to prompt a missed call on the LCD screen before displaying 
+##the caller ID when performing a semi-attended transfer.0-Enabled,1-Disabled
+##The default value is 1.
+transfer.semi_attend_tran_enable = {$yealink_transfer_semi_attended}
+
+##It enables or disables the phone to complete the blind transfer through on-hook.0-Disabled,1-Enabled .
+##The default value is 1.
+transfer.blind_tran_on_hook_enable = {$yealink_transfer_blind_on_hook}
+
+##It enables or disables the phone to transfer call to the two parties after a local conference call hangs up.
+##0-Disabled,1-Enabled.
+##The default value is 0.
+transfer.tran_others_after_conf_enable = {$yealink_transfer_after_conf}
+
+##It enables or disables the phone to complete the attended transfer through on-hook.
+##0-Disabled,1-Enabled.
+##The default value is 1.
+transfer.on_hook_trans_enable = {$yealink_transfer_onhook}
+
+##It configures the DSS key behavior during an active call when user presses the DSS 
+##key and the DSS key is configured as a speed dial, transfer or BLF/BLF list key.
+##0-New Call,1-Attended Transfer,2-Blind Transfer.
+##The default value is 2.
+transfer.dsskey_deal_type = {$yealink_dsskey_transfer_mode}
+
+##It enables or disables the phone to enter Transfer to menu during multiple calls when pressing the transfer soft key or TRAN key.
+##0-Disabled,1-Enabled.
+##The default value is 1.
+transfer.multi_call_trans_enable = 
+
+
+#######################################################################################
+##                                   Language Settings                               ##
+#######################################################################################
+##It configures the language of the web user interface.
+static.lang.wui = 
+
+##It configures the language of the phone user interface.
+##The default value is English.
+static.lang.gui = {$yealink_language_gui}
+
+gui_lang.url = 
+gui_lang.delete = 
+wui_lang.url = 
+wui_lang_note.url = 
+wui_lang.delete = 
+
+
+#######################################################################################
+##                                   Auto Redial                                     ##
+#######################################################################################
+auto_redial.enable = 
+auto_redial.interval = 
+auto_redial.times = 
+
+
+#######################################################################################
+##                                   Zero Touch                                      ##
+#######################################################################################
+static.zero_touch.enable = 
+static.zero_touch.wait_time = 
+static.zero_touch.network_fail_wait_times =
+static.zero_touch.network_fail_delay_times =
+
+
+#######################################################################################
+##                                   Push XML                                        ##
+#######################################################################################
+push_xml.server = 
+push_xml.block_in_calling= 
+push_xml.sip_notify= 
+
+
+#######################################################################################
+##                                   Dial Plan                                       ##
+#######################################################################################
+dialplan.area_code.code = 
+dialplan.area_code.min_len =  
+dialplan.area_code.max_len = 
+dialplan.area_code.line_id = 
+
+### X ranges from 1 to 10
+###dialplan.block_out.number.x =
+###dialplan.block_out.line_id.x =
+
+dialplan.block_out.number.1 =
+dialplan.block_out.line_id.1 =
+
+###X ranges from 1 to 100
+###dialplan.dialnow.rule.X =
+dialplan.dialnow.rule.1 = {$yealink_dialplan_dialnow_rule_1}
+dialplan.dialnow.rule.2 = {$yealink_dialplan_dialnow_rule_2}
+dialplan.dialnow.rule.3 = {$yealink_dialplan_dialnow_rule_3}
+dialplan.dialnow.rule.4 = {$yealink_dialplan_dialnow_rule_4}
+dialplan.dialnow.rule.5 = {$yealink_dialplan_dialnow_rule_5}
+###dialplan.dialnow.line_id.X = 
+
+dialplan.dialnow.rule.1 = 
+dialplan.dialnow.line_id.1 = 
+
+###X ranges from 1 to 100
+###dialplan.replace.prefix.X = 
+###dialplan.replace.replace.X = 
+###dialplan.replace.line_id.X = 
+
+dialplan.replace.prefix.1 = 
+dialplan.replace.replace.1 = 
+dialplan.replace.line_id.1 = 
+
+dialplan_dialnow.url = 
+phone_setting.dialnow_delay = 
+dialplan_replace_rule.url =
+
+
+#######################################################################################
+##                                   Remote Phonebook(Except T20P Model)             ##
+#######################################################################################
+###X ranges from 1 to 5
+###remote_phonebook.data.X.url =   
+###remote_phonebook.data.X.name = 
+
+{if isset($yealink_remote_phonebook_1_url) }
+remote_phonebook.data.1.url =  {$yealink_remote_phonebook_1_url}
+{else}
+remote_phonebook.data.1.url = https://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=users
+{/if}   
+{if isset($yealink_remote_phonebook_1_name) }
+remote_phonebook.data.1.name = {$yealink_remote_phonebook_1_name}
+{else}
+remote_phonebook.data.1.name = Users
+{/if}
+
+{if isset($yealink_remote_phonebook_2_name) }
+remote_phonebook.data.2.name = {$yealink_remote_phonebook_2_name}
+{else}
+remote_phonebook.data.2.name = Groups
+{/if}
+{if isset($yealink_remote_phonebook_2_url) }
+remote_phonebook.data.2.url =  {$yealink_remote_phonebook_2_url}
+{else}
+remote_phonebook.data.2.url = https://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=groups
+{/if}
+
+{if isset($yealink_remote_phonebook_3_name) }
+remote_phonebook.data.3.name = {$yealink_remote_phonebook_3_name}
+{else}
+remote_phonebook.data.3.name = Extensions
+{/if}
+{if isset($yealink_remote_phonebook_3_url) }
+remote_phonebook.data.3.url =  {$yealink_remote_phonebook_3_url}
+{else}
+remote_phonebook.data.3.url = https://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=directory.xml&contacts=extensions
+{/if}
+
+remote_phonebook.data.4.name = {$yealink_remote_phonebook_4_name}
+remote_phonebook.data.4.url =  {$yealink_remote_phonebook_4_url}
+
+remote_phonebook.data.5.name = {$yealink_remote_phonebook_5_name}
+remote_phonebook.data.5.url =  {$yealink_remote_phonebook_5_url}
+remote_phonebook.display_name = 
+
+###It enables or disables the phone to update the data of the remote phone book at a time when accessing the remote phone book.
+###0-Disabled, 1-Enabled. The default value is 0.
+features.remote_phonebook.enter_update_enable = 
+
+##It enables or disables the phone to perform a remote phone book search when receiving an incoming call.
+##0-Disabled,1-Enabled.
+##The default value is 0.
+features.remote_phonebook.enable = 
+
+##It configures the interval (in seconds) for the phone to update the data of the remote phone book from the remote phone book server.
+##The value 0 means the phone will not regularly update the data of the remote phone book from the remote phone book server.
+##The default value is 21600.Integer from 3600 to 2592000,and 0.
+features.remote_phonebook.flash_time = 
+
+
+#######################################################################################
+##                                   LDAP                                            ##
+#######################################################################################
+##It enables or disables LDAP feature.0-Disabled,1-Enabled.
+##The default value is 0.
+ldap.enable = {$ldap_enable}
+
+##It configures the criteria for searching the contact name attributes.
+##Example:ldap.name_filter = (|(cn=%)(sn=%)).
+##The default value is blank.
+ldap.name_filter = {$ldap_name_filter}
+
+##It configures the criteria for searching the contact number attributes.
+##Example:ldap.number_filter = (|(telephoneNumber=%)(mobile=%)(ipPhone=%))
+##The default value is blank.
+ldap.number_filter = {$ldap_number_filter}
+
+##It configures the IP address or domain name of the LDAP server.
+##The default value is blank.
+ldap.host = {$ldap_host}
+
+##It configures the port of the LDAP server.
+##The default value is 389.Integer from 1 to 65535.
+ldap.port = {$ldap_port}
+
+##It configures the LDAP search base which corresponds to the location of the LDAP phonebook.
+##Example:ldap.base = dc=yealink,dc=cn.
+##The default value is blank.
+ldap.base = {$ldap_base}
+ 
+##It configures the user name for accessing the LDAP server.
+##The default value is blank.
+ldap.user = {$ldap_user}
+
+##It configures the password for accessing the LDAP server.
+##The default value is blank.
+ldap.password = {$ldap_password}
+
+##It configures the maximum of the search results returned by the LDAP server to be displayed.
+##The default value is 50.Integer from 1 to 32000.
+ldap.max_hits = {$ldap_max_hits}
+
+##It configures the name attributes of each record to be returned by the LDAP server.
+##Multiple attributes are separated by spaces.Example:ldap.name_attr =sn cn.
+##The default value is blank.
+ldap.name_attr = {$ldap_name_attr}
+
+##It configures the number attributes of each record to be returned by the LDAP server.
+##Multiple attributes are separated by spaces.Example:ldap.numb_attr = Mobile ipPhone.
+##The default value is blank.
+ldap.numb_attr = {$ldap_numb_attr}
+
+##It configures the display name of the contact record displayed on the LCD screen. The value of this parameter must start with °∞%°± symbol.
+##Example:ldap.display_name = %cn
+##The default value is blank.
+ldap.display_name = {$ldap_display_name}
+
+##It configures the LDAP version.
+##The default value is 3.
+ldap.version = {$ldap_version}
+
+##It enables or disables the phone to perform an LDAP search when receiving an incoming call.
+##0-Disabled,1-Enabled.
+##The default value is 0.
+ldap.call_in_lookup = {$ldap_call_in_lookup}
+
+##It enables or disables the phone to sort the search results in alphabetical order or numerical order.
+##0-Disabled,1-Enabled.
+##The default value is 0.
+ldap.ldap_sort = {$ldap_sort}
+##It is the electricity + start, automatic search + 00 the beginning and the beginning of the numbe
+##The default value is 0.(0-Disable,1-Enable )(Except T19P/T21P Models)
+ldap.incoming_call_special_search.enable =
+##The default value is 0,value of 0 to 2, respectively the ldap, ldap + StarTLS and ldaps
+ldap.tls_mode = 
+ldap.call_out_lookup = {$ldap_dial_lookup}
+
+
+#######################################################################################
+##                                   Features                                        ##
+#######################################################################################
+features.normal_refuse_code = 
+features.auto_answer_delay = 
+features.allow_mute = 
+features.group_listen_in_talking_enable = 
+features.call_completion_enable = 
+features.call_num_filter = 
+features.direct_ip_call_enable = {$yealink_direct_ip_call_enable}
+features.relog_offtime = 
+features.ringer_device.is_use_headset = 
+features.factory_pwd_enable = 
+features.anonymous_response_code =
+features.show_action_uri_option =
+features.reset_by_long_press_enable =
+features.show_anywhere_remote_office_enable =
+features.upload_server =
+features.call_log_show_num = 
+features.ldap.input_type = 
+features.call_invite_format =
+
+phone_setting.logon_wizard_forever_wait =
+features.transfer_type = {$yealink_transfer_type}
+features.caller_name_type_on_dialing =
+gui_input_method.delete = 
+features.off_hook_answer.enable = 
+features.auto_linekeys.enable =
+
+features.blf_pickup_only_send_code =
+##It is configured in the middle of the screen shows the current default at the bottom of the account name.
+##The default is 0.CNT version 1.
+features.show_default_account=
+features.reboot_in_talk_enable =
+features.barge_in_via_username.enable = 
+features.flash_url_dsskey_led.enable = 
+static.features.default_account =
+features.linekey_call_with_default_account = 
+features.hide_feature_access_codes.enable = {$yealink_hide_feature_access_codes_enable}
+static.features.hide_zero_touch_url.enable =
+
+
+#######################################################################################
+##                                   Features Forward                                ##
+#######################################################################################
+
+features.fwd_mode =
+features.fwd_diversion_enable = 
+
+
+#######################################################################################
+##                                   Features DND                                    ##
+#######################################################################################
+
+features.dnd_mode = 
+features.dnd.enable = 
+features.dnd.on_code = *78
+features.dnd.off_code = *79
+features.dnd_refuse_code = 
+features.dnd.emergency_enable = 1
+features.dnd.emergency_authorized_number = 
+
+
+#######################################################################################
+##                                   Features Bluetooth(Only for T46G model)         ##
+#######################################################################################
+features.bluetooth_enable = {$yealink_bluetooth_enable}
+
+
+#######################################################################################
+##                                   Features BLF                                    ##
+#######################################################################################
+##It configures BLF LED mode and provides four kinds of definition for the BLF/BLF list key LED status.
+##For more information, refer to BLF LED Mode on page 218.
+##The default value is 0.
+features.blf_led_mode = {$yealink_blf_led_mode}
+
+##It enables or disables the phone to deal with the Version header in the BLF NOTIFY message sent by the server.
+##0-Disabled,1-Enabled.
+##The default value is 0.It takes effect after a reboot.
+features.blf_list_version = 0
+
+
+#######################################################################################
+##                                   Features Intercom                               ##
+#######################################################################################
+features.intercom.allow  = 
+features.intercom.mute  = 
+features.intercom.tone  = 
+features.intercom.barge  = 
+features.intercom.led.enable =
+features.intercom.subscribe.enable =
+
+
+#######################################################################################
+##                                   Features Hotline                                ##
+#######################################################################################
+##It configures the hotline number.
+##The default value is blank.
+features.hotline_number = 
+
+##It configures the delay time (in seconds) for the phone to dial out the hotline number automatically.
+##The default value of delay time is 4.Integer from 0 to 10
+features.hotline_delay = 
+
+
+#######################################################################################
+##                                   Features DTMF                                   ##
+#######################################################################################
+features.dtmf.hide = {$yealink_dtmf_hide}
+
+###Except T20P Model
+features.dtmf.hide_delay = 
+
+features.dtmf.repetition = 
+features.dtmf.transfer = 
+features.dtmf.replace_tran = 
+features.dtmf.duration =
+features.dtmf.volume =
+features.play_local_dtmf_tone_enable =
+
+
+#######################################################################################
+##                                   Features Audio Settings                         ##
+#######################################################################################
+features.headset_prior = 
+features.headset_training = 
+features.alert_info_tone =
+features.busy_tone_delay = 
+features.send_pound_key = 
+features.key_as_send = 
+features.send_key_tone = 
+features.key_tone = 
+features.play_hold_tone.enable = 
+features.play_hold_tone.delay = 
+features.redial_tone = 
+features.partition_tone = 
+
+
+#######################################################################################
+##                                   Features Action URI                             ##
+#######################################################################################
+features.action_uri_limit_ip =
+
+
+#######################################################################################
+##                                   Features Prefix                                 ##
+#######################################################################################
+features.password_dial.enable = 
+features.password_dial.prefix =
+features.password_dial.length =
+
+
+#######################################################################################
+##                                   Features History                                ##
+#######################################################################################
+features.save_call_history = 
+
+
+#######################################################################################
+##                                   Notification Popups                             ##
+#######################################################################################
+features.voice_mail_popup.enable= {$yealink_voice_mail_popup_enable}
+features.missed_call_popup.enable= {$yealink_missed_call_popup_enable}
+features.forward_call_popup.enable=
+features.text_message_popup.enable=
+
+
+#######################################################################################
+##                                   Ringtone                                        ##
+#######################################################################################
+ringtone.url = {$yealink_ringtone_url}
+ringtone.delete = {$yealink_ringtone_delete}
+
+
+#######################################################################################
+##                                   Phone Settings                                  ##
+#######################################################################################
+phone_setting.inter_digit_time = {$yealink_inter_digit_time}
+phone_setting.ring_type = {$yealink_ring_type}
+
+phone_setting.ring_for_tranfailed = 
+phone_setting.is_deal180 = 
+phone_setting.show_code403 =
+
+phone_setting.ringback_timeout =
+phone_setting.ringing_timeout =
+
+phone_setting.page_tip = 
+phone_setting.predial_autodial = 
+phone_setting.headsetkey_mode = 
+features.voice_mail_tone_enable = 
+static.phone_setting.reserve_certs_enable =
+phone_setting.called_party_info_display.enable = 1
+phone_setting.call_info_display_method = 0
+
+
+#######################################################################################
+##                                   Power Led Settings                              ##
+#######################################################################################
+phone_setting.common_power_led_enable = 
+phone_setting.talk_and_dial_power_led_enable = 
+phone_setting.mail_power_led_flash_enable = 1
+phone_setting.ring_power_led_flash_enable =
+phone_setting.mute_power_led_flash_enable= 
+phone_setting.hold_and_held_power_led_flash_enable = {$yealink_missed_call_power_led_flash_enable}
+
+##It configures the level of the active backlight intensity.
+##The default value is 8.
+phone_setting.active_backlight_level = 
+
+
+#######################################################################################
+##                                   Phone Setting Display                           ##
+#######################################################################################
+
+##It configures the backlight time (in seconds).0, 1, 15, 30, 60, 120, 300, 600 or 1800.
+phone_setting.backlight_time = {$yealink_backlight_time}
+
+wallpaper_upload.url = {$yealink_t56a_wallpaper}
+{if isset($yealink_t56a_wallpaper_filename)}
+phone_setting.backgrounds =  Config:{$yealink_t56a_wallpaper_filename}
+{else}
+phone_setting.backgrounds =  Config:yealink_t56a_wallpaper.png
+{/if}
+
+
+#######################################################################################
+##                                   Phone Setting BLF                               ##
+#######################################################################################
+###It enables or disables the phone to automatically configure the BLF list keys in order.
+###0-Disabled,1-Enabled.
+###The default value is 1.
+
+phone_setting.auto_blf_list_enable = 
+
+###It configures the order of BLF list keys assigned automatically.
+###0-Line Keys->Extension Keys
+###1-Extension Keys->Line Keys
+###The default value is 0.
+phone_setting.blf_list_sequence_type =
+
+
+#######################################################################################
+##                                   Key Lock                                        ##
+#######################################################################################
+###It enables or disables keypad lock feature.
+###0-Disabled,1-Enabled.
+###The default value is 0.
+phone_setting.phone_lock.enable = {$yealink_lock_enable}
+
+###It configures the password for unlocking the keypad.
+###The default value is 123.
+phone_setting.phone_lock.unlock_pin = {$yealink_lock_pin}
+
+###It configures the interval (in seconds) to automatically lock the keypad.
+###The default value is 0 (the keypad is locked only by long pressing the pound key or pressing the keypad lock key)
+phone_setting.phone_lock.lock_time_out = {$yealink_lock_timeout}
+phone_setting.emergency.number = {$yealink_emergency_number}
+
+
+#######################################################################################
+##                                   Multicast                                       ##
+#######################################################################################
+
+multicast.codec = 
+
+multicast.receive_priority.enable = 
+multicast.receive_priority.priority = 
+
+###X ranges from 1 to 10
+###multicast.listen_address.X.label = 
+###multicast.listen_address.X.ip_address = 
+
+multicast.listen_address.1.label = 
+multicast.listen_address.1.ip_address = 
+
+multicast.paging_address.1.ip_address =
+multicast.paging_address.1.label = 
+
+
+#######################################################################################
+##                                   Super Search                                    ##
+#######################################################################################
+super_search.recent_call = 
+super_search.url =
+
+
+#######################################################################################
+##                                   Security                                        ##
+#######################################################################################
+###Define the login username and password of the user, var and administrator.
+###If you change the username of the administrator from "admin" to "admin1", your new administrator's username should be configured as: security.user_name.admin = admin1.
+###If you change the password of the administrator from "admin" to "admin1pwd", your new administrator's password should be configured as: security.user_password = admin1:admin1pwd.
+
+###The following examples change the user's username to "user23" and the user's password to "user23pwd".
+###static.security.user_name.user = user23
+###static.security.user_password = user23:user23pwd
+###The following examples change the var's username to "var55" and the var's password to "var55pwd".
+###static.security.user_name.var = var55
+###static.security.user_password = var55:var55pwd
+
+{if isset($user_name) }
+static.security.user_name.user = {$user_name}
+static.security.user_password = {$user_name}:{$user_password}
+{/if}
+{if isset($admin_name) }
+static.security.user_name.admin = {$admin_name}
+static.security.user_password = {$admin_name}:{$admin_password}
+{/if}
+{if isset($var_name) }
+static.security.user_name.var = {$var_name}
+static.security.user_password = {$var_name}:{$var_password}
+{/if}
+
+###It enables or disables the phone to only accept the certificates in the Trusted Certificates list.
+###0-Disabled,1-Enabled.
+###The default value is 1.It takes effect after a reboot.
+static.security.trust_certificates = {if $yealink_trust_certificates == "false"}0{elseif $yealink_trust_certificates == "true"}1{/if}
+
+###It configures the source certificates for the phone to authenticate for TLS connection.
+###0-Default certificates,1-Custom certificates,2-All certificates.
+###The default value is 0.It takes effect after a reboot.
+security.ca_cert =
+
+###It configures the device certificates for the phone to send for TLS authentication.
+###0-Default certificates,1-Custom certificates.
+###The default value is 0.It takes effect after a reboot.
+static.security.dev_cert =
+
+###It enables or disables the phone to mandatorily validate the CommonName or SubjectAltName of the certificate received from the connecting server.
+###0-Disabled,1-Enabled.
+###The default value is 0.It takes effect after a reboot.
+static.security.cn_validation =
+
+
+#######################################################################################
+##                                   User Mode                                       ##
+#######################################################################################
+###It enables or disables the 3-level permissions (admin, user, var).
+###0-Disabled,1-Enabled.
+###The default value is 0.It takes effect after a reboot.
+static.security.var_enable = 
+
+static.web_item_level.url = 
+
+
+#######################################################################################
+##                                   Trusted Certificates                            ##
+#######################################################################################
+static.trusted_certificates.url = {$yealink_trusted_cert_url}
+static.trusted_certificates.delete = {$yealink_trusted_cert_delete}
+
+
+#######################################################################################
+##                                   Server Certificates                             ##
+#######################################################################################
+static.server_certificates.url = 
+static.server_certificates.delete = 
+
+
+#######################################################################################
+##                                   Line Key                                        ##
+#######################################################################################
+###T58A X ranges from 1 to 27
+
+#linekey.X.type--Customize the linekey type.
+#The valid types are: 
+
+#0-NA   1-Conference   2-Forward   3-Transfer   4-Hold   5-DND   7-Call Return   8-SMS   9-Directed Pickup   10-Call Park  11-DTMF   12-Voice Mail   13-Speed Dial
+#14-Intercom   15-Line   16-BLF   17-URL   18-Group Listening  20-Private Hold   22-XML Group   23-Group Pickup  24-Multicast Paging  25-Record   27-XML Browser
+#34-Hot Desking   35-URL Record   38-LDAP   39-BLF List   40-Prefix   41-Zero Touch   42-ACD   45-Local Group   46-Network Group   49-Custom Button   50-Keypad Lock
+#55-Meet-Me Conference   56-Retrieve Park   57-Hoteling   58-ACD Grace   59-Sisp Code   60-Emergency   61-Directory
+
+#0-NA 
+#22-XML Group
+#38-LDAP
+#46-Network Group 
+#17-URL 
+
+###linekey.X.line = 
+###linekey.X.value = 
+###linekey.X.pickup_value = 
+###linekey.X.type = 
+###linekey.X.xml_phonebook =
+###linekey.X.label = 
+###linekey.X.extension
+
+###It configures the desired line to apply the key feature.Integer from 1 to 16
+#linekey.1.line = 
+
+###It configures the value of the line key feature.
+###For example, when setting the key feature to BLF, it configures the number of the monitored user.
+###The default value is blank.
+#linekey.1.value = 
+
+###It configures the pickup code for BLF feature or conference ID followed by the # sign for Meet-Me conference feature.
+###It only applies to BLF and Meet-Me conference features.
+###The default value is blank.
+#linekey.1.pickup_value = 
+#linekey.1.extension
+
+###It configures the key feature for the line key X.
+#linekey.1.type = 
+
+###It configures the desired local group/XML group/network group for the line key X.
+###It only applies to the Local Group, XML Group and Network Group features.
+#linekey.1.xml_phonebook =
+
+###It configures the label displayed on the LCD screen for each line key.
+###The default value is blank.
+#linekey.1.label = 
+
+{foreach $keys['line'] as $row}
+#Configure Line Key {$row.device_key_id}
+linekey.{$row.device_key_id}.line = {$row.device_key_line}
+linekey.{$row.device_key_id}.value = {$row.device_key_value}
+{if $row.device_key_type == "1" || $row.device_key_type == "16"}
+linekey.{$row.device_key_id}.pickup_value = {$row.device_key_extension}
+{else}
+linekey.{$row.device_key_id}.extension = {$row.device_key_extension}
+{/if}
+linekey.{$row.device_key_id}.type = {$row.device_key_type}
+linekey.{$row.device_key_id}.xml_phonebook =
+linekey.{$row.device_key_id}.label = {$row.device_key_label}
+
+{/foreach}
+
+
+#######################################################################################
+##                                   Programable Key                                 ##
+#######################################################################################
+###T58A X ranges from 12 to 14
+
+#programablekey.x.type--Customize the programmable key type.
+#The valid types are: 
+#0-NA   2-Forward   5-DND   7-Call Return   8-SMS   9-Directed Pickup   13-Speed Dial
+#22-XML Group   23-Group Pickup   27-XML Browser   28-History   30-Menu   31-Switch Account   32-New SMS
+#33-Status   34-Hot Desking   38-LDAP   40-Prefix   41-Zero Touch   43-Local Directory   44-Network Directory   45-Local Group
+#46-Network Group   47-XML Directory   50-Keypad Lock   51-Switch Account Up   52-Switch Account Down   55-Meet-Me Conference   61-Directory
+
+###programablekey.X.type = 
+###programablekey.X.line = 
+###programablekey.X.value = 
+###programablekey.X.xml_phonebook = 
+###programablekey.X.history_type = 
+###programablekey.X.label = 
+###programablekey.X.pickup_value =
+###programablekey.X.extension =
+
+{foreach $keys["programmable"] as $row}
+programablekey.{$row.device_key_id}.type = {$row.device_key_type}
+{if $row.device_key_type == "22" || $row.device_key_type == "47"}
+programablekey.{$row.device_key_id}.xml_phonebook = {$row.device_key_line}
+{else}
+programablekey.{$row.device_key_id}.line = {$row.device_key_line}
+programablekey.{$row.device_key_id}.value = {$row.device_key_value}
+{/if}
+programablekey.{$row.device_key_id}.extension = {$row.device_key_extension}
+programablekey.{$row.device_key_id}.label = {$row.device_key_label}
+programablekey.1.pickup_value ={$row.device_key_extension}
+programablekey.1.history_type =
+{/foreach}
+
+
+#######################################################################################
+##                                   Expansion Key(Only for T26P/T28P/T46G Models)   ##
+#######################################################################################
+###T46G/T28P/T26P X ranges from 1 to 6, Y ranges from 1 to 40
+
+###expansion_module.X.key.Y.type = 
+###expansion_module.X.key.Y.line = 
+###expansion_module.X.key.Y.value = 
+###expansion_module.X.key.Y.pickup_value = 
+###expansion_module.X.key.Y.label =
+###expansion_module.X.key.Y.xml_phonebook =
+###expansion_module.X.key.Y.extension =
+
+###It configures the key feature of the expansion module X key Y.
+#expansion_module.1.key.1.type = 
+
+###It configures the desired line to apply the expansion module key feature.Integer from 1 to 6
+#expansion_module.1.key.1.line = 
+
+###It configures the value of the expansion module key feature.
+###The default value is blank.
+#expansion_module.1.key.1.value = 
+
+###It configures the pickup code for BLF feature or conference ID followed by the # sign for Meet-Me conference feature.
+###It only applies to BLF and Meet-Me conference features.
+###The default value is blank.
+#expansion_module.1.key.1.pickup_value = 
+#expansion_module.X.key.Y.extension =
+
+###It configures the label displayed on the LCD screen of the expansion module for each key.
+###The default value is blank.
+#expansion_module.1.key.1.label =
+
+###It only applies to the Local Group, XML Group and Network Group features.Integer from 0 to 48.
+#expansion_module.1.key.1.xml_phonebook =
+
+{foreach $keys["expansion"] as $row}
+expansion_module.1.key.{$row.device_key_id}.type = {$row.device_key_type}
+expansion_module.1.key.{$row.device_key_id}.line = {$row.device_key_line}
+expansion_module.1.key.{$row.device_key_id}.value = {$row.device_key_value}
+expansion_module.1.key.{$row.device_key_id}.extension = {$row.device_key_extension}
+expansion_module.1.key.{$row.device_key_id}.label = {$row.device_key_label}
+expansion_module.1.key.{$row.device_key_id}.xml_phonebook =
+{/foreach}
+{foreach $keys["expansion-1"] as $row}
+expansion_module.1.key.{$row.device_key_id}.type = {$row.device_key_type}
+expansion_module.1.key.{$row.device_key_id}.line = {$row.device_key_line}
+expansion_module.1.key.{$row.device_key_id}.value = {$row.device_key_value}
+expansion_module.1.key.{$row.device_key_id}.extension = {$row.device_key_extension}
+expansion_module.1.key.{$row.device_key_id}.label = {$row.device_key_label}
+expansion_module.1.key.{$row.device_key_id}.xml_phonebook =
+{/foreach}
+{foreach $keys["expansion-2"] as $row}
+expansion_module.2.key.{$row.device_key_id}.type = {$row.device_key_type}
+expansion_module.2.key.{$row.device_key_id}.line = {$row.device_key_line}
+expansion_module.2.key.{$row.device_key_id}.value = {$row.device_key_value}
+expansion_module.2.key.{$row.device_key_id}.extension = {$row.device_key_extension}
+expansion_module.2.key.{$row.device_key_id}.label = {$row.device_key_label}
+expansion_module.2.key.{$row.device_key_id}.xml_phonebook =
+{/foreach}
+
+
+#######################################################################################
+##                                   Forward Always                                  ##
+#######################################################################################
+forward.always.enable = 
+forward.always.target = 
+forward.always.on_code = 
+forward.always.off_code = 
+
+
+#######################################################################################
+##                                   Forward Busy                                    ##
+#######################################################################################
+forward.busy.enable = 
+forward.busy.target = 
+forward.busy.on_code = 
+forward.busy.off_code = 
+
+
+#######################################################################################
+##                                   Forward No Answer                               ##
+#######################################################################################
+forward.no_answer.enable = 
+forward.no_answer.target = 
+forward.no_answer.timeout = 
+forward.no_answer.on_code = 
+forward.no_answer.off_code = 
+
+
+#######################################################################################
+##                                   Forward International                           ##
+#######################################################################################
+###It enables or disables the phone to forward incoming calls to international numbers.
+###0-Disabled,1-Enabled.
+###The default value is 1.
+forward.international.enable = 
+
+
+#######################################################################################
+##                                   Hotdesking Startup                              ##
+#######################################################################################
+phone_setting.logon_wizard = 
+
+hotdesking.startup_register_name_enable = 
+hotdesking.startup_username_enable = 
+hotdesking.startup_password_enable = 
+hotdesking.startup_sip_server_enable = 
+hotdesking.startup_outbound_enable = 
+
+
+#######################################################################################
+##                                   Hotdesking Dsskey                               ##
+#######################################################################################
+hotdesking.dsskey_register_name_enable = 
+hotdesking.dsskey_username_enable = 
+hotdesking.dsskey_password_enable = 
+hotdesking.dsskey_sip_server_enable = 
+hotdesking.dsskey_outbound_enable = 
+
+
+#######################################################################################
+##                                   Alert Info                                      ##
+#######################################################################################
+###X ranges from 1 to 100
+###distinctive_ring_tones.alert_info.x.text =
+###distinctive_ring_tones.alert_info.x.ringer = 
+
+###It configures the internal ringer text for distinctive ringtone.
+###Example: distinctive_ring_tones.alert_info.1.text =  Family
+###The default value is blank.
+distinctive_ring_tones.alert_info.1.text = {$yealink_ring_text_1}
+distinctive_ring_tones.alert_info.2.text = {$yealink_ring_text_2}
+distinctive_ring_tones.alert_info.3.text = {$yealink_ring_text_3}
+distinctive_ring_tones.alert_info.4.text = {$yealink_ring_text_4}
+distinctive_ring_tones.alert_info.5.text = {$yealink_ring_text_5}
+distinctive_ring_tones.alert_info.6.text = {$yealink_ring_text_6}
+distinctive_ring_tones.alert_info.7.text = {$yealink_ring_text_7}
+distinctive_ring_tones.alert_info.8.text = {$yealink_ring_text_8}
+distinctive_ring_tones.alert_info.9.text = {$yealink_ring_text_9}
+distinctive_ring_tones.alert_info.10.text = {$yealink_ring_text_10}
+
+###It configures the desired ring tones for each text.
+###The value ranges from 1 to 8, the digit stands for the appropriate ringtone.
+###Ring tones 6-8 are only applicable to SIP-T46G IP phones.
+###The default value is 1.
+distinctive_ring_tones.alert_info.1.ringer = {$yealink_ring_file_1}
+distinctive_ring_tones.alert_info.2.ringer = {$yealink_ring_file_2}
+distinctive_ring_tones.alert_info.3.ringer = {$yealink_ring_file_3}
+distinctive_ring_tones.alert_info.4.ringer = {$yealink_ring_file_4}
+distinctive_ring_tones.alert_info.5.ringer = {$yealink_ring_file_5}
+distinctive_ring_tones.alert_info.6.ringer = {$yealink_ring_file_6}
+distinctive_ring_tones.alert_info.7.ringer = {$yealink_ring_file_7}
+distinctive_ring_tones.alert_info.8.ringer = {$yealink_ring_file_8}
+distinctive_ring_tones.alert_info.9.ringer = {$yealink_ring_file_9}
+distinctive_ring_tones.alert_info.10.ringer = {$yealink_ring_file_10} 
+
+
+#######################################################################################
+##                                   Call Waiting                                    ##
+#######################################################################################
+call_waiting.enable = {$yealink_call_waiting}
+call_waiting.tone = {$yealink_call_waiting_tone}
+call_waiting.on_code =
+call_waiting.off_code =
+
+
+#######################################################################################
+##                                   Action URL                                      ##
+#######################################################################################
+action_url.setup_completed = 
+action_url.registered = 
+action_url.unregistered =
+action_url.register_failed = 
+action_url.off_hook = 
+action_url.on_hook = 
+action_url.incoming_call = 
+action_url.outgoing_call = 
+action_url.call_established = 
+action_url.dnd_on = 
+action_url.dnd_off = 
+action_url.always_fwd_on = 
+action_url.always_fwd_off = 
+action_url.busy_fwd_on = 
+action_url.busy_fwd_off = 
+action_url.no_answer_fwd_on = 
+action_url.no_answer_fwd_off = 
+action_url.transfer_call = 
+action_url.blind_transfer_call =
+action_url.attended_transfer_call = 
+action_url.hold = 
+action_url.unhold = 
+action_url.mute = 
+action_url.unmute = 
+action_url.missed_call = 
+action_url.call_terminated = 
+action_url.busy_to_idle = 
+action_url.idle_to_busy = 
+action_url.ip_change = 
+action_url.forward_incoming_call = 
+action_url.reject_incoming_call = 
+action_url.answer_new_incoming_call = 
+action_url.transfer_finished = 
+action_url.transfer_failed = 
+action_url.setup_autop_finish =
+action_url.held =
+action_url.unheld =
+
+
+#######################################################################################
+##                                   Contact                                         ##
+#######################################################################################
+local_contact.data.url = 
+local_contact.image.url = 
+local_contact.icon.url =
+local_contact.data_photo_tar.url =
+
+local_contact.photo.url =
+
+
+#######################################################################################
+##                                   Custom Factory Configuration                    ##
+#######################################################################################
+
+static.custom_factory_configuration.url =
+static.features.custom_factory_config.enable = 
+
+
+#######################################################################################
+##                                   Custom  Configuration                           ##
+#######################################################################################
+
+static.configuration.url =
+
+
+#######################################################################################
+##                                   Custom Softkey						             ##
+#######################################################################################
+phone_setting.custom_softkey_enable = 
+custom_softkey_call_failed.url = 
+custom_softkey_call_in.url = 
+custom_softkey_connecting.url = 
+custom_softkey_dialing.url = 
+custom_softkey_ring_back.url = 
+custom_softkey_talking.url = 
+
+
+#######################################################################################
+##                                   Configure the access URL of firmware            ##
+#######################################################################################
+###It configures the access URL of the firmware file.
+###The default value is blank.It takes effect after a reboot.
+static.firmware.url = {$yealink_firmware_url}/{$yealink_firmware_t56a}
+
+
+#######################################################################################
+##                                             RTCP                                 ##
+#######################################################################################
+phone_setting.rtcp_xr_report.enable = 
+phone_setting.vq_rtcpxr.interval_report.enable =
+phone_setting.vq_rtcpxr.session_report.enable =
+phone_setting.vq_rtcpxr.states_show_on_gui.enable =
+phone_setting.vq_rtcpxr.states_show_on_web.enable =
+phone_setting.vq_rtcpxr_delay_threshold_critical =
+phone_setting.vq_rtcpxr_delay_threshold_warning =
+phone_setting.vq_rtcpxr_display_jitter.enable =
+phone_setting.vq_rtcpxr_display_jitter_buffer_max.enable =
+phone_setting.vq_rtcpxr_display_local_call_id.enable =
+phone_setting.vq_rtcpxr_display_local_codec.enable =
+phone_setting.vq_rtcpxr_display_moscq.enable =
+phone_setting.vq_rtcpxr_display_moslq.enable =
+phone_setting.vq_rtcpxr_display_packets_lost.enable =
+phone_setting.vq_rtcpxr_display_remote_call_id.enable =
+phone_setting.vq_rtcpxr_display_remote_codec.enable =
+phone_setting.vq_rtcpxr_display_round_trip_delay.enable =
+phone_setting.vq_rtcpxr_display_start_time.enable =
+phone_setting.vq_rtcpxr_display_stop_time.enable =
+phone_setting.vq_rtcpxr_display_symm_oneway_delay.enable =
+phone_setting.vq_rtcpxr_interval_period =
+phone_setting.vq_rtcpxr_moslq_threshold_critical =
+phone_setting.vq_rtcpxr_moslq_threshold_warning =
+voice.rtcp.enable =
+voice.rtcp_intval =
+voice.rtcp_xr.enable =
+voice.rtcp_cname =
+
+
+#######################################################################################
+##                           DNS                                                     ##
+#######################################################################################
+dns_cache_a.1.name =
+dns_cache_a.1.ip = 
+dns_cache_a.1.ttl =
+dns_cache_srv.1.name = 
+dns_cache_srv.1.port =
+dns_cache_srv.1.priority =
+dns_cache_srv.1.target =
+dns_cache_srv.1.weight =
+dns_cache_srv.1.ttl =
+dns_cache_naptr.1.name =
+dns_cache_naptr.1.flags =
+dns_cache_naptr.1.order =
+dns_cache_naptr.1.preference =
+dns_cache_naptr.1.replace =
+dns_cache_naptr.1.service = 
+dns_cache_naptr.1.ttl = 
+
+
+#######################################################################################
+##                           V80 Add                                                 ##
+#######################################################################################
+## Add Time 2015.6.26
+static.network.attempt_expired_time = 
+static.network.dhcp.server_mac1 = 
+static.network.dhcp.server_mac2 =  
+features.redial_via_local_sip_server.enable =
+features.action_uri_force_autop = 
+features.call_out_history_by_off_hook.enable =
+features.blf_call_out_by_number.enable =
+features.save_init_num_to_history.enable =
+features.action_uri.enable = 
+features.headset_play_phone_ringtone.enable = 
+features.forward.emergency.enable = 
+features.forward.emergency.authorized_number = 
+features.auto_answer_tone.enable = 
+features.ip_call.auto_answer.enable =
+custom.features.dnd_sync.enable = 
+default_input_method.xml_browser_input_screen = 
+action_url.headset = 
+action_url.handfree
+action_url.cancel_callout = 
+action_url.remote_busy = 
+action_url.call_remote_canceled = 
+action_url.call_waiting_on =
+action_url.call_waiting_off =
+sip.terminate_notify_sub_delay_time =
+sip.bind_local_addr_enable = 
+voice.side_tone = 
+static.security.default_access_level =
+static.auto_provision.attempt_expired_time = 
+phone_setting.ringback_timeout = 
+phone_setting.ringing_timeout =  
+
+
+#######################################################################################
+##                              V80-SP1 Add                                          ##
+#######################################################################################
+##Add Time 2015.9.2
+static.wifi.enable = {$yealink_wifi_enable}
+static.wifi.1.label = {$yealink_wifi_1_label}
+static.wifi.1.ssid = {$yealink_wifi_1_ssid}
+static.wifi.1.security_mode = {$yealink_wifi_1_security}
+static.wifi.1.cipher_type = {$yealink_wifi_1_cipher}
+static.wifi.1.password = {$yealink_wifi_1_password}
+features.bluetooth_adapter_name= {$yealink_bluetooth_name}
+
+
+#######################################################################################
+##                              V80-SP2 Add                                          ##
+#######################################################################################
+##Add Time 2016.5.26
+features.power_saving.enable = {$yealink_powersave_enable}
+features.power_saving.office_hour.idle_timeout = {$yealink_powersave_office_hour_timeout}
+features.power_saving.off_hour.idle_timeout = {$yealink_powersave_off_hour_timeout}
+features.power_saving.user_input_ext.idle_timeout = {$yealink_powersave_user_input_timeout}
+features.power_saving.office_hour.monday = {$yealink_powersave_hour_mon}
+features.power_saving.office_hour.tuesday = {$yealink_powersave_hour_tue}
+features.power_saving.office_hour.wednesday = {$yealink_powersave_hour_wed}
+features.power_saving.office_hour.thursday = {$yealink_powersave_hour_thu}
+features.power_saving.office_hour.friday  = {$yealink_powersave_hour_fri}
+features.power_saving.office_hour.saturday  = {$yealink_powersave_hour_sat}
+features.power_saving.office_hour.sunday = {$yealink_powersave_hour_sun}
+screensaver.wait_time = {$yealink_screensaver_wait}
+
+
+#######################################################################################
+##                              V81 Add                                              ##
+#######################################################################################
+dialplan.digitmap.apply_to.on_hook_dial =
+dialplan.digitmap.apply_to.directory_dial =
+dialplan.digitmap.apply_to.forward =
+dialplan.digitmap.apply_to.press_send =
+dialplan.digitmap.enable =
+dialplan.digitmap.string =
+dialplan.digitmap.interdigit_long_timer =
+dialplan.digitmap.interdigit_short_timer =
+dialplan.digitmap.no_match_action =
+dialplan.digitmap.active.on_hook_dialing =
+static.auto_provision.flexible.enable =
+static.auto_provision.flexible.interval=
+static.auto_provision.flexible.begin_time =
+static.auto_provision.flexible.end_time =
+voice.jib.wifi.adaptive = {$yealink_jib_wifi_adaptive}
+voice.jib.wifi.min = {$yealink_jib_wifi_min}
+voice.jib.wifi.max = {$yealink_jib_wifi_max}
+voice.jib.wifi.normal = {$yealink_jib_wifi_normal}
+wui.quick_login =
+multicast.listen_address.1.volume =
+multicast.receive.use_speaker =
+multicast.listen_address.1.channel =
+multicast.paging_address.1.channel =
+dialplan.emergency.asserted_id_source =
+dialplan.emergency.custom_asserted_id =
+dialplan.emergency.server.1.address =
+dialplan.emergency.server.1.port =
+dialplan.emergency.server.1.transport_type =
+dialplan.emergency.1.value =
+dialplan.emergency.1.server_priority =
+features.keep_mute.enable =
+voice.tone.secondary_dial =
+features.power_saving.intelligent_mode =
+features.blf_active_backlight.enable =
+features.intercom.headset_prior.enable =
+expansion_module.1.key.1.extension =
diff --git a/resources/templates/provision/yealink/t58a/{$mac}.cfg b/resources/templates/provision/yealink/t58a/{$mac}.cfg
new file mode 100644
index 0000000000..a9fb33366c
--- /dev/null
+++ b/resources/templates/provision/yealink/t58a/{$mac}.cfg
@@ -0,0 +1,3070 @@
+#!version:1.0.0.1
+#{$microtime}
+
+##File header "#!version:1.0.0.1" can not be edited or deleted, and must be placed in the first line.##
+
+#######################################################################################
+##                           Account 1 Basic Settings                                ##
+#######################################################################################
+{if isset($account.1.password) }
+account.1.enable = 1
+{else}
+account.1.enable = 0
+{/if}
+account.1.label = {$account.1.display_name}
+account.1.display_name = {$account.1.display_name}
+account.1.auth_name = {$account.1.auth_id} 
+{if isset($account.1.server.1.address)}
+account.1.user_name = {$account.1.user_id}@{$account.1.server_address}
+{else}
+account.1.user_name = {$account.1.user_id}
+{/if}
+account.1.password = {$account.1.password}
+account.1.outbound_proxy_enable = {if isset($account.1.outbound_proxy_primary)}1{else}0{/if}
+
+account.1.outbound_proxy.1.address = {$account.1.outbound_proxy_primary}
+{if isset($outbound_proxy_1_port)}
+account.1.outbound_proxy.1.port = {$outbound_proxy_1_port}
+{else}
+account.1.outbound_proxy.1.port = {$account.1.sip_port}
+{/if}
+account.1.dial_tone =
+account.1.outbound_proxy.2.address = {$account.1.outbound_proxy_secondary}
+{if isset($outbound_proxy_1_port)}
+account.1.outbound_proxy.2.port = {$outbound_proxy_2_port}
+{else}
+account.1.outbound_proxy.2.port = {$account.1.sip_port}
+{/if}
+account.1.outbound_proxy_fallback_interval = 120
+
+##It configures the transport type for account 1. 0-UDP,1-TCP,2-TLS,3-DNS-NAPTR
+##The default value is 0.
+
+{if $account.1.sip_transport == 'udp'}account.1.sip_server.1.transport_type = 0{/if}
+{if $account.1.sip_transport == 'tcp'}account.1.sip_server.1.transport_type = 1{/if}
+{if $account.1.sip_transport == 'tls'}account.1.sip_server.1.transport_type = 2{/if}
+{if $account.1.sip_transport == 'dns srv'}account.1.sip_server.1.transport_type = 3{/if}
+
+##It configures the backup server transport type for account 1. 0-UDP,1-TCP,2-TLS,3-DNS-NAPTR
+##The default value is 0. 
+
+{if $account.1.sip_transport == 'udp'}account.1.sip_server.2.transport_type = 0{/if}
+{if $account.1.sip_transport == 'tcp'}account.1.sip_server.2.transport_type = 1{/if}
+{if $account.1.sip_transport == 'tls'}account.1.sip_server.2.transport_type = 2{/if}
+{if $account.1.sip_transport == 'dns srv'}account.1.sip_server.2.transport_type = 3{/if}
+
+#######################################################################################
+##                          Failback                                                 ##
+#######################################################################################
+
+account.1.naptr_build = 0
+account.1.fallback.redundancy_type = 0
+account.1.fallback.timeout = {$yealink_outbound_proxy_fallback_interval}
+
+{if isset($account.1.server.1.address)}
+account.1.sip_server.1.address = {$account.1.server.1.address}
+{else}
+account.1.sip_server.1.address = {$account.1.server_address}
+{/if}
+
+account.1.sip_server.1.port = {$account.1.sip_port}
+account.1.sip_server.1.expires = {$account.1.register_expires}
+account.1.sip_server.1.retry_counts = 3
+account.1.sip_server.1.failback_mode = 0
+account.1.sip_server.1.failback_timeout = 3600
+account.1.sip_server.1.register_on_enable = 0
+account.1.sip_server.2.address = {$account.1.server.2.address}
+account.1.sip_server.2.port = {$account.1.sip_port}
+account.1.sip_server.2.expires = {$account.1.register_expires}
+account.1.sip_server.2.retry_counts = 3 
+account.1.sip_server.2.failback_mode =  0
+account.1.sip_server.2.failback_timeout = 3600 
+account.1.sip_server.2.register_on_enable = 0
+
+account.1.dns_cache_type = 
+account.1.static_cache_pri = 
+account.1.register_expires_overlap = 
+account.1.subscribe_expires_overlap =
+
+
+#######################################################################################
+##                           Register Advanced                                       ##
+#######################################################################################
+##It configures the SIP server type for account X.0-Default,2-BroadSoft,4-Cosmocom,6-UCAP
+##The default value is 0.
+
+account.1.sip_server_type = 
+
+account.1.unregister_on_reboot = 
+account.1.proxy_require = 
+account.1.srv_ttl_timer_enable = 
+account.1.register_mac = 
+account.1.register_line = 
+account.1.reg_fail_retry_interval = 
+
+
+######################################################################################
+##                     NAT Settings                                                 ##
+######################################################################################
+##It enables or disables the NAT traversal for account X.0-Disabled,1-Enabled
+##The default value is 0.
+account.1.nat.nat_traversal = {if isset($stun_server)}1{else}0{/if}
+
+##It configures the type of keep-alive packets sent by the phone to the NAT static to keep the communication port open so that NAT can continue to function for account X.
+##0-Dsiabled,1-Default: the phone sends UDP packets to the server,2-Option: the phone sends SIP OPTION packets to the server,3-Notify: the phone sends SIP NOTIFY packets to the server.
+##The default value is 1.
+account.1.nat.udp_update_enable = 3
+
+##It configures the keep-alive interval (in seconds) for account X.
+##The default value is 30.Integer from 15 to 2147483647
+account.1.nat.udp_update_time = 30
+
+##It enables or disables NAT Rport feature for account X.0-Disabled,1-Enabled
+##The default value is 0.
+account.1.nat.rport = {$yealink_rport}
+
+
+#######################################################################################
+##                            Account1 Advance Settings                              ##
+#######################################################################################
+
+##It configures the voice mail number for account X.
+##The default value is blank.
+voice_mail.number.1 = {$voicemail_number}
+
+##Except T19P/T21P Models
+account.1.auto_dial_enable =
+account.1.auto_dial_num =
+
+account.1.call_id_mode =
+account.1.call_info =
+
+
+#######################################################################################
+##                            Subscribe                                              ##
+#######################################################################################
+##It enables or disables the phone to subscribe the message waiting indicator for account X.0-Disabled,1-Enabled.
+##The default value is 0.
+account.1.subscribe_mwi = 
+
+##It is configuration MWI is NOTIFY messages, whether in Terminated status attributes.
+##The default value is 0(Don't handle terminated values)
+account.1.mwi_parse_terminated =
+
+##It configures the interval (in seconds) of MWI subscription for account X.
+##The default value is 3600.
+account.1.subscribe_mwi_expires = 
+
+##It enables or disables the phone to subscribe to the voice mail number for the message waiting indicator for account X.0-Disabled,1-Enabled.
+##The default value is 0.
+account.1.subscribe_mwi_to_vm = 
+
+##It configures the period (in seconds) of ACD subscription for account X.
+##The default value is 1800.Except T19P/T21P Models
+account.1.subscribe_acd_expires= 
+
+account.1.display_mwi.enable=
+
+
+#######################################################################################
+##                            BLF List(Except T19D Model)                            ##
+#######################################################################################
+##It configures the BLF List URI to monitor a list of users for account X.
+##The default value is blank.
+account.1.blf.blf_list_uri = 
+
+##It configures the feature access code for directed call pickup (default: *97) for account X.
+##The default value is blank.
+account.1.blf_list_code = 
+
+##It configures the feature access code for directed call pickup with barge-in (default: *33) for account X.
+##The default value is blank.
+account.1.blf_list_barge_in_code = 
+
+##It configures the period (in seconds) of the BLF subscription for account X.
+##The default value is 1800.Integer from 30 to 2147483647.
+account.1.blf.subscribe_period = 
+
+##It configures the event of the BLF subscription for account X.0-Dialog,1-Presence.
+##The default value is 0.
+account.1.blf.subscribe_event =
+
+##It enables or disables the phone to handle NOTIFY messages out of the BLF dialog for account X.0-Disabled,1-Enabled.
+##The default value is 0.
+account.1.out_dialog_blf_enable = 
+
+##It configures the BLF List Retrieve call parked code for account X.
+##The default value is blank
+account.1.blf_list_retrieve_call_parked_code = 
+
+account.1.blf.match_host.enable= 
+
+
+#######################################################################################
+##                            BLA/SCA                                                ##
+#######################################################################################
+##It enables or disables Broadsoft SCA feature for account X.0-Disabled,1-Broadsoft SCA.
+##The default value is 0.
+account.1.shared_line = {$account.1.shared_line}
+
+##It configures the BLA number for account X.
+##The default value is blank.
+account.1.bla_number = 
+
+##It configures the period (in seconds) of BLA subscription for account X. 
+##The default value is 300.Integer from 60 to 7200
+account.1.bla_subscribe_period = 
+
+##Except T19P/T21P Models
+##It configures the Call Pull Feature access code for account X.
+##The default value is blank.
+account.1.shared_line_callpull_code =
+##It configures number of linekey for line.
+##The default value is 1,you should enable auto line keys first.
+account.1.number_of_linekey = 
+##It config whether you can retrieve the remote hold call through line key
+##The default value is 1
+account.1.shared_line_one_touch_retrieve.enable=
+##It config whether you can barge in the active call through line key
+##The default value is 1
+account.1.shared_line_one_touch_bargein.enable =
+
+
+#######################################################################################
+##                            Brosoft Callpark                                       ##
+#######################################################################################
+##It enables or disables Broadsoft Callpark for account X.0-Disabled,1-Broadsoft SCA.
+##The default value is 0.
+account.1.callpark_enable =
+
+
+#######################################################################################
+##                            Audio Codec                                            ##
+#######################################################################################
+
+account.1.codec.ilbc_15_2kbps.priority= 0
+account.1.codec.ilbc_15_2kbps.enable= 0
+account.1.codec.ilbc_13_33kbps.priority= {if isset($yealink_codec_iLBC_priority)}{$yealink_codec_iLBC_priority}{else}0{/if}
+account.1.codec.ilbc_13_33kbps.enable = {if isset($yealink_codec_iLBC_enable)}1{else}0{/if}
+account.1.codec.pcma.enable= {if isset($yealink_codec_pcma_enable)}1{else}0{/if}
+account.1.codec.pcma.priority= {if isset($yealink_codec_pcma_priority)}{$yealink_codec_pcma_priority}{else}0{/if}
+account.1.codec.pcmu.enable= {if isset($yealink_codec_pcmu_enable)}1{else}0{/if}
+account.1.codec.pcmu.priority= {if isset($yealink_codec_pcmu_priority)}{$yealink_codec_pcmu_priority}{else}0{/if}
+account.1.codec.opus.priority = {if isset($yealink_codec_opus_priority)}{$yealink_codec_opus_priority}{else}0{/if}
+account.1.codec.opus.enable= {if isset($yealink_codec_opus_enable)}1{else}0{/if}
+account.1.codec.opus.para=
+account.1.codec.g726_40.enable= {if isset($yealink_codec_g726_40_enable)}1{else}0{/if}
+account.1.codec.g726_40.priority= {if isset($yealink_codec_g726_40_priority)}{$yealink_codec_g726_40_priority}{else}0{/if}
+account.1.codec.g726_32.enable= {if isset($yealink_codec_g726_32_enable)}1{else}0{/if}
+account.1.codec.g726_32.priority= {if isset($yealink_codec_g726_32_priority)}{$yealink_codec_g726_32_priority}{else}0{/if}
+account.1.codec.g726_24.enable= {if isset($yealink_codec_g726_24_enable)}1{else}0{/if}
+account.1.codec.g726_24.priority= {if isset($yealink_codec_g726_24_priority)}{$yealink_codec_g726_24_priority}{else}0{/if}
+account.1.codec.g726_16.enable= {if isset($yealink_codec_g726_16_enable)}1{else}0{/if}
+account.1.codec.g726_16.priority= {if isset($yealink_codec_g726_16_priority)}{$yealink_codec_g726_16_priority}{else}0{/if}
+account.1.codec.g723_63.priority= {if isset($yealink_codec_g723_63_priority)}{$yealink_codec_g723_63_priority}{else}0{/if}
+account.1.codec.g723_63.enable= {if isset($yealink_codec_g723_63_enable)}1{else}0{/if}
+account.1.codec.g723_53.priority= {if isset($yealink_codec_g723_53_priority)}{$yealink_codec_g723_53_priority}{else}0{/if}
+account.1.codec.g723_53.enable= {if isset($yealink_codec_g723_53_enable)}1{else}0{/if}
+account.1.codec.g729.priority= {if isset($yealink_codec_g729_priority)}{$yealink_codec_g729_priority}{else}0{/if}
+account.1.codec.g729.enable= {if isset($yealink_codec_g729_enable)}1{else}0{/if}
+account.1.codec.g722.priority= {if isset($yealink_codec_g722_priority)}{$yealink_codec_g722_priority}{else}0{/if}
+account.1.codec.g722.enable= {if isset($yealink_codec_g722_enable)}1{else}0{/if}
+
+account.1.codec.g722_1_24kpbs.enable = 
+account.1.codec.g722_1_24kpbs.para = 
+account.1.codec.g722_1_24kpbs.priority = 
+account.1.codec.g722_1_24kpbs.rtpmap = 
+account.1.codec.g722_1_24kpbs.samplerate = 
+
+account.1.codec.g722_1c_24kpbs.enable =
+account.1.codec.g722_1c_24kpbs.para = 
+account.1.codec.g722_1c_24kpbs.priority =
+account.1.codec.g722_1c_24kpbs.rtpmap = 
+account.1.codec.g722_1c_24kpbs.samplerate = 
+
+account.1.codec.g722_1c_24kpbs.enable =
+account.1.codec.g722_1c_24kpbs.para = 
+account.1.codec.g722_1c_24kpbs.priority =
+account.1.codec.g722_1c_24kpbs.rtpmap = 
+account.1.codec.g722_1c_24kpbs.samplerate = 
+
+account.1.codec.g722_1c_32kpbs.enable =
+account.1.codec.g722_1c_32kpbs.para = 
+account.1.codec.g722_1c_32kpbs.priority =
+account.1.codec.g722_1c_32kpbs.rtpmap = 
+account.1.codec.g722_1c_32kpbs.samplerate = 
+
+account.1.codec.g722_1c_48kpbs.enable =
+account.1.codec.g722_1c_48kpbs.para = 
+account.1.codec.g722_1c_48kpbs.priority =
+account.1.codec.g722_1c_48kpbs.rtpmap = 
+account.1.codec.g722_1c_48kpbs.samplerate = 
+
+
+#######################################################################################
+##                            Audio Advanced                                         ##
+#######################################################################################
+##It configures the RTP packet time for account X.0 (Disabled), 10, 20, 30, 40, 50 or 60.
+##The default value is 20.
+account.1.ptime =
+
+
+#######################################################################################
+##                            Anonymous Call                                         ##
+#######################################################################################
+account.1.send_anonymous_code = 
+account.1.anonymous_call = 
+account.1.anonymous_call_oncode = 
+account.1.anonymous_call_offcode = 
+account.1.reject_anonymous_call = 
+account.1.anonymous_reject_oncode = 
+account.1.anonymous_reject_offcode = 
+account.1.send_anonymous_rejection_code =
+
+
+#######################################################################################
+##                            Pickup Code                                            ##
+#######################################################################################
+##It enables or disables the phone to pick up a call according to the SIP header of dialog-info for account X.0-Disabled,1-Enabled.
+##The default value is 0.
+account.1.dialoginfo_callpickup = 
+
+##It configures the group pickup code for account X.
+##The default value is blank.
+account.1.group_pickup_code = 
+
+##It configures the directed pickup code for account X.
+##The default value is blank.
+account.1.direct_pickup_code = 
+
+
+#######################################################################################
+##                            DTMF                                                   ##
+#######################################################################################
+account.1.dtmf.type = {$yealink_dtmf_type}
+account.1.dtmf.info_type = 
+account.1.dtmf.dtmf_payload = 
+
+
+#######################################################################################
+##                            Alert info                                             ##
+#######################################################################################
+##It enables or disables the distinctive ringtones by the Alert-Info SIP header for account X.0-Disabled,1-Enabled.
+##The default value is 0.
+account.1.alert_info_url_enable = 
+##Except T19P/T21P Models
+##The default value is blank.Values range 256 characters in length
+account.1.alert_info =
+
+account.1.ringtone.ring_type = 
+
+###Only for T46G Model
+##It enables or disables the phone to download the picture information for account X when receiving an incoming call or during a call.0-Disabled,1-Enabled.
+##The default value is 0.
+account.1.picture_info_enable = 
+
+
+#######################################################################################
+##                            Conference                                             ##
+#######################################################################################
+##It configures the conference type for account X.0-Local Conference,2-Network Conference.
+##The default value is 0.
+account.1.conf_type = {if $nway_conference == true}2{/if} 
+
+##It configures the network conference URI for account X.
+##The default value is blank.
+account.1.conf_uri = {if $nway_conference == true}nway{$account.1.auth_id}@{$account.1.server_address}{/if} 
+
+
+#######################################################################################
+##                            CID Source                                             ##
+#######################################################################################
+account.1.cid_source = {$yealink_cid_source}
+account.1.cid_source_privacy = 1
+account.1.cid_source_ppi = 1
+account.1.cp_source = 2
+
+
+#######################################################################################
+##                            Session Timer                                          ##
+#######################################################################################
+account.1.session_timer.enable = {$yealink_session_timer}
+account.1.session_timer.expires = 
+account.1.session_timer.refresher = 
+
+
+#######################################################################################
+##                            Music on Hold                                          ##
+#######################################################################################
+##It configures the way on how the phone processes Music On Hold when placing an active call on hold for account X.
+##0-Calling the music server before holding
+##1-Calling the music server after holding
+##The default value is 0.
+account.1.music_on_hold_type = 
+
+##It configures the URI of the Music On Hold server for account X.
+##The default value is blank.
+account.1.music_server_uri = 
+
+
+#######################################################################################
+##                            Advanced                                               ##
+#######################################################################################
+account.1.auto_answer = 
+account.1.missed_calllog = 
+account.1.100rel_enable = {$yealink_retransmission}
+account.1.enable_user_equal_phone = 
+account.1.compact_header_enable = 
+account.1.custom_ua =
+
+
+#######################################################################################
+##                                   DND(Except T19 Model)                           ##
+#######################################################################################
+account.1.dnd.enable =
+account.1.dnd.on_code = 
+account.1.dnd.off_code =
+
+
+#######################################################################################
+##                                 Call Forward(Except T19 Model)                    ##
+#######################################################################################
+account.1.always_fwd.enable = 
+account.1.always_fwd.target = 
+account.1.always_fwd.off_code =
+account.1.always_fwd.on_code =
+account.1.busy_fwd.enable =          
+account.1.busy_fwd.target =         
+account.1.busy_fwd.off_code =
+account.1.busy_fwd.on_code =
+account.1.timeout_fwd.enable = 
+account.1.timeout_fwd.target =
+account.1.timeout_fwd.timeout =  
+account.1.timeout_fwd.off_code =
+account.1.timeout_fwd.on_code = 
+
+
+#######################################################################################
+##                                   Voice Monitoring  (Except T19P/T21P Models)                  ##
+#######################################################################################
+account.1.vq_rtcpxr.collector_name=
+account.1.vq_rtcpxr.collector_server_host=
+account.1.vq_rtcpxr.collector_server_port=
+
+
+#######################################################################################
+##         Broadsoft XSI                    ##
+#######################################################################################
+##It configures the user name for XSI authentication for account X.Example:account.1.xsi.user = 3502@as.iop1.broadworks.net.
+##The default value is blank.
+account.1.xsi.user =  
+
+##It configures the password for XSI authentication for account X.Example:account.1.xsi.password = 123456.
+##The default value is blank.
+account.1.xsi.password = 
+
+##It configures the access URL of the Xtended Services Platform server for account X.Example:account.1.xsi.host = xsp1.iop1.broadworks.net.
+##The default value is blank.
+account.1.xsi.host = 
+
+##It configures the server type of the Xtended Services Platform server for account X.Example:account.1.xsi.server_type = http.
+##The default value is http.
+account.1.xsi.server_type = 
+
+##It configures the server port of the Xtended Services Platform server for account X.Example:account.1.xsi.port = 80.
+##The default value is 80.Integer from 1 to 65535
+account.1.xsi.port = 
+
+
+#######################################################################################
+##                           Account 2 Basic Settings                                ##
+#######################################################################################
+{if isset($account.2.password) }
+account.2.enable = 1
+{else}
+account.2.enable = 0
+{/if}
+account.2.label = {$account.2.display_name}
+account.2.display_name = {$account.2.display_name}
+account.2.auth_name = {$account.2.auth_id}
+account.2.password = {$account.2.password}
+
+{if isset($account.2.server.1.address)}
+account.2.user_name = {$account.2.user_id}@{$account.2.server_address}
+{else}
+account.2.user_name = {$account.2.user_id}
+{/if}
+
+account.2.outbound_proxy_enable = {if isset($account.2.outbound_proxy_primary)}1{else}0{/if}
+
+account.2.outbound_proxy.1.address = {$account.2.outbound_proxy_primary}
+account.2.outbound_proxy.1.port = {$account.2.sip_port}
+account.2.dial_tone =
+account.2.outbound_proxy.2.address = {$account.2.outbound_proxy_secondary}
+account.2.outbound_proxy.2.port = {$account.2.sip_port}
+account.2.outbound_proxy_fallback_interval =
+
+##It configures the transport type for account 1. 0-UDP,1-TCP,2-TLS,3-DNS-NAPTR
+##The default value is 0.
+
+{if $account.2.sip_transport == 'udp'}account.2.sip_server.1.transport_type = 0{/if}
+{if $account.2.sip_transport == 'tcp'}account.2.sip_server.1.transport_type = 1{/if}
+{if $account.2.sip_transport == 'tls'}account.2.sip_server.1.transport_type = 2{/if}
+{if $account.2.sip_transport == 'dns srv'}account.2.sip_server.1.transport_type = 3{/if}
+
+##It configures the backup server transport type for account 1. 0-UDP,1-TCP,2-TLS,3-DNS-NAPTR
+##The default value is 0. 
+
+{if $account.2.sip_transport == 'udp'}account.2.sip_server.2.transport_type = 0{/if}
+{if $account.2.sip_transport == 'tcp'}account.2.sip_server.2.transport_type = 1{/if}
+{if $account.2.sip_transport == 'tls'}account.2.sip_server.2.transport_type = 2{/if}
+{if $account.2.sip_transport == 'dns srv'}account.2.sip_server.2.transport_type = 3{/if}
+
+
+#######################################################################################
+##                          Failback                                                 ##
+#######################################################################################
+
+account.2.naptr_build = 0
+account.2.fallback.redundancy_type = 0
+account.2.fallback.timeout = {$yealink_outbound_proxy_fallback_interval}
+
+{if isset($account.2.server.1.address)}
+account.2.sip_server.1.address = {$account.2.server.1.address}
+{else}
+account.2.sip_server.1.address = {$account.2.server_address}
+{/if}
+
+account.2.sip_server.1.port = {$account.2.sip_port}
+account.2.sip_server.1.expires = {$account.2.register_expires}
+account.2.sip_server.1.retry_counts = 3
+account.2.sip_server.1.failback_mode = 0
+account.2.sip_server.1.failback_timeout = 3600
+account.2.sip_server.1.register_on_enable = 0
+account.2.sip_server.2.address = {$account.2.server.2.address}
+account.2.sip_server.2.port = {$account.2.sip_port}
+account.2.sip_server.2.expires = {$account.2.register_expires}
+account.2.sip_server.2.retry_counts = 3
+account.2.sip_server.2.failback_mode = 0
+account.2.sip_server.2.failback_timeout = 3600
+account.2.sip_server.2.register_on_enable = 0
+
+account.2.dns_cache_type = 
+account.2.static_cache_pri = 
+account.2.register_expires_overlap = 
+account.2.subscribe_expires_overlap =
+
+
+#######################################################################################
+##                           Register Advanced                                       ##
+#######################################################################################
+##It configures the SIP server type for account X.0-Default,2-BroadSoft,4-Cosmocom,6-UCAP
+##The default value is 0.
+account.2.sip_server_type = 
+account.2.unregister_on_reboot = 
+account.2.proxy_require = 
+account.2.srv_ttl_timer_enable = 
+account.2.register_mac = 
+account.2.register_line = 
+account.2.reg_fail_retry_interval = 
+
+
+######################################################################################
+##                     NAT Settings                                                 ##
+######################################################################################
+##It enables or disables the NAT traversal for account X.0-Disabled,1-Enabled
+##The default value is 0.
+account.2.nat.nat_traversal = 
+##It configures the type of keep-alive packets sent by the phone to the NAT static to keep the communication port open so that NAT can continue to function for account X.
+##0-Dsiabled,1-Default: the phone sends UDP packets to the server,2-Option: the phone sends SIP OPTION packets to the server,3-Notify: the phone sends SIP NOTIFY packets to the server.
+##The default value is 1.
+account.2.nat.udp_update_enable = 
+
+##It configures the keep-alive interval (in seconds) for account X.
+##The default value is 30.Integer from 15 to 2147483647
+account.2.nat.udp_update_time = 
+
+##It enables or disables NAT Rport feature for account X.0-Disabled,1-Enabled
+##The default value is 0.
+account.2.nat.rport = {$yealink_rport}
+
+
+#######################################################################################
+##                            Account2 Advance Settings                              ##
+#######################################################################################
+
+##It configures the voice mail number for account X.
+##The default value is blank.
+voice_mail.number.2 = {$voicemail_number}
+##Except T19P/T21P Models
+account.2.auto_dial_enable =
+account.2.auto_dial_num =
+
+account.2.call_id_mode =
+account.2.call_info =
+
+
+#######################################################################################
+##                            Subscribe                                              ##
+#######################################################################################
+##It enables or disables the phone to subscribe the message waiting indicator for account X.0-Disabled,1-Enabled.
+##The default value is 0.
+account.2.subscribe_mwi = 
+##It is configuration MWI is NOTIFY messages, whether in Terminated status attributes.
+##The default value is 0(Don't handle terminated values)
+account.2.mwi_parse_terminated =
+##It configures the interval (in seconds) of MWI subscription for account X.
+##The default value is 3600.
+account.2.subscribe_mwi_expires = 
+##It enables or disables the phone to subscribe to the voice mail number for the message waiting indicator for account X.0-Disabled,1-Enabled.
+##The default value is 0.
+account.2.subscribe_mwi_to_vm = 
+##It configures the period (in seconds) of ACD subscription for account X.
+##The default value is 1800.Except T19P/T21P Models
+account.2.subscribe_acd_expires= 
+##Except T19P/T21P Models
+account.2.display_mwi.enable =
+##It is configuration MWI is NOTIFY messages, whether in Terminated status attributes.
+##The default value is 0(Don't handle terminated values)
+account.2.mwi_parse_terminated =
+
+
+#######################################################################################
+##                            BLF List(Except T19D Model)                            ##
+#######################################################################################
+##It configures the BLF List URI to monitor a list of users for account X.
+##The default value is blank.
+account.2.blf.blf_list_uri = 
+##It configures the feature access code for directed call pickup (default: *97) for account X.
+##The default value is blank.
+account.2.blf_list_code = 
+##It configures the feature access code for directed call pickup with barge-in (default: *33) for account X.
+##The default value is blank.
+account.2.blf_list_barge_in_code = 
+
+##It configures the period (in seconds) of the BLF subscription for account X.
+##The default value is 1800.Integer from 30 to 2147483647.
+account.2.blf.subscribe_period = 
+##It configures the event of the BLF subscription for account X.0-Dialog,1-Presence.
+##The default value is 0.
+account.2.blf.subscribe_event =
+##It enables or disables the phone to handle NOTIFY messages out of the BLF dialog for account X.0-Disabled,1-Enabled.
+##The default value is 0.
+account.2.out_dialog_blf_enable = 
+##It configures the BLF List Retrieve call parked code for account X.
+##The default value is blank
+account.2.blf_list_retrieve_call_parked_code = 
+account.2.blf.match_host.enable= 
+
+
+#######################################################################################
+##                            BLA/SCA                                                ##
+#######################################################################################
+##It enables or disables Broadsoft SCA feature for account X.0-Disabled,1-Broadsoft SCA.
+##The default value is 0.
+account.2.shared_line = {$account.2.shared_line}
+##It configures the BLA number for account X.
+##The default value is blank.
+account.2.bla_number = 
+##It configures the period (in seconds) of BLA subscription for account X. 
+##The default value is 300.Integer from 60 to 7200
+account.2.bla_subscribe_period = 
+##It configures the Call Pull Feature access code for account X.
+##The default value is blank.
+account.2.shared_line_callpull_code =
+##It configures number of linekey for line.
+##The default value is 1,you should enable auto line keys first.
+account.2.number_of_linekey = 
+
+##It config whether you can retrieve the remote hold call through line key
+##The default value is 1
+account.2.shared_line_one_touch_retrieve.enable=
+
+##It config whether you can barge in the active call through line key
+##The default value is 1
+account.2.shared_line_one_touch_bargein.enable =
+
+
+#######################################################################################
+##                            Brosoft Callpark                                       ##
+#######################################################################################
+##It enables or disables Broadsoft Callpark for account X.0-Disabled,1-Broadsoft SCA.
+##The default value is 0.
+account.2.callpark_enable =
+
+
+#######################################################################################
+##                            Audio Codec                                            ##
+#######################################################################################
+account.2.codec.g722.enable =
+account.2.codec.g722.priority = 
+
+account.2.codec.g729.enable = 
+account.2.codec.g729.priority = 
+
+account.2.codec.g723_53.enable = 
+account.2.codec.g723_53.priority = 
+
+account.2.codec.g723_63.enable = 
+account.2.codec.g723_63.priority = 
+
+account.2.codec.g726_16.enable = 
+account.2.codec.g726_16.priority = 
+account.2.codec.g726_16.rtpmap = 
+
+account.2.codec.g726_24.enable = 
+account.2.codec.g726_24.priority = 
+account.2.codec.g726_24.rtpmap = 
+
+account.2.codec.g726_32.enable = 
+account.2.codec.g726_32.priority = 
+account.2.codec.g726_32.rtpmap = 
+
+account.2.codec.g726_40.enable = 
+account.2.codec.g726_40.priority = 
+account.2.codec.g726_40.rtpmap = 
+
+account.2.codec.ilbc.enable = 
+account.2.codec.ilbc.priority = 
+account.2.codec.ilbc.rtpmap = 
+
+account.2.codec.opus.enable = 
+account.2.codec.opus.priority = 
+account.2.codec.opus.rtpmap = 
+account.2.codec.opus.samplerate = 
+
+account.2.codec.pcmu.enable = 
+account.2.codec.pcmu.priority = 
+
+account.2.codec.pcma.enable =  
+account.2.codec.pcma.priority = 
+
+account.2.codec.g722_1_24kpbs.enable =
+account.2.codec.g722_1_24kpbs.para = 
+account.2.codec.g722_1_24kpbs.priority =
+account.2.codec.g722_1_24kpbs.rtpmap = 
+account.2.codec.g722_1_24kpbs.samplerate = 
+
+account.2.codec.g722_1c_24kpbs.enable =
+account.2.codec.g722_1c_24kpbs.para = 
+account.2.codec.g722_1c_24kpbs.priority =
+account.2.codec.g722_1c_24kpbs.rtpmap = 
+account.2.codec.g722_1c_24kpbs.samplerate = 
+
+account.2.codec.g722_1c_24kpbs.enable =
+account.2.codec.g722_1c_24kpbs.para = 
+account.2.codec.g722_1c_24kpbs.priority =
+account.2.codec.g722_1c_24kpbs.rtpmap = 
+account.2.codec.g722_1c_24kpbs.samplerate = 
+
+account.2.codec.g722_1c_32kpbs.enable =
+account.2.codec.g722_1c_32kpbs.para = 
+account.2.codec.g722_1c_32kpbs.priority =
+account.2.codec.g722_1c_32kpbs.rtpmap = 
+account.2.codec.g722_1c_32kpbs.samplerate = 
+
+account.2.codec.g722_1c_48kpbs.enable =
+account.2.codec.g722_1c_48kpbs.para = 
+account.2.codec.g722_1c_48kpbs.priority =
+account.2.codec.g722_1c_48kpbs.rtpmap = 
+account.2.codec.g722_1c_48kpbs.samplerate = 
+
+
+#######################################################################################
+##                            Audio Advanced                                         ##
+#######################################################################################
+##It configures the RTP packet time for account X.0 (Disabled), 10, 20, 30, 40, 50 or 60.
+##The default value is 20.
+account.2.ptime = 
+
+
+#######################################################################################
+##                            Anonymous Call                                         ##
+#######################################################################################
+account.2.send_anonymous_code = 
+account.2.anonymous_call = 
+account.2.anonymous_call_oncode = 
+account.2.anonymous_call_offcode = 
+account.2.reject_anonymous_call = 
+account.2.anonymous_reject_oncode = 
+account.2.anonymous_reject_offcode = 
+account.2.send_anonymous_rejection_code =
+
+
+#######################################################################################
+##                            Pickup Code                                            ##
+#######################################################################################
+##It enables or disables the phone to pick up a call according to the SIP header of dialog-info for account X.0-Disabled,1-Enabled.
+##The default value is 0.
+account.2.dialoginfo_callpickup = 
+##It configures the group pickup code for account X.
+##The default value is blank.
+account.2.group_pickup_code = 
+##It configures the directed pickup code for account X.
+##The default value is blank.
+account.2.direct_pickup_code = 
+
+
+#######################################################################################
+##                            DTMF                                                   ##
+#######################################################################################
+account.2.dtmf.type = {$yealink_dtmf_type}
+account.2.dtmf.info_type = 
+account.2.dtmf.dtmf_payload = 
+
+
+#######################################################################################
+##                            Alert info                                             ##
+#######################################################################################
+##It enables or disables the distinctive ringtones by the Alert-Info SIP header for account X.0-Disabled,1-Enabled.
+##The default value is 0.
+account.2.alert_info_url_enable = 
+##The default value is blank.Values range 256 characters in length
+account.2.alert_info =
+account.2.ringtone.ring_type = 
+
+##It enables or disables the phone to download the picture information for account X when receiving an incoming call or during a call.0-Disabled,1-Enabled.
+##The default value is 0.
+account.2.picture_info_enable = 
+
+
+#######################################################################################
+##                            Conference                                             ##
+#######################################################################################
+##It configures the conference type for account X.0-Local Conference,2-Network Conference.
+##The default value is 0.
+account.2.conf_type = {if $nway_conference == true}2{/if} 
+##It configures the network conference URI for account X.
+##The default value is blank.
+account.2.conf_uri = {if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if} 
+
+
+#######################################################################################
+##                            CID Source                                             ##
+#######################################################################################
+account.2.cid_source = {$yealink_cid_source}
+account.2.cid_source_privacy = 1
+account.2.cid_source_ppi = 1
+account.2.cp_source = 2
+
+
+#######################################################################################
+##                            Session Timer                                          ##
+#######################################################################################
+account.2.session_timer.enable = 
+account.2.session_timer.expires = 
+account.2.session_timer.refresher = 
+
+
+#######################################################################################
+##                            Music on Hold                                          ##
+#######################################################################################
+##It configures the way on how the phone processes Music On Hold when placing an active call on hold for account X.
+##0-Calling the music server before holding
+##1-Calling the music server after holding
+##The default value is 0.
+account.2.music_on_hold_type = 
+##It configures the URI of the Music On Hold server for account X.
+##The default value is blank.
+account.2.music_server_uri = 
+
+
+#######################################################################################
+##                            Advanced                                               ##
+#######################################################################################
+account.2.auto_answer = 
+account.2.missed_calllog = 
+account.2.100rel_enable = {$yealink_retransmission}
+account.2.enable_user_equal_phone = 
+account.2.compact_header_enable = 
+account.2.custom_ua =
+
+
+#######################################################################################
+##                                   DND(Except T19 Model)                           ##
+#######################################################################################
+account.2.dnd.enable =
+account.2.dnd.on_code = 
+account.2.dnd.off_code =
+
+
+#######################################################################################
+##                                 Call Forward(Except T19 Model)                    ##
+#######################################################################################
+account.2.always_fwd.enable = 
+account.2.always_fwd.target = 
+account.2.always_fwd.off_code =
+account.2.always_fwd.on_code =
+account.2.busy_fwd.enable =
+account.2.busy_fwd.target =
+account.2.busy_fwd.off_code =
+account.2.busy_fwd.on_code =
+account.2.timeout_fwd.enable = 
+account.2.timeout_fwd.target =
+account.2.timeout_fwd.timeout =  
+account.2.timeout_fwd.off_code =
+account.2.timeout_fwd.on_code = 
+
+
+#######################################################################################
+##                      Voice Monitoring  (Except T19P/T21P Models)                  ##
+#######################################################################################
+account.2.vq_rtcpxr.collector_name=
+account.2.vq_rtcpxr.collector_server_host=
+account.2.vq_rtcpxr.collector_server_port=
+
+
+#######################################################################################
+##                      Broadsoft XSI                                                ##
+#######################################################################################
+##It configures the user name for XSI authentication for account X.Example:account.2.xsi.user = 3502@as.iop1.broadworks.net.
+##The default value is blank.
+account.2.xsi.user =  
+
+##It configures the password for XSI authentication for account X.Example:account.2.xsi.password = 123456.
+##The default value is blank.
+account.2.xsi.password = 
+
+##It configures the access URL of the Xtended Services Platform server for account X.Example:account.2.xsi.host = xsp1.iop1.broadworks.net.
+##The default value is blank.
+account.2.xsi.host = 
+
+##It configures the server type of the Xtended Services Platform server for account X.Example:account.2.xsi.server_type = http.
+##The default value is http.
+account.2.xsi.server_type = 
+
+##It configures the server port of the Xtended Services Platform server for account X.Example:account.2.xsi.port = 80.
+##The default value is 80.Integer from 1 to 65535
+account.2.xsi.port = 
+
+
+#######################################################################################
+##                           Account 3 Basic Settings                                ##
+#######################################################################################
+{if isset($account.3.password) }
+account.3.enable = 1
+{else}
+account.3.enable = 0
+{/if}
+account.3.label = {$account.3.display_name}
+account.3.display_name = {$account.3.display_name}
+account.3.auth_name = {$account.3.auth_id}
+account.3.password = {$account.3.password}
+
+{if isset($account.3.server.1.address)}
+account.3.user_name = {$account.3.user_id}@{$account.3.server_address}
+{else}
+account.3.user_name = {$account.3.user_id}
+{/if}
+
+account.3.outbound_proxy_enable = {if isset($account.3.outbound_proxy_primary)}1{else}0{/if}
+
+account.3.outbound_proxy.1.address = {$account.3.outbound_proxy_primary}
+account.3.outbound_proxy.1.port = {$account.3.sip_port}
+account.3.dial_tone =
+account.3.outbound_proxy.2.address = {$account.3.outbound_proxy_secondary}
+account.3.outbound_proxy.2.port = {$account.3.sip_port}
+account.3.outbound_proxy_fallback_interval =
+
+##It configures the transport type for account 1. 0-UDP,1-TCP,2-TLS,3-DNS-NAPTR
+##The default value is 0.
+
+{if $account.3.sip_transport == 'udp'}account.3.sip_server.1.transport_type = 0{/if}
+{if $account.3.sip_transport == 'tcp'}account.3.sip_server.1.transport_type = 1{/if}
+{if $account.3.sip_transport == 'tls'}account.3.sip_server.1.transport_type = 2{/if}
+{if $account.3.sip_transport == 'dns srv'}account.3.sip_server.1.transport_type = 3{/if}
+
+##It configures the backup server transport type for account 1. 0-UDP,1-TCP,2-TLS,3-DNS-NAPTR
+##The default value is 0. 
+
+
+{if $account.3.sip_transport == 'udp'}account.3.sip_server.2.transport_type = 0{/if}
+{if $account.3.sip_transport == 'tcp'}account.3.sip_server.2.transport_type = 1{/if}
+{if $account.3.sip_transport == 'tls'}account.3.sip_server.2.transport_type = 2{/if}
+{if $account.3.sip_transport == 'dns srv'}account.3.sip_server.2.transport_type = 3{/if}
+
+
+#######################################################################################
+##                          Failback                                                 ##
+#######################################################################################
+
+account.3.naptr_build = 0
+account.3.fallback.redundancy_type = 0
+account.3.fallback.timeout = {$yealink_outbound_proxy_fallback_interval}
+
+{if isset($account.3.server.1.address)}
+account.3.sip_server.1.address = {$account.3.server.1.address}
+{else}
+account.3.sip_server.1.address = {$account.3.server_address}
+{/if}
+
+account.3.sip_server.1.port = {$account.3.sip_port}
+account.3.sip_server.1.expires = {$account.3.register_expires}
+account.3.sip_server.1.retry_counts = 3
+account.3.sip_server.1.failback_mode = 0
+account.3.sip_server.1.failback_timeout = 3600
+account.3.sip_server.1.register_on_enable = 0
+account.3.sip_server.2.address = {$account.3.server.2.address}
+account.3.sip_server.2.port = {$account.3.sip_port}
+account.3.sip_server.2.expires = {$account.3.register_expires}
+account.3.sip_server.2.retry_counts = 3
+account.3.sip_server.2.failback_mode = 0
+account.3.sip_server.2.failback_timeout = 3600
+account.3.sip_server.2.register_on_enable = 0
+
+account.3.dns_cache_type = 
+account.3.static_cache_pri = 
+account.3.register_expires_overlap = 
+account.3.subscribe_expires_overlap =
+
+
+#######################################################################################
+##                           Register Advanced                                       ##
+#######################################################################################
+##It configures the SIP server type for account X.0-Default,2-BroadSoft,4-Cosmocom,6-UCAP
+##The default value is 0.
+account.3.sip_server_type = 
+account.3.unregister_on_reboot = 
+account.3.proxy_require = 
+account.3.srv_ttl_timer_enable = 
+account.3.register_mac = 
+account.3.register_line = 
+account.3.reg_fail_retry_interval = 
+
+
+######################################################################################
+##                     NAT Settings                                                 ##
+######################################################################################
+##It enables or disables the NAT traversal for account X.0-Disabled,1-Enabled
+##The default value is 0.
+account.3.nat.nat_traversal = 
+
+##It configures the type of keep-alive packets sent by the phone to the NAT static to keep the communication port open so that NAT can continue to function for account X.
+##0-Dsiabled,1-Default: the phone sends UDP packets to the server,2-Option: the phone sends SIP OPTION packets to the server,3-Notify: the phone sends SIP NOTIFY packets to the server.
+##The default value is 1.
+account.3.nat.udp_update_enable = 
+
+##It configures the keep-alive interval (in seconds) for account X.
+##The default value is 30.Integer from 15 to 2147483647
+account.3.nat.udp_update_time = 
+
+##It enables or disables NAT Rport feature for account X.0-Disabled,1-Enabled
+##The default value is 0.
+account.3.nat.rport = {$yealink_rport}
+
+
+#######################################################################################
+##                            Account3 Advance Settings                              ##
+#######################################################################################
+##It configures the voice mail number for account X.
+##The default value is blank.
+voice_mail.number.3 = {$voicemail_number}
+##Except T19P/T21P Models
+account.3.auto_dial_enable =
+account.3.auto_dial_num =
+
+account.3.call_id_mode =
+account.3.call_info =
+
+
+#######################################################################################
+##                            Subscribe                                              ##
+#######################################################################################
+##It enables or disables the phone to subscribe the message waiting indicator for account X.0-Disabled,1-Enabled.
+##The default value is 0.
+account.3.subscribe_mwi = 
+##It is configuration MWI is NOTIFY messages, whether in Terminated status attributes.
+##The default value is 0(Don't handle terminated values)
+account.3.mwi_parse_terminated =
+
+##It configures the interval (in seconds) of MWI subscription for account X.
+##The default value is 3600.
+account.3.subscribe_mwi_expires = 
+##It enables or disables the phone to subscribe to the voice mail number for the message waiting indicator for account X.0-Disabled,1-Enabled.
+##The default value is 0.
+account.3.subscribe_mwi_to_vm = 
+##It configures the period (in seconds) of ACD subscription for account X.
+##The default value is 1800.Except T19P/T21P Models
+account.3.subscribe_acd_expires= 
+account.3.display_mwi.enable =
+##It is configuration MWI is NOTIFY messages, whether in Terminated status attributes.
+##The default value is 0(Don't handle terminated values)
+account.3.mwi_parse_terminated =
+
+
+#######################################################################################
+##                            BLF List(Except T19D Model)                            ##
+#######################################################################################
+##It configures the BLF List URI to monitor a list of users for account X.
+##The default value is blank.
+account.3.blf.blf_list_uri = 
+##It configures the feature access code for directed call pickup (default: *97) for account X.
+##The default value is blank.
+account.3.blf_list_code = 
+##It configures the feature access code for directed call pickup with barge-in (default: *33) for account X.
+##The default value is blank.
+account.3.blf_list_barge_in_code = 
+##It configures the period (in seconds) of the BLF subscription for account X.
+##The default value is 1800.Integer from 30 to 2147483647.
+account.3.blf.subscribe_period = 
+##It configures the event of the BLF subscription for account X.0-Dialog,1-Presence.
+##The default value is 0.
+account.3.blf.subscribe_event =
+##It enables or disables the phone to handle NOTIFY messages out of the BLF dialog for account X.0-Disabled,1-Enabled.
+##The default value is 0.
+account.3.out_dialog_blf_enable = 
+
+##It configures the BLF List Retrieve call parked code for account X.
+##The default value is blank
+account.3.blf_list_retrieve_call_parked_code = 
+account.3.blf.match_host.enable= 
+
+
+#######################################################################################
+##                            BLA/SCA                                                ##
+#######################################################################################
+##It enables or disables Broadsoft SCA feature for account X.0-Disabled,1-Broadsoft SCA.
+##The default value is 0.
+account.3.shared_line = {$account.3.shared_line}
+##It configures the BLA number for account X.
+##The default value is blank.
+account.3.bla_number = 
+##It configures the period (in seconds) of BLA subscription for account X. 
+##The default value is 300.Integer from 60 to 7200
+account.3.bla_subscribe_period = 
+##It configures the Call Pull Feature access code for account X.
+##The default value is blank.
+account.3.shared_line_callpull_code =
+##It configures number of linekey for line.
+##The default value is 1,you should enable auto line keys first.
+account.3.number_of_linekey =
+##It config whether you can retrieve the remote hold call through line key
+##The default value is 1.
+account.3.shared_line_one_touch_retrieve.enable=
+
+##It config whether you can barge in the active call through line key
+##The default value is 1
+account.3.shared_line_one_touch_bargein.enable =
+
+
+#######################################################################################
+##                            Brosoft Callpark                                       ##
+#######################################################################################
+##It enables or disables Broadsoft Callpark for account X.0-Disabled,1-Broadsoft SCA.
+##The default value is 0.
+account.3.callpark_enable =
+
+
+#######################################################################################
+##                            Audio Codec                                            ##
+#######################################################################################
+account.3.codec.g722.enable =
+account.3.codec.g722.priority = 
+
+account.3.codec.g729.enable = 
+account.3.codec.g729.priority = 
+
+account.3.codec.g723_53.enable = 
+account.3.codec.g723_53.priority = 
+
+account.3.codec.g723_63.enable = 
+account.3.codec.g723_63.priority = 
+
+account.3.codec.g726_16.enable = 
+account.3.codec.g726_16.priority = 
+account.3.codec.g726_16.rtpmap = 
+
+account.3.codec.g726_24.enable = 
+account.3.codec.g726_24.priority = 
+account.3.codec.g726_24.rtpmap = 
+
+account.3.codec.g726_32.enable = 
+account.3.codec.g726_32.priority = 
+account.3.codec.g726_32.rtpmap = 
+
+account.3.codec.g726_40.enable = 
+account.3.codec.g726_40.priority = 
+account.3.codec.g726_40.rtpmap = 
+
+account.3.codec.ilbc.enable = 
+account.3.codec.ilbc.priority = 
+account.3.codec.ilbc.rtpmap = 
+
+account.3.codec.opus.enable = 
+account.3.codec.opus.priority = 
+account.3.codec.opus.rtpmap = 
+account.3.codec.opus.samplerate = 
+
+account.3.codec.pcmu.enable = 
+account.3.codec.pcmu.priority = 
+
+account.3.codec.pcma.enable =  
+account.3.codec.pcma.priority = 
+
+account.3.codec.g722_1_24kpbs.enable =
+account.3.codec.g722_1_24kpbs.para = 
+account.3.codec.g722_1_24kpbs.priority =
+account.3.codec.g722_1_24kpbs.rtpmap = 
+account.3.codec.g722_1_24kpbs.samplerate = 
+
+account.3.codec.g722_1c_24kpbs.enable =
+account.3.codec.g722_1c_24kpbs.para = 
+account.3.codec.g722_1c_24kpbs.priority =
+account.3.codec.g722_1c_24kpbs.rtpmap = 
+account.3.codec.g722_1c_24kpbs.samplerate = 
+
+account.3.codec.g722_1c_24kpbs.enable =
+account.3.codec.g722_1c_24kpbs.para = 
+account.3.codec.g722_1c_24kpbs.priority =
+account.3.codec.g722_1c_24kpbs.rtpmap = 
+account.3.codec.g722_1c_24kpbs.samplerate = 
+
+account.3.codec.g722_1c_32kpbs.enable =
+account.3.codec.g722_1c_32kpbs.para = 
+account.3.codec.g722_1c_32kpbs.priority =
+account.3.codec.g722_1c_32kpbs.rtpmap = 
+account.3.codec.g722_1c_32kpbs.samplerate = 
+
+account.3.codec.g722_1c_48kpbs.enable =
+account.3.codec.g722_1c_48kpbs.para = 
+account.3.codec.g722_1c_48kpbs.priority =
+account.3.codec.g722_1c_48kpbs.rtpmap = 
+account.3.codec.g722_1c_48kpbs.samplerate = 
+
+
+#######################################################################################
+##                            Audio Advanced                                         ##
+#######################################################################################
+##It configures the RTP packet time for account X.0 (Disabled), 10, 20, 30, 40, 50 or 60.
+##The default value is 20.
+account.3.ptime = 
+
+
+#######################################################################################
+##                            Anonymous Call                                         ##
+#######################################################################################
+account.3.send_anonymous_code = 
+account.3.anonymous_call = 
+account.3.anonymous_call_oncode = 
+account.3.anonymous_call_offcode = 
+account.3.reject_anonymous_call = 
+account.3.anonymous_reject_oncode = 
+account.3.anonymous_reject_offcode = 
+account.3.send_anonymous_rejection_code =
+
+
+#######################################################################################
+##                            Pickup Code                                            ##
+#######################################################################################
+##It enables or disables the phone to pick up a call according to the SIP header of dialog-info for account X.0-Disabled,1-Enabled.
+##The default value is 0.
+account.3.dialoginfo_callpickup = 
+
+##It configures the group pickup code for account X.
+##The default value is blank.
+account.3.group_pickup_code =
+##It configures the directed pickup code for account X.
+##The default value is blank.
+account.3.direct_pickup_code =
+
+
+#######################################################################################
+##                            DTMF                                                   ##
+#######################################################################################
+account.3.dtmf.type = {$yealink_dtmf_type}
+account.3.dtmf.info_type = 
+account.3.dtmf.dtmf_payload = 
+
+
+#######################################################################################
+##                            Alert info                                             ##
+#######################################################################################
+##It enables or disables the distinctive ringtones by the Alert-Info SIP header for account X.0-Disabled,1-Enabled.
+##The default value is 0.
+account.3.alert_info_url_enable = 
+##The default value is blank.Values range 256 characters in length
+account.3.alert_info =
+account.3.ringtone.ring_type = 
+
+##It enables or disables the phone to download the picture information for account X when receiving an incoming call or during a call.0-Disabled,1-Enabled.
+##The default value is 0.
+account.3.picture_info_enable = 
+
+
+#######################################################################################
+##                            Conference                                             ##
+#######################################################################################
+##It configures the conference type for account X.0-Local Conference,2-Network Conference.
+##The default value is 0.
+account.3.conf_type = {if $nway_conference == true}2{/if} 
+##It configures the network conference URI for account X.
+##The default value is blank.
+account.3.conf_uri = {if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if} 
+
+
+#######################################################################################
+##                            CID Source                                             ##
+#######################################################################################
+account.3.cid_source = {$yealink_cid_source}
+account.3.cid_source_privacy = 1
+account.3.cid_source_ppi = 1
+account.3.cp_source = 2
+
+
+#######################################################################################
+##                            Session Timer                                          ##
+#######################################################################################
+account.3.session_timer.enable = {$yealink_session_timer}
+account.3.session_timer.expires = 
+account.3.session_timer.refresher = 
+
+
+#######################################################################################
+##                            Music on Hold                                          ##
+#######################################################################################
+##It configures the way on how the phone processes Music On Hold when placing an active call on hold for account X.
+##0-Calling the music server before holding
+##1-Calling the music server after holding
+##The default value is 0.
+account.3.music_on_hold_type = 
+##It configures the URI of the Music On Hold server for account X.
+##The default value is blank.
+account.3.music_server_uri = 
+
+
+#######################################################################################
+##                            Advanced                                               ##
+#######################################################################################
+account.3.auto_answer = 
+account.3.missed_calllog = 
+account.3.100rel_enable = {$yealink_retransmission}
+account.3.enable_user_equal_phone = 
+account.3.compact_header_enable = 
+account.3.custom_ua = 
+
+
+#######################################################################################
+##                                   DND(Except T19 Model)                           ##
+#######################################################################################
+account.3.dnd.enable =
+account.3.dnd.on_code = 
+account.3.dnd.off_code =
+
+
+#######################################################################################
+##                                 Call Forward(Except T19 Model)                    ##
+#######################################################################################
+account.3.always_fwd.enable = 
+account.3.always_fwd.target = 
+account.3.always_fwd.off_code =
+account.3.always_fwd.on_code =
+account.3.busy_fwd.enable =          
+account.3.busy_fwd.target =         
+account.3.busy_fwd.off_code =
+account.3.busy_fwd.on_code =
+account.3.timeout_fwd.enable = 
+account.3.timeout_fwd.target =
+account.3.timeout_fwd.timeout =  
+account.3.timeout_fwd.off_code =
+account.3.timeout_fwd.on_code = 
+
+
+#######################################################################################
+##                                   Voice Monitoring  (Except T19P/T21P Models)                  ##
+#######################################################################################
+account.3.vq_rtcpxr.collector_name=
+account.3.vq_rtcpxr.collector_server_host=
+account.3.vq_rtcpxr.collector_server_port=
+
+
+#######################################################################################
+##         Broadsoft XSI                    ##
+#######################################################################################
+##It configures the user name for XSI authentication for account X.Example:account.3.xsi.user = 3502@as.iop1.broadworks.net.
+##The default value is blank.
+account.3.xsi.user =  
+
+##It configures the password for XSI authentication for account X.Example:account.3.xsi.password = 123456.
+##The default value is blank.
+account.3.xsi.password = 
+
+##It configures the access URL of the Xtended Services Platform server for account X.Example:account.3.xsi.host = xsp1.iop1.broadworks.net.
+##The default value is blank.
+account.3.xsi.host = 
+
+##It configures the server type of the Xtended Services Platform server for account X.Example:account.3.xsi.server_type = http.
+##The default value is http.
+account.3.xsi.server_type = 
+
+##It configures the server port of the Xtended Services Platform server for account X.Example:account.3.xsi.port = 80.
+##The default value is 80.Integer from 1 to 65535
+account.3.xsi.port = 
+
+
+#######################################################################################
+##                           Account 4 Basic Settings                                ##
+#######################################################################################
+{if isset($account.4.password) }
+account.4.enable = 1
+{else}
+account.4.enable = 0
+{/if}
+account.4.label = {$account.4.display_name}
+account.4.display_name = {$account.4.display_name}
+account.4.auth_name = {$account.4.auth_id}
+account.4.password = {$account.4.password}
+{if isset($account.4.server.1.address)}
+account.4.user_name = {$account.4.user_id}@{$account.4.server_address}
+{else}
+account.4.user_name = {$account.4.user_id}
+{/if} 
+account.4.outbound_proxy_enable = {if isset($account.4.outbound_proxy_primary)}1{else}0{/if}
+
+account.4.outbound_proxy.1.address = {$account.4.outbound_proxy_primary}
+account.4.outbound_proxy.1.port = {$account.4.sip_port}
+account.4.dial_tone =
+account.4.outbound_proxy.2.address = {$account.4.outbound_proxy_secondary}
+account.4.outbound_proxy.2.port = {$account.4.sip_port}
+account.4.outbound_proxy_fallback_interval =
+
+##It configures the transport type for account 1. 0-UDP,1-TCP,2-TLS,3-DNS-NAPTR
+##The default value is 0.
+
+{if $account.4.sip_transport == 'udp'}account.4.sip_server.1.transport_type = 0{/if}
+{if $account.4.sip_transport == 'tcp'}account.4.sip_server.1.transport_type = 1{/if}
+{if $account.4.sip_transport == 'tls'}account.4.sip_server.1.transport_type = 2{/if}
+{if $account.4.sip_transport == 'dns srv'}account.4.sip_server.1.transport_type = 3{/if}
+
+##It configures the backup server transport type for account 1. 0-UDP,1-TCP,2-TLS,3-DNS-NAPTR
+##The default value is 0. 
+
+{if $account.4.sip_transport == 'udp'}account.4.sip_server.2.transport_type = 0{/if}
+{if $account.4.sip_transport == 'tcp'}account.4.sip_server.2.transport_type = 1{/if}
+{if $account.4.sip_transport == 'tls'}account.4.sip_server.2.transport_type = 2{/if}
+{if $account.4.sip_transport == 'dns srv'}account.4.sip_server.2.transport_type = 3{/if}
+
+
+#######################################################################################
+##                          Failback                                                 ##
+#######################################################################################
+
+account.4.naptr_build = 0
+account.4.fallback.redundancy_type = 0
+account.4.fallback.timeout = {$yealink_outbound_proxy_fallback_interval}
+
+{if isset($account.4.server.1.address)}
+account.4.sip_server.1.address = {$account.4.server.1.address}
+{else}
+account.4.sip_server.1.address = {$account.4.server_address}
+{/if}
+
+account.4.sip_server.1.port = {$account.4.sip_port}
+account.4.sip_server.1.expires = {$account.4.register_expires}
+account.4.sip_server.1.retry_counts = 3
+account.4.sip_server.1.failback_mode = 0
+account.4.sip_server.1.failback_timeout = 3600
+account.4.sip_server.1.register_on_enable = 0
+account.4.sip_server.2.address = {$account.4.server.2.address}
+account.4.sip_server.2.port = {$account.4.sip_port}
+account.4.sip_server.2.expires = {$account.4.register_expires}
+account.4.sip_server.2.retry_counts = 3
+account.4.sip_server.2.failback_mode = 0
+account.4.sip_server.2.failback_timeout = 3600
+account.4.sip_server.2.register_on_enable = 0
+
+account.4.dns_cache_type = 
+account.4.static_cache_pri = 
+account.4.register_expires_overlap = 
+account.4.subscribe_expires_overlap =
+
+
+#######################################################################################
+##                           Register Advanced                                       ##
+#######################################################################################
+##It configures the SIP server type for account X.0-Default,2-BroadSoft,4-Cosmocom,6-UCAP
+##The default value is 0.
+account.4.sip_server_type = 
+account.4.unregister_on_reboot = 
+account.4.proxy_require = 
+account.4.srv_ttl_timer_enable = 
+account.4.register_mac = 
+account.4.register_line = 
+account.4.reg_fail_retry_interval = 
+
+
+######################################################################################
+##                     NAT Settings                                                 ##
+######################################################################################
+##It enables or disables the NAT traversal for account X.0-Disabled,1-Enabled
+##The default value is 0.
+account.4.nat.nat_traversal = 
+##It configures the type of keep-alive packets sent by the phone to the NAT static to keep the communication port open so that NAT can continue to function for account X.
+##0-Dsiabled,1-Default: the phone sends UDP packets to the server,2-Option: the phone sends SIP OPTION packets to the server,3-Notify: the phone sends SIP NOTIFY packets to the server.
+##The default value is 1.
+account.4.nat.udp_update_enable = 
+
+##It configures the keep-alive interval (in seconds) for account X.
+##The default value is 30.Integer from 15 to 2147483647
+account.4.nat.udp_update_time = 
+
+##It enables or disables NAT Rport feature for account X.0-Disabled,1-Enabled
+##The default value is 0.
+account.4.nat.rport = {$yealink_rport}
+
+
+#######################################################################################
+##                            Account4 Advance Settings                              ##
+#######################################################################################
+
+##It configures the voice mail number for account X.
+##The default value is blank.
+voice_mail.number.4 = {$voicemail_number}
+##Except T19P/T21P Models
+account.4.auto_dial_enable =
+account.4.auto_dial_num =
+
+account.4.call_id_mode =
+account.4.call_info =
+
+
+#######################################################################################
+##                            Subscribe                                              ##
+#######################################################################################
+##It enables or disables the phone to subscribe the message waiting indicator for account X.0-Disabled,1-Enabled.
+##The default value is 0.
+account.4.subscribe_mwi = 
+
+##It is configuration MWI is NOTIFY messages, whether in Terminated status attributes.
+##The default value is 0(Don't handle terminated values)
+account.4.mwi_parse_terminated =
+
+##It configures the interval (in seconds) of MWI subscription for account X.
+##The default value is 3600.
+account.4.subscribe_mwi_expires = 
+
+##It enables or disables the phone to subscribe to the voice mail number for the message waiting indicator for account X.0-Disabled,1-Enabled.
+##The default value is 0.
+account.4.subscribe_mwi_to_vm = 
+
+##It configures the period (in seconds) of ACD subscription for account X.
+##The default value is 1800.Except T19P/T21P Models
+account.4.subscribe_acd_expires= 
+
+account.4.display_mwi.enable=
+
+
+#######################################################################################
+##                            BLF List(Except T19D Model)                            ##
+#######################################################################################
+##It configures the BLF List URI to monitor a list of users for account X.
+##The default value is blank.
+account.4.blf.blf_list_uri =
+##It configures the feature access code for directed call pickup (default: *97) for account X.
+##The default value is blank.
+account.4.blf_list_code = 
+##It configures the feature access code for directed call pickup with barge-in (default: *33) for account X.
+##The default value is blank.
+account.4.blf_list_barge_in_code = 
+
+##It configures the period (in seconds) of the BLF subscription for account X.
+##The default value is 1800.Integer from 30 to 2147483647.
+account.4.blf.subscribe_period = 
+
+##It configures the event of the BLF subscription for account X.0-Dialog,1-Presence.
+##The default value is 0.
+account.4.blf.subscribe_event =
+
+##It enables or disables the phone to handle NOTIFY messages out of the BLF dialog for account X.0-Disabled,1-Enabled.
+##The default value is 0.
+account.4.out_dialog_blf_enable = 
+
+##It configures the BLF List Retrieve call parked code for account X.
+##The default value is blank
+account.4.blf_list_retrieve_call_parked_code = 
+
+account.4.blf.match_host.enable= 
+
+
+#######################################################################################
+##                            BLA/SCA                                                ##
+#######################################################################################
+##It enables or disables Broadsoft SCA feature for account X.0-Disabled,1-Broadsoft SCA.
+##The default value is 0.
+account.4.shared_line = {$account.4.shared_line}
+##It configures the BLA number for account X.
+##The default value is blank.
+account.4.bla_number = 
+##It configures the period (in seconds) of BLA subscription for account X. 
+##The default value is 300.Integer from 60 to 7200
+account.4.bla_subscribe_period = 
+##It configures the Call Pull Feature access code for account X.
+##The default value is blank.
+account.4.shared_line_callpull_code =
+##It configures number of linekey for line.
+##The default value is 1,you should enable auto line keys first.
+account.4.number_of_linekey = 
+
+##It config whether you can retrieve the remote hold call through line key
+##The default value is 1
+account.4.shared_line_one_touch_retrieve.enable=
+
+##It config whether you can barge in the active call through line key
+##The default value is 1
+account.4.shared_line_one_touch_bargein.enable =
+
+
+#######################################################################################
+##                            Brosoft Callpark                                       ##
+#######################################################################################
+##It enables or disables Broadsoft Callpark for account X.0-Disabled,1-Broadsoft SCA.
+##The default value is 0.
+account.4.callpark_enable =
+
+
+#######################################################################################
+##                            Audio Codec                                            ##
+#######################################################################################
+account.4.codec.g722.enable =
+account.4.codec.g722.priority = 
+
+account.4.codec.g729.enable = 
+account.4.codec.g729.priority = 
+
+account.4.codec.g723_53.enable = 
+account.4.codec.g723_53.priority = 
+
+account.4.codec.g723_63.enable = 
+account.4.codec.g723_63.priority = 
+
+account.4.codec.g726_16.enable = 
+account.4.codec.g726_16.priority = 
+account.4.codec.g726_16.rtpmap = 
+
+account.4.codec.g726_24.enable = 
+account.4.codec.g726_24.priority = 
+account.4.codec.g726_24.rtpmap = 
+
+account.4.codec.g726_32.enable = 
+account.4.codec.g726_32.priority = 
+account.4.codec.g726_32.rtpmap = 
+
+account.4.codec.g726_40.enable = 
+account.4.codec.g726_40.priority = 
+account.4.codec.g726_40.rtpmap = 
+
+account.4.codec.ilbc.enable = 
+account.4.codec.ilbc.priority = 
+account.4.codec.ilbc.rtpmap = 
+
+account.4.codec.opus.enable = 
+account.4.codec.opus.priority = 
+account.4.codec.opus.rtpmap = 
+account.4.codec.opus.samplerate = 
+
+account.4.codec.pcmu.enable = 
+account.4.codec.pcmu.priority = 
+
+account.4.codec.pcma.enable =  
+account.4.codec.pcma.priority = 
+
+account.4.codec.g722_1_24kpbs.enable =
+account.4.codec.g722_1_24kpbs.para = 
+account.4.codec.g722_1_24kpbs.priority =
+account.4.codec.g722_1_24kpbs.rtpmap = 
+account.4.codec.g722_1_24kpbs.samplerate = 
+
+account.4.codec.g722_1c_24kpbs.enable =
+account.4.codec.g722_1c_24kpbs.para = 
+account.4.codec.g722_1c_24kpbs.priority =
+account.4.codec.g722_1c_24kpbs.rtpmap = 
+account.4.codec.g722_1c_24kpbs.samplerate = 
+
+account.4.codec.g722_1c_24kpbs.enable =
+account.4.codec.g722_1c_24kpbs.para = 
+account.4.codec.g722_1c_24kpbs.priority =
+account.4.codec.g722_1c_24kpbs.rtpmap = 
+account.4.codec.g722_1c_24kpbs.samplerate = 
+
+account.4.codec.g722_1c_32kpbs.enable =
+account.4.codec.g722_1c_32kpbs.para = 
+account.4.codec.g722_1c_32kpbs.priority =
+account.4.codec.g722_1c_32kpbs.rtpmap = 
+account.4.codec.g722_1c_32kpbs.samplerate = 
+
+account.4.codec.g722_1c_48kpbs.enable =
+account.4.codec.g722_1c_48kpbs.para = 
+account.4.codec.g722_1c_48kpbs.priority =
+account.4.codec.g722_1c_48kpbs.rtpmap = 
+account.4.codec.g722_1c_48kpbs.samplerate = 
+
+
+#######################################################################################
+##                            Audio Advanced                                         ##
+#######################################################################################
+##It configures the RTP packet time for account X.0 (Disabled), 10, 20, 30, 40, 50 or 60.
+##The default value is 20.
+account.4.ptime = 
+
+
+#######################################################################################
+##                            Anonymous Call                                         ##
+#######################################################################################
+account.4.send_anonymous_code = 
+account.4.anonymous_call = 
+account.4.anonymous_call_oncode = 
+account.4.anonymous_call_offcode = 
+account.4.reject_anonymous_call = 
+account.4.anonymous_reject_oncode = 
+account.4.anonymous_reject_offcode = 
+account.4.send_anonymous_rejection_code =
+
+
+#######################################################################################
+##                            Pickup Code                                            ##
+#######################################################################################
+##It enables or disables the phone to pick up a call according to the SIP header of dialog-info for account X.0-Disabled,1-Enabled.
+##The default value is 0.
+account.4.dialoginfo_callpickup = 
+##It configures the group pickup code for account X.
+##The default value is blank.
+account.4.group_pickup_code = 
+##It configures the directed pickup code for account X.
+##The default value is blank.
+account.4.direct_pickup_code =
+
+
+#######################################################################################
+##                            DTMF                                                   ##
+#######################################################################################
+account.4.dtmf.type = {$yealink_dtmf_type}
+account.4.dtmf.info_type = 
+account.4.dtmf.dtmf_payload = 
+
+
+#######################################################################################
+##                            Alert info                                             ##
+#######################################################################################
+##It enables or disables the distinctive ringtones by the Alert-Info SIP header for account X.0-Disabled,1-Enabled.
+##The default value is 0.
+account.4.alert_info_url_enable = 
+##The default value is blank.Values range 256 characters in length
+account.4.alert_info =
+account.4.ringtone.ring_type = 
+
+###Only for T46G Model
+##It enables or disables the phone to download the picture information for account X when receiving an incoming call or during a call.0-Disabled,1-Enabled.
+##The default value is 0.
+account.4.picture_info_enable = 
+
+
+#######################################################################################
+##                            Conference                                             ##
+#######################################################################################
+##It configures the conference type for account X.0-Local Conference,2-Network Conference.
+##The default value is 0.
+account.4.conf_type = {if $nway_conference == true}2{/if} 
+
+##It configures the network conference URI for account X.
+##The default value is blank.
+account.4.conf_uri = {if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if} 
+
+
+#######################################################################################
+##                            CID Source                                             ##
+#######################################################################################
+account.4.cid_source = {$yealink_cid_source}
+account.4.cid_source_privacy = 1
+account.4.cid_source_ppi = 1
+account.4.cp_source = 2
+
+
+#######################################################################################
+##                            Session Timer                                          ##
+#######################################################################################
+account.4.session_timer.enable = {$yealink_session_timer}
+account.4.session_timer.expires = 
+account.4.session_timer.refresher = 
+
+
+#######################################################################################
+##                            Music on Hold                                          ##
+#######################################################################################
+##It configures the way on how the phone processes Music On Hold when placing an active call on hold for account X.
+##0-Calling the music server before holding
+##1-Calling the music server after holding
+##The default value is 0.
+account.4.music_on_hold_type = 
+##It configures the URI of the Music On Hold server for account X.
+##The default value is blank.
+account.4.music_server_uri = 
+
+
+#######################################################################################
+##                            Advanced                                               ##
+#######################################################################################
+account.4.auto_answer = 
+account.4.missed_calllog = 
+account.4.100rel_enable = {$yealink_retransmission}
+account.4.enable_user_equal_phone = 
+account.4.compact_header_enable = 
+account.4.custom_ua =
+
+
+#######################################################################################
+##                                   DND(Except T19 Model)                           ##
+#######################################################################################
+account.4.dnd.enable =
+account.4.dnd.on_code = 
+account.4.dnd.off_code =
+
+
+#######################################################################################
+##                                 Call Forward(Except T19 Model)                    ##
+#######################################################################################
+account.4.always_fwd.enable = 
+account.4.always_fwd.target = 
+account.4.always_fwd.off_code =
+account.4.always_fwd.on_code =
+account.4.busy_fwd.enable =          
+account.4.busy_fwd.target =         
+account.4.busy_fwd.off_code =
+account.4.busy_fwd.on_code =
+account.4.timeout_fwd.enable = 
+account.4.timeout_fwd.target =
+account.4.timeout_fwd.timeout =  
+account.4.timeout_fwd.off_code =
+account.4.timeout_fwd.on_code = 
+
+
+#######################################################################################
+##                           Voice Monitoring  (Except T19P/T21P Models)             ##
+#######################################################################################
+account.4.vq_rtcpxr.collector_name=
+account.4.vq_rtcpxr.collector_server_host=
+account.4.vq_rtcpxr.collector_server_port=
+
+#######################################################################################
+##         Broadsoft XSI                                                             ##
+#######################################################################################
+##It configures the user name for XSI authentication for account X.Example:account.4.xsi.user = 3502@as.iop1.broadworks.net.
+##The default value is blank.
+account.4.xsi.user =  
+
+##It configures the password for XSI authentication for account X.Example:account.4.xsi.password = 123456.
+##The default value is blank.
+account.4.xsi.password = 
+
+##It configures the access URL of the Xtended Services Platform server for account X.Example:account.4.xsi.host = xsp1.iop1.broadworks.net.
+##The default value is blank.
+account.4.xsi.host = 
+
+##It configures the server type of the Xtended Services Platform server for account X.Example:account.4.xsi.server_type = http.
+##The default value is http.
+account.4.xsi.server_type = 
+
+##It configures the server port of the Xtended Services Platform server for account X.Example:account.4.xsi.port = 80.
+##The default value is 80.Integer from 1 to 65535
+account.4.xsi.port = 
+
+
+#######################################################################################
+##                           Account 5 Basic Settings                                ##
+#######################################################################################
+{if isset($account.5.password) }
+account.5.enable = 1
+{else}
+account.5.enable = 0
+{/if}
+account.5.label = {$account.5.display_name}
+account.5.display_name = {$account.5.display_name}
+account.5.auth_name = {$account.5.auth_id}
+account.5.password = {$account.5.password}
+{if isset($account.5.server.1.address)}
+account.5.user_name = {$account.5.user_id}@{$account.5.server_address}
+{else}
+account.5.user_name = {$account.5.user_id}
+{/if} 
+account.5.outbound_proxy_enable = {if isset($account.5.outbound_proxy_primary)}1{else}0{/if}
+
+account.5.outbound_proxy.1.address = {$account.5.outbound_proxy_primary}
+account.5.outbound_proxy.1.port = {$account.5.sip_port}
+account.5.dial_tone =
+account.5.outbound_proxy.2.address = {$account.5.outbound_proxy_secondary}
+account.5.outbound_proxy.2.port = {$account.5.sip_port}
+account.5.outbound_proxy_fallback_interval =
+
+##It configures the transport type for account 1. 0-UDP,1-TCP,2-TLS,3-DNS-NAPTR
+##The default value is 0.
+
+{if $account.5.sip_transport == 'udp'}account.5.sip_server.1.transport_type = 0{/if}
+{if $account.5.sip_transport == 'tcp'}account.5.sip_server.1.transport_type = 1{/if}
+{if $account.5.sip_transport == 'tls'}account.5.sip_server.1.transport_type = 2{/if}
+{if $account.5.sip_transport == 'dns srv'}account.5.sip_server.1.transport_type = 3{/if}
+
+##It configures the backup server transport type for account 1. 0-UDP,1-TCP,2-TLS,3-DNS-NAPTR
+##The default value is 0. 
+
+{if $account.5.sip_transport == 'udp'}account.5.sip_server.2.transport_type = 0{/if}
+{if $account.5.sip_transport == 'tcp'}account.5.sip_server.2.transport_type = 1{/if}
+{if $account.5.sip_transport == 'tls'}account.5.sip_server.2.transport_type = 2{/if}
+{if $account.5.sip_transport == 'dns srv'}account.5.sip_server.2.transport_type = 3{/if}
+
+
+#######################################################################################
+##                          Failback                                                 ##
+#######################################################################################
+
+account.5.naptr_build = 0
+account.5.fallback.redundancy_type = 0
+account.5.fallback.timeout = {$yealink_outbound_proxy_fallback_interval}
+
+{if isset($account.5.server.1.address)}
+account.5.sip_server.1.address = {$account.5.server.1.address}
+{else}
+account.5.sip_server.1.address = {$account.5.server_address}
+{/if}
+
+account.5.sip_server.1.port = {$account.5.sip_port}
+account.5.sip_server.1.expires = {$account.5.register_expires}
+account.5.sip_server.1.retry_counts = 3
+account.5.sip_server.1.failback_mode = 0
+account.5.sip_server.1.failback_timeout = 3600
+account.5.sip_server.1.register_on_enable = 0
+account.5.sip_server.2.address = {$account.5.server.2.address}
+account.5.sip_server.2.port = {$account.5.sip_port}
+account.5.sip_server.2.expires = {$account.5.register_expires}
+account.5.sip_server.2.retry_counts = 3
+account.5.sip_server.2.failback_mode = 0
+account.5.sip_server.2.failback_timeout = 3600
+account.5.sip_server.2.register_on_enable = 0
+
+account.5.dns_cache_type = 
+account.5.static_cache_pri = 
+account.5.register_expires_overlap = 
+account.5.subscribe_expires_overlap =
+
+
+#######################################################################################
+##                           Register Advanced                                       ##
+#######################################################################################
+##It configures the SIP server type for account X.0-Default,2-BroadSoft,4-Cosmocom,6-UCAP
+##The default value is 0.
+account.5.sip_server_type = 
+account.5.unregister_on_reboot = 
+account.5.proxy_require = 
+account.5.srv_ttl_timer_enable = 
+account.5.register_mac = 
+account.5.register_line = 
+account.5.reg_fail_retry_interval = 
+
+
+######################################################################################
+##                     NAT Settings                                                 ##
+######################################################################################
+##It enables or disables the NAT traversal for account X.0-Disabled,1-Enabled
+##The default value is 0.
+account.5.nat.nat_traversal = 
+
+##It configures the type of keep-alive packets sent by the phone to the NAT static to keep the communication port open so that NAT can continue to function for account X.
+##0-Dsiabled,1-Default: the phone sends UDP packets to the server,2-Option: the phone sends SIP OPTION packets to the server,3-Notify: the phone sends SIP NOTIFY packets to the server.
+##The default value is 1.
+account.5.nat.udp_update_enable = 
+
+##It configures the keep-alive interval (in seconds) for account X.
+##The default value is 30.Integer from 15 to 2147483647
+account.5.nat.udp_update_time = 
+
+##It enables or disables NAT Rport feature for account X.0-Disabled,1-Enabled
+##The default value is 0.
+account.5.nat.rport = {$yealink_rport}
+
+
+#######################################################################################
+##                            Account5 Advance Settings                              ##
+#######################################################################################
+
+##It configures the voice mail number for account X.
+##The default value is blank.
+voice_mail.number.5 = {$voicemail_number}
+##Except T19P/T21P Models
+account.5.auto_dial_enable =
+account.5.auto_dial_num =
+
+account.5.call_id_mode =
+account.5.call_info =
+
+
+#######################################################################################
+##                            Subscribe                                              ##
+#######################################################################################
+##It enables or disables the phone to subscribe the message waiting indicator for account X.0-Disabled,1-Enabled.
+##The default value is 0.
+account.5.subscribe_mwi = 
+##It is configuration MWI is NOTIFY messages, whether in Terminated status attributes.
+##The default value is 0(Don't handle terminated values)
+account.5.mwi_parse_terminated =
+
+##It configures the interval (in seconds) of MWI subscription for account X.
+##The default value is 3600.
+account.5.subscribe_mwi_expires = 
+
+##It enables or disables the phone to subscribe to the voice mail number for the message waiting indicator for account X.0-Disabled,1-Enabled.
+##The default value is 0.
+account.5.subscribe_mwi_to_vm = 
+
+##It configures the period (in seconds) of ACD subscription for account X.
+##The default value is 1800.Except T19P/T21P Models
+account.5.subscribe_acd_expires= 
+account.5.display_mwi.enable =
+##It is configuration MWI is NOTIFY messages, whether in Terminated status attributes.
+##The default value is 0(Don't handle terminated values)
+account.5.mwi_parse_terminated =
+
+
+#######################################################################################
+##                            BLF List(Except T19D Model)                            ##
+#######################################################################################
+##It configures the BLF List URI to monitor a list of users for account X.
+##The default value is blank.
+account.5.blf.blf_list_uri = 
+##It configures the feature access code for directed call pickup (default: *97) for account X.
+##The default value is blank.
+account.5.blf_list_code =
+##It configures the feature access code for directed call pickup with barge-in (default: *33) for account X.
+##The default value is blank.
+account.5.blf_list_barge_in_code = 
+
+##It configures the period (in seconds) of the BLF subscription for account X.
+##The default value is 1800.Integer from 30 to 2147483647.
+account.5.blf.subscribe_period = 
+##It configures the event of the BLF subscription for account X.0-Dialog,1-Presence.
+##The default value is 0.
+account.5.blf.subscribe_event =
+##It enables or disables the phone to handle NOTIFY messages out of the BLF dialog for account X.0-Disabled,1-Enabled.
+##The default value is 0.
+account.5.out_dialog_blf_enable = 
+
+##It configures the BLF List Retrieve call parked code for account X.
+##The default value is blank
+account.5.blf_list_retrieve_call_parked_code = 
+
+account.5.blf.match_host.enable= 
+
+
+#######################################################################################
+##                            BLA/SCA                                                ##
+#######################################################################################
+##It enables or disables Broadsoft SCA feature for account X.0-Disabled,1-Broadsoft SCA.
+##The default value is 0.
+account.5.shared_line = {$account.5.shared_line}
+##It configures the BLA number for account X.
+##The default value is blank.
+account.5.bla_number = 
+##It configures the period (in seconds) of BLA subscription for account X. 
+##The default value is 300.Integer from 60 to 7200
+account.5.bla_subscribe_period = 
+##It configures the Call Pull Feature access code for account X.
+##The default value is blank.
+account.5.shared_line_callpull_code =
+##It configures number of linekey for line.
+##The default value is 1,you should enable auto line keys first.
+account.5.number_of_linekey = 
+
+##It config whether you can retrieve the remote hold call through line key
+##The default value is 1
+account.5.shared_line_one_touch_retrieve.enable=
+
+##It config whether you can barge in the active call through line key
+##The default value is 1
+account.5.shared_line_one_touch_bargein.enable =
+
+
+#######################################################################################
+##                            Brosoft Callpark                                       ##
+#######################################################################################
+##It enables or disables Broadsoft Callpark for account X.0-Disabled,1-Broadsoft SCA.
+##The default value is 0.
+account.5.callpark_enable =
+
+
+#######################################################################################
+##                            Audio Codec                                            ##
+#######################################################################################
+account.5.codec.g722.enable =
+account.5.codec.g722.priority = 
+
+account.5.codec.g729.enable = 
+account.5.codec.g729.priority = 
+
+account.5.codec.g723_53.enable = 
+account.5.codec.g723_53.priority = 
+
+account.5.codec.g723_63.enable = 
+account.5.codec.g723_63.priority = 
+
+account.5.codec.g726_16.enable = 
+account.5.codec.g726_16.priority = 
+account.5.codec.g726_16.rtpmap = 
+
+account.5.codec.g726_24.enable = 
+account.5.codec.g726_24.priority = 
+account.5.codec.g726_24.rtpmap = 
+
+account.5.codec.g726_32.enable = 
+account.5.codec.g726_32.priority = 
+account.5.codec.g726_32.rtpmap = 
+
+account.5.codec.g726_40.enable = 
+account.5.codec.g726_40.priority = 
+account.5.codec.g726_40.rtpmap = 
+
+account.5.codec.ilbc.enable = 
+account.5.codec.ilbc.priority = 
+account.5.codec.ilbc.rtpmap = 
+
+account.5.codec.opus.enable = 
+account.5.codec.opus.priority = 
+account.5.codec.opus.rtpmap = 
+account.5.codec.opus.samplerate = 
+
+account.5.codec.pcmu.enable = 
+account.5.codec.pcmu.priority = 
+
+account.5.codec.pcma.enable =  
+account.5.codec.pcma.priority = 
+
+account.5.codec.g722_1_24kpbs.enable =
+account.5.codec.g722_1_24kpbs.para = 
+account.5.codec.g722_1_24kpbs.priority =
+account.5.codec.g722_1_24kpbs.rtpmap = 
+account.5.codec.g722_1_24kpbs.samplerate = 
+
+account.5.codec.g722_1c_24kpbs.enable =
+account.5.codec.g722_1c_24kpbs.para = 
+account.5.codec.g722_1c_24kpbs.priority =
+account.5.codec.g722_1c_24kpbs.rtpmap = 
+account.5.codec.g722_1c_24kpbs.samplerate = 
+
+account.5.codec.g722_1c_24kpbs.enable =
+account.5.codec.g722_1c_24kpbs.para = 
+account.5.codec.g722_1c_24kpbs.priority =
+account.5.codec.g722_1c_24kpbs.rtpmap = 
+account.5.codec.g722_1c_24kpbs.samplerate = 
+
+account.5.codec.g722_1c_32kpbs.enable =
+account.5.codec.g722_1c_32kpbs.para = 
+account.5.codec.g722_1c_32kpbs.priority =
+account.5.codec.g722_1c_32kpbs.rtpmap = 
+account.5.codec.g722_1c_32kpbs.samplerate = 
+
+account.5.codec.g722_1c_48kpbs.enable =
+account.5.codec.g722_1c_48kpbs.para = 
+account.5.codec.g722_1c_48kpbs.priority =
+account.5.codec.g722_1c_48kpbs.rtpmap = 
+account.5.codec.g722_1c_48kpbs.samplerate = 
+
+
+#######################################################################################
+##                            Audio Advanced                                         ##
+#######################################################################################
+
+##It configures the RTP packet time for account X.0 (Disabled), 10, 20, 30, 40, 50 or 60.
+##The default value is 20.
+account.5.ptime =
+
+
+#######################################################################################
+##                            Anonymous Call                                         ##
+#######################################################################################
+account.5.send_anonymous_code = 
+account.5.anonymous_call = 
+account.5.anonymous_call_oncode = 
+account.5.anonymous_call_offcode = 
+account.5.reject_anonymous_call = 
+account.5.anonymous_reject_oncode = 
+account.5.anonymous_reject_offcode = 
+account.5.send_anonymous_rejection_code =
+
+
+#######################################################################################
+##                            Pickup Code                                            ##
+#######################################################################################
+##It enables or disables the phone to pick up a call according to the SIP header of dialog-info for account X.0-Disabled,1-Enabled.
+##The default value is 0.
+account.5.dialoginfo_callpickup = 
+
+##It configures the group pickup code for account X.
+##The default value is blank.
+account.5.group_pickup_code =
+##It configures the directed pickup code for account X.
+##The default value is blank.
+account.5.direct_pickup_code = 
+
+
+#######################################################################################
+##                            DTMF                                                   ##
+#######################################################################################
+account.5.dtmf.type = {$yealink_dtmf_type}
+account.5.dtmf.info_type = 
+account.5.dtmf.dtmf_payload = 
+
+
+#######################################################################################
+##                            Alert info                                             ##
+#######################################################################################
+##It enables or disables the distinctive ringtones by the Alert-Info SIP header for account X.0-Disabled,1-Enabled.
+##The default value is 0.
+account.5.alert_info_url_enable = 
+##The default value is blank.Values range 256 characters in length
+account.5.alert_info =
+account.5.ringtone.ring_type = 
+
+###Only for T46G Model
+##It enables or disables the phone to download the picture information for account X when receiving an incoming call or during a call.0-Disabled,1-Enabled.
+##The default value is 0.
+account.5.picture_info_enable = 
+
+
+#######################################################################################
+##                            Conference                                             ##
+#######################################################################################
+##It configures the conference type for account X.0-Local Conference,2-Network Conference.
+##The default value is 0.
+account.5.conf_type = {if $nway_conference == true}2{/if} 
+
+##It configures the network conference URI for account X.
+##The default value is blank.
+account.5.conf_uri = {if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}
+
+
+#######################################################################################
+##                            CID Source                                             ##
+#######################################################################################
+account.5.cid_source = {$yealink_cid_source}
+account.5.cid_source_privacy = 1
+account.5.cid_source_ppi = 1
+account.5.cp_source = 2
+
+
+#######################################################################################
+##                            Session Timer                                          ##
+#######################################################################################
+account.5.session_timer.enable = {$yealink_session_timer}
+account.5.session_timer.expires = 
+account.5.session_timer.refresher = 
+
+
+#######################################################################################
+##                            Music on Hold                                          ##
+#######################################################################################
+##It configures the way on how the phone processes Music On Hold when placing an active call on hold for account X.
+##0-Calling the music server before holding
+##1-Calling the music server after holding
+##The default value is 0.
+account.5.music_on_hold_type = 
+##It configures the URI of the Music On Hold server for account X.
+##The default value is blank.
+account.5.music_server_uri = 
+
+
+#######################################################################################
+##                            Advanced                                               ##
+#######################################################################################
+account.5.auto_answer = 
+account.5.missed_calllog = 
+account.5.100rel_enable = {$yealink_retransmission}
+account.5.enable_user_equal_phone = 
+account.5.compact_header_enable = 
+account.5.custom_ua =
+
+
+#######################################################################################
+##                                   DND(Except T19 Model)                           ##
+#######################################################################################
+account.5.dnd.enable =
+account.5.dnd.on_code = 
+account.5.dnd.off_code =
+
+
+#######################################################################################
+##                                 Call Forward(Except T19 Model)                    ##
+#######################################################################################
+account.5.always_fwd.enable = 
+account.5.always_fwd.target = 
+account.5.always_fwd.off_code =
+account.5.always_fwd.on_code =
+account.5.busy_fwd.enable =          
+account.5.busy_fwd.target =         
+account.5.busy_fwd.off_code =
+account.5.busy_fwd.on_code =
+account.5.timeout_fwd.enable = 
+account.5.timeout_fwd.target =
+account.5.timeout_fwd.timeout =  
+account.5.timeout_fwd.off_code =
+account.5.timeout_fwd.on_code = 
+
+
+#######################################################################################
+##                      Voice Monitoring  (Except T19P/T21P Models)                  ##
+#######################################################################################
+account.5.vq_rtcpxr.collector_name=
+account.5.vq_rtcpxr.collector_server_host=
+account.5.vq_rtcpxr.collector_server_port=
+
+
+#######################################################################################
+##                         Broadsoft XSI                                             ##
+#######################################################################################
+##It configures the user name for XSI authentication for account X.Example:account.5.xsi.user = 3502@as.iop1.broadworks.net.
+##The default value is blank.
+account.5.xsi.user =  
+
+##It configures the password for XSI authentication for account X.Example:account.5.xsi.password = 123456.
+##The default value is blank.
+account.5.xsi.password = 
+
+##It configures the access URL of the Xtended Services Platform server for account X.Example:account.5.xsi.host = xsp1.iop1.broadworks.net.
+##The default value is blank.
+account.5.xsi.host = 
+
+##It configures the server type of the Xtended Services Platform server for account X.Example:account.5.xsi.server_type = http.
+##The default value is http.
+account.5.xsi.server_type = 
+
+##It configures the server port of the Xtended Services Platform server for account X.Example:account.5.xsi.port = 80.
+##The default value is 80.Integer from 1 to 65535
+account.5.xsi.port = 
+
+
+#######################################################################################
+##                           Account 6 Basic Settings                                ##
+#######################################################################################
+{if isset($account.6.password) }
+account.6.enable = 1
+{else}
+account.6.enable = 0
+{/if}
+account.6.label = {$account.6.display_name}
+account.6.display_name = {$account.6.display_name}
+account.6.auth_name = {$account.6.auth_id}
+account.6.password = {$account.6.password}
+{if isset($account.6.server.1.address)}
+account.6.user_name = {$account.6.user_id}@{$account.6.server_address}
+{else}
+account.6.user_name = {$account.6.user_id}
+{/if} 
+account.6.outbound_proxy_enable = {if isset($account.6.outbound_proxy_primary)}1{else}0{/if}
+
+account.6.outbound_proxy.1.address = {$account.6.outbound_proxy_primary}
+account.6.outbound_proxy.1.port = {$account.6.sip_port}
+account.6.dial_tone =
+account.6.outbound_proxy.2.address = {$account.6.outbound_proxy_secondary}
+account.6.outbound_proxy.2.port = {$account.6.sip_port}
+account.6.outbound_proxy_fallback_interval =
+
+##It configures the transport type for account 1. 0-UDP,1-TCP,2-TLS,3-DNS-NAPTR
+##The default value is 0.
+
+{if $account.6.sip_transport == 'udp'}account.6.sip_server.1.transport_type = 0{/if}
+{if $account.6.sip_transport == 'tcp'}account.6.sip_server.1.transport_type = 1{/if}
+{if $account.6.sip_transport == 'tls'}account.6.sip_server.1.transport_type = 2{/if}
+{if $account.6.sip_transport == 'dns srv'}account.6.sip_server.1.transport_type = 3{/if}
+
+##It configures the backup server transport type for account 1. 0-UDP,1-TCP,2-TLS,3-DNS-NAPTR
+##The default value is 0. 
+
+
+{if $account.6.sip_transport == 'udp'}account.6.sip_server.2.transport_type = 0{/if}
+{if $account.6.sip_transport == 'tcp'}account.6.sip_server.2.transport_type = 1{/if}
+{if $account.6.sip_transport == 'tls'}account.6.sip_server.2.transport_type = 2{/if}
+{if $account.6.sip_transport == 'dns srv'}account.6.sip_server.2.transport_type = 3{/if}
+
+
+#######################################################################################
+##                          Failback                                                 ##
+#######################################################################################
+
+account.6.naptr_build = 0
+account.6.fallback.redundancy_type = 0
+account.6.fallback.timeout = {$yealink_outbound_proxy_fallback_interval}
+
+{if isset($account.6.server.1.address)}
+account.6.sip_server.1.address = {$account.6.server.1.address}
+{else}
+account.6.sip_server.1.address = {$account.6.server_address}
+{/if}
+
+account.6.sip_server.1.port = {$account.6.sip_port}
+account.6.sip_server.1.expires = {$account.6.register_expires}
+account.6.sip_server.1.retry_counts = 3
+account.6.sip_server.1.failback_mode = 0
+account.6.sip_server.1.failback_timeout = 3600
+account.6.sip_server.1.register_on_enable = 0
+account.6.sip_server.2.address = {$account.6.server.2.address}
+account.6.sip_server.2.port = {$account.6.sip_port}
+account.6.sip_server.2.expires = {$account.6.register_expires}
+account.6.sip_server.2.retry_counts = 3
+account.6.sip_server.2.failback_mode = 0
+account.6.sip_server.2.failback_timeout = 3600
+account.6.sip_server.2.register_on_enable = 0
+
+account.6.dns_cache_type = 
+account.6.static_cache_pri = 
+account.6.register_expires_overlap = 
+account.6.subscribe_expires_overlap =
+
+
+#######################################################################################
+##                           Register Advanced                                       ##
+#######################################################################################
+##It configures the SIP server type for account X.0-Default,2-BroadSoft,4-Cosmocom,6-UCAP
+##The default value is 0.
+account.6.sip_server_type = 
+account.6.unregister_on_reboot = 
+account.6.proxy_require = 
+account.6.srv_ttl_timer_enable = 
+account.6.register_mac = 
+account.6.register_line = 
+account.6.reg_fail_retry_interval = 
+
+
+######################################################################################
+##                     NAT Settings                                                 ##
+######################################################################################
+##It enables or disables the NAT traversal for account X.0-Disabled,1-Enabled
+##The default value is 0.
+account.6.nat.nat_traversal = 
+
+
+##It configures the type of keep-alive packets sent by the phone to the NAT static to keep the communication port open so that NAT can continue to function for account X.
+##0-Dsiabled,1-Default: the phone sends UDP packets to the server,2-Option: the phone sends SIP OPTION packets to the server,3-Notify: the phone sends SIP NOTIFY packets to the server.
+##The default value is 1.
+account.6.nat.udp_update_enable = 
+
+##It configures the keep-alive interval (in seconds) for account X.
+##The default value is 30.Integer from 15 to 2147483647
+account.6.nat.udp_update_time = 
+
+##It enables or disables NAT Rport feature for account X.0-Disabled,1-Enabled
+##The default value is 0.
+account.6.nat.rport = {$yealink_rport}
+
+
+#######################################################################################
+##                            Account6 Advance Settings                              ##
+#######################################################################################
+
+##It configures the voice mail number for account X.
+##The default value is blank.
+voice_mail.number.6 = {$voicemail_number}
+##Except T19P/T21P Models
+account.6.auto_dial_enable =
+account.6.auto_dial_num =
+
+account.6.call_id_mode =
+account.6.call_info =
+
+
+#######################################################################################
+##                            Subscribe                                              ##
+#######################################################################################
+##It enables or disables the phone to subscribe the message waiting indicator for account X.0-Disabled,1-Enabled.
+##The default value is 0.
+account.6.subscribe_mwi = 
+##It is configuration MWI is NOTIFY messages, whether in Terminated status attributes.
+##The default value is 0(Don't handle terminated values)
+account.6.mwi_parse_terminated =
+
+##It configures the interval (in seconds) of MWI subscription for account X.
+##The default value is 3600.
+account.6.subscribe_mwi_expires = 
+
+
+##It enables or disables the phone to subscribe to the voice mail number for the message waiting indicator for account X.0-Disabled,1-Enabled.
+##The default value is 0.
+account.6.subscribe_mwi_to_vm = 
+
+##It configures the period (in seconds) of ACD subscription for account X.
+##The default value is 1800.Except T19P/T21P Models
+account.6.subscribe_acd_expires= 
+account.6.display_mwi.enable =
+##It is configuration MWI is NOTIFY messages, whether in Terminated status attributes.
+##The default value is 0(Don't handle terminated values)
+account.6.mwi_parse_terminated =
+
+
+#######################################################################################
+##                            BLF List(Except T19D Model)                            ##
+#######################################################################################
+##It configures the BLF List URI to monitor a list of users for account X.
+##The default value is blank.
+account.6.blf.blf_list_uri =
+##It configures the feature access code for directed call pickup (default: *97) for account X.
+##The default value is blank.
+account.6.blf_list_code = 
+##It configures the feature access code for directed call pickup with barge-in (default: *33) for account X.
+##The default value is blank.
+account.6.blf_list_barge_in_code =
+
+##It configures the period (in seconds) of the BLF subscription for account X.
+##The default value is 1800.Integer from 30 to 2147483647.
+account.6.blf.subscribe_period = 
+
+##It configures the event of the BLF subscription for account X.0-Dialog,1-Presence.
+##The default value is 0.
+account.6.blf.subscribe_event =
+
+##It enables or disables the phone to handle NOTIFY messages out of the BLF dialog for account X.0-Disabled,1-Enabled.
+##The default value is 0.
+account.6.out_dialog_blf_enable = 
+
+##It configures the BLF List Retrieve call parked code for account X.
+##The default value is blank
+account.6.blf_list_retrieve_call_parked_code = 
+account.6.blf.match_host.enable= 
+
+
+#######################################################################################
+##                            BLA/SCA                                                ##
+#######################################################################################
+##It enables or disables Broadsoft SCA feature for account X.0-Disabled,1-Broadsoft SCA.
+##The default value is 0.
+account.6.shared_line = 6
+##It configures the BLA number for account X.
+##The default value is blank.
+account.6.bla_number = 
+
+##It configures the period (in seconds) of BLA subscription for account X. 
+##The default value is 300.Integer from 60 to 7200
+account.6.bla_subscribe_period = 
+##It configures the Call Pull Feature access code for account X.
+##The default value is blank.
+account.6.shared_line_callpull_code =
+##It configures number of linekey for line.
+##The default value is 1,you should enable auto line keys first.
+account.6.number_of_linekey =
+
+##It config whether you can retrieve the remote hold call through line key
+##The default value is 1
+account.6.shared_line_one_touch_retrieve.enable=
+
+##It config whether you can barge in the active call through line key
+##The default value is 1
+account.6.shared_line_one_touch_bargein.enable =
+
+
+#######################################################################################
+##                            Brosoft Callpark                                       ##
+#######################################################################################
+##It enables or disables Broadsoft Callpark for account X.0-Disabled,1-Broadsoft SCA.
+##The default value is 0.
+account.6.callpark_enable =
+
+
+#######################################################################################
+##                            Audio Codec                                            ##
+#######################################################################################
+account.6.codec.g722.enable =
+account.6.codec.g722.priority = 
+
+account.6.codec.g729.enable = 
+account.6.codec.g729.priority = 
+
+account.6.codec.g723_53.enable = 
+account.6.codec.g723_53.priority = 
+
+account.6.codec.g723_63.enable = 
+account.6.codec.g723_63.priority = 
+
+account.6.codec.g726_16.enable = 
+account.6.codec.g726_16.priority = 
+account.6.codec.g726_16.rtpmap = 
+
+account.6.codec.g726_24.enable = 
+account.6.codec.g726_24.priority = 
+account.6.codec.g726_24.rtpmap = 
+
+account.6.codec.g726_32.enable = 
+account.6.codec.g726_32.priority = 
+account.6.codec.g726_32.rtpmap = 
+
+account.6.codec.g726_40.enable = 
+account.6.codec.g726_40.priority = 
+account.6.codec.g726_40.rtpmap = 
+
+account.6.codec.ilbc.enable = 
+account.6.codec.ilbc.priority = 
+account.6.codec.ilbc.rtpmap = 
+
+account.6.codec.opus.enable = 
+account.6.codec.opus.priority = 
+account.6.codec.opus.rtpmap = 
+account.6.codec.opus.samplerate = 
+
+account.6.codec.pcmu.enable = 
+account.6.codec.pcmu.priority = 
+
+account.6.codec.pcma.enable =  
+account.6.codec.pcma.priority = 
+
+account.6.codec.g722_1_24kpbs.enable =
+account.6.codec.g722_1_24kpbs.para = 
+account.6.codec.g722_1_24kpbs.priority =
+account.6.codec.g722_1_24kpbs.rtpmap = 
+account.6.codec.g722_1_24kpbs.samplerate = 
+
+account.6.codec.g722_1c_24kpbs.enable =
+account.6.codec.g722_1c_24kpbs.para = 
+account.6.codec.g722_1c_24kpbs.priority =
+account.6.codec.g722_1c_24kpbs.rtpmap = 
+account.6.codec.g722_1c_24kpbs.samplerate = 
+
+account.6.codec.g722_1c_24kpbs.enable =
+account.6.codec.g722_1c_24kpbs.para = 
+account.6.codec.g722_1c_24kpbs.priority =
+account.6.codec.g722_1c_24kpbs.rtpmap = 
+account.6.codec.g722_1c_24kpbs.samplerate = 
+
+account.6.codec.g722_1c_32kpbs.enable =
+account.6.codec.g722_1c_32kpbs.para = 
+account.6.codec.g722_1c_32kpbs.priority =
+account.6.codec.g722_1c_32kpbs.rtpmap = 
+account.6.codec.g722_1c_32kpbs.samplerate = 
+
+account.6.codec.g722_1c_48kpbs.enable =
+account.6.codec.g722_1c_48kpbs.para = 
+account.6.codec.g722_1c_48kpbs.priority =
+account.6.codec.g722_1c_48kpbs.rtpmap = 
+account.6.codec.g722_1c_48kpbs.samplerate = 
+
+
+#######################################################################################
+##                            Audio Advanced                                         ##
+#######################################################################################
+##It configures the RTP packet time for account X.0 (Disabled), 10, 20, 30, 40, 50 or 60.
+##The default value is 20.
+account.6.ptime =
+
+#######################################################################################
+##                            Anonymous Call                                         ##
+#######################################################################################
+account.6.send_anonymous_code = 
+account.6.anonymous_call = 
+account.6.anonymous_call_oncode = 
+account.6.anonymous_call_offcode = 
+account.6.reject_anonymous_call = 
+account.6.anonymous_reject_oncode = 
+account.6.anonymous_reject_offcode = 
+account.6.send_anonymous_rejection_code =
+
+
+#######################################################################################
+##                            Pickup Code                                            ##
+#######################################################################################
+##It enables or disables the phone to pick up a call according to the SIP header of dialog-info for account X.0-Disabled,1-Enabled.
+##The default value is 0.
+account.6.dialoginfo_callpickup = 
+##It configures the group pickup code for account X.
+##The default value is blank.
+account.6.group_pickup_code =
+##It configures the directed pickup code for account X.
+##The default value is blank.
+account.6.direct_pickup_code =
+
+
+#######################################################################################
+##                            DTMF                                                   ##
+#######################################################################################
+account.6.dtmf.type = {$yealink_dtmf_type}
+account.6.dtmf.info_type = 
+account.6.dtmf.dtmf_payload = 
+
+
+#######################################################################################
+##                            Alert info                                             ##
+#######################################################################################
+##It enables or disables the distinctive ringtones by the Alert-Info SIP header for account X.0-Disabled,1-Enabled.
+##The default value is 0.
+account.6.alert_info_url_enable = 
+##The default value is blank.Values range 256 characters in length
+account.6.alert_info =
+account.6.ringtone.ring_type = 
+
+###Only for T46G Model
+##It enables or disables the phone to download the picture information for account X when receiving an incoming call or during a call.0-Disabled,1-Enabled.
+##The default value is 0.
+account.6.picture_info_enable = 
+
+
+#######################################################################################
+##                            Conference                                             ##
+#######################################################################################
+##It configures the conference type for account X.0-Local Conference,2-Network Conference.
+##The default value is 0.
+account.6.conf_type = {if $nway_conference == true}2{/if} 
+##It configures the network conference URI for account X.
+##The default value is blank.
+account.6.conf_uri = {if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if} 
+
+
+#######################################################################################
+##                            CID Source                                             ##
+#######################################################################################
+account.6.cid_source = {$yealink_cid_source}
+account.6.cid_source_privacy = 1
+account.6.cid_source_ppi = 1
+account.6.cp_source = 2
+
+
+#######################################################################################
+##                            Session Timer                                          ##
+#######################################################################################
+account.6.session_timer.enable = {$yealink_session_timer}
+account.6.session_timer.expires = 
+account.6.session_timer.refresher = 
+
+
+#######################################################################################
+##                            Music on Hold                                          ##
+#######################################################################################
+##It configures the way on how the phone processes Music On Hold when placing an active call on hold for account X.
+##0-Calling the music server before holding
+##1-Calling the music server after holding
+##The default value is 0.
+account.6.music_on_hold_type = 
+##It configures the URI of the Music On Hold server for account X.
+##The default value is blank.
+account.6.music_server_uri = 
+
+
+#######################################################################################
+##                            Advanced                                               ##
+#######################################################################################
+account.6.auto_answer = 
+account.6.missed_calllog = 
+account.6.100rel_enable = {$yealink_retransmission}
+account.6.enable_user_equal_phone = 
+account.6.compact_header_enable = 
+account.6.custom_ua =
+
+
+#######################################################################################
+##                                   DND(Except T19 Model)                           ##
+#######################################################################################
+account.6.dnd.enable =
+account.6.dnd.on_code = 
+account.6.dnd.off_code =
+
+
+#######################################################################################
+##                                 Call Forward(Except T19 Model)                    ##
+#######################################################################################
+account.6.always_fwd.enable = 
+account.6.always_fwd.target = 
+account.6.always_fwd.off_code =
+account.6.always_fwd.on_code =
+account.6.busy_fwd.enable =          
+account.6.busy_fwd.target =         
+account.6.busy_fwd.off_code =
+account.6.busy_fwd.on_code =
+account.6.timeout_fwd.enable = 
+account.6.timeout_fwd.target =
+account.6.timeout_fwd.timeout =  
+account.6.timeout_fwd.off_code =
+account.6.timeout_fwd.on_code = 
+
+
+#######################################################################################
+##                                   Voice Monitoring  (Except T19P/T21P Models)                  ##
+#######################################################################################
+account.6.vq_rtcpxr.collector_name=
+account.6.vq_rtcpxr.collector_server_host=
+account.6.vq_rtcpxr.collector_server_port=
+
+
+#######################################################################################
+##         Broadsoft XSI                    ##
+#######################################################################################
+##It configures the user name for XSI authentication for account X.Example:account.6.xsi.user = 3502@as.iop1.broadworks.net.
+##The default value is blank.
+account.6.xsi.user =  
+
+##It configures the password for XSI authentication for account X.Example:account.6.xsi.password = 123456.
+##The default value is blank.
+account.6.xsi.password = 
+
+##It configures the access URL of the Xtended Services Platform server for account X.Example:account.6.xsi.host = xsp1.iop1.broadworks.net.
+##The default value is blank.
+account.6.xsi.host = 
+
+##It configures the server type of the Xtended Services Platform server for account X.Example:account.6.xsi.server_type = http.
+##The default value is http.
+account.6.xsi.server_type = 
+
+##It configures the server port of the Xtended Services Platform server for account X.Example:account.6.xsi.port = 80.
+##The default value is 80.Integer from 1 to 65535
+account.6.xsi.port = 
+
+
+#######################################################################################
+##                                 Broadsoft Setting                                ##        
+#######################################################################################
+bw.enable =
+
+###It enables or disables feature key synchronization.
+###0-Disabled,1-Enabled.
+###The default value is 0.
+bw.feature_key_sync = {$yealink_feature_key_sync} 
+
+
+#######################################################################################
+##                                   Broadsoft Phonebook(Except T20P model)          ##
+#######################################################################################
+###It enables or disables the phone to display the group directory.
+###0-Disabled,1-Enabled.
+###The default value is 1.
+bw_phonebook.group_enable = 
+
+###It enables or disables the phone to display the personal directory.
+###0-Disabled,1-Enabled.
+###The default value is 1.
+bw_phonebook.personal_enable = 
+
+###It enables or disables the phone to display the group common directory.
+###0-Disabled,1-Enabled.
+###The default value is 1.
+bw_phonebook.group_common_enable = 
+
+###It enables or disables the phone to display the enterprise directory.
+###0-Disabled,1-Enabled.
+###The default value is 1.
+bw_phonebook.enterprise_enable = 
+
+###It enables or disables the phone to display the enterprise common directory.
+###0-Disabled,1-Enabled.
+###The default value is 1.
+bw_phonebook.enterprise_common_enable = 
+
+###It configures the display name on the LCD screen for the enterprise common directory.
+###The default value is EnterpriseCommon.
+bw_phonebook.enterprise_common_displayname =
+
+###It enables or disables BroadSoft call log feature.
+###0-Disabled,1-Enabled.
+###The default value is 0.
+bw_phonebook.call_log_enable = 
+
+###It enables or disables custom directory feature.
+###0-Disabled,1-Enabled.
+###The default value is 0.
+bw_phonebook.custom =
+
+###It configures the display name on the LCD screen for the group directory.
+###The default value is Group.
+bw_phonebook.group_displayname =
+
+###It configures the display name on the LCD screen for the enterprise directory.
+###The default value is Enterprise.
+bw_phonebook.enterprise_displayname =
+
+###It configures the display name on the LCD screen for the personal directory.
+###The default value is Personal.
+bw_phonebook.personal_displayname =
+
+bw_phonebook.group_common_displayname =
+
+##It configures the interval (in minutes) for the phone to update the data of the BroadSoft directory from the BroadSoft server.
+##The default value is 60.Integer from 2 to 43200
+directory.update_time_interval = 
+
+
+#######################################################################################
+##                                   Features Pickup(Except T20P model)              ##
+#######################################################################################
+##It enables or disables the phone to display the GPickup soft key when the phone is in the pre-dialing screen.
+##0-Disabled,1-Enabled.
+##The default value is 0.
+features.pickup.group_pickup_enable = 
+
+##It configures the group call pickup code.
+##The default value is blank.
+features.pickup.group_pickup_code = 
+
+##It enables or disables the phone to display the DPickup soft key when the phone is in the pre-dialing screen.
+##0-Disabled,1-Enabled.
+##The default value is 0.
+features.pickup.direct_pickup_enable = 
+
+##It configures the directed call pickup code.
+##The default value is blank.
+features.pickup.direct_pickup_code =
+
+##It enables or disables the phone to display a visual alert when the monitored user receives an incoming call.
+##0-Disabled,1-Enabled.
+##The default value is 0.
+features.pickup.blf_visual_enable =
+
+##It enables or disables the phone to play an audio alert when the monitored user receives an incoming call.
+##0-Disabled,1-Enabled.
+##The default value is 0.
+features.pickup.blf_audio_enable = 
+
+
+#######################################################################################
+##                                   Call Park(Except T20P model)                    ##
+#######################################################################################
+###It enables or disables the phone to display the Park soft key during a call.
+###0-Disabled,1-Enabled.
+###The default value is 0.
+features.call_park.enable = 
+
+###It enables or disables the phone to display the GPark soft key during a call.
+###0-Disabled,1-Enabled.
+###The default value is 0.
+features.call_park.group_enable = 
+
+###It enables or disables the phone to play a warning tone when a call is parked against its line.
+###0-Disabled,1-Enabled.
+###The default value is 0.
+features.call_park.park_ring =
+
+###It enables or disables the phone to display a parked indicator when a call is parked against its line.
+###0-Disabled,1-Enabled.
+###The default value is 0.
+features.call_park.park_visual_notify_enable =
+
+features.call_park.group_park_code =
+features.call_park.park_code =
+features.call_park.park_mode =
+features.call_park.park_retrieve_code =
+
+
+#######################################################################################
+##                                 Time                                              ##
+#######################################################################################
+##It configures the time zone.For more available time zones, refer to Time Zones on page 215.
+##The default value is +8.
+local_time.time_zone = {$yealink_time_zone}
+
+##It configures the time zone name.For more available time zone names, refer to Time Zones on page 215.
+##The default time zone name is China(Beijing).
+local_time.time_zone_name = {$yealink_time_zone_name}
+
+local_time.ntp_server1 = {$ntp_server_primary}
+local_time.ntp_server2 = {$ntp_server_secondary}
+
+##It configures the update interval (in seconds) when using the NTP server.
+##The default value is 1000.Integer from 15 to 86400
+local_time.interval = {$yealink_time_update}
+
+##It enables or disables daylight saving time (DST) feature.
+##0-Disabled,1-Enabled,2-Automatic.
+##The default value is 2.
+local_time.summer_time = {$yealink_summer_time}
+
+##It configures the way DST works when DST feature is enabled.
+##0-DST By Date ,1-DST By Week.
+##The default value is 0.
+local_time.dst_time_type = {$yealink_dst_type}
+
+##It configures the start time of the DST.
+##Value formats are:Month/Day/Hour (for By Date),Month/ Day of Week/ Day of Week Last in Month/ Hour of Day (for By Week)
+##The default value is 1/1/0.
+local_time.start_time = {$yealink_time_zone_start_time}
+
+##It configures the end time of the DST.
+##Value formats are:Month/Day/Hour (for By Date),Month/ Day of Week/ Day of Week Last in Month/ Hour of Day (for By Week)
+##The default value is 12/31/23.
+local_time.end_time = {$yealink_time_zone_end_time}
+
+##It configures the offset time (in minutes).
+##The default value is blank.Integer from -300 to 300
+local_time.offset_time = {$yealink_time_format}
+
+##It configures the time format.0-12 Hour,1-24 Hour.
+##The default value is 1.
+local_time.time_format = {$yealink_time_format}
+
+#Configure the date format; 0-WWW MMM DD (default), 1-DD-MMM-YY, 2-YYYY-MM-DD, 3-DD/MM/YYYY, 4-MM/DD/YY, 5-DD MMM YYYY, 6-WWW DD MMM;
+local_time.date_format = {$yealink_date_format}
+
+##It enables or disables the phone to update time with the offset time obtained from the DHCP server.
+##It is only available to offset from GMT 0.0-Disabled,1-Enabled.
+##The default value is 0.
+local_time.dhcp_time = {$yealink_dhcp_time}
+
+##It configures the phone to obtain time from NTP server or manual settings.0-Manual,1-NTP
+##The default value is 1.
+local_time.manual_time_enable = 
+
+##It enables or disables the phone to use manually configured NTP server preferentially.
+##0-Disabled (use the NTP server obtained by DHCP preferentially),1-Enabled.
+##The default value is 0.
+local_time.manual_ntp_srv_prior =
+
+auto_dst.url = {$yealink_auto_dst_url}
+
+
+#######################################################################################
+##                                   NETWORK                                         ##
+#######################################################################################
+##It configures the IP address mode.0-IPv4,1-IPv6,2-IPv4&IPv6
+##The default value is 0.It takes effect after a reboot.
+static.network.ip_address_mode = {$yealink_ip_address_mode}
+
+static.network.ipv6_prefix = 
+static.network.ipv6_internet_port.type = 
+static.network.ipv6_internet_port.ip = 
+static.network.ipv6_internet_port.gateway = 
+static.network.ipv6_primary_dns = 
+static.network.ipv6_secondary_dns = 
+
+####Only T46G Model supports this parameter
+static.network.ipv6_icmp_v6.enable = 
+
+static.network.internet_port.type = 
+static.network.internet_port.ip =
+static.network.internet_port.mask = 
+static.network.internet_port.gateway =
+static.network.primary_dns = {$dns_server_primary}
+static.network.secondary_dns = {$dns_server_secondary}
+
+
+#######################################################################################
+##                           V80 Add                                                 ##
+#######################################################################################
+## Add Time 2015.6.26
+account.X.callerid_in_support_header.enable = 
+account.X.acd.auto_login_enable  = 
+account.X.outbound_proxy_fallback_interval = 
+account.x.transfer_refer_to_contact_header.enable =
+account.x.sub_fail_retry_interval = 
+account.X.update_ack_while_dialing = 
+account.x.end_call_when_transferred.enable = 
+account.x.nat.stun_refresh_timer = 
+account.x.contact_take_line_param.enable =
+account.X.backup_outbound_host =
+account.X.backup_outbound_port =
+
+
+#######################################################################################
+##                           V80-SP2 Add                                             ##
+#######################################################################################
+account.X.bla.notify_with_expire.enable =
+account.X.bla.subscribe_uri_build_type =
+account.x.instance_id.enable =
+
+
+#######################################################################################
+##                           V81 Add                                                 ##
+#######################################################################################
+account.1.dialplan.digitmap.active.on_hook_dialing =
+account.1.dialplan.digitmap.apply_to.directory_dial =
+account.1.dialplan.digitmap.apply_to.forward =
+account.1.dialplan.digitmap.apply_to.on_hook_dial =
+account.1.dialplan.digitmap.apply_to.press_send =
+account.1.dialplan.digitmap.enable =
+account.1.dialplan.digitmap.interdigit_long_timer =
+account.1.dialplan.digitmap.interdigit_short_timer =
+account.1.dialplan.digitmap.no_match_action =
+account.1.dialplan.digitmap.string =
diff --git a/resources/templates/provision/yealink/t58v/y000000000058.cfg b/resources/templates/provision/yealink/t58v/y000000000058.cfg
index c8f167b921..63d1904252 100644
--- a/resources/templates/provision/yealink/t58v/y000000000058.cfg
+++ b/resources/templates/provision/yealink/t58v/y000000000058.cfg
@@ -843,7 +843,8 @@ features.password_dial.length =
 #######################################################################################
 ##                                   Features History                                ##
 #######################################################################################
-features.save_call_history = 
+features.save_call_history =
+features.save_init_num_to_history.enable = 0
 
 
 #######################################################################################
diff --git a/resources/templates/provision/yealink/t58v/{$mac}.cfg b/resources/templates/provision/yealink/t58v/{$mac}.cfg
index db8b835f64..58b37007b3 100644
--- a/resources/templates/provision/yealink/t58v/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t58v/{$mac}.cfg
@@ -369,11 +369,11 @@ account.1.picture_info_enable =
 #######################################################################################
 ##It configures the conference type for account X.0-Local Conference,2-Network Conference.
 ##The default value is 0.
-account.1.conf_type = 
+account.1.conf_type = {if $nway_conference == true}2{/if} 
 
 ##It configures the network conference URI for account X.
 ##The default value is blank.
-account.1.conf_uri = 
+account.1.conf_uri = {if $nway_conference == true}nway{$account.1.auth_id}@{$account.1.server_address}{/if} 
 
 
 #######################################################################################
@@ -833,10 +833,10 @@ account.2.picture_info_enable =
 #######################################################################################
 ##It configures the conference type for account X.0-Local Conference,2-Network Conference.
 ##The default value is 0.
-account.2.conf_type = 
+account.2.conf_type = {if $nway_conference == true}2{/if} 
 ##It configures the network conference URI for account X.
 ##The default value is blank.
-account.2.conf_uri = 
+account.2.conf_uri = {if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if} 
 
 
 #######################################################################################
@@ -1296,10 +1296,10 @@ account.3.picture_info_enable =
 #######################################################################################
 ##It configures the conference type for account X.0-Local Conference,2-Network Conference.
 ##The default value is 0.
-account.3.conf_type = 
+account.3.conf_type = {if $nway_conference == true}2{/if} 
 ##It configures the network conference URI for account X.
 ##The default value is blank.
-account.3.conf_uri = 
+account.3.conf_uri = {if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if} 
 
 
 #######################################################################################
@@ -1762,11 +1762,11 @@ account.4.picture_info_enable =
 #######################################################################################
 ##It configures the conference type for account X.0-Local Conference,2-Network Conference.
 ##The default value is 0.
-account.4.conf_type = 
+account.4.conf_type = {if $nway_conference == true}2{/if} 
 
 ##It configures the network conference URI for account X.
 ##The default value is blank.
-account.4.conf_uri = 
+account.4.conf_uri = {if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if} 
 
 
 #######################################################################################
@@ -2230,11 +2230,11 @@ account.5.picture_info_enable =
 #######################################################################################
 ##It configures the conference type for account X.0-Local Conference,2-Network Conference.
 ##The default value is 0.
-account.5.conf_type = 
+account.5.conf_type = {if $nway_conference == true}2{/if} 
 
 ##It configures the network conference URI for account X.
 ##The default value is blank.
-account.5.conf_uri =
+account.5.conf_uri = {if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}
 
 
 #######################################################################################
@@ -2701,10 +2701,10 @@ account.6.picture_info_enable =
 #######################################################################################
 ##It configures the conference type for account X.0-Local Conference,2-Network Conference.
 ##The default value is 0.
-account.6.conf_type = 
+account.6.conf_type = {if $nway_conference == true}2{/if} 
 ##It configures the network conference URI for account X.
 ##The default value is blank.
-account.6.conf_uri = 
+account.6.conf_uri = {if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if} 
 
 
 #######################################################################################
@@ -2965,17 +2965,17 @@ local_time.summer_time = {$yealink_summer_time}
 ##It configures the way DST works when DST feature is enabled.
 ##0-DST By Date ,1-DST By Week.
 ##The default value is 0.
-local_time.dst_time_type = 
+local_time.dst_time_type = {$yealink_dst_type}
 
 ##It configures the start time of the DST.
 ##Value formats are:Month/Day/Hour (for By Date),Month/ Day of Week/ Day of Week Last in Month/ Hour of Day (for By Week)
 ##The default value is 1/1/0.
-local_time.start_time = 
+local_time.start_time = {$yealink_time_zone_start_time}
 
 ##It configures the end time of the DST.
 ##Value formats are:Month/Day/Hour (for By Date),Month/ Day of Week/ Day of Week Last in Month/ Hour of Day (for By Week)
 ##The default value is 12/31/23.
-local_time.end_time = 
+local_time.end_time = {$yealink_time_zone_end_time}
 
 ##It configures the offset time (in minutes).
 ##The default value is blank.Integer from -300 to 300
@@ -2990,7 +2990,7 @@ local_time.date_format = {$yealink_date_format}
 ##It enables or disables the phone to update time with the offset time obtained from the DHCP server.
 ##It is only available to offset from GMT 0.0-Disabled,1-Enabled.
 ##The default value is 0.
-local_time.dhcp_time = 
+local_time.dhcp_time = {$yealink_dhcp_time}
 
 ##It configures the phone to obtain time from NTP server or manual settings.0-Manual,1-NTP
 ##The default value is 1.
diff --git a/resources/templates/provision/yealink/t5x/y000000000070.cfg b/resources/templates/provision/yealink/t5x/y000000000070.cfg
index ffe89132e8..8f0a9b51ae 100644
--- a/resources/templates/provision/yealink/t5x/y000000000070.cfg
+++ b/resources/templates/provision/yealink/t5x/y000000000070.cfg
@@ -787,7 +787,7 @@ features.save_call_history=
 features.call_log_show_num=
 search_in_dialing.history.enable=
 directory_setting.history.enable=
-features.save_init_num_to_history.enable=
+features.save_init_num_to_history.enable= 0
 features.redial_via_local_sip_server.enable=
 
 
@@ -802,7 +802,11 @@ static.auto_provision.local_contact.backup.enable=
 ##                          Contact Other                                            ##
 #######################################################################################
 directory.search_type=
+{if isset($yealink_local_directory_enable)}
+directory_setting.local_directory.enable = {$yealink_local_directory_enable}
+{else}
 directory_setting.local_directory.enable =
+{/if}
 directory_setting.local_directory.priority =
 
 
diff --git a/resources/templates/provision/yealink/t5x/y000000000095.cfg b/resources/templates/provision/yealink/t5x/y000000000095.cfg
index 9edad20edf..d99fe5b8f4 100644
--- a/resources/templates/provision/yealink/t5x/y000000000095.cfg
+++ b/resources/templates/provision/yealink/t5x/y000000000095.cfg
@@ -875,7 +875,7 @@ search_in_dialing.history.enable=
 search_in_dialing.history.priority=
 directory_setting.history.enable=
 directory_setting.history.priority
-features.save_init_num_to_history.enable=
+features.save_init_num_to_history.enable= 0
 features.redial_via_local_sip_server.enable=
 
 ##V83 Add
@@ -896,7 +896,11 @@ static.auto_provision.local_contact.backup.enable=
 ##                          Contact Other                                            ##       
 #######################################################################################
 directory.search_type=
+{if isset($yealink_local_directory_enable)}
+directory_setting.local_directory.enable = {$yealink_local_directory_enable}
+{else}
 directory_setting.local_directory.enable =
+{/if}
 directory_setting.local_directory.priority =
 
 ##V83 Add
diff --git a/resources/templates/provision/yealink/t5x/y000000000096.cfg b/resources/templates/provision/yealink/t5x/y000000000096.cfg
index bb800ccb68..a59d329131 100644
--- a/resources/templates/provision/yealink/t5x/y000000000096.cfg
+++ b/resources/templates/provision/yealink/t5x/y000000000096.cfg
@@ -876,7 +876,7 @@ search_in_dialing.history.enable=
 search_in_dialing.history.priority=
 directory_setting.history.enable=
 directory_setting.history.priority
-features.save_init_num_to_history.enable=
+features.save_init_num_to_history.enable= 0
 features.redial_via_local_sip_server.enable=
 
 ##V83 Add
@@ -897,7 +897,11 @@ static.auto_provision.local_contact.backup.enable=
 ##                          Contact Other                                            ##       
 #######################################################################################
 directory.search_type=
+{if isset($yealink_local_directory_enable)}
+directory_setting.local_directory.enable = {$yealink_local_directory_enable}
+{else}
 directory_setting.local_directory.enable =
+{/if}
 directory_setting.local_directory.priority =
 
 ##V83 Add
diff --git a/resources/templates/provision/yealink/t5x/y000000000097.cfg b/resources/templates/provision/yealink/t5x/y000000000097.cfg
index 0fad04f289..335b953af6 100644
--- a/resources/templates/provision/yealink/t5x/y000000000097.cfg
+++ b/resources/templates/provision/yealink/t5x/y000000000097.cfg
@@ -876,7 +876,7 @@ search_in_dialing.history.enable=
 search_in_dialing.history.priority=
 directory_setting.history.enable=
 directory_setting.history.priority
-features.save_init_num_to_history.enable=
+features.save_init_num_to_history.enable= 0
 features.redial_via_local_sip_server.enable=
 
 ##V83 Add
@@ -897,7 +897,11 @@ static.auto_provision.local_contact.backup.enable=
 ##                          Contact Other                                            ##       
 #######################################################################################
 directory.search_type=
+{if isset($yealink_local_directory_enable)}
+directory_setting.local_directory.enable = {$yealink_local_directory_enable}
+{else}
 directory_setting.local_directory.enable =
+{/if}
 directory_setting.local_directory.priority =
 
 ##V83 Add
diff --git a/resources/templates/provision/yealink/t5x/{$mac}.cfg b/resources/templates/provision/yealink/t5x/{$mac}.cfg
index 8884ab2056..05dbd44598 100644
--- a/resources/templates/provision/yealink/t5x/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t5x/{$mac}.cfg
@@ -325,10 +325,10 @@ account.{$row.line_number}.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type 0-Local (default), 2-Network Conference
-account.{$row.line_number}.conf_type =
+account.{$row.line_number}.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.{$row.line_number}.conf_uri =
+account.{$row.line_number}.conf_uri = {if $nway_conference == true}nway{$account.{$row.line_number}.user_id}@{$account.{$row.line_number}.server_address}{/if}
 
 #######################################################################################
 ##                            cid_source                                             ##
diff --git a/resources/templates/provision/yealink/vp530/y000000000023.cfg b/resources/templates/provision/yealink/vp530/y000000000023.cfg
index f59729148f..f7c5d31ba8 100644
--- a/resources/templates/provision/yealink/vp530/y000000000023.cfg
+++ b/resources/templates/provision/yealink/vp530/y000000000023.cfg
@@ -619,7 +619,7 @@ local_time.interval =
 local_time.summer_time = {$yealink_summer_time}
 
 #Configure the DST type when the DST feature is enabled; 0-By Date (default), 1-By Week;
-local_time.dst_time_type =
+local_time.dst_time_type = {$yealink_dst_type}
 
 #Configure the start time of DST. The default value is 1/1/0.
 #If the DST type is configured as By Date, the value format is Month/Day/Hour. For example, the value 5/20/10 means the start time is at 10:00 on May 20.
@@ -932,6 +932,7 @@ features.redial_tone =
 
 #Enable or disable the phone to save the call history; 0-Disabled, 1-Enabled (default);
 features.save_call_history =
+features.save_init_num_to_history.enable = 0
 
 #Configure the phone to receive the action URI request from the specified IP address(es) or any IP address;
 #Enter multiple IP addresses (separated by comma) or "any"(stands for any IP address);
diff --git a/resources/templates/provision/yealink/vp530/{$mac}.cfg b/resources/templates/provision/yealink/vp530/{$mac}.cfg
index 0d56f71fe2..b88234afba 100644
--- a/resources/templates/provision/yealink/vp530/{$mac}.cfg
+++ b/resources/templates/provision/yealink/vp530/{$mac}.cfg
@@ -376,10 +376,10 @@ account.1.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.1.conf_type =
+account.1.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.1.conf_uri =
+account.1.conf_uri = {if $nway_conference == true}nway{$account.1.auth_id}@{$account.1.server_address}{/if}
 
 #######################################################################################
 ##                            cid_source                                             ##
@@ -841,10 +841,10 @@ account.2.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.2.conf_type =
+account.2.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.2.conf_uri =
+account.2.conf_uri = {if $nway_conference == true}nway{$account.2.user_id}@{$account.2.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -1350,10 +1350,10 @@ account.3.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.3.conf_type =
+account.3.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.3.conf_uri =
+account.3.conf_uri = {if $nway_conference == true}nway{$account.3.user_id}@{$account.3.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -1842,10 +1842,10 @@ account.4.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.4.conf_type =
+account.4.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.4.conf_uri =
+account.4.conf_uri = {if $nway_conference == true}nway{$account.4.user_id}@{$account.4.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -2334,10 +2334,10 @@ account.5.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.5.conf_type =
+account.5.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.5.conf_uri =
+account.5.conf_uri = {if $nway_conference == true}nway{$account.5.user_id}@{$account.5.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
@@ -2825,10 +2825,10 @@ account.6.picture_info_enable = 1
 ##                            Conference                                             ##
 #######################################################################################
 #Configure the conference type; 0-Local (default), 2-Network Conference;
-account.6.conf_type =
+account.6.conf_type = {if $nway_conference == true}2{/if}
 
 #Configure the conference URI (a SIP URI, or use part of the SIP URI). For example, "conference@domain.com" or "conference".
-account.6.conf_uri =
+account.6.conf_uri = {if $nway_conference == true}nway{$account.6.user_id}@{$account.6.server_address}{/if}
 
 #######################################################################################
 ##                            cid source                                             ##
diff --git a/resources/templates/provision/yealink/vp59/directory.xml b/resources/templates/provision/yealink/vp59/directory.xml
new file mode 100644
index 0000000000..297b9e4108
--- /dev/null
+++ b/resources/templates/provision/yealink/vp59/directory.xml
@@ -0,0 +1,83 @@
+<YealinkIPPhoneDirectory>
+{foreach $contacts as $row}
+{if $smarty.get.contacts == "users" && $row.category == "users"}
+<DirectoryEntry>
+{if $row.contact_name_given != ""}
+{if $row.contact_organization != ""}
+	<Name>{$row.contact_organization} {$row.contact_name_given} {$row.contact_name_family}</Name>
+{else}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{/if}
+{else}
+<Name>{$row.effective_caller_id_name}</Name>
+{/if}
+{foreach $row.numbers as $number}
+{if $number.phone_number != ""}
+	<Telephone>{$number.phone_number}</Telephone>
+{else}		
+	<Telephone>{$number.phone_extension}</Telephone>
+{/if}
+{/foreach}
+</DirectoryEntry>
+{elseif $smarty.get.contacts == "groups" && $row.category == "groups"}
+<DirectoryEntry>
+{if $row.contact_name_given != ""}
+{if $row.contact_organization != ""}
+	<Name>{$row.contact_organization} {$row.contact_name_given} {$row.contact_name_family}</Name>
+{else}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{/if}
+{else}
+	<Name>{$row.effective_caller_id_name}</Name>
+{/if}
+{foreach $row.numbers as $number}
+{if $number.phone_number != ""}
+	<Telephone>{$number.phone_number}</Telephone>
+{else}		
+	<Telephone>{$number.phone_extension}</Telephone>
+{/if}
+{/foreach}
+</DirectoryEntry>
+{elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
+<DirectoryEntry>
+{if $row.contact_name_given != ""}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{else}
+	<Name>{$row.effective_caller_id_name}</Name>
+{/if}
+{if $row.phone_number != ""}
+	<Telephone>{$row.phone_number}</Telephone>
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
+{/if}
+</DirectoryEntry>
+{elseif $smarty.get.contacts == "all"}
+<DirectoryEntry>
+{if $row.contact_name_given != ""}
+{if $row.contact_organization != ""}
+	<Name>{$row.contact_organization} {$row.contact_name_given} {$row.contact_name_family}</Name>
+{else}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{/if}
+{else}
+	<Name>{$row.effective_caller_id_name}</Name>
+{/if}
+{if $row.category == "extensions"}
+{if $row.phone_number != ""}
+	<Telephone>{$row.phone_number}</Telephone>
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
+{/if}
+{else}
+{foreach $row.numbers as $number}
+{if $number.phone_number != ""}
+	<Telephone>{$number.phone_number}</Telephone>
+{else}		
+	<Telephone>{$number.phone_extension}</Telephone>
+{/if}
+{/foreach}
+{/if}
+</DirectoryEntry>
+{/if}
+{/foreach}
+</YealinkIPPhoneDirectory>
diff --git a/resources/templates/provision/yealink/vp59/favorite_setting.xml b/resources/templates/provision/yealink/vp59/favorite_setting.xml
new file mode 100644
index 0000000000..ba7275358e
--- /dev/null
+++ b/resources/templates/provision/yealink/vp59/favorite_setting.xml
@@ -0,0 +1,8 @@
+<root_favorite_set>
+<item id_name="localdirectory" display_name="Local Directory" priority="2" enable="0" />
+<item id_name="history" display_name="History" priority="3" enable="1" />
+<item id_name="networkcalllog" display_name="Network CallLog" priority="4" enable="0" />
+<item id_name="remotedirectory" display_name="Remote Phone Book" priority="5" enable="1" />
+<item id_name="ldap" display_name="LDAP" priority="1" enable="0" />
+<item id_name="networkdirectory" display_name="Network Directory" priority="6" enable="0" />
+</root_favorite_set>
diff --git a/resources/templates/provision/yealink/vp59/y000000000000.boot b/resources/templates/provision/yealink/vp59/y000000000000.boot
new file mode 100644
index 0000000000..178973c04a
--- /dev/null
+++ b/resources/templates/provision/yealink/vp59/y000000000000.boot
@@ -0,0 +1,7 @@
+#!version:1.0.0.1
+## The header above must appear as-is in the first line
+
+include:config "y000000000091.cfg"
+include:config "{$mac}.cfg"
+
+overwrite_mode = {$yealink_overwrite_mode}
diff --git a/resources/templates/provision/yealink/vp59/y000000000091.cfg b/resources/templates/provision/yealink/vp59/y000000000091.cfg
new file mode 100644
index 0000000000..6726c882a4
--- /dev/null
+++ b/resources/templates/provision/yealink/vp59/y000000000091.cfg
@@ -0,0 +1,1777 @@
+#!version:1.0.0.1
+
+##File header "#!version:1.0.0.1" can not be edited or deleted, and must be placed in the first line.##
+
+
+#######################################################################################
+##                                    Network CDP                                    ##       
+#######################################################################################
+static.network.cdp.enable =
+static.network.cdp.packet_interval =
+
+#######################################################################################
+##                                    Network IPv6                                   ##       
+#######################################################################################
+static.network.ipv6_static_dns_enable =
+static.network.ipv6_icmp_v6.enable =
+static.network.ipv6_secondary_dns =
+static.network.ipv6_primary_dns =
+static.network.ipv6_internet_port.gateway =
+static.network.ipv6_internet_port.ip =
+static.network.ipv6_internet_port.type =
+static.network.ipv6_prefix =
+
+
+#######################################################################################
+##                                    Hostname                                       ##       
+#######################################################################################
+static.network.dhcp_host_name =
+
+#######################################################################################
+##                                 Network Internet                                  ##       
+#######################################################################################
+static.network.ip_address_mode =
+static.network.vlan.pc_port_mode =
+static.network.static_dns_enable =
+static.network.pc_port.enable =
+static.network.primary_dns =
+static.network.secondary_dns =
+static.network.internet_port.gateway =
+static.network.internet_port.mask =
+static.network.internet_port.ip =
+static.network.internet_port.type =
+
+
+#######################################################################################
+##                                   Network Advanced                                ##       
+#######################################################################################
+
+##It configures the transmission mode and speed of the Internet (WAN) port.
+##0-Auto Negotiate
+##1-Full Duplex 10Mbps
+##2-Full Duplex 100Mbps
+##3-Half Duplex 10Mbps
+##4-Half Duplex 100Mbps
+##5-Full Duplex 1000Mbps (only applicable to SIP-T42G and SIP-T46G IP phones)
+##The default value is 0.It takes effect after a reboot.
+static.network.internet_port.speed_duplex = 
+
+##It configures the transmission mode and speed of the PC (LAN) port.
+##0-Auto Negotiate
+##1-Full Duplex 10Mbps
+##2-Full Duplex 100Mbps
+##3-Half Duplex 10Mbps
+##4-Half Duplex 100Mbps
+##5-Full Duplex 1000Mbps (only applicable to SIP-T42G and SIP-T46G IP phones)
+##The default value is 0.It takes effect after a reboot.
+static.network.pc_port.speed_duplex = 
+
+##It enable or disable to use A record of TTL 
+##The defalue value is 1;0-Disable   1-Enable 
+static.network.dns.ttl_enable =
+
+##It configures the LAN MTU 
+##The default value is 1500,.Integer from 128 to 1500.It takes effect after a reboot.
+static.network.mtu_value = 
+
+static.network.dhcp.option60type =
+
+static.network.dns.last_cache_expired.enable =
+static.network.dns.last_cache_expired =
+static.network.dns.query_timeout =
+
+#######################################################################################
+##                                    VLAN                                           ##       
+#######################################################################################
+static.network.vlan.internet_port_enable = 
+static.network.vlan.internet_port_vid = 
+static.network.vlan.internet_port_priority = 
+static.network.vlan.pc_port_enable = 
+static.network.vlan.pc_port_vid = 
+static.network.vlan.pc_port_priority = 
+static.network.vlan.dhcp_enable = 
+static.network.vlan.dhcp_option =
+##It configures LLDP or manually VLAN can't obtain IP, whether to switch to other methods of VLAN or closed VLAN to get IP
+##(Except T19P/T21P Models) 0-Disable   1-Enable 
+static.network.vlan.vlan_change.enable = 
+
+#######################################################################################
+##                                   WEB Port                                        ##       
+#######################################################################################
+##It configures the HTTP port for web server access.
+##The default value is 80.It takes effect after a reboot.
+static.network.port.http = 
+
+##It configures the HTTPS port for web server access.
+##The default value is 443.It takes effect after a reboot.
+static.network.port.https = 
+
+static.wui.https_enable = 
+static.wui.http_enable = 
+
+#######################################################################################
+##                                   QoS                                             ##       
+#######################################################################################
+##It configures the audio QoS.
+##The default value is 46.It takes effect after a reboot.Integer from 0 to 63
+static.network.qos.audiotos = 
+
+##It configures the SIP QoS.
+##The default value is 26.It takes effect after a reboot.Integer from 0 to 63
+static.network.qos.signaltos = 
+
+##It configures the video QoS.
+##The default value is 34.It takes effect after a reboot.Integer from 0 to 63
+static.network.qos.videotos =  
+
+#######################################################################################
+##                                   802.1X                                          ##       
+#######################################################################################
+static.network.802_1x.mode = 
+static.network.802_1x.identity = 
+static.network.802_1x.md5_password = 
+static.network.802_1x.root_cert_url =
+static.network.802_1x.client_cert_url = 
+
+##It configure the mouth of the PC 802.1 x - logoff function.It takes effect after a reboot.
+##The default value is 0-Dsable ,    1-Enable
+static.network.802_1x.proxy_eap_logoff.enable = 
+
+static.network.802_1x.eap_fast_provision_mode =
+static.network.802_1x.anonymous_identity =
+#######################################################################################
+##                                   OpenVPN(Except T19P Model)                      ##       
+#######################################################################################
+static.network.vpn_enable = 
+static.openvpn.url = 
+
+#######################################################################################
+##                                   LLDP                                            ##       
+#######################################################################################
+static.network.lldp.enable = 
+static.network.lldp.packet_interval =  
+
+#######################################################################################
+##                                   Span to PC                                      ##       
+#######################################################################################
+static.network.span_to_pc_port = 
+
+#######################################################################################
+##                                   RTP Port                                        ##       
+#######################################################################################
+static.sip.min_udp_port =
+static.sip.max_udp_port =
+static.sip.min_tcp_port =
+static.sip.max_tcp_port =
+
+#######################################################################################
+##                                   Syslog                                          ##       
+#######################################################################################
+static.syslog.enable =
+static.syslog.server =
+static.syslog.level =
+static.syslog.server_port =
+static.syslog.transport_type =
+static.syslog.facility =
+static.syslog.prepend_mac_address.enable =
+static.local_log.enable =
+static.local_log.level =
+static.local_log.max_file_size =
+
+#######################################################################################
+##                                   TR069								             ##      
+#######################################################################################
+static.managementserver.enable = 
+static.managementserver.username = 
+static.managementserver.password = 
+static.managementserver.url = 
+static.managementserver.connection_request_username = 
+static.managementserver.connection_request_password = 
+static.managementserver.periodic_inform_enable = 
+static.managementserver.periodic_inform_interval = 
+
+#######################################################################################
+##                                   Autoprovision            ##                     ##
+#######################################################################################
+### It enables or disables the phone to synchronize personalized configuration settings with the auto provisioning server.
+### If it is set to 1 (Enabled), personalized configuration settings via web/phone user interface are saved in the MAC-local.cfg file on the phone, 
+### and then the phone will upload the MAC-local.cfg file to the provisioning server. During auto provisioning, the phone requests to download the MAC-local.cfg file on the provisioning server.
+### 0-Disabled, 1-Enabled. The default value is 0.
+static.auto_provision.custom.sync =
+
+### It enables or disables the phone to protect personalized configuration settings even after auto provisioning.
+### If it is set to 1 (Enabled), personalized configuration settings via web/phone user interface will be protected and remained after auto provisioning.
+### 0-Disabled, 1-Enabled. The default value is 0.
+static.auto_provision.custom.protect = 
+static.auto_provision.custom.sync.path =
+static.auto_provision.custom.upload_method =
+static.auto_provision.attempt_expired_time =
+
+##V83 Add
+static.auto_provision.authentication.expired_time =
+static.auto_provision.connect.keep_alive =
+
+static.auto_provision.inactivity_time_expire =
+
+custom.auto_provision.save_rps_info.enable =
+static.auto_provision.attempt_before_failed =
+static.auto_provision.retry_delay_after_file_transfer_failed =
+static.auto_provision.server.type =
+static.auto_provision.update_file_mode =
+static.auto_provision.prompt.enable =
+#######################################################################################
+##                                   Autop Mode                                      ##       
+#######################################################################################
+static.auto_provision.power_on =
+
+#######################################################################################
+##                                   Autop PNP                                       ##       
+#######################################################################################
+static.auto_provision.pnp_enable = 
+
+#######################################################################################
+##                                   Autop DHCP                                      ##       
+#######################################################################################
+static.auto_provision.dhcp_option.enable = 
+static.auto_provision.dhcp_option.list_user_options = 
+
+#######################################################################################
+##                                   Autop Repeat                                    ##       
+#######################################################################################
+static.auto_provision.repeat.enable = 
+static.auto_provision.repeat.minutes = 
+
+#######################################################################################
+##                                   Autop Weekly                                    ##       
+#######################################################################################
+static.auto_provision.weekly.enable =
+static.auto_provision.weekly.dayofweek = 
+static.auto_provision.weekly.begin_time = 
+static.auto_provision.weekly.end_time = 
+static.auto_provision.weekly_upgrade_interval =
+#######################################################################################
+##                                   Autop URL                                       ##       
+#######################################################################################
+static.auto_provision.server.url = 
+static.auto_provision.server.username = 
+static.auto_provision.server.password = 
+
+#######################################################################################
+##                                   Autop AES Key                                   ##       
+#######################################################################################
+##It configures the AES key for decrypting the Common CFG file. The valid characters contain: 0 ~ 9, A ~ Z, a ~ z.
+##The default value is blank.
+static.auto_provision.aes_key_16.com = 
+
+##It configures the AES key for decrypting the MAC-Oriented CFG file. The valid characters contain: 0 ~ 9, A ~ Z, a ~ z.
+##The default value is blank.
+
+static.auto_provision.aes_key_16.mac = 
+static.auto_provision.aes_key_in_file =
+
+##It configures the access URL of the custom MAC-Oriented CFG file.
+##The default value is blank.
+static.custom_mac_cfg.url =
+
+##It configures the value (vendor name of the device) of DHCP option 60.
+##The default value is yealink.
+static.auto_provision.dhcp_option.option60_value = 
+##It configuration phone update to restart automatically.It takes effect after a reboot.
+##0-Disable    1-Enable
+static.auto_provision.reboot_force.enable = 
+
+#######################################################################################
+##                                   Autop wildcard                                  ##       
+#######################################################################################
+
+static.auto_provision.url_wildcard.pn = 
+
+#######################################################################################
+##                                   Autop Code                                      ##       
+#######################################################################################
+##It configures the name of the code for triggering auto provisioning.
+##The default value is blank.It takes effect after a reboot.
+static.autoprovision.1.name = 
+
+##It configures the code for triggering auto provisioning.
+##Valid characters are digits, # and *.Example:static.autoprovision.1.code = *99The default value is blank.
+##It takes effect after a reboot.
+static.autoprovision.1.code = 
+
+##It configures the access URL of auto provisioning server.The default value is blank.
+##It takes effect after a reboot.
+static.autoprovision.1.url = 
+
+##It configures the user name for authentication during auto provisioning.
+##The default value is blank.It takes effect after a reboot.
+static.autoprovision.1.user = 
+
+##It configures the password for authentication during auto provisioning.
+##The default value is blank.It takes effect after a reboot.
+static.autoprovision.1.password = 
+
+##It configures the AES key for decrypting the Common CFG file.
+##The default value is blank.It takes effect after a reboot.
+static.autoprovision.1.com_aes = 
+
+##It configures the AES key for decrypting the MAC-Oriented CFG file.
+##The default value is blank.It takes effect after a reboot.
+static.autoprovision.1.mac_aes = 
+
+#######################################################################################
+##                                   Watch Dog                                       ##       
+#######################################################################################
+static.watch_dog.enable = 
+
+#######################################################################################
+##                                   SIP Advanced                                    ##       
+#######################################################################################
+sip.use_23_as_pound = 
+sip.rfc2543_hold = 
+sip.use_out_bound_in_dialog =  
+sip.reg_surge_prevention = 
+sip.send_response_by_request = 
+sip.notify_reboot_enable = 
+sip.disp_incall_to_info =
+sip.listen_port =
+sip.tls_listen_port =
+sip.trust_ctrl =
+static.sip.nat_stun.enable =
+static.sip.nat_stun.server =
+static.sip.nat_stun.port =
+sip.timer_t1 =
+sip.timer_t2 =
+sip.timer_t4 =
+
+##It is ASCII conversion into corresponding symbols.
+##The defalult value is blank. 0-Disable   1-Enable
+sip.escape_characters.enable = 
+
+sip.reserve_characters =
+
+##The default value is 0 ( said according to the transmission mode configured to listen on port),1-
+##1-said at the same time to monitor TCP and UDP
+##2-said to monitor TCP and UDP at the same time, and from the BLF - the LIST to subscribe to the contact with a transport = TCP parameters
+sip.listen_mode =
+
+##The default value is 0.(contracting out the random contact, via port to carry fixed port).It takes effect after a reboot.
+##1-the out-contracting port random contact, via port to carry
+##2-the out-contracting ports fixed contact, via carry fix
+sip.tcp_port_random_mode = 
+
+sip.call_fail_use_reason.enable =
+sip.cid_source.preference =
+
+##V83 Add
+sip.request_validation.event =
+sip.request_validation.digest.realm =
+sip.request_validation.digest.list =
+sip.request_validation.source.list =
+
+#######################################################################################
+##                                   Echo Cancellation                               ##       
+#######################################################################################
+voice.vad = 
+voice.cng = 
+voice.echo_cancellation = 
+voice.ans_nb.enable =
+voice.tns.enable =
+
+#######################################################################################
+##                                   Jitter Buffer                                   ##       
+#######################################################################################
+voice.jib.adaptive = 
+voice.jib.min = 
+voice.jib.max = 
+voice.jib.normal = 
+
+#######################################################################################
+##                                   Tones                                           ##       
+#######################################################################################
+voice.tone.country =
+voice.tone.dial = 
+voice.tone.ring = 
+voice.tone.busy = 
+voice.tone.congestion = 
+voice.tone.callwaiting = 
+voice.tone.dialrecall = 
+voice.tone.info = 
+voice.tone.stutter = 
+voice.tone.autoanswer = 
+
+#######################################################################################
+##                                   Volume                                          ##       
+#######################################################################################
+voice.handfree_send = 
+voice.handset_send = 
+voice.headset_send = 
+
+voice.headset.autoreset_spk_vol =
+voice.handset.autoreset_spk_vol =
+voice.handfree.autoreset_spk_vol =
+
+#######################################################################################
+##                                   Transfer                                        ##       
+#######################################################################################
+##It enables or disables the transferee party¡¯s phone to prompt a missed call on the LCD screen before displaying 
+##the caller ID when performing a semi-attended transfer.0-Enabled,1-Disabled
+##The default value is 1.
+transfer.semi_attend_tran_enable = 
+
+##It enables or disables the phone to complete the blind transfer through on-hook.0-Disabled,1-Enabled .
+##The default value is 1.
+transfer.blind_tran_on_hook_enable = 
+
+##It enables or disables the phone to transfer call to the two parties after a local conference call hangs up.
+##0-Disabled,1-Enabled.
+##The default value is 0.
+transfer.tran_others_after_conf_enable = 
+
+##It enables or disables the phone to complete the attended transfer through on-hook.
+##0-Disabled,1-Enabled.
+##The default value is 1.
+transfer.on_hook_trans_enable = 
+
+##It configures the DSS key behavior during an active call when user presses the DSS 
+##key and the DSS key is configured as a speed dial, transfer or BLF/BLF list key.
+##0-New Call,1-Attended Transfer,2-Blind Transfer.
+##The default value is 2.
+transfer.dsskey_deal_type = 
+
+##It enables or disables the phone to enter Transfer to menu during multiple calls when pressing the transfer soft key or TRAN key.
+##0-Disabled,1-Enabled.
+##The default value is 1.
+transfer.multi_call_trans_enable = 
+
+#######################################################################################
+##                                   Language Settings                               ##
+#######################################################################################
+##It configures the language of the web user interface.
+lang.wui = 
+
+##It configures the language of the phone user interface.
+##The default value is English.
+lang.gui = 
+
+gui_lang.url = 
+gui_lang.delete = 
+wui_lang.url = 
+wui_lang_note.url = 
+wui_lang.delete = 
+
+#######################################################################################
+##                                   Auto Redial                                     ##       
+#######################################################################################
+auto_redial.enable = 
+auto_redial.interval = 
+auto_redial.times = 
+
+#######################################################################################
+##                                   Zero Touch                                      ##       
+#######################################################################################
+static.zero_touch.enable = 
+static.zero_touch.wait_time = 
+static.features.hide_zero_touch_url.enable =
+static.zero_touch.network_fail_wait_times =
+static.zero_touch.network_fail_delay_times =
+
+
+#######################################################################################
+##                                   Dial Plan                                       ##       
+#######################################################################################
+dialplan.area_code.code = 
+dialplan.area_code.min_len =  
+dialplan.area_code.max_len = 
+dialplan.area_code.line_id = 
+
+### X ranges from 1 to 10
+###dialplan.block_out.number.x =
+###dialplan.block_out.line_id.x =
+
+dialplan.block_out.number.1 =
+dialplan.block_out.line_id.1 =
+
+###X ranges from 1 to 100
+###dialplan.dialnow.rule.X = 
+###dialplan.dialnow.line_id.X = 
+
+dialplan.dialnow.rule.1 = 
+dialplan.dialnow.line_id.1 = 
+
+###X ranges from 1 to 100
+###dialplan.replace.prefix.X = 
+###dialplan.replace.replace.X = 
+###dialplan.replace.line_id.X = 
+
+dialplan.replace.prefix.1 = 
+dialplan.replace.replace.1 = 
+dialplan.replace.line_id.1 = 
+
+dialplan_dialnow.url = 
+phone_setting.dialnow_delay = 
+dialplan_replace_rule.url =
+
+
+#######################################################################################
+##                                   Remote Phonebook(Except T20P Model)             ##       
+#######################################################################################
+###X ranges from 1 to 5
+###remote_phonebook.data.X.url =   
+###remote_phonebook.data.X.name = 
+
+remote_phonebook.data.1.url =   
+remote_phonebook.data.1.name = 
+remote_phonebook.display_name = 
+
+###It enables or disables the phone to update the data of the remote phone book at a time when accessing the remote phone book.
+###0-Disabled, 1-Enabled. The default value is 0.
+features.remote_phonebook.enter_update_enable = 
+
+##It enables or disables the phone to perform a remote phone book search when receiving an incoming call.
+##0-Disabled,1-Enabled.
+##The default value is 0.
+features.remote_phonebook.enable = 
+
+##It configures the interval (in seconds) for the phone to update the data of the remote phone book from the remote phone book server.
+##The value 0 means the phone will not regularly update the data of the remote phone book from the remote phone book server.
+##The default value is 21600.Integer from 3600 to 2592000,and 0.
+features.remote_phonebook.flash_time = 
+
+#######################################################################################
+##                                   LDAP							                 ##
+#######################################################################################
+##It enables or disables LDAP feature.0-Disabled,1-Enabled.
+##The default value is 0.
+ldap.enable = 
+
+##It configures the criteria for searching the contact name attributes.
+##Example:ldap.name_filter = (|(cn=%)(sn=%)).
+##The default value is blank.
+ldap.name_filter = 
+
+##It configures the criteria for searching the contact number attributes.
+##Example:ldap.number_filter = (|(telephoneNumber=%)(mobile=%)(ipPhone=%))
+##The default value is blank.
+ldap.number_filter = 
+
+##It configures the IP address or domain name of the LDAP server.
+##The default value is blank.
+ldap.host = 
+
+##It configures the port of the LDAP server.
+##The default value is 389.Integer from 1 to 65535.
+ldap.port = 
+
+##It configures the LDAP search base which corresponds to the location of the LDAP phonebook.
+##Example:ldap.base = dc=yealink,dc=cn.
+##The default value is blank.
+ldap.base =
+ 
+##It configures the user name for accessing the LDAP server.
+##The default value is blank.
+ldap.user = 
+
+##It configures the password for accessing the LDAP server.
+##The default value is blank.
+ldap.password = 
+
+##It configures the maximum of the search results returned by the LDAP server to be displayed.
+##The default value is 50.Integer from 1 to 32000.
+ldap.max_hits = 
+
+##It configures the name attributes of each record to be returned by the LDAP server.
+##Multiple attributes are separated by spaces.Example:ldap.name_attr =sn cn.
+##The default value is blank.
+ldap.name_attr = 
+
+##It configures the number attributes of each record to be returned by the LDAP server.
+##Multiple attributes are separated by spaces.Example:ldap.numb_attr = Mobile ipPhone.
+##The default value is blank.
+ldap.numb_attr = 
+
+##It configures the display name of the contact record displayed on the LCD screen. The value of this parameter must start with ¡°%¡± symbol.
+##Example:ldap.display_name = %cn
+##The default value is blank.
+ldap.display_name = 
+
+##It configures the LDAP version.
+##The default value is 3.
+ldap.version = 
+
+##It enables or disables the phone to perform an LDAP search when receiving an incoming call.
+##0-Disabled,1-Enabled.
+##The default value is 0.
+ldap.call_in_lookup = 
+
+##It enables or disables the phone to sort the search results in alphabetical order or numerical order.
+##0-Disabled,1-Enabled.
+##The default value is 0.
+ldap.ldap_sort = 
+##It is the electricity + start, automatic search + 00 the beginning and the beginning of the numbe
+##The default value is 0.(0-Disable,1-Enable )(Except T19P/T21P Models)
+ldap.incoming_call_special_search.enable =
+##The default value is 0,value of 0 to 2, respectively the ldap, ldap + StarTLS and ldaps
+ldap.tls_mode = 
+ldap.call_out_lookup =
+ldap.customize_label=
+#######################################################################################
+##                                   Features                                        ##       
+#######################################################################################
+features.normal_refuse_code = 
+features.auto_answer_delay = 
+features.allow_mute = 
+features.group_listen_in_talking_enable = 
+features.call_completion_enable = 
+features.call_num_filter = 
+features.direct_ip_call_enable = 
+features.relog_offtime = 
+features.ringer_device.is_use_headset = 
+features.factory_pwd_enable = 
+features.anonymous_response_code =
+features.show_action_uri_option =
+features.reset_by_long_press_enable =
+features.upload_server =
+features.call_log_show_num = 
+features.call_invite_format =
+
+phone_setting.logon_wizard_forever_wait =
+features.caller_name_type_on_dialing =
+features.off_hook_answer.enable = 
+features.auto_linekeys.enable =
+
+
+features.blf_pickup_only_send_code =
+##It is configured in the middle of the screen shows the current default at the bottom of the account name.
+##The default is 0.CNT version 1.
+features.reboot_in_talk_enable =
+features.barge_in_via_username.enable = 
+features.flash_url_dsskey_led.enable = 
+static.features.default_account =
+features.linekey_call_with_default_account = 
+
+
+#######################################################################################
+##                                   Features Forward                                ##       
+#######################################################################################
+
+features.fwd_mode =
+features.fwd_diversion_enable = 
+
+#######################################################################################
+##                                   Features DND                                    ##       
+#######################################################################################
+
+features.dnd_mode = 
+features.dnd.enable = 
+features.dnd.on_code = 
+features.dnd.off_code = 
+features.dnd_refuse_code = 
+features.dnd.emergency_enable = 
+features.dnd.emergency_authorized_number = 
+
+#######################################################################################
+##                                   Features Bluetooth                              ##       
+#######################################################################################
+features.bluetooth_enable = 
+static.bluetooth.function.enable =
+features.bluetooth_adapter_name=
+
+voice.bluetooth_headset_send=
+#######################################################################################
+##                                   Features BLF                                    ##       
+#######################################################################################
+
+##It enables or disables the phone to deal with the Version header in the BLF NOTIFY message sent by the server.
+##0-Disabled,1-Enabled.
+##The default value is 0.It takes effect after a reboot.
+features.blf_list_version = 
+
+#######################################################################################
+##                                   Features Intercom                               ##       
+#######################################################################################
+features.intercom.allow  = 
+features.intercom.mute  = 
+features.intercom.tone  = 
+features.intercom.barge  = 
+features.intercom.led.enable =
+features.intercom.subscribe.enable =
+features.intercom.barge_in_dialing.enable=
+sip.intercom_sub.enable =
+#######################################################################################
+##                                   Features Hotline                                ##       
+#######################################################################################
+##It configures the hotline number.
+##The default value is blank.
+features.hotline_number = 
+
+##It configures the delay time (in seconds) for the phone to dial out the hotline number automatically.
+##The default value of delay time is 4.Integer from 0 to 10
+features.hotline_delay = 
+
+#######################################################################################
+##                                   Features DTMF                                   ##       
+#######################################################################################
+features.dtmf.hide = 
+
+###Except T20P Model
+features.dtmf.hide_delay = 
+
+features.dtmf.repetition = 
+features.dtmf.transfer = 
+features.dtmf.replace_tran = 
+features.dtmf.duration =
+features.dtmf.volume =
+features.play_local_dtmf_tone_enable =
+
+#######################################################################################
+##                                   Features Audio Settings                         ##       
+#######################################################################################
+features.headset_prior = 
+features.headset_training = 
+features.alert_info_tone =
+features.busy_tone_delay = 
+features.send_pound_key = 
+features.key_as_send = 
+features.send_key_tone = 
+features.key_tone = 
+features.play_hold_tone.enable = 
+features.play_hold_tone.delay = 
+features.redial_tone = 
+features.partition_tone = 
+
+#######################################################################################
+##                                   Features Action URI                             ##       
+#######################################################################################
+features.action_uri_limit_ip =
+
+
+#######################################################################################
+##                                   Features Prefix                                 ##       
+#######################################################################################
+features.password_dial.enable = 
+features.password_dial.prefix =
+features.password_dial.length =
+
+#######################################################################################
+##                                   Features History                                ##       
+#######################################################################################
+features.save_call_history = 
+features.redial_via_local_sip_server.enable=
+features.local_calllog.received.replace_rule=
+##V83 Add
+features.calllog_detailed_information =
+
+static.auto_provision.local_calllog.write_delay.terminated=
+static.auto_provision.local_calllog.backup.path=
+static.auto_provision.local_calllog.backup.enable=
+
+#######################################################################################
+##                                   Notification Popups                             ##     
+#######################################################################################
+features.voice_mail_popup.enable=
+features.missed_call_popup.enable=
+features.forward_call_popup.enable=
+
+#######################################################################################
+##                                   Ringtone                                        ##       
+#######################################################################################
+ringtone.url =
+ringtone.delete = 
+
+#######################################################################################
+##                                   Phone Settings                                  ##       
+#######################################################################################
+phone_setting.inter_digit_time = 
+phone_setting.ring_type =  
+
+phone_setting.ring_for_tranfailed = 
+phone_setting.is_deal180 = 
+phone_setting.show_code403 =
+
+phone_setting.ringback_timeout =
+phone_setting.ringing_timeout =
+
+phone_setting.page_tip = 
+phone_setting.predial_autodial = 
+phone_setting.headsetkey_mode = 
+
+static.phone_setting.reserve_certs_enable =
+phone_setting.called_party_info_display.enable =
+phone_setting.call_info_display_method =
+
+
+
+#######################################################################################
+##                                   Power Led Settings                              ##       
+#######################################################################################
+phone_setting.common_power_led_enable = 
+phone_setting.talk_and_dial_power_led_enable = 
+phone_setting.mail_power_led_flash_enable = 
+phone_setting.ring_power_led_flash_enable =
+phone_setting.mute_power_led_flash_enable= 
+phone_setting.hold_and_held_power_led_flash_enable =
+phone_setting.missed_call_power_led_flash.enable = 
+
+##It configures the level of the active backlight intensity.
+##The default value is 8.
+phone_setting.active_backlight_level = 
+
+
+
+#######################################################################################
+##                                   Phone Setting Display                           ##       
+#######################################################################################
+
+##It configures the backlight time (in seconds).0, 1, 15, 30, 60, 120, 300, 600 or 1800.
+phone_setting.backlight_time = 
+phone_setting.backgrounds = 
+wallpaper_upload.url =
+
+
+#######################################################################################
+##                                   Phone Setting BLF                               ##       
+#######################################################################################
+###It enables or disables the phone to automatically configure the BLF list keys in order.
+###0-Disabled,1-Enabled.
+###The default value is 1.
+
+phone_setting.auto_blf_list_enable = 
+
+#######################################################################################
+##                                   Key Lock                                        ##       
+#######################################################################################
+###It enables or disables keypad lock feature.
+###0-Disabled,1-Enabled.
+###The default value is 0.
+phone_setting.phone_lock.enable = 
+
+
+###It configures the password for unlocking the keypad.
+###The default value is 123.
+phone_setting.phone_lock.unlock_pin = 
+
+###It configures the interval (in seconds) to automatically lock the keypad.
+###The default value is 0 (the keypad is locked only by long pressing the pound key or pressing the keypad lock key)
+phone_setting.phone_lock.lock_time_out = 
+phone_setting.emergency.number = 
+
+#######################################################################################
+##                                   Multicast                                       ##       
+#######################################################################################
+
+multicast.codec = 
+
+multicast.receive_priority.enable = 
+multicast.receive_priority.priority = 
+
+###X ranges from 1 to 31
+###multicast.listen_address.X.label = 
+###multicast.listen_address.X.ip_address = 
+
+multicast.listen_address.1.label = 
+multicast.listen_address.1.ip_address = 
+
+multicast.paging_address.1.ip_address =
+multicast.paging_address.1.label = 
+
+multicast.receive.ignore_dnd.priority=
+
+#######################################################################################
+##                                   Super Search									 ##       
+#######################################################################################
+super_search.recent_call = 
+super_search.url =
+
+#######################################################################################
+##                                   Security                                        ##       
+#######################################################################################
+###Define the login username and password of the user, var and administrator.
+###If you change the username of the administrator from "admin" to "admin1", your new administrator's username should be configured as: security.user_name.admin = admin1.
+###If you change the password of the administrator from "admin" to "admin1pwd", your new administrator's password should be configured as: security.user_password = admin1:admin1pwd.
+
+###The following examples change the user's username to "user23" and the user's password to "user23pwd".
+###static.security.user_name.user = user23
+###static.security.user_password = user23:user23pwd
+###The following examples change the var's username to "var55" and the var's password to "var55pwd".
+###static.security.user_name.var = var55
+###static.security.user_password = var55:var55pwd
+static.security.user_name.user = 
+static.security.user_name.admin = 
+static.security.user_name.var = 
+static.security.user_password = 
+
+{if isset($admin_name)}
+static.security.user_name.admin = {$admin_name}
+static.security.user_password = {$admin_name}:{$admin_password}
+{/if}
+
+###It enables or disables the phone to only accept the certificates in the Trusted Certificates list.
+###0-Disabled,1-Enabled.
+###The default value is 1.It takes effect after a reboot.
+static.security.trust_certificates = {if $yealink_trust_certificates == "false"}0{elseif $yealink_trust_certificates == "true"}1{/if}
+
+###It configures the source certificates for the phone to authenticate for TLS connection.
+###0-Default certificates,1-Custom certificates,2-All certificates.
+###The default value is 0.It takes effect after a reboot.
+static.security.ca_cert =
+
+###It configures the device certificates for the phone to send for TLS authentication.
+###0-Default certificates,1-Custom certificates.
+###The default value is 0.It takes effect after a reboot.
+static.security.dev_cert =
+
+###It enables or disables the phone to mandatorily validate the CommonName or SubjectAltName of the certificate received from the connecting server.
+###0-Disabled,1-Enabled.
+###The default value is 0.It takes effect after a reboot.
+static.security.cn_validation =
+
+##V83 Add
+phone_setting.reserve_certs_config.enable =
+#######################################################################################
+##                                   User Mode                                       ##       
+#######################################################################################
+###It enables or disables the 3-level permissions (admin, user, var).
+###0-Disabled,1-Enabled.
+###The default value is 0.It takes effect after a reboot.
+static.security.var_enable = 
+
+static.web_item_level.url = 
+
+#######################################################################################
+##                                   Trusted Certificates                            ##       
+#######################################################################################
+static.trusted_certificates.url = 
+static.trusted_certificates.delete = 
+
+#######################################################################################
+##                                   Server Certificates                             ##       
+#######################################################################################
+static.server_certificates.url = 
+static.server_certificates.delete = 
+
+#######################################################################################
+##                                   Conference                                      ##       
+#######################################################################################
+features.local_conf.combine_with_one_press.enable=
+
+#######################################################################################
+##                                   Line Key                                        ##       
+#######################################################################################
+###T58V/VP59 X ranges from 1 to 27
+
+#linekey.X.type--Customize the linekey type.
+#The valid types are: 
+
+#0-NA   1-Conference   2-Forward   3-Transfer   4-Hold   5-DND   7-Call Return   8-SMS   9-Directed Pickup   10-Call Park  11-DTMF   12-Voice Mail   13-Speed Dial
+#14-Intercom   15-Line   16-BLF   17-URL   18-Group Listening  20-Private Hold   22-XML Group   23-Group Pickup  24-Multicast Paging  25-Record   27-XML Browser
+#34-Hot Desking   35-URL Record   38-LDAP   39-BLF List   40-Prefix   41-Zero Touch   42-ACD   45-Local Group   46-Network Group   49-Custom Button   50-Keypad Lock
+#55-Meet-Me Conference   56-Retrieve Park   57-Hoteling   58-ACD Grace   59-Sisp Code   60-Emergency   61-Directory  84-open door  85-video monitoring
+
+#0-NA 
+#22-XML Group
+#38-LDAP
+#46-Network Group 
+#17-URL 
+
+###linekey.X.line = 
+###linekey.X.value = 
+###linekey.X.type = 
+###linekey.X.xml_phonebook =
+###linekey.X.label = 
+###linekey.X.extension
+
+{foreach $keys['line'] as $row}
+#Configure Line Key {$row.device_key_id}
+linekey.{$row.device_key_id}.line = {$row.device_key_line}
+linekey.{$row.device_key_id}.value = {$row.device_key_value}
+{if $row.device_key_type == "1" || $row.device_key_type == "16"}
+linekey.{$row.device_key_id}.pickup_value = {$row.device_key_extension}
+{else}
+linekey.{$row.device_key_id}.extension = {$row.device_key_extension}
+{/if}
+linekey.{$row.device_key_id}.type = {$row.device_key_type}
+linekey.{$row.device_key_id}.xml_phonebook =
+linekey.{$row.device_key_id}.label = {$row.device_key_label}
+
+{/foreach}
+
+##########################################################################################
+##         	               Programmable Key                                             ##               
+##########################################################################################
+#T58VT56A/VP59 X ranges from 1 to 4,12 to 14
+#programablekey.x.value =
+#programablekey.x.xml_phonebook--Specify the desired remote phonebook/local group/BSFT phonebook for the programmable key. This parameter is only appilicable to the feature XML Group/Local Group/Broadsoft Group.
+#programablekey.x.history_type =
+#programablekey.x.label--This parameter is only available to the key 1 to key 4. 
+
+programablekey.X.type =
+programablekey.X.line = 
+programablekey.X.value =
+programablekey.X.history_type =
+programablekey.X.label =
+programablekey.X.xml_phonebook =
+programablekey.X.extension
+
+#######################################################################################
+##                                   Forward Always                                  ##       
+#######################################################################################
+forward.always.enable = 
+forward.always.target = 
+forward.always.on_code = 
+forward.always.off_code = 
+
+#######################################################################################
+##                                   Forward Busy                                    ##       
+#######################################################################################
+forward.busy.enable = 
+forward.busy.target = 
+forward.busy.on_code = 
+forward.busy.off_code = 
+
+#######################################################################################
+##                                   Forward No Answer                               ##       
+#######################################################################################
+forward.no_answer.enable = 
+forward.no_answer.target = 
+forward.no_answer.timeout = 
+forward.no_answer.on_code = 
+forward.no_answer.off_code = 
+
+#######################################################################################
+##                                   Forward International                           ##       
+#######################################################################################
+###It enables or disables the phone to forward incoming calls to international numbers.
+###0-Disabled,1-Enabled.
+###The default value is 1.
+forward.international.enable = 
+
+
+
+#######################################################################################
+##                                   Hotdesking Startup                              ##       
+#######################################################################################
+phone_setting.logon_wizard = 
+
+
+##############
+hotdesking.startup_register_name_enable = 
+hotdesking.startup_username_enable = 
+hotdesking.startup_password_enable = 
+hotdesking.startup_sip_server_enable = 
+hotdesking.startup_outbound_enable = 
+
+#######################################################################################
+##                                   Hotdesking Dsskey                               ##       
+#######################################################################################
+hotdesking.dsskey_register_name_enable = 
+hotdesking.dsskey_username_enable = 
+hotdesking.dsskey_password_enable = 
+hotdesking.dsskey_sip_server_enable = 
+hotdesking.dsskey_outbound_enable = 
+
+#######################################################################################
+##                                   Alert Info                                      ##       
+#######################################################################################
+###X ranges from 1 to 100
+###distinctive_ring_tones.alert_info.x.text =
+###distinctive_ring_tones.alert_info.x.ringer = 
+
+###It configures the internal ringer text for distinctive ringtone.
+###Example: distinctive_ring_tones.alert_info.1.text = Family
+###The default value is blank.
+distinctive_ring_tones.alert_info.1.text =
+
+###It configures the desired ring tones for each text.
+###The value ranges from 1 to 8, the digit stands for the appropriate ringtone.
+###Ring tones 6-8 are only applicable to SIP-T46G IP phones.
+###The default value is 1.
+distinctive_ring_tones.alert_info.1.ringer = 
+
+#######################################################################################
+##                                   Call Waiting                                    ##       
+#######################################################################################
+call_waiting.enable = 
+call_waiting.tone = 
+call_waiting.on_code =
+call_waiting.off_code =
+
+#######################################################################################
+##                                   Action URL                                      ##       
+#######################################################################################
+action_url.setup_completed = 
+action_url.registered = 
+action_url.unregistered =
+action_url.register_failed = 
+action_url.off_hook = 
+action_url.on_hook = 
+action_url.incoming_call = 
+action_url.outgoing_call = 
+action_url.call_established = 
+action_url.dnd_on = 
+action_url.dnd_off = 
+action_url.always_fwd_on = 
+action_url.always_fwd_off = 
+action_url.busy_fwd_on = 
+action_url.busy_fwd_off = 
+action_url.no_answer_fwd_on = 
+action_url.no_answer_fwd_off = 
+action_url.transfer_call = 
+action_url.blind_transfer_call =
+action_url.attended_transfer_call = 
+action_url.hold = 
+action_url.unhold = 
+action_url.mute = 
+action_url.unmute = 
+action_url.missed_call = 
+action_url.call_terminated = 
+action_url.busy_to_idle = 
+action_url.idle_to_busy = 
+action_url.ip_change = 
+action_url.forward_incoming_call = 
+action_url.reject_incoming_call = 
+action_url.answer_new_incoming_call = 
+action_url.transfer_finished = 
+action_url.transfer_failed = 
+action_url.setup_autop_finish =
+action_url.held =
+action_url.unheld =
+
+
+
+#######################################################################################
+##                                   Contact                                         ##       
+#######################################################################################
+local_contact.data.url = 
+local_contact.image.url = 
+local_contact.icon.url =
+local_contact.data_photo_tar.url =
+
+local_contact.photo.url =
+static.directory_setting.url=
+#######################################################################################
+##                                   Custom Factory Configuration                    ##       
+#######################################################################################
+
+static.custom_factory_configuration.url =
+static.features.custom_factory_config.enable = 
+
+#######################################################################################
+##                                   Custom  Configuration                           ##       
+#######################################################################################
+
+static.configuration.url =
+
+#######################################################################################
+##                                   Custom Softkey						             ##       
+#######################################################################################
+phone_setting.custom_softkey_enable = 
+custom_softkey_call_failed.url = 
+custom_softkey_call_in.url = 
+custom_softkey_connecting.url = 
+custom_softkey_ring_back.url = 
+custom_softkey_talking.url = 
+
+
+
+#######################################################################################
+##                                   Configure the access URL of firmware            ##       
+#######################################################################################
+###It configures the access URL of the firmware file.
+###The default value is blank.It takes effect after a reboot.
+static.firmware.url =
+
+#######################################################################################
+##                                             RTCP                                 ##       
+#######################################################################################
+phone_setting.vq_rtcpxr.interval_report.enable =
+phone_setting.vq_rtcpxr.session_report.enable =
+phone_setting.vq_rtcpxr.states_show_on_gui.enable =
+phone_setting.vq_rtcpxr.states_show_on_web.enable =
+phone_setting.vq_rtcpxr_delay_threshold_critical =
+phone_setting.vq_rtcpxr_delay_threshold_warning =
+phone_setting.vq_rtcpxr_display_jitter.enable =
+phone_setting.vq_rtcpxr_display_jitter_buffer_max.enable =
+phone_setting.vq_rtcpxr_display_local_call_id.enable =
+phone_setting.vq_rtcpxr_display_local_codec.enable =
+phone_setting.vq_rtcpxr_display_moscq.enable =
+phone_setting.vq_rtcpxr_display_moslq.enable =
+phone_setting.vq_rtcpxr_display_packets_lost.enable =
+phone_setting.vq_rtcpxr_display_remote_call_id.enable =
+phone_setting.vq_rtcpxr_display_remote_codec.enable =
+phone_setting.vq_rtcpxr_display_round_trip_delay.enable =
+phone_setting.vq_rtcpxr_display_start_time.enable =
+phone_setting.vq_rtcpxr_display_stop_time.enable =
+phone_setting.vq_rtcpxr_display_symm_oneway_delay.enable =
+phone_setting.vq_rtcpxr_interval_period =
+phone_setting.vq_rtcpxr_moslq_threshold_critical =
+phone_setting.vq_rtcpxr_moslq_threshold_warning =
+voice.rtcp.enable =
+voice.rtcp_xr.enable =
+voice.rtcp_cname =
+
+
+
+#######################################################################################
+##                           DNS                                                     ##       
+#######################################################################################
+dns_cache_a.1.name =
+dns_cache_a.1.ip = 
+dns_cache_a.1.ttl =
+dns_cache_srv.1.name = 
+dns_cache_srv.1.port =
+dns_cache_srv.1.priority =
+dns_cache_srv.1.target =
+dns_cache_srv.1.weight =
+dns_cache_srv.1.ttl =
+dns_cache_naptr.1.name =
+dns_cache_naptr.1.order =
+dns_cache_naptr.1.preference =
+dns_cache_naptr.1.replace =
+dns_cache_naptr.1.service = 
+dns_cache_naptr.1.ttl = 
+
+
+#######################################################################################
+##                           V80 Add                                                 ##       
+#######################################################################################
+## Add Time 2015.6.26
+static.network.attempt_expired_time =   
+features.action_uri_force_autop = 
+features.save_init_num_to_history.enable =
+features.action_uri.enable = 
+features.forward.emergency.enable = 
+features.forward.emergency.authorized_number = 
+features.auto_answer_tone.enable = 
+features.ip_call.auto_answer.enable =
+action_url.headset = 
+action_url.handfree
+action_url.cancel_callout = 
+action_url.remote_busy = 
+action_url.call_remote_canceled = 
+action_url.call_waiting_on =
+action_url.call_waiting_off =
+sip.terminate_notify_sub_delay_time =
+voice.side_tone = 
+static.security.default_access_level = 
+
+#######################################################################################
+##                                    Network WiFi                                   ##       
+#######################################################################################
+##static.wifi.X.label=
+##static.wifi.X.ssid=
+##static.wifi.X.priority=
+##static.wifi.X.security_mode=
+##static.wifi.X.cipher_type=
+##static.wifi.X.password=
+##static.wifi.X.eap_type=
+##static.wifi.X.eap_user_name=
+##static.wifi.x.eap_password=
+##(X ranges from 1 to 5)
+
+static.wifi.enable =
+static.wifi.1.label =
+static.wifi.1.ssid =
+static.wifi.1.priority =
+static.wifi.1.security_mode =
+static.wifi.1.cipher_type =
+static.wifi.1.password =
+static.wifi.1.eap_type =
+static.wifi.1.eap_user_name =
+static.wifi.1.eap_password =
+
+##V83 Add
+static.wifi.function.enable =
+
+#######################################################################################
+##                              V80-SP2 Add                                          ##       
+#######################################################################################
+##Add Time 2016.5.26
+features.power_saving.enable=
+features.power_saving.office_hour.idle_timeout =
+features.power_saving.off_hour.idle_timeout =
+features.power_saving.user_input_ext.idle_timeout=
+features.power_saving.office_hour.monday =
+features.power_saving.office_hour.tuesday =
+features.power_saving.office_hour.wednesday =
+features.power_saving.office_hour.thursday =
+features.power_saving.office_hour.friday  =
+features.power_saving.office_hour.saturday  =
+features.power_saving.office_hour.sunday =
+screensaver.wait_time=
+
+##V83 Add
+features.power_saving.power_led_flash.off_time=
+features.power_saving.power_led_flash.on_time=
+screensaver.type=
+
+#######################################################################################
+##                           Digitmap                                                ##       
+#######################################################################################
+dialplan.digitmap.enable=
+dialplan.digitmap.string=
+dialplan.digitmap.no_match_action=
+dialplan.digitmap.interdigit_short_timer=
+dialplan.digitmap.interdigit_long_timer=
+dialplan.digitmap.apply_to.press_send=
+dialplan.digitmap.apply_to.forward=
+dialplan.digitmap.apply_to.history_dial=
+dialplan.digitmap.apply_to.directory_dial=
+dialplan.digitmap.apply_to.on_hook_dial=
+dialplan.digitmap.active.on_hook_dialing=
+
+##V83 Add
+dialplan.digitmap.apply_to.prefix_key =
+
+#######################################################################################
+##                           Emergency Dialplan                                      ##       
+#######################################################################################
+dialplan.emergency.enable=
+dialplan.emergency.1.value=
+dialplan.emergency.server.1.address=
+dialplan.emergency.server.1.transport_type=
+dialplan.emergency.server.1.port=
+dialplan.emergency.1.server_priority=
+dialplan.emergency.custom_asserted_id=
+dialplan.emergency.asserted_id_source=
+
+#######################################################################################
+##                              V81 Add                                              ##       
+#######################################################################################
+
+static.auto_provision.flexible.enable =
+static.auto_provision.flexible.interval=
+static.auto_provision.flexible.begin_time  = 
+static.auto_provision.flexible.end_time =
+voice.jib.wifi.adaptive =
+voice.jib.wifi.min =
+voice.jib.wifi.max =
+voice.jib.wifi.normal =
+wui.quick_login =
+
+##Multicast(X ranges from 1 to 31.)
+multicast.receive.use_speaker = 
+multicast.listen_address.1.channel =
+multicast.paging_address.1.channel =
+
+features.keep_mute.enable =
+voice.tone.secondary_dial =
+features.power_saving.intelligent_mode =          
+features.blf_active_backlight.enable =                                    
+features.intercom.headset_prior.enable =     
+
+#######################################################################################
+##                                  Time&Date                                        ##       
+#######################################################################################
+auto_dst.url = {$yealink_auto_dst_url}
+local_time.manual_time_enable =
+local_time.manual_ntp_srv_prior =
+local_time.time_format = {$yealink_time_format}
+local_time.date_format = {$yealink_date_format}
+local_time.dhcp_time = {$yealink_dhcp_time}
+
+local_time.summer_time = {$yealink_summer_time}
+local_time.dst_time_type = {$yealink_dst_type}
+local_time.start_time = {$yealink_time_zone_start_time}
+local_time.end_time = {$yealink_time_zone_end_time}
+local_time.offset_time = {$yealink_offset_time}
+local_time.interval =
+
+local_time.ntp_server1 = {$ntp_server_primary}
+local_time.ntp_server2 = {$ntp_server_secondary}
+local_time.time_zone = {$yealink_time_zone}
+local_time.time_zone_name = {$yealink_time_zone_name}
+
+
+#######################################################################################
+##                                    Broadsoft ACD                                  ##       
+#######################################################################################
+acd.enable=
+acd.auto_available_timer=
+
+#######################################################################################
+##                              Broadsoft Call Recording                             ##       
+#######################################################################################
+bw.call_recording.mode =
+
+#######################################################################################
+##                             Broadsoft Network Directory                           ##       
+#######################################################################################
+bw.calllog_and_dir =
+bw_phonebook.custom=
+bw_phonebook.enterprise_common_enable=
+bw_phonebook.enterprise_common_displayname=
+bw_phonebook.enterprise_enable=
+bw_phonebook.enterprise_displayname=
+bw_phonebook.group_common_enable=
+bw_phonebook.group_common_displayname=
+bw_phonebook.personal_enable=
+bw_phonebook.personal_displayname=
+bw_phonebook.group_enable=
+bw_phonebook.group_displayname =
+directory.update_time_interval
+
+##V83 Add
+search_in_dialing.bw_directory.enable=
+search_in_dialing.bw_directory.priority=
+directory_setting.bw_directory.enable =
+directory_setting.bw_directory.priority =
+
+#######################################################################################
+##                               BSFT Setting                                        ##       
+#######################################################################################
+bw.enable =
+
+
+#######################################################################################
+##                       Broadsoft Visual Voice Mail                                 ##       
+#######################################################################################
+bw.voice_mail.visual.enable=
+voice_mail.message_key.mode=
+bw.voice_mail.visual.display_videomail.enable=
+
+
+#######################################################################################
+##                              Broadsoft XSI                                        ##       
+#######################################################################################
+bw.xsi.enable=
+sip.authentication_for_xsi =
+
+#######################################################################################
+##                         Features Sync                                             ##       
+#######################################################################################
+call_waiting.mode =
+features.feature_key_sync.enable = {$yealink_feature_key_sync}
+features.dnd.feature_key_sync.local_processing.enable =
+features.dnd.feature_key_sync.enable =
+features.forward.feature_key_sync.enable =
+features.forward.feature_key_sync.local_processing.enable =
+
+#######################################################################################
+##                              Broadsoft Call Decline                               ##       
+#######################################################################################
+features.call_decline.enable =
+
+
+#######################################################################################
+##                                   Call Park                                       ##       
+#######################################################################################
+features.call_park.enable=
+features.call_park.park_mode=
+features.call_park.park_code=
+features.call_park.park_retrieve_code=
+features.call_park.park_visual_notify_enable=
+features.call_park.park_ring=
+features.call_park.group_enable=
+features.call_park.group_park_code=
+sip.call_park_without_blf=
+
+#######################################################################################
+##                           Broadsoft  UC                                           ##       
+#######################################################################################
+bw.xmpp.enable =
+features.uc_password =
+features.uc_username =
+bw.xmpp.presence_icon.mode =
+bw.xmpp.change_presence.force_manual.enable =
+bw.xmpp.change_presence.enable =
+features.uc_dir.match_tail_number=
+phone_setting.dsskey_directory_auto.enable=
+
+##V83 Add
+directory_setting.bw_uc_buddies.enable =
+directory_setting.bw_uc_buddies.priority =
+search_in_dialing.bw_uc_buddies.enable =
+search_in_dialing.bw_uc_buddies.priority =
+
+#######################################################################################
+##                                   Features Pickup                                 ##       
+#######################################################################################
+
+features.pickup.group_pickup_enable =
+features.pickup.group_pickup_code = 
+features.pickup.direct_pickup_enable = 
+features.pickup.direct_pickup_code =
+features.pickup.blf_visual_enable =
+features.pickup.blf_audio_enable = 
+
+#######################################################################################
+##                               Encryption                                          ##       
+####################################################################################### 
+static.auto_provision.encryption.config = 
+
+#######################################################################################
+##                              Android phone-T58V Add                               ##       
+#######################################################################################
+##Add Time 2016.9.2
+
+static.wifi.802_11e.enable =
+phone_setting.permit_silent_mode.enable =
+sip.h264.peer_resolution.default = 
+features.doorphone.%d.display_name =
+features.doorphone.%d.full_screen =
+features.doorphone.%d.phone_number =
+features.doorphone.%d.send_audio =
+features.doorphone.%d.send_video =
+features.doorphone.%d.unlock_pin =
+features.doorphone.%d.autopreview.enable =
+features.doorphone.%d.httpapi.password =
+features.doorphone.%d.httpapi.username =
+features.doorphone.%d.video.stream.httpurl =
+features.doorphone.%d.videopreview.enable =
+features.doorphone.x.device_model =
+features.doorphone.amount =
+
+features.csta_control.enable = 
+static.network.ethernet_as_wifi.enable =
+
+static.security.default_ssl_method = 
+features.video_call_bandwidth = 
+video.enable =
+features.default_layout =
+
+#######################################################################################
+##                      APP                                                         ##       
+#######################################################################################
+app.install_url = 
+app.uninstall =
+app.unavailable =
+app.autorun =
+custom.static.system_mode =
+custom.static.system_mode_selection =
+custom.static.system_mode_enable = 
+features.action_call_answer =
+features.action_contact =
+features.action_dialer =
+features.action_dsskey =
+features.action_history =
+
+
+#######################################################################################
+##                      Broadsoft  Emergency Call                                    ##       
+#######################################################################################
+##V83 Add
+bw.emergency_calling.enable  =
+
+#######################################################################################
+##                             Broadsoft Network Calllog                             ##       
+#######################################################################################
+##V83 Add
+bw.xsi.call_log.delete.enable =
+bw.xsi.call_log.multiple_accounts.enable =
+bw.xsi.call_log.enable=
+
+#######################################################################################
+##                             Broadsoft Network Directory                           ##       
+#######################################################################################
+bw.xsi.directory.enable=
+bw.xsi.directory.update.enable=
+
+#######################################################################################  
+##                                EDK                                                ##  
+####################################################################################### 
+
+##EDK Soft Keys(X ranges from 1 to 10)
+
+features.enhanced_dss_keys.enable=
+edk.id_mode.enable=
+softkey.X.position=
+softkey.X.use.conferenced=
+softkey.X.use.held=
+softkey.X.use.hold=
+softkey.X.use.transfer_ring_back=
+softkey.X.use.ring_back=
+softkey.X.use.call_failed=
+softkey.X.use.on_talk=
+softkey.X.use.transfer_connecting=
+softkey.X.use.connecting=
+softkey.X.use.incoming_call=
+softkey.X.use.idle=
+softkey.X.action=
+softkey.X.label=
+softkey.X.enable=
+edk.edklist.X.action=
+edk.edklist.X.mname=
+edk.edklist.X.enable=
+edk.edkprompt.X.enable=
+edk.edkprompt.X.label=
+edk.edkprompt.X.type=
+edk.edkprompt.X.userfeedback=
+edk.edkprompt.X.title =
+
+#######################################################################################  
+##                               Voice Mail                                          ##  
+#######################################################################################
+features.voice_mail_alert.enable=
+features.voice_mail_tone_enable=
+features.hide_feature_access_codes.enable=
+
+#######################################################################################  
+##                                XML                                                ##  
+####################################################################################### 
+push_xml.server=
+push_xml.sip_notify=
+push_xml.block_in_calling=
+features.xml_browser.loading_tip.delay =
+
+#######################################################################################
+##                                  Features USB                                     ##       
+#######################################################################################
+##V83 Add
+static.usb.power.enable =
+static.usbdisk.function.enable =
+
+#######################################################################################
+##                                  Acoustic Shield                                  ##       
+#######################################################################################
+##V83 Add
+features.acoustic_shield.level=
+features.acoustic_shield.mode=
+
+#######################################################################################
+##                                  Camera                                           ##       
+#######################################################################################
+camera.flicker = 
+camera.status_bar_icon.enable=
+
+##V83 Add
+static.camera.function.enable=
+
+#######################################################################################
+##                          Contact Other                                            ##       
+#######################################################################################
+##V83 Add
+phone_setting.search.highlight_keywords.enable =
+
+#######################################################################################
+##                          dsskey icon                                            ##       
+#######################################################################################
+##V83 Add
+dsskey.icon.url=
+dsskey.icon.delete=
+programablekey.1.icon=
+programablekey.2.icon=
+programablekey.3.icon=
+programablekey.4.icon=
+
+#######################################################################################
+##                               Call Recording                                      ##       
+#######################################################################################
+features.usb_call_recording.enable=
+
+#######################################################################################
+##                               Log Backup                                          ##       
+#######################################################################################
+static.auto_provision.local_log.backup.enable =
+static.auto_provision.local_log.backup.path =
+static.auto_provision.local_log.backup.upload_period =
+static.auto_provision.local_log.backup.append =
+static.auto_provision.local_log.backup.bootlog.upload_wait_time=
+static.auto_provision.local_log.backup.append.max_file_size =
+static.auto_provision.local_log.backup.append.limit_mode=
+
+#######################################################################################
+##                           Secure Domain List                                      ##       
+#######################################################################################
+wui.secure_domain_list =
+
+##V83 Add
+features.full_screen_in_call_enable=
+features.status_bar.hide=
+features.system_funtion_bar.hide=
+
+
+
+phone_setting.warnings_display.mode=
+phone_setting.browser.url=
+features.hide_world_clock.enable =
+#######################################################################################
+##                                    Dect                                           ##       
+#######################################################################################
+##V83 Add
+base.pin_code=
+static.base.repeater_mode.enable=
+base.pin_code_for_register=
+base.double_pin_code.enable=
+
+custom.handset.auto_answer.enable=
+custom.handset.auto_intercom=
+custom.handset.backlight_in_charger.enable=
+custom.handset.backlight_out_of_charger.enable=
+custom.handset.confirmation_tone.enable=
+custom.handset.date_format=
+custom.handset.eco_mode.enable=-
+custom.handset.keypad_light.enable=
+custom.handset.keypad_tone.enable=
+custom.handset.language=
+custom.handset.low_battery_tone.enable=
+custom.handset.missed_call_notify_light.enable=
+custom.handset.screen_saver.enable=
+custom.handset.time_format=
+custom.handset.voice_mail_notify_light.enable=
+custom.handset.wallpaper=
+
+handset.X.dial_out_default_line=
+handset.X.dial_out_lines=
+handset.X.hac.enable=
+handset.X.incoming_lines=
+handset.X.name=
+handset.X.contact_list.url=
+## X rang from 1 to 5
+
+over_the_air.base_trigger=
+over_the_air.handset_tip=
+over_the_air.handset_trigger=
+over_the_air.url=
+over_the_air.url.w52h=
+over_the_air.url.w56h=
+over_the_air.url.w53h=
+
+static.auto_provision.custom.handset.protect=
+static.auto_provision.handset_configured.enable=
+
+phone_setting.end_call_on_hook.enable=
+
+static.directory_setting.shared_contact.enable=
+shared_contact_list.url=
+
+features.ms.x.mode =
+features.ms.x.slave_handset_number =
+
+
+#######################################################################################
+##                         Metaswitch Setting                                        ##       
+#######################################################################################
+meta.enable =
+meta.login_mode =
+meta.comm_portal.server.token =
+meta.comm_portal.server.username =
+meta.comm_portal.server.password =
+meta.comm_portal.server.url =
+meta.comm_portal.enable =
+meta.comm_portal.contacts.update_interval =
+meta.comm_portal.replace_local_call_list.enable=
+meta.comm_portal.contacts.group.mlhgs.label=
+meta.comm_portal.contacts.group.extensions.label=
+meta.comm_portal.contacts.group.contacts.label=
+meta.comm_portal.contacts.group.mlhgs.enable=
+meta.comm_portal.contacts.group.extensions.enable=
+meta.comm_portal.contacts.group.contacts.enable=
+meta.comm_portal.call_list.enable=
+meta.comm_portal.contacts.enable=
+meta.comm_portal.message.enable=
+meta.comm_portal.logout.enable =
+meta.comm_portal.keep_alive_interval_time =
+directory_setting.meta_directory.enable=
+directory_setting.meta_directory.priority=
+directory_setting.meta_call_log.enable=
+directory_setting.meta_call_log.priority=
+search_in_dialing.meta_call_log.priority =
+search_in_dialing.meta_call_log.enable =
+search_in_dialing.meta_directory.priority =
+search_in_dialing.meta_directory.enable =
+
+#######################################################################################
+##                          Contact Backup                                           ##       
+#######################################################################################
+static.auto_provision.local_contact.backup.path =
+static.auto_provision.local_contact.backup.enable=
diff --git a/resources/templates/provision/yealink/vp59/{$mac}.cfg b/resources/templates/provision/yealink/vp59/{$mac}.cfg
new file mode 100644
index 0000000000..e32c8f80c5
--- /dev/null
+++ b/resources/templates/provision/yealink/vp59/{$mac}.cfg
@@ -0,0 +1,541 @@
+#!version:1.0.0.1
+
+##File header "#!version:1.0.0.1" can not be edited or deleted, and must be placed in the first line.##
+
+{foreach $lines as $row}
+
+#######################################################################################
+##                           Account Basic Settings                                  ##
+#######################################################################################
+
+{if isset({$row.password})}
+account.{$row.line_number}.enable = 1
+{else}
+account.{$row.line_number}.enable = 0
+{/if}
+account.{$row.line_number}.label = {$row.display_name}
+account.{$row.line_number}.display_name = {$row.display_name}
+account.{$row.line_number}.auth_name = {$row.auth_id}
+account.{$row.line_number}.user_name = {$row.user_id}
+account.{$row.line_number}.password = {$row.password}
+{if isset($account.{$row.line_number}.outbound_proxy_primary)}
+account.{$row.line_number}.outbound_proxy_enable = 1
+{else}
+account.{$row.line_number}.outbound_proxy_enable = 0
+{/if}
+account.{$row.line_number}.outbound_proxy.1.address = {$row.outbound_proxy_primary}
+{if isset($outbound_proxy_1_port)}
+account.{$row.line_number}.outbound_proxy.1.port = {$outbound_proxy_1_port}
+{else}
+account.{$row.line_number}.outbound_proxy.1.port = {$row.sip_port}
+{/if}
+account.{$row.line_number}.dial_tone =
+account.{$row.line_number}.outbound_proxy.2.address = {$row.outbound_proxy_secondary}
+{if isset($outbound_proxy_2_port)}
+account.{$row.line_number}.outbound_proxy.2.port = {$outbound_proxy_2_port}
+{else}
+account.{$row.line_number}.outbound_proxy.2.port = {$row.sip_port}
+{/if}
+account.{$row.line_number}.outbound_proxy_fallback_interval =
+
+##It configures the transport type for account 1. 0-UDP,1-TCP,2-TLS,3-DNS-NAPTR
+##The default value is 0.
+{if $row.sip_transport == 'udp'}account.{$row.line_number}.sip_server.1.transport_type = 0{/if}
+{if $row.sip_transport == 'tcp'}account.{$row.line_number}.sip_server.1.transport_type = 1{/if}
+{if $row.sip_transport == 'tls'}account.{$row.line_number}.sip_server.1.transport_type = 2{/if}
+{if $row.sip_transport == 'dns srv'}account.{$row.line_number}.sip_server.1.transport_type = 3{/if}
+
+##It configures the backup server transport type for account 1. 0-UDP,1-TCP,2-TLS,3-DNS-NAPTR
+##The default value is 0. 
+{if $row.sip_transport == 'udp'}account.{$row.line_number}.sip_server.2.transport_type = 0{/if}
+{if $row.sip_transport == 'tcp'}account.{$row.line_number}.sip_server.2.transport_type = 1{/if}
+{if $row.sip_transport == 'tls'}account.{$row.line_number}.sip_server.2.transport_type = 2{/if}
+{if $row.sip_transport == 'dns srv'}account.{$row.line_number}.sip_server.2.transport_type = 3{/if}
+
+
+#######################################################################################
+##                          Failback                                                 ##
+#######################################################################################
+
+account.{$row.line_number}.naptr_build = 0
+account.{$row.line_number}.fallback.redundancy_type = 0
+account.{$row.line_number}.fallback.timeout = {$yealink_outbound_proxy_fallback_interval}
+{if isset($row.server_address_primary)}
+account.{$row.line_number}.sip_server.1.address = {$row.server_address_primary}
+{else}
+account.{$row.line_number}.sip_server.1.address = {$row.server_address}
+{/if}
+account.{$row.line_number}.sip_server.1.port = {$row.sip_port}
+account.{$row.line_number}.sip_server.1.expires = {$row.register_expires}
+account.{$row.line_number}.sip_server.1.retry_counts = 3
+account.{$row.line_number}.sip_server.1.failback_mode = 0
+account.{$row.line_number}.sip_server.1.failback_timeout = 3600
+account.{$row.line_number}.sip_server.1.register_on_enable = 0
+{if isset($row.server_address_secondary)}
+account.{$row.line_number}.sip_server.2.address = {$row.server_address_secondary}
+{/if}
+account.{$row.line_number}.sip_server.2.port = {$row.sip_port}
+account.{$row.line_number}.sip_server.2.expires = {$row.register_expires}
+account.{$row.line_number}.sip_server.2.retry_counts = 3
+account.{$row.line_number}.sip_server.2.failback_mode = 0
+account.{$row.line_number}.sip_server.2.failback_timeout = 3600
+account.{$row.line_number}.sip_server.2.register_on_enable = 0
+
+account.{$row.line_number}.dns_cache_type = 1
+account.{$row.line_number}.static_cache_pri = 0
+account.{$row.line_number}.register_expires_overlap = 
+account.{$row.line_number}.subscribe_expires_overlap =
+
+#######################################################################################
+##                           Register Advanced                                       ##
+#######################################################################################
+##It configures the SIP server type for account X.0-Default,2-BroadSoft,4-Cosmocom,6-UCAP
+##The default value is 0.
+
+account.{$row.line_number}.sip_server_type = 
+
+account.{$row.line_number}.unregister_on_reboot = 
+account.{$row.line_number}.register_mac = 
+account.{$row.line_number}.register_line = 
+account.{$row.line_number}.reg_fail_retry_interval = 
+account.{$row.line_number}.srtp_encryption =
+
+######################################################################################
+##                     NAT Settings                                                 ##
+######################################################################################
+##It enables or disables the NAT traversal for account X.0-Disabled,1-Enabled
+##The default value is 0.
+account.{$row.line_number}.nat.nat_traversal = {if isset($stun_server)}1{else}0{/if}
+
+##It configures the type of keep-alive packets sent by the phone to the NAT static to keep the communication port open so that NAT can continue to function for account X.
+##0-Dsiabled,1-Default: the phone sends UDP packets to the server,2-Option: the phone sends SIP OPTION packets to the server,3-Notify: the phone sends SIP NOTIFY packets to the server.
+##The default value is 1.
+account.{$row.line_number}.nat.udp_update_enable = 3
+
+##It configures the keep-alive interval (in seconds) for account X.
+##The default value is 30.Integer from 15 to 2147483647
+account.{$row.line_number}.nat.udp_update_time = 30
+
+##It enables or disables NAT Rport feature for account X.0-Disabled,1-Enabled
+##The default value is 0.
+account.{$row.line_number}.nat.rport = {$yealink_rport}
+
+
+#######################################################################################
+##                            Account Advance Settings                               ##
+#######################################################################################
+
+
+##It configures the voice mail number for account X.
+##The default value is blank.
+voice_mail.number.{$row.line_number} = {$voicemail_number}
+
+##Except T19P/T21P Models
+account.{$row.line_number}.auto_dial_enable =
+account.{$row.line_number}.auto_dial_num =
+
+account.{$row.line_number}.call_id_mode =
+account.{$row.line_number}.call_info =
+
+account.{$row.line_number}.invite_with_pani_header.enable =
+
+#######################################################################################
+##                            Subscribe                                              ##
+#######################################################################################
+##It enables or disables the phone to subscribe the message waiting indicator for account X.0-Disabled,1-Enabled.
+##The default value is 0.
+account.{$row.line_number}.subscribe_mwi = 
+
+
+##It is configuration MWI is NOTIFY messages, whether in Terminated status attributes.
+##The default value is 0(Don't handle terminated values)
+account.{$row.line_number}.mwi_parse_terminated =
+
+##It configures the interval (in seconds) of MWI subscription for account X.
+##The default value is 3600.
+account.{$row.line_number}.subscribe_mwi_expires = 
+
+
+##It enables or disables the phone to subscribe to the voice mail number for the message waiting indicator for account X.0-Disabled,1-Enabled.
+##The default value is 0.
+account.{$row.line_number}.subscribe_mwi_to_vm = 
+
+##It configures the period (in seconds) of ACD subscription for account X.
+##The default value is 1800.Except T19P/T21P Models
+account.{$row.line_number}.subscribe_acd_expires = 
+
+
+account.{$row.line_number}.display_mwi.enable =
+account.{$row.line_number}.subscribe_register =
+#######################################################################################
+##                                    Broadsoft ACD                                  ##
+#######################################################################################
+account.{$row.line_number}.acd.enable =
+account.{$row.line_number}.acd.unavailable_reason_enable =
+account.{$row.line_number}.acd.initial_state =
+
+##account.X.reason_code.Y=
+##account.X.reason_code_name.Y=
+##The value Y must be continuous.
+account.{$row.line_number}.reason_code.1 =
+account.{$row.line_number}.reason_code_name.1 =
+
+#######################################################################################
+##                            BLF List(Except T19D Model)                            ##
+#######################################################################################
+##It configures the BLF List URI to monitor a list of users for account X.
+##The default value is blank.
+account.{$row.line_number}.blf.blf_list_uri = 
+
+##It configures the feature access code for directed call pickup (default: *97) for account X.
+##The default value is blank.
+account.{$row.line_number}.blf_list_code = 
+
+##It configures the feature access code for directed call pickup with barge-in (default: *33) for account X.
+##The default value is blank.
+account.{$row.line_number}.blf_list_barge_in_code = 
+
+##It configures the period (in seconds) of the BLF subscription for account X.
+##The default value is 1800.Integer from 30 to 2147483647.
+account.{$row.line_number}.blf.subscribe_period = 
+
+##It configures the event of the BLF subscription for account X.0-Dialog,1-Presence.
+##The default value is 0.
+account.{$row.line_number}.blf.subscribe_event =
+
+##It enables or disables the phone to handle NOTIFY messages out of the BLF dialog for account X.0-Disabled,1-Enabled.
+##The default value is 0.
+account.{$row.line_number}.out_dialog_blf_enable = 
+
+##It configures the BLF List Retrieve call parked code for account X.
+##The default value is blank
+account.{$row.line_number}.blf_list_retrieve_call_parked_code = 
+
+account.{$row.line_number}.blf.match_host.enable = 
+
+#######################################################################################
+##                            BLA/SCA                                                ##
+#######################################################################################
+##It enables or disables Broadsoft SCA feature for account X.0-Disabled,1-Broadsoft SCA.
+##The default value is 0.
+account.{$row.line_number}.shared_line = 
+
+##It configures the Call Pull Feature access code for account X.
+##The default value is blank.
+account.{$row.line_number}.shared_line_callpull_code =
+##It configures number of linekey for line.
+##The default value is 1,you should enable auto line keys first.
+account.{$row.line_number}.number_of_linekey = 
+##It config whether you can retrieve the remote hold call through line key
+##The default value is 1
+account.{$row.line_number}.shared_line_one_touch_retrieve.enable =
+##It config whether you can barge in the active call through line key
+##The default value is 1
+account.{$row.line_number}.shared_line_one_touch_bargein.enable =
+
+account.{$row.line_number}.share_line.barge_in.enable =
+#######################################################################################
+##                            Brosoft Callpark                                       ##
+#######################################################################################
+##It enables or disables Broadsoft Callpark for account X.0-Disabled,1-Broadsoft SCA.
+##The default value is 0.
+account.{$row.line_number}.callpark_enable =
+
+#######################################################################################
+##                            Audio Codec                                            ##
+#######################################################################################
+
+account.{$row.line_number}.codec.g722.enable =
+account.{$row.line_number}.codec.g722.priority = 
+
+account.{$row.line_number}.codec.g729.enable = 
+account.{$row.line_number}.codec.g729.priority = 
+
+account.{$row.line_number}.codec.g723_53.enable = 
+account.{$row.line_number}.codec.g723_53.priority = 
+
+account.{$row.line_number}.codec.g723_63.enable = 
+account.{$row.line_number}.codec.g723_63.priority = 
+
+account.{$row.line_number}.codec.g726_16.enable = 
+account.{$row.line_number}.codec.g726_16.priority = 
+
+account.{$row.line_number}.codec.g726_24.enable = 
+account.{$row.line_number}.codec.g726_24.priority = 
+
+account.{$row.line_number}.codec.g726_32.enable = 
+account.{$row.line_number}.codec.g726_32.priority = 
+
+account.{$row.line_number}.codec.g726_40.enable = 
+account.{$row.line_number}.codec.g726_40.priority = 
+
+account.{$row.line_number}.codec.ilbc.enable = 
+account.{$row.line_number}.codec.ilbc.priority = 
+
+account.{$row.line_number}.codec.opus.enable = 
+account.{$row.line_number}.codec.opus.priority = 
+account.{$row.line_number}.codec.opus.para =
+
+account.{$row.line_number}.codec.pcmu.enable = 
+account.{$row.line_number}.codec.pcmu.priority = 
+
+account.{$row.line_number}.codec.pcma.enable =  
+account.{$row.line_number}.codec.pcma.priority = 
+
+account.{$row.line_number}.codec.g722_1_24kpbs.enable =
+account.{$row.line_number}.codec.g722_1_24kpbs.priority =
+
+account.{$row.line_number}.codec.g722_1c_24kpbs.enable =
+account.{$row.line_number}.codec.g722_1c_24kpbs.priority =
+
+account.{$row.line_number}.codec.g722_1c_32kpbs.enable =
+account.{$row.line_number}.codec.g722_1c_32kpbs.priority =
+
+account.{$row.line_number}.codec.g722_1c_48kpbs.enable =
+account.{$row.line_number}.codec.g722_1c_48kpbs.priority =
+
+#######################################################################################
+##                            Video Codec                                            ##
+#######################################################################################
+
+account.{$row.line_number}.video.h264.enable =
+account.{$row.line_number}.video.h264.priority =
+
+account.{$row.line_number}.video.h264hp.enable =
+account.{$row.line_number}.video.h264hp.priority =
+
+account.{$row.line_number}.video.vp8.enable =
+account.{$row.line_number}.video.vp8.priority =
+
+account.{$row.line_number}.video.h263.enable =
+account.{$row.line_number}.video.h263.priority =
+
+#######################################################################################
+##                            Audio Advanced                                         ##
+#######################################################################################
+##It configures the RTP packet time for account X.0 (Disabled), 10, 20, 30, 40, 50 or 60.
+##The default value is 20.
+account.{$row.line_number}.ptime = 
+#######################################################################################
+##                            Anonymous Call                                         ##
+#######################################################################################
+account.{$row.line_number}.send_anonymous_code = 
+account.{$row.line_number}.anonymous_call = 
+account.{$row.line_number}.anonymous_call_oncode = 
+account.{$row.line_number}.anonymous_call_offcode = 
+account.{$row.line_number}.reject_anonymous_call = 
+account.{$row.line_number}.anonymous_reject_oncode = 
+account.{$row.line_number}.anonymous_reject_offcode = 
+account.{$row.line_number}.send_anonymous_rejection_code =
+
+
+#######################################################################################
+##                            Pickup Code                                            ##
+#######################################################################################
+##It enables or disables the phone to pick up a call according to the SIP header of dialog-info for account X.0-Disabled,1-Enabled.
+##The default value is 0.
+account.{$row.line_number}.dialoginfo_callpickup = 
+
+##It configures the group pickup code for account X.
+##The default value is blank.
+account.{$row.line_number}.group_pickup_code = 
+
+##It configures the directed pickup code for account X.
+##The default value is blank.
+account.{$row.line_number}.direct_pickup_code = 
+
+account.{$row.line_number}.refresh_remote_id.enable =
+
+#######################################################################################
+##                            DTMF                                                   ##
+#######################################################################################
+account.{$row.line_number}.dtmf.type = 
+account.{$row.line_number}.dtmf.info_type = 
+account.{$row.line_number}.dtmf.dtmf_payload = 
+
+#######################################################################################
+##                            Alert info                                             ##
+#######################################################################################
+##It enables or disables the distinctive ringtones by the Alert-Info SIP header for account X.0-Disabled,1-Enabled.
+##The default value is 0.
+account.{$row.line_number}.alert_info_url_enable = 
+
+##Except T19P/T21P Models
+##The default value is blank.Values range 256 characters in length
+account.{$row.line_number}.alert_info =
+account.{$row.line_number}.ringtone.ring_type = 
+
+###Only for T46G Model
+##It enables or disables the phone to download the picture information for account X when receiving an incoming call or during a call.0-Disabled,1-Enabled.
+##The default value is 0.
+account.{$row.line_number}.picture_info_enable = 
+
+#######################################################################################
+##                            Conference                                             ##
+#######################################################################################
+##It configures the conference type for account X.0-Local Conference,2-Network Conference.
+##The default value is 0.
+account.{$row.line_number}.conf_type = 
+
+##It configures the network conference URI for account X.
+##The default value is blank.
+account.{$row.line_number}.conf_uri = 
+
+#######################################################################################
+##                            CID Source                                             ##
+#######################################################################################
+account.{$row.line_number}.cid_source = {$yealink_cid_source}
+account.{$row.line_number}.cid_source_privacy = 
+account.{$row.line_number}.cid_source_ppi = 
+account.{$row.line_number}.cp_source = 
+
+#######################################################################################
+##                            Session Timer                                          ##
+#######################################################################################
+account.{$row.line_number}.session_timer.enable = {$yealink_session_timer}
+account.{$row.line_number}.session_timer.expires = 
+account.{$row.line_number}.session_timer.refresher = 
+
+#######################################################################################
+##                            Music on Hold                                          ##
+#######################################################################################
+##It configures the way on how the phone processes Music On Hold when placing an active call on hold for account X.
+##0-Calling the music server before holding
+##1-Calling the music server after holding
+##The default value is 0.
+account.{$row.line_number}.music_on_hold_type = 
+
+##It configures the URI of the Music On Hold server for account X.
+##The default value is blank.
+account.{$row.line_number}.music_server_uri = 
+
+#######################################################################################
+##                            Advanced                                               ##
+#######################################################################################
+account.{$row.line_number}.auto_answer = 
+account.{$row.line_number}.missed_calllog = 
+account.{$row.line_number}.100rel_enable = {$yealink_retransmission}
+account.{$row.line_number}.enable_user_equal_phone = 
+account.{$row.line_number}.compact_header_enable = 
+account.{$row.line_number}.custom_ua =
+
+#######################################################################################
+##                                   DND(Except T19 Model)                           ##
+#######################################################################################
+account.{$row.line_number}.dnd.enable =
+account.{$row.line_number}.dnd.on_code = 
+account.{$row.line_number}.dnd.off_code =
+
+#######################################################################################
+##                                 Call Forward(Except T19 Model)                    ##
+#######################################################################################
+account.{$row.line_number}.always_fwd.enable = 
+account.{$row.line_number}.always_fwd.target = 
+account.{$row.line_number}.always_fwd.off_code =
+account.{$row.line_number}.always_fwd.on_code =
+account.{$row.line_number}.busy_fwd.enable =          
+account.{$row.line_number}.busy_fwd.target =         
+account.{$row.line_number}.busy_fwd.off_code =
+account.{$row.line_number}.busy_fwd.on_code =
+account.{$row.line_number}.timeout_fwd.enable = 
+account.{$row.line_number}.timeout_fwd.target =
+account.{$row.line_number}.timeout_fwd.timeout =  
+account.{$row.line_number}.timeout_fwd.off_code =
+account.{$row.line_number}.timeout_fwd.on_code = 
+
+#######################################################################################
+##                                   Voice Monitoring  (Except T19P/T21P Models)     ##
+#######################################################################################
+account.{$row.line_number}.vq_rtcpxr.collector_name =
+account.{$row.line_number}.vq_rtcpxr.collector_server_host =
+account.{$row.line_number}.vq_rtcpxr.collector_server_port =
+
+
+#######################################################################################
+##         Broadsoft XSI                                                             ##
+#######################################################################################
+##It configures the user name for XSI authentication for account X.Example:account.{$row.line_number}.xsi.user = 3502@as.iop1.broadworks.net.
+##The default value is blank.
+account.{$row.line_number}.xsi.user =  
+
+##It configures the password for XSI authentication for account X.Example:account.{$row.line_number}.xsi.password = 123456.
+##The default value is blank.
+account.{$row.line_number}.xsi.password = 
+
+##It configures the access URL of the Xtended Services Platform server for account X.Example:account.{$row.line_number}.xsi.host = xsp1.iop1.broadworks.net.
+##The default value is blank.
+account.{$row.line_number}.xsi.host = 
+
+##It configures the server type of the Xtended Services Platform server for account X.Example:account.{$row.line_number}.xsi.server_type = http.
+##The default value is http.
+account.{$row.line_number}.xsi.server_type = 
+
+##It configures the server port of the Xtended Services Platform server for account X.Example:account.{$row.line_number}.xsi.port = 80.
+##The default value is 80.Integer from 1 to 65535
+account.{$row.line_number}.xsi.port = 
+
+#######################################################################################
+##                           V80 Add                                                 ##
+#######################################################################################
+## Add Time 2015.6.26
+account.X.callerid_in_support_header.enable = 
+account.x.transfer_refer_to_contact_header.enable =
+account.x.sub_fail_retry_interval = 
+account.X.update_ack_while_dialing = 
+account.x.end_call_when_transferred.enable = 
+account.x.contact_take_line_param =
+#######################################################################################
+##                           V80-SP2 Add                                             ##
+#######################################################################################
+
+account.x.instance_id.enable =
+account.{$row.line_number}.reg_with_pani_header.enable =
+
+#######################################################################################
+##                           V81 Add                                                 ##
+#######################################################################################
+account.{$row.line_number}.dialplan.digitmap.active.on_hook_dialing =
+account.{$row.line_number}.dialplan.digitmap.apply_to.directory_dial =
+account.{$row.line_number}.dialplan.digitmap.apply_to.forward =
+account.{$row.line_number}.dialplan.digitmap.apply_to.on_hook_dial =
+account.{$row.line_number}.dialplan.digitmap.apply_to.press_send =
+account.{$row.line_number}.dialplan.digitmap.enable =
+account.{$row.line_number}.dialplan.digitmap.interdigit_long_timer =
+account.{$row.line_number}.dialplan.digitmap.interdigit_short_timer =
+account.{$row.line_number}.dialplan.digitmap.no_match_action =
+account.{$row.line_number}.dialplan.digitmap.string =
+account.{$row.line_number}.dialplan.digitmap.apply_to.history_dial =
+#######################################################################################
+##                               V40 Add                                             ##
+#######################################################################################
+account.{$row.line_number}.hold_use_inactive =
+account.{$row.line_number}.call_recording.enable =
+account.{$row.line_number}.features.call_decline.enable =
+account.{$row.line_number}.line_seize.expires =
+account.{$row.line_number}.security_classification.enable =
+
+#######################################################################################
+##                         Features Sync                                             ##
+#######################################################################################
+account.{$row.line_number}.features.forward.feature_key_sync.local_processing.enable =
+account.{$row.line_number}.features.dnd.feature_key_sync.local_processing.enable =
+
+#######################################################################################
+##                        Broadsoft Flexible Seating                                 ##
+#######################################################################################
+##V40 Add
+account.{$row.line_number}.flexible_seating.enable =
+account.{$row.line_number}.hoteling.pin =
+account.{$row.line_number}.hoteling.mode =
+
+#######################################################################################
+##                         Broadsoft Hoteling                                        ##
+#######################################################################################
+##V40 Add
+account.{$row.line_number}.hoteling.enable =
+account.{$row.line_number}.hoteling.user_id =
+account.{$row.line_number}.hoteling.password =
+account.{$row.line_number}.hoteling.expires =
+account.{$row.line_number}.hoteling.auto_login_enable =
+
+{/foreach}
diff --git a/resources/templates/provision/yealink/w52p/y000000000025.cfg b/resources/templates/provision/yealink/w52p/y000000000025.cfg
index 585fc99612..1806153dee 100644
--- a/resources/templates/provision/yealink/w52p/y000000000025.cfg
+++ b/resources/templates/provision/yealink/w52p/y000000000025.cfg
@@ -237,7 +237,7 @@ local_time.interval =
 local_time.summer_time = {$yealink_summer_time}
 
 #Configure the DST type when the DST feature is enabled; 0-By Date (default), 1-By Week;
-local_time.dst_time_type =
+local_time.dst_time_type = {$yealink_dst_type}
 
 #Configure the start time of DST. The default value is 1/1/0.
 #If the DST type is configured as By Date, the value format is Month/Day/Hour. For example, the value 5/20/10 means the start time is at 10:00 on May 20.
@@ -318,6 +318,7 @@ sip.trust_ctrl=1
 
 #Enable or disable the phone to save the call history; 0-Disabled, 1-Enabled (default);
 features.save_call_history =
+features.save_init_num_to_history.enable = 0
 
 #Configure the overtime (in minutes) of logging web user interface. It ranges from 1 to 1000, the default value is 5.
 features.relog_offtime = 5
diff --git a/resources/templates/provision/yealink/w56p/y000000000025.cfg b/resources/templates/provision/yealink/w56p/y000000000025.cfg
index 8657569475..82d5d41c9e 100644
--- a/resources/templates/provision/yealink/w56p/y000000000025.cfg
+++ b/resources/templates/provision/yealink/w56p/y000000000025.cfg
@@ -237,7 +237,7 @@ local_time.interval =
 local_time.summer_time = {$yealink_summer_time}
 
 #Configure the DST type when the DST feature is enabled; 0-By Date (default), 1-By Week;
-local_time.dst_time_type =
+local_time.dst_time_type = {$yealink_dst_type}
 
 #Configure the start time of DST. The default value is 1/1/0.
 #If the DST type is configured as By Date, the value format is Month/Day/Hour. For example, the value 5/20/10 means the start time is at 10:00 on May 20.
@@ -318,6 +318,7 @@ sip.trust_ctrl=1
 
 #Enable or disable the phone to save the call history; 0-Disabled, 1-Enabled (default);
 features.save_call_history =
+features.save_init_num_to_history.enable = 0
 
 #Configure the overtime (in minutes) of logging web user interface. It ranges from 1 to 1000, the default value is 5.
 features.relog_offtime = 5
diff --git a/resources/templates/provision/yealink/w60b/y000000000077.cfg b/resources/templates/provision/yealink/w60b/y000000000077.cfg
index 5c8a92c78f..190db69835 100644
--- a/resources/templates/provision/yealink/w60b/y000000000077.cfg
+++ b/resources/templates/provision/yealink/w60b/y000000000077.cfg
@@ -237,7 +237,7 @@ local_time.interval =
 local_time.summer_time = {$yealink_summer_time}
 
 #Configure the DST type when the DST feature is enabled; 0-By Date (default), 1-By Week;
-local_time.dst_time_type =
+local_time.dst_time_type = {$yealink_dst_type}
 
 #Configure the start time of DST. The default value is 1/1/0.
 #If the DST type is configured as By Date, the value format is Month/Day/Hour. For example, the value 5/20/10 means the start time is at 10:00 on May 20.
@@ -338,6 +338,7 @@ firmware.url = {$yealink_firmware_url}/{$yealink_firmware_w60b}
 #######################################################################################
 
 over_the_air.url = {$yealink_firmware_url}/{$yealink_w56h_handset_firmware_url}
+over_the_air.url.w59r = {$yealink_firmware_url}/{$yealink_w59r_handset_firmware_url}
 over_the_air.base_trigger = 1
 over_the_air.handset_tip = 1
 
diff --git a/resources/templates/provision/yealink/w60b/{$mac}.cfg b/resources/templates/provision/yealink/w60b/{$mac}.cfg
index afa8352483..717f851bb2 100644
--- a/resources/templates/provision/yealink/w60b/{$mac}.cfg
+++ b/resources/templates/provision/yealink/w60b/{$mac}.cfg
@@ -12,10 +12,17 @@ account.1.enable = {if isset($account.1.password)}1{else}0{/if}{""}
 
 account.1.label = {$account.1.display_name}
 account.1.display_name = {$account.1.display_name}
+
+{if isset($account.1.server.1.address)}
+account.1.user_name = {$account.1.user_id}@{$account.1.server_address}
+{else}
 account.1.user_name = {$account.1.user_id}
+{/if}
+{if isset($account.1.server.1.address)} account.1.sip_server.1.address= {$account.1.server.1.address} {else} account.1.sip_server.1.address= {$account.1.server_address} {/if}
+
 account.1.auth_name = {$account.1.user_id}
 account.1.password = {$account.1.password}
-account.1.sip_server_host = {$account.1.server_address}
+
 account.1.sip_server_port = {$account.1.sip_port}
 account.1.transport = {if $account.1.sip_transport == 'udp'}0{/if}{if $account.1.sip_transport == 'tcp'}1{/if}{if $account.1.sip_transport == 'tls'}2{/if}{if $account.1.sip_transport == 'dns srv'}3{/if}{""}
 
@@ -284,6 +291,8 @@ account.1.dnd.enable =
 
 account.1.sip_trust_ctrl = 1
 
+voice_mail.number.1 = {$voicemail_number}
+
 #######################################################################################
 ##                                   Account 2 Settings                              ##
 #######################################################################################
@@ -293,10 +302,18 @@ account.2.enable = {if isset($account.2.password) }1{else}0{/if}{""}
 
 account.2.label = {$account.2.display_name}
 account.2.display_name = {$account.2.display_name}
+
+{if isset($account.2.server.1.address)}
+account.2.user_name = {$account.2.user_id}@{$account.2.server_address}
+{else}
 account.2.user_name = {$account.2.user_id}
+{/if}
+
 account.2.auth_name = {$account.2.user_id}
 account.2.password = {$account.2.password}
-account.2.sip_server_host = {$account.2.server_address}
+
+{if isset($account.2.server.1.address)} account.2.sip_server.1.address= {$account.2.server.1.address} {else} account.2.sip_server.1.address= {$account.2.server_address} {/if}
+
 account.2.sip_server_port = {$account.2.sip_port}
 account.2.transport = {if $account.2.sip_transport == 'udp'}0{/if}{if $account.2.sip_transport == 'tcp'}1{/if}{if $account.2.sip_transport == 'tls'}2{/if}{if $account.2.sip_transport == 'dns srv'}3{/if}{""}
 
@@ -520,6 +537,8 @@ account.2.dnd.enable =
 
 account.2.sip_trust_ctrl = 1
 
+voice_mail.number.2 = {$voicemail_number}
+
 #######################################################################################
 ##                                   Account 3 Settings                              ##
 #######################################################################################
@@ -529,10 +548,18 @@ account.3.enable = {if isset($account.3.password) }1{else}0{/if}{""}
 
 account.3.label = {$account.3.display_name}
 account.3.display_name = {$account.3.display_name}
+
+{if isset($account.3.server.1.address)}
+account.3.user_name = {$account.3.user_id}@{$account.3.server_address}
+{else}
 account.3.user_name = {$account.3.user_id}
+{/if}
+
 account.3.auth_name = {$account.3.user_id}
 account.3.password = {$account.3.password}
-account.3.sip_server_host = {$account.3.server_address}
+
+{if isset($account.3.server.1.address)} account.3.sip_server.1.address= {$account.3.server.1.address} {else} account.3.sip_server.1.address= {$account.3.server_address} {/if}
+
 account.3.sip_server_port = {$account.3.sip_port}
 account.3.transport = {if $account.3.sip_transport == 'udp'}0{/if}{if $account.3.sip_transport == 'tcp'}1{/if}{if $account.3.sip_transport == 'tls'}2{/if}{if $account.3.sip_transport == 'dns srv'}3{/if}{""}
 
@@ -756,6 +783,8 @@ account.3.dnd.enable =
 
 account.3.sip_trust_ctrl = 1
 
+voice_mail.number.3 = {$voicemail_number}
+
 #######################################################################################
 ##                                   Account 4 Settings                              ##
 #######################################################################################
@@ -765,10 +794,18 @@ account.4.enable = {if isset($account.4.password) }1{else}0{/if}{""}
 
 account.4.label = {$account.4.display_name}
 account.4.display_name = {$account.4.display_name}
+
+{if isset($account.4.server.1.address)}
+account.4.user_name = {$account.4.user_id}@{$account.4.server_address}
+{else}
 account.4.user_name = {$account.4.user_id}
+{/if}
+
 account.4.auth_name = {$account.4.user_id}
 account.4.password = {$account.4.password}
-account.4.sip_server_host = {$account.4.server_address}
+
+{if isset($account.4.server.1.address)} account.4.sip_server.1.address= {$account.4.server.1.address} {else} account.4.sip_server.1.address= {$account.4.server_address} {/if}
+
 account.4.sip_server_port = {$account.4.sip_port}
 account.4.transport = {if $account.4.sip_transport == 'udp'}0{/if}{if $account.4.sip_transport == 'tcp'}1{/if}{if $account.4.sip_transport == 'tls'}2{/if}{if $account.4.sip_transport == 'dns srv'}3{/if}{""}
 
@@ -992,6 +1029,8 @@ account.4.dnd.enable =
 
 account.4.sip_trust_ctrl = 1
 
+voice_mail.number.4 = {$voicemail_number}
+
 #######################################################################################
 ##                                   Account 5 Settings                              ##
 #######################################################################################
@@ -1001,10 +1040,18 @@ account.5.enable = {if isset($account.5.password) }1{else}0{/if}{""}
 
 account.5.label = {$account.5.display_name}
 account.5.display_name = {$account.5.display_name}
+
+{if isset($account.5.server.1.address)}
+account.5.user_name = {$account.5.user_id}@{$account.5.server_address}
+{else}
 account.5.user_name = {$account.5.user_id}
+{/if}
+
 account.5.auth_name = {$account.5.user_id}
 account.5.password = {$account.5.password}
-account.5.sip_server_host = {$account.5.server_address}
+
+{if isset($account.5.server.1.address)} account.5.sip_server.1.address= {$account.5.server.1.address} {else} account.5.sip_server.1.address= {$account.5.server_address} {/if}
+
 account.5.sip_server_port = {$account.5.sip_port}
 account.5.transport = {if $account.5.sip_transport == 'udp'}0{/if}{if $account.5.sip_transport == 'tcp'}1{/if}{if $account.5.sip_transport == 'tls'}2{/if}{if $account.5.sip_transport == 'dns srv'}3{/if}{""}
 
@@ -1228,7 +1275,7 @@ account.5.dnd.enable =
 
 account.5.sip_trust_ctrl = 1
 
-voice_mail.number.1 = {$voicemail_number}
+voice_mail.number.5 = {$voicemail_number}
 
 #######################################################################################
 ##                                   Network                                         ##
@@ -1258,10 +1305,18 @@ account.6.enable = {if isset($account.6.password) }1{else}0{/if}{""}
 
 account.6.label = {$account.6.display_name}
 account.6.display_name = {$account.6.display_name}
+
+{if isset($account.6.server.1.address)}
+account.6.user_name = {$account.6.user_id}@{$account.6.server_address}
+{else}
 account.6.user_name = {$account.6.user_id}
+{/if}
+
 account.6.auth_name = {$account.6.user_id}
 account.6.password = {$account.6.password}
-account.6.sip_server_host = {$account.6.server_address}
+
+{if isset($account.6.server.1.address)} account.6.sip_server.1.address= {$account.6.server.1.address} {else} account.6.sip_server.1.address= {$account.6.server_address} {/if}
+
 account.6.sip_server_port = {$account.6.sip_port}
 account.6.transport = {if $account.6.sip_transport == 'udp'}0{/if}{if $account.6.sip_transport == 'tcp'}1{/if}{if $account.6.sip_transport == 'tls'}2{/if}{if $account.6.sip_transport == 'dns srv'}3{/if}{""}
 a
@@ -1485,7 +1540,7 @@ account.6.dnd.enable =
 
 account.6.sip_trust_ctrl = 1
 
-voice_mail.number.1 = {$voicemail_number}
+voice_mail.number.6 = {$voicemail_number}
 
 #######################################################################################
 ##                                   Network                                         ##
@@ -1515,10 +1570,18 @@ account.7.enable = {if isset($account.7.user_password) }1{else}0{/if}{""}
 
 account.7.label = {$account.7.display_name}
 account.7.display_name = {$account.7.display_name}
+
+{if isset($account.7.server.1.address)}
+account.7.user_name = {$account.7.user_id}@{$account.7.server_address}
+{else}
 account.7.user_name = {$account.7.user_id}
+{/if}
+
 account.7.auth_name = {$account.7.user_id}
 account.7.password = {$account.7.user_password}
-account.7.sip_server_host = {$account.7.server_address}
+
+{if isset($account.7.server.1.address)} account.7.sip_server.1.address= {$account.7.server.1.address} {else} account.7.sip_server.1.address= {$account.7.server_address} {/if}
+
 account.7.sip_server_port = {$account.7.sip_port}
 account.7.transport = {if $account.7.sip_transport == 'udp'}0{/if}{if $account.7.sip_transport == 'tcp'}1{/if}{if $account.7.sip_transport == 'tls'}2{/if}{if $account.7.sip_transport == 'dns srv'}3{/if}{""}
 
@@ -1742,7 +1805,7 @@ account.7.dnd.enable =
 
 account.7.sip_trust_ctrl = 1
 
-voice_mail.number.1 = {$voicemail_number}
+voice_mail.number.7= {$voicemail_number}
 
 #######################################################################################
 ##                                   Network                                         ##
@@ -1772,10 +1835,18 @@ account.8.enable = {if isset($account.8.user_password) }1{else}0{/if}{""}
 
 account.8.label = {$account.8.display_name}
 account.8.display_name = {$account.8.display_name}
+
+{if isset($account.8.server.1.address)}
+account.8.user_name = {$account.8.user_id}@{$account.8.server_address}
+{else}
 account.8.user_name = {$account.8.user_id}
+{/if}
+
 account.8.auth_name = {$account.8.user_id}
 account.8.password = {$account.8.user_password}
-account.8.sip_server_host = {$account.8.server_address}
+
+{if isset($account.8.server.1.address)} account.8.sip_server.1.address= {$account.8.server.1.address} {else} account.8.sip_server.1.address= {$account.8.server_address} {/if}
+
 account.8.sip_server_port = {$account.8.sip_port}
 account.8.transport = {if $account.8.sip_transport == 'udp'}0{/if}{if $account.8.sip_transport == 'tcp'}1{/if}{if $account.8.sip_transport == 'tls'}2{/if}{if $account.8.sip_transport == 'dns srv'}3{/if}{""}
 
@@ -1999,7 +2070,7 @@ account.8.dnd.enable =
 
 account.8.sip_trust_ctrl = 1
 
-voice_mail.number.1 = {$voicemail_number}
+voice_mail.number.8 = {$voicemail_number}
 
 #######################################################################################
 ##                                   Network                                         ##
@@ -2019,3 +2090,16 @@ network.internet_port.gateway =
 {if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}{""}
 
 {if isset($dns_server_primary)}network.static_dns_enable = 1{else}network.static_dns_enable = 0{/if}{""}
+
+
+#######################################################################################
+##                                   SCA                                             ##       
+#######################################################################################
+account.1.shared_line= {$shared_line_1}
+account.2.shared_line= {$shared_line_2}
+account.3.shared_line= {$shared_line_3}
+account.4.shared_line= {$shared_line_4}
+account.5.shared_line= {$shared_line_5}
+account.6.shared_line= {$shared_line_6}
+account.7.shared_line= {$shared_line_7}
+account.8.shared_line= {$shared_line_8}
diff --git a/themes/default/app_config.php b/themes/default/app_config.php
index 041f0c60c4..f84c9dca82 100644
--- a/themes/default/app_config.php
+++ b/themes/default/app_config.php
@@ -1399,6 +1399,14 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the background bottom hover color (and opacity) of buttons.";
 		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "971cbf46-ed0a-4583-b760-ae1c125d249c";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "button_background_color_email";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "#2e82d0";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the background color of buttons contained in emails (such as Password Reset emails).";
+		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "fdefb220-c2ca-439e-a8e8-ac946d442ccc";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "button_border_size";
@@ -1463,6 +1471,14 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the hover color (and opacity) of button text.";
 		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "5334e4cf-1259-4650-bdd8-f9be364750a6";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "button_text_color_email";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "#ffffff";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the text color of buttons contained in emails (such as Password Reset emails).";
+		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "5313ab04-067f-48ad-b059-3e2de81f0f13";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "button_text_weight";
diff --git a/themes/default/css.php b/themes/default/css.php
index 6da3c1cb26..beeef6a89b 100644
--- a/themes/default/css.php
+++ b/themes/default/css.php
@@ -1440,6 +1440,11 @@ header('Expires: '.gmdate('D, d M Y H:i:s',time()+3600).' GMT');
 		<?php } ?>
 		}
 
+	textarea.txt,
+	textarea.formfld {
+		resize: both;
+		}
+
 	input.login {
 		font-family: <?php echo ($_SESSION['theme']['login_input_text_font']['text'] != '') ? $_SESSION['theme']['login_input_text_font']['text'] : (($_SESSION['theme']['input_text_font']['text'] != '') ? $_SESSION['theme']['input_text_font']['text'] : 'Arial'); ?>;
 		font-size: <?php echo ($_SESSION['theme']['login_input_text_size']['text'] != '') ? $_SESSION['theme']['login_input_text_size']['text'] : (($_SESSION['theme']['input_text_size']['text'] != '') ? $_SESSION['theme']['input_text_size']['text'] : '12px'); ?>;