diff --git a/app/access_controls/access_controls.php b/app/access_controls/access_controls.php
index 0df2caa638..78423c0ec9 100644
--- a/app/access_controls/access_controls.php
+++ b/app/access_controls/access_controls.php
@@ -161,9 +161,9 @@
 		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";
-	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'=>'access_controls.php','style'=>($search == '' ? 'display: none;' : null)]);
+	echo 		"<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown=''>";
+	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search']);
+	//echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'access_controls.php','style'=>($search == '' ? 'display: none;' : null)]);
 	if ($paging_controls_mini != '') {
 		echo 	"<span style='margin-left: 15px;'>".$paging_controls_mini."</span>\n";
 	}
diff --git a/app/access_controls/app_config.php b/app/access_controls/app_config.php
index 63b7b218c6..ebc4c9f397 100644
--- a/app/access_controls/app_config.php
+++ b/app/access_controls/app_config.php
@@ -16,8 +16,8 @@
 		$apps[$x]['description']['de-de'] = "Zugriffssteuerungslisten verwalten";
 		$apps[$x]['description']['es-cl'] = "";
 		$apps[$x]['description']['es-mx'] = "";
-		$apps[$x]['description']['fr-ca'] = "";
-		$apps[$x]['description']['fr-fr'] = "";
+		$apps[$x]['description']['fr-ca'] = "Gérer les listes de contrôle d'accès";
+		$apps[$x]['description']['fr-fr'] = "Gérer les listes de contrôle d'accès";
 		$apps[$x]['description']['he-il'] = "";
 		$apps[$x]['description']['it-it'] = "";
 		$apps[$x]['description']['nl-nl'] = "Beheer toegangs controle lijsten";
diff --git a/app/access_controls/app_defaults.php b/app/access_controls/app_defaults.php
index 15000ff578..5105d77dc1 100644
--- a/app/access_controls/app_defaults.php
+++ b/app/access_controls/app_defaults.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) 2016
+	Portions created by the Initial Developer are Copyright (C) 2016 - 2022
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -46,8 +46,10 @@
 				else {
 					$xml_string = "<configuration name=\"acl.conf\" description=\"Network Lists\">\n";
 					$xml_string .= "	<network-lists>\n";
-					$xml_string .= "		<list name=\"lan\" default=\"allow\">\n";
-					$xml_string .= "			<node type=\"allow\" cidr=\"192.168.42.42/32\"/>\n";
+					$xml_string .= "		<list name=\"rfc1918\" default=\"allow\">\n";
+					$xml_string .= "			<node type=\"allow\" cidr=\"10.0.0.0/8\"/>\n";
+					$xml_string .= "			<node type=\"allow\" cidr=\"172.16.0.0/12\"/>\n";
+					$xml_string .= "			<node type=\"allow\" cidr=\"192.168.0.0/16\"/>\n";
 					$xml_string .= "		</list>\n";
 					$xml_string .= "		<list name=\"domains\" default=\"deny\">\n";
 					$xml_string .= "			<node type=\"allow\" domain=\"".$_SESSION['domain_name']."\"/>\n";
@@ -77,7 +79,7 @@
 						$database = new database;
 						$database->app_name = 'access_controls';
 						$database->app_uuid = '1416a250-f6e1-4edc-91a6-5c9b883638fd';
-						$database->save($array);
+						$database->save($array, false);
 						unset($array);
 
 						$p->delete('access_control_add', 'temp');
@@ -114,7 +116,7 @@
 							$database = new database;
 							$database->app_name = 'access_controls';
 							$database->app_uuid = '1416a250-f6e1-4edc-91a6-5c9b883638fd';
-							$database->save($array);
+							$database->save($array, false);
 							unset($array);
 
 							$p->delete('access_control_node_add', 'temp');
diff --git a/app/access_controls/app_languages.php b/app/access_controls/app_languages.php
index 27fb0ec666..6951615667 100644
--- a/app/access_controls/app_languages.php
+++ b/app/access_controls/app_languages.php
@@ -203,7 +203,7 @@ $text['label-deny']['fr-fr'] = " nier";
 $text['label-deny']['he-il'] = "להכחיש";
 $text['label-deny']['it-it'] = "nega";
 $text['label-deny']['nl-nl'] = "verbieden";
-$text['label-deny']['pl-pl'] = "zaprzeczać";
+$text['label-deny']['pl-pl'] = "odrzuć";
 $text['label-deny']['pt-br'] = "negar"; //copied from pt-pt
 $text['label-deny']['pt-pt'] = "negar";
 $text['label-deny']['ro-ro'] = "Nega";
@@ -224,7 +224,7 @@ $text['label-allow']['fr-fr'] = " permettre";
 $text['label-allow']['he-il'] = "לאפשר";
 $text['label-allow']['it-it'] = "permetti";
 $text['label-allow']['nl-nl'] = "toestaan";
-$text['label-allow']['pl-pl'] = "dopuszczać";
+$text['label-allow']['pl-pl'] = "zezwól";
 $text['label-allow']['pt-br'] = "permitir"; //copied from pt-pt
 $text['label-allow']['pt-pt'] = "permitir";
 $text['label-allow']['ro-ro'] = "Permite";
@@ -253,27 +253,6 @@ $text['label-access_control_name']['ru-ru'] = "Имя";
 $text['label-access_control_name']['sv-se'] = "namn";
 $text['label-access_control_name']['uk-ua'] = "ім'я";
 
-$text['label-access_control_description']['en-us'] = "Description";
-$text['label-access_control_description']['en-gb'] = "Description";
-$text['label-access_control_description']['ar-eg'] = "وصف";
-$text['label-access_control_description']['de-at'] = "Beschreibung"; //copied from de-de
-$text['label-access_control_description']['de-ch'] = "Beschreibung"; //copied from de-de
-$text['label-access_control_description']['de-de'] = "Beschreibung";
-$text['label-access_control_description']['es-cl'] = "Descripción";
-$text['label-access_control_description']['es-mx'] = "Descripción"; //copied from es-cl
-$text['label-access_control_description']['fr-ca'] = "Description"; //copied from fr-fr
-$text['label-access_control_description']['fr-fr'] = "Description";
-$text['label-access_control_description']['he-il'] = "תיאור";
-$text['label-access_control_description']['it-it'] = "Descrizione";
-$text['label-access_control_description']['nl-nl'] = "Omschrijving";
-$text['label-access_control_description']['pl-pl'] = "opis";
-$text['label-access_control_description']['pt-br'] = "Descrição"; //copied from pt-pt
-$text['label-access_control_description']['pt-pt'] = "Descrição";
-$text['label-access_control_description']['ro-ro'] = "Descriere";
-$text['label-access_control_description']['ru-ru'] = "Описание";
-$text['label-access_control_description']['sv-se'] = "Beskrivning";
-$text['label-access_control_description']['uk-ua'] = "опис";
-
 $text['label-access_control_default']['en-us'] = "Default";
 $text['label-access_control_default']['en-gb'] = "Default";
 $text['label-access_control_default']['ar-eg'] = "افتراضي";
@@ -295,6 +274,48 @@ $text['label-access_control_default']['ru-ru'] = "По умолчанию";
 $text['label-access_control_default']['sv-se'] = "Standard";
 $text['label-access_control_default']['uk-ua'] = "дефолт";
 
+$text['label-access_control_nodes']['en-us'] = "Nodes";
+$text['label-access_control_nodes']['en-gb'] = "Nodes";
+$text['label-access_control_nodes']['ar-eg'] = "العقد";
+$text['label-access_control_nodes']['de-at'] = "Knoten"; //copied from de-de
+$text['label-access_control_nodes']['de-ch'] = "Knoten"; //copied from de-de
+$text['label-access_control_nodes']['de-de'] = "Knoten";
+$text['label-access_control_nodes']['es-cl'] = "Nodos";
+$text['label-access_control_nodes']['es-mx'] = "Nodos"; //copied from es-cl
+$text['label-access_control_nodes']['fr-ca'] = " nœuds"; //copied from fr-fr
+$text['label-access_control_nodes']['fr-fr'] = " nœuds";
+$text['label-access_control_nodes']['he-il'] = "בלוטות";
+$text['label-access_control_nodes']['it-it'] = "Nodi";
+$text['label-access_control_nodes']['nl-nl'] = "Knooppunten";
+$text['label-access_control_nodes']['pl-pl'] = "węzły";
+$text['label-access_control_nodes']['pt-br'] = "Nodes";
+$text['label-access_control_nodes']['pt-pt'] = " Nodes";
+$text['label-access_control_nodes']['ro-ro'] = "Noduri";
+$text['label-access_control_nodes']['ru-ru'] = "Узлы";
+$text['label-access_control_nodes']['sv-se'] = "Noder";
+$text['label-access_control_nodes']['uk-ua'] = "вузли";
+
+$text['label-access_control_description']['en-us'] = "Description";
+$text['label-access_control_description']['en-gb'] = "Description";
+$text['label-access_control_description']['ar-eg'] = "وصف";
+$text['label-access_control_description']['de-at'] = "Beschreibung"; //copied from de-de
+$text['label-access_control_description']['de-ch'] = "Beschreibung"; //copied from de-de
+$text['label-access_control_description']['de-de'] = "Beschreibung";
+$text['label-access_control_description']['es-cl'] = "Descripción";
+$text['label-access_control_description']['es-mx'] = "Descripción"; //copied from es-cl
+$text['label-access_control_description']['fr-ca'] = "Description"; //copied from fr-fr
+$text['label-access_control_description']['fr-fr'] = "Description";
+$text['label-access_control_description']['he-il'] = "תיאור";
+$text['label-access_control_description']['it-it'] = "Descrizione";
+$text['label-access_control_description']['nl-nl'] = "Omschrijving";
+$text['label-access_control_description']['pl-pl'] = "opis";
+$text['label-access_control_description']['pt-br'] = "Descrição"; //copied from pt-pt
+$text['label-access_control_description']['pt-pt'] = "Descrição";
+$text['label-access_control_description']['ro-ro'] = "Descriere";
+$text['label-access_control_description']['ru-ru'] = "Описание";
+$text['label-access_control_description']['sv-se'] = "Beskrivning";
+$text['label-access_control_description']['uk-ua'] = "опис";
+
 $text['description-node_type']['en-us'] = "Select the type.";
 $text['description-node_type']['en-gb'] = "Select the type.";
 $text['description-node_type']['ar-eg'] = "حدد نوع.";
diff --git a/app/basic_operator_panel/app_config.php b/app/basic_operator_panel/app_config.php
index 39cd6bf82a..25678f519d 100644
--- a/app/basic_operator_panel/app_config.php
+++ b/app/basic_operator_panel/app_config.php
@@ -75,5 +75,29 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set if extensions are grouped by call_group when viewing all extensions.";
 		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "a9ccd174-5ae1-4f90-8ee2-b79a183a04f8";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "operator_panel_main_background_color";
+		$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'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set main background color (and opacity) of extensions";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "b9d34460-db41-40d5-becd-5da037fa8942";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "operator_panel_sub_background_color";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "#e5eaf5";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set sub background color (and opacity) of extensions";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "9cb6477d-0454-4b9c-b0fb-11c258d4f35f";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "operator_panel_border_color";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "#b9c5d8";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set border color (and opacity) of extensions";
+		$y++;
 
-?>
\ No newline at end of file
+?>
diff --git a/app/basic_operator_panel/app_languages.php b/app/basic_operator_panel/app_languages.php
index fbfdd5d1d3..3810f315e5 100644
--- a/app/basic_operator_panel/app_languages.php
+++ b/app/basic_operator_panel/app_languages.php
@@ -35,7 +35,7 @@ $text['label-status_on_demand']['fr-fr'] = "Sur Demande";
 $text['label-status_on_demand']['he-il'] = "על פי דרישה";
 $text['label-status_on_demand']['it-it'] = "Su Richiesta";
 $text['label-status_on_demand']['nl-nl'] = "Op Aanvraag";
-$text['label-status_on_demand']['pl-pl'] = "Na żądanie ";
+$text['label-status_on_demand']['pl-pl'] = "Na żądanie";
 $text['label-status_on_demand']['pt-br'] = "A pedido";
 $text['label-status_on_demand']['pt-pt'] = "A Pedido";
 $text['label-status_on_demand']['ro-ro'] = "";
@@ -77,7 +77,7 @@ $text['label-status_logged_out_or_unknown']['fr-fr'] = "Déconnexion / Unknown";
 $text['label-status_logged_out_or_unknown']['he-il'] = "";
 $text['label-status_logged_out_or_unknown']['it-it'] = "Sloggato/Sconosciuto";
 $text['label-status_logged_out_or_unknown']['nl-nl'] = "Afgelogged / Onbekend";
-$text['label-status_logged_out_or_unknown']['pl-pl'] = "Wylogowany/nieznany";
+$text['label-status_logged_out_or_unknown']['pl-pl'] = "Wylogowany / Nieznany";
 $text['label-status_logged_out_or_unknown']['pt-br'] = "Desligar / Desconhecido";
 $text['label-status_logged_out_or_unknown']['pt-pt'] = "Desligado / Unknown";
 $text['label-status_logged_out_or_unknown']['ro-ro'] = "";
@@ -119,7 +119,7 @@ $text['label-status_do_not_disturb']['fr-fr'] = "Ne pas Déranger";
 $text['label-status_do_not_disturb']['he-il'] = "נא לא להפריע";
 $text['label-status_do_not_disturb']['it-it'] = "Non Disturbare";
 $text['label-status_do_not_disturb']['nl-nl'] = "Niet Storen";
-$text['label-status_do_not_disturb']['pl-pl'] = "Nie przeszkadzać (DND)";
+$text['label-status_do_not_disturb']['pl-pl'] = "Nie przeszkadzać (DND)";
 $text['label-status_do_not_disturb']['pt-br'] = "Não perturbe";
 $text['label-status_do_not_disturb']['pt-pt'] = "Não perturbe (DND)";
 $text['label-status_do_not_disturb']['ro-ro'] = "";
@@ -140,7 +140,7 @@ $text['label-status_available_on_demand']['fr-fr'] = "Disponible (sur demande)";
 $text['label-status_available_on_demand']['he-il'] = "";
 $text['label-status_available_on_demand']['it-it'] = "Disponibile (Su Richiesta)";
 $text['label-status_available_on_demand']['nl-nl'] = "Beschikbaar (Op Aaanvraag)";
-$text['label-status_available_on_demand']['pl-pl'] = "Dostępny (na żądanie)";
+$text['label-status_available_on_demand']['pl-pl'] = "Dostępny (na żądanie)";
 $text['label-status_available_on_demand']['pt-br'] = "Disponivel (A pedido)";
 $text['label-status_available_on_demand']['pt-pt'] = "Disponível (A Pedido)";
 $text['label-status_available_on_demand']['ro-ro'] = "";
@@ -161,7 +161,7 @@ $text['label-status_available']['fr-fr'] = "Disponible";
 $text['label-status_available']['he-il'] = "זמין";
 $text['label-status_available']['it-it'] = "Disponibile";
 $text['label-status_available']['nl-nl'] = "Beschikbaar";
-$text['label-status_available']['pl-pl'] = "Dostępny";
+$text['label-status_available']['pl-pl'] = "Dostępny";
 $text['label-status_available']['pt-br'] = "Disponível";
 $text['label-status_available']['pt-pt'] = "Disponível";
 $text['label-status_available']['ro-ro'] = "";
@@ -182,7 +182,7 @@ $text['label-refresh_pause']['fr-fr'] = "Pause Actualiser";
 $text['label-refresh_pause']['he-il'] = "עצור רענון";
 $text['label-refresh_pause']['it-it'] = "Interrompi";
 $text['label-refresh_pause']['nl-nl'] = "Stop verversen";
-$text['label-refresh_pause']['pl-pl'] = "Pauzuj odświeżanie";
+$text['label-refresh_pause']['pl-pl'] = "Pauzuj odświeżanie";
 $text['label-refresh_pause']['pt-br'] = "Pausar atualização";
 $text['label-refresh_pause']['pt-pt'] = "Pausa Atualizar";
 $text['label-refresh_pause']['ro-ro'] = "";
@@ -203,7 +203,7 @@ $text['label-refresh_enable']['fr-fr'] = "Activer Actualiser";
 $text['label-refresh_enable']['he-il'] = "אפשר רענון";
 $text['label-refresh_enable']['it-it'] = "Abilita Aggiornamento";
 $text['label-refresh_enable']['nl-nl'] = "Start verversen";
-$text['label-refresh_enable']['pl-pl'] = "Włącz odświeżanie";
+$text['label-refresh_enable']['pl-pl'] = "Włącz odświeżanie";
 $text['label-refresh_enable']['pt-br'] = "Habilitar atualização";
 $text['label-refresh_enable']['pt-pt'] = "Habilitar Atualização";
 $text['label-refresh_enable']['ro-ro'] = "";
@@ -266,7 +266,7 @@ $text['label-other_extensions']['fr-fr'] = "Autres Extensions";
 $text['label-other_extensions']['he-il'] = "שלוחות אחרות";
 $text['label-other_extensions']['it-it'] = "Altri Interni";
 $text['label-other_extensions']['nl-nl'] = "Andere toestellen";
-$text['label-other_extensions']['pl-pl'] = "Inne numery wew";
+$text['label-other_extensions']['pl-pl'] = "Inne numery wewnętrzne";
 $text['label-other_extensions']['pt-br'] = "Outras extensões";
 $text['label-other_extensions']['pt-pt'] = "Outros Extensions";
 $text['label-other_extensions']['ro-ro'] = "";
@@ -287,7 +287,7 @@ $text['label-no_extensions_found']['fr-fr'] = "Aucun extensions trouvés.";
 $text['label-no_extensions_found']['he-il'] = "לא נמצאו שלוחות";
 $text['label-no_extensions_found']['it-it'] = "Nessun interno trovato.";
 $text['label-no_extensions_found']['nl-nl'] = "Geen toestellen gevonden.";
-$text['label-no_extensions_found']['pl-pl'] = "Nie znaleziono numeru wew";
+$text['label-no_extensions_found']['pl-pl'] = "Nie znaleziono numerów wewnętrznych";
 $text['label-no_extensions_found']['pt-br'] = "Não foi encontrada nenhuma extensão";
 $text['label-no_extensions_found']['pt-pt'] = "Sem extensões encontrado.";
 $text['label-no_extensions_found']['ro-ro'] = "";
@@ -308,7 +308,7 @@ $text['label-hangup']['fr-fr'] = "Tuer Appel";
 $text['label-hangup']['he-il'] = "הפסק";
 $text['label-hangup']['it-it'] = "Abbatti";
 $text['label-hangup']['nl-nl'] = "Ophangen";
-$text['label-hangup']['pl-pl'] = "Wyłącz";
+$text['label-hangup']['pl-pl'] = "Rozłączenie się";
 $text['label-hangup']['pt-br'] = "Chamada final";
 $text['label-hangup']['pt-pt'] = "Chamada Final";
 $text['label-hangup']['ro-ro'] = "";
@@ -329,7 +329,7 @@ $text['label-eavesdrop']['fr-fr'] = "Espionner";
 $text['label-eavesdrop']['he-il'] = "";
 $text['label-eavesdrop']['it-it'] = "Ascolta";
 $text['label-eavesdrop']['nl-nl'] = "Afluisteren";
-$text['label-eavesdrop']['pl-pl'] = "Podsłuchiwanie";
+$text['label-eavesdrop']['pl-pl'] = "Podsłuchiwanie";
 $text['label-eavesdrop']['pt-br'] = "Investigar";
 $text['label-eavesdrop']['pt-pt'] = "Bisbilhotar";
 $text['label-eavesdrop']['ro-ro'] = "";
@@ -350,7 +350,7 @@ $text['label-call_group']['fr-fr'] = "Groupe d'appel";
 $text['label-call_group']['he-il'] = "קבוצת חיוג";
 $text['label-call_group']['it-it'] = "Gruppo di Chiamata";
 $text['label-call_group']['nl-nl'] = "Oproep Groep";
-$text['label-call_group']['pl-pl'] = "Grupa odbiorców rozmowy";
+$text['label-call_group']['pl-pl'] = "Grupa odbiorców rozmowy";
 $text['label-call_group']['pt-br'] = "Grupo"; //copied from pt-pt
 $text['label-call_group']['pt-pt'] = "Grupo";
 $text['label-call_group']['ro-ro'] = "";
@@ -392,7 +392,7 @@ $text['description-eavesdrop_destination']['fr-fr'] = "Sélectionnez la destinat
 $text['description-eavesdrop_destination']['he-il'] = "";
 $text['description-eavesdrop_destination']['it-it'] = "Seleziona la Destinazione d'Ascolto";
 $text['description-eavesdrop_destination']['nl-nl'] = "Kies afluister bestemming";
-$text['description-eavesdrop_destination']['pl-pl'] = "Wybierz destynację podsłuchiwanych rozmów";
+$text['description-eavesdrop_destination']['pl-pl'] = "Wybierz destynację podsłuchiwanych rozmów";
 $text['description-eavesdrop_destination']['pt-br'] = "Selecione o eavesdrop de destino";
 $text['description-eavesdrop_destination']['pt-pt'] = "Selecione o Eavesdrop Destino";
 $text['description-eavesdrop_destination']['ro-ro'] = "";
diff --git a/app/bridges/app_languages.php b/app/bridges/app_languages.php
index 5fa1807067..13424709cd 100644
--- a/app/bridges/app_languages.php
+++ b/app/bridges/app_languages.php
@@ -14,7 +14,7 @@
 		$text['title-bridges']['he-il'] = '';
 		$text['title-bridges']['it-it'] = '';
 		$text['title-bridges']['nl-nl'] = 'Bruggen';
-		$text['title-bridges']['pl-pl'] = '';
+		$text['title-bridges']['pl-pl'] = 'Mostki';
 		$text['title-bridges']['pt-br'] = '';
 		$text['title-bridges']['pt-pt'] = '';
 		$text['title-bridges']['ro-ro'] = '';
@@ -35,7 +35,7 @@
 		$text['title-bridge']['he-il'] = '';
 		$text['title-bridge']['it-it'] = '';
 		$text['title-bridge']['nl-nl'] = 'Brug';
-		$text['title-bridge']['pl-pl'] = '';
+		$text['title-bridge']['pl-pl'] = 'Mostek';
 		$text['title-bridge']['pt-br'] = '';
 		$text['title-bridge']['pt-pt'] = '';
 		$text['title-bridge']['ro-ro'] = '';
@@ -56,7 +56,7 @@
 		$text['title_description-bridge']['he-il'] = '';
 		$text['title_description-bridge']['it-it'] = '';
 		$text['title_description-bridge']['nl-nl'] = 'Voeg brug opdrachten toe aan bestemmings lijst.';
-		$text['title_description-bridge']['pl-pl'] = '';
+		$text['title_description-bridge']['pl-pl'] = 'Dodaj wyrażenia mostkowania do listy wyboru destynacji.';
 		$text['title_description-bridge']['pt-br'] = '';
 		$text['title_description-bridge']['pt-pt'] = '';
 		$text['title_description-bridge']['ro-ro'] = '';
@@ -77,7 +77,7 @@
 		$text['label-bridge_name']['he-il'] = '';
 		$text['label-bridge_name']['it-it'] = '';
 		$text['label-bridge_name']['nl-nl'] = 'Naam';
-		$text['label-bridge_name']['pl-pl'] = '';
+		$text['label-bridge_name']['pl-pl'] = 'Nazwa';
 		$text['label-bridge_name']['pt-br'] = '';
 		$text['label-bridge_name']['pt-pt'] = '';
 		$text['label-bridge_name']['ro-ro'] = '';
@@ -98,7 +98,7 @@
 		$text['description-bridge_name']['he-il'] = '';
 		$text['description-bridge_name']['it-it'] = '';
 		$text['description-bridge_name']['nl-nl'] = 'Voer naam in.';
-		$text['description-bridge_name']['pl-pl'] = '';
+		$text['description-bridge_name']['pl-pl'] = 'Wprowadź nazwę.';
 		$text['description-bridge_name']['pt-br'] = '';
 		$text['description-bridge_name']['pt-pt'] = '';
 		$text['description-bridge_name']['ro-ro'] = '';
@@ -119,7 +119,7 @@
 		$text['label-bridge_destination']['he-il'] = '';
 		$text['label-bridge_destination']['it-it'] = '';
 		$text['label-bridge_destination']['nl-nl'] = 'Bestemming';
-		$text['label-bridge_destination']['pl-pl'] = '';
+		$text['label-bridge_destination']['pl-pl'] = 'Destynacja';
 		$text['label-bridge_destination']['pt-br'] = '';
 		$text['label-bridge_destination']['pt-pt'] = '';
 		$text['label-bridge_destination']['ro-ro'] = '';
@@ -140,7 +140,7 @@
 		$text['description-bridge_destination']['he-il'] = '';
 		$text['description-bridge_destination']['it-it'] = '';
 		$text['description-bridge_destination']['nl-nl'] = 'Voer de bestemming in.';
-		$text['description-bridge_destination']['pl-pl'] = '';
+		$text['description-bridge_destination']['pl-pl'] = 'Wprowadź destynację.';
 		$text['description-bridge_destination']['pt-br'] = '';
 		$text['description-bridge_destination']['pt-pt'] = '';
 		$text['description-bridge_destination']['ro-ro'] = '';
@@ -161,7 +161,7 @@
 		$text['label-bridge_enabled']['he-il'] = '';
 		$text['label-bridge_enabled']['it-it'] = '';
 		$text['label-bridge_enabled']['nl-nl'] = 'Geactiveerd';
-		$text['label-bridge_enabled']['pl-pl'] = '';
+		$text['label-bridge_enabled']['pl-pl'] = 'Aktywny';
 		$text['label-bridge_enabled']['pt-br'] = '';
 		$text['label-bridge_enabled']['pt-pt'] = '';
 		$text['label-bridge_enabled']['ro-ro'] = '';
@@ -182,7 +182,7 @@
 		$text['description-bridge_enabled']['he-il'] = '';
 		$text['description-bridge_enabled']['it-it'] = '';
 		$text['description-bridge_enabled']['nl-nl'] = 'Kies aktiveer/deactiveer.';
-		$text['description-bridge_enabled']['pl-pl'] = '';
+		$text['description-bridge_enabled']['pl-pl'] = 'Wybierz czy aktywować lub dezaktywować.';
 		$text['description-bridge_enabled']['pt-br'] = '';
 		$text['description-bridge_enabled']['pt-pt'] = '';
 		$text['description-bridge_enabled']['ro-ro'] = '';
@@ -203,7 +203,7 @@
 		$text['label-bridge_description']['he-il'] = '';
 		$text['label-bridge_description']['it-it'] = '';
 		$text['label-bridge_description']['nl-nl'] = 'Omschrijving';
-		$text['label-bridge_description']['pl-pl'] = '';
+		$text['label-bridge_description']['pl-pl'] = 'Opis';
 		$text['label-bridge_description']['pt-br'] = '';
 		$text['label-bridge_description']['pt-pt'] = '';
 		$text['label-bridge_description']['ro-ro'] = '';
@@ -224,7 +224,7 @@
 		$text['description-bridge_description']['he-il'] = '';
 		$text['description-bridge_description']['it-it'] = '';
 		$text['description-bridge_description']['nl-nl'] = 'Voer omschrijving in.';
-		$text['description-bridge_description']['pl-pl'] = '';
+		$text['description-bridge_description']['pl-pl'] = 'Wprowadź opis.';
 		$text['description-bridge_description']['pt-br'] = '';
 		$text['description-bridge_description']['pt-pt'] = '';
 		$text['description-bridge_description']['ro-ro'] = '';
diff --git a/app/bridges/app_menu.php b/app/bridges/app_menu.php
index 7ad7c51053..51a6527678 100644
--- a/app/bridges/app_menu.php
+++ b/app/bridges/app_menu.php
@@ -6,7 +6,7 @@ $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']['nl-nl'] = 'Bruggen';
-$apps[$x]['menu'][0]['title']['pl'] = '';
+$apps[$x]['menu'][0]['title']['pl'] = 'Mostkowania';
 $apps[$x]['menu'][0]['title']['sv-se'] = '';
 $apps[$x]['menu'][0]['title']['uk'] = '';
 $apps[$x]['menu'][0]['title']['de-at'] = '';
diff --git a/app/bridges/bridges.php b/app/bridges/bridges.php
index c9e77e0aa7..c8e0b8302b 100644
--- a/app/bridges/bridges.php
+++ b/app/bridges/bridges.php
@@ -143,13 +143,13 @@
 		echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add'],'id'=>'btn_add','link'=>'bridge_edit.php']);
 	}
 	if (permission_exists('bridge_add') && $bridges) {
-		echo button::create(['type'=>'button','label'=>$text['button-copy'],'icon'=>$_SESSION['theme']['button_icon_copy'],'name'=>'btn_copy','onclick'=>"modal_open('modal-copy','btn_copy');"]);
+		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('bridge_edit') && $bridges) {
-		echo button::create(['type'=>'button','label'=>$text['button-toggle'],'icon'=>$_SESSION['theme']['button_icon_toggle'],'name'=>'btn_toggle','onclick'=>"modal_open('modal-toggle','btn_toggle');"]);
+		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('bridge_delete') && $bridges) {
-		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 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('bridge_all')) {
@@ -160,9 +160,9 @@
 			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'=>'bridges.php','style'=>($search == '' ? 'display: none;' : null)]);
+	echo 		"<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown=''>";
+	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search']);
+	//echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'bridges.php','style'=>($search == '' ? 'display: none;' : null)]);
 	if ($paging_controls_mini != '') {
 		echo 	"<span style='margin-left: 15px;'>".$paging_controls_mini."</span>\n";
 	}
@@ -192,7 +192,7 @@
 	echo "<tr class='list-header'>\n";
 	if (permission_exists('bridge_add') || permission_exists('bridge_edit') || permission_exists('bridge_delete')) {
 		echo "	<th class='checkbox'>\n";
-		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle();' ".($bridges ?: "style='visibility: hidden;'").">\n";
+		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle(); checkbox_on_change(this);' ".($bridges ?: "style='visibility: hidden;'").">\n";
 		echo "	</th>\n";
 	}
 	if ($_GET['show'] == 'all' && permission_exists('bridge_all')) {
@@ -216,7 +216,7 @@
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('bridge_add') || permission_exists('bridge_edit') || permission_exists('bridge_delete')) {
 				echo "	<td class='checkbox'>\n";
-				echo "		<input type='checkbox' name='bridges[$x][checked]' id='checkbox_".$x."' value='true' onclick=\"if (!this.checked) { document.getElementById('checkbox_all').checked = false; }\">\n";
+				echo "		<input type='checkbox' name='bridges[$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='bridges[$x][uuid]' value='".escape($row['bridge_uuid'])."' />\n";
 				echo "	</td>\n";
 			}
diff --git a/app/call_block/app_config.php b/app/call_block/app_config.php
index b6d42a2bb1..e1c6fc273e 100644
--- a/app/call_block/app_config.php
+++ b/app/call_block/app_config.php
@@ -75,6 +75,10 @@
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "call_block_ring_group";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
+		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "call_block_voicemail";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
diff --git a/app/call_block/app_languages.php b/app/call_block/app_languages.php
index 581062335b..f0be921626 100644
--- a/app/call_block/app_languages.php
+++ b/app/call_block/app_languages.php
@@ -81,7 +81,7 @@ $text['label-update-complete']['fr-fr'] = "Mise à jour effectuée";
 $text['label-update-complete']['he-il'] = "העדכון הושלם";
 $text['label-update-complete']['it-it'] = "Aggiornamento Completato";
 $text['label-update-complete']['nl-nl'] = "Bijgewerkt";
-$text['label-update-complete']['pl-pl'] = "Zaktualizowano poprawnie";
+$text['label-update-complete']['pl-pl'] = "Zaktualizowano pomyślnie";
 $text['label-update-complete']['pt-br'] = "Atualização Completa";
 $text['label-update-complete']['pt-pt'] = "Actualização Efectuada";
 $text['label-update-complete']['ro-ro'] = "Actualizare completă";
@@ -190,7 +190,7 @@ $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']['pl-pl'] = "Kod Kraju";
 $text['label-country_code']['pt-br'] = "Prefixo"; //copied from pt-pt
 $text['label-country_code']['pt-pt'] = "";
 $text['label-country_code']['ro-ro'] = "";
@@ -284,6 +284,48 @@ $text['label-ivr']['ru-ru'] = "IVR";
 $text['label-ivr']['sv-se'] = "IVR";
 $text['label-ivr']['uk-ua'] = "";
 
+$text['label-ring_groups']['en-us'] = "Ring Groups";
+$text['label-ring_groups']['en-gb'] = "Ring Groups";
+$text['label-ring_groups']['ar-eg'] = "مجموعات الرنين";
+$text['label-ring_groups']['de-at'] = "Ringgruppen"; //copied from de-de
+$text['label-ring_groups']['de-ch'] = "Ringgruppen"; //copied from de-de
+$text['label-ring_groups']['de-de'] = "Ringgruppen";
+$text['label-ring_groups']['es-cl'] = "Grupos de timbre";
+$text['label-ring_groups']['es-mx'] = "Grupos de timbre"; //copied from es-cl
+$text['label-ring_groups']['fr-ca'] = "Groupes de sonnerie"; //copied from fr-fr
+$text['label-ring_groups']['fr-fr'] = "Groupes de sonnerie";
+$text['label-ring_groups']['he-il'] = "קבוצות טבעת";
+$text['label-ring_groups']['it-it'] = "Gruppi di suoneria";
+$text['label-ring_groups']['nl-nl'] = "Belgroepen";
+$text['label-ring_groups']['pl-pl'] = "Grupy dzwonków";
+$text['label-ring_groups']['pt-br'] = "Grupos de toque"; //copied from pt-pt
+$text['label-ring_groups']['pt-pt'] = "Grupos de toque";
+$text['label-ring_groups']['ro-ro'] = "Grupuri de apeluri";
+$text['label-ring_groups']['ru-ru'] = "Кольцевые группы";
+$text['label-ring_groups']['sv-se'] = "Ringgrupper";
+$text['label-ring_groups']['uk-ua'] = "Кільцеві групи";
+
+$text['label-ring_group']['en-us'] = "Ring Group";
+$text['label-ring_group']['en-gb'] = "Ring Group";
+$text['label-ring_group']['ar-eg'] = "";
+$text['label-ring_group']['de-at'] = "Rufgruppe"; //copied from de-de
+$text['label-ring_group']['de-ch'] = "Rufgruppe"; //copied from de-de
+$text['label-ring_group']['de-de'] = "Rufgruppe";
+$text['label-ring_group']['es-cl'] = "Grupo de llamado";
+$text['label-ring_group']['es-mx'] = "Grupo de llamado"; //copied from es-cl
+$text['label-ring_group']['fr-ca'] = "Groupe de sonnerie"; //copied from fr-fr
+$text['label-ring_group']['fr-fr'] = "Groupe de sonnerie";
+$text['label-ring_group']['he-il'] = "קבוצת חיוג";
+$text['label-ring_group']['it-it'] = "Gruppo di Squillo";
+$text['label-ring_group']['nl-nl'] = "Belgroep";
+$text['label-ring_group']['pl-pl'] = "Grupa odbiorców.";
+$text['label-ring_group']['pt-br'] = "Grupo"; //copied from pt-pt
+$text['label-ring_group']['pt-pt'] = "Grupo";
+$text['label-ring_group']['ro-ro'] = "";
+$text['label-ring_group']['ru-ru'] = "Группа вызовов";
+$text['label-ring_group']['sv-se'] = "Ringgrupp";
+$text['label-ring_group']['uk-ua'] = "";
+
 $text['label-local']['en-us'] = "Local";
 $text['label-local']['en-gb'] = "Local";
 $text['label-local']['ar-eg'] = "محلي";
@@ -472,7 +514,7 @@ $text['label-delete-complete']['fr-fr'] = "Supprimé";
 $text['label-delete-complete']['he-il'] = "המחיקה הושלמה";
 $text['label-delete-complete']['it-it'] = "Cancellazione Completata";
 $text['label-delete-complete']['nl-nl'] = "Verwijderen gereed";
-$text['label-delete-complete']['pl-pl'] = "Usunięto poprawnie";
+$text['label-delete-complete']['pl-pl'] = "Usunięto pomyślnie";
 $text['label-delete-complete']['pt-br'] = "Remoção efetuada";
 $text['label-delete-complete']['pt-pt'] = "Remoção Efectuada";
 $text['label-delete-complete']['ro-ro'] = "Ștergere completă";
@@ -648,7 +690,7 @@ $text['label-add-complete']['fr-fr'] = "Ajouté";
 $text['label-add-complete']['he-il'] = "הוספה הושלמה";
 $text['label-add-complete']['it-it'] = "Inserimento Completato";
 $text['label-add-complete']['nl-nl'] = "Toevoegen gereed";
-$text['label-add-complete']['pl-pl'] = "Dodano poprawnie";
+$text['label-add-complete']['pl-pl'] = "Dodano pomyślnie";
 $text['label-add-complete']['pt-br'] = "Criação efetuada ";
 $text['label-add-complete']['pt-pt'] = "Adição Efectuada";
 $text['label-add-complete']['ro-ro'] = "Adăugare completă";
@@ -713,7 +755,7 @@ $text['description-direction']['fr-fr'] = "Sélectionnez la direction des appels
 $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']['pl-pl'] = "Wybierz kierunek połączeń, które mają być blokowane.";
 $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.";
@@ -735,7 +777,7 @@ $text['description-call_block_name']['fr-fr'] = "Entrez le nom d'affichage à bl
 $text['description-call_block_name']['he-il'] = "";
 $text['description-call_block_name']['it-it'] = "";
 $text['description-call_block_name']['nl-nl'] = "Voer het te blokkeren CID Naam in.";
-$text['description-call_block_name']['pl-pl'] = "";
+$text['description-call_block_name']['pl-pl'] = "Wprowadź prezentację Nazwy numeru dzwoniącego do zablokowania.";
 $text['description-call_block_name']['pt-br'] = "";
 $text['description-call_block_name']['pt-pt'] = "";
 $text['description-call_block_name']['ro-ro'] = "";
@@ -756,7 +798,7 @@ $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']['pl-pl'] = "Wprowadź prefiks Kodu Kraju.";
 $text['description-country_code']['pt-br'] = "Insira o prefixo do destino.";
 $text['description-country_code']['pt-pt'] = "";
 $text['description-country_code']['ro-ro'] = "";
@@ -778,7 +820,7 @@ $text['description-call_block_number']['fr-fr'] = "Entrez le numéro d'affichage
 $text['description-call_block_number']['he-il'] = "";
 $text['description-call_block_number']['it-it'] = "";
 $text['description-call_block_number']['nl-nl'] = "Voer het te blokkeren CID Nummer in.";
-$text['description-call_block_number']['pl-pl'] = "";
+$text['description-call_block_number']['pl-pl'] = "Wprowadź Kod Kraju i prezentację Numeru dzwoniącego do zablokowania.";
 $text['description-call_block_number']['pt-br'] = "";
 $text['description-call_block_number']['pt-pt'] = "";
 $text['description-call_block_number']['ro-ro'] = "";
@@ -800,7 +842,7 @@ $text['description-extension']['fr-fr'] = "Choissizez le poste sur lequel cette
 $text['description-extension']['he-il'] = "";
 $text['description-extension']['it-it'] = "";
 $text['description-extension']['nl-nl'] = "Selecteer het toestel dat geblokkeerd moet worden.";
-$text['description-extension']['pl-pl'] = "";
+$text['description-extension']['pl-pl'] = "Wybierz numer wewnętrzny, którego blokowanie ma dotyczyć.";
 $text['description-extension']['pt-br'] = "";
 $text['description-extension']['pt-pt'] = "";
 $text['description-extension']['ro-ro'] = "";
@@ -888,7 +930,7 @@ $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?";
-$text['confirm-block']['pl-pl'] = "Do you really want to block this?";
+$text['confirm-block']['pl-pl'] = "Czy na pewno chcesz to zablokować?";
 $text['confirm-block']['pt-br'] = "Do you really want to block this?";
 $text['confirm-block']['pt-pt'] = "Do you really want to block this?";
 $text['confirm-block']['ro-ro'] = "Do you really want to block this?";
@@ -911,7 +953,7 @@ $text['button-block']['fr-fr'] = "Bloquer";
 $text['button-block']['he-il'] = "Block";
 $text['button-block']['it-it'] = "Block";
 $text['button-block']['nl-nl'] = "Block";
-$text['button-block']['pl-pl'] = "Block";
+$text['button-block']['pl-pl'] = "Blokuj";
 $text['button-block']['pt-br'] = "Block";
 $text['button-block']['pt-pt'] = "Block";
 $text['button-block']['ro-ro'] = "Block";
diff --git a/app/call_block/call_block.php b/app/call_block/call_block.php
index 567b4dcdcb..c8e3d08caf 100644
--- a/app/call_block/call_block.php
+++ b/app/call_block/call_block.php
@@ -180,13 +180,13 @@
 		echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add'],'id'=>'btn_add','link'=>'call_block_edit.php']);
 	}
 	if (permission_exists('call_block_add') && $result) {
-		echo button::create(['type'=>'button','label'=>$text['button-copy'],'icon'=>$_SESSION['theme']['button_icon_copy'],'name'=>'btn_copy','onclick'=>"modal_open('modal-copy','btn_copy');"]);
+		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('call_block_edit') && $result) {
-		echo button::create(['type'=>'button','label'=>$text['button-toggle'],'icon'=>$_SESSION['theme']['button_icon_toggle'],'name'=>'btn_toggle','onclick'=>"modal_open('modal-toggle','btn_toggle');"]);
+		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('call_block_delete') && $result) {
-		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 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('call_forward_all')) {
@@ -197,9 +197,9 @@
 			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)]);
+	echo 		"<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown=''>";
+	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search']);
+	//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)]);
 	if ($paging_controls_mini != '') {
 		echo 	"<span style='margin-left: 15px;'>".$paging_controls_mini."</span>";
 	}
@@ -229,7 +229,7 @@
 	echo "<tr class='list-header'>\n";
 	if (permission_exists('call_block_add') || permission_exists('call_block_edit') || permission_exists('call_block_delete')) {
 		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 "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle(); checkbox_on_change(this);' ".($result ?: "style='visibility: hidden;'").">\n";
 		echo "	</th>\n";
 	}
 	if ($_GET['show'] == 'all' && permission_exists('domain_all')) {
@@ -259,7 +259,7 @@
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('call_block_add') || permission_exists('call_block_edit') || permission_exists('call_block_delete')) {
 				echo "	<td class='checkbox'>\n";
-				echo "		<input type='checkbox' name='call_blocks[".$x."][checked]' id='checkbox_".$x."' value='true' onclick=\"if (!this.checked) { document.getElementById('checkbox_all').checked = false; }\">\n";
+				echo "		<input type='checkbox' name='call_blocks[".$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='call_blocks[".$x."][uuid]' value='".escape($row['call_block_uuid'])."' />\n";
 				echo "	</td>\n";
 			}
diff --git a/app/call_block/call_block_edit.php b/app/call_block/call_block_edit.php
index a92329b415..1705e30168 100644
--- a/app/call_block/call_block_edit.php
+++ b/app/call_block/call_block_edit.php
@@ -283,6 +283,17 @@ if (permission_exists('call_block_all') || permission_exists('call_block_ivr'))
 	$ivrs = $database->select($sql, $parameters);
 }
 
+//get the ring groups
+if (permission_exists('call_block_all') || permission_exists('call_block_ring_group')) {
+	$sql = "select ring_group_uuid,ring_group_name, ring_group_extension, ring_group_description from v_ring_groups ";
+	$sql .= "where domain_uuid = :domain_uuid ";
+	// $sql .= "and ring_group_enabled = 'true' ";
+	$sql .= "order by ring_group_extension asc ";
+	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+	$database = new database;
+	$ring_groups = $database->select($sql, $parameters);
+}
+
 //get the voicemails
 	$sql = "select voicemail_uuid, voicemail_id, voicemail_description ";
 	$sql .= "from v_voicemails ";
@@ -405,7 +416,7 @@ if (permission_exists('call_block_all') || permission_exists('call_block_ivr'))
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	function call_block_action_select($label = false) {
-		global $select_margin, $text, $call_block_app, $call_block_data, $extensions, $ivrs, $voicemails;
+		global $select_margin, $text, $call_block_app, $call_block_data, $extensions, $ivrs, $voicemails, $ring_groups;
 		echo "<select class='formfld' style='".$select_margin."' name='call_block_action'>\n";
 		if ($label) {
 			echo "	<option value='' disabled='disabled'>".$text['label-action']."</option>\n";
@@ -448,6 +459,16 @@ if (permission_exists('call_block_all') || permission_exists('call_block_ivr'))
 				echo "	</optgroup>\n";
 			}
 		}
+		if (permission_exists('call_block_ring_group')) {
+			if (is_array($ring_groups) && sizeof($ring_groups) != 0) {
+				echo "	<optgroup label='".$text['label-ring_groups']."'>\n";
+				foreach ($ring_groups as &$row) {
+					$selected = ($call_block_app == 'ring_group' && $call_block_data == $row['ring_group_extension']) ? "selected='selected'" : null;
+					echo "		<option value='ring_group:".urlencode($row["ring_group_extension"])."' ".$selected.">".escape($row['ring_group_name'])." ".escape($row['ring_group_extension'])."</option>\n";
+				}
+				echo "	</optgroup>\n";
+			}
+		}
 		if (permission_exists('call_block_voicemail')) {
 			if (is_array($voicemails) && sizeof($voicemails) != 0) {
 				echo "	<optgroup label='".$text['label-voicemail']."'>\n";
diff --git a/app/call_block/resources/classes/call_block.php b/app/call_block/resources/classes/call_block.php
index 947f123f65..4f163420ef 100644
--- a/app/call_block/resources/classes/call_block.php
+++ b/app/call_block/resources/classes/call_block.php
@@ -328,8 +328,14 @@ if (!class_exists('call_block')) {
 												$array['call_block'][$x]['extension_uuid'] = $this->extension_uuid;
 											}
 											if ($this->call_block_direction == 'inbound') {
+												//remove e.164 and country code
+												$call_block_number = str_replace("+".trim($_SESSION['domain']['country_code']['numeric']), "", trim($row["caller_id_number"]));
+
+												//build the array
+												$array['call_block'][$x]['call_block_country_code'] = trim($_SESSION['domain']['country_code']['numeric']);
 												$array['call_block'][$x]['call_block_name'] = trim($row["caller_id_name"]);
-												$array['call_block'][$x]['call_block_number'] = trim($row["caller_id_number"]);
+												$array['call_block'][$x]['call_block_number'] = $call_block_number;
+												$array['call_block'][$x]['call_block_description'] = trim($row["caller_id_name"]);
 											}
 											if ($this->call_block_direction == 'outbound') {
 												$array['call_block'][$x]['call_block_number'] = trim($row["caller_destination"]);
@@ -350,8 +356,13 @@ if (!class_exists('call_block')) {
 														$array['call_block'][$x]['call_block_direction'] = $this->call_block_direction;
 														$array['call_block'][$x]['extension_uuid'] = $field['extension_uuid'];
 														if ($this->call_block_direction == 'inbound') {
+															//remove e.164 and country code
+															$call_block_number = str_replace("+".trim($_SESSION['domain']['country_code']['numeric']), "", trim($row["caller_id_number"]));
+
+															//build the array
 															$array['call_block'][$x]['call_block_name'] = trim($row["caller_id_name"]);
-															$array['call_block'][$x]['call_block_number'] = trim($row["caller_id_number"]);
+															$array['call_block'][$x]['call_block_number'] = $call_block_number;
+															$array['call_block'][$x]['call_block_description'] = trim($row["caller_id_name"]);
 														}
 														if ($this->call_block_direction == 'outbound') {
 															$array['call_block'][$x]['call_block_number'] = trim($row["caller_destination"]);
@@ -417,4 +428,4 @@ if (!class_exists('call_block')) {
 	} //class
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/app/call_broadcast/app_config.php b/app/call_broadcast/app_config.php
index 2be87c9ca5..a65d8ce9b8 100644
--- a/app/call_broadcast/app_config.php
+++ b/app/call_broadcast/app_config.php
@@ -80,6 +80,9 @@
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "call_broadcast_all";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "call_broadcast_send";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
diff --git a/app/call_broadcast/app_languages.php b/app/call_broadcast/app_languages.php
index 878ddcd7e4..92b7d2e43d 100644
--- a/app/call_broadcast/app_languages.php
+++ b/app/call_broadcast/app_languages.php
@@ -56,7 +56,7 @@ $text['title_description-call_broadcast']['fr-fr'] = "";
 $text['title_description-call_broadcast']['he-il'] = "";
 $text['title_description-call_broadcast']['it-it'] = "";
 $text['title_description-call_broadcast']['nl-nl'] = "Beheer de aflevering van voor-opgenomen boodschappen naar meerdere ontvangers.";
-$text['title_description-call_broadcast']['pl-pl'] = "";
+$text['title_description-call_broadcast']['pl-pl'] = "Zarządzaj dostarczaniem nagranych wiadomości do odbiorców masowych.";
 $text['title_description-call_broadcast']['pt-br'] = "";
 $text['title_description-call_broadcast']['pt-pt'] = "";
 $text['title_description-call_broadcast']['ro-ro'] = "";
@@ -140,7 +140,7 @@ $text['label-start_time']['fr-fr'] = "Start Time";
 $text['label-start_time']['he-il'] = "Start Time";
 $text['label-start_time']['it-it'] = "Start Time";
 $text['label-start_time']['nl-nl'] = "Start Time";
-$text['label-start_time']['pl-pl'] = "Start Time";
+$text['label-start_time']['pl-pl'] = "Czas rozpoczęcia";
 $text['label-start_time']['pt-br'] = "Start Time";
 $text['label-start_time']['pt-pt'] = "Start Time";
 $text['label-start_time']['ro-ro'] = "Start Time";
@@ -435,7 +435,7 @@ $text['label-sample_file']['fr-fr'] = "Sample CSV File";
 $text['label-sample_file']['he-il'] = "Sample CSV File";
 $text['label-sample_file']['it-it'] = "Sample CSV File";
 $text['label-sample_file']['nl-nl'] = "Voorbeeld CSV File";
-$text['label-sample_file']['pl-pl'] = "Sample CSV File";
+$text['label-sample_file']['pl-pl'] = "Przykładowy plik CSV";
 $text['label-sample_file']['pt-br'] = "Sample CSV File";
 $text['label-sample_file']['pt-pt'] = "Sample CSV File";
 $text['label-sample_file']['ro-ro'] = "Sample CSV File";
@@ -456,7 +456,7 @@ $text['label-list_example']['fr-fr'] = "Number|First,Last\nNumber|First,Last\n..
 $text['label-list_example']['he-il'] = "Number|First,Last\nNumber|First,Last\n...";
 $text['label-list_example']['it-it'] = "Number|First,Last\nNumber|First,Last\n...";
 $text['label-list_example']['nl-nl'] = "Nummer|Eerste,Laatste\nNummer|Eerste,Laatste\n...";
-$text['label-list_example']['pl-pl'] = "Number|First,Last\nNumber|First,Last\n...";
+$text['label-list_example']['pl-pl'] = "Numer|Pierwsze,Ostatnie\nNumer|Pierwsze,Ostatnie\n...";
 $text['label-list_example']['pt-br'] = "Number|First,Last\nNumber|First,Last\n...";
 $text['label-list_example']['pt-pt'] = "Number|First,Last\nNumber|First,Last\n...";
 $text['label-list_example']['ro-ro'] = "Number|First,Last\nNumber|First,Last\n...";
@@ -477,7 +477,7 @@ $text['description-start_time']['fr-fr'] = "";
 $text['description-start_time']['he-il'] = "";
 $text['description-start_time']['it-it'] = "";
 $text['description-start_time']['nl-nl'] = "";
-$text['description-start_time']['pl-pl'] = "";
+$text['description-start_time']['pl-pl'] = "Jest to czas w sekundach, po którym rozpocznie się wysyłanie połączeń";
 $text['description-start_time']['pt-br'] = ""; //copied from pt-pt
 $text['description-start_time']['pt-pt'] = "";
 $text['description-start_time']['ro-ro'] = "";
@@ -498,7 +498,7 @@ $text['description-accountcode']['fr-fr'] = "";
 $text['description-accountcode']['he-il'] = "";
 $text['description-accountcode']['it-it'] = "";
 $text['description-accountcode']['nl-nl'] = "";
-$text['description-accountcode']['pl-pl'] = "";
+$text['description-accountcode']['pl-pl'] = "Kod konta używany najczęściej w systemach bilingowych.";
 $text['description-accountcode']['pt-br'] = ""; //copied from pt-pt
 $text['description-accountcode']['pt-pt'] = "";
 $text['description-accountcode']['ro-ro'] = "";
@@ -729,7 +729,7 @@ $text['confirm-update']['fr-fr'] = "Mise à jour terminée";
 $text['confirm-update']['he-il'] = "עידכון הושלם";
 $text['confirm-update']['it-it'] = "Aggiornamento Completato.";
 $text['confirm-update']['nl-nl'] = "Bijwerken gereed";
-$text['confirm-update']['pl-pl'] = "Aktualizacja zakonczona";
+$text['confirm-update']['pl-pl'] = "Zaktualizowano pomyślnie";
 $text['confirm-update']['pt-br'] = "Atualização Efetuada";
 $text['confirm-update']['pt-pt'] = "Actualização Efectuada";
 $text['confirm-update']['ro-ro'] = "";
@@ -792,7 +792,7 @@ $text['confirm-add']['fr-fr'] = "Ajouté";
 $text['confirm-add']['he-il'] = "הוספה הושלמה";
 $text['confirm-add']['it-it'] = "Inserimento Completato";
 $text['confirm-add']['nl-nl'] = "Toevoegen gereed";
-$text['confirm-add']['pl-pl'] = "Dodano poprawnie";
+$text['confirm-add']['pl-pl'] = "Dodano pomyślnie";
 $text['confirm-add']['pt-br'] = "Criação efetuada";
 $text['confirm-add']['pt-pt'] = "Adição Efectuada";
 $text['confirm-add']['ro-ro'] = "";
diff --git a/app/call_broadcast/call_broadcast.php b/app/call_broadcast/call_broadcast.php
index f03d4983f2..15bba09512 100644
--- a/app/call_broadcast/call_broadcast.php
+++ b/app/call_broadcast/call_broadcast.php
@@ -90,17 +90,23 @@
 
 //get the count
 	$sql = "select count(*) from v_call_broadcasts ";
-	$sql .= "where domain_uuid = :domain_uuid ";
+	$sql .= "where true ";
+	if ($_GET['show'] != "all" || !permission_exists('call_broadcast_all')) {
+		$sql .= "and (domain_uuid = :domain_uuid or domain_uuid is null) ";
+		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+	}
 	if (isset($sql_search)) {
 		$sql .= "and ".$sql_search;
 	}
 	$database = new database;
-	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 	$num_rows = $database->select($sql, $parameters, 'column');
 
 //prepare the paging
 	$rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50;
-	$param = "&search=".$search;
+	$param = "&search=".urlencode($search);
+	if ($_GET['show'] == "all" && permission_exists('call_broadcast_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);
@@ -131,15 +137,23 @@
 		echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add'],'id'=>'btn_add','link'=>'call_broadcast_edit.php']);
 	}
 	if (permission_exists('call_broadcast_add') && $result) {
-		echo button::create(['type'=>'button','label'=>$text['button-copy'],'icon'=>$_SESSION['theme']['button_icon_copy'],'name'=>'btn_copy','onclick'=>"modal_open('modal-copy','btn_copy');"]);
+		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('call_broadcast_delete') && $result) {
-		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 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";
-	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_broadcast.php','style'=>($search == '' ? 'display: none;' : null)]);
+	if (permission_exists('call_broadcast_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=''>";
+	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search']);
+	//echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'call_broadcast.php','style'=>($search == '' ? 'display: none;' : null)]);
 	if ($paging_controls_mini != '') {
 		echo 	"<span style='margin-left: 15px;'>".$paging_controls_mini."</span>";
 	}
@@ -166,9 +180,12 @@
 	echo "<tr class='list-header'>\n";
 	if (permission_exists('call_broadcast_add') || permission_exists('call_broadcast_delete')) {
 		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 "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle(); checkbox_on_change(this);' ".($result ?: "style='visibility: hidden;'").">\n";
 		echo "	</th>\n";
 	}
+	if ($_GET['show'] == "all" && permission_exists('call_broadcast_all')) {
+		echo th_order_by('domain_name', $text['label-domain'], $order_by, $order, $param, "class='shrink'");
+	}
 	echo th_order_by('broadcast_name', $text['label-name'], $order_by, $order);
 	echo th_order_by('broadcast_concurrent_limit', $text['label-concurrent-limit'], $order_by, $order);
 	echo th_order_by('broadcast_description', $text['label-description'], $order_by, $order);
@@ -186,10 +203,19 @@
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('call_broadcast_add') || permission_exists('call_broadcast_delete')) {
 				echo "	<td class='checkbox'>\n";
-				echo "		<input type='checkbox' name='call_broadcasts[$x][checked]' id='checkbox_".$x."' value='true' onclick=\"if (!this.checked) { document.getElementById('checkbox_all').checked = false; }\">\n";
+				echo "		<input type='checkbox' name='call_broadcasts[$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='call_broadcasts[$x][uuid]' value='".escape($row['call_broadcast_uuid'])."' />\n";
 				echo "	</td>\n";
 			}
+			if ($_GET['show'] == "all" && permission_exists('call_broadcast_all')) {
+				if (strlen($_SESSION['domains'][$row['domain_uuid']]['domain_name']) > 0) {
+					$domain = $_SESSION['domains'][$row['domain_uuid']]['domain_name'];
+				}
+				else {
+					$domain = $text['label-global'];
+				}
+				echo "	<td>".escape($domain)."</td>\n";
+			}
 			echo "	<td>";
 			if (permission_exists('call_broadcast_edit')) {
 				echo "<a href='".$list_row_url."'>".escape($row['broadcast_name'])."</a>";
@@ -222,4 +248,4 @@
 //include the footer
 	require_once "resources/footer.php";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/call_centers/app_config.php b/app/call_centers/app_config.php
index c80812e088..f5f9c2969d 100644
--- a/app/call_centers/app_config.php
+++ b/app/call_centers/app_config.php
@@ -66,6 +66,9 @@
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "call_center_all";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "call_center_agent_view";
 		$apps[$x]['permissions'][$y]['menu']['uuid'] = "597c483a-51a9-f95a-8d54-ea7d87ada2b8";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
diff --git a/app/call_centers/app_defaults.php b/app/call_centers/app_defaults.php
index 3dbbeef4f0..786dffde4e 100644
--- a/app/call_centers/app_defaults.php
+++ b/app/call_centers/app_defaults.php
@@ -55,7 +55,7 @@ if ($domains_processed == 1) {
 				$database = new database;
 				$database->app_name = 'call_centers';
 				$database->app_uuid = '95788e50-9500-079e-2807-fd530b0ea370';
-				$database->save($array);
+				$database->save($array, false);
 				$response = $database->message;
 				unset($array);
 
@@ -153,7 +153,7 @@ if ($domains_processed == 1) {
 			}
 		}
 		unset ($prep_statement);
-	
+
 	//save the array to the database
 		if (is_array($array)) {
 			//add the dialplan permission
@@ -165,7 +165,7 @@ if ($domains_processed == 1) {
 				$database = new database;
 				$database->app_name = 'call_centers';
 				$database->app_uuid = '95788e50-9500-079e-2807-fd530b0ea370';
-				$database->save($array);
+				$database->save($array, false);
 				$message = $database->message;
 
 			//remove the temporary permission
diff --git a/app/call_centers/call_center_agents.php b/app/call_centers/call_center_agents.php
index 69d9d7ad38..bae686ba4f 100644
--- a/app/call_centers/call_center_agents.php
+++ b/app/call_centers/call_center_agents.php
@@ -81,17 +81,23 @@
 
 //get total call center agent count from the database
 	$sql = "select count(*) from v_call_center_agents ";
-	$sql .= "where domain_uuid = :domain_uuid ";
+	$sql .= "where true ";
+	if ($_GET['show'] != "all" || !permission_exists('call_center_all')) {
+		$sql .= "and (domain_uuid = :domain_uuid or domain_uuid is null) ";
+		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+	}
 	if (isset($sql_search)) {
 		$sql .= "and ".$sql_search;
 	}
-	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 	$database = new database;
 	$num_rows = $database->select($sql, $parameters, 'column');
 
 //prepare to page the results
 	$rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50;
-	$param = "&search=".$search;
+	$param = "&search=".urlencode($search);
+	if ($_GET['show'] == "all" && permission_exists('call_center_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);
@@ -129,9 +135,17 @@
 		echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add'],'id'=>'btn_add','link'=>'call_center_agent_edit.php']);
 	}
 	if (permission_exists('call_center_agent_delete') && $result) {
-		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 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'>";
+	if (permission_exists('call_center_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=&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_center_agents.php','style'=>($search == '' ? 'display: none;' : null)]);
@@ -158,9 +172,12 @@
 	echo "<tr class='list-header'>\n";
 	if (permission_exists('call_center_agent_delete')) {
 		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 "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle(); checkbox_on_change(this);' ".($result ?: "style='visibility: hidden;'").">\n";
 		echo "	</th>\n";
 	}
+	if ($_GET['show'] == "all" && permission_exists('call_center_all')) {
+		echo th_order_by('domain_name', $text['label-domain'], $order_by, $order, $param, "class='shrink'");
+	}
 	//echo th_order_by('domain_uuid', 'domain_uuid', $order_by, $order);
 	echo th_order_by('agent_name', $text['label-agent_name'], $order_by, $order);
 	echo th_order_by('agent_id', $text['label-agent_id'], $order_by, $order);
@@ -186,10 +203,19 @@
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('call_center_agent_delete')) {
 				echo "	<td class='checkbox'>\n";
-				echo "		<input type='checkbox' name='call_center_agents[$x][checked]' id='checkbox_".$x."' value='true' onclick=\"if (!this.checked) { document.getElementById('checkbox_all').checked = false; }\">\n";
+				echo "		<input type='checkbox' name='call_center_agents[$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='call_center_agents[$x][uuid]' value='".escape($row['call_center_agent_uuid'])."' />\n";
 				echo "	</td>\n";
 			}
+			if ($_GET['show'] == "all" && permission_exists('call_center_all')) {
+				if (strlen($_SESSION['domains'][$row['domain_uuid']]['domain_name']) > 0) {
+					$domain = $_SESSION['domains'][$row['domain_uuid']]['domain_name'];
+				}
+				else {
+					$domain = $text['label-global'];
+				}
+				echo "	<td>".escape($domain)."</td>\n";
+			}
 			echo "	<td>";
 			if (permission_exists('call_center_agent_edit')) {
 				echo "<a href='call_center_agent_edit.php?id=".escape($row['call_center_agent_uuid'])."'>".escape($row['agent_name'])."</a>";
diff --git a/app/call_centers/call_center_queues.php b/app/call_centers/call_center_queues.php
index f56991567e..84252b359b 100644
--- a/app/call_centers/call_center_queues.php
+++ b/app/call_centers/call_center_queues.php
@@ -87,17 +87,23 @@
 
 //get total call center queues count from the database
 	$sql = "select count(*) from v_call_center_queues ";
-	$sql .= "where domain_uuid = :domain_uuid ";
+	$sql .= "where true ";
+	if ($_GET['show'] != "all" || !permission_exists('call_center_all')) {
+		$sql .= "and (domain_uuid = :domain_uuid or domain_uuid is null) ";
+		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+	}
 	if (isset($sql_search)) {
 		$sql .= "and ".$sql_search;
 	}
-	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 	$database = new database;
 	$num_rows = $database->select($sql, $parameters, 'column');
 
 //prepare to page the results
 	$rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50;
-	$param = "&search=".$search;
+	$param = "&search=".urlencode($search);
+	if ($_GET['show'] == "all" && permission_exists('call_center_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);
@@ -139,17 +145,25 @@
 		unset($margin_left);
 	}
 	if (permission_exists('call_center_queue_add') && $result && (!is_numeric($_SESSION['limit']['call_center_queues']['numeric']) || $num_rows <= $_SESSION['limit']['call_center_queues']['numeric'])) {
-		echo button::create(['type'=>'button','label'=>$text['button-copy'],'icon'=>$_SESSION['theme']['button_icon_copy'],'name'=>'btn_copy','style'=>$margin_left,'onclick'=>"modal_open('modal-copy','btn_copy');"]);
+		echo button::create(['type'=>'button','label'=>$text['button-copy'],'icon'=>$_SESSION['theme']['button_icon_copy'],'id'=>'btn_copy','name'=>'btn_copy','style'=>'display: none; '.$margin_left,'onclick'=>"modal_open('modal-copy','btn_copy');"]);
 		unset($margin_left);
 	}
 	if (permission_exists('call_center_queue_delete') && $result) {
-		echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'name'=>'btn_delete','style'=>$margin_left,'onclick'=>"modal_open('modal-delete','btn_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_left,'onclick'=>"modal_open('modal-delete','btn_delete');"]);
 		unset($margin_left);
 	}
 	echo 		"<form id='form_search' class='inline' method='get'>\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 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_center_queues.php','style'=>($search == '' ? 'display: none;' : null)]);
+	if (permission_exists('call_center_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=&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=''>";
+	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search']);
+	//echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'call_center_queues.php','style'=>($search == '' ? 'display: none;' : null)]);
 	if ($paging_controls_mini != '') {
 		echo 	"<span style='margin-left: 15px;'>".$paging_controls_mini."</span>";
 	}
@@ -176,9 +190,12 @@
 	echo "<tr class='list-header'>\n";
 	if (permission_exists('call_center_queue_add') || permission_exists('call_center_queue_delete')) {
 		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 "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle(); checkbox_on_change(this);' ".($result ?: "style='visibility: hidden;'").">\n";
 		echo "	</th>\n";
 	}
+	if ($_GET['show'] == "all" && permission_exists('call_center_all')) {
+		echo th_order_by('domain_name', $text['label-domain'], $order_by, $order, $param, "class='shrink'");
+	}
 	echo th_order_by('queue_name', $text['label-queue_name'], $order_by, $order);
 	echo th_order_by('queue_extension', $text['label-extension'], $order_by, $order);
 	echo th_order_by('queue_strategy', $text['label-strategy'], $order_by, $order);
@@ -209,10 +226,19 @@
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('call_center_queue_add') || permission_exists('call_center_queue_delete')) {
 				echo "	<td class='checkbox'>\n";
-				echo "		<input type='checkbox' name='call_center_queues[$x][checked]' id='checkbox_".$x."' value='true' onclick=\"if (!this.checked) { document.getElementById('checkbox_all').checked = false; }\">\n";
+				echo "		<input type='checkbox' name='call_center_queues[$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='call_center_queues[$x][uuid]' value='".escape($row['call_center_queue_uuid'])."' />\n";
 				echo "	</td>\n";
 			}
+			if ($_GET['show'] == "all" && permission_exists('call_center_all')) {
+				if (strlen($_SESSION['domains'][$row['domain_uuid']]['domain_name']) > 0) {
+					$domain = $_SESSION['domains'][$row['domain_uuid']]['domain_name'];
+				}
+				else {
+					$domain = $text['label-global'];
+				}
+				echo "	<td>".escape($domain)."</td>\n";
+			}
 			echo "	<td>";
 			if (permission_exists('call_center_queue_edit')) {
 				echo "	<a href='".$list_row_url."' title=\"".$text['button-edit']."\">".escape($row['queue_name'])."</a>";
diff --git a/app/call_flows/app_config.php b/app/call_flows/app_config.php
index f260fd46da..e344a2370c 100644
--- a/app/call_flows/app_config.php
+++ b/app/call_flows/app_config.php
@@ -34,13 +34,29 @@
 		$apps[$x]['destinations'][$y]['type'] = "sql";
 		$apps[$x]['destinations'][$y]['label'] = "call_flows";
 		$apps[$x]['destinations'][$y]['name'] = "call_flows";
+		$apps[$x]['destinations'][$y]['sql'] = "select call_flow_name as name, call_flow_uuid as uuid, call_flow_extension as destination, call_flow_context as context from v_call_flows ";
 		$apps[$x]['destinations'][$y]['where'] = "where domain_uuid = '\${domain_uuid}' and call_flow_enabled = 'true' ";
 		$apps[$x]['destinations'][$y]['order_by'] = "call_flow_name asc";
 		$apps[$x]['destinations'][$y]['field']['call_flow_uuid'] = "call_flow_uuid";
 		$apps[$x]['destinations'][$y]['field']['name'] = "call_flow_name";
-		$apps[$x]['destinations'][$y]['field']['destination'] = "call_flow_extension";
-		$apps[$x]['destinations'][$y]['field']['extension'] = "call_flow_extension";
-		$apps[$x]['destinations'][$y]['field']['context'] = "call_flow_context";
+		$apps[$x]['destinations'][$y]['field']['destination'] = "destination";
+		$apps[$x]['destinations'][$y]['field']['extension'] = "destination";
+		$apps[$x]['destinations'][$y]['field']['context'] = "context";
+		$apps[$x]['destinations'][$y]['select_value']['dialplan'] = "transfer:\${destination} XML \${context}";
+		$apps[$x]['destinations'][$y]['select_value']['ivr'] = "menu-exec-app:transfer \${destination} XML \${context}";
+		$apps[$x]['destinations'][$y]['select_label'] = "\${destination} \${name}";
+		$y++;
+		$apps[$x]['destinations'][$y]['type'] = "sql";
+		$apps[$x]['destinations'][$y]['label'] = "call_flows";
+		$apps[$x]['destinations'][$y]['name'] = "call_flows";
+		$apps[$x]['destinations'][$y]['sql'] = "select call_flow_name as name, call_flow_uuid as uuid, call_flow_extension as extension, call_flow_feature_code as destination, call_flow_context as context from v_call_flows ";
+		$apps[$x]['destinations'][$y]['where'] = "where domain_uuid = '\${domain_uuid}' and call_flow_enabled = 'true' ";
+		$apps[$x]['destinations'][$y]['order_by'] = "call_flow_extension asc";
+		$apps[$x]['destinations'][$y]['field']['uuid'] = "uuid";
+		$apps[$x]['destinations'][$y]['field']['name'] = "name";
+		$apps[$x]['destinations'][$y]['field']['destination'] = "destination";
+		$apps[$x]['destinations'][$y]['field']['extension'] = "extension";
+		$apps[$x]['destinations'][$y]['field']['context'] = "context";
 		$apps[$x]['destinations'][$y]['select_value']['dialplan'] = "transfer:\${destination} XML \${context}";
 		$apps[$x]['destinations'][$y]['select_value']['ivr'] = "menu-exec-app:transfer \${destination} XML \${context}";
 		$apps[$x]['destinations'][$y]['select_label'] = "\${destination} \${name}";
@@ -64,6 +80,9 @@
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "call_flow_all";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "call_flow_context";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
diff --git a/app/call_flows/app_languages.php b/app/call_flows/app_languages.php
index 6e30aafa30..37520c5a1b 100644
--- a/app/call_flows/app_languages.php
+++ b/app/call_flows/app_languages.php
@@ -43,6 +43,48 @@ $text['title-call_flow']['ru-ru'] = "Переключатель вызовов";
 $text['title-call_flow']['sv-se'] = "Samtalsflöde";
 $text['title-call_flow']['uk-ua'] = "Потік дзвінків";
 
+$text['title-call_flow_extension']['en-us'] = "Call Flows - Extension";
+$text['title-call_flow_extension']['en-gb'] = "Call Flows - Extension";
+$text['title-call_flow_extension']['ar-eg'] = "";
+$text['title-call_flow_extension']['de-at'] = "Anruf Steuerung - Ziel"; //copied from de-de
+$text['title-call_flow_extension']['de-ch'] = "Anruf Steuerung - Ziel"; //copied from de-de
+$text['title-call_flow_extension']['de-de'] = "Anruf Steuerung - Ziel";
+$text['title-call_flow_extension']['es-cl'] = "Flujo de Llamada - Destino";
+$text['title-call_flow_extension']['es-mx'] = "Flujo de Llamada - Destino"; //copied from es-cl
+$text['title-call_flow_extension']['fr-ca'] = "Flux d'appel - Destination"; //copied from fr-fr
+$text['title-call_flow_extension']['fr-fr'] = "Flux d'appel - Destination";
+$text['title-call_flow_extension']['he-il'] = "";
+$text['title-call_flow_extension']['it-it'] = "Deviatori di Chiamata - Destinazione";
+$text['title-call_flow_extension']['nl-nl'] = "Oproep besturing - Bestemming";
+$text['title-call_flow_extension']['pl-pl'] = "Przepływ rozmów - Destynacja";
+$text['title-call_flow_extension']['pt-br'] = "Fluxo de chamadas - Destino";
+$text['title-call_flow_extension']['pt-pt'] = "Fluxo de Chamadas - Desvio";
+$text['title-call_flow_extension']['ro-ro'] = "";
+$text['title-call_flow_extension']['ru-ru'] = "Переключатели вызовов - Направление";
+$text['title-call_flow_extension']['sv-se'] = "Samtalsflöden - Destination";
+$text['title-call_flow_extension']['uk-ua'] = "Потоки дзвінків - Номер";
+
+$text['title-call_flow_feature']['en-us'] = "Call Flows - Feature";
+$text['title-call_flow_feature']['en-gb'] = "Call Flows - Feature";
+$text['title-call_flow_feature']['ar-eg'] = "";
+$text['title-call_flow_feature']['de-at'] = "Anruf Steuerung - Funktions"; //copied from de-de
+$text['title-call_flow_feature']['de-ch'] = "Anruf Steuerung - Funktions"; //copied from de-de
+$text['title-call_flow_feature']['de-de'] = "Anruf Steuerung - Funktions";
+$text['title-call_flow_feature']['es-cl'] = "Flujo de Llamada - distintivo";
+$text['title-call_flow_feature']['es-mx'] = "Flujo de Llamada - distintivo"; //copied from es-cl
+$text['title-call_flow_feature']['fr-ca'] = "Flux d'appel - Fonction"; //copied from fr-fr
+$text['title-call_flow_feature']['fr-fr'] = "Flux d'appel - Fonction";
+$text['title-call_flow_feature']['he-il'] = "";
+$text['title-call_flow_feature']['it-it'] = "Deviatori di Chiamata ";
+$text['title-call_flow_feature']['nl-nl'] = "Oproep besturing - Functie";
+$text['title-call_flow_feature']['pl-pl'] = "Przepływ rozmów ";
+$text['title-call_flow_feature']['pt-br'] = "Fluxo de chamadas - Função";
+$text['title-call_flow_feature']['pt-pt'] = "Fluxo de Chamadas - Função";
+$text['title-call_flow_feature']['ro-ro'] = "";
+$text['title-call_flow_feature']['ru-ru'] = "Переключатели вызовов - Код функции";
+$text['title-call_flow_feature']['sv-se'] = "Samtalsflöden - Funktionskod";
+$text['title-call_flow_feature']['uk-ua'] = "Потоки дзвінків";
+
 $text['label-call_flow_name']['en-us'] = "Name";
 $text['label-call_flow_name']['en-gb'] = "Name";
 $text['label-call_flow_name']['ar-eg'] = "";
@@ -119,7 +161,7 @@ $text['label-call_flow_feature_code']['fr-fr'] = "Code Fonction";
 $text['label-call_flow_feature_code']['he-il'] = "";
 $text['label-call_flow_feature_code']['it-it'] = "";
 $text['label-call_flow_feature_code']['nl-nl'] = "Functie-code";
-$text['label-call_flow_feature_code']['pl-pl'] = "";
+$text['label-call_flow_feature_code']['pl-pl'] = "Kod Funkcji";
 $text['label-call_flow_feature_code']['pt-br'] = "Código de função";
 $text['label-call_flow_feature_code']['pt-pt'] = "Código de Função";
 $text['label-call_flow_feature_code']['ro-ro'] = "";
diff --git a/app/call_flows/call_flows.php b/app/call_flows/call_flows.php
index c04299a2c1..0a899828c9 100644
--- a/app/call_flows/call_flows.php
+++ b/app/call_flows/call_flows.php
@@ -101,15 +101,21 @@
 
 //prepare to page the results
 	$sql = "select count(*) from v_call_flows ";
-	$sql .= "where domain_uuid = :domain_uuid ";
+	$sql .= "where true ";
+	if ($_GET['show'] != "all" || !permission_exists('call_flow_all')) {
+		$sql .= "and (domain_uuid = :domain_uuid or domain_uuid is null) ";
+		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+	}
 	$sql .= $sql_search;
-	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 	$database = new database;
 	$num_rows = $database->select($sql, $parameters, 'column');
 
 //prepare to page the results
 	$rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50;
-	$param = "&search=".$search;
+	$param = "&search=".urlencode($search);
+	if ($_GET['show'] == "all" && permission_exists('call_flow_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);
@@ -150,10 +156,10 @@
 		echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add'],'id'=>'btn_add','link'=>'call_flow_edit.php']);
 	}
 	if (permission_exists('call_flow_add') && $call_flows) {
-		echo button::create(['type'=>'button','label'=>$text['button-copy'],'icon'=>$_SESSION['theme']['button_icon_copy'],'name'=>'btn_copy','onclick'=>"modal_open('modal-copy','btn_copy');"]);
+		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('call_flow_edit') && $call_flows) {
-		echo button::create(['type'=>'button','label'=>$text['button-toggle'],'icon'=>$_SESSION['theme']['button_icon_toggle'],'name'=>'btn_toggle','onclick'=>"toggle_select(); this.blur();"]);
+		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'=>"toggle_select(); this.blur();"]);
 		echo 		"<select class='formfld' style='display: none; width: auto;' id='call_flow_feature' onchange=\"if (this.selectedIndex != 0) { modal_open('modal-toggle','btn_toggle'); }\">";
 		echo "			<option value='' selected='selected'>".$text['label-select']."</option>";
 		echo "			<option value='call_flow_status'>".$text['label-call_flow_status']."</option>";
@@ -161,12 +167,20 @@
 		echo "		</select>";
 	}
 	if (permission_exists('call_flow_delete') && $call_flows) {
-		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 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";
-	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_flows.php','style'=>($search == '' ? 'display: none;' : null)]);
+	if (permission_exists('call_flow_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=&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=''>";
+	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search']);
+	//echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'call_flows.php','style'=>($search == '' ? 'display: none;' : null)]);
 	if ($paging_controls_mini != '') {
 		echo 	"<span style='margin-left: 15px;'>".$paging_controls_mini."</span>";
 	}
@@ -197,9 +211,12 @@
 	echo "<tr class='list-header'>\n";
 	if (permission_exists('call_flow_add') || permission_exists('call_flow_edit') || permission_exists('call_flow_delete')) {
 		echo "	<th class='checkbox'>\n";
-		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle();' ".($call_flows ?: "style='visibility: hidden;'").">\n";
+		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle(); checkbox_on_change(this);' ".($call_flows ?: "style='visibility: hidden;'").">\n";
 		echo "	</th>\n";
 	}
+	if ($_GET['show'] == "all" && permission_exists('call_flow_all')) {
+		echo th_order_by('domain_name', $text['label-domain'], $order_by, $order, $param, "class='shrink'");
+	}
 	echo th_order_by('call_flow_name', $text['label-call_flow_name'], $order_by, $order);
 	echo th_order_by('call_flow_extension', $text['label-call_flow_extension'], $order_by, $order);
 	echo th_order_by('call_flow_feature_code', $text['label-call_flow_feature_code'], $order_by, $order);
@@ -223,10 +240,19 @@
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('call_flow_add') || permission_exists('call_flow_edit') || permission_exists('call_flow_delete')) {
 				echo "	<td class='checkbox'>\n";
-				echo "		<input type='checkbox' name='call_flows[$x][checked]' id='checkbox_".$x."' value='true' onclick=\"if (!this.checked) { document.getElementById('checkbox_all').checked = false; }\">\n";
+				echo "		<input type='checkbox' name='call_flows[$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='call_flows[$x][uuid]' value='".escape($row['call_flow_uuid'])."' />\n";
 				echo "	</td>\n";
 			}
+			if ($_GET['show'] == "all" && permission_exists('call_flow_all')) {
+				if (strlen($_SESSION['domains'][$row['domain_uuid']]['domain_name']) > 0) {
+					$domain = $_SESSION['domains'][$row['domain_uuid']]['domain_name'];
+				}
+				else {
+					$domain = $text['label-global'];
+				}
+				echo "	<td>".escape($domain)."</td>\n";
+			}
 			echo "	<td><a href='".$list_row_url."'>".escape($row['call_flow_name'])."</a>&nbsp;</td>\n";
 			echo "	<td>".escape($row['call_flow_extension'])."&nbsp;</td>\n";
 			echo "	<td>".escape($row['call_flow_feature_code'])."&nbsp;</td>\n";
diff --git a/app/call_forward/app_languages.php b/app/call_forward/app_languages.php
index 37836ac971..aa3bb8a521 100644
--- a/app/call_forward/app_languages.php
+++ b/app/call_forward/app_languages.php
@@ -791,7 +791,7 @@ $text['description-call_routing']['fr-fr'] = "Définir la manipulation pour les
 $text['description-call_routing']['he-il'] = "";
 $text['description-call_routing']['it-it'] = "Definisce gestione alternativa per le chiamate in ingresso per i seguenti interni.";
 $text['description-call_routing']['nl-nl'] = "Deinieer alternatief inkomend gesprek afhandeling in voor de volgende toestellen.";
-$text['description-call_routing']['pl-pl'] = "Definiowanie alternatywnego połączenia przychodzącego obsługi dla następujących rozszerzeń.";
+$text['description-call_routing']['pl-pl'] = "Definiowanie alternatywnego połączenia przychodzącego obsługi dla następujących numerów wewnętrznych.";
 $text['description-call_routing']['pt-br'] = "Defina o tratamento de entradas alternativas para os seguintes ramais. ";
 $text['description-call_routing']['pt-pt'] = "Definir alternativo chamada de entrada assistência para as seguintes extensões.";
 $text['description-call_routing']['ro-ro'] = "";
@@ -854,7 +854,7 @@ $text['confirm-update']['fr-fr'] = "Mis à jour";
 $text['confirm-update']['he-il'] = "";
 $text['confirm-update']['it-it'] = "Aggiornamento Completato";
 $text['confirm-update']['nl-nl'] = "Bijwerken gereed";
-$text['confirm-update']['pl-pl'] = "Aktualizacja zakonczona";
+$text['confirm-update']['pl-pl'] = "Zaktualizowano pomyślnie";
 $text['confirm-update']['pt-br'] = "Atualização Efetuada";
 $text['confirm-update']['pt-pt'] = "Actualização Efectuada";
 $text['confirm-update']['ro-ro'] = "";
diff --git a/app/call_forward/call_forward.php b/app/call_forward/call_forward.php
index ffb4c1da49..7c935d94c1 100644
--- a/app/call_forward/call_forward.php
+++ b/app/call_forward/call_forward.php
@@ -229,9 +229,9 @@
 		if ($_GET['show'] == 'all' && permission_exists('call_forward_all')) {
 			echo "		<input type='hidden' name='show' value='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'=>'call_forward.php','style'=>($search == '' ? 'display: none;' : null)]);
+		echo 		"<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown=''>";
+		echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search']);
+		//echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'call_forward.php','style'=>($search == '' ? 'display: none;' : null)]);
 		if ($paging_controls_mini != '') {
 			echo 	"<span style='margin-left: 15px;'>".$paging_controls_mini."</span>";
 		}
diff --git a/app/call_forward/call_forward_edit.php b/app/call_forward/call_forward_edit.php
index 537fcd131a..8b2ee8a6da 100644
--- a/app/call_forward/call_forward_edit.php
+++ b/app/call_forward/call_forward_edit.php
@@ -147,7 +147,7 @@
 			$token = new token;
 			if (!$token->validate($_SERVER['PHP_SELF'])) {
 				message::add($text['message-invalid_token'],'negative');
-				header('Location: calls.php');
+				header('Location: call_forward.php');
 				exit;
 			}
 
diff --git a/app/call_recordings/app_config.php b/app/call_recordings/app_config.php
index a5ecfcf706..553c273ae6 100644
--- a/app/call_recordings/app_config.php
+++ b/app/call_recordings/app_config.php
@@ -26,6 +26,9 @@
 		$apps[$x]['permissions'][$y]['name'] = 'call_recording_delete';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
 		$y++;
+		$apps[$x]['permissions'][$y]['name'] = 'call_recording_all';
+		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'call_recording_play';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
 		$y++;
diff --git a/app/call_recordings/app_languages.php b/app/call_recordings/app_languages.php
index 4dd78ba62a..46794f08e9 100644
--- a/app/call_recordings/app_languages.php
+++ b/app/call_recordings/app_languages.php
@@ -13,7 +13,7 @@ $text['title-call_recordings']['fr-fr'] = "Enregistrements d'appels";
 $text['title-call_recordings']['he-il'] = "";
 $text['title-call_recordings']['it-it'] = "";
 $text['title-call_recordings']['nl-nl'] = "Gespreksopnamen";
-$text['title-call_recordings']['pl-pl'] = "";
+$text['title-call_recordings']['pl-pl'] = "Nagrania Rozmów";
 $text['title-call_recordings']['pt-br'] = "";
 $text['title-call_recordings']['pt-pt'] = "";
 $text['title-call_recordings']['ro-ro'] = "";
@@ -55,7 +55,7 @@ $text['title_description-call_recordings']['fr-fr'] = "Affiche les enregistremen
 $text['title_description-call_recordings']['he-il'] = "";
 $text['title_description-call_recordings']['it-it'] = "";
 $text['title_description-call_recordings']['nl-nl'] = "Toont de gespreksopnamen met naam, lengte, datum/tijd en oproep richting.";
-$text['title_description-call_recordings']['pl-pl'] = "";
+$text['title_description-call_recordings']['pl-pl'] = "Wyświetla nagrania połączeń wraz z nazwą, długością, datą i godziną oraz kierunkiem połączenia.";
 $text['title_description-call_recordings']['pt-br'] = "";
 $text['title_description-call_recordings']['pt-pt'] = "";
 $text['title_description-call_recordings']['ro-ro'] = "";
@@ -76,7 +76,7 @@ $text['label-call_recording_name']['fr-fr'] = "Nom";
 $text['label-call_recording_name']['he-il'] = "";
 $text['label-call_recording_name']['it-it'] = "";
 $text['label-call_recording_name']['nl-nl'] = "Naam";
-$text['label-call_recording_name']['pl-pl'] = "";
+$text['label-call_recording_name']['pl-pl'] = "Nazwa";
 $text['label-call_recording_name']['pt-br'] = "";
 $text['label-call_recording_name']['pt-pt'] = "";
 $text['label-call_recording_name']['ro-ro'] = "";
@@ -118,7 +118,7 @@ $text['label-call_recording_path']['fr-fr'] = "Chemin";
 $text['label-call_recording_path']['he-il'] = "";
 $text['label-call_recording_path']['it-it'] = "";
 $text['label-call_recording_path']['nl-nl'] = "Pad";
-$text['label-call_recording_path']['pl-pl'] = "";
+$text['label-call_recording_path']['pl-pl'] = "Scieżka";
 $text['label-call_recording_path']['pt-br'] = "";
 $text['label-call_recording_path']['pt-pt'] = "";
 $text['label-call_recording_path']['ro-ro'] = "";
@@ -160,7 +160,7 @@ $text['label-call_recording_length']['fr-fr'] = "Longueur";
 $text['label-call_recording_length']['he-il'] = "";
 $text['label-call_recording_length']['it-it'] = "";
 $text['label-call_recording_length']['nl-nl'] = "Lengte";
-$text['label-call_recording_length']['pl-pl'] = "";
+$text['label-call_recording_length']['pl-pl'] = "Długość";
 $text['label-call_recording_length']['pt-br'] = "";
 $text['label-call_recording_length']['pt-pt'] = "";
 $text['label-call_recording_length']['ro-ro'] = "";
@@ -202,7 +202,7 @@ $text['label-call_recording_date']['fr-fr'] = "Date";
 $text['label-call_recording_date']['he-il'] = "";
 $text['label-call_recording_date']['it-it'] = "";
 $text['label-call_recording_date']['nl-nl'] = "Datum";
-$text['label-call_recording_date']['pl-pl'] = "";
+$text['label-call_recording_date']['pl-pl'] = "Data";
 $text['label-call_recording_date']['pt-br'] = "";
 $text['label-call_recording_date']['pt-pt'] = "";
 $text['label-call_recording_date']['ro-ro'] = "";
@@ -244,7 +244,7 @@ $text['label-call_direction']['fr-fr'] = "Direction";
 $text['label-call_direction']['he-il'] = "";
 $text['label-call_direction']['it-it'] = "";
 $text['label-call_direction']['nl-nl'] = "Richting";
-$text['label-call_direction']['pl-pl'] = "";
+$text['label-call_direction']['pl-pl'] = "Kierunek";
 $text['label-call_direction']['pt-br'] = "";
 $text['label-call_direction']['pt-pt'] = "";
 $text['label-call_direction']['ro-ro'] = "";
@@ -286,7 +286,7 @@ $text['label-call_recording_description']['fr-fr'] = "Description";
 $text['label-call_recording_description']['he-il'] = "";
 $text['label-call_recording_description']['it-it'] = "";
 $text['label-call_recording_description']['nl-nl'] = "Omschrijving";
-$text['label-call_recording_description']['pl-pl'] = "";
+$text['label-call_recording_description']['pl-pl'] = "Opis";
 $text['label-call_recording_description']['pt-br'] = "";
 $text['label-call_recording_description']['pt-pt'] = "";
 $text['label-call_recording_description']['ro-ro'] = "";
@@ -328,7 +328,7 @@ $text['label-call_recording_base64']['fr-fr'] = "Base64";
 $text['label-call_recording_base64']['he-il'] = "";
 $text['label-call_recording_base64']['it-it'] = "";
 $text['label-call_recording_base64']['nl-nl'] = "Base64";
-$text['label-call_recording_base64']['pl-pl'] = "";
+$text['label-call_recording_base64']['pl-pl'] = "Base64";
 $text['label-call_recording_base64']['pt-br'] = "";
 $text['label-call_recording_base64']['pt-pt'] = "";
 $text['label-call_recording_base64']['ro-ro'] = "";
@@ -370,7 +370,7 @@ $text['label-inbound']['fr-fr'] = "Inbound";
 $text['label-inbound']['he-il'] = "Inbound";
 $text['label-inbound']['it-it'] = "Inbound";
 $text['label-inbound']['nl-nl'] = "Inkomend";
-$text['label-inbound']['pl-pl'] = "Inbound";
+$text['label-inbound']['pl-pl'] = "Przychodzący";
 $text['label-inbound']['pt-br'] = "Inbound";
 $text['label-inbound']['pt-pt'] = "Inbound";
 $text['label-inbound']['ro-ro'] = "Inbound";
@@ -391,7 +391,7 @@ $text['label-outbound']['fr-fr'] = "Outbound";
 $text['label-outbound']['he-il'] = "Outbound";
 $text['label-outbound']['it-it'] = "Outbound";
 $text['label-outbound']['nl-nl'] = "Uitgaand";
-$text['label-outbound']['pl-pl'] = "Outbound";
+$text['label-outbound']['pl-pl'] = "Wychodzący";
 $text['label-outbound']['pt-br'] = "Outbound";
 $text['label-outbound']['pt-pt'] = "Outbound";
 $text['label-outbound']['ro-ro'] = "Outbound";
@@ -412,7 +412,7 @@ $text['label-local']['fr-fr'] = "Local";
 $text['label-local']['he-il'] = "Local";
 $text['label-local']['it-it'] = "Local";
 $text['label-local']['nl-nl'] = "Lokaal";
-$text['label-local']['pl-pl'] = "Local";
+$text['label-local']['pl-pl'] = "Lokalny";
 $text['label-local']['pt-br'] = "Local";
 $text['label-local']['pt-pt'] = "Local";
 $text['label-local']['ro-ro'] = "Local";
diff --git a/app/call_recordings/app_menu.php b/app/call_recordings/app_menu.php
index 07c2a58a54..5c8e4d8a97 100644
--- a/app/call_recordings/app_menu.php
+++ b/app/call_recordings/app_menu.php
@@ -6,7 +6,7 @@ $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']['nl-nl'] = 'Gespreksopnamen';
-$apps[$x]['menu'][0]['title']['pl'] = '';
+$apps[$x]['menu'][0]['title']['pl'] = 'Nagrania Rozmów';
 $apps[$x]['menu'][0]['title']['sv-se'] = '';
 $apps[$x]['menu'][0]['title']['uk'] = '';
 $apps[$x]['menu'][0]['title']['de-at'] = '';
diff --git a/app/call_recordings/call_recordings.php b/app/call_recordings/call_recordings.php
index 5e68cb0eb1..27d68499de 100644
--- a/app/call_recordings/call_recordings.php
+++ b/app/call_recordings/call_recordings.php
@@ -82,17 +82,23 @@
 
 //get the count
 	$sql = "select count(call_recording_uuid) from v_call_recordings ";
-	$sql .= "where domain_uuid = :domain_uuid ";
+	$sql .= "where true ";
+	if ($_GET['show'] != "all" || !permission_exists('call_recording_all')) {
+		$sql .= "and (domain_uuid = :domain_uuid or domain_uuid is null) ";
+		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+	}
 	if (isset($sql_search)) {
 		$sql .= $sql_search;
 	}
-	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 	$database = new database;
 	$num_rows = $database->select($sql, $parameters, 'column');
 
 //prepare to page the results
 	$rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50;
-	$param = "&search=".$search;
+	$param = "&search=".urlencode($search);
+	if ($_GET['show'] == "all" && permission_exists('call_recording_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);
@@ -123,12 +129,12 @@
 		echo button::create(['type'=>'button','label'=>$text['button-download'],'icon'=>$_SESSION['theme']['button_icon_download'],'collapse'=>'hide-xs','onclick'=>"list_action_set('download'); list_form_submit('form_list');"]);
 	}
 	if (permission_exists('call_recording_delete') && $call_recordings) {
-		echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'name'=>'btn_delete','style'=>'margin-left: 15px;','collapse'=>'hide-xs','onclick'=>"modal_open('modal-delete','btn_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-left: 15px;','collapse'=>'hide-xs','onclick'=>"modal_open('modal-delete','btn_delete');"]);
 	}
 	echo 		"<form id='form_search' class='inline' method='get'>\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 button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search','style'=>($search != '' ? 'display: none;' : null),'collapse'=>'hide-xs']);
-	echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'call_recordings.php','style'=>($search == '' ? 'display: none;' : null),'collapse'=>'hide-xs']);
+	echo 		"<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown=''>";
+	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search','collapse'=>'hide-xs']);
+	//echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'call_recordings.php','style'=>($search == '' ? 'display: none;' : null),'collapse'=>'hide-xs']);
 	if ($paging_controls_mini != '') {
 		echo 	"<span style='margin-left: 15px;'>".$paging_controls_mini."</span>\n";
 	}
@@ -153,10 +159,13 @@
 	$col_count = 4;
 	if (permission_exists('call_recording_delete')) {
 		echo "	<th class='checkbox'>\n";
-		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle();' ".($call_recordings ?: "style='visibility: hidden;'").">\n";
+		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle(); checkbox_on_change(this);' ".($call_recordings ?: "style='visibility: hidden;'").">\n";
 		echo "	</th>\n";
 		$col_count++;
 	}
+	if ($_GET['show'] == "all" && permission_exists('call_recording_all')) {
+		echo th_order_by('domain_name', $text['label-domain'], $order_by, $order, $param, "class='shrink'");
+	}
 	echo th_order_by('call_recording_name', $text['label-call_recording_name'], $order_by, $order, null, "class='pct-40'");
 	if (permission_exists('call_recording_play') || permission_exists('call_recording_download')) {
 		echo "<th class='shrink center'>".$text['label-recording']."</th>\n";
@@ -184,10 +193,19 @@
 			echo "<tr class='list-row' href=\"".$list_row_url."\">\n";
 			if (permission_exists('call_recording_delete')) {
 				echo "	<td class='checkbox'>\n";
-				echo "		<input type='checkbox' name='call_recordings[$x][checked]' id='checkbox_".$x."' value='true' onclick=\"if (!this.checked) { document.getElementById('checkbox_all').checked = false; }\">\n";
+				echo "		<input type='checkbox' name='call_recordings[$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='call_recordings[$x][uuid]' value='".escape($row['call_recording_uuid'])."' />\n";
 				echo "	</td>\n";
 			}
+			if ($_GET['show'] == "all" && permission_exists('call_recording_all')) {
+				if (strlen($_SESSION['domains'][$row['domain_uuid']]['domain_name']) > 0) {
+					$domain = $_SESSION['domains'][$row['domain_uuid']]['domain_name'];
+				}
+				else {
+					$domain = $text['label-global'];
+				}
+				echo "	<td>".escape($domain)."</td>\n";
+			}
 			echo "	<td class='overflow'>".escape($row['call_recording_name'])."</td>\n";
 			if (permission_exists('call_recording_play') || permission_exists('call_recording_download')) {
 				echo "	<td class='middle button center no-link no-wrap'>";
diff --git a/app/calls_active/app_languages.php b/app/calls_active/app_languages.php
index ea76c13dbf..1d0bc09be5 100644
--- a/app/calls_active/app_languages.php
+++ b/app/calls_active/app_languages.php
@@ -56,7 +56,7 @@ $text['label-time']['fr-fr'] = "Temps";
 $text['label-time']['he-il'] = "אזור זמן";
 $text['label-time']['it-it'] = "Tempo";
 $text['label-time']['nl-nl'] = "Tijd";
-$text['label-time']['pl-pl'] = "Strefa czasowa";
+$text['label-time']['pl-pl'] = "Czas";
 $text['label-time']['pt-br'] = "Fuso Horário";
 $text['label-time']['pt-pt'] = "Tempo";
 $text['label-time']['ro-ro'] = "";
@@ -161,7 +161,7 @@ $text['label-refresh_pause']['fr-fr'] = "Pause Actualiser";
 $text['label-refresh_pause']['he-il'] = "עצור רענון";
 $text['label-refresh_pause']['it-it'] = "Pausa";
 $text['label-refresh_pause']['nl-nl'] = "Stop pagina verversen";
-$text['label-refresh_pause']['pl-pl'] = "Pauzuj odświeżanie";
+$text['label-refresh_pause']['pl-pl'] = "Pauzuj Odświeżanie";
 $text['label-refresh_pause']['pt-br'] = "Pausar atualização";
 $text['label-refresh_pause']['pt-pt'] = "Pausa Atualizar";
 $text['label-refresh_pause']['ro-ro'] = "";
@@ -560,7 +560,7 @@ $text['confirm-socket']['fr-fr'] = "la Connexion au Event Socket a échoué.";
 $text['confirm-socket']['he-il'] = "";
 $text['confirm-socket']['it-it'] = "Connessione alla Event Socket fallita.";
 $text['confirm-socket']['nl-nl'] = "Verbinding met 'Event-Socket' mislukt";
-$text['confirm-socket']['pl-pl'] = "Polaczenie do  Event Socket nie powiodło się";
+$text['confirm-socket']['pl-pl'] = "Połączenie do 'Event Socket' nie powiodło się";
 $text['confirm-socket']['pt-br'] = "A conexão ao evento socket falhou";
 $text['confirm-socket']['pt-pt'] = "A conexão ao Event Socket falhou.";
 $text['confirm-socket']['ro-ro'] = "";
@@ -581,7 +581,7 @@ $text['confirm-hangup']['fr-fr'] = "Voulez-vous vraiment raccrocher cette commun
 $text['confirm-hangup']['he-il'] = "";
 $text['confirm-hangup']['it-it'] = "Vuoi veramente chiudere questa chiamata?";
 $text['confirm-hangup']['nl-nl'] = "Wil je dit gesprek werkelijk verbreken?";
-$text['confirm-hangup']['pl-pl'] = "Czy na pewno chcesz się rozłączyć tę rozmowę?";
+$text['confirm-hangup']['pl-pl'] = "Czy na pewno chcesz rozłączyć tę rozmowę?";
 $text['confirm-hangup']['pt-br'] = "Deseja realmente finalizar essa chamada?";
 $text['confirm-hangup']['pt-pt'] = "Deseja realmente terminar esta chamada?";
 $text['confirm-hangup']['ro-ro'] = "";
@@ -602,7 +602,7 @@ $text['confirm-hangups']['fr-fr'] = "Voulez-vous vraiment raccrocher cette commu
 $text['confirm-hangups']['he-il'] = "";
 $text['confirm-hangups']['it-it'] = "Vuoi veramente chiudere questa chiamata?";
 $text['confirm-hangups']['nl-nl'] = "Wil je deze gesprekken werkelijk verbreken?";
-$text['confirm-hangups']['pl-pl'] = "Czy na pewno chcesz się rozłączyć tę rozmowę?";
+$text['confirm-hangups']['pl-pl'] = "Czy na pewno chcesz rozłączyć te rozmowy?";
 $text['confirm-hangups']['pt-br'] = "Deseja realmente finalizar essa chamada?";
 $text['confirm-hangups']['pt-pt'] = "Deseja realmente terminar esta chamada?";
 $text['confirm-hangups']['ro-ro'] = "";
@@ -749,7 +749,7 @@ $text['message-calls_ended']['fr-fr'] = "";
 $text['message-calls_ended']['he-il'] = "";
 $text['message-calls_ended']['it-it'] = "";
 $text['message-calls_ended']['nl-nl'] = "Beeindigde gesprekken";
-$text['message-calls_ended']['pl-pl'] = "";
+$text['message-calls_ended']['pl-pl'] = "Rozmowy Zakończone";
 $text['message-calls_ended']['pt-br'] = "";
 $text['message-calls_ended']['pt-pt'] = "";
 $text['message-calls_ended']['ro-ro'] = "";
diff --git a/app/conference_centers/app_config.php b/app/conference_centers/app_config.php
index 64b92d72bc..6642c89545 100644
--- a/app/conference_centers/app_config.php
+++ b/app/conference_centers/app_config.php
@@ -5,7 +5,7 @@
 		$apps[$x]['uuid'] = "8d083f5a-f726-42a8-9ffa-8d28f848f10e";
 		$apps[$x]['category'] = "Switch";
 		$apps[$x]['subcategory'] = "";
-		$apps[$x]['version'] = "1.0";
+		$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'] = "Conferences Centers allows one or more audio and video conference rooms.";
@@ -64,6 +64,9 @@
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "conference_center_all";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "conference_room_view";
 		$apps[$x]['permissions'][$y]['menu']['uuid'] = "95f88726-4706-43f0-b52b-9504a0b8046f";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
@@ -153,6 +156,12 @@
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$apps[$x]['permissions'][$y]['groups'][] = "user";
 		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "conference_room_email_address";
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "conference_room_account_code";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
+		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "conference_room_enabled";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
@@ -199,6 +208,14 @@
 		$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'] = "Enable Conference Sessions";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "b1a4e1b7-8201-4637-b2fb-380b67112ea5";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "conference_center";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "account_code_enabled";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "boolean";
+		$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'] = "Request the account ID.";
 
 	//cache details
 		$apps[$x]['cache']['key'] = "dialplan.\${domain_name}";
@@ -355,6 +372,16 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "The user that created the conference session.";
 		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "email_address";
+		$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'] = "Optional email address for the conference.";
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "account_code";
+		$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'] = "Optional account code for the conference.";
+		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "enabled";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Select to enable or disable the session.";
diff --git a/app/conference_centers/app_languages.php b/app/conference_centers/app_languages.php
index 7f10328487..25920b8630 100644
--- a/app/conference_centers/app_languages.php
+++ b/app/conference_centers/app_languages.php
@@ -212,6 +212,48 @@ $text['description-conference_center_pin_length']['ru-ru'] = "Введите м
 $text['description-conference_center_pin_length']['sv-se'] = "Ange minimum PIN längd.";
 $text['description-conference_center_pin_length']['uk-ua'] = "Введіть мінімальну довжину PIN-коду.";
 
+$text['label-email_address']['en-us'] = "Email Address";
+$text['label-email_address']['en-gb'] = "Email Address";
+$text['label-email_address']['ar-eg'] = "البريد الإليكتروني";
+$text['label-email_address']['de-at'] = "Email Address"; //copied from de-de
+$text['label-email_address']['de-ch'] = "Email Address"; //copied from de-de
+$text['label-email_address']['de-de'] = "Email Address";
+$text['label-email_address']['es-cl'] = "Email Address";
+$text['label-email_address']['es-mx'] = "Email Address"; //copied from es-cl
+$text['label-email_address']['fr-ca'] = "Courriel"; //copied from fr-fr
+$text['label-email_address']['fr-fr'] = "Courriel";
+$text['label-email_address']['he-il'] = "אימייל";
+$text['label-email_address']['it-it'] = "Email Address";
+$text['label-email_address']['nl-nl'] = "E-mail Address";
+$text['label-email_address']['pl-pl'] = "Email Address";
+$text['label-email_address']['pt-br'] = "Email Address"; //copied from pt-pt
+$text['label-email_address']['pt-pt'] = "Email Address";
+$text['label-email_address']['ro-ro'] = "Email Address";
+$text['label-email_address']['ru-ru'] = "Электронная Почта";
+$text['label-email_address']['sv-se'] = "E-post";
+$text['label-email_address']['uk-ua'] = "Електронна пошта";
+
+$text['description-email_address']['en-us'] = "Optional conference email address.";
+$text['description-email_address']['en-gb'] = "Optional conference email address.";
+$text['description-email_address']['ar-eg'] = "البريد الإليكتروني";
+$text['description-email_address']['de-at'] = "Optional conference email address."; //copied from de-de
+$text['description-email_address']['de-ch'] = "Optional conference email address."; //copied from de-de
+$text['description-email_address']['de-de'] = "Optional conference email address.";
+$text['description-email_address']['es-cl'] = "Optional conference email address.";
+$text['description-email_address']['es-mx'] = "Optional conference email address."; //copied from es-cl
+$text['description-email_address']['fr-ca'] = "Courriel"; //copied from fr-fr
+$text['description-email_address']['fr-fr'] = "Courriel";
+$text['description-email_address']['he-il'] = "אימייל";
+$text['description-email_address']['it-it'] = "Optional conference email address.";
+$text['description-email_address']['nl-nl'] = "Optional conference E-mail Address";
+$text['description-email_address']['pl-pl'] = "Optional conference email address.";
+$text['description-email_address']['pt-br'] = "Optional conference email address."; //copied from pt-pt
+$text['description-email_address']['pt-pt'] = "Optional conference email address.";
+$text['description-email_address']['ro-ro'] = "Optional conference email address.";
+$text['description-email_address']['ru-ru'] = "Электронная Почта";
+$text['description-email_address']['sv-se'] = "E-post";
+$text['description-email_address']['uk-ua'] = "Електронна пошта";
+
 $text['label-conference_center_greeting']['en-us'] = "Greeting";
 $text['label-conference_center_greeting']['en-gb'] = "Greeting";
 $text['label-conference_center_greeting']['ar-eg'] = "";
@@ -254,6 +296,48 @@ $text['description-conference_center_greeting']['ru-ru'] = "Выберите п
 $text['description-conference_center_greeting']['sv-se'] = "Välj hälsningsmeddelande som skall spelas upp före anslutning till konferensrummet.";
 $text['description-conference_center_greeting']['uk-ua'] = "Виберіть привітання, яке грає до вступу в конференц-зал.";
 
+$text['label-account_code']['en-us'] = "Account Code";
+$text['label-account_code']['en-gb'] = "Account Code";
+$text['label-account_code']['ar-eg'] = "";
+$text['label-account_code']['de-at'] = "Kontoschlüssel"; //copied from de-de
+$text['label-account_code']['de-ch'] = "Kontoschlüssel"; //copied from de-de
+$text['label-account_code']['de-de'] = "Kontoschlüssel";
+$text['label-account_code']['es-cl'] = "Código de Cuenta";
+$text['label-account_code']['es-mx'] = "Código de Cuenta"; //copied from es-cl
+$text['label-account_code']['fr-ca'] = "Centre de frais"; //copied from fr-fr
+$text['label-account_code']['fr-fr'] = "Centre de frais";
+$text['label-account_code']['he-il'] = "קוד חשבון";
+$text['label-account_code']['it-it'] = "Account Code";
+$text['label-account_code']['nl-nl'] = "Account code";
+$text['label-account_code']['pl-pl'] = "Numer konta billingowego";
+$text['label-account_code']['pt-br'] = "Código de conta";
+$text['label-account_code']['pt-pt'] = "Código de Conta";
+$text['label-account_code']['ro-ro'] = "";
+$text['label-account_code']['ru-ru'] = "Код Учетной Записи";
+$text['label-account_code']['sv-se'] = "Kontokod";
+$text['label-account_code']['uk-ua'] = "";
+
+$text['description-account_code']['en-us'] = "Enter the account code here.";
+$text['description-account_code']['en-gb'] = "Enter the account code here.";
+$text['description-account_code']['ar-eg'] = "";
+$text['description-account_code']['de-at'] = "Geben Sie den Account Code hier an."; //copied from de-de
+$text['description-account_code']['de-ch'] = "Geben Sie den Account Code hier an."; //copied from de-de
+$text['description-account_code']['de-de'] = "Geben Sie den Account Code hier an.";
+$text['description-account_code']['es-cl'] = "Ingrese el código de cuenta aquí.";
+$text['description-account_code']['es-mx'] = "Ingrese el código de cuenta aquí."; //copied from es-cl
+$text['description-account_code']['fr-ca'] = "Entrez le code de compte ici.";
+$text['description-account_code']['fr-fr'] = "Entrez le code de compte ici.";
+$text['description-account_code']['he-il'] = "";
+$text['description-account_code']['it-it'] = "Inserire qui l'account code.";
+$text['description-account_code']['nl-nl'] = "Voer de account code hier in.";
+$text['description-account_code']['pl-pl'] = "Wpisz numer billingowy (nagłówek dodany do SIP INVITE).";
+$text['description-account_code']['pt-br'] = "Insira o código de conta aqui.";
+$text['description-account_code']['pt-pt'] = "Introduza o código de conta aqui.";
+$text['description-account_code']['ro-ro'] = "";
+$text['description-account_code']['ru-ru'] = "Введите здесь код счета.";
+$text['description-account_code']['sv-se'] = "Ange 'account code' här.";
+$text['description-account_code']['uk-ua'] = "";
+
 $text['label-conference_center_enabled']['en-us'] = "Enabled";
 $text['label-conference_center_enabled']['en-gb'] = "Enabled";
 $text['label-conference_center_enabled']['ar-eg'] = "";
@@ -1653,7 +1737,7 @@ $text['button-view_active']['fr-fr'] = "Voir Active";
 $text['button-view_active']['he-il'] = "";
 $text['button-view_active']['it-it'] = "Mostra Attive";
 $text['button-view_active']['nl-nl'] = "Toon aktieve ruimten";
-$text['button-view_active']['pl-pl'] = "";
+$text['button-view_active']['pl-pl'] = "Pokaż Aktywne";
 $text['button-view_active']['pt-br'] = "Ver Ativo"; //copied from pt-pt
 $text['button-view_active']['pt-pt'] = "Ver Ativo";
 $text['button-view_active']['ro-ro'] = "";
diff --git a/app/conference_centers/conference_centers.php b/app/conference_centers/conference_centers.php
index b018c7d570..6747fbc31d 100644
--- a/app/conference_centers/conference_centers.php
+++ b/app/conference_centers/conference_centers.php
@@ -97,15 +97,21 @@
 
 //prepare to page the results
 	$sql = "select count(*) from v_conference_centers ";
-	$sql .= "where domain_uuid = :domain_uuid ";
+	$sql .= "where true ";
+	if ($_GET['show'] != "all" || !permission_exists('conference_center_all')) {
+		$sql .= "and (domain_uuid = :domain_uuid or domain_uuid is null) ";
+		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+	}
 	$sql .= $sql_search;
-	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 	$database = new database;
 	$num_rows = $database->select($sql, $parameters, 'column');
 
 //prepare to page the results
 	$rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50;
-	$param = "&search=".$search;
+	$param = "&search=".urlencode($search);
+	if ($_GET['show'] == "all" && permission_exists('conference_center_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);
@@ -140,15 +146,23 @@
 		echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add'],'id'=>'btn_add','link'=>'conference_center_edit.php']);
 	}
 	if (permission_exists('conference_center_edit') && $conference_centers) {
-		echo button::create(['type'=>'button','label'=>$text['button-toggle'],'icon'=>$_SESSION['theme']['button_icon_toggle'],'name'=>'btn_toggle','onclick'=>"modal_open('modal-toggle','btn_toggle');"]);
+		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('conference_center_delete') && $conference_centers) {
-		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 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";
-	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'=>'conference_centers.php','style'=>($search == '' ? 'display: none;' : null)]);
+	if (permission_exists('conference_center_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=&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=''>";
+	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search']);
+	//echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'conference_centers.php','style'=>($search == '' ? 'display: none;' : null)]);
 	if ($paging_controls_mini != '') {
 		echo 	"<span style='margin-left: 15px;'>".$paging_controls_mini."</span>";
 	}
@@ -175,9 +189,12 @@
 	echo "<tr class='list-header'>\n";
 	if (permission_exists('conference_center_edit') || permission_exists('conference_center_delete')) {
 		echo "	<th class='checkbox'>\n";
-		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle();' ".($conference_centers ?: "style='visibility: hidden;'").">\n";
+		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle(); checkbox_on_change(this);' ".($conference_centers ?: "style='visibility: hidden;'").">\n";
 		echo "	</th>\n";
 	}
+	if ($_GET['show'] == "all" && permission_exists('conference_center_all')) {
+		echo th_order_by('domain_name', $text['label-domain'], $order_by, $order, $param, "class='shrink'");
+	}
 	echo th_order_by('conference_center_name', $text['label-conference_center_name'], $order_by, $order);
 	echo th_order_by('conference_center_extension', $text['label-conference_center_extension'], $order_by, $order);
 	echo th_order_by('conference_center_greeting', $text['label-conference_center_greeting'], $order_by, $order);
@@ -198,10 +215,19 @@
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('conference_center_edit') || permission_exists('conference_center_delete')) {
 				echo "	<td class='checkbox'>\n";
-				echo "		<input type='checkbox' name='conference_centers[$x][checked]' id='checkbox_".$x."' value='true' onclick=\"if (!this.checked) { document.getElementById('checkbox_all').checked = false; }\">\n";
+				echo "		<input type='checkbox' name='conference_centers[$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='conference_centers[$x][uuid]' value='".escape($row['conference_center_uuid'])."' />\n";
 				echo "	</td>\n";
 			}
+			if ($_GET['show'] == "all" && permission_exists('conference_center_all')) {
+				if (strlen($_SESSION['domains'][$row['domain_uuid']]['domain_name']) > 0) {
+					$domain = $_SESSION['domains'][$row['domain_uuid']]['domain_name'];
+				}
+				else {
+					$domain = $text['label-global'];
+				}
+				echo "	<td>".escape($domain)."</td>\n";
+			}
 			echo "	<td><a href='".$list_row_url."' title=\"".$text['button-edit']."\">".escape($row['conference_center_name'])."</a>&nbsp;</td>\n";
 			echo "	<td>".escape($row['conference_center_extension'])."&nbsp;</td>\n";
 			echo "	<td>".escape($row['conference_center_greeting'])."&nbsp;</td>\n";
@@ -238,4 +264,4 @@
 //include the footer
 	require_once "resources/footer.php";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/conference_centers/conference_room_edit.php b/app/conference_centers/conference_room_edit.php
index 7b054b13a1..f7913f07c8 100644
--- a/app/conference_centers/conference_room_edit.php
+++ b/app/conference_centers/conference_room_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):
@@ -58,6 +58,7 @@
 		$conference_room_name = $_POST['conference_room_name'];
 		$moderator_pin = $_POST["moderator_pin"];
 		$participant_pin = $_POST["participant_pin"];
+		
 		$profile = $_POST["profile"];
 		$record = $_POST["record"];
 		$user_uuid = $_POST["user_uuid"];
@@ -73,6 +74,8 @@
 		$mute = $_POST["mute"];
 		$created = $_POST["created"];
 		$created_by = $_POST["created_by"];
+		$email_address = $_POST["email_address"];
+		$account_code = $_POST["account_code"];
 		$enabled = $_POST["enabled"];
 		$description = $_POST["description"];
 
@@ -319,6 +322,12 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 					$array['conference_rooms'][0]['mute'] = $mute;
 					$array['conference_rooms'][0]['created'] = 'now()';
 					$array['conference_rooms'][0]['created_by'] = $_SESSION['user_uuid'];
+					if (permission_exists('conference_room_email_address')) {
+						$array['conference_rooms'][0]['email_address'] = $email_address;
+					}
+					if (permission_exists('conference_room_account_code')) {
+						$array['conference_rooms'][0]['account_code'] = $account_code;
+					}
 					$array['conference_rooms'][0]['enabled'] = $enabled;
 					$array['conference_rooms'][0]['description'] = $description;
 
@@ -391,6 +400,12 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 						$array['conference_rooms'][0]['mute'] = $mute;
 					}
 					$array['conference_rooms'][0]['sounds'] = $sounds;
+					if (permission_exists('conference_room_email_address')) {
+						$array['conference_rooms'][0]['email_address'] = $email_address;
+					}
+					if (permission_exists('conference_room_account_code')) {
+						$array['conference_rooms'][0]['account_code'] = $account_code;
+					}
 					if (strlen($enabled) > 0) {
 						$array['conference_rooms'][0]['enabled'] = $enabled;
 					}
@@ -465,6 +480,8 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 				$mute = $row["mute"];
 				$created = $row["created"];
 				$created_by = $row["created_by"];
+				$email_address = $row["email_address"];
+				$account_code = $row["account_code"];
 				$enabled = $row["enabled"];
 				$description = $row["description"];
 			}
@@ -863,6 +880,32 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 		echo "</tr>\n";
 	}
 
+	if (permission_exists('conference_room_email_address')) {
+		echo "<tr>\n";
+		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+		echo "	".$text['label-email_address']."\n";
+		echo "</td>\n";
+		echo "<td class='vtable' align='left'>\n";
+		echo "	<input class='formfld' type='text' name='email_address' maxlength='255' value=\"".escape($email_address)."\">\n";
+		echo "<br />\n";
+		echo "".$text['description-email_address']."\n";
+		echo "</td>\n";
+		echo "</tr>\n";
+	}
+
+	if (permission_exists('conference_room_account_code')) {
+		echo "<tr>\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='account_code' maxlength='255' value=\"".escape($account_code)."\">\n";
+		echo "<br />\n";
+		echo "".$text['description-account_code']."\n";
+		echo "</td>\n";
+		echo "</tr>\n";
+	}
+
 	if (permission_exists('conference_room_enabled')) {
 		echo "<tr>\n";
 		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>".$text['label-enabled']."</td>\n";
diff --git a/app/conference_centers/conference_rooms.php b/app/conference_centers/conference_rooms.php
index faa65b14b2..f398f72ae2 100644
--- a/app/conference_centers/conference_rooms.php
+++ b/app/conference_centers/conference_rooms.php
@@ -223,7 +223,7 @@
 		echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add'],'id'=>'btn_add','link'=>'conference_room_edit.php']);
 	}
 	if (permission_exists('conference_room_edit') && $result) {
-		echo button::create(['type'=>'button','label'=>$text['button-toggle'],'icon'=>$_SESSION['theme']['button_icon_toggle'],'name'=>'btn_toggle','onclick'=>"toggle_select(); this.blur();"]);
+		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'=>"toggle_select(); this.blur();"]);
 		echo 		"<select class='formfld' style='display: none; width: auto;' id='conference_room_feature' onchange=\"if (this.selectedIndex != 0) { modal_open('modal-toggle','btn_toggle'); }\">";
 		echo "			<option value='' selected='selected'>".$text['label-select']."</option>";
 		echo "			<option value='record'>".$text['label-record']."</option>";
@@ -237,7 +237,7 @@
 		echo "		</select>";
 	}
 	if (permission_exists('conference_room_delete') && $result) {
-		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 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";
 	echo 		"<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown='list_search_reset();'>";
@@ -270,7 +270,7 @@
 	echo "<tr class='list-header'>\n";
 	if (permission_exists('conference_room_add') || permission_exists('conference_room_edit') || permission_exists('conference_room_delete')) {
 		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 "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle(); checkbox_on_change(this);' ".($result ?: "style='visibility: hidden;'").">\n";
 		echo "	</th>\n";
 	}
 	//echo th_order_by('conference_center_uuid', 'Conference UUID', $order_by, $order);
@@ -318,7 +318,7 @@
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('conference_room_add') || permission_exists('conference_room_edit') || permission_exists('conference_room_delete')) {
 				echo "	<td class='checkbox'>\n";
-				echo "		<input type='checkbox' name='conference_rooms[$x][checked]' id='checkbox_".$x."' value='true' onclick=\"if (!this.checked) { document.getElementById('checkbox_all').checked = false; }\">\n";
+				echo "		<input type='checkbox' name='conference_rooms[$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='conference_rooms[$x][uuid]' value='".escape($row['conference_room_uuid'])."' />\n";
 				echo "	</td>\n";
 			}
diff --git a/app/conference_controls/app_languages.php b/app/conference_controls/app_languages.php
index cec8b0ee14..15e07ea62c 100644
--- a/app/conference_controls/app_languages.php
+++ b/app/conference_controls/app_languages.php
@@ -14,7 +14,7 @@ $text['title-conference_controls']['fr-fr'] = "Contrôles de conférence";
 $text['title-conference_controls']['he-il'] = "";
 $text['title-conference_controls']['it-it'] = "Controlli Conferenza";
 $text['title-conference_controls']['nl-nl'] = "Conferentie besturingen";
-$text['title-conference_controls']['pl-pl'] = "";
+$text['title-conference_controls']['pl-pl'] = "Kontrole Konferencji";
 $text['title-conference_controls']['pt-br'] = "Controles de conferência"; //copied from pt-pt
 $text['title-conference_controls']['pt-pt'] = "Controles de conferência";
 $text['title-conference_controls']['ro-ro'] = "";
@@ -35,7 +35,7 @@ $text['title-conference_control']['fr-fr'] = "Contrôle de conférence";
 $text['title-conference_control']['he-il'] = "";
 $text['title-conference_control']['it-it'] = "Controllo Conferenza";
 $text['title-conference_control']['nl-nl'] = "Conferentie besturing";
-$text['title-conference_control']['pl-pl'] = "";
+$text['title-conference_control']['pl-pl'] = "Kontrola Konferencji";
 $text['title-conference_control']['pt-br'] = "Controle de conferência"; //copied from pt-pt
 $text['title-conference_control']['pt-pt'] = "Controle de conferência";
 $text['title-conference_control']['ro-ro'] = "";
@@ -56,7 +56,7 @@ $text['description-conference_controls']['fr-fr'] = "Les commandes d'appel perme
 $text['description-conference_controls']['he-il'] = "";
 $text['description-conference_controls']['it-it'] = "I controlli in chiamata abilitano la possibilità di assegnare azioni ai tasti. Possono essere usati per silenziare, desilenziare, o fare altro durante le conferenze.";
 $text['description-conference_controls']['nl-nl'] = "Oproep besturing maakt het mogelijk om cijfers aan akties toe te kennen. Ze kunnen gebruikt worden om deelnemers op stil/spreken in te stellen of andere acties uit te voeren.";
-$text['description-conference_controls']['pl-pl'] = "";
+$text['description-conference_controls']['pl-pl'] = "Kontrola połączeń umożliwia przypisywanie cyfr do akcji. Mogą być używane do wyciszania, anulowania wyciszenia lub innych działań podczas połączenia konferencyjnego.";
 $text['description-conference_controls']['pt-br'] = "Controle de chamadas habilita atribuir ações aos números. Podem ser usadas para silenciar, ou outras ações durante a conferência."; //copied from pt-pt
 $text['description-conference_controls']['pt-pt'] = "Controle de chamadas habilita atribuir ações aos números. Podem ser usadas para silenciar, ou outras ações durante a conferência.";
 $text['description-conference_controls']['ro-ro'] = "";
@@ -77,7 +77,7 @@ $text['label-control_name']['fr-fr'] = "Nom";
 $text['label-control_name']['he-il'] = "";
 $text['label-control_name']['it-it'] = "Nome";
 $text['label-control_name']['nl-nl'] = "Naam";
-$text['label-control_name']['pl-pl'] = "";
+$text['label-control_name']['pl-pl'] = "Nazwa";
 $text['label-control_name']['pt-br'] = "Nome"; //copied from pt-pt
 $text['label-control_name']['pt-pt'] = "Nome";
 $text['label-control_name']['ro-ro'] = "";
@@ -98,7 +98,7 @@ $text['description-control_name']['fr-fr'] = "Entrez le nom du contrôle de la c
 $text['description-control_name']['he-il'] = "";
 $text['description-control_name']['it-it'] = "Inserire il nome del set di controllo della conferenza.";
 $text['description-control_name']['nl-nl'] = "Voer conferentie besturings naam in.";
-$text['description-control_name']['pl-pl'] = "";
+$text['description-control_name']['pl-pl'] = "Wprowadź nazwę kontrolki konferencji.";
 $text['description-control_name']['pt-br'] = "Entre com o nome do controle de conferência."; //copied from pt-pt
 $text['description-control_name']['pt-pt'] = "Entre com o nome do controle de conferência.";
 $text['description-control_name']['ro-ro'] = "";
@@ -119,7 +119,7 @@ $text['label-control_enabled']['fr-fr'] = "Activé";
 $text['label-control_enabled']['he-il'] = "";
 $text['label-control_enabled']['it-it'] = "Abilitato";
 $text['label-control_enabled']['nl-nl'] = "Aktief";
-$text['label-control_enabled']['pl-pl'] = "";
+$text['label-control_enabled']['pl-pl'] = "Aktywny";
 $text['label-control_enabled']['pt-br'] = "Habilitado"; //copied from pt-pt
 $text['label-control_enabled']['pt-pt'] = "Habilitado";
 $text['label-control_enabled']['ro-ro'] = "";
@@ -140,7 +140,7 @@ $text['description-control_enabled']['fr-fr'] = "Définir le statut du contrôle
 $text['description-control_enabled']['he-il'] = "";
 $text['description-control_enabled']['it-it'] = "Imposta lo stato del controllo.";
 $text['description-control_enabled']['nl-nl'] = "Stel de status van de besturing in.";
-$text['description-control_enabled']['pl-pl'] = "";
+$text['description-control_enabled']['pl-pl'] = "Ustaw status kontrolki.";
 $text['description-control_enabled']['pt-br'] = "Atribua o estado do controle."; //copied from pt-pt
 $text['description-control_enabled']['pt-pt'] = "Atribua o estado do controle.";
 $text['description-control_enabled']['ro-ro'] = "";
@@ -161,7 +161,7 @@ $text['label-control_description']['fr-fr'] = "Description";
 $text['label-control_description']['he-il'] = "";
 $text['label-control_description']['it-it'] = "Descrizione";
 $text['label-control_description']['nl-nl'] = "Omschrijving";
-$text['label-control_description']['pl-pl'] = "";
+$text['label-control_description']['pl-pl'] = "Opis";
 $text['label-control_description']['pt-br'] = "Descrição"; //copied from pt-pt
 $text['label-control_description']['pt-pt'] = "Descrição";
 $text['label-control_description']['ro-ro'] = "";
@@ -182,7 +182,7 @@ $text['description-control_description']['fr-fr'] = "Entrez la description.";
 $text['description-control_description']['he-il'] = "";
 $text['description-control_description']['it-it'] = "Inserire la descrizione.";
 $text['description-control_description']['nl-nl'] = "Voer de omschrijving in.";
-$text['description-control_description']['pl-pl'] = "";
+$text['description-control_description']['pl-pl'] = "Wprowadź opis.";
 $text['description-control_description']['pt-br'] = "Entre com a descrição."; //copied from pt-pt
 $text['description-control_description']['pt-pt'] = "Entre com a descrição.";
 $text['description-control_description']['ro-ro'] = "";
@@ -203,7 +203,7 @@ $text['message-required']['fr-fr'] = "Veuillez fournir";
 $text['message-required']['he-il'] = "";
 $text['message-required']['it-it'] = "Prego fornire: ";
 $text['message-required']['nl-nl'] = "Geef aub: ";
-$text['message-required']['pl-pl'] = "";
+$text['message-required']['pl-pl'] = "Proszę wprowadzić: ";
 $text['message-required']['pt-br'] = "Por favor, informe: "; //copied from pt-pt
 $text['message-required']['pt-pt'] = "Por favor, informe: ";
 $text['message-required']['ro-ro'] = "";
@@ -224,7 +224,7 @@ $text['title-conference_control_details']['fr-fr'] = "";
 $text['title-conference_control_details']['he-il'] = "";
 $text['title-conference_control_details']['it-it'] = "Controlli";
 $text['title-conference_control_details']['nl-nl'] = "Besturingen";
-$text['title-conference_control_details']['pl-pl'] = "";
+$text['title-conference_control_details']['pl-pl'] = "Kontrolki";
 $text['title-conference_control_details']['pt-br'] = "Controles"; //copied from pt-pt
 $text['title-conference_control_details']['pt-pt'] = "Controles";
 $text['title-conference_control_details']['ro-ro'] = "";
@@ -245,7 +245,7 @@ $text['title-conference_control_detail']['fr-fr'] = "Les contrôles";
 $text['title-conference_control_detail']['he-il'] = "";
 $text['title-conference_control_detail']['it-it'] = "Controllo";
 $text['title-conference_control_detail']['nl-nl'] = "Besturing";
-$text['title-conference_control_detail']['pl-pl'] = "";
+$text['title-conference_control_detail']['pl-pl'] = "Kontrola";
 $text['title-conference_control_detail']['pt-br'] = "Controle"; //copied from pt-pt
 $text['title-conference_control_detail']['pt-pt'] = "Controle";
 $text['title-conference_control_detail']['ro-ro'] = "";
@@ -266,7 +266,7 @@ $text['title_description-conference_control_detail']['fr-fr'] = "Les commandes d
 $text['title_description-conference_control_detail']['he-il'] = "";
 $text['title_description-conference_control_detail']['it-it'] = "";
 $text['title_description-conference_control_detail']['nl-nl'] = "Oproep besturingen maken het mogelijk om cijfers aan akiteis toe te wijzen. Deze kunnen gebruikt worden om een deelnemer op stil/spreken in te stellen of andere acties.";
-$text['title_description-conference_control_detail']['pl-pl'] = "";
+$text['title_description-conference_control_detail']['pl-pl'] = "Kontrola połączeń umożliwia przypisywanie cyfr do akcji. Mogą być używane do wyciszania, anulowania wyciszenia lub innych działań podczas połączenia konferencyjnego.";
 $text['title_description-conference_control_detail']['pt-br'] = "";
 $text['title_description-conference_control_detail']['pt-pt'] = "";
 $text['title_description-conference_control_detail']['ro-ro'] = "";
@@ -287,7 +287,7 @@ $text['label-control_digits']['fr-fr'] = "Chiffres";
 $text['label-control_digits']['he-il'] = "";
 $text['label-control_digits']['it-it'] = "Tasti";
 $text['label-control_digits']['nl-nl'] = "Cijfers";
-$text['label-control_digits']['pl-pl'] = "";
+$text['label-control_digits']['pl-pl'] = "Cyfry";
 $text['label-control_digits']['pt-br'] = "Digitos"; //copied from pt-pt
 $text['label-control_digits']['pt-pt'] = "Digitos";
 $text['label-control_digits']['ro-ro'] = "";
@@ -308,7 +308,7 @@ $text['description-control_digits']['fr-fr'] = "Entrez les chiffres";
 $text['description-control_digits']['he-il'] = "";
 $text['description-control_digits']['it-it'] = "Inserire i tasti.";
 $text['description-control_digits']['nl-nl'] = "Voer de cijfers in.";
-$text['description-control_digits']['pl-pl'] = "";
+$text['description-control_digits']['pl-pl'] = "Wprowadź cyfry.";
 $text['description-control_digits']['pt-br'] = "Entre com os digitos"; //copied from pt-pt
 $text['description-control_digits']['pt-pt'] = "Entre com os digitos";
 $text['description-control_digits']['ro-ro'] = "";
@@ -329,7 +329,7 @@ $text['label-control_action']['fr-fr'] = "Action";
 $text['label-control_action']['he-il'] = "";
 $text['label-control_action']['it-it'] = "Azione";
 $text['label-control_action']['nl-nl'] = "Aktie";
-$text['label-control_action']['pl-pl'] = "";
+$text['label-control_action']['pl-pl'] = "Akcja";
 $text['label-control_action']['pt-br'] = "Ação"; //copied from pt-pt
 $text['label-control_action']['pt-pt'] = "Ação";
 $text['label-control_action']['ro-ro'] = "";
@@ -350,7 +350,7 @@ $text['description-control_action']['fr-fr'] = "Entrer L'action";
 $text['description-control_action']['he-il'] = "";
 $text['description-control_action']['it-it'] = "Impostare azione.";
 $text['description-control_action']['nl-nl'] = "Voer de aktie in.";
-$text['description-control_action']['pl-pl'] = "";
+$text['description-control_action']['pl-pl'] = "Wprowadź akcję.";
 $text['description-control_action']['pt-br'] = "Informe uma ação."; //copied from pt-pt
 $text['description-control_action']['pt-pt'] = "Informe uma ação.";
 $text['description-control_action']['ro-ro'] = "";
@@ -371,7 +371,7 @@ $text['label-control_data']['fr-fr'] = "Les données";
 $text['label-control_data']['he-il'] = "";
 $text['label-control_data']['it-it'] = "Dati";
 $text['label-control_data']['nl-nl'] = "Data";
-$text['label-control_data']['pl-pl'] = "";
+$text['label-control_data']['pl-pl'] = "Data";
 $text['label-control_data']['pt-br'] = "Dados"; //copied from pt-pt
 $text['label-control_data']['pt-pt'] = "Dados";
 $text['label-control_data']['ro-ro'] = "";
@@ -392,7 +392,7 @@ $text['description-control_data']['fr-fr'] = "Entrer les données";
 $text['description-control_data']['he-il'] = "";
 $text['description-control_data']['it-it'] = "Inserire il dato.";
 $text['description-control_data']['nl-nl'] = "Voer de data in.";
-$text['description-control_data']['pl-pl'] = "";
+$text['description-control_data']['pl-pl'] = "Wprowadź datę.";
 $text['description-control_data']['pt-br'] = "Informe os dados."; //copied from pt-pt
 $text['description-control_data']['pt-pt'] = "Informe os dados.";
 $text['description-control_data']['ro-ro'] = "";
diff --git a/app/conference_controls/conference_controls.php b/app/conference_controls/conference_controls.php
index 284f0cd527..dbcc334523 100644
--- a/app/conference_controls/conference_controls.php
+++ b/app/conference_controls/conference_controls.php
@@ -129,18 +129,18 @@
 		echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add'],'id'=>'btn_add','link'=>'conference_control_edit.php']);
 	}
 	if (permission_exists('conference_control_add') && $conference_controls) {
-		echo button::create(['type'=>'button','label'=>$text['button-copy'],'icon'=>$_SESSION['theme']['button_icon_copy'],'name'=>'btn_copy','onclick'=>"modal_open('modal-copy','btn_copy');"]);
+		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('conference_control_edit') && $conference_controls) {
-		echo button::create(['type'=>'button','label'=>$text['button-toggle'],'icon'=>$_SESSION['theme']['button_icon_toggle'],'name'=>'btn_toggle','onclick'=>"modal_open('modal-toggle','btn_toggle');"]);
+		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('conference_control_delete') && $conference_controls) {
-		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 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";
-	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'=>'conference_controls.php','style'=>($search == '' ? 'display: none;' : null)]);
+	echo 		"<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown=''>";
+	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search']);
+	//echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'conference_controls.php','style'=>($search == '' ? 'display: none;' : null)]);
 	if ($paging_controls_mini != '') {
 		echo 	"<span style='margin-left: 15px;'>".$paging_controls_mini."</span>\n";
 	}
@@ -170,7 +170,7 @@
 	echo "<tr class='list-header'>\n";
 	if (permission_exists('conference_control_add') || permission_exists('conference_control_edit') || permission_exists('conference_control_delete')) {
 		echo "	<th class='checkbox'>\n";
-		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle();' ".($conference_controls ?: "style='visibility: hidden;'").">\n";
+		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle(); checkbox_on_change(this);' ".($conference_controls ?: "style='visibility: hidden;'").">\n";
 		echo "	</th>\n";
 	}
 	echo th_order_by('control_name', $text['label-control_name'], $order_by, $order);
@@ -190,7 +190,7 @@
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('conference_control_add') || permission_exists('conference_control_edit') || permission_exists('conference_control_delete')) {
 				echo "	<td class='checkbox'>\n";
-				echo "		<input type='checkbox' name='conference_controls[$x][checked]' id='checkbox_".$x."' value='true' onclick=\"if (!this.checked) { document.getElementById('checkbox_all').checked = false; }\">\n";
+				echo "		<input type='checkbox' name='conference_controls[$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='conference_controls[$x][uuid]' value='".escape($row['conference_control_uuid'])."' />\n";
 				echo "	</td>\n";
 			}
@@ -232,4 +232,4 @@
 //include the footer
 	require_once "resources/footer.php";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/conference_profiles/app_defaults.php b/app/conference_profiles/app_defaults.php
index c542c04455..eab37bfe66 100644
--- a/app/conference_profiles/app_defaults.php
+++ b/app/conference_profiles/app_defaults.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) 2016
+	Portions created by the Initial Developer are Copyright (C) 2016 - 2021
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -72,7 +72,7 @@
 						$database = new database;
 						$database->app_name = 'conference_profiles';
 						$database->app_uuid = 'c33e2c2a-847f-44c1-8c0d-310df5d65ba9';
-						$database->save($array);
+						$database->save($array, false);
 						unset($array);
 
 						$p->delete('conference_profile_add', 'temp');
@@ -99,7 +99,7 @@
 								$database = new database;
 								$database->app_name = 'conference_profiles';
 								$database->app_uuid = 'c33e2c2a-847f-44c1-8c0d-310df5d65ba9';
-								$database->save($array);
+								$database->save($array, false);
 								unset($array);
 
 								$p->delete('conference_profile_param_add', 'temp');
diff --git a/app/conference_profiles/app_languages.php b/app/conference_profiles/app_languages.php
index a230968a78..bb388b6b2f 100644
--- a/app/conference_profiles/app_languages.php
+++ b/app/conference_profiles/app_languages.php
@@ -14,7 +14,7 @@ $text['title-conference_profiles']['fr-fr'] = "Profils de conférence";
 $text['title-conference_profiles']['he-il'] = "";
 $text['title-conference_profiles']['it-it'] = "Profili Conferenza";
 $text['title-conference_profiles']['nl-nl'] = "Conferentie profielen";
-$text['title-conference_profiles']['pl-pl'] = "";
+$text['title-conference_profiles']['pl-pl'] = "Profile Konferencji";
 $text['title-conference_profiles']['pt-br'] = "";
 $text['title-conference_profiles']['pt-pt'] = "";
 $text['title-conference_profiles']['ro-ro'] = "";
@@ -35,7 +35,7 @@ $text['title-conference_profile']['fr-fr'] = "Profil de la conférence";
 $text['title-conference_profile']['he-il'] = "";
 $text['title-conference_profile']['it-it'] = "Profilo Conferenza";
 $text['title-conference_profile']['nl-nl'] = "Conferentie profiel";
-$text['title-conference_profile']['pl-pl'] = "";
+$text['title-conference_profile']['pl-pl'] = "Profil Konferencji";
 $text['title-conference_profile']['pt-br'] = "";
 $text['title-conference_profile']['pt-pt'] = "";
 $text['title-conference_profile']['ro-ro'] = "";
@@ -56,7 +56,7 @@ $text['description-conference_profiles']['fr-fr'] = "Un groupe de paramètres de
 $text['description-conference_profiles']['he-il'] = "";
 $text['description-conference_profiles']['it-it'] = "Un insieme di parametri per le conferenze costituiscono un profilo.";
 $text['description-conference_profiles']['nl-nl'] = "Een groep van conferentie parameters die gezamenlijk opgeslagen zijn.";
-$text['description-conference_profiles']['pl-pl'] = "";
+$text['description-conference_profiles']['pl-pl'] = "Grupa parametrów konferencji zapisywana razem jako profil.";
 $text['description-conference_profiles']['pt-br'] = "";
 $text['description-conference_profiles']['pt-pt'] = "";
 $text['description-conference_profiles']['ro-ro'] = "";
@@ -77,7 +77,7 @@ $text['label-profile_name']['fr-fr'] = "Nom";
 $text['label-profile_name']['he-il'] = "";
 $text['label-profile_name']['it-it'] = "Nome";
 $text['label-profile_name']['nl-nl'] = "Naam";
-$text['label-profile_name']['pl-pl'] = "";
+$text['label-profile_name']['pl-pl'] = "Nazwa";
 $text['label-profile_name']['pt-br'] = "";
 $text['label-profile_name']['pt-pt'] = "";
 $text['label-profile_name']['ro-ro'] = "";
@@ -98,7 +98,7 @@ $text['description-profile_name']['fr-fr'] = "Entrez le nom du profil.";
 $text['description-profile_name']['he-il'] = "";
 $text['description-profile_name']['it-it'] = "Inserire il nome del profilo.";
 $text['description-profile_name']['nl-nl'] = "Voer de profielnaam in.";
-$text['description-profile_name']['pl-pl'] = "";
+$text['description-profile_name']['pl-pl'] = "Wprowadź nazwę profilu.";
 $text['description-profile_name']['pt-br'] = "";
 $text['description-profile_name']['pt-pt'] = "";
 $text['description-profile_name']['ro-ro'] = "";
@@ -119,7 +119,7 @@ $text['label-profile_enabled']['fr-fr'] = "Activé";
 $text['label-profile_enabled']['he-il'] = "";
 $text['label-profile_enabled']['it-it'] = "Abilitato";
 $text['label-profile_enabled']['nl-nl'] = "Aktief";
-$text['label-profile_enabled']['pl-pl'] = "";
+$text['label-profile_enabled']['pl-pl'] = "Aktywny";
 $text['label-profile_enabled']['pt-br'] = "";
 $text['label-profile_enabled']['pt-pt'] = "";
 $text['label-profile_enabled']['ro-ro'] = "";
@@ -140,7 +140,7 @@ $text['description-profile_enabled']['fr-fr'] = "Définir le statut du profil.";
 $text['description-profile_enabled']['he-il'] = "";
 $text['description-profile_enabled']['it-it'] = "Imposta lo stato del profilo.";
 $text['description-profile_enabled']['nl-nl'] = "Stel de status van het profiel in.";
-$text['description-profile_enabled']['pl-pl'] = "";
+$text['description-profile_enabled']['pl-pl'] = "Ustaw status profilu.";
 $text['description-profile_enabled']['pt-br'] = "";
 $text['description-profile_enabled']['pt-pt'] = "";
 $text['description-profile_enabled']['ro-ro'] = "";
@@ -161,7 +161,7 @@ $text['label-profile_description']['fr-fr'] = "Description";
 $text['label-profile_description']['he-il'] = "";
 $text['label-profile_description']['it-it'] = "Descrizione";
 $text['label-profile_description']['nl-nl'] = "Omschrijving";
-$text['label-profile_description']['pl-pl'] = "";
+$text['label-profile_description']['pl-pl'] = "Opis";
 $text['label-profile_description']['pt-br'] = "";
 $text['label-profile_description']['pt-pt'] = "";
 $text['label-profile_description']['ro-ro'] = "";
@@ -182,7 +182,7 @@ $text['description-profile_description']['fr-fr'] = "Entrez la description";
 $text['description-profile_description']['he-il'] = "";
 $text['description-profile_description']['it-it'] = "Inserire la descrizione.";
 $text['description-profile_description']['nl-nl'] = "Voer de omschrijving in.";
-$text['description-profile_description']['pl-pl'] = "";
+$text['description-profile_description']['pl-pl'] = "Wprowadź opis.";
 $text['description-profile_description']['pt-br'] = "";
 $text['description-profile_description']['pt-pt'] = "";
 $text['description-profile_description']['ro-ro'] = "";
@@ -203,7 +203,7 @@ $text['title-conference_profile_params']['fr-fr'] = "Paramètres du profil";
 $text['title-conference_profile_params']['he-il'] = "";
 $text['title-conference_profile_params']['it-it'] = "Parametri del Profilo";
 $text['title-conference_profile_params']['nl-nl'] = "Profiel parameters";
-$text['title-conference_profile_params']['pl-pl'] = "";
+$text['title-conference_profile_params']['pl-pl'] = "Parametry Profilu";
 $text['title-conference_profile_params']['pt-br'] = "";
 $text['title-conference_profile_params']['pt-pt'] = "";
 $text['title-conference_profile_params']['ro-ro'] = "";
@@ -224,7 +224,7 @@ $text['title-conference_profile_param']['fr-fr'] = "Paramètres du profil";
 $text['title-conference_profile_param']['he-il'] = "";
 $text['title-conference_profile_param']['it-it'] = "Parametro Profilo";
 $text['title-conference_profile_param']['nl-nl'] = "Profiel parameter";
-$text['title-conference_profile_param']['pl-pl'] = "";
+$text['title-conference_profile_param']['pl-pl'] = "Parametr Profilu";
 $text['title-conference_profile_param']['pt-br'] = "";
 $text['title-conference_profile_param']['pt-pt'] = "";
 $text['title-conference_profile_param']['ro-ro'] = "";
@@ -245,7 +245,7 @@ $text['title_description-conference_profile_param']['fr-fr'] = "Paramètres attr
 $text['title_description-conference_profile_param']['he-il'] = "";
 $text['title_description-conference_profile_param']['it-it'] = "Impostazioni assegnare ai profili di conferenza.";
 $text['title_description-conference_profile_param']['nl-nl'] = "Instellinge die aan het conferentie profiel zijn toegewezen.";
-$text['title_description-conference_profile_param']['pl-pl'] = "";
+$text['title_description-conference_profile_param']['pl-pl'] = "Ustawienia przypisane do profili konferencji.";
 $text['title_description-conference_profile_param']['pt-br'] = "";
 $text['title_description-conference_profile_param']['pt-pt'] = "";
 $text['title_description-conference_profile_param']['ro-ro'] = "";
@@ -266,7 +266,7 @@ $text['label-profile_param_name']['fr-fr'] = "Nom";
 $text['label-profile_param_name']['he-il'] = "";
 $text['label-profile_param_name']['it-it'] = "Nome";
 $text['label-profile_param_name']['nl-nl'] = "Naam";
-$text['label-profile_param_name']['pl-pl'] = "";
+$text['label-profile_param_name']['pl-pl'] = "Nazwa";
 $text['label-profile_param_name']['pt-br'] = "";
 $text['label-profile_param_name']['pt-pt'] = "";
 $text['label-profile_param_name']['ro-ro'] = "";
@@ -287,7 +287,7 @@ $text['description-profile_param_name']['fr-fr'] = "Entrez le nom du paramètre.
 $text['description-profile_param_name']['he-il'] = "";
 $text['description-profile_param_name']['it-it'] = "Inserire nome parametro.";
 $text['description-profile_param_name']['nl-nl'] = "Voer de parameternaam in.";
-$text['description-profile_param_name']['pl-pl'] = "";
+$text['description-profile_param_name']['pl-pl'] = "Wprowadź nazwę parametru.";
 $text['description-profile_param_name']['pt-br'] = "";
 $text['description-profile_param_name']['pt-pt'] = "";
 $text['description-profile_param_name']['ro-ro'] = "";
@@ -308,7 +308,7 @@ $text['label-profile_param_value']['fr-fr'] = "Valeur";
 $text['label-profile_param_value']['he-il'] = "";
 $text['label-profile_param_value']['it-it'] = "Valore";
 $text['label-profile_param_value']['nl-nl'] = "Waarde";
-$text['label-profile_param_value']['pl-pl'] = "";
+$text['label-profile_param_value']['pl-pl'] = "Wartość";
 $text['label-profile_param_value']['pt-br'] = "";
 $text['label-profile_param_value']['pt-pt'] = "";
 $text['label-profile_param_value']['ro-ro'] = "";
@@ -329,7 +329,7 @@ $text['description-profile_param_value']['fr-fr'] = "Entrez la valeur";
 $text['description-profile_param_value']['he-il'] = "";
 $text['description-profile_param_value']['it-it'] = "Inserire il valore.";
 $text['description-profile_param_value']['nl-nl'] = "Voer de waarde in.";
-$text['description-profile_param_value']['pl-pl'] = "";
+$text['description-profile_param_value']['pl-pl'] = "Wprowadź wartość.";
 $text['description-profile_param_value']['pt-br'] = "";
 $text['description-profile_param_value']['pt-pt'] = "";
 $text['description-profile_param_value']['ro-ro'] = "";
@@ -350,7 +350,7 @@ $text['label-profile_param_enabled']['fr-fr'] = "Activé";
 $text['label-profile_param_enabled']['he-il'] = "";
 $text['label-profile_param_enabled']['it-it'] = "Abilitato";
 $text['label-profile_param_enabled']['nl-nl'] = "Aktief";
-$text['label-profile_param_enabled']['pl-pl'] = "";
+$text['label-profile_param_enabled']['pl-pl'] = "Aktywny";
 $text['label-profile_param_enabled']['pt-br'] = "";
 $text['label-profile_param_enabled']['pt-pt'] = "";
 $text['label-profile_param_enabled']['ro-ro'] = "";
@@ -371,7 +371,7 @@ $text['description-profile_param_enabled']['fr-fr'] = "Définir le statut du par
 $text['description-profile_param_enabled']['he-il'] = "";
 $text['description-profile_param_enabled']['it-it'] = "Imposta lo stato del parametro.";
 $text['description-profile_param_enabled']['nl-nl'] = "Stel de status van de parameter in.";
-$text['description-profile_param_enabled']['pl-pl'] = "";
+$text['description-profile_param_enabled']['pl-pl'] = "Ustaw status parametru.";
 $text['description-profile_param_enabled']['pt-br'] = "";
 $text['description-profile_param_enabled']['pt-pt'] = "";
 $text['description-profile_param_enabled']['ro-ro'] = "";
@@ -392,7 +392,7 @@ $text['label-profile_param_description']['fr-fr'] = "Description";
 $text['label-profile_param_description']['he-il'] = "";
 $text['label-profile_param_description']['it-it'] = "Descrizione";
 $text['label-profile_param_description']['nl-nl'] = "Omschrijving";
-$text['label-profile_param_description']['pl-pl'] = "";
+$text['label-profile_param_description']['pl-pl'] = "Opis";
 $text['label-profile_param_description']['pt-br'] = "";
 $text['label-profile_param_description']['pt-pt'] = "";
 $text['label-profile_param_description']['ro-ro'] = "";
@@ -413,7 +413,7 @@ $text['description-profile_param_description']['fr-fr'] = "Entrez la description
 $text['description-profile_param_description']['he-il'] = "";
 $text['description-profile_param_description']['it-it'] = "Inserire la descrizione.";
 $text['description-profile_param_description']['nl-nl'] = "Voer de omschrijving in.";
-$text['description-profile_param_description']['pl-pl'] = "";
+$text['description-profile_param_description']['pl-pl'] = "Wprowadź opis.";
 $text['description-profile_param_description']['pt-br'] = "";
 $text['description-profile_param_description']['pt-pt'] = "";
 $text['description-profile_param_description']['ro-ro'] = "";
diff --git a/app/conference_profiles/app_menu.php b/app/conference_profiles/app_menu.php
index 628a3982dc..e5e8f7fa67 100644
--- a/app/conference_profiles/app_menu.php
+++ b/app/conference_profiles/app_menu.php
@@ -14,7 +14,7 @@
 	$apps[$x]['menu'][$y]['title']['he-il'] = "";
 	$apps[$x]['menu'][$y]['title']['it-it'] = "Profili Conferenza";
 	$apps[$x]['menu'][$y]['title']['nl-nl'] = "Conferentie profielen";
-	$apps[$x]['menu'][$y]['title']['pl-pl'] = "";
+	$apps[$x]['menu'][$y]['title']['pl-pl'] = "Profile Konferencji";
 	$apps[$x]['menu'][$y]['title']['pt-br'] = "";
 	$apps[$x]['menu'][$y]['title']['pt-pt'] = "";
 	$apps[$x]['menu'][$y]['title']['ro-ro'] = "";
diff --git a/app/conference_profiles/conference_profiles.php b/app/conference_profiles/conference_profiles.php
index 2b95a5bb0c..52cc0579f9 100644
--- a/app/conference_profiles/conference_profiles.php
+++ b/app/conference_profiles/conference_profiles.php
@@ -122,18 +122,18 @@
 		echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add'],'id'=>'btn_add','link'=>'conference_profile_edit.php']);
 	}
 	if (permission_exists('conference_profile_add') && $conference_profiles) {
-		echo button::create(['type'=>'button','label'=>$text['button-copy'],'icon'=>$_SESSION['theme']['button_icon_copy'],'name'=>'btn_copy','onclick'=>"modal_open('modal-copy','btn_copy');"]);
+		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('conference_profile_edit') && $conference_profiles) {
-		echo button::create(['type'=>'button','label'=>$text['button-toggle'],'icon'=>$_SESSION['theme']['button_icon_toggle'],'name'=>'btn_toggle','onclick'=>"modal_open('modal-toggle','btn_toggle');"]);
+		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('conference_profile_delete') && $conference_profiles) {
-		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 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";
-	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'=>'conference_profiles.php','style'=>($search == '' ? 'display: none;' : null)]);
+	echo 		"<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown=''>";
+	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search']);
+	//echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'conference_profiles.php','style'=>($search == '' ? 'display: none;' : null)]);
 	if ($paging_controls_mini != '') {
 		echo 	"<span style='margin-left: 15px;'>".$paging_controls_mini."</span>\n";
 	}
@@ -163,7 +163,7 @@
 	echo "<tr class='list-header'>\n";
 	if (permission_exists('conference_profile_add') || permission_exists('conference_profile_edit') || permission_exists('conference_profile_delete')) {
 		echo "	<th class='checkbox'>\n";
-		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle();' ".($conference_profiles ?: "style='visibility: hidden;'").">\n";
+		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle(); checkbox_on_change(this);' ".($conference_profiles ?: "style='visibility: hidden;'").">\n";
 		echo "	</th>\n";
 	}
 	echo th_order_by('profile_name', $text['label-profile_name'], $order_by, $order);
@@ -183,7 +183,7 @@
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('conference_profile_add') || permission_exists('conference_profile_edit') || permission_exists('conference_profile_delete')) {
 				echo "	<td class='checkbox'>\n";
-				echo "		<input type='checkbox' name='conference_profiles[$x][checked]' id='checkbox_".$x."' value='true' onclick=\"if (!this.checked) { document.getElementById('checkbox_all').checked = false; }\">\n";
+				echo "		<input type='checkbox' name='conference_profiles[$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='conference_profiles[$x][uuid]' value='".escape($row['conference_profile_uuid'])."' />\n";
 				echo "	</td>\n";
 			}
@@ -225,4 +225,4 @@
 //include the footer
 	require_once "resources/footer.php";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/conferences/app_config.php b/app/conferences/app_config.php
index 20f8d1b824..27127c36dc 100644
--- a/app/conferences/app_config.php
+++ b/app/conferences/app_config.php
@@ -66,6 +66,9 @@
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "conference_all";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "conference_user_view";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";;
@@ -82,10 +85,17 @@
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "conference_email_address";
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "conference_account_code";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
+		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "conference_destinations";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 
+
 	//cache details
 		$apps[$x]['cache']['key'] = "dialplan.\${domain_name}";
 
@@ -136,6 +146,15 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Conference Profile is a collection of settings for the conference.";
 		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "conference_email_address";
+		$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'] = "Optional email address for the conference.";
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "conference_account_code";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Optional account code for the conference.";
+		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "conference_flags";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Optional conference flags. examples: mute|deaf|waste|moderator";
diff --git a/app/conferences/app_languages.php b/app/conferences/app_languages.php
index 712f3d98ca..7bb87fd058 100644
--- a/app/conferences/app_languages.php
+++ b/app/conferences/app_languages.php
@@ -14,7 +14,7 @@ $text['title-conferences']['fr-fr'] = "Conférences";
 $text['title-conferences']['he-il'] = "חדר ועידה";
 $text['title-conferences']['it-it'] = "Conferenze";
 $text['title-conferences']['nl-nl'] = "Conferenties";
-$text['title-conferences']['pl-pl'] = "";
+$text['title-conferences']['pl-pl'] = "Konferencje";
 $text['title-conferences']['pt-br'] = "Conferências"; //copied from pt-pt
 $text['title-conferences']['pt-pt'] = "Conferências";
 $text['title-conferences']['ro-ro'] = "";
@@ -35,7 +35,7 @@ $text['title-conference']['fr-fr'] = "Conférences";
 $text['title-conference']['he-il'] = "";
 $text['title-conference']['it-it'] = "Conferenze";
 $text['title-conference']['nl-nl'] = "Conferenties";
-$text['title-conference']['pl-pl'] = "";
+$text['title-conference']['pl-pl'] = "Konferencja";
 $text['title-conference']['pt-br'] = "Conferências"; //copied from pt-pt
 $text['title-conference']['pt-pt'] = "Conferências";
 $text['title-conference']['ro-ro'] = "";
@@ -56,7 +56,7 @@ $text['description']['fr-fr'] = "Ce menu est utilisé pour créer des salles de
 $text['description']['he-il'] = "";
 $text['description']['it-it'] = "Conferenze permette di configurare stanze di conferenza con nome, descrizione, e PIN opzionale.";
 $text['description']['nl-nl'] = "Conferenties wordt gebruikt om gespreksruimten te maken met een naam, omschrijving en optionele PIN code";
-$text['description']['pl-pl'] = "";
+$text['description']['pl-pl'] = "Konferencja służy do konfigurowania sal konferencyjnych z nazwą, opisem i opcjonalnym numerem pin.";
 $text['description']['pt-br'] = "As conferências são utilizadas para configurar salas de conferência com um nome, descrição e número pin opcional."; //copied from pt-pt
 $text['description']['pt-pt'] = "As conferências são utilizadas para configurar salas de conferência com um nome, descrição e número pin opcional.";
 $text['description']['ro-ro'] = "";
@@ -77,7 +77,7 @@ $text['label-active_conferences']['fr-fr'] = "Conférences actives";
 $text['label-active_conferences']['he-il'] = "";
 $text['label-active_conferences']['it-it'] = "Conferenze Attive";
 $text['label-active_conferences']['nl-nl'] = "Aktieve conferenties";
-$text['label-active_conferences']['pl-pl'] = "";
+$text['label-active_conferences']['pl-pl'] = "Aktywne Konferencje";
 $text['label-active_conferences']['pt-br'] = "Conferências Activas"; //copied from pt-pt
 $text['label-active_conferences']['pt-pt'] = "Conferências Activas";
 $text['label-active_conferences']['ro-ro'] = "";
@@ -98,7 +98,7 @@ $text['button-view_active']['fr-fr'] = "Voir Active";
 $text['button-view_active']['he-il'] = "";
 $text['button-view_active']['it-it'] = "Mostra Attive";
 $text['button-view_active']['nl-nl'] = "Toon aktieve ruimten";
-$text['button-view_active']['pl-pl'] = "";
+$text['button-view_active']['pl-pl'] = "Pokaż Aktywne";
 $text['button-view_active']['pt-br'] = "Ver Ativo"; //copied from pt-pt
 $text['button-view_active']['pt-pt'] = "Ver Ativo";
 $text['button-view_active']['ro-ro'] = "";
@@ -119,7 +119,7 @@ $text['table-name']['fr-fr'] = "Nom";
 $text['table-name']['he-il'] = "";
 $text['table-name']['it-it'] = "Nome";
 $text['table-name']['nl-nl'] = "Naam";
-$text['table-name']['pl-pl'] = "";
+$text['table-name']['pl-pl'] = "Nazwa";
 $text['table-name']['pt-br'] = "Nome"; //copied from pt-pt
 $text['table-name']['pt-pt'] = "Nome";
 $text['table-name']['ro-ro'] = "";
@@ -140,7 +140,7 @@ $text['table-extension']['fr-fr'] = "Extension";
 $text['table-extension']['he-il'] = "";
 $text['table-extension']['it-it'] = "Interno";
 $text['table-extension']['nl-nl'] = "Toestel";
-$text['table-extension']['pl-pl'] = "";
+$text['table-extension']['pl-pl'] = "Numer Wewnętrzny";
 $text['table-extension']['pt-br'] = "Extensão"; //copied from pt-pt
 $text['table-extension']['pt-pt'] = "Extensão";
 $text['table-extension']['ro-ro'] = "";
@@ -161,7 +161,7 @@ $text['table-profile']['fr-fr'] = "Profile";
 $text['table-profile']['he-il'] = "";
 $text['table-profile']['it-it'] = "Profilo";
 $text['table-profile']['nl-nl'] = "Profiel";
-$text['table-profile']['pl-pl'] = "";
+$text['table-profile']['pl-pl'] = "Profil";
 $text['table-profile']['pt-br'] = "Perfil"; //copied from pt-pt
 $text['table-profile']['pt-pt'] = "Perfil";
 $text['table-profile']['ro-ro'] = "";
@@ -182,7 +182,7 @@ $text['table-order']['fr-fr'] = "Ordre";
 $text['table-order']['he-il'] = "";
 $text['table-order']['it-it'] = "Ordine";
 $text['table-order']['nl-nl'] = "Volgorde";
-$text['table-order']['pl-pl'] = "";
+$text['table-order']['pl-pl'] = "Kolejność";
 $text['table-order']['pt-br'] = "Ordem"; //copied from pt-pt
 $text['table-order']['pt-pt'] = "Ordem";
 $text['table-order']['ro-ro'] = "";
@@ -203,7 +203,7 @@ $text['table-enabled']['fr-fr'] = "Actif";
 $text['table-enabled']['he-il'] = "";
 $text['table-enabled']['it-it'] = "Abilitato";
 $text['table-enabled']['nl-nl'] = "Aan";
-$text['table-enabled']['pl-pl'] = "";
+$text['table-enabled']['pl-pl'] = "Aktywny";
 $text['table-enabled']['pt-br'] = "Activo"; //copied from pt-pt
 $text['table-enabled']['pt-pt'] = "Activo";
 $text['table-enabled']['ro-ro'] = "";
@@ -224,7 +224,7 @@ $text['table-description']['fr-fr'] = "Description";
 $text['table-description']['he-il'] = "";
 $text['table-description']['it-it'] = "Descrizione";
 $text['table-description']['nl-nl'] = "Omschrijving";
-$text['table-description']['pl-pl'] = "";
+$text['table-description']['pl-pl'] = "Opis";
 $text['table-description']['pt-br'] = "Descrição"; //copied from pt-pt
 $text['table-description']['pt-pt'] = "Descrição";
 $text['table-description']['ro-ro'] = "";
@@ -245,7 +245,7 @@ $text['confirm-add']['fr-fr'] = "Ajouté";
 $text['confirm-add']['he-il'] = "";
 $text['confirm-add']['it-it'] = "Inserimento Completato";
 $text['confirm-add']['nl-nl'] = "Toevoegen gereed";
-$text['confirm-add']['pl-pl'] = "";
+$text['confirm-add']['pl-pl'] = "Dodano pomyślnie";
 $text['confirm-add']['pt-br'] = "Adição Efectuada"; //copied from pt-pt
 $text['confirm-add']['pt-pt'] = "Adição Efectuada";
 $text['confirm-add']['ro-ro'] = "";
@@ -266,7 +266,7 @@ $text['confirm-update']['fr-fr'] = "Mis a jour";
 $text['confirm-update']['he-il'] = "";
 $text['confirm-update']['it-it'] = "Aggiornamento Completato";
 $text['confirm-update']['nl-nl'] = "Bijwerken gereed";
-$text['confirm-update']['pl-pl'] = "";
+$text['confirm-update']['pl-pl'] = "Zaktualizowano pomyślnie";
 $text['confirm-update']['pt-br'] = "Actualização Efectuada"; //copied from pt-pt
 $text['confirm-update']['pt-pt'] = "Actualização Efectuada";
 $text['confirm-update']['ro-ro'] = "";
@@ -287,7 +287,7 @@ $text['confirm-name']['fr-fr'] = "Merci d'indiquer: Nom";
 $text['confirm-name']['he-il'] = "";
 $text['confirm-name']['it-it'] = "Prego fornire: Nome";
 $text['confirm-name']['nl-nl'] = "Geef aub.: Naam";
-$text['confirm-name']['pl-pl'] = "";
+$text['confirm-name']['pl-pl'] = "Wprowadź nazwę";
 $text['confirm-name']['pt-br'] = "Por favor indique: Nome"; //copied from pt-pt
 $text['confirm-name']['pt-pt'] = "Por favor indique: Nome";
 $text['confirm-name']['ro-ro'] = "";
@@ -308,7 +308,7 @@ $text['confirm-extension']['fr-fr'] = "Merci d'indiquer: Extension";
 $text['confirm-extension']['he-il'] = "";
 $text['confirm-extension']['it-it'] = "Prego fornire: Interno";
 $text['confirm-extension']['nl-nl'] = "Geef aub.: Toestel";
-$text['confirm-extension']['pl-pl'] = "";
+$text['confirm-extension']['pl-pl'] = "Wprowadź numer wewnętrzny";
 $text['confirm-extension']['pt-br'] = "Por favor indique: Extensão"; //copied from pt-pt
 $text['confirm-extension']['pt-pt'] = "Por favor indique: Extensão";
 $text['confirm-extension']['ro-ro'] = "";
@@ -329,7 +329,7 @@ $text['confirm-profile']['fr-fr'] = "Merci d'indiquer: Profile";
 $text['confirm-profile']['he-il'] = "";
 $text['confirm-profile']['it-it'] = "Prego fornire: Profilo";
 $text['confirm-profile']['nl-nl'] = "Geef aub.: Profiel";
-$text['confirm-profile']['pl-pl'] = "";
+$text['confirm-profile']['pl-pl'] = "Wprowadź profil";
 $text['confirm-profile']['pt-br'] = "Por favor indique: Perfil"; //copied from pt-pt
 $text['confirm-profile']['pt-pt'] = "Por favor indique: Perfil";
 $text['confirm-profile']['ro-ro'] = "";
@@ -350,7 +350,7 @@ $text['confirm-enabled']['fr-fr'] = "Merci d'indiquer: Actif";
 $text['confirm-enabled']['he-il'] = "";
 $text['confirm-enabled']['it-it'] = "Prego fornire: Abilitato";
 $text['confirm-enabled']['nl-nl'] = "Geef aub.: Aktief";
-$text['confirm-enabled']['pl-pl'] = "";
+$text['confirm-enabled']['pl-pl'] = "Wprowadź stan aktywacji";
 $text['confirm-enabled']['pt-br'] = "Por favor indique: Ativado"; //copied from pt-pt
 $text['confirm-enabled']['pt-pt'] = "Por favor indique: Ativado";
 $text['confirm-enabled']['ro-ro'] = "";
@@ -371,7 +371,7 @@ $text['label-conference-add']['fr-fr'] = "Ajouter des conférences";
 $text['label-conference-add']['he-il'] = "";
 $text['label-conference-add']['it-it'] = "Inserisci Conferenze";
 $text['label-conference-add']['nl-nl'] = "Conferentie toevoegen";
-$text['label-conference-add']['pl-pl'] = "";
+$text['label-conference-add']['pl-pl'] = "Dodaj Konferencje";
 $text['label-conference-add']['pt-br'] = "Adição de Conferências"; //copied from pt-pt
 $text['label-conference-add']['pt-pt'] = "Adição de Conferências";
 $text['label-conference-add']['ro-ro'] = "";
@@ -392,7 +392,7 @@ $text['label-conference-edit']['fr-fr'] = "Editer les conférences";
 $text['label-conference-edit']['he-il'] = "";
 $text['label-conference-edit']['it-it'] = "Modifica Conferenze";
 $text['label-conference-edit']['nl-nl'] = "Conferenties bewerken";
-$text['label-conference-edit']['pl-pl'] = "";
+$text['label-conference-edit']['pl-pl'] = "Edytuj Konferencje";
 $text['label-conference-edit']['pt-br'] = "Edição de Conferências"; //copied from pt-pt
 $text['label-conference-edit']['pt-pt'] = "Edição de Conferências";
 $text['label-conference-edit']['ro-ro'] = "";
@@ -413,7 +413,7 @@ $text['label-extension']['fr-fr'] = "Extension";
 $text['label-extension']['he-il'] = "";
 $text['label-extension']['it-it'] = "Interno";
 $text['label-extension']['nl-nl'] = "Toestel";
-$text['label-extension']['pl-pl'] = "";
+$text['label-extension']['pl-pl'] = "Numer Wewnętrzny";
 $text['label-extension']['pt-br'] = "Extensão"; //copied from pt-pt
 $text['label-extension']['pt-pt'] = "Extensão";
 $text['label-extension']['ro-ro'] = "";
@@ -434,7 +434,7 @@ $text['description-name']['fr-fr'] = "Entrer le nom de la conférence.";
 $text['description-name']['he-il'] = "";
 $text['description-name']['it-it'] = "Inserisci il nome della conferenza.";
 $text['description-name']['nl-nl'] = "Voer conferentie naam in.";
-$text['description-name']['pl-pl'] = "";
+$text['description-name']['pl-pl'] = "Wprowadź nazwę konferencji.";
 $text['description-name']['pt-br'] = "Insira o nome da conferência."; //copied from pt-pt
 $text['description-name']['pt-pt'] = "Insira o nome da conferência.";
 $text['description-name']['ro-ro'] = "";
@@ -455,7 +455,7 @@ $text['description-extension']['fr-fr'] = "Entrer le numéro d'extension de la c
 $text['description-extension']['he-il'] = "";
 $text['description-extension']['it-it'] = "Inserisci il numero di interno della conferenza.";
 $text['description-extension']['nl-nl'] = "Voer het conferentie toestel nummer in.";
-$text['description-extension']['pl-pl'] = "";
+$text['description-extension']['pl-pl'] = "Wprowadź numer wewnętrzny konferencji.";
 $text['description-extension']['pt-br'] = "Insira a extensão da conferência"; //copied from pt-pt
 $text['description-extension']['pt-pt'] = "Insira a extensão da conferência";
 $text['description-extension']['ro-ro'] = "";
@@ -476,7 +476,7 @@ $text['description-3']['fr-fr'] = "Superviser et interagir avec la salle de conf
 $text['description-3']['he-il'] = "";
 $text['description-3']['it-it'] = "per monitorare e interagire con la stanza di conferenza.";
 $text['description-3']['nl-nl'] = "om de gespreksruimte te bewaken en gebruiken.";
-$text['description-3']['pl-pl'] = "";
+$text['description-3']['pl-pl'] = "monitoring i interakcja z salą konferencyjną";
 $text['description-3']['pt-br'] = "para monitorizar e interagir com a sala de conferências."; //copied from pt-pt
 $text['description-3']['pt-pt'] = "para monitorizar e interagir com a sala de conferências.";
 $text['description-3']['ro-ro'] = "";
@@ -497,7 +497,7 @@ $text['label-pin']['fr-fr'] = "Code Pin";
 $text['label-pin']['he-il'] = "";
 $text['label-pin']['it-it'] = "PIN";
 $text['label-pin']['nl-nl'] = "PIN";
-$text['label-pin']['pl-pl'] = "";
+$text['label-pin']['pl-pl'] = "Numer PIN";
 $text['label-pin']['pt-br'] = "Código Pin"; //copied from pt-pt
 $text['label-pin']['pt-pt'] = "Código Pin";
 $text['label-pin']['ro-ro'] = "";
@@ -518,7 +518,7 @@ $text['description-pin']['fr-fr'] = "Numéro d'identifiant pour sécuriser l'acc
 $text['description-pin']['he-il'] = "";
 $text['description-pin']['it-it'] = "PIN opzionale per proteggere l'accesso alla conferenza.";
 $text['description-pin']['nl-nl'] = "Optionele PIN code om de gespreksruimte te beveiligen.";
-$text['description-pin']['pl-pl'] = "";
+$text['description-pin']['pl-pl'] = "Opcjonalny numer PIN dla zabezpieczenia dostępu do konferencji.";
 $text['description-pin']['pt-br'] = "Código pin opcional para garantir o acesso à conferência."; //copied from pt-pt
 $text['description-pin']['pt-pt'] = "Código pin opcional para garantir o acesso à conferência.";
 $text['description-pin']['ro-ro'] = "";
@@ -526,6 +526,48 @@ $text['description-pin']['ru-ru'] = "Дополнительный PIN номер
 $text['description-pin']['sv-se'] = "Frivilligt pin nummer för att säkra tillgången till konferensen.";
 $text['description-pin']['uk-ua'] = "";
 
+$text['label-email_address']['en-us'] = "Email Address";
+$text['label-email_address']['en-gb'] = "Email Address";
+$text['label-email_address']['ar-eg'] = "البريد الإليكتروني";
+$text['label-email_address']['de-at'] = "Email Address"; //copied from de-de
+$text['label-email_address']['de-ch'] = "Email Address"; //copied from de-de
+$text['label-email_address']['de-de'] = "Email Address";
+$text['label-email_address']['es-cl'] = "Email Address";
+$text['label-email_address']['es-mx'] = "Email Address"; //copied from es-cl
+$text['label-email_address']['fr-ca'] = "Courriel"; //copied from fr-fr
+$text['label-email_address']['fr-fr'] = "Courriel";
+$text['label-email_address']['he-il'] = "אימייל";
+$text['label-email_address']['it-it'] = "Email Address";
+$text['label-email_address']['nl-nl'] = "E-mail Address";
+$text['label-email_address']['pl-pl'] = "Adres Email";
+$text['label-email_address']['pt-br'] = "Email Address"; //copied from pt-pt
+$text['label-email_address']['pt-pt'] = "Email Address";
+$text['label-email_address']['ro-ro'] = "Email Address";
+$text['label-email_address']['ru-ru'] = "Электронная Почта";
+$text['label-email_address']['sv-se'] = "E-post";
+$text['label-email_address']['uk-ua'] = "Електронна пошта";
+
+$text['description-email_address']['en-us'] = "Optional conference email address.";
+$text['description-email_address']['en-gb'] = "Optional conference email address.";
+$text['description-email_address']['ar-eg'] = "البريد الإليكتروني";
+$text['description-email_address']['de-at'] = "Optional conference email address."; //copied from de-de
+$text['description-email_address']['de-ch'] = "Optional conference email address."; //copied from de-de
+$text['description-email_address']['de-de'] = "Optional conference email address.";
+$text['description-email_address']['es-cl'] = "Optional conference email address.";
+$text['description-email_address']['es-mx'] = "Optional conference email address."; //copied from es-cl
+$text['description-email_address']['fr-ca'] = "Courriel"; //copied from fr-fr
+$text['description-email_address']['fr-fr'] = "Courriel";
+$text['description-email_address']['he-il'] = "אימייל";
+$text['description-email_address']['it-it'] = "Optional conference email address.";
+$text['description-email_address']['nl-nl'] = "Optional conference E-mail Address";
+$text['description-email_address']['pl-pl'] = "Opcjonalny adres email konferencji.";
+$text['description-email_address']['pt-br'] = "Optional conference email address."; //copied from pt-pt
+$text['description-email_address']['pt-pt'] = "Optional conference email address.";
+$text['description-email_address']['ro-ro'] = "Optional conference email address.";
+$text['description-email_address']['ru-ru'] = "Электронная Почта";
+$text['description-email_address']['sv-se'] = "E-post";
+$text['description-email_address']['uk-ua'] = "Електронна пошта";
+
 $text['confirm-delete-2']['en-us'] = "Do you really want to delete this?";
 $text['confirm-delete-2']['en-gb'] = "Do you really want to delete this?";
 $text['confirm-delete-2']['ar-eg'] = "";
@@ -539,7 +581,7 @@ $text['confirm-delete-2']['fr-fr'] = "Voulez-vous vraiment supprimer cela?";
 $text['confirm-delete-2']['he-il'] = "";
 $text['confirm-delete-2']['it-it'] = "Vuoi veramente cancellarlo?";
 $text['confirm-delete-2']['nl-nl'] = "Wil deze werkelijk verwijderen?";
-$text['confirm-delete-2']['pl-pl'] = "";
+$text['confirm-delete-2']['pl-pl'] = "Czy na pewno chcesz to usunąć?";
 $text['confirm-delete-2']['pt-br'] = "Deseja realmente apagar isto?"; //copied from pt-pt
 $text['confirm-delete-2']['pt-pt'] = "Deseja realmente apagar isto?";
 $text['confirm-delete-2']['ro-ro'] = "";
@@ -560,7 +602,7 @@ $text['description-info']['fr-fr'] = "";
 $text['description-info']['he-il'] = "";
 $text['description-info']['it-it'] = "Inserire la descrizione.";
 $text['description-info']['nl-nl'] = "Voer de omschrijving in.";
-$text['description-info']['pl-pl'] = "";
+$text['description-info']['pl-pl'] = "Wprowadź opis.";
 $text['description-info']['pt-br'] = "Insira a descrição."; //copied from pt-pt
 $text['description-info']['pt-pt'] = "Insira a descrição.";
 $text['description-info']['ro-ro'] = "";
@@ -581,7 +623,7 @@ $text['description-conference-enable']['fr-fr'] = "Choisir d'activer ou non la c
 $text['description-conference-enable']['he-il'] = "";
 $text['description-conference-enable']['it-it'] = "Selezionare per abilitare o disabilitare la conferenza.";
 $text['description-conference-enable']['nl-nl'] = "Kies om de conferentie aan/uit te zetten";
-$text['description-conference-enable']['pl-pl'] = "";
+$text['description-conference-enable']['pl-pl'] = "Wybierz czy aktywować czy dezaktywować konferencję.";
 $text['description-conference-enable']['pt-br'] = "Seleccione se deseja ativar ou desativar a conferência."; //copied from pt-pt
 $text['description-conference-enable']['pt-pt'] = "Seleccione se deseja ativar ou desativar a conferência.";
 $text['description-conference-enable']['ro-ro'] = "";
@@ -602,7 +644,7 @@ $text['description-order']['fr-fr'] = "Entrer le numéro d'ordre.";
 $text['description-order']['he-il'] = "";
 $text['description-order']['it-it'] = "Inserire il numero d'ordine.";
 $text['description-order']['nl-nl'] = "Voer volgorde nummer in.";
-$text['description-order']['pl-pl'] = "";
+$text['description-order']['pl-pl'] = "Wprowadź numer kolejności.";
 $text['description-order']['pt-br'] = "Digite o número do pedido."; //copied from pt-pt
 $text['description-order']['pt-pt'] = "Digite o número do pedido.";
 $text['description-order']['ro-ro'] = "";
@@ -610,8 +652,8 @@ $text['description-order']['ru-ru'] = "Введите номер заказа.";
 $text['description-order']['sv-se'] = "Ange ordnings numret.";
 $text['description-order']['uk-ua'] = "";
 
-$text['description-user-add']['en-us'] = "Assign the users that are can manage this conference extension.";
-$text['description-user-add']['en-gb'] = "Assign the users that are can manage this conference extension.";
+$text['description-user-add']['en-us'] = "Assign the users that can manage this conference extension.";
+$text['description-user-add']['en-gb'] = "Assign the users that can manage this conference extension.";
 $text['description-user-add']['ar-eg'] = "";
 $text['description-user-add']['de-at'] = "Wählen Sie die Benutzer aus, welche die Konferenz administrieren können."; //copied from de-de
 $text['description-user-add']['de-ch'] = "Wählen Sie die Benutzer aus, welche die Konferenz administrieren können."; //copied from de-de
@@ -623,7 +665,7 @@ $text['description-user-add']['fr-fr'] = "Wählen Sie die Benutzer aus, welche d
 $text['description-user-add']['he-il'] = "";
 $text['description-user-add']['it-it'] = "Imposta gli utenti che possono gestire questa conferenza.";
 $text['description-user-add']['nl-nl'] = "Wijs de gebruikers die deze conferentie ruimte kunnen beheren.";
-$text['description-user-add']['pl-pl'] = "";
+$text['description-user-add']['pl-pl'] = "Przypisz użytkowników, którzy mogą zarządzać numerami wewnętrznymi konferencji.";
 $text['description-user-add']['pt-br'] = "Atribuir utilizadores que podem gerir esta extensão de conferência."; //copied from pt-pt
 $text['description-user-add']['pt-pt'] = "Atribuir utilizadores que podem gerir esta extensão de conferência.";
 $text['description-user-add']['ro-ro'] = "";
@@ -644,7 +686,7 @@ $text['description-profile']['fr-fr'] = "Le profile de la conférence est une li
 $text['description-profile']['he-il'] = "";
 $text['description-profile']['it-it'] = "Il Profilo Conferenza è un insieme di parametri della conferenza.";
 $text['description-profile']['nl-nl'] = "Conferentie profiel is een verzameling instellingen voor deze conferentie.";
-$text['description-profile']['pl-pl'] = "";
+$text['description-profile']['pl-pl'] = "Profil Konferencji jest zbiorem ustawien dla konferencji.";
 $text['description-profile']['pt-br'] = "Perfil de conferência é um conjunto de definições para a conferência."; //copied from pt-pt
 $text['description-profile']['pt-pt'] = "Perfil de conferência é um conjunto de definições para a conferência.";
 $text['description-profile']['ro-ro'] = "";
@@ -665,7 +707,7 @@ $text['description-flags']['fr-fr'] = "Flags Optionnels de la conférence. exemp
 $text['description-flags']['he-il'] = "";
 $text['description-flags']['it-it'] = "Flag opzionali per la conferenza. es. : mute|deaf|waste|moderator";
 $text['description-flags']['nl-nl'] = "Optionele conferentie instellingen, voorbeeld: mute|deaf|waste|moderator";
-$text['description-flags']['pl-pl'] = "";
+$text['description-flags']['pl-pl'] = "Opcjonalne flagi konferencji. Przykłady: mute|deaf|waste|moderator";
 $text['description-flags']['pt-br'] = "Flags opcionais de conferências. Exemplos: mute|deaf|waste|moderator"; //copied from pt-pt
 $text['description-flags']['pt-pt'] = "Flags opcionais de conferências. Exemplos: mute|deaf|waste|moderator";
 $text['description-flags']['ro-ro'] = "";
@@ -673,6 +715,27 @@ $text['description-flags']['ru-ru'] = "Дополнительные флаги 
 $text['description-flags']['sv-se'] = "Valfria konferensflaggor. Exempel: mute|deaf|waste|moderator";
 $text['description-flags']['uk-ua'] = "";
 
+$text['description-account_code']['en-us'] = "Enter the account code here.";
+$text['description-account_code']['en-gb'] = "Enter the account code here.";
+$text['description-account_code']['ar-eg'] = "";
+$text['description-account_code']['de-at'] = "Geben Sie den Account Code hier an."; //copied from de-de
+$text['description-account_code']['de-ch'] = "Geben Sie den Account Code hier an."; //copied from de-de
+$text['description-account_code']['de-de'] = "Geben Sie den Account Code hier an.";
+$text['description-account_code']['es-cl'] = "Ingrese el código de cuenta aquí.";
+$text['description-account_code']['es-mx'] = "Ingrese el código de cuenta aquí."; //copied from es-cl
+$text['description-account_code']['fr-ca'] = "Entrez le code de compte ici.";
+$text['description-account_code']['fr-fr'] = "Entrez le code de compte ici.";
+$text['description-account_code']['he-il'] = "";
+$text['description-account_code']['it-it'] = "Inserire qui l'account code.";
+$text['description-account_code']['nl-nl'] = "Voer de accountcode hier in.";
+$text['description-account_code']['pl-pl'] = "Wpisz numer billingowy (nagłówek dodany do SIP INVITE).";
+$text['description-account_code']['pt-br'] = "Insira o código de conta aqui.";
+$text['description-account_code']['pt-pt'] = "Introduza o código de conta aqui.";
+$text['description-account_code']['ro-ro'] = "";
+$text['description-account_code']['ru-ru'] = "Введите здесь код счета.";
+$text['description-account_code']['sv-se'] = "Ange 'account code' här.";
+$text['description-account_code']['uk-ua'] = "";
+
 $text['label-user_list']['en-us'] = "User List";
 $text['label-user_list']['en-gb'] = "User List";
 $text['label-user_list']['ar-eg'] = "";
@@ -686,7 +749,7 @@ $text['label-user_list']['fr-fr'] = "Liste des utilisateurs";
 $text['label-user_list']['he-il'] = "";
 $text['label-user_list']['it-it'] = "Lista Utenti";
 $text['label-user_list']['nl-nl'] = "Gebruikerslijst";
-$text['label-user_list']['pl-pl'] = "";
+$text['label-user_list']['pl-pl'] = "Lista Użytkowników";
 $text['label-user_list']['pt-br'] = "Lista de usuários"; //copied from pt-pt
 $text['label-user_list']['pt-pt'] = "Lista de usuários";
 $text['label-user_list']['ro-ro'] = "";
@@ -707,7 +770,7 @@ $text['label-flags']['fr-fr'] = "Drapeaux";
 $text['label-flags']['he-il'] = "";
 $text['label-flags']['it-it'] = "Flags";
 $text['label-flags']['nl-nl'] = "Attributen";
-$text['label-flags']['pl-pl'] = "";
+$text['label-flags']['pl-pl'] = "Flagi";
 $text['label-flags']['pt-br'] = "Bandeiras"; //copied from pt-pt
 $text['label-flags']['pt-pt'] = "Bandeiras";
 $text['label-flags']['ro-ro'] = "";
@@ -715,4 +778,25 @@ $text['label-flags']['ru-ru'] = "Флаги";
 $text['label-flags']['sv-se'] = "Flaggor";
 $text['label-flags']['uk-ua'] = "";
 
+$text['label-account_code']['en-us'] = "Account Code";
+$text['label-account_code']['en-gb'] = "Account Code";
+$text['label-account_code']['ar-eg'] = "";
+$text['label-account_code']['de-at'] = "Kontoschlüssel"; //copied from de-de
+$text['label-account_code']['de-ch'] = "Kontoschlüssel"; //copied from de-de
+$text['label-account_code']['de-de'] = "Kontoschlüssel";
+$text['label-account_code']['es-cl'] = "Código de Cuenta";
+$text['label-account_code']['es-mx'] = "Código de Cuenta"; //copied from es-cl
+$text['label-account_code']['fr-ca'] = "Centre de frais"; //copied from fr-fr
+$text['label-account_code']['fr-fr'] = "Centre de frais";
+$text['label-account_code']['he-il'] = "קוד חשבון";
+$text['label-account_code']['it-it'] = "Account Code";
+$text['label-account_code']['nl-nl'] = "Accountcode";
+$text['label-account_code']['pl-pl'] = "Numer konta billingowego";
+$text['label-account_code']['pt-br'] = "Código de conta";
+$text['label-account_code']['pt-pt'] = "Código de Conta";
+$text['label-account_code']['ro-ro'] = "";
+$text['label-account_code']['ru-ru'] = "Код Учетной Записи";
+$text['label-account_code']['sv-se'] = "Kontokod";
+$text['label-account_code']['uk-ua'] = "";
+
 ?>
diff --git a/app/conferences/conference_edit.php b/app/conferences/conference_edit.php
index 0bd7508cd3..4d5c30212e 100644
--- a/app/conferences/conference_edit.php
+++ b/app/conferences/conference_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):
@@ -59,6 +59,8 @@
 		$conference_pin_number = $_POST["conference_pin_number"];
 		$conference_profile = $_POST["conference_profile"];
 		$conference_flags = $_POST["conference_flags"];
+		$conference_email_address = $_POST["conference_email_address"];
+		$conference_account_code = $_POST["conference_account_code"];
 		$conference_order = $_POST["conference_order"];
 		$conference_description = $_POST["conference_description"];
 		$conference_enabled = $_POST["conference_enabled"];
@@ -182,6 +184,12 @@
 					$array['conferences'][0]['conference_pin_number'] = $conference_pin_number;
 					$array['conferences'][0]['conference_profile'] = $conference_profile;
 					$array['conferences'][0]['conference_flags'] = $conference_flags;
+					if (permission_exists('conference_email_address')) {
+						$array['conferences'][0]['conference_email_address'] = $conference_email_address;
+					}
+					if (permission_exists('conference_account_code')) {
+						$array['conferences'][0]['conference_account_code'] = $conference_account_code;
+					}
 					$array['conferences'][0]['conference_order'] = $conference_order;
 					$array['conferences'][0]['conference_description'] = $conference_description;
 					$array['conferences'][0]['conference_enabled'] = $conference_enabled;
@@ -275,6 +283,8 @@
 			$conference_pin_number = $row["conference_pin_number"];
 			$conference_profile = $row["conference_profile"];
 			$conference_flags = $row["conference_flags"];
+			$conference_email_address = $row["conference_email_address"];
+			$conference_account_code = $row["conference_account_code"];
 			$conference_order = $row["conference_order"];
 			$conference_description = $row["conference_description"];
 			$conference_enabled = $row["conference_enabled"];
@@ -452,6 +462,32 @@
 	echo "</td>\n";
 	echo "</tr>\n";
 
+	if (permission_exists('conference_email_address')) {
+		echo "<tr>\n";
+		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+		echo "	".$text['label-email_address']."\n";
+		echo "</td>\n";
+		echo "<td class='vtable' align='left'>\n";
+		echo "	<input class='formfld' type='text' name='conference_email_address' maxlength='255' value=\"".escape($conference_email_address)."\">\n";
+		echo "<br />\n";
+		echo "".$text['description-email_address']."\n";
+		echo "</td>\n";
+		echo "</tr>\n";
+	}
+
+	if (permission_exists('conference_account_code')) {
+		echo "<tr>\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='conference_account_code' maxlength='255' value=\"".escape($conference_account_code)."\">\n";
+		echo "<br />\n";
+		echo "".$text['description-account_code']."\n";
+		echo "</td>\n";
+		echo "</tr>\n";
+	}
+
 	echo "<tr>\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
 	echo "	".$text['label-order']."\n";
diff --git a/app/conferences/conferences.php b/app/conferences/conferences.php
index f34e12df1d..38a6add73c 100644
--- a/app/conferences/conferences.php
+++ b/app/conferences/conferences.php
@@ -97,7 +97,11 @@
 	if (if_group("superadmin") || if_group("admin")) {
 		//show all extensions
 		$sql = "select count(*) from v_conferences ";
-		$sql .= "where domain_uuid = :domain_uuid ";
+		$sql .= "where true ";
+		if ($_GET['show'] != "all" || !permission_exists('conference_all')) {
+			$sql .= "and (domain_uuid = :domain_uuid or domain_uuid is null) ";
+			$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+		}
 	}
 	else {
 		//show only assigned extensions
@@ -108,13 +112,15 @@
 		$parameters['user_uuid'] = $_SESSION['user_uuid'];
 	}
 	$sql .= $sql_search;
-	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 	$database = new database;
 	$num_rows = $database->select($sql, $parameters, 'column');
 
 //prepare to page the results
 	$rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50;
-	$param = "&search=".$search;
+	$param = "&search=".urlencode($search);
+	if ($_GET['show'] == "all" && permission_exists('conference_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);
@@ -148,18 +154,26 @@
 		echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add'],'id'=>'btn_add','link'=>'conference_edit.php']);
 	}
 	if (permission_exists('conference_add') && $conferences) {
-		echo button::create(['type'=>'button','label'=>$text['button-copy'],'icon'=>$_SESSION['theme']['button_icon_copy'],'name'=>'btn_copy','onclick'=>"modal_open('modal-copy','btn_copy');"]);
+		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('conference_edit') && $conferences) {
-		echo button::create(['type'=>'button','label'=>$text['button-toggle'],'icon'=>$_SESSION['theme']['button_icon_toggle'],'name'=>'btn_toggle','onclick'=>"modal_open('modal-toggle','btn_toggle');"]);
+		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('conference_delete') && $conferences) {
-		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 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";
-	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'=>'conferences.php','style'=>($search == '' ? 'display: none;' : null)]);
+	if (permission_exists('conference_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=&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=''>";
+	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search']);
+	//echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'conferences.php','style'=>($search == '' ? 'display: none;' : null)]);
 	if ($paging_controls_mini != '') {
 		echo 	"<span style='margin-left: 15px;'>".$paging_controls_mini."</span>";
 	}
@@ -189,9 +203,12 @@
 	echo "<tr class='list-header'>\n";
 	if (permission_exists('conference_add') || permission_exists('conference_edit') || permission_exists('conference_delete')) {
 		echo "	<th class='checkbox'>\n";
-		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle();' ".($conferences ?: "style='visibility: hidden;'").">\n";
+		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle(); checkbox_on_change(this);' ".($conferences ?: "style='visibility: hidden;'").">\n";
 		echo "	</th>\n";
 	}
+	if ($_GET['show'] == "all" && permission_exists('conference_all')) {
+		echo th_order_by('domain_name', $text['label-domain'], $order_by, $order, $param, "class='shrink'");
+	}
 	echo th_order_by('conference_name', $text['table-name'], $order_by, $order);
 	echo th_order_by('conference_extension', $text['table-extension'], $order_by, $order);
 	echo th_order_by('conference_profile', $text['table-profile'], $order_by, $order);
@@ -212,10 +229,19 @@
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('conference_add') || permission_exists('conference_edit') || permission_exists('conference_delete')) {
 				echo "	<td class='checkbox'>\n";
-				echo "		<input type='checkbox' name='conferences[$x][checked]' id='checkbox_".$x."' value='true' onclick=\"if (!this.checked) { document.getElementById('checkbox_all').checked = false; }\">\n";
+				echo "		<input type='checkbox' name='conferences[$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='conferences[$x][uuid]' value='".escape($row['conference_uuid'])."' />\n";
 				echo "	</td>\n";
 			}
+			if ($_GET['show'] == "all" && permission_exists('conference_all')) {
+				if (strlen($_SESSION['domains'][$row['domain_uuid']]['domain_name']) > 0) {
+					$domain = $_SESSION['domains'][$row['domain_uuid']]['domain_name'];
+				}
+				else {
+					$domain = $text['label-global'];
+				}
+				echo "	<td>".escape($domain)."</td>\n";
+			}
 			echo "	<td><a href='".$list_row_url."'>".str_replace('-', ' ', $row['conference_name'])."</a>&nbsp;</td>\n";
 			echo "	<td>".escape($row['conference_extension'])."&nbsp;</td>\n";
 			echo "	<td>".escape($row['conference_profile'])."&nbsp;</td>\n";
@@ -251,4 +277,4 @@
 //include the footer
 	require_once "resources/footer.php";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/contacts/app_config.php b/app/contacts/app_config.php
index c3294676e5..1adbf8f90b 100644
--- a/app/contacts/app_config.php
+++ b/app/contacts/app_config.php
@@ -5,7 +5,7 @@
 		$apps[$x]['uuid'] = "04481e0e-a478-c559-adad-52bd4174574c";
 		$apps[$x]['category'] = "CRM";
 		$apps[$x]['subcategory'] = "";
-		$apps[$x]['version'] = "1.1";
+		$apps[$x]['version'] = "2.0";
 		$apps[$x]['license'] = "Mozilla Public License 1.1";
 		$apps[$x]['contact_url'] = "http://www.fusionpbx.com";
 		$apps[$x]['description']['en-us'] = "Provides a place to store contact information for individuals and organizations.";
@@ -48,6 +48,9 @@
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "contact_all";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "contact_upload";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
@@ -459,6 +462,10 @@
 		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = "contact_uuid";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "phone_label";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Custom label for the number";
+		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "phone_type_voice";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "numeric";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Number is used for voice calls.";
@@ -475,13 +482,13 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "numeric";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Number is used for text messages.";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = "phone_label";
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "phone_speed_dial";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Custom label for the number";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the speed dial.";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = "phone_primary";
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "phone_country_code";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "numeric";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Designate a primary number.";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the country code.";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "phone_number";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
@@ -491,10 +498,11 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the extension.";
 		$z++;
-		$apps[$x]['db'][$y]['fields'][$z]['name'] = "phone_speed_dial";
-		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
-		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the speed dial.";
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "phone_primary";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "numeric";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Designate a primary number.";
 		$z++;
+		
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "phone_description";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the description.";
@@ -943,5 +951,12 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Define the allowed file attachment extensions and their mime types in a JSON array.";
 		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "d8998b7f-c27c-43ac-ad1b-a9c66187bb10";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "contact";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "permissions";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "boolean";
+		$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'] = "";
 
 ?>
diff --git a/app/contacts/app_defaults.php b/app/contacts/app_defaults.php
index 4d87492e89..b037cacee0 100644
--- a/app/contacts/app_defaults.php
+++ b/app/contacts/app_defaults.php
@@ -87,7 +87,7 @@ if ($domains_processed == 1) {
 					$database = new database;
 					$database->app_name = 'contacts';
 					$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
-					$database->save($array);
+					$database->save($array, false);
 					unset($array);
 
 					$p->delete('contact_email_add', 'temp');
@@ -148,7 +148,7 @@ if ($domains_processed == 1) {
 					$database = new database;
 					$database->app_name = 'contacts';
 					$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
-					$database->save($array);
+					$database->save($array, false);
 					unset($array);
 
 					$p->delete('contact_url_add', 'temp');
@@ -213,7 +213,7 @@ if ($domains_processed == 1) {
 				$database = new database;
 				$database->app_name = 'contacts';
 				$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
-				$database->save($array);
+				$database->save($array, false);
 				unset($array);
 
 				$array['contact_groups'][0]['contact_group_uuid'] = $row["contact_group_uuid"];
@@ -233,4 +233,4 @@ if ($domains_processed == 1) {
 
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/app/contacts/app_languages.php b/app/contacts/app_languages.php
index a739bae454..a8f4e05a34 100644
--- a/app/contacts/app_languages.php
+++ b/app/contacts/app_languages.php
@@ -32,7 +32,7 @@ $text['title-contacts_import']['de-de'] = "Kontakte importieren";
 $text['title-contacts_import']['el-gr'] = "Εισαγωγή Επαφών";
 $text['title-contacts_import']['es-cl'] = "Importar Contactos";
 $text['title-contacts_import']['es-mx'] = "Importar Contactos"; //copied from es-cl
-$text['title-contacts_import']['fr-ca'] = "Importe des Contacts"; //copied from fr-fr
+$text['title-contacts_import']['fr-ca'] = "Importer Contacts";
 $text['title-contacts_import']['fr-fr'] = "Importe des Contacts";
 $text['title-contacts_import']['he-il'] = "ייבא אנשי קשר";
 $text['title-contacts_import']['it-it'] = "Importa Contatti";
@@ -76,8 +76,8 @@ $text['title-contact_properties']['de-de'] = "Contact Properties";
 $text['title-contact_properties']['el-gr'] = "Contact Properties";
 $text['title-contact_properties']['es-cl'] = "Contact Properties";
 $text['title-contact_properties']['es-mx'] = "Contact Properties";
-$text['title-contact_properties']['fr-ca'] = "Contact Properties";
-$text['title-contact_properties']['fr-fr'] = "Contact Properties";
+$text['title-contact_properties']['fr-ca'] = "Propriétés de Contact";
+$text['title-contact_properties']['fr-fr'] = "Propriétés de Contact";
 $text['title-contact_properties']['he-il'] = "Contact Properties";
 $text['title-contact_properties']['it-it'] = "Contact Properties";
 $text['title-contact_properties']['nl-nl'] = "Contact Properties";
@@ -98,7 +98,7 @@ $text['title-contact_email-edit']['de-de'] = "Email des Kontakts bearbeiten";
 $text['title-contact_email-edit']['el-gr'] = "Επεξεργασία e-mail επαφής";
 $text['title-contact_email-edit']['es-cl'] = "Correo electrónico de contacto Editar";
 $text['title-contact_email-edit']['es-mx'] = "Correo electrónico de contacto Editar"; //copied from es-cl
-$text['title-contact_email-edit']['fr-ca'] = "Contact Courriel Modifier"; //copied from fr-fr
+$text['title-contact_email-edit']['fr-ca'] = "Courriel de Contact Modifier";
 $text['title-contact_email-edit']['fr-fr'] = "Contact Courriel Modifier";
 $text['title-contact_email-edit']['he-il'] = "";
 $text['title-contact_email-edit']['it-it'] = "Modifica Email Contatto";
@@ -120,7 +120,7 @@ $text['title-contact_email-add']['de-de'] = "Email zum Kontakt hinzufügen";
 $text['title-contact_email-add']['el-gr'] = "Προσθήκη e-mail επαφής";
 $text['title-contact_email-add']['es-cl'] = "Correo electrónico de contacto Agregar";
 $text['title-contact_email-add']['es-mx'] = "Correo electrónico de contacto Agregar"; //copied from es-cl
-$text['title-contact_email-add']['fr-ca'] = "Contactez-mail Ajouter"; //copied from fr-fr
+$text['title-contact_email-add']['fr-ca'] = "Courriel de Contact Ajouter";
 $text['title-contact_email-add']['fr-fr'] = "Contactez-mail Ajouter";
 $text['title-contact_email-add']['he-il'] = "";
 $text['title-contact_email-add']['it-it'] = "Inserisci Email Contatto";
@@ -142,7 +142,7 @@ $text['title-contact_url-edit']['de-de'] = "URL bearbeiten";
 $text['title-contact_url-edit']['el-gr'] = "Επεξεργασία συνδέσμου URL επαφής";
 $text['title-contact_url-edit']['es-cl'] = "Correo electrónico de contacto Editar";
 $text['title-contact_url-edit']['es-mx'] = "Correo electrónico de contacto Editar"; //copied from es-cl
-$text['title-contact_url-edit']['fr-ca'] = "Contact Courriel Modifier"; //copied from fr-fr
+$text['title-contact_url-edit']['fr-ca'] = "URL de Contact Modifier";
 $text['title-contact_url-edit']['fr-fr'] = "Contact Courriel Modifier";
 $text['title-contact_url-edit']['he-il'] = "";
 $text['title-contact_url-edit']['it-it'] = "Modifica URL Contatto";
@@ -164,7 +164,7 @@ $text['title-contact_url-add']['de-de'] = "URL hinzufügen";
 $text['title-contact_url-add']['el-gr'] = "Προσθήκη συνδέσμου URL επαφής";
 $text['title-contact_url-add']['es-cl'] = "Correo electrónico de contacto Agregar";
 $text['title-contact_url-add']['es-mx'] = "Correo electrónico de contacto Agregar"; //copied from es-cl
-$text['title-contact_url-add']['fr-ca'] = "Contactez-mail Ajouter"; //copied from fr-fr
+$text['title-contact_url-add']['fr-ca'] = "URL de Contact Ajouter";
 $text['title-contact_url-add']['fr-fr'] = "Contactez-mail Ajouter";
 $text['title-contact_url-add']['he-il'] = "";
 $text['title-contact_url-add']['it-it'] = "Inserisci URL Contatto";
@@ -274,7 +274,7 @@ $text['title-contact_relation']['de-de'] = "Beziehung";
 $text['title-contact_relation']['el-gr'] = "Συσχετίσεις Επαφών";
 $text['title-contact_relation']['es-cl'] = "Contacto Relación";
 $text['title-contact_relation']['es-mx'] = "Contacto Relación"; //copied from es-cl
-$text['title-contact_relation']['fr-ca'] = "Contactez Relation"; //copied from fr-fr
+$text['title-contact_relation']['fr-ca'] = "Relation de Contact";
 $text['title-contact_relation']['fr-fr'] = "Contactez Relation";
 $text['title-contact_relation']['he-il'] = "";
 $text['title-contact_relation']['it-it'] = "Relazioni Contatto";
@@ -296,7 +296,7 @@ $text['title-contact_phones-edit']['de-de'] = "Nummer bearbeiten";
 $text['title-contact_phones-edit']['el-gr'] = "Επεξεργασία Αριθμού Επαφής";
 $text['title-contact_phones-edit']['es-cl'] = "Editar Número de Contacto";
 $text['title-contact_phones-edit']['es-mx'] = "Editar Número de Contacto"; //copied from es-cl
-$text['title-contact_phones-edit']['fr-ca'] = "Editer le téléphone du Contact"; //copied from fr-fr
+$text['title-contact_phones-edit']['fr-ca'] = "Numéro de Contact Modifier";
 $text['title-contact_phones-edit']['fr-fr'] = "Editer le téléphone du Contact";
 $text['title-contact_phones-edit']['he-il'] = "";
 $text['title-contact_phones-edit']['it-it'] = "Modifica Numero Contatto";
@@ -318,7 +318,7 @@ $text['title-contact_phones-add']['de-de'] = "Nummer hinzufügen";
 $text['title-contact_phones-add']['el-gr'] = "Προσθήκη Αριθμού Επαφής";
 $text['title-contact_phones-add']['es-cl'] = "Agregar Número de Contacto";
 $text['title-contact_phones-add']['es-mx'] = "Agregar Número de Contacto"; //copied from es-cl
-$text['title-contact_phones-add']['fr-ca'] = "Ajouter un téléphone au Contact"; //copied from fr-fr
+$text['title-contact_phones-add']['fr-ca'] = "Numéro de Contact Ajouter";
 $text['title-contact_phones-add']['fr-fr'] = "Ajouter un téléphone au Contact";
 $text['title-contact_phones-add']['he-il'] = "";
 $text['title-contact_phones-add']['it-it'] = "Inserire Numero Contatto";
@@ -340,7 +340,7 @@ $text['title-contact_notes-edit']['de-de'] = "Notiz bearbeiten";
 $text['title-contact_notes-edit']['el-gr'] = "Επεξεργασία Σημείωσης Επαφής";
 $text['title-contact_notes-edit']['es-cl'] = "Editar Nota de Contactos";
 $text['title-contact_notes-edit']['es-mx'] = "Editar Nota de Contactos"; //copied from es-cl
-$text['title-contact_notes-edit']['fr-ca'] = "Editer la note du contact"; //copied from fr-fr
+$text['title-contact_notes-edit']['fr-ca'] = "Note du Contact Modifier";
 $text['title-contact_notes-edit']['fr-fr'] = "Editer la note du contact";
 $text['title-contact_notes-edit']['he-il'] = "";
 $text['title-contact_notes-edit']['it-it'] = "Modifica Note Contatto";
@@ -384,7 +384,7 @@ $text['title-contact_addresses-edit']['de-de'] = "Adresse bearbeiten";
 $text['title-contact_addresses-edit']['el-gr'] = "Επεξεργασία Διεύθυνσης Επαφής";
 $text['title-contact_addresses-edit']['es-cl'] = "Editar Dirección de Contacto";
 $text['title-contact_addresses-edit']['es-mx'] = "Editar Dirección de Contacto"; //copied from es-cl
-$text['title-contact_addresses-edit']['fr-ca'] = "Editer l'adresse du contact"; //copied from fr-fr
+$text['title-contact_addresses-edit']['fr-ca'] = "Modifier l'adresse du contact";
 $text['title-contact_addresses-edit']['fr-fr'] = "Editer l'adresse du contact";
 $text['title-contact_addresses-edit']['he-il'] = "";
 $text['title-contact_addresses-edit']['it-it'] = "Modifica Indirizzo Contatto";
@@ -428,8 +428,8 @@ $text['title-contact_attachment-edit']['de-de'] = "";
 $text['title-contact_attachment-edit']['el-gr'] = "Επεξεργασία Επισύναψης Επαφής";
 $text['title-contact_attachment-edit']['es-cl'] = "";
 $text['title-contact_attachment-edit']['es-mx'] = "";
-$text['title-contact_attachment-edit']['fr-ca'] = "";
-$text['title-contact_attachment-edit']['fr-fr'] = "";
+$text['title-contact_attachment-edit']['fr-ca'] = "Pièce jointe de Contact Modifier";
+$text['title-contact_attachment-edit']['fr-fr'] = "Pièce jointe de Contact Modifier";
 $text['title-contact_attachment-edit']['he-il'] = "";
 $text['title-contact_attachment-edit']['it-it'] = "";
 $text['title-contact_attachment-edit']['nl-nl'] = "Kontact aanhangsel bewerken";
@@ -450,8 +450,8 @@ $text['title-contact_attachment-add']['de-de'] = "";
 $text['title-contact_attachment-add']['el-gr'] = "Προσθήκη Επισύναψης Επαφής";
 $text['title-contact_attachment-add']['es-cl'] = "";
 $text['title-contact_attachment-add']['es-mx'] = "";
-$text['title-contact_attachment-add']['fr-ca'] = "";
-$text['title-contact_attachment-add']['fr-fr'] = "";
+$text['title-contact_attachment-add']['fr-ca'] = "Pièce jointe de Contact Ajouter";
+$text['title-contact_attachment-add']['fr-fr'] = "Pièce jointe de Contact Ajouter";
 $text['title-contact_attachment-add']['he-il'] = "";
 $text['title-contact_attachment-add']['it-it'] = "";
 $text['title-contact_attachment-add']['nl-nl'] = "Kontact aanhangsel toevoegen";
@@ -516,7 +516,7 @@ $text['option-work']['de-de'] = "Arbeit";
 $text['option-work']['el-gr'] = "Εργασία";
 $text['option-work']['es-cl'] = "Lugar de Trabajo";
 $text['option-work']['es-mx'] = "Lugar de Trabajo"; //copied from es-cl
-$text['option-work']['fr-ca'] = "En Milieu de Travail"; //copied from fr-fr
+$text['option-work']['fr-ca'] = "Travail";
 $text['option-work']['fr-fr'] = "En Milieu de Travail";
 $text['option-work']['he-il'] = "עבודה";
 $text['option-work']['it-it'] = "Lavoro";
@@ -560,7 +560,7 @@ $text['option-true']['de-de'] = "Ein";
 $text['option-true']['el-gr'] = "Ναι";
 $text['option-true']['es-cl'] = "Verdadero";
 $text['option-true']['es-mx'] = "Verdadero"; //copied from es-cl
-$text['option-true']['fr-ca'] = "Oui"; //copied from fr-fr
+$text['option-true']['fr-ca'] = "vrai";
 $text['option-true']['fr-fr'] = "Oui";
 $text['option-true']['he-il'] = "חוקי";
 $text['option-true']['it-it'] = "Vero";
@@ -846,8 +846,8 @@ $text['option-intl']['de-de'] = "International";
 $text['option-intl']['el-gr'] = "Διεθνής";
 $text['option-intl']['es-cl'] = "Internacional";
 $text['option-intl']['es-mx'] = "Internacional"; //copied from es-cl
-$text['option-intl']['fr-ca'] = "international"; //copied from fr-fr
-$text['option-intl']['fr-fr'] = "international";
+$text['option-intl']['fr-ca'] = "International"; //copied from fr-fr
+$text['option-intl']['fr-fr'] = "International";
 $text['option-intl']['he-il'] = "בילאומי";
 $text['option-intl']['it-it'] = "Internazionale";
 $text['option-intl']['nl-nl'] = "Internationaal";
@@ -912,7 +912,7 @@ $text['option-home']['de-de'] = "Privat";
 $text['option-home']['el-gr'] = "Αρχική";
 $text['option-home']['es-cl'] = "Casa";
 $text['option-home']['es-mx'] = "Casa"; //copied from es-cl
-$text['option-home']['fr-ca'] = "Maison"; //copied from fr-fr
+$text['option-home']['fr-ca'] = "Domicile";
 $text['option-home']['fr-fr'] = "Maison";
 $text['option-home']['he-il'] = "בית";
 $text['option-home']['it-it'] = "Casa";
@@ -956,7 +956,7 @@ $text['option-false']['de-de'] = "Aus";
 $text['option-false']['el-gr'] = "Όχι";
 $text['option-false']['es-cl'] = "Falso";
 $text['option-false']['es-mx'] = "Falso"; //copied from es-cl
-$text['option-false']['fr-ca'] = "Non"; //copied from fr-fr
+$text['option-false']['fr-ca'] = "Faux";
 $text['option-false']['fr-fr'] = "Non";
 $text['option-false']['he-il'] = "לא חוקי";
 $text['option-false']['it-it'] = "Falso";
@@ -1313,7 +1313,7 @@ $text['message-update']['fr-fr'] = "Mis à jour";
 $text['message-update']['he-il'] = "העדכון הושלם";
 $text['message-update']['it-it'] = "Aggiornamento Completato";
 $text['message-update']['nl-nl'] = "Bijwerken gereed";
-$text['message-update']['pl-pl'] = "Zaktualizowano poprawnie";
+$text['message-update']['pl-pl'] = "Zaktualizowano pomyślnie";
 $text['message-update']['pt-br'] = "Atualização Efetuada";
 $text['message-update']['pt-pt'] = "Actualização Efectuada";
 $text['message-update']['ro-ro'] = "";
@@ -1423,7 +1423,7 @@ $text['message-delete']['fr-fr'] = "Supprimé";
 $text['message-delete']['he-il'] = "מחיקה הושלמה";
 $text['message-delete']['it-it'] = "Cancellazione Completata";
 $text['message-delete']['nl-nl'] = "Verwijderen gereed";
-$text['message-delete']['pl-pl'] = "Usunięto poprawnie";
+$text['message-delete']['pl-pl'] = "Usunięto pomyślnie";
 $text['message-delete']['pt-br'] = "Remoção Efetuada";
 $text['message-delete']['pt-pt'] = "Remoção Efectuada";
 $text['message-delete']['ro-ro'] = "";
@@ -1445,7 +1445,7 @@ $text['message-contacts_imported']['fr-fr'] = "Contacts Importés:";
 $text['message-contacts_imported']['he-il'] = "אנשי קשר יובאו";
 $text['message-contacts_imported']['it-it'] = "Contatti Importati:";
 $text['message-contacts_imported']['nl-nl'] = "Kontacten geimporteerd";
-$text['message-contacts_imported']['pl-pl'] = "Kontakty importowano poprawnie.";
+$text['message-contacts_imported']['pl-pl'] = "Zaimportowane kontakty:";
 $text['message-contacts_imported']['pt-br'] = "Contatos importados";
 $text['message-contacts_imported']['pt-pt'] = "Contatos Importados:";
 $text['message-contacts_imported']['ro-ro'] = "";
@@ -1467,7 +1467,7 @@ $text['message-add']['fr-fr'] = "Ajouté";
 $text['message-add']['he-il'] = "הוספה הושלמה";
 $text['message-add']['it-it'] = "Inserimento Completato";
 $text['message-add']['nl-nl'] = "Toevoegen gereed";
-$text['message-add']['pl-pl'] = "Dodano poprawnie";
+$text['message-add']['pl-pl'] = "Dodano pomyślnie";
 $text['message-add']['pt-br'] = "Criação Efetuada";
 $text['message-add']['pt-pt'] = "Adição Efectuada";
 $text['message-add']['ro-ro'] = "";
@@ -1616,7 +1616,7 @@ $text['label-url_address']['de-de'] = "Adresse";
 $text['label-url_address']['el-gr'] = "Διεύθυνση";
 $text['label-url_address']['es-cl'] = "Calle";
 $text['label-url_address']['es-mx'] = "Calle"; //copied from es-cl
-$text['label-url_address']['fr-ca'] = "Rue"; //copied from fr-fr
+$text['label-url_address']['fr-ca'] = "Adresse";
 $text['label-url_address']['fr-fr'] = "Rue";
 $text['label-url_address']['he-il'] = "כתובת";
 $text['label-url_address']['it-it'] = "Indirizzo";
@@ -1638,7 +1638,7 @@ $text['label-true']['de-de'] = "Ein";
 $text['label-true']['el-gr'] = "Ναι";
 $text['label-true']['es-cl'] = "Verdadero";
 $text['label-true']['es-mx'] = "Verdadero"; //copied from es-cl
-$text['label-true']['fr-ca'] = "Oui"; //copied from fr-fr
+$text['label-true']['fr-ca'] = "Vrai";
 $text['label-true']['fr-fr'] = "Oui";
 $text['label-true']['he-il'] = "חיובי";
 $text['label-true']['it-it'] = "Vero";
@@ -1682,7 +1682,7 @@ $text['label-time_timer']['de-de'] = "Timer";
 $text['label-time_timer']['el-gr'] = "Χρονοδιακόπτης";
 $text['label-time_timer']['es-cl'] = "Timer";
 $text['label-time_timer']['es-mx'] = "Timer"; //copied from es-cl
-$text['label-time_timer']['fr-ca'] = "Minuteur"; //copied from fr-fr
+$text['label-time_timer']['fr-ca'] = "Minuterie";
 $text['label-time_timer']['fr-fr'] = "Minuteur";
 $text['label-time_timer']['he-il'] = "";
 $text['label-time_timer']['it-it'] = "Timer";
@@ -1726,7 +1726,7 @@ $text['label-time_stop']['de-de'] = "Stopp";
 $text['label-time_stop']['el-gr'] = "Διακοπή";
 $text['label-time_stop']['es-cl'] = "Deténgase";
 $text['label-time_stop']['es-mx'] = "Deténgase"; //copied from es-cl
-$text['label-time_stop']['fr-ca'] = "Stop"; //copied from fr-fr
+$text['label-time_stop']['fr-ca'] = "Arrêt"; //copied from fr-fr
 $text['label-time_stop']['fr-fr'] = "Stop";
 $text['label-time_stop']['he-il'] = "עצור";
 $text['label-time_stop']['it-it'] = "Stop";
@@ -1849,27 +1849,27 @@ $text['label-shared']['ru-ru'] = "Общий";
 $text['label-shared']['sv-se'] = "Delad";
 $text['label-shared']['uk-ua'] = "";
 
-$text['label-primary']['en-us'] = "Primary";
-$text['label-primary']['en-gb'] = "Primary";
-$text['label-primary']['ar-eg'] = "";
-$text['label-primary']['de-at'] = "Primär"; //copied from de-de
-$text['label-primary']['de-ch'] = "Primär"; //copied from de-de
-$text['label-primary']['de-de'] = "Primär";
-$text['label-primary']['el-gr'] = "Κύρια";
-$text['label-primary']['es-cl'] = "Primário";
-$text['label-primary']['es-mx'] = "Primário"; //copied from es-cl
-$text['label-primary']['fr-ca'] = "Primaire"; //copied from fr-fr
-$text['label-primary']['fr-fr'] = "Primaire";
-$text['label-primary']['he-il'] = "ראשי";
-$text['label-primary']['it-it'] = "Primario";
-$text['label-primary']['nl-nl'] = "Primair";
-$text['label-primary']['pl-pl'] = "Główny";
-$text['label-primary']['pt-br'] = "Primário"; //copied from pt-pt
-$text['label-primary']['pt-pt'] = "Primário";
-$text['label-primary']['ro-ro'] = "";
-$text['label-primary']['ru-ru'] = "Основной";
-$text['label-primary']['sv-se'] = "Primär";
-$text['label-primary']['uk-ua'] = "";
+$text['label-phone_label']['en-us'] = "Label";
+$text['label-phone_label']['en-gb'] = "Label";
+$text['label-phone_label']['ar-eg'] = "";
+$text['label-phone_label']['de-at'] = "Kennzeichnung"; //copied from de-de
+$text['label-phone_label']['de-ch'] = "Kennzeichnung"; //copied from de-de
+$text['label-phone_label']['de-de'] = "Kennzeichnung";
+$text['label-phone_label']['el-gr'] = "Ετικέτα";
+$text['label-phone_label']['es-cl'] = "Etiqueta";
+$text['label-phone_label']['es-mx'] = "Etiqueta"; //copied from es-cl
+$text['label-phone_label']['fr-ca'] = "Etiquette"; //copied from fr-fr
+$text['label-phone_label']['fr-fr'] = "Etiquette";
+$text['label-phone_label']['he-il'] = "";
+$text['label-phone_label']['it-it'] = "Etichetta";
+$text['label-phone_label']['nl-nl'] = "Etiket";
+$text['label-phone_label']['pl-pl'] = "Etykieta";
+$text['label-phone_label']['pt-br'] = "Identificador";
+$text['label-phone_label']['pt-pt'] = "Etiqueta";
+$text['label-phone_label']['ro-ro'] = "";
+$text['label-phone_label']['ru-ru'] = "Метка";
+$text['label-phone_label']['sv-se'] = "Etikett";
+$text['label-phone_label']['uk-ua'] = "Назва";
 
 $text['label-phone_type']['en-us'] = "Type";
 $text['label-phone_type']['en-gb'] = "Type";
@@ -1924,8 +1924,8 @@ $text['label-phone_speed_dial']['de-de'] = "Kurzwahl";
 $text['label-phone_speed_dial']['el-gr'] = "Ταχεία κλήση";
 $text['label-phone_speed_dial']['es-cl'] = "";
 $text['label-phone_speed_dial']['es-mx'] = "";
-$text['label-phone_speed_dial']['fr-ca'] = "";
-$text['label-phone_speed_dial']['fr-fr'] = "";
+$text['label-phone_speed_dial']['fr-ca'] = "Numérotation Abrégée";
+$text['label-phone_speed_dial']['fr-fr'] = "Numérotation Abrégée";
 $text['label-phone_speed_dial']['he-il'] = "";
 $text['label-phone_speed_dial']['it-it'] = "Numero Breve";
 $text['label-phone_speed_dial']['nl-nl'] = "Snelkiezen";
@@ -1935,7 +1935,29 @@ $text['label-phone_speed_dial']['pt-pt'] = "";
 $text['label-phone_speed_dial']['ro-ro'] = "";
 $text['label-phone_speed_dial']['ru-ru'] = "Быстрый Набор";
 $text['label-phone_speed_dial']['sv-se'] = "Snabb Nummer";
-$text['label-phone_speed_dial']['uk-ua'] = "";
+$text['label-phone_speed_dial']['uk-ua'] = "";      
+
+$text['label-phone_country_code']['en-us'] = "Country Code";
+$text['label-phone_country_code']['en-gb'] = "Country Code";
+$text['label-phone_country_code']['ar-eg'] = "";
+$text['label-phone_country_code']['de-at'] = ""; //copied from de-de
+$text['label-phone_country_code']['de-ch'] = ""; //copied from de-de
+$text['label-phone_country_code']['de-de'] = "";
+$text['label-phone_country_code']['el-gr'] = "";
+$text['label-phone_country_code']['es-cl'] = "";
+$text['label-phone_country_code']['es-mx'] = "";
+$text['label-phone_country_code']['fr-ca'] = "Indicatif du Pays";
+$text['label-phone_country_code']['fr-fr'] = "Indicatif du Pays";
+$text['label-phone_country_code']['he-il'] = "";
+$text['label-phone_country_code']['it-it'] = "";
+$text['label-phone_country_code']['nl-nl'] = "";
+$text['label-phone_country_code']['pl-pl'] = "";
+$text['label-phone_country_code']['pt-br'] = "";
+$text['label-phone_country_code']['pt-pt'] = "";
+$text['label-phone_country_code']['ro-ro'] = "";
+$text['label-phone_country_code']['ru-ru'] = "";
+$text['label-phone_country_code']['sv-se'] = "";
+$text['label-phone_country_code']['uk-ua'] = "";
 
 $text['label-phone_numbers']['en-us'] = "Numbers";
 $text['label-phone_numbers']['en-gb'] = "Numbers";
@@ -1981,28 +2003,6 @@ $text['label-phone_number']['ru-ru'] = "Номер";
 $text['label-phone_number']['sv-se'] = "Nummer";
 $text['label-phone_number']['uk-ua'] = "Номер";
 
-$text['label-phone_label']['en-us'] = "Label";
-$text['label-phone_label']['en-gb'] = "Label";
-$text['label-phone_label']['ar-eg'] = "";
-$text['label-phone_label']['de-at'] = "Kennzeichnung"; //copied from de-de
-$text['label-phone_label']['de-ch'] = "Kennzeichnung"; //copied from de-de
-$text['label-phone_label']['de-de'] = "Kennzeichnung";
-$text['label-phone_label']['el-gr'] = "Ετικέτα";
-$text['label-phone_label']['es-cl'] = "Etiqueta";
-$text['label-phone_label']['es-mx'] = "Etiqueta"; //copied from es-cl
-$text['label-phone_label']['fr-ca'] = "Etiquette"; //copied from fr-fr
-$text['label-phone_label']['fr-fr'] = "Etiquette";
-$text['label-phone_label']['he-il'] = "";
-$text['label-phone_label']['it-it'] = "Etichetta";
-$text['label-phone_label']['nl-nl'] = "Etiket";
-$text['label-phone_label']['pl-pl'] = "Etykieta";
-$text['label-phone_label']['pt-br'] = "Identificador";
-$text['label-phone_label']['pt-pt'] = "Etiqueta";
-$text['label-phone_label']['ro-ro'] = "";
-$text['label-phone_label']['ru-ru'] = "Метка";
-$text['label-phone_label']['sv-se'] = "Etikett";
-$text['label-phone_label']['uk-ua'] = "Назва";
-
 $text['label-phone_extension']['en-us'] = "Extension";
 $text['label-phone_extension']['en-gb'] = "Extension";
 $text['label-phone_extension']['ar-eg'] = "";
@@ -2025,6 +2025,28 @@ $text['label-phone_extension']['ru-ru'] = "Внутренний Номер";
 $text['label-phone_extension']['sv-se'] = "Anknytning";
 $text['label-phone_extension']['uk-ua'] = "Розширення";
 
+$text['label-primary']['en-us'] = "Primary";
+$text['label-primary']['en-gb'] = "Primary";
+$text['label-primary']['ar-eg'] = "";
+$text['label-primary']['de-at'] = "Primär"; //copied from de-de
+$text['label-primary']['de-ch'] = "Primär"; //copied from de-de
+$text['label-primary']['de-de'] = "Primär";
+$text['label-primary']['el-gr'] = "Κύρια";
+$text['label-primary']['es-cl'] = "Primário";
+$text['label-primary']['es-mx'] = "Primário"; //copied from es-cl
+$text['label-primary']['fr-ca'] = "Primaire"; //copied from fr-fr
+$text['label-primary']['fr-fr'] = "Primaire";
+$text['label-primary']['he-il'] = "ראשי";
+$text['label-primary']['it-it'] = "Primario";
+$text['label-primary']['nl-nl'] = "Primair";
+$text['label-primary']['pl-pl'] = "Główny";
+$text['label-primary']['pt-br'] = "Primário"; //copied from pt-pt
+$text['label-primary']['pt-pt'] = "Primário";
+$text['label-primary']['ro-ro'] = "";
+$text['label-primary']['ru-ru'] = "Основной";
+$text['label-primary']['sv-se'] = "Primär";
+$text['label-primary']['uk-ua'] = "";
+
 $text['label-phone_description']['en-us'] = "Description";
 $text['label-phone_description']['en-gb'] = "Description";
 $text['label-phone_description']['ar-eg'] = "";
@@ -2122,8 +2144,8 @@ $text['label-note_content']['de-de'] = "Inhalt";
 $text['label-note_content']['el-gr'] = "Περιεχόμενο";
 $text['label-note_content']['es-cl'] = "Contenido";
 $text['label-note_content']['es-mx'] = "Contenido"; //copied from es-cl
-$text['label-note_content']['fr-ca'] = "Content"; //copied from fr-fr
-$text['label-note_content']['fr-fr'] = "Content";
+$text['label-note_content']['fr-ca'] = "Contenu";
+$text['label-note_content']['fr-fr'] = "Contenu";
 $text['label-note_content']['he-il'] = "";
 $text['label-note_content']['it-it'] = "Contenuto";
 $text['label-note_content']['nl-nl'] = "Inhoud";
@@ -2166,7 +2188,7 @@ $text['label-import_fields']['de-de'] = "Felder";
 $text['label-import_fields']['el-gr'] = "Πεδία";
 $text['label-import_fields']['es-cl'] = "Campos";
 $text['label-import_fields']['es-mx'] = "Campos"; //copied from es-cl
-$text['label-import_fields']['fr-ca'] = "Les Champs"; //copied from fr-fr
+$text['label-import_fields']['fr-ca'] = "Champs";
 $text['label-import_fields']['fr-fr'] = "Les Champs";
 $text['label-import_fields']['he-il'] = "שדות";
 $text['label-import_fields']['it-it'] = "Campi";
@@ -2386,7 +2408,7 @@ $text['label-false']['de-de'] = "Aus";
 $text['label-false']['el-gr'] = "Όχι";
 $text['label-false']['es-cl'] = "Falso";
 $text['label-false']['es-mx'] = "Falso"; //copied from es-cl
-$text['label-false']['fr-ca'] = "Non"; //copied from fr-fr
+$text['label-false']['fr-ca'] = "Faux";
 $text['label-false']['fr-fr'] = "Non";
 $text['label-false']['he-il'] = "לא חוקי";
 $text['label-false']['it-it'] = "Falso";
@@ -2430,7 +2452,7 @@ $text['label-enabled']['de-de'] = "An";
 $text['label-enabled']['el-gr'] = "Ενεργό";
 $text['label-enabled']['es-cl'] = "Activado";
 $text['label-enabled']['es-mx'] = "Activado"; //copied from es-cl
-$text['label-enabled']['fr-ca'] = "Actif"; //copied from fr-fr
+$text['label-enabled']['fr-ca'] = "Activé";
 $text['label-enabled']['fr-fr'] = "Actif";
 $text['label-enabled']['he-il'] = "מופעל";
 $text['label-enabled']['it-it'] = "Abilitato";
@@ -2452,8 +2474,8 @@ $text['label-emails']['de-de'] = "Emails";
 $text['label-emails']['el-gr'] = "E-mails";
 $text['label-emails']['es-cl'] = "Extensións";
 $text['label-emails']['es-mx'] = "Extensións"; //copied from es-cl
-$text['label-emails']['fr-ca'] = "Extensions"; //copied from fr-fr
-$text['label-emails']['fr-fr'] = "Extensions";
+$text['label-emails']['fr-ca'] = "Courriels";
+$text['label-emails']['fr-fr'] = "Courriels";
 $text['label-emails']['he-il'] = "אימיילים";
 $text['label-emails']['it-it'] = "Emails";
 $text['label-emails']['nl-nl'] = "E-mails";
@@ -2474,8 +2496,8 @@ $text['label-email_label']['de-de'] = "Kennzeichnung";
 $text['label-email_label']['el-gr'] = "Ετικέτα";
 $text['label-email_label']['es-cl'] = "Etiqueta";
 $text['label-email_label']['es-mx'] = "Etiqueta"; //copied from es-cl
-$text['label-email_label']['fr-ca'] = "Etiquette"; //copied from fr-fr
-$text['label-email_label']['fr-fr'] = "Etiquette";
+$text['label-email_label']['fr-ca'] = "Étiquette"; //copied from fr-fr
+$text['label-email_label']['fr-fr'] = "Étiquette";
 $text['label-email_label']['he-il'] = "";
 $text['label-email_label']['it-it'] = "Etichetta";
 $text['label-email_label']['nl-nl'] = "Etiket";
@@ -2518,8 +2540,8 @@ $text['label-email_address']['de-de'] = "Email-Adresse";
 $text['label-email_address']['el-gr'] = "Ηλεκτρονική διεύθυνση";
 $text['label-email_address']['es-cl'] = "Calle";
 $text['label-email_address']['es-mx'] = "Calle"; //copied from es-cl
-$text['label-email_address']['fr-ca'] = "Rue"; //copied from fr-fr
-$text['label-email_address']['fr-fr'] = "Rue";
+$text['label-email_address']['fr-ca'] = "Courriel"; 
+$text['label-email_address']['fr-fr'] = "Courriel";
 $text['label-email_address']['he-il'] = "כתובת מייל";
 $text['label-email_address']['it-it'] = "Indirizzo";
 $text['label-email_address']['nl-nl'] = "E-mail Adres";
@@ -2870,8 +2892,8 @@ $text['label-contact_relation_option_parent']['de-de'] = "Eltern";
 $text['label-contact_relation_option_parent']['el-gr'] = "Γονέας";
 $text['label-contact_relation_option_parent']['es-cl'] = "Padre";
 $text['label-contact_relation_option_parent']['es-mx'] = "Padre"; //copied from es-cl
-$text['label-contact_relation_option_parent']['fr-ca'] = "Mère"; //copied from fr-fr
-$text['label-contact_relation_option_parent']['fr-fr'] = "Mère";
+$text['label-contact_relation_option_parent']['fr-ca'] = "Parent";
+$text['label-contact_relation_option_parent']['fr-fr'] = "Parent";
 $text['label-contact_relation_option_parent']['he-il'] = "";
 $text['label-contact_relation_option_parent']['it-it'] = "Padre";
 $text['label-contact_relation_option_parent']['nl-nl'] = "Ouder";
@@ -3002,8 +3024,8 @@ $text['label-contact_relation_name']['de-de'] = "Name";
 $text['label-contact_relation_name']['el-gr'] = "Όνομα";
 $text['label-contact_relation_name']['es-cl'] = "Nombre";
 $text['label-contact_relation_name']['es-mx'] = "Nombre"; //copied from es-cl
-$text['label-contact_relation_name']['fr-ca'] = "Nome"; //copied from fr-fr
-$text['label-contact_relation_name']['fr-fr'] = "Nome";
+$text['label-contact_relation_name']['fr-ca'] = "Nom"; //copied from fr-fr
+$text['label-contact_relation_name']['fr-fr'] = "Nom";
 $text['label-contact_relation_name']['he-il'] = "שם";
 $text['label-contact_relation_name']['it-it'] = "Nome";
 $text['label-contact_relation_name']['nl-nl'] = "Naam";
@@ -3442,8 +3464,8 @@ $text['label-address_region']['de-de'] = "Region";
 $text['label-address_region']['el-gr'] = "Περιοχή";
 $text['label-address_region']['es-cl'] = "Región";
 $text['label-address_region']['es-mx'] = "Región"; //copied from es-cl
-$text['label-address_region']['fr-ca'] = "Département"; //copied from fr-fr
-$text['label-address_region']['fr-fr'] = "Département";
+$text['label-address_region']['fr-ca'] = "Région"; //copied from fr-fr
+$text['label-address_region']['fr-fr'] = "Région";
 $text['label-address_region']['he-il'] = "";
 $text['label-address_region']['it-it'] = "Regione";
 $text['label-address_region']['nl-nl'] = "Regio";
@@ -3552,8 +3574,8 @@ $text['label-address_label']['de-de'] = "Kennzeichnung";
 $text['label-address_label']['el-gr'] = "Ετικέτα";
 $text['label-address_label']['es-cl'] = "Etiqueta";
 $text['label-address_label']['es-mx'] = "Etiqueta"; //copied from es-cl
-$text['label-address_label']['fr-ca'] = "Etiquette"; //copied from fr-fr
-$text['label-address_label']['fr-fr'] = "Etiquette";
+$text['label-address_label']['fr-ca'] = "Étiquette"; //copied from fr-fr
+$text['label-address_label']['fr-fr'] = "Étiquette";
 $text['label-address_label']['he-il'] = "";
 $text['label-address_label']['it-it'] = "etichetta";
 $text['label-address_label']['nl-nl'] = "Etiket";
@@ -3640,8 +3662,8 @@ $text['label-address_address']['de-de'] = "Adresse";
 $text['label-address_address']['el-gr'] = "Διεύθυνση";
 $text['label-address_address']['es-cl'] = "Calle";
 $text['label-address_address']['es-mx'] = "Calle"; //copied from es-cl
-$text['label-address_address']['fr-ca'] = "Rue"; //copied from fr-fr
-$text['label-address_address']['fr-fr'] = "Rue";
+$text['label-address_address']['fr-ca'] = "Adresse"; //copied from fr-fr
+$text['label-address_address']['fr-fr'] = "Adresse";
 $text['label-address_address']['he-il'] = "כתובת";
 $text['label-address_address']['it-it'] = "Indirizzo";
 $text['label-address_address']['nl-nl'] = "Adres";
@@ -3662,8 +3684,8 @@ $text['label-attachments']['de-de'] = "";
 $text['label-attachments']['el-gr'] = "Επισυνάψεις";
 $text['label-attachments']['es-cl'] = "";
 $text['label-attachments']['es-mx'] = "";
-$text['label-attachments']['fr-ca'] = "";
-$text['label-attachments']['fr-fr'] = "";
+$text['label-attachments']['fr-ca'] = "Pièces Jointes";
+$text['label-attachments']['fr-fr'] = "Pièces Jointes";
 $text['label-attachments']['he-il'] = "";
 $text['label-attachments']['it-it'] = "";
 $text['label-attachments']['nl-nl'] = "Aanhangsels";
@@ -3684,8 +3706,8 @@ $text['label-attachment_filename']['de-de'] = "";
 $text['label-attachment_filename']['el-gr'] = "Όνομα αρχείου";
 $text['label-attachment_filename']['es-cl'] = "";
 $text['label-attachment_filename']['es-mx'] = "";
-$text['label-attachment_filename']['fr-ca'] = "";
-$text['label-attachment_filename']['fr-fr'] = "";
+$text['label-attachment_filename']['fr-ca'] = "Nom du Fichier";
+$text['label-attachment_filename']['fr-fr'] = "Nom du Fichier";
 $text['label-attachment_filename']['he-il'] = "";
 $text['label-attachment_filename']['it-it'] = "";
 $text['label-attachment_filename']['nl-nl'] = "Bestandsnaam";
@@ -3706,8 +3728,8 @@ $text['label-attachment']['de-de'] = "";
 $text['label-attachment']['el-gr'] = "Επισύναψη";
 $text['label-attachment']['es-cl'] = "";
 $text['label-attachment']['es-mx'] = "";
-$text['label-attachment']['fr-ca'] = "";
-$text['label-attachment']['fr-fr'] = "";
+$text['label-attachment']['fr-ca'] = "Pièce Jointe";
+$text['label-attachment']['fr-fr'] = "Pièce Jointe";
 $text['label-attachment']['he-il'] = "";
 $text['label-attachment']['it-it'] = "";
 $text['label-attachment']['nl-nl'] = "Toevoeging";
@@ -3728,8 +3750,8 @@ $text['label-attachment_size']['de-de'] = "";
 $text['label-attachment_size']['el-gr'] = "Μέγεθος";
 $text['label-attachment_size']['es-cl'] = "";
 $text['label-attachment_size']['es-mx'] = "";
-$text['label-attachment_size']['fr-ca'] = "";
-$text['label-attachment_size']['fr-fr'] = "";
+$text['label-attachment_size']['fr-ca'] = "Taille";
+$text['label-attachment_size']['fr-fr'] = "Taille";
 $text['label-attachment_size']['he-il'] = "";
 $text['label-attachment_size']['it-it'] = "";
 $text['label-attachment_size']['nl-nl'] = "Omvang";
@@ -3750,8 +3772,8 @@ $text['label-attachment_description']['de-de'] = "";
 $text['label-attachment_description']['el-gr'] = "Περιγραφή";
 $text['label-attachment_description']['es-cl'] = "";
 $text['label-attachment_description']['es-mx'] = "";
-$text['label-attachment_description']['fr-ca'] = "";
-$text['label-attachment_description']['fr-fr'] = "";
+$text['label-attachment_description']['fr-ca'] = "Description";
+$text['label-attachment_description']['fr-fr'] = "Description";
 $text['label-attachment_description']['he-il'] = "";
 $text['label-attachment_description']['it-it'] = "";
 $text['label-attachment_description']['nl-nl'] = "Omschrijving";
@@ -3816,8 +3838,8 @@ $text['header-contacts_import']['de-de'] = "Kontakte importieren";
 $text['header-contacts_import']['el-gr'] = "Εισαγωγή επαφών";
 $text['header-contacts_import']['es-cl'] = "Importar Contactos";
 $text['header-contacts_import']['es-mx'] = "Importar Contactos"; //copied from es-cl
-$text['header-contacts_import']['fr-ca'] = "Importe des Contacts"; //copied from fr-fr
-$text['header-contacts_import']['fr-fr'] = "Importe des Contacts";
+$text['header-contacts_import']['fr-ca'] = "Importé des Contacts";
+$text['header-contacts_import']['fr-fr'] = "Importé des Contacts";
 $text['header-contacts_import']['he-il'] = "ייבא אנשי קשר";
 $text['header-contacts_import']['it-it'] = "Importa Contatti";
 $text['header-contacts_import']['nl-nl'] = "Importeer kontacten";
@@ -3860,7 +3882,7 @@ $text['header-contact_url-edit']['de-de'] = "URL bearbeiten";
 $text['header-contact_url-edit']['el-gr'] = "Επεξεργασία συνδέσμου URL επαφής";
 $text['header-contact_url-edit']['es-cl'] = "Correo electrónico de contacto Editar";
 $text['header-contact_url-edit']['es-mx'] = "Correo electrónico de contacto Editar"; //copied from es-cl
-$text['header-contact_url-edit']['fr-ca'] = "Contact Courriel Modifier"; //copied from fr-fr
+$text['header-contact_url-edit']['fr-ca'] = "URL de Contact Modifier";
 $text['header-contact_url-edit']['fr-fr'] = "Contact Courriel Modifier";
 $text['header-contact_url-edit']['he-il'] = "";
 $text['header-contact_url-edit']['it-it'] = "Modifica URL Contatto";
@@ -3882,7 +3904,7 @@ $text['header-contact_url-add']['de-de'] = "URL hinzufügen";
 $text['header-contact_url-add']['el-gr'] = "Προσθήκη συνδέσμου URL επαφής";
 $text['header-contact_url-add']['es-cl'] = "Correo electrónico de contacto Agregar";
 $text['header-contact_url-add']['es-mx'] = "Correo electrónico de contacto Agregar"; //copied from es-cl
-$text['header-contact_url-add']['fr-ca'] = "Contactez-mail Ajouter"; //copied from fr-fr
+$text['header-contact_url-add']['fr-ca'] = "URL de Contactez Ajouter";
 $text['header-contact_url-add']['fr-fr'] = "Contactez-mail Ajouter";
 $text['header-contact_url-add']['he-il'] = "";
 $text['header-contact_url-add']['it-it'] = "Inserisci URL Contatto";
@@ -4036,7 +4058,7 @@ $text['header-contact_phones-edit']['de-de'] = "Nummer des Kontakts bearbeiten";
 $text['header-contact_phones-edit']['el-gr'] = "Επεξεργασία αριθμού επαφής";
 $text['header-contact_phones-edit']['es-cl'] = "Editar Número de Contacto";
 $text['header-contact_phones-edit']['es-mx'] = "Editar Número de Contacto"; //copied from es-cl
-$text['header-contact_phones-edit']['fr-ca'] = "Editer le téléphone du Contact"; //copied from fr-fr
+$text['header-contact_phones-edit']['fr-ca'] = "Numéro du Contact Modifier";
 $text['header-contact_phones-edit']['fr-fr'] = "Editer le téléphone du Contact";
 $text['header-contact_phones-edit']['he-il'] = "";
 $text['header-contact_phones-edit']['it-it'] = "Modifica Numero Contatto";
@@ -4058,7 +4080,7 @@ $text['header-contact_phones-add']['de-de'] = "Nummer zum Kontakt hinzufügen";
 $text['header-contact_phones-add']['el-gr'] = "Προσθήκη αριθμού επαφής";
 $text['header-contact_phones-add']['es-cl'] = "Agregar Número de Contacto";
 $text['header-contact_phones-add']['es-mx'] = "Agregar Número de Contacto"; //copied from es-cl
-$text['header-contact_phones-add']['fr-ca'] = "Ajouter un téléphone au Contact"; //copied from fr-fr
+$text['header-contact_phones-add']['fr-ca'] = "Numéro Contact Ajouter";
 $text['header-contact_phones-add']['fr-fr'] = "Ajouter un téléphone au Contact";
 $text['header-contact_phones-add']['he-il'] = "";
 $text['header-contact_phones-add']['it-it'] = "Inserisci Numero Contatto";
@@ -4080,7 +4102,7 @@ $text['header-contact_notes-edit']['de-de'] = "Notiz für Kontakt bearbeiten";
 $text['header-contact_notes-edit']['el-gr'] = "Επεξεργασία σημείωσης επαφής";
 $text['header-contact_notes-edit']['es-cl'] = "Editar Nota de Contactos";
 $text['header-contact_notes-edit']['es-mx'] = "Editar Nota de Contactos"; //copied from es-cl
-$text['header-contact_notes-edit']['fr-ca'] = "Editer la note du contact"; //copied from fr-fr
+$text['header-contact_notes-edit']['fr-ca'] = "Modifier la note du contact";
 $text['header-contact_notes-edit']['fr-fr'] = "Editer la note du contact";
 $text['header-contact_notes-edit']['he-il'] = "";
 $text['header-contact_notes-edit']['it-it'] = "Modifica Note Contatto";
@@ -4124,7 +4146,7 @@ $text['header-contact_email-edit']['de-de'] = "Email des Kontakts bearbeiten";
 $text['header-contact_email-edit']['el-gr'] = "Επεξεργασία e-mail επαφής";
 $text['header-contact_email-edit']['es-cl'] = "Correo electrónico de contacto Editar";
 $text['header-contact_email-edit']['es-mx'] = "Correo electrónico de contacto Editar"; //copied from es-cl
-$text['header-contact_email-edit']['fr-ca'] = "Contact Courriel Modifier"; //copied from fr-fr
+$text['header-contact_email-edit']['fr-ca'] = "Courriel Contact Modifier";
 $text['header-contact_email-edit']['fr-fr'] = "Contact Courriel Modifier";
 $text['header-contact_email-edit']['he-il'] = "";
 $text['header-contact_email-edit']['it-it'] = "Modifica Email Contatto";
@@ -4146,7 +4168,7 @@ $text['header-contact_email-add']['de-de'] = "Email zum Kontakt hinzufügen";
 $text['header-contact_email-add']['el-gr'] = "Προσθήκη e-mail επαφής";
 $text['header-contact_email-add']['es-cl'] = "Correo electrónico de contacto Agregar";
 $text['header-contact_email-add']['es-mx'] = "Correo electrónico de contacto Agregar"; //copied from es-cl
-$text['header-contact_email-add']['fr-ca'] = "Contactez-mail Ajouter"; //copied from fr-fr
+$text['header-contact_email-add']['fr-ca'] = "Courriel Contact Ajouter"; //copied from fr-fr
 $text['header-contact_email-add']['fr-fr'] = "Contactez-mail Ajouter";
 $text['header-contact_email-add']['he-il'] = "";
 $text['header-contact_email-add']['it-it'] = "Inserisci Email Contatto";
@@ -4168,7 +4190,7 @@ $text['header-contact_addresses-edit']['de-de'] = "Adresse des Kontakts bearbeit
 $text['header-contact_addresses-edit']['el-gr'] = "Επεξεργασία διεύθυνσης επαφής";
 $text['header-contact_addresses-edit']['es-cl'] = "Editar Dirección de Contacto";
 $text['header-contact_addresses-edit']['es-mx'] = "Editar Dirección de Contacto"; //copied from es-cl
-$text['header-contact_addresses-edit']['fr-ca'] = "Editer l'adresse du contact"; //copied from fr-fr
+$text['header-contact_addresses-edit']['fr-ca'] = "Adresse Contact Modifier";
 $text['header-contact_addresses-edit']['fr-fr'] = "Editer l'adresse du contact";
 $text['header-contact_addresses-edit']['he-il'] = "";
 $text['header-contact_addresses-edit']['it-it'] = "Modifica Indirizzo Contatto";
@@ -4190,7 +4212,7 @@ $text['header-contact_addresses-add']['de-de'] = "Adresse zum Kontakt hinzufüge
 $text['header-contact_addresses-add']['el-gr'] = "Προσθήκη διεύθυνσης επαφής";
 $text['header-contact_addresses-add']['es-cl'] = "Agregar Dirección de Contacto";
 $text['header-contact_addresses-add']['es-mx'] = "Agregar Dirección de Contacto"; //copied from es-cl
-$text['header-contact_addresses-add']['fr-ca'] = "Ajouter une adresse au contact"; //copied from fr-fr
+$text['header-contact_addresses-add']['fr-ca'] = "Adresse Contact Ajouter";
 $text['header-contact_addresses-add']['fr-fr'] = "Ajouter une adresse au contact";
 $text['header-contact_addresses-add']['he-il'] = "";
 $text['header-contact_addresses-add']['it-it'] = "Inserisci Indirizzo Contatto";
@@ -4212,8 +4234,8 @@ $text['header-contact_attachment-edit']['de-de'] = "";
 $text['header-contact_attachment-edit']['el-gr'] = "Επεξεργασία επισύναψης επαφής";
 $text['header-contact_attachment-edit']['es-cl'] = "";
 $text['header-contact_attachment-edit']['es-mx'] = "";
-$text['header-contact_attachment-edit']['fr-ca'] = "";
-$text['header-contact_attachment-edit']['fr-fr'] = "";
+$text['header-contact_attachment-edit']['fr-ca'] = "Pièce Jointe Contact Modifier";
+$text['header-contact_attachment-edit']['fr-fr'] = "Pièce Jointe Contact Modifier";
 $text['header-contact_attachment-edit']['he-il'] = "";
 $text['header-contact_attachment-edit']['it-it'] = "";
 $text['header-contact_attachment-edit']['nl-nl'] = "Kontact aanhangsel bewerken";
@@ -4234,8 +4256,8 @@ $text['header-contact_attachment-add']['de-de'] = "";
 $text['header-contact_attachment-add']['el-gr'] = "Προσθήκη επισύναψης επαφής";
 $text['header-contact_attachment-add']['es-cl'] = "";
 $text['header-contact_attachment-add']['es-mx'] = "";
-$text['header-contact_attachment-add']['fr-ca'] = "";
-$text['header-contact_attachment-add']['fr-fr'] = "";
+$text['header-contact_attachment-add']['fr-ca'] = "Pièce Jointe Contact Ajouter";
+$text['header-contact_attachment-add']['fr-fr'] = "Pièce Jointe Contact Ajouter";
 $text['header-contact_attachment-add']['he-il'] = "";
 $text['header-contact_attachment-add']['it-it'] = "";
 $text['header-contact_attachment-add']['nl-nl'] = "Kontact aanhangsel toevoegen";
@@ -4300,7 +4322,7 @@ $text['description_timer']['de-de'] = "Den Timer stoppen bevor Sie das Fenster s
 $text['description_timer']['el-gr'] = "Σταματήστε το χρονοδιακόπτη πριν κλείσετε το παράθυρο, εάν το επιθυμείτε.";
 $text['description_timer']['es-cl'] = "Detenga el temporizador antes de cerrar la ventana, si se desea.";
 $text['description_timer']['es-mx'] = "Detenga el temporizador antes de cerrar la ventana, si se desea."; //copied from es-cl
-$text['description_timer']['fr-ca'] = "Arrêter le retardateur avant la fermeture de la fenêtre, si désiré."; //copied from fr-fr
+$text['description_timer']['fr-ca'] = "Arrêter le minuteur avant la fermeture de la fenêtre, si désiré.";
 $text['description_timer']['fr-fr'] = "Arrêter le retardateur avant la fermeture de la fenêtre, si désiré.";
 $text['description_timer']['he-il'] = "";
 $text['description_timer']['it-it'] = "Stoppa il timer prima di chiudere la finestra, se lo desideri.";
@@ -4379,6 +4401,28 @@ $text['description-shared']['ru-ru'] = "Разделите этот контак
 $text['description-shared']['sv-se'] = "Dela denna kontakt med andra användare i domänen.";
 $text['description-shared']['uk-ua'] = "";
 
+$text['description-phone_label']['en-us'] = "Select or enter a custom label.";
+$text['description-phone_label']['en-gb'] = "Select or enter a custom label.";
+$text['description-phone_label']['ar-eg'] = "";
+$text['description-phone_label']['de-at'] = "Wählen Sie eine beliebige Kennzeichnung."; //copied from de-de
+$text['description-phone_label']['de-ch'] = "Wählen Sie eine beliebige Kennzeichnung."; //copied from de-de
+$text['description-phone_label']['de-de'] = "Wählen Sie eine beliebige Kennzeichnung.";
+$text['description-phone_label']['el-gr'] = "Επιλέξτε ή εισάγετε μια προσωποποιημένη ετικέτα";
+$text['description-phone_label']['es-cl'] = "Seleccione o introduzca una etiqueta personalizada.";
+$text['description-phone_label']['es-mx'] = "Seleccione o introduzca una etiqueta personalizada."; //copied from es-cl
+$text['description-phone_label']['fr-ca'] = "Sélectionnez ou entrez une étiquette personnalisée."; //copied from fr-fr
+$text['description-phone_label']['fr-fr'] = "Sélectionnez ou entrez une étiquette personnalisée.";
+$text['description-phone_label']['he-il'] = "";
+$text['description-phone_label']['it-it'] = "Seleziona o inserisci un'etichetta personalizzata.";
+$text['description-phone_label']['nl-nl'] = "Kies of voer een keuze kenmerk in.";
+$text['description-phone_label']['pl-pl'] = "Wybierz lub wprowadź własną etykietę.";
+$text['description-phone_label']['pt-br'] = "Selecione ou digite um identificador personalizado";
+$text['description-phone_label']['pt-pt'] = "Selecione ou digite um rótulo personalizado.";
+$text['description-phone_label']['ro-ro'] = "";
+$text['description-phone_label']['ru-ru'] = "Выберите или введите настраиваемую метку.";
+$text['description-phone_label']['sv-se'] = "Välj eller ange anpassad etikett.";
+$text['description-phone_label']['uk-ua'] = "";
+
 $text['description-phone_type']['en-us'] = "Define the number type or purpose.";
 $text['description-phone_type']['en-gb'] = "Define the number type or purpose.";
 $text['description-phone_type']['ar-eg'] = "";
@@ -4401,28 +4445,6 @@ $text['description-phone_type']['ru-ru'] = "Определите тип или 
 $text['description-phone_type']['sv-se'] = "Definiera nummertypen eller nummerändamålet.";
 $text['description-phone_type']['uk-ua'] = "";
 
-$text['description-phone_primary']['en-us'] = "Set as the primary Number for this contact.";
-$text['description-phone_primary']['en-gb'] = "Set as the primary Number for this contact.";
-$text['description-phone_primary']['ar-eg'] = "";
-$text['description-phone_primary']['de-at'] = "Als primäre Nummer für diesen Kontakt setzen."; //copied from de-de
-$text['description-phone_primary']['de-ch'] = "Als primäre Nummer für diesen Kontakt setzen."; //copied from de-de
-$text['description-phone_primary']['de-de'] = "Als primäre Nummer für diesen Kontakt setzen.";
-$text['description-phone_primary']['el-gr'] = "Ορίστε τον κύριο αριθμό για αυτή την επαφή";
-$text['description-phone_primary']['es-cl'] = "Establecer como el número primario para este contacto.";
-$text['description-phone_primary']['es-mx'] = "Establecer como el número primario para este contacto."; //copied from es-cl
-$text['description-phone_primary']['fr-ca'] = "Définir comme primaire numéro pour ce contact."; //copied from fr-fr
-$text['description-phone_primary']['fr-fr'] = "Définir comme primaire numéro pour ce contact.";
-$text['description-phone_primary']['he-il'] = "";
-$text['description-phone_primary']['it-it'] = "Imposta come numero principale per questo contatto.";
-$text['description-phone_primary']['nl-nl'] = "Stel nummer in als primair nummer voor dit kontact";
-$text['description-phone_primary']['pl-pl'] = "Ustaw jako podstawowy numer tego kontaktu.";
-$text['description-phone_primary']['pt-br'] = "Defina número principal para este contato";
-$text['description-phone_primary']['pt-pt'] = "Definir como o principal número para este contato.";
-$text['description-phone_primary']['ro-ro'] = "";
-$text['description-phone_primary']['ru-ru'] = "Укажите в качестве основного номера для этого контакта.";
-$text['description-phone_primary']['sv-se'] = "Sätt som primärt Nummer för denna kontakt.";
-$text['description-phone_primary']['uk-ua'] = "";
-
 $text['description-phone_speed_dial']['en-us'] = "Enter the speed dial number.";
 $text['description-phone_speed_dial']['en-gb'] = "Enter the speed dial number.";
 $text['description-phone_speed_dial']['ar-eg'] = "";
@@ -4432,8 +4454,8 @@ $text['description-phone_speed_dial']['de-de'] = "Kurzwahlnummer eingeben";
 $text['description-phone_speed_dial']['el-gr'] = "Εισάγετε τον αριθμό ταχείας κλήσης.";
 $text['description-phone_speed_dial']['es-cl'] = "";
 $text['description-phone_speed_dial']['es-mx'] = "";
-$text['description-phone_speed_dial']['fr-ca'] = "";
-$text['description-phone_speed_dial']['fr-fr'] = "";
+$text['description-phone_speed_dial']['fr-ca'] = "Entrez le numéro de numérotation abrégée";
+$text['description-phone_speed_dial']['fr-fr'] = "Entrez le numéro de numérotation abrégée";
 $text['description-phone_speed_dial']['he-il'] = "";
 $text['description-phone_speed_dial']['it-it'] = "Inserire il numero breve del contatto.";
 $text['description-phone_speed_dial']['nl-nl'] = "Voer snelkies nummer in.";
@@ -4445,6 +4467,28 @@ $text['description-phone_speed_dial']['ru-ru'] = "Введите номер бы
 $text['description-phone_speed_dial']['sv-se'] = "Ange snabbknappens nummer.";
 $text['description-phone_speed_dial']['uk-ua'] = "";
 
+$text['description-phone_country_code']['en-us'] = "Enter the country code.";
+$text['description-phone_country_code']['en-gb'] = "Enter the country code.";
+$text['description-phone_country_code']['ar-eg'] = "";
+$text['description-phone_country_code']['de-at'] = "";
+$text['description-phone_country_code']['de-ch'] = "";
+$text['description-phone_country_code']['de-de'] = "";
+$text['description-phone_country_code']['el-gr'] = "";
+$text['description-phone_country_code']['es-cl'] = "";
+$text['description-phone_country_code']['es-mx'] = "";
+$text['description-phone_country_code']['fr-ca'] = "Entrez l'indicatif du pays";
+$text['description-phone_country_code']['fr-fr'] = "Entrez l'indicatif du pays";
+$text['description-phone_country_code']['he-il'] = "";
+$text['description-phone_country_code']['it-it'] = "";
+$text['description-phone_country_code']['nl-nl'] = "";
+$text['description-phone_country_code']['pl-pl'] = "";
+$text['description-phone_country_code']['pt-br'] = "";
+$text['description-phone_country_code']['pt-pt'] = "";
+$text['description-phone_country_code']['ro-ro'] = "";
+$text['description-phone_country_code']['ru-ru'] = "";
+$text['description-phone_country_code']['sv-se'] = "";
+$text['description-phone_country_code']['uk-ua'] = "";
+
 $text['description-phone_number']['en-us'] = "Enter the phone number.";
 $text['description-phone_number']['en-gb'] = "Enter the phone number.";
 $text['description-phone_number']['ar-eg'] = "";
@@ -4467,28 +4511,6 @@ $text['description-phone_number']['ru-ru'] = "Введите номер теле
 $text['description-phone_number']['sv-se'] = "Ange telefonnummer.";
 $text['description-phone_number']['uk-ua'] = "";
 
-$text['description-phone_label']['en-us'] = "Select or enter a custom label.";
-$text['description-phone_label']['en-gb'] = "Select or enter a custom label.";
-$text['description-phone_label']['ar-eg'] = "";
-$text['description-phone_label']['de-at'] = "Wählen Sie eine beliebige Kennzeichnung."; //copied from de-de
-$text['description-phone_label']['de-ch'] = "Wählen Sie eine beliebige Kennzeichnung."; //copied from de-de
-$text['description-phone_label']['de-de'] = "Wählen Sie eine beliebige Kennzeichnung.";
-$text['description-phone_label']['el-gr'] = "Επιλέξτε ή εισάγετε μια προσωποποιημένη ετικέτα";
-$text['description-phone_label']['es-cl'] = "Seleccione o introduzca una etiqueta personalizada.";
-$text['description-phone_label']['es-mx'] = "Seleccione o introduzca una etiqueta personalizada."; //copied from es-cl
-$text['description-phone_label']['fr-ca'] = "Sélectionnez ou entrez une étiquette personnalisée."; //copied from fr-fr
-$text['description-phone_label']['fr-fr'] = "Sélectionnez ou entrez une étiquette personnalisée.";
-$text['description-phone_label']['he-il'] = "";
-$text['description-phone_label']['it-it'] = "Seleziona o inserisci un'etichetta personalizzata.";
-$text['description-phone_label']['nl-nl'] = "Kies of voer een keuze kenmerk in.";
-$text['description-phone_label']['pl-pl'] = "Wybierz lub wprowadź własną etykietę.";
-$text['description-phone_label']['pt-br'] = "Selecione ou digite um identificador personalizado";
-$text['description-phone_label']['pt-pt'] = "Selecione ou digite um rótulo personalizado.";
-$text['description-phone_label']['ro-ro'] = "";
-$text['description-phone_label']['ru-ru'] = "Выберите или введите настраиваемую метку.";
-$text['description-phone_label']['sv-se'] = "Välj eller ange anpassad etikett.";
-$text['description-phone_label']['uk-ua'] = "";
-
 $text['description-phone_extension']['en-us'] = "Enter the extension.";
 $text['description-phone_extension']['en-gb'] = "Enter the extension.";
 $text['description-phone_extension']['ar-eg'] = "";
@@ -4511,6 +4533,28 @@ $text['description-phone_extension']['ru-ru'] = "Введите Внутренн
 $text['description-phone_extension']['sv-se'] = "Ange anknytningen.";
 $text['description-phone_extension']['uk-ua'] = "";
 
+$text['description-phone_primary']['en-us'] = "Set as the primary Number for this contact.";
+$text['description-phone_primary']['en-gb'] = "Set as the primary Number for this contact.";
+$text['description-phone_primary']['ar-eg'] = "";
+$text['description-phone_primary']['de-at'] = "Als primäre Nummer für diesen Kontakt setzen."; //copied from de-de
+$text['description-phone_primary']['de-ch'] = "Als primäre Nummer für diesen Kontakt setzen."; //copied from de-de
+$text['description-phone_primary']['de-de'] = "Als primäre Nummer für diesen Kontakt setzen.";
+$text['description-phone_primary']['el-gr'] = "Ορίστε τον κύριο αριθμό για αυτή την επαφή";
+$text['description-phone_primary']['es-cl'] = "Establecer como el número primario para este contacto.";
+$text['description-phone_primary']['es-mx'] = "Establecer como el número primario para este contacto."; //copied from es-cl
+$text['description-phone_primary']['fr-ca'] = "Définir comme primaire numéro pour ce contact."; //copied from fr-fr
+$text['description-phone_primary']['fr-fr'] = "Définir comme primaire numéro pour ce contact.";
+$text['description-phone_primary']['he-il'] = "";
+$text['description-phone_primary']['it-it'] = "Imposta come numero principale per questo contatto.";
+$text['description-phone_primary']['nl-nl'] = "Stel nummer in als primair nummer voor dit kontact";
+$text['description-phone_primary']['pl-pl'] = "Ustaw jako podstawowy numer tego kontaktu.";
+$text['description-phone_primary']['pt-br'] = "Defina número principal para este contato";
+$text['description-phone_primary']['pt-pt'] = "Definir como o principal número para este contato.";
+$text['description-phone_primary']['ro-ro'] = "";
+$text['description-phone_primary']['ru-ru'] = "Укажите в качестве основного номера для этого контакта.";
+$text['description-phone_primary']['sv-se'] = "Sätt som primärt Nummer för denna kontakt.";
+$text['description-phone_primary']['uk-ua'] = "";
+
 $text['description-phone_description']['en-us'] = "Enter the description.";
 $text['description-phone_description']['en-gb'] = "Enter the description.";
 $text['description-phone_description']['ar-eg'] = "";
@@ -5312,8 +5356,8 @@ $text['description-contact_name_given']['de-de'] = "Geben Sie den Vornamen ein."
 $text['description-contact_name_given']['el-gr'] = "Εισάγετε το όνομα.";
 $text['description-contact_name_given']['es-cl'] = "Ingrese el nombre dado.";
 $text['description-contact_name_given']['es-mx'] = "Ingrese el nombre dado."; //copied from es-cl
-$text['description-contact_name_given']['fr-ca'] = "Entrez le nom donné."; //copied from fr-fr
-$text['description-contact_name_given']['fr-fr'] = "Entrez le nom donné.";
+$text['description-contact_name_given']['fr-ca'] = "Entrez le prénom."; //copied from fr-fr
+$text['description-contact_name_given']['fr-fr'] = "Entrez le prénom.";
 $text['description-contact_name_given']['he-il'] = "";
 $text['description-contact_name_given']['it-it'] = "Inserire il nome.";
 $text['description-contact_name_given']['nl-nl'] = "Voer de voornaam in.";
@@ -5356,8 +5400,8 @@ $text['description-contact_email-edit']['de-de'] = "Email-Address Informationen.
 $text['description-contact_email-edit']['el-gr'] = "Πληροφορίες ηλεκτρονικής διεύθυνσης αλληλογραφίας.";
 $text['description-contact_email-edit']['es-cl'] = "Contactar con información de la dirección de correo electrónico.";
 $text['description-contact_email-edit']['es-mx'] = "Contactar con información de la dirección de correo electrónico."; //copied from es-cl
-$text['description-contact_email-edit']['fr-ca'] = "Coordonnées de l'adresse e-mail."; //copied from fr-fr
-$text['description-contact_email-edit']['fr-fr'] = "Coordonnées de l'adresse e-mail.";
+$text['description-contact_email-edit']['fr-ca'] = "Coordonnées de l'adresse courriel.";
+$text['description-contact_email-edit']['fr-fr'] = "Coordonnées de l'adresse courriel.";
 $text['description-contact_email-edit']['he-il'] = "";
 $text['description-contact_email-edit']['it-it'] = "Indirizzo email del contatto.";
 $text['description-contact_email-edit']['nl-nl'] = "Voer het E-mail adres informatie in.";
@@ -5378,8 +5422,8 @@ $text['description-contact_email-add']['de-de'] = "Email-Address Informationen."
 $text['description-contact_email-add']['el-gr'] = "Πληροφορίες ηλεκτρονικής διεύθυνσης αλληλογραφίας.";
 $text['description-contact_email-add']['es-cl'] = "Contactar con información de la dirección de correo electrónico.";
 $text['description-contact_email-add']['es-mx'] = "Contactar con información de la dirección de correo electrónico."; //copied from es-cl
-$text['description-contact_email-add']['fr-ca'] = "Coordonnées de l'adresse e-mail."; //copied from fr-fr
-$text['description-contact_email-add']['fr-fr'] = "Coordonnées de l'adresse e-mail.";
+$text['description-contact_email-add']['fr-ca'] = "Coordonnées de l'adresse courriel.";
+$text['description-contact_email-add']['fr-fr'] = "Coordonnées de l'adresse courriel.";
 $text['description-contact_email-add']['he-il'] = "";
 $text['description-contact_email-add']['it-it'] = "Indirizzo email del contatto.";
 $text['description-contact_email-add']['nl-nl'] = "Kontact E-mail adres informatie.";
@@ -5400,8 +5444,8 @@ $text['description-contact_email']['de-de'] = "Geben Sie die Email Addresse ein.
 $text['description-contact_email']['el-gr'] = "Ορίστε τη διεύθυνση ηλεκτρονικής αλληλογραφίας.";
 $text['description-contact_email']['es-cl'] = "Ingrese la dirección de correo electrónico.";
 $text['description-contact_email']['es-mx'] = "Ingrese la dirección de correo electrónico."; //copied from es-cl
-$text['description-contact_email']['fr-ca'] = "Entrez l'adresse e-mail."; //copied from fr-fr
-$text['description-contact_email']['fr-fr'] = "Entrez l'adresse e-mail.";
+$text['description-contact_email']['fr-ca'] = "Entrez l'adresse courriel.";
+$text['description-contact_email']['fr-fr'] = "Entrez l'adresse courriel.";
 $text['description-contact_email']['he-il'] = "";
 $text['description-contact_email']['it-it'] = "Inserire l'indirizzo email.";
 $text['description-contact_email']['nl-nl'] = "Voer E-mail adres in.";
@@ -5664,7 +5708,7 @@ $text['description-address_locality']['de-de'] = "Geben Sie die Stadt ein.";
 $text['description-address_locality']['el-gr'] = "Εισάγετε την πόλη.";
 $text['description-address_locality']['es-cl'] = "Ingrese la ciudad";
 $text['description-address_locality']['es-mx'] = "Ingrese la ciudad"; //copied from es-cl
-$text['description-address_locality']['fr-ca'] = "Entrez dans la ville."; //copied from fr-fr
+$text['description-address_locality']['fr-ca'] = "Entrez la ville.";
 $text['description-address_locality']['fr-fr'] = "Entrez dans la ville.";
 $text['description-address_locality']['he-il'] = "";
 $text['description-address_locality']['it-it'] = "Inserire la città.";
@@ -6021,7 +6065,7 @@ $text['button-save']['fr-fr'] = "Sauvegarder";
 $text['button-save']['he-il'] = "שמור";
 $text['button-save']['it-it'] = "Salva";
 $text['button-save']['nl-nl'] = "Opslaan";
-$text['button-save']['pl-pl'] = "Zachowaj";
+$text['button-save']['pl-pl'] = "Zapisz";
 $text['button-save']['pt-br'] = "Salvar";
 $text['button-save']['pt-pt'] = "Guardar";
 $text['button-save']['ro-ro'] = "";
@@ -6126,7 +6170,7 @@ $text['button-edit']['de-de'] = "Bearbeiten";
 $text['button-edit']['el-gr'] = "Επεξεργασία";
 $text['button-edit']['es-cl'] = "Editar";
 $text['button-edit']['es-mx'] = "Editar"; //copied from es-cl
-$text['button-edit']['fr-ca'] = "Editer"; //copied from fr-fr
+$text['button-edit']['fr-ca'] = "Modifier";
 $text['button-edit']['fr-fr'] = "Editer";
 $text['button-edit']['he-il'] = "";
 $text['button-edit']['it-it'] = "Modifica";
@@ -6380,8 +6424,8 @@ $text['label-properties']['de-ch'] = "Properties";
 $text['label-properties']['de-de'] = "Properties";
 $text['label-properties']['es-cl'] = "Properties";
 $text['label-properties']['es-mx'] = "Properties";
-$text['label-properties']['fr-ca'] = "Properties";
-$text['label-properties']['fr-fr'] = "Properties";
+$text['label-properties']['fr-ca'] = "Propriétés";
+$text['label-properties']['fr-fr'] = "Propriétés";
 $text['label-properties']['he-il'] = "Properties";
 $text['label-properties']['it-it'] = "Properties";
 $text['label-properties']['nl-nl'] = "Properties";
@@ -6412,4 +6456,25 @@ $text['label-contact']['ru-ru'] = "Контакт";
 $text['label-contact']['sv-se'] = "Kontakt";
 $text['label-contact']['uk-ua'] = "Контакт";
 
-?>
\ No newline at end of file
+$text['label-permissions']['en-us'] = "Permissions";
+$text['label-permissions']['en-gb'] = "Permissions";
+$text['label-permissions']['ar-eg'] = "";
+$text['label-permissions']['de-at'] = "Berechtigungen"; //copied from de-de
+$text['label-permissions']['de-ch'] = "Berechtigungen"; //copied from de-de
+$text['label-permissions']['de-de'] = "Berechtigungen";
+$text['label-permissions']['es-cl'] = "Permisos";
+$text['label-permissions']['es-mx'] = "Permisos"; //copied from es-cl
+$text['label-permissions']['fr-ca'] = "Permissions"; //copied from fr-fr
+$text['label-permissions']['fr-fr'] = "Permissions";
+$text['label-permissions']['he-il'] = "הרשאות";
+$text['label-permissions']['it-it'] = "Permessi";
+$text['label-permissions']['nl-nl'] = "";
+$text['label-permissions']['pl-pl'] = "Uprawnienia";
+$text['label-permissions']['pt-br'] = "Permissões"; //copied from pt-pt
+$text['label-permissions']['pt-pt'] = "Permissões";
+$text['label-permissions']['ro-ro'] = "";
+$text['label-permissions']['ru-ru'] = "Права";
+$text['label-permissions']['sv-se'] = "Rättigheter";
+$text['label-permissions']['uk-ua'] = "Привілеї";
+
+?>
diff --git a/app/contacts/contact_edit.php b/app/contacts/contact_edit.php
index 1fb2746838..6f0bbb63a3 100644
--- a/app/contacts/contact_edit.php
+++ b/app/contacts/contact_edit.php
@@ -17,11 +17,8 @@
 
 	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) 2018 - 2022
 	the Initial Developer. All Rights Reserved.
-
-	Contributor(s):
-	Mark J Crane <markjcrane@fusionpbx.com>
 */
 
 //includes
@@ -30,7 +27,7 @@
 	require_once "resources/check_auth.php";
 
 //check permissions
-	if (permission_exists('contact_edit')) {
+	if (permission_exists('contact_add') || permission_exists('contact_edit')) {
 		//access granted
 	}
 	else {
@@ -46,34 +43,14 @@
 	if (is_uuid($_REQUEST["id"])) {
 		$action = "update";
 		$contact_uuid = $_REQUEST["id"];
+		$id = $_REQUEST["id"];
 	}
 	else {
 		$action = "add";
 	}
 
 //get http post variables and set them to php variables
-	if (count($_POST) > 0) {
-
-		//process the http post data by submitted action
-			if ($_POST['action'] != '' && is_uuid($_POST['contact_uuid'])) {
-				$array[0]['checked'] = 'true';
-				$array[0]['uuid'] = $_POST['contact_uuid'];
-
-				switch ($_POST['action']) {
-					case 'delete':
-						if (permission_exists('contact_delete')) {
-							$obj = new contacts;
-							$obj->delete($array);
-
-							header('Location: contacts.php');
-							exit;
-						}
-				}
-			}
-
-		$user_uuid = $_POST["user_uuid"];
-		$group_uuid = $_POST['group_uuid'];
-		$contact_type = $_POST["contact_type"];
+	if (is_array($_POST)) {
 		$contact_organization = $_POST["contact_organization"];
 		$contact_name_prefix = $_POST["contact_name_prefix"];
 		$contact_name_given = $_POST["contact_name_given"];
@@ -81,22 +58,39 @@
 		$contact_name_family = $_POST["contact_name_family"];
 		$contact_name_suffix = $_POST["contact_name_suffix"];
 		$contact_nickname = $_POST["contact_nickname"];
+
+		$contact_type = $_POST["contact_type"];
 		$contact_title = $_POST["contact_title"];
-		$contact_category = $_POST["contact_category"];
 		$contact_role = $_POST["contact_role"];
+		$contact_category = $_POST["contact_category"];
 		$contact_time_zone = $_POST["contact_time_zone"];
 		$contact_note = $_POST["contact_note"];
-		$contact_users_delete = $_POST['contact_users_delete'];
-		$contact_groups_delete = $_POST['contact_groups_delete'];
+
+		$last_mod_date = $_POST["last_mod_date"];
+		$last_mod_user = $_POST["last_mod_user"];
+
+		//$contact_users = $_POST["contact_users"];
+		//$contact_groups = $_POST["contact_groups"];
+		$contact_user_uuid = $_POST["contact_user_uuid"];
+		$contact_group_uuid = $_POST["contact_group_uuid"];
+
+
+		$contact_phones = $_POST["contact_phones"];
+		$contact_addresses = $_POST["contact_addresses"];
+		$contact_emails = $_POST["contact_emails"];
+		$contact_urls = $_POST["contact_urls"];
+		$contact_relations = $_POST["contact_relations"];
+		$contact_settings = $_POST["contact_settings"];
+		$contact_attachments = $_POST["contact_attachments"];
+		$contact_times = $_POST["contact_times"];
+		$contact_notes = $_POST["contact_notes"];
 	}
 
-//process the form data
+//process the user data and save it to the database
 	if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 
-		//set the uuid
-			if ($action == "update") {
-				$contact_uuid = $_POST["contact_uuid"];
-			}
+		//debug info
+			//view_array($_POST, true);
 
 		//validate the token
 			$token = new token;
@@ -106,20 +100,162 @@
 				exit;
 			}
 
+		//process the http post data by submitted action
+			if ($_POST['action'] != '' && strlen($_POST['action']) > 0) {
+
+				//prepare the array(s)
+				$x = 0;
+				foreach ($_POST['contact_users'] as $row) {
+					if (is_uuid($row['contact_uuid']) && $row['checked'] === 'true') {
+						$array['contacts'][$x]['checked'] = $row['checked'];
+						$array['contacts'][$x]['contact_users'][]['contact_user_uuid'] = $row['contact_user_uuid'];
+						$x++;
+					}
+				}
+
+				$x = 0;
+				foreach ($_POST['contact_groups'] as $row) {
+					if (is_uuid($row['contact_uuid']) && $row['checked'] === 'true') {
+						$array['contacts'][$x]['checked'] = $row['checked'];
+						$array['contacts'][$x]['contact_groups'][]['contact_group_uuid'] = $row['contact_group_uuid'];
+						$x++;
+					}
+				}
+
+				$x = 0;
+				foreach ($_POST['contact_phones'] as $row) {
+					if (is_uuid($row['contact_uuid']) && $row['checked'] === 'true') {
+						$array['contacts'][$x]['checked'] = $row['checked'];
+						$array['contacts'][$x]['contact_phones'][]['contact_phone_uuid'] = $row['contact_phone_uuid'];
+						$x++;
+					}
+				}
+
+				$x = 0;
+				foreach ($_POST['contact_addresses'] as $row) {
+					if (is_uuid($row['contact_uuid']) && $row['checked'] === 'true') {
+						$array['contacts'][$x]['checked'] = $row['checked'];
+						$array['contacts'][$x]['contact_addresses'][]['contact_address_uuid'] = $row['contact_address_uuid'];
+						$x++;
+					}
+				}
+
+				$x = 0;
+				foreach ($_POST['contact_emails'] as $row) {
+					if (is_uuid($row['contact_uuid']) && $row['checked'] === 'true') {
+						$array['contacts'][$x]['checked'] = $row['checked'];
+						$array['contacts'][$x]['contact_emails'][]['contact_email_uuid'] = $row['contact_email_uuid'];
+						$x++;
+					}
+				}
+
+				$x = 0;
+				foreach ($_POST['contact_urls'] as $row) {
+					if (is_uuid($row['contact_uuid']) && $row['checked'] === 'true') {
+						$array['contacts'][$x]['checked'] = $row['checked'];
+						$array['contacts'][$x]['contact_urls'][]['contact_url_uuid'] = $row['contact_url_uuid'];
+						$x++;
+					}
+				}
+
+				$x = 0;
+				foreach ($_POST['contact_relations'] as $row) {
+					if (is_uuid($row['contact_uuid']) && $row['checked'] === 'true') {
+						$array['contacts'][$x]['checked'] = $row['checked'];
+						$array['contacts'][$x]['contact_relations'][]['contact_relation_uuid'] = $row['contact_relation_uuid'];
+						$x++;
+					}
+				}
+
+				$x = 0;
+				foreach ($_POST['contact_settings'] as $row) {
+					if (is_uuid($row['contact_uuid']) && $row['checked'] === 'true') {
+						$array['contacts'][$x]['checked'] = $row['checked'];
+						$array['contacts'][$x]['contact_settings'][]['contact_setting_uuid'] = $row['contact_setting_uuid'];
+						$x++;
+					}
+				}
+
+				$x = 0;
+				foreach ($_POST['contact_attachments'] as $row) {
+					if (is_uuid($row['contact_uuid']) && $row['checked'] === 'true') {
+						$array['contacts'][$x]['checked'] = $row['checked'];
+						$array['contacts'][$x]['contact_attachments'][]['contact_attachment_uuid'] = $row['contact_attachment_uuid'];
+						$x++;
+					}
+				}
+
+				$x = 0;
+				foreach ($_POST['contact_times'] as $row) {
+					if (is_uuid($row['contact_uuid']) && $row['checked'] === 'true') {
+						$array['contacts'][$x]['checked'] = $row['checked'];
+						$array['contacts'][$x]['contact_times'][]['contact_time_uuid'] = $row['contact_time_uuid'];
+						$x++;
+					}
+				}
+
+				$x = 0;
+				foreach ($_POST['contact_notes'] as $row) {
+					if (is_uuid($row['contact_uuid']) && $row['checked'] === 'true') {
+						$array['contacts'][$x]['checked'] = $row['checked'];
+						$array['contacts'][$x]['contact_notes'][]['contact_note_uuid'] = $row['contact_note_uuid'];
+						$x++;
+					}
+				}
+
+				//send the array to the database class
+				switch ($_POST['action']) {
+					case 'copy':
+						if (permission_exists('contact_add')) {
+							$obj = new database;
+							$obj->copy($array);
+						}
+						break;
+					case 'delete':
+						if (permission_exists('contact_delete')) {
+							$obj = new database;
+							$obj->delete($array);
+						}
+						break;
+					case 'toggle':
+						if (permission_exists('contact_update')) {
+							$obj = new database;
+							$obj->toggle($array);
+						}
+						break;
+				}
+
+				//redirect the user
+				if (in_array($_POST['action'], array('copy', 'delete', 'toggle'))) {
+					header('Location: contact_edit.php?id='.$id);
+					exit;
+				}
+			}
+
 		//check for all required data
 			$msg = '';
-			//if (strlen($contact_type) == 0) { $msg .= $text['message-required'].$text['label-contact_type']."<br>\n"; }
-			//if (strlen($contact_organization) == 0) { $msg .= $text['message-required'].$text['label-contact_organization']."<br>\n"; }
-			//if (strlen($contact_name_prefix) == 0) { $msg .= $text['message-required'].$text['label-contact_name_prefix']."<br>\n"; }
-			//if (strlen($contact_name_given) == 0) { $msg .= $text['message-required'].$text['label-contact_name_given']."<br>\n"; }
-			//if (strlen($contact_name_middle) == 0) { $msg .= $text['message-required'].$text['label-contact_name_middle']."<br>\n"; }
-			//if (strlen($contact_name_family) == 0) { $msg .= $text['message-required'].$text['label-contact_name_family']."<br>\n"; }
-			//if (strlen($contact_name_suffix) == 0) { $msg .= $text['message-required'].$text['label-contact_name_suffix']."<br>\n"; }
-			//if (strlen($contact_nickname) == 0) { $msg .= $text['message-required'].$text['label-contact_nickname']."<br>\n"; }
-			//if (strlen($contact_title) == 0) { $msg .= $text['message-required'].$text['label-contact_title']."<br>\n"; }
-			//if (strlen($contact_role) == 0) { $msg .= $text['message-required'].$text['label-contact_role']."<br>\n"; }
-			//if (strlen($contact_time_zone) == 0) { $msg .= $text['message-required'].$text['label-contact_time_zone']."<br>\n"; }
-			//if (strlen($contact_note) == 0) { $msg .= $text['message-required'].$text['label-contact_note']."<br>\n"; }
+			//if (strlen($contact_type) == 0) { $msg .= $text['message-required']." ".$text['label-contact_type']."<br>\n"; }
+			//if (strlen($contact_title) == 0) { $msg .= $text['message-required']." ".$text['label-contact_title']."<br>\n"; }
+			//if (strlen($contact_role) == 0) { $msg .= $text['message-required']." ".$text['label-contact_role']."<br>\n"; }
+			//if (strlen($contact_category) == 0) { $msg .= $text['message-required']." ".$text['label-contact_category']."<br>\n"; }
+			//if (strlen($contact_organization) == 0) { $msg .= $text['message-required']." ".$text['label-contact_organization']."<br>\n"; }
+			//if (strlen($contact_name_prefix) == 0) { $msg .= $text['message-required']." ".$text['label-contact_name_prefix']."<br>\n"; }
+			//if (strlen($contact_name_given) == 0) { $msg .= $text['message-required']." ".$text['label-contact_name_given']."<br>\n"; }
+			//if (strlen($contact_name_middle) == 0) { $msg .= $text['message-required']." ".$text['label-contact_name_middle']."<br>\n"; }
+			//if (strlen($contact_name_family) == 0) { $msg .= $text['message-required']." ".$text['label-contact_name_family']."<br>\n"; }
+			//if (strlen($contact_name_suffix) == 0) { $msg .= $text['message-required']." ".$text['label-contact_name_suffix']."<br>\n"; }
+			//if (strlen($contact_nickname) == 0) { $msg .= $text['message-required']." ".$text['label-contact_nickname']."<br>\n"; }
+			//if (strlen($contact_time_zone) == 0) { $msg .= $text['message-required']." ".$text['label-contact_time_zone']."<br>\n"; }
+			//if (strlen($last_mod_date) == 0) { $msg .= $text['message-required']." ".$text['label-last_mod_date']."<br>\n"; }
+			//if (strlen($last_mod_user) == 0) { $msg .= $text['message-required']." ".$text['label-last_mod_user']."<br>\n"; }
+			//if (strlen($contact_phones) == 0) { $msg .= $text['message-required']." ".$text['label-contact_phones']."<br>\n"; }
+			//if (strlen($contact_addresses) == 0) { $msg .= $text['message-required']." ".$text['label-contact_addresses']."<br>\n"; }
+			//if (strlen($contact_emails) == 0) { $msg .= $text['message-required']." ".$text['label-contact_emails']."<br>\n"; }
+			//if (strlen($contact_urls) == 0) { $msg .= $text['message-required']." ".$text['label-contact_urls']."<br>\n"; }
+			//if (strlen($contact_settings) == 0) { $msg .= $text['message-required']." ".$text['label-contact_settings']."<br>\n"; }
+			//if (strlen($contact_user_uuid) == 0) { $msg .= $text['message-required']." ".$text['label-contact_user_uuid']."<br>\n"; }
+			//if (strlen($contact_group_uuid) == 0) { $msg .= $text['message-required']." ".$text['label-contact_group_uuid']."<br>\n"; }
+			//if (strlen($contact_note) == 0) { $msg .= $text['message-required']." ".$text['label-contact_note']."<br>\n"; }
 			if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
 				require_once "resources/header.php";
 				require_once "resources/persist_form_var.php";
@@ -133,147 +269,270 @@
 				return;
 			}
 
-		//add or update the database
-			if ($_POST["persistformvar"] != "true") {
+		//add the contact_uuid
+			if (!is_uuid($_POST["contact_uuid"])) {
+				$contact_uuid = uuid();
+			}
 
-				//add the contact
-					if ($action == "add" && permission_exists('contact_add')) {
-						$contact_uuid = uuid();
-						$array['contacts'][0]['contact_uuid'] = $contact_uuid;
+		//prepare the array
+			$array['contacts'][0]['contact_uuid'] = $contact_uuid;
+			$array['contacts'][0]['domain_uuid'] = $_SESSION['domain_uuid'];
+			$array['contacts'][0]['contact_type'] = $contact_type;
+			$array['contacts'][0]['contact_title'] = $contact_title;
+			$array['contacts'][0]['contact_role'] = $contact_role;
+			$array['contacts'][0]['contact_category'] = $contact_category;
+			$array['contacts'][0]['contact_organization'] = $contact_organization;
+			$array['contacts'][0]['contact_name_prefix'] = $contact_name_prefix;
+			$array['contacts'][0]['contact_name_given'] = $contact_name_given;
+			$array['contacts'][0]['contact_name_middle'] = $contact_name_middle;
+			$array['contacts'][0]['contact_name_family'] = $contact_name_family;
+			$array['contacts'][0]['contact_name_suffix'] = $contact_name_suffix;
+			$array['contacts'][0]['contact_nickname'] = $contact_nickname;
+			$array['contacts'][0]['contact_time_zone'] = $contact_time_zone;
+			$array['contacts'][0]['last_mod_date'] = "now()";
+			$array['contacts'][0]['last_mod_user'] = $_SESSION['user_uuid'];
+			$array['contacts'][0]['contact_note'] = $contact_note;
 
-						message::add($text['message-add']);
+			$y = 0;
+			if (isset($contact_user_uuid)) {
+				$array['contacts'][0]['contact_users'][$y]['domain_uuid'] = $_SESSION['domain_uuid'];
+				$array['contacts'][0]['contact_users'][$y]['contact_user_uuid'] = uuid();
+				$array['contacts'][0]['contact_users'][$y]['contact_uuid'] = $contact_uuid;
+				$array['contacts'][0]['contact_users'][$y]['user_uuid'] = $contact_user_uuid;
+				$y++;
+			}
+
+			$y = 0;
+			if (isset($contact_group_uuid)) {
+				$array['contacts'][0]['contact_groups'][$y]['domain_uuid'] = $_SESSION['domain_uuid'];
+				$array['contacts'][0]['contact_groups'][$y]['contact_group_uuid'] = uuid();
+				$array['contacts'][0]['contact_groups'][$y]['contact_uuid'] = $contact_uuid;
+				$array['contacts'][0]['contact_groups'][$y]['group_uuid'] = $contact_group_uuid;
+				$y++;
+			}
+
+			$y = 0;
+			if (is_array($contact_phones)) {
+				foreach ($contact_phones as $row) {
+					if (strlen($row['phone_number']) > 0) {
+						$array['contacts'][0]['contact_phones'][$y]['domain_uuid'] = $_SESSION['domain_uuid'];
+						$array['contacts'][0]['contact_phones'][$y]['contact_uuid'] = $contact_uuid;
+						$array['contacts'][0]['contact_phones'][$y]['contact_phone_uuid'] = $row["contact_phone_uuid"];
+						$array['contacts'][0]['contact_phones'][$y]['phone_label'] = $row["phone_label"];
+						$array['contacts'][0]['contact_phones'][$y]['phone_type_voice'] = $row["phone_type_voice"];
+						$array['contacts'][0]['contact_phones'][$y]['phone_type_fax'] = $row["phone_type_fax"];
+						$array['contacts'][0]['contact_phones'][$y]['phone_type_video'] = $row["phone_type_video"];
+						$array['contacts'][0]['contact_phones'][$y]['phone_type_text'] = $row["phone_type_text"];
+						$array['contacts'][0]['contact_phones'][$y]['phone_speed_dial'] = $row["phone_speed_dial"];
+						$array['contacts'][0]['contact_phones'][$y]['phone_country_code'] = $row["phone_country_code"];
+						$array['contacts'][0]['contact_phones'][$y]['phone_number'] = $row["phone_number"];
+						$array['contacts'][0]['contact_phones'][$y]['phone_extension'] = $row["phone_extension"];
+						$array['contacts'][0]['contact_phones'][$y]['phone_primary'] = $row["phone_primary"];
+						$array['contacts'][0]['contact_phones'][$y]['phone_description'] = $row["phone_description"];
+						$y++;
 					}
+				}
+			}
 
-				//update the contact
-					if ($action == "update") {
-						$array['contacts'][0]['contact_uuid'] = $contact_uuid;
-
-						message::add($text['message-update']);
+			$y = 0;
+			if (is_array($contact_addresses)) {
+				foreach ($contact_addresses as $row) {
+					if (strlen($row['address_street']) > 0) {
+						$array['contacts'][0]['contact_addresses'][$y]['domain_uuid'] = $_SESSION['domain_uuid'];
+						$array['contacts'][0]['contact_addresses'][$y]['contact_uuid'] = $contact_uuid;
+						$array['contacts'][0]['contact_addresses'][$y]['contact_address_uuid'] = $row["contact_address_uuid"];
+						$array['contacts'][0]['contact_addresses'][$y]['address_label'] = $row["address_label"];
+						$array['contacts'][0]['contact_addresses'][$y]['address_type'] = $row["address_type"];
+						$array['contacts'][0]['contact_addresses'][$y]['address_street'] = $row["address_street"];
+						$array['contacts'][0]['contact_addresses'][$y]['address_extended'] = $row["address_extended"];
+						if (permission_exists('address_community')) {
+							$array['contacts'][0]['contact_addresses'][$y]['address_community'] = $row["address_community"];
+						}
+						$array['contacts'][0]['contact_addresses'][$y]['address_locality'] = $row["address_locality"];
+						$array['contacts'][0]['contact_addresses'][$y]['address_region'] = $row["address_region"];
+						$array['contacts'][0]['contact_addresses'][$y]['address_postal_code'] = $row["address_postal_code"];
+						$array['contacts'][0]['contact_addresses'][$y]['address_country'] = $row["address_country"];
+						if (permission_exists('address_latitude')) {
+							$array['contacts'][0]['contact_addresses'][$y]['address_latitude'] = $row["address_latitude"];
+						}
+						if (permission_exists('address_longitude')) {
+							$array['contacts'][0]['contact_addresses'][$y]['address_longitude'] = $row["address_longitude"];
+						}
+						$array['contacts'][0]['contact_addresses'][$y]['address_primary'] = $row["address_primary"];
+						$array['contacts'][0]['contact_addresses'][$y]['address_description'] = $row["address_description"];
+						$y++;
 					}
+				}
+			}
 
-				//create array
-					if (is_array($array) && @sizeof($array) != 0) {
-						$array['contacts'][0]['domain_uuid'] = $_SESSION['domain_uuid'];
-						$array['contacts'][0]['contact_type'] = $contact_type;
-						$array['contacts'][0]['contact_organization'] = $contact_organization;
-						$array['contacts'][0]['contact_name_prefix'] = $contact_name_prefix;
-						$array['contacts'][0]['contact_name_given'] = $contact_name_given;
-						$array['contacts'][0]['contact_name_middle'] = $contact_name_middle;
-						$array['contacts'][0]['contact_name_family'] = $contact_name_family;
-						$array['contacts'][0]['contact_name_suffix'] = $contact_name_suffix;
-						$array['contacts'][0]['contact_nickname'] = $contact_nickname;
-						$array['contacts'][0]['contact_title'] = $contact_title;
-						$array['contacts'][0]['contact_category'] = $contact_category;
-						$array['contacts'][0]['contact_role'] = $contact_role;
-						$array['contacts'][0]['contact_time_zone'] = $contact_time_zone;
-						$array['contacts'][0]['contact_note'] = $contact_note;
-						$array['contacts'][0]['last_mod_date'] = 'now()';
-						$array['contacts'][0]['last_mod_user'] = $_SESSION['username'];
-
-						$p = new permissions;
+			$y = 0;
+			if (is_array($contact_emails)) {
+				foreach ($contact_emails as $row) {
+					if (strlen($row['email_address']) > 0) {
+						$array['contacts'][0]['contact_emails'][$y]['domain_uuid'] = $_SESSION['domain_uuid'];
+						$array['contacts'][0]['contact_emails'][$y]['contact_uuid'] = $contact_uuid;
+						$array['contacts'][0]['contact_emails'][$y]['contact_email_uuid'] = $row["contact_email_uuid"];
+						$array['contacts'][0]['contact_emails'][$y]['email_label'] = $row["email_label"];
+						$array['contacts'][0]['contact_emails'][$y]['email_address'] = $row["email_address"];
+						$array['contacts'][0]['contact_emails'][$y]['email_primary'] = $row["email_primary"];
+						$array['contacts'][0]['contact_emails'][$y]['email_description'] = $row["email_description"];
+						$y++;
 					}
+				}
 
-				//assign the contact to the user that added the contact
-					if ($action == "add" && !permission_exists('contact_user_add')) {
-						$user_uuid = $_SESSION["user_uuid"];
+			}
+
+			$y = 0;
+			if (is_array($contact_urls)) {
+				foreach ($contact_urls as $row) {
+					if (strlen($row['url_address']) > 0) {
+						$array['contacts'][0]['contact_urls'][$y]['domain_uuid'] = $_SESSION['domain_uuid'];
+						$array['contacts'][0]['contact_urls'][$y]['contact_uuid'] = $contact_uuid;
+						$array['contacts'][0]['contact_urls'][$y]['contact_url_uuid'] = $row["contact_url_uuid"];
+						$array['contacts'][0]['contact_urls'][$y]['url_type'] = $row["url_type"];
+						$array['contacts'][0]['contact_urls'][$y]['url_label'] = $row["url_label"];
+						$array['contacts'][0]['contact_urls'][$y]['url_address'] = $row["url_address"];
+						$array['contacts'][0]['contact_urls'][$y]['url_primary'] = $row["url_primary"];
+						$array['contacts'][0]['contact_urls'][$y]['url_description'] = $row["url_description"];
+						$y++;
 					}
+				}
+			}
 
-				//add user to contact users table
-					if (is_uuid($user_uuid) && (permission_exists('contact_user_add') || $action == "add")) {
-						$contact_user_uuid = uuid();
-						$array['contact_users'][0]['domain_uuid'] = $domain_uuid;
-						$array['contact_users'][0]['contact_user_uuid'] = $contact_user_uuid;
-						$array['contact_users'][0]['contact_uuid'] = $contact_uuid;
-						$array['contact_users'][0]['user_uuid'] = $user_uuid;
-
-						$p->add('contact_user_add', 'temp');
+			$y = 0;
+			if (is_array($contact_relations)) {
+				foreach ($contact_relations as $row) {
+					if (strlen($row['contact_relation_uuid']) > 0) {
+						$array['contacts'][0]['contact_relations'][$y]['domain_uuid'] = $_SESSION['domain_uuid'];
+						$array['contacts'][0]['contact_relations'][$y]['contact_uuid'] = $contact_uuid;
+						$array['contacts'][0]['contact_relations'][$y]['contact_relation_uuid'] = $row["contact_relation_uuid"];
+						$array['contacts'][0]['contact_relations'][$y]['relation_label'] = $row["relation_label"];
+						$array['contacts'][0]['contact_relations'][$y]['relation_contact_uuid'] = $row["relation_contact_uuid"];
+						$y++;
 					}
+				}
+			}
 
-				//assign the contact to the group
-					if (is_uuid($group_uuid) && permission_exists('contact_group_add')) {
-						$contact_group_uuid = uuid();
-						$array['contact_groups'][0]['contact_group_uuid'] = $contact_group_uuid;
-						$array['contact_groups'][0]['domain_uuid'] = $domain_uuid;
-						$array['contact_groups'][0]['contact_uuid'] = $contact_uuid;
-						$array['contact_groups'][0]['group_uuid'] = $group_uuid;
-
-						$p->add('contact_group_add', 'temp');
+			$y = 0;
+			if (is_array($contact_settings)) {
+				foreach ($contact_settings as $row) {
+					if (strlen($row['contact_setting_category']) > 0 && strlen($row['contact_setting_subcategory']) > 0 && strlen($row['contact_setting_name']) > 0) {
+						$array['contacts'][0]['contact_settings'][$y]['domain_uuid'] = $_SESSION['domain_uuid'];
+						$array['contacts'][0]['contact_settings'][$y]['contact_uuid'] = $contact_uuid;
+						$array['contacts'][0]['contact_settings'][$y]['contact_setting_uuid'] = $row["contact_setting_uuid"];
+						$array['contacts'][0]['contact_settings'][$y]['contact_setting_category'] = $row["contact_setting_category"];
+						$array['contacts'][0]['contact_settings'][$y]['contact_setting_subcategory'] = $row["contact_setting_subcategory"];
+						$array['contacts'][0]['contact_settings'][$y]['contact_setting_name'] = $row["contact_setting_name"];
+						$array['contacts'][0]['contact_settings'][$y]['contact_setting_value'] = $row["contact_setting_value"];
+						$array['contacts'][0]['contact_settings'][$y]['contact_setting_order'] = $row["contact_setting_order"];
+						$array['contacts'][0]['contact_settings'][$y]['contact_setting_enabled'] = $row["contact_setting_enabled"];
+						$array['contacts'][0]['contact_settings'][$y]['contact_setting_description'] = $row["contact_setting_description"];
+						$y++;
 					}
+				}
+			}
 
-				//execute
-					if (is_array($array) && @sizeof($array) != 0) {
-						$database = new database;
-						$database->app_name = 'contacts';
-						$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
-						$database->save($array);
-						unset($array);
-
-						$p->delete('contact_user_add', 'temp');
-						$p->delete('contact_group_add', 'temp');
+			$y = 0;
+			if (is_array($contact_attachments)) {
+				foreach ($contact_attachments as $row) {
+					if (strlen($row['attachment_description']) > 0) {
+						$array['contacts'][0]['contact_attachments'][$y]['contact_attachment_uuid'] = $row["contact_attachment_uuid"];
+						$array['contacts'][0]['contact_attachments'][$y]['domain_uuid'] = $row["domain_uuid"];
+						$array['contacts'][0]['contact_attachments'][$y]['contact_uuid'] = $row["contact_uuid"];
+						$array['contacts'][0]['contact_attachments'][$y]['attachment_primary'] = $row["attachment_primary"];
+						//$array['contacts'][0]['contact_attachments'][$y]['attachment_filename'] = $row["attachment_filename"];
+						//$array['contacts'][0]['contact_attachments'][$y]['attachment_content'] = $row["attachment_content"];
+						$array['contacts'][0]['contact_attachments'][$y]['attachment_description'] = $row["attachment_description"];
+						//$array['contacts'][0]['contact_attachments'][$y]['attachment_uploaded_date'] = $row["attachment_uploaded_date"];
+						//$array['contacts'][0]['contact_attachments'][$y]['attachment_uploaded_user_uuid'] = $row["attachment_uploaded_user_uuid"];
+						//$array['contacts'][0]['contact_attachments'][$y]['attachment_size'] = $row["attachment_size"];
+						$y++;
 					}
+				}
+			}
 
-				//delete checked contact properties
-					$array = array();
-					if (permission_exists('contact_phone_delete')) { $contact_properties['contact_phones'] = $_POST['contact_phones']; }
-					if (permission_exists('contact_address_delete')) { $contact_properties['contact_addresses'] = $_POST['contact_addresses']; }
-					if (permission_exists('contact_email_delete')) { $contact_properties['contact_emails'] = $_POST['contact_emails']; }
-					if (permission_exists('contact_url_delete')) { $contact_properties['contact_urls'] = $_POST['contact_urls']; }
-					//if (permission_exists('contact_extension_delete')) { $contact_properties['contact_extensions'] = $_POST['contact_extensions']; }
-					if (permission_exists('contact_relation_delete')) { $contact_properties['contact_relations'] = $_POST['contact_relations']; }
-					if (permission_exists('contact_note_delete')) { $contact_properties['contact_notes'] = $_POST['contact_notes']; }
-					if (permission_exists('contact_time_delete')) { $contact_properties['contact_times'] = $_POST['contact_times']; }
-					if (permission_exists('contact_setting_delete')) { $contact_properties['contact_settings'] = $_POST['contact_settings']; }
-					if (permission_exists('contact_attachment_delete')) { $contact_properties['contact_attachments'] = $_POST['contact_attachments']; }
-
-					if (@sizeof($contact_properties) != 0) {
-						$obj = new contacts;
-						$obj->contact_uuid = $contact_uuid;
-						$obj->delete_properties($contact_properties);
+			$y = 0;
+			if (is_array($contact_times)) {
+				foreach ($contact_times as $row) {
+					if (strlen($row['time_start']) > 0) {
+						$array['contacts'][0]['contact_times'][$y]['contact_time_uuid'] = $row["contact_time_uuid"];
+						$array['contacts'][0]['contact_times'][$y]['domain_uuid'] = $row["domain_uuid"];
+						$array['contacts'][0]['contact_times'][$y]['contact_uuid'] = $row["contact_uuid"];
+						$array['contacts'][0]['contact_times'][$y]['time_start'] = $row["time_start"];
+						$array['contacts'][0]['contact_times'][$y]['time_stop'] = $row["time_stop"];
+						$array['contacts'][0]['contact_times'][$y]['time_description'] = $row["time_description"];
+						$y++;
 					}
+				}
+			}
 
-				//remove checked users
-					if (
-						$action == 'update'
-						&& permission_exists('contact_user_delete')
-						&& is_array($contact_users_delete)
-						&& @sizeof($contact_users_delete) != 0
-						) {
-						$obj = new contacts;
-						$obj->contact_uuid = $contact_uuid;
-						$obj->delete_users($contact_users_delete);
+			$y = 0;
+			if (is_array($contact_notes)) {
+				foreach ($contact_notes as $row) {
+					if (strlen($row['contact_note']) > 0) {
+						$array['contacts'][0]['contact_notes'][$y]['contact_note_uuid'] = $row["contact_note_uuid"];
+						$array['contacts'][0]['contact_notes'][$y]['domain_uuid'] = $row["domain_uuid"];
+						$array['contacts'][0]['contact_notes'][$y]['contact_uuid'] = $row["contact_uuid"];
+						$array['contacts'][0]['contact_notes'][$y]['contact_note'] = $row["contact_note"];
+						$array['contacts'][0]['contact_notes'][$y]['last_mod_date'] = 'now()';
+						$array['contacts'][0]['contact_notes'][$y]['last_mod_user'] = $_SESSION['username'];
+						$y++;
 					}
+				}
+			}
 
-				//remove checked groups
-					if (
-						$action == 'update'
-						&& permission_exists('contact_group_delete')
-						&& is_array($contact_groups_delete)
-						&& @sizeof($contact_groups_delete) != 0
-						) {
-						$obj = new contacts;
-						$obj->contact_uuid = $contact_uuid;
-						$obj->delete_groups($contact_groups_delete);
-					}
+		//save the data
+			if (is_array($array) && @sizeof($array) != 0) {
+				//add the permission object
+				$p = new permissions;
+				$p->add('contact_add', 'temp');
+				$p->add('contact_phone_add', 'temp');
+				$p->add('contact_address_add', 'temp');
+				$p->add('contact_user_add', 'temp');
+				$p->add('contact_group_add', 'temp');
 
-				//redirect the browser
-					header("Location: contact_edit.php?id=".urlencode($contact_uuid));
-					exit;
+				//view_array($array);
 
+				$database = new database;
+				$database->app_name = 'contacts';
+				$database->app_uuid = '04481e0e-a478-c559-adad-52bd4174574c';
+				$database->save($array);
+				$message = $database->message;
+				unset($array);
+
+				//view_array($message);
+
+				$p->delete('contact_add', 'temp');
+				$p->delete('contact_phone_add', 'temp');
+				$p->delete('contact_address_add', 'temp');
+				$p->delete('contact_user_add', 'temp');
+				$p->delete('contact_group_add', 'temp');
+			}
+
+		//redirect the user
+			if (isset($action)) {
+				if ($action == "add") {
+					$_SESSION["message"] = $text['message-add'];
+				}
+				if ($action == "update") {
+					$_SESSION["message"] = $text['message-update'];
+				}
+				//header('Location: contacts.php');
+				header('Location: contact_edit.php?id='.urlencode($contact_uuid));
+				return;
 			}
 	}
 
 //pre-populate the form
-	if (count($_GET) > 0 && $_POST["persistformvar"] != "true") {
-		$contact_uuid = $_GET["id"];
+	if (is_array($_GET) && $_POST["persistformvar"] != "true") {
 		$sql = "select * from v_contacts ";
-		$sql .= "where domain_uuid = :domain_uuid ";
-		$sql .= "and contact_uuid = :contact_uuid ";
-		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+		$sql .= "where contact_uuid = :contact_uuid ";
+		//$sql .= "and domain_uuid = :domain_uuid ";
+		//$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 		$parameters['contact_uuid'] = $contact_uuid;
 		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (is_array($row) && @sizeof($row) != 0) {
-			$contact_type = $row["contact_type"];
 			$contact_organization = $row["contact_organization"];
 			$contact_name_prefix = $row["contact_name_prefix"];
 			$contact_name_given = $row["contact_name_given"];
@@ -281,11 +540,27 @@
 			$contact_name_family = $row["contact_name_family"];
 			$contact_name_suffix = $row["contact_name_suffix"];
 			$contact_nickname = $row["contact_nickname"];
+
+			$contact_type = $row["contact_type"];
 			$contact_title = $row["contact_title"];
-			$contact_category = $row["contact_category"];
 			$contact_role = $row["contact_role"];
+			$contact_category = $row["contact_category"];
 			$contact_time_zone = $row["contact_time_zone"];
 			$contact_note = $row["contact_note"];
+
+			$last_mod_date = $row["last_mod_date"];
+			$last_mod_user = $row["last_mod_user"];
+
+			//$contact_phones = $row["contact_phones"];
+			//$contact_addresses = $row["contact_addresses"];
+			//$contact_emails = $row["contact_emails"];
+			//$contact_urls = $row["contact_urls"];
+			//$contact_settings = $row["contact_settings"];
+			//$contact_user_uuid = $row["contact_user_uuid"];
+
+			$contact_user_uuid = $row["contact_user_uuid"];
+			$contact_group_uuid = $row["contact_group_uuid"];
+
 		}
 		unset($sql, $parameters, $row);
 	}
@@ -310,37 +585,42 @@
 	}
 
 //get the users assigned to this contact
-	$sql = "select u.username, u.user_uuid, a.contact_user_uuid from v_contacts as c, v_users as u, v_contact_users as a ";
-	$sql .= "where c.contact_uuid = :contact_uuid ";
-	$sql .= "and c.domain_uuid = :domain_uuid ";
-	$sql .= "and u.user_uuid = a.user_uuid ";
-	$sql .= "and c.contact_uuid = a.contact_uuid ";
-	$sql .= "order by u.username asc ";
-	$parameters['contact_uuid'] = $contact_uuid;
-	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
-	$database = new database;
-	$contact_users_assigned = $database->select($sql, $parameters, 'all');
-	unset($sql, $parameters);
+	if (is_uuid($contact_uuid)) {
+		$sql = "select c.domain_uuid, c.contact_uuid, u.username, u.user_uuid, a.contact_user_uuid ";
+		$sql .= "from v_contacts as c, v_users as u, v_contact_users as a ";
+		$sql .= "where c.contact_uuid = :contact_uuid ";
+		$sql .= "and c.domain_uuid = :domain_uuid ";
+		$sql .= "and u.user_uuid = a.user_uuid ";
+		$sql .= "and c.contact_uuid = a.contact_uuid ";
+		$sql .= "order by u.username asc ";
+		$parameters['contact_uuid'] = $contact_uuid;
+		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+		$database = new database;
+		$contact_users_assigned = $database->select($sql, $parameters, 'all');
+		unset($sql, $parameters);
+	}
 
 //get the assigned groups of this contact
-	$sql = "select g.*, cg.contact_group_uuid ";
-	$sql .= "from v_groups as g, v_contact_groups as cg ";
-	$sql .= "where cg.group_uuid = g.group_uuid ";
-	$sql .= "and cg.domain_uuid = :domain_uuid ";
-	$sql .= "and cg.contact_uuid = :contact_uuid ";
-	$sql .= "and cg.group_uuid <> :group_uuid ";
-	$sql .= "order by g.group_name asc ";
-	$parameters['domain_uuid'] = $domain_uuid;
-	$parameters['contact_uuid'] = $contact_uuid;
-	$parameters['group_uuid'] = $_SESSION["user_uuid"];
-	$database = new database;
-	$contact_groups_assigned = $database->select($sql, $parameters, 'all');
-	if (is_array($contact_groups_assigned) && @sizeof($contact_groups_assigned) != 0) {
-		foreach ($contact_groups_assigned as $field) {
-			$contact_groups[] = "'".$field['group_uuid']."'";
+	if (is_uuid($contact_uuid)) {
+		$sql = "select g.*, cg.contact_group_uuid ";
+		$sql .= "from v_groups as g, v_contact_groups as cg ";
+		$sql .= "where cg.group_uuid = g.group_uuid ";
+		$sql .= "and cg.domain_uuid = :domain_uuid ";
+		$sql .= "and cg.contact_uuid = :contact_uuid ";
+		$sql .= "and cg.group_uuid <> :group_uuid ";
+		$sql .= "order by g.group_name asc ";
+		$parameters['domain_uuid'] = $domain_uuid;
+		$parameters['contact_uuid'] = $contact_uuid;
+		$parameters['group_uuid'] = $_SESSION["user_uuid"];
+		$database = new database;
+		$contact_groups_assigned = $database->select($sql, $parameters, 'all');
+		if (is_array($contact_groups_assigned) && @sizeof($contact_groups_assigned) != 0) {
+			foreach ($contact_groups_assigned as $field) {
+				$contact_groups[] = "'".$field['group_uuid']."'";
+			}
 		}
+		unset($sql, $parameters);
 	}
-	unset($sql, $parameters);
 
 //get the available groups to this contact
 	$sql = "select group_uuid, group_name from v_groups ";
@@ -354,19 +634,266 @@
 	$contact_groups_available = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters, $contact_groups);
 
+//get the child data
+	if (is_uuid($contact_uuid)) {
+		$sql = "select * from v_contact_phones ";
+		$sql .= "where contact_uuid = :contact_uuid ";
+		//$sql .= "and domain_uuid = '".$domain_uuid."' ";
+		//$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+		$parameters['contact_uuid'] = $contact_uuid;
+		$database = new database;
+		$contact_phones = $database->select($sql, $parameters, 'all');
+		unset ($sql, $parameters);
+	}
+
+//add the $contact_phone_uuid
+	if (!is_uuid($contact_phone_uuid)) {
+		$contact_phone_uuid = uuid();
+	}
+
+//add an empty row
+	if (!is_array($contact_phones) || count($contact_phones) == 0) {
+		$x = is_array($contact_phones) ? count($contact_phones) : 0;
+		$contact_phones[$x]['domain_uuid'] = $_SESSION['domain_uuid'];
+		$contact_phones[$x]['contact_uuid'] = $contact_uuid;
+		$contact_phones[$x]['contact_phone_uuid'] = uuid();
+		$contact_phones[$x]['phone_label'] = '';
+		$contact_phones[$x]['phone_type_voice'] = '';
+		$contact_phones[$x]['phone_type_fax'] = '';
+		$contact_phones[$x]['phone_type_video'] = '';
+		$contact_phones[$x]['phone_type_text'] = '';
+		$contact_phones[$x]['phone_speed_dial'] = '';
+		$contact_phones[$x]['phone_country_code'] = '';
+		$contact_phones[$x]['phone_number'] = '';
+		$contact_phones[$x]['phone_extension'] = '';
+		$contact_phones[$x]['phone_primary'] = '';
+		$contact_phones[$x]['phone_description'] = '';
+	}
+
+//get the child data
+	if (is_uuid($contact_uuid)) {
+		$sql = "select * from v_contact_addresses ";
+		$sql .= "where contact_uuid = :contact_uuid ";
+		//$sql .= "and domain_uuid = '".$domain_uuid."' ";
+		$sql .= "order by address_street asc";
+		//$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+		$parameters['contact_uuid'] = $contact_uuid;
+		$database = new database;
+		$contact_addresses = $database->select($sql, $parameters, 'all');
+		unset ($sql, $parameters);
+	}
+
+//add the $contact_address_uuid
+	if (!is_uuid($contact_address_uuid)) {
+		$contact_address_uuid = uuid();
+	}
+
+//add an empty row
+	if (!is_array($contact_addresses) || count($contact_addresses) == 0) {
+		$x = is_array($contact_addresses) ? count($contact_addresses) : 0;
+		$contact_addresses[$x]['domain_uuid'] = $_SESSION['domain_uuid'];
+		$contact_addresses[$x]['contact_uuid'] = $contact_uuid;
+		$contact_addresses[$x]['contact_address_uuid'] = uuid();
+		$contact_addresses[$x]['address_label'] = '';
+		$contact_addresses[$x]['address_type'] = '';
+		$contact_addresses[$x]['address_street'] = '';
+		$contact_addresses[$x]['address_extended'] = '';
+		$contact_addresses[$x]['address_community'] = '';
+		$contact_addresses[$x]['address_locality'] = '';
+		$contact_addresses[$x]['address_region'] = '';
+		$contact_addresses[$x]['address_postal_code'] = '';
+		$contact_addresses[$x]['address_country'] = '';
+		$contact_addresses[$x]['address_latitude'] = '';
+		$contact_addresses[$x]['address_longitude'] = '';
+		$contact_addresses[$x]['address_primary'] = '';
+		$contact_addresses[$x]['address_description'] = '';
+	}
+
+//get the child data
+	if (is_uuid($contact_uuid)) {
+		$sql = "select * from v_contact_emails ";
+		$sql .= "where contact_uuid = :contact_uuid ";
+		//$sql .= "and domain_uuid = '".$domain_uuid."' ";
+		//$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+		$parameters['contact_uuid'] = $contact_uuid;
+		$database = new database;
+		$contact_emails = $database->select($sql, $parameters, 'all');
+		unset ($sql, $parameters);
+	}
+
+//add the $contact_email_uuid
+	if (!is_uuid($contact_email_uuid)) {
+		$contact_email_uuid = uuid();
+	}
+
+//add an empty row
+	if (!is_array($contact_emails) || count($contact_emails) == 0) {
+		$x = is_array($contact_emails) ? count($contact_emails) : 0;
+		$contact_emails[$x]['domain_uuid'] = $_SESSION['domain_uuid'];
+		$contact_emails[$x]['contact_uuid'] = $contact_uuid;
+		$contact_emails[$x]['contact_email_uuid'] = uuid();
+		$contact_emails[$x]['email_label'] = '';
+		$contact_emails[$x]['email_address'] = '';
+		$contact_emails[$x]['email_primary'] = '';
+		$contact_emails[$x]['email_description'] = '';
+	}
+
+//get the child data
+	if (is_uuid($contact_uuid)) {
+		$sql = "select * from v_contact_urls ";
+		$sql .= "where contact_uuid = :contact_uuid ";
+		//$sql .= "and domain_uuid = '".$domain_uuid."' ";
+		$sql .= "order by url_address asc";
+		//$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+		$parameters['contact_uuid'] = $contact_uuid;
+		$database = new database;
+		$contact_urls = $database->select($sql, $parameters, 'all');
+		unset ($sql, $parameters);
+	}
+
+//add the $contact_url_uuid
+	if (!is_uuid($contact_url_uuid)) {
+		$contact_url_uuid = uuid();
+	}
+
+//add an empty row
+	if (!is_array($contact_urls) || count($contact_urls) == 0) {
+		$x = is_array($contact_urls) ? count($contact_urls) : 0;
+		$contact_urls[$x]['domain_uuid'] = $_SESSION['domain_uuid'];
+		$contact_urls[$x]['contact_uuid'] = $contact_uuid;
+		$contact_urls[$x]['contact_url_uuid'] = uuid();
+		$contact_urls[$x]['url_type'] = '';
+		$contact_urls[$x]['url_label'] = '';
+		$contact_urls[$x]['url_address'] = '';
+		$contact_urls[$x]['url_primary'] = '';
+		$contact_urls[$x]['url_description'] = '';
+	}
+
+//get the child data
+	if (is_uuid($contact_uuid)) {
+		$sql = "select * from v_contact_relations ";
+		$sql .= "where contact_uuid = :contact_uuid ";
+		//$sql .= "and domain_uuid = '".$domain_uuid."' ";
+		//$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+		$parameters['contact_uuid'] = $contact_uuid;
+		$database = new database;
+		$contact_relations = $database->select($sql, $parameters, 'all');
+		unset ($sql, $parameters);
+	}
+
+//add the $contact_setting_uuid
+	if (!is_uuid($contact_relation_uuid)) {
+		$contact_relation_uuid = uuid();
+	}
+
+//add an empty row
+	if (!is_array($contact_relations) || count($contact_relations) == 0) {
+		$x = is_array($contact_relations) ? count($contact_relations) : 0;
+		$contact_relations[$x]['domain_uuid'] = $_SESSION['domain_uuid'];
+		$contact_relations[$x]['contact_uuid'] = $contact_uuid;
+		$contact_relations[$x]['contact_relation_uuid'] = uuid();
+		$contact_relations[$x]['relation_label'] = '';
+		$contact_relations[$x]['relation_contact_uuid'] = '';
+	}
+
+//get the child data
+	if (is_uuid($contact_uuid)) {
+		$sql = "select * from v_contact_settings ";
+		$sql .= "where contact_uuid = :contact_uuid ";
+		//$sql .= "and domain_uuid = '".$domain_uuid."' ";
+		//$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+		$parameters['contact_uuid'] = $contact_uuid;
+		$database = new database;
+		$contact_settings = $database->select($sql, $parameters, 'all');
+		unset ($sql, $parameters);
+	}
+
+//add the $contact_setting_uuid
+	if (!is_uuid($contact_setting_uuid)) {
+		$contact_setting_uuid = uuid();
+	}
+
+//add an empty row
+	if (!is_array($contact_settings) || count($contact_settings) == 0) {
+		$x = is_array($contact_settings) ? count($contact_settings) : 0;
+		$contact_settings[$x]['domain_uuid'] = $_SESSION['domain_uuid'];
+		$contact_settings[$x]['contact_uuid'] = $contact_uuid;
+		$contact_settings[$x]['contact_setting_uuid'] = uuid();
+		$contact_settings[$x]['contact_setting_category'] = '';
+		$contact_settings[$x]['contact_setting_subcategory'] = '';
+		$contact_settings[$x]['contact_setting_name'] = '';
+		$contact_settings[$x]['contact_setting_value'] = '';
+		$contact_settings[$x]['contact_setting_order'] = '';
+		$contact_settings[$x]['contact_setting_enabled'] = '';
+		$contact_settings[$x]['contact_setting_description'] = '';
+	}
+
+//get the contact attachments
+	if (is_uuid($contact_uuid)) {
+		$sql = "select *, length(decode(attachment_content,'base64')) as attachment_size from v_contact_attachments ";
+		$sql .= "where domain_uuid = :domain_uuid ";
+		$sql .= "and contact_uuid = :contact_uuid ";
+		$sql .= "order by attachment_primary desc, attachment_filename asc ";
+		$parameters['domain_uuid'] = $domain_uuid;
+		$parameters['contact_uuid'] = $contact_uuid;
+		$database = new database;
+		$contact_attachments = $database->select($sql, $parameters, 'all');
+		unset($sql, $parameters);
+	}
+
+//get the child data
+	if (is_uuid($contact_uuid)) {
+		$sql = "select * from v_contact_times ";
+		$sql .= "where contact_uuid = :contact_uuid ";
+		//$sql .= "and domain_uuid = '".$domain_uuid."' ";
+		//$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+		$parameters['contact_uuid'] = $contact_uuid;
+		$database = new database;
+		$contact_times = $database->select($sql, $parameters, 'all');
+		unset ($sql, $parameters);
+	}
+
+//add the $contact_time_uuid
+	if (!is_uuid($contact_time_uuid)) {
+		$contact_time_uuid = uuid();
+	}
+
+//add an empty row
+	if (!is_array($contact_times)) {
+		$x = is_array($contact_times) ? count($contact_times) : 0;
+		$contact_times[$x]['domain_uuid'] = $_SESSION['domain_uuid'];
+		$contact_times[$x]['contact_uuid'] = $contact_uuid;
+		$contact_times[$x]['contact_time_uuid'] = uuid();
+	}
+
+//get the contact notes
+	$sql = "select * from v_contact_notes ";
+	$sql .= "where domain_uuid = :domain_uuid ";
+	$sql .= "and contact_uuid = :contact_uuid ";
+	$sql .= "order by last_mod_date desc ";
+	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+	$parameters['contact_uuid'] = $contact_uuid;
+	$database = new database;
+	$contact_notes = $database->select($sql, $parameters, 'all');
+	unset($sql, $parameters);
+
+//add an empty row
+	if (!is_array($contact_times)) {
+		$x = is_array($contact_times) ? count($contact_times) : 0;
+		$contact_times[$x]['domain_uuid'] = $_SESSION['domain_uuid'];
+		$contact_times[$x]['contact_uuid'] = $contact_uuid;
+		$contact_times[$x]['contact_time_uuid'] = uuid();
+	}
+
 //create token
 	$object = new token;
 	$token = $object->create($_SERVER['PHP_SELF']);
 
 //show the header
-	if ($action == "update") {
-		$document['title'] = $text['title-contact-edit'];
-	}
-	else if ($action == "add") {
-		$document['title'] = $text['title-contact-add'];
-	}
+	$document['title'] = $text['title-contact-edit'];
 	require_once "resources/header.php";
 
+
 //determine qr branding
 	if ($_SESSION['theme']['qr_brand_type']['text'] == 'image' && $_SESSION['theme']['qr_brand_image']['text'] != '') {
 		echo "<img id='img-buffer' style='display: none;' src='".$_SESSION["theme"]["qr_brand_image"]["text"]."'>";
@@ -434,20 +961,24 @@
 	echo "</script>";
 
 //show the content
-	echo "<form name='frm' id='frm' method='post'>\n";
+	echo "<form name='frm' id='frm' method='post' action=''>\n";
+	echo "<input class='formfld' type='hidden' name='contact_uuid' value='".escape($contact_uuid)."'>\n";
 
 	echo "<div class='action_bar' id='action_bar'>\n";
-	echo "	<div class='heading'>";
-	if ($action == "add") {
-		echo "<b>".$text['header-contact-add']."</b>";
-	}
-	else if ($action == "update") {
-		echo "<b>".$text['header-contact-edit']."</b>";
-	}
-	echo "	</div>\n";
+	echo "	<div class='heading'><b>".$text['title-contact-edit']."</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-sm-dn','style'=>'margin-right: 15px;','link'=>'contacts.php']);
-	if ($action == "update") {
+	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'=>'contacts.php']);
+	if ($action == 'update') {
+		if (permission_exists('contact_phone_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('contact_phone_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');"]);
+		}
+	}
+
+	//add edit
+	if (isset($id)) {
 		if (permission_exists('contact_time_add')) {
 			//detect timer state (and start time)
 			$sql = "select ";
@@ -467,16 +998,17 @@
 			unset($sql, $parameters);
 			echo button::create(['type'=>'button','label'=>$text['button-timer'],'icon'=>'clock','style'=>$btn_style,'title'=>$time_start,'collapse'=>'hide-sm-dn','onclick'=>"window.open('contact_timer.php?domain_uuid=".urlencode($domain_uuid)."&contact_uuid=".urlencode($contact_uuid)."','contact_time_".escape($contact_uuid)."','width=300, height=375, top=30, left='+(screen.width - 350)+', menubar=no, scrollbars=no, status=no, toolbar=no, resizable=no');"]);
 		}
+
 		echo button::create(['type'=>'button','label'=>$text['button-qr_code'],'icon'=>'qrcode','collapse'=>'hide-sm-dn','onclick'=>"$('#qr_code_container').fadeIn(400);"]);
 		echo button::create(['type'=>'button','label'=>$text['button-vcard'],'icon'=>'address-card','collapse'=>'hide-sm-dn','link'=>'contacts_vcard.php?id='.urlencode($contact_uuid).'&type=download']);
 	}
-	if ($action == "update" && is_dir($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/app/invoices')) {
-		echo button::create(['type'=>'button','label'=>$text['button-invoices'],'icon'=>'file-invoice-dollar','collapse'=>'hide-sm-dn','link'=>'../invoices/invoices.php?id='.urlencode($contact_uuid)]);
-	}
-	if ($action == "update" && is_dir($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/app/certificates')) {
-		echo button::create(['type'=>'button','label'=>$text['button-certificate'],'icon'=>'certificate','collapse'=>'hide-sm-dn','link'=>'../certificates/index.php?name='.urlencode($contact_name_given." ".$contact_name_family)]);
-	}
-	if ($action == "update" && permission_exists('user_edit') && is_uuid($contact_user_uuid)) {
+	//add edit
+	//if (isset($id)) {
+		//echo button::create(['type'=>'button','label'=>$text['button-notes'],'icon'=>'','collapse'=>'hide-xs','style'=>'margin-right: 0px;','link'=>"contact_notes.php?id=$id"]);
+	//}
+
+	//add user
+	if (isset($id) && permission_exists('user_edit')) {
 		echo button::create(['type'=>'button','label'=>$text['button-user'],'icon'=>'user','collapse'=>'hide-sm-dn','link'=>'../../core/users/user_edit.php?id='.urlencode($contact_user_uuid)]);
 	}
 	if (
@@ -521,388 +1053,1560 @@
 		)) {
 		echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'name'=>'btn_delete','collapse'=>'hide-sm-dn','onclick'=>"modal_open('modal-delete','btn_delete');"]);
 	}
-	if (permission_exists('contact_add')) {
-		echo button::create(['type'=>'button','label'=>$text['button-save'],'icon'=>$_SESSION['theme']['button_icon_save'],'id'=>'btn_save','style'=>($action != 'update' ?: 'margin-left: 15px;'),'collapse'=>'hide-sm-dn','onclick'=>"document.getElementById('frm').submit();"]);
-	}
+	echo button::create(['type'=>'submit','label'=>$text['button-save'],'icon'=>$_SESSION['theme']['button_icon_save'],'style'=>'margin-left: 15px;','id'=>'btn_save','collapse'=>'hide-xs']);
 	echo "	</div>\n";
 	echo "	<div style='clear: both;'></div>\n";
 	echo "</div>\n";
 
-	if (
-		$action == "update" && (
-		permission_exists('contact_delete') ||
-		permission_exists('contact_user_delete') ||
-		permission_exists('contact_group_delete') ||
-		permission_exists('contact_phone_delete') ||
-		permission_exists('contact_address_delete') ||
-		permission_exists('contact_email_delete') ||
-		permission_exists('contact_url_delete') ||
-		permission_exists('contact_relation_delete') ||
-		permission_exists('contact_note_delete') ||
-		permission_exists('contact_time_delete') ||
-		permission_exists('contact_setting_delete') ||
-		permission_exists('contact_attachment_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();"])]);
-	}
-
-	if ($action == "add") {
-		echo $text['description-contact-add']."\n";
-	}
-	else if ($action == "update") {
-		echo $text['description-contact-edit']."\n";
-	}
+	echo $text['description-contact-edit']."\n";
 	echo "<br /><br />\n";
 
-	echo "<table border='0' cellpadding='0' cellspacing='0' width='100%'>\n";
-	echo "<tr>\n";
-	echo "<td valign='top' align='left' nowrap='nowrap'>\n";
+	if ($action == 'update') {
+		if (permission_exists('contact_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('contact_delete')) {
+			echo modal::create(['id'=>'modal-delete','type'=>'delete','actions'=>button::create(['type'=>'submit','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'id'=>'btn_delete','style'=>'float: right; margin-left: 15px;','collapse'=>'never','name'=>'action','value'=>'delete','onclick'=>"modal_close();"])]);
+		}
+	}
 
-		echo "<table border='0' cellpadding='0' cellspacing='0' width='100%'>\n";
-		echo "<tr>\n";
-		echo "<td width='30%' class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-		echo "	".$text['label-contact_type']."\n";
-		echo "</td>\n";
-		echo "<td width='70%' class='vtable' align='left'>\n";
-		if (is_array($_SESSION["contact"]["type"])) {
-			sort($_SESSION["contact"]["type"]);
-			echo "	<select class='formfld' name='contact_type'>\n";
-			echo "		<option value=''></option>\n";
-			foreach($_SESSION["contact"]["type"] as $type) {
-				echo "	<option value='".escape($type)."' ".(($type == $contact_type) ? "selected='selected'" : null).">".escape($type)."</option>\n";
-			}
-			echo "	</select>\n";
+?>
+
+<style>
+* {
+  box-sizing: border-box;
+}
+
+input[type=text], select, textarea {
+  width: 100%;
+  padding: 12px;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  resize: vertical;
+}
+
+label {
+  padding: 12px 12px 12px 0;
+  display: inline-block;
+}
+
+input[type=submit] {
+  background-color: #4CAF50;
+  color: white;
+  padding: 12px 20px;
+  border: none;
+  border-radius: 100px;
+  cursor: pointer;
+  float: right;
+}
+
+input[type=submit]:hover {
+  background-color: #45a049;
+}
+
+option:first-child {
+  color: #ccc;
+}
+
+.container {
+  border-radius: 5px;
+  background-color: #f2f2f2;
+  padding: 20px;
+}
+
+.col-25 {
+  float: left;
+  width: 25%;
+  margin-top: 6px;
+}
+
+.col-75 {
+  float: left;
+  width: 75%;
+  margin-top: 6px;
+}
+
+/* Clear floats after the columns */
+.row:after {
+  content: "";
+  display: table;
+  clear: both;
+}
+
+.form_set {
+  padding: 10px;
+}
+
+/* Responsive layout - when the screen is less than 600px wide, make the two columns stack on top of each other instead of next to each other */
+@media screen and (max-width: 600px) {
+  .col-25, .col-75, input[type=submit] {
+    width: 100%;
+    margin-top: 0;
+  }
+}
+
+@media screen and (max-width: 941px) {
+  .empty_row {
+	display: none;
+  }
+}
+</style>
+
+<?php
+
+echo "<div class='form_grid'>\n";
+
+echo "	<div class='form_set'>\n";
+echo "		<div class='heading'>\n";
+echo "			<b>".$text['label-name']."</b>\n";
+echo "		</div>\n";
+echo "		<div style='clear: both;'></div>\n";
+
+echo "		<div class='label'>\n";
+echo "			".$text['label-contact_organization']."\n";
+echo "		</div>\n";
+echo "		<div class='field no-wrap'>\n";
+echo "				<input class='formfld' type='text' name='contact_organization' placeholder='' maxlength='255' value='".escape($contact_organization)."'>\n";
+echo "		</div>\n";
+
+echo "		<div class='label'>\n";
+echo "			".$text['label-contact_name_prefix']."\n";
+echo "		</div>\n";
+echo "		<div class='field no-wrap'>\n";
+echo "				<input class='formfld' type='text' name='contact_name_prefix' placeholder='' maxlength='255' value='".escape($contact_name_prefix)."'>\n";
+echo "		</div>\n";
+
+echo "		<div class='label'>\n";
+echo "			".$text['label-contact_name_given']."\n";
+echo "		</div>\n";
+echo "		<div class='field no-wrap'>\n";
+echo "				<input class='formfld' type='text' name='contact_name_given' placeholder='' maxlength='255' value='".escape($contact_name_given)."'>\n";
+echo "		</div>\n";
+
+echo "		<div class='label'>\n";
+echo "			".$text['label-contact_name_middle']."\n";
+echo "		</div>\n";
+echo "		<div class='field no-wrap'>\n";
+echo "				<input class='formfld' type='text' name='contact_name_middle' placeholder='' maxlength='255' value='".escape($contact_name_middle)."'>\n";
+echo "		</div>\n";
+
+echo "		<div class='label'>\n";
+echo "			".$text['label-contact_name_family']."\n";
+echo "		</div>\n";
+echo "		<div class='field no-wrap'>\n";
+echo "				<input class='formfld' type='text' name='contact_name_family' placeholder='' maxlength='255' value='".escape($contact_name_family)."'>\n";
+echo "		</div>\n";
+
+echo "		<div class='label'>\n";
+echo "			".$text['label-contact_name_suffix']."\n";
+echo "		</div>\n";
+echo "		<div class='field no-wrap'>\n";
+echo "				<input class='formfld' type='text' name='contact_name_suffix' placeholder='' maxlength='255' value='".escape($contact_name_suffix)."'>\n";
+echo "		</div>\n";
+
+echo "		<div class='label'>\n";
+echo "			".$text['label-contact_nickname']."\n";
+echo "		</div>\n";
+echo "		<div class='field no-wrap'>\n";
+echo "				<input class='formfld' type='text' name='contact_nickname' placeholder='' maxlength='255' value='".escape($contact_nickname)."'>\n";
+echo "		</div>\n";
+
+echo "		<div class='label empty_row' style='grid-row: 10 / span 99;'>\n";
+echo "			&nbsp;\n";
+echo "		</div>\n";
+echo "		<div class='field empty_row' style='grid-row: 10 / span 99;'>\n";
+echo "		</div>\n";
+
+echo "	</div>\n";
+
+echo "	<div class='form_set'>\n";
+echo "		<div class='heading'>\n";
+echo "			<b>".$text['option-other']."</b>\n";
+echo "		</div>\n";
+echo "		<div style='clear: both;'></div>\n";
+
+echo "		<div class='label'>\n";
+echo "			".$text['label-contact_type']."\n";
+echo "		</div>\n";
+echo "		<div class='field no-wrap'>\n";
+if (is_array($_SESSION["contact"]["type"])) {
+	sort($_SESSION["contact"]["type"]);
+	echo "	<select class='formfld' name='contact_type'>\n";
+	echo "		<option value=''></option>\n";
+	foreach($_SESSION["contact"]["type"] as $type) {
+		echo "		<option value='".escape($type)."' ".(($type == $contact_type) ? "selected='selected'" : null).">".escape($type)."</option>\n";
+	}
+	echo "	</select>\n";
+}
+else {
+	echo "	<select class='formfld' name='contact_type'>\n";
+	echo "		<option value=''></option>\n";
+	echo "		<option value='customer' ".(($contact_type == "customer") ? "selected='selected'" : null).">".$text['option-contact_type_customer']."</option>\n";
+	echo "		<option value='contractor' ".(($contact_type == "contractor") ? "selected='selected'" : null).">".$text['option-contact_type_contractor']."</option>\n";
+	echo "		<option value='friend' ".(($contact_type == "friend") ? "selected='selected'" : null).">".$text['option-contact_type_friend']."</option>\n";
+	echo "		<option value='lead' ".(($contact_type == "lead") ? "selected='selected'" : null).">".$text['option-contact_type_lead']."</option>\n";
+	echo "		<option value='member' ".(($contact_type == "member") ? "selected='selected'" : null).">".$text['option-contact_type_member']."</option>\n";
+	echo "		<option value='family' ".(($contact_type == "family") ? "selected='selected'" : null).">".$text['option-contact_type_family']."</option>\n";
+	echo "		<option value='subscriber' ".(($contact_type == "subscriber") ? "selected='selected'" : null).">".$text['option-contact_type_subscriber']."</option>\n";
+	echo "		<option value='supplier' ".(($contact_type == "supplier") ? "selected='selected'" : null).">".$text['option-contact_type_supplier']."</option>\n";
+	echo "		<option value='provider' ".(($contact_type == "provider") ? "selected='selected'" : null).">".$text['option-contact_type_provider']."</option>\n";
+	echo "		<option value='user' ".(($contact_type == "user") ? "selected='selected'" : null).">".$text['option-contact_type_user']."</option>\n";
+	echo "		<option value='volunteer' ".(($contact_type == "volunteer") ? "selected='selected'" : null).">".$text['option-contact_type_volunteer']."</option>\n";
+	echo "	</select>\n";
+}
+echo "		</div>\n";
+
+echo "		<div class='label'>\n";
+echo "			".$text['label-contact_title']."\n";
+echo "		</div>\n";
+echo "		<div class='field no-wrap'>\n";
+if (is_array($_SESSION['contact']['contact_title'])) {
+	echo "		<select class='formfld' name='contact_title'>\n";
+	echo "			<option value=''></option>\n";
+	sort($_SESSION['contact']['contact_title']);
+	foreach($_SESSION['contact']['contact_title'] as $row) {
+		echo "			<option value='".escape($row)."' ".(($row == $contact_title) ? "selected='selected'" : null).">".escape(ucwords($row))."</option>\n";
+	}
+	echo "		</select>\n";
+}
+else {
+	echo "		<input class='formfld' type='text' name='contact_title' placeholder='' maxlength='255' value='".escape($contact_title)."'>\n";
+}
+echo "		</div>\n";
+
+echo "		<div class='label'>\n";
+echo "			".$text['label-contact_role']."\n";
+echo "		</div>\n";
+echo "		<div class='field no-wrap'>\n";
+if (is_array($_SESSION['contact']['contact_role'])) {
+	echo "		<select class='formfld' name='contact_role'>\n";
+	echo "			<option value=''>".$text['label-contact_category']."</option>\n";
+	sort($_SESSION['contact']['contact_role']);
+	foreach($_SESSION['contact']['contact_role'] as $row) {
+		echo "			<option value='".escape($row)."' ".(($row == $contact_role) ? "selected='selected'" : null).">".escape(ucwords($row))."</option>\n";
+	}
+	echo "		</select>\n";
+}
+else {
+	echo "		<input class='formfld' type='text' name='contact_role'  placeholder='' maxlength='255' value='".escape($contact_role)."'>\n";
+}
+echo "		</div>\n";
+
+echo "		<div class='label'>\n";
+echo "			".$text['label-contact_category']."\n";
+echo "		</div>\n";
+echo "		<div class='field no-wrap'>\n";
+if (is_array($_SESSION['contact']['contact_category'])) {
+	echo "	<select class='formfld' name='contact_category'>\n";
+	echo "		<option value=''></option>\n";
+	sort($_SESSION['contact']['contact_category']);
+	foreach($_SESSION['contact']['contact_category'] as $row) {
+		echo "		<option value='".escape($row)."' ".(($row == $contact_category) ? "selected='selected'" : null).">".escape(ucwords($row))."</option>\n";
+	}
+	echo "	</select>\n";
+}
+else {
+	echo "	<input class='formfld' type='text' name='contact_category' placeholder='' maxlength='255' value='".escape($contact_category)."'>\n";
+}
+echo "		</div>\n";
+
+echo "		<div class='label'>\n";
+echo "			".$text['label-contact_time_zone']."\n";
+echo "		</div>\n";
+echo "		<div class='field no-wrap'>\n";
+echo "			<select class='formfld' id='contact_time_zone' name='contact_time_zone' style=''>\n";
+echo "				<option value=''></option>\n";
+//$list = DateTimeZone::listAbbreviations();
+$time_zone_identifiers = DateTimeZone::listIdentifiers();
+$previous_category = '';
+$x = 0;
+foreach ($time_zone_identifiers as $key => $val) {
+	$time_zone = explode("/", $val);
+	$category = $time_zone[0];
+	if ($category != $previous_category) {
+		if ($x > 0) {
+			echo "			</optgroup>\n";
+		}
+		echo "			<optgroup label='".$category."'>\n";
+	}
+	if (strlen($val) > 0) {
+		$time_zone_offset = get_time_zone_offset($val)/3600;
+		$time_zone_offset_hours = floor($time_zone_offset);
+		$time_zone_offset_minutes = ($time_zone_offset - $time_zone_offset_hours) * 60;
+		$time_zone_offset_minutes = number_pad($time_zone_offset_minutes, 2);
+		if ($time_zone_offset > 0) {
+			$time_zone_offset_hours = number_pad($time_zone_offset_hours, 2);
+			$time_zone_offset_hours = "+".$time_zone_offset_hours;
 		}
 		else {
-			echo "	<select class='formfld' name='contact_type'>\n";
-			echo "		<option value=''></option>\n";
-			echo "		<option value='customer' ".(($contact_type == "customer") ? "selected='selected'" : null).">".$text['option-contact_type_customer']."</option>\n";
-			echo "		<option value='contractor' ".(($contact_type == "contractor") ? "selected='selected'" : null).">".$text['option-contact_type_contractor']."</option>\n";
-			echo "		<option value='friend' ".(($contact_type == "friend") ? "selected='selected'" : null).">".$text['option-contact_type_friend']."</option>\n";
-			echo "		<option value='lead' ".(($contact_type == "lead") ? "selected='selected'" : null).">".$text['option-contact_type_lead']."</option>\n";
-			echo "		<option value='member' ".(($contact_type == "member") ? "selected='selected'" : null).">".$text['option-contact_type_member']."</option>\n";
-			echo "		<option value='family' ".(($contact_type == "family") ? "selected='selected'" : null).">".$text['option-contact_type_family']."</option>\n";
-			echo "		<option value='subscriber' ".(($contact_type == "subscriber") ? "selected='selected'" : null).">".$text['option-contact_type_subscriber']."</option>\n";
-			echo "		<option value='supplier' ".(($contact_type == "supplier") ? "selected='selected'" : null).">".$text['option-contact_type_supplier']."</option>\n";
-			echo "		<option value='provider' ".(($contact_type == "provider") ? "selected='selected'" : null).">".$text['option-contact_type_provider']."</option>\n";
-			echo "		<option value='user' ".(($contact_type == "user") ? "selected='selected'" : null).">".$text['option-contact_type_user']."</option>\n";
-			echo "		<option value='volunteer' ".(($contact_type == "volunteer") ? "selected='selected'" : null).">".$text['option-contact_type_volunteer']."</option>\n";
-			echo "	</select>\n";
+			$time_zone_offset_hours = str_replace("-", "", $time_zone_offset_hours);
+			$time_zone_offset_hours = "-".number_pad($time_zone_offset_hours, 2);
 		}
-		echo "</td>\n";
-		echo "</tr>\n";
+	}
+	if ($val == $contact_time_zone) {
+		echo "				<option value='".$val."' selected='selected'>(UTC ".$time_zone_offset_hours.":".$time_zone_offset_minutes.") ".$val."</option>\n";
+	}
+	else {
+		echo "				<option value='".$val."'>(UTC ".$time_zone_offset_hours.":".$time_zone_offset_minutes.") ".$val."</option>\n";
+	}
+	$previous_category = $category;
+	$x++;
+}
+echo "			</select>\n";
+echo "		</div>\n";
 
-		echo "<tr>\n";
-		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-		echo "	".$text['label-contact_organization']."\n";
-		echo "</td>\n";
-		echo "<td class='vtable' align='left'>\n";
-		echo "	<input class='formfld' type='text' name='contact_organization' maxlength='255' value=\"".escape($contact_organization)."\">\n";
-		echo "</td>\n";
-		echo "</tr>\n";
+echo "		<div class='label'>\n";
+echo "			".$text['label-contact_note']."\n";
+echo "		</div>\n";
+echo "		<div class='field no-wrap'>\n";
+echo "			<textarea class='formfld' style='width: 100%; height: 100%;' name='contact_note'>".$contact_note."</textarea>\n";
+echo "		</div>\n";
 
-		echo "<tr>\n";
-		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-		echo "	".$text['label-contact_name_prefix']."\n";
-		echo "</td>\n";
-		echo "<td class='vtable' align='left'>\n";
-		echo "	<input class='formfld' type='text' name='contact_name_prefix' maxlength='255' value=\"".escape($contact_name_prefix)."\">\n";
-		echo "</td>\n";
-		echo "</tr>\n";
+echo "		<div class='label empty_row' style='grid-row: 8 / span 99;'>\n";
+echo "			&nbsp;\n";
+echo "		</div>\n";
+echo "		<div class='field empty_row' style='grid-row: 8 / span 99;'>\n";
+echo "		</div>\n";
 
-		echo "<tr>\n";
-		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-		echo "	".$text['label-contact_name_given']."\n";
-		echo "</td>\n";
-		echo "<td class='vtable' align='left'>\n";
-		echo "	<input class='formfld' type='text' name='contact_name_given' maxlength='255' value=\"".escape($contact_name_given)."\">\n";
-		echo "</td>\n";
-		echo "</tr>\n";
+echo "	</div>\n";
+unset($contact_note);
 
-		echo "<tr>\n";
-		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-		echo "	".$text['label-contact_name_middle']."\n";
-		echo "</td>\n";
-		echo "<td class='vtable' align='left'>\n";
-		echo "	<input class='formfld' type='text' name='contact_name_middle' maxlength='255' value=\"".escape($contact_name_middle)."\">\n";
-		echo "</td>\n";
-		echo "</tr>\n";
-
-		echo "<tr>\n";
-		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-		echo "	".$text['label-contact_name_family']."\n";
-		echo "</td>\n";
-		echo "<td class='vtable' align='left'>\n";
-		echo "	<input class='formfld' type='text' name='contact_name_family' maxlength='255' value=\"".escape($contact_name_family)."\">\n";
-		echo "</td>\n";
-		echo "</tr>\n";
-
-		echo "<tr>\n";
-		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-		echo "	".$text['label-contact_name_suffix']."\n";
-		echo "</td>\n";
-		echo "<td class='vtable' align='left'>\n";
-		echo "	<input class='formfld' type='text' name='contact_name_suffix' maxlength='255' value=\"".escape($contact_name_suffix)."\">\n";
-		echo "</td>\n";
-		echo "</tr>\n";
-
-		echo "<tr>\n";
-		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-		echo "	".$text['label-contact_nickname']."\n";
-		echo "</td>\n";
-		echo "<td class='vtable' align='left'>\n";
-		echo "	<input class='formfld' type='text' name='contact_nickname' maxlength='255' value=\"".escape($contact_nickname)."\">\n";
-		echo "</td>\n";
-		echo "</tr>\n";
-
-		echo "<tr>\n";
-		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-		echo "	".$text['label-contact_title']."\n";
-		echo "</td>\n";
-		echo "<td class='vtable' align='left'>\n";
-		if (is_array($_SESSION["contact"]["title"])) {
-			sort($_SESSION["contact"]["title"]);
-			echo "	<select class='formfld' name='contact_title'>\n";
-			echo "	<option value=''></option>\n";
-			foreach($_SESSION["contact"]["title"] as $title) {
-				echo "	<option value='".escape($title)."' ".(($title == $contact_title) ? "selected='selected'" : null).">".escape($title)."</option>\n";
-			}
-			echo "	</select>\n";
-		}
-		else {
-			echo "	<input class='formfld' type='text' name='contact_title' maxlength='255' value=\"".escape($contact_title)."\">\n";
-		}
-		echo "</td>\n";
-		echo "</tr>\n";
-
-		echo "<tr>\n";
-		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-		echo "	".$text['label-contact_category']."\n";
-		echo "</td>\n";
-		echo "<td class='vtable' align='left'>\n";
-		if (is_array($_SESSION["contact"]["category"])) {
-			sort($_SESSION["contact"]["category"]);
-			echo "	<select class='formfld' name='contact_category'>\n";
-			echo "	<option value=''></option>\n";
-			foreach($_SESSION["contact"]["category"] as $category) {
-				echo "	<option value='".escape($category)."' ".(($category == $contact_category) ? "selected='selected'" : null).">".escape($category)."</option>\n";
-			}
-			echo "	</select>\n";
-		}
-		else {
-			echo "	<input class='formfld' type='text' name='contact_category' maxlength='255' value=\"".escape($contact_category)."\">\n";
-		}
-		echo "</td>\n";
-		echo "</tr>\n";
-
-		echo "<tr>\n";
-		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-		echo "	".$text['label-contact_role']."\n";
-		echo "</td>\n";
-		echo "<td class='vtable' align='left'>\n";
-		if (is_array($_SESSION["contact"]["role"])) {
-			sort($_SESSION["contact"]["role"]);
-			echo "	<select class='formfld' name='contact_role'>\n";
-			echo "	<option value=''></option>\n";
-			foreach($_SESSION["contact"]["role"] as $role) {
-				echo "	<option value='".escape($role)."' ".(($role == $contact_role) ? "selected='selected'" : null).">".escape($role)."</option>\n";
-			}
-			echo "	</select>\n";
-		}
-		else {
-			echo "	<input class='formfld' type='text' name='contact_role' maxlength='255' value=\"".escape($contact_role)."\">\n";
-		}
-		echo "</td>\n";
-		echo "</tr>\n";
-
-		echo "<tr>\n";
-		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-		echo "	".$text['label-contact_time_zone']."\n";
-		echo "</td>\n";
-		echo "<td class='vtable' align='left'>\n";
-		echo "	<input class='formfld' type='text' name='contact_time_zone' maxlength='255' value=\"".escape($contact_time_zone)."\">\n";
-		echo "</td>\n";
-		echo "</tr>\n";
+if ($_SESSION['contact']['permissions']['boolean'] == "true") {
+	if (permission_exists('contact_user_view') || permission_exists('contact_group_view')) {
+		echo "	<div class='form_set'>\n";
+		echo "		<div class='heading'>\n";
+		echo "			<b>".$text['label-permissions']."</b>\n";
+		echo "		</div>\n";
+		echo "		<div style='clear: both;'></div>\n";
 
 		if (permission_exists('contact_user_edit')) {
-			echo "	<tr>";
-			echo "		<td class='vncell' valign='top'>".$text['label-users']."</td>";
-			echo "		<td class='vtable' align='left'>";
-			echo "			<table border='0' cellpadding='0' cellspacing='0' style='width: 100%;'>\n";
+			echo "		<div class='label' valign='top'>".$text['label-users']."</div>\n";
+			echo "		<div class='field no-wrap' align='left'>";
 			if ($action == "update" && is_array($contact_users_assigned) && @sizeof($contact_users_assigned) != 0) {
-				echo "				<tr>\n";
-				echo "					<td class='vtable'>".$text['label-username']."</td>\n";
+				echo "			<div class='vtable'>".$text['label-username']."\n";
 				if ($contact_users_assigned && permission_exists('contact_user_delete')) {
-					echo "					<td class='vtable edit_delete_checkbox_all' onmouseover=\"swap_display('delete_label_users', 'delete_toggle_users');\" onmouseout=\"swap_display('delete_label_users', 'delete_toggle_users');\">\n";
-					echo "						<span id='delete_label_users'>".$text['label-delete']."</span>\n";
-					echo "						<span id='delete_toggle_users'><input type='checkbox' id='checkbox_all_users' name='checkbox_all' onclick=\"edit_all_toggle('users');\"></span>\n";
-					echo "					</td>\n";
+					//echo "			<div class='edit_delete_checkbox_all' onmouseover=\"swap_display('delete_label_users', 'delete_toggle_users');\" onmouseout=\"swap_display('delete_label_users', 'delete_toggle_users');\">\n";
+					echo "			<div style='float: right;'\">\n";
+					echo "				<span>".$text['label-delete']."</span>\n";
+					//echo "				<span id='delete_label_users'>".$text['label-delete']."</span>\n";
+					//echo "				<span id='delete_toggle_users'><input type='checkbox' id='checkbox_all_users' name='checkbox_all' onclick=\"edit_all_toggle('users');\"></span>\n";
+					echo "			</div>\n";
 				}
-				echo "				</tr>\n";
+				echo "		</div>\n";
 				foreach ($contact_users_assigned as $x => $field) {
-					echo "			<tr>\n";
-					echo "				<td class='vtable'>".escape($field['username'])."</td>\n";
+					echo "		<div class='vtable'>".escape($field['username'])."\n";
 					if ($contact_users_assigned && permission_exists('contact_user_delete')) {
 						if (is_uuid($field['contact_user_uuid'])) {
-							echo "			<td class='vtable' style='text-align: center; padding-bottom: 3px;'>";
-							echo "				<input type='checkbox' name='contact_users_delete[".$x."][checked]' value='true' class='chk_delete checkbox_users' onclick=\"edit_delete_action('users');\">\n";
-							echo "				<input type='hidden' name='contact_users_delete[".$x."][uuid]' value='".escape($field['contact_user_uuid'])."' />\n";
+							echo "		<div style='text-align: center; padding-bottom: 3px; float: right; margin-right: 10px;'>\n";
+							//echo "			<input type='checkbox' name='contact_users_delete[".$x."][checked]' value='true' class='chk_delete checkbox_users' onclick=\"edit_delete_action('users');\">\n";
+							//echo "			<input type='hidden' name='contact_users_delete[".$x."][uuid]' value='".escape($field['contact_user_uuid'])."' />\n";
+							echo "			<input type='checkbox' name='contact_users[".$x."][checked]' value='true' class='chk_delete checkbox_users' onclick=\"edit_delete_action('users');\">\n";
+							echo "			<input type='hidden' name='contact_users[".$x."][uuid]' value='".escape($field['contact_user_uuid'])."' />\n";
+							echo "			<input type='hidden' name='contact_users[$x][domain_uuid]' value=\"".escape($_SESSION['domain_uuid'])."\">\n";
+							echo "			<input type='hidden' name='contact_users[$x][contact_user_uuid]' value='".escape($field['contact_user_uuid'])."' />\n";
+							echo "			<input type='hidden' name='contact_users[$x][contact_uuid]' value='".escape($field['contact_uuid'])."' />\n";
 						}
 						else {
-							echo "			<td>";
+							echo "		<div>\n";
 						}
-						echo "			</td>\n";
+						echo "	</div>\n";
 					}
-					echo "			</tr>\n";
+					echo "	</div>\n";
 				}
 			}
 			if (permission_exists('contact_user_add')) {
-				echo "			<tr>\n";
-				echo "				<td class='vtable' style='border-bottom: none;' colspan='2'>\n";
-				echo "					<select name='user_uuid' class='formfld' style='width: auto;'>\n";
-				echo "						<option value=''></option>\n";
+				echo "		<div class='vtable' style='border-bottom: none;'>\n";
+				echo "			<select name='contact_user_uuid' class='formfld' style='width: auto;'>\n";
+				echo "				<option value=''></option>\n";
 				foreach ($users as $field) {
 					if (in_array($field['user_uuid'], array_column($contact_users_assigned, 'user_uuid'))) { continue; } //skip users already assigned
-					echo "						<option value='".escape($field['user_uuid'])."'>".escape($field['username'])."</option>\n";
+					echo "					<option value='".escape($field['user_uuid'])."'>".escape($field['username'])."</option>\n";
 				}
-				echo "					</select>";
+				echo "			</select>\n";
 				if ($action == "update") {
 					echo button::create(['type'=>'submit','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add']]);
 				}
 				unset($users);
-				echo "				</td>\n";
-				echo "			<tr>\n";
+				echo "		</div>\n";
 			}
-			echo "			</table>\n";
 			echo "			".$text['description-users']."\n";
-			echo "		</td>";
-			echo "	</tr>";
+			echo "		</div>\n";
 		}
 
 		if (permission_exists('contact_group_view')) {
-			echo "<tr>";
-			echo "	<td class='vncell' valign='top'>".$text['label-groups']."</td>";
-			echo "	<td class='vtable'>";
-			echo "		<table border='0' cellpadding='0' cellspacing='0' style='width: 100%;'>\n";
+			echo "	<div class='label'>".$text['label-groups']."</div>";
+			echo "	<div class='field no-wrap'>";
 			if (is_array($contact_groups_assigned) && @sizeof($contact_groups_assigned) != 0) {
-				echo "			<tr>\n";
-				echo "				<td class='vtable'>".$text['label-group']."</td>\n";
+				echo "		<div class='vtable'>".$text['label-group']."\n";
 				if ($contact_groups_assigned && permission_exists('contact_group_delete')) {
-					echo "				<td class='vtable edit_delete_checkbox_all' onmouseover=\"swap_display('delete_label_groups', 'delete_toggle_groups');\" onmouseout=\"swap_display('delete_label_groups', 'delete_toggle_groups');\">\n";
-					echo "					<span id='delete_label_groups'>".$text['label-delete']."</span>\n";
-					echo "					<span id='delete_toggle_groups'><input type='checkbox' id='checkbox_all_groups' name='checkbox_all' onclick=\"edit_all_toggle('groups');\"></span>\n";
-					echo "				</td>\n";
+					//echo "		<div class='edit_delete_checkbox_all' style='float: right;' onmouseover=\"swap_display('delete_label_groups', 'delete_toggle_groups');\" onmouseout=\"swap_display('delete_label_groups', 'delete_toggle_groups');\">\n";
+					echo "		<div style='float: right;'\">\n";
+					echo "			<span>".$text['label-delete']."</span>\n";
+					//echo "			<span id='delete_label_groups'>".$text['label-delete']."</span>\n";
+					//echo "			<span id='delete_toggle_groups' style='margin-right: 10px;'><input type='checkbox' id='checkbox_all_groups' name='checkbox_all' onclick=\"edit_all_toggle('groups');\"></span>\n";
+					echo "		</div>\n";
 				}
-				echo "			</tr>\n";
+				echo "		</div>\n";
 				foreach ($contact_groups_assigned as $x => $field) {
 					if (strlen($field['group_name']) > 0) {
-						echo "			<tr>\n";
-						echo "				<td class='vtable'>".escape($field['group_name'])."</td>\n";
+						echo "		<div class='vtable'>".escape($field['group_name'])."\n";
 						if (permission_exists('contact_group_delete')) {
 							if (is_uuid($field['contact_group_uuid'])) {
-								echo "				<td class='vtable' style='text-align: center; padding-bottom: 3px;'>";
-								echo "					<input type='checkbox' name='contact_groups_delete[".$x."][checked]' value='true' class='chk_delete checkbox_groups' onclick=\"edit_delete_action('groups');\">\n";
-								echo "					<input type='hidden' name='contact_groups_delete[".$x."][uuid]' value='".escape($field['contact_group_uuid'])."' />\n";
+								echo "		<div style='text-align: center; padding-bottom: 3px; float: right; margin-right: 10px;'>";
+								//echo "			<input type='checkbox' name='contact_groups_delete[".$x."][checked]' value='true' class='chk_delete checkbox_groups' onclick=\"edit_delete_action('groups');\">\n";
+								//echo "			<input type='hidden' name='contact_groups_delete[".$x."][uuid]' value='".escape($field['contact_group_uuid'])."' />\n";
+								echo "			<input type='checkbox' name='contact_groups[".$x."][checked]' value='true' class='chk_delete checkbox_groups' onclick=\"edit_delete_action('groups');\">\n";
+								echo "			<input type='hidden' name='contact_groups[".$x."][uuid]' value='".escape($field['contact_group_uuid'])."' />\n";
+								echo "			<input type='hidden' name='contact_groups[$x][domain_uuid]' value=\"".escape($_SESSION['domain_uuid'])."\">\n";
+								echo "			<input type='hidden' name='contact_groups[$x][contact_group_uuid]' value='".escape($field['contact_group_uuid'])."' />\n";
+								echo "			<input type='hidden' name='contact_groups[$x][contact_uuid]' value='".escape($contact_uuid)."' />\n";
 							}
 							else {
-								echo "				<td>";
+								echo "		<div>";
 							}
-							echo "				</td>\n";
+							echo "		</div>\n";
 						}
-						echo "			</tr>\n";
+						echo "		</div>\n";
 					}
 				}
 			}
 
 			if (permission_exists('contact_group_add')) {
 				if (is_array($contact_groups_available) && @sizeof($contact_groups_available) != 0) {
-					echo "			<tr>\n";
-					echo "				<td class='vtable' style='border-bottom: none;' colspan='2'>\n";
-					echo "					<select name='group_uuid' class='formfld' style='width: auto; margin-right: 3px;'>\n";
-					echo "						<option value=''></option>\n";
+					echo "	<div class='vtable' style='border-bottom: none;'>\n";
+					echo "		<select name='contact_group_uuid' class='formfld' style='width: auto; margin-right: 3px;'>\n";
+					echo "			<option value=''></option>\n";
 					foreach ($contact_groups_available as $field) {
 						if ($field['group_name'] == "superadmin" && !if_group("superadmin")) { continue; }	//only show superadmin group to superadmins
 						if ($field['group_name'] == "admin" && (!if_group("superadmin") && !if_group("admin"))) { continue; }	//only show admin group to admins
-						echo "						<option value='".escape($field['group_uuid'])."'>".escape($field['group_name'])."</option>\n";
+						echo "			<option value='".escape($field['group_uuid'])."'>".escape($field['group_name'])."</option>\n";
 					}
-					echo "					</select>";
+					echo "		</select>";
 					if ($action == "update") {
 						echo button::create(['type'=>'submit','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add']]);
 					}
-					echo "				</td>\n";
-					echo "			</tr>\n";
+					echo "	</div>\n";
 				}
 			}
-
-			echo "		</table>\n";
 			echo "		".$text['description-groups']."\n";
-
-			echo "	</td>";
-			echo "</tr>";
+			echo "	</div>\n";
 		}
 
-		echo "<tr>\n";
-		echo "	<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+		echo "		<div class='label empty_row' style='grid-row: 4 / span 99;'>\n";
+		echo "			&nbsp;\n";
+		echo "		</div>\n";
+		echo "		<div class='field empty_row' style='grid-row: 4 / span 99;'>\n";
+		echo "		</div>\n";
+
+		echo "	</div>\n";
+	}
+}
+
+if (permission_exists('contact_phone_view')) {
+
+	echo "<script type=\"text/javascript\">\n";
+	echo "function send_cmd(url) {\n";
+	echo "	if (window.XMLHttpRequest) {// code for IE7+, Firefox, Chrome, Opera, Safari\n";
+	echo "		xmlhttp=new XMLHttpRequest();\n";
+	echo "	}\n";
+	echo "	else {// code for IE6, IE5\n";
+	echo "		xmlhttp=new ActiveXObject(\"Microsoft.XMLHTTP\");\n";
+	echo "	}\n";
+	echo "	xmlhttp.open(\"GET\",url,true);\n";
+	echo "	xmlhttp.send(null);\n";
+	echo "	document.getElementById('cmd_reponse').innerHTML=xmlhttp.responseText;\n";
+	echo "}\n";
+	echo "</script>\n";
+
+	$x = 0;
+	foreach($contact_phones as $row) {
+		echo "	<div class='form_set'>\n";
+		echo "		<div class='heading' style='position: absolute;'>\n";
+		echo "			<b style='float: left;'>".$text['label-phone_numbers']."</b>\n";
+		if ($row['phone_primary'] == "1") {
+			echo "			<i class='fas fa-star fa-xs' style='color: ".$_SESSION['theme']['body_text_color']."; float: left; margin-top: 7px; margin-left: 8px;' title=\"".$text['label-primary']."\"></i>\n";
+		}
+		if (permission_exists('contact_phone_delete')) {
+			echo "			<div class='checkbox' style='float: left; margin-top: 3px; margin-left: 8px;'>\n";
+			echo "				<input type='checkbox' name='contact_phones[$x][checked]' id='checkbox_".$x."' class='chk_delete checkbox_phones' value='true' onclick=\"edit_delete_action('phones');\">\n";
+			echo "				<input type='hidden' name='contact_phones[$x][uuid]' value='".escape($row['contact_phone_uuid'])."' />\n";
+			echo "			</div>\n";
+		}
+		echo "			<div class='button no-link' style='float: left; margin-top: 1px; margin-left: 8px;'>\n";
+		echo "				<a href='../xml_cdr/xml_cdr.php?caller_id_number=".urlencode($row['phone_number'])."'>\n";
+		echo "					<i class='fas fa-search fa-fw' style='color: ".$_SESSION['theme']['body_text_color']."; float: left; margin-top: 7px; margin-left: 3px; margin-right: 3px;' title=\"".$text['button-cdr']."\"></i>\n";
+		echo "				</a>\n";
+
+		$call = "send_cmd('";
+		$call .= PROJECT_PATH."/app/click_to_call/click_to_call.php";
+		$call .= "?src_cid_name=".urlencode($row['phone_number']);
+		$call .= "&src_cid_number=".urlencode($row['phone_number']);
+		$call .= "&dest_cid_name=".urlencode($_SESSION['user']['extension'][0]['outbound_caller_id_name']);
+		$call .= "&dest_cid_number=".urlencode($_SESSION['user']['extension'][0]['outbound_caller_id_number']);
+		$call .= "&src=".urlencode($_SESSION['user']['extension'][0]['user']);
+		$call .= "&dest=".urlencode($row['phone_number']);
+		$call .= "&rec=false";
+		$call .= "&ringback=us-ring";
+		$call .= "&auto_answer=true";
+		$call .= "');";
+		echo "				<a href='' onclick=\"".$call."\">\n";
+		echo "					<i class='fas fa-phone fa-fw' style='color: ".$_SESSION['theme']['body_text_color']."; float: left; margin-top: 7px; margin-left: 7px;' title=\"".urlencode($row['phone_number'])."\"></i>\n";
+		echo "				</a>\n";
+
+		echo "			</div>\n";
+		echo "		</div>\n";
+		echo "		<br>\n";
+		echo "		<div style='clear: both; margin-bottom: 25px;'></div>\n";
+
+		echo "		<input type='hidden' name='contact_phones[$x][domain_uuid]' value=\"".escape($row["domain_uuid"])."\">\n";
+		echo "		<input type='hidden' name='contact_phones[$x][contact_uuid]' value=\"".escape($row["contact_uuid"])."\">\n";
+		echo "		<input type='hidden' name='contact_phones[$x][contact_phone_uuid]' value=\"".escape($row["contact_phone_uuid"])."\">\n";
+
+		echo "		<div class='label'>\n";
+		echo "			".$text['label-phone_label']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap'>\n";
+		echo "			<select class='formfld' name='contact_phones[$x][phone_label]' style=''>\n";
+		echo "				<option value=''></option>\n";
+		if ($row['phone_label'] == "work") {
+			echo "				<option value='work' selected='selected'>".$text['option-work']."</option>\n";
+		}
+		else {
+			echo "				<option value='work'>".$text['option-work']."</option>\n";
+		}
+		if ($row['phone_label'] == "home") {
+			echo "				<option value='home' selected='selected'>".$text['option-home']."</option>\n";
+		}
+		else {
+			echo "				<option value='home'>".$text['option-home']."</option>\n";
+		}
+		if ($row['phone_label'] == "mobile") {
+			echo "				<option value='mobile' selected='selected'>".$text['option-mobile']."</option>\n";
+		}
+		else {
+			echo "				<option value='mobile'>".$text['option-mobile']."</option>\n";
+		}
+		if ($row['phone_label'] == "main") {
+			echo "				<option value='main' selected='selected'>".$text['option-main']."</option>\n";
+		}
+		else {
+			echo "				<option value='main'>".$text['option-main']."</option>\n";
+		}
+		if ($row['phone_label'] == "fax") {
+			echo "				<option value='fax' selected='selected'>".$text['option-fax']."</option>\n";
+		}
+		else {
+			echo "				<option value='fax'>".$text['option-fax']."</option>\n";
+		}
+		if ($row['phone_label'] == "voicemail") {
+			echo "				<option value='voicemail' selected='selected'>".$text['option-voicemail']."</option>\n";
+		}
+		else {
+			echo "				<option value='voicemail'>".$text['option-voicemail']."</option>\n";
+		}
+		if ($row['phone_label'] == "text") {
+			echo "				<option value='text' selected='selected'>".$text['option-text']."</option>\n";
+		}
+		else {
+			echo "				<option value='text'>".$text['option-text']."</option>\n";
+		}
+		if ($row['phone_label'] == "other") {
+			echo "				<option value='other' selected='selected'>".$text['option-other']."</option>\n";
+		}
+		else {
+			echo "				<option value='other'>".$text['option-other']."</option>\n";
+		}
+		echo "			</select>\n";
+		//echo 				$text['description-phone_label']."\n";
+		echo "		</div>\n";
+
+		echo "		<div class='label'>\n";
+		echo "			".$text['label-phone_type']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap'>\n";
+		echo "			<label><input type='checkbox' name='contact_phones[$x][phone_type_voice]' id='phone_type_voice' value='1' ".(($row['phone_type_voice']) ? "checked='checked'" : null)."> ".$text['label-voice']."</label>&nbsp;\n";
+		echo "			<label><input type='checkbox' name='contact_phones[$x][phone_type_fax]' id='phone_type_fax' value='1' ".(($row['phone_type_fax']) ? "checked='checked'" : null)."> ".$text['label-fax']."</label>&nbsp;\n";
+		echo "			<label><input type='checkbox' name='contact_phones[$x][phone_type_video]' id='phone_type_video' value='1' ".(($row['phone_type_video']) ? "checked='checked'" : null)."> ".$text['label-video']."</label>&nbsp;\n";
+		echo "			<label><input type='checkbox' name='contact_phones[$x][phone_type_text]' id='phone_type_text' value='1' ".(($row['phone_type_text']) ? "checked='checked'" : null)."> ".$text['label-text']."</label>\n";
+		echo "			<br />\n";
+		//echo 			$text['description-phone_type']."\n";
+		echo "		</div>\n";
+
+		echo "		<div class='label'>\n";
+		echo "			".$text['label-phone_speed_dial']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap'>\n";
+		echo "				<input class='formfld' type='text' name='contact_phones[$x][phone_speed_dial]' placeholder='' maxlength='255' style='' value=\"".escape($row["phone_speed_dial"])."\">\n";
+		//echo 				$text['description-phone_extension']."\n";
+		echo "		</div>\n";
+
+		echo "		<div class='label'>\n";
+		echo "			".$text['label-phone_country_code']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap'>\n";
+		echo "				<input class='formfld' type='text' name='contact_phones[$x][phone_country_code]' placeholder='' maxlength='6' style='' value=\"".escape($row["phone_country_code"])."\">\n";
+		//echo 				$text['description-phone_country_code']."\n";
+		echo "		</div>\n";
+
+		echo "		<div class='label required'>\n";
+		echo "			".$text['label-phone_number']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap'>\n";
+		echo "				<input class='formfld' type='text' name='contact_phones[$x][phone_number]' placeholder='' style=''  maxlength='255' style='max-width:90px;' value=\"".escape($row["phone_number"])."\">\n";
+		//echo 				$text['description-phone_speed_dial']."\n";
+		echo "		</div>\n";
+
+		echo "		<div class='label'>\n";
+		echo "			".$text['label-phone_extension']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap'>\n";
+		echo "				<input class='formfld' type='text' name='contact_phones[$x][phone_extension]' placeholder='' style='' maxlength='255' value=\"".escape($row["phone_extension"])."\">\n";
+		//echo 				$text['description-phone_number']."\n";
+		echo "		</div>\n";
+
+		echo "		<div class='label'>\n";
+		echo "			".$text['label-primary']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap'>\n";
+
+		echo "			<select class='formfld' name='contact_phones[$x][phone_primary]' style='width: auto;'>\n";
+		echo "				<option value=''></option>\n";
+		if ($row['phone_primary'] == "1") {
+			echo "				<option value='1' selected='selected'>".$text['label-true']."</option>\n";
+		}
+		else {
+			echo "				<option value='1'>".$text['label-true']."</option>\n";
+		}
+		if ($row['phone_primary'] == "0") {
+			echo "				<option value='0' selected='selected'>".$text['label-false']."</option>\n";
+		}
+		else {
+			echo "				<option value='0'>".$text['label-false']."</option>\n";
+		}
+		echo "			</select>\n";
+		//echo 				$text['description-phone_primary']."\n";
+		echo "		</div>\n";
+
+		echo "		<div class='label'>\n";
+		echo "			".$text['label-phone_description']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap'>\n";
+		echo "				<input class='formfld' type='text' name='contact_phones[$x][phone_description]' placeholder='' maxlength='255' value=\"".escape($row["phone_description"])."\">\n";
+		//echo 				$text['description-phone_description']."\n";
+		echo "		</div>\n";
+
+		echo "		<div class='label empty_row' style='grid-row: 9 / span 99;'>\n";
+		echo "			&nbsp;\n";
+		echo "		</div>\n";
+		echo "		<div class='field empty_row' style='grid-row: 9 / span 99;'>\n";
+		echo "		</div>\n";
+
+		//if (is_array($contact_phones) && @sizeof($contact_phones) > 1 && permission_exists('contact_phone_delete')) {
+		//	echo "		<div class='label'>\n";
+		//	echo "			".$text['label-action']."\n";
+		//	echo "		</div>\n";
+		//	echo "		<div class='field no-wrap'>\n";
+		//	//echo "			<span id='delete_label_details'>".$text['label-action']."</span>\n";
+		//	echo "			<span id='delete_toggle_details'>\n";
+		//	//echo "				<input type='checkbox' name='contact_phones[".$x."][checked]' value='true' class='chk_delete checkbox_details' onclick=\"checkbox_on_change(this);\">\n";
+		//	echo "				<input type='checkbox' id='checkbox_all_details' name='checkbox_all' onclick=\"edit_all_toggle('details'); checkbox_on_change(this);\">\n";
+		//	echo "			</span>\n";
+		//	echo "		</div>\n";
+		//}
+
+		echo "	</div>\n";
+		$x++;
+	}
+}
+
+if (permission_exists('contact_address_view')) {
+	foreach($contact_addresses as $row) {
+		echo "	<div class='form_set'>\n";
+		echo "		<div class='heading'>\n";
+		echo "			<b style='float: left;'>".$text['label-addresses']."</b>\n";
+		if ($row['address_primary'] == "1") {
+			echo "			<i class='fas fa-star fa-xs' style='color: ".$_SESSION['theme']['body_text_color']."; float: left; margin-top: 7px; margin-left: 8px;' title=\"".$text['label-primary']."\"></i>\n";
+		}
+		if (permission_exists('contact_address_delete')) {
+			echo "			<div class='checkbox' style='float: left; margin-top: 3px; margin-left: 8px;'>\n";
+			echo "				<input type='checkbox' name='contact_addresses[$x][checked]' id='checkbox_".$x."' class='chk_delete checkbox_addresses' value='true' onclick=\"edit_delete_action('addresses');\">\n";
+			echo "				<input type='hidden' name='contact_addresses[$x][uuid]' value='".escape($row['contact_address_uuid'])."' />\n";
+			echo "			</div>\n";
+		}
+		echo "			<div class='button no-link' style='float: left; margin-top: 1px; margin-left: 8px;'>\n";
+		$map_query = $row['address_street']." ".$row['address_extended'].", ".$row['address_locality'].", ".$row['address_region'].", ".$row['address_region'].", ".$row['address_postal_code'];
+		echo " 				<a href=\"http://maps.google.com/maps?q=".urlencode($map_query)."&hl=en\" target=\"_blank\">";
+		echo " 					<img src='resources/images/icon_gmaps.png' style='width: 17px; height: 17px;' alt='".$text['label-google_map']."' title='".$text['label-google_map']."'>";
+		echo " 				</a>\n";
+		echo "			</div>\n";
+		echo "		</div>\n";
+		echo "		<div style='clear: both;'></div>\n";
+
+		echo "		<input type='hidden' name='contact_addresses[$x][domain_uuid]' value=\"".escape($row["domain_uuid"])."\">\n";
+		echo "		<input type='hidden' name='contact_addresses[$x][contact_uuid]' value=\"".escape($row["contact_uuid"])."\">\n";
+		echo "		<input type='hidden' name='contact_addresses[$x][contact_address_uuid]' value=\"".escape($row["contact_address_uuid"])."\">\n";
+
+		echo "		<div class='label'>\n";
+		echo "			".$text['label-address_label']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap'>\n";
+		echo "			<select class='formfld' name='contact_addresses[$x][address_label]'>\n";
+		echo "				<option value=''></option>\n";
+		if ($row['address_label'] == "work") {
+			echo "				<option value='work' selected='selected'>".$text['option-work']."</option>\n";
+		}
+		else {
+			echo "				<option value='work'>".$text['option-work']."</option>\n";
+		}
+		if ($row['address_label'] == "home") {
+			echo "				<option value='home' selected='selected'>".$text['option-home']."</option>\n";
+		}
+		else {
+			echo "				<option value='home'>".$text['option-home']."</option>\n";
+		}
+		if ($row['address_label'] == "mobile") {
+			echo "				<option value='mobile' selected='selected'>".$text['option-mobile']."</option>\n";
+		}
+		else {
+			echo "				<option value='mobile'>".$text['option-mobile']."</option>\n";
+		}
+		if ($row['address_label'] == "main") {
+			echo "				<option value='main' selected='selected'>".$text['option-main']."</option>\n";
+		}
+		else {
+			echo "				<option value='main'>".$text['option-main']."</option>\n";
+		}
+		if ($row['address_label'] == "fax") {
+			echo "				<option value='fax' selected='selected'>".$text['option-fax']."</option>\n";
+		}
+		else {
+			echo "				<option value='fax'>".$text['option-fax']."</option>\n";
+		}
+		if ($row['address_label'] == "pager") {
+			echo "				<option value='pager' selected='selected'>".$text['option-pager']."</option>\n";
+		}
+		else {
+			echo "				<option value='pager'>".$text['option-pager']."</option>\n";
+		}
+		if ($row['address_label'] == "voicemail") {
+			echo "				<option value='voicemail' selected='selected'>".$text['option-voicemail']."</option>\n";
+		}
+		else {
+			echo "				<option value='voicemail'>".$text['option-voicemail']."</option>\n";
+		}
+		if ($row['address_label'] == "text") {
+			echo "				<option value='text' selected='selected'>".$text['option-text']."</option>\n";
+		}
+		else {
+			echo "				<option value='text'>".$text['option-text']."</option>\n";
+		}
+		echo "			</select>\n";
+		echo "		</div>\n";
+
+		echo "		<div class='label'>\n";
+		echo "			".$text['label-address_type']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap'>\n";
+		echo "			<select class='formfld' name='contact_addresses[$x][address_type]'>\n";
+		echo "				<option value=''></option>\n";
+		if ($row['address_type'] == "work") {
+			echo "				<option value='work' selected='selected'>".$text['option-work']."</option>\n";
+		}
+		else {
+			echo "				<option value='work'>".$text['option-work']."</option>\n";
+		}
+		if ($row['address_type'] == "home") {
+			echo "				<option value='home' selected='selected'>".$text['option-home']."</option>\n";
+		}
+		else {
+			echo "				<option value='home'>".$text['option-home']."</option>\n";
+		}
+		if ($row['address_type'] == "domestic") {
+			echo "				<option value='domestic' selected='selected'>".$text['option-dom']."</option>\n";
+		}
+		else {
+			echo "				<option value='domestic'>".$text['option-dom']."</option>\n";
+		}
+		if ($row['address_type'] == "international") {
+			echo "				<option value='international' selected='selected'>".$text['option-intl']."</option>\n";
+		}
+		else {
+			echo "				<option value='international'>".$text['option-intl']."</option>\n";
+		}
+		if ($row['address_type'] == "postal") {
+			echo "				<option value='postal' selected='selected'>".$text['option-postal']."</option>\n";
+		}
+		else {
+			echo "				<option value='postal'>".$text['option-postal']."</option>\n";
+		}
+		if ($row['address_type'] == "parcel") {
+			echo "				<option value='parcel' selected='selected'>".$text['option-parcel']."</option>\n";
+		}
+		else {
+			echo "				<option value='parcel'>".$text['option-parcel']."</option>\n";
+		}
+		if ($row['address_type'] == "preferred") {
+			echo "				<option value='preferred' selected='selected'>".$text['option-pref']."</option>\n";
+		}
+		else {
+			echo "				<option value='preferred'>".$text['option-pref']."</option>\n";
+		}
+		echo "			</select>\n";
+		echo "		</div>\n";
+
+		echo "		<div class='label required'>\n";
+		echo "			".$text['label-address_address']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap'>\n";
+		echo "			<input class='formfld' type='text' name='contact_addresses[$x][address_street]' placeholder='".$text['label-address_address']." 1' maxlength='255' value=\"".escape($row["address_street"])."\"><br />\n";
+		echo "			<input class='formfld' type='text' name='contact_addresses[$x][address_extended]' placeholder='".$text['label-address_address']." 2' maxlength='255' value=\"".escape($row["address_extended"])."\">\n";
+		echo "		</div>\n";
+
+		if (permission_exists('address_community')) {
+			echo "		<div class='label'>\n";
+			echo "			".$text['label-address_community']."\n";
+			echo "		</div>\n";
+			echo "		<div class='field no-wrap'>\n";
+			echo "			<input class='formfld' type='text' name='contact_addresses[$x][address_community]' placeholder='' maxlength='255' value=\"".escape($row["address_community"])."\">\n";
+			echo "		</div>\n";
+		}
+
+		echo "		<div class='label'>\n";
+		echo "			".$text['label-address_locality']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap'>\n";
+		echo "			<input class='formfld' type='text' name='contact_addresses[$x][address_locality]' placeholder='' maxlength='255' value=\"".escape($row["address_locality"])."\">\n";
+		echo "		</div>\n";
+
+		echo "		<div class='label'>\n";
+		echo "			".$text['label-address_region']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap'>\n";
+		echo "			<input class='formfld' type='text' name='contact_addresses[$x][address_region]' placeholder='' maxlength='255' value=\"".escape($row["address_region"])."\">\n";
+		echo "		</div>\n";
+
+		echo "		<div class='label'>\n";
+		echo "			".$text['label-address_postal_code']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap'>\n";
+		echo "			<input class='formfld' type='text' name='contact_addresses[$x][address_postal_code]' placeholder='' maxlength='255' value=\"".escape($row["address_postal_code"])."\">\n";
+		echo "		</div>\n";
+
+		echo "		<div class='label'>\n";
+		echo "			".$text['label-address_country']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap'>\n";
+		echo "			<input class='formfld' type='text' name='contact_addresses[$x][address_country]' placeholder='' maxlength='255' value=\"".escape($row["address_country"])."\">\n";
+		echo "		</div>\n";
+
+		if (permission_exists('address_latitude')) {
+			echo "		<div class='label'>\n";
+			echo "			".$text['label-address_latitude']."\n";
+			echo "		</div>\n";
+			echo "		<div class='field no-wrap'>\n";
+			echo "			<input class='formfld' type='text' name='contact_addresses[$x][address_latitude]' placeholder='".escape($text['label-address_latitude'])."' maxlength='255' value=\"".escape($row["address_latitude"])."\">\n";
+			echo "		</div>\n";
+		}
+
+		if (permission_exists('address_longitude')) {
+			echo "		<div class='label'>\n";
+			echo "			".$text['label-address_longitude']."\n";
+			echo "		</div>\n";
+			echo "		<div class='field no-wrap'>\n";
+			echo "			<input class='formfld' type='text' name='contact_addresses[$x][address_longitude]' placeholder='".escape($text['label-address_longitude'])."' maxlength='255' value=\"".escape($row["address_longitude"])."\">\n";
+			echo "		</div>\n";
+		}
+
+		echo "		<div class='label'>\n";
+		echo "			".$text['label-primary']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap'>\n";
+		echo "			<select class='formfld' name='contact_addresses[$x][address_primary]' style='width: auto;'>\n";
+		echo "				<option value=''>".escape($text['label-address_primary'])."</option>\n";
+		if ($row['address_primary'] == "1") {
+			echo "			<option value='1' selected='selected'>".$text['label-true']."</option>\n";
+		}
+		else {
+			echo "			<option value='1'>".$text['label-true']."</option>\n";
+		}
+		if ($row['address_primary'] == "0") {
+			echo "			<option value='0' selected='selected'>".$text['label-false']."</option>\n";
+		}
+		else {
+			echo "			<option value='0'>".$text['label-false']."</option>\n";
+		}
+		echo "			</select>\n";
+		echo "		</div>\n";
+
+		echo "		<div class='label'>\n";
+		echo "			".$text['label-address_description']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap'>\n";
+		echo "			<input class='formfld' type='text' name='contact_addresses[$x][address_description]' placeholder='' maxlength='255' value=\"".escape($row["address_description"])."\">\n";
+		echo "		</div>\n";
+
+		//if (is_array($contact_addresses) && @sizeof($contact_addresses) > 1 && permission_exists('contact_address_delete')) {
+		//	if (is_uuid($row['contact_address_uuid'])) {
+		//		echo "		<div class='label'>\n";
+		//		echo "			".$text['label-action']."\n";
+		//		echo "		</div>\n";
+		//		echo "		<div class='field no-wrap'>\n";
+		//		echo "			<input type='checkbox' name='contact_addresses[".$x."][checked]' value='true' class='chk_delete checkbox_details' onclick=\"checkbox_on_change(this);\">\n";
+		//		echo "		</div>\n";
+		//	}
+		//}
+
+		echo "	</div>\n";
+		$x++;
+	}
+}
+
+if (permission_exists('contact_email_view')) {
+	$x = 0;
+	foreach($contact_emails as $row) {
+		echo "	<div class='form_set'>\n";
+		echo "		<div class='heading'>\n";
+		echo "			<b style='float: left;'>".$text['label-emails']."</b>\n";
+		if ($row['email_primary'] == "1") {
+			echo "			<i class='fas fa-star fa-xs' style='color: ".$_SESSION['theme']['body_text_color']."; float: left; margin-top: 7px; margin-left: 8px;' title=\"".$text['label-primary']."\"></i>\n";
+		}
+		if (permission_exists('contact_email_delete')) {
+			echo "			<div class='checkbox' style='float: left; margin-top: 3px; margin-left: 8px;'>\n";
+			echo "				<input type='checkbox' name='contact_emails[$x][checked]' id='checkbox_".$x."' class='chk_delete checkbox_emails' value='true' onclick=\"edit_delete_action('emails');\">\n";
+			echo "				<input type='hidden' name='contact_emails[$x][uuid]' value='".escape($row['contact_email_uuid'])."' />\n";
+			echo "			</div>\n";
+		}
+		echo "			<div class='button no-link' style='float: left; margin-top: 1px; margin-left: 8px;'>\n";
+		echo "				<a href='mailto:".escape($row['email_address'])."'>\n";
+		echo "					<i class='fas fa-envelope fa-fw' style='color: ".$_SESSION['theme']['body_text_color']."; float: left; margin-top: 5px; margin-left: 3px;' title=\"".escape($row["email_label"])."\"></i>\n";
+		echo "				</a>\n";
+		echo "			</div>\n";
+		echo "		</div>\n";
+		echo "		<div style='clear: both;'></div>\n";
+
+		echo "		<input type='hidden' name='contact_emails[$x][domain_uuid]' value=\"".escape($row["domain_uuid"])."\">\n";
+		echo "		<input type='hidden' name='contact_emails[$x][contact_uuid]' value=\"".escape($row["contact_uuid"])."\">\n";
+		echo "		<input type='hidden' name='contact_emails[$x][contact_email_uuid]' value=\"".escape($row["contact_email_uuid"])."\">\n";
+
+		echo "		<div class='label'>\n";
+		echo "			".$text['label-email_label']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap'>\n";
+		echo "				<input class='formfld' type='text' name='contact_emails[$x][email_label]' placeholder='".escape($text['label-email_label'])."' maxlength='255' value=\"".escape($row["email_label"])."\">\n";
+		echo "		</div>\n";
+
+		echo "		<div class='label required'>\n";
+		echo "			".$text['label-email_address']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap'>\n";
+		echo "				<input class='formfld' type='text' name='contact_emails[$x][email_address]' placeholder='".escape($text['label-email_address'])."' maxlength='255' value=\"".escape($row["email_address"])."\">\n";
+		echo "		</div>\n";
+
+		echo "		<div class='label'>\n";
+		echo "			".$text['label-primary']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap'>\n";
+		echo "			<select class='formfld' name='contact_emails[$x][email_primary]' style='width: auto;'>\n";
+		echo "				<option value=''>".escape($text['label-contact_emails'])."</option>\n";
+		if ($row['email_primary'] == "1") {
+			echo "				<option value='1' selected='selected'>".$text['label-true']."</option>\n";
+		}
+		else {
+			echo "				<option value='1'>".$text['label-true']."</option>\n";
+		}
+		if ($row['email_primary'] == "0") {
+			echo "				<option value='0' selected='selected'>".$text['label-false']."</option>\n";
+		}
+		else {
+			echo "				<option value='0'>".$text['label-false']."</option>\n";
+		}
+		echo "			</select>\n";
+		//echo "				<br />\n";
+		//echo 				$text['description-email_primary']."\n";
+		echo "		</div>\n";
+
+		echo "		<div class='label'>\n";
+		echo "			".$text['label-email_description']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap'>\n";
+		echo "				<input class='formfld' type='text' name='contact_emails[$x][email_description]' placeholder='' maxlength='255' value=\"".escape($row["email_description"])."\">\n";
+		echo "		</div>\n";
+
+		echo "		<div class='label empty_row' style='grid-row: 6 / span 99;'>\n";
+		echo "			&nbsp;\n";
+		echo "		</div>\n";
+		echo "		<div class='field empty_row' style='grid-row: 6 / span 99;'>\n";
+		echo "		</div>\n";
+
+		//if (is_array($contact_emails) && @sizeof($contact_emails) > 1 && permission_exists('contact_email_delete')) {
+		//	if (is_uuid($row['contact_email_uuid'])) {
+		//		echo "		<div class='label'>\n";
+		//		echo "			".$text['label-action']."\n";
+		//		echo "		</div>\n";
+		//		echo "		<div class='field no-wrap'>\n";
+		//		echo "			<input type='checkbox' name='contact_emails[".$x."][checked]' value='true' class='chk_delete checkbox_details' onclick=\"checkbox_on_change(this);\">\n";
+		//		echo "		</div>\n";
+		//	}
+		//}
+		echo "	</div>\n";
+		$x++;
+	}
+}
+
+if (permission_exists('contact_url_view')) {
+	$x = 0;
+	foreach($contact_urls as $row) {
+		echo "	<div class='form_set'>\n";
+		echo "		<div class='heading'>\n";
+		echo "			<b style='float: left;'>".$text['label-contact_url']."</b>\n";
+		if ($row['url_primary'] == "1") {
+			echo "			<i class='fas fa-star fa-xs' style='color: ".$_SESSION['theme']['body_text_color']."; float: left; margin-top: 7px; margin-left: 8px;' title=\"".$text['label-primary']."\"></i>\n";
+		}
+		if (permission_exists('contact_url_delete')) {
+			echo "			<div class='checkbox' style='float: left; margin-top: 3px; margin-left: 8px;'>\n";
+			echo "				<input type='checkbox' name='contact_urls[$x][checked]' id='checkbox_".$x."' class='chk_delete checkbox_urls' value='true' onclick=\"edit_delete_action('urls');\">\n";
+			echo "				<input type='hidden' name='contact_urls[$x][uuid]' value='".escape($row['contact_url_uuid'])."' />\n";
+			echo "			</div>\n";
+		}
+		echo "			<div class='button no-link' style='float: left; margin-top: 1px; margin-left: 8px;'>\n";
+		echo "				<a href='".escape($row['url_address'])."' target='_blank'>\n";
+		echo "					<span class='fas fa-link fa-fw' style='color: ".$_SESSION['theme']['body_text_color']."; float: left; margin-top: 7px; margin-left: 3px;' title=\"".str_replace("http://", "", str_replace("https://", "", escape($row['url_address'])))."\"></span>\n";
+		echo "				</a>\n";
+		echo "			</div>\n";
+		echo "		</div>\n";
+		echo "		<div style='clear: both;'></div>\n";
+		echo "			<input type='hidden' name='contact_urls[$x][domain_uuid]' value=\"".escape($row["domain_uuid"])."\">\n";
+		echo "			<input type='hidden' name='contact_urls[$x][contact_uuid]' value=\"".escape($row["contact_uuid"])."\">\n";
+		echo "			<input type='hidden' name='contact_urls[$x][contact_url_uuid]' value=\"".escape($row["contact_url_uuid"])."\">\n";
+		//echo "			<td class='formfld'>\n";
+		//echo "			<div class='label'>\n";
+		//echo "				".$text['label-url_type']."\n";
+		//echo "			</div>\n";
+		//echo "			<div class='field no-wrap'>\n";
+		//echo "					<input class='formfld' type='text' name='contact_urls[$x][url_type]' placeholder='".escape($text['label-url_type'])."' maxlength='255' value=\"".escape($row["url_type"])."\">\n";
+		//echo "			</div>\n";
+		echo "			<div class='label'>\n";
+		echo "				".$text['label-url_label']."\n";
+		echo "			</div>\n";
+		echo "			<div class='field no-wrap'>\n";;
+
+		//if there are no custom labels add defaults
+		if (is_array($_SESSION["contact"]["url_label"])) {
+			$contact_url_labels = $_SESSION["contact"]["url_label"];
+		}
+		else {
+			$contact_url_labels[] = $text['option-work'];
+			$contact_url_labels[] = $text['option-personal'];
+			$contact_url_labels[] = $text['option-other'];
+		}
+		sort($contact_url_labels);
+		foreach($contact_url_labels as $label) {
+			$url_label_options[] = "<option value='".$label."' ".(($label == $row['url_label']) ? "selected='selected'" : null).">".$label."</option>";
+		}
+		$url_label_found = (in_array($url_label, $contact_url_labels)) ? true : false;
+
+		echo "				<select class='formfld' ".((!$url_label_found && $url_label != '') ? "style='display: none;'" : "style='width: auto;'")." name='contact_urls[$x][url_label]' id='url_label' onchange=\"getElementById('url_label_custom').value='';\">\n";
+		echo "					<option value=''></option>\n";
+
+		echo 					(is_array($url_label_options)) ? implode("\n", $url_label_options) : null;
+		echo "				</select>\n";
+		echo "				<input type='text' class='formfld' ".(($url_label_found || $url_label == '') ? "style='display: none;'" : null)." name='url_label_custom' id='url_label_custom' value=\"".((!$url_label_found) ? htmlentities($url_label) : null)."\">\n";
+		//echo "				<input type='button' id='btn_toggle_label' class='btn' alt='".$text['button-back']."' value='&#9665;' onclick=\"toggle_custom('url_label');\">\n";
+		echo "			</div>\n";
+
+		echo "			<div class='label required'>\n";
+		echo "				".$text['label-url_address']."\n";
+		echo "			</div>\n";
+		echo "			<div class='field no-wrap'>\n";
+
+		echo "					<input class='formfld' type='text' name='contact_urls[$x][url_address]' placeholder='http://...' maxlength='255' value=\"".escape($row["url_address"])."\">\n";
+		echo "			</div>\n";
+
+		echo "			<div class='label'>\n";
+		echo "				".$text['label-primary']."\n";
+		echo "			</div>\n";
+		echo "			<div class='field no-wrap'>\n";
+		echo "				<select class='formfld' name='contact_urls[$x][url_primary]' style='width: auto;'>\n";
+		echo "					<option value=''>".escape($text['label-url_primary'])."</option>\n";
+		if ($row['url_primary'] == "1") {
+			echo "					<option value='1' selected='selected'>".$text['label-true']."</option>\n";
+		}
+		else {
+			echo "					<option value='1'>".$text['label-true']."</option>\n";
+		}
+		if ($row['url_primary'] == "0") {
+			echo "					<option value='0' selected='selected'>".$text['label-false']."</option>\n";
+		}
+		else {
+			echo "					<option value='0'>".$text['label-false']."</option>\n";
+		}
+		echo "				</select>\n";
+		echo "			</div>\n";
+
+		echo "			<div class='label'>\n";
+		echo "				".$text['label-url_description']."\n";
+		echo "			</div>\n";
+		echo "			<div class='field no-wrap'>\n";
+		echo "				<input class='formfld' type='text' name='contact_urls[$x][url_description]' placeholder='' maxlength='255' value=\"".escape($row["url_description"])."\">\n";
+		echo "			</div>\n";
+		if (is_array($contact_urls) && @sizeof($contact_urls) > 1 && permission_exists('contact_url_delete')) {
+			if (is_uuid($row['contact_url_uuid'])) {
+				echo "			<input type='checkbox' name='contact_urls[".$x."][checked]' value='true' class='chk_delete checkbox_details' onclick=\"checkbox_on_change(this);\">\n";
+			}
+		}
+		//echo "			<br />\n";
+		//echo "			".$text['description-contact_organization']."\n";
+		echo "			<div class='label empty_row' style='grid-row: 6 / span 99;'>\n";
+		echo "				&nbsp;\n";
+		echo "			</div>\n";
+		echo "			<div class='field empty_row' style='grid-row: 6 / span 99;'>\n";
+		echo "			</div>\n";
+		echo "	</div>\n";
+		$x++;
+	}
+}
+
+if (permission_exists('contact_relation_view')) {
+	if (is_array($contact_relations)) {
+
+		$x = 0;
+		foreach($contact_relations as $row) {
+
+			$sql = "select contact_uuid, contact_organization, contact_name_given, contact_name_family from v_contacts ";
+			$sql .= "where domain_uuid = :domain_uuid ";
+			$sql .= "and contact_uuid <> :contact_uuid ";
+			$sql .= "order by contact_organization desc, contact_name_given asc, contact_name_family asc ";
+			$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+			$parameters['contact_uuid'] = $row['contact_uuid'];
+			$database = new database;
+			$contacts = $database->select($sql, $parameters, 'all');
+
+			echo "	<div class='form_set'>\n";
+			echo "		<div class='heading'>\n";
+			echo "			<b style='float: left;'>".$text['label-contact_relation_label']."</b>\n";
+			if (permission_exists('contact_relation_delete')) {
+				echo "			<div class='checkbox' style='float: left; margin-top: 3px; margin-left: 8px;'>\n";
+				echo "				<input type='checkbox' name='contact_relations[$x][checked]' id='checkbox_".$x."' class='chk_delete checkbox_relations' value='true' onclick=\"edit_delete_action('relations');\">\n";
+				echo "				<input type='hidden' name='contact_relations[$x][uuid]' value='".escape($row['contact_relation_uuid'])."' />\n";
+				echo "				<input type='hidden' name='contact_relations[$x][contact_relation_uuid]' value='".escape($row['contact_relation_uuid'])."' />\n";
+				echo "				<input type='hidden' name='contact_relations[$x][contact_uuid]' value='".escape($row['contact_uuid'])."' />\n";
+				echo "			</div>\n";
+			}
+			echo "		</div>\n";
+			echo "		<div style='clear: both;'></div>\n";
+
+			echo "		<div class='label required'>\n";
+			echo "			".$text['label-contact_relation_label']."\n";
+			echo "		</div>\n";
+			echo "		<div class='field no-wrap'>\n";
+
+
+			//if there are no custom labels add defaults
+			if (is_array($_SESSION["contact"]["relation_label"])) {
+				$relation_labels = $_SESSION["contact"]["url_label"];
+			}
+			else {
+				$relation_labels[] = $text['label-contact_relation_option_parent'];
+				$relation_labels[] = $text['label-contact_relation_option_child'];
+				$relation_labels[] = $text['label-contact_relation_option_employee'];
+				$relation_labels[] = $text['label-contact_relation_option_member'];
+				$relation_labels[] = $text['label-contact_relation_option_associate'];
+				$relation_labels[] = $text['label-contact_relation_option_other'];
+			}
+			sort($relation_labels);
+			foreach($relation_labels as $label) {
+				$relation_label_options[] = "<option value='".escape($label)."' ".(($label == $row['relation_label']) ? "selected='selected'" : null).">".escape($label)."</option>";
+			}
+			$relation_label_found = (in_array($relation_label, $relation_labels)) ? true : false;
+			echo "			<select class='formfld' ".((!$relation_label_found && $relation_label != '') ? "style='display: none;'" : "style='auto;'")." name='contact_relations[$x][relation_label]' id='relation_label' onchange=\"getElementById('relation_label_custom').value='';\">\n";
+			echo "				<option value=''></option>\n";
+			echo 		(is_array($relation_label_options)) ? implode("\n", $relation_label_options) : null;
+			echo "			</select>\n";
+			//echo "			<input type='text' class='formfld' ".(($relation_label_found || $relation_label == '') ? "style='display: none;'" : null)." name='contact_relations[$x][relation_label_custom]' id='relation_label_custom' value=\"".((!$relation_label_found) ? htmlentities($relation_label) : null)."\">\n";
+			//echo "			<input type='button' id='btn_toggle_label' class='btn' alt='".$text['button-back']."' value='&#9665;' onclick=\"toggle_custom('relation_label');\">\n";
+			//echo "			<br />\n";
+			//echo 				$text['description-relation_label']."\n";
+			echo "		</div>\n";
+
+			echo "		<div class='label required'>\n";
+			echo "			".$text['label-contact_relation_contact']."\n";
+			echo "		</div>\n";
+			echo "		<div class='field no-wrap'>\n";
+
+			echo "			<select class='formfld' name='contact_relations[$x][relation_contact_uuid]' id='relation_contact_uuid'>\n";
+			echo "				<option value=''></option>\n";
+			if (is_array($contacts) && @sizeof($contacts) != 0) {
+				foreach($contacts as $field) {
+					$contact_name = $field['contact_name_given'].(($field['contact_name_given'] != '' && $field['contact_name_family'] != '') ? ' ' : null) . $field['contact_name_family'];
+					if ($field['contact_organization'] != '') {
+						if ($contact_name != '') {
+							$contact_name = $field['contact_organization'].', '.$contact_name;
+						}
+						else {
+							$contact_name = $field['contact_organization'];
+						}
+					}
+					echo "			<option value='".escape($field['contact_uuid'])."' ".(($field['contact_uuid'] == $row['relation_contact_uuid']) ? "selected='selected'" : null).">".escape($contact_name)."</option>\n";
+				}
+			}
+			unset($sql, $parameters, $result, $row);
+			echo "			</select>\n";
+			echo "		</div>\n";
+
+			echo "		<div class='label empty_row' style='grid-row: 4 / span 99;'>\n";
+			echo "			&nbsp;\n";
+			echo "		</div>\n";
+			echo "		<div class='field no-wrap empty_row' style='grid-row: 4 / span 99;'>\n";
+			echo "		</div>\n";
+
+			echo "	</div>\n";
+			$x++;
+		}
+	}
+}
+
+if (permission_exists('contact_setting_view')) {
+	$x = 0;
+	foreach($contact_settings as $row) {
+		echo "	<div class='form_set'>\n";
+		echo "		<div class='heading'>\n";
+		echo "			<b style='float: left;'>".$text['label-contact_settings']."</b>\n";
+		if (permission_exists('contact_setting_delete')) {
+			echo "			<div class='checkbox' style='float: left; margin-top: 3px; margin-left: 8px;'>\n";
+			echo "				<input type='checkbox' name='contact_settings[$x][checked]' id='checkbox_".$x."' class='chk_delete checkbox_settings' value='true' onclick=\"edit_delete_action('settings');\">\n";
+			echo "				<input type='hidden' name='contact_settings[$x][uuid]' value='".escape($row['contact_setting_uuid'])."' />\n";
+			echo "			</div>\n";
+		}
+		echo "		</div>\n";
+		echo "		<div style='clear: both;'></div>\n";
+
+		echo "		<input type='hidden' name='contact_settings[$x][domain_uuid]' value=\"".escape($row["domain_uuid"])."\">\n";
+		echo "		<input type='hidden' name='contact_settings[$x][contact_uuid]' value=\"".escape($row["contact_uuid"])."\">\n";
+		echo "		<input type='hidden' name='contact_settings[$x][contact_setting_uuid]' value=\"".escape($row["contact_setting_uuid"])."\">\n";
+
+		echo "		<div class='label required'>\n";
+		echo "			".$text['label-contact_setting_category']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap'>\n";
+		echo "				<input class='formfld' type='text' name='contact_settings[$x][contact_setting_category]'  placeholder='' maxlength='255' value=\"".escape($row["contact_setting_category"])."\">\n";
+		echo "		</div>\n";
+
+		echo "		<div class='label required'>\n";
+		echo "			".$text['label-contact_setting_subcategory']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap'>\n";
+		echo "				<input class='formfld' type='text' name='contact_settings[$x][contact_setting_subcategory]' placeholder='' maxlength='255' value=\"".escape($row["contact_setting_subcategory"])."\">\n";
+		echo "		</div>\n";
+
+		echo "		<div class='label required'>\n";
+		echo "			".$text['label-name']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap'>\n";
+		echo "				<input class='formfld' type='text' name='contact_settings[$x][contact_setting_name]' placeholder='' maxlength='255' value=\"".escape($row["contact_setting_name"])."\">\n";
+		echo "		</div>\n";
+
+		echo "		<div class='label'>\n";
+		echo "			".$text['label-contact_setting_value']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap'>\n";
+		echo "				<input class='formfld' type='text' name='contact_settings[$x][contact_setting_value]' placeholder='' maxlength='255' value=\"".escape($row["contact_setting_value"])."\">\n";
+		echo "		</div>\n";
+
+		echo "		<div class='label'>\n";
+		echo "			".$text['label-order']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap'>\n";
+		echo "			<select name='contact_settings[$x][contact_setting_order]' class='formfld'>\n";
+		echo "				<option value='$i' ".$selected.">".escape($text['label-contact_setting_order'])."</option>\n";
+		$i=0;
+		while ($i<=999) {
+			$selected = ($i == $row["contact_setting_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 "		</div>\n";
+
+		echo "		<div class='label required'>\n";
+		echo "			".$text['label-enabled']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap'>\n";
+		echo "			<select class='formfld' name='contact_settings[$x][contact_setting_enabled]' style='width: 5em;'>\n";
+		echo "				<option value=''><b>".escape($text['label-contact_setting_enabled'])."</b></option>\n";
+		if ($row['contact_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 ($row['contact_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 "		</div>\n";
+
+		echo "		<div class='label'>\n";
+		echo "			".$text['label-description']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap'>\n";
+		echo "				<input class='formfld' type='text' name='contact_settings[$x][contact_setting_description]' placeholder='".escape($text['label-contact_setting_description'])."' maxlength='255' value=\"".escape($row["contact_setting_description"])."\">\n";
+		echo "		</div>\n";
+
+		if (is_array($contact_settings) && @sizeof($contact_settings) > 1 && permission_exists('contact_setting_delete')) {
+			if (is_uuid($row['contact_setting_uuid'])) {
+				echo "		<div class='label'>\n";
+				echo "			".$text['label-enabled']."\n";
+				echo "		</div>\n";
+				echo "		<div class='field no-wrap'>\n";
+				echo "			<input type='checkbox' name='contact_settings[".$x."][checked]' value='true' class='chk_delete checkbox_details' onclick=\"checkbox_on_change(this);\">\n";
+				echo "		</div>\n";
+			}
+		}
+
+		echo "		<div class='label empty_row' style='grid-row: 9 / span 99;'>\n";
+		echo "			&nbsp;\n";
+		echo "		</div>\n";
+		echo "		<div class='field no-wrap empty_row' style='grid-row: 9 / span 99;'>\n";
+		echo "		</div>\n";
+
+		echo "	</div>\n";
+		$x++;
+	}
+}
+
+if (permission_exists('contact_attachment_view')) {
+	$x = 0;
+	foreach($contact_attachments as $row) {
+		$attachment_type = strtolower(pathinfo($row['attachment_filename'], PATHINFO_EXTENSION));
+		$attachment_type_label = $attachment_type == 'jpg' || $attachment_type == 'jpeg' || $attachment_type == 'gif' || $attachment_type == 'png' ? $text['label-image'] : $text['label-file'];
+		echo "<div class='form_set'>\n";
+		echo "	<div class='heading'>\n";
+		echo " 		<b style='float: left;'>".$text['label-attachments']."</b>\n";
+		if ($row['attachment_primary'] == "1") {
+			echo "		<i class='fas fa-star fa-xs' style='color: ".$_SESSION['theme']['body_text_color']."; float: left; margin-top: 7px; margin-left: 8px;' title=\"".$text['label-primary']."\"></i>\n";
+		}
+		if (permission_exists('contact_attachment_delete')) {
+			echo "		<div class='checkbox' style='float: left; margin-top: 3px; margin-left: 8px;'>\n";
+			echo "			<input type='checkbox' name='contact_attachments[$x][checked]' id='checkbox_".$x."' class='chk_delete checkbox_attachments' value='true' onclick=\"edit_delete_action('attachments');\">\n";
+			echo "			<input type='hidden' name='contact_attachments[$x][uuid]' value='".escape($row['contact_attachment_uuid'])."' />\n";
+			echo "			<input type='hidden' name='contact_attachments[$x][domain_uuid]' value=\"".escape($row["domain_uuid"])."\">\n";
+			echo "			<input type='hidden' name='contact_attachments[$x][contact_attachment_uuid]' value='".escape($row['contact_attachment_uuid'])."' />\n";
+			echo "			<input type='hidden' name='contact_attachments[$x][contact_uuid]' value='".escape($row['contact_uuid'])."' />\n";
+			echo "		</div>\n";
+		}
+		echo "	</div>\n";
+		echo "	<div style='clear: both;'></div>\n";
+
+		//styles and attachment layer
+		echo "<style>\n";
+		echo "	#contact_attachment_layer {\n";
+		echo "		z-index: 999999;\n";
+		echo "		position: absolute;\n";
+		echo "		left: 0px;\n";
+		echo "		top: 0px;\n";
+		echo "		right: 0px;\n";
+		echo "		bottom: 0px;\n";
+		echo "		text-align: center;\n";
+		echo "		vertical-align: middle;\n";
+		echo "	}\n";
+		echo "</style>\n";
+		echo "<div id='contact_attachment_layer' style='display: none;'></div>\n";
+
+		//script
+		echo "<script>\n";
+		echo "	function display_attachment(id) {\n";
+		echo "		$('#contact_attachment_layer').load('contact_attachment.php?id=' + id + '&action=display', function(){\n";
+		echo "			$('#contact_attachment_layer').fadeIn(200);\n";
+		echo "		});\n";
+		echo "	}\n";
+		echo "</script>\n";
+
+		echo "	<div class='label'>\n";
+		echo "		".$text['label-attachment']."\n";
+		echo "	</div>\n";
+		echo "	<div class='field no-wrap'>\n";
+		$attachment_type = strtolower(pathinfo($row['attachment_filename'], PATHINFO_EXTENSION));
+		//if ($action == 'update') {
+			echo "<input type='hidden' name='attachment_filename' value=\"".escape($row['attachment_filename'])."\">\n";
+			if ($attachment_type == 'jpg' || $attachment_type == 'jpeg' || $attachment_type == 'gif' || $attachment_type == 'png') {
+				echo "<img src='data:image/".$attachment_type.";base64,".escape($row['attachment_content'])."' style='border: none; max-width: 220px; max-height: 220px;' oncontextmenu=\"window.open('contact_attachment.php?id=".escape($row['contact_attachment_uuid'])."&action=download'); return false;\">";
+			}
+			else {
+				echo "<a href='contact_attachment.php?id=".escape($row['contact_attachment_uuid'])."&action=download' style='font-size: 120%;'>".escape($row['attachment_filename'])."</a>";
+			}
+		//}
+		//else {
+		//	$allowed_attachment_types = json_decode($_SESSION['contact']['allowed_attachment_types']['text'], true);
+		//	echo "	<input type='file' class='formfld' name='attachment' id='attachment' accept='.".implode(',.',array_keys($allowed_attachment_types))."'>\n";
+		//	echo "	<span style='display: inline-block; margin-top: 5px; font-size: 80%;'>".strtoupper(implode(', ', array_keys($allowed_attachment_types)))."</span>";
+		//}
+		echo "	</div>\n";
+
+		echo "	<div class='label'>\n";
+		echo "		".$text['label-attachment_filename']."\n";
+		echo "	</div>\n";
+		echo "	<div class='field no-wrap'>\n";
+		echo "		<a href='contact_attachment.php?id=".escape($row['contact_attachment_uuid'])."&action=download' style='font-size: 120%;'>".escape($row['attachment_filename'])."</a>";
+		echo "	</div>\n";
+
+		echo "	<div class='label'>\n";
+		echo "		".$text['label-attachment_size']."\n";
+		echo "	</div>\n";
+		echo "	<div class='field no-wrap'>\n";
+		echo 		strtoupper(byte_convert($row['attachment_size']))."\n";
+		echo "	</div>\n";
+
+		echo "	<div class='label'>\n";
+		echo "		".$text['label-primary']."\n";
+		echo "	</div>\n";
+		echo "	<div class='field no-wrap'>\n";
+		echo "		<select class='formfld' name='contact_attachments[$x][attachment_primary]' id='attachment_primary' style='width: auto;'>\n";
+		echo "			<option value='0'>".$text['option-false']."</option>\n";
+		echo "			<option value='1' ".(($row['attachment_primary']) ? "selected" : null).">".$text['option-true']."</option>\n";
+		echo "		</select>\n";
+		echo "	</div>\n";
+
+		echo "	<div class='label required'>\n";
+		echo "		".$text['label-description']."\n";
+		echo "	</div>\n";
+		echo "	<div class='field no-wrap'>\n";
+		echo "		<input class='formfld' type='text' name='contact_attachments[$x][attachment_description]' maxlength='255' value=\"".escape($row['attachment_description'])."\">\n";
+		echo "	</div>\n";
+
+		echo "	<div class='label empty_row' style='grid-row: 9 / span 99;'>\n";
+		echo "		&nbsp;\n";
+		echo "	</div>\n";
+		echo "	<div class='field no-wrap empty_row' style='grid-row: 9 / span 99;'>\n";
+		echo "	</div>\n";
+
+		echo "</div>\n";
+		$x++;
+	}
+}
+
+if (permission_exists('contact_time_view')) {
+	$x = 0;
+	foreach ($contact_times as $row) {
+		echo "<div class='form_set'>\n";
+		echo "	<div class='heading'>\n";
+		echo " 		<b style='float: left;'>".$text['header_contact_times']."</b>\n";
+		if (permission_exists('contact_time_delete')) {
+			echo "		<div class='checkbox' style='float: left; margin-top: 3px; margin-left: 8px;'>\n";
+			echo "			<input type='checkbox' name='contact_times[$x][checked]' id='checkbox_".$x."' class='chk_delete checkbox_times' value='true' onclick=\"edit_delete_action('times');\">\n";
+			echo "			<input type='hidden' name='contact_times[$x][uuid]' value='".escape($row['contact_time_uuid'])."' />\n";
+			echo "			<input type='hidden' name='contact_times[$x][domain_uuid]' value=\"".escape($row["domain_uuid"])."\">\n";
+			echo "			<input type='hidden' name='contact_times[$x][contact_time_uuid]' value='".escape($row['contact_time_uuid'])."' />\n";
+			echo "			<input type='hidden' name='contact_times[$x][contact_uuid]' value='".escape($row['contact_uuid'])."' />\n";
+			echo "		</div>\n";
+		}
+		echo "	</div>\n";
+		echo "	<div style='clear: both;'></div>\n";
+
+		echo "	<div class='label required'>\n";
+		echo "		".$text['label-time_start']."\n";
+		echo "	</div>\n";
+		echo "	<div class='field no-wrap'>\n";
+		echo "		<input class='formfld datetimesecpicker' data-toggle='datetimepicker' data-target='#time_start' type='text' name='contact_times[$x][time_start]' id='time_start' style='min-width: 135px; width: 135px;' value='".escape($row["time_start"])."' onblur=\"$(this).datetimepicker('hide');\">\n";
+		echo "	</div>\n";
+
+		echo "	<div class='label'>\n";
+		echo "		".$text['label-time_stop']."\n";
+		echo "	</div>\n";
+		echo "	<div class='field no-wrap'>\n";
+		echo "		<input class='formfld datetimesecpicker' data-toggle='datetimepicker' data-target='#time_stop' type='text' name='contact_times[$x][time_stop]' id='time_stop' style='min-width: 135px; width: 135px;' value='".escape($row["time_stop"])."' onblur=\"$(this).datetimepicker('hide');\">\n";
+		echo "	</div>\n";
+
+		echo "	<div class='label'>\n";
+		echo "		".$text['label-time_description']."\n";
+		echo "	</div>\n";
+		echo "	<div class='field no-wrap'>\n";
+		echo "  	<textarea class='formfld' type='text' name='contact_times[$x][time_description]' id='time_description' style='width: 100%; height: 100%;'>".escape($row["time_description"])."</textarea>\n";
+		echo "	</div>\n";
+
+		echo "	<div class='label empty_row' style='grid-row: 5 / span 99;'>\n";
+		echo "		&nbsp;\n";
+		echo "	</div>\n";
+		echo "	<div class='field empty_row' style='grid-row: 5 / span 99;'>\n";
+		echo "	</div>\n";
+
+		echo "</div>\n";
+		$x++;
+	}
+	unset($contact_times);
+}
+
+if (permission_exists('contact_note_view')) {
+	$x = 0;
+	foreach($contact_notes as $row) {
+		$contact_note = $row['contact_note'];
+		$contact_note = escape($contact_note);
+		$contact_note = str_replace("\n","<br />",$contact_note);
+		if (permission_exists('contact_note_add')) {
+			$list_row_url = "contact_note_edit.php?contact_uuid=".escape($row['contact_uuid'])."&id=".escape($row['contact_note_uuid']);
+		}
+
+		echo "<div class='form_set'>\n";
+		echo "	<div class='heading'>\n";
+		echo "		<b style='float: left;'>".$text['label-contact_notes']."</b>\n";
+		if (permission_exists('contact_note_delete')) {
+			echo "		<div class='checkbox' style='float: left; margin-top: 3px; margin-left: 8px;'>\n";
+			echo "			<input type='checkbox' name='contact_notes[$x][checked]' id='checkbox_".$x."' class='chk_delete checkbox_notes' value='true' onclick=\"edit_delete_action('notes');\">\n";
+			echo "			<input type='hidden' name='contact_notes[$x][uuid]' value='".escape($row['contact_note_uuid'])."' />\n";
+			echo "			<input type='hidden' name='contact_notes[$x][domain_uuid]' value=\"".escape($row["domain_uuid"])."\">\n";
+			echo "			<input type='hidden' name='contact_notes[$x][contact_note_uuid]' value='".escape($row['contact_note_uuid'])."' />\n";
+			echo "			<input type='hidden' name='contact_notes[$x][contact_uuid]' value='".escape($row['contact_uuid'])."' />\n";
+			echo "		</div>\n";
+		}
+		echo "	</div>\n";
+		echo "	<div style='clear: both;'></div>\n";
+
+		echo "	<div class='label required'>\n";
 		echo "		".$text['label-contact_note']."\n";
-		echo "	</td>\n";
-		echo "	<td class='vtable' align='left'>\n";
-		echo "		<textarea class='formfld' style='width: 100%; height: 160px;' name='contact_note'>".$contact_note."</textarea>\n";
-		echo "	</td>\n";
-		echo "</tr>\n";
+		echo "	</div>\n";
+		echo "	<div class='field no-wrap' style='float: left;'>\n";
+		echo "  	<textarea class='formfld' name=\"contact_notes[$x][contact_note]\" style='min-width: 100%; height: 275px;'>".$contact_note."</textarea>\n";
+		echo "	</div>\n";
 
-		echo "</table>";
+		echo "	<div class='label'>\n";
+		echo "		".$text['label-note_user']."\n";
+		echo "	</div>\n";
+		echo "	<div class='field no-wrap' style='margin-top: 2px;'>\n";
+		echo "		<div class='description'><strong>".escape($row['last_mod_user'])."</strong>: ".date("j M Y @ H:i:s", strtotime($row['last_mod_date']))."</div>\n";
+		echo "	</div>\n";
 
-	echo "</td>\n";
+		echo "	<div class='label empty_row' style='grid-row: 4 / span 99;'>\n";
+		echo "		&nbsp;\n";
+		echo "	</div>\n";
+		echo "	<div class='field empty_row' style='grid-row: 4 / span 99;'>\n";
+		echo "	</div>\n";
 
-	if ($action == "update") {
-		echo "<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>";
-		echo "<td width='100%' valign='top'>\n";
-
-		if (permission_exists('contact_phone_view')) { require "contact_phones.php"; }
-		if (permission_exists('contact_address_view')) { require "contact_addresses.php"; }
-		if (permission_exists('contact_email_view')) { require "contact_emails.php"; }
-		if (permission_exists('contact_url_view')) { require "contact_urls.php"; }
-		if (permission_exists('contact_extension_view')) { require "contact_extensions.php"; }
-		if (permission_exists('contact_relation_view')) { require "contact_relations.php"; }
-		if (permission_exists('contact_note_view')) { require "contact_notes.php"; }
-		if (permission_exists('contact_time_view')) { require "contact_times.php"; }
-		if (permission_exists('contact_setting_view')) { require "contact_settings.php"; }
-		if (permission_exists('contact_attachment_view')) { require "contact_attachments.php"; }
-
-		echo "</td>\n";
+		echo "</div>\n";
+		$x++;
 	}
+	unset($contact_notes);
+}
 
-	echo "</tr>\n";
-	echo "</table>\n";
-	echo "<br><br>";
 
-	if ($action == "update") {
-		echo "<input type='hidden' name='contact_uuid' value='".escape($contact_uuid)."'>\n";
-	}
+//close the grid
+	echo "</div>\n";
+	echo "<br /><br />";
+
+//end the form
 	echo "<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
 	echo "</form>";
 
-//hide the delete button when nothing to delete
-	if (
-		$action == 'update' &&
-		!permission_exists('contact_delete') && (
-		(!is_array($contact_users_assigned) || @sizeof($contact_users_assigned) == 0) &&
-		(!is_array($contact_groups_assigned) || @sizeof($contact_groups_assigned) == 0) &&
-		(!is_array($contact_phones) || @sizeof($contact_phones) == 0) &&
-		(!is_array($contact_addresses) || @sizeof($contact_addresses) == 0) &&
-		(!is_array($contact_emails) || @sizeof($contact_emails) == 0) &&
-		(!is_array($contact_urls) || @sizeof($contact_urls) == 0) &&
-		(!is_array($contact_extensions) || @sizeof($contact_extensions) == 0) &&
-		(!is_array($contact_relations) || @sizeof($contact_relations) == 0) &&
-		(!is_array($contact_notes) || @sizeof($contact_notes) == 0) &&
-		(!is_array($contact_times) || @sizeof($contact_times) == 0) &&
-		(!is_array($contact_settings) || @sizeof($contact_settings) == 0) &&
-		(!is_array($contact_attachments) || @sizeof($contact_attachments) == 0)
-		)) {
-		echo "<script>document.getElementsByName('btn_delete')[0].style.display='none';</script>\n";
-	}
-
 //include the footer
 	require_once "resources/footer.php";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/contacts/contact_import.php b/app/contacts/contact_import.php
index dfb92964fc..a3460bde54 100644
--- a/app/contacts/contact_import.php
+++ b/app/contacts/contact_import.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):
@@ -55,7 +55,7 @@
 	}
 
 //set the max php execution time
-	ini_set('max_execution_time',7200);
+	ini_set('max_execution_time', 7200);
 
 //get the http get values and set them as php variables
 	$action = $_POST["action"];
@@ -77,7 +77,6 @@
 			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'];
 			$_SESSION['file'] = $file;
 		}
@@ -208,8 +207,8 @@
 				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
+						//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'";
@@ -221,9 +220,9 @@
 					echo "			</optgroup>\n";
 				}
 				echo "		</select>\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 "		<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++;
@@ -310,7 +309,7 @@
 								foreach ($fields as $key => $value) {
 									//get the line
 									$result = str_getcsv($line, $delimiter, $enclosure);
-									
+
 									//get the table and field name
 									$field_array = explode(".",$value);
 									$table_name = $field_array[0];
@@ -318,15 +317,26 @@
 									//echo "value: $value<br />\n";
 									//echo "table_name: $table_name<br />\n";
 									//echo "field_name: $field_name<br />\n";
-									
+
 									//get the parent table name
 									$parent = get_parent($schema, $table_name);
-	
+
+									//count the field names
+									if (isset($field_count[$table_name][$field_name])) {
+										$field_count[$table_name][$field_name]++;
+									}
+									else {
+										$field_count[$table_name][$field_name] = 0;
+									}
+
+									//set the ordinal ID
+									$id = $field_count[$table_name][$field_name];
+
 									//remove formatting from the phone number
 									if ($field_name == "phone_number") {
 										$result[$key] = preg_replace('{(?!^\+)[\D]}', '', $result[$key]);
 									}
-	
+
 									//build the data array
 									if (strlen($table_name) > 0) {
 										if (strlen($parent) == 0) {
@@ -335,42 +345,44 @@
 										}
 										else {
 											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];
-												}
+												$array[$parent][$row_id][$table_name][$id]['domain_uuid'] = $domain_uuid;
+												$array[$parent][$row_id][$table_name][$id][$field_name] = $result[$key];
+												//if ($field_name == 'phone_number') {
+												//	$array[$parent][$row_id][$table_name][$id]['phone_label'] = $labels[$key];
+												//}
 											}
 										}
-	
+
 										if ($field_name == "group_name") {
 											foreach ($groups as $field) {
 												if ($field['group_name'] == $result[$key]) {
 													//$array[$parent][$row_id]['contact_group_uuid'] = uuid();
-													$array[$parent][$row_id]['contact_groups'][$y]['domain_uuid'] = $domain_uuid;
+													$array[$parent][$row_id]['contact_groups'][$id]['domain_uuid'] = $domain_uuid;
 													//$array['contact_groups'][$x]['contact_uuid'] = $row['contact_uuid'];
-													$array[$parent][$row_id]['contact_groups'][$y]['group_uuid'] = $field['group_uuid'];
+													$array[$parent][$row_id]['contact_groups'][$id]['group_uuid'] = $field['group_uuid'];
 												}
 											}
 										}
-	
+
 										if ($field_name == "username") {
 											foreach ($users as $field) {
 												if ($field['username'] == $result[$key]) {
-													//$array[$parent][$row_id]['contact_users'][$y]['contact_group_uuid'] = uuid();
-													$array[$parent][$row_id]['contact_users'][$y]['domain_uuid'] = $domain_uuid;
+													//$array[$parent][$row_id]['contact_users'][$id]['contact_group_uuid'] = uuid();
+													$array[$parent][$row_id]['contact_users'][$id]['domain_uuid'] = $domain_uuid;
 													//$array['contact_groups'][$x]['contact_uuid'] = $row['contact_uuid'];
-													$array[$parent][$row_id]['contact_users'][$y]['user_uuid'] = $field['user_uuid'];
+													$array[$parent][$row_id]['contact_users'][$id]['user_uuid'] = $field['user_uuid'];
 												}
 											}
 										}
 									}
 									if (is_array($array[$parent][$row_id])) { $y++; }
 								}
-	
+
+							//debug information
+								//view_array($field_count);
+
 							//process a chunk of the array
 								if ($row_id === 1000) {
-
 									//save to the data
 										$database = new database;
 										$database->app_name = 'contacts';
@@ -383,14 +395,17 @@
 									//set the row id back to 0
 										$row_id = 0;
 								}
-	
+
 						} //if ($from_row <= $row_number)
+						unset($field_count);
 						$row_number++;
 						$row_id++;
 					} //end while
-
 					fclose($handle);
 
+				//debug information
+					//view_array($array);
+
 				//save to the data
 					if (is_array($array)) {
 						$database = new database;
diff --git a/app/contacts/contact_phone_edit.php b/app/contacts/contact_phone_edit.php
index d184461e26..938973ca7c 100644
--- a/app/contacts/contact_phone_edit.php
+++ b/app/contacts/contact_phone_edit.php
@@ -59,13 +59,14 @@
 
 //get http post variables and set them to php variables
 	if (is_array($_POST) && @sizeof($_POST) != 0) {
+		$phone_label = $_POST["phone_label"];
+		$phone_label_custom = $_POST["phone_label_custom"];
 		$phone_type_voice = $_POST["phone_type_voice"];
 		$phone_type_fax = $_POST["phone_type_fax"];
 		$phone_type_video = $_POST["phone_type_video"];
 		$phone_type_text = $_POST["phone_type_text"];
-		$phone_label = $_POST["phone_label"];
-		$phone_label_custom = $_POST["phone_label_custom"];
 		$phone_speed_dial = $_POST["phone_speed_dial"];
+		$phone_country_code = $_POST["phone_country_code"];
 		$phone_number = $_POST["phone_number"];
 		$phone_extension = $_POST["phone_extension"];
 		$phone_primary = $_POST["phone_primary"];
@@ -160,12 +161,13 @@
 					if (is_array($array) && @sizeof($array) != 0) {
 						$array['contact_phones'][0]['contact_uuid'] = $contact_uuid;
 						$array['contact_phones'][0]['domain_uuid'] = $domain_uuid;
+						$array['contact_phones'][0]['phone_label'] = $phone_label;
 						$array['contact_phones'][0]['phone_type_voice'] = $phone_type_voice ? 1 : null;
 						$array['contact_phones'][0]['phone_type_fax'] = $phone_type_fax ? 1 : null;
 						$array['contact_phones'][0]['phone_type_video'] = $phone_type_video ? 1 : null;
 						$array['contact_phones'][0]['phone_type_text'] = $phone_type_text ? 1 : null;
-						$array['contact_phones'][0]['phone_label'] = $phone_label;
 						$array['contact_phones'][0]['phone_speed_dial'] = $phone_speed_dial;
+						$array['contact_phones'][0]['phone_country_code'] = $phone_country_code;
 						$array['contact_phones'][0]['phone_number'] = $phone_number;
 						$array['contact_phones'][0]['phone_extension'] = $phone_extension;
 						$array['contact_phones'][0]['phone_primary'] = $phone_primary ? 1 : 0;
@@ -196,12 +198,13 @@
 		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
 		if (is_array($row) && @sizeof($row) != 0) {
+			$phone_label = $row["phone_label"];
 			$phone_type_voice = $row["phone_type_voice"];
 			$phone_type_fax = $row["phone_type_fax"];
 			$phone_type_video = $row["phone_type_video"];
 			$phone_type_text = $row["phone_type_text"];
-			$phone_label = $row["phone_label"];
 			$phone_speed_dial = $row["phone_speed_dial"];
+			$phone_country_code = $row["phone_country_code"];
 			$phone_number = $row["phone_number"];
 			$phone_extension = $row["phone_extension"];
 			$phone_primary = $row["phone_primary"];
@@ -319,6 +322,17 @@
 	echo "</td>\n";
 	echo "</tr>\n";
 
+	echo "<tr>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-phone_country_code']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' align='left'>\n";
+	echo "	<input class='formfld' type='text' name='phone_country_code' maxlength='6' min='0' step='1' value=\"".escape($phone_country_code)."\">\n";
+	echo "<br />\n";
+	echo $text['description-phone_country_code']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
 	echo "<tr>\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
 	echo "	".$text['label-phone_number']."\n";
@@ -380,4 +394,4 @@
 //include the footer
 	require_once "resources/footer.php";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/contacts/contacts.php b/app/contacts/contacts.php
index 6356f66b47..fda8de102d 100644
--- a/app/contacts/contacts.php
+++ b/app/contacts/contacts.php
@@ -74,13 +74,9 @@
 	$user_group_uuids[] = $_SESSION["user_uuid"];
 
 //get contact settings - sync sources
-	$sql = "select ";
-	$sql .= "contact_uuid, ";
-	$sql .= "contact_setting_value ";
-	$sql .= "from ";
-	$sql .= "v_contact_settings ";
-	$sql .= "where ";
-	$sql .= "domain_uuid = :domain_uuid ";
+	$sql = "select contact_uuid, contact_setting_value ";
+	$sql .= "from v_contact_settings ";
+	$sql .= "where domain_uuid = :domain_uuid ";
 	$sql .= "and contact_setting_category = 'sync' ";
 	$sql .= "and contact_setting_subcategory = 'source' ";
 	$sql .= "and contact_setting_name = 'array' ";
@@ -186,7 +182,11 @@
 //build query for paging and list
 	$sql = "select count(*) ";
 	$sql .= "from v_contacts as c ";
-	$sql .= "where domain_uuid = :domain_uuid ";
+	$sql .= "where true ";
+	if ($_GET['show'] != "all" || !permission_exists('contact_all')) {
+		$sql .= "and (domain_uuid = :domain_uuid or domain_uuid is null) ";
+		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+	}
 	if (!permission_exists('contact_domain_view')) {
 		$sql .= "and ( "; //only contacts assigned to current user's group(s) and those not assigned to any group
 		$sql .= "	contact_uuid in ( ";
@@ -216,13 +216,15 @@
 		$parameters['user_uuid'] = $_SESSION['user_uuid'];
 	}
 	$sql .= $sql_search;
-	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 	$database = new database;
 	$num_rows = $database->select($sql, $parameters, 'column');
 
 //prepare to page the results
 	$rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50;
-	$param = "&search=".$search;
+	$param = "&search=".urlencode($search);
+	if ($_GET['show'] == "all" && permission_exists('contact_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); //bottom
@@ -230,7 +232,44 @@
 	$offset = $rows_per_page * $page;
 
 //get the list
-	$sql = str_replace('count(*)', '*, (select a.contact_attachment_uuid from v_contact_attachments as a where a.contact_uuid = c.contact_uuid and a.attachment_primary = 1) as contact_attachment_uuid', $sql);
+	$sql = "select *, ";
+	$sql .= "(select a.contact_attachment_uuid from v_contact_attachments as a where a.contact_uuid = c.contact_uuid and a.attachment_primary = 1) as contact_attachment_uuid ";
+	$sql .= "from v_contacts as c ";
+	$sql .= "where true ";
+	if ($_GET['show'] != "all" || !permission_exists('contact_all')) {
+		$sql .= "and (domain_uuid = :domain_uuid or domain_uuid is null) ";
+		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+	}
+	if (!permission_exists('contact_domain_view')) {
+		$sql .= "and ( "; //only contacts assigned to current user's group(s) and those not assigned to any group
+		$sql .= "	contact_uuid in ( ";
+		$sql .= "		select contact_uuid from v_contact_groups ";
+		$sql .= "		where ";
+		if (is_array($user_group_uuids) && @sizeof($user_group_uuids) != 0) {
+			foreach ($user_group_uuids as $index => $user_group_uuid) {
+				if (is_uuid($user_group_uuid)) {
+					$sql_where_or[] = "group_uuid = :group_uuid_".$index;
+					$parameters['group_uuid_'.$index] = $user_group_uuid;
+				}
+			}
+			if (is_array($sql_where_or) && @sizeof($sql_where_or) != 0) {
+				$sql .= " ( ".implode(' or ', $sql_where_or)." ) ";
+			}
+			unset($sql_where_or, $index, $user_group_uuid);
+		}
+		$sql .= "		and domain_uuid = :domain_uuid ";
+		$sql .= "	) ";
+		$sql .= "	or contact_uuid in ( ";
+		$sql .= "		select contact_uuid from v_contact_users ";
+		$sql .= "		where user_uuid = :user_uuid ";
+		$sql .= "		and domain_uuid = :domain_uuid ";
+		$sql .= "";
+		$sql .= "	) ";
+		$sql .= ") ";
+		$parameters['user_uuid'] = $_SESSION['user_uuid'];
+	}
+	$sql .= $sql_search;
+	$database = new database;
 	if ($order_by != '') {
 		$sql .= order_by($order_by, $order);
 		$sql .= ", contact_organization asc ";
@@ -283,12 +322,20 @@
 		echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add'],'id'=>'btn_add','collapse'=>'hide-sm-dn','link'=>'contact_edit.php']);
 	}
 	if (permission_exists('contact_delete') && $contacts) {
-		echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'name'=>'btn_delete','collapse'=>'hide-sm-dn','onclick'=>"modal_open('modal-delete','btn_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;','collapse'=>'hide-sm-dn','onclick'=>"modal_open('modal-delete','btn_delete');"]);
 	}
 	echo 		"<form id='form_search' class='inline' method='get'>\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 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'=>'contacts.php','style'=>($search == '' ? 'display: none;' : null)]);
+	if (permission_exists('contact_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=&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=''>";
+	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search','collapse'=>'hide-sm-dn']);
+	//echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','collapse'=>'hide-sm-dn','link'=>'contacts.php','style'=>($search == '' ? 'display: none;' : null)]);
 	if ($paging_controls_mini != '') {
 		echo 	"<span style='margin-left: 15px;'>".$paging_controls_mini."</span>";
 	}
@@ -312,9 +359,12 @@
 	echo "<tr class='list-header'>\n";
 	if (permission_exists('contact_delete')) {
 		echo "	<th class='checkbox'>\n";
-		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle();' ".($contacts ?: "style='visibility: hidden;'").">\n";
+		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle(); checkbox_on_change(this);' ".($contacts ?: "style='visibility: hidden;'").">\n";
 		echo "	</th>\n";
 	}
+	if ($_GET['show'] == "all" && permission_exists('contact_all')) {
+		echo th_order_by('domain_name', $text['label-domain'], $order_by, $order, $param, "class='shrink'");
+	}
 	echo th_order_by('contact_type', $text['label-contact_type'], $order_by, $order);
 	echo th_order_by('contact_organization', $text['label-contact_organization'], $order_by, $order);
 	echo "<th class='shrink hide-xs'>&nbsp;</th>\n";
@@ -336,10 +386,19 @@
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('contact_delete')) {
 				echo "	<td class='checkbox'>\n";
-				echo "		<input type='checkbox' name='contacts[$x][checked]' id='checkbox_".$x."' value='true' onclick=\"if (!this.checked) { document.getElementById('checkbox_all').checked = false; }\">\n";
+				echo "		<input type='checkbox' name='contacts[$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='contacts[$x][uuid]' value='".escape($row['contact_uuid'])."' />\n";
 				echo "	</td>\n";
 			}
+			if ($_GET['show'] == "all" && permission_exists('contact_all')) {
+				if (strlen($_SESSION['domains'][$row['domain_uuid']]['domain_name']) > 0) {
+					$domain = $_SESSION['domains'][$row['domain_uuid']]['domain_name'];
+				}
+				else {
+					$domain = $text['label-global'];
+				}
+				echo "	<td>".escape($domain)."</td>\n";
+			}
 			echo "	<td>".ucwords(escape($row['contact_type']))."&nbsp;</td>\n";
 			echo "	<td class='overflow'><a href='".$list_row_url."'>".escape($row['contact_organization'])."</a>&nbsp;</td>\n";
 			echo "	<td class='shrink no-link hide-xs center'>";
diff --git a/app/contacts/resources/functions/google_get_contacts.php b/app/contacts/resources/functions/google_get_contacts.php
index 0e2fb6c1e8..7498ced9bc 100644
--- a/app/contacts/resources/functions/google_get_contacts.php
+++ b/app/contacts/resources/functions/google_get_contacts.php
@@ -24,91 +24,93 @@
 	Mark J Crane <markjcrane@fusionpbx.com>
 */
 
-function google_get_contacts($token, $max_results = 50) {
-	//global $records;
-	global $groups;
+if (!function_exists('google_get_contacts')) {
+	function google_get_contacts($token, $max_results = 50) {
+		//global $records;
+		global $groups;
 
-	//$url = 'https://www.google.com/m8/feeds/contacts/default/full?max-results='.$max_results.'&oauth_token='.$_SESSION['contact_auth']['token']; // all contacts as xml
-	//$url = 'https://www.google.com/m8/feeds/contacts/default/full/78967d550d3fdd99?alt=json&v=3.0&oauth_token='.$_SESSION['contact_auth']['token']; // single contact
-	$url = 'https://www.google.com/m8/feeds/contacts/default/full?max-results='.$max_results.'&alt=json&v=3.0&oauth_token='.$token; // all contacts as json
-	$xml_response = curl_file_get_contents($url);
-	$records = json_decode($xml_response, true);
+		//$url = 'https://www.google.com/m8/feeds/contacts/default/full?max-results='.$max_results.'&oauth_token='.$_SESSION['contact_auth']['token']; // all contacts as xml
+		//$url = 'https://www.google.com/m8/feeds/contacts/default/full/78967d550d3fdd99?alt=json&v=3.0&oauth_token='.$_SESSION['contact_auth']['token']; // single contact
+		$url = 'https://www.google.com/m8/feeds/contacts/default/full?max-results='.$max_results.'&alt=json&v=3.0&oauth_token='.$token; // all contacts as json
+		$xml_response = curl_file_get_contents($url);
+		$records = json_decode($xml_response, true);
 
-	//check for authentication errors (logged out of google account, or app access permission revoked, etc)
-	if ($records['error']['code']) {
-		header("Location: contact_auth.php?source=google&target=".substr($_SERVER["PHP_SELF"], strrpos($_SERVER["PHP_SELF"],'/')+1));
-		exit;
+		//check for authentication errors (logged out of google account, or app access permission revoked, etc)
+		if ($records['error']['code']) {
+			header("Location: contact_auth.php?source=google&target=".substr($_SERVER["PHP_SELF"], strrpos($_SERVER["PHP_SELF"],'/')+1));
+			exit;
+		}
+
+		//create new array of contacts
+		foreach($records['feed']['entry'] as $contact['number'] => $contact) {
+			$contact_id = substr($contact['id']['$t'], strrpos($contact['id']['$t'], "/")+1);
+			$contacts[$contact_id]['etag'] = $contact['gd$etag'];
+			$contacts[$contact_id]['updated'] = $contact['updated']['$t'];
+			$contacts[$contact_id]['name_prefix'] = $contact['gd$name']['gd$namePrefix']['$t'];
+			$contacts[$contact_id]['name_given'] = $contact['gd$name']['gd$givenName']['$t'];
+			$contacts[$contact_id]['name_middle'] = $contact['gd$name']['gd$additionalName']['$t'];
+			$contacts[$contact_id]['name_family'] = $contact['gd$name']['gd$familyName']['$t'];
+			$contacts[$contact_id]['name_suffix'] = $contact['gd$name']['gd$nameSuffix']['$t'];
+			$contacts[$contact_id]['nickname'] = $contact['gContact$nickname']['$t'];
+			$contacts[$contact_id]['title'] = $contact['gd$organization'][0]['gd$orgTitle']['$t'];
+			$contacts[$contact_id]['organization'] = $contact['gd$organization'][0]['gd$orgName']['$t'];
+			foreach ($contact['gd$email'] as $contact_email['number'] => $contact_email) {
+				if ($contact_email['label']) {
+					$contact_email_label = $contact_email['label'];
+				}
+				else {
+					$contact_email_label = substr($contact_email['rel'], strpos($contact_email['rel'], "#")+1);
+					$contact_email_label = ucwords(str_replace("_", " ", $contact_email_label));
+				}
+				$contacts[$contact_id]['emails'][$contact_email['number']]['label'] = $contact_email_label;
+				$contacts[$contact_id]['emails'][$contact_email['number']]['address'] = $contact_email['address'];
+				$contacts[$contact_id]['emails'][$contact_email['number']]['primary'] = ($contact_email['primary']) ? 1 : 0;
+			}
+			foreach ($contact['gd$phoneNumber'] as $contact_phone['number'] => $contact_phone) {
+				if ($contact_phone['label']) {
+					$contact_phone_label = $contact_phone['label'];
+				}
+				else {
+					$contact_phone_label = substr($contact_phone['rel'], strpos($contact_phone['rel'], "#")+1);
+					$contact_phone_label = ucwords(str_replace("_", " ", $contact_phone_label));
+				}
+				$contacts[$contact_id]['numbers'][$contact_phone['number']]['label'] = $contact_phone_label;
+				$contacts[$contact_id]['numbers'][$contact_phone['number']]['number'] = preg_replace('{\D}', '', $contact_phone['$t']);
+			}
+			foreach ($contact['gContact$website'] as $contact_website['number'] => $contact_website) {
+				$contact_website_label = ($contact_website['label']) ? $contact_website['label'] : ucwords(str_replace("_", " ", $contact_website['rel']));
+				$contacts[$contact_id]['urls'][$contact_website['number']]['label'] = $contact_website_label;
+				$contacts[$contact_id]['urls'][$contact_website['number']]['url'] = $contact_website['href'];
+			}
+			foreach ($contact['gd$structuredPostalAddress'] as $contact_address['number'] => $contact_address) {
+				if ($contact_address['label']) {
+					$contact_address_label = $contact_address['label'];
+				}
+				else {
+					$contact_address_label = substr($contact_address['rel'], strpos($contact_address['rel'], "#")+1);
+					$contact_address_label = ucwords(str_replace("_", " ", $contact_address_label));
+				}
+				$contacts[$contact_id]['addresses'][$contact_address['number']]['label'] = $contact_address_label;
+				$contacts[$contact_id]['addresses'][$contact_address['number']]['street'] = $contact_address['gd$street']['$t'];
+				$contacts[$contact_id]['addresses'][$contact_address['number']]['extended'] = $contact_address['gd$pobox']['$t'];
+				$contacts[$contact_id]['addresses'][$contact_address['number']]['community'] = $contact_address['gd$neighborhood']['$t'];
+				$contacts[$contact_id]['addresses'][$contact_address['number']]['locality'] = $contact_address['gd$city']['$t'];
+				$contacts[$contact_id]['addresses'][$contact_address['number']]['region'] = $contact_address['gd$region']['$t'];
+				$contacts[$contact_id]['addresses'][$contact_address['number']]['postal_code'] = $contact_address['gd$postcode']['$t'];
+				$contacts[$contact_id]['addresses'][$contact_address['number']]['country'] = $contact_address['gd$country']['$t'];
+			}
+			foreach ($contact['gContact$groupMembershipInfo'] as $contact_group['number'] => $contact_group) {
+				$contact_group_id = substr($contact_group['href'], strrpos($contact_group['href'], "/")+1);
+				$contacts[$contact_id]['groups'][$contact_group_id] = $groups[$contact_group_id]['name'];
+			}
+			$contacts[$contact_id]['notes'] = $contact['content']['$t'];
+		}
+
+		//set account holder info
+		$_SESSION['contact_auth']['name'] = $records['feed']['author'][0]['name']['$t'];
+		$_SESSION['contact_auth']['email'] = $records['feed']['author'][0]['email']['$t'];
+
+		return $contacts;
 	}
-
-	//create new array of contacts
-	foreach($records['feed']['entry'] as $contact['number'] => $contact) {
-		$contact_id = substr($contact['id']['$t'], strrpos($contact['id']['$t'], "/")+1);
-		$contacts[$contact_id]['etag'] = $contact['gd$etag'];
-		$contacts[$contact_id]['updated'] = $contact['updated']['$t'];
-		$contacts[$contact_id]['name_prefix'] = $contact['gd$name']['gd$namePrefix']['$t'];
-		$contacts[$contact_id]['name_given'] = $contact['gd$name']['gd$givenName']['$t'];
-		$contacts[$contact_id]['name_middle'] = $contact['gd$name']['gd$additionalName']['$t'];
-		$contacts[$contact_id]['name_family'] = $contact['gd$name']['gd$familyName']['$t'];
-		$contacts[$contact_id]['name_suffix'] = $contact['gd$name']['gd$nameSuffix']['$t'];
-		$contacts[$contact_id]['nickname'] = $contact['gContact$nickname']['$t'];
-		$contacts[$contact_id]['title'] = $contact['gd$organization'][0]['gd$orgTitle']['$t'];
-		$contacts[$contact_id]['organization'] = $contact['gd$organization'][0]['gd$orgName']['$t'];
-		foreach ($contact['gd$email'] as $contact_email['number'] => $contact_email) {
-			if ($contact_email['label']) {
-				$contact_email_label = $contact_email['label'];
-			}
-			else {
-				$contact_email_label = substr($contact_email['rel'], strpos($contact_email['rel'], "#")+1);
-				$contact_email_label = ucwords(str_replace("_", " ", $contact_email_label));
-			}
-			$contacts[$contact_id]['emails'][$contact_email['number']]['label'] = $contact_email_label;
-			$contacts[$contact_id]['emails'][$contact_email['number']]['address'] = $contact_email['address'];
-			$contacts[$contact_id]['emails'][$contact_email['number']]['primary'] = ($contact_email['primary']) ? 1 : 0;
-		}
-		foreach ($contact['gd$phoneNumber'] as $contact_phone['number'] => $contact_phone) {
-			if ($contact_phone['label']) {
-				$contact_phone_label = $contact_phone['label'];
-			}
-			else {
-				$contact_phone_label = substr($contact_phone['rel'], strpos($contact_phone['rel'], "#")+1);
-				$contact_phone_label = ucwords(str_replace("_", " ", $contact_phone_label));
-			}
-			$contacts[$contact_id]['numbers'][$contact_phone['number']]['label'] = $contact_phone_label;
-			$contacts[$contact_id]['numbers'][$contact_phone['number']]['number'] = preg_replace('{\D}', '', $contact_phone['$t']);
-		}
-		foreach ($contact['gContact$website'] as $contact_website['number'] => $contact_website) {
-			$contact_website_label = ($contact_website['label']) ? $contact_website['label'] : ucwords(str_replace("_", " ", $contact_website['rel']));
-			$contacts[$contact_id]['urls'][$contact_website['number']]['label'] = $contact_website_label;
-			$contacts[$contact_id]['urls'][$contact_website['number']]['url'] = $contact_website['href'];
-		}
-		foreach ($contact['gd$structuredPostalAddress'] as $contact_address['number'] => $contact_address) {
-			if ($contact_address['label']) {
-				$contact_address_label = $contact_address['label'];
-			}
-			else {
-				$contact_address_label = substr($contact_address['rel'], strpos($contact_address['rel'], "#")+1);
-				$contact_address_label = ucwords(str_replace("_", " ", $contact_address_label));
-			}
-			$contacts[$contact_id]['addresses'][$contact_address['number']]['label'] = $contact_address_label;
-			$contacts[$contact_id]['addresses'][$contact_address['number']]['street'] = $contact_address['gd$street']['$t'];
-			$contacts[$contact_id]['addresses'][$contact_address['number']]['extended'] = $contact_address['gd$pobox']['$t'];
-			$contacts[$contact_id]['addresses'][$contact_address['number']]['community'] = $contact_address['gd$neighborhood']['$t'];
-			$contacts[$contact_id]['addresses'][$contact_address['number']]['locality'] = $contact_address['gd$city']['$t'];
-			$contacts[$contact_id]['addresses'][$contact_address['number']]['region'] = $contact_address['gd$region']['$t'];
-			$contacts[$contact_id]['addresses'][$contact_address['number']]['postal_code'] = $contact_address['gd$postcode']['$t'];
-			$contacts[$contact_id]['addresses'][$contact_address['number']]['country'] = $contact_address['gd$country']['$t'];
-		}
-		foreach ($contact['gContact$groupMembershipInfo'] as $contact_group['number'] => $contact_group) {
-			$contact_group_id = substr($contact_group['href'], strrpos($contact_group['href'], "/")+1);
-			$contacts[$contact_id]['groups'][$contact_group_id] = $groups[$contact_group_id]['name'];
-		}
-		$contacts[$contact_id]['notes'] = $contact['content']['$t'];
-	}
-
-	//set account holder info
-	$_SESSION['contact_auth']['name'] = $records['feed']['author'][0]['name']['$t'];
-	$_SESSION['contact_auth']['email'] = $records['feed']['author'][0]['email']['$t'];
-
-	return $contacts;
 }
-?>
\ No newline at end of file
+?>
diff --git a/app/database_transactions/app_config.php b/app/database_transactions/app_config.php
index cc22ff6bed..4bc3301d93 100644
--- a/app/database_transactions/app_config.php
+++ b/app/database_transactions/app_config.php
@@ -112,12 +112,14 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "longtext";
+		$apps[$x]['db'][$y]['fields'][$z]['search'] = 'true';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Before the transaction.";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "transaction_new";
 		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "longtext";
+		$apps[$x]['db'][$y]['fields'][$z]['search'] = 'true';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "After the transaction.";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "transaction_result";
diff --git a/app/database_transactions/app_languages.php b/app/database_transactions/app_languages.php
index 2fb88996e0..62ced40d84 100644
--- a/app/database_transactions/app_languages.php
+++ b/app/database_transactions/app_languages.php
@@ -14,7 +14,7 @@ $text['title-database_transactions']['fr-fr'] = "Transactions de base de donnée
 $text['title-database_transactions']['he-il'] = "";
 $text['title-database_transactions']['it-it'] = "";
 $text['title-database_transactions']['nl-nl'] = "Database transacties";
-$text['title-database_transactions']['pl-pl'] = "";
+$text['title-database_transactions']['pl-pl'] = "Transakcje Bazy Danych";
 $text['title-database_transactions']['pt-br'] = "";
 $text['title-database_transactions']['pt-pt'] = "";
 $text['title-database_transactions']['ro-ro'] = "";
@@ -35,7 +35,7 @@ $text['title-database_transaction']['fr-fr'] = "Transactions de base de données
 $text['title-database_transaction']['he-il'] = "";
 $text['title-database_transaction']['it-it'] = "";
 $text['title-database_transaction']['nl-nl'] = "Database transactie";
-$text['title-database_transaction']['pl-pl'] = "";
+$text['title-database_transaction']['pl-pl'] = "Transakcja Bazy Danych";
 $text['title-database_transaction']['pt-br'] = "";
 $text['title-database_transaction']['pt-pt'] = "";
 $text['title-database_transaction']['ro-ro'] = "";
@@ -56,7 +56,7 @@ $text['description-database_transactions']['fr-fr'] = "Transactions de base de d
 $text['description-database_transactions']['he-il'] = "";
 $text['description-database_transactions']['it-it'] = "";
 $text['description-database_transactions']['nl-nl'] = "Database transacties";
-$text['description-database_transactions']['pl-pl'] = "";
+$text['description-database_transactions']['pl-pl'] = "Śledź zmiany w bazie danych. Śledź, kiedy zmiany zostały wprowadzone, użytkownika i adres użytkownika, który dokonał zmian. Zapewnia opcję cofnięcia, usunięcia i aktualizacji transakcji.";
 $text['description-database_transactions']['pt-br'] = "";
 $text['description-database_transactions']['pt-pt'] = "";
 $text['description-database_transactions']['ro-ro'] = "";
@@ -77,7 +77,7 @@ $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']['pl-pl'] = "Użytkownik";
 $text['label-user']['pt-br'] = "";
 $text['label-user']['pt-pt'] = "";
 $text['label-user']['ro-ro'] = "";
@@ -98,7 +98,7 @@ $text['label-user_uuid']['fr-fr'] = "Utilisateur";
 $text['label-user_uuid']['he-il'] = "";
 $text['label-user_uuid']['it-it'] = "";
 $text['label-user_uuid']['nl-nl'] = "Gebruiker";
-$text['label-user_uuid']['pl-pl'] = "";
+$text['label-user_uuid']['pl-pl'] = "Użytkownik";
 $text['label-user_uuid']['pt-br'] = "";
 $text['label-user_uuid']['pt-pt'] = "";
 $text['label-user_uuid']['ro-ro'] = "";
@@ -119,7 +119,7 @@ $text['description-user_uuid']['fr-fr'] = "Transaction d'utilisateur";
 $text['description-user_uuid']['he-il'] = "";
 $text['description-user_uuid']['it-it'] = "";
 $text['description-user_uuid']['nl-nl'] = "Gebruiker transactie.";
-$text['description-user_uuid']['pl-pl'] = "";
+$text['description-user_uuid']['pl-pl'] = "Transakcje użytkownika";
 $text['description-user_uuid']['pt-br'] = "";
 $text['description-user_uuid']['pt-pt'] = "";
 $text['description-user_uuid']['ro-ro'] = "";
@@ -140,7 +140,7 @@ $text['label-app_name']['fr-fr'] = "Application";
 $text['label-app_name']['he-il'] = "";
 $text['label-app_name']['it-it'] = "";
 $text['label-app_name']['nl-nl'] = "Applicatie";
-$text['label-app_name']['pl-pl'] = "";
+$text['label-app_name']['pl-pl'] = "Aplikacja";
 $text['label-app_name']['pt-br'] = "";
 $text['label-app_name']['pt-pt'] = "";
 $text['label-app_name']['ro-ro'] = "";
@@ -161,7 +161,7 @@ $text['description-app_name']['fr-fr'] = "Nom de l'application";
 $text['description-app_name']['he-il'] = "";
 $text['description-app_name']['it-it'] = "";
 $text['description-app_name']['nl-nl'] = "Applicatie naam.";
-$text['description-app_name']['pl-pl'] = "";
+$text['description-app_name']['pl-pl'] = "Nazwa aplikacji";
 $text['description-app_name']['pt-br'] = "";
 $text['description-app_name']['pt-pt'] = "";
 $text['description-app_name']['ro-ro'] = "";
@@ -182,7 +182,7 @@ $text['label-app_uuid']['fr-fr'] = "ID d'application";
 $text['label-app_uuid']['he-il'] = "";
 $text['label-app_uuid']['it-it'] = "";
 $text['label-app_uuid']['nl-nl'] = "Applicatie ID.";
-$text['label-app_uuid']['pl-pl'] = "";
+$text['label-app_uuid']['pl-pl'] = "ID aplikacji";
 $text['label-app_uuid']['pt-br'] = "";
 $text['label-app_uuid']['pt-pt'] = "";
 $text['label-app_uuid']['ro-ro'] = "";
@@ -203,7 +203,7 @@ $text['description-app_uuid']['fr-fr'] = "Nom de l'application";
 $text['description-app_uuid']['he-il'] = "";
 $text['description-app_uuid']['it-it'] = "";
 $text['description-app_uuid']['nl-nl'] = "Applicatie naam.";
-$text['description-app_uuid']['pl-pl'] = "";
+$text['description-app_uuid']['pl-pl'] = "Nazwa aplikacji";
 $text['description-app_uuid']['pt-br'] = "";
 $text['description-app_uuid']['pt-pt'] = "";
 $text['description-app_uuid']['ro-ro'] = "";
@@ -224,7 +224,7 @@ $text['label-transaction_code']['fr-fr'] = "Code";
 $text['label-transaction_code']['he-il'] = "";
 $text['label-transaction_code']['it-it'] = "";
 $text['label-transaction_code']['nl-nl'] = "Code";
-$text['label-transaction_code']['pl-pl'] = "";
+$text['label-transaction_code']['pl-pl'] = "Kod";
 $text['label-transaction_code']['pt-br'] = "";
 $text['label-transaction_code']['pt-pt'] = "";
 $text['label-transaction_code']['ro-ro'] = "";
@@ -245,7 +245,7 @@ $text['description-transaction_code']['fr-fr'] = "Code de transaction";
 $text['description-transaction_code']['he-il'] = "";
 $text['description-transaction_code']['it-it'] = "";
 $text['description-transaction_code']['nl-nl'] = "Transactie code.";
-$text['description-transaction_code']['pl-pl'] = "";
+$text['description-transaction_code']['pl-pl'] = "Kod transakcji.";
 $text['description-transaction_code']['pt-br'] = "";
 $text['description-transaction_code']['pt-pt'] = "";
 $text['description-transaction_code']['ro-ro'] = "";
@@ -266,7 +266,7 @@ $text['label-transaction_address']['fr-fr'] = "adresse IP";
 $text['label-transaction_address']['he-il'] = "";
 $text['label-transaction_address']['it-it'] = "";
 $text['label-transaction_address']['nl-nl'] = "IP Adres";
-$text['label-transaction_address']['pl-pl'] = "";
+$text['label-transaction_address']['pl-pl'] = "Adres IP";
 $text['label-transaction_address']['pt-br'] = "";
 $text['label-transaction_address']['pt-pt'] = "";
 $text['label-transaction_address']['ro-ro'] = "";
@@ -287,7 +287,7 @@ $text['description-transaction_address']['fr-fr'] = "Adresse IP de l'utilisateur
 $text['description-transaction_address']['he-il'] = "";
 $text['description-transaction_address']['it-it'] = "";
 $text['description-transaction_address']['nl-nl'] = "IP Adres van de gebruiker.";
-$text['description-transaction_address']['pl-pl'] = "";
+$text['description-transaction_address']['pl-pl'] = "Adres IP użytkownika.";
 $text['description-transaction_address']['pt-br'] = "";
 $text['description-transaction_address']['pt-pt'] = "";
 $text['description-transaction_address']['ro-ro'] = "";
@@ -308,7 +308,7 @@ $text['label-transaction_type']['fr-fr'] = "Type";
 $text['label-transaction_type']['he-il'] = "";
 $text['label-transaction_type']['it-it'] = "";
 $text['label-transaction_type']['nl-nl'] = "Type";
-$text['label-transaction_type']['pl-pl'] = "";
+$text['label-transaction_type']['pl-pl'] = "Typ";
 $text['label-transaction_type']['pt-br'] = "";
 $text['label-transaction_type']['pt-pt'] = "";
 $text['label-transaction_type']['ro-ro'] = "";
@@ -329,7 +329,7 @@ $text['description-transaction_type']['fr-fr'] = "Type: ajouter, mettre à jour,
 $text['description-transaction_type']['he-il'] = "";
 $text['description-transaction_type']['it-it'] = "";
 $text['description-transaction_type']['nl-nl'] = "Type: toevoegen, bijwerken, verwijderen";
-$text['description-transaction_type']['pl-pl'] = "";
+$text['description-transaction_type']['pl-pl'] = "Typ: dodaj, zaktualizuj, usuń";
 $text['description-transaction_type']['pt-br'] = "";
 $text['description-transaction_type']['pt-pt'] = "";
 $text['description-transaction_type']['ro-ro'] = "";
@@ -350,7 +350,7 @@ $text['label-transaction_date']['fr-fr'] = "Date";
 $text['label-transaction_date']['he-il'] = "";
 $text['label-transaction_date']['it-it'] = "";
 $text['label-transaction_date']['nl-nl'] = "Datum";
-$text['label-transaction_date']['pl-pl'] = "";
+$text['label-transaction_date']['pl-pl'] = "Data";
 $text['label-transaction_date']['pt-br'] = "";
 $text['label-transaction_date']['pt-pt'] = "";
 $text['label-transaction_date']['ro-ro'] = "";
@@ -371,7 +371,7 @@ $text['description-transaction_date']['fr-fr'] = "Date de la transaction.";
 $text['description-transaction_date']['he-il'] = "";
 $text['description-transaction_date']['it-it'] = "";
 $text['description-transaction_date']['nl-nl'] = "Transactie datum.";
-$text['description-transaction_date']['pl-pl'] = "";
+$text['description-transaction_date']['pl-pl'] = "Data transakcji.";
 $text['description-transaction_date']['pt-br'] = "";
 $text['description-transaction_date']['pt-pt'] = "";
 $text['description-transaction_date']['ro-ro'] = "";
@@ -392,7 +392,7 @@ $text['label-transaction_old']['fr-fr'] = "Avant";
 $text['label-transaction_old']['he-il'] = "";
 $text['label-transaction_old']['it-it'] = "";
 $text['label-transaction_old']['nl-nl'] = "Voor";
-$text['label-transaction_old']['pl-pl'] = "";
+$text['label-transaction_old']['pl-pl'] = "Przed";
 $text['label-transaction_old']['pt-br'] = "";
 $text['label-transaction_old']['pt-pt'] = "";
 $text['label-transaction_old']['ro-ro'] = "";
@@ -413,7 +413,7 @@ $text['description-transaction_old']['fr-fr'] = "Tableau avant la transaction";
 $text['description-transaction_old']['he-il'] = "";
 $text['description-transaction_old']['it-it'] = "";
 $text['description-transaction_old']['nl-nl'] = "Tabel voor de transactie.";
-$text['description-transaction_old']['pl-pl'] = "";
+$text['description-transaction_old']['pl-pl'] = "Tablica przed transakcją.";
 $text['description-transaction_old']['pt-br'] = "";
 $text['description-transaction_old']['pt-pt'] = "";
 $text['description-transaction_old']['ro-ro'] = "";
@@ -434,7 +434,7 @@ $text['label-transaction_new']['fr-fr'] = "Après";
 $text['label-transaction_new']['he-il'] = "";
 $text['label-transaction_new']['it-it'] = "";
 $text['label-transaction_new']['nl-nl'] = "Na";
-$text['label-transaction_new']['pl-pl'] = "";
+$text['label-transaction_new']['pl-pl'] = "Po";
 $text['label-transaction_new']['pt-br'] = "";
 $text['label-transaction_new']['pt-pt'] = "";
 $text['label-transaction_new']['ro-ro'] = "";
@@ -455,7 +455,7 @@ $text['description-transaction_new']['fr-fr'] = "Tableau après la transaction";
 $text['description-transaction_new']['he-il'] = "";
 $text['description-transaction_new']['it-it'] = "";
 $text['description-transaction_new']['nl-nl'] = "Tabel na de transactie.";
-$text['description-transaction_new']['pl-pl'] = "";
+$text['description-transaction_new']['pl-pl'] = "Tablica po transakcji.";
 $text['description-transaction_new']['pt-br'] = "";
 $text['description-transaction_new']['pt-pt'] = "";
 $text['description-transaction_new']['ro-ro'] = "";
@@ -476,7 +476,7 @@ $text['label-transaction_result']['fr-fr'] = "Résultat";
 $text['label-transaction_result']['he-il'] = "";
 $text['label-transaction_result']['it-it'] = "";
 $text['label-transaction_result']['nl-nl'] = "Resultaat";
-$text['label-transaction_result']['pl-pl'] = "";
+$text['label-transaction_result']['pl-pl'] = "Rezultat";
 $text['label-transaction_result']['pt-br'] = "";
 $text['label-transaction_result']['pt-pt'] = "";
 $text['label-transaction_result']['ro-ro'] = "";
@@ -497,7 +497,7 @@ $text['description-transaction_result']['fr-fr'] = "Résultat de la transaction"
 $text['description-transaction_result']['he-il'] = "";
 $text['description-transaction_result']['it-it'] = "";
 $text['description-transaction_result']['nl-nl'] = "Resultaat van de transactie.";
-$text['description-transaction_result']['pl-pl'] = "";
+$text['description-transaction_result']['pl-pl'] = "Rezultat transakcji.";
 $text['description-transaction_result']['pt-br'] = "";
 $text['description-transaction_result']['pt-pt'] = "";
 $text['description-transaction_result']['ro-ro'] = "";
@@ -518,7 +518,7 @@ $text['label-true']['fr-fr'] = "Vrai";
 $text['label-true']['he-il'] = "";
 $text['label-true']['it-it'] = "";
 $text['label-true']['nl-nl'] = "waar";
-$text['label-true']['pl-pl'] = "";
+$text['label-true']['pl-pl'] = "Tak";
 $text['label-true']['pt-br'] = "";
 $text['label-true']['pt-pt'] = "";
 $text['label-true']['ro-ro'] = "";
@@ -539,7 +539,7 @@ $text['label-false']['fr-fr'] = "Faux";
 $text['label-false']['he-il'] = "";
 $text['label-false']['it-it'] = "";
 $text['label-false']['nl-nl'] = "onwaar";
-$text['label-false']['pl-pl'] = "";
+$text['label-false']['pl-pl'] = "Nie";
 $text['label-false']['pt-br'] = "falso"; //copied from pt-pt
 $text['label-false']['pt-pt'] = "falso";
 $text['label-false']['ro-ro'] = "";
@@ -560,7 +560,7 @@ $text['button-add']['fr-fr'] = "Ajouter";
 $text['button-add']['he-il'] = "";
 $text['button-add']['it-it'] = "";
 $text['button-add']['nl-nl'] = "Toevoegen";
-$text['button-add']['pl-pl'] = "";
+$text['button-add']['pl-pl'] = "Dodaj";
 $text['button-add']['pt-br'] = "";
 $text['button-add']['pt-pt'] = "";
 $text['button-add']['ro-ro'] = "";
@@ -581,7 +581,7 @@ $text['button-edit']['fr-fr'] = "Modifier";
 $text['button-edit']['he-il'] = "";
 $text['button-edit']['it-it'] = "";
 $text['button-edit']['nl-nl'] = "Bewerken";
-$text['button-edit']['pl-pl'] = "";
+$text['button-edit']['pl-pl'] = "Edytuj";
 $text['button-edit']['pt-br'] = "";
 $text['button-edit']['pt-pt'] = "";
 $text['button-edit']['ro-ro'] = "";
@@ -602,7 +602,7 @@ $text['button-delete']['fr-fr'] = "Supprimer";
 $text['button-delete']['he-il'] = "";
 $text['button-delete']['it-it'] = "";
 $text['button-delete']['nl-nl'] = "Verwijderen";
-$text['button-delete']['pl-pl'] = "";
+$text['button-delete']['pl-pl'] = "Usuń";
 $text['button-delete']['pt-br'] = "";
 $text['button-delete']['pt-pt'] = "";
 $text['button-delete']['ro-ro'] = "";
@@ -623,7 +623,7 @@ $text['button-save']['fr-fr'] = "Enregistrer";
 $text['button-save']['he-il'] = "";
 $text['button-save']['it-it'] = "";
 $text['button-save']['nl-nl'] = "Opslaan";
-$text['button-save']['pl-pl'] = "";
+$text['button-save']['pl-pl'] = "Zapisz";
 $text['button-save']['pt-br'] = "Guardar"; //copied from pt-pt
 $text['button-save']['pt-pt'] = "Guardar";
 $text['button-save']['ro-ro'] = "";
@@ -644,7 +644,7 @@ $text['button-view']['fr-fr'] = "Vue";
 $text['button-view']['he-il'] = "";
 $text['button-view']['it-it'] = "";
 $text['button-view']['nl-nl'] = "Tonen";
-$text['button-view']['pl-pl'] = "";
+$text['button-view']['pl-pl'] = "Podgląd";
 $text['button-view']['pt-br'] = "";
 $text['button-view']['pt-pt'] = "";
 $text['button-view']['ro-ro'] = "";
@@ -665,7 +665,7 @@ $text['button-back']['fr-fr'] = "Retour";
 $text['button-back']['he-il'] = "";
 $text['button-back']['it-it'] = "";
 $text['button-back']['nl-nl'] = "Terug";
-$text['button-back']['pl-pl'] = "";
+$text['button-back']['pl-pl'] = "Cofnij";
 $text['button-back']['pt-br'] = "Voltar"; //copied from pt-pt
 $text['button-back']['pt-pt'] = "Voltar";
 $text['button-back']['ro-ro'] = "";
@@ -686,7 +686,7 @@ $text['confirm-delete']['fr-fr'] = "Voulez-vous vraiment supprimer ca";
 $text['confirm-delete']['he-il'] = "";
 $text['confirm-delete']['it-it'] = "";
 $text['confirm-delete']['nl-nl'] = "Wil je dit werkelijk uitvoeren?";
-$text['confirm-delete']['pl-pl'] = "";
+$text['confirm-delete']['pl-pl'] = "Czy napewno chcesz to usunąć?";
 $text['confirm-delete']['pt-br'] = "";
 $text['confirm-delete']['pt-pt'] = "";
 $text['confirm-delete']['ro-ro'] = "";
@@ -707,7 +707,7 @@ $text['message-add']['fr-fr'] = "Ajouter terminé";
 $text['message-add']['he-il'] = "";
 $text['message-add']['it-it'] = "";
 $text['message-add']['nl-nl'] = "Toevoegen gereed";
-$text['message-add']['pl-pl'] = "";
+$text['message-add']['pl-pl'] = "Dodano pomyślnie";
 $text['message-add']['pt-br'] = "";
 $text['message-add']['pt-pt'] = "";
 $text['message-add']['ro-ro'] = "";
@@ -728,7 +728,7 @@ $text['message-update']['fr-fr'] = "Mise à jour terminée";
 $text['message-update']['he-il'] = "";
 $text['message-update']['it-it'] = "";
 $text['message-update']['nl-nl'] = "Bijwerken gereed";
-$text['message-update']['pl-pl'] = "";
+$text['message-update']['pl-pl'] = "Zaktualizowano pomyślnie";
 $text['message-update']['pt-br'] = "";
 $text['message-update']['pt-pt'] = "";
 $text['message-update']['ro-ro'] = "";
@@ -749,7 +749,7 @@ $text['message-delete']['fr-fr'] = "Supprimer terminé";
 $text['message-delete']['he-il'] = "";
 $text['message-delete']['it-it'] = "";
 $text['message-delete']['nl-nl'] = "Verwijderen gereed";
-$text['message-delete']['pl-pl'] = "";
+$text['message-delete']['pl-pl'] = "Usunięto pomyślnie";
 $text['message-delete']['pt-br'] = "";
 $text['message-delete']['pt-pt'] = "";
 $text['message-delete']['ro-ro'] = "";
@@ -770,7 +770,7 @@ $text['message-required']['fr-fr'] = "Veuillez fournir";
 $text['message-required']['he-il'] = "";
 $text['message-required']['it-it'] = "";
 $text['message-required']['nl-nl'] = "Aub. geef: ";
-$text['message-required']['pl-pl'] = "";
+$text['message-required']['pl-pl'] = "Proszę podać: ";
 $text['message-required']['pt-br'] = "";
 $text['message-required']['pt-pt'] = "";
 $text['message-required']['ro-ro'] = "";
diff --git a/app/database_transactions/database_transactions.php b/app/database_transactions/database_transactions.php
index 4cbdb8932a..a7086169ec 100644
--- a/app/database_transactions/database_transactions.php
+++ b/app/database_transactions/database_transactions.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) 2016 - 2019
+	Portions created by the Initial Developer are Copyright (C) 2016 - 2021
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -57,6 +57,8 @@
 		$sql_search .= "	or lower(t.transaction_address) like :search ";
 		$sql_search .= "	or lower(t.transaction_type) like :search ";
 		$sql_search .= "	or cast(t.transaction_date as text) like :search ";
+		$sql_search .= "	or lower(t.transaction_old) like :search ";
+		$sql_search .= "	or lower(t.transaction_new) like :search ";
 		$sql_search .= "	or lower(u.username) like :search ";
 		$sql_search .= ") ";
 		$parameters['search'] = '%'.$search.'%';
@@ -126,9 +128,9 @@
 		}
 		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','onclick'=>"document.getElementById('search').value = ''; document.getElementById('form_search').submit();",'style'=>(!$search ? 'display: none;' : null)]);
+	echo 		"<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown=''>";
+	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search']);
+	//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 4df7bf6a1e..04f7af5d54 100644
--- a/app/destinations/app_config.php
+++ b/app/destinations/app_config.php
@@ -102,9 +102,6 @@
 		$apps[$x]['permissions'][$y]['name'] = "destination_all";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = "destination_record";
-		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
-		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "destination_trunk_prefix";
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "destination_area_code";
@@ -123,6 +120,16 @@
 		$apps[$x]['permissions'][$y]['name'] = "destination_context";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "destination_record";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "destination_hold_music";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "destination_distinctive_ring";
+		$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";
@@ -236,6 +243,14 @@
 		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = "v_users";
 		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = "user_uuid";
 		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "group_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_groups";
+		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = "group_uuid";
+		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "destination_type";
 		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "destination_name";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
@@ -295,6 +310,10 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Select whether to set music on hold.";
 		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "destination_distinctive_ring";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Select whether to set distinctive ring.";
+		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "destination_accountcode";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['search'] = 'true';
diff --git a/app/destinations/app_languages.php b/app/destinations/app_languages.php
index 1c291ea33f..93c112a676 100644
--- a/app/destinations/app_languages.php
+++ b/app/destinations/app_languages.php
@@ -603,7 +603,7 @@ $text['label-destination_enabled']['fr-fr'] = "Actif";
 $text['label-destination_enabled']['he-il'] = "מופעל";
 $text['label-destination_enabled']['it-it'] = "Abilitato";
 $text['label-destination_enabled']['nl-nl'] = "Aktief";
-$text['label-destination_enabled']['pl-pl'] = "Włączona";
+$text['label-destination_enabled']['pl-pl'] = "Włączony";
 $text['label-destination_enabled']['pt-br'] = "Ativado";
 $text['label-destination_enabled']['pt-pt'] = "Activado";
 $text['label-destination_enabled']['ro-ro'] = "";
@@ -758,6 +758,27 @@ $text['label-destination_hold_music']['ru-ru'] = "Музыка на Удержа
 $text['label-destination_hold_music']['sv-se'] = "Vänt-musik";
 $text['label-destination_hold_music']['uk-ua'] = "";
 
+$text['label-destination_distinctive_ring']['en-us'] = "Distinctive Ring";
+$text['label-destination_distinctive_ring']['en-gb'] = "Distinctive Ring";
+$text['label-destination_distinctive_ring']['ar-eg'] = "";
+$text['label-destination_distinctive_ring']['de-at'] = "Individueller Rufton"; //copied from de-de
+$text['label-destination_distinctive_ring']['de-ch'] = "Individueller Rufton"; //copied from de-de
+$text['label-destination_distinctive_ring']['de-de'] = "Individueller Rufton";
+$text['label-destination_distinctive_ring']['es-cl'] = "";
+$text['label-destination_distinctive_ring']['es-mx'] = "";
+$text['label-destination_distinctive_ring']['fr-ca'] = "Sonnerie Distinctive"; //copied from fr-fr
+$text['label-destination_distinctive_ring']['fr-fr'] = "Sonnerie Distinctive";
+$text['label-destination_distinctive_ring']['he-il'] = "";
+$text['label-destination_distinctive_ring']['it-it'] = "Squillo Personalizzato";
+$text['label-destination_distinctive_ring']['nl-nl'] = "Alternatieve beltoon";
+$text['label-destination_distinctive_ring']['pl-pl'] = "Charakterystyczny Sygnał";
+$text['label-destination_distinctive_ring']['pt-br'] = "";
+$text['label-destination_distinctive_ring']['pt-pt'] = "";
+$text['label-destination_distinctive_ring']['ro-ro'] = "";
+$text['label-destination_distinctive_ring']['ru-ru'] = "Отличительный вызов";
+$text['label-destination_distinctive_ring']['sv-se'] = "Distinkt Ringning";
+$text['label-destination_distinctive_ring']['uk-ua'] = "";
+
 $text['label-destination_record']['en-us'] = "Record";
 $text['label-destination_record']['en-gb'] = "Record";
 $text['label-destination_record']['ar-eg'] = "";
@@ -813,7 +834,7 @@ $text['label-detail_action']['fr-fr'] = "Actions";
 $text['label-detail_action']['he-il'] = "פעולות";
 $text['label-detail_action']['it-it'] = "Azioni";
 $text['label-detail_action']['nl-nl'] = "Akties";
-$text['label-detail_action']['pl-pl'] = "Operacje (gdzie przesłać rozmowę).";
+$text['label-detail_action']['pl-pl'] = "Akcje";
 $text['label-detail_action']['pt-br'] = "Ações"; //copied from pt-pt
 $text['label-detail_action']['pt-pt'] = "Ações";
 $text['label-detail_action']['ro-ro'] = "";
@@ -1496,6 +1517,27 @@ $text['description-destination_hold_music']['ru-ru'] = "Выберите мел
 $text['description-destination_hold_music']['sv-se'] = "Välj MOH Kategori här.";
 $text['description-destination_hold_music']['uk-ua'] = "";
 
+$text['description-destination_distinctive_ring']['en-us'] = "Select a sound for a distinctive ring.";
+$text['description-destination_distinctive_ring']['en-gb'] = "Select a sound for a distinctive ring.";
+$text['description-destination_distinctive_ring']['ar-eg'] = "";
+$text['description-destination_distinctive_ring']['de-at'] = "Wählen Sie einen Ton für den individuellen Rufton."; //copied from de-de
+$text['description-destination_distinctive_ring']['de-ch'] = "Wählen Sie einen Ton für den individuellen Rufton."; //copied from de-de
+$text['description-destination_distinctive_ring']['de-de'] = "Wählen Sie einen Ton für den individuellen Rufton.";
+$text['description-destination_distinctive_ring']['es-cl'] = "";
+$text['description-destination_distinctive_ring']['es-mx'] = "";
+$text['description-destination_distinctive_ring']['fr-ca'] = "Sélectionner un son pour une sonnerie distinctive"; //copied from fr-fr
+$text['description-destination_distinctive_ring']['fr-fr'] = "Sélectionner un son pour une sonnerie distinctive";
+$text['description-destination_distinctive_ring']['he-il'] = "";
+$text['description-destination_distinctive_ring']['it-it'] = "Selezionare il tono per uno squillo personalizzato.";
+$text['description-destination_distinctive_ring']['nl-nl'] = "Kies een geluid voor een afwijkende beltoon.";
+$text['description-destination_distinctive_ring']['pl-pl'] = "Wybierz dźwięk dla funkcji charakterystycznego sygnału";
+$text['description-destination_distinctive_ring']['pt-br'] = "";
+$text['description-destination_distinctive_ring']['pt-pt'] = "";
+$text['description-destination_distinctive_ring']['ro-ro'] = "";
+$text['description-destination_distinctive_ring']['ru-ru'] = "Выберите параметры звука для отличительного вызова";
+$text['description-destination_distinctive_ring']['sv-se'] = "Välj ett ljud för den distinkta ringningen.";
+$text['description-destination_distinctive_ring']['uk-ua'] = "";
+
 $text['description-destination_record']['en-us'] = "Save the recording.";
 $text['description-destination_record']['en-gb'] = "Save the recording.";
 $text['description-destination_record']['ar-eg'] = "";
diff --git a/app/destinations/app_menu.php b/app/destinations/app_menu.php
index e8d448ac2e..d3abc6df06 100644
--- a/app/destinations/app_menu.php
+++ b/app/destinations/app_menu.php
@@ -9,7 +9,7 @@
 	$apps[$x]['menu'][$y]['title']['de-de'] = "Ziele";
 	$apps[$x]['menu'][$y]['title']['es-cl'] = "Destinos";
 	$apps[$x]['menu'][$y]['title']['es-mx'] = "Destinos";
-	$apps[$x]['menu'][$y]['title']['fr-ca'] = "Cibler";
+	$apps[$x]['menu'][$y]['title']['fr-ca'] = "Destinations";
 	$apps[$x]['menu'][$y]['title']['fr-fr'] = "Destinations";
 	$apps[$x]['menu'][$y]['title']['he-il'] = "יעד";
 	$apps[$x]['menu'][$y]['title']['it-it'] = "Destinazioni";
diff --git a/app/destinations/destination_edit.php b/app/destinations/destination_edit.php
index 325bd408f3..f3d7f0e5ce 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-2021
+	Portions created by the Initial Developer are Copyright (C) 2008-2022
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -102,6 +102,7 @@
 			$fax_uuid = $_POST["fax_uuid"];
 			$provider_uuid = $_POST["provider_uuid"];
 			$user_uuid = $_POST["user_uuid"];
+			$group_uuid = $_POST["group_uuid"];
 			$destination_order= $_POST["destination_order"];
 			$destination_enabled = $_POST["destination_enabled"];
 			$destination_description = $_POST["destination_description"];
@@ -110,6 +111,7 @@
 			$destination_buy = check_float($_POST["destination_buy"]);
 			$currency_buy = $_POST["currency_buy"];
 			$destination_hold_music = $_POST["destination_hold_music"];
+			$destination_distinctive_ring = $_POST["destination_distinctive_ring"];
 			$destination_record = $_POST["destination_record"];
 			$destination_accountcode = $_POST["destination_accountcode"];
 			$destination_type_voice = $_POST["destination_type_voice"];
@@ -374,7 +376,7 @@
 							}
 
 						//build the xml dialplan
-							$dialplan["dialplan_xml"] = "<extension name=\"".$dialplan_name."\" continue=\"false\" uuid=\"".$dialplan_uuid."\">\n";
+							$dialplan["dialplan_xml"] = "<extension name=\"".$dialplan["dialplan_name"]."\" continue=\"false\" uuid=\"".$dialplan_uuid."\">\n";
 							$dialplan["dialplan_xml"] .= "	<condition field=\"".$dialplan_detail_type."\" expression=\"".$destination_number_regex."\">\n";
 							$dialplan["dialplan_xml"] .= "		<action application=\"export\" data=\"call_direction=inbound\" inline=\"true\"/>\n";
 							$dialplan["dialplan_xml"] .= "		<action application=\"set\" data=\"domain_uuid=".$_SESSION['domain_uuid']."\" inline=\"true\"/>\n";
@@ -400,6 +402,9 @@
 							if (strlen($destination_hold_music) > 0) {
 								$dialplan["dialplan_xml"] .= "		<action application=\"export\" data=\"hold_music=".$destination_hold_music."\" inline=\"true\"/>\n";
 							}
+							if (strlen($destination_distinctive_ring) > 0) {
+								$dialplan["dialplan_xml"] .= "		<action application=\"export\" data=\"sip_h_Alert-Info=".$destination_distinctive_ring."\" inline=\"true\"/>\n";
+							}
 							if (strlen($destination_accountcode) > 0) {
 								$dialplan["dialplan_xml"] .= "		<action application=\"export\" data=\"accountcode=".$destination_accountcode."\" inline=\"true\"/>\n";
 							}
@@ -526,6 +531,17 @@
 										$y++;
 									}
 
+								//set the distinctive ring
+									if (strlen($destination_distinctive_ring) > 0) {
+										$dialplan["dialplan_details"][$y]["domain_uuid"] = $domain_uuid;
+										$dialplan["dialplan_details"][$y]["dialplan_detail_tag"] = "action";
+										$dialplan["dialplan_details"][$y]["dialplan_detail_type"] = "export";
+										$dialplan["dialplan_details"][$y]["dialplan_detail_data"] = "sip_h_Alert-Info=".$destination_distinctive_ring;
+										$dialplan["dialplan_details"][$y]["dialplan_detail_inline"] = "true";
+										$dialplan["dialplan_details"][$y]["dialplan_detail_order"] = $dialplan_detail_order;
+										$y++;
+									}
+							
 								//add fax detection
 									if (is_uuid($fax_uuid)) {
 
@@ -712,6 +728,9 @@
 							if (permission_exists('user_edit')) {
 								$array['destinations'][$x]["user_uuid"] = $user_uuid;
 							}
+							if (permission_exists('group_edit')) {
+								$array['destinations'][$x]["group_uuid"] = $group_uuid;
+							}
 							$array['destinations'][$x]["destination_type"] = $destination_type;
 							if (permission_exists('destination_condition_field')) {
 								$array['destinations'][$x]["destination_condition_field"] = $destination_condition_field;
@@ -731,7 +750,12 @@
 							$array['destinations'][$x]["destination_caller_id_number"] = $destination_caller_id_number;
 							$array['destinations'][$x]["destination_cid_name_prefix"] = $destination_cid_name_prefix;
 							$array['destinations'][$x]["destination_context"] = $destination_context;
-							$array['destinations'][$x]["destination_hold_music"] = $destination_hold_music;
+							if (permission_exists("destination_hold_music")) {
+								$array['destinations'][$x]["destination_hold_music"] = $destination_hold_music;
+							}
+							if (permission_exists("destination_distinctive_ring")) {
+								$array['destinations'][$x]["destination_distinctive_ring"] = $destination_distinctive_ring;
+							}
 							$array['destinations'][$x]["destination_record"] = $destination_record;
 							$array['destinations'][$x]["destination_accountcode"] = $destination_accountcode;
 							$array['destinations'][$x]["destination_type_voice"] = $destination_type_voice ? 1 : null;
@@ -882,6 +906,7 @@
 				$destination_caller_id_number = $row["destination_caller_id_number"];
 				$destination_cid_name_prefix = $row["destination_cid_name_prefix"];
 				$destination_hold_music = $row["destination_hold_music"];
+				$destination_distinctive_ring = $row["destination_distinctive_ring"];
 				$destination_record = $row["destination_record"];
 				$destination_accountcode = $row["destination_accountcode"];
 				$destination_type_voice = $row["destination_type_voice"];
@@ -896,6 +921,7 @@
 				$fax_uuid = $row["fax_uuid"];
 				$provider_uuid = $row["provider_uuid"];
 				$user_uuid = $row["user_uuid"];
+				$group_uuid = $row["group_uuid"];
 				$currency = $row["currency"];
 				$destination_sell = $row["destination_sell"];
 				$destination_buy = $row["destination_buy"];
@@ -998,6 +1024,17 @@
 		unset($sql, $parameters);
 	}
 
+//get the groups list
+	if (permission_exists('group_edit')) {
+		$sql = "select group_uuid, domain_uuid, group_name, group_description from v_groups ";
+		$sql .= "where (domain_uuid is null or domain_uuid = :domain_uuid) ";
+		$sql .= "order by group_name asc ";
+		$parameters['domain_uuid'] = $domain_uuid;
+		$database = new database;
+		$groups = $database->select($sql, $parameters, 'all');
+		unset($sql, $parameters);
+	}
+
 //create token
 	$object = new token;
 	$token = $object->create($_SERVER['PHP_SELF']);
@@ -1306,6 +1343,28 @@
 		unset($users);
 		echo "			<br>\n";
 		echo "			".$text['description-user']."\n";
+		echo "</td>\n";
+		echo "</tr>\n";
+	}
+
+	if (permission_exists('group_edit')) {
+		echo "<tr id='tr_group'>\n";
+		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+		echo "	".$text['label-group']."\n";
+		echo "</td>\n";
+		echo "<td class='vtable' align='left'>\n";
+		echo "	<select name=\"group_uuid\" class='formfld' style='width: auto;'>\n";
+		echo "		<option value=\"\"></option>\n";
+		foreach($groups as $field) {
+			if ($field['group_uuid'] == $group_uuid) { $selected = "selected='selected'"; } else { $selected = ''; }
+			echo "		<option value='".escape($field['group_uuid'])."' $selected>".escape($field['group_name'])."</option>\n";
+		}
+		echo "		</select>";
+		unset($groups);
+		echo "		<br>\n";
+		echo "		".$text['description-group']."\n";
+		echo "</td>\n";
+		echo "</tr>\n";
 	}
 
 	echo "<tr id='tr_cid_name_prefix'>\n";
@@ -1343,7 +1402,7 @@
 		echo "</tr>\n";
 	}
 
-	if (is_dir($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/app/music_on_hold')) {
+	if (permission_exists("destination_hold_music") && is_dir($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/app/music_on_hold')) {
 		echo "<tr id='tr_hold_music'>\n";
 		echo "<td width=\"30%\" class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
 		echo "	".$text['label-destination_hold_music']."\n";
@@ -1358,6 +1417,19 @@
 		echo "</tr>\n";
 	}
 
+	if (permission_exists("destination_distinctive_ring")) {
+		echo "<tr>\n";
+		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+		echo "	".$text['label-destination_distinctive_ring']."\n";
+		echo "</td>\n";
+		echo "<td class='vtable' align='left'>\n";
+		echo "  <input class='formfld' type='text' name='destination_distinctive_ring' maxlength='255' value='".escape($destination_distinctive_ring)."'>\n";
+		echo "<br />\n";
+		echo $text['description-destination_distinctive_ring']." \n";
+		echo "</td>\n";
+		echo "</tr>\n";
+	}
+
 	if (permission_exists("destination_accountcode")) {
 		echo "<tr id='tr_account_code'>\n";
 		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
diff --git a/app/destinations/destinations.php b/app/destinations/destinations.php
index f5ec6458d4..987f735c52 100644
--- a/app/destinations/destinations.php
+++ b/app/destinations/destinations.php
@@ -205,7 +205,7 @@
 		echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add'],'id'=>'btn_add','style'=>'margin-left: 15px;','link'=>'destination_edit.php']);
 	}
 	if (permission_exists('destination_delete') && $destinations) {
-		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 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('destination_all')) {
@@ -217,9 +217,9 @@
 		}
 	}
 	echo "		<input type='hidden' name='type' value=\"".escape($destination_type)."\">\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 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'=>'destinations.php','style'=>($search == '' ? 'display: none;' : null)]);
+	echo "		<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown=''>";
+	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search']);
+	//echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'destinations.php','style'=>($search == '' ? 'display: none;' : null)]);
 	if ($paging_controls_mini != '') {
 		echo 	"<span style='margin-left: 15px;'>".$paging_controls_mini."</span>";
 	}
@@ -244,7 +244,7 @@
 	echo "<tr class='list-header'>\n";
 	if (permission_exists('destination_delete')) {
 		echo "	<th class='checkbox'>\n";
-		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle();' ".($destinations ?: "style='visibility: hidden;'").">\n";
+		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle(); checkbox_on_change(this);' ".($destinations ?: "style='visibility: hidden;'").">\n";
 		echo "	</th>\n";
 	}
 	if ($_GET['show'] == "all" && permission_exists('destination_all')) {
@@ -285,7 +285,7 @@
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('destination_delete')) {
 				echo "	<td class='checkbox'>\n";
-				echo "		<input type='checkbox' name='destinations[$x][checked]' id='checkbox_".$x."' value='true' onclick=\"if (!this.checked) { document.getElementById('checkbox_all').checked = false; }\">\n";
+				echo "		<input type='checkbox' name='destinations[$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='destinations[$x][uuid]' value='".escape($row['destination_uuid'])."' />\n";
 				echo "	</td>\n";
 			}
diff --git a/app/destinations/resources/classes/destinations.php b/app/destinations/resources/classes/destinations.php
index 38db669146..f81447d749 100644
--- a/app/destinations/resources/classes/destinations.php
+++ b/app/destinations/resources/classes/destinations.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) 2017 - 2020
+	Portions created by the Initial Developer are Copyright (C) 2017 - 2022
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -90,6 +90,11 @@ if (!class_exists('destinations')) {
 					$destination_regex .= "^".$array['destination_area_code'].$array['destination_number']."\$|";
 					$destination_regex .= "^".$array['destination_number']."\$)";
 				}
+				elseif (isset($array['destination_prefix']) && isset($array['destination_trunk_prefix']) && isset($array['destination_number'])) {
+					$destination_regex = "(\+?".$array['destination_prefix'].$array['destination_number']."\$|";
+					$destination_regex .= "^".$array['destination_trunk_prefix'].$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']."\$|";
@@ -109,12 +114,13 @@ if (!class_exists('destinations')) {
 
 					//add prefix
 						if (strlen($destination_prefix) > 0) {
-							if (strlen($destination_prefix) > 0 && strlen($destination_prefix) < 4) {
-								$plus = (substr($destination_prefix, 0, 1) == "+") ? '' : '\+?';
+							$destination_prefix = str_replace("+", "", $destination_prefix);
+							$plus = '\+?';
+							if (strlen($destination_prefix) == 1) {
 								$destination_prefix = $plus.$destination_prefix.'?';
 							}
 							else {
-								$destination_prefix = '(?:'.$destination_prefix.')?';
+								$destination_prefix = $plus.'(?:'.$destination_prefix.')?';
 							}
 						}
 
@@ -953,7 +959,6 @@ if (!class_exists('destinations')) {
 						$i++;
 					}
 
-					$i = 0;
 					unset($text);
 				}
 			}
@@ -985,7 +990,15 @@ if (!class_exists('destinations')) {
 		* valid destination
 		*/
 		public function valid($destination, $type = 'dialplan') {
+			//allow an empty destination
+			if ($destination == ':') {
+				return true;
+			}
+
+			//get all of the $destinations
 			$destinations = $this->all($type);
+
+			//loop through destinations to validate them
 			foreach($destinations as $category => $array) {
 				if (is_array($array)) {
 					foreach ($array as $key => $value) {
diff --git a/app/devices/app_config.php b/app/devices/app_config.php
index f4eca6aa62..01aca9b27a 100644
--- a/app/devices/app_config.php
+++ b/app/devices/app_config.php
@@ -134,6 +134,7 @@
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "device_key_line";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "device_key_extension";
 		//$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
@@ -206,6 +207,10 @@
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "device_location";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
+		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "device_model";
 		//$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
@@ -264,19 +269,19 @@
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'device_profile_view';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'device_profile_add';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'device_profile_edit';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'device_profile_delete';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'device_profile_all';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
@@ -286,38 +291,38 @@
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'device_profile_key_view';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'device_profile_key_add';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'device_profile_key_edit';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'device_profile_key_delete';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'device_profile_key_all';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'device_profile_setting_view';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'device_profile_setting_add';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'device_profile_setting_edit';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'device_profile_setting_delete';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
-		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = 'device_profile_setting_all';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
@@ -325,6 +330,8 @@
 		$apps[$x]['permissions'][$y]['name'] = 'device_export';
 		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
 		$y++;
+		$apps[$x]['permissions'][$y]['name'] = 'device_key_icon';
+		$y++;
 
 	//default settings
 		$y = 0;
@@ -398,6 +405,11 @@
 		$apps[$x]['db'][$y]['fields'][$z]['search'] = 'true';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "device_location";
+		$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'] = "";
+		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "device_model";
 		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "phone_model";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
@@ -536,6 +548,10 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the outbound proxy.";
 		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "label";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the label.";
+		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "display_name";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the display name.";
@@ -633,7 +649,7 @@
 		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = "v_device_profiles";
 		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = "device_profile_uuid";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
-
+		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = "true";
 		$y++;
 		$apps[$x]['db'][$y]['table']['name'] = "v_device_keys";
 		$apps[$x]['db'][$y]['table']['parent'] = "v_devices";
@@ -668,6 +684,7 @@
 		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = "v_device_profiles";
 		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = "device_profile_uuid";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
+		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = "true";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "device_key_id";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "numeric";
diff --git a/app/devices/app_defaults.php b/app/devices/app_defaults.php
index 8c750e2a94..094476902a 100644
--- a/app/devices/app_defaults.php
+++ b/app/devices/app_defaults.php
@@ -16,7 +16,7 @@
 	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-2016
+	Portions created by the Initial Developer are Copyright (C) 2008-2021
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -26,13 +26,34 @@
 if ($domains_processed == 1) {
 
 	//set all lines to enabled (true) where null or empty string
-		$sql = "update v_device_lines set ";
-		$sql .= "enabled = 'true' ";
-		$sql .= "where enabled is null ";
-		$sql .= "or enabled = '' ";
+		$sql = "select device_line_uuid from v_device_lines ";
+		$sql .= "where enabled is null or enabled = '' ";
 		$database = new database;
-		$database->execute($sql);
-		unset($sql);
+		$device_lines = $database->select($sql, null, 'all');
+		if (is_array($device_lines) && @sizeof($device_lines) != 0) {
+			$sql = "update v_device_lines set ";
+			$sql .= "enabled = 'true' ";
+			$sql .= "where enabled is null ";
+			$sql .= "or enabled = '' ";
+			$database = new database;
+			$database->execute($sql);
+			unset($sql);
+		}
+		unset($sql, $device_lines);
+
+	//set label to user_id if the label is null
+		$sql = "select device_line_uuid from v_device_lines ";
+		$sql .= "where label is null ";
+		$database = new database;
+		$device_lines = $database->select($sql, null, 'all');
+		if (is_array($device_lines) && @sizeof($device_lines) != 0) {
+			foreach($device_lines as $row) {
+				$sql = "update v_device_lines ";
+				$sql .= "set label = user_id ";
+				$sql .= "where label is null ";
+				$database->execute($sql);
+			}
+		}
 
 	//set the device key vendor
 		$sql = "select * from v_device_keys as k, v_devices as d ";
@@ -231,7 +252,11 @@ if ($domains_processed == 1) {
 
 		}
 		unset($num_rows);
-
+	
+	//where the device lines label is null set the value to the display name to maintain the original behavior
+		$sql = "update v_device_lines set label = display_name where label is null;\n";
+		$database->execute($sql);
+		unset($sql);
 }
 
 ?>
diff --git a/app/devices/app_languages.php b/app/devices/app_languages.php
index 57ecfe91cf..df011865e7 100644
--- a/app/devices/app_languages.php
+++ b/app/devices/app_languages.php
@@ -290,7 +290,7 @@ $text['message-command_sent']['fr-fr'] = "Command Sent";
 $text['message-command_sent']['he-il'] = "Command Sent";
 $text['message-command_sent']['it-it'] = "Command Sent";
 $text['message-command_sent']['nl-nl'] = "Command Sent";
-$text['message-command_sent']['pl-pl'] = "Command Sent";
+$text['message-command_sent']['pl-pl'] = "Wysłano polecenie pomyślnie";
 $text['message-command_sent']['pt-br'] = "Command Sent";
 $text['message-command_sent']['pt-pt'] = "Command Sent";
 $text['message-command_sent']['ro-ro'] = "Command Sent";
@@ -353,7 +353,7 @@ $text['label-xml_directory']['fr-fr'] = "Annuaire XML";
 $text['label-xml_directory']['he-il'] = "מדריך";
 $text['label-xml_directory']['it-it'] = "Elenco Num. XML";
 $text['label-xml_directory']['nl-nl'] = "XML telefoonlijst";
-$text['label-xml_directory']['pl-pl'] = "Ksiażka telefoniczna XML";
+$text['label-xml_directory']['pl-pl'] = "Katalog XML";
 $text['label-xml_directory']['pt-br'] = "Diretório XML"; //copied from pt-pt
 $text['label-xml_directory']['pt-pt'] = "Diretório XML";
 $text['label-xml_directory']['ro-ro'] = "";
@@ -458,7 +458,7 @@ $text['label-user']['fr-fr'] = "Utilisateur";
 $text['label-user']['he-il'] = "";
 $text['label-user']['it-it'] = "Utente";
 $text['label-user']['nl-nl'] = "Gebruiker";
-$text['label-user']['pl-pl'] = "Użytkownicy";
+$text['label-user']['pl-pl'] = "Użytkownik";
 $text['label-user']['pt-br'] = "Usuário";
 $text['label-user']['pt-pt'] = "Utilizadore";
 $text['label-user']['ro-ro'] = "";
@@ -605,7 +605,7 @@ $text['label-switch_account_down']['fr-fr'] = "Mettez compte vers le bas";
 $text['label-switch_account_down']['he-il'] = "העבר חשבון למטה";
 $text['label-switch_account_down']['it-it'] = "Sposta Account in basso";
 $text['label-switch_account_down']['nl-nl'] = "Centrale Account omlaad";
-$text['label-switch_account_down']['pl-pl'] = "Przenieś konto do dół";
+$text['label-switch_account_down']['pl-pl'] = "Przenieś konto do dołu";
 $text['label-switch_account_down']['pt-br'] = "Desabilitar conta"; //copied from pt-pt
 $text['label-switch_account_down']['pt-pt'] = "Desabilitar conta";
 $text['label-switch_account_down']['ro-ro'] = "";
@@ -688,7 +688,7 @@ $text['label-speed_dial']['fr-fr'] = "Numérotation abrégée";
 $text['label-speed_dial']['he-il'] = "";
 $text['label-speed_dial']['it-it'] = "Speed Dial";
 $text['label-speed_dial']['nl-nl'] = "Snelkiezen";
-$text['label-speed_dial']['pl-pl'] = "";
+$text['label-speed_dial']['pl-pl'] = "Szybkie wybieranie";
 $text['label-speed_dial']['pt-br'] = "Discagem Rápida";
 $text['label-speed_dial']['pt-pt'] = "";
 $text['label-speed_dial']['ro-ro'] = "";
@@ -709,7 +709,7 @@ $text['label-speed_dial_prefix']['fr-fr'] = "Préfixe du numérotation abrégée
 $text['label-speed_dial_prefix']['he-il'] = "";
 $text['label-speed_dial_prefix']['it-it'] = "Prefisso Speed Dial";
 $text['label-speed_dial_prefix']['nl-nl'] = "Snelkies voorloop";
-$text['label-speed_dial_prefix']['pl-pl'] = "";
+$text['label-speed_dial_prefix']['pl-pl'] = "Prefiks szybkiego wybierania";
 $text['label-speed_dial_prefix']['pt-br'] = "Prefixo de discagem rápida";
 $text['label-speed_dial_prefix']['pt-pt'] = "";
 $text['label-speed_dial_prefix']['ro-ro'] = "";
@@ -751,7 +751,7 @@ $text['label-sip_transport']['fr-fr'] = "Transport";
 $text['label-sip_transport']['he-il'] = "";
 $text['label-sip_transport']['it-it'] = "Trasporto";
 $text['label-sip_transport']['nl-nl'] = "Transport";
-$text['label-sip_transport']['pl-pl'] = "Transport ";
+$text['label-sip_transport']['pl-pl'] = "Transport";
 $text['label-sip_transport']['pt-br'] = "Transporte"; //copied from pt-pt
 $text['label-sip_transport']['pt-pt'] = "Transporte";
 $text['label-sip_transport']['ro-ro'] = "";
@@ -793,7 +793,7 @@ $text['label-shared_line']['fr-fr'] = "Ligne partagée";
 $text['label-shared_line']['he-il'] = "קו משותף";
 $text['label-shared_line']['it-it'] = "Linea Condivisa";
 $text['label-shared_line']['nl-nl'] = "Gedeelde lijn";
-$text['label-shared_line']['pl-pl'] = "Linia dzielona";
+$text['label-shared_line']['pl-pl'] = "Linia współdzielona";
 $text['label-shared_line']['pt-br'] = "Linha compartilhada ";
 $text['label-shared_line']['pt-pt'] = "Linha partilhada";
 $text['label-shared_line']['ro-ro'] = "";
@@ -835,7 +835,7 @@ $text['label-server_address']['fr-fr'] = "Adresse du Serveur";
 $text['label-server_address']['he-il'] = "כתובת שרת";
 $text['label-server_address']['it-it'] = "Indirizzo Server";
 $text['label-server_address']['nl-nl'] = "Server adres";
-$text['label-server_address']['pl-pl'] = "Adres serwera (registrar)";
+$text['label-server_address']['pl-pl'] = "Adres serwera";
 $text['label-server_address']['pt-br'] = "Endereço do servidor";
 $text['label-server_address']['pt-pt'] = "Endereço do Servidor";
 $text['label-server_address']['ro-ro'] = "";
@@ -856,7 +856,7 @@ $text['label-server_address_primary']['fr-fr'] = "Adresse principale";
 $text['label-server_address_primary']['he-il'] = "כתובת שרת";
 $text['label-server_address_primary']['it-it'] = "Indirizzo Server";
 $text['label-server_address_primary']['nl-nl'] = "Primaire adres";
-$text['label-server_address_primary']['pl-pl'] = "Adres serwera (registrar)";
+$text['label-server_address_primary']['pl-pl'] = "Adres podstawowy";
 $text['label-server_address_primary']['pt-br'] = "Endereço Primário";
 $text['label-server_address_primary']['pt-pt'] = "Endereço do Servidor";
 $text['label-server_address_primary']['ro-ro'] = "";
@@ -877,7 +877,7 @@ $text['label-server_address_secondary']['fr-fr'] = "Adresse secondaire";
 $text['label-server_address_secondary']['he-il'] = "כתובת שרת";
 $text['label-server_address_secondary']['it-it'] = "Indirizzo Server";
 $text['label-server_address_secondary']['nl-nl'] = "Secondaire adres";
-$text['label-server_address_secondary']['pl-pl'] = "Adres serwera (registrar)";
+$text['label-server_address_secondary']['pl-pl'] = "Adres drugorzędny";
 $text['label-server_address_secondary']['pt-br'] = "Endereço Secundário";
 $text['label-server_address_secondary']['pt-pt'] = "Endereço do Servidor";
 $text['label-server_address_secondary']['ro-ro'] = "";
@@ -1284,43 +1284,43 @@ $text['label-p2t']['ru-ru'] = "Push to Talk";
 $text['label-p2t']['sv-se'] = "Push to Talk ";
 $text['label-p2t']['uk-ua'] = "";
 
-$text['label-outbound_proxy_primary']['en-us'] = "Outbound Proxy";
-$text['label-outbound_proxy_primary']['en-gb'] = "Outbound Proxy";
+$text['label-outbound_proxy_primary']['en-us'] = "Outbound Proxy Primary";
+$text['label-outbound_proxy_primary']['en-gb'] = "Outbound Proxy Primary";
 $text['label-outbound_proxy_primary']['ar-eg'] = "";
-$text['label-outbound_proxy_primary']['de-at'] = "Outbound Proxy"; //copied from de-de
-$text['label-outbound_proxy_primary']['de-ch'] = "Outbound Proxy"; //copied from de-de
+$text['label-outbound_proxy_primary']['de-at'] = "Outbound Proxy Primary"; //copied from de-de
+$text['label-outbound_proxy_primary']['de-ch'] = "Outbound Proxy Primary"; //copied from de-de
 $text['label-outbound_proxy_primary']['de-de'] = "Outbound Proxy";
-$text['label-outbound_proxy_primary']['es-cl'] = "Proxy de salida";
-$text['label-outbound_proxy_primary']['es-mx'] = "Proxy de salida"; //copied from es-cl
-$text['label-outbound_proxy_primary']['fr-ca'] = "Proxy Sortant"; //copied from fr-fr
-$text['label-outbound_proxy_primary']['fr-fr'] = "Proxy Sortant";
+$text['label-outbound_proxy_primary']['es-cl'] = "Proxy de salida Primaria";
+$text['label-outbound_proxy_primary']['es-mx'] = "Proxy de salida Primaria"; //copied from es-cl
+$text['label-outbound_proxy_primary']['fr-ca'] = "Proxy Sortant Primaire"; //copied from fr-fr
+$text['label-outbound_proxy_primary']['fr-fr'] = "Proxy Sortant Primaire";
 $text['label-outbound_proxy_primary']['he-il'] = "";
 $text['label-outbound_proxy_primary']['it-it'] = "Outbound Proxy";
 $text['label-outbound_proxy_primary']['nl-nl'] = "Uitgaande proxy";
 $text['label-outbound_proxy_primary']['pl-pl'] = "Wychodzący serwer proxy";
-$text['label-outbound_proxy_primary']['pt-br'] = "Proxy de Saída";
-$text['label-outbound_proxy_primary']['pt-pt'] = "Outbound Proxy";
+$text['label-outbound_proxy_primary']['pt-br'] = "Proxy de Saída Primária";
+$text['label-outbound_proxy_primary']['pt-pt'] = "Proxy de Saída Primária";
 $text['label-outbound_proxy_primary']['ro-ro'] = "";
 $text['label-outbound_proxy_primary']['ru-ru'] = "Исходящий прокси-сервер";
 $text['label-outbound_proxy_primary']['sv-se'] = "Utgående Proxy";
 $text['label-outbound_proxy_primary']['uk-ua'] = "";
 
-$text['label-outbound_proxy_secondary']['en-us'] = "Outbound Proxy";
-$text['label-outbound_proxy_secondary']['en-gb'] = "Outbound Proxy";
+$text['label-outbound_proxy_secondary']['en-us'] = "Outbound Proxy Secondary";
+$text['label-outbound_proxy_secondary']['en-gb'] = "Outbound Proxy Secondary";
 $text['label-outbound_proxy_secondary']['ar-eg'] = "";
 $text['label-outbound_proxy_secondary']['de-at'] = "Outbound Proxy"; //copied from de-de
 $text['label-outbound_proxy_secondary']['de-ch'] = "Outbound Proxy"; //copied from de-de
 $text['label-outbound_proxy_secondary']['de-de'] = "Outbound Proxy";
-$text['label-outbound_proxy_secondary']['es-cl'] = "Proxy de salida";
-$text['label-outbound_proxy_secondary']['es-mx'] = "Proxy de salida"; //copied from es-cl
-$text['label-outbound_proxy_secondary']['fr-ca'] = "Proxy Sortant"; //copied from fr-fr
-$text['label-outbound_proxy_secondary']['fr-fr'] = "Proxy Sortant";
+$text['label-outbound_proxy_secondary']['es-cl'] = "Proxy de salida Secundaria";
+$text['label-outbound_proxy_secondary']['es-mx'] = "Proxy de salida Secundaria"; //copied from es-cl
+$text['label-outbound_proxy_secondary']['fr-ca'] = "Proxy Sortant Secondaire"; //copied from fr-fr
+$text['label-outbound_proxy_secondary']['fr-fr'] = "Proxy Sortant Secondaire";
 $text['label-outbound_proxy_secondary']['he-il'] = "";
 $text['label-outbound_proxy_secondary']['it-it'] = "Outbound Proxy";
 $text['label-outbound_proxy_secondary']['nl-nl'] = "Uitgaande proxy";
 $text['label-outbound_proxy_secondary']['pl-pl'] = "Wychodzący serwer proxy";
-$text['label-outbound_proxy_secondary']['pt-br'] = "Proxy de Saída";
-$text['label-outbound_proxy_secondary']['pt-pt'] = "Outbound Proxy";
+$text['label-outbound_proxy_secondary']['pt-br'] = "Proxy de Saída Secundária";
+$text['label-outbound_proxy_secondary']['pt-pt'] = "Proxy de Saída Secundária";
 $text['label-outbound_proxy_secondary']['ro-ro'] = "";
 $text['label-outbound_proxy_secondary']['ru-ru'] = "Исходящий прокси-сервер";
 $text['label-outbound_proxy_secondary']['sv-se'] = "Utgående Proxy";
@@ -2523,6 +2523,27 @@ $text['label-device_vendor']['ru-ru'] = "Производитель";
 $text['label-device_vendor']['sv-se'] = "Tillverkare";
 $text['label-device_vendor']['uk-ua'] = "";
 
+$text['label-device_location']['en-us'] = "Location";
+$text['label-device_location']['en-gb'] = "Location";
+$text['label-device_location']['ar-eg'] = "Location";
+$text['label-device_location']['de-at'] = "Ort"; //copied from de-de
+$text['label-device_location']['de-ch'] = "Ort"; //copied from de-de
+$text['label-device_location']['de-de'] = "Ort";
+$text['label-device_location']['es-cl'] = "Ubicación";
+$text['label-device_location']['es-mx'] = "Ubicación"; //copied from es-cl
+$text['label-device_location']['fr-ca'] = "Situation géographique";
+$text['label-device_location']['fr-fr'] = "Emplacement";
+$text['label-device_location']['he-il'] = "מקום";
+$text['label-device_location']['it-it'] = "Ubicazione";
+$text['label-device_location']['nl-nl'] = "Plaats";
+$text['label-device_location']['pl-pl'] = "Wprowadź lokalizację urządzenia.";
+$text['label-device_location']['pt-br'] = "Localização"; //copied from pt-pt
+$text['label-device_location']['pt-pt'] = "Localização";
+$text['label-device_location']['ro-ro'] = "Introduceți locația dispozitivului.";
+$text['label-device_location']['ru-ru'] = "Местоположение";
+$text['label-device_location']['sv-se'] = "Ange enhetens plats.";
+$text['label-device_location']['uk-ua'] = "Введіть розташування пристрою.";
+
 $text['label-device_key_vendor']['en-us'] = "Vendor";
 $text['label-device_key_vendor']['en-gb'] = "Vendor";
 $text['label-device_key_vendor']['ar-eg'] = "";
@@ -4469,7 +4490,7 @@ $text['label-next_tab']['fr-fr'] = "Onglet suivant";
 $text['label-next_tab']['he-il'] = "";
 $text['label-next_tab']['it-it'] = "";
 $text['label-next_tab']['nl-nl'] = "Volgende tab";
-$text['label-next_tab']['pl-pl'] = "";
+$text['label-next_tab']['pl-pl'] = "Następna zakładka";
 $text['label-next_tab']['pt-br'] = "Próxima Aba";
 $text['label-next_tab']['pt-pt'] = "";
 $text['label-next_tab']['ro-ro'] = "";
@@ -4490,7 +4511,7 @@ $text['label-message_status']['fr-fr'] = "Etat du message";
 $text['label-message_status']['he-il'] = "";
 $text['label-message_status']['it-it'] = "";
 $text['label-message_status']['nl-nl'] = "Boodschap status";
-$text['label-message_status']['pl-pl'] = "";
+$text['label-message_status']['pl-pl'] = "Status Wiadomości";
 $text['label-message_status']['pt-br'] = "Mensagem de Estado";
 $text['label-message_status']['pt-pt'] = "";
 $text['label-message_status']['ro-ro'] = "";
@@ -4595,7 +4616,7 @@ $text['label-add_to_conference']['fr-fr'] = "Ajouter à la conférence";
 $text['label-add_to_conference']['he-il'] = "";
 $text['label-add_to_conference']['it-it'] = "";
 $text['label-add_to_conference']['nl-nl'] = "Voeg toe aan conferentie";
-$text['label-add_to_conference']['pl-pl'] = "";
+$text['label-add_to_conference']['pl-pl'] = "Dodaj do Konferencji";
 $text['label-add_to_conference']['pt-br'] = "Adicionar à Conferência";
 $text['label-add_to_conference']['pt-pt'] = "";
 $text['label-add_to_conference']['ro-ro'] = "";
@@ -4616,7 +4637,7 @@ $text['label-custom']['fr-fr'] = "Custom";
 $text['label-custom']['he-il'] = "";
 $text['label-custom']['it-it'] = "";
 $text['label-custom']['nl-nl'] = "Aangepast";
-$text['label-custom']['pl-pl'] = "";
+$text['label-custom']['pl-pl'] = "Własne";
 $text['label-custom']['pt-br'] = "Personalizado";
 $text['label-custom']['pt-pt'] = "";
 $text['label-custom']['ro-ro'] = "";
@@ -4637,7 +4658,7 @@ $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']['pl-pl'] = "Pola";
 $text['label-fields']['pt-br'] = "Fields";
 $text['label-fields']['pt-pt'] = "Fields";
 $text['label-fields']['ro-ro'] = "Fields";
@@ -4789,7 +4810,7 @@ $text['description-device_export']['fr-fr'] = "Select the fields you wish to inc
 $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']['pl-pl'] = "Wybierz pola, które mają być uwzględnione w eksporcie.";
 $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.";
@@ -4895,7 +4916,7 @@ $text['description-server_address']['fr-fr'] = "Sélectionnez une adresse de ser
 $text['description-server_address']['he-il'] = "בחר כתובת שרת";
 $text['description-server_address']['it-it'] = "Selezionare indirizzo server.";
 $text['description-server_address']['nl-nl'] = "Kies een server adres.";
-$text['description-server_address']['pl-pl'] = "Wybierz adres serwera (registrar)";
+$text['description-server_address']['pl-pl'] = "Wybierz adres serwera.";
 $text['description-server_address']['pt-br'] = "Selecione um endereço de servidor";
 $text['description-server_address']['pt-pt'] = "Seleccione um endereço de servidor.";
 $text['description-server_address']['ro-ro'] = "";
@@ -5021,7 +5042,7 @@ $text['description-profile2']['fr-fr'] = "Sélectionnez un profil de touche et /
 $text['description-profile2']['he-il'] = "";
 $text['description-profile2']['it-it'] = "Seleziona un Profilo Tasti e/o definisci altri tasti sotto.";
 $text['description-profile2']['nl-nl'] = "Kies een sleutel profiel en/of definieer aangepaste toetsen hieronder.";
-$text['description-profile2']['pl-pl'] = "Wybierz Główny  Profil i / lub zdefiniuj własne klucze poniżej";
+$text['description-profile2']['pl-pl'] = "Wybierz Główny Profil i / lub zdefiniuj własne klucze poniżej";
 $text['description-profile2']['pt-br'] = "Selecione uma tecla de perfil e/ou defina teclas personalizadas abaixo.";
 $text['description-profile2']['pt-pt'] = "Selecione um perfil Key e / ou definir chaves personalizados abaixo.";
 $text['description-profile2']['ro-ro'] = "";
@@ -5105,7 +5126,7 @@ $text['description-line_number']['fr-fr'] = "Sélectionnez un numéro de ligne."
 $text['description-line_number']['he-il'] = "";
 $text['description-line_number']['it-it'] = "Selezionare un numero di linea.";
 $text['description-line_number']['nl-nl'] = "Kies een lijnnummer";
-$text['description-line_number']['pl-pl'] = "Wybierz numer lini";
+$text['description-line_number']['pl-pl'] = "Wybierz numer linii";
 $text['description-line_number']['pt-br'] = "Selecione o número da linha.";
 $text['description-line_number']['pt-pt'] = "Selecciona um número.";
 $text['description-line_number']['ro-ro'] = "";
@@ -5126,7 +5147,7 @@ $text['description-extension']['fr-fr'] = "Assigner l'extension et les numéro d
 $text['description-extension']['he-il'] = "";
 $text['description-extension']['it-it'] = "Assegna l'interno e i numeri di linea al dispositivo.";
 $text['description-extension']['nl-nl'] = "Wijs toestel en lijnnummers to aan het apparaat.";
-$text['description-extension']['pl-pl'] = "Przypisz do urządzenia numer linii oraz numery wewnętrzne ";
+$text['description-extension']['pl-pl'] = "Przypisz do urządzenia numer linii oraz numery wewnętrzne.";
 $text['description-extension']['pt-br'] = "Atribua um ramal e números de linha ao dispositivo.";
 $text['description-extension']['pt-pt'] = "Atribuir a extensão e números ao dispositivo.";
 $text['description-extension']['ro-ro'] = "";
@@ -5197,6 +5218,27 @@ $text['description-device_vendor']['ru-ru'] = "Введите название 
 $text['description-device_vendor']['sv-se'] = "Fyll i tillverkar-namn.";
 $text['description-device_vendor']['uk-ua'] = "";
 
+$text['description-device_location']['en-us'] = "Enter the device location.";
+$text['description-device_location']['en-gb'] = "Enter the device location.";
+$text['description-device_location']['ar-eg'] = "Enter the device location.";
+$text['description-device_location']['de-at'] = "Geben Sie den Gerätestandort ein."; //copied from de-de
+$text['description-device_location']['de-ch'] = "Geben Sie den Gerätestandort ein."; //copied from de-de
+$text['description-device_location']['de-de'] = "Geben Sie den Gerätestandort ein.";
+$text['description-device_location']['es-cl'] = "Introduzca la ubicación del dispositivo.";
+$text['description-device_location']['es-mx'] = "Introduzca la ubicación del dispositivo."; //copied from es-cl
+$text['description-device_location']['fr-ca'] = "Entrez dans l'emplacement de l'appareil."; //copied from fr-fr
+$text['description-device_location']['fr-fr'] = "Entrez l'emplacement de l'appareil.";
+$text['description-device_location']['he-il'] = "הזן את מיקום ההתקן.";
+$text['description-device_location']['it-it'] = "Inserisci la posizione del dispositivo.";
+$text['description-device_location']['nl-nl'] = "Voer de locatie van het apparaat in.";
+$text['description-device_location']['pl-pl'] = "Wprowadź lokalizację urządzenia.";
+$text['description-device_location']['pt-br'] = "Digite a localização do dispositivo.";
+$text['description-device_location']['pt-pt'] = "Introduza a localização do dispositivo.";
+$text['description-device_location']['ro-ro'] = "Introduceți locația dispozitivului.";
+$text['description-device_location']['ru-ru'] = "Введите расположение устройства.";
+$text['description-device_location']['sv-se'] = "Ange enhetens plats.";
+$text['description-device_location']['uk-ua'] = "Введіть розташування пристрою.";
+
 $text['description-device_time_zone']['en-us'] = "Enter the time zone.";
 $text['description-device_time_zone']['en-gb'] = "Enter the time zone.";
 $text['description-device_time_zone']['ar-eg'] = "";
@@ -5252,7 +5294,7 @@ $text['description-device_enabled']['fr-fr'] = "Activer ou désactiver le provis
 $text['description-device_enabled']['he-il'] = "";
 $text['description-device_enabled']['it-it'] = "Abilita o disabilita il provisioning per questo dispositivo.";
 $text['description-device_enabled']['nl-nl'] = "Zet beschikbaarstellen aan/uit voor dit apparaat.";
-$text['description-device_enabled']['pl-pl'] = "Włącz lub wyłącz automatyczna konfiguracje tego urządzenia";
+$text['description-device_enabled']['pl-pl'] = "Włącz lub wyłącz automatyczną konfigurację tego urządzenia";
 $text['description-device_enabled']['pt-br'] = "Ative ou desative o provisionamento para este dispositivo.";
 $text['description-device_enabled']['pt-pt'] = "Active ou Desactive o aprovisionamento para este dispositivo.";
 $text['description-device_enabled']['ro-ro'] = "";
@@ -5378,7 +5420,7 @@ $text['description-device_key_line']['fr-fr'] = "Sélectionnez le numéro de la
 $text['description-device_key_line']['he-il'] = "בחר את מספר הקו";
 $text['description-device_key_line']['it-it'] = "Seleziona il numero di linea.";
 $text['description-device_key_line']['nl-nl'] = "Kies een lijnnummer.";
-$text['description-device_key_line']['pl-pl'] = "Wybierz numer lini";
+$text['description-device_key_line']['pl-pl'] = "Wybierz numer linii.";
 $text['description-device_key_line']['pt-br'] = "Selecione o número da linha.";
 $text['description-device_key_line']['pt-pt'] = "Selecione o número da linha.";
 $text['description-device_key_line']['ro-ro'] = "";
@@ -5609,7 +5651,7 @@ $text['button-files']['fr-fr'] = "Fichiers";
 $text['button-files']['he-il'] = "קבצים";
 $text['button-files']['it-it'] = "Files";
 $text['button-files']['nl-nl'] = "Bestanden";
-$text['button-files']['pl-pl'] = "";
+$text['button-files']['pl-pl'] = "Pliki";
 $text['button-files']['pt-br'] = "Arquivos"; //copied from pt-pt
 $text['button-files']['pt-pt'] = "Arquivos";
 $text['button-files']['ro-ro'] = "";
@@ -5651,7 +5693,7 @@ $text['description-device_vendors']['fr-fr'] = "Définit la liste des fournisseu
 $text['description-device_vendors']['he-il'] = "";
 $text['description-device_vendors']['it-it'] = "Definisce la lista dei produttori di telefoni auto configurabili.";
 $text['description-device_vendors']['nl-nl'] = "Definieert de lijst van fabrikanten die met apparaat voorzieningen leiden.";
-$text['description-device_vendors']['pl-pl'] = "";
+$text['description-device_vendors']['pl-pl'] = "Definiuje listę producentów używanych w automatycznej konfiguracji urządzeń.";
 $text['description-device_vendors']['pt-br'] = "Defina a lista de fabricantes usados com o provisionamento de dispositivos.";
 $text['description-device_vendors']['pt-pt'] = "";
 $text['description-device_vendors']['ro-ro'] = "";
@@ -5735,7 +5777,7 @@ $text['description-device_vendor']['fr-fr'] = "Définit la liste des fournisseur
 $text['description-device_vendor']['he-il'] = "";
 $text['description-device_vendor']['it-it'] = "Definisce la lista dei produttori di telefoni auto configurabili.";
 $text['description-device_vendor']['nl-nl'] = "Definieert de lijst van fabrikanten die gebruikt worden met apparaat voorzieningen.";
-$text['description-device_vendor']['pl-pl'] = "";
+$text['description-device_vendor']['pl-pl'] = "Definiuje listę producentów używanych w automatycznej konfiguracji urządzeń.";
 $text['description-device_vendor']['pt-br'] = "Defina a lista de fabricantes usados com o provisionamento de dispositivos.";
 $text['description-device_vendor']['pt-pt'] = "";
 $text['description-device_vendor']['ro-ro'] = "";
@@ -5756,7 +5798,7 @@ $text['button-vendors']['fr-fr'] = "Fabriquant";
 $text['button-vendors']['he-il'] = "";
 $text['button-vendors']['it-it'] = "Produttori";
 $text['button-vendors']['nl-nl'] = "Fabrikanten";
-$text['button-vendors']['pl-pl'] = "Producent";
+$text['button-vendors']['pl-pl'] = "Producenci";
 $text['button-vendors']['pt-br'] = "Fabricantes"; //copied from pt-pt
 $text['button-vendors']['pt-pt'] = "Fabricante";
 $text['button-vendors']['ro-ro'] = "";
@@ -5777,7 +5819,7 @@ $text['label-column_name']['fr-fr'] = "Nom de colonne";
 $text['label-column_name']['he-il'] = "";
 $text['label-column_name']['it-it'] = "";
 $text['label-column_name']['nl-nl'] = "Kolomnaam";
-$text['label-column_name']['pl-pl'] = "";
+$text['label-column_name']['pl-pl'] = "Nazwa kolumny";
 $text['label-column_name']['pt-br'] = "Nome da Coluna";
 $text['label-column_name']['pt-pt'] = "";
 $text['label-column_name']['ro-ro'] = "";
diff --git a/app/devices/device_edit.php b/app/devices/device_edit.php
index 4c8e5b60b9..9918c29818 100644
--- a/app/devices/device_edit.php
+++ b/app/devices/device_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-2022
 	the Initial Developer. All Rights Reserved.
 
 */
@@ -115,6 +115,7 @@
 			$device_username = $_POST["device_username"];
 			$device_password = $_POST["device_password"];
 			$device_vendor = $_POST["device_vendor"];
+			$device_location = $_POST["device_location"];
 			$device_uuid_alternate = $_POST["device_uuid_alternate"];
 			$device_model = $_POST["device_model"];
 			$device_firmware_version = $_POST["device_firmware_version"];
@@ -128,6 +129,7 @@
 			//$server_address = $_POST["server_address"];
 			//$outbound_proxy_primary = $_POST["outbound_proxy_primary"];
 			//$outbound_proxy_secondary = $_POST["outbound_proxy_secondary"];
+			//$label = $_POST["label"];
 			//$display_name = $_POST["display_name"];
 			//$user_id = $_POST["user_id"];
 			//$auth_id = $_POST["auth_id"];
@@ -256,6 +258,9 @@
 					if (permission_exists('device_vendor')) {
 						$array['devices'][0]['device_vendor'] = $device_vendor;
 					}
+					if (permission_exists('device_location')) {
+						$array['devices'][0]['device_location'] = $device_location;
+					}
 					if (permission_exists('device_alternate') && is_uuid($device_uuid_alternate)) {
 						$array['devices'][0]['device_uuid_alternate'] = $device_uuid_alternate;
 					}
@@ -316,6 +321,7 @@
 								} 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]['label'] = $row["label"];
 								$array['devices'][0]['device_lines'][$y]['display_name'] = $row["display_name"];
 								$array['devices'][0]['device_lines'][$y]['user_id'] = $row["user_id"];
 								if (permission_exists('device_line_auth_id')) {
@@ -385,7 +391,9 @@
 								}
 								//$array['devices'][0]['device_keys'][$y]['device_key_protected'] = $row["device_key_protected"];
 								$array['devices'][0]['device_keys'][$y]['device_key_label'] = $row["device_key_label"];
-								$array['devices'][0]['device_keys'][$y]['device_key_icon'] = $row["device_key_icon"];
+								if (permission_exists('device_key_icon')) {
+									$array['devices'][0]['device_keys'][$y]['device_key_icon'] = $row["device_key_icon"];
+								}
 								$y++;
 							}
 						}
@@ -500,6 +508,7 @@
 			$device_username = $row["device_username"];
 			$device_password = $row["device_password"];
 			$device_vendor = $row["device_vendor"];
+			$device_location = $row["device_location"];
 			$device_uuid_alternate = $row["device_uuid_alternate"];
 			$device_model = $row["device_model"];
 			$device_firmware_version = $row["device_firmware_version"];
@@ -547,6 +556,7 @@
 	$device_lines[$x]['outbound_proxy_secondary'] = $_SESSION['provision']['outbound_proxy_secondary']['text'];
 	$device_lines[$x]['server_address_primary'] = $_SESSION['provision']['server_address_primary']['text'];
 	$device_lines[$x]['server_address_secondary'] = $_SESSION['provision']['server_address_secondary']['text'];
+	$device_lines[$x]['label'] = '';
 	$device_lines[$x]['display_name'] = '';
 	$device_lines[$x]['user_id'] = '';
 	$device_lines[$x]['auth_id'] = '';
@@ -1041,6 +1051,7 @@
 		if (permission_exists('device_line_outbound_proxy_secondary')) {
 			echo "				<td class='vtable'>".$text['label-outbound_proxy_secondary']."</td>\n";
 		}
+		echo "				<td class='vtable'>".$text['label-label']."</td>\n";
 		echo "				<td class='vtable'>".$text['label-display_name']."</td>\n";
 		echo "				<td class='vtable'>".$text['label-user_id']."</td>\n";
 		if (permission_exists('device_line_auth_id')) {
@@ -1181,6 +1192,10 @@
 					echo "			</td>\n";
 				}
 
+				echo "			<td align='left'>\n";
+				echo "				<input class='formfld' style='min-width: 75px; width: 100%;' type='text' name='device_lines[".$x."][label]' maxlength='255' value=\"".escape($row['label'])."\"/>\n";
+				echo "			</td>\n";
+
 				echo "			<td align='left'>\n";
 				echo "				<input class='formfld' style='min-width: 75px; width: 100%;' type='text' name='device_lines[".$x."][display_name]' maxlength='255' value=\"".escape($row['display_name'])."\"/>\n";
 				echo "			</td>\n";
@@ -1322,7 +1337,9 @@
 				echo "				<td class='vtable'>".$text['label-device_key_extension']."</td>\n";
 			}
 			echo "				<td class='vtable'>".$text['label-device_key_label']."</td>\n";
-			echo "				<td class='vtable'>".$text['label-device_key_icon']."</td>\n";
+			if (permission_exists('device_key_icon')) {
+				echo "				<td class='vtable'>".$text['label-device_key_icon']."</td>\n";
+			}
 			if (is_array($device_keys) && @sizeof($device_keys) > 1 && permission_exists('device_key_delete')) {
 				echo "				<td class='vtable edit_delete_checkbox_all' onmouseover=\"swap_display('delete_label_keys', 'delete_toggle_keys');\" onmouseout=\"swap_display('delete_label_keys', 'delete_toggle_keys');\">\n";
 				echo "					<span id='delete_label_keys'>".$text['label-delete']."</span>\n";
@@ -1354,7 +1371,9 @@
 						echo "				<td class='vtable'>".$text['label-device_key_extension']."</td>\n";
 					}
 					echo "				<td class='vtable'>".$text['label-device_key_label']."</td>\n";
-					echo "				<td class='vtable'>".$text['label-device_key_icon']."</td>\n";
+					if (permission_exists('device_key_icon')) {
+						echo "				<td class='vtable'>".$text['label-device_key_icon']."</td>\n";
+					}
 					if (is_array($device_keys) && @sizeof($device_keys) > 1 && permission_exists('device_key_delete')) {
 						echo "				<td class='vtable edit_delete_checkbox_all' onmouseover=\"swap_display('delete_label_keys', 'delete_toggle_keys');\" onmouseout=\"swap_display('delete_label_keys', 'delete_toggle_keys');\">\n";
 						echo "					<span id='delete_label_keys'>".$text['label-delete']."</span>\n";
@@ -1566,10 +1585,12 @@
 				echo "<td align='left'>\n";
 				echo "	<input class='formfld' type='text' name='device_keys[".$x."][device_key_label]' style='width: 75px;' maxlength='255' value=\"".escape($row['device_key_label'])."\"/>\n";
 				echo "</td>\n";
-				
-				echo "<td align='left'>\n";
-				echo "	<input class='formfld' type='text' name='device_keys[".$x."][device_key_icon]' style='width: 75px;' maxlength='255' value=\"".escape($row['device_key_icon'])."\"/>\n";
-				echo "</td>\n";
+
+				if (permission_exists('device_key_icon')) {
+					echo "<td align='left'>\n";
+					echo "	<input class='formfld' type='text' name='device_keys[".$x."][device_key_icon]' style='width: 75px;' maxlength='255' value=\"".escape($row['device_key_icon'])."\"/>\n";
+					echo "</td>\n";
+				}
 
 				if (is_array($device_keys) && @sizeof($device_keys) > 1 && permission_exists('device_key_delete')) {
 					if (is_uuid($row['device_key_uuid'])) {
@@ -1746,6 +1767,19 @@
 		echo "</tr>\n";
 	}
 
+	if (permission_exists('device_location')) {
+		echo "<tr>\n";
+		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+		echo "	".$text['label-device_location']."\n";
+		echo "</td>\n";
+		echo "<td class='vtable' align='left'>\n";
+		echo "	<input class='formfld' type='text' name='device_location' maxlength='255' value=\"".escape($device_location)."\"/>\n";
+		echo "<br />\n";
+		echo $text['description-device_location']."\n";
+		echo "</td>\n";
+		echo "</tr>\n";
+	}
+
 	if (permission_exists('device_model')) {
 		echo "<tr>\n";
 		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
diff --git a/app/devices/device_imports.php b/app/devices/device_imports.php
index 239fdda74f..def7e7cdcb 100644
--- a/app/devices/device_imports.php
+++ b/app/devices/device_imports.php
@@ -278,7 +278,7 @@
 								foreach ($fields as $key => $value) {
 									//get the line
 									$result = str_getcsv($line, $delimiter, $enclosure);
-									
+
 									//get the table and field name
 									$field_array = explode(".",$value);
 									$table_name = $field_array[0];
@@ -290,6 +290,17 @@
 									//get the parent table name
 									$parent = get_parent($schema, $table_name);
 
+									//count the field names
+									if (isset($field_count[$table_name][$field_name])) {
+										$field_count[$table_name][$field_name]++;
+									}
+									else {
+										$field_count[$table_name][$field_name] = 0;
+									}
+
+									//set the ordinal ID
+									$id = $field_count[$table_name][$field_name];
+
 									//remove formatting from the phone number
 									if ($field_name == "phone_number") {
 										$result[$key] = preg_replace('{\D}', '', $result[$key]);
@@ -310,14 +321,14 @@
 											}
 										}
 										else {
-											$array[$parent][$row_id][$table_name][$y]['domain_uuid'] = $domain_uuid;
-											$array[$parent][$row_id][$table_name][$y][$field_name] = $result[$key];
+											$array[$parent][$row_id][$table_name][$id]['domain_uuid'] = $domain_uuid;
+											$array[$parent][$row_id][$table_name][$id][$field_name] = $result[$key];
 										}
 
 										if ($field_name == "username") {
 											foreach ($users as $field) {
 												if ($field['username'] == $result[$key]) {
-													$array[$table_name][$row_id]['device_user_uuid'] = $field['user_uuid'];
+													$array[$parent][$table_name][$id]['device_user_uuid'] = $field['user_uuid'];
 												}
 											}
 										}
@@ -344,9 +355,41 @@
 									unset($sql, $parameters);
 								}
 
+							//debug information
+								//view_array($field_count);
+
 							//process a chunk of the array
 								if ($row_id === 1000) {
 
+									//remove sub table data if it doesn't have more details than domain_uuid an device_uuid
+										$x = 0;
+										foreach ($array['devices'] as $row) {
+											//remove empty device keys
+											if (isset($row['device_keys'])) {
+												$y = 0;
+												foreach ($row['device_keys'] as &$sub_row) {
+													if (count($sub_row) == 2) {
+														unset($array['devices'][$x]['device_keys']);
+													}
+													$y++;
+												}
+											}
+
+											//remove empty device lines
+											if (isset($row['device_lines'])) {
+												$y = 0;
+												foreach ($row['device_lines'] as &$sub_row) {
+													if (count($sub_row) == 2) {
+														unset($array['devices'][$x]['device_lines']);
+													}
+													$y++;
+												}
+											}
+
+											//increment device id
+											$x++;
+										}
+
 									//save to the data
 										$database->save($array);
 										//$message = $database->message;
@@ -359,21 +402,49 @@
 								}
 
 						} //if ($from_row <= $row_id)
+						unset($field_count);
 						$row_number++;
 						$row_id++;
 					} //end while
 					fclose($handle);
 
+				//remove sub table data if it doesn't have more details than domain_uuid an device_uuid
+					$x = 0;
+					foreach ($array['devices'] as $row) {
+						//remove empty device keys
+						if (isset($row['device_keys'])) {
+							$y = 0;
+							foreach ($row['device_keys'] as &$sub_row) {
+								if (count($sub_row) == 2) {
+									unset($array['devices'][$x]['device_keys']);
+								}
+								$y++;
+							}
+						}
+
+						//remove empty device lines
+						if (isset($row['device_lines'])) {
+							$y = 0;
+							foreach ($row['device_lines'] as &$sub_row) {
+								if (count($sub_row) == 2) {
+									unset($array['devices'][$x]['device_lines']);
+								}
+								$y++;
+							}
+						}
+
+						//increment device id
+						$x++;
+					}
+
 				//debug info
-					//echo "<pre>\n";
-					//print_r($array);
-					//echo "</pre>\n";
-					//exit;
+					//view_array($array);
 
 				//save to the data
 					if (is_array($array)) {
 						$database->save($array);
 						//$message = $database->message;
+						//view_array($message);
 					}
 				
 					if (strlen($_SESSION['provision']['path']['text']) > 0) {
diff --git a/app/devices/device_vendor_functions.php b/app/devices/device_vendor_functions.php
index 714caba1aa..0b92d55204 100644
--- a/app/devices/device_vendor_functions.php
+++ b/app/devices/device_vendor_functions.php
@@ -134,10 +134,10 @@
 		echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add'],'id'=>'btn_add','link'=>'device_vendor_function_edit.php?device_vendor_uuid='.urlencode($_GET['id'])]);
 	}
 	if (permission_exists('device_vendor_function_edit') && $vendor_functions) {
-		echo button::create(['type'=>'button','label'=>$text['button-toggle'],'icon'=>$_SESSION['theme']['button_icon_toggle'],'name'=>'btn_toggle','onclick'=>"modal_open('modal-toggle','btn_toggle');"]);
+		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('device_vendor_function_delete') && $vendor_functions) {
-		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 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');"]);
 	}
 	if ($paging_controls_mini != '') {
 		echo 	"<span style='margin-left: 15px;'>".$paging_controls_mini."</span>\n";
@@ -157,7 +157,7 @@
 	echo "<tr class='list-header'>\n";
 	if (permission_exists('device_vendor_function_add') || permission_exists('device_vendor_function_edit') || permission_exists('device_vendor_function_delete')) {
 		echo "	<th class='checkbox'>\n";
-		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle();' ".($vendor_functions ?: "style='visibility: hidden;'").">\n";
+		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle(); checkbox_on_change(this);' ".($vendor_functions ?: "style='visibility: hidden;'").">\n";
 		echo "	</th>\n";
 	}
 	echo th_order_by('name', $text['label-name'], $order_by, $order);
@@ -204,7 +204,7 @@
 				echo "<tr class='list-row' href='".$list_row_url."'>\n";
 				if (permission_exists('device_vendor_function_add') || permission_exists('device_vendor_function_edit') || permission_exists('device_vendor_function_delete')) {
 					echo "	<td class='checkbox'>\n";
-					echo "		<input type='checkbox' name='vendor_functions[$x][checked]' id='checkbox_".$x."' value='true' onclick=\"if (!this.checked) { document.getElementById('checkbox_all').checked = false; }\">\n";
+					echo "		<input type='checkbox' name='vendor_functions[$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='vendor_functions[$x][uuid]' value='".escape($row['device_vendor_function_uuid'])."' />\n";
 					echo "	</td>\n";
 				}
@@ -263,4 +263,4 @@
 
 	echo "</script>\n";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/devices/device_vendors.php b/app/devices/device_vendors.php
index 6469403c88..d37c6812ff 100644
--- a/app/devices/device_vendors.php
+++ b/app/devices/device_vendors.php
@@ -129,10 +129,10 @@
 		echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add'],'id'=>'btn_add','link'=>'device_vendor_edit.php']);
 	}
 	if (permission_exists('device_vendor_edit') && $result) {
-		echo button::create(['type'=>'button','label'=>$text['button-toggle'],'icon'=>$_SESSION['theme']['button_icon_toggle'],'name'=>'btn_toggle','onclick'=>"modal_open('modal-toggle','btn_toggle');"]);
+		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('device_vendor_delete') && $result) {
-		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 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";
 	echo 		"<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown='list_search_reset();'>";
@@ -165,7 +165,7 @@
 	echo "<tr class='list-header'>\n";
 	if (permission_exists('device_vendor_edit') || permission_exists('device_vendor_delete')) {
 		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 "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle(); checkbox_on_change(this);' ".($result ?: "style='visibility: hidden;'").">\n";
 		echo "	</th>\n";
 	}
 	echo th_order_by('name', $text['label-name'], $order_by, $order);
@@ -185,7 +185,7 @@
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('device_vendor_edit') || permission_exists('device_vendor_delete')) {
 				echo "	<td class='checkbox'>\n";
-				echo "		<input type='checkbox' name='vendors[$x][checked]' id='checkbox_".$x."' value='true' onclick=\"if (!this.checked) { document.getElementById('checkbox_all').checked = false; }\">\n";
+				echo "		<input type='checkbox' name='vendors[$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='vendors[$x][uuid]' value='".escape($row['device_vendor_uuid'])."' />\n";
 				echo "	</td>\n";
 			}
@@ -221,4 +221,4 @@
 //include the footer
 	require_once "resources/footer.php";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/devices/devices.php b/app/devices/devices.php
index 7c2ed342db..b729fbf342 100644
--- a/app/devices/devices.php
+++ b/app/devices/devices.php
@@ -78,6 +78,14 @@
 	$order_by = $_GET["order_by"];
 	$order = $_GET["order"];
 
+//set the time zone
+	if (isset($_SESSION['domain']['time_zone']['name'])) {
+		$time_zone = $_SESSION['domain']['time_zone']['name'];
+	}
+	else {
+		$time_zone = date_default_timezone_get();
+	}
+
 //get total devices count from the database
 	$sql = "select count(*) from v_devices ";
 	$sql .= "where domain_uuid = :domain_uuid ";
@@ -173,7 +181,9 @@
 	$offset = $rows_per_page * $page;
 
 //get the list
-	$sql = "select d.*, d2.device_label as alternate_label ";
+	$sql = "select d.*, d2.device_label as alternate_label, ";
+	$sql .= "to_char(timezone(:time_zone, d.device_provisioned_date), 'DD Mon YYYY') as provisioned_date_formatted, \n";
+	$sql .= "to_char(timezone(:time_zone, d.device_provisioned_date), 'HH12:MI:SS am') as provisioned_time_formatted \n";	
 	$sql .= "from v_devices as d, v_devices as d2 ";
 	if (isset($_GET['show']) && $_GET['show'] == "all" && permission_exists('device_all')) {
 		$sql .= ", v_domains as d3 ";
@@ -244,6 +254,7 @@
 		$sql .= "order by $order_by $order ";
 	}
 	$sql .= limit_offset($rows_per_page, $offset);
+	$parameters['time_zone'] = $time_zone;
 	$database = new database;
 	$devices = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
@@ -289,11 +300,11 @@
 		unset($margin_left);
 	}
 	if (permission_exists('device_edit') && $devices) {
-		echo button::create(['type'=>'button','label'=>$text['button-toggle'],'icon'=>$_SESSION['theme']['button_icon_toggle'],'name'=>'btn_toggle','style'=>$margin_left,'onclick'=>"modal_open('modal-toggle','btn_toggle');"]);
+		echo button::create(['type'=>'button','label'=>$text['button-toggle'],'icon'=>$_SESSION['theme']['button_icon_toggle'],'id'=>'btn_toggle','name'=>'btn_toggle','style'=>'display: none; '.$margin_left,'onclick'=>"modal_open('modal-toggle','btn_toggle');"]);
 		unset($margin_left);
 	}
 	if (permission_exists('device_delete') && $devices) {
-		echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'name'=>'btn_delete','style'=>$margin_left,'onclick'=>"modal_open('modal-delete','btn_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_left,'onclick'=>"modal_open('modal-delete','btn_delete');"]);
 		unset($margin_left);
 	}
 	echo 		"<form id='form_search' class='inline' method='get'>\n";
@@ -314,9 +325,9 @@
 	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)]);
+	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=''>";
+	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search']);
+	//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 != '') {
 		echo 	"<span style='margin-left: 15px;'>".$paging_controls_mini."</span>";
 	}
@@ -344,7 +355,7 @@
 	echo "<tr class='list-header'>\n";
 	if (permission_exists('device_edit') || permission_exists('device_delete')) {
 		echo "	<th class='checkbox'>\n";
-		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle();' ".($devices ?: "style='visibility: hidden;'").">\n";
+		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle(); checkbox_on_change(this);' ".($devices ?: "style='visibility: hidden;'").">\n";
 		echo "	</th>\n";
 	}
 	if ($_GET['show'] == "all" && permission_exists('device_all')) {
@@ -394,7 +405,7 @@
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('device_edit') || permission_exists('device_delete')) {
 				echo "	<td class='checkbox'>\n";
-				echo "		<input type='checkbox' name='devices[$x][checked]' id='checkbox_".$x."' value='true' onclick=\"if (!this.checked) { document.getElementById('checkbox_all').checked = false; }\">\n";
+				echo "		<input type='checkbox' name='devices[$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='devices[$x][uuid]' value='".escape($row['device_uuid'])."' />\n";
 				echo "	</td>\n";
 			}
@@ -427,7 +438,7 @@
 				echo $text['label-'.$row['device_enabled']];
 			}
 			echo "	</td>\n";
-			echo "	<td class='no-link'><a title='".escape($row['device_provisioned_agent'])."' href='javascript:void(0)'>".escape($row['device_provisioned_date'])."</a> &nbsp; ".escape($device_provisioned_method)." &nbsp; <a href='".escape($device_provisioned_method)."://".escape($row['device_provisioned_ip'])."' target='_blank'>".escape($row['device_provisioned_ip'])."</a>&nbsp;</td>\n";
+			echo "	<td class='no-link'><a title='".escape($row['device_provisioned_agent'])."' href='javascript:void(0)'>".escape($row['provisioned_date_formatted'])." ".escape($row['provisioned_time_formatted'])."</a> &nbsp; ".escape($device_provisioned_method)." &nbsp; <a href='".escape($device_provisioned_method)."://".escape($row['device_provisioned_ip'])."' target='_blank'>".escape($row['device_provisioned_ip'])."</a>&nbsp;</td>\n";
 			echo "	<td class='description overflow hide-sm-dn'>".escape($row['device_description'])."&nbsp;</td>\n";
 			if (permission_exists('device_edit') && $_SESSION['theme']['list_row_edit_button']['boolean'] == 'true') {
 				echo "	<td class='action-button'>";
diff --git a/app/devices/resources/classes/device.php b/app/devices/resources/classes/device.php
index 7d35a3a19c..4e7da2f666 100644
--- a/app/devices/resources/classes/device.php
+++ b/app/devices/resources/classes/device.php
@@ -120,6 +120,9 @@ include "root.php";
 				case "64167f":
 					$device_vendor = "polycom";
 					break;
+				case "482567":
+					$device_vendor = "polycom";
+					break;
 				case "000413":
 					$device_vendor = "snom";
 					break;
diff --git a/app/devices/resources/dashboard/device_keys.php b/app/devices/resources/dashboard/device_keys.php
index 4155b4f9a1..6536fbdd84 100644
--- a/app/devices/resources/dashboard/device_keys.php
+++ b/app/devices/resources/dashboard/device_keys.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) 2016-2021
+	Portions created by the Initial Developer are Copyright (C) 2016-2022
 	the Initial Developer. All Rights Reserved.
 
 */
@@ -231,7 +231,9 @@
 											$array['device_keys'][0]['device_key_line'] = $device_key_line;
 											$array['device_keys'][0]['device_key_value'] = $device_key_value;
 											$array['device_keys'][0]['device_key_label'] = $device_key_label;
-											$array['device_keys'][0]['device_key_icon'] = $device_key_icon;
+											if (permission_exists('device_key_icon')) {
+												$array['device_keys'][0]['device_key_icon'] = $device_key_icon;
+											}
 											$array['device_keys'][0]['device_key_category'] = $device_key_category;
 											$array['device_keys'][0]['device_key_vendor'] = $device_key_vendor;
 
@@ -252,7 +254,9 @@
 										$array['device_keys'][0]['device_key_type'] = $device_key_type;
 										$array['device_keys'][0]['device_key_value'] = $device_key_value;
 										$array['device_keys'][0]['device_key_label'] = $device_key_label;
-										$array['device_keys'][0]['device_key_icon'] = $device_key_icon;
+										if (permission_exists('device_key_icon')) {
+											$array['device_keys'][0]['device_key_icon'] = $device_key_icon;
+										}
 								}
 								if ($save) {
 									//add the temporary permissions
@@ -470,7 +474,9 @@
 					}
 					echo "		<th>".$text['label-device_key_value']."</th>\n";
 					echo "		<th>".$text['label-device_key_label']."</th>\n";
-					echo "		<th class='shrink'>".$text['label-device_key_icon']."</th>\n";
+					if (permission_exists('device_key_icon')) {
+						echo "		<th class='shrink'>".$text['label-device_key_icon']."</th>\n";
+					}
 					echo "	</tr>\n";
 				}
 
@@ -610,11 +616,13 @@
 				echo "		</td>\n";
 				echo "		<td class='input'>\n";
 				echo "			<input class='formfld' style='min-width: 50px; max-width: 100px;' type='text' name='device_keys[".$x."][device_key_label]' maxlength='255' value=\"".$row['device_key_label']."\">\n";
-				echo "		</td>\n";
-				echo "		<td class='input'>\n";
-				echo "			<input class='formfld' style='min-width: 50px; max-width: 100px;' type='text' name='device_keys[".$x."][device_key_icon]' maxlength='255' value=\"".$row['device_key_icon']."\">\n";
 				echo "			<input type='hidden' name='device_keys[".$x."][device_profile_uuid]' value=\"".$row['device_profile_uuid']."\">\n";
 				echo "		</td>\n";
+				if (permission_exists('device_key_icon')) {
+					echo "		<td class='input'>\n";
+					echo "			<input class='formfld' style='min-width: 50px; max-width: 100px;' type='text' name='device_keys[".$x."][device_key_icon]' maxlength='255' value=\"".$row['device_key_icon']."\">\n";
+					echo "		</td>\n";
+				}
 				echo "	</tr>\n";
 
 			//set the previous vendor
diff --git a/app/dialplan_inbound/app_defaults.php b/app/dialplan_inbound/app_defaults.php
index 911ff1f94e..94eb8378a8 100644
--- a/app/dialplan_inbound/app_defaults.php
+++ b/app/dialplan_inbound/app_defaults.php
@@ -52,7 +52,9 @@
 //if the public directory doesn't exist then create it
 	if ($domains_processed == 1) {
 		if (strlen($_SESSION['switch']['dialplan']['dir']) > 0) {
-			if (!is_dir($_SESSION['switch']['dialplan']['dir'].'/public')) { event_socket_mkdir($_SESSION['switch']['dialplan']['dir'].'/public'); }
+			if (!is_dir($_SESSION['switch']['dialplan']['dir'].'/public')) {
+				mkdir($_SESSION['switch']['dialplan']['dir'].'/public', 0770, false);
+			}
 		}
 	}
 
@@ -61,7 +63,7 @@
 		//make sure the public directory and xml file exist
 		if (strlen($_SESSION['switch']['dialplan']['dir']) > 0) {
 			if (!is_dir($_SESSION['switch']['dialplan']['dir'].'/public'.$_SESSION['domains'][$domain_uuid]['domain_name'])) {
-				event_socket_mkdir($_SESSION['switch']['dialplan']['dir'].'/public/'.$_SESSION['domains'][$domain_uuid]['domain_name']);
+				mkdir($_SESSION['switch']['dialplan']['dir'].'/public/'.$_SESSION['domains'][$domain_uuid]['domain_name'], 0770, false);
 			}
 			$file = $_SESSION['switch']['dialplan']['dir']."/public/".$_SESSION['domains'][$domain_uuid]['domain_name'].".xml";
 			if (!file_exists($file)) {
@@ -76,4 +78,4 @@
 		}
 		}
 
-?>
\ No newline at end of file
+?>
diff --git a/app/dialplan_inbound/app_languages.php b/app/dialplan_inbound/app_languages.php
index e9d6b27488..6862f09e37 100644
--- a/app/dialplan_inbound/app_languages.php
+++ b/app/dialplan_inbound/app_languages.php
@@ -728,7 +728,7 @@ $text['confirm-update-complete']['fr-fr'] = "Mis à jour";
 $text['confirm-update-complete']['he-il'] = "";
 $text['confirm-update-complete']['it-it'] = "Aggiornamento Completato.";
 $text['confirm-update-complete']['nl-nl'] = "Bijwerken gereed";
-$text['confirm-update-complete']['pl-pl'] = "Potwierdź";
+$text['confirm-update-complete']['pl-pl'] = "Zaktualizowano pomyślnie";
 $text['confirm-update-complete']['pt-br'] = "Atualização Completa"; //copied from pt-pt
 $text['confirm-update-complete']['pt-pt'] = "Actualização Efectuada";
 $text['confirm-update-complete']['ro-ro'] = "";
diff --git a/app/dialplan_outbound/dialplan_outbound_add.php b/app/dialplan_outbound/dialplan_outbound_add.php
index 58f01d8df0..a38d655b97 100644
--- a/app/dialplan_outbound/dialplan_outbound_add.php
+++ b/app/dialplan_outbound/dialplan_outbound_add.php
@@ -235,9 +235,9 @@
 							$label = $text['label-11d'];
 							$abbrv = "11d";
 							break;
-						case "^(?:\+?1)?(\d{10})$":
+						case "^\+?1?([2-9]\d{2}[2-9]\d{2}\d{4})$":
 							$label = $text['label-north_america'];
-							$abbrv = "10-11d";
+							$abbrv = "10-11-NANP";
 							break;
 						case "^(011\d{9,17})$":
 							$label = $text['label-north_america_intl'];
@@ -438,6 +438,7 @@
 						$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_data'] = 'false';
 						$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_order'] = $y * 10;
 						$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_group'] = '0';
+						$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_enabled'] = 'true';
 						$y++;
 
 						if (strlen($toll_allow) > 0) {
@@ -449,6 +450,7 @@
 							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_data'] = $toll_allow;
 							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_order'] = $y * 10;
 							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_group'] = '0';
+							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_enabled'] = 'true';
 							$y++;
 						}
 
@@ -460,6 +462,7 @@
 						$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_data'] = $dialplan_expression;
 						$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_order'] = $y * 10;
 						$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_group'] = '0';
+						$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_enabled'] = 'true';
 
 						if ($gateway_type != "transfer") {
 							if (strlen($accountcode) > 0) {
@@ -472,6 +475,7 @@
 								$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_data'] = 'sip_h_X-accountcode='.$accountcode;
 								$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_order'] = $y * 10;
 								$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_group'] = '0';
+								$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_enabled'] = 'true';
 							}
 							else {
 								$y++;
@@ -483,6 +487,7 @@
 								$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_data'] = 'sip_h_X-accountcode=${accountcode}';
 								$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_order'] = $y * 10;
 								$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_group'] = '0';
+								$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_enabled'] = 'true';
 							}
 						}
 
@@ -495,6 +500,7 @@
 						$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_data'] = 'call_direction=outbound';
 						$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_order'] = $y * 10;
 						$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_group'] = '0';
+						$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_enabled'] = 'true';
 
 						$y++;
 						$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_uuid'] = uuid();
@@ -505,6 +511,7 @@
 						$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_data'] = 'call_timeout';
 						$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_order'] = $y * 10;
 						$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_group'] = '0';
+						$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_enabled'] = 'true';
 
 						if ($gateway_type != "transfer") {
 							$y++;
@@ -516,6 +523,7 @@
 							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_data'] = 'hangup_after_bridge=true';
 							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_order'] = $y * 10;
 							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_group'] = '0';
+							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_enabled'] = 'true';
 
 							$y++;
 							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_uuid'] = uuid();
@@ -531,6 +539,7 @@
 							}
 							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_order'] = $y * 10;
 							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_group'] = '0';
+							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_enabled'] = 'true';
 
 							$y++;
 							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_uuid'] = uuid();
@@ -546,6 +555,20 @@
 							}
 							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_order'] = $y * 10;
 							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_group'] = '0';
+							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_enabled'] = 'true';
+
+							if ($dialplan_expression == '(^911$|^933$)') {
+								$y++;
+								$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_uuid'] = uuid();
+								$array['dialplans'][$x]['dialplan_details'][$y]['domain_uuid'] = $_SESSION['domain_uuid'];
+								$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_uuid'] = $dialplan_uuid;
+								$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_tag'] = 'action';
+								$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_type'] = 'lua';
+								$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_data'] = "email.lua \${email_to} \${email_from} '' 'Emergency Call' '\${sip_from_user}@\${domain_name} has called 911 emergency'";
+								$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_order'] = $y * 10;
+								$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_group'] = '0';
+								$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_enabled'] = 'false';
+							}
 
 							$y++;
 							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_uuid'] = uuid();
@@ -556,6 +579,7 @@
 							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_data'] = 'inherit_codec=true';
 							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_order'] = $y * 10;
 							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_group'] = '0';
+							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_enabled'] = 'true';
 
 							$y++;
 							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_uuid'] = uuid();
@@ -566,6 +590,7 @@
 							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_data'] = 'ignore_display_updates=true';
 							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_order'] = $y * 10;
 							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_group'] = '0';
+							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_enabled'] = 'true';
 
 							$y++;
 							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_uuid'] = uuid();
@@ -576,6 +601,7 @@
 							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_data'] = 'callee_id_number=$1';
 							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_order'] = $y * 10;
 							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_group'] = '0';
+							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_enabled'] = 'true';
 
 							$y++;
 							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_uuid'] = uuid();
@@ -586,6 +612,7 @@
 							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_data'] = 'continue_on_fail=1,2,3,6,18,21,27,28,31,34,38,41,42,44,58,88,111,403,501,602,607';
 							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_order'] = $y * 10;
 							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_group'] = '0';
+							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_enabled'] = 'true';
 						}
 
 						if ($gateway_type == "enum" || $gateway_2_type == "enum") {
@@ -598,6 +625,7 @@
 							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_data'] = $prefix_number."$1 e164.org";
 							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_order'] = $y * 10;
 							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_group'] = '0';
+							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_enabled'] = 'true';
 						}
 
 						if (strlen($limit) > 0) {
@@ -610,6 +638,7 @@
 							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_data'] = "hash \${domain_name} outbound ".$limit." !USER_BUSY";
 							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_order'] = $y * 10;
 							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_group'] = '0';
+							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_enabled'] = 'true';
 						}
 
 						if (strlen($outbound_prefix) > 0) {
@@ -622,6 +651,7 @@
 							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_data'] = 'outbound_prefix='.$outbound_prefix;
 							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_order'] = $y * 10;
 							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_group'] = '0';
+							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_enabled'] = 'true';
 						}
 
 						if ($pin_numbers_enable == "true") {
@@ -634,6 +664,7 @@
 							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_data'] = 'pin_number=database';
 							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_order'] = $y * 10;
 							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_group'] = '0';
+							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_enabled'] = 'true';
 
 							$y++;
 							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_uuid'] = uuid();
@@ -644,6 +675,7 @@
 							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_data'] = 'pin_number.lua';
 							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_order'] = $y * 10;
 							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_group'] = '0';
+							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_enabled'] = 'true';
 						}
 
 						if (strlen($prefix_number) > 2) {
@@ -656,6 +688,7 @@
 							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_data'] = 'provider_prefix='.$prefix_number;
 							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_order'] = $y * 10;
 							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_group'] = '0';
+							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_enabled'] = 'true';
 						}
 
 						if ($gateway_type == "transfer") { $dialplan_detail_type = 'transfer'; } else { $dialplan_detail_type = 'bridge'; }
@@ -668,6 +701,7 @@
 						$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_data'] = $bridge_data;
 						$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_order'] = $y * 10;
 						$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_group'] = '0';
+						$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_enabled'] = 'true';
 
 						if (strlen($bridge_2_data) > 0) {
 							$y++;
@@ -679,6 +713,7 @@
 							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_data'] = $bridge_2_data;
 							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_order'] = $y * 10;
 							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_group'] = '0';
+							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_enabled'] = 'true';
 						}
 
 						if (strlen($bridge_3_data) > 0) {
@@ -691,6 +726,7 @@
 							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_data'] = $bridge_3_data;
 							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_order'] = $y * 10;
 							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_group'] = '0';
+							$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_enabled'] = 'true';
 						}
 
 						unset($bridge_data);
@@ -1086,7 +1122,7 @@ function type_onchange(dialplan_detail_type) {
 	echo "	<option value='^(\\d{9})\$'>".$text['label-9d']."</option>\n";
 	echo "	<option value='^(\\d{10})\$'>".$text['label-10d']."</option>\n";
 	echo "	<option value='^\+?(\\d{11})\$'>".$text['label-11d']."</option>\n";
-	echo "	<option value='^\+?1?(\\d{10})\$'>".$text['label-north_america']."</option>\n";
+	echo "	<option value='^\+?1?([2-9]\\d{2}[2-9]\\d{2}\\d{4})\$'>".$text['label-north_america']."</option>\n";
 	echo "	<option value='^(011\\d{9,17})\$'>".$text['label-north_america_intl']."</option>\n";
 	echo "	<option value='^\+?1?((?:264|268|242|246|441|284|345|767|809|829|849|473|658|876|664|787|939|869|758|784|721|868|649|340|684|671|670|808)\d{7})\$'>".$text['label-north_america_islands']."</option>\n";
 	echo "	<option value='^(00\\d{9,17})\$'>".$text['label-europe_intl']."</option>\n";
diff --git a/app/dialplans/app_defaults.php b/app/dialplans/app_defaults.php
index 69d196d71d..8a1b61dcc0 100644
--- a/app/dialplans/app_defaults.php
+++ b/app/dialplans/app_defaults.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-2022
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -28,48 +28,49 @@
 	if ($domains_processed == 1) {
 
 		//get the list of domains
-			$sql = "select * from v_domains ";
-			$database = new database;
-			$domains = $database->select($sql, null, 'all');
-			unset($sql);
+		$sql = "select * from v_domains ";
+		$database = new database;
+		$domains = $database->select($sql, null, 'all');
+		unset($sql);
 
 		//dialplan class
-			$dialplan = new dialplan;
-			$dialplan->import($domains);
+		$dialplan = new dialplan;
+		$dialplan->import($domains);
 
 		//update the dialplan order
-			$database = new database;
-			$sql = "update v_dialplans set dialplan_order = '870' where dialplan_order = '980' and dialplan_name = 'cidlookup';\n";
-			$database->execute($sql);
-			$sql = "update v_dialplans set dialplan_order = '880' where dialplan_order = '990' and dialplan_name = 'call_screen';\n";
-			$database->execute($sql);
-			$sql = "update v_dialplans set dialplan_order = '890' where dialplan_order = '999' and dialplan_name = 'local_extension';\n";
-			$database->execute($sql);
-			unset($sql);
+		$database = new database;
+		$sql = "update v_dialplans set dialplan_order = '870' where dialplan_order = '980' and dialplan_name = 'cidlookup';\n";
+		$database->execute($sql);
+		$sql = "update v_dialplans set dialplan_order = '880' where dialplan_order = '990' and dialplan_name = 'call_screen';\n";
+		$database->execute($sql);
+		$sql = "update v_dialplans set dialplan_order = '890' where dialplan_order = '999' and dialplan_name = 'local_extension';\n";
+		$database->execute($sql);
+		unset($sql);
 
 		//set empty strings to null
-			$database = new database;
-			$sql = "update v_device_lines set outbound_proxy_primary = null where outbound_proxy_primary = '';\n";
-			$database->execute($sql);
-			$sql = "update v_device_lines set outbound_proxy_secondary = null where outbound_proxy_secondary = '';\n";
-			$database->execute($sql);
-			unset($sql);
+		$database = new database;
+		$sql = "update v_device_lines set outbound_proxy_primary = null where outbound_proxy_primary = '';\n";
+		$database->execute($sql);
+		$sql = "update v_device_lines set outbound_proxy_secondary = null where outbound_proxy_secondary = '';\n";
+		$database->execute($sql);
+		unset($sql);
 
 		//change recording_slots to recording_id
-			$database = new database;
-			$sql = "update v_dialplan_details set dialplan_detail_data = 'recording_id=true' ";
-			$sql .= "where dialplan_uuid in (select dialplan_uuid from v_dialplans where app_uuid = '430737df-5385-42d1-b933-22600d3fb79e') ";
-			$sql .= "and dialplan_detail_data = 'recording_slots=true'; \n";
-			$database->execute($sql);
-			$sql = "update v_dialplan_details set dialplan_detail_data = 'recording_id=false' ";
-			$sql .= "where dialplan_uuid in (select dialplan_uuid from v_dialplans where app_uuid = '430737df-5385-42d1-b933-22600d3fb79e') ";
-			$sql .= "and dialplan_detail_data = 'recording_slots=false'; \n";
-			$database->execute($sql);
-			unset($sql);
+		$database = new database;
+		$sql = "update v_dialplan_details set dialplan_detail_data = 'recording_id=true' ";
+		$sql .= "where dialplan_uuid in (select dialplan_uuid from v_dialplans where app_uuid = '430737df-5385-42d1-b933-22600d3fb79e') ";
+		$sql .= "and dialplan_detail_data = 'recording_slots=true'; \n";
+		$database->execute($sql);
+		$sql = "update v_dialplan_details set dialplan_detail_data = 'recording_id=false' ";
+		$sql .= "where dialplan_uuid in (select dialplan_uuid from v_dialplans where app_uuid = '430737df-5385-42d1-b933-22600d3fb79e') ";
+		$sql .= "and dialplan_detail_data = 'recording_slots=false'; \n";
+		$database->execute($sql);
+		unset($sql);
 	}
 
-//add xml for each dialplan where the dialplan xml is empty
+//additional dialplan upgrade commands 
 	if ($domains_processed == 1) {
+		//add xml for each dialplan where the dialplan xml is empty
 		$sql = "select domain_name ";
 		$sql .= "from v_domains \n";
 		$database = new database;
@@ -90,16 +91,28 @@
 		$dialplans->destination = "database";
 		$dialplans->is_empty = "dialplan_xml";
 		$array = $dialplans->xml();
-	}
 
-//delete the follow me bridge dialplan
-	if ($domains_processed == 1) {
+		//delete the follow me bridge dialplan
 		$database = new database;
 		$sql = "delete from v_dialplan_details where dialplan_uuid = '8ed73d1f-698f-466c-8a7a-1cf4cd229f7f' ";
 		$database->execute($sql);
 		$sql = "delete from v_dialplans where dialplan_uuid = '8ed73d1f-698f-466c-8a7a-1cf4cd229f7f' ";
 		$database->execute($sql);
 		unset($sql);
+
+		//change dialplan context ${domain_name} to global
+		$sql = "update v_dialplans set dialplan_context = 'global' ";
+		$sql .= "where dialplan_context = '\${domain_name}';\n";
+		$database->execute($sql);
+		unset($sql);
+
+		//update recordings dialplan change recording_id=true to recording_id
+		$sql = "update v_dialplans set dialplan_xml = replace(dialplan_xml, 'recording_id=true','recording_id=') where dialplan_xml like '%recording_id=true%'\n";
+		$database->execute($sql);
+		$sql = "update v_dialplan_details set dialplan_detail_data = 'recording_id='  where dialplan_detail_data = 'recording_id=true'\n";
+		$database->execute($sql);
+		unset($sql);
+
 	}
 
 //add not found dialplan to inbound routes
@@ -140,7 +153,7 @@
 				$database = new database;
 				$database->app_name = 'dialplans';
 				$database->app_uuid = '742714e5-8cdf-32fd-462c-cbe7e3d655db';
-				$database->save($array);
+				$database->save($array, false);
 				unset($array);
 
 				$p->delete('dialplan_add', 'temp');
diff --git a/app/dialplans/dialplan_edit.php b/app/dialplans/dialplan_edit.php
index 2f9812ae9d..2036c4ad08 100644
--- a/app/dialplans/dialplan_edit.php
+++ b/app/dialplans/dialplan_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):
@@ -86,10 +86,35 @@
 		$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
 		if ($fp) {
 			$result = event_socket_request($fp, 'api show application');
-			$_SESSION['switch']['applications'] = explode("\n\n", $result);
-			$_SESSION['switch']['applications'] = explode("\n", $_SESSION['switch']['applications'][0]);
+			
+			$show_applications = explode("\n\n", $result);
+			$raw_applications = explode("\n", $show_applications[0]);
 			unset($result);
 			unset($fp);
+
+			$previous_application = null;
+			foreach($raw_applications as $row) {
+				if (strlen($row) > 0) {
+					$application_array = explode(",", $row);
+					$application = $application_array[0];
+
+					if (
+						$application != "name" 
+						&& $application != "system" 
+						&& $application != "bgsystem" 
+						&& $application != "spawn" 
+						&& $application != "bg_spawn" 
+						&& $application != "spawn_stream" 
+						&& stristr($application, "[") != true
+					) {
+						if ($application != $previous_application) {
+							$applications[] = $application;
+						}
+					}
+					$previous_application = $application;
+				}
+			}
+			$_SESSION['switch']['applications'] = $applications;
 		} else {
 			$_SESSION['switch']['applications'] = Array();
 		}
@@ -221,9 +246,15 @@
 						if (!preg_match("/system/i", $row["dialplan_detail_type"])) {
 							$dialplan_detail_type = $row["dialplan_detail_type"];
 						}
+						if (!preg_match("/spawn/i", $row["dialplan_detail_type"])) {
+							$dialplan_detail_type = $row["dialplan_detail_type"];
+						}
 						if (!preg_match("/system/i", $row["dialplan_detail_data"])) {
 							$dialplan_detail_data = $row["dialplan_detail_data"];
 						}
+						if (!preg_match("/spawn/i", $row["dialplan_detail_data"])) {
+							$dialplan_detail_data = $row["dialplan_detail_data"];
+						}
 						$array['dialplans'][$x]['dialplan_details'][$y]['domain_uuid'] = is_uuid($_POST["domain_uuid"]) ? $_POST["domain_uuid"] : null;
 						$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_tag'] = $row["dialplan_detail_tag"];
 						$array['dialplans'][$x]['dialplan_details'][$y]['dialplan_detail_type'] = $dialplan_detail_type;
@@ -860,13 +891,8 @@
 								//if (strlen($dialplan_detail_tag) == 0 || $dialplan_detail_tag == "action" || $dialplan_detail_tag == "anti-action") {
 									echo "	<optgroup label='".$text['optgroup-applications']."'>\n";
 									if (is_array($_SESSION['switch']['applications'])) {
-										foreach ($_SESSION['switch']['applications'] as $row) {
-											if (strlen($row) > 0) {
-												$application = explode(",", $row);
-												if ($application[0] != "name" && $application[0] != "system" && stristr($application[0], "[") != true) {
-													echo "	<option value='".escape($application[0])."'>".escape($application[0])."</option>\n";
-												}
-											}
+										foreach ($_SESSION['switch']['applications'] as $application) {
+											echo "	<option value='".escape($application)."'>".escape($application)."</option>\n";
 										}
 									}
 									echo "	</optgroup>\n";
diff --git a/app/dialplans/dialplan_xml.php b/app/dialplans/dialplan_xml.php
index 9c81b62b3b..88f7c0f308 100644
--- a/app/dialplans/dialplan_xml.php
+++ b/app/dialplans/dialplan_xml.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):
@@ -81,12 +81,30 @@
 			if (preg_match("/.*([\"\'])bgsystem([\"\']).*>/i", $dialplan_xml)) {
 				$dialplan_valid = false;
 			}
+			if (preg_match("/.*([\"\'])bg_spawn([\"\']).*>/i", $dialplan_xml)) {
+				$dialplan_valid = false;
+			}
+			if (preg_match("/.*([\"\'])spawn([\"\']).*>/i", $dialplan_xml)) {
+				$dialplan_valid = false;
+			}
+			if (preg_match("/.*([\"\'])spawn_stream([\"\']).*>/i", $dialplan_xml)) {
+				$dialplan_valid = false;
+			}
 			if (preg_match("/.*{system.*/i", $dialplan_xml)) {
 				$dialplan_valid = false;
 			}
 			if (preg_match("/.*{bgsystem.*/i", $dialplan_xml)) {
 				$dialplan_valid = false;
 			}
+			if (preg_match("/.*{bg_spawn.*/i", $dialplan_xml)) {
+				$dialplan_valid = false;
+			}
+			if (preg_match("/.*{spawn.*/i", $dialplan_xml)) {
+				$dialplan_valid = false;
+			}
+			if (preg_match("/.*{spawn_stream.*/i", $dialplan_xml)) {
+				$dialplan_valid = false;
+			}
 
 		//disable xml entities and load the xml object to test if the xml is valid
 			libxml_disable_entity_loader(true);
diff --git a/app/dialplans/dialplans.php b/app/dialplans/dialplans.php
index 576f9ec1db..e3ebfca634 100644
--- a/app/dialplans/dialplans.php
+++ b/app/dialplans/dialplans.php
@@ -241,7 +241,7 @@
 			($app_uuid == "4b821450-926b-175a-af93-a03c441818b1" && permission_exists('time_condition_add')) ||
 			permission_exists('dialplan_add')
 			) {
-			echo button::create(['type'=>'button','label'=>$text['button-copy'],'icon'=>$_SESSION['theme']['button_icon_copy'],'name'=>'btn_copy','onclick'=>"modal_open('modal-copy','btn_copy');"]);
+			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 (
 			($app_uuid == "c03b422e-13a8-bd1b-e42b-b6b9b4d27ce4" && permission_exists('inbound_route_edit')) ||
@@ -250,7 +250,7 @@
 			($app_uuid == "4b821450-926b-175a-af93-a03c441818b1" && permission_exists('time_condition_edit')) ||
 			permission_exists('dialplan_edit')
 			) {
-			echo button::create(['type'=>'button','label'=>$text['button-toggle'],'icon'=>$_SESSION['theme']['button_icon_toggle'],'name'=>'btn_toggle','onclick'=>"modal_open('modal-toggle','btn_toggle');"]);
+			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 (
 			($app_uuid == "c03b422e-13a8-bd1b-e42b-b6b9b4d27ce4" && permission_exists('inbound_route_delete')) ||
@@ -259,7 +259,7 @@
 			($app_uuid == "4b821450-926b-175a-af93-a03c441818b1" && permission_exists('time_condition_delete')) ||
 			permission_exists('dialplan_delete')
 			) {
-			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 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";
@@ -285,13 +285,13 @@
 	if ($order) {
 		echo 	"<input type='hidden' name='order' value='".escape($order)."'>";
 	}
-	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 		"<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown=''>";
+	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search']);
 	$params[] = "app_uuid=".urlencode($app_uuid);
 	if ($order_by) { $params[] = "order_by=".urlencode($order_by); }
 	if ($order) { $params[] = "order=".urlencode($order); }
 	if ($_GET['show'] && permission_exists('dialplan_all')) { $params[] = "show=".urlencode($_GET['show']); }
-	echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'dialplans.php'.($params ? '?'.implode('&', $params) : null),'style'=>($search == '' ? 'display: none;' : null)]);
+	//echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'dialplans.php'.($params ? '?'.implode('&', $params) : null),'style'=>($search == '' ? 'display: none;' : null)]);
 	unset($params);
 	if ($paging_controls_mini != '') {
 		echo 	"<span style='margin-left: 15px;'>".$paging_controls_mini."</span>";
@@ -357,7 +357,7 @@
 		permission_exists('dialplan_add') || permission_exists('dialplan_edit') || permission_exists('dialplan_delete')
 		) {
 		echo "	<th class='checkbox'>\n";
-		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle();' ".($dialplans ?: "style='visibility: hidden;'").">\n";
+		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle(); checkbox_on_change(this);' ".($dialplans ?: "style='visibility: hidden;'").">\n";
 		echo "	</th>\n";
 	}
 	if ($_GET['show'] == "all" && permission_exists('dialplan_all')) {
@@ -414,7 +414,7 @@
 				($app_uuid == "4b821450-926b-175a-af93-a03c441818b1" && (permission_exists('time_condition_add') || permission_exists('time_condition_edit') || permission_exists('time_condition_delete')))
 				) {
 				echo "	<td class='checkbox'>\n";
-				echo "		<input type='checkbox' name='dialplans[$x][checked]' id='checkbox_".$x."' value='true' onclick=\"if (!this.checked) { document.getElementById('checkbox_all').checked = false; }\">\n";
+				echo "		<input type='checkbox' name='dialplans[$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='dialplans[$x][uuid]' value='".escape($row['dialplan_uuid'])."' />\n";
 				echo "	</td>\n";
 			}
diff --git a/app/dialplans/resources/classes/dialplan.php b/app/dialplans/resources/classes/dialplan.php
index 76aa43a59a..88ff1f3017 100644
--- a/app/dialplans/resources/classes/dialplan.php
+++ b/app/dialplans/resources/classes/dialplan.php
@@ -1,4 +1,3 @@
- 
 <?php
 /*
 	FusionPBX
@@ -280,9 +279,11 @@
 										//dialplan global
 											if (isset($dialplan['extension']['@attributes']['global']) && $dialplan['extension']['@attributes']['global'] == "true") {
 												$dialplan_global = true;
+												$dialplan_context = 'global';
 											}
 											else {
 												$dialplan_global = false;
+												$dialplan_context = $dialplan['@attributes']['name'];
 											}
 
 										//set the domain_uuid
@@ -301,7 +302,7 @@
 											$array['dialplans'][$x]['app_uuid'] = $dialplan['extension']['@attributes']['app_uuid'];
 											$array['dialplans'][$x]['dialplan_name'] = $dialplan['extension']['@attributes']['name'];
 											$array['dialplans'][$x]['dialplan_number'] = $dialplan['extension']['@attributes']['number'];
-											$array['dialplans'][$x]['dialplan_context'] = $dialplan['@attributes']['name'];
+											$array['dialplans'][$x]['dialplan_context'] = $dialplan_context;
 											if (strlen($dialplan['extension']['@attributes']['destination']) > 0) {
 												$array['dialplans'][$x]['dialplan_destination'] = $dialplan['extension']['@attributes']['destination'];
 											}
diff --git a/app/dialplans/resources/switch/conf/dialplan/020_domain-variables.xml b/app/dialplans/resources/switch/conf/dialplan/020_domain-variables.xml
index ebd243a48a..35a05b3d74 100644
--- a/app/dialplans/resources/switch/conf/dialplan/020_domain-variables.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/020_domain-variables.xml
@@ -1,7 +1,8 @@
 <context name="{v_context}">
 	<extension name="domain-variables" number="" continue="true" app_uuid="9f356fe7-8cf8-4c14-8fe2-6daf89304458" order="20">
 		<condition>
-			<action application="export" data="origination_callee_id_name=${destination_number}"/>
+			<action application="export" data="origination_callee_id_name=${destination_number}" enabled="true"/>
+			<action application="set" data="operator=1000" inline="true" enabled="true"/>
 		</condition>
 	</extension>
 </context>
diff --git a/app/dialplans/resources/switch/conf/dialplan/015_call_direction.xml b/app/dialplans/resources/switch/conf/dialplan/030_call_direction.xml
similarity index 98%
rename from app/dialplans/resources/switch/conf/dialplan/015_call_direction.xml
rename to app/dialplans/resources/switch/conf/dialplan/030_call_direction.xml
index ee0707156d..25c280abfd 100644
--- a/app/dialplans/resources/switch/conf/dialplan/015_call_direction.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/030_call_direction.xml
@@ -1,5 +1,5 @@
 <context name="{v_context}">
-	<extension name="call-direction" number="" continue="true" app_uuid="3780f814-5543-4350-b65d-563512d1fe71" enabled="true" order="15">
+	<extension name="call-direction" number="" continue="true" app_uuid="3780f814-5543-4350-b65d-563512d1fe71" enabled="true" order="30">
 		<condition field="${call_direction}" expression="^(inbound|outbound|local)$" break="never">
 			<anti-action application="export" data="call_direction=local" inline="true"/>
 		</condition>
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 43e987af5f..b4ad6ab590 100644
--- a/app/dialplans/resources/switch/conf/dialplan/050_user_record.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/050_user_record.xml
@@ -43,15 +43,18 @@
 		</condition>
 		<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"/>-->
-			<action application="set" data="recording_follow_transfer=true" inline="true"/>
-			<action application="bind_digit_action" data="local,*5,api:uuid_record,${uuid} mask ${recordings_dir}/${domain_name}/archive/${strftime(%Y)}/${strftime(%b)}/${strftime(%d)}/${uuid}.${record_ext},both,self"/>
-			<action application="bind_digit_action" data="local,*6,api:uuid_record,${uuid} unmask ${recordings_dir}/${domain_name}/archive/${strftime(%Y)}/${strftime(%b)}/${strftime(%d)}/${uuid}.${record_ext},both,self"/>
-			<action application="set" data="record_append=true" inline="true"/>
-			<action application="set" data="record_in_progress=true" inline="true"/>
-			<action application="set" data="api_on_answer=uuid_record ${uuid} start ${record_path}/${record_name}" inline="false"/>
+			<action application="set" data="record_path=${recordings_dir}/${domain_name}/archive/${strftime(%Y)}/${strftime(%b)}/${strftime(%d)}" inline="true" enabled="true"/>
+			<action application="set" data="record_name=${uuid}.${record_ext}" inline="true" enabled="true"/>
+			<!--<action application="set" data="record_name=${destination_number}-${caller_id_number}_${strftime(%Y-%m-%d %H:%M)}.${record_ext}" inline="true" enabled="true"/>-->
+			<action application="mkdir" data="${record_path}" enabled="true"/>
+			<action application="set" data="recording_follow_transfer=true" inline="true" enabled="true"/>
+			<action application="bind_digit_action" data="local,*5,api:uuid_record,${uuid} mask ${recordings_dir}/${domain_name}/archive/${strftime(%Y)}/${strftime(%b)}/${strftime(%d)}/${uuid}.${record_ext},both,self" enabled="true"/>
+			<action application="bind_digit_action" data="local,*6,api:uuid_record,${uuid} unmask ${recordings_dir}/${domain_name}/archive/${strftime(%Y)}/${strftime(%b)}/${strftime(%d)}/${uuid}.${record_ext},both,self" enabled="true"/>
+			<action application="set" data="record_append=true" inline="true" enabled="true"/>
+			<action application="set" data="record_in_progress=true" inline="true" enabled="true"/>
+			<action application="set" data="api_on_answer=uuid_record ${uuid} start ${record_path}/${record_name}" inline="false" enabled="false"/>
+			<action application="set" data="RECORD_ANSWER_REQ=true" enabled="true"/>
+			<action application="record_session" data="${record_path}/${record_name}" enabled="true"/>
 		</condition>
 	</extension>
 </context>
diff --git a/app/dialplans/resources/switch/conf/dialplan/070_speed_dial.xml b/app/dialplans/resources/switch/conf/dialplan/070_speed_dial.xml
index 58d2d034c0..1275cdc46d 100644
--- a/app/dialplans/resources/switch/conf/dialplan/070_speed_dial.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/070_speed_dial.xml
@@ -1,6 +1,7 @@
 <context name="{v_context}">
 	<extension name="speed_dial" number="*0[ext]" continue="false" app_uuid="1a4a2611-01e3-4582-982b-4ada4d314ea3" enabled="true" order="70">
 		<condition field="destination_number" expression="^\*0(.*)$">
+			<action application="set" data="permissions=false"/>
 			<action application="lua" data="app.lua speed_dial $1"/>
 		</condition>
 	</extension>
diff --git a/app/dialplans/resources/switch/conf/dialplan/085_bind_digit_action.xml b/app/dialplans/resources/switch/conf/dialplan/085_bind_digit_action.xml
index 1352817763..497fa6a745 100644
--- a/app/dialplans/resources/switch/conf/dialplan/085_bind_digit_action.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/085_bind_digit_action.xml
@@ -16,5 +16,10 @@
 			<!-- <action application="bind_digit_action" data="local,*0,exec:execute_extension,conf_xfer_from_dialplan XML conf-xfer@${domain_name},${bind_target},${bind_action_target}"/> -->
 			<action application="digit_action_set_realm" data="local"/>
 		</condition>
+		<condition field="${user_exists}" expression="true"/>
+		<condition field="${from_user_exists}" expression="true">
+			<action application="set" data="bridge_pre_execute_bleg_app=lua"/>
+			<action application="set" data="bridge_pre_execute_bleg_data=bind_digit_bleg.lua ${context}"/>
+		</condition>
 	</extension>
 </context>
diff --git a/app/dialplans/resources/switch/conf/dialplan/200_agent_status.xml b/app/dialplans/resources/switch/conf/dialplan/200_agent_status.xml
index 660e668bd2..3d9263e364 100644
--- a/app/dialplans/resources/switch/conf/dialplan/200_agent_status.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/200_agent_status.xml
@@ -1,10 +1,10 @@
 <context name="{v_context}">
 	<extension name="agent_status" number="*22" continue="false" app_uuid="2eb032c5-c79d-4096-ac90-8a47fe40f411" order="200">
-		<condition field="destination_number" expression="^\*22$" break="never">
+		<condition field="destination_number" expression="^\*22$" break="on-true">
 			<action application="set" data="agent_id=${sip_from_user}"/>
 			<action application="lua" data="app.lua agent_status"/>
 		</condition>
-		<condition field="destination_number" expression="^agent\+(.*)$">
+		<condition field="destination_number" expression="^(?:agent\+|\*22)(.+)$">
 			<action application="set" data="agent_id=$1"/>
 			<action application="lua" data="app.lua agent_status"/>
 		</condition>
diff --git a/app/dialplans/resources/switch/conf/dialplan/470_valet_park.xml b/app/dialplans/resources/switch/conf/dialplan/470_valet_park.xml
index c917204f5e..ea19232f9e 100644
--- a/app/dialplans/resources/switch/conf/dialplan/470_valet_park.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/470_valet_park.xml
@@ -17,7 +17,7 @@
 		<condition field="${park_in_use}" expression="true" break="never">
 			<action application="transfer" data="${referred_by_user} XML ${context}"/>
 			<anti-action application="set" data="effective_caller_id_name=${cond ${regex ${direction} | inbound} == true ? 'park#${caller_id_name}' : 'park#${callee_id_name}'}" inline="true"/>
-			<anti-action application="set" data="valet_parking_timeout=180"/>
+			<anti-action application="set" data="valet_parking_timeout=900"/>
 			<anti-action application="set" data="valet_hold_music=${hold_music}"/>
 			<anti-action application="set" data="valet_parking_orbit_exten=${referred_by_user}"/>
 			<anti-action application="answer" data=""/>
diff --git a/app/dialplans/resources/switch/conf/dialplan/474_valet_park_in.xml b/app/dialplans/resources/switch/conf/dialplan/474_valet_park_in.xml
index 37e2e186fc..0edeecf145 100644
--- a/app/dialplans/resources/switch/conf/dialplan/474_valet_park_in.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/474_valet_park_in.xml
@@ -5,7 +5,7 @@
 			<action application="set" data="valet_announce_slot=disable" enabled="false"/>
 			<action application="set" data="valet_hold_music=${hold_music}" enabled="true"/>
 			<action application="set" data="valet_parking_orbit_exten=${referred_by_user}" enabled="true"/>
-			<action application="set" data="valet_parking_timeout=180" enabled="true"/>
+			<action application="set" data="valet_parking_timeout=900" enabled="true"/>
 			<action application="valet_park" data="5900@${domain_name} auto in 5901 5999" enabled="true"/>
 		</condition>
 	</extension>
diff --git a/app/dialplans/resources/switch/conf/dialplan/480_operator.xml b/app/dialplans/resources/switch/conf/dialplan/480_operator.xml
index 49fd9e823d..9c74cbe8ed 100644
--- a/app/dialplans/resources/switch/conf/dialplan/480_operator.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/480_operator.xml
@@ -1,11 +1,11 @@
 <context name="{v_context}">
-	<extension name="operator" number="0" continue="false" app_uuid="0e1cd2d7-9d84-4959-8b6c-0cb23de4de59" order="480">
+	<extension name="operator" number="0" continue="false" app_uuid="0e1cd2d7-9d84-4959-8b6c-0cb23de4de59" enabled="false" order="480">
 		<condition field="destination_number" expression="^0$|^operator$">
-			<action application="export" data="transfer_context={v_context}" />
-			<action application="bind_meta_app" data="4 ab s execute_extension::att_xfer XML ${context}" />
-			<action application="bind_meta_app" data="5 ab s execute_extension::xfer_vm XML ${context}" />
-			<action application="set" data="domain_name={v_context}" />
-			<action application="transfer" data="1001 XML {v_context}"/>
+			<action application="export" data="transfer_context={v_context}" enabled="true"/>
+			<action application="bind_meta_app" data="4 ab s execute_extension::att_xfer XML ${context}" enabled="false"/>
+			<action application="bind_meta_app" data="5 ab s execute_extension::xfer_vm XML ${context}" enabled="false"/>
+			<action application="set" data="domain_name={v_context}" enabled="true"/>
+			<action application="transfer" data="${operator} XML {v_context}" enabled="true"/>
 		</condition>
 	</extension>
 </context>
diff --git a/app/dialplans/resources/switch/conf/dialplan/490_do-not-disturb.xml b/app/dialplans/resources/switch/conf/dialplan/490_do-not-disturb.xml
index 032952d038..9abee17d50 100644
--- a/app/dialplans/resources/switch/conf/dialplan/490_do-not-disturb.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/490_do-not-disturb.xml
@@ -1,22 +1,18 @@
 <context name="{v_context}">
 	<extension name="do-not-disturb" number="*77,*78,*79" continue="false" app_uuid="df32d982-e39e-4ae5-a46d-aed1893873f2" enabled="true" order="490">
 		<condition field="destination_number" expression="^\*77$" break="on-true">
-			<action application="limit" data="hash dnd ${sip_from_uri} 1 !USER_BUSY"/>
 			<action application="set" data="enabled=toggle"/>
 			<action application="lua" data="do_not_disturb.lua"/>
 		</condition>
 		<condition field="destination_number" expression="^\*78$|\*363$" break="on-true">
-			<action application="limit" data="hash dnd ${sip_from_uri} 1 !USER_BUSY"/>
 			<action application="set" data="enabled=true"/>
 			<action application="lua" data="do_not_disturb.lua"/>
 		</condition>
 		<condition field="destination_number" expression="^\*79$" break="on-true">
-			<action application="limit" data="hash dnd ${sip_from_uri} 1 !USER_BUSY"/>
 			<action application="set" data="enabled=false"/>
 			<action application="lua" data="do_not_disturb.lua"/>
 		</condition>
 		<condition field="destination_number" expression="^dnd\+${caller_id_number}$" break="on-true">
-			<action application="limit" data="hash dnd ${sip_from_uri} 1 !USER_BUSY"/>
 			<action application="set" data="enabled=toggle"/>
 			<action application="lua" data="do_not_disturb.lua"/>
 		</condition>
diff --git a/app/dialplans/resources/switch/conf/dialplan/500_call-forward.xml b/app/dialplans/resources/switch/conf/dialplan/500_call-forward.xml
index 3ceee6e3e2..12cbe2f995 100644
--- a/app/dialplans/resources/switch/conf/dialplan/500_call-forward.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/500_call-forward.xml
@@ -5,6 +5,11 @@
 			<action application="set" data="enabled=true"/>
 			<action application="lua" data="call_forward.lua $1"/>
 		</condition>
+		<condition field="destination_number" expression="^\*72$" break="on-true">
+			<action application="set" data="request_id=false"/>
+			<action application="set" data="enabled=true"/>
+			<action application="lua" data="call_forward.lua"/>
+		</condition>
 		<condition field="destination_number" expression="^\*73$" break="on-true">
 			<action application="set" data="request_id=false"/>
 			<action application="set" data="enabled=false"/>
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 ca85eeedbf..3d6fdbdbe5 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,12 +1,20 @@
 <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" 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="set" data="accountcode=${user_data ${destination_number}@${domain_name} var accountcode}" inline="true" enabled="false"/>
-		<action application="transfer" data="${forward_all_destination} XML ${domain_name}"/>
-	</condition>
+	    <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"/>
+	    </condition>
+	    <condition field="${call_direction}" expression="^local$" break="on-true">
+	        <action application="set" data="outbound_caller_id_name=${user_data ${destination_number}@${domain_name} var outbound_caller_id_name}" inline="true"/>
+	        <action application="set" data="outbound_caller_id_number=${user_data ${destination_number}@${domain_name} var outbound_caller_id_number}" inline="true"/>
+	        <action application="set" data="accountcode=${user_data ${destination_number}@${domain_name} var accountcode}" inline="true"/>
+	        <action application="transfer" data="${forward_all_destination} XML ${domain_name}"/>
+	    </condition>
+	    <condition field="${call_direction}" expression="inbound" break="on-true">
+	        <action application="set" data="outbound_caller_id_name=${caller_id_name}" inline="true"/>
+	        <action application="set" data="outbound_caller_id_number=${caller_id_number}" inline="true"/>
+	        <action application="set" data="accountcode=${user_data ${destination_number}@${domain_name} var accountcode}" inline="true"/>
+	        <action application="transfer" data="${forward_all_destination} XML ${domain_name}"/>
+	    </condition>
 	</extension>
 </context>
diff --git a/app/dialplans/resources/switch/conf/dialplan/890_local_extension.xml b/app/dialplans/resources/switch/conf/dialplan/890_local_extension.xml
index 79d2ccce4d..0f0b628eb7 100644
--- a/app/dialplans/resources/switch/conf/dialplan/890_local_extension.xml
+++ b/app/dialplans/resources/switch/conf/dialplan/890_local_extension.xml
@@ -15,6 +15,7 @@
 			<action application="set" data="called_party_call_group=${user_data(${dialed_extension}@${domain_name} var call_group)}"/>
 			<!--<action application="export" data="nolocal:sip_secure_media=${user_data(${dialed_extension}@${domain_name} var sip_secure_media)}"/>-->
 			<action application="hash" data="insert/${domain_name}-last_dial/${called_party_call_group}/${uuid}"/>
+			<action application="set" data="fail_on_single_reject=true"/>
 			<action application="set" data="api_hangup_hook=lua app.lua hangup"/>
 			<action application="export" data="domain_name=${domain_name}"/>
 			<!-- standard method -->
diff --git a/app/domain_limits/resources/dashboard/domain_limits.php b/app/domain_limits/resources/dashboard/domain_limits.php
index 8f935537a4..d892917288 100644
--- a/app/domain_limits/resources/dashboard/domain_limits.php
+++ b/app/domain_limits/resources/dashboard/domain_limits.php
@@ -19,9 +19,8 @@
 	$text = $language->get($_SESSION['domain']['language']['code'], 'core/user_settings');
 
 //domain limits
-	echo "<div class='hud_box'>\n";
-
 	if (is_array($_SESSION['limit']) && sizeof($_SESSION['limit']) > 0) {
+		echo "<div class='hud_box'>\n";
 		$c = 0;
 		$row_style["0"] = "row_style0";
 		$row_style["1"] = "row_style1";
@@ -58,10 +57,10 @@
 		if ($show_stat) {
 			//add doughnut chart
 			?>
-			<div style='display: flex; flex-wrap: wrap; justify-content: center; padding-bottom: 20px;'>
+			<div style='display: flex; flex-wrap: wrap; justify-content: center; padding-bottom: 25px;'>
 				<div style='width: 175px; height: 175px;'>
 					<canvas id='domain_limits_chart'></canvas>
-					<span style='color: rgb(125,125,125);'><?php echo $hud_stat_title;?></span>
+					<div style='color: rgb(125,125,125); margin-top: 2px;'><?php echo $hud_stat_title;?></div>
 				</div>
 			</div>
 
diff --git a/app/email_logs/email_logs.php b/app/email_logs/email_logs.php
index bcbbfe2846..e25ea47224 100644
--- a/app/email_logs/email_logs.php
+++ b/app/email_logs/email_logs.php
@@ -44,13 +44,6 @@
 //process the http post data by action
 	if ($action != '' && is_array($emails) && @sizeof($emails) != 0) {
 		switch ($action) {
-			case 'download':
-				if (permission_exists('email_log_download')) {
-					$obj = new email_logs;
-					$obj->download($emails);
-					message::add($text['message-download_failed'],'negative',7000); //download failed, set message
-				}
-				break;
 			case 'resend':
 				if (permission_exists('email_log_resend')) {
 					$obj = new email_logs;
@@ -75,22 +68,23 @@
 
 //add the search term
 	$search = strtolower($_GET["search"]);
-	if (strlen($search) > 0) {
-		$sql_search = "and (";
-		$sql_search .= "lower(type) like :search ";
-		$sql_search .= "or lower(email) like :search ";
-		$sql_search .= ") ";
-		$parameters['search'] = '%'.$search.'%';
-	}
 
 //prepare to page the results
 	$sql = "select count(*) from v_email_logs ";
-	$sql .= "where true ";
-	if (permission_exists('email_log_all') && $_REQUEST['show'] != 'all') {
-		$sql .= "and domain_uuid = :domain_uuid ";
+	if ($_REQUEST['show'] == 'all' && permission_exists('email_log_all')) {
+		$sql .= "where true ";
+	}
+	else {
+		$sql .= "where domain_uuid = :domain_uuid ";
 		$parameters['domain_uuid'] = $domain_uuid;
 	}
-	$sql .= $sql_search;
+	if (strlen($search) > 0) {
+		$sql = "and (";
+		$sql .= "lower(type) like :search ";
+		$sql .= "or lower(email) like :search ";
+		$sql .= ") ";
+		$parameters['search'] = '%'.$search.'%';
+	}
 	$database = new database;
 	$num_rows = $database->select($sql, $parameters, 'column');
 
@@ -107,7 +101,21 @@
 	$offset = $rows_per_page * $page;
 
 //get the list
-	$sql = str_replace('count(*)', '*', $sql);
+	$sql = "select * from v_email_logs ";
+	if ($_REQUEST['show'] == 'all' && permission_exists('email_log_all')) {
+		$sql .= "where true ";
+	}
+	else {
+		$sql .= "where domain_uuid = :domain_uuid ";
+		$parameters['domain_uuid'] = $domain_uuid;
+	}
+	if (strlen($search) > 0) {
+		$sql = "and (";
+		$sql .= "lower(type) like :search ";
+		$sql .= "or lower(email) like :search ";
+		$sql .= ") ";
+		$parameters['search'] = '%'.$search.'%';
+	}
 	$sql .= order_by($order_by, $order, 'sent_date', 'desc');
 	$sql .= limit_offset($rows_per_page, $offset);
 	$database = new database;
@@ -199,9 +207,6 @@
 	if (permission_exists('email_log_resend') && $result) {
 		echo button::create(['type'=>'button','label'=>$text['button-resend'],'icon'=>'paper-plane','onclick'=>"modal_open('modal-resend','btn_resend');"]);
 	}
-	if (permission_exists('email_log_download') && $result) {
-		echo button::create(['type'=>'button','label'=>$text['button-download'],'icon'=>$_SESSION['theme']['button_icon_download'],'onclick'=>"list_action_set('download'); list_form_submit('form_list');"]);
-	}
 	if (permission_exists('email_log_delete') && $result) {
 		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');"]);
 	}
@@ -215,9 +220,9 @@
 		}
 	}
 	echo button::create(['label'=>$text['button-refresh'],'icon'=>$_SESSION['theme']['button_icon_refresh'],'type'=>'button','onclick'=>'document.location.reload();']);
-	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'=>'email_logs.php','style'=>($search == '' ? 'display: none;' : null)]);
+	echo 		"<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown=''>";
+	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search']);
+	//echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'email_logs.php','style'=>($search == '' ? 'display: none;' : null)]);
 	if ($paging_controls_mini != '') {
 		echo 	"<span style='margin-left: 15px;'>".$paging_controls_mini."</span>";
 	}
@@ -271,7 +276,7 @@
 
 	echo "<table class='list'>\n";
 	echo "<tr class='list-header'>\n";
-	if (permission_exists('email_log_download') || permission_exists('email_log_resend') || permission_exists('email_log_delete')) {
+	if (permission_exists('email_log_resend') || permission_exists('email_log_delete')) {
 		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";
@@ -294,7 +299,7 @@
 		foreach($result as $row) {
 			$list_row_url = "email_log_view.php?id=".urlencode($row['email_log_uuid']);
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
-			if (permission_exists('email_log_download') || permission_exists('email_log_resend') || permission_exists('email_log_delete')) {
+			if (permission_exists('email_log_resend') || permission_exists('email_log_delete')) {
 				echo "	<td class='checkbox'>\n";
 				echo "		<input type='checkbox' name='emails[$x][checked]' id='checkbox_".$x."' value='true' onclick=\"if (!this.checked) { document.getElementById('checkbox_all').checked = false; }\">\n";
 				echo "		<input type='hidden' name='emails[$x][uuid]' value='".escape($row['email_log_uuid'])."' />\n";
@@ -311,9 +316,6 @@
 			if (permission_exists('email_log_resend')) {
 				echo button::create(['type'=>'button','title'=>$text['button-resend'],'icon'=>'paper-plane','onclick'=>"list_self_check('checkbox_".$x."'); list_action_set('resend'); list_form_submit('form_list')"]);
 			}
-			if (permission_exists('email_log_download')) {
-				echo button::create(['type'=>'button','title'=>$text['button-download'],'icon'=>$_SESSION['theme']['button_icon_download'],'onclick'=>"list_self_check('checkbox_".$x."'); list_action_set('download'); list_form_submit('form_list')"]);
-			}
 			echo "	</td>\n";
 			echo "	<td class='description overflow hide-sm-dn no-link'>";
 			echo button::create(['type'=>'button','class'=>'link','label'=>$text['label-reference_cdr'],'link'=>PROJECT_PATH.'/app/xml_cdr/xml_cdr_details.php?id='.urlencode($row['call_uuid'])]);
@@ -368,4 +370,4 @@
 //include the footer
 	require_once "resources/footer.php";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/email_logs/email_test.php b/app/email_logs/email_test.php
index 76187f2e00..d9951bf1b6 100644
--- a/app/email_logs/email_test.php
+++ b/app/email_logs/email_test.php
@@ -1,23 +1,28 @@
 <?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-2019
-	the Initial Developer. All Rights Reserved.
-	Contributor(s):
-	Mark J Crane <markjcrane@fusionpbx.com>
-*/
+/*-
+ * Copyright (c) 2008-2022 Mark J Crane <markjcrane@fusionpbx.com>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
 
 //includes
 	require_once "root.php";
@@ -34,23 +39,21 @@
 	$language = new text;
 	$text = $language->get();
 
-//send email
+//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']);
 
+//show the content
 	echo "<b>".$text['header-settings']."</b>\n";
 	echo "<br><br>\n";
 	ksort($_SESSION['email']);
@@ -71,26 +74,48 @@
 	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";
+//prepare the email
+	$email_recipient = check_str($_POST['to']);
 
-	ob_start();
-	$sent = !send_email($recipient, 'Test Message', $eml_body, $eml_error, null, null, 3, 3) ? false : true;
-	$response = ob_get_clean();
+	$email_body = "<b>Test Message</b><br /><br />\n";
+	$email_body .= "This message is a test of the SMTP settings configured within your PBX.<br />\n";
+	$email_body .= "If you received this message, your current SMTP settings are valid.<br /><br />\n";
 
-	echo $response;
+	//$email_attachments[0]['type'] = 'file';
+	//$email_attachments[0]['name'] = 'logo.png';
+	//$email_attachments[0]['value'] = $_SERVER["PROJECT_ROOT"]."/themes/default/images/logo.png";
 
+	$email_from_address = $_SESSION['email']['smtp_from']['text'];
+	$email_from_name = $_SESSION['email']['smtp_from_name']['text'];
+
+//send email
+	//ob_start();
+	//$sent = !send_email($email_recipient, 'Test Message', $email_body, $email_error, null, null, 3, 3, $email_attachments) ? false : true;
+	//$email_response = ob_get_clean();
+
+//send email
+	$email = new email;
+	$email->recipients = $email_recipient;
+	$email->subject = 'Test Message';
+	$email->body = $email_body;
+	$email->from_address = $email_from_address;
+	$email->from_name = $email_from_name;
+	$email->attachments = $email_attachments;
+	$email->debug_level = 3;
+	$email->method = 'direct';
+	$sent = $email->send();
+	//$email_error = $email->email_error;
+
+//show additional information
 	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 $sent ? "Message Sent Successfully<br>Receipient: <a href='mailto:".$email_recipient."'>".$email_recipient."</a>" : "Message Failed...<br>".$email_error;
 
 	echo "<br>\n";
 	echo "<center>\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";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/email_logs/resources/classes/email_logs.php b/app/email_logs/resources/classes/email_logs.php
index 6542543771..62189ba274 100644
--- a/app/email_logs/resources/classes/email_logs.php
+++ b/app/email_logs/resources/classes/email_logs.php
@@ -147,42 +147,41 @@ if (!class_exists('email_logs')) {
 										$sql .= "where email_log_uuid = :email_log_uuid ";
 										$parameters['email_log_uuid'] = $uuid;
 										$database = new database;
-										$email = $database->select($sql, $parameters, 'column');
-										$found = $email != '' ? true : false;
+										$msg = $database->select($sql, $parameters, 'column');
+										$found = $msg != '' ? true : false;
 										unset($sql, $parameters, $row);
 
 									//resend email
 										if ($found) {
-											$msg = $email;
 											$resend = true;
 											require "secure/v_mailto.php";
-											if ($mailer_error == '') {
+
+											if ($sent) {
 
 												//build the delete array
-													$array[$this->table][$x][$this->uuid_prefix.'uuid'] = $uuid;
+												$array[$this->table][$x][$this->uuid_prefix.'uuid'] = $uuid;
 
 												//grant temporary permissions
-													$p = new permissions;
-													$p->add('email_log_delete', 'temp');
+												$p = new permissions;
+												$p->add('email_log_delete', 'temp');
 
 												//delete the email log
-													$database = new database;
-													$database->app_name = $this->app_name;
-													$database->app_uuid = $this->app_uuid;
-													$database->delete($array);
-													unset($array);
+												$database = new database;
+												$database->app_name = $this->app_name;
+												$database->app_uuid = $this->app_uuid;
+												$database->delete($array);
+												unset($array);
 
 												//revoke temporary permissions
-													$p->delete('email_log_delete', 'temp');
+												$p->delete('email_log_delete', 'temp');
 
 												//set message
-													message::add($text['message-message_resent']);
+												message::add($text['message-message_resent']);
 
 											}
 											else {
-
 												//set message
-													message::add($text['message-resend_failed'].": ".$mailer_error, 'negative', 4000);
+												message::add($text['message-resend_failed'].": ".$email->email_error, 'negative', 4000);
 
 											}
 										}
@@ -198,129 +197,7 @@ if (!class_exists('email_logs')) {
 			}
 		}
 
-		/**
-		 * download records
-		 */
-		public function download($records) {
-			if (permission_exists($this->permission_prefix.'download')) {
-
-				//add multi-lingual support
-					$language = new text;
-					$text = $language->get();
-
-				//validate the token
-					$token = new token;
-					if (!$token->validate('/app/email_logs/email_logs.php')) {
-						message::add($text['message-invalid_token'],'negative');
-						header('Location: '.$this->list_page);
-						exit;
-					}
-
-				//download multiple records (eventually zip individual emails together)
-					if (is_array($records) && @sizeof($records) != 0) {
-
-						//retrieve checked records
-							foreach($records as $x => $record) {
-								if ($record['checked'] == 'true' && is_uuid($record['uuid'])) {
-									$uuids[] = $record['uuid'];
-								}
-							}
-
-						//download emails
-							if (is_array($uuids) && @sizeof($uuids) != 0) {
-								foreach ($uuids as $x => $uuid) {
-
-									//get email details
-										$sql = "select call_uuid, sent_date, type, email from v_email_logs ";
-										$sql .= "where email_log_uuid = :email_log_uuid ";
-										$parameters['email_log_uuid'] = $uuid;
-										$database = new database;
-										$row = $database->select($sql, $parameters, 'row');
-										if (is_array($row) && @sizeof($row) != 0 && is_uuid($row['call_uuid'])) {
-
-											//santize filename components
-												$sent_date = str_replace('-','', $row['sent_date']);
-												$sent_date = str_replace(':','', $sent_date);
-												$sent_date = str_replace(' ','_', $sent_date);
-												$type = strtolower($row['type']);
-												$email_filename = $sent_date.'_'.$type.'_'.$row['call_uuid'].'.eml';
-
-											//single email
-												if (@sizeof($uuids) == 1) {
-
-													//set headers
-														header("Content-Type: message/rfc822");
-														header('Content-Disposition: attachment; filename="'.$email_filename.'"');
-														header("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1
-														header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); // Date in the past
-														header("Content-Length: ".strlen($row['email']));
-
-													//output content
-														echo $row['email'];
-														exit;
-												}
-
-											//multiple emails
-												else {
-													if (is_dir($_SESSION['server']['temp']['dir'])) {
-
-														if (file_put_contents($_SESSION['server']['temp']['dir'].'/'.$email_filename, $row['email'])) {
-															$email_files[] = $_SESSION['server']['temp']['dir'].'/'.$email_filename;
-														}
-													}
-												}
-
-										}
-										unset($sql, $parameters, $row);
-								}
-
-								//download compressed file
-								if (@sizeof($email_files) != 0) {
-
-									//define compressed file name
-										$compressed_filename = 'emails_'.date('Ymd_His').'.zip';
-
-									//compress email files
-										$command = 'zip -mj '.$_SESSION['server']['temp']['dir'].'/'.$compressed_filename.' '.implode(' ', $email_files).' 2>&1';
-										exec($command, $response, $restore_errlevel);
-										unset($command);
-
-									//push download
-										if (file_exists($_SESSION['server']['temp']['dir'].'/'.$compressed_filename)) {
-
-											//open file
-												session_cache_limiter('public');
-												$fd = fopen($_SESSION['server']['temp']['dir'].'/'.$compressed_filename, 'rb');
-
-											//set headers
-												header("Content-Type: application/zip");
-												header('Content-Disposition: attachment; filename="'.$compressed_filename.'"');
-												header("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1
-												header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); // Date in the past
-												header("Content-Length: ".filesize($_SESSION['server']['temp']['dir'].'/'.$compressed_filename));
-
-											//output file content
-												ob_clean();
-												fpassthru($fd);
-												fclose($fd);
-
-											//remove compressed file
-												@unlink($_SESSION['server']['temp']['dir'].'/'.$compressed_filename);
-												exit;
-
-										}
-
-								}
-
-							}
-
-					}
-
-			}
-
-		} //method
-
 	} //class
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/app/email_queue/app_config.php b/app/email_queue/app_config.php
new file mode 100644
index 0000000000..05ea72513e
--- /dev/null
+++ b/app/email_queue/app_config.php
@@ -0,0 +1,216 @@
+<?php
+
+	//application details
+		$apps[$x]['name'] = 'Email Queue';
+		$apps[$x]['uuid'] = '5befdf60-a242-445f-91b3-2e9ee3e0ddf7';
+		$apps[$x]['category'] = 'system';
+		$apps[$x]['subcategory'] = 'email';
+		$apps[$x]['version'] = '2.10';
+		$apps[$x]['license'] = 'Member';
+		$apps[$x]['url'] = 'http://www.fusionpbx.com';
+		$apps[$x]['description']['en-us'] = '';
+
+	//default settings
+		$y=0;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "35c40afc-8b08-45f1-a96c-2f8a5352cd2d";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "email_queue";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "enabled";
+		$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'] = "Enable or disable the email queue.";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "237efdc4-ba71-4c8f-8040-28d0e3a3d6bf";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "email_queue";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "limit";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "30";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Limit the records to process at one time.";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "c4905655-2d67-4eda-9df0-029931c12c6f";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "email_queue";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "interval";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "120";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "How often to process the email queue. Default 120 seconds.";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "d945ed66-39c1-44eb-b596-49c9399d8018";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "email_queue";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "retry_limit";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "3";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Number of tries to send an email before giving up.";
+		$y++;
+		//$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "a9eb5a16-e018-4a83-975e-eee2ed31f923";
+		//$apps[$x]['default_settings'][$y]['default_setting_category'] = "email_queue";
+		//$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "retry_interval";
+		//$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		//$apps[$x]['default_settings'][$y]['default_setting_value'] = "300";
+		//$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		//$apps[$x]['default_settings'][$y]['default_setting_description'] = "Time in seconds to wait before trying to email again. Default 300 seconds";
+
+	//permission details
+		$y = 0;
+		$apps[$x]['permissions'][$y]['name'] = 'email_queue_view';
+		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = 'email_queue_add';
+		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = 'email_queue_edit';
+		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = 'email_queue_delete';
+		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = 'email_queue_all';
+		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = 'email_queue_attachment_view';
+		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = 'email_queue_attachment_add';
+		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = 'email_queue_attachment_edit';
+		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = 'email_queue_attachment_delete';
+		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = 'email_queue_attachment_all';
+		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$y++;
+
+	//email queue
+		$y = 0;
+		$apps[$x]['db'][$y]['table']['name'] = 'v_email_queue';
+		$apps[$x]['db'][$y]['table']['parent'] = '';
+		$z = 0;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'email_queue_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'] = 'hostname';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['search_by'] = 'true';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'email_date';
+		$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'] = 'false';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'email_from';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['search_by'] = 'true';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'email_to';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['search_by'] = 'true';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'email_subject';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['search_by'] = 'true';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'email_body';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['search_by'] = 'true';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'email_status';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['search_by'] = 'true';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'email_retry_count';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'numeric';
+		$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'] = 'email_action_before';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['search_by'] = 'true';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'email_action_after';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['search_by'] = 'true';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'email_uuid';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'email_transcription';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['search_by'] = 'true';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'email_debug';
+		$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'email_substatus';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		//$apps[$x]['db'][$y]['fields'][$z]['search_by'] = 'true';
+		$z++;
+
+	//attachments
+		$y = 6;
+		$apps[$x]['db'][$y]['table']['name'] = 'v_email_queue_attachments';
+		$apps[$x]['db'][$y]['table']['parent'] = 'v_email_queue';
+		$z = 0;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'email_queue_attachment_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'] = 'email_queue_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_email_queue';
+		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = 'email_queue_uuid';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'email_attachment_type';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['search_by'] = '';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'email_attachment_path';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['search_by'] = '';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'email_attachment_name';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['search_by'] = '';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'email_attachment_base64';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['search_by'] = '';
+		$z++;
+
+?>
diff --git a/app/email_queue/app_languages.php b/app/email_queue/app_languages.php
new file mode 100644
index 0000000000..fa0e6ba9db
--- /dev/null
+++ b/app/email_queue/app_languages.php
@@ -0,0 +1,504 @@
+<?php
+
+	//Email Queue
+		$text['title-email_queue']['en-us'] = 'Email Queue';
+		$text['title-email_queue']['ar-eg'] = '';
+		$text['title-email_queue']['de-at'] = '';
+		$text['title-email_queue']['de-ch'] = '';
+		$text['title-email_queue']['de-de'] = '';
+		$text['title-email_queue']['es-cl'] = '';
+		$text['title-email_queue']['es-mx'] = '';
+		$text['title-email_queue']['fr-ca'] = '';
+		$text['title-email_queue']['fr-fr'] = '';
+		$text['title-email_queue']['he-il'] = '';
+		$text['title-email_queue']['it-it'] = '';
+		$text['title-email_queue']['nl-nl'] = '';
+		$text['title-email_queue']['pl-pl'] = '';
+		$text['title-email_queue']['pt-br'] = '';
+		$text['title-email_queue']['pt-pt'] = '';
+		$text['title-email_queue']['ro-ro'] = '';
+		$text['title-email_queue']['ru-ru'] = '';
+		$text['title-email_queue']['sv-se'] = '';
+		$text['title-email_queue']['uk-ua'] = '';
+
+		$text['title-email_queue']['en-us'] = 'Email Queue';
+		$text['title-email_queue']['ar-eg'] = '';
+		$text['title-email_queue']['de-at'] = '';
+		$text['title-email_queue']['de-ch'] = '';
+		$text['title-email_queue']['de-de'] = '';
+		$text['title-email_queue']['es-cl'] = '';
+		$text['title-email_queue']['es-mx'] = '';
+		$text['title-email_queue']['fr-ca'] = '';
+		$text['title-email_queue']['fr-fr'] = '';
+		$text['title-email_queue']['he-il'] = '';
+		$text['title-email_queue']['it-it'] = '';
+		$text['title-email_queue']['nl-nl'] = '';
+		$text['title-email_queue']['pl-pl'] = '';
+		$text['title-email_queue']['pt-br'] = '';
+		$text['title-email_queue']['pt-pt'] = '';
+		$text['title-email_queue']['ro-ro'] = '';
+		$text['title-email_queue']['ru-ru'] = '';
+		$text['title-email_queue']['sv-se'] = '';
+		$text['title-email_queue']['uk-ua'] = '';
+
+		$text['title_description-email_queue']['en-us'] = '';
+		$text['title_description-email_queue']['ar-eg'] = '';
+		$text['title_description-email_queue']['de-at'] = '';
+		$text['title_description-email_queue']['de-ch'] = '';
+		$text['title_description-email_queue']['de-de'] = '';
+		$text['title_description-email_queue']['es-cl'] = '';
+		$text['title_description-email_queue']['es-mx'] = '';
+		$text['title_description-email_queue']['fr-ca'] = '';
+		$text['title_description-email_queue']['fr-fr'] = '';
+		$text['title_description-email_queue']['he-il'] = '';
+		$text['title_description-email_queue']['it-it'] = '';
+		$text['title_description-email_queue']['nl-nl'] = '';
+		$text['title_description-email_queue']['pl-pl'] = '';
+		$text['title_description-email_queue']['pt-br'] = '';
+		$text['title_description-email_queue']['pt-pt'] = '';
+		$text['title_description-email_queue']['ro-ro'] = '';
+		$text['title_description-email_queue']['ru-ru'] = '';
+		$text['title_description-email_queue']['sv-se'] = '';
+		$text['title_description-email_queue']['uk-ua'] = '';
+
+		$text['label-email_date']['en-us'] = 'Date';
+		$text['label-email_date']['ar-eg'] = '';
+		$text['label-email_date']['de-at'] = '';
+		$text['label-email_date']['de-ch'] = '';
+		$text['label-email_date']['de-de'] = '';
+		$text['label-email_date']['es-cl'] = '';
+		$text['label-email_date']['es-mx'] = '';
+		$text['label-email_date']['fr-ca'] = '';
+		$text['label-email_date']['fr-fr'] = '';
+		$text['label-email_date']['he-il'] = '';
+		$text['label-email_date']['it-it'] = '';
+		$text['label-email_date']['nl-nl'] = '';
+		$text['label-email_date']['pl-pl'] = '';
+		$text['label-email_date']['pt-br'] = '';
+		$text['label-email_date']['pt-pt'] = '';
+		$text['label-email_date']['ro-ro'] = '';
+		$text['label-email_date']['ru-ru'] = '';
+		$text['label-email_date']['sv-se'] = '';
+		$text['label-email_date']['uk-ua'] = '';
+
+		$text['description-email_date']['en-us'] = 'Enter the email date.';
+		$text['description-email_date']['ar-eg'] = '';
+		$text['description-email_date']['de-at'] = '';
+		$text['description-email_date']['de-ch'] = '';
+		$text['description-email_date']['de-de'] = '';
+		$text['description-email_date']['es-cl'] = '';
+		$text['description-email_date']['es-mx'] = '';
+		$text['description-email_date']['fr-ca'] = '';
+		$text['description-email_date']['fr-fr'] = '';
+		$text['description-email_date']['he-il'] = '';
+		$text['description-email_date']['it-it'] = '';
+		$text['description-email_date']['nl-nl'] = '';
+		$text['description-email_date']['pl-pl'] = '';
+		$text['description-email_date']['pt-br'] = '';
+		$text['description-email_date']['pt-pt'] = '';
+		$text['description-email_date']['ro-ro'] = '';
+		$text['description-email_date']['ru-ru'] = '';
+		$text['description-email_date']['sv-se'] = '';
+		$text['description-email_date']['uk-ua'] = '';
+
+		$text['label-email_from']['en-us'] = 'From';
+		$text['label-email_from']['ar-eg'] = '';
+		$text['label-email_from']['de-at'] = '';
+		$text['label-email_from']['de-ch'] = '';
+		$text['label-email_from']['de-de'] = '';
+		$text['label-email_from']['es-cl'] = '';
+		$text['label-email_from']['es-mx'] = '';
+		$text['label-email_from']['fr-ca'] = '';
+		$text['label-email_from']['fr-fr'] = '';
+		$text['label-email_from']['he-il'] = '';
+		$text['label-email_from']['it-it'] = '';
+		$text['label-email_from']['nl-nl'] = '';
+		$text['label-email_from']['pl-pl'] = '';
+		$text['label-email_from']['pt-br'] = '';
+		$text['label-email_from']['pt-pt'] = '';
+		$text['label-email_from']['ro-ro'] = '';
+		$text['label-email_from']['ru-ru'] = '';
+		$text['label-email_from']['sv-se'] = '';
+		$text['label-email_from']['uk-ua'] = '';
+
+		$text['description-email_from']['en-us'] = 'Enter the email from.';
+		$text['description-email_from']['ar-eg'] = '';
+		$text['description-email_from']['de-at'] = '';
+		$text['description-email_from']['de-ch'] = '';
+		$text['description-email_from']['de-de'] = '';
+		$text['description-email_from']['es-cl'] = '';
+		$text['description-email_from']['es-mx'] = '';
+		$text['description-email_from']['fr-ca'] = '';
+		$text['description-email_from']['fr-fr'] = '';
+		$text['description-email_from']['he-il'] = '';
+		$text['description-email_from']['it-it'] = '';
+		$text['description-email_from']['nl-nl'] = '';
+		$text['description-email_from']['pl-pl'] = '';
+		$text['description-email_from']['pt-br'] = '';
+		$text['description-email_from']['pt-pt'] = '';
+		$text['description-email_from']['ro-ro'] = '';
+		$text['description-email_from']['ru-ru'] = '';
+		$text['description-email_from']['sv-se'] = '';
+		$text['description-email_from']['uk-ua'] = '';
+
+		$text['label-email_to']['en-us'] = 'To';
+		$text['label-email_to']['ar-eg'] = '';
+		$text['label-email_to']['de-at'] = '';
+		$text['label-email_to']['de-ch'] = '';
+		$text['label-email_to']['de-de'] = '';
+		$text['label-email_to']['es-cl'] = '';
+		$text['label-email_to']['es-mx'] = '';
+		$text['label-email_to']['fr-ca'] = '';
+		$text['label-email_to']['fr-fr'] = '';
+		$text['label-email_to']['he-il'] = '';
+		$text['label-email_to']['it-it'] = '';
+		$text['label-email_to']['nl-nl'] = '';
+		$text['label-email_to']['pl-pl'] = '';
+		$text['label-email_to']['pt-br'] = '';
+		$text['label-email_to']['pt-pt'] = '';
+		$text['label-email_to']['ro-ro'] = '';
+		$text['label-email_to']['ru-ru'] = '';
+		$text['label-email_to']['sv-se'] = '';
+		$text['label-email_to']['uk-ua'] = '';
+
+		$text['description-email_to']['en-us'] = 'Enter the email to.';
+		$text['description-email_to']['ar-eg'] = '';
+		$text['description-email_to']['de-at'] = '';
+		$text['description-email_to']['de-ch'] = '';
+		$text['description-email_to']['de-de'] = '';
+		$text['description-email_to']['es-cl'] = '';
+		$text['description-email_to']['es-mx'] = '';
+		$text['description-email_to']['fr-ca'] = '';
+		$text['description-email_to']['fr-fr'] = '';
+		$text['description-email_to']['he-il'] = '';
+		$text['description-email_to']['it-it'] = '';
+		$text['description-email_to']['nl-nl'] = '';
+		$text['description-email_to']['pl-pl'] = '';
+		$text['description-email_to']['pt-br'] = '';
+		$text['description-email_to']['pt-pt'] = '';
+		$text['description-email_to']['ro-ro'] = '';
+		$text['description-email_to']['ru-ru'] = '';
+		$text['description-email_to']['sv-se'] = '';
+		$text['description-email_to']['uk-ua'] = '';
+
+		$text['label-email_cc']['en-us'] = 'CC';
+		$text['label-email_cc']['ar-eg'] = '';
+		$text['label-email_cc']['de-at'] = '';
+		$text['label-email_cc']['de-ch'] = '';
+		$text['label-email_cc']['de-de'] = '';
+		$text['label-email_cc']['es-cl'] = '';
+		$text['label-email_cc']['es-mx'] = '';
+		$text['label-email_cc']['fr-ca'] = '';
+		$text['label-email_cc']['fr-fr'] = '';
+		$text['label-email_cc']['he-il'] = '';
+		$text['label-email_cc']['it-it'] = '';
+		$text['label-email_cc']['nl-nl'] = '';
+		$text['label-email_cc']['pl-pl'] = '';
+		$text['label-email_cc']['pt-br'] = '';
+		$text['label-email_cc']['pt-pt'] = '';
+		$text['label-email_cc']['ro-ro'] = '';
+		$text['label-email_cc']['ru-ru'] = '';
+		$text['label-email_cc']['sv-se'] = '';
+		$text['label-email_cc']['uk-ua'] = '';
+
+		$text['description-email_cc']['en-us'] = 'Enter the email cc.';
+		$text['description-email_cc']['ar-eg'] = '';
+		$text['description-email_cc']['de-at'] = '';
+		$text['description-email_cc']['de-ch'] = '';
+		$text['description-email_cc']['de-de'] = '';
+		$text['description-email_cc']['es-cl'] = '';
+		$text['description-email_cc']['es-mx'] = '';
+		$text['description-email_cc']['fr-ca'] = '';
+		$text['description-email_cc']['fr-fr'] = '';
+		$text['description-email_cc']['he-il'] = '';
+		$text['description-email_cc']['it-it'] = '';
+		$text['description-email_cc']['nl-nl'] = '';
+		$text['description-email_cc']['pl-pl'] = '';
+		$text['description-email_cc']['pt-br'] = '';
+		$text['description-email_cc']['pt-pt'] = '';
+		$text['description-email_cc']['ro-ro'] = '';
+		$text['description-email_cc']['ru-ru'] = '';
+		$text['description-email_cc']['sv-se'] = '';
+		$text['description-email_cc']['uk-ua'] = '';
+
+		$text['label-email_bcc']['en-us'] = 'BCC';
+		$text['label-email_bcc']['ar-eg'] = '';
+		$text['label-email_bcc']['de-at'] = '';
+		$text['label-email_bcc']['de-ch'] = '';
+		$text['label-email_bcc']['de-de'] = '';
+		$text['label-email_bcc']['es-cl'] = '';
+		$text['label-email_bcc']['es-mx'] = '';
+		$text['label-email_bcc']['fr-ca'] = '';
+		$text['label-email_bcc']['fr-fr'] = '';
+		$text['label-email_bcc']['he-il'] = '';
+		$text['label-email_bcc']['it-it'] = '';
+		$text['label-email_bcc']['nl-nl'] = '';
+		$text['label-email_bcc']['pl-pl'] = '';
+		$text['label-email_bcc']['pt-br'] = '';
+		$text['label-email_bcc']['pt-pt'] = '';
+		$text['label-email_bcc']['ro-ro'] = '';
+		$text['label-email_bcc']['ru-ru'] = '';
+		$text['label-email_bcc']['sv-se'] = '';
+		$text['label-email_bcc']['uk-ua'] = '';
+
+		$text['description-email_bcc']['en-us'] = 'Enter the email bcc.';
+		$text['description-email_bcc']['ar-eg'] = '';
+		$text['description-email_bcc']['de-at'] = '';
+		$text['description-email_bcc']['de-ch'] = '';
+		$text['description-email_bcc']['de-de'] = '';
+		$text['description-email_bcc']['es-cl'] = '';
+		$text['description-email_bcc']['es-mx'] = '';
+		$text['description-email_bcc']['fr-ca'] = '';
+		$text['description-email_bcc']['fr-fr'] = '';
+		$text['description-email_bcc']['he-il'] = '';
+		$text['description-email_bcc']['it-it'] = '';
+		$text['description-email_bcc']['nl-nl'] = '';
+		$text['description-email_bcc']['pl-pl'] = '';
+		$text['description-email_bcc']['pt-br'] = '';
+		$text['description-email_bcc']['pt-pt'] = '';
+		$text['description-email_bcc']['ro-ro'] = '';
+		$text['description-email_bcc']['ru-ru'] = '';
+		$text['description-email_bcc']['sv-se'] = '';
+		$text['description-email_bcc']['uk-ua'] = '';
+
+		$text['label-email_subject']['en-us'] = 'Subject';
+		$text['label-email_subject']['ar-eg'] = '';
+		$text['label-email_subject']['de-at'] = '';
+		$text['label-email_subject']['de-ch'] = '';
+		$text['label-email_subject']['de-de'] = '';
+		$text['label-email_subject']['es-cl'] = '';
+		$text['label-email_subject']['es-mx'] = '';
+		$text['label-email_subject']['fr-ca'] = '';
+		$text['label-email_subject']['fr-fr'] = '';
+		$text['label-email_subject']['he-il'] = '';
+		$text['label-email_subject']['it-it'] = '';
+		$text['label-email_subject']['nl-nl'] = '';
+		$text['label-email_subject']['pl-pl'] = '';
+		$text['label-email_subject']['pt-br'] = '';
+		$text['label-email_subject']['pt-pt'] = '';
+		$text['label-email_subject']['ro-ro'] = '';
+		$text['label-email_subject']['ru-ru'] = '';
+		$text['label-email_subject']['sv-se'] = '';
+		$text['label-email_subject']['uk-ua'] = '';
+
+		$text['description-email_subject']['en-us'] = 'Enter the email subject.';
+		$text['description-email_subject']['ar-eg'] = '';
+		$text['description-email_subject']['de-at'] = '';
+		$text['description-email_subject']['de-ch'] = '';
+		$text['description-email_subject']['de-de'] = '';
+		$text['description-email_subject']['es-cl'] = '';
+		$text['description-email_subject']['es-mx'] = '';
+		$text['description-email_subject']['fr-ca'] = '';
+		$text['description-email_subject']['fr-fr'] = '';
+		$text['description-email_subject']['he-il'] = '';
+		$text['description-email_subject']['it-it'] = '';
+		$text['description-email_subject']['nl-nl'] = '';
+		$text['description-email_subject']['pl-pl'] = '';
+		$text['description-email_subject']['pt-br'] = '';
+		$text['description-email_subject']['pt-pt'] = '';
+		$text['description-email_subject']['ro-ro'] = '';
+		$text['description-email_subject']['ru-ru'] = '';
+		$text['description-email_subject']['sv-se'] = '';
+		$text['description-email_subject']['uk-ua'] = '';
+
+		$text['label-email_body']['en-us'] = 'Body';
+		$text['label-email_body']['ar-eg'] = '';
+		$text['label-email_body']['de-at'] = '';
+		$text['label-email_body']['de-ch'] = '';
+		$text['label-email_body']['de-de'] = '';
+		$text['label-email_body']['es-cl'] = '';
+		$text['label-email_body']['es-mx'] = '';
+		$text['label-email_body']['fr-ca'] = '';
+		$text['label-email_body']['fr-fr'] = '';
+		$text['label-email_body']['he-il'] = '';
+		$text['label-email_body']['it-it'] = '';
+		$text['label-email_body']['nl-nl'] = '';
+		$text['label-email_body']['pl-pl'] = '';
+		$text['label-email_body']['pt-br'] = '';
+		$text['label-email_body']['pt-pt'] = '';
+		$text['label-email_body']['ro-ro'] = '';
+		$text['label-email_body']['ru-ru'] = '';
+		$text['label-email_body']['sv-se'] = '';
+		$text['label-email_body']['uk-ua'] = '';
+
+		$text['description-email_body']['en-us'] = 'Enter the email body.';
+		$text['description-email_body']['ar-eg'] = '';
+		$text['description-email_body']['de-at'] = '';
+		$text['description-email_body']['de-ch'] = '';
+		$text['description-email_body']['de-de'] = '';
+		$text['description-email_body']['es-cl'] = '';
+		$text['description-email_body']['es-mx'] = '';
+		$text['description-email_body']['fr-ca'] = '';
+		$text['description-email_body']['fr-fr'] = '';
+		$text['description-email_body']['he-il'] = '';
+		$text['description-email_body']['it-it'] = '';
+		$text['description-email_body']['nl-nl'] = '';
+		$text['description-email_body']['pl-pl'] = '';
+		$text['description-email_body']['pt-br'] = '';
+		$text['description-email_body']['pt-pt'] = '';
+		$text['description-email_body']['ro-ro'] = '';
+		$text['description-email_body']['ru-ru'] = '';
+		$text['description-email_body']['sv-se'] = '';
+		$text['description-email_body']['uk-ua'] = '';
+
+		$text['label-email_status']['en-us'] = 'Status';
+		$text['label-email_status']['ar-eg'] = '';
+		$text['label-email_status']['de-at'] = '';
+		$text['label-email_status']['de-ch'] = '';
+		$text['label-email_status']['de-de'] = '';
+		$text['label-email_status']['es-cl'] = '';
+		$text['label-email_status']['es-mx'] = '';
+		$text['label-email_status']['fr-ca'] = '';
+		$text['label-email_status']['fr-fr'] = '';
+		$text['label-email_status']['he-il'] = '';
+		$text['label-email_status']['it-it'] = '';
+		$text['label-email_status']['nl-nl'] = '';
+		$text['label-email_status']['pl-pl'] = '';
+		$text['label-email_status']['pt-br'] = '';
+		$text['label-email_status']['pt-pt'] = '';
+		$text['label-email_status']['ro-ro'] = '';
+		$text['label-email_status']['ru-ru'] = '';
+		$text['label-email_status']['sv-se'] = '';
+		$text['label-email_status']['uk-ua'] = '';
+
+		$text['description-email_status']['en-us'] = 'Enter the email status.';
+		$text['description-email_status']['ar-eg'] = '';
+		$text['description-email_status']['de-at'] = '';
+		$text['description-email_status']['de-ch'] = '';
+		$text['description-email_status']['de-de'] = '';
+		$text['description-email_status']['es-cl'] = '';
+		$text['description-email_status']['es-mx'] = '';
+		$text['description-email_status']['fr-ca'] = '';
+		$text['description-email_status']['fr-fr'] = '';
+		$text['description-email_status']['he-il'] = '';
+		$text['description-email_status']['it-it'] = '';
+		$text['description-email_status']['nl-nl'] = '';
+		$text['description-email_status']['pl-pl'] = '';
+		$text['description-email_status']['pt-br'] = '';
+		$text['description-email_status']['pt-pt'] = '';
+		$text['description-email_status']['ro-ro'] = '';
+		$text['description-email_status']['ru-ru'] = '';
+		$text['description-email_status']['sv-se'] = '';
+		$text['description-email_status']['uk-ua'] = '';
+
+		$text['label-email_action_before']['en-us'] = 'Before Email';
+		$text['label-email_action_before']['ar-eg'] = '';
+		$text['label-email_action_before']['de-at'] = '';
+		$text['label-email_action_before']['de-ch'] = '';
+		$text['label-email_action_before']['de-de'] = '';
+		$text['label-email_action_before']['es-cl'] = '';
+		$text['label-email_action_before']['es-mx'] = '';
+		$text['label-email_action_before']['fr-ca'] = '';
+		$text['label-email_action_before']['fr-fr'] = '';
+		$text['label-email_action_before']['he-il'] = '';
+		$text['label-email_action_before']['it-it'] = '';
+		$text['label-email_action_before']['nl-nl'] = '';
+		$text['label-email_action_before']['pl-pl'] = '';
+		$text['label-email_action_before']['pt-br'] = '';
+		$text['label-email_action_before']['pt-pt'] = '';
+		$text['label-email_action_before']['ro-ro'] = '';
+		$text['label-email_action_before']['ru-ru'] = '';
+		$text['label-email_action_before']['sv-se'] = '';
+		$text['label-email_action_before']['uk-ua'] = '';
+
+		$text['description-email_action_before']['en-us'] = 'Enter the action before sending the email.';
+		$text['description-email_action_before']['ar-eg'] = '';
+		$text['description-email_action_before']['de-at'] = '';
+		$text['description-email_action_before']['de-ch'] = '';
+		$text['description-email_action_before']['de-de'] = '';
+		$text['description-email_action_before']['es-cl'] = '';
+		$text['description-email_action_before']['es-mx'] = '';
+		$text['description-email_action_before']['fr-ca'] = '';
+		$text['description-email_action_before']['fr-fr'] = '';
+		$text['description-email_action_before']['he-il'] = '';
+		$text['description-email_action_before']['it-it'] = '';
+		$text['description-email_action_before']['nl-nl'] = '';
+		$text['description-email_action_before']['pl-pl'] = '';
+		$text['description-email_action_before']['pt-br'] = '';
+		$text['description-email_action_before']['pt-pt'] = '';
+		$text['description-email_action_before']['ro-ro'] = '';
+		$text['description-email_action_before']['ru-ru'] = '';
+		$text['description-email_action_before']['sv-se'] = '';
+		$text['description-email_action_before']['uk-ua'] = '';
+
+		$text['label-email_action_after']['en-us'] = 'After Email';
+		$text['label-email_action_after']['ar-eg'] = '';
+		$text['label-email_action_after']['de-at'] = '';
+		$text['label-email_action_after']['de-ch'] = '';
+		$text['label-email_action_after']['de-de'] = '';
+		$text['label-email_action_after']['es-cl'] = '';
+		$text['label-email_action_after']['es-mx'] = '';
+		$text['label-email_action_after']['fr-ca'] = '';
+		$text['label-email_action_after']['fr-fr'] = '';
+		$text['label-email_action_after']['he-il'] = '';
+		$text['label-email_action_after']['it-it'] = '';
+		$text['label-email_action_after']['nl-nl'] = '';
+		$text['label-email_action_after']['pl-pl'] = '';
+		$text['label-email_action_after']['pt-br'] = '';
+		$text['label-email_action_after']['pt-pt'] = '';
+		$text['label-email_action_after']['ro-ro'] = '';
+		$text['label-email_action_after']['ru-ru'] = '';
+		$text['label-email_action_after']['sv-se'] = '';
+		$text['label-email_action_after']['uk-ua'] = '';
+
+		$text['description-email_action_after']['en-us'] = 'Enter the action after sending the email.';
+		$text['description-email_action_after']['ar-eg'] = '';
+		$text['description-email_action_after']['de-at'] = '';
+		$text['description-email_action_after']['de-ch'] = '';
+		$text['description-email_action_after']['de-de'] = '';
+		$text['description-email_action_after']['es-cl'] = '';
+		$text['description-email_action_after']['es-mx'] = '';
+		$text['description-email_action_after']['fr-ca'] = '';
+		$text['description-email_action_after']['fr-fr'] = '';
+		$text['description-email_action_after']['he-il'] = '';
+		$text['description-email_action_after']['it-it'] = '';
+		$text['description-email_action_after']['nl-nl'] = '';
+		$text['description-email_action_after']['pl-pl'] = '';
+		$text['description-email_action_after']['pt-br'] = '';
+		$text['description-email_action_after']['pt-pt'] = '';
+		$text['description-email_action_after']['ro-ro'] = '';
+		$text['description-email_action_after']['ru-ru'] = '';
+		$text['description-email_action_after']['sv-se'] = '';
+		$text['description-email_action_after']['uk-ua'] = '';
+
+		$text['label-email_retry_count']['en-us'] = 'Retry';
+		$text['label-email_retry_count']['ar-eg'] = '';
+		$text['label-email_retry_count']['de-at'] = '';
+		$text['label-email_retry_count']['de-ch'] = '';
+		$text['label-email_retry_count']['de-de'] = '';
+		$text['label-email_retry_count']['es-cl'] = '';
+		$text['label-email_retry_count']['es-mx'] = '';
+		$text['label-email_retry_count']['fr-ca'] = '';
+		$text['label-email_retry_count']['fr-fr'] = '';
+		$text['label-email_retry_count']['he-il'] = '';
+		$text['label-email_retry_count']['it-it'] = '';
+		$text['label-email_retry_count']['nl-nl'] = '';
+		$text['label-email_retry_count']['pl-pl'] = '';
+		$text['label-email_retry_count']['pt-br'] = '';
+		$text['label-email_retry_count']['pt-pt'] = '';
+		$text['label-email_retry_count']['ro-ro'] = '';
+		$text['label-email_retry_count']['ru-ru'] = '';
+		$text['label-email_retry_count']['sv-se'] = '';
+		$text['label-email_retry_count']['uk-ua'] = '';
+
+		$text['description-email_retry_count']['en-us'] = 'Enter the email retry.';
+		$text['description-email_retry_count']['ar-eg'] = '';
+		$text['description-email_retry_count']['de-at'] = '';
+		$text['description-email_retry_count']['de-ch'] = '';
+		$text['description-email_retry_count']['de-de'] = '';
+		$text['description-email_retry_count']['es-cl'] = '';
+		$text['description-email_retry_count']['es-mx'] = '';
+		$text['description-email_retry_count']['fr-ca'] = '';
+		$text['description-email_retry_count']['fr-fr'] = '';
+		$text['description-email_retry_count']['he-il'] = '';
+		$text['description-email_retry_count']['it-it'] = '';
+		$text['description-email_retry_count']['nl-nl'] = '';
+		$text['description-email_retry_count']['pl-pl'] = '';
+		$text['description-email_retry_count']['pt-br'] = '';
+		$text['description-email_retry_count']['pt-pt'] = '';
+		$text['description-email_retry_count']['ro-ro'] = '';
+		$text['description-email_retry_count']['ru-ru'] = '';
+		$text['description-email_retry_count']['sv-se'] = '';
+		$text['description-email_retry_count']['uk-ua'] = '';
+
+?>
\ No newline at end of file
diff --git a/app/email_queue/app_menu.php b/app/email_queue/app_menu.php
new file mode 100644
index 0000000000..995e08170c
--- /dev/null
+++ b/app/email_queue/app_menu.php
@@ -0,0 +1,19 @@
+<?php
+
+$apps[$x]['menu'][0]['title']['en-us'] = 'Email Queue';
+$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'] = 'dfa6a878-e2b0-4051-acaf-f6ffc13b9abf';
+$apps[$x]['menu'][0]['parent_uuid'] = '0438b504-8613-7887-c420-c837ffb20cb1';
+$apps[$x]['menu'][0]['category'] = 'internal';
+$apps[$x]['menu'][0]['path'] = '/app/email_queue/email_queue.php';
+$apps[$x]['menu'][0]['groups'][] = 'superadmin';
+//$apps[$x]['menu'][0]['groups'][] = 'admin';
+//$apps[$x]['menu'][0]['groups'][] = 'user';
+
+?>
diff --git a/app/email_queue/email_queue.php b/app/email_queue/email_queue.php
new file mode 100644
index 0000000000..d3a2c77552
--- /dev/null
+++ b/app/email_queue/email_queue.php
@@ -0,0 +1,304 @@
+<?php
+
+//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('email_queue_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['email_queue'])) {
+		$action = $_POST['action'];
+		$search = $_POST['search'];
+		$email_queue = $_POST['email_queue'];
+	}
+
+//process the http post data by action
+	if ($action != '' && is_array($email_queue) && @sizeof($email_queue) != 0) {
+
+		//validate the token
+		$token = new token;
+		if (!$token->validate($_SERVER['PHP_SELF'])) {
+			message::add($text['message-invalid_token'],'negative');
+			header('Location: email_queue.php');
+			exit;
+		}
+
+		//prepare the array
+		foreach($email_queue as $row) {
+			//email class queue uuid
+			$array[$x]['checked'] = $row['checked'];
+			$array[$x]['uuid'] = $row['email_queue_uuid']; 
+
+			// database class uuid
+			//$array['email_queue'][$x]['checked'] = $row['checked'];
+			//$array['email_queue'][$x]['email_queue_uuid'] = $row['email_queue_uuid'];
+			$x++;
+		}
+
+		//prepare the database object
+		$database = new database;
+		$database->app_name = 'email_queue';
+		$database->app_uuid = '5befdf60-a242-445f-91b3-2e9ee3e0ddf7';
+
+		//send the array to the database class
+		switch ($action) {
+			case 'copy':
+				//if (permission_exists('email_queue_add')) {
+				//	$database->copy($array);
+				//}
+				break;
+			case 'toggle':
+				//if (permission_exists('email_queue_edit')) {
+				//	$database->toggle($array);
+				//}
+				break;
+			case 'delete':
+				if (permission_exists('email_queue_delete')) {
+					$obj = new email_queue;
+					$obj->delete($array);
+					//$database->delete($array);
+				}
+				break;
+		}
+
+		//redirect the user
+		header('Location: email_queue.php'.($search != '' ? '?search='.urlencode($search) : null));
+		exit;
+	}
+
+//set the time zone
+	if (isset($_SESSION['domain']['time_zone']['name'])) {
+		$time_zone = $_SESSION['domain']['time_zone']['name'];
+	}
+	else {
+		$time_zone = date_default_timezone_get();
+	}
+
+//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(email_queue_uuid) ";
+	$sql .= "from v_email_queue ";
+	if (isset($search)) {
+		$sql .= "where (";
+		$sql .= "	lower(email_from) like :search ";
+		$sql .= "	or lower(email_to) like :search ";
+		$sql .= "	or lower(email_subject) like :search ";
+		$sql .= "	or lower(email_body) like :search ";
+		$sql .= "	or lower(email_status) like :search ";
+		$sql .= ") ";
+		$parameters['search'] = '%'.$search.'%';
+	}
+	//else {
+	//	$sql .= "where (domain_uuid = :domain_uuid or domain_uuid is null) ";
+	//	$parameters['domain_uuid'] = $domain_uuid;
+	//}
+	$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('email_queue_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 .= "email_date, ";
+	$sql .= "to_char(timezone(:time_zone, email_date), 'DD Mon YYYY') as email_date_formatted, \n";
+	$sql .= "to_char(timezone(:time_zone, email_date), 'HH12:MI:SS am') as email_time_formatted, \n";	
+	$sql .= "email_queue_uuid, ";
+	$sql .= "hostname, ";
+	$sql .= "email_from, ";
+	$sql .= "email_to, ";
+	$sql .= "email_subject, ";
+	$sql .= "email_body, ";
+	//$sql .= "email_action_before, ";
+	$sql .= "email_action_after, ";
+	$sql .= "email_status, ";
+	$sql .= "email_retry_count ";
+	$sql .= "from v_email_queue ";
+	if (isset($_GET["search"])) {
+		$sql .= "where (";
+		$sql .= "	lower(email_from) like :search ";
+		$sql .= "	or lower(email_to) like :search ";
+		$sql .= "	or lower(email_subject) like :search ";
+		$sql .= "	or lower(email_body) like :search ";
+		$sql .= "	or lower(email_status) like :search ";
+		$sql .= ") ";
+		$parameters['search'] = '%'.$search.'%';
+	}
+	$sql .= order_by($order_by, $order, 'email_date', 'desc');
+	$sql .= limit_offset($rows_per_page, $offset);
+	$parameters['time_zone'] = $time_zone;
+	$database = new database;
+	$email_queue = $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-email_queue'];
+	require_once "resources/header.php";
+
+//show the content
+	echo "<div class='action_bar' id='action_bar'>\n";
+	echo "	<div class='heading'><b>".$text['title-email_queue']." (".$num_rows.")</b></div>\n";
+	echo "	<div class='actions'>\n";
+	//if (permission_exists('email_queue_add')) {
+	//	echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add'],'id'=>'btn_add','name'=>'btn_add','link'=>'email_queue_edit.php']);
+	//}
+	//if (permission_exists('email_queue_add') && $email_queue) {
+	//	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('email_queue_edit') && $email_queue) {
+	//	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('email_queue_delete') && $email_queue) {
+		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('email_queue_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'=>'email_queue.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('email_queue_add') && $email_queue) {
+		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('email_queue_edit') && $email_queue) {
+		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('email_queue_delete') && $email_queue) {
+		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 "<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('email_queue_add') || permission_exists('email_queue_edit') || permission_exists('email_queue_delete')) {
+		echo "	<th class='checkbox'>\n";
+		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle(); checkbox_on_change(this);' ".($email_queue ?: "style='visibility: hidden;'").">\n";
+		echo "	</th>\n";
+	}
+	//if ($_GET['show'] == 'all' && permission_exists('email_queue_all')) {
+	//	echo th_order_by('domain_name', $text['label-domain'], $order_by, $order);
+	//}
+	//echo th_order_by('email_date', $text['label-email_date'], $order_by, $order);
+	echo "<th class='center shrink'>".$text['label-date']."</th>\n";
+	echo "<th class='center shrink hide-md-dn'>".$text['label-time']."</th>\n";
+	echo th_order_by('hostname', $text['label-hostname'], $order_by, $order);
+	echo th_order_by('email_from', $text['label-email_from'], $order_by, $order);
+	echo th_order_by('email_to', $text['label-email_to'], $order_by, $order);
+	echo th_order_by('email_subject', $text['label-email_subject'], $order_by, $order);
+	echo th_order_by('email_body', $text['label-email_body'], $order_by, $order);
+	echo th_order_by('email_status', $text['label-email_status'], $order_by, $order);
+	echo th_order_by('email_retry_count', $text['label-email_retry_count'], $order_by, $order);
+	
+	//echo th_order_by('email_action_before', $text['label-email_action_before'], $order_by, $order);
+	echo th_order_by('email_action_after', $text['label-email_action_after'], $order_by, $order);
+	if (permission_exists('email_queue_edit') && $_SESSION['theme']['list_row_edit_button']['boolean'] == 'true') {
+		echo "	<td class='action-button'>&nbsp;</td>\n";
+	}
+	echo "</tr>\n";
+
+	if (is_array($email_queue) && @sizeof($email_queue) != 0) {
+		$x = 0;
+		foreach ($email_queue as $row) {
+			if (permission_exists('email_queue_edit')) {
+				$list_row_url = "email_queue_edit.php?id=".urlencode($row['email_queue_uuid']);
+			}
+			echo "<tr class='list-row' href='".$list_row_url."'>\n";
+			if (permission_exists('email_queue_add') || permission_exists('email_queue_edit') || permission_exists('email_queue_delete')) {
+				echo "	<td class='checkbox'>\n";
+				echo "		<input type='checkbox' name='email_queue[$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='email_queue[$x][email_queue_uuid]' value='".escape($row['email_queue_uuid'])."' />\n";
+				echo "	</td>\n";
+			}
+			//if ($_GET['show'] == 'all' && permission_exists('email_queue_all')) {
+			//	echo "	<td>".escape($_SESSION['domains'][$row['domain_uuid']]['domain_name'])."</td>\n";
+			//}
+			if (permission_exists('email_queue_edit')) {
+				//echo "	<td><a href='".$list_row_url."' title=\"".$text['button-edit']."\">".escape($row['email_date'])."</a></td>\n";
+				echo "	<td nowrap='nowrap'><a href='".$list_row_url."' title=\"".$text['button-edit']."\">".escape($row['email_date_formatted'])."</a></td>\n";
+				echo "	<td nowrap='nowrap'><a href='".$list_row_url."' title=\"".$text['button-edit']."\">".escape($row['email_time_formatted'])."</a></td>\n";
+			}
+			else {
+				//echo "	<td>".escape($row['email_date'])."	</td>\n";
+				echo "	<td nowrap='nowrap'>".escape($row['email_date_formatted'])."	</td>\n";
+				echo "	<td nowrap='nowrap'>".escape($row['email_time_formatted'])."	</td>\n";
+			}
+			echo "	<td>".escape($row['hostname'])."</td>\n";
+			echo "	<td>".escape($row['email_from'])."</td>\n";
+			echo "	<td>".escape($row['email_to'])."</td>\n";
+			echo "	<td>".iconv_mime_decode($row['email_subject'])."</td>\n";
+			echo "	<td>".escape($row['email_body'])."</td>\n";
+			echo "	<td>".escape($row['email_status'])."</td>\n";
+			echo "	<td>".escape($row['email_retry_count'])."</td>\n";
+			//echo "	<td>".escape($row['email_action_before'])."</td>\n";
+			echo "	<td>".escape($row['email_action_after'])."</td>\n";
+			if (permission_exists('email_queue_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($email_queue);
+	}
+
+	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/app/email_queue/email_queue_delete.php b/app/email_queue/email_queue_delete.php
new file mode 100644
index 0000000000..251321f6ca
--- /dev/null
+++ b/app/email_queue/email_queue_delete.php
@@ -0,0 +1,41 @@
+<?php
+
+//includes
+	require_once "root.php";
+	require_once "resources/require.php";
+	require_once "resources/check_auth.php";
+
+//check permissions
+	if (permission_exists('email_queue_delete')) {
+		//access granted
+	}
+	else {
+		echo "access denied";
+		exit;
+	}
+
+//add multi-lingual support
+	$language = new text;
+	$text = $language->get();
+
+//delete the message
+	message::add($text['message-delete']);
+
+//delete the data
+	if (isset($_GET["id"]) && is_uuid($_GET["id"])) {
+
+		//get the id
+			$id = $_GET["id"];
+
+		//delete the data
+			$array['email_queue'][]['email_queue_uuid'] = $id;
+			$database = new database;
+			$database->delete($array);
+			unset($array);
+
+		//redirect the user
+			header('Location: email_queues.php');
+	}
+
+
+?>
\ No newline at end of file
diff --git a/app/email_queue/email_queue_edit.php b/app/email_queue/email_queue_edit.php
new file mode 100644
index 0000000000..a0d386eb33
--- /dev/null
+++ b/app/email_queue/email_queue_edit.php
@@ -0,0 +1,322 @@
+<?php
+
+//includes
+	require_once "root.php";
+	require_once "resources/require.php";
+	require_once "resources/check_auth.php";
+
+//check permissions
+	if (permission_exists('email_queue_add') || permission_exists('email_queue_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";
+		$email_queue_uuid = $_REQUEST["id"];
+		$id = $_REQUEST["id"];
+	}
+	else {
+		$action = "add";
+	}
+
+//get http post variables and set them to php variables
+	if (is_array($_POST)) {
+		$email_date = $_POST["email_date"];
+		$email_from = $_POST["email_from"];
+		$email_to = $_POST["email_to"];
+		$email_subject = $_POST["email_subject"];
+		$email_body = $_POST["email_body"];
+		$email_status = $_POST["email_status"];
+		$email_retry_count = $_POST["email_retry_count"];
+		//$email_action_before = $_POST["email_action_before"];
+		$email_action_after = $_POST["email_action_after"];
+	}
+
+//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: email_queue.php');
+				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('email_queue_add')) {
+							$obj = new database;
+							$obj->copy($array);
+						}
+						break;
+					case 'delete':
+						if (permission_exists('email_queue_delete')) {
+							$obj = new database;
+							$obj->delete($array);
+						}
+						break;
+					case 'toggle':
+						if (permission_exists('email_queue_update')) {
+							$obj = new database;
+							$obj->toggle($array);
+						}
+						break;
+				}
+
+				//redirect the user
+				if (in_array($_POST['action'], array('copy', 'delete', 'toggle'))) {
+					header('Location: email_queue_edit.php?id='.$id);
+					exit;
+				}
+			}
+
+		//check for all required data
+			$msg = '';
+			//if (strlen($email_date) == 0) { $msg .= $text['message-required']." ".$text['label-email_date']."<br>\n"; }
+			//if (strlen($email_from) == 0) { $msg .= $text['message-required']." ".$text['label-email_from']."<br>\n"; }
+			//if (strlen($email_to) == 0) { $msg .= $text['message-required']." ".$text['label-email_to']."<br>\n"; }
+			//if (strlen($email_subject) == 0) { $msg .= $text['message-required']." ".$text['label-email_subject']."<br>\n"; }
+			//if (strlen($email_body) == 0) { $msg .= $text['message-required']." ".$text['label-email_body']."<br>\n"; }
+			//if (strlen($email_status) == 0) { $msg .= $text['message-required']." ".$text['label-email_status']."<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 email_queue_uuid
+			if (!is_uuid($_POST["email_queue_uuid"])) {
+				$email_queue_uuid = uuid();
+			}
+
+		//prepare the array
+			$array['email_queue'][0]['email_queue_uuid'] = $email_queue_uuid;
+			$array['email_queue'][0]['domain_uuid'] = $_SESSION['domain_uuid'];
+			$array['email_queue'][0]['email_date'] = $email_date;
+			$array['email_queue'][0]['email_from'] = $email_from;
+			$array['email_queue'][0]['email_to'] = $email_to;
+			$array['email_queue'][0]['email_subject'] = $email_subject;
+			$array['email_queue'][0]['email_body'] = $email_body;
+			$array['email_queue'][0]['email_status'] = $email_status;
+			$array['email_queue'][0]['email_retry_count'] = $email_retry_count;
+			//$array['email_queue'][0]['email_action_before'] = $email_action_before;
+			$array['email_queue'][0]['email_action_after'] = $email_action_after;
+
+		//save the data
+			$database = new database;
+			$database->app_name = 'email queue';
+			$database->app_uuid = '5befdf60-a242-445f-91b3-2e9ee3e0ddf7';
+			$database->save($array);
+
+		//redirect the user
+			if (isset($action)) {
+				if ($action == "add") {
+					$_SESSION["message"] = $text['message-add'];
+				}
+				if ($action == "update") {
+					$_SESSION["message"] = $text['message-update'];
+				}
+				//header('Location: email_queue.php');
+				header('Location: email_queue_edit.php?id='.urlencode($email_queue_uuid));
+				return;
+			}
+	}
+
+//pre-populate the form
+	if (is_array($_GET) && $_POST["persistformvar"] != "true") {
+		$sql = "select * from v_email_queue ";
+		$sql .= "where email_queue_uuid = :email_queue_uuid ";
+		//$sql .= "and domain_uuid = :domain_uuid ";
+		//$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+		$parameters['email_queue_uuid'] = $email_queue_uuid;
+		$database = new database;
+		$row = $database->select($sql, $parameters, 'row');
+		if (is_array($row) && @sizeof($row) != 0) {
+			$email_date = $row["email_date"];
+			$email_from = $row["email_from"];
+			$email_to = $row["email_to"];
+			$email_subject = $row["email_subject"];
+			$email_body = $row["email_body"];
+			$email_status = $row["email_status"];
+			$email_retry_count = $row["email_retry_count"];
+			//$email_action_before = $row["email_action_before"];
+			$email_action_after = $row["email_action_after"];
+		}
+		unset($sql, $parameters, $row);
+	}
+
+//create token
+	$object = new token;
+	$token = $object->create($_SERVER['PHP_SELF']);
+
+//show the header
+	$document['title'] = $text['title-email_queue'];
+	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='email_queue_uuid' value='".escape($email_queue_uuid)."'>\n";
+
+	echo "<div class='action_bar' id='action_bar'>\n";
+	echo "	<div class='heading'><b>".$text['title-email_queue']."</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'=>'email_queue.php']);
+	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-email_queue']."\n";
+	echo "<br /><br />\n";
+
+	if ($action == 'update') {
+		if (permission_exists('email_queue_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('email_queue_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-email_date']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' style='position: relative;' align='left'>\n";
+	echo "  <input class='formfld' type='text' name='email_date' maxlength='255' value='".escape($email_date)."'>\n";
+	echo "<br />\n";
+	echo $text['description-email_date']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
+	echo "<tr>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-email_from']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' style='position: relative;' align='left'>\n";
+	echo "	<input class='formfld' type='text' name='email_from' maxlength='255' value='".escape($email_from)."'>\n";
+	echo "<br />\n";
+	echo $text['description-email_from']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
+	echo "<tr>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-email_to']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' style='position: relative;' align='left'>\n";
+	echo "	<input class='formfld' type='text' name='email_to' maxlength='255' value='".escape($email_to)."'>\n";
+	echo "<br />\n";
+	echo $text['description-email_to']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
+	echo "<tr>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-email_subject']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' style='position: relative;' align='left'>\n";
+	echo "	<input class='formfld' type='text' name='email_subject' maxlength='255' value='".escape($email_subject)."'>\n";
+	echo "<br />\n";
+	echo $text['description-email_subject']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
+	echo "<tr>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-email_body']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' style='position: relative;' align='left'>\n";
+	echo "	<input class='formfld' type='text' name='email_body' maxlength='255' value='".escape($email_body)."'>\n";
+	echo "<br />\n";
+	echo $text['description-email_body']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
+	echo "<tr>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-email_status']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' style='position: relative;' align='left'>\n";
+	echo "	<input class='formfld' type='text' name='email_status' maxlength='255' value='".escape($email_status)."'>\n";
+	echo "<br />\n";
+	echo $text['description-email_status']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
+	echo "<tr>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-email_retry_count']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' style='position: relative;' align='left'>\n";
+	echo "	<input class='formfld' type='text' name='email_retry_count' maxlength='255' value='".escape($email_retry_count)."'>\n";
+	echo "<br />\n";
+	echo $text['description-email_retry_count']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
+	//echo "<tr>\n";
+	//echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	//echo "	".$text['label-email_action_before']."\n";
+	//echo "</td>\n";
+	//echo "<td class='vtable' style='position: relative;' align='left'>\n";
+	//echo "	<input class='formfld' type='text' name='email_action_before' maxlength='255' value='".escape($email_action_before)."'>\n";
+	//echo "<br />\n";
+	//echo $text['description-email_action_before']."\n";
+	//echo "</td>\n";
+	//echo "</tr>\n";
+
+	echo "<tr>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-email_action_after']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' style='position: relative;' align='left'>\n";
+	echo "	<input class='formfld' type='text' name='email_action_after' maxlength='255' value='".escape($email_action_after)."'>\n";
+	echo "<br />\n";
+	echo $text['description-email_action_after']."\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/app/email_queue/resources/classes/email_queue.php b/app/email_queue/resources/classes/email_queue.php
new file mode 100644
index 0000000000..281bfd9ee0
--- /dev/null
+++ b/app/email_queue/resources/classes/email_queue.php
@@ -0,0 +1,240 @@
+<?php
+
+/**
+ * email_queue class
+ *
+ * @method null delete
+ * @method null toggle
+ * @method null copy
+ */
+if (!class_exists('email_queue')) {
+	class email_queue {
+
+		/**
+		* 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 = 'email_queue';
+				$this->app_uuid = '5befdf60-a242-445f-91b3-2e9ee3e0ddf7';
+				$this->name = 'email_queue';
+				$this->table = 'email_queue';
+				$this->toggle_field = '';
+				$this->toggle_values = ['true','false'];
+				$this->location = 'email_queue.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['email_queue_attachments'][$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);
+					}
+			}
+		}
+
+		/**
+		 * 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();
+
+										//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/email_queue/resources/functions/transcribe.php b/app/email_queue/resources/functions/transcribe.php
new file mode 100644
index 0000000000..019e401ff9
--- /dev/null
+++ b/app/email_queue/resources/functions/transcribe.php
@@ -0,0 +1,229 @@
+<?php
+
+if (!function_exists('transcribe')) {
+	function transcribe ($file_path, $file_name, $file_extension) {
+
+		//transcription variables
+			$transcribe_provider = $_SESSION['voicemail']['transcribe_provider']['text'];
+			$transcribe_language = $_SESSION['voicemail']['transcribe_language']['text'];
+
+		//transribe - watson
+			if ($transcribe_provider == 'watson') {
+				$api_key = $_SESSION['voicemail']['watson_key']['text'];
+				$api_url = $_SESSION['voicemail']['watson_url']['text'];
+
+				if ($file_extension == "mp3") {
+					$content_type = 'audio/mp3';
+				}
+				if ($file_extension == "wav") {
+					$content_type = 'audio/wav';
+				}
+
+				if (isset($api_key) && $api_key != '') {
+
+					//check if the file exists
+					if (!file_exists($file_path.'/'.$file_name)) {
+						echo "file not found ".$file_path.'/'.$file_name;
+						exit;
+					}
+
+					//start output buffer
+					ob_start();  
+					$out = fopen('php://output', 'w');
+
+					//create the curl resource
+					$ch = curl_init();
+
+					//set the curl options
+					curl_setopt($ch, CURLOPT_URL, $api_url);
+					curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+					curl_setopt($ch, CURLOPT_USERPWD, 'apikey' . ':' . $api_key);
+					curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_BASIC); //set the authentication type
+					curl_setopt($ch, CURLOPT_HTTPHEADER, ['Content-Type: '.$content_type]);
+					curl_setopt($ch, CURLOPT_BINARYTRANSFER,TRUE);
+					curl_setopt($ch, CURLOPT_POSTFIELDS, file_get_contents($file_path.'/'.$file_name));
+					curl_setopt($ch, CURLOPT_POST, 1);
+					curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 20);	//The number of seconds to wait while trying to connect.
+					curl_setopt($ch, CURLOPT_FOLLOWLOCATION, TRUE);	//To follow any "Location: " header that the server sends as part of the HTTP header.
+					curl_setopt($ch, CURLOPT_AUTOREFERER, TRUE);	//To automatically set the Referer: field in requests where it follows a Location: redirect.
+					curl_setopt($ch, CURLOPT_TIMEOUT, 300);	//The maximum number of seconds to allow cURL functions to execute.
+					curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, TRUE);	//To stop cURL from verifying the peer's certificate.
+					curl_setopt($ch, CURLOPT_HEADER, 0); //hide the headers when set to 0
+
+					//add verbose for debugging
+					curl_setopt($ch, CURLOPT_VERBOSE, true);
+					curl_setopt($ch, CURLOPT_STDERR, $out);
+
+					//execute the curl with the options
+					$http_content = curl_exec($ch);
+
+					//return the error
+					if (curl_errno($ch)) {
+						echo 'Error:' . curl_error($ch);
+					}
+
+					//close the curl resource
+					curl_close($ch);
+
+					//show the debug information
+					fclose($out);
+					$debug = ob_get_clean();
+					echo $debug;
+
+					//$command = "curl -X POST -silent -u \"apikey:".$api_key."\" --header \"Content-type: ".$content_type."\" --data-binary @".$file_path."/".$file_name." \"".$api_url."\"";
+					//echo "command: ".$command."\n";
+
+					//ob_start();
+					//$result = passthru($command);
+					//$json_result = ob_get_contents();
+					//ob_end_clean();
+
+					//run the command
+					//$http_response = shell_exec($command);
+					//echo "http_response:\n".$http_response."\n";
+
+					//remove headers and return the http content
+					//$http_response = trim(str_ireplace("HTTP/1.1 100 Continue", "", $http_response));
+
+					//$temp_array = explode("HTTP/1.1 200 OK", $http_response);
+					//$http_array = explode("\r\n\r\n", $temp_array[1]);
+					//$http_content = trim($http_array[1]);
+					echo "http_content:\n".$http_content."\n";
+
+					//validate the json
+					$ob = json_decode($http_content);
+					if($ob === null) {
+						echo "invalid json\n";
+						return false;
+					}
+
+					$message = '';
+					$json = json_decode($http_content, true);
+					//echo "json; ".$json."\n";
+					foreach($json['results'] as $row) {
+						$message .= $row['alternatives'][0]['transcript'];
+					}
+
+					$message = str_replace("%HESITATION", " ", trim($message));
+					$message = ucfirst($message);
+					$array['provider'] = $transcribe_provider;
+					$array['language'] = $transcribe_language;
+					//$array['command'] = $command;
+					$array['message'] = $message;
+
+					return $array;
+				}
+			}
+
+		//transribe - google
+			if ($transcribe_provider == 'google') {
+				$api_key = $_SESSION['voicemail']['google_key']['text'];
+				$api_url = $_SESSION['voicemail']['google_url']['text'];
+				$transcribe_language = $_SESSION['voicemail']['transcribe_language']['text'];
+				$transcribe_alternate_language = $_SESSION['voicemail']['transcribe_alternate_language']['text'];
+
+				if (!isset($transcribe_language) && strlen($transcribe_language) == 0) {
+					$transcribe_language = 'en-Us';
+				}
+				if (!isset($transcribe_alternate_language) && strlen($transcribe_alternate_language) == 0) {
+					$transcribe_alternate_language = 'es-Us';
+				}
+				if ($file_extension == "mp3") {
+					$content_type = 'audio/mp3';
+				}
+				if ($file_extension == "wav") {
+					$content_type = 'audio/wav';
+				}
+
+				if (isset($api_key) && $api_key != '') {
+					//$command = "curl -X POST -silent -u \"apikey:".$api_key."\" --header \"Content-type: ".$content_type."\" --data-binary @".$file_path."/".$file_name." \"".$api_url."\"";
+					//echo "command: ".$command."\n";
+
+					$command = "sox ".$file_path."/".$file_name." ".$file_path."/".$file_name.".flac trim 0 00:59 ";
+					$command .= "&& echo \"{ 'config': { 'languageCode': '".$transcribe_language."', 'enableWordTimeOffsets': false , 'enableAutomaticPunctuation': true , 'alternativeLanguageCodes': '".$transcribe_alternate_language."' }, 'audio': { 'content': '`base64 -w 0 ".$file_path."/".$file_name.".flac`' } }\" ";
+					$command .= "| curl -X POST -H \"Content-Type: application/json\" -d @- ".$api_url.":recognize?key=".$api_key." ";
+					$command .= "&& rm -f ".$file_path."/".$file_name.".flac";
+					echo $command."\n";
+
+					//ob_start();
+					//$result = passthru($command);
+					//$json_result = ob_get_contents();
+					//ob_end_clean();
+
+					//run the command
+					$http_response = shell_exec($command);
+
+					//validate the json
+					$ob = json_decode($http_response);
+					if($ob === null) {
+						echo "invalid json\n";
+						return false;
+					}
+
+					$message = '';
+					$json = json_decode($http_response, true);
+					//echo "json; ".$json."\n";
+					foreach($json['results'] as $row) {
+						$message .= $row['alternatives'][0]['transcript'];
+					}
+
+					//build the response
+					$array['provider'] = $transcribe_provider;
+					$array['language'] = $transcribe_language;
+					$array['command'] = $command;
+					$array['message'] = $message;
+					//print_r($array);
+
+					return $array;
+				}
+			}
+
+		//transribe - azure
+			if ($transcribe_provider == 'azure') {
+				$api_key = $_SESSION['voicemail']['azure_key']['text'];
+				$api_url = $_SESSION['voicemail']['azure_server_region']['text'];
+
+				if (strlen($transcribe_language) == 0) {
+					$transcribe_language = 'en-US';
+				}
+
+				if ($file_extension == "mp3") {
+					$content_type = 'audio/mp3';
+				}
+				if ($file_extension == "wav") {
+					$content_type = 'audio/wav';
+				}
+
+				if (isset($api_key) && $api_key != '') {
+					$command = "curl -X POST \"https://".$api_url.".api.cognitive.microsoft.com/sts/v1.0/issueToken\" -H \"Content-type: application/x-www-form-urlencoded\" -H \"Content-Length: 0\" -H \"Ocp-Apim-Subscription-Key: ".$api_key."\"";
+					$access_token_result = shell_exec($command);
+					if (strlen($access_token_result) == 0) {
+						return false;
+					}
+					else {
+						$file_path = $file_path.'/'.$file_name;
+						$command = "curl -X POST \"https://".$api_url.".stt.speech.microsoft.com/speech/recognition/conversation/cognitiveservices/v1?language=".$transcribe_language."&format=detailed\" -H 'Authorization: Bearer ".$access_token_result."' -H 'Content-type: audio/wav; codec=\"audio/pcm\"; samplerate=8000; trustsourcerate=false' --data-binary @".$file_path;
+						echo $command."\n";
+						$http_response = shell_exec($command);
+						$array = json_decode($http_response, true);
+						if ($array === null) {
+							return false;
+						}
+						else {
+							$message = $array['NBest'][0]['Display'];
+						}
+					}
+					$array['provider'] = $transcribe_provider;
+					$array['language'] = $transcribe_language;
+					$array['api_key'] = $api_key;
+					$array['command'] = $command;
+					$array['message'] = $message;
+					return $array;
+				}
+
+			}
+
+	}
+}
+
+?>
diff --git a/app/email_queue/resources/jobs/email_queue.php b/app/email_queue/resources/jobs/email_queue.php
new file mode 100644
index 0000000000..5788bdb0af
--- /dev/null
+++ b/app/email_queue/resources/jobs/email_queue.php
@@ -0,0 +1,198 @@
+<?php
+
+//check the permission
+	if (defined('STDIN')) {
+		$document_root = str_replace("\\", "/", $_SERVER["PHP_SELF"]);
+		preg_match("/^(.*)\/app\/.*$/", $document_root, $matches);
+		$document_root = $matches[1];
+		set_include_path($document_root);
+		$_SERVER["DOCUMENT_ROOT"] = $document_root;
+		require_once "resources/require.php";
+		require_once "resources/pdo.php";
+	}
+	else {
+		exit;
+		include "root.php";
+		require_once "resources/require.php";
+		require_once "resources/pdo.php";
+	}
+
+//increase limits
+	set_time_limit(0);
+	ini_set('max_execution_time', 0);
+	ini_set('memory_limit', '512M');
+
+//save the arguments to variables
+	$script_name = $argv[0];
+	if (!empty($argv[1])) {
+		parse_str($argv[1], $_GET);
+	}
+	//print_r($_GET);
+
+//set the variables
+	if (isset($_GET['hostname'])) {
+		$hostname = urldecode($_GET['hostname']);
+	}
+	if (isset($_GET['debug'])) {
+		$debug = $_GET['debug'];
+	}
+
+//includes
+	if (!defined('STDIN')) { include_once "root.php"; }
+	require_once "resources/require.php";
+	include "resources/classes/permissions.php";
+	require $document_root."/app/email_queue/resources/functions/transcribe.php";
+
+//define the process id file
+	$pid_file = "/var/run/fusionpbx/".basename( $argv[0], ".php") .".pid";
+	//echo "pid_file: ".$pid_file."\n";
+
+//function to check if the process exists
+	function process_exists($file = false) {
+
+		//set the default exists to false
+		$exists = false;
+
+		//check to see if the process is running
+		if (file_exists($file)) {
+			$pid = file_get_contents($file);
+			if (posix_getsid($pid) === false) { 
+				//process is not running
+				$exists = false;
+			}
+			else {
+				//process is running
+				$exists = true;
+			}
+		}
+
+		//return the result
+		return $exists;
+	}
+
+//check to see if the process exists
+	$pid_exists = process_exists($pid_file);
+
+//prevent the process running more than once
+	if ($pid_exists) {
+		echo "Cannot lock pid file {$pid_file}\n";
+		exit;
+	}
+
+//email queue enabled
+	if ($_SESSION['email_queue']['enabled']['boolean'] != 'true') {
+		echo "Email Queue is disabled in Default Settings\n";
+		exit;
+	}
+
+//make sure the /var/run/fusionpbx directory exists
+    if (!file_exists('/var/run/fusionpbx')) {
+        $result = mkdir('/var/run/fusionpbx', 0777, true);
+        if (!$result) {
+            die('Failed to create /var/run/fusionpbx');
+        }
+    }
+
+//create the process id file if the process doesn't exist
+	if (!$pid_exists) {
+		//remove the old pid file
+		if (file_exists($file)) {
+			unlink($pid_file);
+		}
+
+		//show the details to the user
+		//echo "The process id is ".getmypid()."\n";
+		//echo "pid_file: ".$pid_file."\n";
+
+		//save the pid file
+		file_put_contents($pid_file, getmypid());
+	}
+
+//get the call center settings
+	$interval = $_SESSION['email_queue']['interval']['numeric'];
+
+//set the defaults
+	if (!is_numeric($interval)) { $interval = 30; }
+
+//set the email queue limit
+	if (isset($_SESSION['email_queue']['limit']['numeric'])) {
+		$email_queue_limit = $_SESSION['email_queue']['limit']['numeric'];
+	}
+	else {
+		$email_queue_limit = '30';
+	}
+	if (isset($_SESSION['email_queue']['debug']['boolean'])) {
+		$debug = $_SESSION['email_queue']['debug']['boolean'];
+	}
+
+//get the messages waiting in the email queue
+    $sql = "select * from v_email_queue ";
+    $sql .= "where (email_status = 'waiting' or email_status = 'trying') ";
+    $sql .= "and hostname = :hostname ";
+    $sql .= "order by domain_uuid asc ";
+    $sql .= "limit :limit ";
+    if (isset($hostname)) {
+        $parameters['hostname'] = $hostname;
+    }
+    else {
+        $parameters['hostname'] = gethostname();
+    }
+    $parameters['limit'] = $email_queue_limit;
+    $database = new database;
+    $email_queue = $database->select($sql, $parameters, 'all');
+    unset($parameters);
+
+    //process the messages
+    if (is_array($email_queue) && @sizeof($email_queue) != 0) {
+        foreach($email_queue as $row) {
+            $command = exec('which php')." ".$document_root."/app/email_queue/resources/jobs/email_send.php ";
+            $command .= "'action=send&email_queue_uuid=".$row["email_queue_uuid"]."&hostname=".$hostname."'";
+            if (isset($debug)) {
+                //run process inline to see debug info
+                echo $command."\n";
+                $result = system($command);
+                echo $result."\n";
+            }
+            else {
+                //starts process rapidly doesn't wait for previous process to finish (used for production)
+                $handle = popen($command." > /dev/null &", 'r'); 
+                echo "'$handle'; " . gettype($handle) . "\n";
+                $read = fread($handle, 2096);
+                echo $read;
+                pclose($handle);
+            }
+        }
+    }
+
+//remove the old pid file
+	if (file_exists($pid_file)) {
+		unlink($pid_file);
+	}
+
+//save output to
+	//$fp = fopen(sys_get_temp_dir()."/mailer-app.log", "a");
+
+//prepare the output buffers
+	//ob_end_clean();
+	//ob_start();
+
+//message divider for log file
+	//echo "\n\n=============================================================================================================================================\n\n";
+
+//get and save the output from the buffer
+	//$content = ob_get_contents(); //get the output from the buffer
+	//$content = str_replace("<br />", "", $content);
+
+	//ob_end_clean(); //clean the buffer
+
+	//fwrite($fp, $content);
+	//fclose($fp);
+
+//notes
+	//echo __line__."\n";
+	// if not keeping the email then need to delete it after the voicemail is emailed
+
+//how to use this feature
+	// cd /var/www/fusionpbx; /usr/bin/php /var/www/fusionpbx/app/email_queue/resources/send.php
+
+?>
diff --git a/app/email_queue/resources/jobs/email_send.php b/app/email_queue/resources/jobs/email_send.php
new file mode 100644
index 0000000000..3d0c73b650
--- /dev/null
+++ b/app/email_queue/resources/jobs/email_send.php
@@ -0,0 +1,701 @@
+<?php
+
+//check the permission
+	if (defined('STDIN')) {
+		$document_root = str_replace("\\", "/", $_SERVER["PHP_SELF"]);
+		preg_match("/^(.*)\/app\/.*$/", $document_root, $matches);
+		$document_root = $matches[1];
+		set_include_path($document_root);
+		$_SERVER["DOCUMENT_ROOT"] = $document_root;
+		require_once "resources/require.php";
+	}
+	else {
+		exit;
+		include "root.php";
+		require_once "resources/require.php";
+		require_once "resources/pdo.php";
+	}
+
+//increase limits
+	set_time_limit(0);
+	//ini_set('max_execution_time',1800); //30 minutes
+	ini_set('memory_limit', '512M');
+
+//save the arguments to variables
+	$script_name = $argv[0];
+	if (!empty($argv[1])) {
+		parse_str($argv[1], $_GET);
+	}
+	//print_r($_GET);
+
+//get the primary key
+	if (is_uuid($_GET['email_queue_uuid'])) {
+		$email_queue_uuid = $_GET['email_queue_uuid'];
+		$hostname = urldecode($_GET['hostname']);
+		$debug = $_GET['debug'];
+		$sleep_seconds = $_GET['sleep'];
+	}
+	else {
+		//invalid uuid
+		exit;
+	}
+
+//define the process id file
+	$pid_file = "/var/run/fusionpbx/email_send".".".$email_queue_uuid.".pid";
+	//echo "pid_file: ".$pid_file."\n";
+
+//function to check if the process exists
+	function process_exists($file = false) {
+
+		//set the default exists to false
+		$exists = false;
+
+		//check to see if the process is running
+		if (file_exists($file)) {
+			$pid = file_get_contents($file);
+			if (posix_getsid($pid) === false) { 
+				//process is not running
+				$exists = false;
+			}
+			else {
+				//process is running
+				$exists = true;
+			}
+		}
+
+		//return the result
+		return $exists;
+	}
+
+//check to see if the process exists
+	$pid_exists = process_exists($pid_file);
+
+//prevent the process running more than once
+	if ($pid_exists) {
+		//echo "Cannot lock pid file {$pid_file}\n";
+		exit;
+	}
+
+//make sure the /var/run/fusionpbx directory exists
+	if (!file_exists('/var/run/fusionpbx')) {
+		$result = mkdir('/var/run/fusionpbx', 0777, true);
+		if (!$result) {
+			die('Failed to create /var/run/fusionpbx');
+		}
+	}
+
+//create the process id file if the process doesn't exist
+	if (!$pid_exists) {
+		//remove the old pid file
+		if (file_exists($file)) {
+			unlink($pid_file);
+		}
+
+		//show the details to the user
+		//echo "The process id is ".getmypid()."\n";
+		//echo "pid_file: ".$pid_file."\n";
+
+		//save the pid file
+		file_put_contents($pid_file, getmypid());
+	}
+
+//sleep used for debugging
+	if (isset($sleep_seconds)) {
+		sleep($sleep_seconds);
+	}
+
+//includes
+	if (!defined('STDIN')) { include_once "root.php"; }
+	require_once "resources/require.php";
+	include "resources/classes/permissions.php";
+	require $document_root."/app/email_queue/resources/functions/transcribe.php";
+
+//define a function to remove html tags
+	if (!function_exists('remove_tags')) {
+		function remove_tags($string) {
+			//remove HTML tags
+			$string = preg_replace ('/<[^>]*>/', ' ', $string);
+
+			//remove control characters
+			$string = str_replace("\r", '', $string);    // --- replace with empty space
+			$string = str_replace("\n", ' ', $string);   // --- replace with space
+			$string = str_replace("\t", ' ', $string);   // --- replace with space
+
+			//remove multiple spaces
+			$string = trim(preg_replace('/ {2,}/', ' ', $string));
+			return $string;
+		}
+	}
+
+//includes
+	include_once "resources/phpmailer/class.phpmailer.php";
+	include_once "resources/phpmailer/class.smtp.php";
+
+//get the email details to send
+	$sql = "select * from v_email_queue ";
+	$sql .= "where email_queue_uuid = :email_queue_uuid ";
+	$parameters['email_queue_uuid'] = $email_queue_uuid;
+	$database = new database;
+	$row = $database->select($sql, $parameters, 'row');
+	if (is_array($row)) {
+		$domain_uuid = $row["domain_uuid"];
+		$email_date = $row["email_date"];
+		$email_from = $row["email_from"];
+		$email_to = $row["email_to"];
+		$email_subject = $row["email_subject"];
+		$email_body = $row["email_body"];
+		$email_status = $row["email_status"];
+		$email_retry_count = $row["email_retry_count"];
+		$email_uuid = $row["email_uuid"];
+		//$email_action_before = $row["email_action_before"];
+		$email_action_after = $row["email_action_after"];
+	}
+	unset($parameters);
+
+//get the call center settings
+	$retry_limit = $_SESSION['email_queue']['retry_limit']['numeric'];
+	//$retry_interval = $_SESSION['email_queue']['retry_interval']['numeric'];
+
+//set defaults
+	if (strlen($email_retry_count) == 0) {
+		$email_retry_count = 0;
+	}
+
+//create the email object
+/*
+	$mail = new PHPMailer();
+	if (isset($_SESSION['email']['method'])) {
+		switch ($_SESSION['email']['method']['text']) {
+			case 'sendmail': $mail->IsSendmail(); break;
+			case 'qmail': $mail->IsQmail(); break;
+			case 'mail': $mail->IsMail(); break;
+			default: $mail->IsSMTP(); break;
+		}
+	}
+	else {
+		$mail->IsSMTP();
+	}
+*/
+
+//load default smtp settings
+/*
+	if ($_SESSION['email']['smtp_hostname']['text'] != '') { 
+		$smtp['hostname'] = $_SESSION['email']['smtp_hostname']['text'];
+	}
+	$smtp['host'] 		= (strlen($_SESSION['email']['smtp_host']['text']) ? $_SESSION['email']['smtp_host']['text']: '127.0.0.1');
+	if (isset($_SESSION['email']['smtp_port'])) {
+		$smtp['port'] = (int) $_SESSION['email']['smtp_port']['numeric'];
+	}
+	else {
+		$smtp['port'] = 0;
+	}
+	$smtp['secure'] 	= $_SESSION['email']['smtp_secure']['text'];
+	$smtp['auth'] 		= $_SESSION['email']['smtp_auth']['text'];
+	$smtp['username'] 	= $_SESSION['email']['smtp_username']['text'];
+	$smtp['password'] 	= $_SESSION['email']['smtp_password']['text'];
+	$smtp['from'] 		= $_SESSION['email']['smtp_from']['text'];
+	$smtp['from_name'] 	= $_SESSION['email']['smtp_from_name']['text'];
+
+	if (isset($_SESSION['voicemail']['smtp_from']) && strlen($_SESSION['voicemail']['smtp_from']['text']) > 0) {
+		$smtp['from'] = $_SESSION['voicemail']['smtp_from']['text'];
+	}
+	if (isset($_SESSION['voicemail']['smtp_from_name']) && strlen($_SESSION['voicemail']['smtp_from_name']['text']) > 0) {
+		$smtp['from_name'] = $_SESSION['voicemail']['smtp_from_name']['text'];
+	}
+*/
+
+//overwrite with domain-specific smtp server settings, if any
+	$sql = "select domain_setting_subcategory, domain_setting_value ";
+	$sql .= "from v_domain_settings ";
+	$sql .= "where domain_uuid = :domain_uuid ";
+	$sql .= "and (domain_setting_category = 'email' or domain_setting_category = 'voicemail') ";
+	$sql .= "and domain_setting_enabled = 'true' ";
+	$parameters['domain_uuid'] = $domain_uuid;
+	$database = new database;
+	$result = $database->select($sql, $parameters, 'all');
+	if (is_array($result) && @sizeof($result) != 0) {
+		foreach ($result as $row) {
+			if ($row['domain_setting_value'] != '') {
+				$smtp[str_replace('smtp_','',$row["domain_setting_subcategory"])] = $row['domain_setting_value'];
+			}
+		}
+	}
+	unset($sql, $parameters, $result, $row);
+
+//value adjustments
+	$smtp['auth']		= ($smtp['auth'] == "true") ? true : false;
+	$smtp['password']	= ($smtp['password'] != '') ? $smtp['password'] : null;
+	$smtp['secure']		= ($smtp['secure'] != "none") ? $smtp['secure'] : null;
+	$smtp['username']	= ($smtp['username'] != '') ? $smtp['username'] : null;
+
+//option to disable smtp ssl or tls validation
+/*
+	if (isset($_SESSION['email']['smtp_validate_certificate'])) {
+		if ($_SESSION['email']['smtp_validate_certificate']['boolean'] == "false") {
+			$mail->SMTPOptions = array(
+				'ssl' => array(
+				'verify_peer' => false,
+				'verify_peer_name' => false,
+				'allow_self_signed' => true
+				)
+			);
+		}
+	}
+*/
+
+//add smtp authentication
+/*
+	$mail->SMTPAuth = $smtp['auth'];
+	if (isset($smtp['hostname'])) { 
+		$mail->Hostname = $smtp['hostname'];
+	}
+	$mail->Host = $smtp['host'];
+	if ($smtp['port'] != 0) {
+		$mail->Port = $smtp['port'];
+	}
+	if ($smtp['secure'] != '') {
+		$mail->SMTPSecure = $smtp['secure'];
+	}
+	if ($smtp['auth']) {
+		$mail->Username = $smtp['username'];
+		$mail->Password = $smtp['password'];
+	}
+	$mail->SMTPDebug = 4;
+*/
+
+//get the voicemail details
+	$sql = "select * from v_voicemails ";
+	$sql .= "where voicemail_uuid in ( ";
+	$sql .= "	select voicemail_uuid from v_voicemail_messages	";
+	$sql .= "	where voicemail_message_uuid = :voicemail_message_uuid ";
+	$sql .= ") ";
+	$parameters['voicemail_message_uuid'] = $email_uuid;
+	$database = new database;
+	$row = $database->select($sql, $parameters, 'row');
+	if (is_array($row)) {
+		//$domain_uuid = $row["domain_uuid"];
+		//$voicemail_uuid = $row["voicemail_uuid"];
+		$voicemail_id = $row["voicemail_id"];
+		//$voicemail_password = $row["voicemail_password"];
+		//$greeting_id = $row["greeting_id"];
+		//$voicemail_alternate_greet_id = $row["voicemail_alternate_greet_id"];
+		//$voicemail_mail_to = $row["voicemail_mail_to"];
+		//$voicemail_sms_to  = $row["voicemail_sms_to "];
+		$voicemail_transcription_enabled = $row["voicemail_transcription_enabled"];
+		//$voicemail_attach_file = $row["voicemail_attach_file"];
+		//$voicemail_file = $row["voicemail_file"];
+		//$voicemail_local_after_email = $row["voicemail_local_after_email"];
+		//$voicemail_enabled = $row["voicemail_enabled"];
+		//$voicemail_description = $row["voicemail_description"];
+		//$voicemail_name_base64 = $row["voicemail_name_base64"];
+		//$voicemail_tutorial = $row["voicemail_tutorial"];
+		echo "transcribe enabled: ".$voicemail_transcription_enabled."\n";
+	}
+	unset($parameters);
+
+//get the attachments and add to the email
+	$sql = "select * from v_email_queue_attachments ";
+	$sql .= "where email_queue_uuid = :email_queue_uuid ";
+	$parameters['email_queue_uuid'] = $email_queue_uuid;
+	$database = new database;
+	$email_queue_attachments = $database->select($sql, $parameters, 'all');
+	if (is_array($email_queue_attachments) && @sizeof($email_queue_attachments) != 0) {
+		foreach($email_queue_attachments as $field) {
+
+			$email_queue_attachment_uuid = $field['email_queue_attachment_uuid'];
+			$domain_uuid = $field['domain_uuid'];
+			$email_attachment_type = $field['email_attachment_type'];
+			$email_attachment_path = $field['email_attachment_path'];
+			$email_attachment_name = $field['email_attachment_name'];
+			//$email_attachment_base64= $field['email_attachment_base64'];
+
+			switch ($email_attachment_type) {
+				case "wav":
+					$mime_type = "audio/x-wav";
+					break;
+				case "mp3":
+					$mime_type = "audio/x-mp3";
+					break;
+				case "pdf":
+					$mime_type = "application/pdf";
+					break;
+				case "tif":
+					$mime_type = "image/tiff";
+					break;
+				case "tiff":
+					$mime_type = "image/tiff";
+					break;
+				default:
+					$mime_type = "binary/octet-stream";
+					break;
+			}
+
+			if (isset($voicemail_transcription_enabled) && $voicemail_transcription_enabled == 'true') {
+				//transcribe the attachment
+				if ($email_attachment_type == 'wav' || $email_attachment_type == 'mp3') {
+					$field = transcribe($email_attachment_path, $email_attachment_name, $email_attachment_type);
+					echo "transcribe path: ".$email_attachment_path."\n";
+					echo "transcribe name: ".$email_attachment_name."\n";
+					echo "transcribe type: ".$email_attachment_type."\n";
+					echo "transcribe command: ".$field['command']."\n";
+					echo "transcribe message: ".$field['message']."\n";
+					$transcribe_message = $field['message'];
+				}
+
+				//echo "email_body before: ".$email_body."\n";
+				$email_body = str_replace('${message_text}', $transcribe_message, $email_body);
+				//$email_debug = $field['message'];
+				//echo "email_body after: ".$email_body."\n";
+				//unset($field);
+			}
+			else {
+				$email_body = str_replace('${message_text}', '', $email_body);
+			}
+
+			//base64 encode the file
+			//$file_contents = base64_encode(file_get_contents($email_attachment_path.'/'.$email_attachment_name));
+
+			//add an attachment
+			//public addAttachment ( string $path, string $name = '', string $encoding = 'base64', string $type = '', string $disposition = 'attachment' ) : boolean
+			//$mail->AddAttachment($email_attachment_path.'/'.$email_attachment_name, $email_attachment_name, 'base64', 'attachment');
+
+			//add email attachments as a string for the send_email function
+			//$email_attachments[0]['type'] = 'string';
+			//$email_attachments[0]['name'] = $email_attachment_path.'/'.$email_attachment_name;
+			//$email_attachments[0]['value'] = base64_encode(file_get_contents($email_attachment_path.'/'.$email_attachment_name));
+
+			//add email attachment as a file for the send_email function
+			$email_attachments[0]['type'] = 'file';
+			$email_attachments[0]['name'] = $email_attachment_name;
+			$email_attachments[0]['value'] = $email_attachment_path.'/'.$email_attachment_name;
+		}
+	}
+	unset($parameters);
+
+//send context to the temp log
+	echo "Subject: ".$email_subject."\n";
+	echo "From: ".$email_from."\n";
+	echo "Reply-to: ".$email_from."\n";
+	echo "To: ".$email_to."\n";
+	echo "Date: ".$email_date."\n";
+	//echo "Transcript: ".$array['message']."\n";
+	//echo "Body: ".$email_body."\n";
+
+//update the message transcription
+	if (isset($voicemail_transcription_enabled) && $voicemail_transcription_enabled == 'true' && isset($transcribe_message)) {
+		$sql = "update v_voicemail_messages ";
+		$sql .= "set message_transcription = :message_transcription ";
+		$sql .= "where voicemail_message_uuid = :voicemail_message_uuid; ";
+		$parameters['voicemail_message_uuid'] = $email_uuid;
+		$parameters['message_transcription'] = $transcribe_message;
+		//echo $sql."\n";
+		//print_r($parameters);
+		$database = new database;
+		$database->execute($sql, $parameters);
+		unset($parameters);
+	}
+
+//send email
+	//ob_start();
+	//$sent = !send_email($email_to, $email_subject, $email_body, $email_error, null, null, null, null, $email_attachments) ? false : true;
+	//$response = ob_get_clean();
+	//echo $response;
+
+//send the email
+	$email = new email;
+	$email->from_address = $email_from_address;
+	$email->from_name = $email_from_name;
+	$email->recipients = $email_to;
+	$email->subject = $email_subject;
+	$email->body = $email_body;
+	$email->attachments = $email_attachments;
+	$email->method = 'direct';
+	$sent = $email->send();
+	//$response = $email->email_error;
+	
+//add to, from, fromname, custom headers and subject to the email
+/*
+	$mail->From = $smtp['from'] ;
+	$mail->FromName = $smtp['from_name'];
+	$mail->Subject = $email_subject;
+
+	$email_to = trim($email_to, "<> ");
+	$email_to = str_replace(";", ",", $email_to);
+	$email_to_array = explode(",", $email_to);
+	if (count($email_to_array) == 0) {
+		$mail->AddAddress($email_to);
+	}
+	else {
+		foreach ($email_to_array as $email_address) {
+			if (strlen($email_address) > 0) {
+				echo "Add Address: $email_address\n";
+				$mail->AddAddress(trim($email_address));
+			}
+		}
+	}
+*/
+
+//add the body to the email
+/*
+	$body_plain = remove_tags($email_body);
+	//echo "body_plain = $body_plain\n";
+	if ((substr($email_body, 0, 5) == "<html") || (substr($email_body, 0, 9) == "<!doctype")) {
+		//$mail->ContentType = "text/html; charset=utf-8";
+		$mail->Body = $email_body."<br><br>";
+		$mail->AltBody = $body_plain."\n";
+		$mail->isHTML(true);
+	}
+	else {
+		//$mail->Body = ($body != '') ? $body : $body_plain;
+		$mail->Body = $body_plain."\n";
+		$mail->AltBody = $body_plain."\n";
+		$mail->isHTML(false);
+	}
+	$mail->CharSet = "utf-8";
+*/
+
+//send the email
+	if ($sent) {
+		//if ($mail->Send()) {
+
+		/*
+		$sql = "delete from v_email_queue_attachments ";
+		$sql .= "where email_queue_uuid = :email_queue_uuid; ";
+		$parameters['email_queue_uuid'] = $email_queue_uuid;
+		$database = new database;
+		$database->select($sql, $parameters);
+
+		$sql = "delete from v_email_queue ";
+		$sql .= "where email_queue_uuid = :email_queue_uuid; ";
+		$parameters['email_queue_uuid'] = $email_queue_uuid;
+		$database = new database;
+		$database->select($sql, $parameters);
+		*/
+
+		/*
+		//build insert array
+		$email_log_uuid = uuid();
+		$array['email_queue'][0]['email_queue_uuid'] = $email_queue_uuid;
+		$array['email_queue'][0]['email_status'] = 'sent';
+		if (isset($field['message'])) {
+			$array['email_queue'][0]['email_transcription'] = $field['message'];
+		}
+
+		//grant temporary permissions
+		$p = new permissions;
+		$p->add('email_queue_add', 'temp');
+
+		//execute insert
+		$database = new database;
+		$database->app_name = 'email_queue';
+		$database->app_uuid = 'ba41954e-9d21-4b10-bbc2-fa5ceabeb184';
+		$database->save($array);
+		unset($array);
+
+		//revoke temporary permissions
+		$p->delete('email_queue_add', 'temp');
+		*/
+
+		//set the email status to sent
+		$sql = "update v_email_queue ";
+		$sql .= "set email_status = 'sent' ";
+		//$sql .= "set email_status = 'waiting' "; //debug
+		if (isset($transcribe_message)) {
+			$sql .= ", email_transcription = :email_transcription ";
+		}
+		$sql .= "where email_queue_uuid = :email_queue_uuid; ";
+		$parameters['email_queue_uuid'] = $email_queue_uuid;
+		if (isset($transcribe_message)) {
+			$parameters['email_transcription'] = $transcribe_message;
+		}
+		//echo $sql."\n";
+		//print_r($parameters);
+		$database = new database;
+		$database->execute($sql, $parameters);
+		unset($parameters);
+
+		//delete the email after it is sent
+		if ($email_action_after == 'delete') {
+			//remove the email file after it has been sent
+			if (is_array($email_queue_attachments) && @sizeof($email_queue_attachments) != 0) {
+				foreach($email_queue_attachments as $field) {
+					$email_attachment_path = $field['email_attachment_path'];
+					$email_attachment_name = $field['email_attachment_name'];
+					if (file_exists($email_attachment_path.'/'.$email_attachment_name)) {
+						unlink($email_attachment_path.'/'.$email_attachment_name);
+					}
+				}
+			}
+
+			//delete the voicemail message from the database
+			$sql = "delete from v_voicemail_messages ";
+			$sql .= "where voicemail_message_uuid = :voicemail_message_uuid; ";
+			$parameters['voicemail_message_uuid'] = $email_uuid;
+			//echo $sql."\n";
+			//print_r($parameters);
+			$database = new database;
+			$database->execute($sql, $parameters);
+			unset($parameters);
+
+			//get the domain_name
+			$sql = "select domain_name from v_domains ";
+			$sql .= "where domain_uuid = :domain_uuid ";
+			$parameters['domain_uuid'] = $domain_uuid;
+			$database = new database;
+			$domain_name = $database->select($sql, $parameters, 'column');
+
+			//send the message waiting status
+			$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+			if ($fp) {
+				//$switch_cmd .= "luarun app.lua voicemail mwi ".$voicemail_id."@".$domain_name;
+				$switch_cmd .= "luarun app/voicemail/resources/scripts/mwi_notify.lua ".$voicemail_id." ".$domain_name." 0 0";
+				$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
+				echo $switch_cmd."\n";
+			}
+			else {
+				echo "event socket connection failed\n";
+			}
+		}
+
+		/*
+		//build insert array
+			$array['email_queue'][0]['email_queue_uuid'] = $email_queue_uuid;
+			//$array['email_queue'][0]['sent_date'] = 'now()';
+			$array['email_queue'][0]['email_status'] = 'sent';
+
+		//grant temporary permissions
+			$p = new permissions;
+			$p->add('email_queue_add', 'temp');
+			$p->add('email_queue_update', 'temp');
+		//execute insert
+			$database = new database;
+			$database->app_name = 'email_queue';
+			$database->app_uuid = '5befdf60-a242-445f-91b3-2e9ee3e0ddf7';
+			print_r($array);
+			$message = $database->save($array);
+			print_r($message);
+			unset($array);
+		//revoke temporary permissions
+			$p->delete('email_queue_add', 'temp');
+			$p->delete('email_queue_update', 'temp');
+		*/
+
+		//send a message to the console
+			echo "Message sent!\n";
+
+	}
+	else {
+
+		$mailer_error = $mail->ErrorInfo;
+		echo "Mailer Error: ".$mailer_error."\n\n";
+
+		/*
+		//build insert array
+		$email_log_uuid = uuid();
+		$array['email_queue'][0]['email_queue_uuid'] = $email_queue_uuid;
+		$array['email_queue'][0]['email_status'] = 'failed';
+
+		//grant temporary permissions
+		$p = new permissions;
+		$p->add('email_queue_add', 'temp');
+
+		//execute insert
+		$database = new database;
+		$database->app_name = 'email_queue';
+		$database->app_uuid = 'ba41954e-9d21-4b10-bbc2-fa5ceabeb184';
+		$database->save($array);
+		unset($array);
+
+		//revoke temporary permissions
+		$p->delete('email_queue_add', 'temp');
+		*/
+
+		//set the email retry count
+		$email_retry_count++;
+
+		//set the email status to failed
+		$sql = "update v_email_queue ";
+		if ($email_retry_count >= $retry_limit) {
+			$sql .= "set email_status = 'failed', ";
+		}
+		else {
+			$sql .= "set email_status = 'trying', ";
+		}
+		$sql .= "email_retry_count = :email_retry_count ";
+		//$sql .= ", email_debug = :email_debug ";
+		$sql .= "where email_queue_uuid = :email_queue_uuid; ";
+		$parameters['email_queue_uuid'] = $email_queue_uuid;
+		//$parameters['email_debug'] = $mailer_error;
+		$parameters['email_retry_count'] = $email_retry_count;
+		//echo $sql."\n";
+		//print_r($parameters);
+		$database = new database;
+		$database->execute($sql, $parameters);
+		unset($parameters);
+
+		/*
+		$call_uuid = $headers["X-FusionPBX-Call-UUID"];
+		if ($resend == true) {
+			echo "Retained in v_email_logs \n";
+		}
+		else {
+			// log/store message in database for review
+			if (!isset($email_log_uuid)) {
+				//build insert array
+					$email_log_uuid = uuid();
+					$array['email_logs'][0]['email_log_uuid'] = $email_log_uuid;
+					if (is_uuid($call_uuid)) {
+						$array['email_logs'][0]['call_uuid'] = $call_uuid;
+					}
+					$array['email_logs'][0]['domain_uuid'] = $headers["X-FusionPBX-Domain-UUID"];
+					$array['email_logs'][0]['sent_date'] = 'now()';
+					$array['email_logs'][0]['type'] = $headers["X-FusionPBX-Email-Type"];
+					$array['email_logs'][0]['status'] = 'failed';
+					$array['email_logs'][0]['email'] = str_replace("'", "''", $msg);
+				//grant temporary permissions
+					$p = new permissions;
+					$p->add('email_log_add', 'temp');
+				//execute insert
+					$database = new database;
+					$database->app_name = 'v_mailto';
+					$database->app_uuid = 'ba41954e-9d21-4b10-bbc2-fa5ceabeb184';
+					$database->save($array);
+					unset($array);
+				//revoke temporary permissions
+					$p->delete('email_log_add', 'temp');
+			}
+
+			echo "Retained in v_email_logs as email_log_uuid = ".$email_log_uuid."\n";
+		}
+		*/
+
+	}
+
+//remove the old pid file
+	if (file_exists($pid_file)) {
+		unlink($pid_file);
+	}
+
+//unset the php mail object
+	unset($mail);
+
+//save output to
+	//$fp = fopen(sys_get_temp_dir()."/mailer-app.log", "a");
+
+//prepare the output buffers
+	//ob_end_clean();
+	//ob_start();
+
+//message divider for log file
+	//echo "\n\n====================================================\n\n";
+
+//get and save the output from the buffer
+	//$content = ob_get_contents(); //get the output from the buffer
+	//$content = str_replace("<br />", "", $content);
+
+	//ob_end_clean(); //clean the buffer
+
+	//fwrite($fp, $content);
+	//fclose($fp);
+
+?>
diff --git a/app/email_queue/resources/service/debian.service b/app/email_queue/resources/service/debian.service
new file mode 100644
index 0000000000..a3baec5f76
--- /dev/null
+++ b/app/email_queue/resources/service/debian.service
@@ -0,0 +1,30 @@
+; Author: Mark J Crane <markjcrane@fusionpbx.com>
+; cp /var/www/fusionpbx/app/email_queue/resources/service/debian.service /etc/systemd/system/email_queue.service
+; systemctl enable email_queue
+; systemctl start email_queue
+; systemctl daemon-reload
+
+[Unit]
+Description=FusionPBX Email Queue
+Wants=network-online.target
+Requires=network.target local-fs.target postgresql.service
+After=network.target network-online.target local-fs.target postgresql.service
+StartLimitIntervalSec=0
+
+[Service]
+Type=simple
+;Type=forking
+PIDFile=/var/run/fusionpbx/email_queue.pid
+WorkingDirectory=/var/www/fusionpbx
+;Environment="USER=www-data"
+;Environment="GROUP=www-data"
+;EnvironmentFile=-/etc/default/fusionpbx
+ExecStartPre=/bin/mkdir -p /var/run/fusionpbx
+;ExecStartPre=/bin/chown -R ${USER}:${GROUP} /var/www/fusionpbx
+ExecStart=/usr/bin/php /var/www/fusionpbx/app/email_queue/resources/service/email_queue.php
+TimeoutSec=55s
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
+Also=
diff --git a/app/email_queue/resources/service/email_queue.php b/app/email_queue/resources/service/email_queue.php
new file mode 100644
index 0000000000..75df0d8b93
--- /dev/null
+++ b/app/email_queue/resources/service/email_queue.php
@@ -0,0 +1,204 @@
+<?php
+
+//check the permission
+	if (defined('STDIN')) {
+		$document_root = str_replace("\\", "/", $_SERVER["PHP_SELF"]);
+		preg_match("/^(.*)\/app\/.*$/", $document_root, $matches);
+		$document_root = $matches[1];
+		set_include_path($document_root);
+		$_SERVER["DOCUMENT_ROOT"] = $document_root;
+		require_once "resources/require.php";
+	}
+	else {
+		exit;
+		include "root.php";
+		require_once "resources/require.php";
+		require_once "resources/pdo.php";
+	}
+
+//increase limits
+	set_time_limit(0);
+	ini_set('max_execution_time', 0);
+	ini_set('memory_limit', '512M');
+
+//save the arguments to variables
+	$script_name = $argv[0];
+	if (!empty($argv[1])) {
+		parse_str($argv[1], $_GET);
+	}
+	//print_r($_GET);
+
+//set the variables
+	if (isset($_GET['hostname'])) {
+		$hostname = urldecode($_GET['hostname']);
+	}
+	if (isset($_GET['debug'])) {
+		$debug = $_GET['debug'];
+	}
+
+//includes
+	if (!defined('STDIN')) { include_once "root.php"; }
+	require_once "resources/require.php";
+	include "resources/classes/permissions.php";
+	require $document_root."/app/email_queue/resources/functions/transcribe.php";
+
+//define the process id file
+	$pid_file = "/var/run/fusionpbx/".basename( $argv[0], ".php") .".pid";
+	//echo "pid_file: ".$pid_file."\n";
+
+//function to check if the process exists
+	function process_exists($file = false) {
+
+		//set the default exists to false
+		$exists = false;
+
+		//check to see if the process is running
+		if (file_exists($file)) {
+			$pid = file_get_contents($file);
+			if (posix_getsid($pid) === false) { 
+				//process is not running
+				$exists = false;
+			}
+			else {
+				//process is running
+				$exists = true;
+			}
+		}
+
+		//return the result
+		return $exists;
+	}
+
+//check to see if the process exists
+	$pid_exists = process_exists($pid_file);
+
+//prevent the process running more than once
+	if ($pid_exists) {
+		echo "Cannot lock pid file {$pid_file}\n";
+		exit;
+	}
+
+//email queue enabled
+	if ($_SESSION['email_queue']['enabled']['boolean'] != 'true') {
+		echo "Email Queue is disabled in Default Settings\n";
+		exit;
+	}
+
+//make sure the /var/run/fusionpbx directory exists
+    if (!file_exists('/var/run/fusionpbx')) {
+        $result = mkdir('/var/run/fusionpbx', 0777, true);
+        if (!$result) {
+            die('Failed to create /var/run/fusionpbx');
+        }
+    }
+
+//create the process id file if the process doesn't exist
+	if (!$pid_exists) {
+		//remove the old pid file
+		if (file_exists($file)) {
+			unlink($pid_file);
+		}
+
+		//show the details to the user
+		//echo "The process id is ".getmypid()."\n";
+		//echo "pid_file: ".$pid_file."\n";
+
+		//save the pid file
+		file_put_contents($pid_file, getmypid());
+	}
+
+//get the call center settings
+	$interval = $_SESSION['email_queue']['interval']['numeric'];
+
+//set the defaults
+	if (!is_numeric($interval)) { $interval = 30; }
+
+//set the email queue limit
+	if (isset($_SESSION['email_queue']['limit']['numeric'])) {
+		$email_queue_limit = $_SESSION['email_queue']['limit']['numeric'];
+	}
+	else {
+		$email_queue_limit = '30';
+	}
+	if (isset($_SESSION['email_queue']['debug']['boolean'])) {
+		$debug = $_SESSION['email_queue']['debug']['boolean'];
+	}
+
+//get the messages waiting in the email queue
+	while (true) {
+
+		//get the messages that are waiting to send
+		$sql = "select * from v_email_queue ";
+		$sql .= "where (email_status = 'waiting' or email_status = 'trying') ";
+		$sql .= "and hostname = :hostname ";
+		$sql .= "order by domain_uuid asc ";
+		$sql .= "limit :limit ";
+		if (isset($hostname)) {
+			$parameters['hostname'] = $hostname;
+		}
+		else {
+			$parameters['hostname'] = gethostname();
+		}
+		$parameters['limit'] = $email_queue_limit;
+		$database = new database;
+		$email_queue = $database->select($sql, $parameters, 'all');
+		unset($parameters);
+
+		//process the messages
+		if (is_array($email_queue) && @sizeof($email_queue) != 0) {
+			foreach($email_queue as $row) {
+				$command = exec('which php')." ".$document_root."/app/email_queue/resources/jobs/email_send.php ";
+				$command .= "'action=send&email_queue_uuid=".$row["email_queue_uuid"]."&hostname=".$hostname."'";
+				if (isset($debug)) {
+					//run process inline to see debug info
+					echo $command."\n";
+					$result = system($command);
+					echo $result."\n";
+				}
+				else {
+					//starts process rapidly doesn't wait for previous process to finish (used for production)
+					$handle = popen($command." > /dev/null &", 'r'); 
+					echo "'$handle'; " . gettype($handle) . "\n";
+					$read = fread($handle, 2096);
+					echo $read;
+					pclose($handle);
+				}
+			}
+		}
+
+		//pause to prevent excessive database queries
+		sleep($interval);
+	}
+
+//remove the old pid file
+	if (file_exists($pid_file)) {
+		unlink($pid_file);
+	}
+
+//save output to
+	//$fp = fopen(sys_get_temp_dir()."/mailer-app.log", "a");
+
+//prepare the output buffers
+	//ob_end_clean();
+	//ob_start();
+
+//message divider for log file
+	//echo "\n\n=============================================================================================================================================\n\n";
+
+//get and save the output from the buffer
+	//$content = ob_get_contents(); //get the output from the buffer
+	//$content = str_replace("<br />", "", $content);
+
+	//ob_end_clean(); //clean the buffer
+
+	//fwrite($fp, $content);
+	//fclose($fp);
+
+//notes
+	//echo __line__."\n";
+	// if not keeping the email then need to delete it after the voicemail is emailed
+
+//how to use this feature
+	// cd /var/www/fusionpbx; /usr/bin/php /var/www/fusionpbx/app/email_queue/resources/send.php
+
+?>
diff --git a/app/email_queue/root.php b/app/email_queue/root.php
new file mode 100644
index 0000000000..b35ebdf68d
--- /dev/null
+++ b/app/email_queue/root.php
@@ -0,0 +1,66 @@
+<?php
+
+// 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/email_templates/app_defaults.php b/app/email_templates/app_defaults.php
index aca702e5b6..fa91451d6a 100644
--- a/app/email_templates/app_defaults.php
+++ b/app/email_templates/app_defaults.php
@@ -517,7 +517,7 @@
 			$database = new database;
 			$database->app_name = 'email_templates';
 			$database->app_uuid = '8173e738-2523-46d5-8943-13883befd2fd';
-			$database->save($array);
+			$database->save($array, false);
 			//$message = $database->message;
 
 			//remove the temporary permission
diff --git a/app/email_templates/app_languages.php b/app/email_templates/app_languages.php
index 89357ecd0c..a32dd21d79 100644
--- a/app/email_templates/app_languages.php
+++ b/app/email_templates/app_languages.php
@@ -14,7 +14,7 @@
 		$text['title-email_templates']['he-il'] = '';
 		$text['title-email_templates']['it-it'] = '';
 		$text['title-email_templates']['nl-nl'] = '';
-		$text['title-email_templates']['pl-pl'] = '';
+		$text['title-email_templates']['pl-pl'] = 'Szablony Email';
 		$text['title-email_templates']['pt-br'] = '';
 		$text['title-email_templates']['pt-pt'] = '';
 		$text['title-email_templates']['ro-ro'] = '';
@@ -35,7 +35,7 @@
 		$text['title-email_template']['he-il'] = '';
 		$text['title-email_template']['it-it'] = '';
 		$text['title-email_template']['nl-nl'] = '';
-		$text['title-email_template']['pl-pl'] = '';
+		$text['title-email_template']['pl-pl'] = 'Szablon Email';
 		$text['title-email_template']['pt-br'] = '';
 		$text['title-email_template']['pt-pt'] = '';
 		$text['title-email_template']['ro-ro'] = '';
@@ -56,7 +56,7 @@
 		$text['title_description-email_template']['he-il'] = '';
 		$text['title_description-email_template']['it-it'] = '';
 		$text['title_description-email_template']['nl-nl'] = '';
-		$text['title_description-email_template']['pl-pl'] = '';
+		$text['title_description-email_template']['pl-pl'] = 'Definiowanie i zarządzanie dynamicznymi szablonami wykorzystywanymi w generowanych przez system wychodzących wiadomościach e-mail.';
 		$text['title_description-email_template']['pt-br'] = '';
 		$text['title_description-email_template']['pt-pt'] = '';
 		$text['title_description-email_template']['ro-ro'] = '';
@@ -77,7 +77,7 @@
 		$text['label-template_language']['he-il'] = '';
 		$text['label-template_language']['it-it'] = '';
 		$text['label-template_language']['nl-nl'] = '';
-		$text['label-template_language']['pl-pl'] = '';
+		$text['label-template_language']['pl-pl'] = 'Język';
 		$text['label-template_language']['pt-br'] = '';
 		$text['label-template_language']['pt-pt'] = '';
 		$text['label-template_language']['ro-ro'] = '';
@@ -98,7 +98,7 @@
 		$text['description-template_language']['he-il'] = '';
 		$text['description-template_language']['it-it'] = '';
 		$text['description-template_language']['nl-nl'] = '';
-		$text['description-template_language']['pl-pl'] = '';
+		$text['description-template_language']['pl-pl'] = 'Wprowadź język.';
 		$text['description-template_language']['pt-br'] = '';
 		$text['description-template_language']['pt-pt'] = '';
 		$text['description-template_language']['ro-ro'] = '';
@@ -119,7 +119,7 @@
 		$text['label-template_category']['he-il'] = '';
 		$text['label-template_category']['it-it'] = '';
 		$text['label-template_category']['nl-nl'] = '';
-		$text['label-template_category']['pl-pl'] = '';
+		$text['label-template_category']['pl-pl'] = 'Kategoria';
 		$text['label-template_category']['pt-br'] = '';
 		$text['label-template_category']['pt-pt'] = '';
 		$text['label-template_category']['ro-ro'] = '';
@@ -140,7 +140,7 @@
 		$text['description-template_category']['he-il'] = '';
 		$text['description-template_category']['it-it'] = '';
 		$text['description-template_category']['nl-nl'] = '';
-		$text['description-template_category']['pl-pl'] = '';
+		$text['description-template_category']['pl-pl'] = 'Wybierz kategorię.';
 		$text['description-template_category']['pt-br'] = '';
 		$text['description-template_category']['pt-pt'] = '';
 		$text['description-template_category']['ro-ro'] = '';
@@ -161,7 +161,7 @@
 		$text['label-template_subcategory']['he-il'] = '';
 		$text['label-template_subcategory']['it-it'] = '';
 		$text['label-template_subcategory']['nl-nl'] = '';
-		$text['label-template_subcategory']['pl-pl'] = '';
+		$text['label-template_subcategory']['pl-pl'] = 'Podkategoria';
 		$text['label-template_subcategory']['pt-br'] = '';
 		$text['label-template_subcategory']['pt-pt'] = '';
 		$text['label-template_subcategory']['ro-ro'] = '';
@@ -182,7 +182,7 @@
 		$text['description-template_subcategory']['he-il'] = '';
 		$text['description-template_subcategory']['it-it'] = '';
 		$text['description-template_subcategory']['nl-nl'] = '';
-		$text['description-template_subcategory']['pl-pl'] = '';
+		$text['description-template_subcategory']['pl-pl'] = 'Wprowadź podkategorię.';
 		$text['description-template_subcategory']['pt-br'] = '';
 		$text['description-template_subcategory']['pt-pt'] = '';
 		$text['description-template_subcategory']['ro-ro'] = '';
@@ -203,7 +203,7 @@
 		$text['label-template_subject']['he-il'] = '';
 		$text['label-template_subject']['it-it'] = '';
 		$text['label-template_subject']['nl-nl'] = '';
-		$text['label-template_subject']['pl-pl'] = '';
+		$text['label-template_subject']['pl-pl'] = 'Tytuł';
 		$text['label-template_subject']['pt-br'] = '';
 		$text['label-template_subject']['pt-pt'] = '';
 		$text['label-template_subject']['ro-ro'] = '';
@@ -224,7 +224,7 @@
 		$text['description-template_subject']['he-il'] = '';
 		$text['description-template_subject']['it-it'] = '';
 		$text['description-template_subject']['nl-nl'] = '';
-		$text['description-template_subject']['pl-pl'] = '';
+		$text['description-template_subject']['pl-pl'] = 'Wprowadź szablon tytułu.';
 		$text['description-template_subject']['pt-br'] = '';
 		$text['description-template_subject']['pt-pt'] = '';
 		$text['description-template_subject']['ro-ro'] = '';
@@ -245,7 +245,7 @@
 		$text['label-template_body']['he-il'] = '';
 		$text['label-template_body']['it-it'] = '';
 		$text['label-template_body']['nl-nl'] = '';
-		$text['label-template_body']['pl-pl'] = '';
+		$text['label-template_body']['pl-pl'] = 'Treść';
 		$text['label-template_body']['pt-br'] = '';
 		$text['label-template_body']['pt-pt'] = '';
 		$text['label-template_body']['ro-ro'] = '';
@@ -266,7 +266,7 @@
 		$text['description-template_body']['he-il'] = '';
 		$text['description-template_body']['it-it'] = '';
 		$text['description-template_body']['nl-nl'] = '';
-		$text['description-template_body']['pl-pl'] = '';
+		$text['description-template_body']['pl-pl'] = 'Wprowadź szablon treści.';
 		$text['description-template_body']['pt-br'] = '';
 		$text['description-template_body']['pt-pt'] = '';
 		$text['description-template_body']['ro-ro'] = '';
@@ -287,7 +287,7 @@
 		$text['label-template_type']['he-il'] = '';
 		$text['label-template_type']['it-it'] = '';
 		$text['label-template_type']['nl-nl'] = '';
-		$text['label-template_type']['pl-pl'] = '';
+		$text['label-template_type']['pl-pl'] = 'Typ';
 		$text['label-template_type']['pt-br'] = '';
 		$text['label-template_type']['pt-pt'] = '';
 		$text['label-template_type']['ro-ro'] = '';
@@ -308,7 +308,7 @@
 		$text['description-template_type']['he-il'] = '';
 		$text['description-template_type']['it-it'] = '';
 		$text['description-template_type']['nl-nl'] = '';
-		$text['description-template_type']['pl-pl'] = '';
+		$text['description-template_type']['pl-pl'] = 'Ustaw typ treści.';
 		$text['description-template_type']['pt-br'] = '';
 		$text['description-template_type']['pt-pt'] = '';
 		$text['description-template_type']['ro-ro'] = '';
@@ -350,7 +350,7 @@
 		$text['label-template_enabled']['he-il'] = '';
 		$text['label-template_enabled']['it-it'] = '';
 		$text['label-template_enabled']['nl-nl'] = '';
-		$text['label-template_enabled']['pl-pl'] = '';
+		$text['label-template_enabled']['pl-pl'] = 'Aktywny';
 		$text['label-template_enabled']['pt-br'] = '';
 		$text['label-template_enabled']['pt-pt'] = '';
 		$text['label-template_enabled']['ro-ro'] = '';
@@ -371,7 +371,7 @@
 		$text['description-template_enabled']['he-il'] = '';
 		$text['description-template_enabled']['it-it'] = '';
 		$text['description-template_enabled']['nl-nl'] = '';
-		$text['description-template_enabled']['pl-pl'] = '';
+		$text['description-template_enabled']['pl-pl'] = 'Ustaw status szablonu.';
 		$text['description-template_enabled']['pt-br'] = '';
 		$text['description-template_enabled']['pt-pt'] = '';
 		$text['description-template_enabled']['ro-ro'] = '';
@@ -392,7 +392,7 @@
 		$text['label-template_description']['he-il'] = '';
 		$text['label-template_description']['it-it'] = '';
 		$text['label-template_description']['nl-nl'] = '';
-		$text['label-template_description']['pl-pl'] = '';
+		$text['label-template_description']['pl-pl'] = 'Opis';
 		$text['label-template_description']['pt-br'] = '';
 		$text['label-template_description']['pt-pt'] = '';
 		$text['label-template_description']['ro-ro'] = '';
@@ -413,7 +413,7 @@
 		$text['description-template_description']['he-il'] = '';
 		$text['description-template_description']['it-it'] = '';
 		$text['description-template_description']['nl-nl'] = '';
-		$text['description-template_description']['pl-pl'] = '';
+		$text['description-template_description']['pl-pl'] = 'Wprowadź opis.';
 		$text['description-template_description']['pt-br'] = '';
 		$text['description-template_description']['pt-pt'] = '';
 		$text['description-template_description']['ro-ro'] = '';
diff --git a/app/email_templates/app_menu.php b/app/email_templates/app_menu.php
index 99106b91cd..a9bd4b546e 100644
--- a/app/email_templates/app_menu.php
+++ b/app/email_templates/app_menu.php
@@ -5,7 +5,7 @@ $apps[$x]['menu'][0]['title']['en-gb'] = 'Email Templates';
 $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']['pl'] = 'Szablony Email';
 $apps[$x]['menu'][0]['title']['sv-se'] = '';
 $apps[$x]['menu'][0]['title']['uk'] = '';
 $apps[$x]['menu'][0]['title']['de-at'] = '';
diff --git a/app/email_templates/email_templates.php b/app/email_templates/email_templates.php
index b0f0e9a2a0..32b682fdd0 100644
--- a/app/email_templates/email_templates.php
+++ b/app/email_templates/email_templates.php
@@ -151,13 +151,13 @@
 		echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add'],'id'=>'btn_add','link'=>'email_template_edit.php']);
 	}
 	if (permission_exists('email_template_add') && $result) {
-		echo button::create(['type'=>'button','label'=>$text['button-copy'],'icon'=>$_SESSION['theme']['button_icon_copy'],'name'=>'btn_copy','onclick'=>"modal_open('modal-copy','btn_copy');"]);
+		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('email_template_edit') && $result) {
-		echo button::create(['type'=>'button','label'=>$text['button-toggle'],'icon'=>$_SESSION['theme']['button_icon_toggle'],'name'=>'btn_toggle','onclick'=>"modal_open('modal-toggle','btn_toggle');"]);
+		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('email_template_delete') && $result) {
-		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 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('email_template_all')) {
@@ -168,9 +168,9 @@
 			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'=>'email_templates.php','style'=>($search == '' ? 'display: none;' : null)]);
+	echo 		"<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown=''>";
+	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search']);
+	//echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'email_templates.php','style'=>($search == '' ? 'display: none;' : null)]);
 	if ($paging_controls_mini != '') {
 		echo 	"<span style='margin-left: 15px;'>".$paging_controls_mini."</span>";
 	}
@@ -200,7 +200,7 @@
 	echo "<tr class='list-header'>\n";
 	if (permission_exists('email_template_add') || permission_exists('email_template_edit') || permission_exists('email_template_delete')) {
 		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 "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle(); checkbox_on_change(this);' ".($result ?: "style='visibility: hidden;'").">\n";
 		echo "	</th>\n";
 	}
 	if ($_GET['show'] == "all" && permission_exists('email_template_all')) {
@@ -228,7 +228,7 @@
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('email_template_add') || permission_exists('email_template_edit') || permission_exists('email_template_delete')) {
 				echo "	<td class='checkbox'>\n";
-				echo "		<input type='checkbox' name='email_templates[$x][checked]' id='checkbox_".$x."' value='true' onclick=\"if (!this.checked) { document.getElementById('checkbox_all').checked = false; }\">\n";
+				echo "		<input type='checkbox' name='email_templates[$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='email_templates[$x][uuid]' value='".escape($row['email_template_uuid'])."' />\n";
 				echo "	</td>\n";
 			}
@@ -286,4 +286,4 @@
 //include the footer
 	require_once "resources/footer.php";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/extension_settings/resources/classes/extension_settings.php b/app/extension_settings/resources/classes/extension_settings.php
index e1221eb3c1..20e65f76c1 100755
--- a/app/extension_settings/resources/classes/extension_settings.php
+++ b/app/extension_settings/resources/classes/extension_settings.php
@@ -158,13 +158,14 @@ if (!class_exists('extension_settings')) {
 								}
 							}
 							if (is_array($uuids) && @sizeof($uuids) != 0) {
-								$sql = "select ".$this->name."_uuid as uuid, ".$this->toggle_field." as toggle from v_".$this->table." ";
+								$sql = "select ".$this->name."_uuid as uuid, ".$this->toggle_field." as toggle, extension_uuid 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) {
+									$extension_uuid = $rows[0]['extension_uuid'];
 									foreach ($rows as $row) {
 										$states[$row['uuid']] = $row['toggle'];
 									}
@@ -191,6 +192,16 @@ if (!class_exists('extension_settings')) {
 									$database->app_uuid = $this->app_uuid;
 									$database->save($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-toggle']);
diff --git a/app/extensions/app_defaults.php b/app/extensions/app_defaults.php
index 412a2cf283..a13f5c4aa9 100644
--- a/app/extensions/app_defaults.php
+++ b/app/extensions/app_defaults.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-2022
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -29,7 +29,9 @@
 
 		//create the directory
 			if (strlen($_SESSION['switch']['extensions']['dir']) > 0) {
-				if (!is_dir($_SESSION['switch']['extensions']['dir'])) { event_socket_mkdir($_SESSION['switch']['extensions']['dir']); }
+				if (!is_dir($_SESSION['switch']['extensions']['dir'])) {
+					mkdir($_SESSION['switch']['extensions']['dir'], 0770, false);
+				}
 			}
 
 		//update the directory first and last names
@@ -55,7 +57,7 @@
 					$database = new database;
 					$database->app_name = 'extensions';
 					$database->app_uuid = 'e68d9689-2769-e013-28fa-6214bf47fca3';
-					$database->save($array);
+					$database->save($array, false);
 					unset($array);
 
 					$p->delete('extension_edit', 'temp');
@@ -89,6 +91,11 @@
 				$database->execute($sql);
 				unset($sql);
 			}
+		
+		//do not disturb no longer uses the extension dial_string set the value to null
+			$sql = "update v_extensions set dial_string = null where (dial_string = '!USER_BUSY' or dial_string = 'error/user_busy');\n";
+			$database->execute($sql);
+			unset($sql);
 
 	}
 
diff --git a/app/extensions/app_languages.php b/app/extensions/app_languages.php
index 4aeed699d6..341c4d5563 100644
--- a/app/extensions/app_languages.php
+++ b/app/extensions/app_languages.php
@@ -342,6 +342,27 @@ $text['label-voicemail_local_after_email']['ru-ru'] = "Сообщение хра
 $text['label-voicemail_local_after_email']['sv-se'] = "Röstbrevlåda Behåll Lokalt";
 $text['label-voicemail_local_after_email']['uk-ua'] = "Залишати голосову пошту локально";
 
+$text['label-voicemail_transcription_enabled']['en-us'] = "Transcription Enabled";
+$text['label-voicemail_transcription_enabled']['en-gb'] = "Transcription Enabled";
+$text['label-voicemail_transcription_enabled']['ar-eg'] = "";
+$text['label-voicemail_transcription_enabled']['de-at'] = "Übertragung aktiviert"; //copied from de-de
+$text['label-voicemail_transcription_enabled']['de-ch'] = "Übertragung aktiviert"; //copied from de-de
+$text['label-voicemail_transcription_enabled']['de-de'] = "Übertragung aktiviert";
+$text['label-voicemail_transcription_enabled']['es-cl'] = "";
+$text['label-voicemail_transcription_enabled']['es-mx'] = "";
+$text['label-voicemail_transcription_enabled']['fr-ca'] = "Transcription activée";
+$text['label-voicemail_transcription_enabled']['fr-fr'] = "Transcription activée";
+$text['label-voicemail_transcription_enabled']['he-il'] = "";
+$text['label-voicemail_transcription_enabled']['it-it'] = "";
+$text['label-voicemail_transcription_enabled']['nl-nl'] = "Transscriptie geactiveerd";
+$text['label-voicemail_transcription_enabled']['pl-pl'] = "";
+$text['label-voicemail_transcription_enabled']['pt-br'] = "";
+$text['label-voicemail_transcription_enabled']['pt-pt'] = "";
+$text['label-voicemail_transcription_enabled']['ro-ro'] = "";
+$text['label-voicemail_transcription_enabled']['ru-ru'] = "Транскрипция включена";
+$text['label-voicemail_transcription_enabled']['sv-se'] = "Transcription Aktiverad";
+$text['label-voicemail_transcription_enabled']['uk-ua'] = "";
+
 $text['label-voicemail_file']['en-us'] = "Voicemail File";
 $text['label-voicemail_file']['en-gb'] = "Voicemail File";
 $text['label-voicemail_file']['ar-eg'] = "";
@@ -1969,6 +1990,27 @@ $text['description-voicemail_local_after_email']['ru-ru'] = "Выберите, 
 $text['description-voicemail_local_after_email']['sv-se'] = "Välj om du vill behålla röstmeddelande i systemet efter att e-postmeddelandet skickats.";
 $text['description-voicemail_local_after_email']['uk-ua'] = "";
 
+$text['description-voicemail_transcription_enabled']['en-us'] = "Choose if voicemail transcription is enabled for this extension";
+$text['description-voicemail_transcription_enabled']['en-gb'] = "Choose if voicemail transcription is enabled for this extension";
+$text['description-voicemail_transcription_enabled']['ar-eg'] = "";
+$text['description-voicemail_transcription_enabled']['de-at'] = "Wählen Sie, ob die Voicemail Übertragung für diese Nebenstelle aktiviert werden soll"; //copied from de-de
+$text['description-voicemail_transcription_enabled']['de-ch'] = "Wählen Sie, ob die Voicemail Übertragung für diese Nebenstelle aktiviert werden soll"; //copied from de-de
+$text['description-voicemail_transcription_enabled']['de-de'] = "Wählen Sie, ob die Voicemail Übertragung für diese Nebenstelle aktiviert werden soll";
+$text['description-voicemail_transcription_enabled']['es-cl'] = "";
+$text['description-voicemail_transcription_enabled']['es-mx'] = "";
+$text['description-voicemail_transcription_enabled']['fr-ca'] = "Choisissez si la transcription de la messagerie vocale est activée pour cette extension";
+$text['description-voicemail_transcription_enabled']['fr-fr'] = "Choisissez si la transcription de la messagerie vocale est activée pour cette extension";
+$text['description-voicemail_transcription_enabled']['he-il'] = "";
+$text['description-voicemail_transcription_enabled']['it-it'] = "";
+$text['description-voicemail_transcription_enabled']['nl-nl'] = "Kies als antwoordapparaat transscriptie aangezet is voor dit toestel";
+$text['description-voicemail_transcription_enabled']['pl-pl'] = "";
+$text['description-voicemail_transcription_enabled']['pt-br'] = "";
+$text['description-voicemail_transcription_enabled']['pt-pt'] = "";
+$text['description-voicemail_transcription_enabled']['ro-ro'] = "";
+$text['description-voicemail_transcription_enabled']['ru-ru'] = "Выберите, разрешена ли голосовая почта для этого расширения";
+$text['description-voicemail_transcription_enabled']['sv-se'] = "Välj om transcription är aktiverat för denna anknytning ";
+$text['description-voicemail_transcription_enabled']['uk-ua'] = "";
+
 $text['description-voicemail_file']['en-us'] = "Select a listening option to include with the email notification.";
 $text['description-voicemail_file']['en-gb'] = "Select a listening option to include with the email notification.";
 $text['description-voicemail_file']['ar-eg'] = "";
diff --git a/app/extensions/extension_edit.php b/app/extensions/extension_edit.php
index 93eb6f052d..cb37522806 100644
--- a/app/extensions/extension_edit.php
+++ b/app/extensions/extension_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-2021
+	Portions created by the Initial Developer are Copyright (C) 2008-2022
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -110,6 +110,7 @@
 			$voicemail_password = $_POST["voicemail_password"];
 			$voicemail_enabled = $_POST["voicemail_enabled"];
 			$voicemail_mail_to = $_POST["voicemail_mail_to"];
+			$voicemail_transcription_enabled = $_POST["voicemail_transcription_enabled"];
 			$voicemail_file = $_POST["voicemail_file"];
 			$voicemail_local_after_email = $_POST["voicemail_local_after_email"];
 			$user_context = $_POST["user_context"];
@@ -537,6 +538,55 @@
 													$device_vendor = device::get_vendor($device_mac_address);	
 												}
 
+												//determine the name
+												if (strlen($effective_caller_id_name) > 0) {
+													$name = $effective_caller_id_name;
+												}
+												elseif (strlen($directory_first_name) > 0 && strlen($directory_last_name) > 0) {
+													$name = $directory_first_name.' '.$directory_last_name;
+												}
+												elseif (strlen($directory_first_name) > 0) {
+													$name = $directory_first_name;
+												}
+												elseif (strlen($directory_first_name) > 0) {
+													$name = $directory_first_name.' '.$directory_last_name;
+												}
+												else {
+													$name = '';
+												}
+
+												//get the dislplay label
+												if ($_SESSION['provision']['line_label']['text'] == 'auto') {
+													$line_label = $extension;
+												}
+												else {
+													$line_label = $_SESSION['provision']['line_label']['text'];
+													$line_label = str_replace("\${name}", $name, $line_label);
+													$line_label = str_replace("\${effective_caller_id_name}", $effective_caller_id_name, $line_label);
+													$line_label = str_replace("\${first_name}", $directory_first_name, $line_label);
+													$line_label = str_replace("\${last_name}", $directory_last_name, $line_label);
+													$line_label = str_replace("\${user_id}", $extension, $line_label);
+													$line_label = str_replace("\${auth_id}", $extension, $line_label);
+													$line_label = str_replace("\${extension}", $extension, $line_label);
+													$line_label = str_replace("\${description}", $description, $line_label);
+												}
+
+												//get the dislplay name
+												if ($_SESSION['provision']['line_display_name']['text'] == 'auto') {
+													$line_display_name = $name;
+												}
+												else {
+													$line_display_name = $_SESSION['provision']['line_display_name']['text'];
+													$line_display_name = str_replace("\${name}", $name, $line_display_name);
+													$line_display_name = str_replace("\${effective_caller_id_name}", $effective_caller_id_name, $line_display_name);
+													$line_display_name = str_replace("\${first_name}", $directory_first_name, $line_display_name);
+													$line_display_name = str_replace("\${last_name}", $directory_last_name, $line_display_name);
+													$line_display_name = str_replace("\${user_id}", $extension, $line_display_name);
+													$line_display_name = str_replace("\${auth_id}", $extension, $line_display_name);
+													$line_display_name = str_replace("\${extension}", $extension, $line_display_name);
+													$line_display_name = str_replace("\${description}", $description, $line_display_name);
+												}
+
 												//send a message to the user the device is not unique
 												if (!$device_unique) {
 													$message = $text['message-duplicate'].(if_group("superadmin") && $_SESSION["domain_name"] != $device_domain_name ? ": ".$device_domain_name : null);
@@ -562,7 +612,8 @@
 													$array["devices"][$j]["device_lines"][0]["outbound_proxy_secondary"] = $_SESSION['provision']['outbound_proxy_secondary']['text'];
 													$array["devices"][$j]["device_lines"][0]["server_address_primary"] = $_SESSION['provision']['server_address_primary']['text'];
 													$array["devices"][$j]["device_lines"][0]["server_address_secondary"] = $_SESSION['provision']['server_address_secondary']['text'];
-													$array["devices"][$j]["device_lines"][0]["display_name"] = strlen($effective_caller_id_name) > 0 ? $effective_caller_id_name : $extension;
+													$array["devices"][$j]["device_lines"][0]["label"] = $line_label;
+													$array["devices"][$j]["device_lines"][0]["display_name"] = $line_display_name;
 													$array["devices"][$j]["device_lines"][0]["user_id"] = $extension;
 													$array["devices"][$j]["device_lines"][0]["auth_id"] = $extension;
 													$array["devices"][$j]["device_lines"][0]["password"] = $password;
@@ -607,6 +658,10 @@
 											if (!is_uuid($voicemail_uuid)) {
 												$voicemail_uuid = uuid();
 												$voicemail_tutorial = 'true';
+												//if adding a mailbox and don't have the transcription permission, set the default transcribe behavior
+												if (!permission_exists('voicemail_transcription_enabled') && isset($_SESSION['voicemail']['transcription_enabled_default']['boolean'])) {
+													$voicemail_transcription_enabled = $_SESSION['voicemail']['transcription_enabled_default']['boolean'];
+												}
 											}
 
 										//add the voicemail to the array
@@ -623,15 +678,15 @@
 											if (permission_exists('voicemail_local_after_email')) {
 												$array["voicemails"][$i]["voicemail_local_after_email"] = $voicemail_local_after_email;
 											}
+											$array["voicemails"][$i]["voicemail_transcription_enabled"] = $voicemail_transcription_enabled;
+											$array["voicemails"][$i]["voicemail_tutorial"] = $voicemail_tutorial;
 											$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;
 
 										//make sure the voicemail directory exists
 											if (is_numeric($voicemail_id)) {
 												if (!file_exists($_SESSION['switch']['voicemail']['dir']."/default/".$_SESSION['domain_name']."/".$voicemail_id)) {
-													mkdir($_SESSION['switch']['voicemail']['dir']."/default/".$_SESSION['domain_name']."/".$voicemail_id, 0770);
+													mkdir($_SESSION['switch']['voicemail']['dir']."/default/".$_SESSION['domain_name']."/".$voicemail_id, 0770, true);
 												}
 											}
 
@@ -817,23 +872,23 @@
 
 	//get the voicemail data
 		if (is_dir($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/app/voicemails')) {
-			//get the voicemails
-				$sql = "select * from v_voicemails ";
-				$sql .= "where domain_uuid = :domain_uuid ";
-				$sql .= "and voicemail_id = :voicemail_id ";
-				$parameters['domain_uuid'] = $domain_uuid;
-				$parameters['voicemail_id'] = is_numeric($number_alias) ? $number_alias : $extension;
-				$database = new database;
-				$row = $database->select($sql, $parameters, 'row');
-				if (is_array($row) && @sizeof($row) != 0) {
-					$voicemail_password = str_replace("#", "", $row["voicemail_password"]);
-					$voicemail_mail_to = str_replace(" ", "", $row["voicemail_mail_to"]);
-					$voicemail_file = $row["voicemail_file"];
-					$voicemail_local_after_email = $row["voicemail_local_after_email"];
-					$voicemail_enabled = $row["voicemail_enabled"];
-					$voicemail_tutorial = $row["voicemail_tutorial"];
-				}
-				unset($sql, $parameters, $row);
+			$sql = "select * from v_voicemails ";
+			$sql .= "where domain_uuid = :domain_uuid ";
+			$sql .= "and voicemail_id = :voicemail_id ";
+			$parameters['domain_uuid'] = $domain_uuid;
+			$parameters['voicemail_id'] = is_numeric($number_alias) ? $number_alias : $extension;
+			$database = new database;
+			$row = $database->select($sql, $parameters, 'row');
+			if (is_array($row) && @sizeof($row) != 0) {
+				$voicemail_password = str_replace("#", "", $row["voicemail_password"]);
+				$voicemail_mail_to = str_replace(" ", "", $row["voicemail_mail_to"]);
+				$voicemail_transcription_enabled = $row["voicemail_transcription_enabled"];
+				$voicemail_tutorial = $row["voicemail_tutorial"];
+				$voicemail_file = $row["voicemail_file"];
+				$voicemail_local_after_email = $row["voicemail_local_after_email"];
+				$voicemail_enabled = $row["voicemail_enabled"];
+			}
+			unset($sql, $parameters, $row);
 		}
 
 	}
@@ -946,6 +1001,7 @@
 	if (strlen($call_timeout) == 0) { $call_timeout = '30'; }
 	if (strlen($call_screen_enabled) == 0) { $call_screen_enabled = 'false'; }
 	if (strlen($user_record) == 0) { $user_record = $_SESSION['extension']['user_record_default']['text']; }
+	if (strlen($voicemail_transcription_enabled) == 0) { $voicemail_transcription_enabled = $_SESSION['voicemail']['transcription_enabled_default']['boolean']; }
 	if (strlen($voicemail_enabled) == 0) { $voicemail_enabled = $_SESSION['voicemail']['enabled_default']['boolean']; }
 
 //create token
@@ -1665,6 +1721,22 @@
 		echo "</td>\n";
 		echo "</tr>\n";
 
+		if (permission_exists('voicemail_transcription_enabled')) {
+			echo "<tr>\n";
+			echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+			echo "	".$text['label-voicemail_transcription_enabled']."\n";
+			echo "</td>\n";
+			echo "<td class='vtable' align='left'>\n";
+			echo "	<select class='formfld' name='voicemail_transcription_enabled' id='voicemail_transcription_enabled'>\n";
+			echo "    	<option value='true' ".(($voicemail_transcription_enabled == "true") ? "selected='selected'" : null).">".$text['label-true']."</option>\n";
+			echo "    	<option value='false' ".(($voicemail_transcription_enabled == "false") ? "selected='selected'" : null).">".$text['label-false']."</option>\n";
+			echo "	</select>\n";
+			echo "<br />\n";
+			echo $text['description-voicemail_transcription_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-voicemail_file']."\n";
diff --git a/app/extensions/extensions.php b/app/extensions/extensions.php
index ed109b7f04..ecef86661b 100644
--- a/app/extensions/extensions.php
+++ b/app/extensions/extensions.php
@@ -185,15 +185,15 @@ if (is_numeric($_SESSION['limit']['extensions']['numeric'])) {
 		unset($margin_left);
 	}
 	if (permission_exists('extension_enabled') && $extensions) {
-		echo button::create(['type'=>'button','label'=>$text['button-toggle'],'icon'=>$_SESSION['theme']['button_icon_toggle'],'name'=>'btn_toggle','style'=>$margin_left,'onclick'=>"modal_open('modal-toggle','btn_toggle');"]);
+		echo button::create(['type'=>'button','label'=>$text['button-toggle'],'icon'=>$_SESSION['theme']['button_icon_toggle'],'id'=>'btn_toggle','name'=>'btn_toggle','style'=>'display: none; '.$margin_left,'onclick'=>"modal_open('modal-toggle','btn_toggle');"]);
 		unset($margin_left);
 	}
 	if (permission_exists('extension_delete') && $extensions) {
 		if (permission_exists('voicemail_delete')) {
-			echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'name'=>'btn_delete','style'=>$margin_left,'onclick'=>"modal_open('modal-delete-options');"]);
+			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_left,'onclick'=>"modal_open('modal-delete-options');"]);
 		}
 		else {
-			echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'name'=>'btn_delete','style'=>$margin_left,'onclick'=>"modal_open('modal-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_left,'onclick'=>"modal_open('modal-delete');"]);
 		}
 		unset($margin_left);
 	}
@@ -206,9 +206,9 @@ if (is_numeric($_SESSION['limit']['extensions']['numeric'])) {
 			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'=>'extensions.php','style'=>($search == '' ? 'display: none;' : null)]);
+	echo 		"<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown=''>";
+	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search']);
+	//echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'extensions.php','style'=>($search == '' ? 'display: none;' : null)]);
 	if ($paging_controls_mini != '') {
 		echo 	"<span style='margin-left: 15px;'>".$paging_controls_mini."</span>";
 	}
@@ -248,7 +248,7 @@ if (is_numeric($_SESSION['limit']['extensions']['numeric'])) {
 	echo "<tr class='list-header'>\n";
 	if (permission_exists('extension_enabled') || permission_exists('extension_delete')) {
 		echo "	<th class='checkbox'>\n";
-		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle();' ".($extensions ?: "style='visibility: hidden;'").">\n";
+		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle(); checkbox_on_change(this);' ".($extensions ?: "style='visibility: hidden;'").">\n";
 		echo "	</th>\n";
 	}
 	if ($_GET['show'] == "all" && permission_exists('extension_all')) {
@@ -283,7 +283,7 @@ if (is_numeric($_SESSION['limit']['extensions']['numeric'])) {
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('extension_enabled') || permission_exists('extension_delete')) {
 				echo "	<td class='checkbox'>\n";
-				echo "		<input type='checkbox' name='extensions[$x][checked]' id='checkbox_".$x."' value='true' onclick=\"if (!this.checked) { document.getElementById('checkbox_all').checked = false; }\">\n";
+				echo "		<input type='checkbox' name='extensions[$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='extensions[$x][uuid]' value='".escape($row['extension_uuid'])."' />\n";
 				echo "	</td>\n";
 			}
diff --git a/app/extensions/resources/classes/extension.php b/app/extensions/resources/classes/extension.php
index 8ee14f4a84..0548af145d 100644
--- a/app/extensions/resources/classes/extension.php
+++ b/app/extensions/resources/classes/extension.php
@@ -436,7 +436,7 @@ if (!class_exists('extension')) {
 								$xml .= "  </user>\n";
 
 								if (!is_readable($_SESSION['switch']['extensions']['dir']."/".$row['user_context'])) {
-									event_socket_mkdir($_SESSION['switch']['extensions']['dir']."/".$row['user_context']);
+									mkdir($_SESSION['switch']['extensions']['dir']."/".$row['user_context'], 0770, false);
 								}
 								if (strlen($extension) > 0) {
 									$fout = fopen($_SESSION['switch']['extensions']['dir']."/".$row['user_context']."/v_".$extension.".xml","w");
@@ -810,4 +810,4 @@ if (!class_exists('extension')) {
 	}
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/app/extensions/resources/dashboard/caller_id.php b/app/extensions/resources/dashboard/caller_id.php
index f6b6212431..e33291330a 100644
--- a/app/extensions/resources/dashboard/caller_id.php
+++ b/app/extensions/resources/dashboard/caller_id.php
@@ -205,10 +205,10 @@
 					else {
 						//caller id name and number inputs
 						echo "	<td class='input'>\n";
-						echo "		<input class='formfld' style='min-width: 50px; max-width: 100px;' type='text' name='extensions[".$x."][outbound_caller_id_name]' maxlength='255' value=\"".escape($row['outbound_caller_id_name'])."\">\n";
+						echo "		<input class='formfld' style='width: 70%;' type='text' name='extensions[".$x."][outbound_caller_id_name]' maxlength='255' value=\"".escape($row['outbound_caller_id_name'])."\">\n";
 						echo "	</td>\n";
 						echo "	<td class='input'>\n";
-						echo "		<input class='formfld' style='min-width: 50px; max-width: 100px;' type='text' name='extensions[".$x."][outbound_caller_id_number]' maxlength='255' value=\"".$row['outbound_caller_id_number']."\">\n";
+						echo "		<input class='formfld' style='width: 70%;' type='text' name='extensions[".$x."][outbound_caller_id_number]' maxlength='255' value=\"".$row['outbound_caller_id_number']."\">\n";
 						echo "	</td>\n";
 					}
 					echo "	<td class='description overflow hide-sm-dn'>\n";
diff --git a/app/fanvil/app_config.php b/app/fanvil/app_config.php
index c4fe460dab..83262aeeff 100644
--- a/app/fanvil/app_config.php
+++ b/app/fanvil/app_config.php
@@ -751,5 +751,12 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set Fanvil LCD energy saving. 0=Sleep, 1=Normal, 2=Disable";
 		$y++;
-
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "a055ed05-74a2-4f58-9831-6c2676571929";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_app_icon_display";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$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'] = "Enable or Disable App Icon on the phone display. enabled 1,1,1,1 ( Default), disable 0,0,0,0 (call log, messages, voicemail, DND)";
+		$y++;
 ?>
diff --git a/app/fax/app_config.php b/app/fax/app_config.php
index 7eeafd3825..08291d5933 100644
--- a/app/fax/app_config.php
+++ b/app/fax/app_config.php
@@ -386,7 +386,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "smtp_from";
 		$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_enabled'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "";
 		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "03c6ea15-a0b8-4164-9026-47595981477b";
@@ -394,7 +394,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "smtp_from_name";
 		$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_enabled'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "";
 
 	//schema details
diff --git a/app/fax/app_defaults.php b/app/fax/app_defaults.php
index adadacce42..6060c271ac 100644
--- a/app/fax/app_defaults.php
+++ b/app/fax/app_defaults.php
@@ -1,7 +1,142 @@
-<?php
+ <?php
 
-if ($domains_processed == 1) {
 
-}
+//add fax email templates
+	if ($domains_processed == 1) {
+
+		//build the array
+		$x = 0;
+		$array['email_templates'][$x]['email_template_uuid'] = 'c3cc981f-3bf5-49d7-bfeb-ed688c788179';
+		$array['email_templates'][$x]['template_language'] = 'en-us';
+		$array['email_templates'][$x]['template_category'] = 'fax';
+		$array['email_templates'][$x]['template_subcategory'] = 'inbound';
+		$array['email_templates'][$x]['template_subject'] = 'FAX Received: ${fax_subject_tag} ${fax_file_name}';
+		$array['email_templates'][$x]['template_body'] .= "<html>\n";
+		$array['email_templates'][$x]['template_body'] .= "<body>\n";
+		$array['email_templates'][$x]['template_body'] .= "<br />\n";
+		$array['email_templates'][$x]['template_body'] = "<br><strong>Fax Received</strong><br><br>";
+		$array['email_templates'][$x]['template_body'] .= "Name: \${fax_file_name}<br>";
+		$array['email_templates'][$x]['template_body'] .= "Extension: \${fax_extension}<br>";
+		$array['email_templates'][$x]['template_body'] .= "Messages: \${fax_messages} <br>";
+		$array['email_templates'][$x]['template_body'] .= "\${fax_file_warning}<br>";
+		$array['email_templates'][$x]['template_body'] .= "</body>\n";
+		$array['email_templates'][$x]['template_body'] .= "</html>\n";
+		$array['email_templates'][$x]['template_type'] = "html";
+		$array['email_templates'][$x]['template_enabled'] = "true";
+		$x++;
+
+		$array['email_templates'][$x]['email_template_uuid'] = '9817e168-8d02-4b9f-a21b-e867241d68db';
+		$array['email_templates'][$x]['template_language'] = 'en-us';
+		$array['email_templates'][$x]['template_category'] = 'fax';
+		$array['email_templates'][$x]['template_subcategory'] = 'relay';
+		$array['email_templates'][$x]['template_subject'] = 'FAX Received: ${fax_subject_tag} ${fax_file_name}';
+		$array['email_templates'][$x]['template_body'] .= "<html>\n";
+		$array['email_templates'][$x]['template_body'] .= "<body>\n";
+		$array['email_templates'][$x]['template_body'] .= "<br />\n";
+		$array['email_templates'][$x]['template_body'] = "<br><strong>Fax Received</strong><br><br>";
+		$array['email_templates'][$x]['template_body'] .= "Name: \${fax_file_name}<br>";
+		$array['email_templates'][$x]['template_body'] .= "Extension: \${fax_extension}<br>";
+		$array['email_templates'][$x]['template_body'] .= "Messages: \${fax_messages} <br>";
+		$array['email_templates'][$x]['template_body'] .= "\${fax_file_warning}<br>";
+		$array['email_templates'][$x]['template_body'] .= "<br>This message arrived successfully from your fax machine, and has been queued for outbound fax delivery. You will be notified later as to the success or failure of this fax.<br>";
+		$array['email_templates'][$x]['template_body'] .= "</body>\n";
+		$array['email_templates'][$x]['template_body'] .= "</html>\n";
+		$array['email_templates'][$x]['template_type'] = "html";
+		$array['email_templates'][$x]['template_enabled'] = "true";
+		$x++;
+
+		$array['email_templates'][$x]['email_template_uuid'] = 'a70a73d0-e10b-40ee-9a02-308de200ea84';
+		$array['email_templates'][$x]['template_language'] = 'en-gb';
+		$array['email_templates'][$x]['template_category'] = 'fax';
+		$array['email_templates'][$x]['template_subcategory'] = 'inbound';
+		$array['email_templates'][$x]['template_subject'] = 'FAX Received: ${fax_subject_tag} ${fax_file_name}';
+		$array['email_templates'][$x]['template_body'] .= "<html>\n";
+		$array['email_templates'][$x]['template_body'] .= "<body>\n";
+		$array['email_templates'][$x]['template_body'] .= "<br />\n";
+		$array['email_templates'][$x]['template_body'] = "<br><strong>Fax Received</strong><br><br>";
+		$array['email_templates'][$x]['template_body'] .= "Name: \${fax_file_name}<br>";
+		$array['email_templates'][$x]['template_body'] .= "Extension: \${fax_extension}<br>";
+		$array['email_templates'][$x]['template_body'] .= "Messages: \${fax_messages} <br>";
+		$array['email_templates'][$x]['template_body'] .= "\${fax_file_warning}<br>";
+		$array['email_templates'][$x]['template_body'] .= "</body>\n";
+		$array['email_templates'][$x]['template_body'] .= "</html>\n";
+		$array['email_templates'][$x]['template_type'] = "html";
+		$array['email_templates'][$x]['template_enabled'] = "true";
+		$x++;
+
+		$array['email_templates'][$x]['email_template_uuid'] = '819979a1-281c-4c10-b036-3cea084dc42b';
+		$array['email_templates'][$x]['template_language'] = 'en-gb';
+		$array['email_templates'][$x]['template_category'] = 'fax';
+		$array['email_templates'][$x]['template_subcategory'] = 'relay';
+		$array['email_templates'][$x]['template_subject'] = 'FAX Received: ${fax_subject_tag} ${fax_file_name}';
+		$array['email_templates'][$x]['template_body'] .= "<html>\n";
+		$array['email_templates'][$x]['template_body'] .= "<body>\n";
+		$array['email_templates'][$x]['template_body'] .= "<br />\n";
+		$array['email_templates'][$x]['template_body'] = "<br><strong>Fax Received</strong><br><br>";
+		$array['email_templates'][$x]['template_body'] .= "Name: \${fax_file_name}<br>";
+		$array['email_templates'][$x]['template_body'] .= "Extension: \${fax_extension}<br>";
+		$array['email_templates'][$x]['template_body'] .= "Messages: \${fax_messages} <br>";
+		$array['email_templates'][$x]['template_body'] .= "\${fax_file_warning}<br>";
+		$array['email_templates'][$x]['template_body'] .= "<br>This message arrived successfully from your fax machine, and has been queued for outbound fax delivery. You will be notified later as to the success or failure of this fax.<br>";
+		$array['email_templates'][$x]['template_body'] .= "</body>\n";
+		$array['email_templates'][$x]['template_body'] .= "</html>\n";
+		$array['email_templates'][$x]['template_type'] = "html";
+		$array['email_templates'][$x]['template_enabled'] = "true";
+
+		//build array of email template uuids
+		foreach ($array['email_templates'] as $row) {
+			if (is_uuid($row['email_template_uuid'])) {
+				$uuids[] = $row['email_template_uuid'];
+			}
+		}
+
+		//add the email templates to the database
+		if (is_array($uuids) && @sizeof($uuids) != 0) {
+			$sql = "select * from v_email_templates where ";
+			foreach ($uuids as $index => $uuid) {
+				$sql_where[] = "email_template_uuid = :email_template_uuid_".$index;
+				$parameters['email_template_uuid_'.$index] = $uuid;
+			}
+			$sql .= implode(' or ', $sql_where);
+			$database = new database;
+			$email_templates = $database->select($sql, $parameters, 'all');
+			unset($sql, $sql_where, $parameters);
+
+			//remove templates that already exist from the array
+			foreach ($array['email_templates'] as $index => $row) {
+				if (is_array($email_templates) && @sizeof($email_templates) != 0) {
+					foreach($email_templates as $email_template) {
+						if ($row['email_template_uuid'] == $email_template['email_template_uuid']) {
+							unset($array['email_templates'][$index]);
+						}
+					}
+				}
+			}
+			unset($email_templates, $index);
+		}
+
+		//add the missing email templates
+		if (is_array($array['email_templates']) && @sizeof($array['email_templates']) != 0) {
+			//add the temporary permission
+			$p = new permissions;
+			$p->add("email_template_add", 'temp');
+			$p->add("email_template_edit", 'temp');
+
+			//save the data
+			$database = new database;
+			$database->app_name = 'email_templates';
+			$database->app_uuid = '8173e738-2523-46d5-8943-13883befd2fd';
+			$database->save($array);
+			//$message = $database->message;
+
+			//remove the temporary permission
+			$p->delete("email_template_add", 'temp');
+			$p->delete("email_template_edit", 'temp');
+		}
+
+		//remove the array
+		unset($array);
+
+	}
 
 ?>
diff --git a/app/fax/app_languages.php b/app/fax/app_languages.php
index 751e3ddf2d..689d83b863 100644
--- a/app/fax/app_languages.php
+++ b/app/fax/app_languages.php
@@ -413,7 +413,7 @@ $text['message-invalid-fax']['fr-fr'] = "Fax Invalide - Merci d'entrer un messag
 $text['message-invalid-fax']['he-il'] = "";
 $text['message-invalid-fax']['it-it'] = "Fax non Valido - Prego inserire messaggio o selezionare file da inviare.";
 $text['message-invalid-fax']['nl-nl'] = "";
-$text['message-invalid-fax']['pl-pl'] = "Nieprawidłowy faks - Proszę wpisać wiadomość lub wybrać plik do wysłania ";
+$text['message-invalid-fax']['pl-pl'] = "Nieprawidłowy faks - Proszę wpisać wiadomość lub wybrać plik do wysłania.";
 $text['message-invalid-fax']['pt-br'] = "Fax inválido - Por favor, digite uma mensagem ou selecionar um arquivo a ser enviado.";
 $text['message-invalid-fax']['pt-pt'] = "Fax inválida - Por favor, digite uma mensagem ou selecionar um arquivo a ser enviado.";
 $text['message-invalid-fax']['ro-ro'] = "";
@@ -602,7 +602,7 @@ $text['label-active']['fr-fr'] = "Actif";
 $text['label-active']['he-il'] = "";
 $text['label-active']['it-it'] = "Attivo";
 $text['label-active']['nl-nl'] = "";
-$text['label-active']['pl-pl'] = "";
+$text['label-active']['pl-pl'] = "Aktywny";
 $text['label-active']['pt-br'] = "";
 $text['label-active']['pt-pt'] = "";
 $text['label-active']['ro-ro'] = "";
@@ -686,7 +686,7 @@ $text['label-file']['fr-fr'] = "Fichier non trové";
 $text['label-file']['he-il'] = "";
 $text['label-file']['it-it'] = "File non trovato.";
 $text['label-file']['nl-nl'] = "";
-$text['label-file']['pl-pl'] = "Nie znalziono pliku";
+$text['label-file']['pl-pl'] = "Nie znaleziono pliku";
 $text['label-file']['pt-br'] = "Ficheiro não encontrado";
 $text['label-file']['pt-pt'] = "Ficheiro não encontrado.";
 $text['label-file']['ro-ro'] = "";
@@ -707,7 +707,7 @@ $text['label-fax_uuid']['fr-fr'] = "Détection de Fax";
 $text['label-fax_uuid']['he-il'] = "זיהוי פקסים";
 $text['label-fax_uuid']['it-it'] = "FAX UUID";
 $text['label-fax_uuid']['nl-nl'] = "";
-$text['label-fax_uuid']['pl-pl'] = "Wykrywanie faksu";
+$text['label-fax_uuid']['pl-pl'] = "FAKS UUID";
 $text['label-fax_uuid']['pt-br'] = "Detecção de FAX";
 $text['label-fax_uuid']['pt-pt'] = "Detecção de fax";
 $text['label-fax_uuid']['ro-ro'] = "";
@@ -770,7 +770,7 @@ $text['label-fax_success']['fr-fr'] = "succès";
 $text['label-fax_success']['he-il'] = "";
 $text['label-fax_success']['it-it'] = "Successo";
 $text['label-fax_success']['nl-nl'] = "";
-$text['label-fax_success']['pl-pl'] = "Wysłano poprawnie";
+$text['label-fax_success']['pl-pl'] = "Sukces";
 $text['label-fax_success']['pt-br'] = "Sucesso";
 $text['label-fax_success']['pt-pt'] = "sucesso";
 $text['label-fax_success']['ro-ro'] = "";
@@ -812,7 +812,7 @@ $text['label-fax_retry_limit']['fr-fr'] = "Retry Limit";
 $text['label-fax_retry_limit']['he-il'] = "";
 $text['label-fax_retry_limit']['it-it'] = "Limite Tentativi";
 $text['label-fax_retry_limit']['nl-nl'] = "";
-$text['label-fax_retry_limit']['pl-pl'] = "Maksymalna ilość prób";
+$text['label-fax_retry_limit']['pl-pl'] = "Limit ponownych prób";
 $text['label-fax_retry_limit']['pt-br'] = "Limite de repetições";
 $text['label-fax_retry_limit']['pt-pt'] = "Limite de Repetições";
 $text['label-fax_retry_limit']['ro-ro'] = "";
@@ -1022,7 +1022,7 @@ $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'] = "";
-$text['label-fax_files']['pl-pl'] = "Pliki faksowe";
+$text['label-fax_files']['pl-pl'] = "Plik(i) faksu";
 $text['label-fax_files']['pt-br'] = "Arquivos FAX";
 $text['label-fax_files']['pt-pt'] = "Fax Arquivo(s)";
 $text['label-fax_files']['ro-ro'] = "";
@@ -1421,7 +1421,7 @@ $text['label-fax-pages']['fr-fr'] = "Pages";
 $text['label-fax-pages']['he-il'] = "דפים";
 $text['label-fax-pages']['it-it'] = "Pagine";
 $text['label-fax-pages']['nl-nl'] = "";
-$text['label-fax-pages']['pl-pl'] = "Stron";
+$text['label-fax-pages']['pl-pl'] = "Strony";
 $text['label-fax-pages']['pt-br'] = "Páginas"; //copied from pt-pt
 $text['label-fax-pages']['pt-pt'] = "Páginas";
 $text['label-fax-pages']['ro-ro'] = "";
@@ -1568,7 +1568,7 @@ $text['label-fax-fax']['fr-fr'] = "Télécopie";
 $text['label-fax-fax']['he-il'] = "פקס";
 $text['label-fax-fax']['it-it'] = "FAX";
 $text['label-fax-fax']['nl-nl'] = "";
-$text['label-fax-fax']['pl-pl'] = "FAKS";
+$text['label-fax-fax']['pl-pl'] = "Faks";
 $text['label-fax-fax']['pt-br'] = "Fax"; //copied from pt-pt
 $text['label-fax-fax']['pt-pt'] = "Fax";
 $text['label-fax-fax']['ro-ro'] = "";
@@ -1757,7 +1757,7 @@ $text['label-email_inbound_subject_tag']['fr-fr'] = "Tag Sujet";
 $text['label-email_inbound_subject_tag']['he-il'] = "";
 $text['label-email_inbound_subject_tag']['it-it'] = "TAG dell'Oggetto";
 $text['label-email_inbound_subject_tag']['nl-nl'] = "";
-$text['label-email_inbound_subject_tag']['pl-pl'] = "Tag ł";
+$text['label-email_inbound_subject_tag']['pl-pl'] = "Tag tytułu";
 $text['label-email_inbound_subject_tag']['pt-br'] = "Assunto Tag"; //copied from pt-pt
 $text['label-email_inbound_subject_tag']['pt-pt'] = "Assunto Tag";
 $text['label-email_inbound_subject_tag']['ro-ro'] = "";
@@ -1778,7 +1778,7 @@ $text['label-email_email-to-fax']['fr-fr'] = "Email-à-Fax";
 $text['label-email_email-to-fax']['he-il'] = "פקס לאימייל";
 $text['label-email_email-to-fax']['it-it'] = "Email-to-Fax";
 $text['label-email_email-to-fax']['nl-nl'] = "";
-$text['label-email_email-to-fax']['pl-pl'] = "Email-to-Fax ";
+$text['label-email_email-to-fax']['pl-pl'] = "Email-do-Faksu";
 $text['label-email_email-to-fax']['pt-br'] = "Email para Fax";
 $text['label-email_email-to-fax']['pt-pt'] = "Email-to-Fax";
 $text['label-email_email-to-fax']['ro-ro'] = "";
@@ -2114,7 +2114,7 @@ $text['label-fax_send_greeting']['fr-fr'] = "Salutation";
 $text['label-fax_send_greeting']['he-il'] = "";
 $text['label-fax_send_greeting']['it-it'] = "Saluti";
 $text['label-fax_send_greeting']['nl-nl'] = "";
-$text['label-fax_send_greeting']['pl-pl'] = "";
+$text['label-fax_send_greeting']['pl-pl'] = "Powitanie";
 $text['label-fax_send_greeting']['pt-br'] = "";
 $text['label-fax_send_greeting']['pt-pt'] = "";
 $text['label-fax_send_greeting']['ro-ro'] = "";
@@ -2135,7 +2135,7 @@ $text['label-fax_send_channels']['fr-fr'] = "Nombre de canaux";
 $text['label-fax_send_channels']['he-il'] = "";
 $text['label-fax_send_channels']['it-it'] = "Numero Canali";
 $text['label-fax_send_channels']['nl-nl'] = "";
-$text['label-fax_send_channels']['pl-pl'] = "";
+$text['label-fax_send_channels']['pl-pl'] = "Ilość kanałów";
 $text['label-fax_send_channels']['pt-br'] = "";
 $text['label-fax_send_channels']['pt-pt'] = "";
 $text['label-fax_send_channels']['ro-ro'] = "";
@@ -2156,7 +2156,7 @@ $text['label-copy']['fr-fr'] = "Copie";
 $text['label-copy']['he-il'] = "Copy";
 $text['label-copy']['it-it'] = "Copy";
 $text['label-copy']['nl-nl'] = "Copy";
-$text['label-copy']['pl-pl'] = "Copy";
+$text['label-copy']['pl-pl'] = "Kopia";
 $text['label-copy']['pt-br'] = "Copy";
 $text['label-copy']['pt-pt'] = "Copy";
 $text['label-copy']['ro-ro'] = "Copy";
@@ -2164,6 +2164,27 @@ $text['label-copy']['ru-ru'] = "Copy";
 $text['label-copy']['sv-se'] = "Copy";
 $text['label-copy']['uk-ua'] = "Copy";
 
+$text['label-outbox']['en-us'] = "Outbox";
+$text['label-outbox']['en-gb'] = "Outbox";
+$text['label-outbox']['ar-eg'] = "Outbox";
+$text['label-outbox']['de-at'] = "Outbox";
+$text['label-outbox']['de-ch'] = "Outbox";
+$text['label-outbox']['de-de'] = "Outbox";
+$text['label-outbox']['es-cl'] = "Outbox";
+$text['label-outbox']['es-mx'] = "Outbox";
+$text['label-outbox']['fr-ca'] = "Outbox";
+$text['label-outbox']['fr-fr'] = "Outbox";
+$text['label-outbox']['he-il'] = "Outbox";
+$text['label-outbox']['it-it'] = "Outbox";
+$text['label-outbox']['nl-nl'] = "Outbox";
+$text['label-outbox']['pl-pl'] = "Skrzynka nadawcza";
+$text['label-outbox']['pt-br'] = "Outbox";
+$text['label-outbox']['pt-pt'] = "Outbox";
+$text['label-outbox']['ro-ro'] = "Outbox";
+$text['label-outbox']['ru-ru'] = "Outbox";
+$text['label-outbox']['sv-se'] = "Outbox";
+$text['label-outbox']['uk-ua'] = "Outbox";
+
 $text['header-sent_faxes']['en-us'] = "Sent";
 $text['header-sent_faxes']['en-gb'] = "Sent";
 $text['header-sent_faxes']['ar-eg'] = "";
@@ -2261,7 +2282,7 @@ $text['description-user-add']['fr-fr'] = "Ajouter les usagers pouvant utiliser c
 $text['description-user-add']['he-il'] = "";
 $text['description-user-add']['it-it'] = "Configura gli utenti che possono gestire questo interno fax.";
 $text['description-user-add']['nl-nl'] = "";
-$text['description-user-add']['pl-pl'] = "Przypisz użytkowników, którzy mogą zarządzać ustawieniami  faksu ";
+$text['description-user-add']['pl-pl'] = "Przypisz użytkowników, którzy mogą zarządzać ustawieniami faksu.";
 $text['description-user-add']['pt-br'] = "Atribuir aos usuários que podem gerenciar esta extensão de fax";
 $text['description-user-add']['pt-pt'] = "Atribuir os utilizadores que podem gerir esta extensão de fax.";
 $text['description-user-add']['ro-ro'] = "";
@@ -2303,7 +2324,7 @@ $text['description-name']['fr-fr'] = "Entrez le nom ici.";
 $text['description-name']['he-il'] = "הכנס את השם";
 $text['description-name']['it-it'] = "Inserire il nome qui.";
 $text['description-name']['nl-nl'] = "";
-$text['description-name']['pl-pl'] = "Wprowadź nazwę ";
+$text['description-name']['pl-pl'] = "Wprowadź nazwę.";
 $text['description-name']['pt-br'] = "Insira o nome do menu";
 $text['description-name']['pt-pt'] = "Insira aqui o nome.";
 $text['description-name']['ro-ro'] = "";
@@ -2387,7 +2408,7 @@ $text['description-fax_uri']['fr-fr'] = "Fax URI";
 $text['description-fax_uri']['he-il'] = "";
 $text['description-fax_uri']['it-it'] = "";
 $text['description-fax_uri']['nl-nl'] = "";
-$text['description-fax_uri']['pl-pl'] = "";
+$text['description-fax_uri']['pl-pl'] = "Faks URI";
 $text['description-fax_uri']['pt-br'] = "";
 $text['description-fax_uri']['pt-pt'] = "";
 $text['description-fax_uri']['ro-ro'] = "";
@@ -2408,7 +2429,7 @@ $text['description-fax_transfer_rate']['fr-fr'] = "Taux de transfert pour la com
 $text['description-fax_transfer_rate']['he-il'] = "";
 $text['description-fax_transfer_rate']['it-it'] = "";
 $text['description-fax_transfer_rate']['nl-nl'] = "";
-$text['description-fax_transfer_rate']['pl-pl'] = "";
+$text['description-fax_transfer_rate']['pl-pl'] = "Szybkość transferu dla komunikacji.";
 $text['description-fax_transfer_rate']['pt-br'] = "";
 $text['description-fax_transfer_rate']['pt-pt'] = "";
 $text['description-fax_transfer_rate']['ro-ro'] = "";
@@ -2429,7 +2450,7 @@ $text['description-fax_success']['fr-fr'] = "Fax envoyé / reçu avec succès.";
 $text['description-fax_success']['he-il'] = "";
 $text['description-fax_success']['it-it'] = "";
 $text['description-fax_success']['nl-nl'] = "";
-$text['description-fax_success']['pl-pl'] = "";
+$text['description-fax_success']['pl-pl'] = "Faks pomyślnie został wysłany/otrzymany.";
 $text['description-fax_success']['pt-br'] = "";
 $text['description-fax_success']['pt-pt'] = "";
 $text['description-fax_success']['ro-ro'] = "";
@@ -2450,7 +2471,7 @@ $text['description-fax_retry_sleep']['fr-fr'] = "Pause entre les tentatives.";
 $text['description-fax_retry_sleep']['he-il'] = "";
 $text['description-fax_retry_sleep']['it-it'] = "";
 $text['description-fax_retry_sleep']['nl-nl'] = "";
-$text['description-fax_retry_sleep']['pl-pl'] = "";
+$text['description-fax_retry_sleep']['pl-pl'] = "Pauza pomiędzy ponownymi próbami.";
 $text['description-fax_retry_sleep']['pt-br'] = "";
 $text['description-fax_retry_sleep']['pt-pt'] = "";
 $text['description-fax_retry_sleep']['ro-ro'] = "";
@@ -2471,7 +2492,7 @@ $text['description-fax_retry_limit']['fr-fr'] = "Limite pour le nombre de tentat
 $text['description-fax_retry_limit']['he-il'] = "";
 $text['description-fax_retry_limit']['it-it'] = "";
 $text['description-fax_retry_limit']['nl-nl'] = "";
-$text['description-fax_retry_limit']['pl-pl'] = "";
+$text['description-fax_retry_limit']['pl-pl'] = "Limit dla liczby ponownych prób.";
 $text['description-fax_retry_limit']['pt-br'] = "";
 $text['description-fax_retry_limit']['pt-pt'] = "";
 $text['description-fax_retry_limit']['ro-ro'] = "";
@@ -2492,7 +2513,7 @@ $text['description-fax_retry_attempts']['fr-fr'] = "Réessayer";
 $text['description-fax_retry_attempts']['he-il'] = "";
 $text['description-fax_retry_attempts']['it-it'] = "";
 $text['description-fax_retry_attempts']['nl-nl'] = "";
-$text['description-fax_retry_attempts']['pl-pl'] = "";
+$text['description-fax_retry_attempts']['pl-pl'] = "Ponowne próby";
 $text['description-fax_retry_attempts']['pt-br'] = "";
 $text['description-fax_retry_attempts']['pt-pt'] = "";
 $text['description-fax_retry_attempts']['ro-ro'] = "";
@@ -2513,7 +2534,7 @@ $text['description-fax_result_text']['fr-fr'] = "Texte du résultat de la télé
 $text['description-fax_result_text']['he-il'] = "";
 $text['description-fax_result_text']['it-it'] = "";
 $text['description-fax_result_text']['nl-nl'] = "";
-$text['description-fax_result_text']['pl-pl'] = "";
+$text['description-fax_result_text']['pl-pl'] = "Tekst wyniku faksu.";
 $text['description-fax_result_text']['pt-br'] = "";
 $text['description-fax_result_text']['pt-pt'] = "";
 $text['description-fax_result_text']['ro-ro'] = "";
@@ -2534,7 +2555,7 @@ $text['description-fax_result_code']['fr-fr'] = "Code de résultat du fax.";
 $text['description-fax_result_code']['he-il'] = "";
 $text['description-fax_result_code']['it-it'] = "";
 $text['description-fax_result_code']['nl-nl'] = "";
-$text['description-fax_result_code']['pl-pl'] = "";
+$text['description-fax_result_code']['pl-pl'] = "Kod wyniku faksu.";
 $text['description-fax_result_code']['pt-br'] = "";
 $text['description-fax_result_code']['pt-pt'] = "";
 $text['description-fax_result_code']['ro-ro'] = "";
@@ -2555,7 +2576,7 @@ $text['description-fax_prefix']['fr-fr'] = "Entrez un préfixe pour être utilis
 $text['description-fax_prefix']['he-il'] = "";
 $text['description-fax_prefix']['it-it'] = "Inserire prefisso da usare per la spedizione fax.";
 $text['description-fax_prefix']['nl-nl'] = "";
-$text['description-fax_prefix']['pl-pl'] = "Wprowadź prefiks ma być używany podczas wysyłania faksu.";
+$text['description-fax_prefix']['pl-pl'] = "Wprowadź prefiks, który ma być używany podczas wysyłania faksu.";
 $text['description-fax_prefix']['pt-br'] = "Digite um prefixo para ser usado quando o envio de um fax."; //copied from pt-pt
 $text['description-fax_prefix']['pt-pt'] = "Digite um prefixo para ser usado quando o envio de um fax.";
 $text['description-fax_prefix']['ro-ro'] = "";
@@ -2576,7 +2597,7 @@ $text['description-fax_number']['fr-fr'] = "Fax numéro de destination";
 $text['description-fax_number']['he-il'] = "";
 $text['description-fax_number']['it-it'] = "Numero di destinazione FAX";
 $text['description-fax_number']['nl-nl'] = "";
-$text['description-fax_number']['pl-pl'] = "";
+$text['description-fax_number']['pl-pl'] = "Numer docelowy faksu";
 $text['description-fax_number']['pt-br'] = "Número de fax de destino"; //copied from pt-pt
 $text['description-fax_number']['pt-pt'] = "Número de fax de destino";
 $text['description-fax_number']['ro-ro'] = "";
@@ -2597,7 +2618,7 @@ $text['description-fax_mode']['fr-fr'] = "Moyens de recevoir et RX TX signifie t
 $text['description-fax_mode']['he-il'] = "";
 $text['description-fax_mode']['it-it'] = "RX significa ricezione e TX trasmissione.";
 $text['description-fax_mode']['nl-nl'] = "";
-$text['description-fax_mode']['pl-pl'] = "";
+$text['description-fax_mode']['pl-pl'] = "RX oznacza odbiór, a TX oznacza nadawanie.";
 $text['description-fax_mode']['pt-br'] = "Meios RX receber e TX significa Transmitir."; //copied from pt-pt
 $text['description-fax_mode']['pt-pt'] = "Meios RX receber e TX significa Transmitir.";
 $text['description-fax_mode']['ro-ro'] = "";
@@ -2639,7 +2660,7 @@ $text['description-fax_local_station_id']['fr-fr'] = "ID de la station locale.";
 $text['description-fax_local_station_id']['he-il'] = "";
 $text['description-fax_local_station_id']['it-it'] = "";
 $text['description-fax_local_station_id']['nl-nl'] = "";
-$text['description-fax_local_station_id']['pl-pl'] = "";
+$text['description-fax_local_station_id']['pl-pl'] = "Lokalny identyfikator stacji";
 $text['description-fax_local_station_id']['pt-br'] = "";
 $text['description-fax_local_station_id']['pt-pt'] = "";
 $text['description-fax_local_station_id']['ro-ro'] = "";
@@ -2660,7 +2681,7 @@ $text['description-fax_image_size']['fr-fr'] = "Taille de la page de fax.";
 $text['description-fax_image_size']['he-il'] = "";
 $text['description-fax_image_size']['it-it'] = "";
 $text['description-fax_image_size']['nl-nl'] = "";
-$text['description-fax_image_size']['pl-pl'] = "";
+$text['description-fax_image_size']['pl-pl'] = "Rozmiar strony faksu.";
 $text['description-fax_image_size']['pt-br'] = "";
 $text['description-fax_image_size']['pt-pt'] = "";
 $text['description-fax_image_size']['ro-ro'] = "";
@@ -2681,7 +2702,7 @@ $text['description-fax_image_resolution']['fr-fr'] = "Résolution d'image de fax
 $text['description-fax_image_resolution']['he-il'] = "";
 $text['description-fax_image_resolution']['it-it'] = "";
 $text['description-fax_image_resolution']['nl-nl'] = "";
-$text['description-fax_image_resolution']['pl-pl'] = "";
+$text['description-fax_image_resolution']['pl-pl'] = "Rozdzielczość obrazu faksu.";
 $text['description-fax_image_resolution']['pt-br'] = "";
 $text['description-fax_image_resolution']['pt-pt'] = "";
 $text['description-fax_image_resolution']['ro-ro'] = "";
@@ -2702,7 +2723,7 @@ $text['description-fax_files']['fr-fr'] = "Choisir un fichier à télécharger p
 $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'] = "";
-$text['description-fax_files']['pl-pl'] = "Wybierz plik/pliki faksu do wyslania";
+$text['description-fax_files']['pl-pl'] = "Wybierz plik/pliki faksu do wysłania";
 $text['description-fax_files']['pt-br'] = "Selecione a pasta para enviar por Fax";
 $text['description-fax_files']['pt-pt'] = "Selecione o ficheiro a carregar para enviar por fax.";
 $text['description-fax_files']['ro-ro'] = "";
@@ -2744,7 +2765,7 @@ $text['description-fax_file_path']['fr-fr'] = "Chemin du fichier pour le répert
 $text['description-fax_file_path']['he-il'] = "";
 $text['description-fax_file_path']['it-it'] = "";
 $text['description-fax_file_path']['nl-nl'] = "";
-$text['description-fax_file_path']['pl-pl'] = "";
+$text['description-fax_file_path']['pl-pl'] = "Ścieżka pliku do katalogu faksu";
 $text['description-fax_file_path']['pt-br'] = "";
 $text['description-fax_file_path']['pt-pt'] = "";
 $text['description-fax_file_path']['ro-ro'] = "";
@@ -2765,7 +2786,7 @@ $text['description-fax_file']['fr-fr'] = "Fichiers FAX";
 $text['description-fax_file']['he-il'] = "";
 $text['description-fax_file']['it-it'] = "File(s) FAX";
 $text['description-fax_file']['nl-nl'] = "";
-$text['description-fax_file']['pl-pl'] = "Pliki faks";
+$text['description-fax_file']['pl-pl'] = "Pliki faksu";
 $text['description-fax_file']['pt-br'] = "Arquivos FAX"; //copied from pt-pt
 $text['description-fax_file']['pt-pt'] = "Arquivos FAX";
 $text['description-fax_file']['ro-ro'] = "";
@@ -2786,7 +2807,7 @@ $text['description-fax_epoch']['fr-fr'] = "Époque";
 $text['description-fax_epoch']['he-il'] = "";
 $text['description-fax_epoch']['it-it'] = "";
 $text['description-fax_epoch']['nl-nl'] = "";
-$text['description-fax_epoch']['pl-pl'] = "";
+$text['description-fax_epoch']['pl-pl'] = "Epoka";
 $text['description-fax_epoch']['pt-br'] = "";
 $text['description-fax_epoch']['pt-pt'] = "";
 $text['description-fax_epoch']['ro-ro'] = "";
@@ -2807,7 +2828,7 @@ $text['description-fax_ecm_used']['fr-fr'] = "Mode de correction d'erreur (ECM)
 $text['description-fax_ecm_used']['he-il'] = "";
 $text['description-fax_ecm_used']['it-it'] = "";
 $text['description-fax_ecm_used']['nl-nl'] = "";
-$text['description-fax_ecm_used']['pl-pl'] = "";
+$text['description-fax_ecm_used']['pl-pl'] = "Użyty tryb korekcji błędów (ECM).";
 $text['description-fax_ecm_used']['pt-br'] = "";
 $text['description-fax_ecm_used']['pt-pt'] = "";
 $text['description-fax_ecm_used']['ro-ro'] = "";
@@ -2828,7 +2849,7 @@ $text['description-fax_document_transferred_pages']['fr-fr'] = "Nombre de pages
 $text['description-fax_document_transferred_pages']['he-il'] = "";
 $text['description-fax_document_transferred_pages']['it-it'] = "";
 $text['description-fax_document_transferred_pages']['nl-nl'] = "";
-$text['description-fax_document_transferred_pages']['pl-pl'] = "";
+$text['description-fax_document_transferred_pages']['pl-pl'] = "Liczba przesłanych stron.";
 $text['description-fax_document_transferred_pages']['pt-br'] = "";
 $text['description-fax_document_transferred_pages']['pt-pt'] = "";
 $text['description-fax_document_transferred_pages']['ro-ro'] = "";
@@ -2849,7 +2870,7 @@ $text['description-fax_document_total_pages']['fr-fr'] = "Nombre total de pages.
 $text['description-fax_document_total_pages']['he-il'] = "";
 $text['description-fax_document_total_pages']['it-it'] = "";
 $text['description-fax_document_total_pages']['nl-nl'] = "";
-$text['description-fax_document_total_pages']['pl-pl'] = "";
+$text['description-fax_document_total_pages']['pl-pl'] = "Całkowita liczba stron.";
 $text['description-fax_document_total_pages']['pt-br'] = "";
 $text['description-fax_document_total_pages']['pt-pt'] = "";
 $text['description-fax_document_total_pages']['ro-ro'] = "";
@@ -2870,7 +2891,7 @@ $text['description-fax_date']['fr-fr'] = "Date de télécopie";
 $text['description-fax_date']['he-il'] = "";
 $text['description-fax_date']['it-it'] = "";
 $text['description-fax_date']['nl-nl'] = "";
-$text['description-fax_date']['pl-pl'] = "";
+$text['description-fax_date']['pl-pl'] = "Data faksu.";
 $text['description-fax_date']['pt-br'] = "";
 $text['description-fax_date']['pt-pt'] = "";
 $text['description-fax_date']['ro-ro'] = "";
@@ -2891,7 +2912,7 @@ $text['description-fax_caller_id_number']['fr-fr'] = "Numéro d'identification d
 $text['description-fax_caller_id_number']['he-il'] = "";
 $text['description-fax_caller_id_number']['it-it'] = "";
 $text['description-fax_caller_id_number']['nl-nl'] = "";
-$text['description-fax_caller_id_number']['pl-pl'] = "";
+$text['description-fax_caller_id_number']['pl-pl'] = "Prezentacja numeru dzwoniącego.";
 $text['description-fax_caller_id_number']['pt-br'] = "";
 $text['description-fax_caller_id_number']['pt-pt'] = "";
 $text['description-fax_caller_id_number']['ro-ro'] = "";
@@ -2912,7 +2933,7 @@ $text['description-fax_caller_id_name']['fr-fr'] = "Nom de l'appelant.";
 $text['description-fax_caller_id_name']['he-il'] = "";
 $text['description-fax_caller_id_name']['it-it'] = "";
 $text['description-fax_caller_id_name']['nl-nl'] = "";
-$text['description-fax_caller_id_name']['pl-pl'] = "";
+$text['description-fax_caller_id_name']['pl-pl'] = "Prezentacja nazwy dzwoniącego.";
 $text['description-fax_caller_id_name']['pt-br'] = "";
 $text['description-fax_caller_id_name']['pt-pt'] = "";
 $text['description-fax_caller_id_name']['ro-ro'] = "";
@@ -2933,7 +2954,7 @@ $text['description-toll_allow']['fr-fr'] = "";
 $text['description-toll_allow']['he-il'] = "";
 $text['description-toll_allow']['it-it'] = "";
 $text['description-toll_allow']['nl-nl'] = "";
-$text['description-toll_allow']['pl-pl'] = "";
+$text['description-toll_allow']['pl-pl'] = "Wprowadź wartość drogich/szczegółowych połączeń.";
 $text['description-toll_allow']['pt-br'] = "";
 $text['description-toll_allow']['pt-pt'] = "";
 $text['description-toll_allow']['ro-ro'] = "";
@@ -2954,7 +2975,7 @@ $text['description-fax_base64']['fr-fr'] = "Base64 codage";
 $text['description-fax_base64']['he-il'] = "";
 $text['description-fax_base64']['it-it'] = "";
 $text['description-fax_base64']['nl-nl'] = "";
-$text['description-fax_base64']['pl-pl'] = "";
+$text['description-fax_base64']['pl-pl'] = "Kodowanie Base64";
 $text['description-fax_base64']['pt-br'] = "";
 $text['description-fax_base64']['pt-pt'] = "";
 $text['description-fax_base64']['ro-ro'] = "";
@@ -2975,7 +2996,7 @@ $text['description-fax_bad_rows']['fr-fr'] = "Nombre de mauvaises lignes.";
 $text['description-fax_bad_rows']['he-il'] = "";
 $text['description-fax_bad_rows']['it-it'] = "";
 $text['description-fax_bad_rows']['nl-nl'] = "";
-$text['description-fax_bad_rows']['pl-pl'] = "";
+$text['description-fax_bad_rows']['pl-pl'] = "Liczba złych wierszy";
 $text['description-fax_bad_rows']['pt-br'] = "";
 $text['description-fax_bad_rows']['pt-pt'] = "";
 $text['description-fax_bad_rows']['ro-ro'] = "";
@@ -3101,7 +3122,7 @@ $text['description-fax-number']['fr-fr'] = "Entrez le numéro(s) de fax du desti
 $text['description-fax-number']['he-il'] = "";
 $text['description-fax-number']['it-it'] = "Inserire i/il numero del destinatario.";
 $text['description-fax-number']['nl-nl'] = "";
-$text['description-fax-number']['pl-pl'] = "Wprowadź numer (y) faksu odbiorcy.";
+$text['description-fax-number']['pl-pl'] = "Wprowadź numer(y) faksu odbiorcy.";
 $text['description-fax-number']['pt-br'] = "Digite o número de fax do destinatário";
 $text['description-fax-number']['pt-pt'] = "Digite o número do(s) de fax do destinatário.";
 $text['description-fax-number']['ro-ro'] = "";
@@ -3143,7 +3164,7 @@ $text['description-fax-header']['fr-fr'] = "Affiché sous le logo dans l'en-têt
 $text['description-fax-header']['he-il'] = "";
 $text['description-fax-header']['it-it'] = "Mostrato sotto il logo nell'intestazione della copertina (opzionale).";
 $text['description-fax-header']['nl-nl'] = "";
-$text['description-fax-header']['pl-pl'] = "Wyświetlane pod logo w nagłówku stroniy tytułowej (opcjonalnie).";
+$text['description-fax-header']['pl-pl'] = "Wyświetlane pod logo w nagłówku strony tytułowej (opcjonalnie).";
 $text['description-fax-header']['pt-br'] = "Exibir logo abaixo no cabeçalho da folha de rosto(opcional)";
 $text['description-fax-header']['pt-pt'] = "Exibido abaixo do logotipo no cabeçalho da folha de rosto (opcional).";
 $text['description-fax-header']['ro-ro'] = "";
@@ -3185,7 +3206,7 @@ $text['description-extension']['fr-fr'] = "Choisir un numéro d'extension.";
 $text['description-extension']['he-il'] = "";
 $text['description-extension']['it-it'] = "Inserire l'interno fax.";
 $text['description-extension']['nl-nl'] = "";
-$text['description-extension']['pl-pl'] = "Wprowadź alfanumeryczny numer wewnętrzny. Domyślna konfiguracja pozwala na 2-7 cyfrowe  numery wewnętrzne";
+$text['description-extension']['pl-pl'] = "Wprowadź alfanumeryczny numer wewnętrzny. Domyślna konfiguracja pozwala na 2-7 cyfrowe numery wewnętrzne";
 $text['description-extension']['pt-br'] = "Atribua a extensão e números ao dispositivo";
 $text['description-extension']['pt-pt'] = "Introduza aqui a extensão do fax";
 $text['description-extension']['ro-ro'] = "";
@@ -3227,7 +3248,7 @@ $text['description-email_outbound_authorized_senders']['fr-fr'] = "Définir l'ad
 $text['description-email_outbound_authorized_senders']['he-il'] = "";
 $text['description-email_outbound_authorized_senders']['it-it'] = "Definire l'indirizzo/i e-mail a cui è permesso inviare i fax tramite questo servizio.";
 $text['description-email_outbound_authorized_senders']['nl-nl'] = "";
-$text['description-email_outbound_authorized_senders']['pl-pl'] = "Określ adres e-mail (y) dopuszczone do wysyłania faksów za pośrednictwem tego serwera.";
+$text['description-email_outbound_authorized_senders']['pl-pl'] = "Określ adres(y) e-mail(i) dopuszczone do wysyłania faksów za pośrednictwem tego serwera.";
 $text['description-email_outbound_authorized_senders']['pt-br'] = "Defina um endereço de email com permissões para enviar fax através deste servidor";
 $text['description-email_outbound_authorized_senders']['pt-pt'] = "Defina o endereço de e-mail(s) permissão para enviar faxes através deste servidor.";
 $text['description-email_outbound_authorized_senders']['ro-ro'] = "";
@@ -3269,7 +3290,7 @@ $text['description-email_connection_validate']['fr-fr'] = "Activer la validation
 $text['description-email_connection_validate']['he-il'] = "";
 $text['description-email_connection_validate']['it-it'] = "Abilita verifica certificato server.";
 $text['description-email_connection_validate']['nl-nl'] = "";
-$text['description-email_connection_validate']['pl-pl'] = "Włącz sprawdzanie poprawności certyfikatu serwera.";
+$text['description-email_connection_validate']['pl-pl'] = "Włącz sprawdzanie poprawności certyfikatu serwera.<br>(Wybierz 'Nie' dla certyfikatów z podpisem własnym.)";
 $text['description-email_connection_validate']['pt-br'] = "Habilitar validação do certificado do servidor.(Selecione 'Não' para os certificados auto-assinados)";
 $text['description-email_connection_validate']['pt-pt'] = "Habilitar a validação do certificado do servidor.<br>(Selecione 'Não' para os certificados auto-assinados.)";
 $text['description-email_connection_validate']['ro-ro'] = "";
@@ -3395,7 +3416,7 @@ $text['description-email_connection_mailbox']['fr-fr'] = "Entrez le nom du dossi
 $text['description-email_connection_mailbox']['he-il'] = "";
 $text['description-email_connection_mailbox']['it-it'] = "Inserire il nome della cartella remota da controllare.";
 $text['description-email_connection_mailbox']['nl-nl'] = "";
-$text['description-email_connection_mailbox']['pl-pl'] = "Wpisz nazwę zdalnego folderu  monitorowanego.";
+$text['description-email_connection_mailbox']['pl-pl'] = "Wpisz nazwę zdalnego folderu monitorowanego.";
 $text['description-email_connection_mailbox']['pt-br'] = "Digite o nome da pasta remota para monitoramento";
 $text['description-email_connection_mailbox']['pt-pt'] = "Digite o nome da pasta remoto para monitorar.";
 $text['description-email_connection_mailbox']['ro-ro'] = "";
@@ -3403,25 +3424,25 @@ $text['description-email_connection_mailbox']['ru-ru'] = "Введите имя
 $text['description-email_connection_mailbox']['sv-se'] = "Ange fjärrmapp-namnet för att övervaka.";
 $text['description-email_connection_mailbox']['uk-ua'] = "";
 
-$text['description-email']['en-us'] = "Enter a delivery address for inbound faxes.";
-$text['description-email']['en-gb'] = "Enter a delivery address for inbound faxes.";
+$text['description-email']['en-us'] = "Enter a delivery address for fax notifications.";
+$text['description-email']['en-gb'] = "Enter a delivery address for fax notifications.";
 $text['description-email']['ar-eg'] = "";
-$text['description-email']['de-at'] = "Geben Sie eine Zustelladdresse für eingehende Faxe ein."; //copied from de-de
-$text['description-email']['de-ch'] = "Geben Sie eine Zustelladdresse für eingehende Faxe ein."; //copied from de-de
-$text['description-email']['de-de'] = "Geben Sie eine Zustelladdresse für eingehende Faxe ein.";
-$text['description-email']['es-cl'] = "Ingrese la dirección de email para enviar el fax.";
-$text['description-email']['es-mx'] = "Ingrese la dirección de email para enviar el fax."; //copied from es-cl
-$text['description-email']['fr-ca'] = "Choisir un courriel où envoyer le Fax."; //copied from fr-fr
-$text['description-email']['fr-fr'] = "Choisir un courriel où envoyer le Fax.";
+$text['description-email']['de-at'] = "Geben Sie eine Zustelladresse für Faxbenachrichtigungen ein."; //copied from de-de
+$text['description-email']['de-ch'] = "Geben Sie eine Zustelladresse für Faxbenachrichtigungen ein."; //copied from de-de
+$text['description-email']['de-de'] = "Geben Sie eine Zustelladresse für Faxbenachrichtigungen ein.";
+$text['description-email']['es-cl'] = "Introduzca una dirección de entrega para las notificaciones por fax.";
+$text['description-email']['es-mx'] = "Introduzca una dirección de entrega para las notificaciones por fax."; //copied from es-cl
+$text['description-email']['fr-ca'] = "Saisissez une adresse de livraison pour les notifications par fax."; //copied from fr-fr
+$text['description-email']['fr-fr'] = "Saisissez une adresse de livraison pour les notifications par fax.";
 $text['description-email']['he-il'] = "";
-$text['description-email']['it-it'] = "Inserire un indirizzo di consegna per i fax in ingresso.";
+$text['description-email']['it-it'] = "Immettere un indirizzo di consegna per le notifiche fax.";
 $text['description-email']['nl-nl'] = "";
-$text['description-email']['pl-pl'] = "Podaj email,  na który będą wysyłane faksy przychodzące.";
-$text['description-email']['pt-br'] = "Insira o endereço de email para enviar o fax";
-$text['description-email']['pt-pt'] = "Introduza o endereço de email para enviar o fax.";
+$text['description-email']['pl-pl'] = "Wprowadź adres dostawy dla powiadomień faksowych.";
+$text['description-email']['pt-br'] = "Insira um endereço de entrega para notificações de fax.";
+$text['description-email']['pt-pt'] = "Introduza um endereço de entrega para notificações de fax.";
 $text['description-email']['ro-ro'] = "";
-$text['description-email']['ru-ru'] = "Введите адрес доставки входящих факсов.";
-$text['description-email']['sv-se'] = "Ange en adress för inkommande fax.";
+$text['description-email']['ru-ru'] = "Введите адрес доставки факсимильных уведомлений.";
+$text['description-email']['sv-se'] = "Ange en leveransadress för faxmeddelanden.";
 $text['description-email']['uk-ua'] = "";
 
 $text['description-destination-number']['en-us'] = "Enter the fax destination number.";
@@ -3500,7 +3521,7 @@ $text['description-advanced_settings']['fr-fr'] = "Configurez les paramètres ci
 $text['description-advanced_settings']['he-il'] = "";
 $text['description-advanced_settings']['it-it'] = "Configura il parametro sotto per abilitare la Ricezione Remota e la funzionalità Email-to-Fax.";
 $text['description-advanced_settings']['nl-nl'] = "";
-$text['description-advanced_settings']['pl-pl'] = "Skonfiguruj te ustawienia, aby właczyć zdalną skrzynkę odbiorczą oraz funkcję 'Email-to-Fax '.";
+$text['description-advanced_settings']['pl-pl'] = "Skonfiguruj te ustawienia, aby właczyć zdalną skrzynkę odbiorczą oraz funkcję 'Email-to-Fax'.";
 $text['description-advanced_settings']['pt-br'] = "Defina as configurações abaixo para permitir caixa de entrada de fax remota";
 $text['description-advanced_settings']['pt-pt'] = "Defina as configurações abaixo para permitir Inbox remoto e funcionalidade Email-to-Fax.";
 $text['description-advanced_settings']['ro-ro'] = "";
@@ -3521,7 +3542,7 @@ $text['description-3']['fr-fr'] = "Installer LibreOffice pour un soutien supplé
 $text['description-3']['he-il'] = "";
 $text['description-3']['it-it'] = "Installa LibreOffice per supportare altri formati di file (DOC, DOCX, XLS, XLSX, ODT, OTT, RTF, etc). Vedi lo stato di una trasmissione fax nella pagina Chiamate Attive, nel Visualizzatore Log, o guardando i risultati nella console dello Switch.";
 $text['description-3']['nl-nl'] = "";
-$text['description-3']['pl-pl'] = "Zainstaluj LibreOffice w celu dodatkowego wsparcia formatu plików (DOC, DOCX, XLS, XLSX, ODT, OTT, RTF, itp). Obserwuj status transmisji faksu na stronie Aktywnych Połączeń, w Podglądzie Logów  lub przeglądając wyniki w konsoli.";
+$text['description-3']['pl-pl'] = "Zainstaluj LibreOffice w celu dodatkowego wsparcia formatu plików (DOC, DOCX, XLS, XLSX, ODT, OTT, RTF, itp). Obserwuj status transmisji faksu na stronie Aktywnych Połączeń, w Podglądzie Logów lub przeglądając wyniki w konsoli.";
 $text['description-3']['pt-br'] = "Utilize os campos para filtrar a informação sobre os registos de chamadas desejados.";
 $text['description-3']['pt-pt'] = "Instalar LibreOffice para suporte adicional formato de arquivo (DOC, DOCX, XLS, XLSX, ODT, OTT, RTF, ...). Exibir o status de uma transmissão de fax na página de chamadas ativas, o Log Viewer, ou assistindo os resultados no console switch.";
 $text['description-3']['ro-ro'] = "";
@@ -3542,7 +3563,7 @@ $text['description-2']['fr-fr'] = "Pour envoyer un fax, téléchargez un fichier
 $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'] = "";
-$text['description-2']['pl-pl'] = "Aby wysłać faks, prześlij go w pliku PDF lub TIF.  Aby stworzyć okładkę, wpisz poniżej Tytuł oraz treść wiadomości.";
+$text['description-2']['pl-pl'] = "Aby wysłać faks, prześlij go w pliku <strong>PDF</strong> lub <strong>TIF</strong>. Aby stworzyć okładkę, wpisz poniżej Tytuł i/lub treść wiadomości.";
 $text['description-2']['pt-br'] = "A informação contem a origem, destino, duração e outros detalhes úteis da chamada.";
 $text['description-2']['pt-pt'] = "Pour envoyer un fax, télécharger un fichier <strong>PDF</strong> ou <strong>TIF</strong>.  Para gerar uma folha de rosto, digite um assunto e / ou mensagem abaixo.";
 $text['description-2']['ro-ro'] = "";
@@ -3584,7 +3605,7 @@ $text['description-accountcode']['fr-fr'] = "Entrez le code de compte.";
 $text['description-accountcode']['he-il'] = "";
 $text['description-accountcode']['it-it'] = "Inserire l'accountcode.";
 $text['description-accountcode']['nl-nl'] = "";
-$text['description-accountcode']['pl-pl'] = "";
+$text['description-accountcode']['pl-pl'] = "Wprowadź numer konta billingowego.";
 $text['description-accountcode']['pt-br'] = "";
 $text['description-accountcode']['pt-pt'] = "";
 $text['description-accountcode']['ro-ro'] = "";
@@ -3605,7 +3626,7 @@ $text['description-fax_send_channels']['fr-fr'] = "";
 $text['description-fax_send_channels']['he-il'] = "";
 $text['description-fax_send_channels']['it-it'] = "";
 $text['description-fax_send_channels']['nl-nl'] = "";
-$text['description-fax_send_channels']['pl-pl'] = "";
+$text['description-fax_send_channels']['pl-pl'] = "Wprowadź maksymalną liczbę kanałów do użycia.";
 $text['description-fax_send_channels']['pt-br'] = "";
 $text['description-fax_send_channels']['pt-pt'] = "";
 $text['description-fax_send_channels']['ro-ro'] = "";
@@ -3626,7 +3647,7 @@ $text['confirm-update']['fr-fr'] = "Mis à jour";
 $text['confirm-update']['he-il'] = "עידכון הושלם";
 $text['confirm-update']['it-it'] = "Aggiornamento Completato";
 $text['confirm-update']['nl-nl'] = "";
-$text['confirm-update']['pl-pl'] = "Aktualizacja zakonczona";
+$text['confirm-update']['pl-pl'] = "Zaktualizowano pomyślnie";
 $text['confirm-update']['pt-br'] = "Atualização Efetuada";
 $text['confirm-update']['pt-pt'] = "Actualização Completa";
 $text['confirm-update']['ro-ro'] = "";
@@ -3647,7 +3668,7 @@ $text['confirm-fax']['fr-fr'] = "Merci d'indiquer: Un Fichier à émettre";
 $text['confirm-fax']['he-il'] = "";
 $text['confirm-fax']['it-it'] = "Prego fornire: Un file da faxare";
 $text['confirm-fax']['nl-nl'] = "";
-$text['confirm-fax']['pl-pl'] = "Wprowadź plik do wysłania";
+$text['confirm-fax']['pl-pl'] = "Wprowadź plik do wysłania faksem";
 $text['confirm-fax']['pt-br'] = "Por favor indique uma pasta para enviar Fax";
 $text['confirm-fax']['pt-pt'] = "Por favor indique: um ficheiro para enviar Fax";
 $text['confirm-fax']['ro-ro'] = "";
@@ -3655,8 +3676,8 @@ $text['confirm-fax']['ru-ru'] = "Предоставьте: файл для фа
 $text['confirm-fax']['sv-se'] = "Ange: En fil att fax:a";
 $text['confirm-fax']['uk-ua'] = "";
 
-$text['confirm-ext']['en-us'] = "Por favor indique: Extensión";
-$text['confirm-ext']['en-gb'] = "Por favor indique: Extensión";
+$text['confirm-ext']['en-us'] = "Please provide: An extension number";
+$text['confirm-ext']['en-gb'] = "Please provide: An extension number";
 $text['confirm-ext']['ar-eg'] = "";
 $text['confirm-ext']['de-at'] = "Bitte geben Sie eine Nebenstelle an."; //copied from de-de
 $text['confirm-ext']['de-ch'] = "Bitte geben Sie eine Nebenstelle an."; //copied from de-de
@@ -3689,7 +3710,7 @@ $text['confirm-add']['fr-fr'] = "Ajouté";
 $text['confirm-add']['he-il'] = "הוספה הושלמה";
 $text['confirm-add']['it-it'] = "Inserimento Completato";
 $text['confirm-add']['nl-nl'] = "";
-$text['confirm-add']['pl-pl'] = "Dodano poprawnie";
+$text['confirm-add']['pl-pl'] = "Dodano pomyślnie";
 $text['confirm-add']['pt-br'] = "Criação efetuada";
 $text['confirm-add']['pt-pt'] = "Adição Efectuada";
 $text['confirm-add']['ro-ro'] = "";
@@ -3697,6 +3718,48 @@ $text['confirm-add']['ru-ru'] = "Добавление выполнено";
 $text['confirm-add']['sv-se'] = "Tillagd";
 $text['confirm-add']['uk-ua'] = "";
 
+$text['confirm-queued']['en-us'] = "FAX Queued";
+$text['confirm-queued']['en-gb'] = "FAX Queued";
+$text['confirm-queued']['ar-eg'] = "";
+$text['confirm-queued']['de-at'] = "Gesendete Faxe"; //copied from de-de
+$text['confirm-queued']['de-ch'] = "Gesendete Faxe"; //copied from de-de
+$text['confirm-queued']['de-de'] = "Gesendete Faxe";
+$text['confirm-queued']['es-cl'] = "Los Faxes Enviados";
+$text['confirm-queued']['es-mx'] = "Los Faxes Enviados"; //copied from es-cl
+$text['confirm-queued']['fr-ca'] = "Fax Envoyés"; //copied from fr-fr
+$text['confirm-queued']['fr-fr'] = "Fax Envoyés";
+$text['confirm-queued']['he-il'] = "פקסים שנשלחו";
+$text['confirm-queued']['it-it'] = "Fax Spediti";
+$text['confirm-queued']['nl-nl'] = "";
+$text['confirm-queued']['pl-pl'] = "Wysłane faksy";
+$text['confirm-queued']['pt-br'] = "Fax enviados";
+$text['confirm-queued']['pt-pt'] = "Faxes Enviados";
+$text['confirm-queued']['ro-ro'] = "";
+$text['confirm-queued']['ru-ru'] = "Передача Fax";
+$text['confirm-queued']['sv-se'] = "Skickade Fax";
+$text['confirm-queued']['uk-ua'] = "";
+
+$text['confirm-sent']['en-us'] = "FAX Sent";
+$text['confirm-sent']['en-gb'] = "FAX Sent";
+$text['confirm-sent']['ar-eg'] = "";
+$text['confirm-sent']['de-at'] = "Gesendete Faxe"; //copied from de-de
+$text['confirm-sent']['de-ch'] = "Gesendete Faxe"; //copied from de-de
+$text['confirm-sent']['de-de'] = "Gesendete Faxe";
+$text['confirm-sent']['es-cl'] = "Los Faxes Enviados";
+$text['confirm-sent']['es-mx'] = "Los Faxes Enviados"; //copied from es-cl
+$text['confirm-sent']['fr-ca'] = "Fax Envoyés"; //copied from fr-fr
+$text['confirm-sent']['fr-fr'] = "Fax Envoyés";
+$text['confirm-sent']['he-il'] = "פקסים שנשלחו";
+$text['confirm-sent']['it-it'] = "Fax Spediti";
+$text['confirm-sent']['nl-nl'] = "";
+$text['confirm-sent']['pl-pl'] = "Wysłane faksy";
+$text['confirm-sent']['pt-br'] = "Fax enviados";
+$text['confirm-sent']['pt-pt'] = "Faxes Enviados";
+$text['confirm-sent']['ro-ro'] = "";
+$text['confirm-sent']['ru-ru'] = "Передача Fax";
+$text['confirm-sent']['sv-se'] = "Skickade Fax";
+$text['confirm-sent']['uk-ua'] = "";
+
 $text['button-settings']['en-us'] = "Settings";
 $text['button-settings']['en-gb'] = "Settings";
 $text['button-settings']['ar-eg'] = "";
@@ -3731,7 +3794,7 @@ $text['button-send']['fr-fr'] = "Envoyer";
 $text['button-send']['he-il'] = "נשלח";
 $text['button-send']['it-it'] = "Invia";
 $text['button-send']['nl-nl'] = "";
-$text['button-send']['pl-pl'] = "Wysłane";
+$text['button-send']['pl-pl'] = "Wyślij";
 $text['button-send']['pt-br'] = "Enviar Broadcast";
 $text['button-send']['pt-pt'] = "Enviar";
 $text['button-send']['ro-ro'] = "";
@@ -3752,7 +3815,7 @@ $text['button-preview']['fr-fr'] = "Aperçu";
 $text['button-preview']['he-il'] = "תצוגה מקדימה";
 $text['button-preview']['it-it'] = "Anteprima";
 $text['button-preview']['nl-nl'] = "";
-$text['button-preview']['pl-pl'] = "Podgląd ";
+$text['button-preview']['pl-pl'] = "Podgląd";
 $text['button-preview']['pt-br'] = "Visualização";
 $text['button-preview']['pt-pt'] = "Pré-Visualização";
 $text['button-preview']['ro-ro'] = "";
@@ -3794,7 +3857,7 @@ $text['fax-active_title']['fr-fr'] = "File d'attente de fax";
 $text['fax-active_title']['he-il'] = "";
 $text['fax-active_title']['it-it'] = "Coda Fax";
 $text['fax-active_title']['nl-nl'] = "";
-$text['fax-active_title']['pl-pl'] = "";
+$text['fax-active_title']['pl-pl'] = "Kolejka faksów";
 $text['fax-active_title']['pt-br'] = "";
 $text['fax-active_title']['pt-pt'] = "";
 $text['fax-active_title']['ro-ro'] = "";
@@ -3815,7 +3878,7 @@ $text['fax-active_description']['fr-fr'] = "Statut actuel de la file d'attente d
 $text['fax-active_description']['he-il'] = "";
 $text['fax-active_description']['it-it'] = "Stato della Coda Fax";
 $text['fax-active_description']['nl-nl'] = "";
-$text['fax-active_description']['pl-pl'] = "";
+$text['fax-active_description']['pl-pl'] = "Aktualny stan kolejki faksów";
 $text['fax-active_description']['pt-br'] = "";
 $text['fax-active_description']['pt-pt'] = "";
 $text['fax-active_description']['ro-ro'] = "";
@@ -3836,7 +3899,7 @@ $text['fax-active_title_fax_server']['fr-fr'] = "Fax";
 $text['fax-active_title_fax_server']['he-il'] = "";
 $text['fax-active_title_fax_server']['it-it'] = "Fax";
 $text['fax-active_title_fax_server']['nl-nl'] = "";
-$text['fax-active_title_fax_server']['pl-pl'] = "";
+$text['fax-active_title_fax_server']['pl-pl'] = "Faks";
 $text['fax-active_title_fax_server']['pt-br'] = "";
 $text['fax-active_title_fax_server']['pt-pt'] = "";
 $text['fax-active_title_fax_server']['ro-ro'] = "";
@@ -3857,7 +3920,7 @@ $text['fax-active_title_enabled']['fr-fr'] = "Activé";
 $text['fax-active_title_enabled']['he-il'] = "";
 $text['fax-active_title_enabled']['it-it'] = "Abilitato";
 $text['fax-active_title_enabled']['nl-nl'] = "";
-$text['fax-active_title_enabled']['pl-pl'] = "";
+$text['fax-active_title_enabled']['pl-pl'] = "Aktywny";
 $text['fax-active_title_enabled']['pt-br'] = "";
 $text['fax-active_title_enabled']['pt-pt'] = "";
 $text['fax-active_title_enabled']['ro-ro'] = "";
@@ -3878,7 +3941,7 @@ $text['fax-active_title_status']['fr-fr'] = "Statut";
 $text['fax-active_title_status']['he-il'] = "";
 $text['fax-active_title_status']['it-it'] = "Stato";
 $text['fax-active_title_status']['nl-nl'] = "";
-$text['fax-active_title_status']['pl-pl'] = "";
+$text['fax-active_title_status']['pl-pl'] = "Status";
 $text['fax-active_title_status']['pt-br'] = "";
 $text['fax-active_title_status']['pt-pt'] = "";
 $text['fax-active_title_status']['ro-ro'] = "";
@@ -3899,7 +3962,7 @@ $text['fax-active_title_next_time']['fr-fr'] = "Prochaine fois";
 $text['fax-active_title_next_time']['he-il'] = "";
 $text['fax-active_title_next_time']['it-it'] = "Prossima volta";
 $text['fax-active_title_next_time']['nl-nl'] = "";
-$text['fax-active_title_next_time']['pl-pl'] = "";
+$text['fax-active_title_next_time']['pl-pl'] = "Następny czas próby";
 $text['fax-active_title_next_time']['pt-br'] = "";
 $text['fax-active_title_next_time']['pt-pt'] = "";
 $text['fax-active_title_next_time']['ro-ro'] = "";
@@ -3920,7 +3983,7 @@ $text['fax-active_title_files']['fr-fr'] = "Ficher";
 $text['fax-active_title_files']['he-il'] = "";
 $text['fax-active_title_files']['it-it'] = "Files";
 $text['fax-active_title_files']['nl-nl'] = "";
-$text['fax-active_title_files']['pl-pl'] = "";
+$text['fax-active_title_files']['pl-pl'] = "Pliki";
 $text['fax-active_title_files']['pt-br'] = "";
 $text['fax-active_title_files']['pt-pt'] = "";
 $text['fax-active_title_files']['ro-ro'] = "";
@@ -3941,7 +4004,7 @@ $text['fax-active_title_uri']['fr-fr'] = "URI";
 $text['fax-active_title_uri']['he-il'] = "";
 $text['fax-active_title_uri']['it-it'] = "URI";
 $text['fax-active_title_uri']['nl-nl'] = "";
-$text['fax-active_title_uri']['pl-pl'] = "";
+$text['fax-active_title_uri']['pl-pl'] = "URI";
 $text['fax-active_title_uri']['pt-br'] = "";
 $text['fax-active_title_uri']['pt-pt'] = "";
 $text['fax-active_title_uri']['ro-ro'] = "";
@@ -3962,7 +4025,7 @@ $text['fax-active_status_wait']['fr-fr'] = "Attendre";
 $text['fax-active_status_wait']['he-il'] = "";
 $text['fax-active_status_wait']['it-it'] = "Attendi";
 $text['fax-active_status_wait']['nl-nl'] = "";
-$text['fax-active_status_wait']['pl-pl'] = "";
+$text['fax-active_status_wait']['pl-pl'] = "Oczekiwanie";
 $text['fax-active_status_wait']['pt-br'] = "";
 $text['fax-active_status_wait']['pt-pt'] = "";
 $text['fax-active_status_wait']['ro-ro'] = "";
@@ -3983,7 +4046,7 @@ $text['fax-active_status_execute']['fr-fr'] = "Exécuter";
 $text['fax-active_status_execute']['he-il'] = "";
 $text['fax-active_status_execute']['it-it'] = "Esegui";
 $text['fax-active_status_execute']['nl-nl'] = "";
-$text['fax-active_status_execute']['pl-pl'] = "";
+$text['fax-active_status_execute']['pl-pl'] = "Wykonywanie";
 $text['fax-active_status_execute']['pt-br'] = "";
 $text['fax-active_status_execute']['pt-pt'] = "";
 $text['fax-active_status_execute']['ro-ro'] = "";
@@ -4004,7 +4067,7 @@ $text['fax-active_status_success']['fr-fr'] = "Succès";
 $text['fax-active_status_success']['he-il'] = "";
 $text['fax-active_status_success']['it-it'] = "Successo";
 $text['fax-active_status_success']['nl-nl'] = "";
-$text['fax-active_status_success']['pl-pl'] = "";
+$text['fax-active_status_success']['pl-pl'] = "Sukces";
 $text['fax-active_status_success']['pt-br'] = "";
 $text['fax-active_status_success']['pt-pt'] = "";
 $text['fax-active_status_success']['ro-ro'] = "";
@@ -4025,7 +4088,7 @@ $text['fax-active_status_fail']['fr-fr'] = "Échouer";
 $text['fax-active_status_fail']['he-il'] = "";
 $text['fax-active_status_fail']['it-it'] = "Fallito";
 $text['fax-active_status_fail']['nl-nl'] = "";
-$text['fax-active_status_fail']['pl-pl'] = "";
+$text['fax-active_status_fail']['pl-pl'] = "Niepowodzenie";
 $text['fax-active_status_fail']['pt-br'] = "";
 $text['fax-active_status_fail']['pt-pt'] = "";
 $text['fax-active_status_fail']['ro-ro'] = "";
diff --git a/app/fax/fax.php b/app/fax/fax.php
index 0cb4f845d0..1054e54dda 100644
--- a/app/fax/fax.php
+++ b/app/fax/fax.php
@@ -202,15 +202,15 @@
 		echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add'],'id'=>'btn_add','link'=>'fax_edit.php']);
 	}
 	if (permission_exists('fax_extension_add') && $result) {
-		echo button::create(['type'=>'button','label'=>$text['button-copy'],'icon'=>$_SESSION['theme']['button_icon_copy'],'name'=>'btn_copy','onclick'=>"modal_open('modal-copy','btn_copy');"]);
+		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('fax_extension_delete') && $result) {
-		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 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";
-	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'=>'fax.php','style'=>($search == '' ? 'display: none;' : null)]);
+	echo 		"<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown=''>";
+	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search']);
+	//echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'fax.php','style'=>($search == '' ? 'display: none;' : null)]);
 	if ($paging_controls_mini != '') {
 		echo 	"<span style='margin-left: 15px;'>".$paging_controls_mini."</span>";
 	}
@@ -237,7 +237,7 @@
 	echo "<tr class='list-header'>\n";
 	if (permission_exists('fax_extension_add') || permission_exists('fax_extension_delete')) {
 		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 "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle(); checkbox_on_change(this);' ".($result ?: "style='visibility: hidden;'").">\n";
 		echo "	</th>\n";
 	}
 	echo th_order_by('fax_name', $text['label-name'], $order_by, $order);
@@ -259,7 +259,7 @@
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('fax_extension_add') || permission_exists('fax_extension_delete')) {
 				echo "	<td class='checkbox'>\n";
-				echo "		<input type='checkbox' name='fax_servers[$x][checked]' id='checkbox_".$x."' value='true' onclick=\"if (!this.checked) { document.getElementById('checkbox_all').checked = false; }\">\n";
+				echo "		<input type='checkbox' name='fax_servers[$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='fax_servers[$x][uuid]' value='".escape($row['fax_uuid'])."' />\n";
 				echo "	</td>\n";
 			}
@@ -287,6 +287,7 @@
 					$box = 'inbox';
 				}
 				echo "		<a href='".$file."?order_by=fax_date&order=desc&id=".urlencode($row['fax_uuid'])."&box=".$box."'>".$text['label-inbox']."</a>&nbsp;&nbsp;";
+				//echo "		<a href='fax_outbox.php?id=".urlencode($row['fax_uuid'])."'>".$text['label-outbox']."</a>&nbsp;&nbsp;";
 			}
 			if (permission_exists('fax_sent_view')) {
 				echo "		<a href='fax_files.php?order_by=fax_date&order=desc&id=".urlencode($row['fax_uuid'])."&box=sent'>".$text['label-sent']."</a>&nbsp;&nbsp;";
diff --git a/app/fax/fax_edit.php b/app/fax/fax_edit.php
index ae11e2bdc1..cc97110e05 100644
--- a/app/fax/fax_edit.php
+++ b/app/fax/fax_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):
@@ -51,7 +51,7 @@
 	$fax_dir = $_SESSION['switch']['storage']['dir'].'/fax/'.$_SESSION['domain_name'];
 
 //get the fax extension
-	if (strlen($fax_extension) > 0) {
+	if (is_numeric($fax_extension) > 0) {
 		//set the fax directories. example /usr/local/freeswitch/storage/fax/329/inbox
 			$dir_fax_inbox = $fax_dir.'/'.$fax_extension.'/inbox';
 			$dir_fax_sent = $fax_dir.'/'.$fax_extension.'/sent';
@@ -59,20 +59,21 @@
 
 		//make sure the directories exist
 			if (!is_dir($_SESSION['switch']['storage']['dir'])) {
-				event_socket_mkdir($_SESSION['switch']['storage']['dir']);
+				mkdir($_SESSION['switch']['storage']['dir'], 0770, true);
 			}
 			if (!is_dir($fax_dir.'/'.$fax_extension)) {
-				event_socket_mkdir($fax_dir.'/'.$fax_extension);
+				mkdir($fax_dir.'/'.$fax_extension, 0770, true);
 			}
 			if (!is_dir($dir_fax_inbox)) {
-				event_socket_mkdir($dir_fax_inbox);
+				mkdir($dir_fax_inbox, 0770, true);
 			}
 			if (!is_dir($dir_fax_sent)) {
-				event_socket_mkdir($dir_fax_sent);
+				mkdir($dir_fax_sent, 0770, true);
 			}
 			if (!is_dir($dir_fax_temp)) {
-				event_socket_mkdir($dir_fax_temp);
+				mkdir($dir_fax_temp, 0770, true);
 			}
+
 	}
 
 //set the action as an add or an update
@@ -1086,4 +1087,4 @@
 //show the footer
 	require_once "resources/footer.php";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/fax/fax_emails.php b/app/fax/fax_emails.php
index babec44e0d..2590b2a146 100644
--- a/app/fax/fax_emails.php
+++ b/app/fax/fax_emails.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) 2015
+	Portions created by the Initial Developer are Copyright (C) 2015 - 2022
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -25,6 +25,7 @@
 	James Rose <james.o.rose@gmail.com>
 */
 
+//includes
 include "root.php";
 require_once "resources/require.php";
 require_once "resources/functions/object_to_array.php";
@@ -64,10 +65,6 @@ if (is_array($result) && @sizeof($result) != 0) {
 	$event_socket['password'] = $row['event_socket_password'];
 	unset($sql, $row);
 
-	$fax_send_mode_default = $_SESSION['fax']['send_mode']['text'];
-	if(strlen($fax_send_mode_default) == 0){
-		$fax_send_mode_default = 'direct';
-	}
 	$fax_cover_font_default = $_SESSION['fax']['cover_font']['text'];
 
 	$fax_allowed_extension_default = arr_to_map($_SESSION['fax']['allowed_extension']);
@@ -104,18 +101,13 @@ if (is_array($result) && @sizeof($result) != 0) {
 		$_SESSION = $default_settings;
 		load_domain_settings($domain_uuid);
 
-		$fax_send_mode = $_SESSION['fax']['send_mode']['text'];
-		if(strlen($fax_send_mode) == 0){
-			$fax_send_mode = $fax_send_mode_default;
-		}
-
 		$fax_cover_font = $_SESSION['fax']['cover_font']['text'];
 		if(strlen($fax_cover_font) == 0){
 			$fax_cover_font = $fax_cover_font_default;
 		}
 
 		$fax_allowed_extension = arr_to_map($_SESSION['fax']['allowed_extension']);
-		if($fax_allowed_extension == false){
+		if($fax_allowed_extension == false) {
 			$fax_allowed_extension = $fax_allowed_extension_default;
 		}
 
@@ -164,17 +156,29 @@ if (is_array($result) && @sizeof($result) != 0) {
 
 			sort($emails); // oldest first
 			foreach ($emails as $email_id) {
+				//get email meta data
 				$metadata = object_to_array(imap_fetch_overview($connection, $email_id, FT_UID));
+				//print_r($metadata);
 
 				//format from address
-				$tmp = object_to_array(imap_rfc822_parse_adrlist($metadata[0]['from'], null));
-				$metadata[0]['from'] = strtolower($tmp[0]['mailbox']."@".$tmp[0]['host']);
-
+				//$tmp = object_to_array(imap_rfc822_parse_adrlist($metadata[0]['from'], null));
+				//$metadata[0]['from'] = strtolower($tmp[0]['mailbox']."@".$tmp[0]['host']);
+				//$sender_email = $metadata[0]['from'];
+	
+				//get the sender email address	
+				if (strstr($metadata[0]['from'], '<') && strstr($metadata[0]['from'], '>')) {
+					$sender_email = preg_match('/^.*<(.+)>/', $metadata[0]['from'], $matches) ? strtolower($matches[1]) : '';
+				}
+				else {
+					$sender_email = strtolower($metadata[0]['from']);
+				}
+ 
 				//check sender
-				$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) {
+					//debug info
+					//echo "authorized\n";
 
 					//add multi-lingual support
 					$language = new text;
diff --git a/app/fax/fax_files.php b/app/fax/fax_files.php
index f4a806b8ef..fc675e3a0a 100644
--- a/app/fax/fax_files.php
+++ b/app/fax/fax_files.php
@@ -171,19 +171,19 @@
 
 		//make sure the directories exist
 			if (!is_dir($_SESSION['switch']['storage']['dir'])) {
-				event_socket_mkdir($_SESSION['switch']['storage']['dir']);
+				mkdir($_SESSION['switch']['storage']['dir'], 0770, false);
 			}
 			if (!is_dir($fax_dir.'/'.$fax_extension)) {
-				event_socket_mkdir($fax_dir.'/'.$fax_extension);
+				mkdir($fax_dir.'/'.$fax_extension, 0770, false);
 			}
 			if (!is_dir($dir_fax_inbox)) {
-				event_socket_mkdir($dir_fax_inbox);
+				mkdir($dir_fax_inbox, 0770, false);
 			}
 			if (!is_dir($dir_fax_sent)) {
-				event_socket_mkdir($dir_fax_sent);
+				mkdir($dir_fax_sent, 0770, false);
 			}
 			if (!is_dir($dir_fax_temp)) {
-				event_socket_mkdir($dir_fax_temp);
+				mkdir($dir_fax_temp, 0770, false);
 			}
 	}
 
@@ -201,6 +201,7 @@
 	$parameters['domain_uuid'] = $domain_uuid;
 	$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;
@@ -211,7 +212,17 @@
 	$offset = $rows_per_page * $page;
 
 //get the list
-	$sql = str_replace('count(fax_file_uuid)', '*', $sql);
+	$sql = "select * from v_fax_files ";
+	$sql .= "where fax_uuid = :fax_uuid ";
+	$sql .= "and domain_uuid = :domain_uuid ";
+	if ($_REQUEST['box'] == 'inbox') {
+		$sql .= "and fax_mode = 'rx' ";
+	}
+	if ($_REQUEST['box'] == 'sent') {
+		$sql .= "and fax_mode = 'tx' ";
+	}
+	$parameters['fax_uuid'] = $fax_uuid;
+	$parameters['domain_uuid'] = $domain_uuid;
 	$sql .= order_by($order_by, $order, 'fax_date', 'desc');
 	$sql .= limit_offset($rows_per_page, $offset);
 	$database = new database;
@@ -351,6 +362,7 @@
 				//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);
+					//echo $cmd_tif2pdf."<br >\n";
 				//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'); }
diff --git a/app/fax/fax_outbox.php b/app/fax/fax_outbox.php
new file mode 100644
index 0000000000..d20a296c52
--- /dev/null
+++ b/app/fax/fax_outbox.php
@@ -0,0 +1,184 @@
+<?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>
+*/
+
+//includes
+	include "root.php";
+	require_once "resources/require.php";
+	require_once "resources/check_auth.php";
+	require_once "resources/paging.php";
+
+//check permissions
+	if (permission_exists('fax_extension_view')) {
+		//access granted
+	}
+	else {
+		echo "access denied";
+		exit;
+	}
+
+//add multi-lingual support
+	$language = new text;
+	$text = $language->get();
+
+//create token
+	$object = new token;
+	$token = $object->create($_SERVER['PHP_SELF']);
+
+//get fax extensions
+	if (is_uuid($_REQUEST["id"])) {
+		$fax_uuid = $_REQUEST["id"];
+		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 ";
+			$sql .= "and fax_uuid = :fax_uuid ";
+			$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+			$parameters['fax_uuid'] = $fax_uuid;
+		}
+		else {
+			//show only assigned fax extensions
+			$sql = "select fax_name, fax_extension 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 f.fax_uuid = :fax_uuid ";
+			$sql .= "and u.user_uuid = :user_uuid ";
+			$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+			$parameters['fax_uuid'] = $fax_uuid;
+			$parameters['user_uuid'] = $_SESSION['user_uuid'];
+		}
+		$database = new database;
+		$row = $database->select($sql, $parameters, 'row');
+		if (is_array($row) && @sizeof($row) != 0) {
+			//set database fields as variables
+			$fax_name = $row["fax_name"];
+			$fax_extension = $row["fax_extension"];
+		}
+		else {
+			if (!permission_exists('fax_extension_view_domain')) {
+				echo "access denied";
+				exit;
+			}
+		}
+		unset($sql, $parameters, $row);
+	}
+
+	$sql = "select * from v_fax_files ";
+	$sql .= "where fax_uuid = :fax_uuid ";
+	$sql .= "and domain_uuid = :domain_uuid ";
+	$sql .= "and fax_mode = 'tx' ";
+	$parameters['fax_uuid'] = $_REQUEST["id"];
+	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+	$database = new database;
+	$fax_files = $database->select($sql, $parameters, 'all');
+	unset($sql, $parameters);
+
+//check if currently sending a fax
+	$switch_cmd = 'show channels as json';
+
+//create the event socket connection
+	$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+
+//send the event socket command and get the array
+	if ($fp) {
+		$json = trim(event_socket_request($fp, 'api '.$switch_cmd));
+		$results = json_decode($json, "true");
+	}
+
+//additional includes
+	$document['title'] = 'Fax Outbox';
+	require_once "resources/header.php";
+
+//show the content
+	echo "<div class='action_bar' id='action_bar'>\n";
+	echo "	<div class='heading'><b>Fax Outbox</b></div>\n";
+	echo "	<div style='clear: both;'></div>\n";
+	echo "</div>\n";
+
+	echo "Show active faxes that are currently sending.\n";
+	echo "<br /><br />\n";
+
+	//echo "<form id='form_list' method='post'>\n";
+	echo "<form id='form_list' onsubmit='' 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' id='my_id' name='my_id' value='' />";
+
+	echo "	<table class='list'>\n";
+	echo "		<tr class='list-header'>\n";
+	echo "			<th>Destination</th>";
+	echo "			<th>Status</th>";
+	echo "			<th>Preview</th>";
+	echo "			<th>Path</th>";
+	echo "		</tr>\n";
+
+//loop through the faxes
+	if (isset($results["rows"])) {
+		if (is_array($results["rows"]) && @sizeof($results["rows"]) != 0) {
+			$x = 0;
+			foreach ($results["rows"] as $row) {
+				$file = basename($row['application_data']);
+				if (strtolower(substr($file, -3)) == "tif" || strtolower(substr($file, -3)) == "pdf") {
+					$file_name = substr($file, 0, (strlen($file) -4));
+				}
+
+				if (strlen($row['fax_base64']) <= 0) {
+					echo "	<tr class='list-row' >\n";
+					echo "	<td>".escape($row['dest'])."</td>";
+					echo "	<td>Sending...</td>";
+					echo "	<td>\n";
+					echo "		<a href='/app/fax/fax_files.php?id=".urlencode($_REQUEST["id"])."&a=download&type=fax_sent&t=bin&ext=".urlencode($fax_extension)."&filename=".urlencode($file_name).".tif'>Fax PDF - ".urlencode($file_name)."</a>\n";
+					echo "	</td>\n";
+					echo "	<td>".escape($row['application_data'])."</td>";
+					echo "	</tr>\n";
+				}
+				$x++;
+			}
+		}
+	}
+	echo "	</table>\n";
+	echo "	<br />\n";
+	echo "	<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
+	echo "</form>\n";
+
+	echo "<span id='output'></span>\n";
+	echo "<script type='text/javascript'>\n";
+	echo "	function AutoRefresh( t ) { setTimeout('location.reload(true);', t); }";
+	echo "	AutoRefresh(10000);";
+	echo "</script>\n";
+
+	//$my_id = $_SESSION['/var/lib/freeswitch/storage/fax/'.$_SESSION['domain_name'].'/'.$fax_extension.'/temp'];
+	//if (file_exists('/var/lib/freeswitch/storage/fax/'.$_SESSION['domain_name'].'/'.$fax_extension.'/temp/'.$my_id.'.tif')) {
+	//	rename('/var/lib/freeswitch/storage/fax/'.$_SESSION['domain_name'].'/'.$fax_extension.'/temp/'.$my_id.'.tif', '/var/lib/freeswitch/storage/fax/'.$_SESSION['domain_name'].'/'.$fax_extension.'/sent/'.$my_id.'.tif');
+	//}
+
+	//if (file_exists('/var/lib/freeswitch/storage/fax/'.$_SESSION['domain_name'].'/'.$fax_extension.'/temp/'.$my_id.'.pdf')) {
+	//	rename('/var/lib/freeswitch/storage/fax/'.$_SESSION['domain_name'].'/'.$fax_extension.'/temp/'.$my_id.'.pdf', '/var/lib/freeswitch/storage/fax/'.$_SESSION['domain_name'].'/'.$fax_extension.'/sent/'.$my_id.'.pdf');
+	//}
+
+//include the footer
+	require_once "resources/footer.php";
+
+?>
diff --git a/app/fax/fax_send.php b/app/fax/fax_send.php
index 722088ba87..777e244096 100644
--- a/app/fax/fax_send.php
+++ b/app/fax/fax_send.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-2021
+	Portions created by the Initial Developer are Copyright (C) 2008-2022
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -28,10 +28,13 @@
 	Corey Moullas <cmoullas@emak.tech>
 */
 
-if (!isset($included)) { $included = false; }
+//set included to boolean
+	if (!isset($included)) { $included = false; }
 
-if (stristr(PHP_OS, 'WIN')) { $IS_WINDOWS = true; } else { $IS_WINDOWS = false; }
+//check if windows
+	if (stristr(PHP_OS, 'WIN')) { $IS_WINDOWS = true; } else { $IS_WINDOWS = false; }
 
+//send email through browser
 if (!$included) {
 
 	//includes
@@ -87,13 +90,13 @@ if (!$included) {
 			$row = $database->select($sql, $parameters, 'row');
 			if (is_array($row) && @sizeof($row) != 0) {
 				//set database fields as variables
-					$fax_uuid = $row["fax_uuid"];
-					$fax_extension = $row["fax_extension"];
-					$fax_caller_id_name = $row["fax_caller_id_name"];
-					$fax_caller_id_number = $row["fax_caller_id_number"];
-					$fax_toll_allow = $row["fax_toll_allow"];
-					$fax_accountcode = $row["accountcode"];
-					$fax_send_greeting = $row["fax_send_greeting"];
+				$fax_uuid = $row["fax_uuid"];
+				$fax_extension = $row["fax_extension"];
+				$fax_caller_id_name = $row["fax_caller_id_name"];
+				$fax_caller_id_number = $row["fax_caller_id_number"];
+				$fax_toll_allow = $row["fax_toll_allow"];
+				$fax_accountcode = $row["accountcode"];
+				$fax_send_greeting = $row["fax_send_greeting"];
 			}
 			else {
 				if (!permission_exists('fax_extension_view_domain')) {
@@ -102,17 +105,12 @@ if (!$included) {
 				}
 			}
 			unset($sql, $parameters, $row);
-
-			$fax_send_mode = $_SESSION['fax']['send_mode']['text'];
-			if(strlen($fax_send_mode) == 0){
-				$fax_send_mode = 'direct';
-			}
 		}
 
 	//set the fax directory
 		$fax_dir = $_SESSION['switch']['storage']['dir'].'/fax/'.$_SESSION['domain_name'];
 
-	// set fax cover font to generate pdf
+	//set fax cover font to generate pdf
 		$fax_cover_font = $_SESSION['fax']['cover_font']['text'];
 }
 else {
@@ -129,6 +127,7 @@ if (!function_exists('correct_path')) {
 	}
 }
 
+//define function gs_cmd
 if (!function_exists('gs_cmd')) {
 	function gs_cmd($args) {
 		global $IS_WINDOWS;
@@ -139,69 +138,7 @@ if (!function_exists('gs_cmd')) {
 	}
 }
 
-if (!function_exists('fax_enqueue')) {
-	function fax_enqueue($fax_uuid, $fax_file, $wav_file, $reply_address, $fax_uri, $fax_dtmf, $dial_string){
-		global $db_type;
-
-		$fax_task_uuid = uuid();
-		$dial_string .= "fax_task_uuid='" . $fax_task_uuid . "',";
-		$description = ''; //! @todo add description
-		if ($db_type == "pgsql") {
-			$date_utc_now_sql  = "NOW() at time zone 'utc'";
-		}
-		if ($db_type == "mysql") {
-			$date_utc_now_sql  = "UTC_TIMESTAMP()";
-		}
-		if ($db_type == "sqlite") {
-			$date_utc_now_sql  = "datetime('now')";
-		}
-
-		$array['fax_tasks'][0]['fax_task_uuid'] = $fax_task_uuid;
-		$array['fax_tasks'][0]['fax_uuid'] = $fax_uuid;
-		$array['fax_tasks'][0]['task_next_time'] = $date_utc_now_sql;
-		$array['fax_tasks'][0]['task_lock_time'] = null;
-		$array['fax_tasks'][0]['task_fax_file'] = $fax_file;
-		$array['fax_tasks'][0]['task_wav_file'] = $wav_file;
-		$array['fax_tasks'][0]['task_uri'] = $fax_uri;
-		$array['fax_tasks'][0]['task_dial_string'] = $dial_string;
-		$array['fax_tasks'][0]['task_dtmf'] = $fax_dtmf;
-		$array['fax_tasks'][0]['task_interrupted'] = 'false';
-		$array['fax_tasks'][0]['task_status'] = 0;
-		$array['fax_tasks'][0]['task_no_answer_counter'] = 0;
-		$array['fax_tasks'][0]['task_no_answer_retry_counter'] = 0;
-		$array['fax_tasks'][0]['task_retry_counter'] = 0;
-		$array['fax_tasks'][0]['task_reply_address'] = $reply_address;
-		$array['fax_tasks'][0]['task_description'] = $description;
-
-		$p = new permissions;
-		$p->add('fax_task_add', 'temp');
-
-		$database = new database;
-		$database->app_name = 'fax';
-		$database->app_uuid = '24108154-4ac3-1db6-1551-4731703a4440';
-		$database->save($array);
-		$message = $database->message;
-		unset($array);
-
-		$p->delete('fax_task_add', 'temp');
-
-		if ($message['message'] == 'OK' && $message['code'] == 200) {
-			$response = 'Enqueued';
-		}
-		else {
-			$response = 'Fail Enqueue';
-
-			echo $message['message'].' ['.$message['code']."]<br />\n";
-			if (is_array($message['error']) && @sizeof($message['error']) != 0) {
-				foreach ($message['error'] as $error) {
-					echo "<pre>".$error."</pre><br /><br />\n";
-				}
-			}
-		}
-		return $response;
-	}
-}
-
+//define function fax_split dtmf
 if (!function_exists('fax_split_dtmf')) {
 	function fax_split_dtmf(&$fax_number, &$fax_dtmf){
 		$tmp = array();
@@ -251,18 +188,19 @@ if (!function_exists('fax_split_dtmf')) {
 	$continue = false;
 	if (!$included) {
 		if (($_POST['action'] == "send")) {
-			$fax_numbers = $_POST['fax_numbers'];
-			$fax_uuid = $_POST["id"];
-			$fax_caller_id_name = $_POST['fax_caller_id_name'];
-			$fax_caller_id_number = $_POST['fax_caller_id_number'];
-			$fax_header = $_POST['fax_header'];
-			$fax_sender = $_POST['fax_sender'];
-			$fax_recipient = $_POST['fax_recipient'];
-			$fax_subject = $_POST['fax_subject'];
-			$fax_message = $_POST['fax_message'];
-			$fax_resolution = $_POST['fax_resolution'];
-			$fax_page_size = $_POST['fax_page_size'];
-			$fax_footer = $_POST['fax_footer'];
+			//get the values from the HTTP POST
+				$fax_numbers = $_POST['fax_numbers'];
+				$fax_uuid = $_POST["id"];
+				$fax_caller_id_name = $_POST['fax_caller_id_name'];
+				$fax_caller_id_number = $_POST['fax_caller_id_number'];
+				$fax_header = $_POST['fax_header'];
+				$fax_sender = $_POST['fax_sender'];
+				$fax_recipient = $_POST['fax_recipient'];
+				$fax_subject = $_POST['fax_subject'];
+				$fax_message = $_POST['fax_message'];
+				$fax_resolution = $_POST['fax_resolution'];
+				$fax_page_size = $_POST['fax_page_size'];
+				$fax_footer = $_POST['fax_footer'];
 
 			//validate the token
 				$token = new token;
@@ -384,13 +322,14 @@ if (!function_exists('fax_split_dtmf')) {
 					chdir($dir_fax_temp);
 
 					//convert pdf to tif
-					$cmd = gs_cmd("-q -r".$gs_r." -g".$gs_g." -dBATCH -dPDFFitPage -dNOSAFER -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");
+					$cmd = exec('which gs')." -q -r".$gs_r." -g".$gs_g." -dBATCH -dPDFFitPage -dNOSAFER -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');
 				}
 
-				$cmd = "tiffinfo ".correct_path($dir_fax_temp.'/'.$fax_name).".tif | grep \"Page Number\" | grep -c \"P\"";
+				//get the page count
+				$cmd = exec('which tiffinfo')." ".correct_path($dir_fax_temp.'/'.$fax_name).".tif | grep \"Page Number\" | grep -c \"P\"";
 				// echo($cmd . "<br/>\n");
 				$tif_page_count = exec($cmd);
 				if ($tif_page_count != '') {
@@ -577,20 +516,20 @@ if (!function_exists('fax_split_dtmf')) {
 			$pages = $pdf->getNumPages();
 
 			if ($pages > 1) {
-				# save ynew for last page
+				//save ynew for last page
 				$yn = $pdf->GetY();
 
-				# First page
+				//first page
 				$pdf->setPage(1, 0);
 				$pdf->Rect($x + 0.5, $y + 3.4, 7.5, $page_height - 3.9, 'D');
 
-				# 2nd to N-th page
+				//2nd to n-th page
 				for ($n = 2; $n < $pages; $n++) {
 					$pdf->setPage($n, 0);
 					$pdf->Rect($x + 0.5, $y + 0.5, 7.5, $page_height - 1, 'D');
 				}
 
-				#Last page
+				//last page
 				$pdf->setPage($pages, 0);
 				$pdf->Rect($x + 0.5, 0.5, 7.5, $yn, 'D');
 				$y = $yn;
@@ -612,7 +551,7 @@ if (!function_exists('fax_split_dtmf')) {
 			$pdf->SetAutoPageBreak(false);
 			$pdf->SetTopMargin(0);
 
-			// save cover pdf
+			//save cover pdf
 			$pdf->Output($dir_fax_temp.'/'.$fax_instance_uuid.'_cover.pdf', "F");	// Display [I]nline, Save to [F]ile, [D]ownload
 
 			//convert pdf to tif, add to array of pages, delete pdf
@@ -634,52 +573,55 @@ if (!function_exists('fax_split_dtmf')) {
 
 		//combine tif files into single multi-page tif
 		if (is_array($tif_files) && sizeof($tif_files) > 0) {
-			$cmd = "tiffcp -c none ";
+			$cmd = exec('which tiffcp')." -c none ";
 			foreach ($tif_files as $tif_file) {
 				$cmd .= correct_path($tif_file) . ' ';
 			}
-			$cmd .= correct_path($dir_fax_temp.'/'.$fax_instance_uuid.'.tif');
+			$cmd .= correct_path($dir_fax_sent.'/'.$fax_instance_uuid.'.tif');
 			//echo($cmd . "<br/>\n");
 			exec($cmd);
 
-			foreach ($tif_files as $tif_file) {
-				@unlink($tif_file);
-			}
-
 			//generate pdf from tif
-			$cmd = 'tiff2pdf -u i -p '.$fax_page_size.
+			$cmd = exec('which 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');
+				correct_path($dir_fax_sent.'/'.$fax_instance_uuid.'.pdf').' '.
+				correct_path($dir_fax_sent.'/'.$fax_instance_uuid.'.tif');
+
 			exec($cmd);
-		}
-		else {
-			if (!$included) {
-				//nothing to send, redirect the browser
-				message::add($text['message-invalid-fax'], 'negative', 4000);
-				header("Location: fax_send.php?id=".$fax_uuid);
-				exit;
+			//echo $cmd."<br />\n";
+
+			//remove the extra files
+			foreach ($tif_files as $tif_file) {
+				@unlink($tif_file);
 			}
 		}
+		elseif (!$included) {
+			//nothing to send, redirect the browser
+			message::add($text['message-invalid-fax'], 'negative', 4000);
+			header("Location: fax_send.php?id=".$fax_uuid);
+			exit;
+		}
 
 		//preview, if requested
 		if (($_REQUEST['submit'] != '') && ($_REQUEST['submit'] == 'preview')) {
 			unset($file_type);
-			if (file_exists($dir_fax_temp.'/'.$fax_instance_uuid.'.pdf')) {
+			if (file_exists($dir_fax_sent.'/'.$fax_instance_uuid.'.pdf')) {
+				$file_path = $dir_fax_sent.'/'.$fax_instance_uuid.".pdf";
 				$file_type = 'pdf';
 				$content_type = 'application/pdf';
-				@unlink($dir_fax_temp.'/'.$fax_instance_uuid.".tif");
+				@unlink($dir_fax_sent.'/'.$fax_instance_uuid.".tif");
 			}
-			else if (file_exists($dir_fax_temp.'/'.$fax_instance_uuid.'.tif')) {
+			else if (file_exists($dir_fax_sent.'/'.$fax_instance_uuid.'.tif')) {
+				$file_path = $dir_fax_sent.'/'.$fax_instance_uuid.".tif";
 				$file_type = 'tif';
 				$content_type = 'image/tiff';
-				@unlink($dir_fax_temp.'/'.$fax_instance_uuid.".pdf");
+				@unlink($dir_fax_sent.'/'.$fax_instance_uuid.".pdf");
 			}
 			if ($file_type != '') {
 				//push download
-				$fd = fopen($dir_fax_temp.'/'.$fax_instance_uuid.'.'.$file_type, "rb");
+				$fd = fopen($file_path, "rb");
 				header("Content-Type: application/force-download");
 				header("Content-Type: application/octet-stream");
 				header("Content-Type: application/download");
@@ -689,54 +631,59 @@ if (!function_exists('fax_split_dtmf')) {
 				header('Accept-Ranges: bytes');
 				header("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1
 				header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); // date in the past
-				header("Content-Length: ".filesize($dir_fax_temp.'/'.$fax_instance_uuid.'.'.$file_type));
+				header("Content-Length: ".filesize($file_path));
 				fpassthru($fd);
-				@unlink($dir_fax_temp.'/'.$fax_instance_uuid.".".$file_type);
+				@unlink($file_path);
 			}
 			exit;
 		}
 
-		//get some more info to send the fax
-		$mailfrom_address = (isset($_SESSION['fax']['smtp_from']['text'])) ? $_SESSION['fax']['smtp_from']['text'] : $_SESSION['email']['smtp_from']['text'];
+		//prepare variables send the fax
+		$mail_from_address = (isset($_SESSION['fax']['smtp_from']['text'])) ? $_SESSION['fax']['smtp_from']['text'] : $_SESSION['email']['smtp_from']['text'];
 
+		//get the fax mail to address and fax prefix
 		$sql = "select * from v_fax where fax_uuid = :fax_uuid ";
 		$parameters['fax_uuid'] = $fax_uuid;
 		$database = new database;
 		$row = $database->select($sql, $parameters, 'row');
-		$mailto_address_fax = $row["fax_email"];
+		$mail_to_address = $row["fax_email"];
 		$fax_prefix = $row["fax_prefix"];
 		unset($sql, $parameters, $row);
 
-		if (!$included) {
-			$sql = "select user_email from v_users where user_uuid = :user_uuid ";
-			$parameters['user_uuid'] = $_SESSION['user_uuid'];
-			$database = new database;
-			$mailto_address_user = $database->select($sql, $parameters, 'column');
-			unset($sql, $parameters);
+		//for email to fax send email notification back to the email sender
+		if ($included) {
+			//use email-to-fax from address
+			$mail_to_address = $sender_email;
 		}
 		else {
-			//use email-to-fax from address
+			//send fax through the browser
 		}
 
-		if ($mailto_address_fax != '' && $mailto_address_user != $mailto_address_fax) {
-			$mailto_address = $mailto_address_fax.",".$mailto_address_user;
-		}
-		else {
-			$mailto_address = $mailto_address_user;
-		}
+		//move the generated tif (and pdf) files to the sent directory
+		//if (file_exists($dir_fax_temp.'/'.$fax_instance_uuid.".tif")) {
+		//	copy($dir_fax_temp.'/'.$fax_instance_uuid.".tif", $dir_fax_sent.'/'.$fax_instance_uuid.".tif");
+		//}
+		//if (file_exists($dir_fax_temp.'/'.$fax_instance_uuid.".pdf")) {
+		//	copy($dir_fax_temp.'/'.$fax_instance_uuid.".pdf ", $dir_fax_sent.'/'.$fax_instance_uuid.".pdf");
+		//}
+
+		//set the fax
+		$fax_queue_uuid = uuid();
 
 		//send the fax
-		$fax_file = $dir_fax_temp."/".$fax_instance_uuid.".tif";
-		$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                . "',";
+		$fax_file = $dir_fax_sent."/".$fax_instance_uuid.".tif";
+		$common_variables .= "fax_queue_uuid='"               . $fax_queue_uuid          . "',";
+		$common_variables  = "for_fax=1,";
+		$common_variables .= "accountcode='"                  . $fax_accountcode         . "',";
+		$common_variables .= "sip_h_X-accountcode='"          . $fax_accountcode         . "',";
+		$common_variables .= "domain_uuid="                   . $_SESSION["domain_uuid"] . ",";
+		$common_variables .= "domain_name="                   . $_SESSION["domain_name"] . ",";
+		$common_variables .= "origination_caller_id_name='"   . $fax_caller_id_name      . "',";
+		$common_variables .= "origination_caller_id_number='" . $fax_caller_id_number    . "',";
+		$common_variables .= "fax_ident='"                    . $fax_caller_id_number    . "',";
+		$common_variables .= "fax_header='"                   . $fax_caller_id_name      . "',";
+		$common_variables .= "fax_file='"                     . $fax_file                . "',";
+
 		foreach ($fax_numbers as $fax_number) {
 
 			$fax_number = trim($fax_number);
@@ -761,57 +708,86 @@ 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 . "',";
-				$dial_string .= "fax_uri=" . $fax_uri  . ",";
-				$dial_string .= "fax_retry_attempts=1" . ",";
-				$dial_string .= "fax_retry_limit=20"   . ",";
-				$dial_string .= "fax_retry_sleep=180"  . ",";
-				$dial_string .= "fax_verbose=true"     . ",";
-				$dial_string .= "fax_use_ecm=off"      . ",";
+			//build the fax dial string
+			$dial_string = $common_variables;
+			$dial_string .= $fax_variables;
+			$dial_string .= "mailto_address='"     . $mail_to_address   . "',";
+			$dial_string .= "mailfrom_address='"   . $mail_from_address . "',";
+			$dial_string .= "fax_uri=" . $fax_uri  . ",";
+			$dial_string .= "fax_retry_attempts=1" . ",";
+			$dial_string .= "fax_retry_limit=20"   . ",";
+			$dial_string .= "fax_retry_sleep=180"  . ",";
+			$dial_string .= "fax_verbose=true"     . ",";
+			$dial_string .= "fax_use_ecm=off"      . ",";
+			if ($_SESSION['fax_queue']['enabled']['boolean']) {
+				$dial_string .= "api_hangup_hook='lua app/fax/resources/scripts/hangup_tx.lua'";
+			}
+			else {
 				$dial_string .= "api_hangup_hook='lua fax_retry.lua'";
-				$dial_string  = "{" . $dial_string . "}" . $fax_uri." &txfax('".$fax_file."')";
+			}
+			$dial_string  = "{" . $dial_string . "}" . $fax_uri." &txfax('".$fax_file."')";
 
+			//add fax to the fax queue or send it directly
+			if ($_SESSION['fax_queue']['enabled']['boolean']) {
+				//build an array to add the fax to the queue
+				$array['fax_queue'][0]['fax_queue_uuid'] = $fax_queue_uuid;
+				$array['fax_queue'][0]['domain_uuid'] = $_SESSION['domain_uuid'];
+				$array['fax_queue'][0]['fax_uuid'] = $fax_uuid;
+				$array['fax_queue'][0]['fax_date'] = 'now()';
+				$array['fax_queue'][0]['hostname'] = gethostname();
+				$array['fax_queue'][0]['fax_caller_id_name'] = $fax_caller_id_name;
+				$array['fax_queue'][0]['fax_caller_id_number'] = $fax_caller_id_number;
+				$array['fax_queue'][0]['fax_number'] = $fax_number;
+				$array['fax_queue'][0]['fax_prefix'] = $fax_prefix;
+				$array['fax_queue'][0]['fax_email_address'] = $mail_to_address;
+				$array['fax_queue'][0]['fax_file'] = $fax_file;
+				$array['fax_queue'][0]['fax_status'] = 'waiting';
+				//$array['fax_queue'][0]['fax_retry_date'] = $fax_retry_date;
+				$array['fax_queue'][0]['fax_retry_count'] = 0;
+				$array['fax_queue'][0]['fax_accountcode'] = $fax_accountcode;
+				$array['fax_queue'][0]['fax_command'] = 'originate '.$dial_string;
+
+				//add temporary permisison
+				$p = new permissions;
+				$p->add('fax_queue_add', 'temp');
+
+				//save the data
+				$database = new database;
+				$database->app_name = 'fax queue';
+				$database->app_uuid = '3656287f-4b22-4cf1-91f6-00386bf488f4';
+				$database->save($array);
+
+				//remove temporary permisison
+				$p->delete('fax_queue_add', 'temp');
+				
+				//add message to show in the browser
+				message::add($text['confirm-queued']);
+			}
+			else {
+				//send the fax directly
 				$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
 				if ($fp) {
 					$cmd = "api originate " . $dial_string;
-					//send the command to event socket
 					$response = event_socket_request($fp, $cmd);
 					$response = str_replace("\n", "", $response);
 					$uuid = str_replace("+OK ", "", $response);
 				}
 				fclose($fp);
-			}
-			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);
+				
+				//add message to show in the browser
+				message::add($text['confirm-sent']." ".$response);
 			}
 		}
 
-		//wait for a few seconds
-		sleep(5);
-
-		//move the generated tif (and pdf) files to the sent directory
-		if (file_exists($dir_fax_temp.'/'.$fax_instance_uuid.".tif")) {
-			copy($dir_fax_temp.'/'.$fax_instance_uuid.".tif", $dir_fax_sent.'/'.$fax_instance_uuid.".tif");
-		}
-
-		if (file_exists($dir_fax_temp.'/'.$fax_instance_uuid.".pdf")) {
-			copy($dir_fax_temp.'/'.$fax_instance_uuid.".pdf ", $dir_fax_sent.'/'.$fax_instance_uuid.".pdf");
-		}
-
+		//redirect the browser
 		if (!$included && is_uuid($fax_uuid)) {
-			//redirect the browser
-			message::add($response, 'default');
-			if (isset($_SESSION['fax']['send_mode']['text']) && $_SESSION['fax']['send_mode']['text'] == 'queue') {
-				header("Location: fax_active.php?id=".$fax_uuid);
+			if ($_SESSION['fax_queue']['enabled']['boolean']) {
+				//header("Location: ".PROJECT_PATH."/app/fax_queue/fax_queue.php?id=".$fax_uuid);
+				header("Location: ".PROJECT_PATH."fax.php");
 			}
 			else {
 				header("Location: fax_files.php?id=".$fax_uuid."&box=sent");
+				//header("Location: fax_outbox.php?id=".$fax_uuid);
 			}
 			exit;
 		}
@@ -819,8 +795,87 @@ if (!function_exists('fax_split_dtmf')) {
 	} //end upload and send fax
 
 
+//show content in the browser
 if (!$included) {
 
+	//retrieve current user's assigned groups (uuids)
+		foreach ($_SESSION['groups'] as $group_data) {
+			$user_group_uuids[] = $group_data['group_uuid'];
+		}
+
+	//add user's uuid to group uuid list to include private (non-shared) contacts
+		$user_group_uuids[] = $_SESSION["user_uuid"];
+		$sql = "select ";
+		$sql .= "c.contact_organization, ";
+		$sql .= "c.contact_name_given, ";
+		$sql .= "c.contact_name_family, ";
+		$sql .= "c.contact_nickname, ";
+		$sql .= "cp.phone_number ";
+		$sql .= "from ";
+		$sql .= "v_contacts as c, ";
+		$sql .= "v_contact_phones as cp ";
+		$sql .= "where ";
+		$sql .= "c.contact_uuid = cp.contact_uuid ";
+		$sql .= "and c.domain_uuid = :domain_uuid ";
+		$sql .= "and cp.domain_uuid = :domain_uuid ";
+		$sql .= "and cp.phone_type_fax = 1 ";
+		$sql .= "and cp.phone_number is not null ";
+		$sql .= "and cp.phone_number <> '' ";
+		if ($_SESSION['contact']['permissions']['boolean'] == "true") {
+			if (is_array($user_group_uuids) && @sizeof($user_group_uuids) != 0) {
+				//only show contacts assigned to current user's group(s) and those not assigned to any group
+				$sql .= "and (";
+				$sql .= "	c.contact_uuid in ( ";
+				$sql .= "		select contact_uuid from v_contact_groups ";
+				$sql .= "		where (";
+				foreach ($user_group_uuids as $index => $user_group_uuid) {
+					$sql .= $or;
+					$sql .= "		group_uuid = :group_uuid_".$index." ";
+					$parameters['group_uuid_'.$index] = $user_group_uuid;
+					$or = " or ";
+				}
+				unset($user_group_uuids, $index, $user_group_uuid, $or);
+				$sql .= "		) ";
+				$sql .= "		and domain_uuid = :domain_uuid ";
+				$sql .= "	) ";
+				$sql .= "	or ";
+				$sql .= "	c.contact_uuid not in ( ";
+				$sql .= "		select contact_uuid from v_contact_groups ";
+				$sql .= "		where domain_uuid = :domain_uuid ";
+				$sql .= "	) ";
+				$sql .= ") ";
+			}
+		}
+		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+		$database = new database;
+		$contacts = $database->select($sql, $parameters, 'all');
+		unset($sql, $parameters, $row);
+
+	//build the contact labels
+		if (is_array($contacts) && @sizeof($contacts) != 0) {
+			foreach ($contacts as &$row) {
+				if ($row['contact_organization'] != '') {
+					$contact_option_label = $row['contact_organization'];
+				}
+				if ($row['contact_name_given'] != '' || $row['contact_name_family'] != '' || $row['contact_nickname'] != '') {
+					$contact_option_label .= ($row['contact_organization'] != '') ? "," : null;
+					$contact_option_label .= ($row['contact_name_given'] != '') ? (($row['contact_organization'] != '') ? " " : null).$row['contact_name_given'] : null;
+					$contact_option_label .= ($row['contact_name_family'] != '') ? (($row['contact_organization'] != '' || $row['contact_name_given'] != '') ? " " : null).$row['contact_name_family'] : null;
+					$contact_option_label .= ($row['contact_nickname'] != '') ? (($row['contact_organization'] != '' || $row['contact_name_given'] != '' || $row['contact_name_family'] != '') ? " (".$row['contact_nickname'].")" : $row['contact_nickname']) : null;
+				}
+				$contact_option_value_recipient = $contact_option_label;
+				$contact_option_value_faxnumber = $row['phone_number'];
+				$contact_option_label .= " ".escape(format_phone($row['phone_number']));
+				$contact_labels[] = $contact_option_label;
+				$contact_values[] = $contact_option_value_faxnumber."|".$contact_option_value_recipient;
+				unset($contact_option_label);
+			}
+			if (is_array($contact_labels)) {
+				//sort by name(s)
+				asort($contact_labels, SORT_NATURAL); 
+			}
+		}
+
 	//create token
 		$object = new token;
 		$token = $object->create($_SERVER['PHP_SELF']);
@@ -920,83 +975,16 @@ if (!$included) {
 		echo "	".$text['label-fax-recipient']."\n";
 		echo "</td>\n";
 		echo "<td class='vtable' align='left'>\n";
-		//retrieve current user's assigned groups (uuids)
-		foreach ($_SESSION['groups'] as $group_data) {
-			$user_group_uuids[] = $group_data['group_uuid'];
-		}
-		//add user's uuid to group uuid list to include private (non-shared) contacts
-		$user_group_uuids[] = $_SESSION["user_uuid"];
-		$sql = "select ";
-		$sql .= "c.contact_organization, ";
-		$sql .= "c.contact_name_given, ";
-		$sql .= "c.contact_name_family, ";
-		$sql .= "c.contact_nickname, ";
-		$sql .= "cp.phone_number ";
-		$sql .= "from ";
-		$sql .= "v_contacts as c, ";
-		$sql .= "v_contact_phones as cp ";
-		$sql .= "where ";
-		$sql .= "c.contact_uuid = cp.contact_uuid ";
-		$sql .= "and c.domain_uuid = :domain_uuid ";
-		$sql .= "and cp.domain_uuid = :domain_uuid ";
-		$sql .= "and cp.phone_type_fax = 1 ";
-		$sql .= "and cp.phone_number is not null ";
-		$sql .= "and cp.phone_number <> '' ";
-		if (is_array($user_group_uuids) && @sizeof($user_group_uuids) != 0) {
-			//only show contacts assigned to current user's group(s) and those not assigned to any group
-			$sql .= "and (";
-			$sql .= "	c.contact_uuid in ( ";
-			$sql .= "		select contact_uuid from v_contact_groups ";
-			$sql .= "		where (";
-			foreach ($user_group_uuids as $index => $user_group_uuid) {
-				$sql .= $or;
-				$sql .= "		group_uuid = :group_uuid_".$index." ";
-				$parameters['group_uuid_'.$index] = $user_group_uuid;
-				$or = " or ";
-			}
-			unset($user_group_uuids, $index, $user_group_uuid, $or);
-			$sql .= "		) ";
-			$sql .= "		and domain_uuid = :domain_uuid ";
-			$sql .= "	) ";
-			$sql .= "	or ";
-			$sql .= "	c.contact_uuid not in ( ";
-			$sql .= "		select contact_uuid from v_contact_groups ";
-			$sql .= "		where domain_uuid = :domain_uuid ";
-			$sql .= "	) ";
-			$sql .= ") ";
-		}
-		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
-		$database = new database;
-		$contacts = $database->select($sql, $parameters, 'all');
 		if (is_array($contacts) && @sizeof($contacts) != 0) {
-			foreach ($contacts as &$row) {
-				if ($row['contact_organization'] != '') {
-					$contact_option_label = $row['contact_organization'];
-				}
-				if ($row['contact_name_given'] != '' || $row['contact_name_family'] != '' || $row['contact_nickname'] != '') {
-					$contact_option_label .= ($row['contact_organization'] != '') ? "," : null;
-					$contact_option_label .= ($row['contact_name_given'] != '') ? (($row['contact_organization'] != '') ? " " : null).$row['contact_name_given'] : null;
-					$contact_option_label .= ($row['contact_name_family'] != '') ? (($row['contact_organization'] != '' || $row['contact_name_given'] != '') ? " " : null).$row['contact_name_family'] : null;
-					$contact_option_label .= ($row['contact_nickname'] != '') ? (($row['contact_organization'] != '' || $row['contact_name_given'] != '' || $row['contact_name_family'] != '') ? " (".$row['contact_nickname'].")" : $row['contact_nickname']) : null;
-				}
-				$contact_option_value_recipient = $contact_option_label;
-				$contact_option_value_faxnumber = $row['phone_number'];
-				$contact_option_label .= ":&nbsp;&nbsp;".escape(format_phone($row['phone_number']));
-				$contact_labels[] = $contact_option_label;
-				$contact_values[] = $contact_option_value_faxnumber."|".$contact_option_value_recipient;
-				unset($contact_option_label);
-			}
-			if (is_array($contact_labels)) {
-				asort($contact_labels, SORT_NATURAL); // sort by name(s)
-			}
 			echo "	<select class='formfld' style='display: none;' id='fax_recipient_select' onchange='contact_load(this);'>\n";
 			echo "		<option value=''></option>\n";
-			foreach ($contact_labels as $index => $contact_label) {
-				echo "	<option value=\"".escape($contact_values[$index])."\">".$contact_label."</option>\n";
+			if (is_array($contact_labels) && @sizeof($contact_labels) != 0) {
+				foreach ($contact_labels as $index => $contact_label) {
+					echo "	<option value=\"".escape($contact_values[$index])."\">".$contact_label."</option>\n";
+				}
 			}
 			echo "	</select>\n";
 		}
-		unset($sql, $parameters, $row);
 		echo "	<input type='text' name='fax_recipient' id='fax_recipient' class='formfld' style='max-width: 250px;' value=''>\n";
 		if (is_array($contacts)) {
 			echo "	<input type='button' id='btn_toggle_recipient' class='btn' name='' alt='".$text['button-back']."' value='&#9665;' onclick=\"toggle('fax_recipient');\">\n";
diff --git a/app/fax_queue/app_config.php b/app/fax_queue/app_config.php
new file mode 100644
index 0000000000..639ea0ff21
--- /dev/null
+++ b/app/fax_queue/app_config.php
@@ -0,0 +1,192 @@
+<?php
+
+	//application details
+		$apps[$x]['name'] = 'FAX Queue';
+		$apps[$x]['uuid'] = '3656287f-4b22-4cf1-91f6-00386bf488f4';
+		$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'] = 'fax_queue_view';
+		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = 'fax_queue_add';
+		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = 'fax_queue_edit';
+		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = 'fax_queue_delete';
+		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		//$apps[$x]['permissions'][$y]['groups'][] = 'admin';
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = 'fax_queue_all';
+		$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
+		$y++;
+
+	//default settings
+		$y=0;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "e63df592-9928-4cd3-85bc-afdec2f4cd1c";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "fax_queue";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "enabled";
+		$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'] = "Enable or disable the fax queue.";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "84a6f2a8-4633-49d9-ad28-c9f96d630050";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "fax_queue";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "limit";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "30";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Limit the records to process at one time.";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "4d05c680-6ef8-422a-a26f-845ec0135729";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "fax_queue";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "retry_limit";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "3";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Number of tries to send before giving up.";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "9c379e94-0cb8-41d6-8ee5-8459c5ef7391";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "fax_queue";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "interval";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "30";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "How often to process the queue. Default 30 seconds.";
+		//$y++;
+		//$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "afd729d9-cf69-4793-a140-21093814d314";
+		//$apps[$x]['default_settings'][$y]['default_setting_category'] = "fax_queue";
+		//$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "enabled";
+		//$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'] = "Enable or disable the fax queue.";
+		//$y++;
+
+	//fax queue
+		$y = 0;
+		$apps[$x]['db'][$y]['table']['name'] = 'v_fax_queue';
+		$apps[$x]['db'][$y]['table']['parent'] = '';
+		$z = 0;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'fax_queue_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'] = 'fax_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'] = '';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'origination_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)';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'fax_date';
+		$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'] = 'Date of the FAX entered the queue.';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'hostname';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['search_by'] = '1';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Hostname of the server.';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'fax_caller_id_name';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['search_by'] = '1';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the Caller ID name.';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'fax_caller_id_number';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['search_by'] = '1';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the Caller ID number.';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'fax_number';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['search_by'] = '1';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the fax destination.';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'fax_prefix';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['search_by'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the fax prefix.';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'fax_email_address';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['search_by'] = '1';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the fax email address.';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'fax_file';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['search_by'] = '1';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the fax file.';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'fax_status';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['search_by'] = '1';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the fax status.';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'fax_retry_date';
+		$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'] = 'Date the fax was retried';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'fax_notify_sent';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'boolean';
+		$apps[$x]['db'][$y]['fields'][$z]['toggle'] = ['true','false'];
+		$apps[$x]['db'][$y]['fields'][$z]['search_by'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Fax notification sent. true,false';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'fax_notify_date';
+		$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'] = '1';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Date the fax notification was sent';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'fax_retry_count';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'numeric';
+		$apps[$x]['db'][$y]['fields'][$z]['search_by'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the fax retries.';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'fax_accountcode';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['search_by'] = '1';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the accountcode.';
+		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'fax_command';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['search_by'] = '1';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the fax command.';
+		$z++;
+
+?>
diff --git a/app/fax_queue/app_defaults.php b/app/fax_queue/app_defaults.php
new file mode 100644
index 0000000000..adadacce42
--- /dev/null
+++ b/app/fax_queue/app_defaults.php
@@ -0,0 +1,7 @@
+<?php
+
+if ($domains_processed == 1) {
+
+}
+
+?>
diff --git a/app/fax_queue/app_languages.php b/app/fax_queue/app_languages.php
new file mode 100644
index 0000000000..293018ecda
--- /dev/null
+++ b/app/fax_queue/app_languages.php
@@ -0,0 +1,664 @@
+<?php
+
+	//FAX Queue
+		$text['title-fax_queue']['en-us'] = 'FAX Queue';
+		$text['title-fax_queue']['ar-eg'] = '';
+		$text['title-fax_queue']['de-at'] = '';
+		$text['title-fax_queue']['de-ch'] = '';
+		$text['title-fax_queue']['de-de'] = '';
+		$text['title-fax_queue']['es-cl'] = '';
+		$text['title-fax_queue']['es-mx'] = '';
+		$text['title-fax_queue']['fr-ca'] = '';
+		$text['title-fax_queue']['fr-fr'] = '';
+		$text['title-fax_queue']['he-il'] = '';
+		$text['title-fax_queue']['it-it'] = '';
+		$text['title-fax_queue']['nl-nl'] = '';
+		$text['title-fax_queue']['pl-pl'] = '';
+		$text['title-fax_queue']['pt-br'] = '';
+		$text['title-fax_queue']['pt-pt'] = '';
+		$text['title-fax_queue']['ro-ro'] = '';
+		$text['title-fax_queue']['ru-ru'] = '';
+		$text['title-fax_queue']['sv-se'] = '';
+		$text['title-fax_queue']['uk-ua'] = '';
+
+		$text['title-fax_queue']['en-us'] = 'FAX Queue';
+		$text['title-fax_queue']['ar-eg'] = '';
+		$text['title-fax_queue']['de-at'] = '';
+		$text['title-fax_queue']['de-ch'] = '';
+		$text['title-fax_queue']['de-de'] = '';
+		$text['title-fax_queue']['es-cl'] = '';
+		$text['title-fax_queue']['es-mx'] = '';
+		$text['title-fax_queue']['fr-ca'] = '';
+		$text['title-fax_queue']['fr-fr'] = '';
+		$text['title-fax_queue']['he-il'] = '';
+		$text['title-fax_queue']['it-it'] = '';
+		$text['title-fax_queue']['nl-nl'] = '';
+		$text['title-fax_queue']['pl-pl'] = '';
+		$text['title-fax_queue']['pt-br'] = '';
+		$text['title-fax_queue']['pt-pt'] = '';
+		$text['title-fax_queue']['ro-ro'] = '';
+		$text['title-fax_queue']['ru-ru'] = '';
+		$text['title-fax_queue']['sv-se'] = '';
+		$text['title-fax_queue']['uk-ua'] = '';
+
+		$text['title_description-fax_queue']['en-us'] = '';
+		$text['title_description-fax_queue']['ar-eg'] = '';
+		$text['title_description-fax_queue']['de-at'] = '';
+		$text['title_description-fax_queue']['de-ch'] = '';
+		$text['title_description-fax_queue']['de-de'] = '';
+		$text['title_description-fax_queue']['es-cl'] = '';
+		$text['title_description-fax_queue']['es-mx'] = '';
+		$text['title_description-fax_queue']['fr-ca'] = '';
+		$text['title_description-fax_queue']['fr-fr'] = '';
+		$text['title_description-fax_queue']['he-il'] = '';
+		$text['title_description-fax_queue']['it-it'] = '';
+		$text['title_description-fax_queue']['nl-nl'] = '';
+		$text['title_description-fax_queue']['pl-pl'] = '';
+		$text['title_description-fax_queue']['pt-br'] = '';
+		$text['title_description-fax_queue']['pt-pt'] = '';
+		$text['title_description-fax_queue']['ro-ro'] = '';
+		$text['title_description-fax_queue']['ru-ru'] = '';
+		$text['title_description-fax_queue']['sv-se'] = '';
+		$text['title_description-fax_queue']['uk-ua'] = '';
+
+		$text['label-fax_uuid']['en-us'] = 'FAX ID';
+		$text['label-fax_uuid']['ar-eg'] = '';
+		$text['label-fax_uuid']['de-at'] = '';
+		$text['label-fax_uuid']['de-ch'] = '';
+		$text['label-fax_uuid']['de-de'] = '';
+		$text['label-fax_uuid']['es-cl'] = '';
+		$text['label-fax_uuid']['es-mx'] = '';
+		$text['label-fax_uuid']['fr-ca'] = '';
+		$text['label-fax_uuid']['fr-fr'] = '';
+		$text['label-fax_uuid']['he-il'] = '';
+		$text['label-fax_uuid']['it-it'] = '';
+		$text['label-fax_uuid']['nl-nl'] = '';
+		$text['label-fax_uuid']['pl-pl'] = '';
+		$text['label-fax_uuid']['pt-br'] = '';
+		$text['label-fax_uuid']['pt-pt'] = '';
+		$text['label-fax_uuid']['ro-ro'] = '';
+		$text['label-fax_uuid']['ru-ru'] = '';
+		$text['label-fax_uuid']['sv-se'] = '';
+		$text['label-fax_uuid']['uk-ua'] = '';
+
+		$text['description-fax_uuid']['en-us'] = '';
+		$text['description-fax_uuid']['ar-eg'] = '';
+		$text['description-fax_uuid']['de-at'] = '';
+		$text['description-fax_uuid']['de-ch'] = '';
+		$text['description-fax_uuid']['de-de'] = '';
+		$text['description-fax_uuid']['es-cl'] = '';
+		$text['description-fax_uuid']['es-mx'] = '';
+		$text['description-fax_uuid']['fr-ca'] = '';
+		$text['description-fax_uuid']['fr-fr'] = '';
+		$text['description-fax_uuid']['he-il'] = '';
+		$text['description-fax_uuid']['it-it'] = '';
+		$text['description-fax_uuid']['nl-nl'] = '';
+		$text['description-fax_uuid']['pl-pl'] = '';
+		$text['description-fax_uuid']['pt-br'] = '';
+		$text['description-fax_uuid']['pt-pt'] = '';
+		$text['description-fax_uuid']['ro-ro'] = '';
+		$text['description-fax_uuid']['ru-ru'] = '';
+		$text['description-fax_uuid']['sv-se'] = '';
+		$text['description-fax_uuid']['uk-ua'] = '';
+
+		$text['label-fax_date']['en-us'] = 'Date';
+		$text['label-fax_date']['ar-eg'] = '';
+		$text['label-fax_date']['de-at'] = '';
+		$text['label-fax_date']['de-ch'] = '';
+		$text['label-fax_date']['de-de'] = '';
+		$text['label-fax_date']['es-cl'] = '';
+		$text['label-fax_date']['es-mx'] = '';
+		$text['label-fax_date']['fr-ca'] = '';
+		$text['label-fax_date']['fr-fr'] = '';
+		$text['label-fax_date']['he-il'] = '';
+		$text['label-fax_date']['it-it'] = '';
+		$text['label-fax_date']['nl-nl'] = '';
+		$text['label-fax_date']['pl-pl'] = '';
+		$text['label-fax_date']['pt-br'] = '';
+		$text['label-fax_date']['pt-pt'] = '';
+		$text['label-fax_date']['ro-ro'] = '';
+		$text['label-fax_date']['ru-ru'] = '';
+		$text['label-fax_date']['sv-se'] = '';
+		$text['label-fax_date']['uk-ua'] = '';
+
+		$text['description-fax_date']['en-us'] = 'Date of the FAX entered the queue.';
+		$text['description-fax_date']['ar-eg'] = '';
+		$text['description-fax_date']['de-at'] = '';
+		$text['description-fax_date']['de-ch'] = '';
+		$text['description-fax_date']['de-de'] = '';
+		$text['description-fax_date']['es-cl'] = '';
+		$text['description-fax_date']['es-mx'] = '';
+		$text['description-fax_date']['fr-ca'] = '';
+		$text['description-fax_date']['fr-fr'] = '';
+		$text['description-fax_date']['he-il'] = '';
+		$text['description-fax_date']['it-it'] = '';
+		$text['description-fax_date']['nl-nl'] = '';
+		$text['description-fax_date']['pl-pl'] = '';
+		$text['description-fax_date']['pt-br'] = '';
+		$text['description-fax_date']['pt-pt'] = '';
+		$text['description-fax_date']['ro-ro'] = '';
+		$text['description-fax_date']['ru-ru'] = '';
+		$text['description-fax_date']['sv-se'] = '';
+		$text['description-fax_date']['uk-ua'] = '';
+
+		$text['label-hostname']['en-us'] = 'Hostname';
+		$text['label-hostname']['ar-eg'] = '';
+		$text['label-hostname']['de-at'] = '';
+		$text['label-hostname']['de-ch'] = '';
+		$text['label-hostname']['de-de'] = '';
+		$text['label-hostname']['es-cl'] = '';
+		$text['label-hostname']['es-mx'] = '';
+		$text['label-hostname']['fr-ca'] = '';
+		$text['label-hostname']['fr-fr'] = '';
+		$text['label-hostname']['he-il'] = '';
+		$text['label-hostname']['it-it'] = '';
+		$text['label-hostname']['nl-nl'] = '';
+		$text['label-hostname']['pl-pl'] = '';
+		$text['label-hostname']['pt-br'] = '';
+		$text['label-hostname']['pt-pt'] = '';
+		$text['label-hostname']['ro-ro'] = '';
+		$text['label-hostname']['ru-ru'] = '';
+		$text['label-hostname']['sv-se'] = '';
+		$text['label-hostname']['uk-ua'] = '';
+
+		$text['description-hostname']['en-us'] = 'Hostname of the server.';
+		$text['description-hostname']['ar-eg'] = '';
+		$text['description-hostname']['de-at'] = '';
+		$text['description-hostname']['de-ch'] = '';
+		$text['description-hostname']['de-de'] = '';
+		$text['description-hostname']['es-cl'] = '';
+		$text['description-hostname']['es-mx'] = '';
+		$text['description-hostname']['fr-ca'] = '';
+		$text['description-hostname']['fr-fr'] = '';
+		$text['description-hostname']['he-il'] = '';
+		$text['description-hostname']['it-it'] = '';
+		$text['description-hostname']['nl-nl'] = '';
+		$text['description-hostname']['pl-pl'] = '';
+		$text['description-hostname']['pt-br'] = '';
+		$text['description-hostname']['pt-pt'] = '';
+		$text['description-hostname']['ro-ro'] = '';
+		$text['description-hostname']['ru-ru'] = '';
+		$text['description-hostname']['sv-se'] = '';
+		$text['description-hostname']['uk-ua'] = '';
+
+		$text['label-fax_caller_id_name']['en-us'] = 'Caller ID Name';
+		$text['label-fax_caller_id_name']['ar-eg'] = '';
+		$text['label-fax_caller_id_name']['de-at'] = '';
+		$text['label-fax_caller_id_name']['de-ch'] = '';
+		$text['label-fax_caller_id_name']['de-de'] = '';
+		$text['label-fax_caller_id_name']['es-cl'] = '';
+		$text['label-fax_caller_id_name']['es-mx'] = '';
+		$text['label-fax_caller_id_name']['fr-ca'] = '';
+		$text['label-fax_caller_id_name']['fr-fr'] = '';
+		$text['label-fax_caller_id_name']['he-il'] = '';
+		$text['label-fax_caller_id_name']['it-it'] = '';
+		$text['label-fax_caller_id_name']['nl-nl'] = '';
+		$text['label-fax_caller_id_name']['pl-pl'] = '';
+		$text['label-fax_caller_id_name']['pt-br'] = '';
+		$text['label-fax_caller_id_name']['pt-pt'] = '';
+		$text['label-fax_caller_id_name']['ro-ro'] = '';
+		$text['label-fax_caller_id_name']['ru-ru'] = '';
+		$text['label-fax_caller_id_name']['sv-se'] = '';
+		$text['label-fax_caller_id_name']['uk-ua'] = '';
+
+		$text['description-fax_caller_id_name']['en-us'] = 'Enter the Caller ID name.';
+		$text['description-fax_caller_id_name']['ar-eg'] = '';
+		$text['description-fax_caller_id_name']['de-at'] = '';
+		$text['description-fax_caller_id_name']['de-ch'] = '';
+		$text['description-fax_caller_id_name']['de-de'] = '';
+		$text['description-fax_caller_id_name']['es-cl'] = '';
+		$text['description-fax_caller_id_name']['es-mx'] = '';
+		$text['description-fax_caller_id_name']['fr-ca'] = '';
+		$text['description-fax_caller_id_name']['fr-fr'] = '';
+		$text['description-fax_caller_id_name']['he-il'] = '';
+		$text['description-fax_caller_id_name']['it-it'] = '';
+		$text['description-fax_caller_id_name']['nl-nl'] = '';
+		$text['description-fax_caller_id_name']['pl-pl'] = '';
+		$text['description-fax_caller_id_name']['pt-br'] = '';
+		$text['description-fax_caller_id_name']['pt-pt'] = '';
+		$text['description-fax_caller_id_name']['ro-ro'] = '';
+		$text['description-fax_caller_id_name']['ru-ru'] = '';
+		$text['description-fax_caller_id_name']['sv-se'] = '';
+		$text['description-fax_caller_id_name']['uk-ua'] = '';
+
+		$text['label-fax_caller_id_number']['en-us'] = 'Caller ID Number';
+		$text['label-fax_caller_id_number']['ar-eg'] = '';
+		$text['label-fax_caller_id_number']['de-at'] = '';
+		$text['label-fax_caller_id_number']['de-ch'] = '';
+		$text['label-fax_caller_id_number']['de-de'] = '';
+		$text['label-fax_caller_id_number']['es-cl'] = '';
+		$text['label-fax_caller_id_number']['es-mx'] = '';
+		$text['label-fax_caller_id_number']['fr-ca'] = '';
+		$text['label-fax_caller_id_number']['fr-fr'] = '';
+		$text['label-fax_caller_id_number']['he-il'] = '';
+		$text['label-fax_caller_id_number']['it-it'] = '';
+		$text['label-fax_caller_id_number']['nl-nl'] = '';
+		$text['label-fax_caller_id_number']['pl-pl'] = '';
+		$text['label-fax_caller_id_number']['pt-br'] = '';
+		$text['label-fax_caller_id_number']['pt-pt'] = '';
+		$text['label-fax_caller_id_number']['ro-ro'] = '';
+		$text['label-fax_caller_id_number']['ru-ru'] = '';
+		$text['label-fax_caller_id_number']['sv-se'] = '';
+		$text['label-fax_caller_id_number']['uk-ua'] = '';
+
+		$text['description-fax_caller_id_number']['en-us'] = 'Enter the Caller ID number.';
+		$text['description-fax_caller_id_number']['ar-eg'] = '';
+		$text['description-fax_caller_id_number']['de-at'] = '';
+		$text['description-fax_caller_id_number']['de-ch'] = '';
+		$text['description-fax_caller_id_number']['de-de'] = '';
+		$text['description-fax_caller_id_number']['es-cl'] = '';
+		$text['description-fax_caller_id_number']['es-mx'] = '';
+		$text['description-fax_caller_id_number']['fr-ca'] = '';
+		$text['description-fax_caller_id_number']['fr-fr'] = '';
+		$text['description-fax_caller_id_number']['he-il'] = '';
+		$text['description-fax_caller_id_number']['it-it'] = '';
+		$text['description-fax_caller_id_number']['nl-nl'] = '';
+		$text['description-fax_caller_id_number']['pl-pl'] = '';
+		$text['description-fax_caller_id_number']['pt-br'] = '';
+		$text['description-fax_caller_id_number']['pt-pt'] = '';
+		$text['description-fax_caller_id_number']['ro-ro'] = '';
+		$text['description-fax_caller_id_number']['ru-ru'] = '';
+		$text['description-fax_caller_id_number']['sv-se'] = '';
+		$text['description-fax_caller_id_number']['uk-ua'] = '';
+
+		$text['label-fax_number']['en-us'] = 'Number';
+		$text['label-fax_number']['ar-eg'] = '';
+		$text['label-fax_number']['de-at'] = '';
+		$text['label-fax_number']['de-ch'] = '';
+		$text['label-fax_number']['de-de'] = '';
+		$text['label-fax_number']['es-cl'] = '';
+		$text['label-fax_number']['es-mx'] = '';
+		$text['label-fax_number']['fr-ca'] = '';
+		$text['label-fax_number']['fr-fr'] = '';
+		$text['label-fax_number']['he-il'] = '';
+		$text['label-fax_number']['it-it'] = '';
+		$text['label-fax_number']['nl-nl'] = '';
+		$text['label-fax_number']['pl-pl'] = '';
+		$text['label-fax_number']['pt-br'] = '';
+		$text['label-fax_number']['pt-pt'] = '';
+		$text['label-fax_number']['ro-ro'] = '';
+		$text['label-fax_number']['ru-ru'] = '';
+		$text['label-fax_number']['sv-se'] = '';
+		$text['label-fax_number']['uk-ua'] = '';
+
+		$text['description-fax_number']['en-us'] = 'Enter the fax destination.';
+		$text['description-fax_number']['ar-eg'] = '';
+		$text['description-fax_number']['de-at'] = '';
+		$text['description-fax_number']['de-ch'] = '';
+		$text['description-fax_number']['de-de'] = '';
+		$text['description-fax_number']['es-cl'] = '';
+		$text['description-fax_number']['es-mx'] = '';
+		$text['description-fax_number']['fr-ca'] = '';
+		$text['description-fax_number']['fr-fr'] = '';
+		$text['description-fax_number']['he-il'] = '';
+		$text['description-fax_number']['it-it'] = '';
+		$text['description-fax_number']['nl-nl'] = '';
+		$text['description-fax_number']['pl-pl'] = '';
+		$text['description-fax_number']['pt-br'] = '';
+		$text['description-fax_number']['pt-pt'] = '';
+		$text['description-fax_number']['ro-ro'] = '';
+		$text['description-fax_number']['ru-ru'] = '';
+		$text['description-fax_number']['sv-se'] = '';
+		$text['description-fax_number']['uk-ua'] = '';
+
+		$text['label-fax_prefix']['en-us'] = 'Prefix';
+		$text['label-fax_prefix']['ar-eg'] = '';
+		$text['label-fax_prefix']['de-at'] = '';
+		$text['label-fax_prefix']['de-ch'] = '';
+		$text['label-fax_prefix']['de-de'] = '';
+		$text['label-fax_prefix']['es-cl'] = '';
+		$text['label-fax_prefix']['es-mx'] = '';
+		$text['label-fax_prefix']['fr-ca'] = '';
+		$text['label-fax_prefix']['fr-fr'] = '';
+		$text['label-fax_prefix']['he-il'] = '';
+		$text['label-fax_prefix']['it-it'] = '';
+		$text['label-fax_prefix']['nl-nl'] = '';
+		$text['label-fax_prefix']['pl-pl'] = '';
+		$text['label-fax_prefix']['pt-br'] = '';
+		$text['label-fax_prefix']['pt-pt'] = '';
+		$text['label-fax_prefix']['ro-ro'] = '';
+		$text['label-fax_prefix']['ru-ru'] = '';
+		$text['label-fax_prefix']['sv-se'] = '';
+		$text['label-fax_prefix']['uk-ua'] = '';
+
+		$text['description-fax_prefix']['en-us'] = 'Enter the fax prefix.';
+		$text['description-fax_prefix']['ar-eg'] = '';
+		$text['description-fax_prefix']['de-at'] = '';
+		$text['description-fax_prefix']['de-ch'] = '';
+		$text['description-fax_prefix']['de-de'] = '';
+		$text['description-fax_prefix']['es-cl'] = '';
+		$text['description-fax_prefix']['es-mx'] = '';
+		$text['description-fax_prefix']['fr-ca'] = '';
+		$text['description-fax_prefix']['fr-fr'] = '';
+		$text['description-fax_prefix']['he-il'] = '';
+		$text['description-fax_prefix']['it-it'] = '';
+		$text['description-fax_prefix']['nl-nl'] = '';
+		$text['description-fax_prefix']['pl-pl'] = '';
+		$text['description-fax_prefix']['pt-br'] = '';
+		$text['description-fax_prefix']['pt-pt'] = '';
+		$text['description-fax_prefix']['ro-ro'] = '';
+		$text['description-fax_prefix']['ru-ru'] = '';
+		$text['description-fax_prefix']['sv-se'] = '';
+		$text['description-fax_prefix']['uk-ua'] = '';
+
+		$text['label-fax_email_address']['en-us'] = 'Email Address';
+		$text['label-fax_email_address']['ar-eg'] = '';
+		$text['label-fax_email_address']['de-at'] = '';
+		$text['label-fax_email_address']['de-ch'] = '';
+		$text['label-fax_email_address']['de-de'] = '';
+		$text['label-fax_email_address']['es-cl'] = '';
+		$text['label-fax_email_address']['es-mx'] = '';
+		$text['label-fax_email_address']['fr-ca'] = '';
+		$text['label-fax_email_address']['fr-fr'] = '';
+		$text['label-fax_email_address']['he-il'] = '';
+		$text['label-fax_email_address']['it-it'] = '';
+		$text['label-fax_email_address']['nl-nl'] = '';
+		$text['label-fax_email_address']['pl-pl'] = '';
+		$text['label-fax_email_address']['pt-br'] = '';
+		$text['label-fax_email_address']['pt-pt'] = '';
+		$text['label-fax_email_address']['ro-ro'] = '';
+		$text['label-fax_email_address']['ru-ru'] = '';
+		$text['label-fax_email_address']['sv-se'] = '';
+		$text['label-fax_email_address']['uk-ua'] = '';
+
+		$text['description-fax_email_address']['en-us'] = 'Enter the fax email address.';
+		$text['description-fax_email_address']['ar-eg'] = '';
+		$text['description-fax_email_address']['de-at'] = '';
+		$text['description-fax_email_address']['de-ch'] = '';
+		$text['description-fax_email_address']['de-de'] = '';
+		$text['description-fax_email_address']['es-cl'] = '';
+		$text['description-fax_email_address']['es-mx'] = '';
+		$text['description-fax_email_address']['fr-ca'] = '';
+		$text['description-fax_email_address']['fr-fr'] = '';
+		$text['description-fax_email_address']['he-il'] = '';
+		$text['description-fax_email_address']['it-it'] = '';
+		$text['description-fax_email_address']['nl-nl'] = '';
+		$text['description-fax_email_address']['pl-pl'] = '';
+		$text['description-fax_email_address']['pt-br'] = '';
+		$text['description-fax_email_address']['pt-pt'] = '';
+		$text['description-fax_email_address']['ro-ro'] = '';
+		$text['description-fax_email_address']['ru-ru'] = '';
+		$text['description-fax_email_address']['sv-se'] = '';
+		$text['description-fax_email_address']['uk-ua'] = '';
+
+		$text['label-fax_file']['en-us'] = 'File';
+		$text['label-fax_file']['ar-eg'] = '';
+		$text['label-fax_file']['de-at'] = '';
+		$text['label-fax_file']['de-ch'] = '';
+		$text['label-fax_file']['de-de'] = '';
+		$text['label-fax_file']['es-cl'] = '';
+		$text['label-fax_file']['es-mx'] = '';
+		$text['label-fax_file']['fr-ca'] = '';
+		$text['label-fax_file']['fr-fr'] = '';
+		$text['label-fax_file']['he-il'] = '';
+		$text['label-fax_file']['it-it'] = '';
+		$text['label-fax_file']['nl-nl'] = '';
+		$text['label-fax_file']['pl-pl'] = '';
+		$text['label-fax_file']['pt-br'] = '';
+		$text['label-fax_file']['pt-pt'] = '';
+		$text['label-fax_file']['ro-ro'] = '';
+		$text['label-fax_file']['ru-ru'] = '';
+		$text['label-fax_file']['sv-se'] = '';
+		$text['label-fax_file']['uk-ua'] = '';
+
+		$text['description-fax_file']['en-us'] = 'Enter the fax file.';
+		$text['description-fax_file']['ar-eg'] = '';
+		$text['description-fax_file']['de-at'] = '';
+		$text['description-fax_file']['de-ch'] = '';
+		$text['description-fax_file']['de-de'] = '';
+		$text['description-fax_file']['es-cl'] = '';
+		$text['description-fax_file']['es-mx'] = '';
+		$text['description-fax_file']['fr-ca'] = '';
+		$text['description-fax_file']['fr-fr'] = '';
+		$text['description-fax_file']['he-il'] = '';
+		$text['description-fax_file']['it-it'] = '';
+		$text['description-fax_file']['nl-nl'] = '';
+		$text['description-fax_file']['pl-pl'] = '';
+		$text['description-fax_file']['pt-br'] = '';
+		$text['description-fax_file']['pt-pt'] = '';
+		$text['description-fax_file']['ro-ro'] = '';
+		$text['description-fax_file']['ru-ru'] = '';
+		$text['description-fax_file']['sv-se'] = '';
+		$text['description-fax_file']['uk-ua'] = '';
+
+		$text['label-fax_status']['en-us'] = 'Status';
+		$text['label-fax_status']['ar-eg'] = '';
+		$text['label-fax_status']['de-at'] = '';
+		$text['label-fax_status']['de-ch'] = '';
+		$text['label-fax_status']['de-de'] = '';
+		$text['label-fax_status']['es-cl'] = '';
+		$text['label-fax_status']['es-mx'] = '';
+		$text['label-fax_status']['fr-ca'] = '';
+		$text['label-fax_status']['fr-fr'] = '';
+		$text['label-fax_status']['he-il'] = '';
+		$text['label-fax_status']['it-it'] = '';
+		$text['label-fax_status']['nl-nl'] = '';
+		$text['label-fax_status']['pl-pl'] = '';
+		$text['label-fax_status']['pt-br'] = '';
+		$text['label-fax_status']['pt-pt'] = '';
+		$text['label-fax_status']['ro-ro'] = '';
+		$text['label-fax_status']['ru-ru'] = '';
+		$text['label-fax_status']['sv-se'] = '';
+		$text['label-fax_status']['uk-ua'] = '';
+
+		$text['description-fax_status']['en-us'] = 'Enter the fax status.';
+		$text['description-fax_status']['ar-eg'] = '';
+		$text['description-fax_status']['de-at'] = '';
+		$text['description-fax_status']['de-ch'] = '';
+		$text['description-fax_status']['de-de'] = '';
+		$text['description-fax_status']['es-cl'] = '';
+		$text['description-fax_status']['es-mx'] = '';
+		$text['description-fax_status']['fr-ca'] = '';
+		$text['description-fax_status']['fr-fr'] = '';
+		$text['description-fax_status']['he-il'] = '';
+		$text['description-fax_status']['it-it'] = '';
+		$text['description-fax_status']['nl-nl'] = '';
+		$text['description-fax_status']['pl-pl'] = '';
+		$text['description-fax_status']['pt-br'] = '';
+		$text['description-fax_status']['pt-pt'] = '';
+		$text['description-fax_status']['ro-ro'] = '';
+		$text['description-fax_status']['ru-ru'] = '';
+		$text['description-fax_status']['sv-se'] = '';
+		$text['description-fax_status']['uk-ua'] = '';
+
+		$text['label-fax_retry_date']['en-us'] = 'Retry Date';
+		$text['label-fax_retry_date']['ar-eg'] = '';
+		$text['label-fax_retry_date']['de-at'] = '';
+		$text['label-fax_retry_date']['de-ch'] = '';
+		$text['label-fax_retry_date']['de-de'] = '';
+		$text['label-fax_retry_date']['es-cl'] = '';
+		$text['label-fax_retry_date']['es-mx'] = '';
+		$text['label-fax_retry_date']['fr-ca'] = '';
+		$text['label-fax_retry_date']['fr-fr'] = '';
+		$text['label-fax_retry_date']['he-il'] = '';
+		$text['label-fax_retry_date']['it-it'] = '';
+		$text['label-fax_retry_date']['nl-nl'] = '';
+		$text['label-fax_retry_date']['pl-pl'] = '';
+		$text['label-fax_retry_date']['pt-br'] = '';
+		$text['label-fax_retry_date']['pt-pt'] = '';
+		$text['label-fax_retry_date']['ro-ro'] = '';
+		$text['label-fax_retry_date']['ru-ru'] = '';
+		$text['label-fax_retry_date']['sv-se'] = '';
+		$text['label-fax_retry_date']['uk-ua'] = '';
+
+		$text['label-fax_notify_date']['en-us'] = 'Notify Date';
+		$text['label-fax_notify_date']['ar-eg'] = '';
+		$text['label-fax_notify_date']['de-at'] = '';
+		$text['label-fax_notify_date']['de-ch'] = '';
+		$text['label-fax_notify_date']['de-de'] = '';
+		$text['label-fax_notify_date']['es-cl'] = '';
+		$text['label-fax_notify_date']['es-mx'] = '';
+		$text['label-fax_notify_date']['fr-ca'] = '';
+		$text['label-fax_notify_date']['fr-fr'] = '';
+		$text['label-fax_notify_date']['he-il'] = '';
+		$text['label-fax_notify_date']['it-it'] = '';
+		$text['label-fax_notify_date']['nl-nl'] = '';
+		$text['label-fax_notify_date']['pl-pl'] = '';
+		$text['label-fax_notify_date']['pt-br'] = '';
+		$text['label-fax_notify_date']['pt-pt'] = '';
+		$text['label-fax_notify_date']['ro-ro'] = '';
+		$text['label-fax_notify_date']['ru-ru'] = '';
+		$text['label-fax_notify_date']['sv-se'] = '';
+		$text['label-fax_notify_date']['uk-ua'] = '';
+
+		$text['description-fax_retry_date']['en-us'] = 'Date the fax was retried';
+		$text['description-fax_retry_date']['ar-eg'] = '';
+		$text['description-fax_retry_date']['de-at'] = '';
+		$text['description-fax_retry_date']['de-ch'] = '';
+		$text['description-fax_retry_date']['de-de'] = '';
+		$text['description-fax_retry_date']['es-cl'] = '';
+		$text['description-fax_retry_date']['es-mx'] = '';
+		$text['description-fax_retry_date']['fr-ca'] = '';
+		$text['description-fax_retry_date']['fr-fr'] = '';
+		$text['description-fax_retry_date']['he-il'] = '';
+		$text['description-fax_retry_date']['it-it'] = '';
+		$text['description-fax_retry_date']['nl-nl'] = '';
+		$text['description-fax_retry_date']['pl-pl'] = '';
+		$text['description-fax_retry_date']['pt-br'] = '';
+		$text['description-fax_retry_date']['pt-pt'] = '';
+		$text['description-fax_retry_date']['ro-ro'] = '';
+		$text['description-fax_retry_date']['ru-ru'] = '';
+		$text['description-fax_retry_date']['sv-se'] = '';
+		$text['description-fax_retry_date']['uk-ua'] = '';
+
+		$text['description-fax_notify_date']['en-us'] = 'Date the fax was notified';
+		$text['description-fax_notify_date']['ar-eg'] = '';
+		$text['description-fax_notify_date']['de-at'] = '';
+		$text['description-fax_notify_date']['de-ch'] = '';
+		$text['description-fax_notify_date']['de-de'] = '';
+		$text['description-fax_notify_date']['es-cl'] = '';
+		$text['description-fax_notify_date']['es-mx'] = '';
+		$text['description-fax_notify_date']['fr-ca'] = '';
+		$text['description-fax_notify_date']['fr-fr'] = '';
+		$text['description-fax_notify_date']['he-il'] = '';
+		$text['description-fax_notify_date']['it-it'] = '';
+		$text['description-fax_notify_date']['nl-nl'] = '';
+		$text['description-fax_notify_date']['pl-pl'] = '';
+		$text['description-fax_notify_date']['pt-br'] = '';
+		$text['description-fax_notify_date']['pt-pt'] = '';
+		$text['description-fax_notify_date']['ro-ro'] = '';
+		$text['description-fax_notify_date']['ru-ru'] = '';
+		$text['description-fax_notify_date']['sv-se'] = '';
+		$text['description-fax_notify_date']['uk-ua'] = '';
+
+		$text['label-fax_retry_count']['en-us'] = 'Retry Count';
+		$text['label-fax_retry_count']['ar-eg'] = '';
+		$text['label-fax_retry_count']['de-at'] = '';
+		$text['label-fax_retry_count']['de-ch'] = '';
+		$text['label-fax_retry_count']['de-de'] = '';
+		$text['label-fax_retry_count']['es-cl'] = '';
+		$text['label-fax_retry_count']['es-mx'] = '';
+		$text['label-fax_retry_count']['fr-ca'] = '';
+		$text['label-fax_retry_count']['fr-fr'] = '';
+		$text['label-fax_retry_count']['he-il'] = '';
+		$text['label-fax_retry_count']['it-it'] = '';
+		$text['label-fax_retry_count']['nl-nl'] = '';
+		$text['label-fax_retry_count']['pl-pl'] = '';
+		$text['label-fax_retry_count']['pt-br'] = '';
+		$text['label-fax_retry_count']['pt-pt'] = '';
+		$text['label-fax_retry_count']['ro-ro'] = '';
+		$text['label-fax_retry_count']['ru-ru'] = '';
+		$text['label-fax_retry_count']['sv-se'] = '';
+		$text['label-fax_retry_count']['uk-ua'] = '';
+
+		$text['description-fax_retry_count']['en-us'] = 'Enter the fax retries.';
+		$text['description-fax_retry_count']['ar-eg'] = '';
+		$text['description-fax_retry_count']['de-at'] = '';
+		$text['description-fax_retry_count']['de-ch'] = '';
+		$text['description-fax_retry_count']['de-de'] = '';
+		$text['description-fax_retry_count']['es-cl'] = '';
+		$text['description-fax_retry_count']['es-mx'] = '';
+		$text['description-fax_retry_count']['fr-ca'] = '';
+		$text['description-fax_retry_count']['fr-fr'] = '';
+		$text['description-fax_retry_count']['he-il'] = '';
+		$text['description-fax_retry_count']['it-it'] = '';
+		$text['description-fax_retry_count']['nl-nl'] = '';
+		$text['description-fax_retry_count']['pl-pl'] = '';
+		$text['description-fax_retry_count']['pt-br'] = '';
+		$text['description-fax_retry_count']['pt-pt'] = '';
+		$text['description-fax_retry_count']['ro-ro'] = '';
+		$text['description-fax_retry_count']['ru-ru'] = '';
+		$text['description-fax_retry_count']['sv-se'] = '';
+		$text['description-fax_retry_count']['uk-ua'] = '';
+
+		$text['label-fax_accountcode']['en-us'] = 'Accountcode';
+		$text['label-fax_accountcode']['ar-eg'] = '';
+		$text['label-fax_accountcode']['de-at'] = '';
+		$text['label-fax_accountcode']['de-ch'] = '';
+		$text['label-fax_accountcode']['de-de'] = '';
+		$text['label-fax_accountcode']['es-cl'] = '';
+		$text['label-fax_accountcode']['es-mx'] = '';
+		$text['label-fax_accountcode']['fr-ca'] = '';
+		$text['label-fax_accountcode']['fr-fr'] = '';
+		$text['label-fax_accountcode']['he-il'] = '';
+		$text['label-fax_accountcode']['it-it'] = '';
+		$text['label-fax_accountcode']['nl-nl'] = '';
+		$text['label-fax_accountcode']['pl-pl'] = '';
+		$text['label-fax_accountcode']['pt-br'] = '';
+		$text['label-fax_accountcode']['pt-pt'] = '';
+		$text['label-fax_accountcode']['ro-ro'] = '';
+		$text['label-fax_accountcode']['ru-ru'] = '';
+		$text['label-fax_accountcode']['sv-se'] = '';
+		$text['label-fax_accountcode']['uk-ua'] = '';
+
+		$text['description-fax_accountcode']['en-us'] = 'Enter the accountcode.';
+		$text['description-fax_accountcode']['ar-eg'] = '';
+		$text['description-fax_accountcode']['de-at'] = '';
+		$text['description-fax_accountcode']['de-ch'] = '';
+		$text['description-fax_accountcode']['de-de'] = '';
+		$text['description-fax_accountcode']['es-cl'] = '';
+		$text['description-fax_accountcode']['es-mx'] = '';
+		$text['description-fax_accountcode']['fr-ca'] = '';
+		$text['description-fax_accountcode']['fr-fr'] = '';
+		$text['description-fax_accountcode']['he-il'] = '';
+		$text['description-fax_accountcode']['it-it'] = '';
+		$text['description-fax_accountcode']['nl-nl'] = '';
+		$text['description-fax_accountcode']['pl-pl'] = '';
+		$text['description-fax_accountcode']['pt-br'] = '';
+		$text['description-fax_accountcode']['pt-pt'] = '';
+		$text['description-fax_accountcode']['ro-ro'] = '';
+		$text['description-fax_accountcode']['ru-ru'] = '';
+		$text['description-fax_accountcode']['sv-se'] = '';
+		$text['description-fax_accountcode']['uk-ua'] = '';
+
+		$text['label-fax_command']['en-us'] = 'Command';
+		$text['label-fax_command']['ar-eg'] = '';
+		$text['label-fax_command']['de-at'] = '';
+		$text['label-fax_command']['de-ch'] = '';
+		$text['label-fax_command']['de-de'] = '';
+		$text['label-fax_command']['es-cl'] = '';
+		$text['label-fax_command']['es-mx'] = '';
+		$text['label-fax_command']['fr-ca'] = '';
+		$text['label-fax_command']['fr-fr'] = '';
+		$text['label-fax_command']['he-il'] = '';
+		$text['label-fax_command']['it-it'] = '';
+		$text['label-fax_command']['nl-nl'] = '';
+		$text['label-fax_command']['pl-pl'] = '';
+		$text['label-fax_command']['pt-br'] = '';
+		$text['label-fax_command']['pt-pt'] = '';
+		$text['label-fax_command']['ro-ro'] = '';
+		$text['label-fax_command']['ru-ru'] = '';
+		$text['label-fax_command']['sv-se'] = '';
+		$text['label-fax_command']['uk-ua'] = '';
+
+		$text['description-fax_command']['en-us'] = 'Enter the fax command.';
+		$text['description-fax_command']['ar-eg'] = '';
+		$text['description-fax_command']['de-at'] = '';
+		$text['description-fax_command']['de-ch'] = '';
+		$text['description-fax_command']['de-de'] = '';
+		$text['description-fax_command']['es-cl'] = '';
+		$text['description-fax_command']['es-mx'] = '';
+		$text['description-fax_command']['fr-ca'] = '';
+		$text['description-fax_command']['fr-fr'] = '';
+		$text['description-fax_command']['he-il'] = '';
+		$text['description-fax_command']['it-it'] = '';
+		$text['description-fax_command']['nl-nl'] = '';
+		$text['description-fax_command']['pl-pl'] = '';
+		$text['description-fax_command']['pt-br'] = '';
+		$text['description-fax_command']['pt-pt'] = '';
+		$text['description-fax_command']['ro-ro'] = '';
+		$text['description-fax_command']['ru-ru'] = '';
+		$text['description-fax_command']['sv-se'] = '';
+		$text['description-fax_command']['uk-ua'] = '';
+
+?>
diff --git a/app/fax_queue/app_menu.php b/app/fax_queue/app_menu.php
new file mode 100644
index 0000000000..04f6fde700
--- /dev/null
+++ b/app/fax_queue/app_menu.php
@@ -0,0 +1,19 @@
+<?php
+
+$apps[$x]['menu'][0]['title']['en-us'] = 'FAX Queue';
+$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'] = '88fd4b3e-30b2-4514-be1d-6870aa97d652';
+$apps[$x]['menu'][0]['parent_uuid'] = '0438b504-8613-7887-c420-c837ffb20cb1';
+$apps[$x]['menu'][0]['category'] = 'internal';
+$apps[$x]['menu'][0]['path'] = '/app/fax_queue/fax_queue.php';
+$apps[$x]['menu'][0]['groups'][] = 'superadmin';
+//$apps[$x]['menu'][0]['groups'][] = 'admin';
+//$apps[$x]['menu'][0]['groups'][] = 'user';
+
+?>
diff --git a/app/fax_queue/fax_queue.php b/app/fax_queue/fax_queue.php
new file mode 100644
index 0000000000..9bdce4d475
--- /dev/null
+++ b/app/fax_queue/fax_queue.php
@@ -0,0 +1,321 @@
+<?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) 2022
+	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('fax_queue_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['fax_queue'])) {
+		$action = $_POST['action'];
+		$search = $_POST['search'];
+		$fax_queue = $_POST['fax_queue'];
+	}
+
+//process the http post data by action
+	if ($action != '' && is_array($fax_queue) && @sizeof($fax_queue) != 0) {
+
+		switch ($action) {
+			case 'copy':
+				if (permission_exists('fax_queue_add')) {
+					$obj = new fax_queue;
+					$obj->copy($fax_queue);
+				}
+				break;
+			//case 'toggle':
+			//	if (permission_exists('fax_queue_edit')) {
+			//		$obj = new fax_queue;
+			//		$obj->toggle($fax_queue);
+			//	}
+			//	break;
+			case 'delete':
+				if (permission_exists('fax_queue_delete')) {
+					$obj = new fax_queue;
+					$obj->delete($fax_queue);
+				}
+				break;
+		}
+
+		//redirect the user
+		header('Location: fax_queue.php'.($search != '' ? '?search='.urlencode($search) : null));
+		exit;
+	}
+
+//set the time zone
+	if (isset($_SESSION['domain']['time_zone']['name'])) {
+		$time_zone = $_SESSION['domain']['time_zone']['name'];
+	}
+	else {
+		$time_zone = date_default_timezone_get();
+	}
+
+//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(fax_queue_uuid) ";
+	$sql .= "from v_fax_queue ";
+	if ($_GET['show'] == "all" && permission_exists('fax_queue_all')) {
+		$sql .= "where true ";
+	}
+	else {
+		$sql .= "where domain_uuid = :domain_uuid ";
+		$parameters['domain_uuid'] = $domain_uuid;
+	}
+	if (isset($search)) {
+		$sql .= "and (";
+		$sql .= "	lower(hostname) like :search ";
+		$sql .= "	or lower(fax_caller_id_name) like :search ";
+		$sql .= "	or lower(fax_caller_id_number) like :search ";
+		$sql .= "	or lower(fax_number) like :search ";
+		$sql .= "	or lower(fax_email_address) like :search ";
+		$sql .= "	or lower(fax_file) like :search ";
+		$sql .= "	or lower(fax_status) like :search ";
+		$sql .= "	or lower(fax_accountcode) 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('fax_queue_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 .= "d.domain_name, ";
+	$sql .= "q.fax_queue_uuid, ";
+	$sql .= "q.fax_uuid, ";
+	$sql .= "q.fax_date, ";
+	$sql .= "to_char(timezone(:time_zone, q.fax_date), 'DD Mon YYYY') as fax_date_formatted, \n";
+	$sql .= "to_char(timezone(:time_zone, q.fax_date), 'HH12:MI:SS am') as fax_time_formatted, \n";	
+	$sql .= "q.hostname, ";
+	$sql .= "q.fax_caller_id_name, ";
+	$sql .= "q.fax_caller_id_number, ";
+	$sql .= "q.fax_number, ";
+	$sql .= "q.fax_prefix, ";
+	$sql .= "q.fax_email_address, ";
+	$sql .= "q.fax_file, ";
+	$sql .= "q.fax_status, ";
+	$sql .= "q.fax_retry_date, ";
+	$sql .= "to_char(timezone(:time_zone, q.fax_retry_date), 'DD Mon YYYY') as fax_retry_date_formatted, \n";
+	$sql .= "to_char(timezone(:time_zone, q.fax_retry_date), 'HH12:MI:SS am') as fax_retry_time_formatted, \n";	
+	$sql .= "q.fax_notify_date, ";
+	$sql .= "to_char(timezone(:time_zone, q.fax_notify_date), 'DD Mon YYYY') as fax_notify_date_formatted, \n";
+	$sql .= "to_char(timezone(:time_zone, q.fax_notify_date), 'HH12:MI:SS am') as fax_notify_time_formatted, \n";	
+	$sql .= "q.fax_retry_count, ";
+	$sql .= "q.fax_accountcode, ";
+	$sql .= "q.fax_command ";
+	$sql .= "from v_fax_queue as q, v_domains as d ";
+	if ($_GET['show'] == "all" && permission_exists('fax_queue_all')) {
+		$sql .= "where true ";
+	}
+	else {
+		$sql .= "where q.domain_uuid = :domain_uuid ";
+		$parameters['domain_uuid'] = $domain_uuid;
+	}
+	$sql .= "and q.domain_uuid = d.domain_uuid ";
+	if (isset($_GET["search"])) {
+		$sql .= "and (";
+		$sql .= "	lower(hostname) like :search ";
+		$sql .= "	or lower(fax_caller_id_name) like :search ";
+		$sql .= "	or lower(fax_caller_id_number) like :search ";
+		$sql .= "	or lower(fax_number) like :search ";
+		$sql .= "	or lower(fax_email_address) like :search ";
+		$sql .= "	or lower(fax_file) like :search ";
+		$sql .= "	or lower(fax_status) like :search ";
+		$sql .= "	or lower(fax_accountcode) like :search ";
+		$sql .= ") ";
+		$parameters['search'] = '%'.$search.'%';
+	}
+	$sql .= order_by($order_by, $order, 'fax_date', 'desc');
+	$sql .= limit_offset($rows_per_page, $offset);
+	$parameters['time_zone'] = $time_zone;
+	$database = new database;
+	$fax_queue = $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-fax_queue'];
+	require_once "resources/header.php";
+
+//show the content
+	echo "<div class='action_bar' id='action_bar'>\n";
+	echo "	<div class='heading'><b>".$text['title-fax_queue']." (".$num_rows.")</b></div>\n";
+	echo "	<div class='actions'>\n";
+	if (permission_exists('fax_queue_add')) {
+		echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add'],'id'=>'btn_add','name'=>'btn_add','link'=>'fax_queue_edit.php']);
+	}
+	if (permission_exists('fax_queue_add') && $fax_queue) {
+		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('fax_queue_edit') && $fax_queue) {
+	//	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('fax_queue_delete') && $fax_queue) {
+		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('fax_queue_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'=>'fax_queue.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('fax_queue_add') && $fax_queue) {
+		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('fax_queue_edit') && $fax_queue) {
+	//	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('fax_queue_delete') && $fax_queue) {
+		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 "<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('fax_queue_add') || permission_exists('fax_queue_edit') || permission_exists('fax_queue_delete')) {
+		echo "	<th class='checkbox'>\n";
+		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle(); checkbox_on_change(this);' ".($fax_queue ?: "style='visibility: hidden;'").">\n";
+		echo "	</th>\n";
+	}
+	if ($_GET['show'] == 'all' && permission_exists('fax_queue_all')) {
+		echo th_order_by('domain_name', $text['label-domain'], $order_by, $order);
+	}
+	//echo th_order_by('fax_date', $text['label-fax_date'], $order_by, $order);
+	echo "<th class='center shrink'>".$text['label-date']."</th>\n";
+	echo "<th class='center shrink hide-md-dn'>".$text['label-time']."</th>\n";
+	echo th_order_by('hostname', $text['label-hostname'], $order_by, $order);
+	echo th_order_by('fax_caller_id_name', $text['label-fax_caller_id_name'], $order_by, $order);
+	echo th_order_by('fax_caller_id_number', $text['label-fax_caller_id_number'], $order_by, $order);
+	echo th_order_by('fax_number', $text['label-fax_number'], $order_by, $order);
+	echo th_order_by('fax_email_address', $text['label-fax_email_address'], $order_by, $order);
+	echo th_order_by('fax_file', $text['label-fax_file'], $order_by, $order);
+	echo th_order_by('fax_status', $text['label-fax_status'], $order_by, $order);
+	echo th_order_by('fax_retry_date', $text['label-fax_retry_date'], $order_by, $order);
+	echo th_order_by('fax_notify_date', $text['label-fax_notify_date'], $order_by, $order);
+	echo th_order_by('fax_retry_count', $text['label-fax_retry_count'], $order_by, $order);
+	if (permission_exists('fax_queue_edit') && $_SESSION['theme']['list_row_edit_button']['boolean'] == 'true') {
+		echo "	<td class='action-button'>&nbsp;</td>\n";
+	}
+	echo "</tr>\n";
+
+	if (is_array($fax_queue) && @sizeof($fax_queue) != 0) {
+		$x = 0;
+		foreach ($fax_queue as $row) {
+			if (permission_exists('fax_queue_edit')) {
+				$list_row_url = "fax_queue_edit.php?id=".urlencode($row['fax_queue_uuid']);
+			}
+			echo "<tr class='list-row' href='".$list_row_url."'>\n";
+			if (permission_exists('fax_queue_add') || permission_exists('fax_queue_edit') || permission_exists('fax_queue_delete')) {
+				echo "	<td class='checkbox'>\n";
+				echo "		<input type='checkbox' name='fax_queue[$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='fax_queue[$x][fax_queue_uuid]' value='".escape($row['fax_queue_uuid'])."' />\n";
+				echo "	</td>\n";
+			}
+			if ($_GET['show'] == 'all' && permission_exists('fax_queue_all')) {
+				echo "	<td>".escape($row['domain_name'])."</td>\n";
+			}
+			echo "	<td nowrap='nowrap'>".escape($row['fax_date_formatted'])."</td>\n";
+			echo "	<td nowrap='nowrap'>".escape($row['fax_time_formatted'])."</td>\n";
+			echo "	<td>".escape($row['hostname'])."</td>\n";
+			echo "	<td>".escape($row['fax_caller_id_name'])."</td>\n";
+			echo "	<td>".escape($row['fax_caller_id_number'])."</td>\n";
+			echo "	<td>".escape($row['fax_number'])."</td>\n";
+			echo "	<td>".escape($row['fax_email_address'])."</td>\n";
+			echo "	<td>".escape($row['fax_file'])."</td>\n";
+			echo "	<td>".escape($row['fax_status'])."</td>\n";
+			echo "	<td>".escape($row['fax_retry_date_formatted'])." ".escape($row['fax_retry_time_formatted'])."</td>\n";
+			echo "	<td>".escape($row['fax_notify_date_formatted'])." ".escape($row['fax_notify_time_formatted'])."</td>\n";
+			echo "	<td>".escape($row['fax_retry_count'])."</td>\n";
+			if (permission_exists('fax_queue_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($fax_queue);
+	}
+
+	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/app/fax_queue/fax_queue_delete.php b/app/fax_queue/fax_queue_delete.php
new file mode 100644
index 0000000000..6978f96722
--- /dev/null
+++ b/app/fax_queue/fax_queue_delete.php
@@ -0,0 +1,41 @@
+<?php
+
+//includes
+	require_once "root.php";
+	require_once "resources/require.php";
+	require_once "resources/check_auth.php";
+
+//check permissions
+	if (permission_exists('fax_queue_delete')) {
+		//access granted
+	}
+	else {
+		echo "access denied";
+		exit;
+	}
+
+//add multi-lingual support
+	$language = new text;
+	$text = $language->get();
+
+//delete the message
+	message::add($text['message-delete']);
+
+//delete the data
+	if (isset($_GET["id"]) && is_uuid($_GET["id"])) {
+
+		//get the id
+			$id = $_GET["id"];
+
+		//delete the data
+			$array['fax_queue'][]['fax_queue_uuid'] = $id;
+			$database = new database;
+			$database->delete($array);
+			unset($array);
+
+		//redirect the user
+			header('Location: fax_queues.php');
+	}
+
+
+?>
\ No newline at end of file
diff --git a/app/fax_queue/fax_queue_edit.php b/app/fax_queue/fax_queue_edit.php
new file mode 100644
index 0000000000..f4307b32a8
--- /dev/null
+++ b/app/fax_queue/fax_queue_edit.php
@@ -0,0 +1,452 @@
+<?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) 2022
+	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('fax_queue_add') || permission_exists('fax_queue_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";
+		$fax_queue_uuid = $_REQUEST["id"];
+		$id = $_REQUEST["id"];
+	}
+	else {
+		$action = "add";
+	}
+
+//get http post variables and set them to php variables
+	if (is_array($_POST)) {
+		$fax_uuid = $_POST["fax_uuid"];
+		$fax_date = $_POST["fax_date"];
+		$hostname = $_POST["hostname"];
+		$fax_caller_id_name = $_POST["fax_caller_id_name"];
+		$fax_caller_id_number = $_POST["fax_caller_id_number"];
+		$fax_number = $_POST["fax_number"];
+		$fax_prefix = $_POST["fax_prefix"];
+		$fax_email_address = $_POST["fax_email_address"];
+		$fax_file = $_POST["fax_file"];
+		$fax_status = $_POST["fax_status"];
+		$fax_retry_date = $_POST["fax_retry_date"];
+		$fax_notify_date = $_POST["fax_notify_date"];
+		$fax_retry_count = $_POST["fax_retry_count"];
+		$fax_accountcode = $_POST["fax_accountcode"];
+		$fax_command = $_POST["fax_command"];
+	}
+
+//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: fax_queue.php');
+				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('fax_queue_add')) {
+							$obj = new database;
+							$obj->copy($array);
+						}
+						break;
+					case 'delete':
+						if (permission_exists('fax_queue_delete')) {
+							$obj = new database;
+							$obj->delete($array);
+						}
+						break;
+					case 'toggle':
+						if (permission_exists('fax_queue_update')) {
+							$obj = new database;
+							$obj->toggle($array);
+						}
+						break;
+				}
+
+				//redirect the user
+				if (in_array($_POST['action'], array('copy', 'delete', 'toggle') && is_uuid($id))) {
+					header('Location: fax_queue_edit.php?id='.$id);
+					exit;
+				}
+			}
+
+		//check for all required data
+			$msg = '';
+			//if (strlen($fax_uuid) == 0) { $msg .= $text['message-required']." ".$text['label-fax_uuid']."<br>\n"; }
+			if (strlen($fax_date) == 0) { $msg .= $text['message-required']." ".$text['label-fax_date']."<br>\n"; }
+			if (strlen($hostname) == 0) { $msg .= $text['message-required']." ".$text['label-hostname']."<br>\n"; }
+			//if (strlen($fax_caller_id_name) == 0) { $msg .= $text['message-required']." ".$text['label-fax_caller_id_name']."<br>\n"; }
+			//if (strlen($fax_caller_id_number) == 0) { $msg .= $text['message-required']." ".$text['label-fax_caller_id_number']."<br>\n"; }
+			if (strlen($fax_number) == 0) { $msg .= $text['message-required']." ".$text['label-fax_number']."<br>\n"; }
+			//if (strlen($fax_prefix) == 0) { $msg .= $text['message-required']." ".$text['label-fax_prefix']."<br>\n"; }
+			//if (strlen($fax_email_address) == 0) { $msg .= $text['message-required']." ".$text['label-fax_email_address']."<br>\n"; }
+			if (strlen($fax_file) == 0) { $msg .= $text['message-required']." ".$text['label-fax_file']."<br>\n"; }
+			if (strlen($fax_status) == 0) { $msg .= $text['message-required']." ".$text['label-fax_status']."<br>\n"; }
+			//if (strlen($fax_retry_date) == 0) { $msg .= $text['message-required']." ".$text['label-fax_retry_date']."<br>\n"; }
+			//if (strlen($fax_retry_count) == 0) { $msg .= $text['message-required']." ".$text['label-fax_retry_count']."<br>\n"; }
+			//if (strlen($fax_accountcode) == 0) { $msg .= $text['message-required']." ".$text['label-fax_accountcode']."<br>\n"; }
+			//if (strlen($fax_command) == 0) { $msg .= $text['message-required']." ".$text['label-fax_command']."<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 fax_queue_uuid
+			if (!is_uuid($_POST["fax_queue_uuid"])) {
+				$fax_queue_uuid = uuid();
+			}
+
+		//prepare the array
+			$array['fax_queue'][0]['fax_queue_uuid'] = $fax_queue_uuid;
+			$array['fax_queue'][0]['domain_uuid'] = $_SESSION['domain_uuid'];
+			//$array['fax_queue'][0]['fax_uuid'] = $fax_uuid;
+			$array['fax_queue'][0]['fax_date'] = $fax_date;
+			$array['fax_queue'][0]['hostname'] = $hostname;
+			$array['fax_queue'][0]['fax_caller_id_name'] = $fax_caller_id_name;
+			$array['fax_queue'][0]['fax_caller_id_number'] = $fax_caller_id_number;
+			$array['fax_queue'][0]['fax_number'] = $fax_number;
+			$array['fax_queue'][0]['fax_prefix'] = $fax_prefix;
+			$array['fax_queue'][0]['fax_email_address'] = $fax_email_address;
+			$array['fax_queue'][0]['fax_file'] = $fax_file;
+			$array['fax_queue'][0]['fax_status'] = $fax_status;
+			$array['fax_queue'][0]['fax_retry_date'] = $fax_retry_date;
+			$array['fax_queue'][0]['fax_notify_date'] = $fax_notify_date;
+			$array['fax_queue'][0]['fax_retry_count'] = $fax_retry_count;
+			$array['fax_queue'][0]['fax_accountcode'] = $fax_accountcode;
+			$array['fax_queue'][0]['fax_command'] = $fax_command;
+
+		//save the data
+			$database = new database;
+			$database->app_name = 'fax queue';
+			$database->app_uuid = '3656287f-4b22-4cf1-91f6-00386bf488f4';
+			$database->save($array);
+
+		//redirect the user
+			if (isset($action)) {
+				if ($action == "add") {
+					$_SESSION["message"] = $text['message-add'];
+				}
+				if ($action == "update") {
+					$_SESSION["message"] = $text['message-update'];
+				}
+				//header('Location: fax_queue.php');
+				header('Location: fax_queue_edit.php?id='.urlencode($fax_queue_uuid));
+				return;
+			}
+	}
+
+//pre-populate the form
+	if (is_array($_GET) && $_POST["persistformvar"] != "true") {
+		$sql = "select ";
+		$sql .= " fax_uuid, ";
+		$sql .= " fax_date, ";
+		$sql .= " hostname, ";
+		$sql .= " fax_caller_id_name, ";
+		$sql .= " fax_caller_id_number, ";
+		$sql .= " fax_number, ";
+		$sql .= " fax_prefix, ";
+		$sql .= " fax_email_address, ";
+		$sql .= " fax_file, ";
+		$sql .= " fax_status, ";
+		$sql .= " fax_retry_date, ";
+		$sql .= " fax_notify_date, ";
+		$sql .= " fax_retry_count, ";
+		$sql .= " fax_accountcode, ";
+		$sql .= " fax_command ";
+		$sql .= "from v_fax_queue ";
+		$sql .= "where fax_queue_uuid = :fax_queue_uuid ";
+		//$sql .= "and domain_uuid = :domain_uuid ";
+		//$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+		$parameters['fax_queue_uuid'] = $fax_queue_uuid;
+		$database = new database;
+		$row = $database->select($sql, $parameters, 'row');
+		if (is_array($row) && @sizeof($row) != 0) {
+			$fax_uuid = $row["fax_uuid"];
+			$fax_date = $row["fax_date"];
+			$hostname = $row["hostname"];
+			$fax_caller_id_name = $row["fax_caller_id_name"];
+			$fax_caller_id_number = $row["fax_caller_id_number"];
+			$fax_number = $row["fax_number"];
+			$fax_prefix = $row["fax_prefix"];
+			$fax_email_address = $row["fax_email_address"];
+			$fax_file = $row["fax_file"];
+			$fax_status = $row["fax_status"];
+			$fax_retry_date = $row["fax_retry_date"];
+			$fax_notify_date = $row["fax_notify_date"];
+			$fax_retry_count = $row["fax_retry_count"];
+			$fax_accountcode = $row["fax_accountcode"];
+			$fax_command = $row["fax_command"];
+		}
+		unset($sql, $parameters, $row);
+	}
+
+//create token
+	$object = new token;
+	$token = $object->create($_SERVER['PHP_SELF']);
+
+//show the header
+	$document['title'] = $text['title-fax_queue'];
+	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='fax_queue_uuid' value='".escape($fax_queue_uuid)."'>\n";
+
+	echo "<div class='action_bar' id='action_bar'>\n";
+	echo "	<div class='heading'><b>".$text['title-fax_queue']."</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'=>'fax_queue.php']);
+	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-fax_queue']."\n";
+	echo "<br /><br />\n";
+
+	if ($action == 'update') {
+		if (permission_exists('fax_queue_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('fax_queue_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-fax_uuid']."\n";
+	//echo "</td>\n";
+	//echo "<td class='vtable' style='position: relative;' align='left'>\n";
+	//echo "  <input class='formfld' type='text' name='fax_uuid' maxlength='255' value='".escape($fax_uuid)."'>\n";
+	//echo "<br />\n";
+	//echo $text['description-fax_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-fax_date']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' style='position: relative;' align='left'>\n";
+	echo "  <input class='formfld' type='text' name='fax_date' maxlength='255' value='".escape($fax_date)."'>\n";
+	echo "<br />\n";
+	echo $text['description-fax_date']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
+	echo "<tr>\n";
+	echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-hostname']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' style='position: relative;' align='left'>\n";
+	echo "	<input class='formfld' type='text' name='hostname' maxlength='255' value='".escape($hostname)."'>\n";
+	echo "<br />\n";
+	echo $text['description-hostname']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
+	echo "<tr>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-fax_caller_id_name']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' style='position: relative;' align='left'>\n";
+	echo "	<input class='formfld' type='text' name='fax_caller_id_name' maxlength='255' value='".escape($fax_caller_id_name)."'>\n";
+	echo "<br />\n";
+	echo $text['description-fax_caller_id_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-fax_caller_id_number']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' style='position: relative;' align='left'>\n";
+	echo "	<input class='formfld' type='text' name='fax_caller_id_number' maxlength='255' value='".escape($fax_caller_id_number)."'>\n";
+	echo "<br />\n";
+	echo $text['description-fax_caller_id_number']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
+	echo "<tr>\n";
+	echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-fax_number']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' style='position: relative;' align='left'>\n";
+	echo "	<input class='formfld' type='text' name='fax_number' maxlength='255' value='".escape($fax_number)."'>\n";
+	echo "<br />\n";
+	echo $text['description-fax_number']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
+	echo "<tr>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-fax_prefix']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' style='position: relative;' align='left'>\n";
+	echo "	<input class='formfld' type='text' name='fax_prefix' maxlength='255' value='".escape($fax_prefix)."'>\n";
+	echo "<br />\n";
+	echo $text['description-fax_prefix']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
+	echo "<tr>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-fax_email_address']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' style='position: relative;' align='left'>\n";
+	echo "	<input class='formfld' type='text' name='fax_email_address' maxlength='255' value='".escape($fax_email_address)."'>\n";
+	echo "<br />\n";
+	echo $text['description-fax_email_address']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
+	echo "<tr>\n";
+	echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-fax_file']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' style='position: relative;' align='left'>\n";
+	echo "	<input class='formfld' type='text' name='fax_file' maxlength='255' value='".escape($fax_file)."'>\n";
+	echo "<br />\n";
+	echo $text['description-fax_file']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
+	echo "<tr>\n";
+	echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-fax_status']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' style='position: relative;' align='left'>\n";
+	echo "	<input class='formfld' type='text' name='fax_status' maxlength='255' value='".escape($fax_status)."'>\n";
+	echo "<br />\n";
+	echo $text['description-fax_status']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
+	echo "<tr>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-fax_retry_date']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' style='position: relative;' align='left'>\n";
+	echo "  <input class='formfld' type='text' name='fax_retry_date' maxlength='255' value='".escape($fax_retry_date)."'>\n";
+	echo "<br />\n";
+	echo $text['description-fax_retry_date']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
+	echo "<tr>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-fax_notify_date']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' style='position: relative;' align='left'>\n";
+	echo "  <input class='formfld' type='text' name='fax_retry_date' maxlength='255' value='".escape($fax_notify_date)."'>\n";
+	echo "<br />\n";
+	echo $text['description-fax_notify_date']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
+	echo "<tr>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-fax_retry_count']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' style='position: relative;' align='left'>\n";
+	echo "  <input class='formfld' type='text' name='fax_retry_count' maxlength='255' value='".escape($fax_retry_count)."'>\n";
+	echo "<br />\n";
+	echo $text['description-fax_retry_count']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
+	echo "<tr>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-fax_accountcode']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' style='position: relative;' align='left'>\n";
+	echo "	<input class='formfld' type='text' name='fax_accountcode' maxlength='255' value='".escape($fax_accountcode)."'>\n";
+	echo "<br />\n";
+	echo $text['description-fax_accountcode']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
+	echo "<tr>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-fax_command']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' style='position: relative;' align='left'>\n";
+	echo "	<textarea class='formfld' name='fax_command' style='width: 185px; height: 80px;'>".$fax_command."</textarea>\n";
+	echo "<br />\n";
+	echo $text['description-fax_command']."\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";
+
+?>
diff --git a/app/fax_queue/resources/classes/fax_queue.php b/app/fax_queue/resources/classes/fax_queue.php
new file mode 100644
index 0000000000..d34b80e61b
--- /dev/null
+++ b/app/fax_queue/resources/classes/fax_queue.php
@@ -0,0 +1,263 @@
+<?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>
+*/
+
+/**
+ * fax_queue class
+ *
+ * @method null delete
+ * @method null toggle
+ * @method null copy
+ */
+if (!class_exists('fax_queue')) {
+	class fax_queue {
+
+		/**
+		* 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 = 'fax_queue';
+				$this->app_uuid = '3656287f-4b22-4cf1-91f6-00386bf488f4';
+				$this->name = 'fax_queue';
+				$this->table = 'fax_queue';
+				$this->toggle_field = '';
+				$this->toggle_values = ['true','false'];
+				$this->location = 'fax_queue.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['fax_queue_uuid'])) {
+										$array[$this->table][$x]['fax_queue_uuid'] = $record['fax_queue_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);
+					}
+			}
+		}
+
+		/**
+		 * 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['fax_queue_uuid'])) {
+									$uuids[] = "'".$record['fax_queue_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['fax_queue_uuid'])) {
+									$uuids[] = "'".$record['fax_queue_uuid']."'";
+								}
+							}
+
+						//create the array from existing data
+							if (is_array($uuids) && @sizeof($uuids) != 0) {
+								$sql = "select * from v_".$this->table." ";
+								$sql .= "where fax_queue_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][fax_queue.'_uuid'] = uuid();
+
+										//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);
+					}
+			}
+		}
+
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/app/fax_queue/resources/job/fax_queue.php b/app/fax_queue/resources/job/fax_queue.php
new file mode 100644
index 0000000000..2a9495747c
--- /dev/null
+++ b/app/fax_queue/resources/job/fax_queue.php
@@ -0,0 +1,199 @@
+<?php
+
+//includes
+	if (defined('STDIN')) {
+		$document_root = str_replace("\\", "/", $_SERVER["PHP_SELF"]);
+		preg_match("/^(.*)\/app\/.*$/", $document_root, $matches);
+		$document_root = $matches[1];
+		set_include_path($document_root);
+		$_SERVER["DOCUMENT_ROOT"] = $document_root;
+		require_once "resources/require.php";
+	}
+	else {
+		exit;
+		include "root.php";
+		require_once "resources/require.php";
+		require_once "resources/pdo.php";
+	}
+
+//increase limits
+	set_time_limit(0);
+	ini_set('max_execution_time', 0);
+	ini_set('memory_limit', '512M');
+
+//save the arguments to variables
+	$script_name = $argv[0];
+	if (!empty($argv[1])) {
+		parse_str($argv[1], $_GET);
+	}
+	//print_r($_GET);
+
+//set the variables
+	if (isset($_GET['hostname'])) {
+		$hostname = urldecode($_GET['hostname']);
+	}
+	if (isset($_GET['debug'])) {
+		$debug = $_GET['debug'];
+	}
+
+//define the process id file
+	$pid_file = "/var/run/fusionpbx/".basename( $argv[0], ".php") .".pid";
+	//echo "pid_file: ".$pid_file."\n";
+
+//function to check if the process exists
+	function process_exists($file = false) {
+
+		//set the default exists to false
+		$exists = false;
+
+		//check to see if the process is running
+		if (file_exists($file)) {
+			$pid = file_get_contents($file);
+			if (posix_getsid($pid) === false) { 
+				//process is not running
+				$exists = false;
+			}
+			else {
+				//process is running
+				$exists = true;
+			}
+		}
+
+		//return the result
+		return $exists;
+	}
+
+//get the default settings settings
+	$fax_queue_interval = $_SESSION['fax_queue']['interval']['numeric'];
+
+//set the defaults
+	if (!is_numeric($interval)) { $interval = 30; }
+
+//set the email queue limit
+	if (isset($_SESSION['fax_queue']['limit']['numeric'])) {
+		$fax_queue_limit = $_SESSION['fax_queue']['limit']['numeric'];
+	}
+	else {
+		$fax_queue_limit = '30';
+	}
+	if (isset($_SESSION['fax_queue']['debug']['boolean'])) {
+		$debug = $_SESSION['fax_queue']['debug']['boolean'];
+	}
+
+//check to see if the process exists
+	$pid_exists = process_exists($pid_file);
+
+//prevent the process running more than once
+	if ($pid_exists) {
+		echo "Cannot lock pid file {$pid_file}\n";
+		exit;
+	}
+
+//make sure the /var/run/fusionpbx directory exists
+	if (!file_exists('/var/run/fusionpbx')) {
+		$result = mkdir('/var/run/fusionpbx', 0777, true);
+		if (!$result) {
+			die('Failed to create /var/run/fusionpbx');
+		}
+	}
+
+//create the process id file if the process doesn't exist
+	if (!$pid_exists) {
+		//remove the old pid file
+		if (file_exists($file)) {
+			unlink($pid_file);
+		}
+
+		//show the details to the user
+		//echo "The process id is ".getmypid()."\n";
+		//echo "pid_file: ".$pid_file."\n";
+
+		//save the pid file
+		file_put_contents($pid_file, getmypid());
+	}
+
+//get the fax messages that are waiting to send
+	$sql = "select * from v_fax_queue ";
+	$sql .= "where ";
+	$sql .= "( ";
+	$sql .= "	(fax_status = 'waiting' or fax_status = 'trying') ";
+	$sql .= "	and (fax_retry_date is null or floor(extract(epoch from now()) - extract(epoch from fax_retry_date)) > :interval) ";
+	$sql .= ")  ";
+	$sql .= "or ( ";
+	$sql .= "	fax_status = 'sent' ";
+	$sql .= "	and fax_email_address is not null ";
+	$sql .= "	and fax_notify_date is null ";
+	$sql .= ") ";
+	$sql .= "and hostname = :hostname ";
+	$sql .= "order by domain_uuid asc ";
+	$sql .= "limit :limit ";
+	if (isset($hostname)) {
+		$parameters['hostname'] = $hostname;
+	}
+	else {
+		$parameters['hostname'] = gethostname();
+	}
+	$parameters['limit'] = $fax_queue_limit;
+	$parameters['interval'] = $fax_queue_interval;
+	$database = new database;
+	$fax_queue = $database->select($sql, $parameters, 'all');
+	unset($parameters);
+
+//change the working directory
+	chdir($document_root);
+
+//process the messages
+	if (is_array($fax_queue) && @sizeof($fax_queue) != 0) {
+		foreach($fax_queue as $row) {
+			$command = exec('which php')." ".$document_root."/app/fax_queue/resources/job/fax_send.php ";
+			$command .= "'action=send&fax_queue_uuid=".$row["fax_queue_uuid"]."&hostname=".$hostname."&debug=true'";
+			if (isset($debug)) {
+				//run process inline to see debug info
+				echo $command."\n";
+				$result = system($command);
+				echo $result."\n";
+			}
+			else {
+				//starts process rapidly doesn't wait for previous process to finish (used for production)
+				echo $command."\n";
+				$handle = popen($command." > /dev/null &", 'r'); 
+				echo "'$handle'; " . gettype($handle) . "\n";
+				$read = fread($handle, 2096);
+				echo $read;
+				pclose($handle);
+			}
+		}
+	}
+
+//remove the old pid file
+	if (file_exists($pid_file)) {
+		unlink($pid_file);
+	}
+
+//save output to
+	//$fp = fopen(sys_get_temp_dir()."/mailer-app.log", "a");
+
+//prepare the output buffers
+	//ob_end_clean();
+	//ob_start();
+
+//message divider for log file
+	//echo "\n\n=============================================================================================================================================\n\n";
+
+//get and save the output from the buffer
+	//$content = ob_get_contents(); //get the output from the buffer
+	//$content = str_replace("<br />", "", $content);
+
+	//ob_end_clean(); //clean the buffer
+
+	//fwrite($fp, $content);
+	//fclose($fp);
+
+//notes
+	//echo __line__."\n";
+	// if not keeping the email then need to delete it after the voicemail is emailed
+
+//how to use this feature
+	// cd /var/www/fusionpbx; /usr/bin/php /var/www/fusionpbx/app/fax_queue/resources/send.php
+
+?>
diff --git a/app/fax_queue/resources/job/fax_send.php b/app/fax_queue/resources/job/fax_send.php
new file mode 100644
index 0000000000..b95282ab9c
--- /dev/null
+++ b/app/fax_queue/resources/job/fax_send.php
@@ -0,0 +1,606 @@
+<?php
+
+//check the permission
+	if (defined('STDIN')) {
+		$document_root = str_replace("\\", "/", $_SERVER["PHP_SELF"]);
+		preg_match("/^(.*)\/app\/.*$/", $document_root, $matches);
+		$document_root = $matches[1];
+		set_include_path($document_root);
+		$_SERVER["DOCUMENT_ROOT"] = $document_root;
+		require_once "resources/require.php";
+		require_once "resources/functions.php";
+	}
+	else {
+		exit;
+		include "root.php";
+		require_once "resources/require.php";
+		require_once "resources/pdo.php";
+	}
+
+//increase limits
+	set_time_limit(0);
+	//ini_set('max_execution_time',1800); //30 minutes
+	ini_set('memory_limit', '512M');
+
+//save the arguments to variables
+	$script_name = $argv[0];
+	if (!empty($argv[1])) {
+		parse_str($argv[1], $_GET);
+	}
+	//print_r($_GET);
+
+//set the variables
+	if (isset($_GET['hostname'])) {
+		$hostname = urldecode($_GET['hostname']);
+	}
+	if (isset($_GET['debug'])) {
+		$debug = $_GET['debug'];
+	}
+
+//extract dtmf from the fax number
+	if (!function_exists('fax_split_dtmf')) {
+		function fax_split_dtmf(&$fax_number, &$fax_dtmf){
+			$tmp = array();
+			$fax_dtmf = '';
+			if (preg_match('/^\s*(.*?)\s*\((.*)\)\s*$/', $fax_number, $tmp)){
+				$fax_number = $tmp[1];
+				$fax_dtmf = $tmp[2];
+			}
+		}
+	}
+
+//set the GET array
+	if (!empty($argv[1])) {
+		parse_str($argv[1], $_GET);
+	}
+
+//get the primary key
+	if (is_uuid($_GET['fax_queue_uuid'])) {
+		$fax_queue_uuid = $_GET['fax_queue_uuid'];
+		$hostname = $_GET['hostname'];
+		$sleep_seconds = $_GET['sleep'];
+	}
+	else {
+		//invalid uuid
+		exit;
+	}
+
+//define the process id file
+	$pid_file = "/var/run/fusionpbx/fax_send".".".$fax_queue_uuid.".pid";
+	//echo "pid_file: ".$pid_file."\n";
+
+//function to check if the process exists
+	function process_exists($file = false) {
+
+		//set the default exists to false
+		$exists = false;
+
+		//check to see if the process is running
+		if (file_exists($file)) {
+			$pid = file_get_contents($file);
+			if (posix_getsid($pid) === false) { 
+				//process is not running
+				$exists = false;
+			}
+			else {
+				//process is running
+				$exists = true;
+			}
+		}
+
+		//return the result
+		return $exists;
+	}
+
+//check to see if the process exists
+	$pid_exists = process_exists($pid_file);
+
+//prevent the process running more than once
+	if ($pid_exists) {
+		//echo "Cannot lock pid file {$pid_file}\n";
+		exit;
+	}
+
+//make sure the /var/run/fusionpbx directory exists
+	if (!file_exists('/var/run/fusionpbx')) {
+		$result = mkdir('/var/run/fusionpbx', 0777, true);
+		if (!$result) {
+			die('Failed to create /var/run/fusionpbx');
+		}
+	}
+
+//create the process id file if the process doesn't exist
+	if (!$pid_exists) {
+		//remove the old pid file
+		if (file_exists($file)) {
+			unlink($pid_file);
+		}
+
+		//show the details to the user
+		//echo "The process id is ".getmypid()."\n";
+		//echo "pid_file: ".$pid_file."\n";
+
+		//save the pid file
+		file_put_contents($pid_file, getmypid());
+	}
+
+//sleep used for debugging
+	if (isset($sleep_seconds)) {
+		sleep($sleep_seconds);
+	}
+
+//prepare to save the output
+	if (isset($_GET['debug'])) {
+		//create the debug log
+		$fp = fopen(sys_get_temp_dir()."/fax_queue.log", "a");
+		
+		//prepare the output buffers
+		ob_end_clean();
+		ob_start();
+
+		//message divider for log file
+		echo "\n\n====================================================\n\n";
+	}
+
+//get the fax queue details to send
+	$sql = "select q.*, d.domain_name ";
+	$sql .= "from v_fax_queue as q, v_domains as d ";
+	$sql .= "where fax_queue_uuid = :fax_queue_uuid ";
+	$sql .= "and q.domain_uuid = d.domain_uuid ";
+	$parameters['fax_queue_uuid'] = $fax_queue_uuid;
+	$database = new database;
+	$row = $database->select($sql, $parameters, 'row');
+	if (is_array($row)) {
+		$fax_queue_uuid = $row['fax_queue_uuid'];
+		$domain_uuid = $row['domain_uuid'];
+		$domain_name = $row['domain_name'];
+		$fax_uuid = $row['fax_uuid'];
+		$origination_uuid = $row['origination_uuid'];
+		$hostname = $row["hostname"];
+		$fax_date = $row["fax_date"];
+		$fax_caller_id_name = $row["fax_caller_id_name"];
+		$fax_caller_id_number = $row["fax_caller_id_number"];
+		$fax_prefix = $row["fax_prefix"];
+		$fax_number = $row["fax_number"];
+		$fax_email_address = $row["fax_email_address"];
+		$fax_file = $row["fax_file"];
+		$fax_status = $row["fax_status"];
+		$fax_retry_count = $row["fax_retry_count"];
+		$fax_accountcode = $row["fax_accountcode"];
+		$fax_command = $row["fax_command"];
+	}
+	unset($parameters);
+
+//get the default settings
+	$sql = "select default_setting_uuid, default_setting_name, default_setting_category, default_setting_subcategory, default_setting_value ";
+	$sql .= "from v_default_settings ";
+	$sql .= "where default_setting_category in ('domain', 'fax', 'fax_queue') ";
+	$sql .= "and default_setting_enabled = 'true' ";
+	$parameters = null;
+	$database = new database;
+	$result = $database->select($sql, $parameters, 'all');
+	unset($sql, $parameters);
+	if (is_array($result) && sizeof($result) != 0) {
+		foreach ($result as $row) {
+			$name = $row['default_setting_name'];
+			$category = $row['default_setting_category'];
+			$subcategory = $row['default_setting_subcategory'];
+			if ($subcategory != '') {
+				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($result, $row);
+
+//get the domain settings
+	$sql = "select domain_setting_uuid, domain_setting_name, domain_setting_category, domain_setting_subcategory, domain_setting_value ";
+	$sql .= "from v_domain_settings ";
+	$sql .= "where domain_uuid = :domain_uuid ";
+	$sql .= "and domain_setting_category in ('domain', 'fax', 'fax_queue') ";
+	$sql .= "and domain_setting_enabled = 'true' ";
+	$parameters['domain_uuid'] = $domain_uuid;
+	$database = new database;
+	$result = $database->select($sql, $parameters, 'all');
+	unset($sql, $parameters);
+	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 ($subcategory != '') {
+				if ($name == "array") {
+					$_SESSION[$category][] = $row['domain_setting_value'];
+				}
+				else {
+					$_SESSION[$category][$name] = $row['domain_setting_value'];
+				}
+			}
+			else {
+				if ($name == "array") {
+					$_SESSION[$category][$subcategory][] = $row['domain_setting_value'];
+				}
+				else {
+					$_SESSION[$category][$subcategory]['uuid'] = $row['domain_setting_uuid'];
+					$_SESSION[$category][$subcategory][$name] = $row['domain_setting_value'];
+				}
+			}
+		}
+	}
+	unset($result, $parameters);
+
+//prepare the smtp from and from name variables
+	$email_from = $_SESSION['email']['smtp_from']['text'];
+	$email_from_name = $_SESSION['email']['smtp_from_name']['text'];
+	if (isset($_SESSION['fax']['smtp_from']['text']) && strlen($_SESSION['fax']['smtp_from']['text']) > 0) {
+		$email_from = $_SESSION['fax']['smtp_from']['text'];
+	}
+	if (isset($_SESSION['fax']['smtp_from_name']['text']) && strlen($_SESSION['fax']['smtp_from_name']['text']) > 0) {
+		$email_from_name = $_SESSION['fax']['smtp_from_name']['text'];
+	}
+
+//prepare the variables to send the fax
+	$email_from_address = (isset($_SESSION['fax']['smtp_from']['text'])) ? $_SESSION['fax']['smtp_from']['text'] : $_SESSION['email']['smtp_from']['text'];
+	$retry_limit = $_SESSION['fax_queue']['retry_limit']['numeric'];
+	//$retry_interval = $_SESSION['fax_queue']['retry_interval']['numeric'];
+
+//prepare the fax retry count
+	if (strlen($fax_retry_count) == 0) {
+		$fax_retry_count = 0;
+	}
+	elseif ($fax_status != 'busy') {
+		$fax_retry_count = $fax_retry_count + 1;
+	}
+
+//determine if the retry count exceed the limit
+	if ($fax_status != 'sent' && $fax_status != 'busy' && $fax_retry_count > $retry_limit) {
+		$fax_status = 'failed';
+	}
+
+//sending the fax
+	if ($fax_status == 'waiting' || $fax_status == 'trying' || $fax_status == 'busy') {
+
+		//create event socket handle
+			$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+			if (!$fp) {
+				echo "Could not connect to event socket.\n";
+				exit;	
+			}
+			else 
+
+		//check if the uuid exists if it does then end the script
+			if (trim(event_socket_request($fp, "api uuid_exists ".$origination_uuid)) == 'true') {
+				echo "FAX job in progress.\n";
+				exit;
+			}
+
+		//fax options
+			if ($fax_retry_count == 0) {
+				$fax_options = "fax_use_ecm=false,fax_enable_t38=true,fax_enable_t38_request=true,fax_disable_v17=default";
+			}
+			elseif ($fax_retry_count == 1) {
+				$fax_options = "fax_use_ecm=true,fax_enable_t38=true,fax_enable_t38_request=true,fax_disable_v17=false";
+			}
+			elseif ($fax_retry_count == 2) {
+				$fax_options = "fax_use_ecm=true,fax_enable_t38=false,fax_enable_t38_request=false,fax_disable_v17=false";
+			}
+			elseif ($fax_retry_count == 3) {
+				$fax_options = "fax_use_ecm=true,fax_enable_t38=true,fax_enable_t38_request=true,fax_disable_v17=true";
+			}
+			elseif ($fax_retry_count == 4) {
+				$fax_options = "fax_use_ecm=false,fax_enable_t38=false,fax_enable_t38_request=false,fax_disable_v17=false";
+			}
+
+		//define the fax file
+			$common_variables  = "for_fax=1,";
+			$common_variables .= "accountcode='"                  . $fax_accountcode         . "',";
+			$common_variables .= "sip_h_X-accountcode='"          . $fax_accountcode         . "',";
+			$common_variables .= "domain_uuid="                   . $domain_uuid             . "',";
+			$common_variables .= "domain_name="                   . $domain_name             . "',";
+			$common_variables .= "origination_caller_id_name='"   . $fax_caller_id_name      . "',";
+			$common_variables .= "origination_caller_id_number='" . $fax_caller_id_number    . "',";
+			$common_variables .= "fax_ident='"                    . $fax_caller_id_number    . "',";
+			$common_variables .= "fax_header='"                   . $fax_caller_id_name      . "',";
+			$common_variables .= "fax_file='"                     . $fax_file                . "',";
+
+		//extract fax_dtmf from the fax number
+			fax_split_dtmf($fax_number, $fax_dtmf);
+
+		//prepare the fax command
+			if (strlen($fax_toll_allow) > 0) {
+				$channel_variables["toll_allow"] = $fax_toll_allow;
+			}
+			$route_array = outbound_route_to_bridge($domain_uuid, $fax_prefix . $fax_number, $channel_variables);
+			if (count($route_array) == 0) {
+				//send the internal call to the registered extension
+				$fax_uri = "user/".$fax_number."@".$domain_name;
+				$fax_variables = "";
+			}
+			else {
+				//send the external call
+				$fax_uri = $route_array[0];
+				$fax_variables = "";
+				foreach($_SESSION['fax']['variable'] as $variable) {
+					$fax_variables .= $variable.",";
+				}
+			}
+
+		//set the fax file name without the extension
+			$fax_instance_id = pathinfo($fax_file, PATHINFO_FILENAME);
+
+		//set the origination uuid
+			$origination_uuid = uuid();
+
+		//build a list of fax variables
+			$dial_string = $common_variables;
+			$dial_string .= $fax_variables;
+			$dial_string .= $fax_options.",";
+			
+			$dial_string .= "origination_uuid="    . $origination_uuid. ",";
+			$dial_string .= "fax_uuid="            . $fax_uuid. ",";
+			$dial_string .= "fax_queue_uuid="      . $fax_queue_uuid. ",";
+			$dial_string .= "mailto_address='"     . $fax_email_address   . "',";
+			$dial_string .= "mailfrom_address='"   . $email_from_address . "',";
+			$dial_string .= "fax_uri="             . $fax_uri  . ",";
+			$dial_string .= "fax_retry_attempts=1" . ",";
+			$dial_string .= "fax_retry_limit=1"    . ",";
+			//$dial_string .= "fax_retry_sleep=180"  . ",";
+			$dial_string .= "fax_verbose=true"     . ",";
+			//$dial_string .= "fax_use_ecm=off"      . ",";
+			$dial_string .= "api_hangup_hook='lua app/fax/resources/scripts/hangup_tx.lua'";
+			$fax_command  = "originate {" . $dial_string . "}" . $fax_uri." &txfax('".$fax_file."')";
+			//echo $fax_command."\n";
+
+		//connect to event socket and send the command
+			if ($fax_status != 'failed' && file_exists($fax_file)) {
+				if ($fp) {
+					$response = event_socket_request($fp, "api " . $fax_command);
+					//$response = event_socket_request($fp, $fax_command);
+					$response = str_replace("\n", "", $response);
+					$uuid = str_replace("+OK ", "", $response);
+					echo "uuid ".$uuid."\n";
+				}
+				fclose($fp);
+			}
+			else {
+				echo "fax file missing: ".$fax_file."\n";
+			}
+
+		//set the fax status
+			$fax_status = 'trying';
+
+		//update the database to say status to trying and set the command
+			$array['fax_queue'][0]['fax_queue_uuid'] = $fax_queue_uuid;
+			$array['fax_queue'][0]['domain_uuid'] = $domain_uuid;
+			$array['fax_queue'][0]['origination_uuid'] = $origination_uuid;
+			$array['fax_queue'][0]['fax_status'] = $fax_status;
+			$array['fax_queue'][0]['fax_retry_count'] = $fax_retry_count;
+			$array['fax_queue'][0]['fax_retry_date'] = 'now()';
+			$array['fax_queue'][0]['fax_command'] = $fax_command;
+
+		//add temporary permissions
+			$p = new permissions;
+			$p->add('fax_queue_edit', 'temp');
+
+		//save the data
+			$database = new database;
+			$database->app_name = 'fax queue';
+			$database->app_uuid = '3656287f-4b22-4cf1-91f6-00386bf488f4';
+			$database->save($array, false);
+			unset($array);
+
+		//remove temporary permissions
+			$p->delete('fax_queue_edit', 'temp');
+
+	}
+
+//send the email
+	if (in_array($fax_status, array('sent', 'failed')) && strlen($fax_email_address) > 0 && file_exists($fax_file)) {
+
+		//get the language code
+			$language_code = $_SESSION['domain']['language']['code'];
+
+		//get the template subcategory
+			if (isset($fax_relay) && $fax_relay == 'true') {
+				$template_subcategory = 'relay';
+			}
+			else {
+				$template_subcategory = 'inbound';
+			}
+
+		//get the email template from the database
+			if (isset($fax_email_address) && strlen($fax_email_address) > 0) {
+				$sql = "select template_subcategory, template_subject, template_body from v_email_templates ";
+				$sql .= "where (domain_uuid = :domain_uuid or domain_uuid is null) ";
+				$sql .= "and template_language = :template_language ";
+				$sql .= "and template_category = :template_category ";
+				$sql .= "and template_type = :template_type ";
+				$sql .= "and template_enabled = 'true' ";
+				$parameters['domain_uuid'] = $domain_uuid;
+				$parameters['template_language'] = $language_code;
+				$parameters['template_category'] = 'fax';
+				$parameters['template_type'] = 'html';
+				$database = new database;
+				$fax_templates = $database->select($sql, $parameters, 'all');
+				unset($sql, $parameters);
+			}
+
+		//determine the template category: fail_busy, fail_default, fail_invalid, inbound, relay, success_default
+			switch ($fax_status) {
+				case 'sent':
+					$template_subcategory = 'success_default';
+					break;
+				case 'failed':
+					$template_subcategory = 'fail_default';
+					break;
+				case 'busy':
+					$template_subcategory = 'fail_busy';
+					break;
+			}
+
+		//determine the email template to use
+			if (is_array($fax_templates)) {
+				foreach($fax_templates as $row) {
+					if ($row['template_subcategory'] == $template_subcategory) {
+						$email_subject = $row['template_subject'];
+						$email_body = $row['template_body'];
+					}
+				}
+			}
+
+		//get the fax file name (only) if a full path
+			$path_info = pathinfo($fax_file);
+			$fax_file_dirname = $path_info['dirname'];
+			$fax_file_basename = $path_info['basename'];
+			$fax_file_filename = $path_info['filename'];
+			$fax_file_extension = $path_info['extension'];
+
+		//set the fax file pdf and tif files
+			$fax_file_tif = path_join($fax_file_dirname, $fax_file_filename . $fax_file_extension);
+			$fax_file_pdf = path_join($fax_file_dirname, $fax_file_filename . 'pdf');
+			if (file_exists(path_join($fax_file_dirname, $fax_file_filename . 'pdf'))) {
+				$fax_file_name = $fax_file_filename . '.pdf';
+			}
+			else {
+				$fax_file_name = $fax_file_filename . '.' . $fax_file_extension;
+			}
+
+		//replace variables in email subject
+			$email_subject = str_replace('${domain_name}', $domain_uuid, $email_subject);
+			$email_subject = str_replace('${number_dialed}', $fax_number, $email_subject);
+			$email_subject = str_replace('${fax_file_name}', $fax_file_name, $email_subject);
+			$email_subject = str_replace('${fax_extension}', $fax_extension, $email_subject);
+			$email_subject = str_replace('${fax_messages}', $fax_messages, $email_subject);
+			$email_subject = str_replace('${fax_file_warning}', $fax_file_warning, $email_subject);
+			$email_subject = str_replace('${fax_subject_tag}', $fax_email_inbound_subject_tag, $email_subject);
+
+		//replace variables in email body
+			$email_body = str_replace('${domain_name}', $domain_uuid, $email_body);
+			$email_body = str_replace('${number_dialed}', $fax_number, $email_body);
+			$email_body = str_replace('${fax_file_name}', $fax_file_name, $email_body);
+			$email_body = str_replace('${fax_extension}', $fax_extension, $email_body);
+			$email_body = str_replace('${fax_messages}', $fax_messages, $email_body);
+			$email_body = str_replace('${fax_file_warning}', $fax_file_warning, $email_body);
+			$email_body = str_replace('${fax_subject_tag}', $fax_email_inbound_subject_tag, $email_body);
+
+		//send the email
+			if (isset($fax_email_address) && strlen($fax_email_address) > 0) {
+				//add the attachment
+				if (strlen($fax_file_name) > 0) {
+					$email_attachments[0]['type'] = 'file';
+					$email_attachments[0]['name'] = $fax_file_name;
+					$email_attachments[0]['value'] = path_join($fax_file_dirname, '.', $fax_file_name);
+				}
+
+				$fax_email_address = str_replace(",", ";", $fax_email_address);
+				$email_addresses = explode(";", $fax_email_address);
+				foreach($email_addresses as $email_address) {
+						//send the email
+						$email = new email;
+						$email->recipients = $email_address;
+						$email->subject = $email_subject;
+						$email->body = $email_body;
+						$email->from_address = $email_from_address;
+						$email->from_name = $email_from_name;
+						$email->attachments = $email_attachments;
+						$email->debug_level = 3;
+						$email_error = $mail->error;
+						//view_array($email);
+						$sent = $email->send();
+
+						//debug info
+						if (isset($_GET['debug'])) {
+							echo "template_subcategory: ".$template_subcategory."\n";
+							echo "email_adress: ".$email_address."\n";
+							echo "email_from: ".$email_from_name."\n";
+							echo "email_from_name: ".$email_from_address."\n";
+							echo "email_subject: ".$email_subject."\n";
+							//echo "email_body: ".$email_body."\n";
+							echo "email_error: ".$email_error."\n";
+							echo "\n";
+						}
+				}
+			}
+
+		//update the database to say status to trying and set the command
+			$array['fax_queue'][0]['fax_queue_uuid'] = $fax_queue_uuid;
+			$array['fax_queue'][0]['domain_uuid'] = $domain_uuid;
+			$array['fax_queue'][0]['fax_status'] = $fax_status;
+			$array['fax_queue'][0]['fax_notify_sent'] = true;
+			$array['fax_queue'][0]['fax_notify_date'] = 'now()';
+
+		//add temporary permissions
+			$p = new permissions;
+			$p->add('fax_queue_edit', 'temp');
+
+		//save the data
+			$database = new database;
+			$database->app_name = 'fax queue';
+			$database->app_uuid = '3656287f-4b22-4cf1-91f6-00386bf488f4';
+			$database->save($array, false);
+			unset($array);
+
+		//remove temporary permissions
+			$p->delete('fax_queue_edit', 'temp');
+
+		//send the email
+			//if ($sent) {
+			//	echo "Mailer Error";
+			//	$email_status=$mail;
+			//}
+			//else {
+			//	echo "Message sent!";
+			//	$email_status="ok";
+			//}
+	}
+
+//remove the old pid file
+	if (file_exists($pid_file)) {
+		unlink($pid_file);
+	}
+
+//wait for a few seconds
+	//sleep(1);
+
+//move the generated tif (and pdf) files to the sent directory
+	//if (file_exists($dir_fax_temp.'/'.$fax_instance_id.".tif")) {
+	//	copy($dir_fax_temp.'/'.$fax_instance_id.".tif", $dir_fax_sent.'/'.$fax_instance_id.".tif");
+	//}
+	//if (file_exists($dir_fax_temp.'/'.$fax_instance_id.".pdf")) {
+	//	copy($dir_fax_temp.'/'.$fax_instance_id.".pdf ", $dir_fax_sent.'/'.$fax_instance_id.".pdf");
+	//}
+
+//send context to the temp log
+	//echo "Subject: ".$email_subject."\n";
+	//echo "From: ".$email_from."\n";
+	//echo "Reply-to: ".$email_from."\n";
+	//echo "To: ".$email_to."\n";
+	//echo "Date: ".$email_date."\n";
+	//echo "Transcript: ".$array['message']."\n";
+	//echo "Body: ".$email_body."\n";
+
+//get and save the output from the buffer
+	if (isset($_GET['debug'])) {
+		$content = ob_get_contents(); //get the output from the buffer
+		$content = str_replace("<br />", "", $content);
+
+		ob_end_clean(); //clean the buffer
+
+		fwrite($fp, $content);
+		fclose($fp);
+	}
+
+?>
diff --git a/app/fax_queue/resources/service/debian.service b/app/fax_queue/resources/service/debian.service
new file mode 100644
index 0000000000..6cdcf0edd2
--- /dev/null
+++ b/app/fax_queue/resources/service/debian.service
@@ -0,0 +1,30 @@
+; Author: Mark J Crane <markjcrane@fusionpbx.com>
+; cp /var/www/fusionpbx/app/fax_queue/resources/service/debian.service /etc/systemd/system/fax_queue.service
+; systemctl enable fax_queue
+; systemctl start fax_queue
+; systemctl daemon-reload
+
+[Unit]
+Description=FusionPBX FAX Queue
+Wants=network-online.target
+Requires=network.target local-fs.target postgresql.service
+After=network.target network-online.target local-fs.target postgresql.service
+StartLimitIntervalSec=0
+
+[Service]
+Type=simple
+;Type=forking
+PIDFile=/var/run/fusionpbx/fax_queue.pid
+WorkingDirectory=/var/www/fusionpbx
+;Environment="USER=www-data"
+;Environment="GROUP=www-data"
+;EnvironmentFile=-/etc/default/fusionpbx
+ExecStartPre=/bin/mkdir -p /var/run/fusionpbx
+;ExecStartPre=/bin/chown -R ${USER}:${GROUP} /var/www/fusionpbx
+ExecStart=/usr/bin/php /var/www/fusionpbx/app/fax_queue/resources/service/fax_queue.php
+TimeoutSec=55s
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
+Also=
diff --git a/app/fax_queue/resources/service/fax_queue.php b/app/fax_queue/resources/service/fax_queue.php
new file mode 100644
index 0000000000..cee76f8dc2
--- /dev/null
+++ b/app/fax_queue/resources/service/fax_queue.php
@@ -0,0 +1,238 @@
+<?php
+
+//check the permission
+	if (defined('STDIN')) {
+		$document_root = str_replace("\\", "/", $_SERVER["PHP_SELF"]);
+		preg_match("/^(.*)\/app\/.*$/", $document_root, $matches);
+		$document_root = $matches[1];
+		set_include_path($document_root);
+		$_SERVER["DOCUMENT_ROOT"] = $document_root;
+		require_once "resources/require.php";
+		require_once "resources/pdo.php";
+	}
+	else {
+		exit;
+		include "root.php";
+		require_once "resources/require.php";
+		require_once "resources/pdo.php";
+	}
+
+//increase limits
+	set_time_limit(0);
+	ini_set('max_execution_time', 0);
+	ini_set('memory_limit', '512M');
+
+//save the arguments to variables
+	$script_name = $argv[0];
+	if (!empty($argv[1])) {
+		parse_str($argv[1], $_GET);
+	}
+	//print_r($_GET);
+
+//set the variables
+	if (isset($_GET['hostname'])) {
+		$hostname = urldecode($_GET['hostname']);
+	}
+	if (isset($_GET['debug'])) {
+		$debug = $_GET['debug'];
+	}
+	if (isset($_GET['sql'])) {
+		$debug_sql = $_GET['sql'];
+	}
+
+//includes
+	if (!defined('STDIN')) { include_once "root.php"; }
+	require_once "resources/require.php";
+	include "resources/classes/permissions.php";
+
+//define the process id file
+	$pid_file = "/var/run/fusionpbx/".basename( $argv[0], ".php") .".pid";
+	//echo "pid_file: ".$pid_file."\n";
+
+//function to check if the process exists
+	function process_exists($file = false) {
+
+		//set the default exists to false
+		$exists = false;
+
+		//check to see if the process is running
+		if (file_exists($file)) {
+			$pid = file_get_contents($file);
+			if (posix_getsid($pid) === false) { 
+				//process is not running
+				$exists = false;
+			}
+			else {
+				//process is running
+				$exists = true;
+			}
+		}
+
+		//return the result
+		return $exists;
+	}
+
+//check to see if the process exists
+	$pid_exists = process_exists($pid_file);
+
+//prevent the process running more than once
+	if ($pid_exists) {
+		echo "Cannot lock pid file {$pid_file}\n";
+		exit;
+	}
+
+//fax queue enabled
+	if ($_SESSION['fax_queue']['enabled']['boolean'] != 'true') {
+		echo "FAX Queue is disabled in Default Settings\n";
+		exit;
+	}
+
+//make sure the /var/run/fusionpbx directory exists
+    if (!file_exists('/var/run/fusionpbx')) {
+        $result = mkdir('/var/run/fusionpbx', 0777, true);
+        if (!$result) {
+            die('Failed to create /var/run/fusionpbx');
+        }
+    }
+
+//create the process id file if the process doesn't exist
+	if (!$pid_exists) {
+		//remove the old pid file
+		if (file_exists($file)) {
+			unlink($pid_file);
+		}
+
+		//show the details to the user
+		//echo "The process id is ".getmypid()."\n";
+		//echo "pid_file: ".$pid_file."\n";
+
+		//save the pid file
+		file_put_contents($pid_file, getmypid());
+	}
+
+//get the call center settings
+	$interval = $_SESSION['fax_queue']['interval']['numeric'];
+
+//set the defaults
+	if (!is_numeric($interval)) { $interval = 30; }
+
+//set the fax queue interval
+	if (isset($_SESSION['fax_queue']['interval']['numeric'])) {
+		$fax_queue_interval = $_SESSION['fax_queue']['interval']['numeric'];
+	}
+	else {
+		$fax_queue_interval = '30';
+	}
+
+//set the fax queue limit
+	if (isset($_SESSION['fax_queue']['limit']['numeric'])) {
+		$fax_queue_limit = $_SESSION['fax_queue']['limit']['numeric'];
+	}
+	else {
+		$fax_queue_limit = '30';
+	}
+	if (isset($_SESSION['fax_queue']['debug']['boolean'])) {
+		$debug = $_SESSION['fax_queue']['debug']['boolean'];
+	}
+
+//change the working directory
+	chdir($document_root);
+
+//get the messages waiting in the email queue
+	while (true) {
+
+		//get the fax messages that are waiting to send
+			$sql = "select * from v_fax_queue ";
+			$sql .= "where ";
+			$sql .= "( ";
+			$sql .= "	(fax_status = 'waiting' or fax_status = 'trying') ";
+			$sql .= "	and (fax_retry_date is null or floor(extract(epoch from now()) - extract(epoch from fax_retry_date)) > :interval) ";
+			$sql .= ")  ";
+			$sql .= "or ( ";
+			$sql .= "	fax_status = 'sent' ";
+			$sql .= "	and fax_email_address is not null ";
+			$sql .= "	and fax_notify_date is null ";
+			$sql .= ") ";
+			$sql .= "and hostname = :hostname ";
+			$sql .= "order by domain_uuid asc ";
+			$sql .= "limit :limit ";
+			if (isset($hostname)) {
+				$parameters['hostname'] = $hostname;
+			}
+			else {
+				$parameters['hostname'] = gethostname();
+			}
+			$parameters['limit'] = $fax_queue_limit;
+			$parameters['interval'] = $fax_queue_interval;
+			if (isset($debug_sql)) {
+				print_r($parameters);
+			}
+			$database = new database;
+			$fax_queue = $database->select($sql, $parameters, 'all');
+			unset($parameters);
+			
+		//show results from the database
+			if (isset($debug_sql)) {
+				echo $sql."\n";
+				print_r($parameters);
+			}
+
+		//process the messages
+			if (is_array($fax_queue) && @sizeof($fax_queue) != 0) {
+				foreach($fax_queue as $row) {
+					$command = exec('which php')." ".$document_root."/app/fax_queue/resources/job/fax_send.php ";
+					$command .= "'action=send&fax_queue_uuid=".$row["fax_queue_uuid"]."&hostname=".$hostname."'";
+					if (isset($debug)) {
+						//run process inline to see debug info
+						echo $command."\n";
+						$result = system($command);
+						echo $result."\n";
+					}
+					else {
+						//starts process rapidly doesn't wait for previous process to finish (used for production)
+						echo $command."\n";
+						$handle = popen($command." > /dev/null &", 'r'); 
+						echo "'$handle'; " . gettype($handle) . "\n";
+						$read = fread($handle, 2096);
+						echo $read;
+						pclose($handle);
+					}
+				}
+			}
+
+		//pause to prevent excessive database queries
+		sleep($interval);
+	}
+
+//remove the old pid file
+	if (file_exists($pid_file)) {
+		unlink($pid_file);
+	}
+
+//save output to
+	//$fp = fopen(sys_get_temp_dir()."/mailer-app.log", "a");
+
+//prepare the output buffers
+	//ob_end_clean();
+	//ob_start();
+
+//message divider for log file
+	//echo "\n\n=============================================================================================================================================\n\n";
+
+//get and save the output from the buffer
+	//$content = ob_get_contents(); //get the output from the buffer
+	//$content = str_replace("<br />", "", $content);
+
+	//ob_end_clean(); //clean the buffer
+
+	//fwrite($fp, $content);
+	//fclose($fp);
+
+//notes
+	//echo __line__."\n";
+	// if not keeping the email then need to delete it after the voicemail is emailed
+
+//how to use this feature
+	// cd /var/www/fusionpbx; /usr/bin/php /var/www/fusionpbx/app/fax_queue/resources/send.php
+
+?>
diff --git a/app/fax_queue/root.php b/app/fax_queue/root.php
new file mode 100644
index 0000000000..b35ebdf68d
--- /dev/null
+++ b/app/fax_queue/root.php
@@ -0,0 +1,66 @@
+<?php
+
+// 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/gateways/app_menu.php b/app/gateways/app_menu.php
index daf5c80081..d1b5ecf004 100644
--- a/app/gateways/app_menu.php
+++ b/app/gateways/app_menu.php
@@ -8,7 +8,7 @@
 	$apps[$x]['menu'][$y]['title']['de-de'] = "Gateways";
 	$apps[$x]['menu'][$y]['title']['es-cl'] = "Pasarelas";
 	$apps[$x]['menu'][$y]['title']['es-mx'] = "Pasarelas";
-	$apps[$x]['menu'][$y]['title']['fr-ca'] = "";
+	$apps[$x]['menu'][$y]['title']['fr-ca'] = "Passerelles";
 	$apps[$x]['menu'][$y]['title']['fr-fr'] = "Passerelles";
 	$apps[$x]['menu'][$y]['title']['he-il'] = "";
 	$apps[$x]['menu'][$y]['title']['it-it'] = "Gateways";
diff --git a/app/gateways/gateways.php b/app/gateways/gateways.php
index f4fe0392a8..bc2e74a3dc 100644
--- a/app/gateways/gateways.php
+++ b/app/gateways/gateways.php
@@ -186,13 +186,13 @@
 		echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add'],'id'=>'btn_add','link'=>'gateway_edit.php']);
 	}
 	if (permission_exists('gateway_add') && $gateways) {
-		echo button::create(['type'=>'button','label'=>$text['button-copy'],'icon'=>$_SESSION['theme']['button_icon_copy'],'name'=>'btn_copy','onclick'=>"modal_open('modal-copy','btn_copy');"]);
+		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('gateway_edit') && $gateways) {
-		echo button::create(['type'=>'button','label'=>$text['button-toggle'],'icon'=>$_SESSION['theme']['button_icon_toggle'],'name'=>'btn_toggle','onclick'=>"modal_open('modal-toggle','btn_toggle');"]);
+		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('gateway_delete') && $gateways) {
-		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 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('gateway_all')) {
@@ -203,9 +203,9 @@
 			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'=>'gateways.php','style'=>($search == '' ? 'display: none;' : null)]);
+	echo 		"<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown=''>";
+	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search']);
+	//echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'gateways.php','style'=>($search == '' ? 'display: none;' : null)]);
 	if ($paging_controls_mini != '') {
 		echo 	"<span style='margin-left: 15px;'>".$paging_controls_mini."</span>";
 	}
@@ -239,7 +239,7 @@
 	echo "<tr class='list-header'>\n";
 	if (permission_exists('gateway_add') || permission_exists('gateway_edit') || permission_exists('gateway_delete')) {
 		echo "	<th class='checkbox'>\n";
-		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle();' ".($gateways ?: "style='visibility: hidden;'").">\n";
+		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle(); checkbox_on_change(this);' ".($gateways ?: "style='visibility: hidden;'").">\n";
 		echo "	</th>\n";
 	}
 	if ($_GET['show'] == "all" && permission_exists('gateway_all')) {
@@ -271,7 +271,7 @@
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('gateway_add') || permission_exists('gateway_edit') || permission_exists('gateway_delete')) {
 				echo "	<td class='checkbox'>\n";
-				echo "		<input type='checkbox' name='gateways[$x][checked]' id='checkbox_".$x."' value='true' onclick=\"if (!this.checked) { document.getElementById('checkbox_all').checked = false; }\">\n";
+				echo "		<input type='checkbox' name='gateways[$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='gateways[$x][uuid]' value='".escape($row['gateway_uuid'])."' />\n";
 				echo "	</td>\n";
 			}
diff --git a/app/gateways/resources/classes/gateways.php b/app/gateways/resources/classes/gateways.php
index d0aec16895..0d125c0102 100644
--- a/app/gateways/resources/classes/gateways.php
+++ b/app/gateways/resources/classes/gateways.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-2022
  the Initial Developer. All Rights Reserved.
 
  Contributor(s):
@@ -98,9 +98,14 @@ if (!class_exists('gateways')) {
 						//get necessary gateway details
 							if (is_array($uuids) && @sizeof($uuids) != 0) {
 								$sql = "select ".$this->uuid_prefix."uuid as uuid, gateway, profile, enabled from v_".$this->table." ";
-								$sql .= "where (domain_uuid = :domain_uuid ".(permission_exists('gateway_domain') ? " or domain_uuid is null " : null).") ";
-								$sql .= "and ".$this->uuid_prefix."uuid in (".implode(', ', $uuids).") ";
-								$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+								if (permission_exists('gateway_all')) {
+									$sql .= "where ".$this->uuid_prefix."uuid in (".implode(', ', $uuids).") ";
+								}
+								else {
+									$sql .= "where (domain_uuid = :domain_uuid) ";
+									$sql .= "and ".$this->uuid_prefix."uuid in (".implode(', ', $uuids).") ";
+									$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+								}
 								$database = new database;
 								$rows = $database->select($sql, $parameters, 'all');
 								if (is_array($rows) && @sizeof($rows) != 0) {
@@ -172,9 +177,14 @@ if (!class_exists('gateways')) {
 						//get necessary gateway details
 							if (is_array($uuids) && @sizeof($uuids) != 0) {
 								$sql = "select ".$this->uuid_prefix."uuid as uuid, gateway, profile, enabled from v_".$this->table." ";
-								$sql .= "where (domain_uuid = :domain_uuid ".(permission_exists('gateway_domain') ? " or domain_uuid is null " : null).") ";
-								$sql .= "and ".$this->uuid_prefix."uuid in (".implode(', ', $uuids).") ";
-								$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+								if (permission_exists('gateway_all')) {
+									$sql .= "where ".$this->uuid_prefix."uuid in (".implode(', ', $uuids).") ";
+								}
+								else {
+									$sql .= "where (domain_uuid = :domain_uuid) ";
+									$sql .= "and ".$this->uuid_prefix."uuid in (".implode(', ', $uuids).") ";
+									$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+								}
 								$database = new database;
 								$rows = $database->select($sql, $parameters, 'all');
 								if (is_array($rows) && @sizeof($rows) != 0) {
@@ -246,9 +256,14 @@ if (!class_exists('gateways')) {
 						//get necessary gateway details
 							if (is_array($uuids) && @sizeof($uuids) != 0) {
 								$sql = "select ".$this->uuid_prefix."uuid as uuid, gateway, profile from v_".$this->table." ";
-								$sql .= "where (domain_uuid = :domain_uuid ".(permission_exists('gateway_domain') ? " or domain_uuid is null " : null).") ";
-								$sql .= "and ".$this->uuid_prefix."uuid in (".implode(', ', $uuids).") ";
-								$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+								if (permission_exists('gateway_all')) {
+									$sql .= "where ".$this->uuid_prefix."uuid in (".implode(', ', $uuids).") ";
+								}
+								else {
+									$sql .= "where (domain_uuid = :domain_uuid) ";
+									$sql .= "and ".$this->uuid_prefix."uuid in (".implode(', ', $uuids).") ";
+									$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+								}
 								$database = new database;
 								$rows = $database->select($sql, $parameters, 'all');
 								if (is_array($rows) && @sizeof($rows) != 0) {
@@ -379,9 +394,14 @@ if (!class_exists('gateways')) {
 							}
 							if (is_array($uuids) && @sizeof($uuids) != 0) {
 								$sql = "select ".$this->uuid_prefix."uuid as uuid, ".$this->toggle_field." as state, gateway, profile from v_".$this->table." ";
-								$sql .= "where (domain_uuid = :domain_uuid ".(permission_exists('gateway_domain') ? " or domain_uuid is null " : null).") ";
-								$sql .= "and ".$this->uuid_prefix."uuid in (".implode(', ', $uuids).") ";
-								$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+								if (permission_exists('gateway_all')) {
+									$sql .= "where ".$this->uuid_prefix."uuid in (".implode(', ', $uuids).") ";
+								}
+								else {
+									$sql .= "where (domain_uuid = :domain_uuid) ";
+									$sql .= "and ".$this->uuid_prefix."uuid in (".implode(', ', $uuids).") ";
+									$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+								}
 								$database = new database;
 								$rows = $database->select($sql, $parameters, 'all');
 								if (is_array($rows) && @sizeof($rows) != 0) {
@@ -507,9 +527,14 @@ if (!class_exists('gateways')) {
 						//create insert array from existing data
 							if (is_array($uuids) && @sizeof($uuids) != 0) {
 								$sql = "select * from v_".$this->table." ";
-								$sql .= "where (domain_uuid = :domain_uuid ".(permission_exists('gateway_domain') ? " or domain_uuid is null " : null).") ";
-								$sql .= "and ".$this->uuid_prefix."uuid in (".implode(', ', $uuids).") ";
-								$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+								if (permission_exists('gateway_all')) {
+									$sql .= "where ".$this->uuid_prefix."uuid in (".implode(', ', $uuids).") ";
+								}
+								else {
+									$sql .= "where (domain_uuid = :domain_uuid) ";
+									$sql .= "and ".$this->uuid_prefix."uuid in (".implode(', ', $uuids).") ";
+									$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+								}
 								$database = new database;
 								$rows = $database->select($sql, $parameters, 'all');
 								if (is_array($rows) && @sizeof($rows) != 0) {
diff --git a/app/grandstream/app_config.php b/app/grandstream/app_config.php
index c5e2f2a60c..c84e8edfb4 100644
--- a/app/grandstream/app_config.php
+++ b/app/grandstream/app_config.php
@@ -234,7 +234,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_phonebook_xml_server_path";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "mydomain.com/app/provision/pb/";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "mydomain.com/app/provision/";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Grandstream Phonebook Server Path - NOTE template adds MAC on the end of this if contact_grandstream is enabled.  This also requires nginx rewrite rules for phonebook.xml";
 		$y++;
@@ -798,5 +798,13 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Disable Active MPK Page. 0 - No, 1 - Yes. Default is 0";
 		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "f4a764b1-7c31-406c-ba81-4fe3328450f6";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_long_label";
+		$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 Long Label. 0 - No, 1 - Yes. Default is 0";
+		$y++;
 
 ?>
diff --git a/app/gswave/app_languages.php b/app/gswave/app_languages.php
index 1efa8603eb..aa882038c8 100644
--- a/app/gswave/app_languages.php
+++ b/app/gswave/app_languages.php
@@ -34,7 +34,7 @@ $text['title_description-gswave']['fr-fr'] = "Grandstream Wave est un logiciel d
 $text['title_description-gswave']['he-il'] = "";
 $text['title_description-gswave']['it-it'] = "";
 $text['title_description-gswave']['nl-nl'] = "Grandstream Wave is een software telefoon voor 'smart-phones' en 'tablets'. Het kan eenvoudig d.m.v. een QR code voorzien worden van configuratie. Installeer Granstream Wave op je apparaat start de applicatie en ga naar ' Account Settings' en druk op + om een nieuwaccount toe te voegen. Druk op 'UCM account' (Scan QR Code) and kies het toestelnummer en scan de QR code met het apparaat.";
-$text['title_description-gswave']['pl-pl'] = "";
+$text['title_description-gswave']['pl-pl'] = "Grandstream Wave to telefon programowy dla smartfonów lub tabletów. Można go łatwo skonfigurować za pomocą dostarczonego tutaj kodu QR. Aby z niego skorzystać, pobierz i zainstaluj Grandstream Wave na swoim urządzeniu. Uruchom aplikację, a następnie przejdź do Ustawień konta naciśnij +, aby dodać nowe konto. Naciśnij Konto UCM (Skanuj kod QR), a następnie wybierz rozszerzenie i zeskanuj kod QR.";
 $text['title_description-gswave']['pt-br'] = "";
 $text['title_description-gswave']['pt-pt'] = "";
 $text['title_description-gswave']['ro-ro'] = "";
diff --git a/app/ivr_menus/app_config.php b/app/ivr_menus/app_config.php
index 7821d40b3a..50834351de 100644
--- a/app/ivr_menus/app_config.php
+++ b/app/ivr_menus/app_config.php
@@ -63,7 +63,7 @@
 		$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_value']['ivr'] = "\${destination}:";
 		$apps[$x]['destinations'][$y]['select_label'] = "\${name}";
 		$z=0;
 		$apps[$x]['destinations'][$y]['result']['data'][$z]['name'] = 'top';
@@ -95,6 +95,9 @@
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "ivr_menu_all";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "ivr_menu_option_view";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
diff --git a/app/ivr_menus/app_defaults.php b/app/ivr_menus/app_defaults.php
index 4075d60551..2438c76cb7 100644
--- a/app/ivr_menus/app_defaults.php
+++ b/app/ivr_menus/app_defaults.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) 2019
+	Portions created by the Initial Developer are Copyright (C) 2019 - 2021
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -59,7 +59,7 @@ if ($domains_processed == 1) {
 			$database = new database;
 			$database->app_name = 'ivr_menus';
 			$database->app_uuid = 'a5788e9b-58bc-bd1b-df59-fff5d51253ab';
-			$database->save($array);
+			$database->save($array, false);
 			unset($array);
 	
 			$p->delete('ivr_menu_edit', 'temp');
diff --git a/app/ivr_menus/ivr_menus.php b/app/ivr_menus/ivr_menus.php
index 76a8ffd196..6900beed81 100644
--- a/app/ivr_menus/ivr_menus.php
+++ b/app/ivr_menus/ivr_menus.php
@@ -96,8 +96,11 @@
 
 //prepare to page the results
 	$sql = "select count(*) from v_ivr_menus ";
-	$sql .= "where domain_uuid = :domain_uuid ";
-	$parameters['domain_uuid'] = $_SESSION["domain_uuid"];
+	$sql .= "where true ";
+	if ($_GET['show'] != "all" || !permission_exists('ivr_menu_all')) {
+		$sql .= "and (domain_uuid = :domain_uuid or domain_uuid is null) ";
+		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+	}
 	$database = new database;
 	$total_ivr_menus = $database->select($sql, $parameters, 'column');
 	$num_rows = $total_ivr_menus;
@@ -111,7 +114,10 @@
 
 //prepare to page the results
 	$rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50;
-	$param = "&search=".$search;
+	$param = "&search=".urlencode($search);
+	if ($_GET['show'] == "all" && permission_exists('ivr_menu_all')) {
+		$param .= "&show=all";
+	}
 	$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);
@@ -141,18 +147,26 @@
 		echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add'],'id'=>'btn_add','link'=>'ivr_menu_edit.php']);
 	}
 	if (permission_exists('ivr_menu_add') && $ivr_menus && (!is_numeric($_SESSION['limit']['ivr_menus']['numeric']) || $total_ivr_menus < $_SESSION['limit']['ivr_menus']['numeric'])) {
-		echo button::create(['type'=>'button','label'=>$text['button-copy'],'icon'=>$_SESSION['theme']['button_icon_copy'],'name'=>'btn_copy','onclick'=>"modal_open('modal-copy','btn_copy');"]);
+		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('ivr_menu_edit') && $ivr_menus) {
-		echo button::create(['type'=>'button','label'=>$text['button-toggle'],'icon'=>$_SESSION['theme']['button_icon_toggle'],'name'=>'btn_toggle','onclick'=>"modal_open('modal-toggle','btn_toggle');"]);
+		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('ivr_menu_delete') && $ivr_menus) {
-		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 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";
-	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'=>'ivr_menus.php','style'=>($search == '' ? 'display: none;' : null)]);
+	if (permission_exists('ivr_menu_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=&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=''>";
+	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search']);
+	//echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'ivr_menus.php','style'=>($search == '' ? 'display: none;' : null)]);
 	if ($paging_controls_mini != '') {
 		echo 	"<span style='margin-left: 15px;'>".$paging_controls_mini."</span>";
 	}
@@ -182,9 +196,12 @@
 	echo "<tr class='list-header'>\n";
 	if (permission_exists('ivr_menu_add') || permission_exists('ivr_menu_edit') || permission_exists('ivr_menu_delete')) {
 		echo "	<th class='checkbox'>\n";
-		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle();' ".($ivr_menus ?: "style='visibility: hidden;'").">\n";
+		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle(); checkbox_on_change(this);' ".($ivr_menus ?: "style='visibility: hidden;'").">\n";
 		echo "	</th>\n";
 	}
+	if ($_GET['show'] == "all" && permission_exists('ivr_menu_all')) {
+		echo th_order_by('domain_name', $text['label-domain'], $order_by, $order, $param, "class='shrink'");
+	}
 	echo th_order_by('ivr_menu_name', $text['label-name'], $order_by, $order);
 	echo th_order_by('ivr_menu_extension', $text['label-extension'], $order_by, $order);
 	echo th_order_by('ivr_menu_enabled', $text['label-enabled'], $order_by, $order, null, "class='center'");
@@ -203,10 +220,19 @@
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('ivr_menu_add') || permission_exists('ivr_menu_edit') || permission_exists('ivr_menu_delete')) {
 				echo "	<td class='checkbox'>\n";
-				echo "		<input type='checkbox' name='ivr_menus[$x][checked]' id='checkbox_".$x."' value='true' onclick=\"if (!this.checked) { document.getElementById('checkbox_all').checked = false; }\">\n";
+				echo "		<input type='checkbox' name='ivr_menus[$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='ivr_menus[$x][uuid]' value='".escape($row['ivr_menu_uuid'])."' />\n";
 				echo "	</td>\n";
 			}
+			if ($_GET['show'] == "all" && permission_exists('ivr_menu_all')) {
+				if (strlen($_SESSION['domains'][$row['domain_uuid']]['domain_name']) > 0) {
+					$domain = $_SESSION['domains'][$row['domain_uuid']]['domain_name'];
+				}
+				else {
+					$domain = $text['label-global'];
+				}
+				echo "	<td>".escape($domain)."</td>\n";
+			}
 			echo "	<td>";
 			if (permission_exists('ivr_menu_edit')) {
 				echo "<a href='".$list_row_url."' title=\"".$text['button-edit']."\">".escape($row['ivr_menu_name'])."</a>";
@@ -248,4 +274,4 @@
 //include the footer
 	require_once "resources/footer.php";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/log_viewer/app_languages.php b/app/log_viewer/app_languages.php
index 9700f8c408..b92f33b2df 100644
--- a/app/log_viewer/app_languages.php
+++ b/app/log_viewer/app_languages.php
@@ -14,7 +14,7 @@ $text['title-log_viewer']['fr-fr'] = "Afficher les Logs";
 $text['title-log_viewer']['he-il'] = "";
 $text['title-log_viewer']['it-it'] = "Log Viewer";
 $text['title-log_viewer']['nl-nl'] = "Bekijk logs";
-$text['title-log_viewer']['pl-pl'] = "Podgląd logów freeswitcha";
+$text['title-log_viewer']['pl-pl'] = "Podgląd logów";
 $text['title-log_viewer']['pt-br'] = "Visualizar os logs";
 $text['title-log_viewer']['pt-pt'] = "Visualização de Logs";
 $text['title-log_viewer']['ro-ro'] = "";
@@ -160,7 +160,7 @@ $text['label-log_file']['fr-fr'] = "Log file";
 $text['label-log_file']['he-il'] = "Log file";
 $text['label-log_file']['it-it'] = "Log file";
 $text['label-log_file']['nl-nl'] = "Log file";
-$text['label-log_file']['pl-pl'] = "Log file";
+$text['label-log_file']['pl-pl'] = "Plik logów";
 $text['label-log_file']['pt-br'] = "Log file";
 $text['label-log_file']['pt-pt'] = "Log file";
 $text['label-log_file']['ro-ro'] = "Log file";
@@ -286,7 +286,7 @@ $text['label-display']['fr-fr'] = "Display";
 $text['label-display']['he-il'] = "Display";
 $text['label-display']['it-it'] = "Display";
 $text['label-display']['nl-nl'] = "Display";
-$text['label-display']['pl-pl'] = "Display";
+$text['label-display']['pl-pl'] = "Wyświetl";
 $text['label-display']['pt-br'] = "Display";
 $text['label-display']['pt-pt'] = "Display";
 $text['label-display']['ro-ro'] = "Display";
diff --git a/app/modules/app_defaults.php b/app/modules/app_defaults.php
index 7c4f6ce271..b189d7755d 100644
--- a/app/modules/app_defaults.php
+++ b/app/modules/app_defaults.php
@@ -53,7 +53,7 @@
 					$database = new database;
 					$database->app_name = 'modules';
 					$database->app_uuid = '5eb9cba1-8cb6-5d21-e36a-775475f16b5e';
-					$database->save($array);
+					$database->save($array, false);
 					unset($array);
 				}
 			}
@@ -69,4 +69,4 @@
 			}
 	}
 
-?>
\ No newline at end of file
+?>
diff --git a/app/modules/modules.php b/app/modules/modules.php
index 8e2c03769a..5d9bf0de2a 100644
--- a/app/modules/modules.php
+++ b/app/modules/modules.php
@@ -131,10 +131,10 @@
 		echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add'],'id'=>'btn_add','link'=>'module_edit.php']);
 	}
 	if (permission_exists('module_edit') && $modules) {
-		echo button::create(['type'=>'button','label'=>$text['button-toggle'],'icon'=>$_SESSION['theme']['button_icon_toggle'],'name'=>'btn_toggle','onclick'=>"modal_open('modal-toggle','btn_toggle');"]);
+		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('module_delete') && $modules) {
-		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 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 "	</div>\n";
 	echo "	<div style='clear: both;'></div>\n";
@@ -169,7 +169,7 @@
 		echo "<tr class='list-header'>\n";
 		if (permission_exists('module_edit') || permission_exists('module_delete')) {
 			echo "	<th class='checkbox'>\n";
-			echo "		<input type='checkbox' id='checkbox_all_".$modifier."' name='checkbox_all' onclick=\"list_all_toggle('".$modifier."');\" ".($modules ?: "style='visibility: hidden;'").">\n";
+			echo "		<input type='checkbox' id='checkbox_all_".$modifier."' name='checkbox_all' onclick=\"list_all_toggle('".$modifier."'); checkbox_on_change(this);\" ".($modules ?: "style='visibility: hidden;'").">\n";
 			echo "	</th>\n";
 		}
 		echo "<th>".$text['label-label']."</th>\n";
@@ -206,7 +206,7 @@
 				$modifier = str_replace('  ', ' ', $modifier);
 				$modifier = str_replace(' ', '_', $modifier);
 				echo "	<td class='checkbox'>\n";
-				echo "		<input type='checkbox' name='modules[$x][checked]' id='checkbox_".$x."' class='checkbox_".$modifier."' value='true' onclick=\"if (!this.checked) { document.getElementById('checkbox_all_".$modifier."').checked = false; }\">\n";
+				echo "		<input type='checkbox' name='modules[$x][checked]' id='checkbox_".$x."' class='checkbox_".$modifier."' value='true' onclick=\"checkbox_on_change(this); if (!this.checked) { document.getElementById('checkbox_all_".$modifier."').checked = false; }\">\n";
 				echo "		<input type='hidden' name='modules[$x][uuid]' value='".escape($row['module_uuid'])."' />\n";
 				echo "	</td>\n";
 			}
@@ -275,4 +275,4 @@
 //include the footer
 	require_once "resources/footer.php";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/music_on_hold/app_config.php b/app/music_on_hold/app_config.php
index de7f4489c9..7b2f9a05e6 100644
--- a/app/music_on_hold/app_config.php
+++ b/app/music_on_hold/app_config.php
@@ -44,6 +44,9 @@
 		$apps[$x]['permissions'][$y]['name'] = "music_on_hold_delete";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "music_on_hold_all";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "music_on_hold_name";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
diff --git a/app/music_on_hold/app_defaults.php b/app/music_on_hold/app_defaults.php
index d1b9ba2cad..816c54ff5a 100644
--- a/app/music_on_hold/app_defaults.php
+++ b/app/music_on_hold/app_defaults.php
@@ -100,7 +100,7 @@ if ($domains_processed == 1) {
 							$database = new database;
 							$database->app_name = 'app_name';
 							$database->app_uuid = 'app_uuid';
-							$database->save($array);
+							$database->save($array, false);
 							unset($array);
 
 							$p->add('music_on_hold_delete', 'temp');
diff --git a/app/music_on_hold/app_languages.php b/app/music_on_hold/app_languages.php
index 6ea9d8f2cc..176eb78307 100644
--- a/app/music_on_hold/app_languages.php
+++ b/app/music_on_hold/app_languages.php
@@ -140,7 +140,7 @@ $text['message-upload_completed']['fr-fr'] = "Fichier reçu";
 $text['message-upload_completed']['he-il'] = "העדכון הושלם בהצלחה";
 $text['message-upload_completed']['it-it'] = "Caricamento Completato";
 $text['message-upload_completed']['nl-nl'] = "Opsturen gereed";
-$text['message-upload_completed']['pl-pl'] = "Prześlij Zakończony";
+$text['message-upload_completed']['pl-pl'] = "Wysłano pomyślnie";
 $text['message-upload_completed']['pt-br'] = "Carregar Concluído"; //copied from pt-pt
 $text['message-upload_completed']['pt-pt'] = "Carregar Concluído";
 $text['message-upload_completed']['ro-ro'] = "";
diff --git a/app/music_on_hold/music_on_hold.php b/app/music_on_hold/music_on_hold.php
index c377e41046..e6e22c4874 100644
--- a/app/music_on_hold/music_on_hold.php
+++ b/app/music_on_hold/music_on_hold.php
@@ -45,14 +45,15 @@
 
 //get the music_on_hold array
 	$sql = "select * from v_music_on_hold ";
-	$sql .= "where ( ";
-	$sql .= "domain_uuid = :domain_uuid ";
+	$sql .= "where true ";
+	if ($_GET['show'] != "all" || !permission_exists('music_on_hold_all')) {
+		$sql .= "and (domain_uuid = :domain_uuid or domain_uuid is null) ";
+		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+	}
 	if (permission_exists('music_on_hold_domain')) {
 		$sql .= "or domain_uuid is null ";
 	}
-	$sql .= ") ";
 	$sql .= "order by domain_uuid desc, music_on_hold_name asc, music_on_hold_rate asc";
-	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 	$database = new database;
 	$streams = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
@@ -275,7 +276,7 @@
 
 				//check target folder, move uploaded file
 					if (!is_dir($stream_path)) {
-						event_socket_mkdir($stream_path);
+						mkdir($stream_path, 0770, true);
 					}
 					if (is_dir($stream_path)) {
 						if (copy($stream_file_name_temp, $stream_path.'/'.$stream_file_name)) {
@@ -423,8 +424,16 @@
 		echo 	"</span>\n";
 		echo 	"</form>";
 	}
+	if (permission_exists('music_on_hold_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=&show=all'.($search != '' ? "&search=".urlencode($search) : null)]);
+		}
+	}
 	if (permission_exists('music_on_hold_delete') && $streams) {
-		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 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 "	</div>\n";
 	echo "	<div style='clear: both;'></div>\n";
@@ -510,10 +519,13 @@
 					echo "	<tr class='list-header'>\n";
 					if (permission_exists('music_on_hold_delete')) {
 						echo "	<th class='checkbox'>\n";
-						echo "		<input type='checkbox' id='checkbox_all_".$row['music_on_hold_uuid']."' name='checkbox_all' onclick=\"list_all_toggle('".$row['music_on_hold_uuid']."'); document.getElementById('checkbox_all_".$row['music_on_hold_uuid']."_hidden').value = this.checked ? 'true' : '';\">\n";
+						echo "		<input type='checkbox' id='checkbox_all_".$row['music_on_hold_uuid']."' name='checkbox_all' onclick=\"list_all_toggle('".$row['music_on_hold_uuid']."'); document.getElementById('checkbox_all_".$row['music_on_hold_uuid']."_hidden').value = this.checked ? 'true' : ''; checkbox_on_change(this);\">\n";
 						echo "		<input type='hidden' id='checkbox_all_".$row['music_on_hold_uuid']."_hidden' name='moh[".$row['music_on_hold_uuid']."][checked]'>\n";
 						echo "	</th>\n";
 					}
+					if ($_GET['show'] == "all" && permission_exists('music_on_hold_all')) {
+						echo th_order_by('domain_name', $text['label-domain'], $order_by, $order, $param, "class='shrink'");
+					}
 					echo "		<th class='pct-50'>".$stream_details."</th>\n";
 					echo "		<th class='center shrink'>".$text['label-tools']."</th>\n";
 					echo "		<th class='right hide-xs no-wrap pct-20'>".$text['label-file-size']."</th>\n";
@@ -541,10 +553,19 @@
 							echo "<tr class='list-row' href=\"".$list_row_link."\">\n";
 							if (permission_exists('music_on_hold_delete')) {
 								echo "	<td class='checkbox'>\n";
-								echo "		<input type='checkbox' name='moh[".$row['music_on_hold_uuid']."][$x][checked]' id='checkbox_".$x."' class='checkbox_".$row['music_on_hold_uuid']."' value='true' onclick=\"if (!this.checked) { document.getElementById('checkbox_all_".$row['music_on_hold_uuid']."').checked = false; }\">\n";
+								echo "		<input type='checkbox' name='moh[".$row['music_on_hold_uuid']."][$x][checked]' id='checkbox_".$x."' class='checkbox_".$row['music_on_hold_uuid']."' value='true' onclick=\"checkbox_on_change(this); if (!this.checked) { document.getElementById('checkbox_all_".$row['music_on_hold_uuid']."').checked = false; }\">\n";
 								echo "		<input type='hidden' name='moh[".$row['music_on_hold_uuid']."][$x][file_name]' value=\"".escape($stream_file)."\" />\n";
 								echo "	</td>\n";
 							}
+							if ($_GET['show'] == "all" && permission_exists('music_on_hold_all')) {
+								if (strlen($_SESSION['domains'][$row['domain_uuid']]['domain_name']) > 0) {
+									$domain = $_SESSION['domains'][$row['domain_uuid']]['domain_name'];
+								}
+								else {
+									$domain = $text['label-global'];
+								}
+								echo "	<td>".escape($domain)."</td>\n";
+							}
 							echo "	<td class='overflow'>".escape($stream_file)."</td>\n";
 							echo "	<td class='button center no-link no-wrap'>";
 							echo 		"<audio id='recording_audio_".$row_uuid."' style='display: none;' preload='none' ontimeupdate=\"update_progress('".$row_uuid."')\" onended=\"recording_reset('".$row_uuid."');\" src='music_on_hold.php?action=download&id=".escape($row['music_on_hold_uuid'])."&file=".urlencode($stream_file)."' type='".$stream_file_type."'></audio>";
@@ -666,4 +687,4 @@
 		fclose($fp);
 	}
 
-?>
\ No newline at end of file
+?>
diff --git a/app/number_translations/app_languages.php b/app/number_translations/app_languages.php
index 1da12978d2..73e877f779 100644
--- a/app/number_translations/app_languages.php
+++ b/app/number_translations/app_languages.php
@@ -14,7 +14,7 @@ $text['title-number_translations']['fr-fr'] = 'Traductions de nombre';
 $text['title-number_translations']['he-il'] = '';
 $text['title-number_translations']['it-it'] = '';
 $text['title-number_translations']['nl-nl'] = 'Nummer vertalingen';
-$text['title-number_translations']['pl-pl'] = '';
+$text['title-number_translations']['pl-pl'] = 'Translacje numerów';
 $text['title-number_translations']['pt-br'] = '';
 $text['title-number_translations']['pt-pt'] = '';
 $text['title-number_translations']['ro-ro'] = '';
@@ -35,7 +35,7 @@ $text['title-number_translation']['fr-fr'] = 'Traduction de nombre';
 $text['title-number_translation']['he-il'] = '';
 $text['title-number_translation']['it-it'] = '';
 $text['title-number_translation']['nl-nl'] = 'Nummer vertaling';
-$text['title-number_translation']['pl-pl'] = '';
+$text['title-number_translation']['pl-pl'] = 'Translacja numeru';
 $text['title-number_translation']['pt-br'] = '';
 $text['title-number_translation']['pt-pt'] = '';
 $text['title-number_translation']['ro-ro'] = '';
@@ -56,7 +56,7 @@ $text['title_description-number_translations']['fr-fr'] = "Utilisez ceci pour tr
 $text['title_description-number_translations']['he-il'] = '';
 $text['title_description-number_translations']['it-it'] = '';
 $text['title_description-number_translations']['nl-nl'] = 'Gebruik dit om nummers van het orginele nummer naar een nieuw nummer om te zetten m.b.v. reguliere uitdrukkingen.';
-$text['title_description-number_translations']['pl-pl'] = '';
+$text['title_description-number_translations']['pl-pl'] = 'Służy do konwersji liczb z jednego rodzaju na inny za pomocą wyrażeń regularnych';
 $text['title_description-number_translations']['pt-br'] = '';
 $text['title_description-number_translations']['pt-pt'] = '';
 $text['title_description-number_translations']['ro-ro'] = '';
@@ -98,7 +98,7 @@ $text['description-number_translation_detail_regex']['fr-fr'] = "Entrez l'expres
 $text['description-number_translation_detail_regex']['he-il'] = '';
 $text['description-number_translation_detail_regex']['it-it'] = '';
 $text['description-number_translation_detail_regex']['nl-nl'] = 'Voer de reguliere uitdrukking die het nummer dat vervangen moet worden selecteerd';
-$text['description-number_translation_detail_regex']['pl-pl'] = '';
+$text['description-number_translation_detail_regex']['pl-pl'] = 'Podaj wyrażenie regularne do konwersji liczby';
 $text['description-number_translation_detail_regex']['pt-br'] = '';
 $text['description-number_translation_detail_regex']['pt-pt'] = '';
 $text['description-number_translation_detail_regex']['ro-ro'] = '';
@@ -119,7 +119,7 @@ $text['label-number_translation_detail_replace']['fr-fr'] = "Remplacer";
 $text['label-number_translation_detail_replace']['he-il'] = "החלף";
 $text['label-number_translation_detail_replace']['it-it'] = "Sostituire";
 $text['label-number_translation_detail_replace']['nl-nl'] = "Vervangen";
-$text['label-number_translation_detail_replace']['pl-pl'] = "Zastąpić";
+$text['label-number_translation_detail_replace']['pl-pl'] = "Zastąp";
 $text['label-number_translation_detail_replace']['pt-br'] = "Substituir"; //copied from pt-pt
 $text['label-number_translation_detail_replace']['pt-pt'] = "Substituir";
 $text['label-number_translation_detail_replace']['ro-ro'] = "A inlocui";
@@ -140,7 +140,7 @@ $text['description-number_translation_detail_replace']['fr-fr'] = "Entrez le dé
 $text['description-number_translation_detail_replace']['he-il'] = '';
 $text['description-number_translation_detail_replace']['it-it'] = '';
 $text['description-number_translation_detail_replace']['nl-nl'] = 'Voer de nummer vertaling varvanging in.';
-$text['description-number_translation_detail_replace']['pl-pl'] = '';
+$text['description-number_translation_detail_replace']['pl-pl'] = 'Podaj nazwę translacji numeru';
 $text['description-number_translation_detail_replace']['pt-br'] = '';
 $text['description-number_translation_detail_replace']['pt-pt'] = '';
 $text['description-number_translation_detail_replace']['ro-ro'] = '';
@@ -161,7 +161,7 @@ $text['label-number_translation_detail_order']['fr-fr'] = 'Ordre';
 $text['label-number_translation_detail_order']['he-il'] = '';
 $text['label-number_translation_detail_order']['it-it'] = '';
 $text['label-number_translation_detail_order']['nl-nl'] = 'Volgorde';
-$text['label-number_translation_detail_order']['pl-pl'] = '';
+$text['label-number_translation_detail_order']['pl-pl'] = 'Kolejność';
 $text['label-number_translation_detail_order']['pt-br'] = '';
 $text['label-number_translation_detail_order']['pt-pt'] = '';
 $text['label-number_translation_detail_order']['ro-ro'] = '';
@@ -182,7 +182,7 @@ $text['description-number_translation_detail_order']['fr-fr'] = "Sélectionnez l
 $text['description-number_translation_detail_order']['he-il'] = '';
 $text['description-number_translation_detail_order']['it-it'] = '';
 $text['description-number_translation_detail_order']['nl-nl'] = 'Kies de regel volgorde weer.';
-$text['description-number_translation_detail_order']['pl-pl'] = '';
+$text['description-number_translation_detail_order']['pl-pl'] = 'Wybierz kolejność reguły';
 $text['description-number_translation_detail_order']['pt-br'] = '';
 $text['description-number_translation_detail_order']['pt-pt'] = '';
 $text['description-number_translation_detail_order']['ro-ro'] = '';
@@ -203,7 +203,7 @@ $text['label-number_translation_name']['fr-fr'] = 'Nom';
 $text['label-number_translation_name']['he-il'] = '';
 $text['label-number_translation_name']['it-it'] = '';
 $text['label-number_translation_name']['nl-nl'] = 'Naam';
-$text['label-number_translation_name']['pl-pl'] = '';
+$text['label-number_translation_name']['pl-pl'] = 'Nazwa';
 $text['label-number_translation_name']['pt-br'] = '';
 $text['label-number_translation_name']['pt-pt'] = '';
 $text['label-number_translation_name']['ro-ro'] = '';
@@ -224,7 +224,7 @@ $text['description-number_translation_name']['fr-fr'] = 'Entrez le nom de traduc
 $text['description-number_translation_name']['he-il'] = '';
 $text['description-number_translation_name']['it-it'] = '';
 $text['description-number_translation_name']['nl-nl'] = 'Voer de nummervertalingnaam in.';
-$text['description-number_translation_name']['pl-pl'] = '';
+$text['description-number_translation_name']['pl-pl'] = 'Podaj nazwę translacji numeru';
 $text['description-number_translation_name']['pt-br'] = '';
 $text['description-number_translation_name']['pt-pt'] = '';
 $text['description-number_translation_name']['ro-ro'] = '';
@@ -245,7 +245,7 @@ $text['label-number_translation_details']['fr-fr'] = 'Détails';
 $text['label-number_translation_details']['he-il'] = '';
 $text['label-number_translation_details']['it-it'] = '';
 $text['label-number_translation_details']['nl-nl'] = 'Details';
-$text['label-number_translation_details']['pl-pl'] = '';
+$text['label-number_translation_details']['pl-pl'] = 'Szczegóły';
 $text['label-number_translation_details']['pt-br'] = '';
 $text['label-number_translation_details']['pt-pt'] = '';
 $text['label-number_translation_details']['ro-ro'] = '';
@@ -287,7 +287,7 @@ $text['label-number_translation_enabled']['fr-fr'] = 'Activé';
 $text['label-number_translation_enabled']['he-il'] = '';
 $text['label-number_translation_enabled']['it-it'] = '';
 $text['label-number_translation_enabled']['nl-nl'] = 'Aktief';
-$text['label-number_translation_enabled']['pl-pl'] = '';
+$text['label-number_translation_enabled']['pl-pl'] = 'Aktywne';
 $text['label-number_translation_enabled']['pt-br'] = '';
 $text['label-number_translation_enabled']['pt-pt'] = '';
 $text['label-number_translation_enabled']['ro-ro'] = '';
@@ -308,7 +308,7 @@ $text['description-number_translation_enabled']['fr-fr'] = 'Entrez le numéro de
 $text['description-number_translation_enabled']['he-il'] = '';
 $text['description-number_translation_enabled']['it-it'] = '';
 $text['description-number_translation_enabled']['nl-nl'] = 'Voer de nummervertaling aan/uit in.';
-$text['description-number_translation_enabled']['pl-pl'] = '';
+$text['description-number_translation_enabled']['pl-pl'] = 'Włącz/wyłącz translacje';
 $text['description-number_translation_enabled']['pt-br'] = '';
 $text['description-number_translation_enabled']['pt-pt'] = '';
 $text['description-number_translation_enabled']['ro-ro'] = '';
@@ -329,7 +329,7 @@ $text['label-number_translation_description']['fr-fr'] = 'Description';
 $text['label-number_translation_description']['he-il'] = '';
 $text['label-number_translation_description']['it-it'] = '';
 $text['label-number_translation_description']['nl-nl'] = 'Omschrijving';
-$text['label-number_translation_description']['pl-pl'] = '';
+$text['label-number_translation_description']['pl-pl'] = 'Opis';
 $text['label-number_translation_description']['pt-br'] = '';
 $text['label-number_translation_description']['pt-pt'] = '';
 $text['label-number_translation_description']['ro-ro'] = '';
@@ -350,7 +350,7 @@ $text['description-number_translation_description']['fr-fr'] = 'Entrez la descri
 $text['description-number_translation_description']['he-il'] = '';
 $text['description-number_translation_description']['it-it'] = '';
 $text['description-number_translation_description']['nl-nl'] = 'Voer de nummervertaling omschrijving in.';
-$text['description-number_translation_description']['pl-pl'] = '';
+$text['description-number_translation_description']['pl-pl'] = 'Podaj opis translacji numeru';
 $text['description-number_translation_description']['pt-br'] = '';
 $text['description-number_translation_description']['pt-pt'] = '';
 $text['description-number_translation_description']['ro-ro'] = '';
diff --git a/app/number_translations/number_translations.php b/app/number_translations/number_translations.php
index c25f7b6fc5..97bb4c17c4 100644
--- a/app/number_translations/number_translations.php
+++ b/app/number_translations/number_translations.php
@@ -172,9 +172,9 @@
 		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";
-	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'=>'number_translations.php','style'=>($search == '' ? 'display: none;' : null)]);
+	echo 		"<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown=''>";
+	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search']);
+	//echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'number_translations.php','style'=>($search == '' ? 'display: none;' : null)]);
 	if ($paging_controls_mini != '') {
 		echo 	"<span style='margin-left: 15px;'>".$paging_controls_mini."</span>\n";
 	}
diff --git a/app/phrases/app_config.php b/app/phrases/app_config.php
index 8fe3fa4c6c..38a079efe5 100644
--- a/app/phrases/app_config.php
+++ b/app/phrases/app_config.php
@@ -62,6 +62,9 @@
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "phrase_all";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "phrase_play";
 		$apps[$x]['permissions'][$y]['groups'][] = "user";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
diff --git a/app/phrases/app_defaults.php b/app/phrases/app_defaults.php
index a88a52cb37..44e5386a2f 100644
--- a/app/phrases/app_defaults.php
+++ b/app/phrases/app_defaults.php
@@ -28,13 +28,13 @@ if ($domains_processed == 1) {
 
 	//create phrases folder and add include line in xml for each language found
 		/*
-		if (strlen($_SESSION['switch']['phrases']['dir']) > 0) {
-			if (is_readable($_SESSION['switch']['phrases']['dir'])) {
-				$conf_lang_folders = glob($_SESSION['switch']['phrases']['dir']."/*");
+		if (strlen($_SESSION['switch']['languages']['dir']) > 0) {
+			if (is_readable($_SESSION['switch']['languages']['dir'])) {
+				$conf_lang_folders = glob($_SESSION['switch']['languages']['dir']."/*");
 				foreach ($conf_lang_folders as $conf_lang_folder) {
 					//create phrases folder, if necessary
 					if (!file_exists($conf_lang_folder."/phrases/")) {
-						event_socket_mkdir($conf_lang_folder."/phrases/");
+						mkdir($conf_lang_folder."/phrases/", 0770, false);
 					}
 					//parse language, open xml file
 					$conf_lang = substr($conf_lang_folder, -2);
@@ -90,7 +90,7 @@ if ($domains_processed == 1) {
 					$database = new database;
 					$database->app_name = 'phrases';
 					$database->app_uuid = '5c6f597c-9b78-11e4-89d3-123b93f75cba';
-					$database->save($array);
+					$database->save($array, false);
 					unset($array);
 
 					$p->delete('phrase_detail_edit', 'temp');
@@ -128,7 +128,7 @@ if ($domains_processed == 1) {
 					$database = new database;
 					$database->app_name = 'phrases';
 					$database->app_uuid = '5c6f597c-9b78-11e4-89d3-123b93f75cba';
-					$database->save($array);
+					$database->save($array, false);
 					unset($array);
 
 					$p->delete('phrase_detail_edit', 'temp');
diff --git a/app/phrases/phrases.php b/app/phrases/phrases.php
index 52c48517e7..389e628aa9 100644
--- a/app/phrases/phrases.php
+++ b/app/phrases/phrases.php
@@ -94,15 +94,21 @@
 
 //get phrases record count
 	$sql = "select count(*) from v_phrases ";
-	$sql .= "where (domain_uuid = :domain_uuid or domain_uuid is null) ";
+	$sql .= "where true ";
+	if ($_GET['show'] != "all" || !permission_exists('phrase_all')) {
+		$sql .= "and (domain_uuid = :domain_uuid or domain_uuid is null) ";
+		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+	}
 	$sql .= $sql_search;
-	$parameters['domain_uuid'] = $domain_uuid;
 	$database = new database;
 	$num_rows = $database->select($sql, $parameters, 'column');
 
 //prepare to page the results
 	$rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50;
-	$param = "&search=".$search;
+	$param = "&search=".urlencode($search);
+	if ($_GET['show'] == "all" && permission_exists('phrase_all')) {
+		$param .= "&show=all";
+	}
 	$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);
@@ -132,18 +138,26 @@
 		echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add'],'id'=>'btn_add','link'=>'phrase_edit.php']);
 	}
 	if (permission_exists('phrase_add') && $phrases) {
-		echo button::create(['type'=>'button','label'=>$text['button-copy'],'icon'=>$_SESSION['theme']['button_icon_copy'],'name'=>'btn_copy','onclick'=>"modal_open('modal-copy','btn_copy');"]);
+		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('phrase_edit') && $phrases) {
-		echo button::create(['type'=>'button','label'=>$text['button-toggle'],'icon'=>$_SESSION['theme']['button_icon_toggle'],'name'=>'btn_toggle','onclick'=>"modal_open('modal-toggle','btn_toggle');"]);
+		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('phrase_delete') && $phrases) {
-		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 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";
-	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'=>'phrases.php','style'=>($search == '' ? 'display: none;' : null)]);
+	if (permission_exists('phrase_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=&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=''>";
+	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search']);
+	//echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'phrases.php','style'=>($search == '' ? 'display: none;' : null)]);
 	if ($paging_controls_mini != '') {
 		echo 	"<span style='margin-left: 15px;'>".$paging_controls_mini."</span>";
 	}
@@ -173,9 +187,12 @@
 	echo "<tr class='list-header'>\n";
 	if (permission_exists('phrase_add') || permission_exists('phrase_edit') || permission_exists('phrase_delete')) {
 		echo "	<th class='checkbox'>\n";
-		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle();' ".($phrases ?: "style='visibility: hidden;'").">\n";
+		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle(); checkbox_on_change(this);' ".($phrases ?: "style='visibility: hidden;'").">\n";
 		echo "	</th>\n";
 	}
+	if ($_GET['show'] == "all" && permission_exists('phrase_all')) {
+		echo th_order_by('domain_name', $text['label-domain'], $order_by, $order, $param, "class='shrink'");
+	}
 	echo th_order_by('phrase_name', $text['label-name'], $order_by, $order);
 	echo th_order_by('phrase_language', $text['label-language'], $order_by, $order);
 	echo th_order_by('phrase_enabled', $text['label-enabled'], $order_by, $order, null, "class='center'");
@@ -194,10 +211,19 @@
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('phrase_add') || permission_exists('phrase_edit') || permission_exists('phrase_delete')) {
 				echo "	<td class='checkbox'>\n";
-				echo "		<input type='checkbox' name='phrases[$x][checked]' id='checkbox_".$x."' value='true' onclick=\"if (!this.checked) { document.getElementById('checkbox_all').checked = false; }\">\n";
+				echo "		<input type='checkbox' name='phrases[$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='phrases[$x][uuid]' value='".escape($row['phrase_uuid'])."' />\n";
 				echo "	</td>\n";
 			}
+			if ($_GET['show'] == "all" && permission_exists('phrase_all')) {
+				if (strlen($_SESSION['domains'][$row['domain_uuid']]['domain_name']) > 0) {
+					$domain = $_SESSION['domains'][$row['domain_uuid']]['domain_name'];
+				}
+				else {
+					$domain = $text['label-global'];
+				}
+				echo "	<td>".escape($domain)."</td>\n";
+			}
 			echo "	<td>";
 			if (permission_exists('phrase_edit')) {
 				echo "<a href='".$list_row_url."' title=\"".$text['button-edit']."\">".escape($row['phrase_name'])."</a>";
diff --git a/app/pin_numbers/app_languages.php b/app/pin_numbers/app_languages.php
index 08a5ad1bb2..4f6b4f9f93 100644
--- a/app/pin_numbers/app_languages.php
+++ b/app/pin_numbers/app_languages.php
@@ -413,7 +413,7 @@ $text['message-add']['fr-fr'] = "Ajouter terminé";
 $text['message-add']['he-il'] = "";
 $text['message-add']['it-it'] = "Inserimento Completato";
 $text['message-add']['nl-nl'] = "Toevoegen gereed";
-$text['message-add']['pl-pl'] = "";
+$text['message-add']['pl-pl'] = "Dodano pomyślnie";
 $text['message-add']['pt-br'] = "";
 $text['message-add']['pt-pt'] = "";
 $text['message-add']['ro-ro'] = "";
@@ -434,7 +434,7 @@ $text['message-update']['fr-fr'] = "Mise à jour terminée";
 $text['message-update']['he-il'] = "";
 $text['message-update']['it-it'] = "Aggiornamento Completato";
 $text['message-update']['nl-nl'] = "Bijwerken gereed";
-$text['message-update']['pl-pl'] = "";
+$text['message-update']['pl-pl'] = "Zaktualizowano pomyślnie";
 $text['message-update']['pt-br'] = "";
 $text['message-update']['pt-pt'] = "";
 $text['message-update']['ro-ro'] = "";
@@ -455,7 +455,7 @@ $text['message-delete']['fr-fr'] = "Supprimer terminé";
 $text['message-delete']['he-il'] = "";
 $text['message-delete']['it-it'] = "Cancellazione Completato";
 $text['message-delete']['nl-nl'] = "Verwijderen gereed";
-$text['message-delete']['pl-pl'] = "";
+$text['message-delete']['pl-pl'] = "Usunięto pomyślnie";
 $text['message-delete']['pt-br'] = "";
 $text['message-delete']['pt-pt'] = "";
 $text['message-delete']['ro-ro'] = "";
diff --git a/app/polycom/app_config.php b/app/polycom/app_config.php
index e3a293d0fe..08e8a1afb6 100644
--- a/app/polycom/app_config.php
+++ b/app/polycom/app_config.php
@@ -347,7 +347,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
 		$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_value'] = "0";
 		$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++;
@@ -550,5 +550,45 @@
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = "04:00";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the time to stop polling when using random mode";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "2ffdfa5b-2545-4d5b-a819-8cd36c866c28";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_emergency_customized";
+		$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'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "allow custom emergency numbers, for example 933";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "0fb63bf9-66d0-4d71-b368-3f314a974e82";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_emergency_server";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "example.domain.tld";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "server handling emergency calls";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "fae39a6e-df46-48db-8e4f-0b0bbe46f759";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_emergency_port";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "5060";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "port on which server handling emergency calls is reachable";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "18df4b4b-cb69-46fa-bee2-c984269a7af7";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_emergency_number";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "array";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "911";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "911";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "ab84a4f1-b30c-464e-a838-665104903290";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "polycom_emergency_number";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "array";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "933";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "933 service";
 
 ?>
diff --git a/app/provision/app_config.php b/app/provision/app_config.php
index 248bd849a3..ff44033af8 100644
--- a/app/provision/app_config.php
+++ b/app/provision/app_config.php
@@ -53,7 +53,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = "digest";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = "";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Options: basic, digest (default)";
 		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "c6a5b05b-210d-484f-bbb6-c1dd2223992e";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
@@ -151,6 +151,22 @@
 		$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'] = "4e2986cc-de12-49b9-9832-5ca53bb2098a";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "line_label";
+		$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'] = "";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "97402737-ba86-4d4e-8847-5497d07ef6b5";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "line_display_name";
+		$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'] = "";
+		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "a9dc7f4a-0a19-40cb-829a-093bf81d00db";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "line_sip_port";
diff --git a/app/provision/app_defaults.php b/app/provision/app_defaults.php
index 377fddc7d2..211235abd3 100644
--- a/app/provision/app_defaults.php
+++ b/app/provision/app_defaults.php
@@ -50,7 +50,7 @@ if ($domains_processed == 1) {
 				$database = new database;
 				$database->app_name = 'provision';
 				$database->app_uuid = 'abf28ead-92ef-3de6-ebbb-023fbc2b6dd3';
-				$database->save($array);
+				$database->save($array, false);
 				unset($array);
 			//revoke temporary permissions
 				$p->delete('device_add', 'temp');
@@ -76,7 +76,7 @@ if ($domains_processed == 1) {
 			$database = new database;
 			$database->app_name = 'provision';
 			$database->app_uuid = 'abf28ead-92ef-3de6-ebbb-023fbc2b6dd3';
-			$database->save($array);
+			$database->save($array, false);
 			unset($array);
 
 		//grant temporary permissions
diff --git a/app/provision/resources/classes/provision.php b/app/provision/resources/classes/provision.php
index 02cbfe1ad2..2266b16ae5 100644
--- a/app/provision/resources/classes/provision.php
+++ b/app/provision/resources/classes/provision.php
@@ -186,7 +186,8 @@ include "root.php";
 			}
 		}
 
-		private function contact_append(&$contacts, &$line, $domain_uuid, $device_user_uuid, $is_group) {
+		private function contact_append(&$contacts, &$line, $domain_uuid, $device_user_uuid, $category) {
+
 			$sql = "select c.contact_uuid, c.contact_organization, c.contact_name_given, c.contact_name_family, ";
 			$sql .= "c.contact_type, c.contact_category, p.phone_label,";
 			$sql .= "p.phone_number, p.phone_extension, p.phone_primary ";
@@ -194,7 +195,7 @@ include "root.php";
 			$sql .= "where c.contact_uuid = p.contact_uuid ";
 			$sql .= "and p.phone_type_voice = '1' ";
 			$sql .= "and c.domain_uuid = :domain_uuid ";
-			if ($is_group) {
+			if ($category == 'groups') {
 				$sql .= "and c.contact_uuid in ( ";
 				$sql .= "	select contact_uuid from v_contact_groups ";
 				$sql .= "	where group_uuid in ( ";
@@ -202,55 +203,57 @@ include "root.php";
 				$sql .= "		where user_uuid = :device_user_uuid ";
 				$sql .= "		and domain_uuid = :domain_uuid ";
 				$sql .= "	)) ";
+				$parameters['device_user_uuid'] = $device_user_uuid;
 			}
-			else {
+			if ($category == 'users') {
 				$sql .= "and c.contact_uuid in ( ";
 				$sql .= "	select contact_uuid from v_contact_users ";
 				$sql .= "	where user_uuid = :device_user_uuid ";
 				$sql .= "	and domain_uuid = :domain_uuid ";
 				$sql .= ") ";
+				$parameters['device_user_uuid'] = $device_user_uuid;
 			}
-			$parameters['device_user_uuid'] = $device_user_uuid;
 			$parameters['domain_uuid'] = $domain_uuid;
 			$database = new database;
-			$user_contacts = $database->select($sql, $parameters, 'all');
-			if (is_array($user_contacts)) {
-				foreach ($user_contacts as &$row) {
+			$database_contacts = $database->select($sql, $parameters, 'all');
+			if (is_array($database_contacts)) {
+				$x = 0;
+				foreach ($database_contacts as &$row) {
 					$uuid = $row['contact_uuid'];
 					$phone_label = strtolower($row['phone_label']);
 					$contact_category = strtolower($row['contact_category']);
 
 					$contact = array();
 					$contacts[] = &$contact;
-					$contact['category']             = $is_group ? 'groups' : 'users';
-					$contact['contact_uuid']         = $row['contact_uuid'];
-					$contact['contact_type']         = $row['contact_type'];
-					$contact['contact_category']     = $row['contact_category'];
-					$contact['contact_organization'] = $row['contact_organization'];
-					$contact['contact_name_given']   = $row['contact_name_given'];
-					$contact['contact_name_family']  = $row['contact_name_family'];
-					$contact['numbers']              = array();
+					$contact['category']				= ($category == 'all') ? 'groups' : $category;
+					$contact['contact_uuid']			= $row['contact_uuid'];
+					$contact['contact_type']			= $row['contact_type'];
+					$contact['contact_category']		= $row['contact_category'];
+					$contact['contact_organization']	= $row['contact_organization'];
+					$contact['contact_name_given']		= $row['contact_name_given'];
+					$contact['contact_name_family']		= $row['contact_name_family'];
 
+					$contact['numbers']					= array();
 					$numbers = &$contact['numbers'];
 
 					if (($row['phone_primary'] == '1') || (!isset($contact['phone_number']))) {
-						$contact['phone_label']		= $phone_label;
-						$contact['phone_number']	= $row['phone_number'];
-						$contact['phone_extension']	= $row['phone_extension'];
+						$contact['phone_label']			= $phone_label;
+						$contact['phone_number']		= $row['phone_number'];
+						$contact['phone_extension']		= $row['phone_extension'];
 					}
 
-					$numbers[] = array(
-						line_number			=> $line['line_number'],
-						phone_label			=> $phone_label,
-						phone_number		=> $row['phone_number'],
-						phone_extension		=> $row['phone_extension'],
-						phone_primary		=> $row['phone_primary'],
-					);
+					$numbers[$x]['line_number']			= $line['line_number'];
+					$numbers[$x]['phone_label']			= $phone_label;
+					$numbers[$x]['phone_number']		= $row['phone_number'];
+					$numbers[$x]['phone_extension']		= $row['phone_extension'];
+					$numbers[$x]['phone_primary']		= $row['phone_primary'];
 
 					$contact['phone_number_' . $phone_label] = $row['phone_number'];
 					unset($contact, $numbers, $uuid, $phone_label);
+					$x++;
 				}
 				unset($parameters);
+
 			}
 		}
 
@@ -300,7 +303,11 @@ include "root.php";
 						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; }
+						if (isset($value)) {
+							$value = str_replace('${domain_name}', $domain_name, $value);
+							$value = str_replace('${mac_address}', $mac, $value);
+							$provision[$key] = $value;
+						}
 						unset($value);
 					}
 				}
@@ -356,15 +363,16 @@ include "root.php";
 								//set the variables from values in the database
 									$device_uuid = $row["device_uuid"];
 									$device_label = $row["device_label"];
-									if (strlen($row["device_vendor"]) > 0) {
-										$device_vendor = strtolower($row["device_vendor"]);
-									}
+									$device_template = $row["device_template"];
+									$device_profile_uuid = $row["device_profile_uuid"];
 									$device_user_uuid = $row["device_user_uuid"];
 									$device_model = $row["device_model"];
 									$device_firmware_version = $row["device_firmware_version"];
+									if (strlen($row["device_vendor"]) > 0) {
+										$device_vendor = strtolower($row["device_vendor"]);
+									}
+									$device_location = $row["device_location"];
 									$device_enabled = $row["device_enabled"];
-									$device_template = $row["device_template"];
-									$device_profile_uuid = $row["device_profile_uuid"];
 									$device_description = $row["device_description"];
 							}
 							unset($row);
@@ -380,12 +388,13 @@ include "root.php";
 								$row = $database->select($sql, $parameters, 'row');
 								if (is_array($row) && sizeof($row) != 0) {
 									$device_label = $row["device_label"];
-									$device_vendor = strtolower($row["device_vendor"]);
-									$device_model = $row["device_model"];
-									$device_firmware_version = $row["device_firmware_version"];
-									$device_enabled = $row["device_enabled"];
 									$device_template = $row["device_template"];
 									$device_profile_uuid = $row["device_profile_uuid"];
+									$device_model = $row["device_model"];
+									$device_firmware_version = $row["device_firmware_version"];
+									$device_vendor = strtolower($row["device_vendor"]);
+									$device_location = strtolower($row["device_location"]);
+									$device_enabled = $row["device_enabled"];
 									$device_description = $row["device_description"];
 								}
 								unset($row, $parameters);
@@ -590,11 +599,13 @@ include "root.php";
 								if (is_array($row) && sizeof($row) != 0) {
 									if ($row["device_enabled"] == "true") {
 										$device_label = $row["device_label"];
+										$device_profile_uuid = $row["device_profile_uuid"];
 										$device_firmware_version = $row["device_firmware_version"];
 										$device_user_uuid = $row["device_user_uuid"];
+										$device_location = strtolower($row["device_location"]);
+										$device_vendor = strtolower($row["device_vendor"]);
 										$device_enabled = $row["device_enabled"];
 										//keep the original template
-										$device_profile_uuid = $row["device_profile_uuid"];
 										$device_description = $row["device_description"];
 									}
 								}
@@ -881,16 +892,22 @@ include "root.php";
 					$view->assign("user", $lines);
 
 				//get the list of contact directly assigned to the user
-					if (is_uuid($device_user_uuid) && is_uuid($domain_uuid)) {
-						//get the contacts assigned to the groups and add to the contacts array
-							if ($_SESSION['provision']['contact_groups']['boolean'] == "true") {
-								$this->contact_append($contacts, $line, $domain_uuid, $device_user_uuid, true);
-							}
-
-						//get the contacts assigned to the user and add to the contacts array
-							if ($_SESSION['provision']['contact_users']['boolean'] == "true") {
-								$this->contact_append($contacts, $line, $domain_uuid, $device_user_uuid, false);
-							}
+					if (is_uuid($domain_uuid)) {
+						if ($_SESSION['contact']['permissions']['boolean'] == "true") {
+							//get the contacts assigned to the groups and add to the contacts array
+								if (is_uuid($device_user_uuid) && $_SESSION['provision']['contact_groups']['boolean'] == "true") {
+									$this->contact_append($contacts, $line, $domain_uuid, $device_user_uuid, 'groups');
+								}
+	
+							//get the contacts assigned to the user and add to the contacts array
+								if (is_uuid($device_user_uuid) && $_SESSION['provision']['contact_users']['boolean'] == "true") {
+									$this->contact_append($contacts, $line, $domain_uuid, $device_user_uuid, 'users');
+								}
+						}
+						else {
+							//show all contacts for the domain
+								$this->contact_append($contacts, $line, $domain_uuid, null, 'all');
+						}
 					}
 
 				//get the extensions and add them to the contacts array
@@ -1125,6 +1142,8 @@ include "root.php";
 					$view->assign("user_id",$user_id);
 					$view->assign("password",$password);
 					$view->assign("template",$device_template);
+					$view->assign("location",$device_location);
+					$view->assign("device_location",$device_location);
 					$view->assign("microtime",microtime(true));
 
 				//personal ldap password
@@ -1194,7 +1213,7 @@ include "root.php";
 					else {
 						//make sure the file exists
 						if (!file_exists($template_dir."/".$device_template ."/".$file)) {
-							echo "file not found ".$template_dir."/".$device_template ."/".$file;
+							$this->http_error('404');
 							if ($_SESSION['provision']['debug']['boolean'] == 'true') {
 								echo ":$template_dir/$device_template/$file<br/>";
 								echo "template_dir: $template_dir<br/>";
diff --git a/app/recordings/app_config.php b/app/recordings/app_config.php
index 81ebbcfbab..3ffd625e78 100644
--- a/app/recordings/app_config.php
+++ b/app/recordings/app_config.php
@@ -64,6 +64,9 @@
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "recording_all";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "recording_upload";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
diff --git a/app/recordings/app_defaults.php b/app/recordings/app_defaults.php
index 800f387a41..95e2733382 100644
--- a/app/recordings/app_defaults.php
+++ b/app/recordings/app_defaults.php
@@ -26,7 +26,9 @@
 
 //if the recordings directory doesn't exist then create it
 	if (is_array($_SESSION['switch']['recordings']) && strlen($_SESSION['switch']['recordings']['dir']."/".$domain_name) > 0) {
-		if (!is_readable($_SESSION['switch']['recordings']['dir']."/".$domain_name)) { event_socket_mkdir($_SESSION['switch']['recordings']['dir']."/".$domain_name,02770,true); }
+		if (!is_readable($_SESSION['switch']['recordings']['dir']."/".$domain_name)) {
+			mkdir($_SESSION['switch']['recordings']['dir']."/".$domain_name, 0770, true);
+		}
 	}
 
 //process one time
@@ -62,7 +64,7 @@
 										$database = new database;
 										$database->app_name = 'recordings';
 										$database->app_uuid = '83913217-c7a2-9e90-925d-a866eb40b60e';
-										$database->save($array);
+										$database->save($array, false);
 										unset($array);
 									//revoke temporary permissions
 										$p->delete('recording_edit', 'temp');
@@ -107,7 +109,7 @@
 								$database = new database;
 								$database->app_name = 'recordings';
 								$database->app_uuid = '83913217-c7a2-9e90-925d-a866eb40b60e';
-								$database->save($array);
+								$database->save($array, false);
 								unset($array);
 							//revoke temporary permissions
 								$p->delete('recording_edit', 'temp');
diff --git a/app/recordings/recordings.php b/app/recordings/recordings.php
index 05ca5ac758..7ad6196347 100644
--- a/app/recordings/recordings.php
+++ b/app/recordings/recordings.php
@@ -122,7 +122,7 @@
 
 		//make sure the destination directory exists
 			if (!is_dir($_SESSION['switch']['recordings']['dir'].'/'.$_SESSION['domain_name'])) {
-				event_socket_mkdir($_SESSION['switch']['recordings']['dir'].'/'.$_SESSION['domain_name']);
+				mkdir($_SESSION['switch']['recordings']['dir'].'/'.$_SESSION['domain_name'], 0770, true);
 			}
 
 		//move the uploaded files
@@ -297,15 +297,21 @@
 
 //get total recordings from the database
 	$sql = "select count(*) from v_recordings ";
-	$sql .= "where domain_uuid = :domain_uuid ";
+	$sql .= "where true ";
+	if ($_GET['show'] != "all" || !permission_exists('conference_center_all')) {
+		$sql .= "and (domain_uuid = :domain_uuid or domain_uuid is null) ";
+		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+	}
 	$sql .= $sql_search;
-	$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
 	$database = new database;
 	$num_rows = $database->select($sql, $parameters, 'column');
 
 //prepare to page the results
 	$rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50;
-	$param = "&search=".$search;
+	$param = "&search=".urlencode($search);
+	if ($_GET['show'] == "all" && permission_exists('recording_all')) {
+		$param .= "&show=all";
+	}
 	$param .= "&order_by=".$order_by."&order=".$order;
 	$page = is_numeric($_GET['page']) ? $_GET['page'] : 0;
 	list($paging_controls, $rows_per_page) = paging($num_rows, $param, $rows_per_page);
@@ -363,12 +369,20 @@
 		echo 	"</form>";
 	}
 	if (permission_exists('recording_delete') && $recordings) {
-		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 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";
-	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'=>'recordings.php','style'=>($search == '' ? 'display: none;' : null)]);
+	if (permission_exists('recording_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=&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=''>";
+	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search']);
+	//echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'recordings.php','style'=>($search == '' ? 'display: none;' : null)]);
 	if ($paging_controls_mini != '') {
 		echo 	"<span style='margin-left: 15px;'>".$paging_controls_mini."</span>";
 	}
@@ -393,10 +407,13 @@
 	$col_count = 0;
 	if (permission_exists('recording_delete')) {
 		echo "	<th class='checkbox'>\n";
-		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle();' ".($recordings ?: "style='visibility: hidden;'").">\n";
+		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle(); checkbox_on_change(this);' ".($recordings ?: "style='visibility: hidden;'").">\n";
 		echo "	</th>\n";
 		$col_count++;
 	}
+	if ($_GET['show'] == "all" && permission_exists('recording_all')) {
+		echo th_order_by('domain_name', $text['label-domain'], $order_by, $order, $param, "class='shrink'");
+	}
 	echo th_order_by('recording_name', $text['label-recording_name'], $order_by, $order);
 	$col_count++;
 	if ($_SESSION['recordings']['storage_type']['text'] != 'base64') {
@@ -423,20 +440,29 @@
 		$x = 0;
 		foreach ($recordings as $row) {
 			//playback progress bar
-				if (permission_exists('recording_play')) {
-					echo "<tr class='list-row' id='recording_progress_bar_".escape($row['recording_uuid'])."' style='display: none;'><td class='playback_progress_bar_background' style='padding: 0; border: none;' colspan='".$col_count."'><span class='playback_progress_bar' id='recording_progress_".escape($row['recording_uuid'])."'></span></td><td class='description hide-sm-dn' style='border-bottom: none !important;'></td></tr>\n";
-					echo "<tr class='list-row' style='display: none;'><td></td></tr>\n"; // dummy row to maintain alternating background color
-				}
+			if (permission_exists('recording_play')) {
+				echo "<tr class='list-row' id='recording_progress_bar_".escape($row['recording_uuid'])."' style='display: none;'><td class='playback_progress_bar_background' style='padding: 0; border: none;' colspan='".$col_count."'><span class='playback_progress_bar' id='recording_progress_".escape($row['recording_uuid'])."'></span></td><td class='description hide-sm-dn' style='border-bottom: none !important;'></td></tr>\n";
+				echo "<tr class='list-row' style='display: none;'><td></td></tr>\n"; // dummy row to maintain alternating background color
+			}
 			if (permission_exists('recording_edit')) {
 				$list_row_url = "recording_edit.php?id=".urlencode($row['recording_uuid']);
 			}
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('recording_delete')) {
 				echo "	<td class='checkbox'>\n";
-				echo "		<input type='checkbox' name='recordings[$x][checked]' id='checkbox_".$x."' value='true' onclick=\"if (!this.checked) { document.getElementById('checkbox_all').checked = false; }\">\n";
+				echo "		<input type='checkbox' name='recordings[$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='recordings[$x][uuid]' value='".escape($row['recording_uuid'])."' />\n";
 				echo "	</td>\n";
 			}
+			if ($_GET['show'] == "all" && permission_exists('recording_all')) {
+				if (strlen($_SESSION['domains'][$row['domain_uuid']]['domain_name']) > 0) {
+					$domain = $_SESSION['domains'][$row['domain_uuid']]['domain_name'];
+				}
+				else {
+					$domain = $text['label-global'];
+				}
+				echo "	<td>".escape($domain)."</td>\n";
+			}
 			echo "	<td>";
 			if (permission_exists('recording_edit')) {
 				echo "<a href='".$list_row_url."' title=\"".$text['button-edit']."\">".escape($row['recording_name'])."</a>";
diff --git a/app/registrations/app_languages.php b/app/registrations/app_languages.php
index 5679103a46..130b26ae14 100644
--- a/app/registrations/app_languages.php
+++ b/app/registrations/app_languages.php
@@ -140,7 +140,7 @@ $text['label-ping']['fr-fr'] = "Ping";
 $text['label-ping']['he-il'] = "";
 $text['label-ping']['it-it'] = "Ping";
 $text['label-ping']['nl-nl'] = "Ping";
-$text['label-ping']['pl-pl'] = "Świst";
+$text['label-ping']['pl-pl'] = "Ping";
 $text['label-ping']['pt-br'] = "Sibilo"; //copied from pt-pt
 $text['label-ping']['pt-pt'] = "Sibilo";
 $text['label-ping']['ro-ro'] = "";
@@ -161,7 +161,7 @@ $text['label-message']['fr-fr'] = "Profil Invalide!";
 $text['label-message']['he-il'] = "";
 $text['label-message']['it-it'] = "Profilo non valido!";
 $text['label-message']['nl-nl'] = "Ongeldig profiel";
-$text['label-message']['pl-pl'] = "Wiadomość";
+$text['label-message']['pl-pl'] = "Niepoprawny Profil!";
 $text['label-message']['pt-br'] = "Mensagem";
 $text['label-message']['pt-pt'] = "Perfil Inválido!";
 $text['label-message']['ro-ro'] = "";
@@ -350,7 +350,7 @@ $text['label-sip_profile_name']['fr-fr'] = "Profile";
 $text['label-sip_profile_name']['he-il'] = "";
 $text['label-sip_profile_name']['it-it'] = "";
 $text['label-sip_profile_name']['nl-nl'] = "Profiel";
-$text['label-sip_profile_name']['pl-pl'] = "Profile";
+$text['label-sip_profile_name']['pl-pl'] = "Profil";
 $text['label-sip_profile_name']['pt-br'] = "Perfis"; //copied from pt-pt
 $text['label-sip_profile_name']['pt-pt'] = "Perfis";
 $text['label-sip_profile_name']['ro-ro'] = "";
@@ -392,7 +392,7 @@ $text['description-registrations']['fr-fr'] = "Manage current extensions registe
 $text['description-registrations']['he-il'] = "Manage current extensions registered to the system.";
 $text['description-registrations']['it-it'] = "Manage current extensions registered to the system.";
 $text['description-registrations']['nl-nl'] = "Manage current extensions registered to the system.";
-$text['description-registrations']['pl-pl'] = "Manage current extensions registered to the system.";
+$text['description-registrations']['pl-pl'] = "Zarządzaj numerami wewnętrznymi zarejestrowanymi w systemie.";
 $text['description-registrations']['pt-br'] = "Manage current extensions registered to the system.";
 $text['description-registrations']['pt-pt'] = "Manage current extensions registered to the system.";
 $text['description-registrations']['ro-ro'] = "Manage current extensions registered to the system.";
@@ -476,7 +476,7 @@ $text['button-provision']['fr-fr'] = "Provisionner";
 $text['button-provision']['he-il'] = "";
 $text['button-provision']['it-it'] = "Riconfigura";
 $text['button-provision']['nl-nl'] = "Voorziening";
-$text['button-provision']['pl-pl'] = "Konfigutuj";
+$text['button-provision']['pl-pl'] = "Konfiguruj";
 $text['button-provision']['pt-br'] = "";
 $text['button-provision']['pt-pt'] = "";
 $text['button-provision']['ro-ro'] = "";
@@ -497,7 +497,7 @@ $text['button-all_profiles']['fr-fr'] = "All Profiles";
 $text['button-all_profiles']['he-il'] = "All Profiles";
 $text['button-all_profiles']['it-it'] = "All Profiles";
 $text['button-all_profiles']['nl-nl'] = "All Profiles";
-$text['button-all_profiles']['pl-pl'] = "All Profiles";
+$text['button-all_profiles']['pl-pl'] = "Wszystkie Profile";
 $text['button-all_profiles']['pt-br'] = "All Profiles";
 $text['button-all_profiles']['pt-pt'] = "All Profiles";
 $text['button-all_profiles']['ro-ro'] = "All Profiles";
@@ -518,7 +518,7 @@ $text['button-single_profile']['fr-fr'] = "Single Profile";
 $text['button-single_profile']['he-il'] = "Single Profile";
 $text['button-single_profile']['it-it'] = "Single Profile";
 $text['button-single_profile']['nl-nl'] = "Single Profile";
-$text['button-single_profile']['pl-pl'] = "Single Profile";
+$text['button-single_profile']['pl-pl'] = "Pojedyńczy Profil";
 $text['button-single_profile']['pt-br'] = "Single Profile";
 $text['button-single_profile']['pt-pt'] = "Single Profile";
 $text['button-single_profile']['ro-ro'] = "Single Profile";
@@ -539,7 +539,7 @@ $text['message-registrations_unregistered']['fr-fr'] = "Unregister Command Sent"
 $text['message-registrations_unregistered']['he-il'] = "Unregister Command Sent";
 $text['message-registrations_unregistered']['it-it'] = "Unregister Command Sent";
 $text['message-registrations_unregistered']['nl-nl'] = "Unregister Command Sent";
-$text['message-registrations_unregistered']['pl-pl'] = "Unregister Command Sent";
+$text['message-registrations_unregistered']['pl-pl'] = "Komenda do Wyrejestrowania została wysłana";
 $text['message-registrations_unregistered']['pt-br'] = "Unregister Command Sent";
 $text['message-registrations_unregistered']['pt-pt'] = "Unregister Command Sent";
 $text['message-registrations_unregistered']['ro-ro'] = "Unregister Command Sent";
@@ -560,7 +560,7 @@ $text['message-registrations_provisioned']['fr-fr'] = "Provision Command Sent";
 $text['message-registrations_provisioned']['he-il'] = "Provision Command Sent";
 $text['message-registrations_provisioned']['it-it'] = "Provision Command Sent";
 $text['message-registrations_provisioned']['nl-nl'] = "Provision Command Sent";
-$text['message-registrations_provisioned']['pl-pl'] = "Provision Command Sent";
+$text['message-registrations_provisioned']['pl-pl'] = "Komenda do Konfiguracji została wysłana";
 $text['message-registrations_provisioned']['pt-br'] = "Provision Command Sent";
 $text['message-registrations_provisioned']['pt-pt'] = "Provision Command Sent";
 $text['message-registrations_provisioned']['ro-ro'] = "Provision Command Sent";
@@ -581,7 +581,7 @@ $text['message-registrations_rebooted']['fr-fr'] = "Registration Command Sent";
 $text['message-registrations_rebooted']['he-il'] = "Registration Command Sent";
 $text['message-registrations_rebooted']['it-it'] = "Registration Command Sent";
 $text['message-registrations_rebooted']['nl-nl'] = "Registration Command Sent";
-$text['message-registrations_rebooted']['pl-pl'] = "Registration Command Sent";
+$text['message-registrations_rebooted']['pl-pl'] = "Komenda do Rejestracji została wysłana";
 $text['message-registrations_rebooted']['pt-br'] = "Registration Command Sent";
 $text['message-registrations_rebooted']['pt-pt'] = "Registration Command Sent";
 $text['message-registrations_rebooted']['ro-ro'] = "Registration Command Sent";
@@ -602,7 +602,7 @@ $text['confirm-unregister']['fr-fr'] = "Do you really want to UNREGISTER these?"
 $text['confirm-unregister']['he-il'] = "Do you really want to UNREGISTER these?";
 $text['confirm-unregister']['it-it'] = "Do you really want to UNREGISTER these?";
 $text['confirm-unregister']['nl-nl'] = "Do you really want to UNREGISTER these?";
-$text['confirm-unregister']['pl-pl'] = "Do you really want to UNREGISTER these?";
+$text['confirm-unregister']['pl-pl'] = "Czy napewno chcesz je WYREJESTROWAĆ?";
 $text['confirm-unregister']['pt-br'] = "Do you really want to UNREGISTER these?";
 $text['confirm-unregister']['pt-pt'] = "Do you really want to UNREGISTER these?";
 $text['confirm-unregister']['ro-ro'] = "Do you really want to UNREGISTER these?";
@@ -623,7 +623,7 @@ $text['confirm-provision']['fr-fr'] = "Do you really want to PROVISION these?";
 $text['confirm-provision']['he-il'] = "Do you really want to PROVISION these?";
 $text['confirm-provision']['it-it'] = "Do you really want to PROVISION these?";
 $text['confirm-provision']['nl-nl'] = "Do you really want to PROVISION these?";
-$text['confirm-provision']['pl-pl'] = "Do you really want to PROVISION these?";
+$text['confirm-provision']['pl-pl'] = "Czy na pewno chcesz je SKONFIGUROWAĆ?";
 $text['confirm-provision']['pt-br'] = "Do you really want to PROVISION these?";
 $text['confirm-provision']['pt-pt'] = "Do you really want to PROVISION these?";
 $text['confirm-provision']['ro-ro'] = "Do you really want to PROVISION these?";
@@ -644,7 +644,7 @@ $text['confirm-reboot']['fr-fr'] = "Do you really want to REBOOT these?";
 $text['confirm-reboot']['he-il'] = "Do you really want to REBOOT these?";
 $text['confirm-reboot']['it-it'] = "Do you really want to REBOOT these?";
 $text['confirm-reboot']['nl-nl'] = "Do you really want to REBOOT these?";
-$text['confirm-reboot']['pl-pl'] = "Do you really want to REBOOT these?";
+$text['confirm-reboot']['pl-pl'] = "Czy na pewno chcesz je ZRESTARTOWAĆ?";
 $text['confirm-reboot']['pt-br'] = "Do you really want to REBOOT these?";
 $text['confirm-reboot']['pt-pt'] = "Do you really want to REBOOT these?";
 $text['confirm-reboot']['ro-ro'] = "Do you really want to REBOOT these?";
diff --git a/app/registrations/registrations.php b/app/registrations/registrations.php
index 97527b380d..34cc7def70 100644
--- a/app/registrations/registrations.php
+++ b/app/registrations/registrations.php
@@ -145,9 +145,9 @@
 		}
 	}
 	if (!$reload) {
-		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'=>$location.($qs['show'] || $qs['profile'] ? '?' : null).$qs['show'].$qs['profile'],'style'=>($search == '' ? 'display: none;' : null)]);
+		echo 		"<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown=''>";
+		echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search']);
+		//echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>$location.($qs['show'] || $qs['profile'] ? '?' : null).$qs['show'].$qs['profile'],'style'=>($search == '' ? 'display: none;' : null)]);
 	}
 	echo "		</form>\n";
 	echo "	</div>\n";
diff --git a/app/ring_groups/app_config.php b/app/ring_groups/app_config.php
index 2b7c6b23d1..0beada5d51 100644
--- a/app/ring_groups/app_config.php
+++ b/app/ring_groups/app_config.php
@@ -16,7 +16,7 @@
 		$apps[$x]['description']['de-de'] = "Ein Werkzeug um mehrere Nebenstellen anzurufen.";
 		$apps[$x]['description']['es-cl'] = "Una herramienta para llamar a múltiples extensiones";
 		$apps[$x]['description']['es-mx'] = "";
-		$apps[$x]['description']['fr-ca'] = "";
+		$apps[$x]['description']['fr-ca'] = "Outil pour appeler plusieurs extensions"; 
 		$apps[$x]['description']['fr-fr'] = "Outil pour appeler plusieurs extensions.";
 		$apps[$x]['description']['he-il'] = "";
 		$apps[$x]['description']['it-it'] = "";
@@ -154,6 +154,22 @@
 		$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'] = "9917d8e3-1c3c-4771-b2c6-e931c448d6e0";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "ring_group";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "destination_delay_max";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "999";
+		$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'] = "c54fc772-7aa5-40de-8da8-39e0e707658e";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "ring_group";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "destination_timeout_max";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "999";
+		$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'] = "de655030-ae71-4b53-8068-5cf0b14cf635";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "limit";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "ring_groups";
diff --git a/app/ring_groups/app_defaults.php b/app/ring_groups/app_defaults.php
index 64787d82bc..030e868554 100644
--- a/app/ring_groups/app_defaults.php
+++ b/app/ring_groups/app_defaults.php
@@ -56,7 +56,7 @@ if ($domains_processed == 1) {
 				$database = new database;
 				$database->app_name = 'ring_groups';
 				$database->app_uuid = '1d61fb65-1eec-bc73-a6ee-a6203b4fe6f2';
-				$database->save($array);
+				$database->save($array, false);
 				unset($array);
 			//revoke temporary permissions
 				$p->delete('ring_group_edit', 'temp');
@@ -65,4 +65,4 @@ if ($domains_processed == 1) {
 
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/app/ring_groups/app_languages.php b/app/ring_groups/app_languages.php
index 2674e4379c..218ab2a9d4 100644
--- a/app/ring_groups/app_languages.php
+++ b/app/ring_groups/app_languages.php
@@ -644,7 +644,7 @@ $text['label-ring_group_call_forward_enabled']['fr-fr'] = "Call Forward";
 $text['label-ring_group_call_forward_enabled']['he-il'] = "Call Forward";
 $text['label-ring_group_call_forward_enabled']['it-it'] = "Call Forward";
 $text['label-ring_group_call_forward_enabled']['nl-nl'] = "Call Forward";
-$text['label-ring_group_call_forward_enabled']['pl-pl'] = "Call Forward";
+$text['label-ring_group_call_forward_enabled']['pl-pl'] = "Przekierowanie rozmowy";
 $text['label-ring_group_call_forward_enabled']['pt-br'] = "Call Forward"; //copied from pt-pt
 $text['label-ring_group_call_forward_enabled']['pt-pt'] = "Call Forward";
 $text['label-ring_group_call_forward_enabled']['ro-ro'] = "Call Forward";
@@ -665,7 +665,7 @@ $text['label-ring_group_follow_me_enabled']['fr-fr'] = "Follow Me";
 $text['label-ring_group_follow_me_enabled']['he-il'] = "Follow Me";
 $text['label-ring_group_follow_me_enabled']['it-it'] = "Follow Me";
 $text['label-ring_group_follow_me_enabled']['nl-nl'] = "Volg me";
-$text['label-ring_group_follow_me_enabled']['pl-pl'] = "Follow Me";
+$text['label-ring_group_follow_me_enabled']['pl-pl'] = "Podążaj za mną";
 $text['label-ring_group_follow_me_enabled']['pt-br'] = "Follow Me"; //copied from pt-pt
 $text['label-ring_group_follow_me_enabled']['pt-pt'] = "Follow Me";
 $text['label-ring_group_follow_me_enabled']['ro-ro'] = "Follow Me";
@@ -833,7 +833,7 @@ $text['label-distinctive_ring']['fr-fr'] = "Sonnerie Distinctive";
 $text['label-distinctive_ring']['he-il'] = "";
 $text['label-distinctive_ring']['it-it'] = "Squillo Personalizzato";
 $text['label-distinctive_ring']['nl-nl'] = "Alternatieve beltoon";
-$text['label-distinctive_ring']['pl-pl'] = "";
+$text['label-distinctive_ring']['pl-pl'] = "Charakterystyczny Sygnał";
 $text['label-distinctive_ring']['pt-br'] = "";
 $text['label-distinctive_ring']['pt-pt'] = "";
 $text['label-distinctive_ring']['ro-ro'] = "";
@@ -1358,7 +1358,7 @@ $text['description-ring_group_call_forward_enabled']['fr-fr'] = "Choose to follo
 $text['description-ring_group_call_forward_enabled']['he-il'] = "Choose to follow a ring group destination's call forward.";
 $text['description-ring_group_call_forward_enabled']['it-it'] = "Choose to follow a ring group destination's call forward.";
 $text['description-ring_group_call_forward_enabled']['nl-nl'] = "Choose to follow a ring group destination's call forward.";
-$text['description-ring_group_call_forward_enabled']['pl-pl'] = "Choose to follow a ring group destination's call forward.";
+$text['description-ring_group_call_forward_enabled']['pl-pl'] = "Wybierz, aby podążać za przekierowaniem połączenia docelowego grupy odbiorców rozmów";
 $text['description-ring_group_call_forward_enabled']['pt-br'] = "Choose to follow a ring group destination's call forward.";
 $text['description-ring_group_call_forward_enabled']['pt-pt'] = "Choose to follow a ring group destination's call forward.";
 $text['description-ring_group_call_forward_enabled']['ro-ro'] = "Choose to follow a ring group destination's call forward.";
@@ -1379,7 +1379,7 @@ $text['description-ring_group_follow_me_enabled']['fr-fr'] = "Choose to follow a
 $text['description-ring_group_follow_me_enabled']['he-il'] = "Choose to follow a ring group destination's follow me.";
 $text['description-ring_group_follow_me_enabled']['it-it'] = "Choose to follow a ring group destination's follow me.";
 $text['description-ring_group_follow_me_enabled']['nl-nl'] = "Kies om een belgroep volg me, te volgen.";
-$text['description-ring_group_follow_me_enabled']['pl-pl'] = "Choose to follow a ring group destination's follow me.";
+$text['description-ring_group_follow_me_enabled']['pl-pl'] = "Wybierz, aby podążać za destynacją funkcji 'podążaj za mną' grupy odbiorców rozmów";
 $text['description-ring_group_follow_me_enabled']['pt-br'] = "Choose to follow a ring group destination's follow me.";
 $text['description-ring_group_follow_me_enabled']['pt-pt'] = "Choose to follow a ring group destination's follow me.";
 $text['description-ring_group_follow_me_enabled']['ro-ro'] = "Choose to follow a ring group destination's follow me.";
@@ -1484,7 +1484,7 @@ $text['description-distinctive_ring']['fr-fr'] = "Sélectionner un son pour une
 $text['description-distinctive_ring']['he-il'] = "";
 $text['description-distinctive_ring']['it-it'] = "Selezionare il tono per uno squillo personalizzato.";
 $text['description-distinctive_ring']['nl-nl'] = "Kies een geluid voor een afwijkende beltoon.";
-$text['description-distinctive_ring']['pl-pl'] = "";
+$text['description-distinctive_ring']['pl-pl'] = "Wybierz dźwięk dla funkcji charakterystycznego sygnału";
 $text['description-distinctive_ring']['pt-br'] = "";
 $text['description-distinctive_ring']['pt-pt'] = "";
 $text['description-distinctive_ring']['ro-ro'] = "";
@@ -1526,7 +1526,7 @@ $text['description-caller_id_name']['fr-fr'] = "Définir le nom de l'appelant po
 $text['description-caller_id_name']['he-il'] = "";
 $text['description-caller_id_name']['it-it'] = "";
 $text['description-caller_id_name']['nl-nl'] = "Stel de CID naam voor uitgaande oproepen in.";
-$text['description-caller_id_name']['pl-pl'] = "";
+$text['description-caller_id_name']['pl-pl'] = "Ustaw prezentację nazwy dzwoniącego dla wychodzących połączeń zewnętrznych.";
 $text['description-caller_id_name']['pt-br'] = "";
 $text['description-caller_id_name']['pt-pt'] = "";
 $text['description-caller_id_name']['ro-ro'] = "";
@@ -1547,7 +1547,7 @@ $text['description-caller_id_number']['fr-fr'] = "Définir le numéro d'identifi
 $text['description-caller_id_number']['he-il'] = "";
 $text['description-caller_id_number']['it-it'] = "";
 $text['description-caller_id_number']['nl-nl'] = "Stel de CID nummer voor uitgaande oproepen in.";
-$text['description-caller_id_number']['pl-pl'] = "";
+$text['description-caller_id_number']['pl-pl'] = "Ustaw prezentację numeru dzwoniącego dla wychodzących połączeń zewnętrznych.";
 $text['description-caller_id_number']['pt-br'] = "";
 $text['description-caller_id_number']['pt-pt'] = "";
 $text['description-caller_id_number']['ro-ro'] = "";
diff --git a/app/ring_groups/app_menu.php b/app/ring_groups/app_menu.php
index 8d7205d9bc..ad72e7f908 100644
--- a/app/ring_groups/app_menu.php
+++ b/app/ring_groups/app_menu.php
@@ -13,7 +13,7 @@
 	$apps[$x]['menu'][$y]['title']['he-il'] = "קבוצות חיוג";
 	$apps[$x]['menu'][$y]['title']['it-it'] = "Gruppi di Squillo";
 	$apps[$x]['menu'][$y]['title']['nl-nl'] = "Bel groepen";
-	$apps[$x]['menu'][$y]['title']['pl-pl'] = "Grupy odbiorców rozmów.";
+	$apps[$x]['menu'][$y]['title']['pl-pl'] = "Grupy odbiorców rozmów";
 	$apps[$x]['menu'][$y]['title']['pt-br'] = "Grupos de chamada";
 	$apps[$x]['menu'][$y]['title']['pt-pt'] = "Grupos de Ring";
 	$apps[$x]['menu'][$y]['title']['ro-ro'] = "";
diff --git a/app/ring_groups/resources/dashboard/ring_group_forward.php b/app/ring_groups/resources/dashboard/ring_group_forward.php
index 6974288296..d222006c3f 100644
--- a/app/ring_groups/resources/dashboard/ring_group_forward.php
+++ b/app/ring_groups/resources/dashboard/ring_group_forward.php
@@ -227,9 +227,4 @@
 	echo "<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
 	echo "</form>\n";
 
-//include the footer
-	if (!$is_included) {
-		require_once "resources/footer.php";
-	}
-
 ?>
diff --git a/app/ring_groups/ring_group_edit.php b/app/ring_groups/ring_group_edit.php
index 3e0bd9b8cc..6f3ed74a24 100644
--- a/app/ring_groups/ring_group_edit.php
+++ b/app/ring_groups/ring_group_edit.php
@@ -500,6 +500,8 @@
 	}
 
 //set the default
+	$destination_delay_max = $_SESSION['ring_group']['destination_delay_max']['numeric'];
+	$destination_timeout_max = $_SESSION['ring_group']['destination_timeout_max']['numeric'];
 	if (strlen($ring_group_ringback) == 0) {
 		$ring_group_ringback = '${us-ring}';
 	}
@@ -696,7 +698,7 @@
 		echo "<optgroup label=".$text['label-'.$key].">\n";
 		$selected = false;
 		foreach ($value as $row) {
-			if ($ring_group_greeting == $row["value"]) { 
+			if ($ring_group_greeting == $row["value"]) {
 				$selected = true;
 				echo "	<option value='".escape($row["value"])."' selected='selected'>".escape($row["name"])."</option>\n";
 			}
@@ -772,7 +774,7 @@
 		echo "				<td class='formfld'>\n";
 		echo "					<select name='ring_group_destinations[".$x."][destination_delay]' class='formfld' style='width:55px'>\n";
 		$i=0;
-		while ($i <= 300) {
+		while ($i <= $destination_delay_max) {
 			if ($i == $row['destination_delay']) {
 				echo "				<option value='$i' selected='selected'>$i</option>\n";
 			}
@@ -785,8 +787,9 @@
 		echo "				</td>\n";
 		echo "				<td class='formfld'>\n";
 		echo "					<select name='ring_group_destinations[".$x."][destination_timeout]' class='formfld' style='width:55px'>\n";
+
 		$i = 5;
-		while($i <= 300) {
+		while($i <= $destination_timeout_max) {
 			if ($i == $row['destination_timeout']) {
 				echo "				<option value='$i' selected='selected'>$i</option>\n";
 			}
@@ -1056,7 +1059,7 @@
 		echo "</td>\n";
 		echo "</tr>\n";
 	}
-	
+
 	if (permission_exists("ring_group_context")) {
 		echo "<tr>\n";
 		echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
diff --git a/app/ring_groups/ring_groups.php b/app/ring_groups/ring_groups.php
index a50f08c01a..e3d6a31308 100644
--- a/app/ring_groups/ring_groups.php
+++ b/app/ring_groups/ring_groups.php
@@ -97,7 +97,7 @@
 			$parameters['domain_uuid'] = $domain_uuid;
 		}
 		if (isset($search)) {
-			$sql = "and (";
+			$sql .= "and (";
 			$sql .= "lower(ring_group_name) like :search ";
 			$sql .= "or lower(ring_group_extension) like :search ";
 			$sql .= "or lower(ring_group_description) like :search ";
@@ -127,7 +127,7 @@
 		$parameters['domain_uuid'] = $domain_uuid;
 	}
 	if (isset($search)) {
-		$sql = "and (";
+		$sql .= "and (";
 		$sql .= "lower(ring_group_name) like :search ";
 		$sql .= "or lower(ring_group_extension) like :search ";
 		$sql .= "or lower(ring_group_description) like :search ";
@@ -174,9 +174,9 @@
 			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'=>'ring_groups.php','style'=>($search == '' ? 'display: none;' : null)]);
+	echo 		"<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown=''>";
+	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search']);
+	//echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'ring_groups.php','style'=>($search == '' ? 'display: none;' : null)]);
 	if ($paging_controls_mini != '') {
 		echo 	"<span style='margin-left: 15px;'>".$paging_controls_mini."</span>";
 	}
diff --git a/app/scripts/resources/scripts/app/call_block/index.lua b/app/scripts/resources/scripts/app/call_block/index.lua
index 4f9a16b849..140f00e72d 100644
--- a/app/scripts/resources/scripts/app/call_block/index.lua
+++ b/app/scripts/resources/scripts/app/call_block/index.lua
@@ -51,6 +51,7 @@
 		context = session:getVariable("context");
 		call_block = session:getVariable("call_block");
 		extension_uuid = session:getVariable("extension_uuid");
+		hold_music = session:getVariable("hold_music");
 	end
 
 --set default variables
@@ -172,9 +173,9 @@
 				end
 				if (call_block_app ~= nil and call_block_app == 'hold') then
 					if (session:ready()) then
-						session:execute("respond", '600');
 						session:execute('set', 'call_block_uuid='..call_block_uuid);
 						session:execute('set', 'call_block_app=hold');
+						session:execute("playback", hold_music);
 						freeswitch.consoleLog("notice", "[call_block] caller id number " .. caller_id_number .. " action: Hold\n");
 					end
 				end
@@ -205,6 +206,15 @@
 							freeswitch.consoleLog("notice", "[call_block] caller id number " .. caller_id_number .. " action: extension ".. call_block_data.."\n");
 						end
 					end
+					if (call_block_app == 'ring_group') then
+						if (session:ready()) then
+							session:execute('set', 'call_block_uuid='..call_block_uuid);
+							session:execute('set', 'call_block_app='..call_block_app);
+							session:execute('set', 'call_block_data='..call_block_data);
+							session:execute("transfer", call_block_data..' XML '.. context);
+							freeswitch.consoleLog("notice", "[call_block] caller id number " .. caller_id_number .. " action: extension ".. call_block_data.."\n");
+						end
+					end
 					if (call_block_app == 'voicemail') then
 						if (session:ready()) then
 							session:execute('set', 'call_block_uuid='..call_block_uuid);
diff --git a/app/scripts/resources/scripts/app/conference_center/index.lua b/app/scripts/resources/scripts/app/conference_center/index.lua
index c0c6fbf278..e374a97b76 100644
--- a/app/scripts/resources/scripts/app/conference_center/index.lua
+++ b/app/scripts/resources/scripts/app/conference_center/index.lua
@@ -1,6 +1,6 @@
 --	conference_center/index.lua
 --	Part of FusionPBX
---	Copyright (C) 2013 - 2015 Mark J Crane <markjcrane@fusionpbx.com>
+--	Copyright (C) 2013 - 2021 Mark J Crane <markjcrane@fusionpbx.com>
 --	All rights reserved.
 --
 --	Redistribution and use in source and binary forms, with or without
@@ -43,8 +43,9 @@
 	dbh = Database.new('system');
 	local settings = Settings.new(dbh, domain_name, domain_uuid);
 
---get the cache directory
+--get the settings
 	session_enabled = settings:get('conference_center', 'session_enabled', 'boolean');
+	account_code_enabled = settings:get('conference_center', 'account_code_enabled', 'boolean');
 
 --include json library
 	local json
@@ -109,10 +110,11 @@
 					link_address = http_protocol.."://"..domain_name..project_path;
 
 				--prepare the headers
-					headers = '{"X-FusionPBX-Domain-UUID":"'..domain_uuid..'",';
-					headers = headers..'"X-FusionPBX-Domain-Name":"'..domain_name..'",';
-					headers = headers..'"X-FusionPBX-Call-UUID":"na",';
-					headers = headers..'"X-FusionPBX-Email-Type":"conference"}';
+					headers = {}
+					headers["X-FusionPBX-Domain-UUID"] = domain_uuid;
+					headers["X-FusionPBX-Domain-Name"] = domain_name;
+					headers["X-FusionPBX-Call-UUID"]   = 'na';
+					headers["X-FusionPBX-Email-Type"]  = 'conference';
 
 				--remove quotes from caller id name and number
 					caller_id_name = caller_id_name:gsub("'", "&#39;");
@@ -151,14 +153,22 @@
 
 				--send the email
 					if (string.len(attachment) > 4) then
-						cmd = "luarun email.lua "..email.." "..email.." '"..headers.."' '"..subject.."' '"..body.."' '"..attachment.."'";
+						send_mail(headers,
+							email,
+							email,
+							{subject, body},
+							attachment
+							);
 					else
-						cmd = "luarun email.lua "..email.." "..email.." '"..headers.."' '"..subject.."' '"..body.."'";
+						send_mail(headers,
+							email,
+							email,
+							{subject, body}
+							);
 					end
 					if (debug["info"]) then
-						freeswitch.consoleLog("notice", "[voicemail] cmd: " .. cmd .. "\n");
+						freeswitch.consoleLog("notice", "[voicemail] cmd: " .. email .. " " .. subject .. " " .. body .. "\n");
 					end
-					result = api:executeString(cmd);
 			end
 
 	end
@@ -581,6 +591,30 @@
 				member_type = "participant";
 			end
 
+		--get the account code
+			if (account_code_enabled == 'true' and member_type == 'moderator') then
+				--request the account code
+					min_digits = 2;
+					max_digits = 20;
+					account_code = session:playAndGetDigits(min_digits, max_digits, max_tries, digit_timeout, "#", "phrase:voicemail_enter_id:#", "", "\\d+");
+					--user_id = session:playAndGetDigits(min_digits, max_digits, max_tries, digit_timeout, "#", sounds_dir.."/"..default_language.."/"..default_dialect.."/"..default_voice.."/ivr/ivr-please_enter_extension_followed_by_pound.wav", "", "\\d+");
+
+				--update the account code
+					local sql = {}
+					table.insert(sql, "update v_conference_rooms ");
+					table.insert(sql, "set account_code = :account_code ");
+					table.insert(sql, "where conference_center_uuid = :conference_center_uuid ");
+					sql = table.concat(sql, "\n");
+					local params = {
+						conference_center_uuid = conference_center_uuid;
+						account_code = account_code;
+					};
+					if (debug["sql"]) then
+						freeswitch.consoleLog("notice", "[conference center] SQL: " .. sql .. "; params:" .. json.encode(params) .. "\n");
+					end
+					dbh:query(sql, params);
+			end
+
 		--close the database connection
 			dbh:release();
 
@@ -600,12 +634,14 @@
 			end
 
 		--check if the conference exists
-			cmd = "conference "..conference_room_uuid.."@"..domain_name.." xml_list";
-			result = trim(api:executeString(cmd));
-			if (string.sub(result, -9) == "not found") then
-				conference_exists = false;
-			else
-				conference_exists = true;
+			if (conference_room_uuid and domain_name) then
+				cmd = "conference "..conference_room_uuid.."@"..domain_name.." xml_list";
+				result = trim(api:executeString(cmd));
+				if (string.sub(result, -9) == "not found") then
+					conference_exists = false;
+				else
+					conference_exists = true;
+				end
 			end
 
 		--check if the conference is locked
@@ -798,4 +834,3 @@
 			freeswitch.consoleLog("INFO","[conference center] conference " .. cmd .. "\n");
 			session:execute("conference", cmd);
 	end
-
diff --git a/app/scripts/resources/scripts/app/emergency_notify/index.lua b/app/scripts/resources/scripts/app/emergency_notify/index.lua
index 805b2a89d6..ef201fd366 100644
--- a/app/scripts/resources/scripts/app/emergency_notify/index.lua
+++ b/app/scripts/resources/scripts/app/emergency_notify/index.lua
@@ -65,10 +65,11 @@
 			end
 
 		--prepare the headers
-			headers = '{"X-FusionPBX-Domain-UUID":"'..domain_uuid..'",';
-			headers = headers..'"X-FusionPBX-Domain-Name":"'..domain_name..'",';
-			headers = headers..'"X-FusionPBX-Call-UUID":"'..uuid..'",';
-			headers = headers..'"X-FusionPBX-Email-Type":"emergency_call"}';
+		    local headers = {}
+		    headers["X-FusionPBX-Domain-UUID"] = domain_uuid;
+		    headers["X-FusionPBX-Domain-Name"] = domain_name;
+		    headers["X-FusionPBX-Call-UUID"]   = uuid;
+		    headers["X-FusionPBX-Email-Type"]  = 'emergency_call';
 
 		--remove quotes from caller id name and number
 			caller_id_name = caller_id_name:gsub("'", "&#39;");
@@ -103,12 +104,12 @@
 			body = trim(body);
 
 		--send the email
-			cmd = "luarun email.lua "..to_email.." "..from_email.." "..headers.." '"..subject.."' '"..body.."'";
-			if (debug["info"]) then
-				freeswitch.consoleLog("notice", "[emergency call] cmd: " .. cmd .. "\n");
-			end
-			api = freeswitch.API();
-			result = api:executeString(cmd);
+			send_mail(headers,
+				from_email,
+				to_email,
+				{subject, body}
+				);
+
 	end
 
 --handle originate_disposition
diff --git a/app/scripts/resources/scripts/app/failure_handler/index.lua b/app/scripts/resources/scripts/app/failure_handler/index.lua
index 01cb8f69b8..02de99fbc6 100644
--- a/app/scripts/resources/scripts/app/failure_handler/index.lua
+++ b/app/scripts/resources/scripts/app/failure_handler/index.lua
@@ -102,8 +102,9 @@
 					body = body:gsub("\n", "");
 					body = trim(body);
 
-				--send the emails
+				--send the email
 					send_mail(headers,
+						nil,
 						missed_call_data,
 						{subject, body}
 					);
diff --git a/app/scripts/resources/scripts/app/fax/resources/scripts/hangup_rx.lua b/app/scripts/resources/scripts/app/fax/resources/scripts/hangup_rx.lua
index a56be490e0..a7c5a0db48 100644
--- a/app/scripts/resources/scripts/app/fax/resources/scripts/hangup_rx.lua
+++ b/app/scripts/resources/scripts/app/fax/resources/scripts/hangup_rx.lua
@@ -16,7 +16,7 @@
 --
 --	The Initial Developer of the Original Code is
 --	Mark J Crane <markjcrane@fusionpbx.com>
---	Copyright (C) 2015-2019
+--	Copyright (C) 2015-2022
 --	the Initial Developer. All Rights Reserved.
 --
 --	Contributor(s):
@@ -41,14 +41,15 @@
 		json = require "resources.functions.lunajson"
 	end
 
---define the explode function
+--additional includes
 	require "resources.functions.explode";
-
---array count
 	require "resources.functions.count";
+	require "resources.functions.send_mail";
 
+--check if windows
 	local IS_WINDOWS = (package.config:sub(1,1) == '\\')
 
+--define function quote
 	local function quote(s)
 		local q = IS_WINDOWS and '"' or "'"
 		if s:find('%s') or s:find(q, nil, true) then
@@ -57,13 +58,13 @@
 		return s
 	end
 
--- escape shell arguments to prevent command injection
-        local function shell_esc(x)
-                return (x:gsub('\\', '\\\\')
-                       :gsub('\'', '\\\''))
-        end
+--escape shell arguments to prevent command injection
+	local function shell_esc(x)
+		return (x:gsub('\\', '\\\\')
+			:gsub('\'', '\\\''))
+	end
 
--- set channel variables to lua variables
+--set channel variables to lua variables
 	domain_uuid = env:getHeader("domain_uuid");
 	domain_name = env:getHeader("domain_name");
 
@@ -97,11 +98,11 @@
 		end
 	end
 
--- show all channel variables
+--show all channel variables
 	serialized = env:serialize()
 	freeswitch.consoleLog("INFO","[fax]\n" .. serialized .. "\n")
 
--- example channel variables relating to fax
+--example channel variables relating to fax
 	--variable_fax_success: 0
 	--variable_fax_result_code: 49
 	--variable_fax_result_text: The%20call%20dropped%20prematurely
@@ -114,9 +115,10 @@
 	--variable_fax_bad_rows: 0
 	--variable_fax_transfer_rate: 14400
 
--- set channel variables to lua variables
-	fax_uuid = env:getHeader("fax_uuid");
+--set channel variables to lua variables
 	uuid = env:getHeader("uuid");
+	fax_uuid = env:getHeader("fax_uuid");
+	fax_queue_uuid = env:getHeader("fax_queue_uuid");
 	fax_success = env:getHeader("fax_success");
 	fax_result_text = env:getHeader("fax_result_text");
 	fax_local_station_id = env:getHeader("fax_local_station_id");
@@ -135,7 +137,7 @@
 	hangup_cause_q850 = tonumber(env:getHeader("hangup_cause_q850"));
 	fax_file = env:getHeader("fax_file");
 
--- prevent nil errors
+--prevent nil errors
 	if (fax_file == nil) then
 		fax_file = env:getHeader("fax_filename");
 	end
@@ -151,6 +153,9 @@
 	if (caller_id_number == nil) then
 		caller_id_number = env:getHeader("Caller-Caller-ID-Number");
 	end
+	if (document_root == nil) then
+		document_root = '';
+	end
 
 --set default values
 	if (not fax_success) then
@@ -205,7 +210,7 @@
 	end
 
 --fax to email
-	-- cmd = "lua" .. " " .. quote(scripts_dir .. "/fax_to_email.lua") .. " ";
+	cmd = "lua" .. " " .. quote(scripts_dir .. "/fax_to_email.lua") .. " ";
 	cmd = quote(shell_esc(php_dir).."/"..shell_esc(php_bin)).." "..quote(shell_esc(document_root).."/secure/fax_to_email.php").." ";
 	cmd = cmd .. "email="..quote(shell_esc(fax_email)).." ";
 	cmd = cmd .. "extension="..quote(shell_esc(fax_extension)).." ";
@@ -225,7 +230,9 @@
 		cmd = cmd .. "fax_prefix=false ";
 	end
 	freeswitch.consoleLog("notice", "[fax] command: " .. cmd .. "\n");
-	result = api:execute("system", cmd);
+	local handle = io.popen(cmd);
+	result = handle:read("*a");
+	handle:close();
 
 --add to fax logs
 	sql = "insert into v_fax_logs ";
@@ -415,7 +422,7 @@
 		end
 	end
 
--- send the selected variables to the console
+--send the selected variables to the console
 	if (fax_success ~= nil) then
 		freeswitch.consoleLog("INFO","fax_success: '" .. fax_success .. "'\n");
 	end
diff --git a/app/scripts/resources/scripts/app/fax/resources/scripts/hangup_tx.lua b/app/scripts/resources/scripts/app/fax/resources/scripts/hangup_tx.lua
new file mode 100644
index 0000000000..ba1a5da83d
--- /dev/null
+++ b/app/scripts/resources/scripts/app/fax/resources/scripts/hangup_tx.lua
@@ -0,0 +1,443 @@
+--
+--	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>
+--	Copyright (C) 2015-2022
+--	the Initial Developer. All Rights Reserved.
+--
+--	Contributor(s):
+--		Mark J. Crane
+
+--set the debug options
+	debug["sql"] = true;
+
+--create the api object
+	api = freeswitch.API();
+
+--include config.lua
+	require "resources.functions.config";
+
+--connect to the database
+	local Database = require "resources.functions.database";
+	dbh = Database.new('system');
+
+--include json library
+	local json
+	if (debug["sql"]) then
+		json = require "resources.functions.lunajson"
+	end
+
+--additional includes
+	require "resources.functions.explode";
+	require "resources.functions.count";
+	require "resources.functions.send_mail";
+
+--check if windows
+	local IS_WINDOWS = (package.config:sub(1,1) == '\\')
+
+--define function quote
+	local function quote(s)
+		local q = IS_WINDOWS and '"' or "'"
+		if s:find('%s') or s:find(q, nil, true) then
+			s = q .. s:gsub(q, q..q) .. q
+		end
+		return s
+	end
+
+--escape shell arguments to prevent command injection
+	local function shell_esc(x)
+		return (x:gsub('\\', '\\\\')
+			:gsub('\'', '\\\''))
+	end
+
+--set channel variables to lua variables
+	domain_uuid = env:getHeader("domain_uuid");
+	domain_name = env:getHeader("domain_name");
+
+--get the domain_uuid using the domain name required for multi-tenant
+	if (domain_name ~= nil) then
+		sql = "SELECT domain_uuid FROM v_domains ";
+		sql = sql .. "WHERE domain_name = :domain_name ";
+		dbh:query(sql, {domain_name = domain_name}, function(rows)
+			domain_uuid = rows["domain_uuid"];
+		end);
+	end
+
+--settings
+	require "resources.functions.settings";
+	settings = settings(domain_uuid);
+	storage_type = "";
+	storage_path = "";
+	if (settings['fax'] ~= nil) then
+		if (settings['fax']['storage_type'] ~= nil) then
+			if (settings['fax']['storage_type']['text'] ~= nil) then
+				storage_type = settings['fax']['storage_type']['text'];
+			end
+		end
+		if (settings['fax']['storage_path'] ~= nil) then
+			if (settings['fax']['storage_path']['text'] ~= nil) then
+				storage_path = settings['fax']['storage_path']['text'];
+				storage_path = storage_path:gsub("${domain_name}", domain_name);
+				storage_path = storage_path:gsub("${voicemail_id}", voicemail_id);
+				storage_path = storage_path:gsub("${voicemail_dir}", voicemail_dir);
+			end
+		end
+	end
+
+--show all channel variables
+	serialized = env:serialize()
+	freeswitch.consoleLog("INFO","[fax]\n" .. serialized .. "\n")
+
+--example channel variables relating to fax
+	--variable_fax_success: 0
+	--variable_fax_result_code: 49
+	--variable_fax_result_text: The%20call%20dropped%20prematurely
+	--variable_fax_ecm_used: off
+	--variable_fax_local_station_id: SpanDSP%20Fax%20Ident
+	--variable_fax_document_transferred_pages: 0
+	--variable_fax_document_total_pages: 0
+	--variable_fax_image_resolution: 0x0
+	--variable_fax_image_size: 0
+	--variable_fax_bad_rows: 0
+	--variable_fax_transfer_rate: 14400
+
+--set channel variables to lua variables
+	uuid = env:getHeader("uuid");
+	fax_uuid = env:getHeader("fax_uuid");
+	fax_queue_uuid = env:getHeader("fax_queue_uuid");
+	fax_success = env:getHeader("fax_success");
+	fax_result_text = env:getHeader("fax_result_text");
+	fax_local_station_id = env:getHeader("fax_local_station_id");
+	fax_ecm_used = env:getHeader("fax_ecm_used");
+	fax_uri = env:getHeader("fax_uri");
+	fax_extension_number = env:getHeader("fax_extension_number");
+	caller_id_name = env:getHeader("caller_id_name");
+	caller_id_number = env:getHeader("caller_id_number");
+	fax_bad_rows = env:getHeader("fax_bad_rows");
+	fax_transfer_rate = env:getHeader("fax_transfer_rate");
+	sip_to_user = env:getHeader("sip_to_user");
+	bridge_hangup_cause = env:getHeader("bridge_hangup_cause");
+	fax_result_code = env:getHeader("fax_result_code");
+	fax_remote_station_id = env:getHeader("fax_remote_station_id");
+	fax_document_total_pages = env:getHeader("fax_document_total_pages");
+	hangup_cause_q850 = tonumber(env:getHeader("hangup_cause_q850"));
+	fax_file = env:getHeader("fax_file");
+
+--prevent nil errors
+	if (fax_file == nil) then
+		fax_file = env:getHeader("fax_filename");
+	end
+	if (fax_uri == nil) then
+		fax_uri = "";
+	end
+	if (fax_remote_station_id == nil) then
+		fax_remote_station_id = "";
+	end
+	if (caller_id_name == nil) then
+		caller_id_name = env:getHeader("Caller-Caller-ID-Name");
+	end
+	if (caller_id_number == nil) then
+		caller_id_number = env:getHeader("Caller-Caller-ID-Number");
+	end
+	if (document_root == nil) then
+		document_root = '';
+	end
+
+--set default values
+	if (not fax_success) then
+		fax_success = "0";
+		fax_result_code = 2;
+	end
+	if (hangup_cause_q850 == "17") then
+		fax_success = "0";
+		fax_result_code = 2;
+	end
+	if (not fax_result_text) then
+		fax_result_text = "FS_NOT_SET";
+	end
+
+--fax sent successfully
+	if (fax_success == '1') then
+		fax_status = 'sent';
+	else
+		fax_status = 'trying';
+	end
+
+--fax busy
+	if (fax_result_code == "2"  or fax_result_code == "3" or hangup_cause_q850 == 17) then
+		--do nothing. don't want to increment
+		freeswitch.consoleLog("INFO","[FAX] Last Fax was probably Busy, don't increment retry_attempts. \n");
+		fax_status = 'busy';
+	end
+
+--get the fax settings from the database
+	local sql = [[SELECT * FROM v_fax
+		WHERE fax_uuid = :fax_uuid
+		AND domain_uuid = :domain_uuid]];
+	local params = {fax_uuid = fax_uuid, domain_uuid = domain_uuid};
+	if (debug["sql"]) then
+		freeswitch.consoleLog("notice", "[fax] SQL: " .. sql .. "; params:" .. json.encode(params) .. "\n");
+	end
+	dbh:query(sql, params, function(row)
+		dialplan_uuid = row["dialplan_uuid"];
+		fax_extension = row["fax_extension"];
+		fax_accountcode = row["accountcode"];
+		fax_destination_number = row["fax_destination_number"];
+		fax_name = row["fax_name"];
+		fax_prefix = row["fax_prefix"];
+		fax_email = row["fax_email"];
+		fax_email_connection_type = row["fax_email_connection_type"];
+		fax_email_connection_host = row["fax_email_connection_host"];
+		fax_email_connection_port = row["fax_email_connection_port"];
+		fax_email_connection_security = row["fax_email_connection_security"];
+		fax_email_connection_validate = row["fax_email_connection_validate"];
+		fax_email_connection_username = row["fax_email_connection_username"];
+		fax_email_connection_password = row["fax_email_connection_password"];
+		fax_email_connection_mailbox = row["fax_email_connection_mailbox"];
+		fax_email_inbound_subject_tag = row["fax_email_inbound_subject_tag"];
+		fax_email_outbound_subject_tag = row["fax_email_outbound_subject_tag"];
+		fax_email_outbound_authorized_senders = row["fax_email_outbound_authorized_senders"];
+		fax_caller_id_name = row["fax_caller_id_name"];
+		fax_caller_id_number = row["fax_caller_id_number"];
+		fax_forward_number = row["fax_forward_number"];
+		fax_description = row["fax_description"];
+	end);
+
+--get the values from the fax file
+	if (fax_file ~= nil) then
+		array = explode("/", fax_file);
+		fax_file_name = array[count(array)];
+	end
+
+--update the email queue status
+	if (fax_success == '1') then
+		sql = "update v_fax_queue ";
+		sql = sql .. "set fax_status = :fax_status ";
+		sql = sql .. "where fax_queue_uuid = :fax_queue_uuid ";
+		local params = {fax_queue_uuid = fax_queue_uuid, fax_status = fax_status}
+		dbh:query(sql, params);
+	end
+
+--add to fax logs
+	sql = "insert into v_fax_logs ";
+	sql = sql .. "(";
+	sql = sql .. "fax_log_uuid, ";
+	sql = sql .. "domain_uuid, ";
+	if (fax_uuid ~= nil) then
+		sql = sql .. "fax_uuid, ";
+	end
+	sql = sql .. "fax_success, ";
+	sql = sql .. "fax_result_code, ";
+	sql = sql .. "fax_result_text, ";
+	sql = sql .. "fax_file, ";
+	if (fax_ecm_used ~= nil) then
+		sql = sql .. "fax_ecm_used, ";
+	end
+	if (fax_local_station_id ~= nil) then
+		sql = sql .. "fax_local_station_id, ";
+	end
+	sql = sql .. "fax_document_transferred_pages, ";
+	sql = sql .. "fax_document_total_pages, ";
+	if (fax_image_resolution ~= nil) then
+		sql = sql .. "fax_image_resolution, ";
+	end
+	if (fax_image_size ~= nil) then
+		sql = sql .. "fax_image_size, ";
+	end
+	if (fax_bad_rows ~= nil) then
+		sql = sql .. "fax_bad_rows, ";
+	end
+	if (fax_transfer_rate ~= nil) then
+		sql = sql .. "fax_transfer_rate, ";
+	end
+	if (fax_uri ~= nil) then
+		sql = sql .. "fax_uri, ";
+	end
+	sql = sql .. "fax_date, ";
+	sql = sql .. "fax_epoch ";
+	sql = sql .. ") ";
+	sql = sql .. "values ";
+	sql = sql .. "(";
+	sql = sql .. ":uuid, ";
+	sql = sql .. ":domain_uuid, ";
+	if (fax_uuid ~= nil) then
+		sql = sql .. ":fax_uuid, ";
+	end
+	sql = sql .. ":fax_success, ";
+	sql = sql .. ":fax_result_code, ";
+	sql = sql .. ":fax_result_text, ";
+	sql = sql .. ":fax_file, ";
+	if (fax_ecm_used ~= nil) then
+		sql = sql .. ":fax_ecm_used, ";
+	end
+	if (fax_local_station_id ~= nil) then
+		sql = sql .. ":fax_local_station_id, ";
+	end
+	sql = sql .. ":fax_document_transferred_pages, ";
+	sql = sql .. ":fax_document_total_pages, ";
+	if (fax_image_resolution ~= nil) then
+		sql = sql .. ":fax_image_resolution, ";
+	end
+	if (fax_image_size ~= nil) then
+		sql = sql .. ":fax_image_size, ";
+	end
+	if (fax_bad_rows ~= nil) then
+		sql = sql .. ":fax_bad_rows, ";
+	end
+	if (fax_transfer_rate ~= nil) then
+		sql = sql .. ":fax_transfer_rate, ";
+	end
+	if (fax_uri ~= nil) then
+		sql = sql .. ":fax_uri, ";
+	end
+	if (database["type"] == "sqlite") then
+		sql = sql .. ":fax_date, ";
+	else
+		sql = sql .. "now(), ";
+	end
+	sql = sql .. ":fax_time ";
+	sql = sql .. ")";
+	local params = {
+		uuid = uuid;
+		domain_uuid = domain_uuid;
+		fax_uuid = fax_uuid;
+		fax_success = fax_success;
+		fax_result_code = fax_result_code;
+		fax_result_text = fax_result_text;
+		fax_file = fax_file;
+		fax_ecm_used = fax_ecm_used;
+		fax_local_station_id = fax_local_station_id;
+		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;
+		fax_image_size = fax_image_size;
+		fax_bad_rows = fax_bad_rows;
+		fax_transfer_rate = fax_transfer_rate;
+		fax_uri = fax_uri;
+		fax_date = os.date("%Y-%m-%d %X");
+		fax_time = os.time();
+	};
+	if (debug["sql"]) then
+		freeswitch.consoleLog("notice", "[fax] SQL: " .. sql .. "; params:" .. json.encode(params) .. "\n");
+	end
+	dbh:query(sql, params);
+
+--prepare base64
+	if (storage_type == "base64") then
+		--include the file io
+			local file = require "resources.functions.file"
+
+		--read file content as base64 string
+			fax_base64 = assert(file.read_base64(fax_file));
+	end
+
+--add the fax files
+	local sql = {}
+	table.insert(sql, "insert into v_fax_files ");
+	table.insert(sql, "(");
+	table.insert(sql, "fax_file_uuid, ");
+	table.insert(sql, "fax_uuid, ");
+	table.insert(sql, "fax_mode, ");
+	table.insert(sql, "fax_file_type, ");
+	table.insert(sql, "fax_file_path, ");
+	if (caller_id_name ~= nil) then
+		table.insert(sql, "fax_caller_id_name, ");
+	end
+	if (caller_id_number ~= nil) then
+		table.insert(sql, "fax_caller_id_number, ");
+	end
+	table.insert(sql, "fax_destination, ");
+	table.insert(sql, "fax_date, ");
+	table.insert(sql, "fax_epoch, ");
+	if (storage_type == "base64") then
+		table.insert(sql, "fax_base64, ");
+	end
+	table.insert(sql, "domain_uuid");
+	table.insert(sql, ") ");
+	table.insert(sql, "values ");
+	table.insert(sql, "(");
+	table.insert(sql, ":uuid, ");
+	table.insert(sql, ":fax_uuid, ");
+	table.insert(sql, "'tx', ");
+	table.insert(sql, "'tif', ");
+	table.insert(sql, ":fax_file, ");
+	if (caller_id_name ~= nil) then
+		table.insert(sql, ":caller_id_name, ");
+	end
+	if (caller_id_number ~= nil) then
+		table.insert(sql, ":caller_id_number, ");
+	end
+	table.insert(sql, ":fax_destination, ");
+	if (database["type"] == "sqlite") then
+		table.insert(sql, ":fax_date, ");
+	else
+		table.insert(sql, "now(), ");
+	end
+	table.insert(sql, ":fax_time, ");
+	if (storage_type == "base64") then
+		table.insert(sql, ":fax_base64, ");
+	end
+	table.insert(sql, ":domain_uuid");
+	table.insert(sql, ")");
+	sql = table.concat(sql, "\n");
+	local params = {
+		uuid = uuid;
+		domain_uuid = domain_uuid;
+		fax_uuid = fax_uuid;
+		fax_file = fax_file;
+		caller_id_name = fax_caller_id_name;
+		caller_id_number = fax_caller_id_number;
+		fax_destination = sip_to_user;
+		fax_base64 = fax_base64;
+		fax_date = os.date("%Y-%m-%d %X");
+		fax_time = os.time();
+	};
+	if (debug["sql"]) then
+		freeswitch.consoleLog("notice", "[fax] SQL: " .. sql .. "; params:" .. json.encode(params) .. "\n");
+	end
+	if (storage_type == "base64") then
+		local dbh = Database.new('system', 'base64');
+		dbh:query(sql, params);
+		dbh:release();
+	else
+		dbh:query(sql, params);
+	end
+
+--send the selected variables to the console
+	if (fax_success ~= nil) then
+		freeswitch.consoleLog("INFO","fax_success: '" .. fax_success .. "'\n");
+	end
+	freeswitch.consoleLog("INFO","domain_uuid: '" .. domain_uuid .. "'\n");
+	freeswitch.consoleLog("INFO","domain_name: '" .. domain_name .. "'\n");
+	freeswitch.consoleLog("INFO","fax_uuid: '" .. fax_uuid .. "'\n");
+	freeswitch.consoleLog("INFO","fax_extension: '" .. fax_extension .. "'\n");
+	freeswitch.consoleLog("INFO","fax_result_text: '" .. fax_result_text .. "'\n");
+	freeswitch.consoleLog("INFO","fax_file: '" .. fax_file .. "'\n");
+	freeswitch.consoleLog("INFO","uuid: '" .. uuid .. "'\n");
+	--freeswitch.consoleLog("INFO","fax_ecm_used: '" .. fax_ecm_used .. "'\n");
+	freeswitch.consoleLog("INFO","fax_uri: '" .. fax_uri.. "'\n");
+	if (caller_id_name ~= nil) then
+		freeswitch.consoleLog("INFO","caller_id_name: " .. fax_caller_id_name .. "\n");
+	end
+	if (caller_id_number ~= nil) then
+		freeswitch.consoleLog("INFO","caller_id_number: " .. fax_caller_id_number .. "\n");
+	end
+	freeswitch.consoleLog("INFO","fax_destination: " .. sip_to_user .. "\n");
+	freeswitch.consoleLog("INFO","fax_result_code: ".. fax_result_code .."\n");
+	--freeswitch.consoleLog("INFO","mailfrom_address: ".. from_address .."\n");
+	--freeswitch.consoleLog("INFO","mailto_address: ".. email_address .."\n");
+	freeswitch.consoleLog("INFO","hangup_cause_q850: '" .. hangup_cause_q850 .. "'\n");
diff --git a/app/scripts/resources/scripts/app/fax/resources/scripts/queue/tasks.lua b/app/scripts/resources/scripts/app/fax/resources/scripts/queue/tasks.lua
index f2f9621eea..df6dc57580 100644
--- a/app/scripts/resources/scripts/app/fax/resources/scripts/queue/tasks.lua
+++ b/app/scripts/resources/scripts/app/fax/resources/scripts/queue/tasks.lua
@@ -255,7 +255,7 @@ local function send_mail_task(task, message, call_uuid, file)
     ["X-FusionPBX-Email-Type"]  = 'email2fax';
   }
 
-  return send_mail(mail_x_headers, task.reply_address, message, file)
+  return send_mail(mail_x_headers, nil, task.reply_address, message, file)
 end
 
 local function read_file(name, mode)
diff --git a/app/scripts/resources/scripts/app/feature_event/index.lua b/app/scripts/resources/scripts/app/feature_event/index.lua
index 68fa615747..4d87b03215 100644
--- a/app/scripts/resources/scripts/app/feature_event/index.lua
+++ b/app/scripts/resources/scripts/app/feature_event/index.lua
@@ -51,51 +51,43 @@
 --connect to the database
 	local Database = require "resources.functions.database";
 	local Settings = require "resources.functions.lazy_settings"
-	local route_to_bridge = require "resources.functions.route_to_bridge"
-	local blf = require "resources.functions.blf"
 	local cache = require "resources.functions.cache"
 	local notify = require "app.feature_event.resources.functions.feature_event_notify"
 	dbh = Database.new('system');
 	local settings = Settings.new(dbh, domain_name, domain_uuid);
 
 --set debug
-	debug["sql"] = true;
+	debug["sql"] = false;
 
 --include json library
 	local json
 	if (debug["sql"]) then
 		json = require "resources.functions.lunajson"
 	end
-	
-	local function empty(t)
-		return (not t) or (#t == 0)
-	end
 
 --get the events
-	--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");
+	--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");
-			domain_name     = event:getHeader("host");
-			contact         = event:getHeader("contact");
-			feature_action  = event:getHeader("Feature-Action");
-			feature_enabled = event:getHeader("Feature-Enabled");
-			action_name     = event:getHeader("Action-Name");
-			action_value    = event:getHeader("Action-Value")
-			ring_count      = event:getHeader("ringCount")
+	--get the event variables
+		user            = event:getHeader("user");
+		host            = event:getHeader("host");
+		domain_name     = event:getHeader("host");
+		contact         = event:getHeader("contact");
+		feature_action  = event:getHeader("Feature-Action");
+		feature_enabled = event:getHeader("Feature-Enabled");
+		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");
-			--if (feature_action ~= nil) then freeswitch.consoleLog("notice","[events] feature_action: " .. feature_action .. "\n");	end
-			--if (feature_enabled ~= nil) then freeswitch.consoleLog("notice","[events] feature_enabled: " .. feature_enabled .. "\n"); end
-			--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
+	--send to the log
+		-- freeswitch.consoleLog("notice","[events] user: " .. user .. "\n");
+		-- freeswitch.consoleLog("notice","[events] host: " .. host .. "\n");
+		-- if (feature_action ~= nil) then freeswitch.consoleLog("notice","[events] feature_action: " .. feature_action .. "\n");	end
+		-- if (feature_enabled ~= nil) then freeswitch.consoleLog("notice","[events] feature_enabled: " .. feature_enabled .. "\n"); end
+		-- 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
 
 	--get the domain uuid from the host
 		local sql = "select * from v_domains ";
@@ -121,66 +113,29 @@
 	--DND
 		if (sip_profiles ~= nil) then
 		--DND enabled
-			if (feature_action == "SetDoNotDisturb" and feature_enabled == "true") then
-				--set a variable
-					dial_string = "!USER_BUSY";
-					do_not_disturb = "true";
+			if (feature_action == "SetDoNotDisturb") then
+				--set dnd
+					if(feature_enabled == "true") then
+						do_not_disturb = "true";
+					else
+						do_not_disturb = "false";
+					end
 
 				--update the extension
 					sql = "update v_extensions set ";
-					sql = sql .. "do_not_disturb = :do_not_disturb, ";
-					sql = sql .. "forward_all_enabled = 'false', ";
-					sql = sql .. "dial_string = :dial_string ";
+					sql = sql .. "do_not_disturb = :do_not_disturb ";
 					sql = sql .. "where domain_uuid = :domain_uuid ";
 					sql = sql .. "and extension_uuid = :extension_uuid ";
-					local params = {domain_uuid = domain_uuid, extension_uuid = extension_uuid, do_not_disturb = do_not_disturb, dial_string = dial_string};
+					local params = {domain_uuid = domain_uuid, extension_uuid = extension_uuid, do_not_disturb = do_not_disturb};
 					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
-					end
-
 				--send notify to the phone
 					notify.dnd(user, host, sip_profiles, do_not_disturb);
 			end
 
-		--DND disabled
-			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, ";
-						sql = sql .. "forward_all_enabled = 'false', ";
-						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, do_not_disturb = do_not_disturb};
-						if (debug["sql"]) then
-							freeswitch.consoleLog("notice", "[feature_event] "..sql.."; params:" .. json.encode(params) .. "\n");
-						end
-						dbh:query(sql, params);
-
-				--send notify to the phone
-					notify.dnd(user, host, sip_profiles, do_not_disturb);
-
-			end
-
 	--Call Forward
 
 		--Call Formward All enabled
@@ -191,7 +146,6 @@
 					forward_immediate_destination = action_value;
 					forward_immediate_enabled = "true";
 
-				--set the dial string
 					if feature_enabled == "true" then
 						local destination_extension, destination_number_alias
 
@@ -221,8 +175,7 @@
 					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 .. "forward_all_destination = :forward_all_destination ";
 					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};
@@ -231,21 +184,6 @@
 					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
-					end
-
 				--send notify to the phone
 					notify.forward_immediate(user, host, sip_profiles, forward_immediate_enabled, forward_immediate_destination);
 			end
@@ -263,11 +201,10 @@
 					sql = sql .. "do_not_disturb = 'false', ";
 					sql = sql .. "forward_all_enabled = 'false', ";
 					if (forward_all_destination ~= nil) then
-						sql = sql .. "forward_all_destination = :forward_all_destination, ";
+						sql = sql .. "forward_all_destination = :forward_all_destination ";
 					else
-						sql = sql .. "forward_all_destination = null, ";
+						sql = sql .. "forward_all_destination = null ";
 					end
-					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};
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 060ab54558..44b630451c 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
@@ -94,6 +94,7 @@ function feature_event_notify.dnd(user, host, sip_profiles, do_not_disturb)
 		event:addHeader("Feature-Event", "DoNotDisturbEvent")
 		event:addHeader("doNotDisturbOn", do_not_disturb)
 		--freeswitch.consoleLog("notice","[events] " .. event:serialize("xml") .. "\n");
+		freeswitch.msleep(300);
 		event:fire()
 	end
 end
@@ -110,6 +111,7 @@ function feature_event_notify.forward_immediate(user, host, sip_profiles, forwar
 		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(300);
 		event:fire()
 	end
 end
@@ -125,6 +127,7 @@ function feature_event_notify.forward_busy(user, host, sip_profiles, forward_bus
 		event:addHeader("Feature-Event", "ForwardingEvent")
 		event:addHeader("forward_busy", forward_busy_destination)
 		event:addHeader("forward_busy_enabled", forward_busy_enabled)
+		freeswitch.msleep(300);
 		event:fire()
 	end
 end
@@ -141,6 +144,7 @@ function feature_event_notify.forward_no_answer(user, host, sip_profiles, forwar
 		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(300);
 		event:fire()
 	end
 end
@@ -164,6 +168,7 @@ function feature_event_notify.init(user, host, sip_profiles, forward_immediate_e
 		event:addHeader("ringCount", ring_count)		
 		event:addHeader("Feature-Event", "DoNotDisturbEvent")
 		event:addHeader("doNotDisturbOn", do_not_disturb)
+		freeswitch.msleep(300);
 		event:fire()
 	end
 end
diff --git a/app/scripts/resources/scripts/app/hangup/index.lua b/app/scripts/resources/scripts/app/hangup/index.lua
index 54ca8d6d31..f4c1772d0e 100644
--- a/app/scripts/resources/scripts/app/hangup/index.lua
+++ b/app/scripts/resources/scripts/app/hangup/index.lua
@@ -53,6 +53,11 @@
 					local Database = require "resources.functions.database";
 					local dbh = Database.new('system');
 
+				--prepare to get the settings
+					local Settings = require "resources.functions.lazy_settings"
+					local settings = Settings.new(dbh, domain_name, domain_uuid)
+					local from_address = settings:get('email', 'smtp_from', 'text');
+
 				--get the templates
 					local sql = "SELECT * FROM v_email_templates ";
 					sql = sql .. "WHERE (domain_uuid = :domain_uuid or domain_uuid is null) ";
@@ -75,7 +80,7 @@
 					headers["X-FusionPBX-Domain-Name"] = domain_name;
 					headers["X-FusionPBX-Call-UUID"]   = uuid;
 					headers["X-FusionPBX-Email-Type"]  = 'missed';
-			
+
 				--remove quotes from caller id name and number
 					caller_id_name = caller_id_name:gsub("'", "&#39;");
 					caller_id_name = caller_id_name:gsub([["]], "&#34;");
@@ -104,6 +109,7 @@
 
 				--send the emails
 					send_mail(headers,
+						from_address,
 						missed_call_data,
 						{subject, body}
 					);
diff --git a/app/scripts/resources/scripts/app/messages/resources/events.lua b/app/scripts/resources/scripts/app/messages/resources/events.lua
deleted file mode 100644
index 12a3ee5770..0000000000
--- a/app/scripts/resources/scripts/app/messages/resources/events.lua
+++ /dev/null
@@ -1,335 +0,0 @@
---
---      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>
---      Copyright (C) 2018
-
-
--- Start the script
-	--	<!-- Subscribe to events -->
-	--	<hook event="CUSTOM" subclass="SMS::SEND_MESSAGE" script="app/messages/resources/events.lua"/>
-
---prepare the api object
-	api = freeswitch.API();
-
---define the functions
-	require "resources.functions.trim";
-	require "resources.functions.explode";
-	require "resources.functions.base64";
-
---include the database class
-	local Database = require "resources.functions.database";
-
---set debug
-	debug["sql"] = false;
-
---get the events
-	--serialize the data for the console
-	--freeswitch.consoleLog("notice","[events] " .. event:serialize("xml") .. "\n");
-	--freeswitch.consoleLog("notice","[evnts] " .. event:serialize("json") .. "\n");
-
---intialize settings
-	--from_user = '';
-
---get the event variables
-	uuid               = event:getHeader("Core-UUID");
-	from_user          = event:getHeader("from_user");
-	from_host          = event:getHeader("from_host");
-	to_user            = event:getHeader("to_user");
-	to_host            = event:getHeader("to_host");
-	content_type       = event:getHeader("type");
-	message_text       = event:getBody();
-
---set required variables
-	if (from_user ~= nil and from_host ~= nil) then
-		message_from   = from_user .. '@' .. from_host;
-	end
-	if (to_user ~= nil and to_host ~= nil) then
-		message_to     = to_user .. '@' .. to_host;
-	end
-	message_type       = 'message';
-
---connect to the database
-	dbh = Database.new('system');
-
---exits the script if we didn't connect properly
-	assert(dbh:connected());
-
---set debug
-	debug["sql"] = true;
-
---include json library
-	local json
-	if (debug["sql"]) then
-		json = require "resources.functions.lunajson"
-	end
-
---check if the from user exits
-	if (from_user ~= nil and from_host ~= nil) then
-		cmd = "user_exists id ".. from_user .." "..from_host;
-		freeswitch.consoleLog("notice", "[messages][from] user exists " .. cmd .. "\n");
-		from_user_exists = api:executeString(cmd);
-	else
-		from_user_exists  = 'false';
-	end
-
---check if the to user exits
-	if (to_user ~= nil and to_host ~= nil) then
-		cmd = "user_exists id ".. to_user .." "..to_host;
-		freeswitch.consoleLog("notice", "[messages][to] user exists " .. cmd .. "\n");
-		to_user_exists = api:executeString(cmd);
-	else
-		to_user_exists = 'false';
-	end
-
---add the message
-	if (from_user_exists == 'true') then
-		--set the direction
-		message_direction = 'send';
-
-		--get the from user_uuid
-		cmd = "user_data ".. from_user .."@"..from_host.." var domain_uuid";
-		domain_uuid = trim(api:executeString(cmd));
-
-		--get the from user_uuid
-		cmd = "user_data ".. from_user .."@"..from_host.." var user_uuid";
-		user_uuid = trim(api:executeString(cmd));
-
-		--get the from contact_uuid
-		cmd = "user_data ".. to_user .."@"..to_host.." var contact_uuid";
-		contact_uuid = trim(api:executeString(cmd));
-
-		--create a new uuid and add it to the uuid list
-		message_uuid = api:executeString("create_uuid");
-
-		--sql statement
-		sql = "INSERT INTO v_messages ";
-		sql = sql .."( ";
-		sql = sql .."domain_uuid, ";
-		sql = sql .."message_uuid, ";
-		sql = sql .."user_uuid, ";
-		if (contact_uuid ~= null and string.len(contact_uuid) > 0) then
-			sql = sql .."contact_uuid, ";
-		end
-		sql = sql .."message_direction, ";
-		sql = sql .."message_date, ";
-		sql = sql .."message_type, ";
-		if (message_from ~= null and string.len(message_from) > 0) then
-			sql = sql .."message_from, ";
-		end
-		sql = sql .."message_to, ";
-		sql = sql .."message_text ";
-		sql = sql ..") ";
-		sql = sql .."VALUES ( ";
-		sql = sql ..":domain_uuid, ";
-		sql = sql ..":message_uuid, ";
-		sql = sql ..":user_uuid, ";
-		if (contact_uuid ~= null and string.len(contact_uuid) > 0) then
-			sql = sql ..":contact_uuid, ";
-		end
-		sql = sql ..":message_direction, ";
-		sql = sql .."now(), ";
-		sql = sql ..":message_type, ";
-		if (message_from ~= null and string.len(message_from) > 0) then
-			sql = sql ..":message_from, ";
-		end
-		sql = sql ..":message_to, ";
-		sql = sql ..":message_text ";
-		sql = sql ..") ";
-
-		--set the parameters
-		local params= {}
-		params['domain_uuid'] = domain_uuid;
-		params['message_uuid'] = message_uuid;
-		params['user_uuid'] = user_uuid;
-		if (contact_uuid ~= null and string.len(contact_uuid) > 0) then
-			params['contact_uuid'] = contact_uuid;
-		end
-		params['message_direction'] = message_direction;
-		params['message_type'] = message_type;
-		if (message_from ~= null) then
-			params['message_from'] = message_from;
-		end
-		params['message_to'] = message_to;
-		params['message_text'] = message_text;
-
-		--show debug info
-		if (debug["sql"]) then
-			freeswitch.consoleLog("notice", "[call_center] SQL: " .. sql .. "; params:" .. json.encode(params) .. "\n");
-		end
-
-		--run the query
-		dbh:query(sql, params);
-	end
-	if (to_user_exists == 'true') then
-		--sql statement
-		sql = "INSERT INTO v_messages ";
-		sql = sql .."( ";
-		sql = sql .."domain_uuid, ";
-		sql = sql .."message_uuid, ";
-		sql = sql .."user_uuid, ";
-		if (contact_uuid ~= null and string.len(contact_uuid) > 0) then
-			sql = sql .."contact_uuid, ";
-		end
-		sql = sql .."message_direction, ";
-		sql = sql .."message_date, ";
-		sql = sql .."message_type, ";
-		if (message_from ~= null and string.len(message_from) > 0) then
-			sql = sql .."message_from, ";
-		end
-		sql = sql .."message_to, ";
-		sql = sql .."message_text ";
-		sql = sql ..") ";
-		sql = sql .."VALUES ( ";
-		sql = sql ..":domain_uuid, ";
-		sql = sql ..":message_uuid, ";
-		sql = sql ..":user_uuid, ";
-		if (contact_uuid ~= null and string.len(contact_uuid) > 0) then
-			sql = sql ..":contact_uuid, ";
-		end
-		sql = sql ..":message_direction, ";
-		sql = sql .."now(), ";
-		sql = sql ..":message_type, ";
-		if (message_from ~= null and string.len(message_from) > 0) then
-			sql = sql ..":message_from, ";
-		end
-		sql = sql ..":message_to, ";
-		sql = sql ..":message_text ";
-		sql = sql ..") ";
-
-		--set the direction
-		message_direction = 'receive';
-
-		--get the from user_uuid
-		cmd = "user_data ".. to_user .."@"..to_host.." var domain_uuid";
-		domain_uuid = trim(api:executeString(cmd));
-
-		--get the from user_uuid
-		cmd = "user_data ".. to_user .."@"..to_host.." var user_uuid";
-		user_uuid = trim(api:executeString(cmd));
-
-		--get the from contact_uuid
-		cmd = "user_data ".. to_user .."@"..to_host.." var contact_uuid";
-		contact_uuid = trim(api:executeString(cmd));
-
-		--create a new uuid and add it to the uuid list
-		message_uuid = api:executeString("create_uuid");
-
-		--set the parameters
-		local params= {}
-		params['domain_uuid'] = domain_uuid;
-		params['message_uuid'] = message_uuid;
-		params['user_uuid'] = user_uuid;
-		if (contact_uuid ~= null and string.len(message_from) > 0) then
-			params['contact_uuid'] = contact_uuid;
-		end
-		params['message_direction'] = message_direction;
-		params['message_type'] = message_type;
-		params['message_from'] = message_from;
-		params['message_to'] = message_to;
-		params['message_text'] = message_text;
-
-		--show debug info
-		if (debug["sql"]) then
-			freeswitch.consoleLog("notice", "[call_center] SQL: " .. sql .. "; params:" .. json.encode(params) .. "\n");
-		end
-
-		--run the query
-		dbh:query(sql, params);
-
-	else
-
-		--get setttings needed to send the message
-		require "resources.functions.settings";
-		settings = settings(domain_uuid);
-		if (settings['message'] ~= nil) then
-			http_method = '';
-			if (settings['message']['http_method'] ~= nil) then
-				if (settings['message']['http_method']['text'] ~= nil) then
-					http_method = settings['message']['http_method']['text'];
-				end
-			end
-
-			http_content_type = '';
-			if (settings['message']['http_content_type'] ~= nil) then
-				if (settings['message']['http_content_type']['text'] ~= nil) then
-					http_content_type = settings['message']['http_content_type']['text'];
-				end
-			end
-
-			http_destination = '';
-			if (settings['message']['http_destination'] ~= nil) then
-				if (settings['message']['http_destination']['text'] ~= nil) then
-					http_destination = settings['message']['http_destination']['text'];
-				end
-			end
-
-			http_auth_enabled = 'false';
-			if (settings['message']['http_auth_enabled'] ~= nil) then
-				if (settings['message']['http_auth_enabled']['boolean'] ~= nil) then
-					http_auth_enabled = settings['message']['http_auth_enabled']['boolean'];
-				end
-			end
-
-			http_auth_type = '';
-			if (settings['message']['http_auth_type'] ~= nil) then
-				if (settings['message']['http_auth_type']['text'] ~= nil) then
-					http_auth_type = settings['message']['http_auth_type']['text'];
-				end
-			end
-
-			http_auth_user = '';
-			if (settings['message']['http_auth_user'] ~= nil) then
-				if (settings['message']['http_auth_user']['text'] ~= nil) then
-					http_auth_user = settings['message']['http_auth_user']['text'];
-				end
-			end
-
-			http_auth_password = '';
-			if (settings['message']['http_auth_password'] ~= nil) then
-				if (settings['message']['http_auth_password']['text'] ~= nil) then
-					http_auth_password = settings['message']['http_auth_password']['text'];
-				end
-			end
-		end
-
-		--get the sip user outbound_caller_id
-		if (from_user ~= nil and from_host ~= nil) then
-			cmd = "user_data ".. from_user .."@"..from_host.." var outbound_caller_id_number";
-			from = trim(api:executeString(cmd));
-		else
-			from = '';
-		end
-
-		--replace variables for their value
-		http_destination = http_destination:gsub("${from}", from);
-		
-		--send to the provider using curl
-		if (to_user ~= nil) then
-			cmd = [[curl ]].. http_destination ..[[ ]]
-			cmd = cmd .. [[-H "Content-Type: ]]..http_content_type..[[" ]];
-			if (http_auth_type == 'basic') then
-				cmd = cmd .. [[-H "Authorization: Basic ]]..base64.encode(http_auth_user..":"..http_auth_password)..[[" ]];
-			end
-			cmd = cmd .. [[-d '{"to":"]]..to_user..[[","text":"]]..message_text..[["}']]
-			result = api:executeString("system "..cmd);
-			--status = os.execute (cmd);
-
-			--debug - log the command
-			freeswitch.consoleLog("notice", "[message] " .. cmd.. "\n");
-		end
-
-	end
diff --git a/app/scripts/resources/scripts/app/messages/resources/send.lua b/app/scripts/resources/scripts/app/messages/resources/send.lua
deleted file mode 100644
index 0cb2e4ede7..0000000000
--- a/app/scripts/resources/scripts/app/messages/resources/send.lua
+++ /dev/null
@@ -1,73 +0,0 @@
---	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
---	the Initial Developer. All Rights Reserved.
-
---get the argv values
-	script_name = argv[0];
-	message_from = argv[1];
-	message_to = argv[2];
-	message_text = argv[3];
-
---send a message to the console
-	freeswitch.consoleLog("NOTICE",[[[message] from ]]..message_from);
-	freeswitch.consoleLog("NOTICE",[[[message] to ]] .. message_to);
-	freeswitch.consoleLog("NOTICE",[[[message] from ]]..message_text);
-
---connect to the database
-	--local Database = require "resources.functions.database";
-	--dbh = Database.new('system');
-
---include functions
-	require "resources.functions.trim";
-	require "resources.functions.explode";
-	--require "resources.functions.file_exists";
-
---create the api object
-	api = freeswitch.API();
-
---get the domain name for the destination
-	array = explode('@', message_to);
-	domain_name = array[2];
-	freeswitch.consoleLog("NOTICE",[[[message] domain_name ]]..domain_name);
-
---get the sip profile name
-	local sofia_contact = trim(api:executeString("sofia_contact */"..message_to));
-	local array = explode("/", sofia_contact);
-	local sip_profile = array[2];
-
---send the sms message
-	local event = freeswitch.Event("CUSTOM", "SMS::SEND_MESSAGE");
-	event:addHeader("proto", "sip");
-	event:addHeader("dest_proto", "sip");
-	event:addHeader("from", message_from);
-	event:addHeader("from_full", "sip:"..message_from);
-	event:addHeader("to", message_to);
-	event:addHeader("subject", "sip:"..message_to);
-	--event:addHeader("type", "text/html");
-	event:addHeader("type", "text/plain");
-	event:addHeader("hint", "the hint");
-	event:addHeader("replying", "true");
-	event:addHeader("sip_profile", sip_profile);
-	event:addBody(message_text);
-
---send info to the console
-	freeswitch.consoleLog("info", event:serialize());
-
---send the event
-	event:fire();
diff --git a/app/scripts/resources/scripts/app/ring_groups/index.lua b/app/scripts/resources/scripts/app/ring_groups/index.lua
index 11aa2e5b96..dc872f0774 100644
--- a/app/scripts/resources/scripts/app/ring_groups/index.lua
+++ b/app/scripts/resources/scripts/app/ring_groups/index.lua
@@ -372,14 +372,16 @@
 					body = trim(body);
 
 				--send the email
-					if (debug["info"]) then
-						freeswitch.consoleLog("notice", "[missed call]: "..mail_to.." '"..subject.."' '"..body.."'\n");
-					end
-
 					send_mail(headers,
+						nil,
 						mail_to,
 						{subject, body}
 					);
+
+				--send the debug info
+					if (debug["info"]) then
+						freeswitch.consoleLog("notice", "[missed call]: "..mail_to.." '"..subject.."' '"..body.."'\n");
+					end
 			end
 		end
 	end
diff --git a/app/scripts/resources/scripts/app/servers/resources/file_cache.lua b/app/scripts/resources/scripts/app/servers/resources/file_cache.lua
index b6a3fa68f3..6ec4df29c4 100644
--- a/app/scripts/resources/scripts/app/servers/resources/file_cache.lua
+++ b/app/scripts/resources/scripts/app/servers/resources/file_cache.lua
@@ -79,7 +79,8 @@
 							if (row.method == "curl") then
 								api_command_argument = api_command_argument:gsub(" ", "%%20");
 								url = [[http://]]..row.username..[[:]]..row.password..[[@]]..row.hostname..[[:]]..row.port..[[/webapi/luarun?app/servers/resources/clear_cache.lua%20]]..api_command_argument;
-								api:executeString("system curl " .. url  );
+								api = freeswitch.API();
+								get_response = api:execute("curl", url);
 								freeswitch.consoleLog("INFO", "[notice] curl ".. url .. " \n");
 							end
 						end
diff --git a/app/scripts/resources/scripts/app/speed_dial/index.lua b/app/scripts/resources/scripts/app/speed_dial/index.lua
index 22e6b678f8..10b8b2b633 100644
--- a/app/scripts/resources/scripts/app/speed_dial/index.lua
+++ b/app/scripts/resources/scripts/app/speed_dial/index.lua
@@ -15,7 +15,7 @@
 
 --	The Initial Developer of the Original Code is
 --	Mark J Crane <markjcrane@fusionpbx.com>
---	Portions created by the Initial Developer are Copyright (C) 2019
+--	Portions created by the Initial Developer are Copyright (C) 2019 - 2022
 --	the Initial Developer. All Rights Reserved.
 
 -- load config
@@ -34,8 +34,12 @@
 	domain_name = session:getVariable("domain_name");
 	domain_uuid = session:getVariable("domain_uuid");
 	context = session:getVariable("context");
-	user = session:getVariable("sip_auth_username")
-		or session:getVariable("username");
+	permissions = session:getVariable("permissions");
+	global = session:getVariable("global") or 'false';
+	user = session:getVariable("sip_auth_username") or session:getVariable("username");
+
+--set the default
+	if (not permissions) then permissions = 'false'; end
 
 --get the argv values
 	destination = argv[2];
@@ -48,7 +52,7 @@
 	if value then
 		local t = json.decode(value)
 		if not (t and t.phone_number) then
-			log.warningf("can not decode value from cache: %s", value)
+			log.warningf("can not decode value from the cache: %s", value)
 			value = nil
 		else
 			value = t
@@ -64,39 +68,55 @@
 			local dbh = Database.new('system');
 
 		-- search for the phone number in database using the speed dial
-			local sql = [[
-				-- find all contacts with correct user or withot users and groups at all
-				select t0.phone_number --, t6.extension, 'GROUP:' || t3.group_name as user_name
-				from v_contact_phones t0
-				inner join v_contacts t1 on t0.contact_uuid = t1.contact_uuid
-				left outer join v_contact_groups t2 on t1.contact_uuid = t2.contact_uuid
-				left outer join v_user_groups t3 on t2.group_uuid = t3.group_uuid
-				left outer join v_users t4 on t3.user_uuid = t4.user_uuid
-				left outer join v_extension_users t5 on t4.user_uuid = t5.user_uuid
-				left outer join v_extensions t6 on t5.extension_uuid = t6.extension_uuid
-				where t0.domain_uuid = :domain_uuid and t0.phone_speed_dial = :phone_speed_dial
-					and ( (1 = 0)
-						or (t6.domain_uuid = :domain_uuid and (t6.extension = :user or t6.number_alias = :user))
-						or (t2.contact_uuid is null and not exists(select 1 from v_contact_users t where t.contact_uuid = t0.contact_uuid) )
-					)
+			if (permissions == 'true') then
+				--advanced, check on user and group permissions
+				sql = [[
+					-- find all contacts with correct user or withot users and groups at all
+					select t0.phone_number --, t6.extension, 'GROUP:' || t3.group_name as user_name
+					from v_contact_phones t0
+					inner join v_contacts t1 on t0.contact_uuid = t1.contact_uuid
+					left outer join v_contact_groups t2 on t1.contact_uuid = t2.contact_uuid
+					left outer join v_user_groups t3 on t2.group_uuid = t3.group_uuid
+					left outer join v_users t4 on t3.user_uuid = t4.user_uuid
+					left outer join v_extension_users t5 on t4.user_uuid = t5.user_uuid
+					left outer join v_extensions t6 on t5.extension_uuid = t6.extension_uuid
+					where t0.domain_uuid = :domain_uuid and t0.phone_speed_dial = :phone_speed_dial
+						and ( (1 = 0)
+							or (t6.domain_uuid = :domain_uuid and (t6.extension = :user or t6.number_alias = :user))
+							or (t2.contact_uuid is null and not exists(select 1 from v_contact_users t where t.contact_uuid = t0.contact_uuid))
+						)
 
-				union
+					union
 
-				-- find all contacts with correct group or withot users and groups at all
-				select t0.phone_number -- , t5.extension, 'USER:' || t3.username as user_name
-				from v_contact_phones t0
-				inner join v_contacts t1 on t0.contact_uuid = t1.contact_uuid
-				left outer join v_contact_users t2 on t1.contact_uuid = t2.contact_uuid
-				left outer join v_users t3 on t2.user_uuid = t3.user_uuid
-				left outer join v_extension_users t4 on t3.user_uuid = t4.user_uuid
-				left outer join v_extensions t5 on t4.extension_uuid = t5.extension_uuid
-				where t0.domain_uuid = :domain_uuid and t0.phone_speed_dial = :phone_speed_dial
-					and ( (1 = 0)
-						or (t5.domain_uuid = :domain_uuid and (t5.extension = :user or t5.number_alias = :user))
-						or (t2.contact_user_uuid is null and not exists(select 1 from v_contact_groups t where t.contact_uuid = t0.contact_uuid))
-					)
-			]];
-			local params = {phone_speed_dial = destination, domain_uuid = domain_uuid, user = user};
+					-- find all contacts with correct group or withot users and groups at all
+					select t0.phone_number -- , t5.extension, 'USER:' || t3.username as user_name
+					from v_contact_phones t0
+					inner join v_contacts t1 on t0.contact_uuid = t1.contact_uuid
+					left outer join v_contact_users t2 on t1.contact_uuid = t2.contact_uuid
+					left outer join v_users t3 on t2.user_uuid = t3.user_uuid
+					left outer join v_extension_users t4 on t3.user_uuid = t4.user_uuid
+					left outer join v_extensions t5 on t4.extension_uuid = t5.extension_uuid
+					where t0.domain_uuid = :domain_uuid and t0.phone_speed_dial = :phone_speed_dial
+						and ( (1 = 0)
+							or (t5.domain_uuid = :domain_uuid and (t5.extension = :user or t5.number_alias = :user))
+							or (t2.contact_user_uuid is null and not exists(select 1 from v_contact_groups t where t.contact_uuid = t0.contact_uuid))
+						)
+				]];
+				log.noticef("[speed dial] advanced");
+			else
+				-- simple, skip looking up user or group permissions
+				sql = "select phone_number ";
+				sql = sql .. "from v_contact_phones ";
+				if (global == 'true') then
+					sql = sql .. "where phone_speed_dial = :phone_speed_dial ";
+					params = {phone_speed_dial = destination};
+				else
+					sql = sql .. "where domain_uuid = :domain_uuid ";
+					sql = sql .. "and phone_speed_dial = :phone_speed_dial ";
+					params = {phone_speed_dial = destination, domain_uuid = domain_uuid};
+				end
+				log.noticef("[speed dial] simple");
+			end
 
 			if (debug["sql"]) then
 				log.noticef("SQL: %s; params: %s", sql, json.encode(params));
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 a161d7b84e..a7597b3c44 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
@@ -47,6 +47,11 @@
 					dtmf_digits = '';
 					if (string.len(greeting_id) > 0 and greeting_id ~= "default") then
 
+						--greeting set to none, return without a greeting
+							if (greeting_id == "0") then
+								return true;
+							end
+
 						--sleep
 							session:execute("playback","silence_stream://200");
 
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 8d8cd51031..cceb8c0f7d 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
@@ -537,7 +537,6 @@
 			if (storage_path == "http_cache") then
 				result = session:recordFile(storage_path.."/"..voicemail_id.."/msg_"..uuid.."."..vm_message_ext, message_max_length, message_silence_threshold, message_silence_seconds);
 			else
-				mkdir(voicemail_dir.."/"..voicemail_id);
 				if (vm_message_ext == "mp3") then
 					shout_exists = trim(api:execute("module_exists", "mod_shout"));
 					if (shout_exists == "true" and transcribe_enabled == "false") or (shout_exists == "true" and transcribe_enabled == "true" and voicemail_transcription_enabled ~= "true") then
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 ea144fdb93..9bfa111a01 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
@@ -225,6 +225,7 @@
 
 				--send the email
 					send_mail(headers,
+						nil,
 						voicemail_mail_to,
 						{subject, body},
 						(voicemail_file == "attach") and file
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 3321d80186..5a10f01b86 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
@@ -206,24 +206,27 @@
 								if (string.find(agent_contact, 'call_timeout') == nil) then
 										--add the call_timeout
 										pos = string.find(agent_contact, "}");
-										first = string.sub(agent_contact, 0, pos);
+										first = string.sub(agent_contact, 0, pos -1);
+										last = string.sub(agent_contact, pos);
+										agent_contact = first..[[,domain_name=]]..domain_name..[[,domain_uuid=]]..domain_uuid..[[,sip_h_caller_destination=${caller_destination},call_timeout=]]..agent_call_timeout..last;
+								else
+										--add the call_timeout
+										pos = string.find(agent_contact, "}");
+										first = string.sub(agent_contact, 0, pos - 1);
 										last = string.sub(agent_contact, pos);
 										agent_contact = first..[[,sip_h_caller_destination=${caller_destination},call_timeout=]]..agent_call_timeout..last;
-								else
-										--the string has the call timeout
-										agent_contact = agent_contact;
 								end
-							else
+						else
 								--found
 								pos = string.find(agent_contact, "}");
-								first = string.sub(agent_contact, 0, pos);
+								first = string.sub(agent_contact, 0, pos - 1);
 								last = string.sub(agent_contact, pos);
 								if (string.find(agent_contact, 'call_timeout') == nil) then
 									--add the call_timeout and confirm
-									agent_contact = first..','..confirm..',sip_h_caller_destination=${caller_destination},call_timeout='..agent_call_timeout..last;
+									agent_contact = first..','..confirm..',sip_h_caller_destination=${caller_destination},domain_name="..domain_name..",domain_uuid="..domain_uuid..",sip_h_caller_destination=${caller_destination},call_timeout='..agent_call_timeout..last;
 								else
 									--add confirm
-									agent_contact = tmp_first..',sip_h_caller_destination=${caller_destination},'..confirm..tmp_last;
+									agent_contact = tmp_first..',domain_name="..domain_name..",domain_uuid="..domain_uuid..",sip_h_caller_destination=${caller_destination},'..confirm..tmp_last;
 								end
 							end
 						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 90a9909417..5049b064ba 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,10 +116,12 @@
 
 		--get the dialplan xml
 			if (context_name == 'public' and dialplan_mode == 'single') then
-				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 = "SELECT (SELECT domain_name FROM v_domains WHERE domain_uuid = p.domain_uuid) as domain_name, "
+				sql = sql .. "(SELECT domain_enabled FROM v_domains WHERE domain_uuid = p.domain_uuid) as domain_enabled, p.dialplan_xml ";
+				sql = sql .. "FROM v_dialplans AS p ";
 				sql = sql .. "WHERE ( ";
 				sql = sql .. "	p.dialplan_uuid IN ( ";
-				sql = sql .. "		SELECT dialplan_uuid FROM v_destinations "
+				sql = sql .. "		SELECT dialplan_uuid FROM v_destinations ";
 				sql = sql .. "		WHERE ( ";
 				sql = sql .. "			destination_prefix || destination_area_code || destination_number = :destination_number ";
 				sql = sql .. "			OR destination_trunk_prefix || destination_area_code || destination_number = :destination_number ";
@@ -139,15 +141,17 @@
 				if (debug["sql"]) then
 					freeswitch.consoleLog("notice", "[dialplan] SQL: " .. sql .. "; params:" .. json.encode(params) .. "\n");
 				end
-				local found = false;
 				dbh:query(sql, params, function(row)
 					if (row.domain_uuid ~= nil) then
 						domain_name = row.domain_name;
+					else
+						table.insert(xml, row.dialplan_xml);
+					end
+					if (row.domain_enabled == true) then
+						table.insert(xml, row.dialplan_xml);
 					end
-					table.insert(xml, row.dialplan_xml);
-					found = true;
 				end);
-				if (not found) then
+				if (xml == nil) then
 					table.insert(xml, [[		<extension name="not-found" continue="false" uuid="9913df49-0757-414b-8cf9-bcae2fd81ae7">]]);
 					table.insert(xml, [[			<condition field="" expression="">]]);
 					table.insert(xml, [[				<action application="set" data="call_direction=inbound" inline="true"/>]]);
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 c53ebb29c8..395df2abb2 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
@@ -1,6 +1,6 @@
 --	xml_handler.lua
 --	Part of FusionPBX
---	Copyright (C) 2013 - 2019 Mark J Crane <markjcrane@fusionpbx.com>
+--	Copyright (C) 2013 - 2021 Mark J Crane <markjcrane@fusionpbx.com>
 --	All rights reserved.
 --
 --	Redistribution and use in source and binary forms, with or without
@@ -273,9 +273,12 @@ continue = true;
 
 				--get the extension from the database
 					if (continue) then
-						local sql = "SELECT * FROM v_extensions WHERE domain_uuid = :domain_uuid "
-							.. "and (extension = :user or number_alias = :user) "
-							.. "and enabled = 'true' ";
+						local sql = "SELECT e.* FROM v_extensions as e, v_domains as d "
+							.. "WHERE e.domain_uuid = :domain_uuid "
+							.. "AND d.domain_uuid = :domain_uuid "
+							.. "AND d.domain_enabled = 'true' "
+							.. "AND (e.extension = :user or e.number_alias = :user) "
+							.. "AND e.enabled = 'true' ";
 						local params = {domain_uuid=domain_uuid, user=user};
 						if (debug["sql"]) then
 							freeswitch.consoleLog("notice", "[xml_handler] SQL: " .. sql .. "; params:" .. json.encode(params) .. "\n");
@@ -384,7 +387,7 @@ continue = true;
 
 							--set the dial_string
 								if (do_not_disturb == "true") then
-									dial_string = "!USER_BUSY";
+									dial_string = "error/user_busy";
 								elseif (string.len(row.dial_string) > 0) then
 									dial_string = row.dial_string;
 								else
diff --git a/app/scripts/resources/scripts/bind_digit_bleg.lua b/app/scripts/resources/scripts/bind_digit_bleg.lua
new file mode 100644
index 0000000000..173504c03b
--- /dev/null
+++ b/app/scripts/resources/scripts/bind_digit_bleg.lua
@@ -0,0 +1,39 @@
+--
+--	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>
+--	Copyright (C) 2021
+--	the Initial Developer. All Rights Reserved.
+--
+--	Contributor(s):
+--	Joseph A Nadiv <ynadiv@corpit.xyz>
+
+--include config.lua
+	require "resources.functions.config";
+
+--create the api object
+	api = freeswitch.API();
+	require "resources.functions.channel_utils";
+
+--get context variable
+	local context = argv[1];
+
+--bind to bleg
+	session:execute("bind_digit_action", "local,*1,exec:execute_extension,dx XML ".. context .. ",self,self");
+	session:execute("bind_digit_action", "local,*3,exec:execute_extension,cf XML ".. context .. ",self,self");
+	session:execute("bind_digit_action", "local,*4,exec:execute_extension,att_xfer XML ".. context .. ",self,self");
+	session:execute("digit_action_set_realm", "local");
diff --git a/app/scripts/resources/scripts/directory.lua b/app/scripts/resources/scripts/directory.lua
index 280ac98299..20d5eec761 100644
--- a/app/scripts/resources/scripts/directory.lua
+++ b/app/scripts/resources/scripts/directory.lua
@@ -393,7 +393,7 @@
 			--directory[x] = row;
 		--variables
 			effective_caller_id_name = row.effective_caller_id_name;
-			if (row.directory_first_name) then
+			if (row.directory_first_name ~= nil) and (row.directory_first_name ~= "") then
 				first_name = row.directory_first_name;
 				last_name = row.directory_last_name;
 			else
diff --git a/app/scripts/resources/scripts/disa.lua b/app/scripts/resources/scripts/disa.lua
index 02ff5a6bb9..3a21f89021 100644
--- a/app/scripts/resources/scripts/disa.lua
+++ b/app/scripts/resources/scripts/disa.lua
@@ -16,7 +16,7 @@
 --
 --	The Initial Developer of the Original Code is
 --	Mark J Crane <markjcrane@fusionpbx.com>
---	Copyright (C) 2010-2019
+--	Copyright (C) 2010-2022
 --	the Initial Developer. All Rights Reserved.
 --
 --	Contributor(s):
@@ -47,8 +47,6 @@
 		sound_extension = session:getVariable("sound_extension");
 		pin_number = session:getVariable("pin_number");
 		sounds_dir = session:getVariable("sounds_dir");
-		caller_id_name = session:getVariable("caller_id_name");
-		caller_id_number = session:getVariable("caller_id_number");
 		predefined_destination = session:getVariable("predefined_destination");
 		fallback_destination = session:getVariable("fallback_destination");
 		digit_min_length = session:getVariable("digit_min_length");
@@ -150,31 +148,35 @@
 		end
 	end
 
---set the caller id name and number
+--set the caller id name and number for external calls
 	if (session:ready()) then
 		cmd = "user_exists id ".. destination_number .." "..context;
 		user_exists = trim(api:executeString(cmd));
-		if (user_exists == "true") then
-			if (caller_id_name) then
-				--caller id name provided do nothing
+		if (user_exists == "false") then
+			--get the outbound caller id variables
+			outbound_caller_id_name = session:getVariable("outbound_caller_id_name");
+			outbound_caller_id_number = session:getVariable("outbound_caller_id_number");
+
+			--get the outbound caller ID information if it is set otherwise keep the original caller id
+			if (outbound_caller_id_name) then
+				caller_id_name = session:getVariable("outbound_caller_id_name");
 			else
-			        caller_id_number = session:getVariable("effective_caller_id_number");
+				caller_id_name = session:getVariable("caller_id_name");
+			end
+			if (outbound_caller_id_number) then
+				caller_id_number = session:getVariable("outbound_caller_id_number");
+			else
+				caller_id_number = session:getVariable("caller_id_number");
+			end
+
+			--set the outbound and effective caller ID information
+			if (caller_id_name) then
+				session:execute("set", "outbound_caller_id_name="..caller_id_name);
+				session:execute("set", "effective_caller_id_name="..caller_id_name);
 			end
 			if (caller_id_number) then
-				--caller id number provided do nothing
-			else
-				caller_id_number = session:getVariable("effective_caller_id_number");
-			end
-		else
-			if (caller_id_name) then
-				--caller id name provided do nothing
-			else
-				caller_id_number = session:getVariable("outbound_caller_id_number");
-			end
-			if (caller_id_number) then
-				--caller id number provided do nothing
-			else
-				caller_id_number = session:getVariable("outbound_caller_id_number");
+				session:execute("set", "outbound_caller_id_number="..caller_id_number);
+				session:execute("set", "effective_caller_id_number="..caller_id_number);
 			end
 		end
 	end
@@ -193,20 +195,6 @@
 
 --send the destination
 	if (session:ready()) then
-		if (user_exists == true) then
-			--local call
-			session:execute("transfer", destination_number .. " XML " .. context);
-		else
-			--external call
-			if (caller_id_name) then
-				session:execute("set", "outbound_caller_id_name="..caller_id_name);
-				session:execute("set", "effective_caller_id_name="..caller_id_name);
-			end
-			if (caller_id_number) then
-				session:execute("set", "outbound_caller_id_number="..caller_id_number);
-				session:execute("set", "effective_caller_id_number="..caller_id_number);
-			end
-                        session:execute("set","disa_outbound=true");
-			session:execute("transfer", destination_number .. " XML " .. context);
-		end
+		session:execute("set","disa_outbound=true");
+		session:execute("transfer", destination_number .. " XML " .. context);
 	end
diff --git a/app/scripts/resources/scripts/email.lua b/app/scripts/resources/scripts/email.lua
index ab521830f6..44111f57cf 100644
--- a/app/scripts/resources/scripts/email.lua
+++ b/app/scripts/resources/scripts/email.lua
@@ -1,6 +1,6 @@
 --	email.lua
 --	Part of FusionPBX
---	Copyright (C) 2010 Mark J Crane <markjcrane@fusionpbx.com>
+--	Copyright (C) 2010 - 2022 Mark J Crane <markjcrane@fusionpbx.com>
 --	All rights reserved.
 --
 --	Redistribution and use in source and binary forms, with or without
@@ -38,6 +38,9 @@
 --Example
 	--luarun email.lua to@domain.com from@domain.com 'headers' 'subject' 'body'
 
+--- include libs
+	local send_mail = require 'resources.functions.send_mail'
+
 --get the argv values
 	script_name = argv[0];
 	to = argv[1];
@@ -56,21 +59,34 @@
 --replace the &#34 with double quote
 	body = body:gsub("&#34;", [["]]);
 
+--get sessions info
+	if (session:ready()) then
+		domain_uuid = session:getVariable("domain_uuid");
+		domain_name = session:getVariable("domain_name");
+		call_uuid = session:getVariable("uuid");
+		headers = {
+			["X-FusionPBX-Domain-UUID"] = domain_uuid;
+			["X-FusionPBX-Domain-Name"] = domain_name;
+			["X-FusionPBX-Email-Type"]	= 'voicemail';
+			["X-FusionPBX-Call-UUID"]	= call_uuid;
+		}
+	end
+
 --send the email
 	if (file == nil) then
-		freeswitch.email(to,
+		send_mail(headers,
 			from,
-			"To: "..to.."\nFrom: "..from.."\nX-Headers: "..headers.."\nSubject: "..subject,
-			body
-			);
+			to,
+			{subject, body}
+		);
 	else
 		if (convert_cmd == nil) then
-			freeswitch.email(to,
+			send_mail(headers,
 				from,
-				"To: "..to.."\nFrom: "..from.."\nX-Headers: "..headers.."\nSubject: "..subject,
-				body,
+				to,
+				{subject, body},
 				file
-				);
+			);
 		else
 			freeswitch.email(to,
 				from,
@@ -83,7 +99,3 @@
 		end
 	end
 
---delete the file
-	if (delete == "true") then
-		os.remove(file);
-	end
diff --git a/app/scripts/resources/scripts/fax_retry.lua b/app/scripts/resources/scripts/fax_retry.lua
index 86145ff12f..4f1644e320 100644
--- a/app/scripts/resources/scripts/fax_retry.lua
+++ b/app/scripts/resources/scripts/fax_retry.lua
@@ -16,7 +16,7 @@
 --
 --	The Initial Developer of the Original Code is
 --	Mark J Crane <markjcrane@fusionpbx.com>
---	Copyright (C) 2010 - 2019
+--	Copyright (C) 2010 - 2022
 --	the Initial Developer. All Rights Reserved.
 --
 --	Contributor(s):
@@ -43,17 +43,16 @@
 		json = require "resources.functions.lunajson"
 	end
 
---define the explode function
+--additional includes
 	require "resources.functions.explode";
-
---array count
 	require "resources.functions.count";
+	require "resources.functions.send_mail";
 
--- show all channel variables
+--show all channel variables
 	--dat = env:serialize()
 	--freeswitch.consoleLog("INFO","[FAX] info:\n" .. dat .. "\n")
 
--- example channel variables relating to fax
+--example channel variables relating to fax
 	--variable_fax_success: 0
 	--variable_fax_result_code: 49
 	--variable_fax_result_text: The%20call%20dropped%20prematurely
@@ -66,7 +65,7 @@
 	--variable_fax_bad_rows: 0
 	--variable_fax_transfer_rate: 14400
 
--- set channel variables to lua variables
+--set channel variables to lua variables
 	uuid = env:getHeader("uuid");
 	domain_uuid = env:getHeader("domain_uuid");
 	domain_name = env:getHeader("domain_name");
@@ -90,6 +89,11 @@
 	fax_result_code = env:getHeader("fax_result_code");
 	fax_busy_attempts = tonumber(env:getHeader("fax_busy_attempts"));
 	hangup_cause_q850 = tonumber(env:getHeader("hangup_cause_q850"));
+	fax_document_transferred_pages = env:getHeader("fax_document_transferred_pages");
+	fax_document_total_pages = env:getHeader("fax_document_total_pages");
+	fax_image_resolution = env:getHeader("fax_image_resolution");
+	fax_duration = env:getHeader("billsec");
+	
 
 --set default values
 	default_language = 'en';
@@ -153,10 +157,10 @@
 		ignore_early_media = "false";
 		if (settings['fax']['variable'] ~= nil) then
 			for i, var in ipairs(settings.fax.variable) do
-		  		--freeswitch.consoleLog("notice", "variable #" .. i .. ": " .. var .. "\n");
-		  		if (var == "ignore_early_media=true") then
-		  			ignore_early_media = "true";
-		  		end
+				--freeswitch.consoleLog("notice", "variable #" .. i .. ": " .. var .. "\n");
+				if (var == "ignore_early_media=true") then
+					ignore_early_media = "true";
+				end
 			end
 		end
 	end
@@ -322,6 +326,26 @@
 	end
 	--do not use apostrophies in message, they are not escaped and the mail will fail.
 
+--get the from address
+	if (from_address == nil) then
+		if (settings['fax'] ~= nil) then
+			if (settings['fax']['smtp_from'] ~= nil) then
+				if (settings['fax']['smtp_from']['text'] ~= nil) then
+					smtp_from = settings['fax']['smtp_from']['text'];
+				end
+			end
+		end
+		if (from_address == nil) then
+			if (settings['email'] ~= nil) then
+				if (settings['email']['smtp_from'] ~= nil) then
+					if (settings['email']['smtp_from']['text'] ~= nil) then
+						smtp_from = settings['email']['smtp_from']['text'];
+					end
+				end
+			end
+		end
+	end
+
 --get the templates
 	local sql = "SELECT * FROM v_email_templates ";
 	sql = sql .. "WHERE (domain_uuid = :domain_uuid or domain_uuid is null) ";
@@ -338,6 +362,30 @@
 	if (debug["sql"]) then
 		freeswitch.consoleLog("notice", "[fax] SQL: " .. sql .. "; params:" .. json.encode(params) .. "\n");
 	end
+
+--function to format time in templates
+	function format_time(seconds)
+		local seconds = tonumber(seconds)
+		
+		if (seconds <= 0) then
+			return "00:00:00";
+		else
+			hours = string.format("%02.f", math.floor(seconds/3600));
+			mins = string.format("%02.f", math.floor(seconds/60 - (hours*60)));
+			secs = string.format("%02.f", math.floor(seconds - hours*3600 - mins *60));
+		
+			if (hours == '00' and mins == '00') then
+				time_formatted = secs.."s";
+			elseif (hours == '00' and mins ~= '00') then
+				time_formatted = mins.."m "..secs.."s";
+			else
+				time_formatted = hours.."h "..mins.."m "..secs.."s";
+			end
+		end
+		return time_formatted;
+	end
+
+--perform variable replacements in email templates
 	dbh:query(sql, params, function(row)
 		if (row["template_subcategory"] == 'success_default') then
 			email_subject_success_default = row["template_subject"];
@@ -345,8 +393,21 @@
 
 			email_subject_success_default = email_subject_success_default:gsub("${number_dialed}", number_dialed);
 			email_subject_success_default = email_subject_success_default:gsub("${fax_busy_attempts}", fax_busy_attempts);
+			email_subject_success_default = email_subject_success_default:gsub("${fax_time}", os.date("%Y-%m-%d %X"));
+			email_subject_success_default = email_subject_success_default:gsub("${fax_document_transferred_pages}", fax_document_transferred_pages);
+			email_subject_success_default = email_subject_success_default:gsub("${fax_document_total_pages}", fax_document_total_pages);
+			email_subject_success_default = email_subject_success_default:gsub("${fax_local_caller_id_number}", fax_local_station_id);
+			email_subject_success_default = email_subject_success_default:gsub("${fax_image_resolution}", fax_image_resolution);
+			email_subject_success_default = email_subject_success_default:gsub("${fax_duration}", format_time(fax_duration));
+			
 			email_body_success_default = email_body_success_default:gsub("${number_dialed}", number_dialed);
 			email_body_success_default = email_body_success_default:gsub("${fax_busy_attempts}", fax_busy_attempts);
+			email_body_success_default = email_body_success_default:gsub("${fax_time}", os.date("%Y-%m-%d %X"));
+			email_body_success_default = email_body_success_default:gsub("${fax_document_transferred_pages}", fax_document_transferred_pages);
+			email_body_success_default = email_body_success_default:gsub("${fax_document_total_pages}", fax_document_total_pages);
+			email_body_success_default = email_body_success_default:gsub("${fax_local_caller_id_number}", fax_local_station_id);
+			email_body_success_default = email_body_success_default:gsub("${fax_image_resolution}", fax_image_resolution);
+			email_body_success_default = email_body_success_default:gsub("${fax_duration}", format_time(fax_duration));
 		end
 		if (row["template_subcategory"] == 'fail_default') then
 			email_subject_fail_default = row["template_subject"];
@@ -354,8 +415,21 @@
 
 			email_subject_fail_default = email_subject_fail_default:gsub("${number_dialed}", number_dialed);
 			email_subject_fail_default = email_subject_fail_default:gsub("${fax_busy_attempts}", fax_busy_attempts);
+			email_subject_fail_default = email_subject_fail_default:gsub("${fax_time}", os.date("%Y-%m-%d %X"));
+			email_subject_fail_default = email_subject_fail_default:gsub("${fax_document_transferred_pages}", fax_document_transferred_pages);
+			email_subject_fail_default = email_subject_fail_default:gsub("${fax_document_total_pages}", fax_document_total_pages);
+			email_subject_fail_default = email_subject_fail_default:gsub("${fax_local_caller_id_number}", fax_local_station_id);
+			email_subject_fail_default = email_subject_fail_default:gsub("${fax_image_resolution}", fax_image_resolution);
+			email_subject_fail_default = email_subject_fail_default:gsub("${fax_duration}", format_time(fax_duration));
+
 			email_body_fail_default = email_body_fail_default:gsub("${number_dialed}", number_dialed);
 			email_body_fail_default = email_body_fail_default:gsub("${fax_busy_attempts}", fax_busy_attempts);
+			email_body_fail_default = email_body_fail_default:gsub("${fax_time}", os.date("%Y-%m-%d %X"));
+			email_body_fail_default = email_body_fail_default:gsub("${fax_document_transferred_pages}", fax_document_transferred_pages);
+			email_body_fail_default = email_body_fail_default:gsub("${fax_document_total_pages}", fax_document_total_pages);
+			email_body_fail_default = email_body_fail_default:gsub("${fax_local_caller_id_number}", fax_local_station_id);
+			email_body_fail_default = email_body_fail_default:gsub("${fax_image_resolution}", fax_image_resolution);
+			email_body_fail_default = email_body_fail_default:gsub("${fax_duration}", format_time(fax_duration));
 		end
 		if (row["template_subcategory"] == 'fail_busy') then
 			email_subject_fail_busy = row["template_subject"];
@@ -363,8 +437,21 @@
 
 			email_subject_fail_busy = email_subject_fail_busy:gsub("${number_dialed}", number_dialed);
 			email_subject_fail_busy = email_subject_fail_busy:gsub("${fax_busy_attempts}", fax_busy_attempts);
+			email_subject_fail_busy = email_subject_fail_busy:gsub("${fax_time}", os.date("%Y-%m-%d %X"));
+			email_subject_fail_busy = email_subject_fail_busy:gsub("${fax_document_transferred_pages}", fax_document_transferred_pages);
+			email_subject_fail_busy = email_subject_fail_busy:gsub("${fax_document_total_pages}", fax_document_total_pages);
+			email_subject_fail_busy = email_subject_fail_busy:gsub("${fax_local_caller_id_number}", fax_local_station_id);
+			email_subject_fail_busy = email_subject_fail_busy:gsub("${fax_image_resolution}", fax_image_resolution);
+			email_subject_fail_busy = email_subject_fail_busy:gsub("${fax_duration}", format_time(fax_duration));
+
 			email_body_fail_busy = email_body_fail_busy:gsub("${number_dialed}", number_dialed);
 			email_body_fail_busy = email_body_fail_busy:gsub("${fax_busy_attempts}", fax_busy_attempts);
+			email_body_fail_busy = email_body_fail_busy:gsub("${fax_time}", os.date("%Y-%m-%d %X"));
+			email_body_fail_busy = email_body_fail_busy:gsub("${fax_document_transferred_pages}", fax_document_transferred_pages);
+			email_body_fail_busy = email_body_fail_busy:gsub("${fax_document_total_pages}", fax_document_total_pages);
+			email_body_fail_busy = email_body_fail_busy:gsub("${fax_local_caller_id_number}", fax_local_station_id);
+			email_body_fail_busy = email_body_fail_busy:gsub("${fax_image_resolution}", fax_image_resolution);
+			email_body_fail_busy = email_body_fail_busy:gsub("${fax_duration}", format_time(fax_duration));
 		end
 		if (row["template_subcategory"] == 'fail_invalid') then
 			email_subject_fail_invalid = row["template_subject"];
@@ -372,8 +459,21 @@
 
 			email_subject_fail_invalid = email_subject_fail_invalid:gsub("${number_dialed}", number_dialed);
 			email_subject_fail_invalid = email_subject_fail_invalid:gsub("${fax_busy_attempts}", fax_busy_attempts);
+			email_subject_fail_invalid = email_subject_fail_invalid:gsub("${fax_time}", os.date("%Y-%m-%d %X"));
+			email_subject_fail_invalid = email_subject_fail_invalid:gsub("${fax_document_transferred_pages}", fax_document_transferred_pages);
+			email_subject_fail_invalid = email_subject_fail_invalid:gsub("${fax_document_total_pages}", fax_document_total_pages);
+			email_subject_fail_invalid = email_subject_fail_invalid:gsub("${fax_local_caller_id_number}", fax_local_station_id);
+			email_subject_fail_invalid = email_subject_fail_invalid:gsub("${fax_image_resolution}", fax_image_resolution);
+			email_subject_fail_invalid = email_subject_fail_invalid:gsub("${fax_duration}", format_time(fax_duration));
+
 			email_body_fail_invalid = email_body_fail_invalid:gsub("${number_dialed}", number_dialed);
 			email_body_fail_invalid = email_body_fail_invalid:gsub("${fax_busy_attempts}", fax_busy_attempts);
+			email_body_fail_invalid = email_body_fail_invalid:gsub("${fax_time}", os.date("%Y-%m-%d %X"));
+			email_body_fail_invalid = email_body_fail_invalid:gsub("${fax_document_transferred_pages}", fax_document_transferred_pages);
+			email_body_fail_invalid = email_body_fail_invalid:gsub("${fax_document_total_pages}", fax_document_total_pages);
+			email_body_fail_invalid = email_body_fail_invalid:gsub("${fax_local_caller_id_number}", fax_local_station_id);
+			email_body_fail_invalid = email_body_fail_invalid:gsub("${fax_image_resolution}", fax_image_resolution);
+			email_body_fail_invalid = email_body_fail_invalid:gsub("${fax_duration}", format_time(fax_duration));
 		end
 	end);
 
@@ -467,7 +567,7 @@
 		end
 	end
 
--- send the selected variables to the console
+--send the selected variables to the console
 	if (fax_success ~= nil) then
 		freeswitch.consoleLog("INFO","[FAX] Success: '" .. fax_success .. "'\n");
 	end
@@ -487,12 +587,18 @@
 	freeswitch.consoleLog("INFO","[FAX] mailto_address: ".. email_address .."\n");
 	freeswitch.consoleLog("INFO","[FAX] hangup_cause_q850: '" .. hangup_cause_q850 .. "'\n");
 	
--- build headers
+--set the type
 	email_type = "email2fax";
-	x_headers = 'X-Headers: {"X-FusionPBX-Email-Type":"'..email_type..'",';
-	x_headers = x_headers..'"X-FusionPBX-Domain-UUID":"'..domain_uuid..'"}';	
 
--- if the fax failed then try again
+--prepare the headers
+	headers = {}
+	headers["X-FusionPBX-Domain-UUID"] = domain_uuid;
+	headers["X-FusionPBX-Domain-Name"] = domain_name;
+	headers["X-FusionPBX-Email-Type"]  = email_type;
+	headers["X-FusionPBX-Email-From"]  = from_address;
+	headers["X-FusionPBX-Call-UUID"] = uuid;
+
+--if the fax failed then try again
 	if (fax_success == "0") then
 		--DEBUG
 		--email_cmd = "/bin/echo '"..email_subject_fail.."' | /usr/bin/mail -s 'Fax to: "..number_dialed.." FAILED' -r "..from_address.." -a '"..fax_file.."' "..email_address;
@@ -570,12 +676,14 @@
 				freeswitch.consoleLog("INFO", "[FAX] RETRY_STATS FAILURE BAD NUMBER: GATEWAY[".. fax_uri .."]");
 
 				email_address = email_address:gsub("\\,", ",");
-				freeswitch.email(email_address,
-									email_address,
-									"To: "..email_address.."\nFrom: "..from_address.."\nSubject: "..email_subject_fail_invalid.."\n"..x_headers,
-									email_body_fail_invalid,
-									fax_file
-								);
+
+				--send the email
+				send_mail(headers,
+					from_address,
+					email_address,
+					{email_subject_fail_invalid, email_body_fail_invalid},
+					fax_file
+				);
 
 			--busy number
 			elseif (fax_retry_attempts == 17) then
@@ -583,12 +691,14 @@
 				freeswitch.consoleLog("INFO", "[FAX] RETRY STATS FAILURE BUSY: GATEWAY[".. fax_uri .."], BUSY NUMBER");
 
 				email_address = email_address:gsub("\\,", ",");
-				freeswitch.email(email_address,
-									email_address,
-									"To: "..email_address.."\nFrom: "..from_address.."\nSubject: "..email_subject_fail_busy.."\n"..x_headers,
-									email_body_fail_busy,
-									fax_file
-								);
+
+				--send the email
+				send_mail(headers,
+					from_address,
+					email_address,
+					{email_subject_fail_busy, email_body_fail_busy},
+					fax_file
+				);
 
 			else
 				--the fax failed completely. send a message
@@ -596,12 +706,14 @@
 				freeswitch.consoleLog("INFO", "[FAX] RETRY STATS FAILURE: GATEWAY[".. fax_uri .."], tried 5 combinations without success");
 
 				email_address = email_address:gsub("\\,", ",");
-				freeswitch.email(email_address,
-									email_address,
-									"To: "..email_address.."\nFrom: "..from_address.."\nSubject: "..email_subject_fail_default.."\n"..x_headers,
-									email_body_fail_default,
-									fax_file
-								);
+
+				--send the email
+				send_mail(headers,
+					from_address,
+					email_address,
+					{email_subject_fail_default, email_body_fail_default},
+					fax_file
+				);
 
 				fax_retry_attempts = fax_retry_attempts + 1;
 
@@ -644,12 +756,13 @@
 		freeswitch.consoleLog("INFO", "[FAX] RETRY STATS SUCCESS: GATEWAY[".. fax_uri .."] VARS[" .. fax_trial .. "]");
 		email_address = email_address:gsub("\\,", ",");
 
-		freeswitch.email(email_address,
-				email_address,
-				"To: "..email_address.."\nFrom: "..from_address.."\nSubject: "..email_subject_success_default.."\n"..x_headers,
-				email_body_success_default,
-				fax_file:gsub(".tif",".pdf",x)
-			);
+		--send the email
+		send_mail(headers,
+			from_address,
+			email_address,
+			{email_subject_success_default, email_body_success_default},
+			fax_file:gsub(".tif",".pdf")
+		);
 
 		if (settings['fax']['keep_local']['boolean'] ~= "nil") then
 			if (settings['fax']['keep_local']['boolean'] == "false") then
diff --git a/app/scripts/resources/scripts/recordings.lua b/app/scripts/resources/scripts/recordings.lua
index 83388ed062..825e2723ed 100644
--- a/app/scripts/resources/scripts/recordings.lua
+++ b/app/scripts/resources/scripts/recordings.lua
@@ -115,6 +115,7 @@
 				max_digits = 20;
 				session:sleep(1000);
 				recording_id = session:playAndGetDigits(min_digits, max_digits, max_tries, digit_timeout, "#", sounds_dir.."/"..default_language.."/"..default_dialect.."/"..default_voice.."/ivr/ivr-id_number.wav", "", "\\d+");
+				session:setVariable("recording_id", recording_id);
 				recording_name = recording_prefix..recording_id.."."..record_ext;
 			elseif (tonumber(recording_id) ~= nil) then
 				recording_name = recording_prefix..recording_id.."."..record_ext;
diff --git a/app/scripts/resources/scripts/resources/functions/send_mail.lua b/app/scripts/resources/scripts/resources/functions/send_mail.lua
index c99ce9be3f..6fb449a481 100644
--- a/app/scripts/resources/scripts/resources/functions/send_mail.lua
+++ b/app/scripts/resources/scripts/resources/functions/send_mail.lua
@@ -8,7 +8,7 @@ local settings = Settings.new(db, domain_name, domain_uuid)
 local email_queue_enabled = settings:get('email_queue', 'enabled', 'boolean') or "false";
 
 if (email_queue_enabled == 'true') then
-	function send_mail(headers, email_address, email_message, email_file)
+	function send_mail(headers, email_from, email_address, email_message, email_file)
 
 		--include json library
 		local json
@@ -22,6 +22,13 @@ if (email_queue_enabled == 'true') then
 		local call_uuid = headers["X-FusionPBX-Call-UUID"];
 		local local_after_email = headers["X-FusionPBX-local_after_email"] or '';
 
+		if (call_uuid ~= nil) then
+			email_uuid = call_uuid;
+		else
+			api = freeswitch.API();
+			email_uuid = api:executeString("create_uuid");
+		end
+
 		if (local_after_email == 'false') then
 			email_action_after = 'delete';
 		else
@@ -31,8 +38,10 @@ if (email_queue_enabled == 'true') then
 		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');
-		local from_name = settings:get('email', 'smtp_from_name', 'text');
+		if (email_from == nil or email_from == "") then
+			email_from = settings:get('email', 'smtp_from', 'text');
+			from_name = settings:get('email', 'smtp_from_name', 'text');
+		end
 
 		if (email_from == nil or email_from == "") then
 			email_from = address;
@@ -83,7 +92,7 @@ if (email_queue_enabled == 'true') then
 			email_subject = email_subject;
 			email_body = email_body;
 			email_status = email_status;
-			email_uuid = call_uuid;
+			email_uuid = email_uuid;
 			email_action_after = email_action_after;
 		}
 		db:query(sql, params);
@@ -157,7 +166,7 @@ else
 		local sendmail = require "sendmail"
 		local uuid = require "uuid"
 
-		function send_mail(headers, address, message, file)
+		function send_mail(headers, from, address, message, file)
 			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'
@@ -227,7 +236,7 @@ else
 	end
 
 	if freeswitch then
-		function send_mail(headers, address, message, file)
+		function send_mail(headers, from, address, message, file)
 			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'
@@ -240,15 +249,22 @@ else
 			end
 			xheaders = xheaders:sub(1,-2) .. '}'
 
-			local from = settings:get('email', 'smtp_from', 'text')
-			local from_name = settings:get('email', 'smtp_from_name', 'text')
+			if (from == nil or from == "") then
+				from = settings:get('email', 'smtp_from', 'text')
+				from_name = settings:get('email', 'smtp_from_name', 'text')
+			end
 			if from == nil or from == "" then
 				from = address
 			elseif from_name ~= nil and from_name ~= "" then
 				from = from_name .. "<" .. from .. ">"
 			end
+
 			local subject = message[1]
 			local body = message[2] or ''
+			
+			--debug info
+			--freeswitch.consoleLog("notice", "[voicemail] from: " .. from .. "\n");
+			--freeswitch.consoleLog("notice", "[voicemail] subject: " .. subject .. "\n");
 
 			local mail_headers =
 				"To: ".. address .. "\n" ..
@@ -257,10 +273,11 @@ else
 				"X-Headers: " .. xheaders
 
 			if file then
-				freeswitch.email(address, from, mail_headers, body, file)
+				ok = freeswitch.email(address, from, mail_headers, body, file)
 			else
-				freeswitch.email(address, from, mail_headers, body)
+				ok = freeswitch.email(address, from, mail_headers, body)
 			end
+			return ok
 		end
 	end
 
diff --git a/app/settings/app_defaults.php b/app/settings/app_defaults.php
index dd429260b7..a8d79466c4 100644
--- a/app/settings/app_defaults.php
+++ b/app/settings/app_defaults.php
@@ -60,7 +60,7 @@ if ($domains_processed == 1) {
 				$database = new database;
 				$database->app_name = 'settings';
 				$database->app_uuid = 'b6b1b2e5-4ba5-044c-8a5c-18709a15eb60';
-				$database->save($array);
+				$database->save($array, false);
 				unset($array);
 			//revoke temporary permissions
 				$p->delete('setting_add', 'temp');
@@ -81,7 +81,7 @@ if ($domains_processed == 1) {
 				$database = new database;
 				$database->app_name = 'settings';
 				$database->app_uuid = 'b6b1b2e5-4ba5-044c-8a5c-18709a15eb60';
-				$database->save($array);
+				$database->save($array, false);
 				unset($array);
 			//revoke temporary permissions
 				$p->delete('setting_edit', 'temp');
diff --git a/app/sip_profiles/app_defaults.php b/app/sip_profiles/app_defaults.php
index b077ba4a42..9c9a2635ff 100644
--- a/app/sip_profiles/app_defaults.php
+++ b/app/sip_profiles/app_defaults.php
@@ -125,7 +125,7 @@
 							$database = new database;
 							$database->app_name = 'sip_profiles';
 							$database->app_uuid = '159a8da8-0e8c-a26b-6d5b-19c532b6d470';
-							$database->save($array);
+							$database->save($array, false);
 							unset($array);
 
 						//revoke temporary permissions
@@ -201,7 +201,7 @@
 							$database = new database;
 							$database->app_name = 'sip_profiles';
 							$database->app_uuid = '159a8da8-0e8c-a26b-6d5b-19c532b6d470';
-							$database->save($array);
+							$database->save($array, false);
 							unset($array);
 
 						//revoke temporary permissions
diff --git a/app/sip_profiles/sip_profiles.php b/app/sip_profiles/sip_profiles.php
index 8571f4701d..053f7a5fa4 100644
--- a/app/sip_profiles/sip_profiles.php
+++ b/app/sip_profiles/sip_profiles.php
@@ -128,18 +128,18 @@
 		echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add'],'id'=>'btn_add','link'=>'sip_profile_edit.php']);
 	}
 	if (permission_exists('sip_profile_edit') && $sip_profiles) {
-		echo button::create(['type'=>'button','label'=>$text['button-toggle'],'icon'=>$_SESSION['theme']['button_icon_toggle'],'name'=>'btn_toggle','onclick'=>"modal_open('modal-toggle','btn_toggle');"]);
+		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('sip_profile_delete') && $sip_profiles) {
-		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 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');"]);
 	}
 	if (permission_exists('sofia_global_setting_view')) {
 		echo button::create(['type'=>'button','label'=>$text['button-settings'],'icon'=>'code','collapse'=>'hide-xs','link'=>'/app/sofia_global_settings/sofia_global_settings.php']);
 	}
 	echo 		"<form id='form_search' class='inline' method='get'>\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 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'=>'sip_profiles.php','style'=>($search == '' ? 'display: none;' : null)]);
+	echo 		"<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown=''>";
+	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search']);
+	//echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'sip_profiles.php','style'=>($search == '' ? 'display: none;' : null)]);
 	if ($paging_controls_mini != '') {
 		echo 	"<span style='margin-left: 15px;'>".$paging_controls_mini."</span>\n";
 	}
@@ -166,7 +166,7 @@
 	echo "<tr class='list-header'>\n";
 	if (permission_exists('sip_profile_add') || permission_exists('sip_profile_edit') || permission_exists('sip_profile_delete')) {
 		echo "	<th class='checkbox'>\n";
-		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle();' ".($sip_profiles ?: "style='visibility: hidden;'").">\n";
+		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle(); checkbox_on_change(this);' ".($sip_profiles ?: "style='visibility: hidden;'").">\n";
 		echo "	</th>\n";
 	}
 	echo th_order_by('sip_profile_name', $text['label-sip_profile_name'], $order_by, $order);
@@ -187,7 +187,7 @@
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('sip_profile_add') || permission_exists('sip_profile_edit') || permission_exists('sip_profile_delete')) {
 				echo "	<td class='checkbox'>\n";
-				echo "		<input type='checkbox' name='sip_profiles[$x][checked]' id='checkbox_".$x."' value='true' onclick=\"if (!this.checked) { document.getElementById('checkbox_all').checked = false; }\">\n";
+				echo "		<input type='checkbox' name='sip_profiles[$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='sip_profiles[$x][uuid]' value='".escape($row['sip_profile_uuid'])."' />\n";
 				echo "	</td>\n";
 			}
diff --git a/app/sip_status/app_config.php b/app/sip_status/app_config.php
index 106be7059b..5db1023e32 100644
--- a/app/sip_status/app_config.php
+++ b/app/sip_status/app_config.php
@@ -16,8 +16,8 @@
 		$apps[$x]['description']['de-de'] = "Zeigt den SIP-Status an.";
 		$apps[$x]['description']['es-cl'] = "Muestra información del sistema como RAM, CPU y Disco Duro";
 		$apps[$x]['description']['es-mx'] = "";
-		$apps[$x]['description']['fr-ca'] = "";
-		$apps[$x]['description']['fr-fr'] = "";
+		$apps[$x]['description']['fr-ca'] = "Affiche les informations système telles que les informations sur la RAM, le processeur et le disque dur.";
+		$apps[$x]['description']['fr-fr'] = "Affiche les informations système telles que les informations sur la RAM, le processeur et le disque dur.";
 		$apps[$x]['description']['he-il'] = "";
 		$apps[$x]['description']['it-it'] = "";
 		$apps[$x]['description']['nl-nl'] = "Toont de systeem informatie zoals RAM, CPU en Harddisk informatie.";
diff --git a/app/sip_status/app_languages.php b/app/sip_status/app_languages.php
index 9b939199e0..72284ed0ef 100644
--- a/app/sip_status/app_languages.php
+++ b/app/sip_status/app_languages.php
@@ -219,12 +219,12 @@ $text['description-sip_status']['de-ch'] = "View and manage the status of system
 $text['description-sip_status']['de-de'] = "View and manage the status of system profiles and gateways.";
 $text['description-sip_status']['es-cl'] = "View and manage the status of system profiles and gateways.";
 $text['description-sip_status']['es-mx'] = "View and manage the status of system profiles and gateways.";
-$text['description-sip_status']['fr-ca'] = "View and manage the status of system profiles and gateways.";
-$text['description-sip_status']['fr-fr'] = "View and manage the status of system profiles and gateways.";
+$text['description-sip_status']['fr-ca'] = "Affichez et gérez l'état des profils système et des passerelles.";
+$text['description-sip_status']['fr-fr'] = "Affichez et gérez l'état des profils système et des passerelles.";
 $text['description-sip_status']['he-il'] = "View and manage the status of system profiles and gateways.";
 $text['description-sip_status']['it-it'] = "View and manage the status of system profiles and gateways.";
 $text['description-sip_status']['nl-nl'] = "View and manage the status of system profiles and gateways.";
-$text['description-sip_status']['pl-pl'] = "View and manage the status of system profiles and gateways.";
+$text['description-sip_status']['pl-pl'] = "Przeglądaj i zarządzaj statusem profili systemowych i bramek.";
 $text['description-sip_status']['pt-br'] = "View and manage the status of system profiles and gateways.";
 $text['description-sip_status']['pt-pt'] = "View and manage the status of system profiles and gateways.";
 $text['description-sip_status']['ro-ro'] = "View and manage the status of system profiles and gateways.";
@@ -261,8 +261,8 @@ $text['button-rescan']['de-ch'] = "Neu scannen"; //copied from de-de
 $text['button-rescan']['de-de'] = "Neu scannen";
 $text['button-rescan']['es-cl'] = "Vuelva a Explorar";
 $text['button-rescan']['es-mx'] = "Vuelva a Explorar"; //copied from es-cl
-$text['button-rescan']['fr-ca'] = "Rescan"; //copied from fr-fr
-$text['button-rescan']['fr-fr'] = "Rescan";
+$text['button-rescan']['fr-ca'] = "Rescanne";
+$text['button-rescan']['fr-fr'] = "Rescanne";
 $text['button-rescan']['he-il'] = "";
 $text['button-rescan']['it-it'] = "Rescan";
 $text['button-rescan']['nl-nl'] = "Opnieuw scannen";
@@ -282,8 +282,8 @@ $text['button-reload_xml']['de-ch'] = "XML neu laden"; //copied from de-de
 $text['button-reload_xml']['de-de'] = "XML neu laden";
 $text['button-reload_xml']['es-cl'] = "Actualizar XML";
 $text['button-reload_xml']['es-mx'] = "Actualizar XML"; //copied from es-cl
-$text['button-reload_xml']['fr-ca'] = "Reload XML"; //copied from fr-fr
-$text['button-reload_xml']['fr-fr'] = "Reload XML";
+$text['button-reload_xml']['fr-ca'] = "Rechargé XML";
+$text['button-reload_xml']['fr-fr'] = "Rechargé XML";
 $text['button-reload_xml']['he-il'] = "";
 $text['button-reload_xml']['it-it'] = "Reload XML";
 $text['button-reload_xml']['nl-nl'] = "Herlaad XML";
@@ -303,8 +303,8 @@ $text['button-reload_acl']['de-ch'] = "ACL neu laden"; //copied from de-de
 $text['button-reload_acl']['de-de'] = "ACL neu laden";
 $text['button-reload_acl']['es-cl'] = "Actualizar ACL";
 $text['button-reload_acl']['es-mx'] = "Actualizar ACL"; //copied from es-cl
-$text['button-reload_acl']['fr-ca'] = "Reload ACL"; //copied from fr-fr
-$text['button-reload_acl']['fr-fr'] = "Reload ACL";
+$text['button-reload_acl']['fr-ca'] = "Rechargé ACL"; //copied from fr-fr
+$text['button-reload_acl']['fr-fr'] = "Rechargé ACL";
 $text['button-reload_acl']['he-il'] = "";
 $text['button-reload_acl']['it-it'] = "Reload ACL";
 $text['button-reload_acl']['nl-nl'] = "Herlaad ACL";
diff --git a/app/sip_status/sip_status.php b/app/sip_status/sip_status.php
index f2aa7326e1..d5de7bad66 100644
--- a/app/sip_status/sip_status.php
+++ b/app/sip_status/sip_status.php
@@ -103,6 +103,9 @@
 		message::add($message, 'negative', 5000);
 	}
 
+//define registration object
+	$registration = new registrations;
+
 //include the header
 	$document['title'] = $text['title-sip_status'];
 	require_once "resources/header.php";
@@ -248,7 +251,7 @@
 			echo "	<div class='heading'><b><a href='javascript:void(0);' onclick=\"$('#".escape($sip_profile_name)."').slideToggle();\">".$text['title-sofia-status-profile']." ".urlencode($sip_profile_name)."</a></b></div>\n";
 			echo "	<div class='actions'>\n";
 			echo button::create(['type'=>'button','label'=>$text['button-flush_registrations'],'icon'=>'eraser','collapse'=>'hide-xs','link'=>'cmd.php?profile='.urlencode($sip_profile_name).'&action=flush_inbound_reg']);
-			echo button::create(['type'=>'button','label'=>$text['button-registrations'],'icon'=>'phone-alt','collapse'=>'hide-xs','link'=>PROJECT_PATH.'/app/registrations/registrations.php?profile='.urlencode($sip_profile_name)]);
+			echo button::create(['type'=>'button','label'=>$text['button-registrations'].' ('.$registration->count($sip_profile_name).')','icon'=>'phone-alt','collapse'=>'hide-xs','link'=>PROJECT_PATH.'/app/registrations/registrations.php?profile='.urlencode($sip_profile_name)]);
 			if ($profile_state == 'stopped') {
 				echo button::create(['type'=>'button','label'=>$text['button-start'],'icon'=>$_SESSION['theme']['button_icon_start'],'collapse'=>'hide-xs','link'=>'cmd.php?profile='.urlencode($sip_profile_name).'&action=start']);
 			}
diff --git a/app/snom/app_config.php b/app/snom/app_config.php
index 828c1b9b37..a2a87d16bf 100644
--- a/app/snom/app_config.php
+++ b/app/snom/app_config.php
@@ -37,7 +37,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = "USA-7";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = "http://wiki.snom.com/Settings/timezone";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "https://service.snom.com/display/wiki/timezone";
 		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "9945982a-f366-11e9-a713-2a2ae2dbcce4";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
diff --git a/app/sofia_global_settings/app_defaults.php b/app/sofia_global_settings/app_defaults.php
index 536031bb7f..ece2b2c9ca 100644
--- a/app/sofia_global_settings/app_defaults.php
+++ b/app/sofia_global_settings/app_defaults.php
@@ -1,6 +1,12 @@
 <?php
 
 if ($domains_processed == 1) {
+	
+	//get all of the sofia global default settings
+		$sql = "select sofia_global_setting_uuid ";
+		$sql .= "from v_sofia_global_settings \n";
+		$database = new database;
+		$sofia_global_settings = $database->select($sql, null, 'all');
 
 	//build array
 		$x = 0;
@@ -27,20 +33,48 @@ if ($domains_processed == 1) {
 		$array['sofia_global_settings'][$x]['global_setting_value'] = 'udp:127.0.0.1:9060';
 		$array['sofia_global_settings'][$x]['global_setting_enabled'] = 'false';
 		$array['sofia_global_settings'][$x]['global_setting_description'] = '';
+		$x++;
+		$array['sofia_global_settings'][$x]['sofia_global_setting_uuid'] = 'b27af7db-4ba5-452b-a5ed-a922c8f201aa';
+		$array['sofia_global_settings'][$x]['global_setting_name'] = 'inbound-reg-in-new-thread';
+		$array['sofia_global_settings'][$x]['global_setting_value'] = 'true';
+		$array['sofia_global_settings'][$x]['global_setting_enabled'] = 'true';
+		$array['sofia_global_settings'][$x]['global_setting_description'] = '';
+		$x++;
+		$array['sofia_global_settings'][$x]['sofia_global_setting_uuid'] = 'cd33b89f-55ef-4b47-833a-538dba70e27e';
+		$array['sofia_global_settings'][$x]['global_setting_name'] = 'max-reg-threads';
+		$array['sofia_global_settings'][$x]['global_setting_value'] = '8';
+		$array['sofia_global_settings'][$x]['global_setting_enabled'] = 'true';
+		$array['sofia_global_settings'][$x]['global_setting_description'] = '';
 
-	//grant temporary permissions
-		$p = new permissions;
-		$p->add('sofia_global_setting_add', 'temp');
+	//removes settings from the array that are already in the database
+		$x = 0;
+		foreach($sofia_global_settings as $row) {
+			$x = 0;
+			foreach ($array['sofia_global_settings'] as $sub_row) {
+				if ($row['sofia_global_setting_uuid'] == $sub_row['sofia_global_setting_uuid']) {
+					unset($array['sofia_global_settings'][$x]);
+				}
+				$x++;
+			}
+		}
 
-	//execute insert
-		$database = new database;
-		$database->app_name = 'sofia_global_settings';
-		$database->app_uuid = '240c25a3-a2cf-44ea-a300-0626eca5b945';
-		$database->save($array);
-		unset($array);
+	//add settings that are not in the database
+		if (count($array['sofia_global_settings']) > 0) {
+			//grant temporary permissions
+				$p = new permissions;
+				$p->add('sofia_global_setting_add', 'temp');
+
+			//execute insert
+				$database = new database;
+				$database->app_name = 'sofia_global_settings';
+				$database->app_uuid = '240c25a3-a2cf-44ea-a300-0626eca5b945';
+				$database->save($array, false);
+				unset($array);
+
+			//revoke temporary permissions
+				$p->delete('sofia_global_setting_add', 'temp');
+		}
 
-	//revoke temporary permissions
-		$p->delete('sofia_global_setting_add', 'temp');
 }
 
 ?>
diff --git a/app/sofia_global_settings/resources/classes/sofia_global_settings.php b/app/sofia_global_settings/resources/classes/sofia_global_settings.php
index aac3f7485b..65d8b10b69 100644
--- a/app/sofia_global_settings/resources/classes/sofia_global_settings.php
+++ b/app/sofia_global_settings/resources/classes/sofia_global_settings.php
@@ -95,7 +95,7 @@ if (!class_exists('sofia_global_settings')) {
 							$x = 0;
 							foreach ($records as $record) {
 								//add to the array
-									if ($record['checked'] == 'true' && is_uuid($record['uuid'])) {
+									if ($record['checked'] == 'true' && is_uuid($record['sofia_global_setting_uuid'])) {
 										$array[$this->table][$x]['sofia_global_setting_uuid'] = $record['sofia_global_setting_uuid'];
 									}
 
diff --git a/app/streams/app_languages.php b/app/streams/app_languages.php
index 6c6b946819..101d1a3daa 100644
--- a/app/streams/app_languages.php
+++ b/app/streams/app_languages.php
@@ -14,7 +14,7 @@
 		$text['title-streams']['he-il'] = '';
 		$text['title-streams']['it-it'] = '';
 		$text['title-streams']['nl-nl'] = '';
-		$text['title-streams']['pl-pl'] = '';
+		$text['title-streams']['pl-pl'] = 'Strumienie';
 		$text['title-streams']['pt-br'] = '';
 		$text['title-streams']['pt-pt'] = '';
 		$text['title-streams']['ro-ro'] = '';
@@ -35,7 +35,7 @@
 		$text['title-stream']['he-il'] = '';
 		$text['title-stream']['it-it'] = '';
 		$text['title-stream']['nl-nl'] = '';
-		$text['title-stream']['pl-pl'] = '';
+		$text['title-stream']['pl-pl'] = 'Strumień';
 		$text['title-stream']['pt-br'] = '';
 		$text['title-stream']['pt-pt'] = '';
 		$text['title-stream']['ro-ro'] = '';
@@ -56,7 +56,7 @@
 		$text['title_description-stream']['he-il'] = '';
 		$text['title_description-stream']['it-it'] = '';
 		$text['title_description-stream']['nl-nl'] = '';
-		$text['title_description-stream']['pl-pl'] = '';
+		$text['title_description-stream']['pl-pl'] = 'Zdefiniuj szczegóły dla strumieniowania audio';
 		$text['title_description-stream']['pt-br'] = '';
 		$text['title_description-stream']['pt-pt'] = '';
 		$text['title_description-stream']['ro-ro'] = '';
@@ -77,7 +77,7 @@
 		$text['label-stream_name']['he-il'] = '';
 		$text['label-stream_name']['it-it'] = '';
 		$text['label-stream_name']['nl-nl'] = '';
-		$text['label-stream_name']['pl-pl'] = '';
+		$text['label-stream_name']['pl-pl'] = 'Nazwa';
 		$text['label-stream_name']['pt-br'] = '';
 		$text['label-stream_name']['pt-pt'] = '';
 		$text['label-stream_name']['ro-ro'] = '';
@@ -98,7 +98,7 @@
 		$text['description-stream_name']['he-il'] = '';
 		$text['description-stream_name']['it-it'] = '';
 		$text['description-stream_name']['nl-nl'] = '';
-		$text['description-stream_name']['pl-pl'] = '';
+		$text['description-stream_name']['pl-pl'] = 'Wprowadź nazwę';
 		$text['description-stream_name']['pt-br'] = '';
 		$text['description-stream_name']['pt-pt'] = '';
 		$text['description-stream_name']['ro-ro'] = '';
@@ -119,7 +119,7 @@
 		$text['label-stream_location']['he-il'] = '';
 		$text['label-stream_location']['it-it'] = '';
 		$text['label-stream_location']['nl-nl'] = '';
-		$text['label-stream_location']['pl-pl'] = '';
+		$text['label-stream_location']['pl-pl'] = 'Lokalizacja';
 		$text['label-stream_location']['pt-br'] = '';
 		$text['label-stream_location']['pt-pt'] = '';
 		$text['label-stream_location']['ro-ro'] = '';
@@ -140,7 +140,7 @@
 		$text['description-stream_location']['he-il'] = '';
 		$text['description-stream_location']['it-it'] = '';
 		$text['description-stream_location']['nl-nl'] = '';
-		$text['description-stream_location']['pl-pl'] = '';
+		$text['description-stream_location']['pl-pl'] = 'Wprowadź lokalizację';
 		$text['description-stream_location']['pt-br'] = '';
 		$text['description-stream_location']['pt-pt'] = '';
 		$text['description-stream_location']['ro-ro'] = '';
@@ -161,7 +161,7 @@
 		$text['label-stream_enabled']['he-il'] = '';
 		$text['label-stream_enabled']['it-it'] = '';
 		$text['label-stream_enabled']['nl-nl'] = '';
-		$text['label-stream_enabled']['pl-pl'] = '';
+		$text['label-stream_enabled']['pl-pl'] = 'Włączony';
 		$text['label-stream_enabled']['pt-br'] = '';
 		$text['label-stream_enabled']['pt-pt'] = '';
 		$text['label-stream_enabled']['ro-ro'] = '';
@@ -182,7 +182,7 @@
 		$text['description-stream_enabled']['he-il'] = '';
 		$text['description-stream_enabled']['it-it'] = '';
 		$text['description-stream_enabled']['nl-nl'] = '';
-		$text['description-stream_enabled']['pl-pl'] = '';
+		$text['description-stream_enabled']['pl-pl'] = 'Włącz lub wyłącz ten strumień.';
 		$text['description-stream_enabled']['pt-br'] = '';
 		$text['description-stream_enabled']['pt-pt'] = '';
 		$text['description-stream_enabled']['ro-ro'] = '';
@@ -203,7 +203,7 @@
 		$text['label-stream_description']['he-il'] = '';
 		$text['label-stream_description']['it-it'] = '';
 		$text['label-stream_description']['nl-nl'] = '';
-		$text['label-stream_description']['pl-pl'] = '';
+		$text['label-stream_description']['pl-pl'] = 'Opis';
 		$text['label-stream_description']['pt-br'] = '';
 		$text['label-stream_description']['pt-pt'] = '';
 		$text['label-stream_description']['ro-ro'] = '';
@@ -224,7 +224,7 @@
 		$text['description-stream_description']['he-il'] = '';
 		$text['description-stream_description']['it-it'] = '';
 		$text['description-stream_description']['nl-nl'] = '';
-		$text['description-stream_description']['pl-pl'] = '';
+		$text['description-stream_description']['pl-pl'] = 'Wprowadź opis.';
 		$text['description-stream_description']['pt-br'] = '';
 		$text['description-stream_description']['pt-pt'] = '';
 		$text['description-stream_description']['ro-ro'] = '';
diff --git a/app/streams/streams.php b/app/streams/streams.php
index 5f2c3d859e..7125d1acac 100644
--- a/app/streams/streams.php
+++ b/app/streams/streams.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) 2018-2020
+	Portions created by the Initial Developer are Copyright (C) 2018-2022
 	the Initial Developer. All Rights Reserved.
 */
 
@@ -144,13 +144,13 @@
 		echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add'],'id'=>'btn_add','link'=>'stream_edit.php']);
 	}
 	if (permission_exists('stream_add') && $streams) {
-		echo button::create(['type'=>'button','label'=>$text['button-copy'],'icon'=>$_SESSION['theme']['button_icon_copy'],'name'=>'btn_copy','onclick'=>"modal_open('modal-copy','btn_copy');"]);
+		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('stream_edit') && $streams) {
-		echo button::create(['type'=>'button','label'=>$text['button-toggle'],'icon'=>$_SESSION['theme']['button_icon_toggle'],'name'=>'btn_toggle','onclick'=>"modal_open('modal-toggle','btn_toggle');"]);
+		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('stream_delete') && $streams) {
-		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 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('stream_all')) {
@@ -193,7 +193,7 @@
 	echo "<tr class='list-header'>\n";
 	if (permission_exists('stream_add') || permission_exists('stream_edit') || permission_exists('stream_delete')) {
 		echo "	<th class='checkbox'>\n";
-		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle();' ".($streams ?: "style='visibility: hidden;'").">\n";
+		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle(); checkbox_on_change(this);' ".($streams ?: "style='visibility: hidden;'").">\n";
 		echo "	</th>\n";
 	}
 	if ($_GET['show'] == 'all' && permission_exists('stream_all')) {
@@ -217,7 +217,7 @@
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('stream_add') || permission_exists('stream_edit') || permission_exists('stream_delete')) {
 				echo "	<td class='checkbox'>\n";
-				echo "		<input type='checkbox' name='streams[$x][checked]' id='checkbox_".$x."' value='true' onclick=\"if (!this.checked) { document.getElementById('checkbox_all').checked = false; }\">\n";
+				echo "		<input type='checkbox' name='streams[$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='streams[$x][uuid]' value='".escape($row['stream_uuid'])."' />\n";
 				echo "	</td>\n";
 			}
@@ -242,9 +242,8 @@
 			echo "	<td class='no-wrap button'>\n";
 			if (strlen($row['stream_location']) > 0) {
 				$location_parts = explode('://',$row['stream_location']);
-				if ($location_parts[0] == "shout") {
-					echo "<audio src='http://".$location_parts[1]."' controls='controls' />\n";
-				}
+				$http_protocol = ($location_parts[0] == "shout") ? 'http' : 'https';
+				echo "<audio src='".$http_protocol."://".$location_parts[1]."' controls='controls' />\n";
 			}
 			echo "	</td>\n";
 			if (permission_exists('stream_edit')) {
@@ -277,4 +276,4 @@
 //include the footer
 	require_once "resources/footer.php";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/switch/app_config.php b/app/switch/app_config.php
new file mode 100644
index 0000000000..e9832b43c0
--- /dev/null
+++ b/app/switch/app_config.php
@@ -0,0 +1,66 @@
+<?php
+
+	//application details
+		$apps[$x]['name'] = "Switch";
+		$apps[$x]['uuid'] = "9cc48cb9-22d3-42eb-8bf8-3ca970e364d7";
+		$apps[$x]['category'] = "Switch";
+		$apps[$x]['subcategory'] = "";
+		$apps[$x]['version'] = "1.0";
+		$apps[$x]['license'] = "";
+		$apps[$x]['url'] = "http://www.fusionpbx.com";
+		$apps[$x]['description']['en-us'] = "Switch details such as version, uptime, channels and registrations.";
+		$apps[$x]['description']['en-gb'] = "Switch details such as version, uptime, channels and registrations.";
+		$apps[$x]['description']['ar-eg'] = "";
+		$apps[$x]['description']['de-at'] = "";
+		$apps[$x]['description']['de-ch'] = "";
+		$apps[$x]['description']['de-de'] = "";
+		$apps[$x]['description']['es-cl'] = "";
+		$apps[$x]['description']['es-mx'] = "";
+		$apps[$x]['description']['fr-ca'] = "";
+		$apps[$x]['description']['fr-fr'] = "";
+		$apps[$x]['description']['he-il'] = "";
+		$apps[$x]['description']['it-it'] = "";
+		$apps[$x]['description']['nl-nl'] = "";
+		$apps[$x]['description']['pl-pl'] = "";
+		$apps[$x]['description']['pt-br'] = "";
+		$apps[$x]['description']['pt-pt'] = "";
+		$apps[$x]['description']['ro-ro'] = "";
+		$apps[$x]['description']['ru-ru'] = "";
+		$apps[$x]['description']['sv-se'] = "";
+		$apps[$x]['description']['uk-ua'] = "";
+
+	//default settings
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "9ff1ed88-76ba-4648-a082-d53f64947d08";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "dashboard";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "switch_status_chart_main_background_color";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "#2a9df4";
+		$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'] = "7d7ba6e6-1616-4082-9f20-774e8ef673c9";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "dashboard";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "switch_status_chart_sub_background_color";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "#d4d4d4";
+		$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'] = "cad4fdf1-2eb5-4669-8215-2b3dbee5d124";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "dashboard";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "switch_status_chart_border_color";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "rgba(0,0,0,0)";
+		$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'] = "206d91d0-1ee2-46f3-a30b-977ad49b84cb";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "dashboard";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "switch_status_chart_border_width";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "";
+
+?>
diff --git a/app/switch/app_languages.php b/app/switch/app_languages.php
new file mode 100644
index 0000000000..96d677de40
--- /dev/null
+++ b/app/switch/app_languages.php
@@ -0,0 +1,135 @@
+<?php
+
+$text['label-switch_status']['en-us'] = "Switch Status";
+$text['label-switch_status']['en-gb'] = "Switch Status";
+$text['label-switch_status']['ar-eg'] = "";
+$text['label-switch_status']['de-at'] = "Switch"; //copied from de-de
+$text['label-switch_status']['de-ch'] = "Switch"; //copied from de-de
+$text['label-switch_status']['de-de'] = "Switch";
+$text['label-switch_status']['el-gr'] = "Switch";
+$text['label-switch_status']['es-cl'] = "Switch";
+$text['label-switch_status']['es-mx'] = "Switch"; //copied from es-cl
+$text['label-switch_status']['fr-ca'] = "Switch"; //copied from fr-fr
+$text['label-switch_status']['fr-fr'] = "Switch";
+$text['label-switch_status']['he-il'] = "";
+$text['label-switch_status']['it-it'] = "Switch";
+$text['label-switch_status']['nl-nl'] = "";
+$text['label-switch_status']['pl-pl'] = "Switch";
+$text['label-switch_status']['pt-br'] = "Switch"; //copied from pt-pt
+$text['label-switch_status']['pt-pt'] = "Switch";
+$text['label-switch_status']['ro-ro'] = "";
+$text['label-switch_status']['ru-ru'] = "FreeSwitch";
+$text['label-switch_status']['sv-se'] = "Switch";
+$text['label-switch_status']['uk-ua'] = "Switch";
+
+$text['label-channels']['en-us'] = "Channels";
+$text['label-channels']['en-gb'] = "Channels";
+$text['label-channels']['ar-eg'] = "";
+$text['label-channels']['de-at'] = "Kanäle"; //copied from de-de
+$text['label-channels']['de-ch'] = "Kanäle"; //copied from de-de
+$text['label-channels']['de-de'] = "Kanäle";
+$text['label-channels']['el-gr'] = "Κανάλια";
+$text['label-channels']['es-cl'] = "Canales";
+$text['label-channels']['es-mx'] = "Canales"; //copied from es-cl
+$text['label-channels']['fr-ca'] = "Canaux"; //copied from fr-fr
+$text['label-channels']['fr-fr'] = "Canaux";
+$text['label-channels']['he-il'] = "ערוצים";
+$text['label-channels']['it-it'] = "Canali";
+$text['label-channels']['nl-nl'] = "";
+$text['label-channels']['pl-pl'] = "Kanały";
+$text['label-channels']['pt-br'] = "Canais"; //copied from pt-pt
+$text['label-channels']['pt-pt'] = "Canais";
+$text['label-channels']['ro-ro'] = "Canale";
+$text['label-channels']['ru-ru'] = "Каналы";
+$text['label-channels']['sv-se'] = "Kanaler";
+$text['label-channels']['uk-ua'] = "Канали";
+
+$text['label-registrations']['en-us'] = "Registrations";
+$text['label-registrations']['en-gb'] = "Registrations";
+$text['label-registrations']['ar-eg'] = "";
+$text['label-registrations']['de-at'] = "Registrierungen"; //copied from de-de
+$text['label-registrations']['de-ch'] = "Registrierungen"; //copied from de-de
+$text['label-registrations']['de-de'] = "Registrierungen";
+$text['label-registrations']['el-gr'] = "Συνδέσεις";
+$text['label-registrations']['es-cl'] = "Inscripciones";
+$text['label-registrations']['es-mx'] = "Inscripciones"; //copied from es-cl
+$text['label-registrations']['fr-ca'] = "Enregistrements SIP"; //copied from fr-fr
+$text['label-registrations']['fr-fr'] = "Enregistrements SIP";
+$text['label-registrations']['he-il'] = "";
+$text['label-registrations']['it-it'] = "Registrazioni";
+$text['label-registrations']['nl-nl'] = "";
+$text['label-registrations']['pl-pl'] = "Rejestracje";
+$text['label-registrations']['pt-br'] = "Registros";
+$text['label-registrations']['pt-pt'] = "Inscrições";
+$text['label-registrations']['ro-ro'] = "";
+$text['label-registrations']['ru-ru'] = "Регистрации SIP";
+$text['label-registrations']['sv-se'] = "Registreringar";
+$text['label-registrations']['uk-ua'] = "Реєстрації";
+
+$text['label-switch_uptime']['en-us'] = "Switch Uptime";
+$text['label-switch_uptime']['en-gb'] = "Switch Uptime";
+$text['label-switch_uptime']['ar-eg'] = "";
+$text['label-switch_uptime']['de-at'] = "Switch Uptime"; //copied from de-de
+$text['label-switch_uptime']['de-ch'] = "Switch Uptime"; //copied from de-de
+$text['label-switch_uptime']['de-de'] = "Switch Uptime";
+$text['label-switch_uptime']['el-gr'] = "Switch Uptime";
+$text['label-switch_uptime']['es-cl'] = "Tiempo de actividad Switch";
+$text['label-switch_uptime']['es-mx'] = "Tiempo de actividad Switch"; //copied from es-cl
+$text['label-switch_uptime']['fr-ca'] = "Switch Uptime"; //copied from fr-fr
+$text['label-switch_uptime']['fr-fr'] = "Switch Uptime";
+$text['label-switch_uptime']['he-il'] = "";
+$text['label-switch_uptime']['it-it'] = "Tempo di attività Switch";
+$text['label-switch_uptime']['nl-nl'] = "";
+$text['label-switch_uptime']['pl-pl'] = "Switch Uptime";
+$text['label-switch_uptime']['pt-br'] = "Tempo de atividade do switch";
+$text['label-switch_uptime']['pt-pt'] = "Uptime Switch";
+$text['label-switch_uptime']['ro-ro'] = "";
+$text['label-switch_uptime']['ru-ru'] = "Время непрерывной работы FreeSwitch";
+$text['label-switch_uptime']['sv-se'] = "Switch Uptime";
+$text['label-switch_uptime']['uk-ua'] = "Switch Uptime";
+
+$text['label-switch']['en-us'] = "Switch";
+$text['label-switch']['en-gb'] = "Switch";
+$text['label-switch']['ar-eg'] = "";
+$text['label-switch']['de-at'] = "Switch"; //copied from de-de
+$text['label-switch']['de-ch'] = "Switch"; //copied from de-de
+$text['label-switch']['de-de'] = "Switch";
+$text['label-switch']['el-gr'] = "Switch";
+$text['label-switch']['es-cl'] = "Switch";
+$text['label-switch']['es-mx'] = "Switch"; //copied from es-cl
+$text['label-switch']['fr-ca'] = "Switch"; //copied from fr-fr
+$text['label-switch']['fr-fr'] = "Switch";
+$text['label-switch']['he-il'] = "";
+$text['label-switch']['it-it'] = "Switch";
+$text['label-switch']['nl-nl'] = "";
+$text['label-switch']['pl-pl'] = "Switch";
+$text['label-switch']['pt-br'] = "Switch"; //copied from pt-pt
+$text['label-switch']['pt-pt'] = "Switch";
+$text['label-switch']['ro-ro'] = "";
+$text['label-switch']['ru-ru'] = "FreeSwitch";
+$text['label-switch']['sv-se'] = "Switch";
+$text['label-switch']['uk-ua'] = "Switch";
+
+$text['label-switch']['en-us'] = "Switch";
+$text['label-switch']['en-gb'] = "Switch";
+$text['label-switch']['ar-eg'] = "";
+$text['label-switch']['de-at'] = "Switch"; //copied from de-de
+$text['label-switch']['de-ch'] = "Switch"; //copied from de-de
+$text['label-switch']['de-de'] = "Switch";
+$text['label-switch']['el-gr'] = "Switch";
+$text['label-switch']['es-cl'] = "Switch";
+$text['label-switch']['es-mx'] = "Switch"; //copied from es-cl
+$text['label-switch']['fr-ca'] = "Switch"; //copied from fr-fr
+$text['label-switch']['fr-fr'] = "Switch";
+$text['label-switch']['he-il'] = "";
+$text['label-switch']['it-it'] = "Switch";
+$text['label-switch']['nl-nl'] = "";
+$text['label-switch']['pl-pl'] = "Switch";
+$text['label-switch']['pt-br'] = "Switch"; //copied from pt-pt
+$text['label-switch']['pt-pt'] = "Switch";
+$text['label-switch']['ro-ro'] = "";
+$text['label-switch']['ru-ru'] = "FreeSwitch";
+$text['label-switch']['sv-se'] = "Switch";
+$text['label-switch']['uk-ua'] = "Switch";
+
+?>
\ No newline at end of file
diff --git a/app/switch/resources/dashboard/config.php b/app/switch/resources/dashboard/config.php
new file mode 100644
index 0000000000..efb1070e47
--- /dev/null
+++ b/app/switch/resources/dashboard/config.php
@@ -0,0 +1,16 @@
+<?php
+
+$x++;
+$array['dashboard'][$x]['dashboard_uuid'] = 'b9d92260-eaf7-4c05-a51e-3083e25516b3';
+$array['dashboard'][$x]['dashboard_name'] = 'Switch Status';
+$array['dashboard'][$x]['dashboard_path'] = 'app/switch/resources/dashboard/switch_status.php';
+$array['dashboard'][$x]['dashboard_order'] = '105';
+$array['dashboard'][$x]['dashboard_enabled'] = 'false';
+$array['dashboard'][$x]['dashboard_description'] = 'Switch details such as version, uptime, channels and registrations.';
+$y = 0;
+$array['dashboard'][$x]['dashboard_groups'][$y]['dashboard_group_uuid'] = '5469c403-2cc5-4340-99f8-6f0755407de7';
+$array['dashboard'][$x]['dashboard_groups'][$y]['dashboard_uuid'] = 'b9d92260-eaf7-4c05-a51e-3083e25516b3';
+$array['dashboard'][$x]['dashboard_groups'][$y]['group_name'] = 'superadmin';
+$x++;
+
+?>
diff --git a/app/switch/resources/dashboard/switch_status.php b/app/switch/resources/dashboard/switch_status.php
new file mode 100644
index 0000000000..2af47d09ee
--- /dev/null
+++ b/app/switch/resources/dashboard/switch_status.php
@@ -0,0 +1,173 @@
+<?php
+
+//includes
+	require_once "root.php";
+	require_once "resources/require.php";
+
+//check permisions
+	require_once "resources/check_auth.php";
+	if (permission_exists("registration_all") || if_group("superadmin")) {
+		//access granted
+	}
+	else {
+		echo "access denied";
+		exit;
+	}
+
+//add multi-lingual support
+	$language = new text;
+	$text = $language->get($_SESSION['domain']['language']['code'], 'app/switch');
+
+//switch status
+	echo "<div class='hud_box'>\n";
+
+//set the row style class names
+	$c = 0;
+	$row_style["0"] = "row_style0";
+	$row_style["1"] = "row_style1";
+
+//connect to event socket
+	$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+
+//switch version
+	if ($fp) {
+		$switch_version = event_socket_request($fp, 'api version');
+		preg_match("/FreeSWITCH Version (\d+\.\d+\.\d+(?:\.\d+)?).*\(.*?(\d+\w+)\s*\)/", $switch_version, $matches);
+		$switch_version = $matches[1];
+		$switch_bits = $matches[2];
+	}
+
+//switch uptime
+	if ($fp) {
+		$tmp = event_socket_request($fp, 'api status');
+		$tmp = explode("\n", $tmp);
+		$tmp = $tmp[0];
+		$tmp = explode(' ', $tmp);
+		$uptime = (($tmp[1]) ? $tmp[1].'y ' : null);
+		$uptime .= (($tmp[3]) ? $tmp[3].'d ' : null);
+		$uptime .= (($tmp[5]) ? $tmp[5].'h ' : null);
+		$uptime .= (($tmp[7]) ? $tmp[7].'m ' : null);
+		$uptime .= (($tmp[9]) ? $tmp[9].'s' : null);
+		if (permission_exists('system_status_sofia_status') || permission_exists('system_status_sofia_status_profile') || if_group("superadmin")) {
+			$tr_link_sip_status = "href='".PROJECT_PATH."/app/sip_status/sip_status.php'";
+		}
+	}
+
+//channel count
+	if ($fp) {
+		$tmp = event_socket_request($fp, 'api status');
+		$matches = Array();
+		preg_match("/(\d+)\s+session\(s\)\s+\-\speak/", $tmp, $matches);
+		$channels = $matches[1] ? $matches[1] : 0;
+		if (permission_exists('call_active_view')) {
+			$tr_link_channels = "href='".PROJECT_PATH."/app/calls_active/calls_active.php'";
+		}
+	}
+
+//registration count
+	if ($fp && file_exists($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/app/registrations/")) {
+		$registration = new registrations;
+		$registrations = $registration->count();
+		if (permission_exists("registration_all") || if_group("superadmin")) {
+			$tr_link_registrations = "href='".PROJECT_PATH."/app/registrations/registrations.php'";
+		}
+	}
+
+//add doughnut chart
+	?>
+	<div style='display: flex; flex-wrap: wrap; justify-content: center; padding-bottom: 20px;'>
+		<div style='width: 175px; height: 175px;'><canvas id='switch_status_chart'></canvas></div>
+	</div>
+
+	<script>
+		var switch_status_chart_context = document.getElementById('switch_status_chart').getContext('2d');
+
+		const switch_status_chart_data = {
+			datasets: [{
+				data: ['<?php echo $registrations; ?>', 0.00001],
+				backgroundColor: ['<?php echo $_SESSION['dashboard']['switch_status_chart_main_background_color']['text']; ?>',
+				'<?php echo $_SESSION['dashboard']['switch_status_chart_sub_background_color']['text']; ?>'],
+				borderColor: '<?php echo $_SESSION['dashboard']['switch_status_chart_border_color']['text']; ?>',
+				borderWidth: '<?php echo $_SESSION['dashboard']['switch_status_chart_border_width']['text']; ?>',
+				cutout: chart_cutout
+			}]
+		};
+
+		const switch_status_chart_config = {
+			type: 'doughnut',
+			data: switch_status_chart_data,
+			options: {
+				responsive: true,
+				maintainAspectRatio: false,
+				plugins: {
+					chart_counter: {
+						chart_text: '<?php echo $registrations; ?>'
+					},
+					legend: {
+						display: false
+					},
+					title: {
+						display: true,
+						text: '<?php echo $text['label-switch_status']; ?>'
+					}
+				}
+			},
+			plugins: [chart_counter],
+		};
+
+		const switch_status_chart = new Chart(
+			switch_status_chart_context,
+			switch_status_chart_config
+		);
+	</script>
+	<?php
+
+//show the content
+	echo "<div class='hud_details hud_box' id='hud_switch_status_details'>";
+	echo "<table class='tr_hover' width='100%' cellpadding='0' cellspacing='0' border='0'>\n";
+	echo "<tr>\n";
+	echo "<th class='hud_heading' width='50%'>".$text['label-name']."</th>\n";
+	echo "<th class='hud_heading' style='text-align: right;'>".$text['label-value']."</th>\n";
+	echo "</tr>\n";
+
+	//switch version
+	if ($switch_version != '') {
+		echo "<tr class='tr_link' ".$tr_link_sip_status.">\n";
+		echo "<td valign='top' class='".$row_style[$c]." hud_text'>".$text['label-switch']."</td>\n";
+		echo "<td valign='top' class='".$row_style[$c]." hud_text' style='text-align: right;'><a ".$tr_link_sip_status.">".$switch_version." (".$switch_bits.")</a></td>\n";
+		echo "</tr>\n";
+		$c = ($c) ? 0 : 1;
+	}
+
+	//switch uptime
+	if ($uptime != '') {
+		echo "<tr class='tr_link' ".$tr_link_sip_status.">\n";
+		echo "<td valign='top' class='".$row_style[$c]." hud_text'>".$text['label-switch_uptime']."</td>\n";
+		echo "<td valign='top' class='".$row_style[$c]." hud_text' style='text-align: right;'><a ".$tr_link_sip_status.">".$uptime."</a></td>\n";
+		echo "</tr>\n";
+		$c = ($c) ? 0 : 1;
+	}
+
+	//switch channels
+	echo "<tr class='tr_link' ".$tr_link_channels.">\n";
+	echo "<td valign='top' class='".$row_style[$c]." hud_text'>".$text['label-channels']."</td>\n";
+	echo "<td valign='top' class='".$row_style[$c]." hud_text' style='text-align: right;'><a ".$tr_link_channels.">".$channels."</a></td>\n";
+	echo "</tr>\n";
+	$c = ($c) ? 0 : 1;
+
+	//switch registrations
+	echo "<tr class='tr_link' ".$tr_link_registrations.">\n";
+	echo "<td valign='top' class='".$row_style[$c]." hud_text'>".$text['label-registrations']."</td>\n";
+	echo "<td valign='top' class='".$row_style[$c]." hud_text' style='text-align: right;'><a ".$tr_link_registrations.">".$registrations."</a></td>\n";
+	echo "</tr>\n";
+	$c = ($c) ? 0 : 1;
+
+
+	echo "</table>\n";
+	echo "</div>";
+	$n++;
+
+	echo "<span class='hud_expander' onclick=\"$('#hud_switch_status_details').slideToggle('fast');\"><span class='fas fa-ellipsis-h'></span></span>";
+	echo "</div>\n";
+
+?>
diff --git a/app/system/app_config.php b/app/system/app_config.php
index b448360f82..a32c5c8c74 100644
--- a/app/system/app_config.php
+++ b/app/system/app_config.php
@@ -162,7 +162,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_order'] = "10";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "";
 		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "d82957f6-c546-4453-ac27-dd05ee4f57e6";
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "acb9d242-5f93-4bb7-a135-64eeefa15fd0";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "dashboard";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "disk_usage_chart_main_background_color";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "array";
diff --git a/app/system/app_languages.php b/app/system/app_languages.php
index 0a097a5a1a..e9cc147f29 100644
--- a/app/system/app_languages.php
+++ b/app/system/app_languages.php
@@ -56,7 +56,7 @@ $text['title-os-info']['fr-fr'] = "Informations sur le système d'exploitation";
 $text['title-os-info']['he-il'] = "";
 $text['title-os-info']['it-it'] = "Informazioni Sistema Operativo";
 $text['title-os-info']['nl-nl'] = "Operating Systeem Informatie";
-$text['title-os-info']['pl-pl'] = "Informacje o System operacyjny";
+$text['title-os-info']['pl-pl'] = "Informacje o Systemie operacyjnym";
 $text['title-os-info']['pt-br'] = "Informação do Sistema operacional";
 $text['title-os-info']['pt-pt'] = "Informação do Sistema Operativo";
 $text['title-os-info']['ro-ro'] = "";
@@ -371,7 +371,7 @@ $text['label-git_commit']['fr-fr'] = "Commettre";
 $text['label-git_commit']['he-il'] = "";
 $text['label-git_commit']['it-it'] = "Commit:";
 $text['label-git_commit']['nl-nl'] = "Vastleggen:";
-$text['label-git_commit']['pl-pl'] = "Popełnić";
+$text['label-git_commit']['pl-pl'] = "Zatwierdzenie";
 $text['label-git_commit']['pt-br'] = "cometer"; //copied from pt-pt
 $text['label-git_commit']['pt-pt'] = "cometer";
 $text['label-git_commit']['ro-ro'] = "";
@@ -604,7 +604,7 @@ $text['label-cpu_cores']['fr-fr'] = "CPU Cores";
 $text['label-cpu_cores']['he-il'] = "CPU Cores";
 $text['label-cpu_cores']['it-it'] = "CPU Cores";
 $text['label-cpu_cores']['nl-nl'] = "CPU Cores";
-$text['label-cpu_cores']['pl-pl'] = "CPU Cores";
+$text['label-cpu_cores']['pl-pl'] = "Rdzenie CPU";
 $text['label-cpu_cores']['pt-br'] = "CPU Cores";
 $text['label-cpu_cores']['pt-pt'] = "CPU Cores";
 $text['label-cpu_cores']['ro-ro'] = "CPU Cores";
@@ -626,7 +626,7 @@ $text['label-load_average']['fr-fr'] = "Load Average";
 $text['label-load_average']['he-il'] = "Load Average";
 $text['label-load_average']['it-it'] = "Load Average";
 $text['label-load_average']['nl-nl'] = "Load Average";
-$text['label-load_average']['pl-pl'] = "Load Average";
+$text['label-load_average']['pl-pl'] = "Średnie Obciążenie";
 $text['label-load_average']['pt-br'] = "Load Average";
 $text['label-load_average']['pt-pt'] = "Load Average";
 $text['label-load_average']['ro-ro'] = "Load Average";
diff --git a/app/system/resources/dashboard/config.php b/app/system/resources/dashboard/config.php
index 30e53faeb9..0fcfffb62d 100644
--- a/app/system/resources/dashboard/config.php
+++ b/app/system/resources/dashboard/config.php
@@ -35,9 +35,9 @@ $y = 0;
 $array['dashboard'][$x]['dashboard_groups'][$y]['dashboard_group_uuid'] = 'a772d2a8-7c1f-4453-b77b-2e15b510a78d';
 $array['dashboard'][$x]['dashboard_groups'][$y]['dashboard_uuid'] = 'bb76f7fc-669f-41dd-a636-6ddaee5deae1';
 $array['dashboard'][$x]['dashboard_groups'][$y]['group_name'] = 'superadmin';
-$y++;
-$array['dashboard'][$x]['dashboard_groups'][$y]['dashboard_group_uuid'] = '127382ae-0dd1-45eb-869c-56a708220de5';
-$array['dashboard'][$x]['dashboard_groups'][$y]['dashboard_uuid'] = 'bb76f7fc-669f-41dd-a636-6ddaee5deae1';
-$array['dashboard'][$x]['dashboard_groups'][$y]['group_name'] = 'admin';
+//$y++;
+//$array['dashboard'][$x]['dashboard_groups'][$y]['dashboard_group_uuid'] = '127382ae-0dd1-45eb-869c-56a708220de5';
+//$array['dashboard'][$x]['dashboard_groups'][$y]['dashboard_uuid'] = 'bb76f7fc-669f-41dd-a636-6ddaee5deae1';
+//$array['dashboard'][$x]['dashboard_groups'][$y]['group_name'] = 'admin';
 
 ?>
diff --git a/app/system/resources/dashboard/system_counts.php b/app/system/resources/dashboard/system_counts.php
index 30a23fe4c7..5d40b5bf10 100644
--- a/app/system/resources/dashboard/system_counts.php
+++ b/app/system/resources/dashboard/system_counts.php
@@ -291,7 +291,7 @@
 	if ($show_stat) {
 		//add doughnut chart
 		?>
-		<div style='display: flex; flex-wrap: wrap; justify-content: center; padding-bottom: 10px;'>
+		<div style='display: flex; flex-wrap: wrap; justify-content: center; padding-bottom: 20px;'>
 			<div style='width: 250px; height: 175px;'><canvas id='system_counts_chart'></canvas></div>
 		</div>
 
@@ -299,7 +299,7 @@
 			var system_counts_chart_context = document.getElementById('system_counts_chart').getContext('2d');
 
 			const system_counts_chart_data = {
-				labels: ['InActive: <?php echo $domain_inactive; ?>', 'Active: <?php echo $domain_active; ?>'],
+				labels: ['<?php echo $text['label-inactive']; ?>: <?php echo $domain_inactive; ?>', '<?php echo $text['label-active']; ?>: <?php echo $domain_active; ?>'],
 				datasets: [{
 					data: ['<?php echo $domain_inactive; ?>', '<?php echo $domain_active; ?>'],
 					backgroundColor: [
diff --git a/app/system/resources/dashboard/system_cpu_status.php b/app/system/resources/dashboard/system_cpu_status.php
index 84bd7e3844..05601e11a8 100644
--- a/app/system/resources/dashboard/system_cpu_status.php
+++ b/app/system/resources/dashboard/system_cpu_status.php
@@ -49,7 +49,7 @@
 
 //add half doughnut chart
 	?>
-	<div style='display: flex; flex-wrap: wrap; justify-content: center; padding-bottom: 8px'>
+	<div style='display: flex; flex-wrap: wrap; justify-content: center; padding-bottom: 20px'>
 		<div style='width: 175px; height: 175px; margin: 0 auto;'><canvas id='system_cpu_status_chart'></canvas></div>
 	</div>
 
@@ -57,11 +57,11 @@
 		var system_cpu_status_chart_context = document.getElementById('system_cpu_status_chart').getContext('2d');
 
 		var system_cpu_status_chart_background_color;
-		if ('<?php echo $percent_cpu; ?>' <= 50) {
+		if ('<?php echo $percent_cpu; ?>' <= 60) {
 			system_cpu_status_chart_background_color = '<?php echo $_SESSION['dashboard']['cpu_usage_chart_main_background_color'][0]; ?>';
-		} else if ('<?php echo $percent_cpu; ?>' <= 70 && '<?php echo $percent_cpu; ?>' > 50) {
+		} else if ('<?php echo $percent_cpu; ?>' <= 80) {
 			system_cpu_status_chart_background_color = '<?php echo $_SESSION['dashboard']['cpu_usage_chart_main_background_color'][1]; ?>';
-		} else if ('<?php echo $percent_cpu; ?>' > 70) {
+		} else if ('<?php echo $percent_cpu; ?>' > 80) {
 			system_cpu_status_chart_background_color = '<?php echo $_SESSION['dashboard']['cpu_usage_chart_main_background_color'][2]; ?>';
 		}
 
@@ -118,7 +118,7 @@
 	echo "<div class='hud_details hud_box' id='hud_system_cpu_status_details'>";
 	echo "<table class='tr_hover' width='100%' cellpadding='0' cellspacing='0' border='0'>\n";
 	echo "<tr>\n";
-	echo "<th class='hud_heading' width='50%'>".$text['label-item']."</th>\n";
+	echo "<th class='hud_heading' width='50%'>".$text['label-name']."</th>\n";
 	echo "<th class='hud_heading' style='text-align: right;'>".$text['label-value']."</th>\n";
 	echo "</tr>\n";
 
diff --git a/app/system/resources/dashboard/system_status.php b/app/system/resources/dashboard/system_status.php
index ab26c0b6ab..8197e50cfa 100644
--- a/app/system/resources/dashboard/system_status.php
+++ b/app/system/resources/dashboard/system_status.php
@@ -38,7 +38,7 @@
 		if ($percent_disk_usage != '') {
 			//add half doughnut chart
 			?>
-			<div style='display: flex; flex-wrap: wrap; justify-content: center; padding-bottom: 8px'>
+			<div style='display: flex; flex-wrap: wrap; justify-content: center; padding-bottom: 20px'>
 				<div style='width: 175px; height: 175px;'><canvas id='system_status_chart'></canvas></div>
 			</div>
 
@@ -46,11 +46,11 @@
 				var system_status_chart_context = document.getElementById('system_status_chart').getContext('2d');
 
 				var system_status_chart_background_color;
-				if ('<?php echo $percent_disk_usage; ?>' < 60) {
+				if ('<?php echo $percent_disk_usage; ?>' <= 80) {
 					system_status_chart_background_color = '<?php echo $_SESSION['dashboard']['disk_usage_chart_main_background_color'][0]; ?>';
-				} else if ('<?php echo $percent_disk_usage; ?>' < 80 && '<?php echo $percent_disk_usage; ?>' > 60) {
+				} else if ('<?php echo $percent_disk_usage; ?>' <= 90) {
 					system_status_chart_background_color = '<?php echo $_SESSION['dashboard']['disk_usage_chart_main_background_color'][1]; ?>';
-				} else if ('<?php echo $percent_disk_usage; ?>' >= 80) {
+				} else if ('<?php echo $percent_disk_usage; ?>' > 90) {
 					system_status_chart_background_color = '<?php echo $_SESSION['dashboard']['disk_usage_chart_main_background_color'][2]; ?>';
 				}
 
diff --git a/app/time_conditions/app_config.php b/app/time_conditions/app_config.php
index fd17638ff9..ce76051015 100644
--- a/app/time_conditions/app_config.php
+++ b/app/time_conditions/app_config.php
@@ -65,6 +65,9 @@
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "time_condition_all";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "time_condition_domain";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
diff --git a/app/time_conditions/time_conditions.php b/app/time_conditions/time_conditions.php
index 6c24dac785..f894307d03 100644
--- a/app/time_conditions/time_conditions.php
+++ b/app/time_conditions/time_conditions.php
@@ -100,16 +100,22 @@
 
 //get the number of rows in the dialplan
 	$sql = "select count(dialplan_uuid) from v_dialplans ";
-	$sql .= "where (domain_uuid = :domain_uuid or domain_uuid is null) ";
+	$sql .= "where true ";
+	if ($_GET['show'] != "all" || !permission_exists('time_condition_all')) {
+		$sql .= "and (domain_uuid = :domain_uuid or domain_uuid is null) ";
+		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+	}
 	$sql .= "and app_uuid = '4b821450-926b-175a-af93-a03c441818b1' ";
 	$sql .= $sql_search;
-	$parameters['domain_uuid'] = $domain_uuid;
 	$database = new database;
 	$num_rows = $database->select($sql, $parameters, 'column');
 
 //prepare to page data
 	$rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50;
-	$param = $search ? "&search=".$search : null;
+	$param = $search ? "&search=".urlencode($search) : null;
+	if ($_GET['show'] == "all" && permission_exists('time_condition_all')) {
+		$param .= "&show=all";
+	}
 	$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);
@@ -139,18 +145,26 @@
 		echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add'],'id'=>'btn_add','link'=>'time_condition_edit.php']);
 	}
 	if (permission_exists('time_condition_add') && $dialplans) {
-		echo button::create(['type'=>'button','label'=>$text['button-copy'],'icon'=>$_SESSION['theme']['button_icon_copy'],'name'=>'btn_copy','onclick'=>"modal_open('modal-copy','btn_copy');"]);
+		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('time_condition_edit') && $dialplans) {
-		echo button::create(['type'=>'button','label'=>$text['button-toggle'],'icon'=>$_SESSION['theme']['button_icon_toggle'],'name'=>'btn_toggle','onclick'=>"modal_open('modal-toggle','btn_toggle');"]);
+		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('time_condition_delete') && $dialplans) {
-		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 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";
-	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'=>'time_conditions.php','style'=>($search == '' ? 'display: none;' : null)]);
+	if (permission_exists('time_condition_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=&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=''>";
+	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search']);
+	//echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'time_conditions.php','style'=>($search == '' ? 'display: none;' : null)]);
 	if ($paging_controls_mini != '') {
 		echo 	"<span style='margin-left: 15px;'>".$paging_controls_mini."</span>\n";
 	}
@@ -166,7 +180,7 @@
 		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('time_condition_delete') && $dialplans) {
-		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 modal::create(['id'=>'modal-delete','type'=>'delete','actions'=>button::create(['type'=>'button','label'=>$text['button-continue'],'icon'=>'check','id'=>'btn_delete','name'=>'btn_delete','style'=>'float: right; margin-left: 15px;','collapse'=>'never','onclick'=>"modal_close(); list_action_set('delete'); list_form_submit('form_list');"])]);
 	}
 
 	echo $text['description-time_conditions']."\n";
@@ -180,9 +194,12 @@
 	echo "<tr class='list-header'>\n";
 	if (permission_exists('time_condition_edit') || permission_exists('time_condition_delete')) {
 		echo "	<th class='checkbox'>\n";
-		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle();' ".($dialplans ?: "style='visibility: hidden;'").">\n";
+		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle(); checkbox_on_change(this);' ".($dialplans ?: "style='visibility: hidden;'").">\n";
 		echo "	</th>\n";
 	}
+	if ($_GET['show'] == "all" && permission_exists('time_condition_all')) {
+		echo th_order_by('domain_name', $text['label-domain'], $order_by, $order, $param, "class='shrink'");
+	}
 	echo th_order_by('dialplan_name', $text['label-name'], $order_by, $order, null, null, ($search != '' ? "search=".$search : null));
 	echo th_order_by('dialplan_number', $text['label-number'], $order_by, $order, null, null, ($search != '' ? "search=".$search : null));
 	if (permission_exists('time_condition_context')) {
@@ -205,10 +222,19 @@
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('time_condition_add') || permission_exists('time_condition_edit') || permission_exists('time_condition_delete')) {
 				echo "	<td class='checkbox'>\n";
-				echo "		<input type='checkbox' name='time_conditions[$x][checked]' id='checkbox_".$x."' value='true' onclick=\"if (!this.checked) { document.getElementById('checkbox_all').checked = false; }\">\n";
+				echo "		<input type='checkbox' name='time_conditions[$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='time_conditions[$x][uuid]' value='".escape($row['dialplan_uuid'])."' />\n";
 				echo "	</td>\n";
 			}
+			if ($_GET['show'] == "all" && permission_exists('time_condition_all')) {
+				if (strlen($_SESSION['domains'][$row['domain_uuid']]['domain_name']) > 0) {
+					$domain = $_SESSION['domains'][$row['domain_uuid']]['domain_name'];
+				}
+				else {
+					$domain = $text['label-global'];
+				}
+				echo "	<td>".escape($domain)."</td>\n";
+			}
 			echo "	<td>";
 			if (permission_exists('time_condition_edit')) {
 				echo "	<a href='".$list_row_url."' title=\"".$text['button-edit']."\">".escape($row['dialplan_name'])."</a>\n";
@@ -252,4 +278,4 @@
 //include the footer
 	require_once "resources/footer.php";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/vars/app_config.php b/app/vars/app_config.php
index 33a1421090..01995fa98b 100644
--- a/app/vars/app_config.php
+++ b/app/vars/app_config.php
@@ -16,8 +16,8 @@
 		$apps[$x]['description']['de-de'] = "Definiere Variablen, die für den Switch, die Verwaltung und anderes verwendet werden können.";
 		$apps[$x]['description']['es-cl'] = "Define variables usadas por el switch, provisionamiento y más";
 		$apps[$x]['description']['es-mx'] = "";
-		$apps[$x]['description']['fr-ca'] = "";
-		$apps[$x]['description']['fr-fr'] = "Définr les variables utilisées par le switch, le provisioning et plus.";
+		$apps[$x]['description']['fr-ca'] = "Définir les variables utilisées par le switch, le provisioning et plus.";
+		$apps[$x]['description']['fr-fr'] = "Définir les variables utilisées par le switch, le provisioning et plus.";
 		$apps[$x]['description']['he-il'] = "";
 		$apps[$x]['description']['it-it'] = "";
 		$apps[$x]['description']['nl-nl'] = "Definieer variabelen die door de Pbx, voorzieningen, en andere onderdelen gebruikt worden";
diff --git a/app/vars/app_defaults.php b/app/vars/app_defaults.php
index 3f7ccb49b3..5e15dc1b8b 100644
--- a/app/vars/app_defaults.php
+++ b/app/vars/app_defaults.php
@@ -81,7 +81,7 @@ if ($domains_processed == 1) {
 				$database = new database;
 				$database->app_name = 'vars';
 				$database->app_uuid = '54e08402-c1b8-0a9d-a30a-f569fc174dd8';
-				$database->save($array);
+				$database->save($array, false);
 				$message = $database->message;
 
 			//revoke temporary permissions
@@ -183,7 +183,7 @@ if ($domains_processed == 1) {
 						$database = new database;
 						$database->app_name = 'vars';
 						$database->app_uuid = '54e08402-c1b8-0a9d-a30a-f569fc174dd8';
-						$database->save($array);
+						$database->save($array, false);
 						unset($array);
 					//revoke temporary permissions
 						$p->delete("var_add", "temp");
@@ -226,7 +226,7 @@ if ($domains_processed == 1) {
 							$database = new database;
 							$database->app_name = 'vars';
 							$database->app_uuid = '54e08402-c1b8-0a9d-a30a-f569fc174dd8';
-							$database->save($array);
+							$database->save($array, false);
 							unset($array);
 						//revoke temporary permissions
 							$p->delete("var_add", "temp");
@@ -241,4 +241,4 @@ if ($domains_processed == 1) {
 			save_var_xml();
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/app/vars/vars.php b/app/vars/vars.php
index 0d0627f7ff..fb50a07bf5 100644
--- a/app/vars/vars.php
+++ b/app/vars/vars.php
@@ -135,18 +135,18 @@
 		echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add'],'id'=>'btn_add','link'=>'var_edit.php']);
 	}
 	if (permission_exists('var_add') && $vars) {
-		echo button::create(['type'=>'button','label'=>$text['button-copy'],'icon'=>$_SESSION['theme']['button_icon_copy'],'name'=>'btn_copy','onclick'=>"modal_open('modal-copy','btn_copy');"]);
+		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('var_edit') && $vars) {
-		echo button::create(['type'=>'button','label'=>$text['button-toggle'],'icon'=>$_SESSION['theme']['button_icon_toggle'],'name'=>'btn_toggle','onclick'=>"modal_open('modal-toggle','btn_toggle');"]);
+		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('var_delete') && $vars) {
-		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 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";
-	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'=>'vars.php','style'=>($search == '' ? 'display: none;' : null)]);
+	echo 		"<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown=''>";
+	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search']);
+	//echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'vars.php','style'=>($search == '' ? 'display: none;' : null)]);
 	if ($paging_controls_mini != '') {
 		echo 	"<span style='margin-left: 15px;'>".$paging_controls_mini."</span>\n";
 	}
@@ -184,7 +184,7 @@
 		echo "<tr class='list-header'>\n";
 		if (permission_exists('var_edit') || permission_exists('var_delete')) {
 			echo "	<th class='checkbox'>\n";
-			echo "		<input type='checkbox' id='checkbox_all_".$modifier."' name='checkbox_all' onclick=\"list_all_toggle('".$modifier."');\" ".($vars ?: "style='visibility: hidden;'").">\n";
+			echo "		<input type='checkbox' id='checkbox_all_".$modifier."' name='checkbox_all' onclick=\"list_all_toggle('".$modifier."'); checkbox_on_change(this);\" ".($vars ?: "style='visibility: hidden;'").">\n";
 			echo "	</th>\n";
 		}
 		echo th_order_by('var_name', $text['label-name'], $order_by, $order, null, "class='pct-30'");
@@ -220,7 +220,7 @@
 				$modifier = str_replace(' ', '_', $modifier);
 				$modifier = str_replace(':', '', $modifier);
 				echo "	<td class='checkbox'>\n";
-				echo "		<input type='checkbox' name='vars[$x][checked]' id='checkbox_".$x."' class='checkbox_".$modifier."' value='true' onclick=\"if (!this.checked) { document.getElementById('checkbox_all_".$modifier."').checked = false; }\">\n";
+				echo "		<input type='checkbox' name='vars[$x][checked]' id='checkbox_".$x."' class='checkbox_".$modifier."' value='true' onclick=\"checkbox_on_change(this); if (!this.checked) { document.getElementById('checkbox_all_".$modifier."').checked = false; }\">\n";
 				echo "		<input type='hidden' name='vars[$x][uuid]' value='".escape($row['var_uuid'])."' />\n";
 				echo "	</td>\n";
 			}
@@ -267,4 +267,4 @@
 //include the footer
 	require_once "resources/footer.php";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/voicemail_greetings/app_config.php b/app/voicemail_greetings/app_config.php
index e6ccd9cbc0..d306fa955d 100644
--- a/app/voicemail_greetings/app_config.php
+++ b/app/voicemail_greetings/app_config.php
@@ -16,7 +16,7 @@
 		$apps[$x]['description']['de-de'] = "Verwalte Voicemail-Begrüßungen für Nebenstellen.";
 		$apps[$x]['description']['es-cl'] = "Administrador de mensajes de bienvenida de correo de voz para extensiones.";
 		$apps[$x]['description']['es-mx'] = "";
-		$apps[$x]['description']['fr-ca'] = "";
+		$apps[$x]['description']['fr-ca'] = "Accueil messagerie Vocale";
 		$apps[$x]['description']['fr-fr'] = "Accueil messagerie Vocale.";
 		$apps[$x]['description']['he-il'] = "";
 		$apps[$x]['description']['it-it'] = "";
@@ -125,4 +125,4 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Voicemail greeting file encoded in base64.";
 
-?>
\ No newline at end of file
+?>
diff --git a/app/voicemail_greetings/app_defaults.php b/app/voicemail_greetings/app_defaults.php
index 96c31a4c41..7c233f1d4e 100644
--- a/app/voicemail_greetings/app_defaults.php
+++ b/app/voicemail_greetings/app_defaults.php
@@ -57,7 +57,7 @@ if ($domains_processed == 1) {
 					$database = new database;
 					$database->app_name = 'voicemail_greetings';
 					$database->app_uuid = 'e4b4fbee-9e4d-8e46-3810-91ba663db0c2';
-					$database->save($array);
+					$database->save($array, false);
 					unset($array);
 				//revoke temporary permissions
 					$p->delete('voicemail_greeting_edit', 'temp');
@@ -99,7 +99,7 @@ if ($domains_processed == 1) {
 							$database = new database;
 							$database->app_name = 'voicemail_greetings';
 							$database->app_uuid = 'e4b4fbee-9e4d-8e46-3810-91ba663db0c2';
-							$database->save($array);
+							$database->save($array, false);
 							unset($array);
 						//revoke temporary permissions
 							$p->delete('voicemail_greeting_edit', 'temp');
@@ -141,7 +141,7 @@ if ($domains_processed == 1) {
 							$database = new database;
 							$database->app_name = 'voicemail_greetings';
 							$database->app_uuid = 'e4b4fbee-9e4d-8e46-3810-91ba663db0c2';
-							$database->save($array);
+							$database->save($array, false);
 							unset($array);
 						//revoke temporary permissions
 							$p->delete('voicemail_greeting_edit', 'temp');
@@ -151,4 +151,4 @@ if ($domains_processed == 1) {
 		}
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/app/voicemail_greetings/app_languages.php b/app/voicemail_greetings/app_languages.php
index e2a4ff8365..74f7b10163 100644
--- a/app/voicemail_greetings/app_languages.php
+++ b/app/voicemail_greetings/app_languages.php
@@ -9,7 +9,7 @@ $text['title']['de-ch'] = "Begrüßungen für Sprachnachrichten"; //copied from
 $text['title']['de-de'] = "Begrüßungen für Sprachnachrichten";
 $text['title']['es-cl'] = "";
 $text['title']['es-mx'] = "";
-$text['title']['fr-ca'] = "Salutations de la messagerie"; //copied from fr-fr
+$text['title']['fr-ca'] = "Accueil messagerie Vocale";
 $text['title']['fr-fr'] = "Salutations de la messagerie";
 $text['title']['he-il'] = "הגדרת חשבון";
 $text['title']['it-it'] = "Saluti Caselle Vocali";
@@ -119,7 +119,7 @@ $text['message-uploaded']['fr-fr'] = "Enregistrer Complet";
 $text['message-uploaded']['he-il'] = "הטענה הושלמה";
 $text['message-uploaded']['it-it'] = "Caricamento Completato";
 $text['message-uploaded']['nl-nl'] = "Opsturen gereed";
-$text['message-uploaded']['pl-pl'] = "Plik wysłano  poprawnie";
+$text['message-uploaded']['pl-pl'] = "Wysłano pomyślnie";
 $text['message-uploaded']['pt-br'] = "Arquivo carregado para";
 $text['message-uploaded']['pt-pt'] = "Carregamento Finalizado";
 $text['message-uploaded']['ro-ro'] = "";
@@ -240,7 +240,7 @@ $text['label-greeting']['de-ch'] = "Begrüßung"; //copied from de-de
 $text['label-greeting']['de-de'] = "Begrüßung";
 $text['label-greeting']['es-cl'] = "Saludo";
 $text['label-greeting']['es-mx'] = "Saludo"; //copied from es-cl
-$text['label-greeting']['fr-ca'] = "Salutation"; //copied from fr-fr
+$text['label-greeting']['fr-ca'] = "Message d'Acceuil";
 $text['label-greeting']['fr-fr'] = "Salutation";
 $text['label-greeting']['he-il'] = "ברכה";
 $text['label-greeting']['it-it'] = "Saluto";
@@ -282,7 +282,7 @@ $text['label-edit']['de-ch'] = "Begrüßung bearbeiten"; //copied from de-de
 $text['label-edit']['de-de'] = "Begrüßung bearbeiten";
 $text['label-edit']['es-cl'] = "Edición de Saludo";
 $text['label-edit']['es-mx'] = "Edición de Saludo"; //copied from es-cl
-$text['label-edit']['fr-ca'] = "Editer Salutation"; //copied from fr-fr
+$text['label-edit']['fr-ca'] = "Modifier Message d'Acceuil";
 $text['label-edit']['fr-fr'] = "Editer Salutation";
 $text['label-edit']['he-il'] = "עריכה";
 $text['label-edit']['it-it'] = "Modificare Saluto";
@@ -324,7 +324,7 @@ $text['label-add']['de-ch'] = "Begrüßung hinzufügen"; //copied from de-de
 $text['label-add']['de-de'] = "Begrüßung hinzufügen";
 $text['label-add']['es-cl'] = "Agregar Saludo";
 $text['label-add']['es-mx'] = "Agregar Saludo"; //copied from es-cl
-$text['label-add']['fr-ca'] = "Ajouter salutation"; //copied from fr-fr
+$text['label-add']['fr-ca'] = "Ajouter Message d'Acceuil";
 $text['label-add']['fr-fr'] = "Ajouter salutation";
 $text['label-add']['he-il'] = "הוסף ברכה";
 $text['label-add']['it-it'] = "Inserire Saluto";
@@ -366,8 +366,8 @@ $text['description-name']['de-ch'] = "Ein Namen für die Begrüßung."; //copied
 $text['description-name']['de-de'] = "Ein Namen für die Begrüßung.";
 $text['description-name']['es-cl'] = "Nombre de Bienvenida.";
 $text['description-name']['es-mx'] = "Nombre de Bienvenida."; //copied from es-cl
-$text['description-name']['fr-ca'] = "Nome da Salutation  (non parsé)."; //copied from fr-fr
-$text['description-name']['fr-fr'] = "Nome da Salutation  (non parsé).";
+$text['description-name']['fr-ca'] = "Nom de Message d'Acceuil (non parsé).";
+$text['description-name']['fr-fr'] = "Nom de Salutation  (non parsé).";
 $text['description-name']['he-il'] = "הכנס את השם";
 $text['description-name']['it-it'] = "Un nome per il saluto (non parsato).";
 $text['description-name']['nl-nl'] = "Een naam voor de begroeting.";
@@ -408,7 +408,7 @@ $text['description']['de-ch'] = "Wählen Sie die aktive Begrüßung aus, welche
 $text['description']['de-de'] = "Wählen Sie die aktive Begrüßung aus, welche für diese Nebenstelle abgespielt werden soll:";
 $text['description']['es-cl'] = "Seleccione el mensaje activo para reproducir:";
 $text['description']['es-mx'] = "Seleccione el mensaje activo para reproducir:"; //copied from es-cl
-$text['description']['fr-ca'] = "Choisir le message de salutation à jouer pour l'extension:"; //copied from fr-fr
+$text['description']['fr-ca'] = "Choisir le message d'acceuil à jouer pour l'extension:";
 $text['description']['fr-fr'] = "Choisir le message de salutation à jouer pour l'extension:";
 $text['description']['he-il'] = "ערוך את פרטי החשבון";
 $text['description']['it-it'] = "Selezionare il messaggio di saluto attivo da suonare per l'interno:";
@@ -429,7 +429,7 @@ $text['confirm-name']['de-ch'] = "Bitte bereitstellen: Namen der Begrüßung"; /
 $text['confirm-name']['de-de'] = "Bitte bereitstellen: Namen der Begrüßung";
 $text['confirm-name']['es-cl'] = "Por favor indique: Nombre de Bienvenida";
 $text['confirm-name']['es-mx'] = "Por favor indique: Nombre de Bienvenida"; //copied from es-cl
-$text['confirm-name']['fr-ca'] = "Merci d'indiquer: Nom de salutation"; //copied from fr-fr
+$text['confirm-name']['fr-ca'] = "Merci d'indiquer: Message d'Acceuil";
 $text['confirm-name']['fr-fr'] = "Merci d'indiquer: Nom de salutation";
 $text['confirm-name']['he-il'] = "אנא הוסף: שם ברכה";
 $text['confirm-name']['it-it'] = "Prego fornire: Nome Saluto";
diff --git a/app/voicemail_greetings/voicemail_greetings.php b/app/voicemail_greetings/voicemail_greetings.php
index 50e2111454..67e9745af3 100644
--- a/app/voicemail_greetings/voicemail_greetings.php
+++ b/app/voicemail_greetings/voicemail_greetings.php
@@ -182,7 +182,7 @@
 
 						if ($num_rows == 0 && !file_exists($v_greeting_dir.'/'.$file_name)) {
 							//move the uploaded greeting
-								event_socket_mkdir($v_greeting_dir);
+								mkdir($v_greeting_dir, 0770, false);
 								if ($file_ext == '.wav' || $file_ext == '.mp3') {
 									move_uploaded_file($_FILES['file']['tmp_name'], $v_greeting_dir.'/'.$file_name);
 								}
diff --git a/app/voicemails/app_config.php b/app/voicemails/app_config.php
index 6724b155bd..30b129e673 100644
--- a/app/voicemails/app_config.php
+++ b/app/voicemails/app_config.php
@@ -16,8 +16,8 @@
 		$apps[$x]['description']['de-de'] = "Sprach-Mailbox verwalten.";
 		$apps[$x]['description']['es-cl'] = "";
 		$apps[$x]['description']['es-mx'] = "";
-		$apps[$x]['description']['fr-ca'] = "";
-		$apps[$x]['description']['fr-fr'] = "";
+		$apps[$x]['description']['fr-ca'] = "Gérer les boîtes vocales";
+		$apps[$x]['description']['fr-fr'] = "Gérer les boîtes vocales";
 		$apps[$x]['description']['he-il'] = "";
 		$apps[$x]['description']['it-it'] = "";
 		$apps[$x]['description']['nl-nl'] = "Beheer antwoordapparaten";
@@ -66,6 +66,9 @@
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "voicemail_all";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "voicemail_domain";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
@@ -92,7 +95,7 @@
 		$apps[$x]['permissions'][$y]['groups'][] = "user";
 		$apps[$x]['permissions'][$y]['groups'][] = "agent";
 		$y++;
-		$apps[$x]['permissions'][$y]['name'] = "voicemail_transcription_edit";
+		$apps[$x]['permissions'][$y]['name'] = "voicemail_transcription_enabled";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
 		$y++;
@@ -267,7 +270,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "smtp_from";
 		$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_enabled'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "";
 		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "b753197c-cb07-44d3-9074-8bf5bca391b8";
@@ -275,7 +278,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "smtp_from_name";
 		$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_enabled'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "";
 		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "77620475-258a-4988-bec5-f74f2603666e";
diff --git a/app/voicemails/app_defaults.php b/app/voicemails/app_defaults.php
index 1a76bde38f..af2c9186db 100644
--- a/app/voicemails/app_defaults.php
+++ b/app/voicemails/app_defaults.php
@@ -1,114 +1,122 @@
-<?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-2021
-	the Initial Developer. All Rights Reserved.
-
-	Contributor(s):
-	Mark J Crane <markjcrane@fusionpbx.com>
-*/
-
-//process this only one time
-if ($domains_processed == 1) {
-
-	//make sure the voicemail directory exists
-	$sql = "select d.domain_name, v.voicemail_id \n";
-	$sql .= "from v_voicemails as v, v_domains as d \n";
-	$sql .= "where voicemail_enabled = 'true' \n";
-	$sql .= "and v.domain_uuid = d.domain_uuid \n";
-	$database = new database;
-	$voicemails = $database->select($sql, null, 'all');
-	unset($sql, $parameters);
-	if (is_array($voicemails) && @sizeof($voicemails) != 0) {
-		foreach($voicemails as $row) {
-			if (is_numeric($row['voicemail_id'])) {
-				if (!file_exists($_SESSION['switch']['voicemail']['dir']."/default/".$row['domain_name']."/".$row['voicemail_id'])) {
-					mkdir($_SESSION['switch']['voicemail']['dir']."/default/".$row['domain_name']."/".$row['voicemail_id'], 0770);
-				}
-			}
-		}
-	}
-
-	//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)) {
-			//get the phrases directory
-			$_SESSION['switch']['phrases']['dir'] = $switch_phrases_dir_correct;
-
-			//update phrases with the correct path
-			$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 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 languages/xx/vm folders
-				$voicemail_xml_source = $_SERVER['PROJECT_ROOT'].'/app/voicemails/resources/switch/languages/'.$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);
-				}
-			}
-		}
-	}
-
-	// 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);
-
-}
-
-?>
+<?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-2021
+	the Initial Developer. All Rights Reserved.
+
+	Contributor(s):
+	Mark J Crane <markjcrane@fusionpbx.com>
+*/
+
+//process this only one time
+if ($domains_processed == 1) {
+
+	//make sure the voicemail directory exists
+	$sql = "select d.domain_name, v.voicemail_id \n";
+	$sql .= "from v_voicemails as v, v_domains as d \n";
+	$sql .= "where voicemail_enabled = 'true' \n";
+	$sql .= "and v.domain_uuid = d.domain_uuid \n";
+	$database = new database;
+	$voicemails = $database->select($sql, null, 'all');
+	unset($sql, $parameters);
+	if (is_array($voicemails) && @sizeof($voicemails) != 0) {
+		foreach($voicemails as $row) {
+			if (is_numeric($row['voicemail_id'])) {
+				if (!file_exists($_SESSION['switch']['voicemail']['dir']."/default/".$row['domain_name']."/".$row['voicemail_id'])) {
+					mkdir($_SESSION['switch']['voicemail']['dir']."/default/".$row['domain_name']."/".$row['voicemail_id'], 0770, true);
+				}
+			}
+		}
+	}
+
+	//define initial, get current, define correct languages folder paths
+	$switch_configuration_dir = $_SESSION['switch']['conf']['dir'] != '' ? $_SESSION['switch']['conf']['dir'] : '/etc/freeswitch';
+	$switch_languages_dir_initial = $switch_configuration_dir.'/lang';
+	$switch_languages_dir_current = $_SESSION['switch']['languages']['dir'];
+	$switch_languages_dir_correct = $switch_configuration_dir.'/languages';
+
+	//ensure switch using languages (not lang) folder
+	if ($switch_languages_dir_current == $switch_languages_dir_initial) {
+		//rename languages folder, if necessary
+		if (file_exists($switch_languages_dir_current) && !file_exists($switch_languages_dir_correct)) {
+			rename($switch_languages_dir_current, $switch_languages_dir_correct);
+		}
+
+		//update default setting value
+		if (file_exists($switch_languages_dir_correct)) {
+			//get the languages directory
+			$_SESSION['switch']['languages']['dir'] = $switch_languages_dir_correct;
+
+			//update languages with the correct path
+			$sql = "update v_default_settings ";
+			$sql .= "set default_setting_value = '".$switch_languages_dir_correct."', ";
+			$sql .= "default_setting_enabled = true ";
+			$sql .= "where default_setting_category = 'switch' ";
+			$sql .= "and default_setting_subcategory = 'languages' ";
+			$sql .= "and default_setting_name = 'dir' ";
+			$database = new database;
+			$database->execute($sql);
+			unset($sql);
+		}
+
+	}
+
+	if (file_exists($switch_languages_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_languages_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 file to include all xml phrase files in the vm folder
+				$language_xml_path = $switch_languages_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 languages/xx/vm folders
+				$voicemail_xml_source = $_SERVER['PROJECT_ROOT'].'/app/voicemails/resources/switch/languages/'.$language_abbreviation.'/vm/voicemail.xml';
+				$voicemail_xml_target = $switch_languages_dir_correct.'/'.$language_abbreviation.'/vm/voicemail.xml';
+				if (!file_exists($voicemail_xml_target)) {
+					copy($voicemail_xml_source, $voicemail_xml_target);
+				}
+			}
+		}
+	}
+
+	// clear variables
+	unset($switch_configuration_dir, $switch_languages_dir_initial, $switch_languages_dir_current, $switch_languages_dir_correct);
+	unset($switch_xml_content, $folder_contents, $language_abbreviation, $language_xml_path, $language_xml_content, $voicemail_xml_source, $voicemail_xml_target);
+
+	//delete the switch phrases in favor of switch languages
+	$sql = "delete from v_default_settings ";
+	$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);
+}
+
+?>
diff --git a/app/voicemails/app_languages.php b/app/voicemails/app_languages.php
index 718ed0f4f8..0b007e8b99 100644
--- a/app/voicemails/app_languages.php
+++ b/app/voicemails/app_languages.php
@@ -205,7 +205,7 @@ $text['message-toggled']['fr-fr'] = "Basculer Terminé";
 $text['message-toggled']['he-il'] = "הושלם Toggle";
 $text['message-toggled']['it-it'] = "Inversione Completata";
 $text['message-toggled']['nl-nl'] = "Omzetten gereed";
-$text['message-toggled']['pl-pl'] = "Przegubowe Zakończony";
+$text['message-toggled']['pl-pl'] = "Przełączono pomyślnie";
 $text['message-toggled']['pt-br'] = "Alternar Concluído"; //copied from pt-pt
 $text['message-toggled']['pt-pt'] = "Alternar Concluído";
 $text['message-toggled']['ro-ro'] = "Completat toggle";
@@ -394,7 +394,7 @@ $text['label-voicemail_alternate_greet_id']['fr-fr'] = "Autre identité de salut
 $text['label-voicemail_alternate_greet_id']['he-il'] = "";
 $text['label-voicemail_alternate_greet_id']['it-it'] = "";
 $text['label-voicemail_alternate_greet_id']['nl-nl'] = "Alternatieve begroeting ID";
-$text['label-voicemail_alternate_greet_id']['pl-pl'] = "";
+$text['label-voicemail_alternate_greet_id']['pl-pl'] = "Alternatywne ID Powitania";
 $text['label-voicemail_alternate_greet_id']['pt-br'] = "";
 $text['label-voicemail_alternate_greet_id']['pt-pt'] = "";
 $text['label-voicemail_alternate_greet_id']['ro-ro'] = "";
@@ -625,7 +625,7 @@ $text['label-voicemail_tutorial']['fr-fr'] = "Jouer le tutoriel";
 $text['label-voicemail_tutorial']['he-il'] = "";
 $text['label-voicemail_tutorial']['it-it'] = "";
 $text['label-voicemail_tutorial']['nl-nl'] = "Handleiding afspelen";
-$text['label-voicemail_tutorial']['pl-pl'] = "";
+$text['label-voicemail_tutorial']['pl-pl'] = "Odtwórz samouczek";
 $text['label-voicemail_tutorial']['pt-br'] = "";
 $text['label-voicemail_tutorial']['pt-pt'] = "";
 $text['label-voicemail_tutorial']['ro-ro'] = "";
@@ -1257,7 +1257,7 @@ $text['description-voicemail_alternate_greet_id']['fr-fr'] = "Un autre identifia
 $text['description-voicemail_alternate_greet_id']['he-il'] = "";
 $text['description-voicemail_alternate_greet_id']['it-it'] = "";
 $text['description-voicemail_alternate_greet_id']['nl-nl'] = "Een alternatieve begroetings ID gebruikt in de standaard begroeting";
-$text['description-voicemail_alternate_greet_id']['pl-pl'] = "";
+$text['description-voicemail_alternate_greet_id']['pl-pl'] = "Alternatywny identyfikator powitania używany w powitaniu domyślnym.";
 $text['description-voicemail_alternate_greet_id']['pt-br'] = "";
 $text['description-voicemail_alternate_greet_id']['pt-pt'] = "";
 $text['description-voicemail_alternate_greet_id']['ro-ro'] = "";
@@ -1635,7 +1635,7 @@ $text['description-voicemail_tutorial']['fr-fr'] = "Jouez le tutoriel de message
 $text['description-voicemail_tutorial']['he-il'] = "";
 $text['description-voicemail_tutorial']['it-it'] = "";
 $text['description-voicemail_tutorial']['nl-nl'] = "Speel de antwoorapparaat handleiding na de volgende login.";
-$text['description-voicemail_tutorial']['pl-pl'] = "";
+$text['description-voicemail_tutorial']['pl-pl'] = "Odtwórz samouczek poczty głosowej po następnym zalogowaniu się do poczty głosowej";
 $text['description-voicemail_tutorial']['pt-br'] = "";
 $text['description-voicemail_tutorial']['pt-pt'] = "";
 $text['description-voicemail_tutorial']['ro-ro'] = "";
diff --git a/app/voicemails/resources/dashboard/voicemails.php b/app/voicemails/resources/dashboard/voicemails.php
index 7f3fb6dacf..aa0f7b80d3 100644
--- a/app/voicemails/resources/dashboard/voicemails.php
+++ b/app/voicemails/resources/dashboard/voicemails.php
@@ -56,7 +56,7 @@
 
 //add doughnut chart
 	?>
-	<div style='display: flex; flex-wrap: wrap; justify-content: center; padding-bottom: 10px;'>
+	<div style='display: flex; flex-wrap: wrap; justify-content: center; padding-bottom: 20px;'>
 		<div style='width: 175px; height: 175px;'><canvas id='new_messages_chart'></canvas></div>
 	</div>
 
diff --git a/app/voicemails/voicemail_edit.php b/app/voicemails/voicemail_edit.php
index 9eed404a15..5217537f75 100644
--- a/app/voicemails/voicemail_edit.php
+++ b/app/voicemails/voicemail_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-2022
  the Initial Developer. All Rights Reserved.
 
  Contributor(s):
@@ -138,8 +138,10 @@
 				//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'];
+						//if adding a mailbox and don't have the transcription permission, set the default transcribe behavior
+						if (!permission_exists('voicemail_transcription_enabled') && isset($_SESSION['voicemail']['transcription_enabled_default']['boolean'])) {
+							$voicemail_transcription_enabled = $_SESSION['voicemail']['transcription_enabled_default']['boolean'];
+						}
 					}
 
 				//add common array fields
@@ -315,7 +317,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 = $_SESSION['voicemail']['transcription_enabled_default']['boolean'] ?: "false"; }	
+	if (strlen($voicemail_transcription_enabled) == 0) { $voicemail_transcription_enabled = $_SESSION['voicemail']['transcription_enabled_default']['boolean']; }	
 	if (strlen($voicemail_tutorial) == 0) { $voicemail_tutorial = "false"; }
 
 //get the greetings list
@@ -520,6 +522,7 @@
 	echo "<td class='vtable' align='left'>\n";
 	echo "	<select class='formfld' name='greeting_id'>\n";
 	echo "		<option value=''>".$text['label-default']."</option>\n";
+	echo "		<option value='0' ".(($greeting_id == "0") ? "selected='selected'" : null).">".$text['label-none']."</option>\n";
 	if (is_array($greetings) && @sizeof($greetings) != 0) {
 		foreach ($greetings as $greeting) {
 			$selected = ($greeting['greeting_id'] == $greeting_id) ? 'selected' : null;
@@ -648,7 +651,7 @@
 		echo "</tr>\n";
 	}
 
-	if (permission_exists('voicemail_transcription_edit') && $_SESSION['voicemail']['transcribe_enabled']['boolean'] == "true") {
+	if (permission_exists('voicemail_transcription_enabled') && $_SESSION['voicemail']['transcribe_enabled']['boolean'] == "true") {
 		echo "<tr>\n";
 		echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
 		echo "	".$text['label-voicemail_transcription_enabled']."\n";
diff --git a/app/voicemails/voicemails.php b/app/voicemails/voicemails.php
index 18ef21370c..a0c591de28 100644
--- a/app/voicemails/voicemails.php
+++ b/app/voicemails/voicemails.php
@@ -109,7 +109,11 @@
 
 //prepare to page the results
 	$sql = "select count(voicemail_uuid) from v_voicemails ";
-	$sql .= "where domain_uuid = :domain_uuid ";
+	$sql .= "where true ";
+	if ($_GET['show'] != "all" || !permission_exists('voicemail_all')) {
+		$sql .= "and (domain_uuid = :domain_uuid or domain_uuid is null) ";
+		$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+	}
 	if (!permission_exists('voicemail_domain')) {
 		if (is_array($voicemail_uuids) && @sizeof($voicemail_uuids) != 0) {
 			$sql .= "and (";
@@ -127,13 +131,15 @@
 		}
 	}
 	$sql .= $sql_search;
-	$parameters['domain_uuid'] = $domain_uuid;
 	$database = new database;
 	$num_rows = $database->select($sql, $parameters, 'column');
 
 //prepare to page the results
 	$rows_per_page = ($_SESSION['domain']['paging']['numeric'] != '') ? $_SESSION['domain']['paging']['numeric'] : 50;
-	$param = $search ? "&search=".$search : null;
+	$param = $search ? "&search=".urlencode($search) : null;
+	if ($_GET['show'] == "all" && permission_exists('voicemail_all')) {
+		$param .= "&show=all";
+	}
 	$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);
@@ -182,15 +188,23 @@
 		echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add'],'id'=>'btn_add','link'=>'voicemail_edit.php']);
 	}
 	if (permission_exists('voicemail_edit') && $voicemails) {
-		echo button::create(['type'=>'button','label'=>$text['button-toggle'],'icon'=>$_SESSION['theme']['button_icon_toggle'],'name'=>'btn_toggle','onclick'=>"modal_open('modal-toggle','btn_toggle');"]);
+		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('voicemail_delete') && $voicemails) {
-		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 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";
-	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'=>'voicemails.php','style'=>($search == '' ? 'display: none;' : null)]);
+	if (permission_exists('voicemail_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=&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=''>";
+	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search']);
+	//echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'voicemails.php','style'=>($search == '' ? 'display: none;' : null)]);
 	if ($paging_controls_mini != '') {
 		echo 	"<span style='margin-left: 15px;'>".$paging_controls_mini."</span>\n";
 	}
@@ -217,9 +231,12 @@
 	echo "<tr class='list-header'>\n";
 	if (permission_exists('voicemail_edit') || permission_exists('voicemail_delete')) {
 		echo "	<th class='checkbox'>\n";
-		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle();' ".($voicemails ?: "style='visibility: hidden;'").">\n";
+		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle(); checkbox_on_change(this);' ".($voicemails ?: "style='visibility: hidden;'").">\n";
 		echo "	</th>\n";
 	}
+	if ($_GET['show'] == "all" && permission_exists('voicemail_all')) {
+		echo th_order_by('domain_name', $text['label-domain'], $order_by, $order, $param, "class='shrink'");
+	}
 	echo th_order_by('voicemail_id', $text['label-voicemail_id'], $order_by, $order);
 	echo th_order_by('voicemail_mail_to', $text['label-voicemail_mail_to'], $order_by, $order, null, "class='hide-sm-dn'");
 	echo th_order_by('voicemail_file', $text['label-voicemail_file_attached'], $order_by, $order, null, "class='center hide-md-dn'");
@@ -249,10 +266,19 @@
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('voicemail_edit') || permission_exists('voicemail_delete')) {
 				echo "	<td class='checkbox'>\n";
-				echo "		<input type='checkbox' name='voicemails[$x][checked]' id='checkbox_".$x."' value='true' onclick=\"if (!this.checked) { document.getElementById('checkbox_all').checked = false; }\">\n";
+				echo "		<input type='checkbox' name='voicemails[$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='voicemails[$x][uuid]' value='".escape($row['voicemail_uuid'])."' />\n";
 				echo "	</td>\n";
 			}
+			if ($_GET['show'] == "all" && permission_exists('voicemail_all')) {
+				if (strlen($_SESSION['domains'][$row['domain_uuid']]['domain_name']) > 0) {
+					$domain = $_SESSION['domains'][$row['domain_uuid']]['domain_name'];
+				}
+				else {
+					$domain = $text['label-global'];
+				}
+				echo "	<td>".escape($domain)."</td>\n";
+			}
 			echo "	<td>\n";
 			if (permission_exists('voicemail_edit')) {
 				echo "	<a href='".$list_row_url."' title=\"".$text['button-edit']."\">".escape($row['voicemail_id'])."</a>\n";
diff --git a/app/xml_cdr/app_config.php b/app/xml_cdr/app_config.php
index 28095dbdec..86a310bd60 100644
--- a/app/xml_cdr/app_config.php
+++ b/app/xml_cdr/app_config.php
@@ -221,6 +221,8 @@
 		$apps[$x]['permissions'][$y]['name'] = "xml_cdr_export_pdf";
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$apps[$x]['permissions'][$y]['groups'][] = "admin";
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "xml_cdr_extension_summary_all";
 
 	//default settings
 		$y=0;
@@ -376,7 +378,7 @@
 		$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'] = "ab7e165f-dbca-403c-ab87-88378be5bace";
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "133980e3-b303-446c-a26a-74fd043f5a96";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "dashboard";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "missed_calls_chart_border_width";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
@@ -408,7 +410,7 @@
 		$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'] = "72c549b5-2456-4b80-b821-ce9d8d69252d";
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "6c30efe1-51a6-4281-96eb-1d942bdabec6";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "dashboard";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "recent_calls_chart_border_width";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
diff --git a/app/xml_cdr/app_languages.php b/app/xml_cdr/app_languages.php
index cfe264dc02..ea438317d6 100644
--- a/app/xml_cdr/app_languages.php
+++ b/app/xml_cdr/app_languages.php
@@ -2772,6 +2772,27 @@ $text['description-mos']['ru-ru'] = "Средний оценочный пока
 $text['description-mos']['sv-se'] = "Genomsnittlig bedömning poäng";
 $text['description-mos']['uk-ua'] = "Середнє число думок";
 
+$text['description-aloc']['en-us'] = "Average Length of Call";
+$text['description-aloc']['en-gb'] = "Average Length of Call";
+$text['description-aloc']['ar-eg'] = "متوسط طول المحادثة";
+$text['description-aloc']['de-at'] = "Durchschnittliche Gesprächsdauer";
+$text['description-aloc']['de-ch'] = "Durchschnittliche Gesprächsdauer";
+$text['description-aloc']['de-de'] = "Durchschnittliche Gesprächsdauer";
+$text['description-aloc']['es-cl'] = "Duración promedio de la conversación";
+$text['description-aloc']['es-mx'] = "Duración promedio de la conversación";
+$text['description-aloc']['fr-ca'] = "Durée moyenne de la conversation";
+$text['description-aloc']['fr-fr'] = "Durée moyenne de la conversation";
+$text['description-aloc']['he-il'] = "משך השיחה הממוצע";
+$text['description-aloc']['it-it'] = "Durata media della conversazione";
+$text['description-aloc']['nl-nl'] = "";
+$text['description-aloc']['pl-pl'] = "";
+$text['description-aloc']['pt-br'] = "Duração média da conversa";
+$text['description-aloc']['pt-pt'] = "Duração média da conversa";
+$text['description-aloc']['ro-ro'] = "Durata medie a conversației";
+$text['description-aloc']['ru-ru'] = "Средняя продолжительность разговора";
+$text['description-aloc']['sv-se'] = "Genomsnittlig konversationslängd";
+$text['description-aloc']['uk-ua'] = "Середня тривалість розмови";
+
 $text['button-archive']['en-us'] = "Archive";
 $text['button-archive']['en-gb'] = "Archive";
 $text['button-archive']['ar-eg'] = "";
diff --git a/app/xml_cdr/resources/classes/xml_cdr.php b/app/xml_cdr/resources/classes/xml_cdr.php
index 9e2499777a..41c8484199 100644
--- a/app/xml_cdr/resources/classes/xml_cdr.php
+++ b/app/xml_cdr/resources/classes/xml_cdr.php
@@ -298,16 +298,45 @@ if (!class_exists('xml_cdr')) {
 			//process data if the call detail record is not a duplicate
 				if ($duplicate_uuid == false && is_uuid($uuid)) {
 
-					//get the caller details
-						$caller_id_name = urldecode($xml->variables->caller_id_name);
-						$caller_id_number = urldecode($xml->variables->caller_id_number);
+					//get the caller ID
+						if (isset($xml->variables->caller_id_name)) {
+							$caller_id_name = urldecode($xml->variables->caller_id_name);
+						}
+						if (isset($xml->variables->caller_id_number)) {
+							$caller_id_number = urldecode($xml->variables->caller_id_number);
+						}
+						if (!isset($caller_id_number) && isset($xml->variables->sip_from_user)) {
+							$caller_id_number = urldecode($xml->variables->sip_from_user);
+						}
+
+					//if the origination caller id name and number are set then use them
+						if (isset($xml->variables->origination_caller_id_name)) {
+							$caller_id_name = urldecode($xml->variables->origination_caller_id_name);
+						}
+						if (isset($xml->variables->origination_caller_id_number)) {
+							$caller_id_number = urldecode($xml->variables->origination_caller_id_number);
+						}
+
+					//if the call is outbound use the external caller ID
 						if (isset($xml->variables->effective_caller_id_name)) {
 							$caller_id_name = urldecode($xml->variables->effective_caller_id_name);
 						}
-						if (isset($xml->variables->effective_caller_id_number)) {
+						if (urldecode($xml->variables->call_direction) == 'outbound' && isset($xml->variables->effective_caller_id_number)) {
 							$caller_id_number = urldecode($xml->variables->effective_caller_id_number);
 						}
 
+					//if the sip_from_domain and domain_name are not the same then original call direction was inbound
+						//when an inbound call is forward the call_direction is set to inbound and then updated to outbound
+						//use sip_from_display and sip_from_user to get the original caller ID instead of the updated caller ID info from the forward
+						if (isset($xml->variables->sip_from_domain) && urldecode($xml->variables->sip_from_domain) != urldecode($xml->variables->domain_name)) { 
+							if (isset($xml->variables->sip_from_display)) {
+								$caller_id_name = urldecode($xml->variables->sip_from_display);
+							}
+							if (isset($xml->variables->sip_from_user)) {
+								$caller_id_number = urldecode($xml->variables->sip_from_user);
+							}
+						}
+
 					//get the values from the callflow.
 						$i = 0;
 						foreach ($xml->callflow as $row) {
@@ -316,12 +345,6 @@ if (!class_exists('xml_cdr')) {
 								$destination_number = urldecode($row->caller_profile->destination_number);
 								$network_addr = urldecode($row->caller_profile->network_addr);
 							}
-							if (strlen($caller_id_name) == 0) {
-								$caller_id_name = urldecode($row->caller_profile->caller_id_name);
-							}
-							if (strlen($caller_id_number) == 0) {
-								$caller_id_number = urldecode($row->caller_profile->caller_id_number);
-							}
 							$i++;
 						}
 						unset($i);
@@ -339,6 +362,17 @@ if (!class_exists('xml_cdr')) {
 							}
 						}
 
+					//get the caller_destination
+						if (isset($xml->variables->caller_destination) ) {
+							$caller_destination = urldecode($xml->variables->caller_destination);
+						}
+						if (isset($xml->variables->sip_h_caller_destination) ) {
+							$caller_destination = urldecode($xml->variables->sip_h_caller_destination);
+						}
+						if (!isset($caller_destination) && isset($xml->variables->dialed_user)) {
+							$caller_destination = urldecode($xml->variables->dialed_user);
+						}
+
 					//set missed calls
 						if (isset($xml->variables->answer_stamp) && isset($xml->variables->bridge_uuid)) {
 							//answered call
@@ -360,7 +394,7 @@ if (!class_exists('xml_cdr')) {
 						$this->array[$key]['missed_call'] = $missed_call;
 						$this->array[$key]['caller_id_name'] = $caller_id_name;
 						$this->array[$key]['caller_id_number'] = $caller_id_number;
-						$this->array[$key]['caller_destination'] = urldecode($xml->variables->caller_destination);
+						$this->array[$key]['caller_destination'] = $caller_destination;
 						$this->array[$key]['accountcode'] = urldecode($xml->variables->accountcode);
 						$this->array[$key]['default_language'] = urldecode($xml->variables->default_language);
 						$this->array[$key]['bridge_uuid'] = urldecode($xml->variables->bridge_uuid);
@@ -371,13 +405,13 @@ if (!class_exists('xml_cdr')) {
 					//time
 						$start_epoch = urldecode($xml->variables->start_epoch);
 						$this->array[$key]['start_epoch'] = $start_epoch;
-						$this->array[$key]['start_stamp'] = date('c', $start_epoch);
+						$this->array[$key]['start_stamp'] = is_numeric($start_epoch) ? date('c', $start_epoch) : null;
 						$answer_epoch = urldecode($xml->variables->answer_epoch);
 						$this->array[$key]['answer_epoch'] = $answer_epoch;
-						$this->array[$key]['answer_stamp'] = date('c', $answer_epoch);
+						$this->array[$key]['answer_stamp'] = is_numeric($answer_epoch) ? date('c', $answer_epoch) : null;
 						$end_epoch = urldecode($xml->variables->end_epoch);
 						$this->array[$key]['end_epoch'] = $end_epoch;
-						$this->array[$key]['end_stamp'] = date('c', $end_epoch);
+						$this->array[$key]['end_stamp'] = is_numeric($end_epoch) ? date('c', $end_epoch) : null;
 						$this->array[$key]['duration'] = urldecode($xml->variables->duration);
 						$this->array[$key]['mduration'] = urldecode($xml->variables->mduration);
 						$this->array[$key]['billsec'] = urldecode($xml->variables->billsec);
@@ -746,7 +780,8 @@ if (!class_exists('xml_cdr')) {
 						catch(PDOException $e) {
 							$tmp_dir = $_SESSION['switch']['log']['dir'].'/xml_cdr/failed/';
 							if(!file_exists($tmp_dir)) {
-								event_socket_mkdir($tmp_dir);
+								mkdir($tmp_dir, 0770, true);
+								
 							}
 							if ($_SESSION['cdr']['format']['text'] == "xml") {
 								$tmp_file = $uuid.'.xml';
@@ -770,7 +805,7 @@ if (!class_exists('xml_cdr')) {
 							if (strlen($uuid) > 0) {
 								$tmp_dir = $_SESSION['switch']['log']['dir'].'/xml_cdr/archive/'.$start_year.'/'.$start_month.'/'.$start_day;
 								if(!file_exists($tmp_dir)) {
-									event_socket_mkdir($tmp_dir);
+									mkdir($tmp_dir, 0770, true);
 								}
 								if ($_SESSION['cdr']['format']['text'] == "xml") {
 									$tmp_file = $uuid.'.xml';
@@ -1140,7 +1175,7 @@ if (!class_exists('xml_cdr')) {
 				$sql .= " originating_leg_uuid, \n";
 				$sql .= " billsec \n";
 				$sql .= " from v_xml_cdr \n";
-				if (!($_GET['show'] === 'all' && permission_exists('xml_cdr_all'))) {
+				if (!($_GET['show'] === 'all' && permission_exists('xml_cdr_extension_summary_all'))) {
 					$sql .= " where domain_uuid = :domain_uuid \n";
 				}
 				else {
@@ -1151,12 +1186,12 @@ if (!class_exists('xml_cdr')) {
 
 				$sql .= "where \n";
 				$sql .= "d.domain_uuid = e.domain_uuid \n";
-				if (!($_GET['show'] === 'all' && permission_exists('xml_cdr_all'))) {
+				if (!($_GET['show'] === 'all' && permission_exists('xml_cdr_extension_summary_all'))) {
 					$sql .= "and e.domain_uuid = :domain_uuid \n";
 				}
 				$sql .= "group by e.extension, e.domain_uuid, d.domain_uuid, e.number_alias, e.description \n";
 				$sql .= "order by extension asc \n";
-				if (!($_GET['show'] === 'all' && permission_exists('xml_cdr_all'))) {
+				if (!($_GET['show'] === 'all' && permission_exists('xml_cdr_extension_summary_all'))) {
 					$parameters['domain_uuid'] = $this->domain_uuid;
 				}
 				$database = new database;
diff --git a/app/xml_cdr/resources/dashboard/missed_calls.php b/app/xml_cdr/resources/dashboard/missed_calls.php
index ba830a020b..713704db2c 100644
--- a/app/xml_cdr/resources/dashboard/missed_calls.php
+++ b/app/xml_cdr/resources/dashboard/missed_calls.php
@@ -45,6 +45,7 @@
 	$sql .=	"		or direction = 'local' \n";
 	$sql .=	"	) \n";
 	$sql .=	"	and (missed_call = true or bridge_uuid is null) ";
+	$sql .=	"	and hangup_cause <> 'LOSE_RACE' ";
 	if (is_array($assigned_extensions) && sizeof($assigned_extensions) != 0) {
 		$x = 0;
 		foreach ($assigned_extensions as $assigned_extension_uuid => $assigned_extension) {
@@ -77,7 +78,7 @@
 
 //add doughnut chart
 	?>
-	<div style='display: flex; flex-wrap: wrap; justify-content: center; padding-bottom: 10px;'>
+	<div style='display: flex; flex-wrap: wrap; justify-content: center; padding-bottom: 20px;'>
 		<div style='width: 175px; height: 175px;'><canvas id='missed_calls_chart'></canvas></div>
 	</div>
 
diff --git a/app/xml_cdr/resources/dashboard/recent_calls.php b/app/xml_cdr/resources/dashboard/recent_calls.php
index 1467d88d00..29951d7ae0 100644
--- a/app/xml_cdr/resources/dashboard/recent_calls.php
+++ b/app/xml_cdr/resources/dashboard/recent_calls.php
@@ -76,7 +76,7 @@
 
 //add doughnut chart
 	?>
-	<div style='display: flex; flex-wrap: wrap; justify-content: center; padding-bottom: 10px;'>
+	<div style='display: flex; flex-wrap: wrap; justify-content: center; padding-bottom: 20px;'>
 		<div style='width: 175px; height: 175px;'><canvas id='recent_calls_chart'></canvas></div>
 	</div>
 
diff --git a/app/xml_cdr/xml_cdr_extension_summary.php b/app/xml_cdr/xml_cdr_extension_summary.php
index 97dcd6cfaf..10c78f5863 100644
--- a/app/xml_cdr/xml_cdr_extension_summary.php
+++ b/app/xml_cdr/xml_cdr_extension_summary.php
@@ -113,7 +113,7 @@
 	echo "<div class='action_bar' id='action_bar'>\n";
 	echo "	<div class='heading'><b>".$text['title-extension_summary']."</b></div>\n";
 	echo "	<div class='actions'>\n";
-	if (permission_exists('xml_cdr_all') && $_GET['show'] != 'all') {
+	if (permission_exists('xml_cdr_extension_summary_all') && $_GET['show'] != 'all') {
 		echo button::create(['type'=>'button','label'=>$text['button-show_all'],'icon'=>$_SESSION['theme']['button_icon_all'],'collapse'=>'hide-sm-dn','link'=>'xml_cdr_extension_summary.php?show=all']);
 	}
 	echo button::create(['type'=>'button','label'=>$text['button-download_csv'],'icon'=>$_SESSION['theme']['button_icon_download'],'collapse'=>'hide-sm-dn','link'=>'xml_cdr_extension_summary.php?'.(strlen($_SERVER["QUERY_STRING"]) > 0 ? $_SERVER["QUERY_STRING"].'&' : null).'type=csv']);
@@ -178,7 +178,7 @@
 
 		echo "</div>\n";
 
-		if (permission_exists('xml_cdr_all') && $_GET['show'] == 'all') {
+		if (permission_exists('xml_cdr_extension_summary_all') && $_GET['show'] == 'all') {
 			echo "<input type='hidden' name='show' value='all'>";
 		}
 
@@ -188,7 +188,7 @@
 //show the results
 	echo "<table class='list'>\n";
 	echo "	<tr class='list-header'>\n";
-	if ($_GET['show'] === "all" && permission_exists('xml_cdr_all')) {
+	if ($_GET['show'] === "all" && permission_exists('xml_cdr_extension_summary_all')) {
 		echo "		<th>".$text['label-domain']."</th>\n";
 	}
 	echo "		<th>".$text['label-extension']."</th>\n";
@@ -197,7 +197,7 @@
 	echo "		<th class='center'>".$text['label-missed']."</th>\n";
 	echo "		<th class='center'>".$text['label-no_answer']."</th>\n";
 	echo "		<th class='center'>".$text['label-busy']."</th>\n";
-	echo "		<th class='center'>".$text['label-aloc']."</th>\n";
+	echo "		<th class='center' title='".$text['description-aloc']."'>".$text['label-aloc']."</th>\n";
 	echo "		<th class='center'>".$text['label-inbound_calls']."</th>\n";
 	echo "		<th class='center'>".$text['label-inbound_duration']."</th>\n";
 	echo "		<th class='center'>".$text['label-outbound_calls']."</th>\n";
@@ -208,7 +208,7 @@
 	if (is_array($summary)) {
 		foreach ($summary as $key => $row) {
 			echo "<tr class='list-row'>\n";
-			if ($_GET['show'] === "all" && permission_exists('xml_cdr_all')) {
+			if ($_GET['show'] === "all" && permission_exists('xml_cdr_extension_summary_all')) {
 				echo "	<td>".escape($row['domain_name'])."</td>\n";
 			}
 			echo "	<td>".escape($row['extension'])."</td>\n";
diff --git a/app/xml_cdr/xml_cdr_inc.php b/app/xml_cdr/xml_cdr_inc.php
index 8015c23fa7..7af4f44d6b 100644
--- a/app/xml_cdr/xml_cdr_inc.php
+++ b/app/xml_cdr/xml_cdr_inc.php
@@ -302,6 +302,7 @@
 	}
 	if ($missed == true) {
 		$sql .= "and missed_call = 1 \n";
+		$sql .= "and hangup_cause <> 'LOSE_RACE' ";
 	}
 	if (strlen($start_epoch) > 0 && strlen($stop_epoch) > 0) {
 		$sql .= "and start_epoch between :start_epoch and :stop_epoch \n";
@@ -470,6 +471,7 @@
 				break;
 			case 'missed':
 				$sql .= "and missed_call = '1' ";
+				$sql .= "and hangup_cause <> 'LOSE_RACE' ";
 				break;
 			case 'cancelled':
 				if ($direction == 'inbound' || $direction == 'local' || $call_result == 'missed') {
diff --git a/app/xml_cdr/xml_cdr_statistics.php b/app/xml_cdr/xml_cdr_statistics.php
index 8336ad5608..e50e8c03fa 100644
--- a/app/xml_cdr/xml_cdr_statistics.php
+++ b/app/xml_cdr/xml_cdr_statistics.php
@@ -280,7 +280,7 @@
 	echo "	<th>".$text['table-calls-per-minute']."</th>\n";
 	echo "	<th class='center'>".$text['table-missed']."</th>\n";
 	echo "	<th>ASR</th>\n";
-	echo "	<th>ALOC</th>\n";
+	echo "	<th title='".$text['description-aloc']."'>".$text['label-aloc']."</th>\n";
 	echo "</tr>\n";
 
 	$i = 0;
diff --git a/app/xml_cdr/xml_cdr_statistics_inc.php b/app/xml_cdr/xml_cdr_statistics_inc.php
index e695b8e67c..a20d3af0fd 100644
--- a/app/xml_cdr/xml_cdr_statistics_inc.php
+++ b/app/xml_cdr/xml_cdr_statistics_inc.php
@@ -154,6 +154,7 @@
 	}
 	if ($missed == true) {
 		$sql_where_ands[] = "missed_call = true ";
+		$sql_where_ands[] = "and hangup_cause <> 'LOSE_RACE' ";
 	}
 	if (strlen($start_epoch) > 0 && strlen($stop_epoch) > 0) {
 		$sql_where_ands[] = "start_epoch between :start_epoch and :stop_epoch";
diff --git a/app/yealink/app_config.php b/app/yealink/app_config.php
index df95ca0f86..43132a8c74 100644
--- a/app/yealink/app_config.php
+++ b/app/yealink/app_config.php
@@ -35,8 +35,8 @@
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_provision_url";
 		$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_value'] = 'https://{$domain_name}/app/provision/';
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Provisioning URL for Yealink";
 		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "fc2fa8cd-b14e-48e3-99bd-7c01c9d6208d";
@@ -63,7 +63,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "0-12 Hour, 1-24 Hour";
 		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "166b27d118604154-88d3-5e15781e7bbb";
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "166b27d1-1860-4154-88d3-5e15781e7bbb";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_date_format";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
@@ -79,7 +79,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Enable or disable the NAT Rport. 0-Disabled (default), 1-Enabled.";
 		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "70894b7b-2edd-41ad8526060589df4e11";
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "70894b7b-2edd-41ad-8526-060589df4e11";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_session_timer";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "boolean";
@@ -87,7 +87,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "SIP Session Timers";
 		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "aa200d6f-c04842039838-8dd05fa31bd5";
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "aa200d6f-c048-4203-9838-8dd05fa31bd5";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_retransmission";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "boolean";
@@ -167,7 +167,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Default 0";
 		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "be02b916-3419-4bc7-881e46711134577c";
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "be02b916-3419-4bc7-881e-46711134577c";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_blf_led_mode";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
@@ -295,6 +295,14 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Filename of the CP960 firmware ROM";
 		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "d5fdf57e-45b2-4704-bdbf-ff7821692a07";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_firmware_t23g";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "t23g-44.84.0.140.rom";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Filename of the T23G firmware ROM";
+		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "2f27755a-5082-469d-8ea6-52e350cb9988";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_firmware_t27g";
@@ -319,7 +327,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Filename of the T33G firmware ROM";
 		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "758509689226450f-a3e1-414ec1d610ee";
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "75850968-9226-450f-a3e1-414ec1d610ee";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_firmware_t38g";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
@@ -335,7 +343,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Filename of the T40G firmware ROM";
 		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "c5d9b7ea-8e3b44289845438be7be0baa";
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "c5d9b7ea-8e3b-4428-9845-438be7be0baa";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_firmware_t40p";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
@@ -351,7 +359,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Filename of the T41P firmware ROM";
 		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "9480f346-c038-462b-b440329383290b84";
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "9480f346-c038-462b-b440-329383290b84";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_firmware_t41s";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
@@ -399,6 +407,14 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Filename of the T46U firmware ROM";
 		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "fe57b4db-e6a2-49be-b103-74345e8dd8b5";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_firmware_t48u";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "T46U(T43U,T46U,T41U,T48U,T42U)-108.86.0.20.rom";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Filename of the T48U 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";
@@ -471,7 +487,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Filename of the T52Sfirmware ROM";
 		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "7378c0b632424989-8af6-903dfb437285";
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "7378c0b6-3242-4989-8af6-903dfb437285";
 		$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";
@@ -479,7 +495,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Firmware tested 2017-11-26";
 		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "4ffd1ad7-1b00-41f7-8e9319412127245a";
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "4ffd1ad7-1b00-41f7-8e93-19412127245a";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_firmware_t56a";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
@@ -639,6 +655,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'] = "a921482c-40db-4aaf-85a8-71732a8b2033";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_remote_phonebook_enable";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Perform a remote phone book search for an incoming or outgoing call and display the matched results on the LCD screen. 0-Disabled;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";
@@ -795,7 +819,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_ring_file_9";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "Ring8.wav";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "Ring9.wav";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Ring tone for each text ranges from 1 to 8. The value 8 stands for Ring8.wav.";
 		$y++;
@@ -803,7 +827,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_ring_file_10";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
-		$apps[$x]['default_settings'][$y]['default_setting_value'] = "Ring8.wav";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "Ring10.wav";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Ring tone for each text ranges from 1 to 8. The value 8 stands for Ring8.wav.";
 		$y++;
@@ -822,6 +846,14 @@
 		$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'] = "The language used in phone interface.";
+		$y++;		
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "3f7a5ed6-364c-4d5c-ba7e-4c6e9bdf9131";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_dialplan_dialnow_delay";
+		$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'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Time in second till dialnow activates.";
 		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "b2d1e9c4-7097-4fc8-bb14-5aba6df4ef32";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
@@ -939,9 +971,9 @@
 		$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'] = "false";
+		$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'] = "Required trusted certificate for provisioning.";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Only Accept Trusted Certificates 0-Disabled (default), 1-Enabled.";
 		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "e1d03aea-1563-4c57-86de-4d4d274b8352";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
@@ -1457,5 +1489,37 @@
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = "*73";
 		$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'] = "fc337406-a3db-46ae-9d56-440bb514bb9f";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_dnd_on_code";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "*78";
+		$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'] = "21569457-b9b3-4c24-b631-4cc33fbe1bce";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_dnd_off_code";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "*79";
+		$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'] = "9e7091a9-6a1c-478c-9a4b-39dd93f19f94";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_udp_update_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'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify";	
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "94a40988-057c-428e-b3fc-f125a345f85f";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_hold_or_swap_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'] = "configures the display rule of the Hold/Swap soft key when there are two calls on the phone. 0-Only display Swap softkey (default), 1-Only display Hold softkey, 2-Display Hold and Swap softkeys";
 
 ?>
diff --git a/app/yealink/app_defaults.php b/app/yealink/app_defaults.php
index 5ecfbd223b..f28fc39f2d 100644
--- a/app/yealink/app_defaults.php
+++ b/app/yealink/app_defaults.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) 2020
+	Portions created by the Initial Developer are Copyright (C) 2022
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -26,10 +26,33 @@
 
 //process this only one time
 	if ($domains_processed == 1) {
-		
+
+		//if yealink_trust_certificates is true or false then update to 1 or 0
+		$sql = "select default_setting_uuid, default_setting_value from v_default_settings ";
+		$sql .= "where default_setting_subcategory = 'yealink_trust_certificates' ";
+		$sql .= "and (default_setting_value = 'true' or default_setting_value = 'false');";
+		$database = new database;
+		$row = $database->select($sql, null, 'row');
+		if (is_array($row)) {
+			if ($row['default_setting_value'] == 'false') {
+				$row['default_setting_value'] = '0';
+			}
+			else {
+				$row['default_setting_value'] = '1';
+			}
+			$sql = "update v_default_settings ";
+			$sql .= "set default_setting_value = ".$row['default_setting_value'].",  ";
+			$sql .= "default_setting_description = 'Only Accept Trusted Certificates 0-Disabled (default), 1-Enabled.'  ";
+			$sql .= "where default_setting_uuid = '".$row['default_setting_uuid']."'; ";
+			$database = new database;
+			$database->execute($sql, null);
+			unset($sql);
+		}
+
 		//correct yealink_codec_opus_priority values
 		if ($db_type == 'pgsql') {
-			$sql = "select pg_typeof(default_setting_enabled) from v_default_settings limit 1;";
+			$sql = "select pg_typeof(default_setting_enabled) ";
+			$sql .= "from v_default_settings limit 1;";
 			$database = new database;
 			$enabled_type = $database->select($sql, null, 'column');
 			if ($enabled_type == 'text') {
@@ -42,4 +65,4 @@
 		}
 
 	}
-     
+
diff --git a/core/authentication/resources/classes/authentication.php b/core/authentication/resources/classes/authentication.php
index 6b7fd340d5..ec11635342 100644
--- a/core/authentication/resources/classes/authentication.php
+++ b/core/authentication/resources/classes/authentication.php
@@ -53,6 +53,34 @@ class authentication {
 				$this->get_domain();
 			}
 
+		//automatically block multiple authentication failures
+			if (!isset($_SESSION['users']['max_retry']['numeric'])) {
+				$_SESSION['users']['max_retry']['numeric'] = 5;
+			}
+			if (!isset($_SESSION['users']['find_time']['numeric'])) {
+				$_SESSION['users']['find_time']['numeric'] = 3600;
+			}
+			$sql = "select count(user_log_uuid) \n";
+			$sql .= "from v_user_logs \n";
+			$sql .= "where result = 'failure' \n";
+			$sql .= "and floor(extract(epoch from now()) - extract(epoch from timestamp)) < :find_time \n";
+			$sql .= "and type = 'login' \n";
+			$sql .= "and remote_address = :remote_address \n";
+			$sql .= "and username = :username \n";
+			$parameters['remote_address'] = $_SERVER['REMOTE_ADDR'];
+			$parameters['find_time'] = $_SESSION['users']['find_time']['numeric'];
+			$parameters['username'] = $this->username;
+			$database = new database;
+			$auth_tries = $database->select($sql, $parameters, 'column');
+			if ($_SESSION['users']['max_retry']['numeric'] <= $auth_tries) {
+				$result["plugin"] = "database";
+				$result["domain_name"] = $this->domain_name;
+				$result["username"] = $this->username;
+				$result["domain_uuid"] = $this->domain_uuid;
+				$result["authorized"] = "false";
+				return $result;
+			}
+
 		//set the database as the default plugin
 			if (!isset($_SESSION['authentication']['methods'])) {
 				$_SESSION['authentication']['methods'][] = 'database';
diff --git a/core/dashboard/app_config.php b/core/dashboard/app_config.php
index 3c2492e90a..8e8923c7fd 100644
--- a/core/dashboard/app_config.php
+++ b/core/dashboard/app_config.php
@@ -72,6 +72,11 @@
 		$apps[$x]['db'][$y]['fields'][$z]['search_by'] = '';
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the dashboard path.';
 		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'dashboard_column_span';
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'numeric';
+		$apps[$x]['db'][$y]['fields'][$z]['search_by'] = '';
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = 'Enter the dashboard column span.';
+		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'dashboard_order';
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = 'numeric';
 		$apps[$x]['db'][$y]['fields'][$z]['search_by'] = '';
diff --git a/core/dashboard/app_defaults.php b/core/dashboard/app_defaults.php
index 442155a7d6..fdb1cfab28 100644
--- a/core/dashboard/app_defaults.php
+++ b/core/dashboard/app_defaults.php
@@ -7,6 +7,10 @@ if ($domains_processed == 1) {
 			unset($array);
 		}
 
+	//make the default groups exist
+		$group = new groups;
+		$group->defaults();
+
 	//get the groups
 		$sql = "select * from v_groups ";
 		$sql .= "where domain_uuid is null ";
@@ -84,7 +88,7 @@ if ($domains_processed == 1) {
 			$database = new database;
 			$database->app_name = 'dashboard';
 			$database->app_uuid = '55533bef-4f04-434a-92af-999c1e9927f7';
-			$database->save($array);
+			$database->save($array, false);
 			//$result = $database->message;
 			//view_array($result);
 		}
diff --git a/core/dashboard/app_languages.php b/core/dashboard/app_languages.php
index a93a61bf53..8a5f50ee2c 100644
--- a/core/dashboard/app_languages.php
+++ b/core/dashboard/app_languages.php
@@ -10,12 +10,12 @@
 		$text['title-dashboard']['el-gr'] = "Πίνακας ελέγχου";
 		$text['title-dashboard']['es-cl'] = "Dashboard Usuario";
 		$text['title-dashboard']['es-mx'] = "Dashboard Usuario"; //copied from es-cl
-		$text['title-dashboard']['fr-ca'] = "Tableau de bord de l'utilisateur"; //copied from fr-fr
-		$text['title-dashboard']['fr-fr'] = "Tableau de bord de l'utilisateur";
+		$text['title-dashboard']['fr-ca'] = "Tableau de bord"; //copied from fr-fr
+		$text['title-dashboard']['fr-fr'] = "Tableau de bord";
 		$text['title-dashboard']['he-il'] = "ממשק משתמש";
 		$text['title-dashboard']['it-it'] = "Pannello di Controllo";
 		$text['title-dashboard']['nl-nl'] = "";
-		$text['title-dashboard']['pl-pl'] = "Panel użytkowników";
+		$text['title-dashboard']['pl-pl'] = "Panel nawigacyjny";
 		$text['title-dashboard']['pt-br'] = "Painel de Controle";
 		$text['title-dashboard']['pt-pt'] = "Painel de Controle do Usuário";
 		$text['title-dashboard']['ro-ro'] = "Panou control utilizator";
@@ -52,12 +52,12 @@
 		$text['label-group_uuid']['de-de'] = '';
 		$text['label-group_uuid']['es-cl'] = '';
 		$text['label-group_uuid']['es-mx'] = '';
-		$text['label-group_uuid']['fr-ca'] = '';
-		$text['label-group_uuid']['fr-fr'] = '';
+		$text['label-group_uuid']['fr-ca'] = 'UUID De Groupe';
+		$text['label-group_uuid']['fr-fr'] = 'UUID De Groupe';
 		$text['label-group_uuid']['he-il'] = '';
 		$text['label-group_uuid']['it-it'] = '';
 		$text['label-group_uuid']['nl-nl'] = '';
-		$text['label-group_uuid']['pl-pl'] = '';
+		$text['label-group_uuid']['pl-pl'] = 'UUID Grupy';
 		$text['label-group_uuid']['pt-br'] = '';
 		$text['label-group_uuid']['pt-pt'] = '';
 		$text['label-group_uuid']['ro-ro'] = '';
@@ -72,12 +72,12 @@
 		$text['description-group_uuid']['de-de'] = '';
 		$text['description-group_uuid']['es-cl'] = '';
 		$text['description-group_uuid']['es-mx'] = '';
-		$text['description-group_uuid']['fr-ca'] = '';
-		$text['description-group_uuid']['fr-fr'] = '';
+		$text['description-group_uuid']['fr-ca'] = "Saisissez l'UUID De Groupe";
+		$text['description-group_uuid']['fr-fr'] = "Saisissez l'UUID De Groupe";
 		$text['description-group_uuid']['he-il'] = '';
 		$text['description-group_uuid']['it-it'] = '';
 		$text['description-group_uuid']['nl-nl'] = '';
-		$text['description-group_uuid']['pl-pl'] = '';
+		$text['description-group_uuid']['pl-pl'] = 'Wprowadź UUID grupy';
 		$text['description-group_uuid']['pt-br'] = '';
 		$text['description-group_uuid']['pt-pt'] = '';
 		$text['description-group_uuid']['ro-ro'] = '';
@@ -92,12 +92,12 @@
 		$text['label-dashboard_name']['de-de'] = '';
 		$text['label-dashboard_name']['es-cl'] = '';
 		$text['label-dashboard_name']['es-mx'] = '';
-		$text['label-dashboard_name']['fr-ca'] = '';
-		$text['label-dashboard_name']['fr-fr'] = '';
+		$text['label-dashboard_name']['fr-ca'] = 'Nom';
+		$text['label-dashboard_name']['fr-fr'] = 'Nom';
 		$text['label-dashboard_name']['he-il'] = '';
 		$text['label-dashboard_name']['it-it'] = '';
 		$text['label-dashboard_name']['nl-nl'] = '';
-		$text['label-dashboard_name']['pl-pl'] = '';
+		$text['label-dashboard_name']['pl-pl'] = 'Nazwa';
 		$text['label-dashboard_name']['pt-br'] = '';
 		$text['label-dashboard_name']['pt-pt'] = '';
 		$text['label-dashboard_name']['ro-ro'] = '';
@@ -112,12 +112,12 @@
 		$text['description-dashboard_name']['de-de'] = '';
 		$text['description-dashboard_name']['es-cl'] = '';
 		$text['description-dashboard_name']['es-mx'] = '';
-		$text['description-dashboard_name']['fr-ca'] = '';
-		$text['description-dashboard_name']['fr-fr'] = '';
+		$text['description-dashboard_name']['fr-ca'] = 'Saisissez le nom du widget du tableau de bord.';
+		$text['description-dashboard_name']['fr-fr'] = 'Saisissez le nom du widget du tableau de bord.';
 		$text['description-dashboard_name']['he-il'] = '';
 		$text['description-dashboard_name']['it-it'] = '';
 		$text['description-dashboard_name']['nl-nl'] = '';
-		$text['description-dashboard_name']['pl-pl'] = '';
+		$text['description-dashboard_name']['pl-pl'] = 'Wprowadź nazwę widżetu panelu nawigacyjnego.';
 		$text['description-dashboard_name']['pt-br'] = '';
 		$text['description-dashboard_name']['pt-pt'] = '';
 		$text['description-dashboard_name']['ro-ro'] = '';
@@ -132,12 +132,12 @@
 		$text['label-dashboard_path']['de-de'] = '';
 		$text['label-dashboard_path']['es-cl'] = '';
 		$text['label-dashboard_path']['es-mx'] = '';
-		$text['label-dashboard_path']['fr-ca'] = '';
-		$text['label-dashboard_path']['fr-fr'] = '';
+		$text['label-dashboard_path']['fr-ca'] = 'Chemin';
+		$text['label-dashboard_path']['fr-fr'] = 'Chemin';
 		$text['label-dashboard_path']['he-il'] = '';
 		$text['label-dashboard_path']['it-it'] = '';
 		$text['label-dashboard_path']['nl-nl'] = '';
-		$text['label-dashboard_path']['pl-pl'] = '';
+		$text['label-dashboard_path']['pl-pl'] = 'Ścieżka';
 		$text['label-dashboard_path']['pt-br'] = '';
 		$text['label-dashboard_path']['pt-pt'] = '';
 		$text['label-dashboard_path']['ro-ro'] = '';
@@ -152,12 +152,12 @@
 		$text['description-dashboard_path']['de-de'] = '';
 		$text['description-dashboard_path']['es-cl'] = '';
 		$text['description-dashboard_path']['es-mx'] = '';
-		$text['description-dashboard_path']['fr-ca'] = '';
-		$text['description-dashboard_path']['fr-fr'] = '';
+		$text['description-dashboard_path']['fr-ca'] = 'Entrez le chemin du widget du tableau de bord.';
+		$text['description-dashboard_path']['fr-fr'] = 'Entrez le chemin du widget du tableau de bord.';
 		$text['description-dashboard_path']['he-il'] = '';
 		$text['description-dashboard_path']['it-it'] = '';
 		$text['description-dashboard_path']['nl-nl'] = '';
-		$text['description-dashboard_path']['pl-pl'] = '';
+		$text['description-dashboard_path']['pl-pl'] = 'Wprowadź ścieżkę widżetu panelu nawigacyjnego.';
 		$text['description-dashboard_path']['pt-br'] = '';
 		$text['description-dashboard_path']['pt-pt'] = '';
 		$text['description-dashboard_path']['ro-ro'] = '';
@@ -172,12 +172,12 @@
 		$text['label-dashboard_groups']['de-de'] = '';
 		$text['label-dashboard_groups']['es-cl'] = '';
 		$text['label-dashboard_groups']['es-mx'] = '';
-		$text['label-dashboard_groups']['fr-ca'] = '';
-		$text['label-dashboard_groups']['fr-fr'] = '';
+		$text['label-dashboard_groups']['fr-ca'] = 'Groupes';
+		$text['label-dashboard_groups']['fr-fr'] = 'Groupes';
 		$text['label-dashboard_groups']['he-il'] = '';
 		$text['label-dashboard_groups']['it-it'] = '';
 		$text['label-dashboard_groups']['nl-nl'] = '';
-		$text['label-dashboard_groups']['pl-pl'] = '';
+		$text['label-dashboard_groups']['pl-pl'] = 'Grupy';
 		$text['label-dashboard_groups']['pt-br'] = '';
 		$text['label-dashboard_groups']['pt-pt'] = '';
 		$text['label-dashboard_groups']['ro-ro'] = '';
@@ -192,12 +192,12 @@
 		$text['description-dashboard_groups']['de-de'] = '';
 		$text['description-dashboard_groups']['es-cl'] = '';
 		$text['description-dashboard_groups']['es-mx'] = '';
-		$text['description-dashboard_groups']['fr-ca'] = '';
-		$text['description-dashboard_groups']['fr-fr'] = '';
+		$text['description-dashboard_groups']['fr-ca'] = 'Ajoutez les groupes autorisés à accéder à ce widget.';
+		$text['description-dashboard_groups']['fr-fr'] = 'Ajoutez les groupes autorisés à accéder à ce widget.';
 		$text['description-dashboard_groups']['he-il'] = '';
 		$text['description-dashboard_groups']['it-it'] = '';
 		$text['description-dashboard_groups']['nl-nl'] = '';
-		$text['description-dashboard_groups']['pl-pl'] = '';
+		$text['description-dashboard_groups']['pl-pl'] = 'Dodaj grupy, które mają uprawnienia do tego widżetu.';
 		$text['description-dashboard_groups']['pt-br'] = '';
 		$text['description-dashboard_groups']['pt-pt'] = '';
 		$text['description-dashboard_groups']['ro-ro'] = '';
@@ -205,6 +205,46 @@
 		$text['description-dashboard_groups']['sv-se'] = '';
 		$text['description-dashboard_groups']['uk-ua'] = '';
 
+		$text['label-dashboard_column_span']['en-us'] = 'Column Span';
+		$text['label-dashboard_column_span']['ar-eg'] = '';
+		$text['label-dashboard_column_span']['de-at'] = '';
+		$text['label-dashboard_column_span']['de-ch'] = '';
+		$text['label-dashboard_column_span']['de-de'] = '';
+		$text['label-dashboard_column_span']['es-cl'] = '';
+		$text['label-dashboard_column_span']['es-mx'] = '';
+		$text['label-dashboard_column_span']['fr-ca'] = "L'étendue de la colonne";
+		$text['label-dashboard_column_span']['fr-fr'] = "L'étendue de la colonne";
+		$text['label-dashboard_column_span']['he-il'] = '';
+		$text['label-dashboard_column_span']['it-it'] = '';
+		$text['label-dashboard_column_span']['nl-nl'] = '';
+		$text['label-dashboard_column_span']['pl-pl'] = 'Szerokość kolumn';
+		$text['label-dashboard_column_span']['pt-br'] = '';
+		$text['label-dashboard_column_span']['pt-pt'] = '';
+		$text['label-dashboard_column_span']['ro-ro'] = '';
+		$text['label-dashboard_column_span']['ru-ru'] = '';
+		$text['label-dashboard_column_span']['sv-se'] = '';
+		$text['label-dashboard_column_span']['uk-ua'] = '';
+
+		$text['description-dashboard_column_span']['en-us'] = 'Enter the dashboard widget column span.';
+		$text['description-dashboard_column_span']['ar-eg'] = '';
+		$text['description-dashboard_column_span']['de-at'] = '';
+		$text['description-dashboard_column_span']['de-ch'] = '';
+		$text['description-dashboard_column_span']['de-de'] = '';
+		$text['description-dashboard_column_span']['es-cl'] = '';
+		$text['description-dashboard_column_span']['es-mx'] = '';
+		$text['description-dashboard_column_span']['fr-ca'] = "Entrez l'étendue de la colonne du widget du tableau de bord";
+		$text['description-dashboard_column_span']['fr-fr'] = "Entrez l'étendue de la colonne du widget du tableau de bord";
+		$text['description-dashboard_column_span']['he-il'] = '';
+		$text['description-dashboard_column_span']['it-it'] = '';
+		$text['description-dashboard_column_span']['nl-nl'] = '';
+		$text['description-dashboard_column_span']['pl-pl'] = 'Wprowadź szerokość kolumn widżetu panelu nawigacyjnego';
+		$text['description-dashboard_column_span']['pt-br'] = '';
+		$text['description-dashboard_column_span']['pt-pt'] = '';
+		$text['description-dashboard_column_span']['ro-ro'] = '';
+		$text['description-dashboard_column_span']['ru-ru'] = '';
+		$text['description-dashboard_column_span']['sv-se'] = '';
+		$text['description-dashboard_column_span']['uk-ua'] = '';
+
 		$text['label-dashboard_order']['en-us'] = 'Order';
 		$text['label-dashboard_order']['ar-eg'] = '';
 		$text['label-dashboard_order']['de-at'] = '';
@@ -212,12 +252,12 @@
 		$text['label-dashboard_order']['de-de'] = '';
 		$text['label-dashboard_order']['es-cl'] = '';
 		$text['label-dashboard_order']['es-mx'] = '';
-		$text['label-dashboard_order']['fr-ca'] = '';
-		$text['label-dashboard_order']['fr-fr'] = '';
+		$text['label-dashboard_order']['fr-ca'] = 'Ordre';
+		$text['label-dashboard_order']['fr-fr'] = 'Ordre';
 		$text['label-dashboard_order']['he-il'] = '';
 		$text['label-dashboard_order']['it-it'] = '';
 		$text['label-dashboard_order']['nl-nl'] = '';
-		$text['label-dashboard_order']['pl-pl'] = '';
+		$text['label-dashboard_order']['pl-pl'] = 'Kolejność';
 		$text['label-dashboard_order']['pt-br'] = '';
 		$text['label-dashboard_order']['pt-pt'] = '';
 		$text['label-dashboard_order']['ro-ro'] = '';
@@ -232,12 +272,12 @@
 		$text['description-dashboard_order']['de-de'] = '';
 		$text['description-dashboard_order']['es-cl'] = '';
 		$text['description-dashboard_order']['es-mx'] = '';
-		$text['description-dashboard_order']['fr-ca'] = '';
-		$text['description-dashboard_order']['fr-fr'] = '';
+		$text['description-dashboard_order']['fr-ca'] = 'Saisissez l ordre du widget du tableau de bord.';
+		$text['description-dashboard_order']['fr-fr'] = 'Saisissez l ordre du widget du tableau de bord.';
 		$text['description-dashboard_order']['he-il'] = '';
 		$text['description-dashboard_order']['it-it'] = '';
 		$text['description-dashboard_order']['nl-nl'] = '';
-		$text['description-dashboard_order']['pl-pl'] = '';
+		$text['description-dashboard_order']['pl-pl'] = 'Wprowadź kolejność widżetu panelu nawigacyjnego.';
 		$text['description-dashboard_order']['pt-br'] = '';
 		$text['description-dashboard_order']['pt-pt'] = '';
 		$text['description-dashboard_order']['ro-ro'] = '';
@@ -252,12 +292,12 @@
 		$text['label-dashboard_enabled']['de-de'] = '';
 		$text['label-dashboard_enabled']['es-cl'] = '';
 		$text['label-dashboard_enabled']['es-mx'] = '';
-		$text['label-dashboard_enabled']['fr-ca'] = '';
-		$text['label-dashboard_enabled']['fr-fr'] = '';
+		$text['label-dashboard_enabled']['fr-ca'] = 'Activé';
+		$text['label-dashboard_enabled']['fr-fr'] = 'Activé';
 		$text['label-dashboard_enabled']['he-il'] = '';
 		$text['label-dashboard_enabled']['it-it'] = '';
 		$text['label-dashboard_enabled']['nl-nl'] = '';
-		$text['label-dashboard_enabled']['pl-pl'] = '';
+		$text['label-dashboard_enabled']['pl-pl'] = 'Włączony';
 		$text['label-dashboard_enabled']['pt-br'] = '';
 		$text['label-dashboard_enabled']['pt-pt'] = '';
 		$text['label-dashboard_enabled']['ro-ro'] = '';
@@ -272,12 +312,12 @@
 		$text['description-dashboard_enabled']['de-de'] = '';
 		$text['description-dashboard_enabled']['es-cl'] = '';
 		$text['description-dashboard_enabled']['es-mx'] = '';
-		$text['description-dashboard_enabled']['fr-ca'] = '';
-		$text['description-dashboard_enabled']['fr-fr'] = '';
+		$text['description-dashboard_enabled']['fr-ca'] = 'Entrez le widget de tableau de bord activé.';
+		$text['description-dashboard_enabled']['fr-fr'] = 'Entrez le widget de tableau de bord activé.';
 		$text['description-dashboard_enabled']['he-il'] = '';
 		$text['description-dashboard_enabled']['it-it'] = '';
 		$text['description-dashboard_enabled']['nl-nl'] = '';
-		$text['description-dashboard_enabled']['pl-pl'] = '';
+		$text['description-dashboard_enabled']['pl-pl'] = 'Wprowadź stan włączenia widżetu panelu nawigacyjnego.';
 		$text['description-dashboard_enabled']['pt-br'] = '';
 		$text['description-dashboard_enabled']['pt-pt'] = '';
 		$text['description-dashboard_enabled']['ro-ro'] = '';
@@ -292,12 +332,12 @@
 		$text['label-dashboard_description']['de-de'] = '';
 		$text['label-dashboard_description']['es-cl'] = '';
 		$text['label-dashboard_description']['es-mx'] = '';
-		$text['label-dashboard_description']['fr-ca'] = '';
-		$text['label-dashboard_description']['fr-fr'] = '';
+		$text['label-dashboard_description']['fr-ca'] = 'Description';
+		$text['label-dashboard_description']['fr-fr'] = 'Description';
 		$text['label-dashboard_description']['he-il'] = '';
 		$text['label-dashboard_description']['it-it'] = '';
 		$text['label-dashboard_description']['nl-nl'] = '';
-		$text['label-dashboard_description']['pl-pl'] = '';
+		$text['label-dashboard_description']['pl-pl'] = 'Opis';
 		$text['label-dashboard_description']['pt-br'] = '';
 		$text['label-dashboard_description']['pt-pt'] = '';
 		$text['label-dashboard_description']['ro-ro'] = '';
@@ -312,12 +352,12 @@
 		$text['description-dashboard_description']['de-de'] = '';
 		$text['description-dashboard_description']['es-cl'] = '';
 		$text['description-dashboard_description']['es-mx'] = '';
-		$text['description-dashboard_description']['fr-ca'] = '';
-		$text['description-dashboard_description']['fr-fr'] = '';
+		$text['description-dashboard_description']['fr-ca'] = 'Saisissez la description du widget du tableau de bord.';
+		$text['description-dashboard_description']['fr-fr'] = 'Saisissez la description du widget du tableau de bord.';
 		$text['description-dashboard_description']['he-il'] = '';
 		$text['description-dashboard_description']['it-it'] = '';
 		$text['description-dashboard_description']['nl-nl'] = '';
-		$text['description-dashboard_description']['pl-pl'] = '';
+		$text['description-dashboard_description']['pl-pl'] = 'Wprowadź opis widżetu panelu nawigacyjnego.';
 		$text['description-dashboard_description']['pt-br'] = '';
 		$text['description-dashboard_description']['pt-pt'] = '';
 		$text['description-dashboard_description']['ro-ro'] = '';
@@ -346,4 +386,4 @@
 		$text['label-welcome']['ru-ru'] = "Добро пожаловать:";
 		$text['label-welcome']['sv-se'] = "Välkommen:";
 		$text['label-welcome']['uk-ua'] = "Ласкаво просимо:";
-?>
\ No newline at end of file
+?>
diff --git a/core/dashboard/dashboard.php b/core/dashboard/dashboard.php
index 7a95452a62..141fc1fccd 100644
--- a/core/dashboard/dashboard.php
+++ b/core/dashboard/dashboard.php
@@ -251,9 +251,9 @@
 		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";
-	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'=>'dashboard.php','style'=>($search == '' ? 'display: none;' : null)]);
+	echo 		"<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown=''>";
+	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search']);
+	//echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'dashboard.php','style'=>($search == '' ? 'display: none;' : null)]);
 	if ($paging_controls_mini != '') {
 		echo 	"<span style='margin-left: 15px;'>".$paging_controls_mini."</span>\n";
 	}
diff --git a/core/dashboard/dashboard_edit.php b/core/dashboard/dashboard_edit.php
index 8ddfd2cb73..86e8f41c5a 100644
--- a/core/dashboard/dashboard_edit.php
+++ b/core/dashboard/dashboard_edit.php
@@ -55,6 +55,7 @@
 		$dashboard_name = $_POST["dashboard_name"];
 		$dashboard_path = $_POST["dashboard_path"];
 		$dashboard_groups = $_POST["dashboard_groups"];
+		$dashboard_column_span = $_POST["dashboard_column_span"];
 		$dashboard_order = $_POST["dashboard_order"];
 		$dashboard_enabled = $_POST["dashboard_enabled"];
 		$dashboard_description = $_POST["dashboard_description"];
@@ -151,6 +152,7 @@
 			$array['dashboard'][0]['dashboard_uuid'] = $dashboard_uuid;
 			$array['dashboard'][0]['dashboard_name'] = $dashboard_name;
 			$array['dashboard'][0]['dashboard_path'] = $dashboard_path;
+			$array['dashboard'][0]['dashboard_column_span'] = $dashboard_column_span;
 			$array['dashboard'][0]['dashboard_order'] = $dashboard_order;
 			$array['dashboard'][0]['dashboard_enabled'] = $dashboard_enabled;
 			$array['dashboard'][0]['dashboard_description'] = $dashboard_description;
@@ -194,6 +196,7 @@
 		$sql .= " dashboard_uuid, ";
 		$sql .= " dashboard_name, ";
 		$sql .= " dashboard_path, ";
+		$sql .= " dashboard_column_span, ";
 		$sql .= " dashboard_order, ";
 		$sql .= " cast(dashboard_enabled as text), ";
 		$sql .= " dashboard_description ";
@@ -206,6 +209,7 @@
 			$dashboard_name = $row["dashboard_name"];
 			$dashboard_path = $row["dashboard_path"];
 			$dashboard_groups = $row["dashboard_groups"];
+			$dashboard_column_span = $row["dashboard_column_span"];
 			$dashboard_order = $row["dashboard_order"];
 			$dashboard_enabled = $row["dashboard_enabled"];
 			$dashboard_description = $row["dashboard_description"];
@@ -374,6 +378,24 @@
 	echo "</td>\n";
 	echo "</tr>\n";
 
+	echo "<tr>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-dashboard_column_span']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' style='position: relative;' align='left'>\n";
+	echo "	<select name='dashboard_column_span' class='formfld'>\n";
+	$i=1;
+	while ($i<=5) {
+		$selected = ($i == $dashboard_column_span) ? "selected" : null;
+		echo "		<option value='$i' ".$selected.">$i</option>\n";
+		$i++;
+	}
+	echo "	</select>\n";
+	echo "<br />\n";
+	echo $text['description-dashboard_column_span']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
 	echo "<tr>\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
 	echo "	".$text['label-dashboard_order']."\n";
diff --git a/core/dashboard/index.php b/core/dashboard/index.php
index 4c0c2f0eec..1464487a4d 100644
--- a/core/dashboard/index.php
+++ b/core/dashboard/index.php
@@ -70,6 +70,7 @@
 	$sql .= "dashboard_uuid, \n";
 	$sql .= "dashboard_name, \n";
 	$sql .= "dashboard_path, \n";
+	$sql .= "dashboard_column_span, \n";
 	$sql .= "dashboard_order, \n";
 	$sql .= "cast(dashboard_enabled as text), \n";
 	$sql .= "dashboard_description \n";
@@ -170,7 +171,7 @@
 	<?php
 
 //show the content
-	echo "<form id='dashboard' method='POST'>\n";
+	echo "<form id='dashboard' method='POST' onsubmit='setFormSubmitting()'>\n";
 	echo "<div class='action_bar' id='action_bar'>\n";
 	echo "	<div class='heading'><b>".$text['title-dashboard']."</b></div>\n";
 	echo "	<div class='actions'>\n";
@@ -209,7 +210,7 @@
 }
 
 .widget {
-  /*background-color: #eee*/
+  /*background-color: #eee;*/
 }
 
 .widgets {
@@ -222,31 +223,69 @@
 
 /* Screen smaller than 550px? 1 columns */
 @media (max-width: 575px) {
-  .widgets { grid-template-columns: repeat(1, 1fr); }
+  .widgets { grid-template-columns: repeat(1, minmax(100px, 1fr)); }
   .col-num { grid-column: span 1; }
+	<?php
+		foreach($dashboard as $row) {
+			$dashboard_name = strtolower($row['dashboard_name']);
+			$dashboard_name = str_replace(" ", "_", $dashboard_name);
+			if (is_numeric($dashboard_column_span)) {
+				echo "#".$dashboard_name." {\n";
+				echo "	grid-column: span 1;\n";
+				echo "}\n";
+			}
+		}
+	?>
 }
 
 /* Screen larger than 550px? 2 columns */
 @media (min-width: 575px) {
-  .widgets { grid-template-columns: repeat(2, 1fr); }
+  .widgets { grid-template-columns: repeat(2, minmax(100px, 1fr)); }
   .col-num { grid-column: span 2; }
+	<?php
+		foreach($dashboard as $row) {
+			$dashboard_name = strtolower($row['dashboard_name']);
+			$dashboard_name = str_replace(" ", "_", $dashboard_name);
+			$dashboard_column_span = 1;
+			if (is_numeric($dashboard_column_span)) {
+				if ($row['dashboard_column_span'] > 2) {
+					$dashboard_column_span = 2;
+				}
+				echo "#".$dashboard_name." {\n";
+				echo "	grid-column: span ".$dashboard_column_span.";\n";
+				echo "}\n";
+			}
+		}
+	?>
 }
 
 /* Screen larger than 1300px? 3 columns */
 @media (min-width: 1300px) {
-  .widgets { grid-template-columns: repeat(3, 1fr); }
+  .widgets { grid-template-columns: repeat(3, minmax(100px, 1fr)); }
   .col-num { grid-column: span 2; }
+	<?php
+		foreach($dashboard as $row) {
+			$dashboard_name = strtolower($row['dashboard_name']);
+			$dashboard_name = str_replace(" ", "_", $dashboard_name);
+			$dashboard_column_span = $row['dashboard_column_span'];
+			if (is_numeric($dashboard_column_span)) {
+				echo "#".$dashboard_name." {\n";
+				echo "	grid-column: span ".$dashboard_column_span.";\n";
+				echo "}\n";
+			}
+		}
+	?>
 }
 
 /* Screen larger than 1500px? 4 columns */
 @media (min-width: 1500px) {
-  .widgets { grid-template-columns: repeat(4, 1fr); }
+  .widgets { grid-template-columns: repeat(4, minmax(100px, 1fr)); }
   .col-num { grid-column: span 2; }
 }
 
 /* Screen larger than 2000px? 5 columns */
 @media (min-width: 2000px) {
-  .widgets { grid-template-columns: repeat(5, 1fr); }
+  .widgets { grid-template-columns: repeat(5, minmax(100px, 1fr)); }
   .col-num { grid-column: span 2; }
 }
 
@@ -260,7 +299,11 @@
 	foreach($dashboard as $row) {
 		$dashboard_name = strtolower($row['dashboard_name']);
 		$dashboard_name = str_replace(" ", "_", $dashboard_name);
-		echo "<div class='widget' id='".$dashboard_name."' draggable='true'>\n";
+		$draggable = '';
+		if ($_GET['edit'] == 'true') {
+			$draggable = "draggable='true'";
+		}
+		echo "<div class='widget' id='".$dashboard_name."' ".$draggable.">\n";
 			include($row['dashboard_path']);
 		echo "</div>\n";
 		$x++;
@@ -295,8 +338,8 @@
 		}
 
 		.hud_box .hud_box:hover {
-			transform: none;
 			box-shadow: none;
+			transform: none;
 		}
 
 		.ghost {
@@ -306,6 +349,7 @@
 		</style>
 
 		<script>
+		//make widgets draggable
 		var widgets = document.getElementById('widgets');
 		var sortable = Sortable.create(widgets, {
 			animation: 150,
@@ -313,16 +357,15 @@
 			preventOnFilter: true,
 			ghostClass: 'ghost',
 			onChange: function (evt) {
-				//re-render chart when dragged
-				if (evt.item.id != 'ring_group_forward' && evt.item.id != 'call_forward') {
-					let chart = eval(evt.item.id + "_chart");
+				//check if chart exists
+				let chart_status = Chart.getChart(evt.item.id + "_chart");
+				if(chart_status !== undefined && chart_status !== null) {
 					let context = eval(evt.item.id + "_chart_context");
+					let chart = Chart.getChart(context);
 					let config = eval(evt.item.id + "_chart_config");
-			
-					let chart_status = Chart.getChart(context);
-					if (chart_status != undefined) {
-						chart_status.destroy();
-					}
+
+					//re render the chart
+					chart.destroy();
 					chart.options.animation = { duration: 0 };
 					chart = new Chart(context, config);
 				}
@@ -336,6 +379,25 @@
 				document.getElementById('widget_order').value = widget_ids_list;
 			},
 		});
+
+		/*
+		//warn the user before leaving the page
+		var formSubmitting = false;
+		var setFormSubmitting = function() { formSubmitting = true; };
+
+		window.onload = function() {
+			window.addEventListener("beforeunload", function (e) {
+				var confirmationMessage = 'You have unsaved changes which will not be saved.';
+
+				if (formSubmitting) {
+					return undefined;
+				}
+
+				(e || window.event).returnValue = confirmationMessage;
+				return confirmationMessage;
+			});
+		};
+		*/
 		</script>
 		<?php
 	} //end edit
diff --git a/core/databases/databases.php b/core/databases/databases.php
index 07f6752808..30d1828815 100644
--- a/core/databases/databases.php
+++ b/core/databases/databases.php
@@ -110,11 +110,11 @@
 		echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add'],'id'=>'btn_add','link'=>'database_edit.php']);
 	}
 	if (permission_exists('database_add') && $databases) {
-		echo button::create(['type'=>'button','label'=>$text['button-copy'],'icon'=>$_SESSION['theme']['button_icon_copy'],'name'=>'btn_copy','onclick'=>"modal_open('modal-copy','btn_copy');"]);
+		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');"]);
 		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('database_delete') && $databases) {
-		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 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 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 "	</div>\n";
@@ -138,7 +138,7 @@
 	echo "<tr class='list-header'>\n";
 	if (permission_exists('database_add') || permission_exists('database_delete')) {
 		echo "	<th class='checkbox'>\n";
-		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle();' ".($databases ?: "style='visibility: hidden;'").">\n";
+		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle(); checkbox_on_change(this);' ".($databases ?: "style='visibility: hidden;'").">\n";
 		echo "	</th>\n";
 	}
 	echo th_order_by('database_driver', $text['label-driver'], $order_by, $order);
@@ -158,7 +158,7 @@
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('database_add') || permission_exists('database_delete')) {
 				echo "	<td class='checkbox'>\n";
-				echo "		<input type='checkbox' name='databases[$x][checked]' id='checkbox_".$x."' value='true' onclick=\"if (!this.checked) { document.getElementById('checkbox_all').checked = false; }\">\n";
+				echo "		<input type='checkbox' name='databases[$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='databases[$x][uuid]' value='".escape($row['database_uuid'])."' />\n";
 				echo "	</td>\n";
 			}
@@ -194,4 +194,4 @@
 //include the footer
 	require_once "resources/footer.php";
 
-?>
\ No newline at end of file
+?>
diff --git a/core/default_settings/app_config.php b/core/default_settings/app_config.php
index ad77a7aea7..eaa3bf8413 100644
--- a/core/default_settings/app_config.php
+++ b/core/default_settings/app_config.php
@@ -108,7 +108,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = "loopback";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = "outbound,loopback,lcr";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Options: outbound,loopback,lcr";
 		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "48874632-421d-4829-a6b7-0695c589d85f";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "domain";
@@ -212,6 +212,14 @@
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = "tls";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Options: tls, none";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "aba1680c-ac78-4d20-adfe-17231aef70fe";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "email";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "smtp_crypto_method";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT";
+		$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'] = "e1c17089-1e75-4e46-9e59-4748bb6a6cec";
diff --git a/core/default_settings/app_languages.php b/core/default_settings/app_languages.php
index 306f738929..90e03dee1c 100644
--- a/core/default_settings/app_languages.php
+++ b/core/default_settings/app_languages.php
@@ -9,7 +9,7 @@ $text['title-default_settings']['de-ch'] = "Standardeinstellungen"; //copied fro
 $text['title-default_settings']['de-de'] = "Standardeinstellungen";
 $text['title-default_settings']['es-cl'] = "Condiciones Predeterminadas";
 $text['title-default_settings']['es-mx'] = "Condiciones Predeterminadas"; //copied from es-cl
-$text['title-default_settings']['fr-ca'] = "Configurations par Défaut"; //copied from fr-fr
+$text['title-default_settings']['fr-ca'] = "Paramètres par Défaut"; //copied from fr-fr
 $text['title-default_settings']['fr-fr'] = "Configurations par Défaut";
 $text['title-default_settings']['he-il'] = "";
 $text['title-default_settings']['it-it'] = "Parametri di Default";
@@ -30,7 +30,7 @@ $text['title-default_setting-edit']['de-ch'] = "Standardeinstellungen"; //copied
 $text['title-default_setting-edit']['de-de'] = "Standardeinstellungen";
 $text['title-default_setting-edit']['es-cl'] = "Configuraciones Predeterminadas";
 $text['title-default_setting-edit']['es-mx'] = "Configuraciones Predeterminadas"; //copied from es-cl
-$text['title-default_setting-edit']['fr-ca'] = "Configurations par Défaut"; //copied from fr-fr
+$text['title-default_setting-edit']['fr-ca'] = "Paramètre par Défaut"; //copied from fr-fr
 $text['title-default_setting-edit']['fr-fr'] = "Configurations par Défaut";
 $text['title-default_setting-edit']['he-il'] = "";
 $text['title-default_setting-edit']['it-it'] = "Parametro di Default";
@@ -51,8 +51,8 @@ $text['title-default_setting-add']['de-ch'] = "Standardeinstellungen"; //copied
 $text['title-default_setting-add']['de-de'] = "Standardeinstellungen";
 $text['title-default_setting-add']['es-cl'] = "Agregar Configuración Predeterminada";
 $text['title-default_setting-add']['es-mx'] = "Agregar Configuración Predeterminada"; //copied from es-cl
-$text['title-default_setting-add']['fr-ca'] = "Ajouter une configuration per défaut"; //copied from fr-fr
-$text['title-default_setting-add']['fr-fr'] = "Ajouter une configuration per défaut";
+$text['title-default_setting-add']['fr-ca'] = "Ajouter une configuration par défaut";
+$text['title-default_setting-add']['fr-fr'] = "Ajouter une configuration par défaut";
 $text['title-default_setting-add']['he-il'] = "";
 $text['title-default_setting-add']['it-it'] = "Inserimento Parametri di Default";
 $text['title-default_setting-add']['nl-nl'] = "";
@@ -72,8 +72,8 @@ $text['option-voicemail_file_listen']['de-ch'] = "Link zur Nachricht (Login erfo
 $text['option-voicemail_file_listen']['de-de'] = "Link zur Nachricht (Login erforderlich)";
 $text['option-voicemail_file_listen']['es-cl'] = "Escuchar Link (Se requiere entrar)";
 $text['option-voicemail_file_listen']['es-mx'] = "Escuchar Link (Se requiere entrar)"; //copied from es-cl
-$text['option-voicemail_file_listen']['fr-ca'] = "Écouter Link (Connexion requise)"; //copied from fr-fr
-$text['option-voicemail_file_listen']['fr-fr'] = "Écouter Link (Connexion requise)";
+$text['option-voicemail_file_listen']['fr-ca'] = "Écouter Lien (Connexion requise)";
+$text['option-voicemail_file_listen']['fr-fr'] = "Écouter Lien (Connexion requise)";
 $text['option-voicemail_file_listen']['he-il'] = "";
 $text['option-voicemail_file_listen']['it-it'] = "Link Ascolto (Richiesta Login)";
 $text['option-voicemail_file_listen']['nl-nl'] = "";
@@ -114,8 +114,8 @@ $text['option-voicemail_file_attach']['de-ch'] = "Audiodatei als Anhang"; //copi
 $text['option-voicemail_file_attach']['de-de'] = "Audiodatei als Anhang";
 $text['option-voicemail_file_attach']['es-cl'] = "Archivo Adjunto Audio";
 $text['option-voicemail_file_attach']['es-mx'] = "Archivo Adjunto Audio"; //copied from es-cl
-$text['option-voicemail_file_attach']['fr-ca'] = "Audio File Attachment"; //copied from fr-fr
-$text['option-voicemail_file_attach']['fr-fr'] = "Audio File Attachment";
+$text['option-voicemail_file_attach']['fr-ca'] = "Fichier audio en pièce jointe";
+$text['option-voicemail_file_attach']['fr-fr'] = "Fichier audio en pièce jointe";
 $text['option-voicemail_file_attach']['he-il'] = "";
 $text['option-voicemail_file_attach']['it-it'] = "Allegare File Audio";
 $text['option-voicemail_file_attach']['nl-nl'] = "";
@@ -135,8 +135,8 @@ $text['option-button_icons_auto']['de-ch'] = "Automatic";
 $text['option-button_icons_auto']['de-de'] = "Automatic";
 $text['option-button_icons_auto']['es-cl'] = "Automatic";
 $text['option-button_icons_auto']['es-mx'] = "Automatic";
-$text['option-button_icons_auto']['fr-ca'] = "Automatic";
-$text['option-button_icons_auto']['fr-fr'] = "Automatic";
+$text['option-button_icons_auto']['fr-ca'] = "Automatique";
+$text['option-button_icons_auto']['fr-fr'] = "Automatique";
 $text['option-button_icons_auto']['he-il'] = "Automatic";
 $text['option-button_icons_auto']['it-it'] = "Automatic";
 $text['option-button_icons_auto']['nl-nl'] = "Automatic";
@@ -156,8 +156,8 @@ $text['option-button_icons_only']['de-ch'] = "Only";
 $text['option-button_icons_only']['de-de'] = "Only";
 $text['option-button_icons_only']['es-cl'] = "Only";
 $text['option-button_icons_only']['es-mx'] = "Only";
-$text['option-button_icons_only']['fr-ca'] = "Only";
-$text['option-button_icons_only']['fr-fr'] = "Only";
+$text['option-button_icons_only']['fr-ca'] = "Seulement";
+$text['option-button_icons_only']['fr-fr'] = "Seulement";
 $text['option-button_icons_only']['he-il'] = "Only";
 $text['option-button_icons_only']['it-it'] = "Only";
 $text['option-button_icons_only']['nl-nl'] = "Only";
@@ -177,8 +177,8 @@ $text['option-button_icons_always']['de-ch'] = "Always";
 $text['option-button_icons_always']['de-de'] = "Always";
 $text['option-button_icons_always']['es-cl'] = "Always";
 $text['option-button_icons_always']['es-mx'] = "Always";
-$text['option-button_icons_always']['fr-ca'] = "Always";
-$text['option-button_icons_always']['fr-fr'] = "Always";
+$text['option-button_icons_always']['fr-ca'] = "Toujours";
+$text['option-button_icons_always']['fr-fr'] = "Toujours";
 $text['option-button_icons_always']['he-il'] = "Always";
 $text['option-button_icons_always']['it-it'] = "Always";
 $text['option-button_icons_always']['nl-nl'] = "Always";
@@ -198,8 +198,8 @@ $text['option-button_icons_never']['de-ch'] = "Never";
 $text['option-button_icons_never']['de-de'] = "Never";
 $text['option-button_icons_never']['es-cl'] = "Never";
 $text['option-button_icons_never']['es-mx'] = "Never";
-$text['option-button_icons_never']['fr-ca'] = "Never";
-$text['option-button_icons_never']['fr-fr'] = "Never";
+$text['option-button_icons_never']['fr-ca'] = "Jamais";
+$text['option-button_icons_never']['fr-fr'] = "Jamais";
 $text['option-button_icons_never']['he-il'] = "Never";
 $text['option-button_icons_never']['it-it'] = "Never";
 $text['option-button_icons_never']['nl-nl'] = "Never";
@@ -224,7 +224,7 @@ $text['message-toggled']['fr-fr'] = "Basculer Terminé";
 $text['message-toggled']['he-il'] = "הושלם Toggle";
 $text['message-toggled']['it-it'] = "Commutazione Completata";
 $text['message-toggled']['nl-nl'] = "";
-$text['message-toggled']['pl-pl'] = "Przegubowe Zakończony";
+$text['message-toggled']['pl-pl'] = "Przełączono pomyślnie";
 $text['message-toggled']['pt-br'] = "Alteração Concluída"; //copied from pt-pt
 $text['message-toggled']['pt-pt'] = "Alternar Concluído";
 $text['message-toggled']['ro-ro'] = "Completat toggle";
@@ -240,8 +240,8 @@ $text['message-settings_reloaded']['de-ch'] = "Einstellungen neu geladen"; //cop
 $text['message-settings_reloaded']['de-de'] = "Einstellungen neu geladen";
 $text['message-settings_reloaded']['es-cl'] = "Ajustes Reloaded";
 $text['message-settings_reloaded']['es-mx'] = "Ajustes Reloaded"; //copied from es-cl
-$text['message-settings_reloaded']['fr-ca'] = "Paramètres Reloaded"; //copied from fr-fr
-$text['message-settings_reloaded']['fr-fr'] = "Paramètres Reloaded";
+$text['message-settings_reloaded']['fr-ca'] = "Paramètres Rechargés";
+$text['message-settings_reloaded']['fr-fr'] = "Paramètres Rechargés";
 $text['message-settings_reloaded']['he-il'] = "";
 $text['message-settings_reloaded']['it-it'] = "Parametri Ricaricati";
 $text['message-settings_reloaded']['nl-nl'] = "";
@@ -324,7 +324,7 @@ $text['label-top']['de-ch'] = "Oben"; //copied from de-de
 $text['label-top']['de-de'] = "Oben";
 $text['label-top']['es-cl'] = "encima";
 $text['label-top']['es-mx'] = "encima"; //copied from es-cl
-$text['label-top']['fr-ca'] = "Meilleur"; //copied from fr-fr
+$text['label-top']['fr-ca'] = "Haut"; //copied from fr-fr
 $text['label-top']['fr-fr'] = "Meilleur";
 $text['label-top']['he-il'] = "עליון";
 $text['label-top']['it-it'] = "Alto";
@@ -408,7 +408,7 @@ $text['label-reference']['de-ch'] = "Referenz"; //copied from de-de
 $text['label-reference']['de-de'] = "Referenz";
 $text['label-reference']['es-cl'] = "Referencia";
 $text['label-reference']['es-mx'] = "Referencia"; //copied from es-cl
-$text['label-reference']['fr-ca'] = "Référence"; //copied from fr-fr
+$text['label-reference']['fr-ca'] = "Voir";
 $text['label-reference']['fr-fr'] = "Référence";
 $text['label-reference']['he-il'] = "התייחסות";
 $text['label-reference']['it-it'] = "Vedi";
@@ -555,8 +555,8 @@ $text['label-image']['de-ch'] = "Bild"; //copied from de-de
 $text['label-image']['de-de'] = "Bild";
 $text['label-image']['es-cl'] = "Imagen";
 $text['label-image']['es-mx'] = "Imagen"; //copied from es-cl
-$text['label-image']['fr-ca'] = "image"; //copied from fr-fr
-$text['label-image']['fr-fr'] = "image";
+$text['label-image']['fr-ca'] = "Image"; //copied from fr-fr
+$text['label-image']['fr-fr'] = "Image";
 $text['label-image']['he-il'] = "תמונה";
 $text['label-image']['it-it'] = "Immagine";
 $text['label-image']['nl-nl'] = "";
@@ -597,8 +597,8 @@ $text['label-side']['de-ch'] = "";
 $text['label-side']['de-de'] = "";
 $text['label-side']['es-cl'] = "";
 $text['label-side']['es-mx'] = "";
-$text['label-side']['fr-ca'] = "";
-$text['label-side']['fr-fr'] = "";
+$text['label-side']['fr-ca'] = "Côté";
+$text['label-side']['fr-fr'] = "Côté";
 $text['label-side']['he-il'] = "";
 $text['label-side']['it-it'] = "";
 $text['label-side']['nl-nl'] = "";
@@ -639,8 +639,8 @@ $text['label-center']['de-ch'] = "Mitte"; //copied from de-de
 $text['label-center']['de-de'] = "Mitte";
 $text['label-center']['es-cl'] = "Centrar";
 $text['label-center']['es-mx'] = "Centrar"; //copied from es-cl
-$text['label-center']['fr-ca'] = "centre"; //copied from fr-fr
-$text['label-center']['fr-fr'] = "centre";
+$text['label-center']['fr-ca'] = "Centre"; //copied from fr-fr
+$text['label-center']['fr-fr'] = "Centre";
 $text['label-center']['he-il'] = "מֶרְכָּז";
 $text['label-center']['it-it'] = "Centro";
 $text['label-center']['nl-nl'] = "";
@@ -723,8 +723,8 @@ $text['label-hours']['de-ch'] = "";
 $text['label-hours']['de-de'] = "";
 $text['label-hours']['es-cl'] = "";
 $text['label-hours']['es-mx'] = "";
-$text['label-hours']['fr-ca'] = "";
-$text['label-hours']['fr-fr'] = "";
+$text['label-hours']['fr-ca'] = "Heure(s)";
+$text['label-hours']['fr-fr'] = "Heure(s)";
 $text['label-hours']['he-il'] = "";
 $text['label-hours']['it-it'] = "";
 $text['label-hours']['nl-nl'] = "";
@@ -744,8 +744,8 @@ $text['label-days']['de-ch'] = "";
 $text['label-days']['de-de'] = "";
 $text['label-days']['es-cl'] = "";
 $text['label-days']['es-mx'] = "";
-$text['label-days']['fr-ca'] = "";
-$text['label-days']['fr-fr'] = "";
+$text['label-days']['fr-ca'] = "Jour(s)";
+$text['label-days']['fr-fr'] = "Jour(s)";
 $text['label-days']['he-il'] = "";
 $text['label-days']['it-it'] = "";
 $text['label-days']['nl-nl'] = "";
@@ -765,8 +765,8 @@ $text['label-messages']['de-ch'] = "";
 $text['label-messages']['de-de'] = "";
 $text['label-messages']['es-cl'] = "";
 $text['label-messages']['es-mx'] = "";
-$text['label-messages']['fr-ca'] = "";
-$text['label-messages']['fr-fr'] = "";
+$text['label-messages']['fr-ca'] = "Message(s)";
+$text['label-messages']['fr-fr'] = "Message(s)";
 $text['label-messages']['he-il'] = "";
 $text['label-messages']['it-it'] = "";
 $text['label-messages']['nl-nl'] = "";
@@ -786,8 +786,8 @@ $text['label-image_text']['de-ch'] = "";
 $text['label-image_text']['de-de'] = "";
 $text['label-image_text']['es-cl'] = "";
 $text['label-image_text']['es-mx'] = "";
-$text['label-image_text']['fr-ca'] = "";
-$text['label-image_text']['fr-fr'] = "";
+$text['label-image_text']['fr-ca'] = "Image et Texte";
+$text['label-image_text']['fr-fr'] = "Image et Texte";
 $text['label-image_text']['he-il'] = "";
 $text['label-image_text']['it-it'] = "";
 $text['label-image_text']['nl-nl'] = "";
@@ -843,8 +843,8 @@ $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']['fr-ca'] = "Dynamique";
+$text['label-dynamic']['fr-fr'] = "Dynamique";
 $text['label-dynamic']['he-il'] = "Dynamic";
 $text['label-dynamic']['it-it'] = "Dynamic";
 $text['label-dynamic']['nl-nl'] = "Dynamic";
@@ -861,8 +861,8 @@ $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']['fr-ca'] = "Singulier";
+$text['label-single']['fr-fr'] = "Singulier";
 $text['label-single']['he-il'] = "Single";
 $text['label-single']['it-it'] = "Single";
 $text['label-single']['nl-nl'] = "Single";
@@ -981,8 +981,8 @@ $text['description-enabled']['de-ch'] = "Setzen Sie den Status dieser Standardei
 $text['description-enabled']['de-de'] = "Setzen Sie den Status dieser Standardeinstellung.";
 $text['description-enabled']['es-cl'] = "Ingrese el estado de esta configuración.";
 $text['description-enabled']['es-mx'] = "Ingrese el estado de esta configuración."; //copied from es-cl
-$text['description-enabled']['fr-ca'] = "Choisir l'état de ce paraètre"; //copied from fr-fr
-$text['description-enabled']['fr-fr'] = "Choisir l'état de ce paraètre";
+$text['description-enabled']['fr-ca'] = "Choisir l'état de ce paramètre"; //copied from fr-fr
+$text['description-enabled']['fr-fr'] = "Choisir l'état de ce paramètre";
 $text['description-enabled']['he-il'] = "";
 $text['description-enabled']['it-it'] = "Seleziona lo stato per questo parametro.";
 $text['description-enabled']['nl-nl'] = "";
diff --git a/core/default_settings/default_setting_edit.php b/core/default_settings/default_setting_edit.php
index 10fd715652..a598383536 100644
--- a/core/default_settings/default_setting_edit.php
+++ b/core/default_settings/default_setting_edit.php
@@ -480,7 +480,7 @@
 	elseif ($subcategory == 'password' || substr_count($subcategory, '_password') > 0 || $category == "login" && $subcategory == "password_reset_key" && $name == "text") {
 		echo "	<input class='formfld' type='password' id='default_setting_value' name='default_setting_value' onmouseover=\"this.type='text';\" onfocus=\"this.type='text';\" onmouseout=\"if (!$(this).is(':focus')) { this.type='password'; }\" onblur=\"this.type='password';\" maxlength='255' value=\"".escape($default_setting_value)."\">\n";
 	}
-	elseif ($category == "theme" && substr_count($subcategory, "_color") > 0 && ($name == "text" || $name == 'array')) {
+	elseif (substr_count($subcategory, "_color") > 0 && ($name == "text" || $name == 'array')) {
 		echo "	<input type='text' class='formfld colorpicker' id='default_setting_value' name='default_setting_value' value=\"".escape($default_setting_value)."\">\n";
 	}
 	elseif ($category == "theme" && substr_count($subcategory, "_font") > 0 && $name == "text") {
@@ -634,6 +634,12 @@
 		echo "    	<option value='fixed' ".($default_setting_value == "fixed" ? "selected='selected'" : null).">".$text['option-fixed']."</option>\n";
 		echo "    </select>\n";
 	}
+	elseif ($category == "theme" && $subcategory == "menu_side_item_main_sub_close" && $name == "text" ) {
+		echo "    <select class='formfld' id='default_setting_value' name='default_setting_value'>\n";
+		echo "    	<option value='automatic'>".$text['option-automatic']."</option>\n";
+		echo "    	<option value='manual' ".($default_setting_value == "manual" ? "selected='selected'" : null).">".$text['option-manual']."</option>\n";
+		echo "    </select>\n";
+	}
 	elseif ($category == "theme" && $subcategory == "body_header_brand_type" && $name == "text" ) {
 		echo "    <select class='formfld' id='default_setting_value' name='default_setting_value'>\n";
 		echo "    	<option value='image' ".(($default_setting_value == "image") ? "selected='selected'" : null).">".$text['label-image']."</option>\n";
diff --git a/core/default_settings/default_settings.php b/core/default_settings/default_settings.php
index 30b9c36d36..025a459385 100644
--- a/core/default_settings/default_settings.php
+++ b/core/default_settings/default_settings.php
@@ -260,7 +260,7 @@
 	}
 	if (permission_exists('default_setting_add') && $default_settings) {
 		if (permission_exists("domain_select") && permission_exists("domain_setting_add") && count($_SESSION['domains']) > 1) {
-			echo button::create(['type'=>'button','label'=>$text['button-copy'],'id'=>'btn_copy','icon'=>$_SESSION['theme']['button_icon_copy'],'id'=>'btn_copy','onclick'=>'show_domains();']);
+			echo button::create(['type'=>'button','label'=>$text['button-copy'],'id'=>'btn_copy','name'=>'btn_copy','style'=>'display: none;','icon'=>$_SESSION['theme']['button_icon_copy'],'id'=>'btn_copy','onclick'=>'show_domains();']);
 			echo button::create(['type'=>'button','label'=>$text['button-cancel'],'id'=>'btn_copy_cancel','icon'=>$_SESSION['theme']['button_icon_cancel'],'style'=>'display: none;','onclick'=>'hide_domains();']);
 			echo 		"<select name='domain_uuid' class='formfld' style='display: none; width: auto;' id='target_domain_uuid' onchange=\"document.getElementById('domain_uuid').value = this.options[this.selectedIndex].value;\">\n";
 			echo "			<option value=''>".$text['label-domain']."...</option>\n";
@@ -272,10 +272,10 @@
 		}
 	}
 	if (permission_exists('default_setting_edit') && $default_settings) {
-		echo button::create(['type'=>'button','label'=>$text['button-toggle'],'icon'=>$_SESSION['theme']['button_icon_toggle'],'name'=>'btn_toggle','onclick'=>"modal_open('modal-toggle','btn_toggle');"]);
+		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('default_setting_delete') && $default_settings) {
-		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 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 (is_array($categories) && @sizeof($categories) != 0) {
@@ -290,9 +290,9 @@
 		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 != '' ? '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 		"<input type='text' class='txt list-search' name='search' id='search' style='margin-left: 0 !important;' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown=''>";
+	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search']);
+	//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";
 	}
@@ -373,7 +373,7 @@
 				echo "<tr class='list-header'>\n";
 				if (permission_exists('default_setting_add') || permission_exists('default_setting_edit') || permission_exists('default_setting_delete')) {
 					echo "	<th class='checkbox'>\n";
-					echo "		<input type='checkbox' id='checkbox_all_".$default_setting_category."' name='checkbox_all' onclick=\"list_all_toggle('".$default_setting_category."');\">\n";
+					echo "		<input type='checkbox' id='checkbox_all_".$default_setting_category."' name='checkbox_all' onclick=\"list_all_toggle('".$default_setting_category."'); checkbox_on_change(this);\">\n";
 					echo "	</th>\n";
 				}
 				if ($_GET['show'] == 'all' && permission_exists('default_setting_all')) {
@@ -395,7 +395,7 @@
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('default_setting_add') || permission_exists('default_setting_edit') || permission_exists('default_setting_delete')) {
 				echo "	<td class='checkbox'>\n";
-				echo "		<input type='checkbox' name='default_settings[$x][checked]' id='checkbox_".$x."' class='checkbox_".$default_setting_category."' value='true' onclick=\"if (!this.checked) { document.getElementById('checkbox_all_".$default_setting_category."').checked = false; }\">\n";
+				echo "		<input type='checkbox' name='default_settings[$x][checked]' id='checkbox_".$x."' class='checkbox_".$default_setting_category."' value='true' onclick=\"checkbox_on_change(this); if (!this.checked) { document.getElementById('checkbox_all_".$default_setting_category."').checked = false; }\">\n";
 				echo "		<input type='hidden' name='default_settings[$x][uuid]' value='".escape($row['default_setting_uuid'])."' />\n";
 				echo "	</td>\n";
 			}
@@ -465,7 +465,10 @@
 			else if ($category == 'theme' && $subcategory == 'menu_side_toggle_body_width' && $name == 'text') {
 				echo "		".$text['option-'.$row['default_setting_value']]."\n";
 			}
-			else if ($category == "theme" && substr_count($subcategory, "_color") > 0 && ($name == "text" || $name == 'array')) {
+			else if ($category == 'theme' && $subcategory == 'menu_side_item_main_sub_close' && $name == 'text') {
+				echo "		".$text['option-'.$row['default_setting_value']]."\n";
+			}
+			else if (substr_count($subcategory, "_color") > 0 && ($name == "text" || $name == 'array')) {
 				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";
 			}
diff --git a/core/domain_settings/app_languages.php b/core/domain_settings/app_languages.php
index 669af0762a..82a128e4ac 100644
--- a/core/domain_settings/app_languages.php
+++ b/core/domain_settings/app_languages.php
@@ -135,8 +135,8 @@ $text['header_description-domain_settings']['de-ch'] = "Settings for this domain
 $text['header_description-domain_settings']['de-de'] = "Settings for this domain override those defined in Default Settings.";
 $text['header_description-domain_settings']['es-cl'] = "Settings for this domain override those defined in Default Settings.";
 $text['header_description-domain_settings']['es-mx'] = "Settings for this domain override those defined in Default Settings.";
-$text['header_description-domain_settings']['fr-ca'] = "Settings for this domain override those defined in Default Settings.";
-$text['header_description-domain_settings']['fr-fr'] = "Settings for this domain override those defined in Default Settings.";
+$text['header_description-domain_settings']['fr-ca'] = "Les paramètres de ce domaine remplacent ceux définis dans les paramètres par défaut";
+$text['header_description-domain_settings']['fr-fr'] = "Les paramètres de ce domaine remplacent ceux définis dans les paramètres par défaut";
 $text['header_description-domain_settings']['he-il'] = "Settings for this domain override those defined in Default Settings.";
 $text['header_description-domain_settings']['it-it'] = "Settings for this domain override those defined in Default Settings.";
 $text['header_description-domain_settings']['nl-nl'] = "Settings for this domain override those defined in Default Settings.";
@@ -198,8 +198,8 @@ $text['label-top']['de-ch'] = "Oben"; //copied from de-de
 $text['label-top']['de-de'] = "Oben";
 $text['label-top']['es-cl'] = "encima";
 $text['label-top']['es-mx'] = "encima"; //copied from es-cl
-$text['label-top']['fr-ca'] = "Meilleur"; //copied from fr-fr
-$text['label-top']['fr-fr'] = "Meilleur";
+$text['label-top']['fr-ca'] = "Haut";
+$text['label-top']['fr-fr'] = "Haut";
 $text['label-top']['he-il'] = "עליון";
 $text['label-top']['it-it'] = "Alto";
 $text['label-top']['nl-nl'] = "";
@@ -303,8 +303,8 @@ $text['label-reference']['de-ch'] = "Referenz"; //copied from de-de
 $text['label-reference']['de-de'] = "Referenz";
 $text['label-reference']['es-cl'] = "Referencia";
 $text['label-reference']['es-mx'] = "Referencia"; //copied from es-cl
-$text['label-reference']['fr-ca'] = "Référence"; //copied from fr-fr
-$text['label-reference']['fr-fr'] = "Référence";
+$text['label-reference']['fr-ca'] = "Voir"; //copied from fr-fr
+$text['label-reference']['fr-fr'] = "Voir";
 $text['label-reference']['he-il'] = "התייחסות";
 $text['label-reference']['it-it'] = "Mostra";
 $text['label-reference']['nl-nl'] = "";
@@ -450,8 +450,8 @@ $text['label-image']['de-ch'] = "Bild"; //copied from de-de
 $text['label-image']['de-de'] = "Bild";
 $text['label-image']['es-cl'] = "Imagen";
 $text['label-image']['es-mx'] = "Imagen"; //copied from es-cl
-$text['label-image']['fr-ca'] = "image"; //copied from fr-fr
-$text['label-image']['fr-fr'] = "image";
+$text['label-image']['fr-ca'] = "Image"; //copied from fr-fr
+$text['label-image']['fr-fr'] = "Image";
 $text['label-image']['he-il'] = "תמונה";
 $text['label-image']['it-it'] = "Immagine";
 $text['label-image']['nl-nl'] = "";
@@ -471,7 +471,7 @@ $text['label-fixed']['de-ch'] = "Fest"; //copied from de-de
 $text['label-fixed']['de-de'] = "Fest";
 $text['label-fixed']['es-cl'] = "Fijo";
 $text['label-fixed']['es-mx'] = "Fijo"; //copied from es-cl
-$text['label-fixed']['fr-ca'] = "Fixé"; //copied from fr-fr
+$text['label-fixed']['fr-ca'] = "Fixe";
 $text['label-fixed']['fr-fr'] = "Fixé";
 $text['label-fixed']['he-il'] = "קָבוּעַ";
 $text['label-fixed']['it-it'] = "Sistemato";
@@ -492,8 +492,8 @@ $text['label-side']['de-ch'] = "Side";
 $text['label-side']['de-de'] = "Side";
 $text['label-side']['es-cl'] = "Side";
 $text['label-side']['es-mx'] = "Side";
-$text['label-side']['fr-ca'] = "Side";
-$text['label-side']['fr-fr'] = "Side";
+$text['label-side']['fr-ca'] = "Côté";
+$text['label-side']['fr-fr'] = "Côté";
 $text['label-side']['he-il'] = "Side";
 $text['label-side']['it-it'] = "Side";
 $text['label-side']['nl-nl'] = "Side";
@@ -534,8 +534,8 @@ $text['label-center']['de-ch'] = "Mitte"; //copied from de-de
 $text['label-center']['de-de'] = "Mitte";
 $text['label-center']['es-cl'] = "Centrar";
 $text['label-center']['es-mx'] = "Centrar"; //copied from es-cl
-$text['label-center']['fr-ca'] = "centre"; //copied from fr-fr
-$text['label-center']['fr-fr'] = "centre";
+$text['label-center']['fr-ca'] = "Centre"; //copied from fr-fr
+$text['label-center']['fr-fr'] = "Centre";
 $text['label-center']['he-il'] = "מֶרְכָּז";
 $text['label-center']['it-it'] = "Centro";
 $text['label-center']['nl-nl'] = "";
@@ -618,8 +618,8 @@ $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']['fr-ca'] = "Dynamique";
+$text['label-dynamic']['fr-fr'] = "Dynamique";
 $text['label-dynamic']['he-il'] = "Dynamic";
 $text['label-dynamic']['it-it'] = "Dynamic";
 $text['label-dynamic']['nl-nl'] = "Dynamic";
@@ -636,7 +636,7 @@ $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-ca'] = "Singulier";
 $text['label-single']['fr-fr'] = "Single";
 $text['label-single']['he-il'] = "Single";
 $text['label-single']['it-it'] = "Single";
@@ -882,7 +882,7 @@ $text['description-domain_setting-edit']['de-ch'] = "Eine Einstellung für diese
 $text['description-domain_setting-edit']['de-de'] = "Eine Einstellung für diese Domain ändern.";
 $text['description-domain_setting-edit']['es-cl'] = "Edita una configuración para este dominio.";
 $text['description-domain_setting-edit']['es-mx'] = "Edita una configuración para este dominio."; //copied from es-cl
-$text['description-domain_setting-edit']['fr-ca'] = "Editer un paramètre du domaine."; //copied from fr-fr
+$text['description-domain_setting-edit']['fr-ca'] = "Modifier un paramètre du domaine.";
 $text['description-domain_setting-edit']['fr-fr'] = "Editer un paramètre du domaine.";
 $text['description-domain_setting-edit']['he-il'] = "";
 $text['description-domain_setting-edit']['it-it'] = "Modifica un parametro per questo dominio.";
@@ -903,8 +903,8 @@ $text['description-domain_setting-add']['de-ch'] = "Eine Einstellung für diese
 $text['description-domain_setting-add']['de-de'] = "Eine Einstellung für diese Domain hinzufügen.";
 $text['description-domain_setting-add']['es-cl'] = "Agregar una configuración para este dominio.";
 $text['description-domain_setting-add']['es-mx'] = "Agregar una configuración para este dominio."; //copied from es-cl
-$text['description-domain_setting-add']['fr-ca'] = "";
-$text['description-domain_setting-add']['fr-fr'] = "";
+$text['description-domain_setting-add']['fr-ca'] = "Ajouter un paramètre pour ce domaine";
+$text['description-domain_setting-add']['fr-fr'] = "Ajouter un paramètre pour ce domaine";
 $text['description-domain_setting-add']['he-il'] = "";
 $text['description-domain_setting-add']['it-it'] = "Inserisci un parametro per questo dominio.";
 $text['description-domain_setting-add']['nl-nl'] = "";
@@ -945,8 +945,8 @@ $text['description-domain-edit']['de-ch'] = "Die Details dieser Domain ändern."
 $text['description-domain-edit']['de-de'] = "Die Details dieser Domain ändern.";
 $text['description-domain-edit']['es-cl'] = "Editar detalles de este dominio.";
 $text['description-domain-edit']['es-mx'] = "Editar detalles de este dominio."; //copied from es-cl
-$text['description-domain-edit']['fr-ca'] = "Editer les détaisl de ce domaine. "; //copied from fr-fr
-$text['description-domain-edit']['fr-fr'] = "Editer les détaisl de ce domaine. ";
+$text['description-domain-edit']['fr-ca'] = "Modifier les détails de ce domaine. "; //copied from fr-fr
+$text['description-domain-edit']['fr-fr'] = "Editer les détails de ce domaine. ";
 $text['description-domain-edit']['he-il'] = "";
 $text['description-domain-edit']['it-it'] = "Modifica i dettagli per questo dominio.";
 $text['description-domain-edit']['nl-nl'] = "";
diff --git a/core/domain_settings/domain_setting_edit.php b/core/domain_settings/domain_setting_edit.php
index 5fd1e5dbc3..e45973eeea 100644
--- a/core/domain_settings/domain_setting_edit.php
+++ b/core/domain_settings/domain_setting_edit.php
@@ -687,6 +687,12 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 		echo "    	<option value='fixed' ".($row['domain_setting_value'] == "fixed" ? "selected='selected'" : null).">".$text['option-fixed']."</option>\n";
 		echo "    </select>\n";
 	}
+	elseif ($category == "theme" && $subcategory == "menu_side_item_main_sub_close" && $name == "text" ) {
+		echo "    <select class='formfld' id='domain_setting_value' name='domain_setting_value'>\n";
+		echo "    	<option value='automatic'>".$text['option-automatic']."</option>\n";
+		echo "    	<option value='manual' ".($domain_setting_value == "manual" ? "selected='selected'" : null).">".$text['option-manual']."</option>\n";
+		echo "    </select>\n";
+	}
 	elseif ($category == "theme" && $subcategory == "body_header_brand_type" && $name == "text" ) {
 		echo "    <select class='formfld' id='domain_setting_value' name='domain_setting_value'>\n";
 		echo "    	<option value='image' ".(($row['domain_setting_value'] == "image") ? "selected='selected'" : null).">".$text['label-image']."</option>\n";
diff --git a/core/domain_settings/domain_settings.php b/core/domain_settings/domain_settings.php
index b7689f35da..1f805a8658 100644
--- a/core/domain_settings/domain_settings.php
+++ b/core/domain_settings/domain_settings.php
@@ -329,6 +329,9 @@
 			else if ($category == 'theme' && $subcategory == 'menu_side_toggle_body_width' && $name == 'text') {
 				echo "		".$text['option-'.$row['domain_setting_value']]."\n";
 			}
+			else if ($category == 'theme' && $subcategory == 'menu_side_item_main_sub_close' && $name == 'text') {
+				echo "		".$text['option-'.$row['domain_setting_value']]."\n";
+			}
 			else if ($category == "theme" && substr_count($subcategory, "_color") > 0 && ($name == "text" || $name == 'array')) {
 				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";
diff --git a/core/domains/app_config.php b/core/domains/app_config.php
index 07f5c27e72..b8c1f3eeff 100644
--- a/core/domains/app_config.php
+++ b/core/domains/app_config.php
@@ -51,6 +51,16 @@
 		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 		$y++;
 
+	//default settings
+		$y=0;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "0bc44a93-b87c-414f-8584-f890dd06d28c";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "domain";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "country_code";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$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'] = "";
+
 	//schema details
 		$y=0;
 		$apps[$x]['db'][$y]['table']['name'] = "v_domains";
diff --git a/core/domains/app_languages.php b/core/domains/app_languages.php
index 0091c7bb0f..8072186847 100644
--- a/core/domains/app_languages.php
+++ b/core/domains/app_languages.php
@@ -183,8 +183,8 @@ $text['option-button_icons_auto']['de-ch'] = "Automatic";
 $text['option-button_icons_auto']['de-de'] = "Automatic";
 $text['option-button_icons_auto']['es-cl'] = "Automatic";
 $text['option-button_icons_auto']['es-mx'] = "Automatic";
-$text['option-button_icons_auto']['fr-ca'] = "Automatic";
-$text['option-button_icons_auto']['fr-fr'] = "Automatic";
+$text['option-button_icons_auto']['fr-ca'] = "Automatique";
+$text['option-button_icons_auto']['fr-fr'] = "Automatique";
 $text['option-button_icons_auto']['he-il'] = "Automatic";
 $text['option-button_icons_auto']['it-it'] = "Automatic";
 $text['option-button_icons_auto']['nl-nl'] = "Automatic";
@@ -204,8 +204,8 @@ $text['option-button_icons_only']['de-ch'] = "Only";
 $text['option-button_icons_only']['de-de'] = "Only";
 $text['option-button_icons_only']['es-cl'] = "Only";
 $text['option-button_icons_only']['es-mx'] = "Only";
-$text['option-button_icons_only']['fr-ca'] = "Only";
-$text['option-button_icons_only']['fr-fr'] = "Only";
+$text['option-button_icons_only']['fr-ca'] = "Seulement";
+$text['option-button_icons_only']['fr-fr'] = "Seulement";
 $text['option-button_icons_only']['he-il'] = "Only";
 $text['option-button_icons_only']['it-it'] = "Only";
 $text['option-button_icons_only']['nl-nl'] = "Only";
@@ -225,8 +225,8 @@ $text['option-button_icons_always']['de-ch'] = "Always";
 $text['option-button_icons_always']['de-de'] = "Always";
 $text['option-button_icons_always']['es-cl'] = "Always";
 $text['option-button_icons_always']['es-mx'] = "Always";
-$text['option-button_icons_always']['fr-ca'] = "Always";
-$text['option-button_icons_always']['fr-fr'] = "Always";
+$text['option-button_icons_always']['fr-ca'] = "Toujours";
+$text['option-button_icons_always']['fr-fr'] = "Toujours";
 $text['option-button_icons_always']['he-il'] = "Always";
 $text['option-button_icons_always']['it-it'] = "Always";
 $text['option-button_icons_always']['nl-nl'] = "Always";
@@ -246,8 +246,8 @@ $text['option-button_icons_never']['de-ch'] = "Never";
 $text['option-button_icons_never']['de-de'] = "Never";
 $text['option-button_icons_never']['es-cl'] = "Never";
 $text['option-button_icons_never']['es-mx'] = "Never";
-$text['option-button_icons_never']['fr-ca'] = "Never";
-$text['option-button_icons_never']['fr-fr'] = "Never";
+$text['option-button_icons_never']['fr-ca'] = "Jamais";
+$text['option-button_icons_never']['fr-fr'] = "Jamais";
 $text['option-button_icons_never']['he-il'] = "Never";
 $text['option-button_icons_never']['it-it'] = "Never";
 $text['option-button_icons_never']['nl-nl'] = "Never";
@@ -288,8 +288,8 @@ $text['message-domain_exists']['de-ch'] = "Domain Already Exists";
 $text['message-domain_exists']['de-de'] = "Domain Already Exists";
 $text['message-domain_exists']['es-cl'] = "Domain Already Exists";
 $text['message-domain_exists']['es-mx'] = "Domain Already Exists";
-$text['message-domain_exists']['fr-ca'] = "Domain Already Exists";
-$text['message-domain_exists']['fr-fr'] = "Domain Already Exists";
+$text['message-domain_exists']['fr-ca'] = "Domaine existe déja";
+$text['message-domain_exists']['fr-fr'] = "Domaine existe déja";
 $text['message-domain_exists']['he-il'] = "Domain Already Exists";
 $text['message-domain_exists']['it-it'] = "Domain Already Exists";
 $text['message-domain_exists']['nl-nl'] = "Domain Already Exists";
@@ -330,8 +330,8 @@ $text['label-top']['de-ch'] = "Oben"; //copied from de-de
 $text['label-top']['de-de'] = "Oben";
 $text['label-top']['es-cl'] = "encima";
 $text['label-top']['es-mx'] = "encima"; //copied from es-cl
-$text['label-top']['fr-ca'] = "Meilleur"; //copied from fr-fr
-$text['label-top']['fr-fr'] = "Meilleur";
+$text['label-top']['fr-ca'] = "Haut"; //copied from fr-fr
+$text['label-top']['fr-fr'] = "Haut";
 $text['label-top']['he-il'] = "עליון";
 $text['label-top']['it-it'] = "Alto";
 $text['label-top']['nl-nl'] = "";
@@ -435,7 +435,7 @@ $text['label-reference']['de-ch'] = "Referenz"; //copied from de-de
 $text['label-reference']['de-de'] = "Referenz";
 $text['label-reference']['es-cl'] = "Referencia";
 $text['label-reference']['es-mx'] = "Referencia"; //copied from es-cl
-$text['label-reference']['fr-ca'] = "Référence"; //copied from fr-fr
+$text['label-reference']['fr-ca'] = "Voir";
 $text['label-reference']['fr-fr'] = "Référence";
 $text['label-reference']['he-il'] = "התייחסות";
 $text['label-reference']['it-it'] = "Mostra";
@@ -624,8 +624,8 @@ $text['label-side']['de-ch'] = "Side";
 $text['label-side']['de-de'] = "Side";
 $text['label-side']['es-cl'] = "Side";
 $text['label-side']['es-mx'] = "Side";
-$text['label-side']['fr-ca'] = "Side";
-$text['label-side']['fr-fr'] = "Side";
+$text['label-side']['fr-ca'] = "Côté";
+$text['label-side']['fr-fr'] = "Côté";
 $text['label-side']['he-il'] = "Side";
 $text['label-side']['it-it'] = "Side";
 $text['label-side']['nl-nl'] = "Side";
@@ -750,7 +750,7 @@ $text['label-default_settings']['de-ch'] = "Standardeinstellungen"; //copied fro
 $text['label-default_settings']['de-de'] = "Standardeinstellungen";
 $text['label-default_settings']['es-cl'] = "Condiciones Predeterminadas";
 $text['label-default_settings']['es-mx'] = "Condiciones Predeterminadas"; //copied from es-cl
-$text['label-default_settings']['fr-ca'] = "Configurations par Défaut"; //copied from fr-fr
+$text['label-default_settings']['fr-ca'] = "Paramètres par défaut";
 $text['label-default_settings']['fr-fr'] = "Configurations par Défaut";
 $text['label-default_settings']['he-il'] = "";
 $text['label-default_settings']['it-it'] = "Parametri di Default";
@@ -1044,8 +1044,8 @@ $text['description-domain_setting-add']['de-ch'] = "Eine Einstellung für diese
 $text['description-domain_setting-add']['de-de'] = "Eine Einstellung für diese Domain hinzufügen.";
 $text['description-domain_setting-add']['es-cl'] = "Agregar una configuración para este dominio.";
 $text['description-domain_setting-add']['es-mx'] = "Agregar una configuración para este dominio."; //copied from es-cl
-$text['description-domain_setting-add']['fr-ca'] = "";
-$text['description-domain_setting-add']['fr-fr'] = "";
+$text['description-domain_setting-add']['fr-ca'] = "Ajouter un paramètre pour ce domaine";
+$text['description-domain_setting-add']['fr-fr'] = "Ajouter un paramètre pour ce domaine";
 $text['description-domain_setting-add']['he-il'] = "";
 $text['description-domain_setting-add']['it-it'] = "Inserisci un parametro per questo dominio.";
 $text['description-domain_setting-add']['nl-nl'] = "";
diff --git a/core/domains/domain_edit.php b/core/domains/domain_edit.php
index 459f4e39ec..55c4032af1 100644
--- a/core/domains/domain_edit.php
+++ b/core/domains/domain_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-2022
  the Initial Developer. All Rights Reserved.
 
  Contributor(s):
@@ -513,6 +513,10 @@
 					}
 				}
 
+			//clear the cache
+				$cache = new cache;
+				$response = $cache->flush();
+
 			//clear the domains session array to update it
 				unset($_SESSION["domains"]);
 				unset($_SESSION['domain']);
diff --git a/core/domains/domains.php b/core/domains/domains.php
index 6d20f1fcf8..88d4b35071 100644
--- a/core/domains/domains.php
+++ b/core/domains/domains.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) 2018 - 2020
+	Portions created by the Initial Developer are Copyright (C) 2018 - 2022
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -191,15 +191,15 @@
 		echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add'],'id'=>'btn_add','link'=>'domain_edit.php']);
 	}
 	if (permission_exists('domain_edit') && $domains) {
-		echo button::create(['type'=>'button','label'=>$text['button-toggle'],'icon'=>$_SESSION['theme']['button_icon_toggle'],'name'=>'btn_toggle','onclick'=>"modal_open('modal-toggle','btn_toggle');"]);
+		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('domain_delete') && $domains) {
- 		echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'name'=>'btn_delete_domain','onclick'=>"modal_open('modal-delete','btn_delete_domain');"]);
+ 		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_domain');"]);
  	}
 	echo 		"<form id='form_search' class='inline' method='get'>\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 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'=>'domains.php','style'=>($search == '' ? 'display: none;' : null)]);
+	echo 		"<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown=''>";
+	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search']);
+	//echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'domains.php','style'=>($search == '' ? 'display: none;' : null)]);
 	if ($paging_controls_mini != '') {
 		echo 	"<span style='margin-left: 15px;'>".$paging_controls_mini."</span>\n";
 	}
@@ -212,7 +212,7 @@
 		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('domain_delete') && $domains) {
-		echo modal::create(['id'=>'modal-delete','type'=>'delete','actions'=>button::create(['type'=>'button','label'=>$text['button-continue'],'icon'=>'check','id'=>'btn_delete_domain','style'=>'float: right; margin-left: 15px;','collapse'=>'never','onclick'=>"modal_close(); list_action_set('delete'); list_form_submit('form_list');"])]);
+		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['description-domains']."\n";
@@ -226,7 +226,7 @@
 	echo "<tr class='list-header'>\n";
 	if (permission_exists('domain_edit') || permission_exists('domain_delete')) {
 		echo "	<th class='checkbox'>\n";
-		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle();' ".($domains ?: "style='visibility: hidden;'").">\n";
+		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle(); checkbox_on_change(this);' ".($domains ?: "style='visibility: hidden;'").">\n";
 		echo "	</th>\n";
 	}
 	if ($_GET['show'] == 'all' && permission_exists('domain_all')) {
@@ -250,7 +250,7 @@
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('domain_edit') || permission_exists('domain_delete')) {
 				echo "	<td class='checkbox'>\n";
-				echo "		<input type='checkbox' name='domains[$x][checked]' id='checkbox_".$x."' value='true' onclick=\"if (!this.checked) { document.getElementById('checkbox_all').checked = false; }\">\n";
+				echo "		<input type='checkbox' name='domains[$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='domains[$x][uuid]' value='".escape($row['domain_uuid'])."' />\n";
 				echo "	</td>\n";
 			}
diff --git a/core/groups/app_defaults.php b/core/groups/app_defaults.php
index 00ae1727ea..0569277e27 100644
--- a/core/groups/app_defaults.php
+++ b/core/groups/app_defaults.php
@@ -93,7 +93,7 @@ if ($domains_processed == 1) {
 			$database = new database;
 			$database->app_name = 'groups';
 			$database->app_uuid = '2caf27b0-540a-43d5-bb9b-c9871a1e4f84';
-			$database->save($array);
+			$database->save($array, false);
 			unset($array);
 		}
 
diff --git a/core/groups/app_languages.php b/core/groups/app_languages.php
index f984c6967c..59bf1d0e7e 100644
--- a/core/groups/app_languages.php
+++ b/core/groups/app_languages.php
@@ -51,12 +51,12 @@ $text['description-groups']['de-ch'] = '';
 $text['description-groups']['de-de'] = '';
 $text['description-groups']['es-cl'] = '';
 $text['description-groups']['es-mx'] = '';
-$text['description-groups']['fr-ca'] = '';
-$text['description-groups']['fr-fr'] = '';
+$text['description-groups']['fr-ca'] = "Les groupes sont une organisation logique d'utilisateurs. Les groupes se voient attribuer des autorisations. Les utilisateurs héritent des autorisations du ou des groupes auxquels ils sont affectés. Les groupes par défaut sont globaux et utilisés dans tous les domaines. Un groupe pertinent pour un domaine peut être créé et affecté à un seul domaine.";
+$text['description-groups']['fr-fr'] = "Les groupes sont une organisation logique d'utilisateurs. Les groupes se voient attribuer des autorisations. Les utilisateurs héritent des autorisations du ou des groupes auxquels ils sont affectés. Les groupes par défaut sont globaux et utilisés dans tous les domaines. Un groupe pertinent pour un domaine peut être créé et affecté à un seul domaine.";
 $text['description-groups']['he-il'] = '';
 $text['description-groups']['it-it'] = '';
 $text['description-groups']['nl-nl'] = '';
-$text['description-groups']['pl-pl'] = '';
+$text['description-groups']['pl-pl'] = 'Grupy to logiczna organizacja użytkowników. Grupom przypisuje się uprawnienia. Użytkownicy dziedziczą uprawnienia z grupy lub grup, do których są przypisani. Grupy domyślne są globalne i używane we wszystkich domenach. Grupa związana z jedną domeną może zostać utworzona i przypisana do pojedyńczej domeny.';
 $text['description-groups']['pt-br'] = '';
 $text['description-groups']['pt-pt'] = '';
 $text['description-groups']['ro-ro'] = '';
@@ -72,7 +72,7 @@ $text['title-user_setting-edit']['de-ch'] = "Benutzereinstellungen"; //copied fr
 $text['title-user_setting-edit']['de-de'] = "Benutzereinstellungen";
 $text['title-user_setting-edit']['es-cl'] = "Configuración de Usuario";
 $text['title-user_setting-edit']['es-mx'] = "Configuración de Usuario"; //copied from es-cl
-$text['title-user_setting-edit']['fr-ca'] = "Cadre de l'utilisateur"; //copied from fr-fr
+$text['title-user_setting-edit']['fr-ca'] = "Paramètre d'utilisateur";
 $text['title-user_setting-edit']['fr-fr'] = "Cadre de l'utilisateur";
 $text['title-user_setting-edit']['he-il'] = "";
 $text['title-user_setting-edit']['it-it'] = "Impostazione utente";
@@ -93,7 +93,7 @@ $text['title-user_setting-add']['de-ch'] = "Benutzereinstellungen hinzufügen";
 $text['title-user_setting-add']['de-de'] = "Benutzereinstellungen hinzufügen";
 $text['title-user_setting-add']['es-cl'] = "Ajuste del usuario Agregar";
 $text['title-user_setting-add']['es-mx'] = "Ajuste del usuario Agregar"; //copied from es-cl
-$text['title-user_setting-add']['fr-ca'] = "Cadre utilisateur Ajouter"; //copied from fr-fr
+$text['title-user_setting-add']['fr-ca'] = "Ajouter Paramètre d'utilisateur"; //copied from fr-fr
 $text['title-user_setting-add']['fr-fr'] = "Cadre utilisateur Ajouter";
 $text['title-user_setting-add']['he-il'] = "";
 $text['title-user_setting-add']['it-it'] = "Aggiungi Impostazione Utente";
@@ -114,7 +114,7 @@ $text['title-user_manager']['de-ch'] = "Benutzerverwaltung"; //copied from de-de
 $text['title-user_manager']['de-de'] = "Benutzerverwaltung";
 $text['title-user_manager']['es-cl'] = "Administración de Usuarios";
 $text['title-user_manager']['es-mx'] = "Administración de Usuarios"; //copied from es-cl
-$text['title-user_manager']['fr-ca'] = "Gestion des utilisateurs"; //copied from fr-fr
+$text['title-user_manager']['fr-ca'] = "Gestion d'utilisateurs";
 $text['title-user_manager']['fr-fr'] = "Gestion des utilisateurs";
 $text['title-user_manager']['he-il'] = "מנהל משתמש";
 $text['title-user_manager']['it-it'] = "Gestione Utenti";
@@ -135,8 +135,8 @@ $text['title-user_edit']['de-ch'] = "Benutzer"; //copied from de-de
 $text['title-user_edit']['de-de'] = "Benutzer";
 $text['title-user_edit']['es-cl'] = "Editar Usuario";
 $text['title-user_edit']['es-mx'] = "Editar Usuario"; //copied from es-cl
-$text['title-user_edit']['fr-ca'] = "Modifier l'utilisateur"; //copied from fr-fr
-$text['title-user_edit']['fr-fr'] = "Modifier l'utilisateur";
+$text['title-user_edit']['fr-ca'] = "Modifier Utilisateur";
+$text['title-user_edit']['fr-fr'] = "Modifier Utilisateur";
 $text['title-user_edit']['he-il'] = "משתמש";
 $text['title-user_edit']['it-it'] = "Utente";
 $text['title-user_edit']['nl-nl'] = "";
@@ -618,12 +618,12 @@ $text['message-copy']['de-ch'] = "Kopieren erfolgreich"; //copied from de-de
 $text['message-copy']['de-de'] = "Kopieren erfolgreich";
 $text['message-copy']['es-cl'] = "Copia Completada";
 $text['message-copy']['es-mx'] = "Copia Completada"; //copied from es-cl
-$text['message-copy']['fr-ca'] = "Copie effectuée"; //copied from fr-fr
+$text['message-copy']['fr-ca'] = "Copie complétée";
 $text['message-copy']['fr-fr'] = "Copie effectuée";
 $text['message-copy']['he-il'] = "העתקה הושלמה";
 $text['message-copy']['it-it'] = "Copia Completata";
 $text['message-copy']['nl-nl'] = "";
-$text['message-copy']['pl-pl'] = "Skopiowano poprawnie";
+$text['message-copy']['pl-pl'] = "Skopiowano pomyślnie";
 $text['message-copy']['pt-br'] = "Cópia concluída"; //copied from pt-pt
 $text['message-copy']['pt-pt'] = "Cópia Efectuada";
 $text['message-copy']['ro-ro'] = "Copiere completă";
@@ -723,7 +723,7 @@ $text['label-user_info']['de-ch'] = "Benutzerinformation"; //copied from de-de
 $text['label-user_info']['de-de'] = "Benutzerinformation";
 $text['label-user_info']['es-cl'] = "Información de Usuario";
 $text['label-user_info']['es-mx'] = "Información de Usuario"; //copied from es-cl
-$text['label-user_info']['fr-ca'] = "Informations sur l'utilisateur"; //copied from fr-fr
+$text['label-user_info']['fr-ca'] = "Info sur l'utilisateur";
 $text['label-user_info']['fr-fr'] = "Informations sur l'utilisateur";
 $text['label-user_info']['he-il'] = "פרטי משתמש";
 $text['label-user_info']['it-it'] = "Informazioni Utente";
@@ -744,8 +744,8 @@ $text['label-uppercase_letters']['de-ch'] = "Großbuchstaben"; //copied from de-
 $text['label-uppercase_letters']['de-de'] = "Großbuchstaben";
 $text['label-uppercase_letters']['es-cl'] = "Letras mayúsculas";
 $text['label-uppercase_letters']['es-mx'] = "Letras mayúsculas"; //copied from es-cl
-$text['label-uppercase_letters']['fr-ca'] = "Lettres capitales"; //copied from fr-fr
-$text['label-uppercase_letters']['fr-fr'] = "Lettres capitales";
+$text['label-uppercase_letters']['fr-ca'] = "Lettres Majuscules";
+$text['label-uppercase_letters']['fr-fr'] = "Lettres Majuscules";
 $text['label-uppercase_letters']['he-il'] = "אותיות רישיות";
 $text['label-uppercase_letters']['it-it'] = "Lettere Maiuscole";
 $text['label-uppercase_letters']['nl-nl'] = "";
@@ -765,8 +765,8 @@ $text['label-top']['de-ch'] = "Oben"; //copied from de-de
 $text['label-top']['de-de'] = "Oben";
 $text['label-top']['es-cl'] = "encima";
 $text['label-top']['es-mx'] = "encima"; //copied from es-cl
-$text['label-top']['fr-ca'] = "Meilleur"; //copied from fr-fr
-$text['label-top']['fr-fr'] = "Meilleur";
+$text['label-top']['fr-ca'] = "Haut";
+$text['label-top']['fr-fr'] = "Haut";
 $text['label-top']['he-il'] = "עליון";
 $text['label-top']['it-it'] = "Inizio";
 $text['label-top']['nl-nl'] = "";
@@ -1017,7 +1017,7 @@ $text['label-numbers']['de-ch'] = "Nummern"; //copied from de-de
 $text['label-numbers']['de-de'] = "Nummern";
 $text['label-numbers']['es-cl'] = "Números";
 $text['label-numbers']['es-mx'] = "Números"; //copied from es-cl
-$text['label-numbers']['fr-ca'] = "Nombres"; //copied from fr-fr
+$text['label-numbers']['fr-ca'] = "Nombres";
 $text['label-numbers']['fr-fr'] = "Nombres";
 $text['label-numbers']['he-il'] = "מספרים";
 $text['label-numbers']['it-it'] = "Numeri";
@@ -1080,7 +1080,7 @@ $text['label-left']['de-ch'] = "Links"; //copied from de-de
 $text['label-left']['de-de'] = "Links";
 $text['label-left']['es-cl'] = "Izquierda";
 $text['label-left']['es-mx'] = "Izquierda"; //copied from es-cl
-$text['label-left']['fr-ca'] = "À gauche"; //copied from fr-fr
+$text['label-left']['fr-ca'] = "Gauche";
 $text['label-left']['fr-fr'] = "À gauche";
 $text['label-left']['he-il'] = "שְׁמֹאל";
 $text['label-left']['it-it'] = "Sinistra";
@@ -1290,12 +1290,12 @@ $text['label-group_level']['de-ch'] = '';
 $text['label-group_level']['de-de'] = '';
 $text['label-group_level']['es-cl'] = '';
 $text['label-group_level']['es-mx'] = '';
-$text['label-group_level']['fr-ca'] = '';
-$text['label-group_level']['fr-fr'] = '';
+$text['label-group_level']['fr-ca'] = 'Niveau';
+$text['label-group_level']['fr-fr'] = 'Niveau';
 $text['label-group_level']['he-il'] = '';
 $text['label-group_level']['it-it'] = '';
 $text['label-group_level']['nl-nl'] = '';
-$text['label-group_level']['pl-pl'] = '';
+$text['label-group_level']['pl-pl'] = 'Poziom';
 $text['label-group_level']['pt-br'] = '';
 $text['label-group_level']['pt-pt'] = '';
 $text['label-group_level']['ro-ro'] = '';
@@ -1311,8 +1311,8 @@ $text['description-group_level']['de-ch'] = '';
 $text['description-group_level']['de-de'] = '';
 $text['description-group_level']['es-cl'] = '';
 $text['description-group_level']['es-mx'] = '';
-$text['description-group_level']['fr-ca'] = '';
-$text['description-group_level']['fr-fr'] = '';
+$text['description-group_level']['fr-ca'] = "Sélectionner l'orde du Groupe";
+$text['description-group_level']['fr-fr'] = "Sélectionner l'orde du Groupe";
 $text['description-group_level']['he-il'] = '';
 $text['description-group_level']['it-it'] = '';
 $text['description-group_level']['nl-nl'] = '';
@@ -1353,8 +1353,8 @@ $text['label-group']['de-ch'] = "Gruppe"; //copied from de-de
 $text['label-group']['de-de'] = "Gruppe";
 $text['label-group']['es-cl'] = "Grupo";
 $text['label-group']['es-mx'] = "Grupo"; //copied from es-cl
-$text['label-group']['fr-ca'] = "Group"; //copied from fr-fr
-$text['label-group']['fr-fr'] = "Group";
+$text['label-group']['fr-ca'] = "Groupe";
+$text['label-group']['fr-fr'] = "Groupe";
 $text['label-group']['he-il'] = "קבוצה";
 $text['label-group']['it-it'] = "Gruppo";
 $text['label-group']['nl-nl'] = "";
@@ -1689,8 +1689,8 @@ $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']['fr-ca'] = "Attribué";
+$text['label-assigned']['fr-fr'] = "Attribué";
 $text['label-assigned']['he-il'] = "Assigned";
 $text['label-assigned']['it-it'] = "Assigned";
 $text['label-assigned']['nl-nl'] = "Assigned";
@@ -1710,8 +1710,8 @@ $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']['fr-ca'] = "Non attribué";
+$text['label-unassigned']['fr-fr'] = "Non attribué";
 $text['label-unassigned']['he-il'] = "Unassigned";
 $text['label-unassigned']['it-it'] = "Unassigned";
 $text['label-unassigned']['nl-nl'] = "Unassigned";
@@ -1731,7 +1731,7 @@ $text['header-user_setting-edit']['de-ch'] = "Benutzereinstellung"; //copied fro
 $text['header-user_setting-edit']['de-de'] = "Benutzereinstellung";
 $text['header-user_setting-edit']['es-cl'] = "Configuración de Usuario";
 $text['header-user_setting-edit']['es-mx'] = "Configuración de Usuario"; //copied from es-cl
-$text['header-user_setting-edit']['fr-ca'] = "Cadre de l'utilisateur"; //copied from fr-fr
+$text['header-user_setting-edit']['fr-ca'] = "Paramètre d'utilisateur";
 $text['header-user_setting-edit']['fr-fr'] = "Cadre de l'utilisateur";
 $text['header-user_setting-edit']['he-il'] = "";
 $text['header-user_setting-edit']['it-it'] = "Impostazione Utente";
@@ -1752,7 +1752,7 @@ $text['header-user_setting-add']['de-ch'] = "Benutzereinstellung hinzufügen"; /
 $text['header-user_setting-add']['de-de'] = "Benutzereinstellung hinzufügen";
 $text['header-user_setting-add']['es-cl'] = "Ajuste del usuario Agregar";
 $text['header-user_setting-add']['es-mx'] = "Ajuste del usuario Agregar"; //copied from es-cl
-$text['header-user_setting-add']['fr-ca'] = "Cadre utilisateur Ajouter"; //copied from fr-fr
+$text['header-user_setting-add']['fr-ca'] = "Ajouter paramètre d'utilisateur"; //copied from fr-fr
 $text['header-user_setting-add']['fr-fr'] = "Cadre utilisateur Ajouter";
 $text['header-user_setting-add']['he-il'] = "";
 $text['header-user_setting-add']['it-it'] = "Aggiungi Impostazione Utente";
@@ -1773,7 +1773,7 @@ $text['header-user_manager']['de-ch'] = "Benutzerverwaltung"; //copied from de-d
 $text['header-user_manager']['de-de'] = "Benutzerverwaltung";
 $text['header-user_manager']['es-cl'] = "Administración de Usuario";
 $text['header-user_manager']['es-mx'] = "Administración de Usuario"; //copied from es-cl
-$text['header-user_manager']['fr-ca'] = "Gestion des utilisateurs"; //copied from fr-fr
+$text['header-user_manager']['fr-ca'] = "Gestion d'Utilisateurs"; //copied from fr-fr
 $text['header-user_manager']['fr-fr'] = "Gestion des utilisateurs";
 $text['header-user_manager']['he-il'] = "מנהל משתמש";
 $text['header-user_manager']['it-it'] = "Utenti";
@@ -1862,7 +1862,7 @@ $text['header-group_manager']['fr-fr'] = "Gestion de Groupe";
 $text['header-group_manager']['he-il'] = "מנהל קבוצה";
 $text['header-group_manager']['it-it'] = "Gestione Gruppo";
 $text['header-group_manager']['nl-nl'] = "";
-$text['header-group_manager']['pl-pl'] = "Menadżer  grup";
+$text['header-group_manager']['pl-pl'] = "Menadżer grup";
 $text['header-group_manager']['pt-br'] = "Gerenciador de Grupos"; //copied from pt-pt
 $text['header-group_manager']['pt-pt'] = "Gestão de Grupos";
 $text['header-group_manager']['ro-ro'] = "";
@@ -1941,8 +1941,8 @@ $text['description-user_setting-add']['de-ch'] = "Eine Einstellung für diesen B
 $text['description-user_setting-add']['de-de'] = "Eine Einstellung für diesen Benutzer hinzufügen.";
 $text['description-user_setting-add']['es-cl'] = "Añadir un entorno para este usuario.";
 $text['description-user_setting-add']['es-mx'] = "Añadir un entorno para este usuario."; //copied from es-cl
-$text['description-user_setting-add']['fr-ca'] = "Ajouter un cadre pour cet utilisateur."; //copied from fr-fr
-$text['description-user_setting-add']['fr-fr'] = "Ajouter un cadre pour cet utilisateur.";
+$text['description-user_setting-add']['fr-ca'] = "Ajouter un paramètre pour cet utilisateur.";
+$text['description-user_setting-add']['fr-fr'] = "Ajouter un paramètre pour cet utilisateur.";
 $text['description-user_setting-add']['he-il'] = "";
 $text['description-user_setting-add']['it-it'] = "Aggiungi una impostazione per questo utente.";
 $text['description-user_setting-add']['nl-nl'] = "";
@@ -2424,8 +2424,8 @@ $text['message-permissions_reloaded']['de-ch'] = "Permissions Reloaded";
 $text['message-permissions_reloaded']['de-de'] = "Permissions Reloaded";
 $text['message-permissions_reloaded']['es-cl'] = "Permissions Reloaded";
 $text['message-permissions_reloaded']['es-mx'] = "Permissions Reloaded";
-$text['message-permissions_reloaded']['fr-ca'] = "Permissions Reloaded";
-$text['message-permissions_reloaded']['fr-fr'] = "Permissions Reloaded";
+$text['message-permissions_reloaded']['fr-ca'] = "Permissions Rechargé";
+$text['message-permissions_reloaded']['fr-fr'] = "Permissions Rechargé";
 $text['message-permissions_reloaded']['he-il'] = "Permissions Reloaded";
 $text['message-permissions_reloaded']['it-it'] = "Permissions Reloaded";
 $text['message-permissions_reloaded']['nl-nl'] = "Permissions Reloaded";
@@ -2437,4 +2437,4 @@ $text['message-permissions_reloaded']['ru-ru'] = "Permissions Reloaded";
 $text['message-permissions_reloaded']['sv-se'] = "Permissions Reloaded";
 $text['message-permissions_reloaded']['uk-ua'] = "Permissions Reloaded";
 
-?>
\ No newline at end of file
+?>
diff --git a/core/groups/groups.php b/core/groups/groups.php
index ef95ed8770..d84530a5e9 100644
--- a/core/groups/groups.php
+++ b/core/groups/groups.php
@@ -143,13 +143,13 @@
 		echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add'],'id'=>'btn_add','link'=>'group_edit.php']);
 	}
 	if (permission_exists('group_add') && $groups) {
-		echo button::create(['type'=>'button','label'=>$text['button-copy'],'icon'=>$_SESSION['theme']['button_icon_copy'],'name'=>'btn_copy','onclick'=>"modal_open('modal-copy','btn_copy');"]);
+		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('group_edit') && $groups) {
-		echo button::create(['type'=>'button','label'=>$text['button-toggle'],'icon'=>$_SESSION['theme']['button_icon_toggle'],'name'=>'btn_toggle','onclick'=>"modal_open('modal-toggle','btn_toggle');"]);
+		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('group_delete') && $groups) {
-		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 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('group_all')) {
@@ -160,9 +160,9 @@
 			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'=>'groups.php','style'=>($search == '' ? 'display: none;' : null)]);
+	echo 		"<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown=''>";
+	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search']);
+	//echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'groups.php','style'=>($search == '' ? 'display: none;' : null)]);
 	if ($paging_controls_mini != '') {
 		echo 	"<span style='margin-left: 15px;'>".$paging_controls_mini."</span>\n";
 	}
@@ -192,7 +192,7 @@
 	echo "<tr class='list-header'>\n";
 	if (permission_exists('group_add') || permission_exists('group_edit') || permission_exists('group_delete')) {
 		echo "	<th class='checkbox'>\n";
-		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle();' ".($groups ?: "style='visibility: hidden;'").">\n";
+		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle(); checkbox_on_change(this);' ".($groups ?: "style='visibility: hidden;'").">\n";
 		echo "	</th>\n";
 	}
 	if ($_GET['show'] == 'all' && permission_exists('group_all')) {
@@ -217,7 +217,7 @@
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('group_add') || permission_exists('group_edit') || permission_exists('group_delete')) {
 				echo "	<td class='checkbox'>\n";
-				echo "		<input type='checkbox' name='groups[$x][checked]' id='checkbox_".$x."' value='true' onclick=\"if (!this.checked) { document.getElementById('checkbox_all').checked = false; }\">\n";
+				echo "		<input type='checkbox' name='groups[$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='groups[$x][uuid]' value='".escape($row['group_uuid'])."' />\n";
 				echo "	</td>\n";
 			}
diff --git a/core/install/app_languages.php b/core/install/app_languages.php
index caad8a9ce4..76b46386a1 100644
--- a/core/install/app_languages.php
+++ b/core/install/app_languages.php
@@ -30,8 +30,8 @@ $text['title-detected_configuration']['de-ch'] = "Erkannte Konfiguration"; //cop
 $text['title-detected_configuration']['de-de'] = "Erkannte Konfiguration";
 $text['title-detected_configuration']['es-cl'] = "Configuración detectado";
 $text['title-detected_configuration']['es-mx'] = "Configuración detectado"; //copied from es-cl
-$text['title-detected_configuration']['fr-ca'] = "Detected Configuration"; //copied from fr-fr
-$text['title-detected_configuration']['fr-fr'] = "Detected Configuration";
+$text['title-detected_configuration']['fr-ca'] = "Configuration Détectée"; //copied from fr-fr
+$text['title-detected_configuration']['fr-fr'] = "Configuration Détectée";
 $text['title-detected_configuration']['he-il'] = "";
 $text['title-detected_configuration']['it-it'] = "Rilevata Configurazione";
 $text['title-detected_configuration']['nl-nl'] = "";
@@ -303,8 +303,8 @@ $text['label-driver']['de-ch'] = "Treiber"; //copied from de-de
 $text['label-driver']['de-de'] = "Treiber";
 $text['label-driver']['es-cl'] = "Controlador";
 $text['label-driver']['es-mx'] = "Controlador"; //copied from es-cl
-$text['label-driver']['fr-ca'] = "Driver"; //copied from fr-fr
-$text['label-driver']['fr-fr'] = "Driver";
+$text['label-driver']['fr-ca'] = "Pilote";
+$text['label-driver']['fr-fr'] = "Pilote";
 $text['label-driver']['he-il'] = "";
 $text['label-driver']['it-it'] = "Driver";
 $text['label-driver']['nl-nl'] = "";
@@ -366,8 +366,8 @@ $text['header-event_socket']['de-ch'] = "Event-Socket Konfigurieren"; //copied f
 $text['header-event_socket']['de-de'] = "Event-Socket Konfigurieren";
 $text['header-event_socket']['es-cl'] = "Configuración del zócalo evento";
 $text['header-event_socket']['es-mx'] = "Configuración del zócalo evento"; //copied from es-cl
-$text['header-event_socket']['fr-ca'] = "Event Configuration Socket"; //copied from fr-fr
-$text['header-event_socket']['fr-fr'] = "Event Configuration Socket";
+$text['header-event_socket']['fr-ca'] = "Configuration du socket d'événement"; //copied from fr-fr
+$text['header-event_socket']['fr-fr'] = "Configuration du socket d'événement";
 $text['header-event_socket']['he-il'] = "";
 $text['header-event_socket']['it-it'] = "Configurazione degli eventi Socket";
 $text['header-event_socket']['nl-nl'] = "";
@@ -681,8 +681,8 @@ $text['description-install']['de-ch'] = "Wählen Sie eine Aktion."; //copied fro
 $text['description-install']['de-de'] = "Wählen Sie eine Aktion.";
 $text['description-install']['es-cl'] = "Seleccione las accion a continuación que desea realizar.";
 $text['description-install']['es-mx'] = "Seleccione las accion a continuación que desea realizar."; //copied from es-cl
-$text['description-install']['fr-ca'] = "Sélectionnez les action ci-dessous que vous souhaitez effectuer."; //copied from fr-fr
-$text['description-install']['fr-fr'] = "Sélectionnez les action ci-dessous que vous souhaitez effectuer.";
+$text['description-install']['fr-ca'] = "Sélectionnez l'action ci-dessous que vous souhaitez effectuer."; //copied from fr-fr
+$text['description-install']['fr-fr'] = "Sélectionnez l'action ci-dessous que vous souhaitez effectuer.";
 $text['description-install']['he-il'] = "";
 $text['description-install']['it-it'] = "Seleziona l'azione che si vuole eseguire.";
 $text['description-install']['nl-nl'] = "";
@@ -723,8 +723,8 @@ $text['description-database-add']['de-ch'] = "Datenbank Verbindungsinformation."
 $text['description-database-add']['de-de'] = "Datenbank Verbindungsinformation.";
 $text['description-database-add']['es-cl'] = "Información de conexión a base de datos.";
 $text['description-database-add']['es-mx'] = "Información de conexión a base de datos."; //copied from es-cl
-$text['description-database-add']['fr-ca'] = "Informations de connexion à la Base."; //copied from fr-fr
-$text['description-database-add']['fr-fr'] = "Informations de connexion à la Base.";
+$text['description-database-add']['fr-ca'] = "Informations de connexion à la Base de donnée."; //copied from fr-fr
+$text['description-database-add']['fr-fr'] = "Informations de connexion à la Base de donnée.";
 $text['description-database-add']['he-il'] = "";
 $text['description-database-add']['it-it'] = "Informazioni di connessione al Database.";
 $text['description-database-add']['nl-nl'] = "";
diff --git a/core/menu/app_languages.php b/core/menu/app_languages.php
index d7a9e33c83..6c9f7706f5 100644
--- a/core/menu/app_languages.php
+++ b/core/menu/app_languages.php
@@ -203,7 +203,7 @@ $text['message-update']['fr-fr'] = "Mis à jour";
 $text['message-update']['he-il'] = "";
 $text['message-update']['it-it'] = "Aggiornamento Completato";
 $text['message-update']['nl-nl'] = "";
-$text['message-update']['pl-pl'] = "Zaktualizowano poprawnie";
+$text['message-update']['pl-pl'] = "Zaktualizowano pomyślnie";
 $text['message-update']['pt-br'] = "Atualização Concluída";
 $text['message-update']['pt-pt'] = "Actualização Efectuada";
 $text['message-update']['ro-ro'] = "";
@@ -791,7 +791,7 @@ $text['description-groups']['fr-fr'] = "";
 $text['description-groups']['he-il'] = "";
 $text['description-groups']['it-it'] = "Descrizione";
 $text['description-groups']['nl-nl'] = "";
-$text['description-groups']['pl-pl'] = "Kontaky przypisane do grupy, są widoczne tylko dla użytkowników w grupie. Kontakty nie przypisane do grupy będą widoczna dla wszystkich użytkowników w domenie.";
+$text['description-groups']['pl-pl'] = "Opis";
 $text['description-groups']['pt-br'] = "Descrição"; //copied from pt-pt
 $text['description-groups']['pt-pt'] = "Descrição";
 $text['description-groups']['ro-ro'] = "";
@@ -833,7 +833,7 @@ $text['description-category']['fr-fr'] = "";
 $text['description-category']['he-il'] = "";
 $text['description-category']['it-it'] = "Descrizione";
 $text['description-category']['nl-nl'] = "";
-$text['description-category']['pl-pl'] = "Wprowadź kategorię";
+$text['description-category']['pl-pl'] = "Opis";
 $text['description-category']['pt-br'] = "Descrição"; //copied from pt-pt
 $text['description-category']['pt-pt'] = "Descrição";
 $text['description-category']['ro-ro'] = "";
diff --git a/core/menu/app_menu.php b/core/menu/app_menu.php
index 333336b7a3..2627ffdc26 100644
--- a/core/menu/app_menu.php
+++ b/core/menu/app_menu.php
@@ -8,7 +8,7 @@
 	$apps[$x]['menu'][$y]['title']['el-gr'] = "Διαχειριστής Μενού";
 	$apps[$x]['menu'][$y]['title']['es-cl'] = "Gestor de Menú";
 	$apps[$x]['menu'][$y]['title']['es-mx'] = "";
-	$apps[$x]['menu'][$y]['title']['fr-ca'] = "";
+	$apps[$x]['menu'][$y]['title']['fr-ca'] = "Gestion des Menus";
 	$apps[$x]['menu'][$y]['title']['fr-fr'] = "Gestion des Menus";
 	$apps[$x]['menu'][$y]['title']['he-il'] = "";
 	$apps[$x]['menu'][$y]['title']['it-it'] = "Gestione dei Menu";
@@ -34,12 +34,12 @@
 	$apps[$x]['menu'][$y]['title']['el-gr'] = "Αρχική";
 	$apps[$x]['menu'][$y]['title']['es-cl'] = "Casa";
 	$apps[$x]['menu'][$y]['title']['es-mx'] = "";
-	$apps[$x]['menu'][$y]['title']['fr-ca'] = "";
+	$apps[$x]['menu'][$y]['title']['fr-ca'] = "Acceuil";
 	$apps[$x]['menu'][$y]['title']['fr-fr'] = "Maison";
 	$apps[$x]['menu'][$y]['title']['he-il'] = "";
 	$apps[$x]['menu'][$y]['title']['it-it'] = "Home";
 	$apps[$x]['menu'][$y]['title']['nl-nl'] = "";
-	$apps[$x]['menu'][$y]['title']['pl-pl'] = "Dom";
+	$apps[$x]['menu'][$y]['title']['pl-pl'] = "Główne";
 	$apps[$x]['menu'][$y]['title']['pt-br'] = "Principal";
 	$apps[$x]['menu'][$y]['title']['pt-pt'] = "Casa";
 	$apps[$x]['menu'][$y]['title']['ro-ro'] = "";
@@ -65,7 +65,7 @@
 	$apps[$x]['menu'][$y]['title']['el-gr'] = "Λογαριασμοί";
 	$apps[$x]['menu'][$y]['title']['es-cl'] = "Cuentas";
 	$apps[$x]['menu'][$y]['title']['es-mx'] = "";
-	$apps[$x]['menu'][$y]['title']['fr-ca'] = "";
+	$apps[$x]['menu'][$y]['title']['fr-ca'] = "Comptes";
 	$apps[$x]['menu'][$y]['title']['fr-fr'] = "Comptes";
 	$apps[$x]['menu'][$y]['title']['he-il'] = "";
 	$apps[$x]['menu'][$y]['title']['it-it'] = "Credenziali";
@@ -93,7 +93,7 @@
 	$apps[$x]['menu'][$y]['title']['de-de'] = "Applikationen";
 	$apps[$x]['menu'][$y]['title']['es-cl'] = "Aplicaciones";
 	$apps[$x]['menu'][$y]['title']['es-mx'] = "";
-	$apps[$x]['menu'][$y]['title']['fr-ca'] = "";
+	$apps[$x]['menu'][$y]['title']['fr-ca'] = "Applications";
 	$apps[$x]['menu'][$y]['title']['fr-fr'] = "Apps";
 	$apps[$x]['menu'][$y]['title']['he-il'] = "";
 	$apps[$x]['menu'][$y]['title']['it-it'] = "";
@@ -124,7 +124,7 @@
 	$apps[$x]['menu'][$y]['title']['el-gr'] = "Κατάσταση";
 	$apps[$x]['menu'][$y]['title']['es-cl'] = "Estado";
 	$apps[$x]['menu'][$y]['title']['es-mx'] = "";
-	$apps[$x]['menu'][$y]['title']['fr-ca'] = "";
+	$apps[$x]['menu'][$y]['title']['fr-ca'] = "Etat";
 	$apps[$x]['menu'][$y]['title']['fr-fr'] = "Etat";
 	$apps[$x]['menu'][$y]['title']['he-il'] = "";
 	$apps[$x]['menu'][$y]['title']['it-it'] = "Stato";
@@ -153,12 +153,12 @@
 	$apps[$x]['menu'][$y]['title']['el-gr'] = "Για προχωρημένους";
 	$apps[$x]['menu'][$y]['title']['es-cl'] = "Avanzado";
 	$apps[$x]['menu'][$y]['title']['es-mx'] = "";
-	$apps[$x]['menu'][$y]['title']['fr-ca'] = "";
+	$apps[$x]['menu'][$y]['title']['fr-ca'] = "Avancé";
 	$apps[$x]['menu'][$y]['title']['fr-fr'] = "Avancé";
 	$apps[$x]['menu'][$y]['title']['he-il'] = "";
 	$apps[$x]['menu'][$y]['title']['it-it'] = "Avanzato";
 	$apps[$x]['menu'][$y]['title']['nl-nl'] = "";
-	$apps[$x]['menu'][$y]['title']['pl-pl'] = "Zaawansowany";
+	$apps[$x]['menu'][$y]['title']['pl-pl'] = "Zaawansowane";
 	$apps[$x]['menu'][$y]['title']['pt-br'] = "Avançado";
 	$apps[$x]['menu'][$y]['title']['pt-pt'] = "Avançado";
 	$apps[$x]['menu'][$y]['title']['ro-ro'] = "";
@@ -181,7 +181,7 @@
 	$apps[$x]['menu'][$y]['title']['el-gr'] = "Είσοδος";
 	$apps[$x]['menu'][$y]['title']['es-cl'] = "Ingresar";
 	$apps[$x]['menu'][$y]['title']['es-mx'] = "";
-	$apps[$x]['menu'][$y]['title']['fr-ca'] = "";
+	$apps[$x]['menu'][$y]['title']['fr-ca'] = "Connexion";
 	$apps[$x]['menu'][$y]['title']['fr-fr'] = "Connexion";
 	$apps[$x]['menu'][$y]['title']['he-il'] = "";
 	$apps[$x]['menu'][$y]['title']['it-it'] = "Login";
@@ -209,7 +209,7 @@
 	$apps[$x]['menu'][$y]['title']['el-gr'] = 'Έξοδος';
 	$apps[$x]['menu'][$y]['title']['es-cl'] = "";
 	$apps[$x]['menu'][$y]['title']['es-mx'] = 'Salir';
-	$apps[$x]['menu'][$y]['title']['fr-ca'] = "";
+	$apps[$x]['menu'][$y]['title']['fr-ca'] = "Déconnexion";
 	$apps[$x]['menu'][$y]['title']['fr-fr'] = 'Déconnexion';
 	$apps[$x]['menu'][$y]['title']['he-il'] = "";
 	$apps[$x]['menu'][$y]['title']['it-it'] = "Logout";
diff --git a/core/menu/menu.php b/core/menu/menu.php
index d943710d2b..6db98a91be 100644
--- a/core/menu/menu.php
+++ b/core/menu/menu.php
@@ -111,12 +111,12 @@
 		echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add'],'id'=>'btn_add','link'=>'menu_edit.php']);
 	}
 	if (permission_exists('menu_delete') && $menus) {
-		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 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";
-	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'=>'menu.php','style'=>($search == '' ? 'display: none;' : null)]);
+	echo 		"<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown=''>";
+	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search']);
+	//echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'menu.php','style'=>($search == '' ? 'display: none;' : null)]);
 	if ($paging_controls_mini != '') {
 		echo 	"<span style='margin-left: 15px;'>".$paging_controls_mini."</span>\n";
 	}
@@ -140,7 +140,7 @@
 	echo "<tr class='list-header'>\n";
 	if (permission_exists('menu_add') || permission_exists('menu_edit') || permission_exists('menu_delete')) {
 		echo "	<th class='checkbox'>\n";
-		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle();' ".($menus ?: "style='visibility: hidden;'").">\n";
+		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle(); checkbox_on_change(this);' ".($menus ?: "style='visibility: hidden;'").">\n";
 		echo "	</th>\n";
 	}
 	echo th_order_by('menu_name', $text['label-menu_name'], $order_by, $order);
@@ -160,7 +160,7 @@
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('menu_add') || permission_exists('menu_edit') || permission_exists('menu_delete')) {
 				echo "	<td class='checkbox'>\n";
-				echo "		<input type='checkbox' name='menus[$x][checked]' id='checkbox_".$x."' value='true' onclick=\"if (!this.checked) { document.getElementById('checkbox_all').checked = false; }\">\n";
+				echo "		<input type='checkbox' name='menus[$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='menus[$x][uuid]' value='".escape($row['menu_uuid'])."' />\n";
 				echo "	</td>\n";
 			}
diff --git a/core/notifications/app_defaults.php b/core/notifications/app_defaults.php
index e94092ae4b..ce54510cc5 100644
--- a/core/notifications/app_defaults.php
+++ b/core/notifications/app_defaults.php
@@ -43,7 +43,7 @@ if ($domains_processed == 1) {
 				$database = new database;
 				$database->app_name = 'notifications';
 				$database->app_uuid = 'e746fbcb-f67f-4e0e-ab64-c414c01fac11';
-				$database->save($array);
+				$database->save($array, false);
 				unset($array);
 			//revoke temporary permissions
 				$p->delete('notification_add', 'temp');
@@ -53,4 +53,4 @@ if ($domains_processed == 1) {
 
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/core/notifications/app_languages.php b/core/notifications/app_languages.php
index 43eb1701b3..ad6adfc166 100644
--- a/core/notifications/app_languages.php
+++ b/core/notifications/app_languages.php
@@ -32,8 +32,8 @@ $text['option-enabled']['de-de'] = "Aktiviert";
 $text['option-enabled']['el-gr'] = "Ενεργοποιημένο";
 $text['option-enabled']['es-cl'] = "Activado";
 $text['option-enabled']['es-mx'] = "Activado"; //copied from es-cl
-$text['option-enabled']['fr-ca'] = "Activ?"; //copied from fr-fr
-$text['option-enabled']['fr-fr'] = "Activ?";
+$text['option-enabled']['fr-ca'] = "Activé"; //copied from fr-fr
+$text['option-enabled']['fr-fr'] = "Activé";
 $text['option-enabled']['he-il'] = "";
 $text['option-enabled']['it-it'] = "Abilitato";
 $text['option-enabled']['nl-nl'] = "";
@@ -54,8 +54,8 @@ $text['option-email']['de-de'] = "E-mail";
 $text['option-email']['el-gr'] = "E-mail";
 $text['option-email']['es-cl'] = "Email";
 $text['option-email']['es-mx'] = "Email"; //copied from es-cl
-$text['option-email']['fr-ca'] = "Email"; //copied from fr-fr
-$text['option-email']['fr-fr'] = "Email";
+$text['option-email']['fr-ca'] = "Courriel"; //copied from fr-fr
+$text['option-email']['fr-fr'] = "Courriel";
 $text['option-email']['he-il'] = "";
 $text['option-email']['it-it'] = "Email";
 $text['option-email']['nl-nl'] = "";
@@ -76,8 +76,8 @@ $text['option-disabled']['de-de'] = "Deaktiviert";
 $text['option-disabled']['el-gr'] = "Απενεργοποιημένο";
 $text['option-disabled']['es-cl'] = "Discapacitado";
 $text['option-disabled']['es-mx'] = "Discapacitado"; //copied from es-cl
-$text['option-disabled']['fr-ca'] = "Handicap閟"; //copied from fr-fr
-$text['option-disabled']['fr-fr'] = "Handicap閟";
+$text['option-disabled']['fr-ca'] = "Désactivé"; //copied from fr-fr
+$text['option-disabled']['fr-fr'] = "Désactivé";
 $text['option-disabled']['he-il'] = "";
 $text['option-disabled']['it-it'] = "Disabilitato";
 $text['option-disabled']['nl-nl'] = "";
@@ -98,8 +98,8 @@ $text['message-no_channels']['de-de'] = "Keine Kanäle aktiviert";
 $text['message-no_channels']['el-gr'] = "Δεν έχουν ενεργοποιηθεί κανάλια";
 $text['message-no_channels']['es-cl'] = "No hay canales habilitados";
 $text['message-no_channels']['es-mx'] = "No hay canales habilitados"; //copied from es-cl
-$text['message-no_channels']['fr-ca'] = "Pas de canaux activ閟"; //copied from fr-fr
-$text['message-no_channels']['fr-fr'] = "Pas de canaux activ閟";
+$text['message-no_channels']['fr-ca'] = "Aucun canaux activé"; //copied from fr-fr
+$text['message-no_channels']['fr-fr'] = "Aucun canaux activé";
 $text['message-no_channels']['he-il'] = "";
 $text['message-no_channels']['it-it'] = "Nessun Canale Abilitato";
 $text['message-no_channels']['nl-nl'] = "";
@@ -120,8 +120,8 @@ $text['message-invalid_recipient']['de-de'] = "Ungültiger Empfänger";
 $text['message-invalid_recipient']['el-gr'] = "Λανθασμένη επιλογή παραλήπτη γνωστοποιήσεων";
 $text['message-invalid_recipient']['es-cl'] = "Inv醠ido destinatario de la notificaci髇";
 $text['message-invalid_recipient']['es-mx'] = "Inv醠ido destinatario de la notificaci髇"; //copied from es-cl
-$text['message-invalid_recipient']['fr-ca'] = "Notification invalide b閚閒iciaire"; //copied from fr-fr
-$text['message-invalid_recipient']['fr-fr'] = "Notification invalide b閚閒iciaire";
+$text['message-invalid_recipient']['fr-ca'] = "Destinataire de la notification non valide"; //copied from fr-fr
+$text['message-invalid_recipient']['fr-fr'] = "Destinataire de la notification non valide";
 $text['message-invalid_recipient']['he-il'] = "";
 $text['message-invalid_recipient']['it-it'] = "Ricettore Notifiche non Valido";
 $text['message-invalid_recipient']['nl-nl'] = "";
@@ -142,8 +142,8 @@ $text['message-disclaimer']['de-de'] = "Bemerkung: Durch das Aktivieren der Proj
 $text['message-disclaimer']['el-gr'] = "<u>Παρατήρηση</u>: Με την ενεργοποίηση των γνωστοποιήσεων αποδέχεστε τη συλλογή <i>ανώνυμων</i> και <i>γενικών</i> δημογραφικών στοιχείων σχετικά με το περιβάλλον εγκατάστασης σας. Οι πληροφορίες περιέχουν τα παρακάτω: 1) Έκδοση FusionPBX , 2) Έκδοση PHP, 3) Έκδοση Web Server, 4) Έκδοση Voice Switch, 5) Τύπος και έκδοση Βάσης Δεδομένων, 6) Λειτουργικό σύστημα 7) Διεύθυνση IP. Εάν δεν επιθυμείτε να μοιράζεστε αυτές τις πληροφορίες, απλά μην ενεργοποιήσετε τις γνωστοποιήσεις.";
 $text['message-disclaimer']['es-cl'] = "<u>Divulgaci髇</u>: Habilitaci髇 del proyecto Notificaciones es el consentimiento a la recopilaci髇 de <i>an髇imo</i> y <i>generales</i> la informaci髇 demogr醘ica sobre su entorno de instalaci髇. La informaci髇 solicitada se compone de los siguientes: 1) FusionPBX versi髇, 2) la versi髇 de PHP, 3) del servidor web y la versi髇 4) Versi髇 conmutador de voz, 5) el tipo de base de datos y la versi髇 6) plataforma de sistema operativo y versi髇, y 7) IP p鷅lica direcci髇. Si usted no desea que esta informaci髇 sea presentada, simplemente deje de Proyecto Notificaciones deshabilitado, y ninguna informaci髇 se presentar?sobre su sistema.";
 $text['message-disclaimer']['es-mx'] = "<u>Divulgaci髇</u>: Habilitaci髇 del proyecto Notificaciones es el consentimiento a la recopilaci髇 de <i>an髇imo</i> y <i>generales</i> la informaci髇 demogr醘ica sobre su entorno de instalaci髇. La informaci髇 solicitada se compone de los siguientes: 1) FusionPBX versi髇, 2) la versi髇 de PHP, 3) del servidor web y la versi髇 4) Versi髇 conmutador de voz, 5) el tipo de base de datos y la versi髇 6) plataforma de sistema operativo y versi髇, y 7) IP p鷅lica direcci髇. Si usted no desea que esta informaci髇 sea presentada, simplemente deje de Proyecto Notificaciones deshabilitado, y ninguna informaci髇 se presentar?sobre su sistema."; //copied from es-cl
-$text['message-disclaimer']['fr-ca'] = "<u>Divulgation</u>: Activation des notifications projet est consentement ?la collecte de <i>anonyme</i> et <i>g閚閞ale</i> des informations d閙ographiques sur l'environnement d'installation. Les informations demand閑s se compose de ce qui suit: 1) FusionPBX version 2) version de PHP, 3) le serveur web et la version 4) Version commutateur vocal, 5) type de base de donn閑s et la version 6) plate-forme de syst鑝e d'exploitation et sa version, et 7) IP publique adresse. Si vous ne souhaitez pas que cette information soit pr閟ent閑, laissez simplement Notifications projet d閟activ? et aucune information ne sera soumis ?votre syst鑝e."; //copied from fr-fr
-$text['message-disclaimer']['fr-fr'] = "<u>Divulgation</u>: Activation des notifications projet est consentement ?la collecte de <i>anonyme</i> et <i>g閚閞ale</i> des informations d閙ographiques sur l'environnement d'installation. Les informations demand閑s se compose de ce qui suit: 1) FusionPBX version 2) version de PHP, 3) le serveur web et la version 4) Version commutateur vocal, 5) type de base de donn閑s et la version 6) plate-forme de syst鑝e d'exploitation et sa version, et 7) IP publique adresse. Si vous ne souhaitez pas que cette information soit pr閟ent閑, laissez simplement Notifications projet d閟activ? et aucune information ne sera soumis ?votre syst鑝e.";
+$text['message-disclaimer']['fr-ca'] = "<u>Divulgation</u>: Activation des notifications projet est consentement ?la collecte de <i>anonyme</i> et <i>générale</i> des informations démographiques sur l'environnement d'installation. Les informations demandées se compose de ce qui suit: 1) FusionPBX version 2) version de PHP, 3) le serveur web et la version 4) Version commutateur vocal, 5) type de base de données et la version 6) plate-forme de système d'exploitation et sa version, et 7) IP publique adresse. Si vous ne souhaitez pas que cette information soit présenté, laissez simplement Notifications projet désactivé et aucune information ne sera soumis à votre système."; //copied from fr-fr
+$text['message-disclaimer']['fr-fr'] = "<u>Divulgation</u>: Activation des notifications projet est consentement ?la collecte de <i>anonyme</i> et <i>générale</i> des informations démographiques sur l'environnement d'installation. Les informations demandées se compose de ce qui suit: 1) FusionPBX version 2) version de PHP, 3) le serveur web et la version 4) Version commutateur vocal, 5) type de base de données et la version 6) plate-forme de système d'exploitation et sa version, et 7) IP publique adresse. Si vous ne souhaitez pas que cette information soit présenté, laissez simplement Notifications projet désactivé et aucune information ne sera soumis à votre système.";
 $text['message-disclaimer']['he-il'] = "";
 $text['message-disclaimer']['it-it'] = "<u>Avvertenza</u>: Abilitando le Notifiche di Progetto si dà il consenso alla raccolta di informazioni demografiche in forma <i>anonima</i> e <i>generica</i> sul vostro ambiente di installazione. Le informazioni richieste sono: 1) Versione FusionPBX, 2) Versione PHP, 3) Server Web e Versione, 4) Versione Voice Switch, 5) Tipo database e versione, 6) sistema operativo e versione, e 7) Indirizzi IP pubblici. Se non vuoi fornire queste informazioni, lascia semplicemente le Notifiche di Progetto disabilitate, e nessuna informazione sul tuo sistema sarà trasmessa.";
 $text['message-disclaimer']['nl-nl'] = "";
@@ -164,8 +164,8 @@ $text['message-demographics_submitted']['de-de'] = "Statistik weitergegeben";
 $text['message-demographics_submitted']['el-gr'] = "Υποβλήθηκαν δημογραφικά στοιχεία";
 $text['message-demographics_submitted']['es-cl'] = "Demograf韆 Enviado";
 $text['message-demographics_submitted']['es-mx'] = "Demograf韆 Enviado"; //copied from es-cl
-$text['message-demographics_submitted']['fr-ca'] = "D閙ographie Soumis"; //copied from fr-fr
-$text['message-demographics_submitted']['fr-fr'] = "D閙ographie Soumis";
+$text['message-demographics_submitted']['fr-ca'] = "Démographie Soumis"; //copied from fr-fr
+$text['message-demographics_submitted']['fr-fr'] = "Démographie Soumis";
 $text['message-demographics_submitted']['he-il'] = "";
 $text['message-demographics_submitted']['it-it'] = "Dati Demografici Forniti";
 $text['message-demographics_submitted']['nl-nl'] = "";
@@ -208,8 +208,8 @@ $text['message-demographics']['de-de'] = "<u>Anmerkung</u>: Um das FusionPBX Pro
 $text['message-demographics']['el-gr'] = "<u>Σημείωση</u>: Μπορείτε να προσφέρετε στο FusionPBX project με την υποβολή δημογραφικών πληροφοριών όπως αναφέρονται παραπάνω <i>χωρίς</i> την εγγραφή σας στις γνωστοποιήσεις ";
 $text['message-demographics']['es-cl'] = "<u>Nota</u>: Para ayudar al proyecto FusionPBX presentando la informaci髇 demogr醘ica descrita anteriormente sin necesidad de suscribirse a Project Notificaciones, haga ";
 $text['message-demographics']['es-mx'] = "<u>Nota</u>: Para ayudar al proyecto FusionPBX presentando la informaci髇 demogr醘ica descrita anteriormente sin necesidad de suscribirse a Project Notificaciones, haga "; //copied from es-cl
-$text['message-demographics']['fr-ca'] = "<u>Remarque</u>: Pour aider le projet FusionPBX en soumettant l'information d閙ographique d閏rit ci-dessus, sans souscrire au Projet Notifications, "; //copied from fr-fr
-$text['message-demographics']['fr-fr'] = "<u>Remarque</u>: Pour aider le projet FusionPBX en soumettant l'information d閙ographique d閏rit ci-dessus, sans souscrire au Projet Notifications, ";
+$text['message-demographics']['fr-ca'] = "<u>Remarque</u>: Pour aider le projet FusionPBX en soumettant l'information démographique décrit ci-dessus, sans souscrire au Projet Notifications, "; //copied from fr-fr
+$text['message-demographics']['fr-fr'] = "<u>Remarque</u>: Pour aider le projet FusionPBX en soumettant l'information démographique décrit ci-dessus, sans souscrire au Projet Notifications, ";
 $text['message-demographics']['he-il'] = "";
 $text['message-demographics']['it-it'] = "<u>Nota</u>: Per aiutare il progetto FusionPBX fornendo le informazioni demografiche descritte sopra <i>senza</i> abilitare le Notifiche di Progetto, semplicemente ";
 $text['message-demographics']['nl-nl'] = "";
@@ -230,8 +230,8 @@ $text['label-project_security']['de-de'] = "Sicherheit";
 $text['label-project_security']['el-gr'] = "Ασφάλεια";
 $text['label-project_security']['es-cl'] = "Seguran鏰";
 $text['label-project_security']['es-mx'] = "Seguran鏰"; //copied from es-cl
-$text['label-project_security']['fr-ca'] = "S閏urit?"; //copied from fr-fr
-$text['label-project_security']['fr-fr'] = "S閏urit?";
+$text['label-project_security']['fr-ca'] = "Sécurité"; //copied from fr-fr
+$text['label-project_security']['fr-fr'] = "Sécurité";
 $text['label-project_security']['he-il'] = "";
 $text['label-project_security']['it-it'] = "Sicurezza";
 $text['label-project_security']['nl-nl'] = "";
@@ -252,8 +252,8 @@ $text['label-project_releases']['de-de'] = "Versionen";
 $text['label-project_releases']['el-gr'] = "Εκδόσεις";
 $text['label-project_releases']['es-cl'] = "Estrenos";
 $text['label-project_releases']['es-mx'] = "Estrenos"; //copied from es-cl
-$text['label-project_releases']['fr-ca'] = "Communiqu閟"; //copied from fr-fr
-$text['label-project_releases']['fr-fr'] = "Communiqu閟";
+$text['label-project_releases']['fr-ca'] = "Communiqué"; //copied from fr-fr
+$text['label-project_releases']['fr-fr'] = "Communiqué";
 $text['label-project_releases']['he-il'] = "";
 $text['label-project_releases']['it-it'] = "Releases";
 $text['label-project_releases']['nl-nl'] = "";
@@ -318,8 +318,8 @@ $text['label-project_notification_method']['de-de'] = "Methode";
 $text['label-project_notification_method']['el-gr'] = "Τρόπος";
 $text['label-project_notification_method']['es-cl'] = "M閠odo";
 $text['label-project_notification_method']['es-mx'] = "M閠odo"; //copied from es-cl
-$text['label-project_notification_method']['fr-ca'] = "M閠hode"; //copied from fr-fr
-$text['label-project_notification_method']['fr-fr'] = "M閠hode";
+$text['label-project_notification_method']['fr-ca'] = "Méthode"; //copied from fr-fr
+$text['label-project_notification_method']['fr-fr'] = "Méthode";
 $text['label-project_notification_method']['he-il'] = "";
 $text['label-project_notification_method']['it-it'] = "Metodo";
 $text['label-project_notification_method']['nl-nl'] = "";
@@ -362,8 +362,8 @@ $text['label-project_events']['de-de'] = "Veranstaltungen";
 $text['label-project_events']['el-gr'] = "Δρώμενα";
 $text['label-project_events']['es-cl'] = "Eventos";
 $text['label-project_events']['es-mx'] = "Eventos"; //copied from es-cl
-$text['label-project_events']['fr-ca'] = "関閚ements"; //copied from fr-fr
-$text['label-project_events']['fr-fr'] = "関閚ements";
+$text['label-project_events']['fr-ca'] = "Événements"; //copied from fr-fr
+$text['label-project_events']['fr-fr'] = "Événements";
 $text['label-project_events']['he-il'] = "";
 $text['label-project_events']['it-it'] = "Eventi";
 $text['label-project_events']['nl-nl'] = "";
@@ -406,8 +406,8 @@ $text['description-project_security']['de-de'] = "Benachrichtigungen über Siche
 $text['description-project_security']['el-gr'] = "Λήψη γνωστοποιήσεων για αναβαθμίσεις ασφαλείας.";
 $text['description-project_security']['es-cl'] = "Recibir notificaciones de actualizaciones de seguridad.";
 $text['description-project_security']['es-mx'] = "Recibir notificaciones de actualizaciones de seguridad."; //copied from es-cl
-$text['description-project_security']['fr-ca'] = "Receber notifica珲es de atualiza珲es de seguran鏰."; //copied from fr-fr
-$text['description-project_security']['fr-fr'] = "Receber notifica珲es de atualiza珲es de seguran鏰.";
+$text['description-project_security']['fr-ca'] = "Recevez des notifications de mises à jour de sécurité."; //copied from fr-fr
+$text['description-project_security']['fr-fr'] = "Recevez des notifications de mises à jour de sécurité.";
 $text['description-project_security']['he-il'] = "";
 $text['description-project_security']['it-it'] = "Ricevi notifiche degli aggiornamenti di sicurezza.";
 $text['description-project_security']['nl-nl'] = "";
@@ -428,8 +428,8 @@ $text['description-project_releases']['de-de'] = "Benachrichtigungen über neue
 $text['description-project_releases']['el-gr'] = "Λήψη γνωστοποιήσεων με την έκδοση προς ανάκτηση νέας παραγωγικής έκδοσης FusionPBX.";
 $text['description-project_releases']['es-cl'] = "Reciba notificaciones cuando una nueva versi髇 estable de FusionPBX se liberan y disponible para su descarga.";
 $text['description-project_releases']['es-mx'] = "Reciba notificaciones cuando una nueva versi髇 estable de FusionPBX se liberan y disponible para su descarga."; //copied from es-cl
-$text['description-project_releases']['fr-ca'] = "Recevez des alertes lorsque la nouvelle version stable de FusionPBX sont lib閞閟 et disponibles pour le t閘閏hargement."; //copied from fr-fr
-$text['description-project_releases']['fr-fr'] = "Recevez des alertes lorsque la nouvelle version stable de FusionPBX sont lib閞閟 et disponibles pour le t閘閏hargement.";
+$text['description-project_releases']['fr-ca'] = "Recevez des alertes lorsque la nouvelle version stable de FusionPBX sont disponibles pour le téléchargement."; //copied from fr-fr
+$text['description-project_releases']['fr-fr'] = "Recevez des alertes lorsque la nouvelle version stable de FusionPBX sont disponibles pour le téléchargement.";
 $text['description-project_releases']['he-il'] = "";
 $text['description-project_releases']['it-it'] = "Ricevi notifiche sulle nuove versioni stabili di FusionPBX che vengono rilasciate per il download.";
 $text['description-project_releases']['nl-nl'] = "";
@@ -450,8 +450,8 @@ $text['description-project_notifications']['de-de'] = "FusionPBX Projekt-Benachr
 $text['description-project_notifications']['el-gr'] = "Ενεργοποίηση γνωστοποιήσεων για το FusionPBX.";
 $text['description-project_notifications']['es-cl'] = "Habilitar las notificaciones de proyectos FusionPBX.";
 $text['description-project_notifications']['es-mx'] = "Habilitar las notificaciones de proyectos FusionPBX."; //copied from es-cl
-$text['description-project_notifications']['fr-ca'] = "Ativar notifica珲es de projetos FusionPBX."; //copied from fr-fr
-$text['description-project_notifications']['fr-fr'] = "Ativar notifica珲es de projetos FusionPBX.";
+$text['description-project_notifications']['fr-ca'] = "Activer les notifications de projet FusionPBX."; //copied from fr-fr
+$text['description-project_notifications']['fr-fr'] = "Activer les notifications de projet FusionPBX.";
 $text['description-project_notifications']['he-il'] = "";
 $text['description-project_notifications']['it-it'] = "Abilita le notifiche di progetto di FusionPBX.";
 $text['description-project_notifications']['nl-nl'] = "";
@@ -472,8 +472,8 @@ $text['description-project_notification_recipient']['de-de'] = "Geben Sie die ge
 $text['description-project_notification_recipient']['el-gr'] = "Εισάγετε την επιθυμητή διεύθυνση E-Mail του παραλήπτη.";
 $text['description-project_notification_recipient']['es-cl'] = "Introduzca la deseada direcci髇 de correo electr髇ico del destinatario.";
 $text['description-project_notification_recipient']['es-mx'] = "Introduzca la deseada direcci髇 de correo electr髇ico del destinatario."; //copied from es-cl
-$text['description-project_notification_recipient']['fr-ca'] = "Entrez l'adresse e-mail souhait閑 pour le destinataire."; //copied from fr-fr
-$text['description-project_notification_recipient']['fr-fr'] = "Entrez l'adresse e-mail souhait閑 pour le destinataire.";
+$text['description-project_notification_recipient']['fr-ca'] = "Entrez l'adresse courriel souhaité pour le destinataire."; //copied from fr-fr
+$text['description-project_notification_recipient']['fr-fr'] = "Entrez l'adresse courriel souhaiteé pour le destinataire.";
 $text['description-project_notification_recipient']['he-il'] = "";
 $text['description-project_notification_recipient']['it-it'] = "Inserire l'indirizzo Email desiderato per il ricettore.";
 $text['description-project_notification_recipient']['nl-nl'] = "";
@@ -494,8 +494,8 @@ $text['description-project_notification_method']['de-de'] = "Wählen Sie den gew
 $text['description-project_notification_method']['el-gr'] = "Επιλέξτε προτιμώμενο τρόπο επικοινωνίας.";
 $text['description-project_notification_method']['es-cl'] = "Seleccione el m閠odo deseado de la comunicaci髇.";
 $text['description-project_notification_method']['es-mx'] = "Seleccione el m閠odo deseado de la comunicaci髇."; //copied from es-cl
-$text['description-project_notification_method']['fr-ca'] = "S閘ectionnez la m閠hode souhait閑 de communication."; //copied from fr-fr
-$text['description-project_notification_method']['fr-fr'] = "S閘ectionnez la m閠hode souhait閑 de communication.";
+$text['description-project_notification_method']['fr-ca'] = "Sélectionnez la méthode de communication souhaitée."; //copied from fr-fr
+$text['description-project_notification_method']['fr-fr'] = "Sélectionnez la méthode de communication souhaitée.";
 $text['description-project_notification_method']['he-il'] = "";
 $text['description-project_notification_method']['it-it'] = "Seleziona il metodo di comunicazione desiderato.";
 $text['description-project_notification_method']['nl-nl'] = "";
@@ -516,8 +516,8 @@ $text['description-project_news']['de-de'] = "Allgemeine Informationen über Fus
 $text['description-project_news']['el-gr'] = "Λήψη γνωστοποιήσεων σχετικά με γενικές πληροφορίες περί FusionPBX.";
 $text['description-project_news']['es-cl'] = "Recibir notificaciones de noticias FusionPBX relacionadas e informaci髇 general.";
 $text['description-project_news']['es-mx'] = "Recibir notificaciones de noticias FusionPBX relacionadas e informaci髇 general."; //copied from es-cl
-$text['description-project_news']['fr-ca'] = "Recevoir des notifications de nouvelles et d'information g閚閞ale FusionPBX li閟."; //copied from fr-fr
-$text['description-project_news']['fr-fr'] = "Recevoir des notifications de nouvelles et d'information g閚閞ale FusionPBX li閟.";
+$text['description-project_news']['fr-ca'] = "Recevoir des notifications de nouvelles et d'information générale liés à FusionPBX."; //copied from fr-fr
+$text['description-project_news']['fr-fr'] = "Recevoir des notifications de nouvelles et d'information générale liés à FusionPBX.";
 $text['description-project_news']['he-il'] = "";
 $text['description-project_news']['it-it'] = "Ricevi le notifiche delle notizie generali su FusionPBX.";
 $text['description-project_news']['nl-nl'] = "";
@@ -538,8 +538,8 @@ $text['description-project_events']['de-de'] = "Benachrichtigungen über kommend
 $text['description-project_events']['el-gr'] = "Λήψη γνωστοποιήσεων σχετικά με επερχόμενα εκπαιδευτικά σεμινάρια και δρώμενα περί FusionPBX.";
 $text['description-project_events']['es-cl'] = "Recibir notificaciones de pr髕imas clases FusionPBX formaci髇, cabinas de convenciones y otros eventos relacionados con el proyecto.";
 $text['description-project_events']['es-mx'] = "Recibir notificaciones de pr髕imas clases FusionPBX formaci髇, cabinas de convenciones y otros eventos relacionados con el proyecto."; //copied from es-cl
-$text['description-project_events']['fr-ca'] = "Recevoir des notifications de venir les classes FusionPBX de formation, des stands de congr鑣 et d'autres 関閚ements li閟 au projet."; //copied from fr-fr
-$text['description-project_events']['fr-fr'] = "Recevoir des notifications de venir les classes FusionPBX de formation, des stands de congr鑣 et d'autres 関閚ements li閟 au projet.";
+$text['description-project_events']['fr-ca'] = "Recevez des notifications sur les prochains cours de formation FusionPBX, les stands de convention et d'autres événements liés au projet."; //copied from fr-fr
+$text['description-project_events']['fr-fr'] = "Recevez des notifications sur les prochains cours de formation FusionPBX, les stands de convention et d'autres événements liés au projet.";
 $text['description-project_events']['he-il'] = "";
 $text['description-project_events']['it-it'] = "Ricevi le notifiche sui corsi di formazione, le conventions, e altri eventi legati al progetto FusionPBX.";
 $text['description-project_events']['nl-nl'] = "";
@@ -560,8 +560,8 @@ $text['description-notifications']['de-de'] = "Benachrichtigungseinstellungen f
 $text['description-notifications']['el-gr'] = "Ορίστε ρυθμίσεις γνωστοποιήσεων πληροφοριών περί FusionPBX.";
 $text['description-notifications']['es-cl'] = "Definici髇 de las preferencias de notificaci髇 de la comunicaci髇 relacionada con el proyecto FusionPBX y otras alertas del sistema local.";
 $text['description-notifications']['es-mx'] = "Definici髇 de las preferencias de notificaci髇 de la comunicaci髇 relacionada con el proyecto FusionPBX y otras alertas del sistema local."; //copied from es-cl
-$text['description-notifications']['fr-ca'] = "Definici髇 de las preferencias de notificaci髇 de la comunicaci髇 relacionada con el proyecto FusionPBX y otras alertas del sistema local."; //copied from fr-fr
-$text['description-notifications']['fr-fr'] = "Definici髇 de las preferencias de notificaci髇 de la comunicaci髇 relacionada con el proyecto FusionPBX y otras alertas del sistema local.";
+$text['description-notifications']['fr-ca'] = "Définir les préférences de notification pour les communications liées au projet FusionPBX et d'autres alertes système locales."; //copied from fr-fr
+$text['description-notifications']['fr-fr'] = "Définir les préférences de notification pour les communications liées au projet FusionPBX et d'autres alertes système locales.";
 $text['description-notifications']['he-il'] = "";
 $text['description-notifications']['it-it'] = "Imposta le preferenze di notifica per le comunicazioni e gli altri sistemi di allerta relativi al progetto FusionPBX.";
 $text['description-notifications']['nl-nl'] = "";
diff --git a/core/permissions/app_defaults.php b/core/permissions/app_defaults.php
index 6a232db6bb..c8fe870433 100644
--- a/core/permissions/app_defaults.php
+++ b/core/permissions/app_defaults.php
@@ -39,7 +39,7 @@ if ($domains_processed == 1) {
 				$database = new database;
 				$database->app_name = 'permissions';
 				$database->app_uuid = 'ce1498a0-46e2-487d-85de-4eec7122a984';
-				$database->save($array);
+				$database->save($array, false);
 				unset($array);
 
 			//revoke temporary permissions
diff --git a/core/software/app_defaults.php b/core/software/app_defaults.php
index 103149fc8c..8c1bb537fb 100644
--- a/core/software/app_defaults.php
+++ b/core/software/app_defaults.php
@@ -55,7 +55,7 @@ if ($domains_processed == 1) {
 		$database = new database;
 		$database->app_name = 'software';
 		$database->app_uuid = 'b88c795f-7dea-4fc8-9ab7-edd555242cff';
-		$database->save($array);
+		$database->save($array, false);
 		unset($array);
 
 		//remove the temporary permission
diff --git a/core/software/resources/classes/software.php b/core/software/resources/classes/software.php
index 6c3256719d..bdb5ba73a9 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.31';
+			return '5.0.1';
 		}
 
 		/**
diff --git a/core/upgrade/upgrade.php b/core/upgrade/upgrade.php
index 3876a28aa9..0106913876 100644
--- a/core/upgrade/upgrade.php
+++ b/core/upgrade/upgrade.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-2022
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -48,59 +48,138 @@
 		$display_type = 'html'; //html, text
 	}
 
-//add multi-lingual support
-	require_once "resources/classes/text.php";
-	$language = new text;
-	$text = $language->get();
+//set the default upgrade type
+	$upgrade_type = 'defaults';
 
-//show the title
-	if ($display_type == 'text') {
-		echo "\n";
-		echo $text['label-upgrade']."\n";
-		echo "-----------------------------------------\n";
-		echo "\n";
-		echo $text['label-database']."\n";
+//get the command line arguments
+	if(defined('STDIN')) {
+		//$application_name = $argv[0];
+		if (isset($argv[1])) {
+			$upgrade_type = $argv[1];
+		}
 	}
 
-//make sure the database schema and installation have performed all necessary tasks
-	require_once "resources/classes/schema.php";
-	$obj = new schema;
-	echo $obj->schema("text");
+//show the upgrade type
+	//echo $upgrade_type."\n";
 
 //run all app_defaults.php files
-	require_once "resources/classes/domains.php";
-	$domain = new domains;
-	$domain->display_type = $display_type;
-	$domain->upgrade();
-
-//show the content
-	if ($display_type == 'html') {
-		echo "<div align='center'>\n";
-		echo "<table width='40%'>\n";
-		echo "<tr>\n";
-		echo "<th align='left'>".$text['header-message']."</th>\n";
-		echo "</tr>\n";
-		echo "<tr>\n";
-		echo "<td class='row_style1'><strong>".$text['message-upgrade']."</strong></td>\n";
-		echo "</tr>\n";
-		echo "</table>\n";
-		echo "</div>\n";
-
-		echo "<br />\n";
-		echo "<br />\n";
-		echo "<br />\n";
-		echo "<br />\n";
-		echo "<br />\n";
-		echo "<br />\n";
-		echo "<br />\n";
-	}
-	elseif ($display_type == 'text') {
-		echo "\n";
+	if ($upgrade_type == 'domains') {
+		require_once "resources/classes/config.php";
+		require_once "resources/classes/domains.php";
+		$domain = new domains;
+		$domain->display_type = $display_type;
+		$domain->upgrade();
 	}
 
-//include the footer
-	if ($display_type == "html") {
-		require_once "resources/footer.php";
+//upgrade schema and/or data_types
+	if ($upgrade_type == 'schema') {
+		//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[2]) && $argv[2] == 'data_types') {
+			$obj->data_types = true;
+		}
+		echo $obj->schema($format);
 	}
 
-?>
\ No newline at end of file
+//restore the default menu
+	if ($upgrade_type == 'menu') {
+
+		//get the menu uuid and language
+		$sql = "select menu_uuid, menu_language from v_menus ";
+		$sql .= "where menu_name = :menu_name ";
+		$parameters['menu_name'] = 'default';
+		$database = new database;
+		$row = $database->select($sql, $parameters, 'row');
+		if (is_array($row) && sizeof($row) != 0) {
+			$menu_uuid = $row["menu_uuid"];
+			$menu_language = $row["menu_language"];
+		}
+		unset($sql, $parameters, $row);
+
+		//show the menu
+		if (isset($argv[2]) && $argv[2] == 'view') {
+			print_r($_SESSION["menu"]);
+		}
+
+		//set the menu back to default
+		if (isset($argv[2]) && (is_null($argv[2]) || $argv[2] == 'default')) {
+			//restore the menu
+			$included = true;
+			require_once("core/menu/menu_restore_default.php");
+			unset($sel_menu);
+		
+			//send message to the console
+			echo $text['message-upgrade_menu']."\n";
+		}
+	}
+
+//restore the default permissions
+	if ($upgrade_type == 'permissions') {
+		//default the permissions
+		$included = true;
+		require_once("core/groups/permissions_default.php");
+
+		//send message to the console
+		echo $text['message-upgrade_permissions']."\n";
+	}
+
+//default upgrade schema and app defaults
+	if ($upgrade_type == 'defaults') {
+		//add multi-lingual support
+			require_once "resources/classes/text.php";
+			$language = new text;
+			$text = $language->get();
+		
+		//show the title
+			if ($display_type == 'text') {
+				echo "\n";
+				echo $text['label-upgrade']."\n";
+				echo "-----------------------------------------\n";
+				echo "\n";
+				echo $text['label-database']."\n";
+			}
+		
+		//make sure the database schema and installation have performed all necessary tasks
+			require_once "resources/classes/schema.php";
+			$obj = new schema;
+			echo $obj->schema("text");
+		
+		//run all app_defaults.php files
+			require_once "resources/classes/domains.php";
+			$domain = new domains;
+			$domain->display_type = $display_type;
+			$domain->upgrade();
+		
+		//show the content
+			if ($display_type == 'html') {
+				echo "<div align='center'>\n";
+				echo "<table width='40%'>\n";
+				echo "<tr>\n";
+				echo "<th align='left'>".$text['header-message']."</th>\n";
+				echo "</tr>\n";
+				echo "<tr>\n";
+				echo "<td class='row_style1'><strong>".$text['message-upgrade']."</strong></td>\n";
+				echo "</tr>\n";
+				echo "</table>\n";
+				echo "</div>\n";
+		
+				echo "<br />\n";
+				echo "<br />\n";
+				echo "<br />\n";
+				echo "<br />\n";
+				echo "<br />\n";
+				echo "<br />\n";
+				echo "<br />\n";
+			}
+			elseif ($display_type == 'text') {
+				echo "\n";
+			}
+		
+		//include the footer
+			if ($display_type == "html") {
+				require_once "resources/footer.php";
+			}
+	}
+
+?>
diff --git a/core/user_logs/app_languages.php b/core/user_logs/app_languages.php
index 75c752b8a4..9a9916f164 100644
--- a/core/user_logs/app_languages.php
+++ b/core/user_logs/app_languages.php
@@ -13,7 +13,7 @@
 		$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']['pl-pl'] = 'Logi Użytkownika';
 		$text['title-user_logs']['pt-br'] = '';
 		$text['title-user_logs']['pt-pt'] = '';
 		$text['title-user_logs']['ro-ro'] = '';
@@ -33,7 +33,7 @@
 		$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']['pl-pl'] = 'Log Użytkownika';
 		$text['title-user_log']['pt-br'] = '';
 		$text['title-user_log']['pt-pt'] = '';
 		$text['title-user_log']['ro-ro'] = '';
@@ -53,7 +53,7 @@
 		$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']['pl-pl'] = 'Pokazuje próby uwierzytelnienia z wynikiem, sygnaturą czasową, adresem zdalnym i szczegółami użytkownika.';
 		$text['title_description-user_logs']['pt-br'] = '';
 		$text['title_description-user_logs']['pt-pt'] = '';
 		$text['title_description-user_logs']['ro-ro'] = '';
@@ -73,7 +73,7 @@
 		$text['label-timestamp']['he-il'] = '';
 		$text['label-timestamp']['it-it'] = '';
 		$text['label-timestamp']['nl-nl'] = '';
-		$text['label-timestamp']['pl-pl'] = '';
+		$text['label-timestamp']['pl-pl'] = 'Znacznik czasu';
 		$text['label-timestamp']['pt-br'] = '';
 		$text['label-timestamp']['pt-pt'] = '';
 		$text['label-timestamp']['ro-ro'] = '';
@@ -93,7 +93,7 @@
 		$text['description-timestamp']['he-il'] = '';
 		$text['description-timestamp']['it-it'] = '';
 		$text['description-timestamp']['nl-nl'] = '';
-		$text['description-timestamp']['pl-pl'] = '';
+		$text['description-timestamp']['pl-pl'] = 'Ustaw datę.';
 		$text['description-timestamp']['pt-br'] = '';
 		$text['description-timestamp']['pt-pt'] = '';
 		$text['description-timestamp']['ro-ro'] = '';
@@ -113,7 +113,7 @@
 		$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']['pl-pl'] = 'Użytkownik';
 		$text['label-user_uuid']['pt-br'] = '';
 		$text['label-user_uuid']['pt-pt'] = '';
 		$text['label-user_uuid']['ro-ro'] = '';
@@ -133,7 +133,7 @@
 		$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']['pl-pl'] = 'Wybierz użytkownika.';
 		$text['description-user_uuid']['pt-br'] = '';
 		$text['description-user_uuid']['pt-pt'] = '';
 		$text['description-user_uuid']['ro-ro'] = '';
@@ -153,7 +153,7 @@
 		$text['label-username']['he-il'] = '';
 		$text['label-username']['it-it'] = '';
 		$text['label-username']['nl-nl'] = '';
-		$text['label-username']['pl-pl'] = '';
+		$text['label-username']['pl-pl'] = 'Użytkownik';
 		$text['label-username']['pt-br'] = '';
 		$text['label-username']['pt-pt'] = '';
 		$text['label-username']['ro-ro'] = '';
@@ -173,7 +173,7 @@
 		$text['description-username']['he-il'] = '';
 		$text['description-username']['it-it'] = '';
 		$text['description-username']['nl-nl'] = '';
-		$text['description-username']['pl-pl'] = '';
+		$text['description-username']['pl-pl'] = 'Wprowadź użytkownika.';
 		$text['description-username']['pt-br'] = '';
 		$text['description-username']['pt-pt'] = '';
 		$text['description-username']['ro-ro'] = '';
@@ -193,7 +193,7 @@
 		$text['label-type']['he-il'] = '';
 		$text['label-type']['it-it'] = '';
 		$text['label-type']['nl-nl'] = '';
-		$text['label-type']['pl-pl'] = '';
+		$text['label-type']['pl-pl'] = 'Typ';
 		$text['label-type']['pt-br'] = '';
 		$text['label-type']['pt-pt'] = '';
 		$text['label-type']['ro-ro'] = '';
@@ -213,7 +213,7 @@
 		$text['description-type']['he-il'] = '';
 		$text['description-type']['it-it'] = '';
 		$text['description-type']['nl-nl'] = '';
-		$text['description-type']['pl-pl'] = '';
+		$text['description-type']['pl-pl'] = 'Wprowadź typ.';
 		$text['description-type']['pt-br'] = '';
 		$text['description-type']['pt-pt'] = '';
 		$text['description-type']['ro-ro'] = '';
@@ -233,7 +233,7 @@
 		$text['label-result']['he-il'] = '';
 		$text['label-result']['it-it'] = '';
 		$text['label-result']['nl-nl'] = '';
-		$text['label-result']['pl-pl'] = '';
+		$text['label-result']['pl-pl'] = 'Rezultat';
 		$text['label-result']['pt-br'] = '';
 		$text['label-result']['pt-pt'] = '';
 		$text['label-result']['ro-ro'] = '';
@@ -253,7 +253,7 @@
 		$text['description-result']['he-il'] = '';
 		$text['description-result']['it-it'] = '';
 		$text['description-result']['nl-nl'] = '';
-		$text['description-result']['pl-pl'] = '';
+		$text['description-result']['pl-pl'] = 'Wyprowadź rezultat.';
 		$text['description-result']['pt-br'] = '';
 		$text['description-result']['pt-pt'] = '';
 		$text['description-result']['ro-ro'] = '';
@@ -272,7 +272,7 @@
 		$text['label-success']['he-il'] = '';
 		$text['label-success']['it-it'] = '';
 		$text['label-success']['nl-nl'] = '';
-		$text['label-success']['pl-pl'] = '';
+		$text['label-success']['pl-pl'] = 'sukces';
 		$text['label-success']['pt-br'] = '';
 		$text['label-success']['pt-pt'] = '';
 		$text['label-success']['ro-ro'] = '';
@@ -291,7 +291,7 @@
 		$text['label-failure']['he-il'] = '';
 		$text['label-failure']['it-it'] = '';
 		$text['label-failure']['nl-nl'] = '';
-		$text['label-failure']['pl-pl'] = '';
+		$text['label-failure']['pl-pl'] = 'niepowodzenie';
 		$text['label-failure']['pt-br'] = '';
 		$text['label-failure']['pt-pt'] = '';
 		$text['label-failure']['ro-ro'] = '';
@@ -311,7 +311,7 @@
 		$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']['pl-pl'] = 'Adres Zdalny';
 		$text['label-remote_address']['pt-br'] = '';
 		$text['label-remote_address']['pt-pt'] = '';
 		$text['label-remote_address']['ro-ro'] = '';
@@ -331,7 +331,7 @@
 		$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']['pl-pl'] = 'Wprowadź adres IP.';
 		$text['description-remote_address']['pt-br'] = '';
 		$text['description-remote_address']['pt-pt'] = '';
 		$text['description-remote_address']['ro-ro'] = '';
@@ -351,7 +351,7 @@
 		$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']['pl-pl'] = 'User Agent';
 		$text['label-user_agent']['pt-br'] = '';
 		$text['label-user_agent']['pt-pt'] = '';
 		$text['label-user_agent']['ro-ro'] = '';
@@ -371,7 +371,7 @@
 		$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']['pl-pl'] = 'Wprowadź User Agent';
 		$text['description-user_agent']['pt-br'] = '';
 		$text['description-user_agent']['pt-pt'] = '';
 		$text['description-user_agent']['ro-ro'] = '';
@@ -391,7 +391,7 @@
 		$text['label-location']['he-il'] = '';
 		$text['label-location']['it-it'] = '';
 		$text['label-location']['nl-nl'] = '';
-		$text['label-location']['pl-pl'] = '';
+		$text['label-location']['pl-pl'] = 'Lokalizacja';
 		$text['label-location']['pt-br'] = '';
 		$text['label-location']['pt-pt'] = '';
 		$text['label-location']['ro-ro'] = '';
@@ -411,7 +411,7 @@
 		$text['description-location']['he-il'] = '';
 		$text['description-location']['it-it'] = '';
 		$text['description-location']['nl-nl'] = '';
-		$text['description-location']['pl-pl'] = '';
+		$text['description-location']['pl-pl'] = 'Wprowadź lokalizację';
 		$text['description-location']['pt-br'] = '';
 		$text['description-location']['pt-pt'] = '';
 		$text['description-location']['ro-ro'] = '';
diff --git a/core/user_logs/resources/classes/user_logs.php b/core/user_logs/resources/classes/user_logs.php
index b654a06416..be19e55f3e 100644
--- a/core/user_logs/resources/classes/user_logs.php
+++ b/core/user_logs/resources/classes/user_logs.php
@@ -98,7 +98,7 @@ if (!class_exists('user_logs')) {
 				$database->app_name = 'authentication';
 				$database->app_uuid = 'a8a12918-69a4-4ece-a1ae-3932be0e41f1';
 				$database->uuid($user_log_uuid);
-				$database->save($array);
+				$database->save($array, false);
 				$message = $database->message;
 
 			//remove the temporary permission
diff --git a/core/user_logs/user_logs.php b/core/user_logs/user_logs.php
index d33c51fa09..0b6227becd 100644
--- a/core/user_logs/user_logs.php
+++ b/core/user_logs/user_logs.php
@@ -193,9 +193,9 @@
 			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)]);
+	echo 		"<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown=''>";
+	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search']);
+	//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";
 	}
@@ -280,4 +280,4 @@
 //include the footer
 	require_once "resources/footer.php";
 
-?>
\ No newline at end of file
+?>
diff --git a/core/user_settings/app_config.php b/core/user_settings/app_config.php
index fcb107229c..2b8b4b258c 100644
--- a/core/user_settings/app_config.php
+++ b/core/user_settings/app_config.php
@@ -16,7 +16,7 @@
 		$apps[$x]['description']['de-de'] = "Einstellungen des Benutzerkontos können durch den Benutzer geändert werden.";
 		$apps[$x]['description']['es-cl'] = "La configuración de la cuenta puede ser modificada por el usuario.";
 		$apps[$x]['description']['es-mx'] = "";
-		$apps[$x]['description']['fr-ca'] = "";
+		$apps[$x]['description']['fr-ca'] = "L'usager peut modifier la configuration de son compte";
 		$apps[$x]['description']['fr-fr'] = "L'usager peut modifier la configuration de son compte";
 		$apps[$x]['description']['he-il'] = "";
 		$apps[$x]['description']['it-it'] = "";
diff --git a/core/user_settings/app_languages.php b/core/user_settings/app_languages.php
index 714a717fff..d66358b473 100644
--- a/core/user_settings/app_languages.php
+++ b/core/user_settings/app_languages.php
@@ -10,7 +10,7 @@ $text['title-user_setting-edit']['de-de'] = "Benutzereinstellung";
 $text['title-user_setting-edit']['el-gr'] = "Ρυθμίσεις χρήστη";
 $text['title-user_setting-edit']['es-cl'] = "Configuración de Usuario";
 $text['title-user_setting-edit']['es-mx'] = "Configuración de Usuario"; //copied from es-cl
-$text['title-user_setting-edit']['fr-ca'] = "Cadre de l'utilisateur"; //copied from fr-fr
+$text['title-user_setting-edit']['fr-ca'] = "Paramètre d'utilisateur";
 $text['title-user_setting-edit']['fr-fr'] = "Cadre de l'utilisateur";
 $text['title-user_setting-edit']['he-il'] = "";
 $text['title-user_setting-edit']['it-it'] = "Parametri Utente";
@@ -32,7 +32,7 @@ $text['title-user_setting-add']['de-de'] = "Benutzereinstellung hinzufügen";
 $text['title-user_setting-add']['el-gr'] = "Προσθήκη ρύθμισης χρήστη";
 $text['title-user_setting-add']['es-cl'] = "Ajuste del usuario Agregar";
 $text['title-user_setting-add']['es-mx'] = "Ajuste del usuario Agregar"; //copied from es-cl
-$text['title-user_setting-add']['fr-ca'] = "Cadre utilisateur Ajouter"; //copied from fr-fr
+$text['title-user_setting-add']['fr-ca'] = "Ajouter Paramètre d'utilisateur"; //copied from fr-fr
 $text['title-user_setting-add']['fr-fr'] = "Cadre utilisateur Ajouter";
 $text['title-user_setting-add']['he-il'] = "";
 $text['title-user_setting-add']['it-it'] = "Inserimento Parametri Utente";
@@ -76,7 +76,7 @@ $text['title']['de-de'] = "Kontoeinstellungen";
 $text['title']['el-gr'] = "Ρυθμίσεις λογαριασμού";
 $text['title']['es-cl'] = "Configuración de Cuenta";
 $text['title']['es-mx'] = "Configuración de Cuenta"; //copied from es-cl
-$text['title']['fr-ca'] = "Personalisation du compte"; //copied from fr-fr
+$text['title']['fr-ca'] = "Paramètres du compte";
 $text['title']['fr-fr'] = "Personalisation du compte";
 $text['title']['he-il'] = "הגדרת חשבון";
 $text['title']['it-it'] = "Parametri Account";
@@ -142,7 +142,7 @@ $text['table-title']['de-de'] = "Benutzerinformationen";
 $text['table-title']['el-gr'] = "Στοιχεία χρήστη";
 $text['table-title']['es-cl'] = "Información de Usuario";
 $text['table-title']['es-mx'] = "Información de Usuario"; //copied from es-cl
-$text['table-title']['fr-ca'] = "Informations de l'usager"; //copied from fr-fr
+$text['table-title']['fr-ca'] = "informations Utilisateur";
 $text['table-title']['fr-fr'] = "Informations de l'usager";
 $text['table-title']['he-il'] = "פרטי משתמש";
 $text['table-title']['it-it'] = "Informazioni Utente";
@@ -164,7 +164,7 @@ $text['table-extension']['de-de'] = "Nebenstelle";
 $text['table-extension']['el-gr'] = "Extension";
 $text['table-extension']['es-cl'] = "Extensión";
 $text['table-extension']['es-mx'] = "Extensión"; //copied from es-cl
-$text['table-extension']['fr-ca'] = "Extension"; //copied from fr-fr
+$text['table-extension']['fr-ca'] = "Extension";
 $text['table-extension']['fr-fr'] = "Extension";
 $text['table-extension']['he-il'] = "שלוחה";
 $text['table-extension']['it-it'] = "Interno";
@@ -208,7 +208,7 @@ $text['message-reset_link_sent']['de-de'] = "Link zum Zurücksetzen des Passwort
 $text['message-reset_link_sent']['el-gr'] = "Έχει σταλεί email επαναφοράς κωδικού";
 $text['message-reset_link_sent']['es-cl'] = "Restablecer Contraseña de Conexión Enviados";
 $text['message-reset_link_sent']['es-mx'] = "Restablecer Contraseña de Conexión Enviados"; //copied from es-cl
-$text['message-reset_link_sent']['fr-ca'] = "Lien de réinitialisation de mot de passe envoyé"; //copied from fr-fr
+$text['message-reset_link_sent']['fr-ca'] = "Lien de réinitialisation de mot de passe envoyé";
 $text['message-reset_link_sent']['fr-fr'] = "Lien de réinitialisation de mot de passe envoyé";
 $text['message-reset_link_sent']['he-il'] = "קישור לאיפוס סיסמה נשלח";
 $text['message-reset_link_sent']['it-it'] = "Link Ripristino Password Inviato";
@@ -340,7 +340,7 @@ $text['message-invalid_email']['de-de'] = "Ungültige E-Mail-Adresse";
 $text['message-invalid_email']['el-gr'] = "Λάθος διεύθυνση email";
 $text['message-invalid_email']['es-cl'] = "Dirección no válida de correo electrónico";
 $text['message-invalid_email']['es-mx'] = "Dirección no válida de correo electrónico"; //copied from es-cl
-$text['message-invalid_email']['fr-ca'] = "Adresse email invalide"; //copied from fr-fr
+$text['message-invalid_email']['fr-ca'] = "Adresse courriel invalide";
 $text['message-invalid_email']['fr-fr'] = "Adresse email invalide";
 $text['message-invalid_email']['he-il'] = "כתובת דואר מייל לא תקינה";
 $text['message-invalid_email']['it-it'] = "Indirizzo Email non valido";
@@ -362,7 +362,7 @@ $text['message-email_assigned_mutliple_users']['de-de'] = "Bereits vorhanden";
 $text['message-email_assigned_mutliple_users']['el-gr'] = "Εντοπίστηκε διπλοεγγραφή";
 $text['message-email_assigned_mutliple_users']['es-cl'] = "duplicar detectado";
 $text['message-email_assigned_mutliple_users']['es-mx'] = "duplicar detectado"; //copied from es-cl
-$text['message-email_assigned_mutliple_users']['fr-ca'] = "Donblons détectés"; //copied from fr-fr
+$text['message-email_assigned_mutliple_users']['fr-ca'] = "Adresse courriel attribuée à plusieurs utilisateurs";
 $text['message-email_assigned_mutliple_users']['fr-fr'] = "Donblons détectés";
 $text['message-email_assigned_mutliple_users']['he-il'] = "זוהותה כפילות";
 $text['message-email_assigned_mutliple_users']['it-it'] = "Duplicato Rilevato";
@@ -606,7 +606,7 @@ $text['label-uppercase_letters']['de-de'] = "Großbuchstaben";
 $text['label-uppercase_letters']['el-gr'] = "Κεφαλαία γράμματα";
 $text['label-uppercase_letters']['es-cl'] = "Letras mayúsculas";
 $text['label-uppercase_letters']['es-mx'] = "Letras mayúsculas"; //copied from es-cl
-$text['label-uppercase_letters']['fr-ca'] = "Lettres capitales"; //copied from fr-fr
+$text['label-uppercase_letters']['fr-ca'] = "Lettres Majuscules";
 $text['label-uppercase_letters']['fr-fr'] = "Lettres capitales";
 $text['label-uppercase_letters']['he-il'] = "אותיות רישיות";
 $text['label-uppercase_letters']['it-it'] = "Lettere Maiuscole";
@@ -650,8 +650,8 @@ $text['label-total_destinations']['de-de'] = "Ziele insgesamt";
 $text['label-total_destinations']['el-gr'] = "Σύνολο προορισμών";
 $text['label-total_destinations']['es-cl'] = "destinos totales";
 $text['label-total_destinations']['es-mx'] = "destinos totales"; //copied from es-cl
-$text['label-total_destinations']['fr-ca'] = "total des destinations"; //copied from fr-fr
-$text['label-total_destinations']['fr-fr'] = "total des destinations";
+$text['label-total_destinations']['fr-ca'] = "Total des Destinations"; //copied from fr-fr
+$text['label-total_destinations']['fr-fr'] = "Total des Destinations";
 $text['label-total_destinations']['he-il'] = "רוזן יעד";
 $text['label-total_destinations']['it-it'] = "Destinazioni Totali";
 $text['label-total_destinations']['nl-nl'] = "";
@@ -721,7 +721,7 @@ $text['label-system_uptime']['fr-fr'] = "système Uptime";
 $text['label-system_uptime']['he-il'] = "מערכת Uptime";
 $text['label-system_uptime']['it-it'] = "Tempo di attività del Sistema";
 $text['label-system_uptime']['nl-nl'] = "";
-$text['label-system_uptime']['pl-pl'] = "System Uptime";
+$text['label-system_uptime']['pl-pl'] = "Czas Pracy Systemu";
 $text['label-system_uptime']['pt-br'] = "Tempo de ativiade do sistema";
 $text['label-system_uptime']['pt-pt'] = "Uptime sistema";
 $text['label-system_uptime']['ro-ro'] = "sistemul Uptime";
@@ -760,7 +760,7 @@ $text['label-system_counts']['de-de'] = "Systemzähler";
 $text['label-system_counts']['el-gr'] = "Στατιστικά συστήματος";
 $text['label-system_counts']['es-cl'] = "Cuenta del sistema";
 $text['label-system_counts']['es-mx'] = "Cuenta del sistema"; //copied from es-cl
-$text['label-system_counts']['fr-ca'] = "Chiffres de système"; //copied from fr-fr
+$text['label-system_counts']['fr-ca'] = "Compte de système"; //copied from fr-fr
 $text['label-system_counts']['fr-fr'] = "Chiffres de système";
 $text['label-system_counts']['he-il'] = "ספירת מערכת";
 $text['label-system_counts']['it-it'] = "Statistiche Sistema";
@@ -980,8 +980,8 @@ $text['label-processor_usage']['de-de'] = "Prozessorauslastung ";
 $text['label-processor_usage']['el-gr'] = "Χρήση CPU";
 $text['label-processor_usage']['es-cl'] = "uso del procesador";
 $text['label-processor_usage']['es-mx'] = "uso del procesador"; //copied from es-cl
-$text['label-processor_usage']['fr-ca'] = "processeur Utilisation"; //copied from fr-fr
-$text['label-processor_usage']['fr-fr'] = "processeur Utilisation";
+$text['label-processor_usage']['fr-ca'] = "Processeur Utilisation"; //copied from fr-fr
+$text['label-processor_usage']['fr-fr'] = "Processeur Utilisation";
 $text['label-processor_usage']['he-il'] = "שימוש מעבד";
 $text['label-processor_usage']['it-it'] = "Uso CPU";
 $text['label-processor_usage']['nl-nl'] = "";
@@ -1068,12 +1068,12 @@ $text['label-no_voicemail_assigned']['de-de'] = "Keine Mailbox zugewiesen";
 $text['label-no_voicemail_assigned']['el-gr'] = "Δεν έχει οριστεί φωνοκιβώτιο";
 $text['label-no_voicemail_assigned']['es-cl'] = "No Asignado correo de voz";
 $text['label-no_voicemail_assigned']['es-mx'] = "No Asignado correo de voz"; //copied from es-cl
-$text['label-no_voicemail_assigned']['fr-ca'] = "Non Voicemail Assigné"; //copied from fr-fr
+$text['label-no_voicemail_assigned']['fr-ca'] = "Aucune Messagerie Vocale Assigné"; //copied from fr-fr
 $text['label-no_voicemail_assigned']['fr-fr'] = "Non Voicemail Assigné";
 $text['label-no_voicemail_assigned']['he-il'] = "אין שירות תא קולי Assigned";
 $text['label-no_voicemail_assigned']['it-it'] = "Nessuna Casella Vocale Assegnata";
 $text['label-no_voicemail_assigned']['nl-nl'] = "";
-$text['label-no_voicemail_assigned']['pl-pl'] = "Nie głosowa Przypisany";
+$text['label-no_voicemail_assigned']['pl-pl'] = "Nieprzypisana Poczta głosowa";
 $text['label-no_voicemail_assigned']['pt-br'] = "Sem correio de voz definido";
 $text['label-no_voicemail_assigned']['pt-pt'] = "Sem Voicemail Assigned";
 $text['label-no_voicemail_assigned']['ro-ro'] = "Nr Mesagerie vocală alocate";
@@ -1244,12 +1244,12 @@ $text['label-memory_available']['de-de'] = "Available Memory";
 $text['label-memory_available']['el-gr'] = "Διαθέσιμη μνήμη";
 $text['label-memory_available']['es-cl'] = "Available Memory";
 $text['label-memory_available']['es-mx'] = "Available Memory";
-$text['label-memory_available']['fr-ca'] = "Available Memory";
+$text['label-memory_available']['fr-ca'] = "Mémoire Libre";
 $text['label-memory_available']['fr-fr'] = "Available Memory";
 $text['label-memory_available']['he-il'] = "Available Memory";
 $text['label-memory_available']['it-it'] = "Available Memory";
 $text['label-memory_available']['nl-nl'] = "Available Memory";
-$text['label-memory_available']['pl-pl'] = "Available Memory";
+$text['label-memory_available']['pl-pl'] = "Dostępna Pamięć";
 $text['label-memory_available']['pt-br'] = "Memória Disponível";
 $text['label-memory_available']['pt-pt'] = "Available Memory";
 $text['label-memory_available']['ro-ro'] = "Available Memory";
@@ -1376,7 +1376,7 @@ $text['label-item']['de-de'] = "Objekt";
 $text['label-item']['el-gr'] = "Είδος";
 $text['label-item']['es-cl'] = "Ítem";
 $text['label-item']['es-mx'] = "Ítem"; //copied from es-cl
-$text['label-item']['fr-ca'] = "Article"; //copied from fr-fr
+$text['label-item']['fr-ca'] = "Objet"; //copied from fr-fr
 $text['label-item']['fr-fr'] = "Article";
 $text['label-item']['he-il'] = "פריט";
 $text['label-item']['it-it'] = "Oggetto";
@@ -1420,7 +1420,7 @@ $text['label-followme']['de-de'] = "Anrufweiterschaltung";
 $text['label-followme']['el-gr'] = "Follow Me";
 $text['label-followme']['es-cl'] = "Sígueme";
 $text['label-followme']['es-mx'] = "Sígueme"; //copied from es-cl
-$text['label-followme']['fr-ca'] = "Follow Me"; //copied from fr-fr
+$text['label-followme']['fr-ca'] = "Me Suivre"; 
 $text['label-followme']['fr-fr'] = "Follow Me";
 $text['label-followme']['he-il'] = "עקוב אחרי";
 $text['label-followme']['it-it'] = "Seguimi";
@@ -1442,7 +1442,7 @@ $text['label-feature']['de-de'] = "Funktion";
 $text['label-feature']['el-gr'] = "Χαρακτηριστικά";
 $text['label-feature']['es-cl'] = "Característica";
 $text['label-feature']['es-mx'] = "Característica"; //copied from es-cl
-$text['label-feature']['fr-ca'] = "Fonctionnalité"; //copied from fr-fr
+$text['label-feature']['fr-ca'] = "Fonction"; //copied from fr-fr
 $text['label-feature']['fr-fr'] = "Fonctionnalité";
 $text['label-feature']['he-il'] = "מאפיין";
 $text['label-feature']['it-it'] = "Funzionalità";
@@ -1464,7 +1464,7 @@ $text['label-failed']['de-de'] = "Fehlgeschlagen";
 $text['label-failed']['el-gr'] = "Απέτυχαν";
 $text['label-failed']['es-cl'] = "Fracasado";
 $text['label-failed']['es-mx'] = "Fracasado"; //copied from es-cl
-$text['label-failed']['fr-ca'] = "Manqué"; //copied from fr-fr
+$text['label-failed']['fr-ca'] = "échoué"; 
 $text['label-failed']['fr-fr'] = "Manqué";
 $text['label-failed']['he-il'] = "נכשל";
 $text['label-failed']['it-it'] = "Fallito";
@@ -1530,8 +1530,8 @@ $text['label-email_address']['de-de'] = "Email Adresse";
 $text['label-email_address']['el-gr'] = "Email Address";
 $text['label-email_address']['es-cl'] = "Dirección de Correo Electrónico";
 $text['label-email_address']['es-mx'] = "Dirección de Correo Electrónico"; //copied from es-cl
-$text['label-email_address']['fr-ca'] = "Adresse E-mail"; //copied from fr-fr
-$text['label-email_address']['fr-fr'] = "Adresse E-mail";
+$text['label-email_address']['fr-ca'] = "Adresse Courriel"; 
+$text['label-email_address']['fr-fr'] = "Adresse Courriel";
 $text['label-email_address']['he-il'] = "כתובת מייל";
 $text['label-email_address']['it-it'] = "Indirizzo Email";
 $text['label-email_address']['nl-nl'] = "";
@@ -1662,7 +1662,7 @@ $text['label-disabled']['de-de'] = "Ausgeschaltet";
 $text['label-disabled']['el-gr'] = "Απενεργοποιημένα";
 $text['label-disabled']['es-cl'] = "Discapacitado";
 $text['label-disabled']['es-mx'] = "Discapacitado"; //copied from es-cl
-$text['label-disabled']['fr-ca'] = "Non Permis"; //copied from fr-fr
+$text['label-disabled']['fr-ca'] = "Désactivé";
 $text['label-disabled']['fr-fr'] = "Non Permis";
 $text['label-disabled']['he-il'] = "";
 $text['label-disabled']['it-it'] = "Disabilitato";
@@ -1684,7 +1684,7 @@ $text['label-devices']['de-de'] = "Geräte";
 $text['label-devices']['el-gr'] = "Συσκευές";
 $text['label-devices']['es-cl'] = "Dispositivos";
 $text['label-devices']['es-mx'] = "Dispositivos"; //copied from es-cl
-$text['label-devices']['fr-ca'] = "Equipements"; //copied from fr-fr
+$text['label-devices']['fr-ca'] = "Appareils"; //copied from fr-fr
 $text['label-devices']['fr-fr'] = "Equipements";
 $text['label-devices']['he-il'] = "התקנים";
 $text['label-devices']['it-it'] = "Apparati";
@@ -1838,12 +1838,12 @@ $text['label-characters']['de-de'] = "Zeichen";
 $text['label-characters']['el-gr'] = "Χαρακτήρες";
 $text['label-characters']['es-cl'] = "Caracteres";
 $text['label-characters']['es-mx'] = "Caracteres"; //copied from es-cl
-$text['label-characters']['fr-ca'] = "Personnages"; //copied from fr-fr
+$text['label-characters']['fr-ca'] = "Caractères";
 $text['label-characters']['fr-fr'] = "Personnages";
 $text['label-characters']['he-il'] = "דמויות";
 $text['label-characters']['it-it'] = "Caratteri";
 $text['label-characters']['nl-nl'] = "";
-$text['label-characters']['pl-pl'] = "Postacie";
+$text['label-characters']['pl-pl'] = "Znaki";
 $text['label-characters']['pt-br'] = "Caracteres"; //copied from pt-pt
 $text['label-characters']['pt-pt'] = "Personagens";
 $text['label-characters']['ro-ro'] = "caractere";
@@ -1992,8 +1992,8 @@ $text['label-active_users']['de-de'] = "Aktive Benutzer";
 $text['label-active_users']['el-gr'] = "Ενεργοί χρήστες";
 $text['label-active_users']['es-cl'] = "Los usuarios activos";
 $text['label-active_users']['es-mx'] = "Los usuarios activos"; //copied from es-cl
-$text['label-active_users']['fr-ca'] = "Usuários ativos..."; //copied from fr-fr
-$text['label-active_users']['fr-fr'] = "Usuários ativos...";
+$text['label-active_users']['fr-ca'] = "Utilisateurs Actifs";
+$text['label-active_users']['fr-fr'] = "Utilisateurs Actifs";
 $text['label-active_users']['he-il'] = "משתמשים פעילים";
 $text['label-active_users']['it-it'] = "Utenti Attivi";
 $text['label-active_users']['nl-nl'] = "";
@@ -2075,7 +2075,7 @@ $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-ca'] = "Simple";
 $text['label-single']['fr-fr'] = "Single";
 $text['label-single']['he-il'] = "Single";
 $text['label-single']['it-it'] = "Single";
@@ -2293,7 +2293,7 @@ $text['confirm-update']['fr-fr'] = "Mise à jour terminée";
 $text['confirm-update']['he-il'] = "עידכון הושלם";
 $text['confirm-update']['it-it'] = "Aggiornamento Completato.";
 $text['confirm-update']['nl-nl'] = "";
-$text['confirm-update']['pl-pl'] = "Aktualizacja zakonczona";
+$text['confirm-update']['pl-pl'] = "Zaktualizowano pomyślnie";
 $text['confirm-update']['pt-br'] = "Atualização completa";
 $text['confirm-update']['pt-pt'] = "Actualização Efectuada";
 $text['confirm-update']['ro-ro'] = "Actualizare completă";
@@ -2310,7 +2310,7 @@ $text['confirm-password']['de-de'] = "Die Passwörter stimmen nicht überein";
 $text['confirm-password']['el-gr'] = "Δεν ταιριάζουν οι κωδικοί";
 $text['confirm-password']['es-cl'] = "Las contraseñas no coinciden.";
 $text['confirm-password']['es-mx'] = "Las contraseñas no coinciden."; //copied from es-cl
-$text['confirm-password']['fr-ca'] = "Les mots de passe ne sont pas les mêmes."; //copied from fr-fr
+$text['confirm-password']['fr-ca'] = "Les mots de passe ne sont pas identiques."; //copied from fr-fr
 $text['confirm-password']['fr-fr'] = "Les mots de passe ne sont pas les mêmes.";
 $text['confirm-password']['he-il'] = "סיסמאות לא תואמות";
 $text['confirm-password']['it-it'] = "Le password non coincidono.";
@@ -2486,7 +2486,7 @@ $text['description-user_setting-add']['de-de'] = "Eine Einstellung für diesen B
 $text['description-user_setting-add']['el-gr'] = "Προσθήκη μιας ρύθμισης για αυτό το χρήστη";
 $text['description-user_setting-add']['es-cl'] = "Añadir un entorno para este usuario.";
 $text['description-user_setting-add']['es-mx'] = "Añadir un entorno para este usuario."; //copied from es-cl
-$text['description-user_setting-add']['fr-ca'] = "Ajouter un cadre pour cet utilisateur."; //copied from fr-fr
+$text['description-user_setting-add']['fr-ca'] = "Ajouter un paramètre pour cet utilisateur."; 
 $text['description-user_setting-add']['fr-fr'] = "Ajouter un cadre pour cet utilisateur.";
 $text['description-user_setting-add']['he-il'] = "";
 $text['description-user_setting-add']['it-it'] = "Aggiungi un parametro per questo utente.";
@@ -2499,4 +2499,46 @@ $text['description-user_setting-add']['ru-ru'] = "Добавьте параме
 $text['description-user_setting-add']['sv-se'] = "Lägg till en inställning för denna användare.";
 $text['description-user_setting-add']['uk-ua'] = "";
 
+$text['label-active']['en-us'] = "Active";
+$text['label-active']['en-gb'] = "Active";
+$text['label-active']['ar-eg'] = "";
+$text['label-active']['de-at'] = "Aktiv"; //copied from de-de
+$text['label-active']['de-ch'] = "Aktiv"; //copied from de-de
+$text['label-active']['de-de'] = "Aktiv";
+$text['label-active']['es-cl'] = "";
+$text['label-active']['es-mx'] = "";
+$text['label-active']['fr-ca'] = "Actif";
+$text['label-active']['fr-fr'] = "Actif";
+$text['label-active']['he-il'] = "";
+$text['label-active']['it-it'] = "Attivo";
+$text['label-active']['nl-nl'] = "";
+$text['label-active']['pl-pl'] = "";
+$text['label-active']['pt-br'] = "";
+$text['label-active']['pt-pt'] = "";
+$text['label-active']['ro-ro'] = "";
+$text['label-active']['ru-ru'] = "Активные";
+$text['label-active']['sv-se'] = "Aktiv";
+$text['label-active']['uk-ua'] = "";
+
+$text['label-inactive']['en-us'] = "InActive";
+$text['label-inactive']['en-gb'] = "InActive";
+$text['label-inactive']['ar-eg'] = "";
+$text['label-inactive']['de-at'] = "InAktiv"; //copied from de-de
+$text['label-inactive']['de-ch'] = "InAktiv"; //copied from de-de
+$text['label-inactive']['de-de'] = "InAktiv";
+$text['label-inactive']['es-cl'] = "";
+$text['label-inactive']['es-mx'] = "";
+$text['label-inactive']['fr-ca'] = "InActif";
+$text['label-inactive']['fr-fr'] = "InActif";
+$text['label-inactive']['he-il'] = "";
+$text['label-inactive']['it-it'] = "Non Attivo";
+$text['label-inactive']['nl-nl'] = "";
+$text['label-inactive']['pl-pl'] = "";
+$text['label-inactive']['pt-br'] = "";
+$text['label-inactive']['pt-pt'] = "";
+$text['label-inactive']['ro-ro'] = "";
+$text['label-inactive']['ru-ru'] = "Неактивный";
+$text['label-inactive']['sv-se'] = "InAktiv";
+$text['label-inactive']['uk-ua'] = "";
+
 ?>
diff --git a/core/user_settings/user_setting_edit.php b/core/user_settings/user_setting_edit.php
index e7a9248185..aa325ab20f 100644
--- a/core/user_settings/user_setting_edit.php
+++ b/core/user_settings/user_setting_edit.php
@@ -649,6 +649,12 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 		echo "    	<option value='fixed' ".($user_setting_value == "fixed" ? "selected='selected'" : null).">".$text['option-fixed']."</option>\n";
 		echo "    </select>\n";
 	}
+	elseif ($user_setting_category == "theme" && $user_setting_subcategory == "menu_side_item_main_sub_close" && $user_setting_name == "text" ) {
+		echo "    <select class='formfld' id='user_setting_value' name='user_setting_value'>\n";
+		echo "    	<option value='automatic'>".$text['option-automatic']."</option>\n";
+		echo "    	<option value='manual' ".($user_setting_value == "manual" ? "selected='selected'" : null).">".$text['option-manual']."</option>\n";
+		echo "    </select>\n";
+	}
 	else if ($user_setting_category == "theme" && $user_setting_subcategory == "body_header_brand_type" && $user_setting_name == "text" ) {
 		echo "    <select class='formfld' id='user_setting_value' name='user_setting_value'>\n";
 		echo "    	<option value='image' ".(($user_setting_value == "image") ? "selected='selected'" : null).">".$text['label-image']."</option>\n";
diff --git a/core/users/app_config.php b/core/users/app_config.php
index f22620cfbd..32d1deb7e8 100644
--- a/core/users/app_config.php
+++ b/core/users/app_config.php
@@ -149,6 +149,22 @@
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = "3";
 		$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'] = "04b1e1e6-064a-4112-ba84-e33cd3a87170";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "users";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "max_retry";
+		$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'] = "Login blocked after reaching the max retries.";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "ee3ae838-90fd-4849-81c4-8ca9bb612125";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "users";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "find_time";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "3600";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Login blocked for many failures in a given time.";
 
 	//schema details
 		$y=0;
diff --git a/core/users/app_defaults.php b/core/users/app_defaults.php
index 4531950819..115739a413 100644
--- a/core/users/app_defaults.php
+++ b/core/users/app_defaults.php
@@ -174,7 +174,7 @@ if ($domains_processed == 1) {
 			$database = new database;
 			$database->app_name = 'default_setting';
 			$database->app_uuid = '2c2453c0-1bea-4475-9f44-4d969650de09';
-			$database->save($array);
+			$database->save($array, false);
 			unset($array);
 
 			//remove the temporary permission
@@ -226,7 +226,7 @@ if ($domains_processed == 1) {
 				$database = new database;
 				$database->app_name = 'email_templates';
 				$database->app_uuid = '8173e738-2523-46d5-8943-13883befd2fd';
-				$database->save($array);
+				$database->save($array, false);
 				unset($array);
 
 				//remove the temporary permission
diff --git a/core/users/app_languages.php b/core/users/app_languages.php
index 2698b2c3cf..0f0e70094a 100644
--- a/core/users/app_languages.php
+++ b/core/users/app_languages.php
@@ -30,8 +30,8 @@ $text['title-user_edit']['de-ch'] = "";
 $text['title-user_edit']['de-de'] = "";
 $text['title-user_edit']['es-cl'] = "";
 $text['title-user_edit']['es-mx'] = "";
-$text['title-user_edit']['fr-ca'] = "";
-$text['title-user_edit']['fr-fr'] = "";
+$text['title-user_edit']['fr-ca'] = "Utilisateur Modifier";
+$text['title-user_edit']['fr-fr'] = "Utilisateur Modifier";
 $text['title-user_edit']['he-il'] = "";
 $text['title-user_edit']['it-it'] = "";
 $text['title-user_edit']['nl-nl'] = "";
@@ -137,7 +137,7 @@ $text['title-user']['de-ch'] = "Benutzer"; //copied from de-de
 $text['title-user']['de-de'] = "Benutzer";
 $text['title-user']['es-cl'] = "Editar Usuario";
 $text['title-user']['es-mx'] = "Editar Usuario"; //copied from es-cl
-$text['title-user']['fr-ca'] = "Modifier l'utilisateur"; //copied from fr-fr
+$text['title-user']['fr-ca'] = "Utilisateur";
 $text['title-user']['fr-fr'] = "Modifier l'utilisateur";
 $text['title-user']['he-il'] = "משתמש";
 $text['title-user']['it-it'] = "Utente";
@@ -158,7 +158,7 @@ $text['option-true']['de-ch'] = "Ein"; //copied from de-de
 $text['option-true']['de-de'] = "Ein";
 $text['option-true']['es-cl'] = "Verdadero";
 $text['option-true']['es-mx'] = "Verdadero"; //copied from es-cl
-$text['option-true']['fr-ca'] = "Oui"; //copied from fr-fr
+$text['option-true']['fr-ca'] = "Vrai";
 $text['option-true']['fr-fr'] = "Oui";
 $text['option-true']['he-il'] = "חוקי";
 $text['option-true']['it-it'] = "True";
@@ -242,7 +242,7 @@ $text['option-false']['de-ch'] = "Aus"; //copied from de-de
 $text['option-false']['de-de'] = "Aus";
 $text['option-false']['es-cl'] = "Falso";
 $text['option-false']['es-mx'] = "Falso"; //copied from es-cl
-$text['option-false']['fr-ca'] = "Non"; //copied from fr-fr
+$text['option-false']['fr-ca'] = "Faux";
 $text['option-false']['fr-fr'] = "Non";
 $text['option-false']['he-il'] = "לא חוקי";
 $text['option-false']['it-it'] = "False";
@@ -436,7 +436,7 @@ $text['message-copy']['fr-fr'] = "Copie effectuée";
 $text['message-copy']['he-il'] = "העתקה הושלמה";
 $text['message-copy']['it-it'] = "Copia completata";
 $text['message-copy']['nl-nl'] = "";
-$text['message-copy']['pl-pl'] = "Skopiowano poprawnie";
+$text['message-copy']['pl-pl'] = "Skopiowano pomyślnie";
 $text['message-copy']['pt-br'] = "Cópia Efectuada"; //copied from pt-pt
 $text['message-copy']['pt-pt'] = "Cópia Efectuada";
 $text['message-copy']['ro-ro'] = "Copiere completă";
@@ -473,12 +473,12 @@ $text['message-invalid_user']['de-ch'] = "Invalid User";
 $text['message-invalid_user']['de-de'] = "Invalid User";
 $text['message-invalid_user']['es-cl'] = "Invalid User";
 $text['message-invalid_user']['es-mx'] = "Invalid User";
-$text['message-invalid_user']['fr-ca'] = "Invalid User";
-$text['message-invalid_user']['fr-fr'] = "Invalid User";
+$text['message-invalid_user']['fr-ca'] = "Utilisateur Invalide";
+$text['message-invalid_user']['fr-fr'] = "Utilisateur Invalide";
 $text['message-invalid_user']['he-il'] = "Invalid User";
 $text['message-invalid_user']['it-it'] = "Invalid User";
 $text['message-invalid_user']['nl-nl'] = "Invalid User";
-$text['message-invalid_user']['pl-pl'] = "Invalid User";
+$text['message-invalid_user']['pl-pl'] = "Niepoprawny Użytkownik";
 $text['message-invalid_user']['pt-br'] = "Invalid User";
 $text['message-invalid_user']['pt-pt'] = "Invalid User";
 $text['message-invalid_user']['ro-ro'] = "Invalid User";
@@ -494,12 +494,12 @@ $text['message-unsaved_changes']['de-ch'] = "Unsaved Changes";
 $text['message-unsaved_changes']['de-de'] = "Unsaved Changes";
 $text['message-unsaved_changes']['es-cl'] = "Unsaved Changes";
 $text['message-unsaved_changes']['es-mx'] = "Unsaved Changes";
-$text['message-unsaved_changes']['fr-ca'] = "Unsaved Changes";
-$text['message-unsaved_changes']['fr-fr'] = "Unsaved Changes";
+$text['message-unsaved_changes']['fr-ca'] = "Modifications non enregistrées";
+$text['message-unsaved_changes']['fr-fr'] = "Modifications non enregistrées";
 $text['message-unsaved_changes']['he-il'] = "Unsaved Changes";
 $text['message-unsaved_changes']['it-it'] = "Unsaved Changes";
 $text['message-unsaved_changes']['nl-nl'] = "Unsaved Changes";
-$text['message-unsaved_changes']['pl-pl'] = "Unsaved Changes";
+$text['message-unsaved_changes']['pl-pl'] = "Niezapisane Zmiany";
 $text['message-unsaved_changes']['pt-br'] = "Unsaved Changes";
 $text['message-unsaved_changes']['pt-pt'] = "Unsaved Changes";
 $text['message-unsaved_changes']['ro-ro'] = "Unsaved Changes";
@@ -515,12 +515,12 @@ $text['message-green_border_passwords_match']['de-ch'] = "Green field borders in
 $text['message-green_border_passwords_match']['de-de'] = "Green field borders indicate typed passwords match.";
 $text['message-green_border_passwords_match']['es-cl'] = "Green field borders indicate typed passwords match.";
 $text['message-green_border_passwords_match']['es-mx'] = "Green field borders indicate typed passwords match.";
-$text['message-green_border_passwords_match']['fr-ca'] = "Green field borders indicate typed passwords match.";
-$text['message-green_border_passwords_match']['fr-fr'] = "Green field borders indicate typed passwords match.";
+$text['message-green_border_passwords_match']['fr-ca'] = "Les bordures vertes indiquent que les mots de passe saisis correspondent.";
+$text['message-green_border_passwords_match']['fr-fr'] = "Les bordures vertes indiquent que les mots de passe saisis correspondent.";
 $text['message-green_border_passwords_match']['he-il'] = "Green field borders indicate typed passwords match.";
 $text['message-green_border_passwords_match']['it-it'] = "Green field borders indicate typed passwords match.";
 $text['message-green_border_passwords_match']['nl-nl'] = "Green field borders indicate typed passwords match.";
-$text['message-green_border_passwords_match']['pl-pl'] = "Green field borders indicate typed passwords match.";
+$text['message-green_border_passwords_match']['pl-pl'] = "Zielone ramki pól oznaczają zgodność wpisanych haseł.";
 $text['message-green_border_passwords_match']['pt-br'] = "Green field borders indicate typed passwords match.";
 $text['message-green_border_passwords_match']['pt-pt'] = "Green field borders indicate typed passwords match.";
 $text['message-green_border_passwords_match']['ro-ro'] = "Green field borders indicate typed passwords match.";
@@ -1292,8 +1292,8 @@ $text['label-required']['de-ch'] = "Required";
 $text['label-required']['de-de'] = "Required";
 $text['label-required']['es-cl'] = "Required";
 $text['label-required']['es-mx'] = "Required";
-$text['label-required']['fr-ca'] = "Required";
-$text['label-required']['fr-fr'] = "Required";
+$text['label-required']['fr-ca'] = "Requis";
+$text['label-required']['fr-fr'] = "Requis";
 $text['label-required']['he-il'] = "Required";
 $text['label-required']['it-it'] = "Required";
 $text['label-required']['nl-nl'] = "Required";
@@ -1313,8 +1313,8 @@ $text['label-number']['de-ch'] = "Number";
 $text['label-number']['de-de'] = "Number";
 $text['label-number']['es-cl'] = "Number";
 $text['label-number']['es-mx'] = "Number";
-$text['label-number']['fr-ca'] = "Number";
-$text['label-number']['fr-fr'] = "Number";
+$text['label-number']['fr-ca'] = "Numéro";
+$text['label-number']['fr-fr'] = "Numéro";
 $text['label-number']['he-il'] = "Number";
 $text['label-number']['it-it'] = "Number";
 $text['label-number']['nl-nl'] = "Number";
@@ -1334,8 +1334,8 @@ $text['label-lowercase']['de-ch'] = "Lowercase";
 $text['label-lowercase']['de-de'] = "Lowercase";
 $text['label-lowercase']['es-cl'] = "Lowercase";
 $text['label-lowercase']['es-mx'] = "Lowercase";
-$text['label-lowercase']['fr-ca'] = "Lowercase";
-$text['label-lowercase']['fr-fr'] = "Lowercase";
+$text['label-lowercase']['fr-ca'] = "Minuscule";
+$text['label-lowercase']['fr-fr'] = "Minuscule";
 $text['label-lowercase']['he-il'] = "Lowercase";
 $text['label-lowercase']['it-it'] = "Lowercase";
 $text['label-lowercase']['nl-nl'] = "Lowercase";
@@ -1355,8 +1355,8 @@ $text['label-uppercase']['de-ch'] = "Uppercase";
 $text['label-uppercase']['de-de'] = "Uppercase";
 $text['label-uppercase']['es-cl'] = "Uppercase";
 $text['label-uppercase']['es-mx'] = "Uppercase";
-$text['label-uppercase']['fr-ca'] = "Uppercase";
-$text['label-uppercase']['fr-fr'] = "Uppercase";
+$text['label-uppercase']['fr-ca'] = "Majuscule";
+$text['label-uppercase']['fr-fr'] = "Majuscule";
 $text['label-uppercase']['he-il'] = "Uppercase";
 $text['label-uppercase']['it-it'] = "Uppercase";
 $text['label-uppercase']['nl-nl'] = "Uppercase";
@@ -1397,12 +1397,12 @@ $text['label-center']['de-ch'] = "Mitte"; //copied from de-de
 $text['label-center']['de-de'] = "Mitte";
 $text['label-center']['es-cl'] = "Centrar";
 $text['label-center']['es-mx'] = "Centrar"; //copied from es-cl
-$text['label-center']['fr-ca'] = "centre"; //copied from fr-fr
-$text['label-center']['fr-fr'] = "centre";
+$text['label-center']['fr-ca'] = "Centre"; //copied from fr-fr
+$text['label-center']['fr-fr'] = "Centre";
 $text['label-center']['he-il'] = "מֶרְכָּז";
 $text['label-center']['it-it'] = "Centro";
 $text['label-center']['nl-nl'] = "";
-$text['label-center']['pl-pl'] = "Centrum";
+$text['label-center']['pl-pl'] = "Środek";
 $text['label-center']['pt-br'] = "Centro"; //copied from pt-pt
 $text['label-center']['pt-pt'] = "Centro";
 $text['label-center']['ro-ro'] = "Centru";
@@ -1460,8 +1460,8 @@ $text['label-message_key']['de-ch'] = "Message Schlüssel"; //copied from de-de
 $text['label-message_key']['de-de'] = "Message Schlüssel";
 $text['label-message_key']['es-cl'] = "Message Key";
 $text['label-message_key']['es-mx'] = "Message Key"; //copied from es-cl
-$text['label-message_key']['fr-ca'] = "Clé d'Message"; //copied from fr-fr
-$text['label-message_key']['fr-fr'] = "Clé d'Message";
+$text['label-message_key']['fr-ca'] = "Clé de Message"; //copied from fr-fr
+$text['label-message_key']['fr-fr'] = "Clé de Message";
 $text['label-message_key']['he-il'] = "";
 $text['label-message_key']['it-it'] = "Message Key";
 $text['label-message_key']['nl-nl'] = "";
@@ -1481,7 +1481,7 @@ $text['label-user_enabled']['de-ch'] = "Aktiviert"; //copied from de-de
 $text['label-user_enabled']['de-de'] = "Aktiviert";
 $text['label-user_enabled']['es-cl'] = "Activado";
 $text['label-user_enabled']['es-mx'] = "Activado"; //copied from es-cl
-$text['label-user_enabled']['fr-ca'] = "Actif"; //copied from fr-fr
+$text['label-user_enabled']['fr-ca'] = "Activé"; //copied from fr-fr
 $text['label-user_enabled']['fr-fr'] = "Actif";
 $text['label-user_enabled']['he-il'] = "";
 $text['label-user_enabled']['it-it'] = "Abilitato";
@@ -1566,8 +1566,8 @@ $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']['fr-ca'] = "Dynamique";
+$text['label-dynamic']['fr-fr'] = "Dynamique";
 $text['label-dynamic']['he-il'] = "Dynamic";
 $text['label-dynamic']['it-it'] = "Dynamic";
 $text['label-dynamic']['nl-nl'] = "Dynamic";
@@ -1584,8 +1584,8 @@ $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']['fr-ca'] = "Simple";
+$text['label-single']['fr-fr'] = "Simple";
 $text['label-single']['he-il'] = "Single";
 $text['label-single']['it-it'] = "Single";
 $text['label-single']['nl-nl'] = "Single";
@@ -1707,12 +1707,12 @@ $text['header-user_settings']['de-de'] = "User Settings";
 $text['header-user_settings']['el-gr'] = "User Settings";
 $text['header-user_settings']['es-cl'] = "User Settings";
 $text['header-user_settings']['es-mx'] = "User Settings";
-$text['header-user_settings']['fr-ca'] = "User Settings";
-$text['header-user_settings']['fr-fr'] = "User Settings";
+$text['header-user_settings']['fr-ca'] = "Paramètres Utilisateur";
+$text['header-user_settings']['fr-fr'] = "Paramètres Utilisateur";
 $text['header-user_settings']['he-il'] = "User Settings";
 $text['header-user_settings']['it-it'] = "User Settings";
 $text['header-user_settings']['nl-nl'] = "User Settings";
-$text['header-user_settings']['pl-pl'] = "User Settings";
+$text['header-user_settings']['pl-pl'] = "Ustawienia Użytkownika";
 $text['header-user_settings']['pt-br'] = "User Settings";
 $text['header-user_settings']['pt-pt'] = "User Settings";
 $text['header-user_settings']['ro-ro'] = "User Settings";
@@ -1729,12 +1729,12 @@ $text['header_description-user_settings']['de-ch'] = "Settings for this user tha
 $text['header_description-user_settings']['de-de'] = "Settings for this user that should override those defined in Domain or Default Settings.";
 $text['header_description-user_settings']['es-cl'] = "Settings for this user that should override those defined in Domain or Default Settings.";
 $text['header_description-user_settings']['es-mx'] = "Settings for this user that should override those defined in Domain or Default Settings.";
-$text['header_description-user_settings']['fr-ca'] = "Settings for this user that should override those defined in Domain or Default Settings.";
-$text['header_description-user_settings']['fr-fr'] = "Settings for this user that should override those defined in Domain or Default Settings.";
+$text['header_description-user_settings']['fr-ca'] = "Paramètres pour cet utilisateur qui doivent remplacer ceux définis dans le domaine ou les paramètres par défaut.";
+$text['header_description-user_settings']['fr-fr'] = "Paramètres pour cet utilisateur qui doivent remplacer ceux définis dans le domaine ou les paramètres par défaut.";
 $text['header_description-user_settings']['he-il'] = "Settings for this user that should override those defined in Domain or Default Settings.";
 $text['header_description-user_settings']['it-it'] = "Settings for this user that should override those defined in Domain or Default Settings.";
 $text['header_description-user_settings']['nl-nl'] = "Settings for this user that should override those defined in Domain or Default Settings.";
-$text['header_description-user_settings']['pl-pl'] = "Settings for this user that should override those defined in Domain or Default Settings.";
+$text['header_description-user_settings']['pl-pl'] = "Ustawienia dla tego użytkownika, które powinny zastąpić te zdefiniowane w Domenie lub Ustawieniach Domyślnych.";
 $text['header_description-user_settings']['pt-br'] = "Settings for this user that should override those defined in Domain or Default Settings.";
 $text['header_description-user_settings']['pt-pt'] = "Settings for this user that should override those defined in Domain or Default Settings.";
 $text['header_description-user_settings']['ro-ro'] = "Settings for this user that should override those defined in Domain or Default Settings.";
diff --git a/core/users/app_menu.php b/core/users/app_menu.php
index f0c3e70f96..7c665c965e 100644
--- a/core/users/app_menu.php
+++ b/core/users/app_menu.php
@@ -8,7 +8,7 @@
 	$apps[$x]['menu'][$y]['title']['de-de'] = "Benutzerverwaltung";
 	$apps[$x]['menu'][$y]['title']['es-cl'] = "Gestor de Usuarios";
 	$apps[$x]['menu'][$y]['title']['es-mx'] = "";
-	$apps[$x]['menu'][$y]['title']['fr-ca'] = "";
+	$apps[$x]['menu'][$y]['title']['fr-ca'] = "Utilisteurs";
 	$apps[$x]['menu'][$y]['title']['fr-fr'] = "Gestion des utilisteurs";
 	$apps[$x]['menu'][$y]['title']['he-il'] = "מנהל משתמש";
 	$apps[$x]['menu'][$y]['title']['it-it'] = "Utenti";
@@ -34,7 +34,7 @@
 	$apps[$x]['menu'][$y]['title']['de-at'] = "Kontoeinstellungen";
 	$apps[$x]['menu'][$y]['title']['es-cl'] = "Config de Cuenta";
 	$apps[$x]['menu'][$y]['title']['es-mx'] = "";
-	$apps[$x]['menu'][$y]['title']['fr-ca'] = "";
+	$apps[$x]['menu'][$y]['title']['fr-ca'] = "Paramètre du Compte";
 	$apps[$x]['menu'][$y]['title']['fr-fr'] = "Configuration du Compte";
 	$apps[$x]['menu'][$y]['title']['he-il'] = "הגדרת חשבון";
 	$apps[$x]['menu'][$y]['title']['it-it'] = "Impostazioni Utente";
diff --git a/core/users/users.php b/core/users/users.php
index cc5867f81a..ed774457ec 100644
--- a/core/users/users.php
+++ b/core/users/users.php
@@ -195,13 +195,13 @@
 		echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add'],'id'=>'btn_add','link'=>'user_edit.php']);
 	}
 	if (permission_exists('user_add') && $users) {
-		echo button::create(['type'=>'button','label'=>$text['button-copy'],'icon'=>$_SESSION['theme']['button_icon_copy'],'name'=>'btn_copy','onclick'=>"modal_open('modal-copy','btn_copy');"]);
+		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('user_edit') && $users) {
-		echo button::create(['type'=>'button','label'=>$text['button-toggle'],'icon'=>$_SESSION['theme']['button_icon_toggle'],'name'=>'btn_toggle','onclick'=>"modal_open('modal-toggle','btn_toggle');"]);
+		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('user_delete') && $users) {
-		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 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_all')) {
@@ -212,9 +212,9 @@
 			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'=>'users.php','style'=>($search == '' ? 'display: none;' : null)]);
+	echo 		"<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown=''>";
+	echo button::create(['label'=>$text['button-search'],'icon'=>$_SESSION['theme']['button_icon_search'],'type'=>'submit','id'=>'btn_search']);
+	//echo button::create(['label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'btn_reset','link'=>'users.php','style'=>($search == '' ? 'display: none;' : null)]);
 	if ($paging_controls_mini != '') {
 		echo 	"<span style='margin-left: 15px;'>".$paging_controls_mini."</span>\n";
 	}
@@ -244,7 +244,7 @@
 	echo "<tr class='list-header'>\n";
 	if (permission_exists('user_add') || permission_exists('user_edit') || permission_exists('user_delete')) {
 		echo "	<th class='checkbox'>\n";
-		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle();' ".($users ?: "style='visibility: hidden;'").">\n";
+		echo "		<input type='checkbox' id='checkbox_all' name='checkbox_all' onclick='list_all_toggle(); checkbox_on_change(this);' ".($users ?: "style='visibility: hidden;'").">\n";
 		echo "	</th>\n";
 	}
 	if ($_GET['show'] == 'all' && permission_exists('user_all')) {
@@ -274,7 +274,7 @@
 			echo "<tr class='list-row' href='".$list_row_url."'>\n";
 			if (permission_exists('user_add') || permission_exists('user_edit') || permission_exists('user_delete')) {
 				echo "	<td class='checkbox'>\n";
-				echo "		<input type='checkbox' name='users[$x][checked]' id='checkbox_".$x."' value='true' onclick=\"if (!this.checked) { document.getElementById('checkbox_all').checked = false; }\">\n";
+				echo "		<input type='checkbox' name='users[$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='users[$x][uuid]' value='".escape($row['user_uuid'])."' />\n";
 				echo "	</td>\n";
 			}
diff --git a/resources/app_languages.php b/resources/app_languages.php
index 3b601c0355..bc5ab7edaf 100644
--- a/resources/app_languages.php
+++ b/resources/app_languages.php
@@ -59,7 +59,7 @@ $text['modal_title-confirmation']['fr-fr'] = "Confirmation";
 $text['modal_title-confirmation']['he-il'] = "Confirmation";
 $text['modal_title-confirmation']['it-it'] = "Confirmation";
 $text['modal_title-confirmation']['nl-nl'] = "Confirmation";
-$text['modal_title-confirmation']['pl-pl'] = "Confirmation";
+$text['modal_title-confirmation']['pl-pl'] = "Potwierdzenie";
 $text['modal_title-confirmation']['pt-br'] = "Confirmation";
 $text['modal_title-confirmation']['pt-pt'] = "Confirmation";
 $text['modal_title-confirmation']['ro-ro'] = "Confirmation";
@@ -81,7 +81,7 @@ $text['message-update']['fr-fr'] = "Mis à jour";
 $text['message-update']['he-il'] = "עידכון הושלם";
 $text['message-update']['it-it'] = "Aggiornamento Completato";
 $text['message-update']['nl-nl'] = "";
-$text['message-update']['pl-pl'] = "Zaktualizowano poprawnie";
+$text['message-update']['pl-pl'] = "Zaktualizowano pomyślnie";
 $text['message-update']['pt-br'] = "Atualização Concluída";
 $text['message-update']['pt-pt'] = "Actualização Efectuada";
 $text['message-update']['ro-ro'] = "Actualizare completă";
@@ -104,7 +104,7 @@ $text['message-required']['fr-fr'] = "Merci d'indiquer:";
 $text['message-required']['he-il'] = " אנא ספק";
 $text['message-required']['it-it'] = "Prego fornire: ";
 $text['message-required']['nl-nl'] = "";
-$text['message-required']['pl-pl'] = "Wpisz:";
+$text['message-required']['pl-pl'] = "Wymagane pola:";
 $text['message-required']['pt-br'] = "Por favor informe:";
 $text['message-required']['pt-pt'] = "Por favor indique:";
 $text['message-required']['ro-ro'] = "Vă rugăm să oferiți";
@@ -127,7 +127,7 @@ $text['message-delete']['fr-fr'] = "Supprimé";
 $text['message-delete']['he-il'] = "מחיקה הושלמה";
 $text['message-delete']['it-it'] = "Cancellazione Completata";
 $text['message-delete']['nl-nl'] = "";
-$text['message-delete']['pl-pl'] = "Usunięto poprawnie";
+$text['message-delete']['pl-pl'] = "Usunięto pomyślnie";
 $text['message-delete']['pt-br'] = "Exclusão Concluída";
 $text['message-delete']['pt-pt'] = "Remoção Efectuada";
 $text['message-delete']['ro-ro'] = "Ștergere completă";
@@ -168,12 +168,12 @@ $text['message-delete_selection']['de-de'] = "What do you wish to delete?";
 $text['message-delete_selection']['el-gr'] = "What do you wish to delete?";
 $text['message-delete_selection']['es-cl'] = "What do you wish to delete?";
 $text['message-delete_selection']['es-mx'] = "What do you wish to delete?";
-$text['message-delete_selection']['fr-ca'] = "What do you wish to delete?";
-$text['message-delete_selection']['fr-fr'] = "What do you wish to delete?";
+$text['message-delete_selection']['fr-ca'] = "Que souhaitez-vous supprimer?";
+$text['message-delete_selection']['fr-fr'] = "Que souhaitez-vous supprimer?";
 $text['message-delete_selection']['he-il'] = "What do you wish to delete?";
 $text['message-delete_selection']['it-it'] = "What do you wish to delete?";
 $text['message-delete_selection']['nl-nl'] = "What do you wish to delete?";
-$text['message-delete_selection']['pl-pl'] = "What do you wish to delete?";
+$text['message-delete_selection']['pl-pl'] = "Co chcesz usunąć?";
 $text['message-delete_selection']['pt-br'] = "What do you wish to delete?";
 $text['message-delete_selection']['pt-pt'] = "What do you wish to delete?";
 $text['message-delete_selection']['ro-ro'] = "What do you wish to delete?";
@@ -196,7 +196,7 @@ $text['message-add']['fr-fr'] = "Ajouté";
 $text['message-add']['he-il'] = "הוספה הושלמה";
 $text['message-add']['it-it'] = "Completato";
 $text['message-add']['nl-nl'] = "";
-$text['message-add']['pl-pl'] = "Dodano poprawnie";
+$text['message-add']['pl-pl'] = "Dodano pomyślnie";
 $text['message-add']['pt-br'] = "Adição Concluída";
 $text['message-add']['pt-pt'] = "Adição Efectuada";
 $text['message-add']['ro-ro'] = "Adăugare completă";
@@ -214,12 +214,12 @@ $text['message-failed']['de-de'] = "Aktualisierung fehlgeschlagen - Kontaktieren
 $text['message-failed']['el-gr'] = "Η ενημέρωση απέτυχε - Επικοινωνήστε με την τεχνική υποστήριξη";
 $text['message-failed']['es-cl'] = "Update Error - Contact Support";
 $text['message-failed']['es-mx'] = "Update Error - Contact Support"; //copied from es-cl
-$text['message-failed']['fr-ca'] = "Mise ?jour a 閏hou?- Contacter le support technique"; //copied from fr-fr
-$text['message-failed']['fr-fr'] = "Mise ?jour a 閏hou?- Contacter le support technique";
+$text['message-failed']['fr-ca'] = "Mise à jour a Échoué - Contacter le support technique"; //copied from fr-fr
+$text['message-failed']['fr-fr'] = "Mise à jour a Échoué - Contacter le support technique";
 $text['message-failed']['he-il'] = "";
 $text['message-failed']['it-it'] = "Aggiornamento Fallito - Contattare Supporto";
 $text['message-failed']['nl-nl'] = "";
-$text['message-failed']['pl-pl'] = "Aktualizacja nie powiod艂a si臋 - skontaktuj si臋 z pomoc膮";
+$text['message-failed']['pl-pl'] = "Aktualizacja nie powiodła się - skontaktuj się z pomocą";
 $text['message-failed']['pt-br'] = "Falha na atualização  - Entre em contato com o suporte";
 $text['message-failed']['pt-pt'] = "Falha na atualiza玢o - Contato com o suporte";
 $text['message-failed']['ro-ro'] = "";
@@ -242,7 +242,7 @@ $text['message-copy']['fr-fr'] = "Copier Terminé";
 $text['message-copy']['he-il'] = "";
 $text['message-copy']['it-it'] = "Copia Completata";
 $text['message-copy']['nl-nl'] = "";
-$text['message-copy']['pl-pl'] = "Skopiowano poprawnie";
+$text['message-copy']['pl-pl'] = "Skopiowano pomyślnie";
 $text['message-copy']['pt-br'] = "Cópia Concluída";
 $text['message-copy']['pt-pt'] = "Cópia Preenchida";
 $text['message-copy']['ro-ro'] = "";
@@ -265,7 +265,7 @@ $text['message-toggle']['fr-fr'] = "Basculer Terminé";
 $text['message-toggle']['he-il'] = "הושלם Toggle";
 $text['message-toggle']['it-it'] = "Commutazione Completata";
 $text['message-toggle']['nl-nl'] = "";
-$text['message-toggle']['pl-pl'] = "Przegubowe Zakończony";
+$text['message-toggle']['pl-pl'] = "Przełączono pomyślnie";
 $text['message-toggle']['pt-br'] = "Alteração Concluída"; //copied from pt-pt
 $text['message-toggle']['pt-pt'] = "Alternar Concluído";
 $text['message-toggle']['ro-ro'] = "Completat toggle";
@@ -282,12 +282,12 @@ $text['message-invalid_credentials']['de-de'] = "Ungültiger Benutzername und/od
 $text['message-invalid_credentials']['el-gr'] = "Λάθος στοιχεία εισόδου";
 $text['message-invalid_credentials']['es-cl'] = "";
 $text['message-invalid_credentials']['es-mx'] = "";
-$text['message-invalid_credentials']['fr-ca'] = "";
-$text['message-invalid_credentials']['fr-fr'] = "";
+$text['message-invalid_credentials']['fr-ca'] = "Nom d'utilisateur et / ou mot de passe incorrect";
+$text['message-invalid_credentials']['fr-fr'] = "Nom d'utilisateur et / ou mot de passe incorrect";
 $text['message-invalid_credentials']['he-il'] = "";
 $text['message-invalid_credentials']['it-it'] = "";
 $text['message-invalid_credentials']['nl-nl'] = "";
-$text['message-invalid_credentials']['pl-pl'] = "";
+$text['message-invalid_credentials']['pl-pl'] = "Niepoprawna nazwa użytkownika i/lub hasło";
 $text['message-invalid_credentials']['pt-br'] = "Nome de usuário e/ou senha inválida";
 $text['message-invalid_credentials']['pt-pt'] = "";
 $text['message-invalid_credentials']['ro-ro'] = "";
@@ -305,12 +305,12 @@ $text['message-invalid_token']['de-de'] = "Invalid Token";
 $text['message-invalid_token']['el-gr'] = "Invalid Token";
 $text['message-invalid_token']['es-cl'] = "Invalid Token";
 $text['message-invalid_token']['es-mx'] = "Invalid Token";
-$text['message-invalid_token']['fr-ca'] = "Invalid Token";
-$text['message-invalid_token']['fr-fr'] = "Invalid Token";
+$text['message-invalid_token']['fr-ca'] = "Jeton Invalide";
+$text['message-invalid_token']['fr-fr'] = "Jeton Invalide";
 $text['message-invalid_token']['he-il'] = "Invalid Token";
 $text['message-invalid_token']['it-it'] = "Invalid Token";
 $text['message-invalid_token']['nl-nl'] = "Invalid Token";
-$text['message-invalid_token']['pl-pl'] = "Invalid Token";
+$text['message-invalid_token']['pl-pl'] = "Niepoprawny token";
 $text['message-invalid_token']['pt-br'] = "Token Inválido";
 $text['message-invalid_token']['pt-pt'] = "Invalid Token";
 $text['message-invalid_token']['ro-ro'] = "Invalid Token";
@@ -356,7 +356,7 @@ $text['message-restore']['fr-fr'] = "Restauré";
 $text['message-restore']['he-il'] = "שחזור הושלם";
 $text['message-restore']['it-it'] = "Ripristino Completato";
 $text['message-restore']['nl-nl'] = "";
-$text['message-restore']['pl-pl'] = "Przywrócenie zakończone";
+$text['message-restore']['pl-pl'] = "Przywrócenie zakończone pomyślnie";
 $text['message-restore']['pt-br'] = "Restauração Concluída"; //copied from pt-pt
 $text['message-restore']['pt-pt'] = "Restauração Efectuada";
 $text['message-restore']['ro-ro'] = "";
@@ -417,12 +417,12 @@ $text['message-username_format_invalid']['de-ch'] = "Ungültiger Benutzername";
 $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']['fr-ca'] = "Format de nom d'utilisateur invalide";
+$text['message-username_format_invalid']['fr-fr'] = "Format de nom d'utilisateur invalide";
 $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']['pl-pl'] = "Niepoprawny format nazwy użytkownika";
 $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'] = "";
@@ -438,12 +438,12 @@ $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']['fr-ca'] = "Quelconque";
+$text['option-username_format_any']['fr-fr'] = "Quelconque";
 $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']['pl-pl'] = "Jakikolwiek";
 $text['option-username_format_any']['pt-br'] = "Any";
 $text['option-username_format_any']['pt-pt'] = "Any";
 $text['option-username_format_any']['ro-ro'] = "Any";
@@ -459,12 +459,12 @@ $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']['fr-ca'] = "Adresse Courriel";
+$text['option-username_format_email']['fr-fr'] = "Adresse Courriel";
 $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']['pl-pl'] = "Adres Email";
 $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";
@@ -480,12 +480,12 @@ $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']['fr-ca'] = "Pas d'adresse courriel";
+$text['option-username_format_no_email']['fr-fr'] = "Pas d'adresse courriel";
 $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']['pl-pl'] = "Nie Adres Email";
 $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";
@@ -507,7 +507,7 @@ $text['confirm-delete']['fr-fr'] = "Voulez-vous vraiment supprimer cela?";
 $text['confirm-delete']['he-il'] = " האם אתה באמת רוצה למחוק את זה?";
 $text['confirm-delete']['it-it'] = "Vuoi veramente cancellarlo?";
 $text['confirm-delete']['nl-nl'] = "";
-$text['confirm-delete']['pl-pl'] = "Czy na pewno chcesz to usunąć?";
+$text['confirm-delete']['pl-pl'] = "Czy na pewno chcesz to USUNĄĆ?";
 $text['confirm-delete']['pt-br'] = "Deseja realmente remover?"; //copied from pt-pt
 $text['confirm-delete']['pt-pt'] = "Deseja realmente remover isto?";
 $text['confirm-delete']['ro-ro'] = "Chiar vrei să ștergeți asta?";
@@ -530,7 +530,7 @@ $text['confirm-copy']['fr-fr'] = "Voulez-vous vraiment copier cela?";
 $text['confirm-copy']['he-il'] = "";
 $text['confirm-copy']['it-it'] = "Vuoi veramente farne una copia?";
 $text['confirm-copy']['nl-nl'] = "";
-$text['confirm-copy']['pl-pl'] = "Czy na pewno chcesz to skopiować?";
+$text['confirm-copy']['pl-pl'] = "Czy na pewno chcesz to SKOPIOWAĆ?";
 $text['confirm-copy']['pt-br'] = "Deseja realmente copiar?"; //copied from pt-pt
 $text['confirm-copy']['pt-pt'] = "Deseja realmente copiar isto?";
 $text['confirm-copy']['ro-ro'] = "";
@@ -548,12 +548,12 @@ $text['confirm-toggle']['de-de'] = "Do you really want to TOGGLE this?";
 $text['confirm-toggle']['el-gr'] = "Do you really want to TOGGLE this?";
 $text['confirm-toggle']['es-cl'] = "Do you really want to TOGGLE this?";
 $text['confirm-toggle']['es-mx'] = "Do you really want to TOGGLE this?";
-$text['confirm-toggle']['fr-ca'] = "Do you really want to TOGGLE this?";
-$text['confirm-toggle']['fr-fr'] = "Do you really want to TOGGLE this?";
+$text['confirm-toggle']['fr-ca'] = "Voulez-vous vraiment basculer cela?";
+$text['confirm-toggle']['fr-fr'] = "Voulez-vous vraiment basculer cela?";
 $text['confirm-toggle']['he-il'] = "Do you really want to TOGGLE this?";
 $text['confirm-toggle']['it-it'] = "Do you really want to TOGGLE this?";
 $text['confirm-toggle']['nl-nl'] = "Do you really want to TOGGLE this?";
-$text['confirm-toggle']['pl-pl'] = "Do you really want to TOGGLE this?";
+$text['confirm-toggle']['pl-pl'] = "Czy na pewno chcesz to PRZEŁĄCZYĆ?";
 $text['confirm-toggle']['pt-br'] = "Deseja realmente alterar?";
 $text['confirm-toggle']['pt-pt'] = "Do you really want to TOGGLE this?";
 $text['confirm-toggle']['ro-ro'] = "Do you really want to TOGGLE this?";
@@ -571,12 +571,12 @@ $text['button-apply']['de-de'] = "Anwenden";
 $text['button-apply']['el-gr'] = "Υποβολή";
 $text['button-apply']['es-cl'] = "";
 $text['button-apply']['es-mx'] = "";
-$text['button-apply']['fr-ca'] = "";
-$text['button-apply']['fr-fr'] = "";
+$text['button-apply']['fr-ca'] = "Appliquer";
+$text['button-apply']['fr-fr'] = "Appliquer";
 $text['button-apply']['he-il'] = "";
 $text['button-apply']['it-it'] = "Applica";
 $text['button-apply']['nl-nl'] = "";
-$text['button-apply']['pl-pl'] = "";
+$text['button-apply']['pl-pl'] = "Zatwierdź";
 $text['button-apply']['pt-br'] = "Aplicar";
 $text['button-apply']['pt-pt'] = "";
 $text['button-apply']['ro-ro'] = "";
@@ -599,7 +599,7 @@ $text['button-provision']['fr-fr'] = "Provisionner";
 $text['button-provision']['he-il'] = "";
 $text['button-provision']['it-it'] = "";
 $text['button-provision']['nl-nl'] = "";
-$text['button-provision']['pl-pl'] = "Konfigutuj";
+$text['button-provision']['pl-pl'] = "Konfiguruj";
 $text['button-provision']['pt-br'] = "Provisionamento";
 $text['button-provision']['pt-pt'] = "";
 $text['button-provision']['ro-ro'] = "";
@@ -616,12 +616,12 @@ $text['button-applied']['de-de'] = "Angewandt";
 $text['button-applied']['el-gr'] = "Υποβλήθηκε";
 $text['button-applied']['es-cl'] = "";
 $text['button-applied']['es-mx'] = "";
-$text['button-applied']['fr-ca'] = "";
-$text['button-applied']['fr-fr'] = "";
+$text['button-applied']['fr-ca'] = "appliqué";
+$text['button-applied']['fr-fr'] = "appliqué";
 $text['button-applied']['he-il'] = "";
 $text['button-applied']['it-it'] = "Applicato";
 $text['button-applied']['nl-nl'] = "";
-$text['button-applied']['pl-pl'] = "";
+$text['button-applied']['pl-pl'] = "Zastosowano";
 $text['button-applied']['pt-br'] = "Aplicado";
 $text['button-applied']['pt-pt'] = "";
 $text['button-applied']['ro-ro'] = "";
@@ -639,12 +639,12 @@ $text['button-xml']['de-de'] = "XML";
 $text['button-xml']['el-gr'] = "XML";
 $text['button-xml']['es-cl'] = "";
 $text['button-xml']['es-mx'] = "";
-$text['button-xml']['fr-ca'] = "";
-$text['button-xml']['fr-fr'] = "";
+$text['button-xml']['fr-ca'] = "XML";
+$text['button-xml']['fr-fr'] = "XML";
 $text['button-xml']['he-il'] = "";
 $text['button-xml']['it-it'] = "XML";
 $text['button-xml']['nl-nl'] = "";
-$text['button-xml']['pl-pl'] = "";
+$text['button-xml']['pl-pl'] = "XML";
 $text['button-xml']['pt-br'] = "XML";
 $text['button-xml']['pt-pt'] = "";
 $text['button-xml']['ro-ro'] = "";
@@ -685,12 +685,12 @@ $text['button-close']['de-de'] = "Schließen";
 $text['button-close']['el-gr'] = "Κλείσιμο";
 $text['button-close']['es-cl'] = "Cerca";
 $text['button-close']['es-mx'] = "Cerca"; //copied from es-cl
-$text['button-close']['fr-ca'] = "Proche"; //copied from fr-fr
-$text['button-close']['fr-fr'] = "Proche";
+$text['button-close']['fr-ca'] = "Fermer"; //copied from fr-fr
+$text['button-close']['fr-fr'] = "Fermer";
 $text['button-close']['he-il'] = "";
 $text['button-close']['it-it'] = "Chiudi";
 $text['button-close']['nl-nl'] = "";
-$text['button-close']['pl-pl'] = "Blisko";
+$text['button-close']['pl-pl'] = "Zamknij";
 $text['button-close']['pt-br'] = "Perto"; //copied from pt-pt
 $text['button-close']['pt-pt'] = "Perto";
 $text['button-close']['ro-ro'] = "";
@@ -713,7 +713,7 @@ $text['button-save']['fr-fr'] = "Sauvegarder";
 $text['button-save']['he-il'] = "שמור";
 $text['button-save']['it-it'] = "Salva";
 $text['button-save']['nl-nl'] = "";
-$text['button-save']['pl-pl'] = "Zachowaj";
+$text['button-save']['pl-pl'] = "Zapisz";
 $text['button-save']['pt-br'] = "Salvar";
 $text['button-save']['pt-pt'] = "Guardar";
 $text['button-save']['ro-ro'] = "Salvează";
@@ -731,12 +731,12 @@ $text['button-send']['de-de'] = "";
 $text['button-send']['el-gr'] = "Αποστολή";
 $text['button-send']['es-cl'] = "";
 $text['button-send']['es-mx'] = "";
-$text['button-send']['fr-ca'] = "";
-$text['button-send']['fr-fr'] = "";
+$text['button-send']['fr-ca'] = "Envoyer";
+$text['button-send']['fr-fr'] = "Envoyer";
 $text['button-send']['he-il'] = "";
 $text['button-send']['it-it'] = "";
 $text['button-send']['nl-nl'] = "";
-$text['button-send']['pl-pl'] = "";
+$text['button-send']['pl-pl'] = "Wyślij";
 $text['button-send']['pt-br'] = "Enviar";
 $text['button-send']['pt-pt'] = "";
 $text['button-send']['ro-ro'] = "";
@@ -800,12 +800,12 @@ $text['button-show_local']['de-de'] = "Show Local";
 $text['button-show_local']['el-gr'] = "Show Local";
 $text['button-show_local']['es-cl'] = "Show Local";
 $text['button-show_local']['es-mx'] = "Show Local";
-$text['button-show_local']['fr-ca'] = "Show Local";
-$text['button-show_local']['fr-fr'] = "Show Local";
+$text['button-show_local']['fr-ca'] = "Afficher Local";
+$text['button-show_local']['fr-fr'] = "Afficher Local";
 $text['button-show_local']['he-il'] = "Show Local";
 $text['button-show_local']['it-it'] = "Show Local";
 $text['button-show_local']['nl-nl'] = "Show Local";
-$text['button-show_local']['pl-pl'] = "Show Local";
+$text['button-show_local']['pl-pl'] = "Pokaż Lokalne";
 $text['button-show_local']['pt-br'] = "Show Local";
 $text['button-show_local']['pt-pt'] = "Show Local";
 $text['button-show_local']['ro-ro'] = "Show Local";
@@ -846,7 +846,7 @@ $text['button-reset']['de-de'] = "Zurücksetzen";
 $text['button-reset']['el-gr'] = "Επαναφορά";
 $text['button-reset']['es-cl'] = "Reajustar";
 $text['button-reset']['es-mx'] = "Reajustar"; //copied from es-cl
-$text['button-reset']['fr-ca'] = "Remettre"; //copied from fr-fr
+$text['button-reset']['fr-ca'] = "Réinitialiser";
 $text['button-reset']['fr-fr'] = "Remettre";
 $text['button-reset']['he-il'] = "אפס";
 $text['button-reset']['it-it'] = "Resetta";
@@ -892,12 +892,12 @@ $text['button-login']['de-de'] = "Anmelden";
 $text['button-login']['el-gr'] = "Είσοδος";
 $text['button-login']['es-cl'] = "Ingresar";
 $text['button-login']['es-mx'] = "Ingresar"; //copied from es-cl
-$text['button-login']['fr-ca'] = "connexion"; //copied from fr-fr
-$text['button-login']['fr-fr'] = "connexion";
+$text['button-login']['fr-ca'] = "Connexion"; //copied from fr-fr
+$text['button-login']['fr-fr'] = "Connexion";
 $text['button-login']['he-il'] = "כניסה";
 $text['button-login']['it-it'] = "Login";
 $text['button-login']['nl-nl'] = "";
-$text['button-login']['pl-pl'] = "Użytkownik";
+$text['button-login']['pl-pl'] = "Zaloguj się";
 $text['button-login']['pt-br'] = "Entrar"; //copied from pt-pt
 $text['button-login']['pt-pt'] = "Iniciar Sessão";
 $text['button-login']['ro-ro'] = "Autentificare";
@@ -915,12 +915,12 @@ $text['button-next']['de-de'] = "Nächste";
 $text['button-next']['el-gr'] = "Επόμενο";
 $text['button-next']['es-cl'] = "";
 $text['button-next']['es-mx'] = "";
-$text['button-next']['fr-ca'] = "";
-$text['button-next']['fr-fr'] = "";
+$text['button-next']['fr-ca'] = "Suivant";
+$text['button-next']['fr-fr'] = "Suivant";
 $text['button-next']['he-il'] = "";
 $text['button-next']['it-it'] = "Avanti";
 $text['button-next']['nl-nl'] = "";
-$text['button-next']['pl-pl'] = "";
+$text['button-next']['pl-pl'] = "Następne";
 $text['button-next']['pt-br'] = "Próximo";
 $text['button-next']['pt-pt'] = "";
 $text['button-next']['ro-ro'] = "";
@@ -984,7 +984,7 @@ $text['button-edit']['de-de'] = "Bearbeiten";
 $text['button-edit']['el-gr'] = "Επεξεργασία";
 $text['button-edit']['es-cl'] = "Editar";
 $text['button-edit']['es-mx'] = "Editar"; //copied from es-cl
-$text['button-edit']['fr-ca'] = "Editer"; //copied from fr-fr
+$text['button-edit']['fr-ca'] = "Modifier";
 $text['button-edit']['fr-fr'] = "Editer";
 $text['button-edit']['he-il'] = " עריכה";
 $text['button-edit']['it-it'] = "Modifica";
@@ -1058,7 +1058,7 @@ $text['button-reload']['fr-fr'] = "Recharger";
 $text['button-reload']['he-il'] = "";
 $text['button-reload']['it-it'] = "Ricarica";
 $text['button-reload']['nl-nl'] = "";
-$text['button-reload']['pl-pl'] = "Przeładować";
+$text['button-reload']['pl-pl'] = "Przeładowanie";
 $text['button-reload']['pt-br'] = "Recarregar"; //copied from pt-pt
 $text['button-reload']['pt-pt'] = "Recarregar";
 $text['button-reload']['ro-ro'] = "";
@@ -1076,7 +1076,7 @@ $text['button-paste']['de-de'] = "Einfügen";
 $text['button-paste']['el-gr'] = "Επικόλληση";
 $text['button-paste']['es-cl'] = "Propagar";
 $text['button-paste']['es-mx'] = "Propagar"; //copied from es-cl
-$text['button-paste']['fr-ca'] = "Propager"; //copied from fr-fr
+$text['button-paste']['fr-ca'] = "Coller";
 $text['button-paste']['fr-fr'] = "Propager";
 $text['button-paste']['he-il'] = "";
 $text['button-paste']['it-it'] = "Incolla";
@@ -1168,7 +1168,7 @@ $text['button-upload']['de-de'] = "Hochladen";
 $text['button-upload']['el-gr'] = "Μεταφόρτωση";
 $text['button-upload']['es-cl'] = "Subir";
 $text['button-upload']['es-mx'] = "Subir"; //copied from es-cl
-$text['button-upload']['fr-ca'] = "déposer"; //copied from fr-fr
+$text['button-upload']['fr-ca'] = "télécharger";
 $text['button-upload']['fr-fr'] = "déposer";
 $text['button-upload']['he-il'] = "";
 $text['button-upload']['it-it'] = "Carica";
@@ -1214,8 +1214,8 @@ $text['button-downloads']['de-de'] = "Herunterladen";
 $text['button-downloads']['el-gr'] = "Αρχεία";
 $text['button-downloads']['es-cl'] = "Descargar";
 $text['button-downloads']['es-mx'] = "Descargar"; //copied from es-cl
-$text['button-downloads']['fr-ca'] = "Télécharger"; //copied from fr-fr
-$text['button-downloads']['fr-fr'] = "Télécharger";
+$text['button-downloads']['fr-ca'] = "Téléchargement"; //copied from fr-fr
+$text['button-downloads']['fr-fr'] = "Téléchargement";
 $text['button-downloads']['he-il'] = "";
 $text['button-downloads']['it-it'] = "Scarica";
 $text['button-downloads']['nl-nl'] = "";
@@ -1329,12 +1329,12 @@ $text['button-stop']['de-de'] = "Stopp";
 $text['button-stop']['el-gr'] = "Διακοπή";
 $text['button-stop']['es-cl'] = "Detener";
 $text['button-stop']['es-mx'] = "Detener"; //copied from es-cl
-$text['button-stop']['fr-ca'] = "Stop"; //copied from fr-fr
-$text['button-stop']['fr-fr'] = "Stop";
+$text['button-stop']['fr-ca'] = "Arrêter";
+$text['button-stop']['fr-fr'] = "Arrêter";
 $text['button-stop']['he-il'] = "";
 $text['button-stop']['it-it'] = "Ferma";
 $text['button-stop']['nl-nl'] = "";
-$text['button-stop']['pl-pl'] = "Zatrzymaj rozsylanie rozmów";
+$text['button-stop']['pl-pl'] = "Stop";
 $text['button-stop']['pt-br'] = "Parar";
 $text['button-stop']['pt-pt'] = "Parar";
 $text['button-stop']['ro-ro'] = "";
@@ -1352,8 +1352,8 @@ $text['button-status']['de-de'] = "Status";
 $text['button-status']['el-gr'] = "Κατάσταση";
 $text['button-status']['es-cl'] = "Estado";
 $text['button-status']['es-mx'] = "Estado"; //copied from es-cl
-$text['button-status']['fr-ca'] = "Etat"; //copied from fr-fr
-$text['button-status']['fr-fr'] = "Etat";
+$text['button-status']['fr-ca'] = "État"; //copied from fr-fr
+$text['button-status']['fr-fr'] = "État";
 $text['button-status']['he-il'] = "";
 $text['button-status']['it-it'] = "Stato";
 $text['button-status']['nl-nl'] = "";
@@ -1398,12 +1398,12 @@ $text['button-overview']['de-de'] = "";
 $text['button-overview']['el-gr'] = "Επισκόπηση";
 $text['button-overview']['es-cl'] = "";
 $text['button-overview']['es-mx'] = "";
-$text['button-overview']['fr-ca'] = "";
-$text['button-overview']['fr-fr'] = "";
+$text['button-overview']['fr-ca'] = "Aperçu";
+$text['button-overview']['fr-fr'] = "Aperçu";
 $text['button-overview']['he-il'] = "";
 $text['button-overview']['it-it'] = "";
 $text['button-overview']['nl-nl'] = "";
-$text['button-overview']['pl-pl'] = "";
+$text['button-overview']['pl-pl'] = "Przegląd";
 $text['button-overview']['pt-br'] = "Visão Geral";
 $text['button-overview']['pt-pt'] = "";
 $text['button-overview']['ro-ro'] = "";
@@ -1421,12 +1421,12 @@ $text['button-summary']['de-de'] = "";
 $text['button-summary']['el-gr'] = "Σύνοψη";
 $text['button-summary']['es-cl'] = "";
 $text['button-summary']['es-mx'] = "";
-$text['button-summary']['fr-ca'] = "";
-$text['button-summary']['fr-fr'] = "";
+$text['button-summary']['fr-ca'] = "Somaire";
+$text['button-summary']['fr-fr'] = "Somaire";
 $text['button-summary']['he-il'] = "";
 $text['button-summary']['it-it'] = "";
 $text['button-summary']['nl-nl'] = "";
-$text['button-summary']['pl-pl'] = "";
+$text['button-summary']['pl-pl'] = "Podsumowanie";
 $text['button-summary']['pt-br'] = "Sumário";
 $text['button-summary']['pt-pt'] = "";
 $text['button-summary']['ro-ro'] = "";
@@ -1535,12 +1535,12 @@ $text['button-toggle']['de-de'] = "Toggle";
 $text['button-toggle']['el-gr'] = "Εναλλαγή";
 $text['button-toggle']['es-cl'] = "Toggle";
 $text['button-toggle']['es-mx'] = "Toggle";
-$text['button-toggle']['fr-ca'] = "Toggle";
-$text['button-toggle']['fr-fr'] = "Toggle";
+$text['button-toggle']['fr-ca'] = "Basculer";
+$text['button-toggle']['fr-fr'] = "Basculer";
 $text['button-toggle']['he-il'] = "Toggle";
 $text['button-toggle']['it-it'] = "Toggle";
 $text['button-toggle']['nl-nl'] = "Toggle";
-$text['button-toggle']['pl-pl'] = "Toggle";
+$text['button-toggle']['pl-pl'] = "Przełącz";
 $text['button-toggle']['pt-br'] = "Alterar";
 $text['button-toggle']['pt-pt'] = "Toggle";
 $text['button-toggle']['ro-ro'] = "Toggle";
@@ -1557,12 +1557,12 @@ $text['button-check_all']['de-de'] = "Check All";
 $text['button-check_all']['el-gr'] = "Επιλογή όλων";
 $text['button-check_all']['es-cl'] = "Check All";
 $text['button-check_all']['es-mx'] = "Check All";
-$text['button-check_all']['fr-ca'] = "Check All";
-$text['button-check_all']['fr-fr'] = "Check All";
+$text['button-check_all']['fr-ca'] = "Cochez Tout";
+$text['button-check_all']['fr-fr'] = "Cochez Tout";
 $text['button-check_all']['he-il'] = "Check All";
 $text['button-check_all']['it-it'] = "Check All";
 $text['button-check_all']['nl-nl'] = "Check All";
-$text['button-check_all']['pl-pl'] = "Check All";
+$text['button-check_all']['pl-pl'] = "Zaznacz Wszystkie";
 $text['button-check_all']['pt-br'] = "Marcar tudo";
 $text['button-check_all']['pt-pt'] = "Check All";
 $text['button-check_all']['ro-ro'] = "Check All";
@@ -1579,12 +1579,12 @@ $text['button-check_none']['de-de'] = "Check None";
 $text['button-check_none']['el-gr'] = "Αποεπιλογή όλων";
 $text['button-check_none']['es-cl'] = "Check None";
 $text['button-check_none']['es-mx'] = "Check None";
-$text['button-check_none']['fr-ca'] = "Check None";
-$text['button-check_none']['fr-fr'] = "Check None";
+$text['button-check_none']['fr-ca'] = "Cochez Aucune";
+$text['button-check_none']['fr-fr'] = "Cochez Aucune";
 $text['button-check_none']['he-il'] = "Check None";
 $text['button-check_none']['it-it'] = "Check None";
 $text['button-check_none']['nl-nl'] = "Check None";
-$text['button-check_none']['pl-pl'] = "Check None";
+$text['button-check_none']['pl-pl'] = "Zaznacz Żaden";
 $text['button-check_none']['pt-br'] = "Desmarcar tudo";
 $text['button-check_none']['pt-pt'] = "Check None";
 $text['button-check_none']['ro-ro'] = "Check None";
@@ -1601,12 +1601,12 @@ $text['button-install']['de-de'] = "Install";
 $text['button-install']['el-gr'] = "Install";
 $text['button-install']['es-cl'] = "Install";
 $text['button-install']['es-mx'] = "Install"; //copied from es-cl
-$text['button-install']['fr-ca'] = "Install"; //copied from fr-fr
-$text['button-install']['fr-fr'] = "Install";
+$text['button-install']['fr-ca'] = "Installer"; //copied from fr-fr
+$text['button-install']['fr-fr'] = "Installer";
 $text['button-install']['he-il'] = "Install";
 $text['button-install']['it-it'] = "Install";
 $text['button-install']['nl-nl'] = "Install";
-$text['button-install']['pl-pl'] = "Install";
+$text['button-install']['pl-pl'] = "Instaluj";
 $text['button-install']['pt-br'] = "Install";
 $text['button-install']['pt-pt'] = "Install";
 $text['button-install']['ro-ro'] = "Install";
@@ -1732,12 +1732,12 @@ $text['label-installed']['de-de'] = "Installed";
 $text['label-installed']['el-gr'] = "Installed";
 $text['label-installed']['es-cl'] = "Installed";
 $text['label-installed']['es-mx'] = "Installed"; //copied from es-cl
-$text['label-installed']['fr-ca'] = "Installed"; //copied from fr-fr
-$text['label-installed']['fr-fr'] = "Installed";
+$text['label-installed']['fr-ca'] = "Installé"; //copied from fr-fr
+$text['label-installed']['fr-fr'] = "Installé";
 $text['label-installed']['he-il'] = "Installed";
 $text['label-installed']['it-it'] = "Installed";
 $text['label-installed']['nl-nl'] = "Installed";
-$text['label-installed']['pl-pl'] = "Installed";
+$text['label-installed']['pl-pl'] = "Zainstalowane";
 $text['label-installed']['pt-br'] = "Installed";
 $text['label-installed']['pt-pt'] = "Installed";
 $text['label-installed']['ro-ro'] = "Installed";
@@ -1778,12 +1778,12 @@ $text['label-overview']['de-de'] = "";
 $text['label-overview']['el-gr'] = "Επισκόπηση";
 $text['label-overview']['es-cl'] = "";
 $text['label-overview']['es-mx'] = "";
-$text['label-overview']['fr-ca'] = "";
-$text['label-overview']['fr-fr'] = "";
+$text['label-overview']['fr-ca'] = "Aperçu";
+$text['label-overview']['fr-fr'] = "Aperçu";
 $text['label-overview']['he-il'] = "";
 $text['label-overview']['it-it'] = "";
 $text['label-overview']['nl-nl'] = "";
-$text['label-overview']['pl-pl'] = "";
+$text['label-overview']['pl-pl'] = "Przegląd";
 $text['label-overview']['pt-br'] = "Visão Geral";
 $text['label-overview']['pt-pt'] = "";
 $text['label-overview']['ro-ro'] = "";
@@ -1801,12 +1801,12 @@ $text['label-summary']['de-de'] = "";
 $text['label-summary']['el-gr'] = "Σύνοψη";
 $text['label-summary']['es-cl'] = "";
 $text['label-summary']['es-mx'] = "";
-$text['label-summary']['fr-ca'] = "";
-$text['label-summary']['fr-fr'] = "";
+$text['label-summary']['fr-ca'] = "Sommaire";
+$text['label-summary']['fr-fr'] = "Sommaire";
 $text['label-summary']['he-il'] = "";
 $text['label-summary']['it-it'] = "";
 $text['label-summary']['nl-nl'] = "";
-$text['label-summary']['pl-pl'] = "";
+$text['label-summary']['pl-pl'] = "Podsumowanie";
 $text['label-summary']['pt-br'] = "Sumário";
 $text['label-summary']['pt-pt'] = "";
 $text['label-summary']['ro-ro'] = "";
@@ -1852,7 +1852,7 @@ $text['description-import']['fr-fr'] = "";
 $text['description-import']['he-il'] = "";
 $text['description-import']['it-it'] = "";
 $text['description-import']['nl-nl'] = "";
-$text['description-import']['pl-pl'] = "";
+$text['description-import']['pl-pl'] = "Prześlij rozdzielone dane, aby dodać wiele rekordów.";
 $text['description-import']['pt-br'] = "Carregue um arquivo com dados delimitados para adicionar múltiplos registros.";
 $text['description-import']['pt-pt'] = "";
 $text['description-import']['ro-ro'] = "";
@@ -1874,7 +1874,7 @@ $text['label-import_data']['fr-fr'] = "Donnée";
 $text['label-import_data']['he-il'] = "";
 $text['label-import_data']['it-it'] = "";
 $text['label-import_data']['nl-nl'] = "";
-$text['label-import_data']['pl-pl'] = "";
+$text['label-import_data']['pl-pl'] = "Data";
 $text['label-import_data']['pt-br'] = "Dados"; //copied from pt-pt
 $text['label-import_data']['pt-pt'] = "Dados";
 $text['label-import_data']['ro-ro'] = "";
@@ -1920,7 +1920,7 @@ $text['label-import_enclosure']['fr-fr'] = "Délimiteur de texte";
 $text['label-import_enclosure']['he-il'] = "";
 $text['label-import_enclosure']['it-it'] = "";
 $text['label-import_enclosure']['nl-nl'] = "";
-$text['label-import_enclosure']['pl-pl'] = "Załącznik ";
+$text['label-import_enclosure']['pl-pl'] = "Załącznik";
 $text['label-import_enclosure']['pt-br'] = "Delimitador de texto";
 $text['label-import_enclosure']['pt-pt'] = "Delimitador de texto";
 $text['label-import_enclosure']['ro-ro'] = "";
@@ -1966,7 +1966,7 @@ $text['label-from_row']['fr-fr'] = "";
 $text['label-from_row']['he-il'] = "";
 $text['label-from_row']['it-it'] = "";
 $text['label-from_row']['nl-nl'] = "";
-$text['label-from_row']['pl-pl'] = "";
+$text['label-from_row']['pl-pl'] = "Z Wiersza";
 $text['label-from_row']['pt-br'] = "Da Linha";
 $text['label-from_row']['pt-pt'] = "";
 $text['label-from_row']['ro-ro'] = "";
@@ -1983,12 +1983,12 @@ $text['description-from_row']['de-de'] = "";
 $text['description-from_row']['el-gr'] = "Έναρξη εισαγωγής δεδομένων από αυτή τη γραμμή.";
 $text['description-from_row']['es-cl'] = "";
 $text['description-from_row']['es-mx'] = "";
-$text['description-from_row']['fr-ca'] = "";
-$text['description-from_row']['fr-fr'] = "";
+$text['description-from_row']['fr-ca'] = "Commencer à importer les données de cette ligne";
+$text['description-from_row']['fr-fr'] = "Commencer à importer les données de cette ligne";
 $text['description-from_row']['he-il'] = "";
 $text['description-from_row']['it-it'] = "";
 $text['description-from_row']['nl-nl'] = "";
-$text['description-from_row']['pl-pl'] = "";
+$text['description-from_row']['pl-pl'] = "Rozpocznij importowanie danych z tego wiersza.";
 $text['description-from_row']['pt-br'] = "Inicia a importação de dados a partir desta linha.";
 $text['description-from_row']['pt-pt'] = "";
 $text['description-from_row']['ro-ro'] = "";
@@ -2010,7 +2010,7 @@ $text['description-import_data']['fr-fr'] = "Copier et coller les données sépa
 $text['description-import_data']['he-il'] = "";
 $text['description-import_data']['it-it'] = "";
 $text['description-import_data']['nl-nl'] = "";
-$text['description-import_data']['pl-pl'] = "";
+$text['description-import_data']['pl-pl'] = "Skopiuj i wklej dane rozdzielone przecinkami do obszaru tekstowego, aby rozpocząć importowanie.";
 $text['description-import_data']['pt-br'] = "Copie e cole os dados separados por vírgula para iniciar a importação."; //copied from pt-pt
 $text['description-import_data']['pt-pt'] = "Copie e cole os dados separados por vírgula para iniciar a importação.";
 $text['description-import_data']['ro-ro'] = "";
@@ -2171,7 +2171,7 @@ $text['option-this_week']['fr-fr'] = "Cette Semaine";
 $text['option-this_week']['he-il'] = "";
 $text['option-this_week']['it-it'] = "";
 $text['option-this_week']['nl-nl'] = "";
-$text['option-this_week']['pl-pl'] = "W tym miesiącu";
+$text['option-this_week']['pl-pl'] = "W tym tygodniu";
 $text['option-this_week']['pt-br'] = "Este Semana";
 $text['option-this_week']['pt-pt'] = "Esta Semana";
 $text['option-this_week']['ro-ro'] = "";
@@ -2258,12 +2258,12 @@ $text['option-hour']['de-de'] = "";
 $text['option-hour']['el-gr'] = "Ώρα";
 $text['option-hour']['es-cl'] = "";
 $text['option-hour']['es-mx'] = ""; //copied from es-cl
-$text['option-hour']['fr-ca'] = ""; //copied from fr-fr
-$text['option-hour']['fr-fr'] = "";
+$text['option-hour']['fr-ca'] = "Heure"; //copied from fr-fr
+$text['option-hour']['fr-fr'] = "Heure";
 $text['option-hour']['he-il'] = "";
 $text['option-hour']['it-it'] = "";
 $text['option-hour']['nl-nl'] = "";
-$text['option-hour']['pl-pl'] = "";
+$text['option-hour']['pl-pl'] = "Godzina";
 $text['option-hour']['pt-br'] = "Hora";
 $text['option-hour']['pt-pt'] = "";
 $text['option-hour']['ro-ro'] = "";
@@ -2281,12 +2281,12 @@ $text['option-day']['de-de'] = "";
 $text['option-day']['el-gr'] = "Ημέρα";
 $text['option-day']['es-cl'] = "";
 $text['option-day']['es-mx'] = ""; //copied from es-cl
-$text['option-day']['fr-ca'] = ""; //copied from fr-fr
-$text['option-day']['fr-fr'] = "";
+$text['option-day']['fr-ca'] = "Jour"; //copied from fr-fr
+$text['option-day']['fr-fr'] = "Jour";
 $text['option-day']['he-il'] = "";
 $text['option-day']['it-it'] = "";
 $text['option-day']['nl-nl'] = "";
-$text['option-day']['pl-pl'] = "";
+$text['option-day']['pl-pl'] = "Dzień";
 $text['option-day']['pt-br'] = "Dia";
 $text['option-day']['pt-pt'] = "";
 $text['option-day']['ro-ro'] = "";
@@ -2309,7 +2309,7 @@ $text['option-week']['fr-fr'] = "Semaine";
 $text['option-week']['he-il'] = "";
 $text['option-week']['it-it'] = "";
 $text['option-week']['nl-nl'] = "";
-$text['option-week']['pl-pl'] = "W tym miesiącu";
+$text['option-week']['pl-pl'] = "Tydzień";
 $text['option-week']['pt-br'] = "Semana";
 $text['option-week']['pt-pt'] = "Semana";
 $text['option-week']['ro-ro'] = "";
@@ -2332,7 +2332,7 @@ $text['option-month']['fr-fr'] = "Mois";
 $text['option-month']['he-il'] = "";
 $text['option-month']['it-it'] = "";
 $text['option-month']['nl-nl'] = "";
-$text['option-month']['pl-pl'] = "Miesiącu";
+$text['option-month']['pl-pl'] = "Miesiąc";
 $text['option-month']['pt-br'] = "Mês";
 $text['option-month']['pt-pt'] = "Mês";
 $text['option-month']['ro-ro'] = "";
@@ -2355,7 +2355,7 @@ $text['option-year']['fr-fr'] = "Année";
 $text['option-year']['he-il'] = "";
 $text['option-year']['it-it'] = "";
 $text['option-year']['nl-nl'] = "";
-$text['option-year']['pl-pl'] = "W tym roku";
+$text['option-year']['pl-pl'] = "Rok";
 $text['option-year']['pt-br'] = "Ano";
 $text['option-year']['pt-pt'] = "Ano";
 $text['option-year']['ro-ro'] = "";
@@ -2447,7 +2447,7 @@ $text['label-start']['fr-fr'] = "Démarrer";
 $text['label-start']['he-il'] = "";
 $text['label-start']['it-it'] = "";
 $text['label-start']['nl-nl'] = "";
-$text['label-start']['pl-pl'] = "Początek rozmowy";
+$text['label-start']['pl-pl'] = "Start";
 $text['label-start']['pt-br'] = "Iniciar";
 $text['label-start']['pt-pt'] = "Começo";
 $text['label-start']['ro-ro'] = "";
@@ -2493,7 +2493,7 @@ $text['label-end_stamp']['fr-fr'] = "Fin";
 $text['label-end_stamp']['he-il'] = "";
 $text['label-end_stamp']['it-it'] = "";
 $text['label-end_stamp']['nl-nl'] = "";
-$text['label-end_stamp']['pl-pl'] = "koniec";
+$text['label-end_stamp']['pl-pl'] = "Koniec";
 $text['label-end_stamp']['pt-br'] = "Fim"; //copied from pt-pt
 $text['label-end_stamp']['pt-pt'] = "Fim";
 $text['label-end_stamp']['ro-ro'] = "";
@@ -2993,7 +2993,7 @@ $text['label-settings']['de-de'] = "Einstellungen";
 $text['label-settings']['el-gr'] = "Global";
 $text['label-settings']['es-cl'] = "Global";
 $text['label-settings']['es-mx'] = "Global"; //copied from es-cl
-$text['label-settings']['fr-ca'] = "Global"; //copied from fr-fr
+$text['label-settings']['fr-ca'] = "Paramètres";
 $text['label-settings']['fr-fr'] = "Configuration";
 $text['label-settings']['he-il'] = "Global";
 $text['label-settings']['it-it'] = "Parametri";
@@ -3067,7 +3067,7 @@ $text['label-search']['fr-fr'] = "Recherche...";
 $text['label-search']['he-il'] = "תוצאות חיפוש";
 $text['label-search']['it-it'] = "Ricerca...";
 $text['label-search']['nl-nl'] = "";
-$text['label-search']['pl-pl'] = "Szukaj ...";
+$text['label-search']['pl-pl'] = "Szukaj...";
 $text['label-search']['pt-br'] = "Pesquisar..."; //copied from pt-pt
 $text['label-search']['pt-pt'] = "Pesquisa...";
 $text['label-search']['ro-ro'] = "";
@@ -3108,12 +3108,12 @@ $text['label-level']['de-de'] = "";
 $text['label-level']['el-gr'] = "Επίπεδο";
 $text['label-level']['es-cl'] = "";
 $text['label-level']['es-mx'] = ""; //copied from es-cl
-$text['label-level']['fr-ca'] = ""; //copied from fr-fr
-$text['label-level']['fr-fr'] = "";
+$text['label-level']['fr-ca'] = "Niveau"; //copied from fr-fr
+$text['label-level']['fr-fr'] = "Niveau";
 $text['label-level']['he-il'] = "";
 $text['label-level']['it-it'] = "";
 $text['label-level']['nl-nl'] = "";
-$text['label-level']['pl-pl'] = "";
+$text['label-level']['pl-pl'] = "Poziom";
 $text['label-level']['pt-br'] = "Nível";
 $text['label-level']['pt-pt'] = "";
 $text['label-level']['ro-ro'] = "";
@@ -3154,12 +3154,12 @@ $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']['fr-ca'] = "Mis à Jour"; //copied from fr-fr
+$text['label-update']['fr-fr'] = "Mis à Jour";
 $text['label-update']['he-il'] = "";
 $text['label-update']['it-it'] = "";
 $text['label-update']['nl-nl'] = "";
-$text['label-update']['pl-pl'] = "";
+$text['label-update']['pl-pl'] = "Zaktualizuj";
 $text['label-update']['pt-br'] = ""; //copied from pt-pt
 $text['label-update']['pt-pt'] = "";
 $text['label-update']['ro-ro'] = "";
@@ -3205,7 +3205,7 @@ $text['label-actions']['fr-fr'] = "Actions";
 $text['label-actions']['he-il'] = "פעולות";
 $text['label-actions']['it-it'] = "Azioni";
 $text['label-actions']['nl-nl'] = "";
-$text['label-actions']['pl-pl'] = "Operacje (gdzie przesłać rozmowę).";
+$text['label-actions']['pl-pl'] = "Akcje";
 $text['label-actions']['pt-br'] = "Ações"; //copied from pt-pt
 $text['label-actions']['pt-pt'] = "Ações";
 $text['label-actions']['ro-ro'] = "";
@@ -3227,7 +3227,7 @@ $text['label-action']['fr-fr'] = "Action";
 $text['label-action']['he-il'] = "פעולות";
 $text['label-action']['it-it'] = "Azioni";
 $text['label-action']['nl-nl'] = "";
-$text['label-action']['pl-pl'] = "Operacje (gdzie przesłać rozmowę).";
+$text['label-action']['pl-pl'] = "Akcja";
 $text['label-action']['pt-br'] = "Açõe"; //copied from pt-pt
 $text['label-action']['pt-pt'] = "Açõe";
 $text['label-action']['ro-ro'] = "";
@@ -3294,7 +3294,7 @@ $text['label-all']['fr-fr'] = "Tout";
 $text['label-all']['he-il'] = "הצג הכל";
 $text['label-all']['it-it'] = "Tutto";
 $text['label-all']['nl-nl'] = "";
-$text['label-all']['pl-pl'] = "wszystkie";
+$text['label-all']['pl-pl'] = "Wszystkie";
 $text['label-all']['pt-br'] = "Todos";
 $text['label-all']['pt-pt'] = "Todos";
 $text['label-all']['ro-ro'] = "";
@@ -3335,8 +3335,8 @@ $text['label-recordings']['de-de'] = "Aufzeichnungen";
 $text['label-recordings']['el-gr'] = "Ηχητικές Εγγραφές";
 $text['label-recordings']['es-cl'] = "Grabaciones";
 $text['label-recordings']['es-mx'] = "Grabaciones"; //copied from es-cl
-$text['label-recordings']['fr-ca'] = "Recordings"; //copied from fr-fr
-$text['label-recordings']['fr-fr'] = "Recordings";
+$text['label-recordings']['fr-ca'] = "Enregistrements"; //copied from fr-fr
+$text['label-recordings']['fr-fr'] = "Enregistrements";
 $text['label-recordings']['he-il'] = "הקלטות";
 $text['label-recordings']['it-it'] = "Registrazioni";
 $text['label-recordings']['nl-nl'] = "Recordings";
@@ -3358,12 +3358,12 @@ $text['label-ringtones']['de-de'] = "Töne";
 $text['label-ringtones']['el-gr'] = "Ήχοι κλήσεων";
 $text['label-ringtones']['es-cl'] = "Tono";
 $text['label-ringtones']['es-mx'] = "Tono"; //copied from es-cl
-$text['label-ringtones']['fr-ca'] = "Ton"; //copied from fr-fr
-$text['label-ringtones']['fr-fr'] = "Ton";
+$text['label-ringtones']['fr-ca'] = "Sonneries"; //copied from fr-fr
+$text['label-ringtones']['fr-fr'] = "Sonneries";
 $text['label-ringtones']['he-il'] = "טוֹן";
 $text['label-ringtones']['it-it'] = "Tono";
 $text['label-ringtones']['nl-nl'] = "Toon";
-$text['label-ringtones']['pl-pl'] = "Ton";
+$text['label-ringtones']['pl-pl'] = "Dzwonki";
 $text['label-ringtones']['pt-br'] = "Tons de toque"; //copied from pt-pt
 $text['label-ringtones']['pt-pt'] = "Tom";
 $text['label-ringtones']['ro-ro'] = "";
@@ -3385,7 +3385,7 @@ $text['label-streams']['fr-fr'] = '';
 $text['label-streams']['he-il'] = '';
 $text['label-streams']['it-it'] = '';
 $text['label-streams']['nl-nl'] = '';
-$text['label-streams']['pl-pl'] = '';
+$text['label-streams']['pl-pl'] = 'Strumienie';
 $text['label-streams']['pt-br'] = 'Fluxo de dados (streams)';
 $text['label-streams']['pt-pt'] = '';
 $text['label-streams']['ro-ro'] = '';
@@ -3402,12 +3402,12 @@ $text['label-tones']['de-de'] = "Töne";
 $text['label-tones']['el-gr'] = "Τονικοί Παλμοί";
 $text['label-tones']['es-cl'] = "Tono";
 $text['label-tones']['es-mx'] = "Tono"; //copied from es-cl
-$text['label-tones']['fr-ca'] = "Ton"; //copied from fr-fr
-$text['label-tones']['fr-fr'] = "Ton";
+$text['label-tones']['fr-ca'] = "Tonalités"; //copied from fr-fr
+$text['label-tones']['fr-fr'] = "Tonalités";
 $text['label-tones']['he-il'] = "טוֹן";
 $text['label-tones']['it-it'] = "Tono";
 $text['label-tones']['nl-nl'] = "Toon";
-$text['label-tones']['pl-pl'] = "Ton";
+$text['label-tones']['pl-pl'] = "Tony";
 $text['label-tones']['pt-br'] = "Tons"; //copied from pt-pt
 $text['label-tones']['pt-pt'] = "Tom";
 $text['label-tones']['ro-ro'] = "";
@@ -3452,7 +3452,7 @@ $text['label-git_branch']['fr-fr'] = "Une succursale";
 $text['label-git_branch']['he-il'] = "";
 $text['label-git_branch']['it-it'] = "Branch:";
 $text['label-git_branch']['nl-nl'] = "";
-$text['label-git_branch']['pl-pl'] = "Gałąź";
+$text['label-git_branch']['pl-pl'] = "Gałąź:";
 $text['label-git_branch']['pt-br'] = "Base"; //copied from pt-pt
 $text['label-git_branch']['pt-pt'] = "Ramo";
 $text['label-git_branch']['ro-ro'] = "";
@@ -3475,7 +3475,7 @@ $text['label-git_commit']['fr-fr'] = "Commettre";
 $text['label-git_commit']['he-il'] = "";
 $text['label-git_commit']['it-it'] = "Commit:";
 $text['label-git_commit']['nl-nl'] = "";
-$text['label-git_commit']['pl-pl'] = "Popełnić";
+$text['label-git_commit']['pl-pl'] = "Zatwierdzenie:";
 $text['label-git_commit']['pt-br'] = "Submeter"; //copied from pt-pt
 $text['label-git_commit']['pt-pt'] = "cometer";
 $text['label-git_commit']['ro-ro'] = "";
@@ -3654,7 +3654,7 @@ $text['option-false']['de-de'] = "Aus";
 $text['option-false']['el-gr'] = "Μη Ενεργό";
 $text['option-false']['es-cl'] = "Falso";
 $text['option-false']['es-mx'] = "Falso"; //copied from es-cl
-$text['option-false']['fr-ca'] = "Non"; //copied from fr-fr
+$text['option-false']['fr-ca'] = "Faux";
 $text['option-false']['fr-fr'] = "Non";
 $text['option-false']['he-il'] = "";
 $text['option-false']['it-it'] = "Falso";
@@ -3677,8 +3677,8 @@ $text['label-label']['de-de'] = "Kennzeichnung";
 $text['label-label']['el-gr'] = "Ετικέτα";
 $text['label-label']['es-cl'] = "Etiqueta";
 $text['label-label']['es-mx'] = "Etiqueta"; //copied from es-cl
-$text['label-label']['fr-ca'] = "Label"; //copied from fr-fr
-$text['label-label']['fr-fr'] = "Label";
+$text['label-label']['fr-ca'] = "Étiquette"; //copied from fr-fr
+$text['label-label']['fr-fr'] = "Étiquette";
 $text['label-label']['he-il'] = "תג";
 $text['label-label']['it-it'] = "Etichetta";
 $text['label-label']['nl-nl'] = "";
@@ -3714,6 +3714,27 @@ $text['label-groups']['sv-se'] = "Grupper";
 $text['label-groups']['uk-ua'] = "Групи";
 $text['label-groups']['tr-tr'] = "Gruplar";
 
+$text['label-group']['en-us'] = "Group";
+$text['label-group']['en-gb'] = "Group";
+$text['label-group']['ar-eg'] = "";
+$text['label-group']['de-at'] = "Gruppe"; //copied from de-de
+$text['label-group']['de-ch'] = "Gruppe"; //copied from de-de
+$text['label-group']['de-de'] = "Gruppe";
+$text['label-group']['es-cl'] = "Grupo";
+$text['label-group']['es-mx'] = "Grupo"; //copied from es-cl
+$text['label-group']['fr-ca'] = "Groupe"; //copied from fr-fr
+$text['label-group']['fr-fr'] = "Groupe";
+$text['label-group']['he-il'] = "קבוצה";
+$text['label-group']['it-it'] = "Gruppo";
+$text['label-group']['nl-nl'] = "";
+$text['label-group']['pl-pl'] = "Grupa";
+$text['label-group']['pt-br'] = "Grupo"; //copied from pt-pt
+$text['label-group']['pt-pt'] = "Grupo";
+$text['label-group']['ro-ro'] = "";
+$text['label-group']['ru-ru'] = "Группа";
+$text['label-group']['sv-se'] = "Grupp";
+$text['label-group']['uk-ua'] = "Група";
+
 $text['label-recording']['en-us'] = "Recording";
 $text['label-recording']['en-gb'] = "Recording";
 $text['label-recording']['ar-eg'] = "";
@@ -3791,8 +3812,8 @@ $text['label-recordings']['de-de'] = "Aufzeichnungen";
 $text['label-recordings']['el-gr'] = "Ηχητικές Εγγραφές";
 $text['label-recordings']['es-cl'] = "Grabaciones";
 $text['label-recordings']['es-mx'] = "Grabaciones"; //copied from es-cl
-$text['label-recordings']['fr-ca'] = "Recordings"; //copied from fr-fr
-$text['label-recordings']['fr-fr'] = "Recordings";
+$text['label-recordings']['fr-ca'] = "Enregistrements"; //copied from fr-fr
+$text['label-recordings']['fr-fr'] = "Enregistrements";
 $text['label-recordings']['he-il'] = "הקלטות";
 $text['label-recordings']['it-it'] = "Registrazioni";
 $text['label-recordings']['nl-nl'] = "Recordings";
@@ -3836,8 +3857,8 @@ $text['label-sounds']['de-de'] = "Ruftöne";
 $text['label-sounds']['el-gr'] = "Ήχοι";
 $text['label-sounds']['es-cl'] = "Sonidos";
 $text['label-sounds']['es-mx'] = "Sonidos"; //copied from es-cl
-$text['label-sounds']['fr-ca'] = "des sons"; //copied from fr-fr
-$text['label-sounds']['fr-fr'] = "des sons";
+$text['label-sounds']['fr-ca'] = "Sons";
+$text['label-sounds']['fr-fr'] = "Sons";
 $text['label-sounds']['he-il'] = "";
 $text['label-sounds']['it-it'] = "";
 $text['label-sounds']['nl-nl'] = "";
@@ -3966,8 +3987,8 @@ $text['label-characters']['de-de'] = "Zeichen";
 $text['label-characters']['el-gr'] = "Χαρακτήρες";
 $text['label-characters']['es-cl'] = "Caracteres";
 $text['label-characters']['es-mx'] = "Caracteres"; //copied from es-cl
-$text['label-characters']['fr-ca'] = "Personnages"; //copied from fr-fr
-$text['label-characters']['fr-fr'] = "Personnages";
+$text['label-characters']['fr-ca'] = "Caractère";
+$text['label-characters']['fr-fr'] = "Caractère";
 $text['label-characters']['he-il'] = "דמויות";
 $text['label-characters']['it-it'] = "Caratteri";
 $text['label-characters']['nl-nl'] = "";
@@ -4032,8 +4053,8 @@ $text['label-uppercase_letters']['de-de'] = "Großbuchstaben";
 $text['label-uppercase_letters']['el-gr'] = "Κεφαλαίοι Χαρακτήρες";
 $text['label-uppercase_letters']['es-cl'] = "Letras mayúsculas";
 $text['label-uppercase_letters']['es-mx'] = "Letras mayúsculas"; //copied from es-cl
-$text['label-uppercase_letters']['fr-ca'] = "Lettres capitales"; //copied from fr-fr
-$text['label-uppercase_letters']['fr-fr'] = "Lettres capitales";
+$text['label-uppercase_letters']['fr-ca'] = "Lettres Majuscules"; //copied from fr-fr
+$text['label-uppercase_letters']['fr-fr'] = "Lettres Majuscules";
 $text['label-uppercase_letters']['he-il'] = "אותיות רישיות";
 $text['label-uppercase_letters']['it-it'] = "Lettere Maiuscole";
 $text['label-uppercase_letters']['nl-nl'] = "";
@@ -4076,12 +4097,12 @@ $text['label-bridges']['de-de'] = '';
 $text['label-bridges']['el-gr'] = 'Bridges';
 $text['label-bridges']['es-cl'] = '';
 $text['label-bridges']['es-mx'] = '';
-$text['label-bridges']['fr-ca'] = '';
-$text['label-bridges']['fr-fr'] = '';
+$text['label-bridges']['fr-ca'] = 'Pont';
+$text['label-bridges']['fr-fr'] = 'Pont';
 $text['label-bridges']['he-il'] = '';
 $text['label-bridges']['it-it'] = '';
 $text['label-bridges']['nl-nl'] = '';
-$text['label-bridges']['pl-pl'] = '';
+$text['label-bridges']['pl-pl'] = 'Mosty';
 $text['label-bridges']['pt-br'] = 'Bridges';
 $text['label-bridges']['pt-pt'] = '';
 $text['label-bridges']['ro-ro'] = '';
@@ -4120,12 +4141,12 @@ $text['label-peak']['de-de'] = "";
 $text['label-peak']['el-gr'] = "Peak";
 $text['label-peak']['es-cl'] = "";
 $text['label-peak']['es-mx'] = "";
-$text['label-peak']['fr-ca'] = "";
-$text['label-peak']['fr-fr'] = "";
+$text['label-peak']['fr-ca'] = "Pic";
+$text['label-peak']['fr-fr'] = "Pic";
 $text['label-peak']['he-il'] = "";
 $text['label-peak']['it-it'] = "";
 $text['label-peak']['nl-nl'] = "";
-$text['label-peak']['pl-pl'] = "";
+$text['label-peak']['pl-pl'] = "Szczyt";
 $text['label-peak']['pt-br'] = "Pico";
 $text['label-peak']['pt-pt'] = "";
 $text['label-peak']['ro-ro'] = "";
@@ -4164,12 +4185,12 @@ $text['label-tickets']['de-de'] = "";
 $text['label-tickets']['el-gr'] = "Tickets";
 $text['label-tickets']['es-cl'] = "";
 $text['label-tickets']['es-mx'] = ""; //copied from es-cl
-$text['label-tickets']['fr-ca'] = ""; //copied from fr-fr
-$text['label-tickets']['fr-fr'] = "";
+$text['label-tickets']['fr-ca'] = "Billets"; //copied from fr-fr
+$text['label-tickets']['fr-fr'] = "Billets";
 $text['label-tickets']['he-il'] = "";
 $text['label-tickets']['it-it'] = "";
 $text['label-tickets']['nl-nl'] = "";
-$text['label-tickets']['pl-pl'] = "";
+$text['label-tickets']['pl-pl'] = "Bilety";
 $text['label-tickets']['pt-br'] = "Tickets"; //copied from pt-pt
 $text['label-tickets']['pt-pt'] = "";
 $text['label-tickets']['ro-ro'] = "";
@@ -4191,7 +4212,7 @@ $text['label-page']['fr-fr'] = "Page";
 $text['label-page']['he-il'] = "";
 $text['label-page']['it-it'] = "Page";
 $text['label-page']['nl-nl'] = "";
-$text['label-page']['pl-pl'] = "";
+$text['label-page']['pl-pl'] = "Strona";
 $text['label-page']['pt-br'] = "Página";
 $text['label-page']['pt-pt'] = "";
 $text['label-page']['ro-ro'] = "";
@@ -4207,12 +4228,12 @@ $text['label-ascending']['de-ch'] = "Ascending";
 $text['label-ascending']['de-de'] = "Ascending";
 $text['label-ascending']['es-cl'] = "Ascending";
 $text['label-ascending']['es-mx'] = "Ascending";
-$text['label-ascending']['fr-ca'] = "Ascending";
-$text['label-ascending']['fr-fr'] = "Ascending";
+$text['label-ascending']['fr-ca'] = "Ascendant";
+$text['label-ascending']['fr-fr'] = "Ascendant";
 $text['label-ascending']['he-il'] = "Ascending";
 $text['label-ascending']['it-it'] = "Ascending";
 $text['label-ascending']['nl-nl'] = "Ascending";
-$text['label-ascending']['pl-pl'] = "Ascending";
+$text['label-ascending']['pl-pl'] = "Rosnąco";
 $text['label-ascending']['pt-br'] = "Ascending";
 $text['label-ascending']['pt-pt'] = "Ascending";
 $text['label-ascending']['ro-ro'] = "Ascending";
@@ -4228,12 +4249,12 @@ $text['label-descending']['de-ch'] = "Descending";
 $text['label-descending']['de-de'] = "Descending";
 $text['label-descending']['es-cl'] = "Descending";
 $text['label-descending']['es-mx'] = "Descending";
-$text['label-descending']['fr-ca'] = "Descending";
-$text['label-descending']['fr-fr'] = "Descending";
+$text['label-descending']['fr-ca'] = "Descendant";
+$text['label-descending']['fr-fr'] = "Descendant";
 $text['label-descending']['he-il'] = "Descending";
 $text['label-descending']['it-it'] = "Descending";
 $text['label-descending']['nl-nl'] = "Descending";
-$text['label-descending']['pl-pl'] = "Descending";
+$text['label-descending']['pl-pl'] = "Malejąco";
 $text['label-descending']['pt-br'] = "Descending";
 $text['label-descending']['pt-pt'] = "Descending";
 $text['label-descending']['ro-ro'] = "Descending";
@@ -4296,7 +4317,7 @@ $text['label-provider']['fr-fr'] = "Fournisseur";
 $text['label-provider']['he-il'] = "";
 $text['label-provider']['it-it'] = "";
 $text['label-provider']['nl-nl'] = "Dienstverlener";
-$text['label-provider']['pl-pl'] = "";
+$text['label-provider']['pl-pl'] = "Dostawca";
 $text['label-provider']['pt-br'] = "Provedores VoIP";
 $text['label-provider']['pt-pt'] = "";
 $text['label-provider']['ro-ro'] = "";
@@ -4304,6 +4325,28 @@ $text['label-provider']['ru-ru'] = "";
 $text['label-provider']['sv-se'] = "";
 $text['label-provider']['uk-ua'] = "";
 
+$text['label-users']['en-us'] = "Users";
+$text['label-users']['en-gb'] = "Users";
+$text['label-users']['ar-eg'] = "";
+$text['label-users']['de-at'] = "Benutzer"; //copied from de-de
+$text['label-users']['de-ch'] = "Benutzer"; //copied from de-de
+$text['label-users']['de-de'] = "Benutzer";
+$text['label-users']['el-gr'] = "Χρήστες";
+$text['label-users']['es-cl'] = "Usuarios";
+$text['label-users']['es-mx'] = "Usuarios"; //copied from es-cl
+$text['label-users']['fr-ca'] = "Utilisateurs"; //copied from fr-fr
+$text['label-users']['fr-fr'] = "Utilisateurs";
+$text['label-users']['he-il'] = "";
+$text['label-users']['it-it'] = "Utenti";
+$text['label-users']['nl-nl'] = "";
+$text['label-users']['pl-pl'] = "Użytkownicy";
+$text['label-users']['pt-br'] = "Usuários";
+$text['label-users']['pt-pt'] = "Utilizadores";
+$text['label-users']['ro-ro'] = "";
+$text['label-users']['ru-ru'] = "Пользователи";
+$text['label-users']['sv-se'] = "Användare";
+$text['label-users']['uk-ua'] = "Користувачі";
+
 $text['label-user']['en-us'] = "User";
 $text['label-user']['en-gb'] = "User";
 $text['label-user']['ar-eg'] = "";
@@ -4334,8 +4377,8 @@ $text['button-tickets']['de-de'] = "";
 $text['button-tickets']['el-gr'] = "Tickets";
 $text['button-tickets']['es-cl'] = "";
 $text['button-tickets']['es-mx'] = ""; //copied from es-cl
-$text['button-tickets']['fr-ca'] = ""; //copied from fr-fr
-$text['button-tickets']['fr-fr'] = "";
+$text['button-tickets']['fr-ca'] = "Billets"; //copied from fr-fr
+$text['button-tickets']['fr-fr'] = "Billets";
 $text['button-tickets']['he-il'] = "";
 $text['button-tickets']['it-it'] = "";
 $text['button-tickets']['nl-nl'] = "";
@@ -4361,7 +4404,7 @@ $text['button-cdr']['fr-fr'] = "";
 $text['button-cdr']['he-il'] = "";
 $text['button-cdr']['it-it'] = "";
 $text['button-cdr']['nl-nl'] = "";
-$text['button-cdr']['pl-pl'] = "";
+$text['button-cdr']['pl-pl'] = "CDR";
 $text['button-cdr']['pt-br'] = "CDR"; //copied from pt-pt
 $text['button-cdr']['pt-pt'] = "";
 $text['button-cdr']['ro-ro'] = "";
@@ -4378,7 +4421,7 @@ $text['button-settings']['de-de'] = "Einstellungen";
 $text['button-settings']['el-gr'] = "Global";
 $text['button-settings']['es-cl'] = "Global";
 $text['button-settings']['es-mx'] = "Global"; //copied from es-cl
-$text['button-settings']['fr-ca'] = "Global"; //copied from fr-fr
+$text['button-settings']['fr-ca'] = "Paramètres"; //copied from fr-fr
 $text['button-settings']['fr-fr'] = "Configuration";
 $text['button-settings']['he-il'] = "Global";
 $text['button-settings']['it-it'] = "Parametri";
@@ -4428,7 +4471,7 @@ $text['description-name']['fr-fr'] = "Écrivez votre nom";
 $text['description-name']['he-il'] = "";
 $text['description-name']['it-it'] = "Inserire il nome.";
 $text['description-name']['nl-nl'] = "";
-$text['description-name']['pl-pl'] = "";
+$text['description-name']['pl-pl'] = "Wprowadź nazwę.";
 $text['description-name']['pt-br'] = "Entre com o nome.";
 $text['description-name']['pt-pt'] = "";
 $text['description-name']['ro-ro'] = "";
@@ -4497,7 +4540,7 @@ $text['description-category']['fr-fr'] = "Entrer la Catégorie.";
 $text['description-category']['he-il'] = "";
 $text['description-category']['it-it'] = "Inserire la categoria.";
 $text['description-category']['nl-nl'] = "";
-$text['description-category']['pl-pl'] = "Wprowadź kategorię";
+$text['description-category']['pl-pl'] = "Wprowadź kategorię.";
 $text['description-category']['pt-br'] = "Entre com a categoria.";
 $text['description-category']['pt-pt'] = "Introduza a categoria.";
 $text['description-category']['ro-ro'] = "";
@@ -4538,8 +4581,8 @@ $text['description-description']['de-de'] = "Geben Sie die Beschreibung ein.";
 $text['description-description']['el-gr'] = "Εισάγετε την περιγραφή.";
 $text['description-description']['es-cl'] = "";
 $text['description-description']['es-mx'] = "";
-$text['description-description']['fr-ca'] = "";
-$text['description-description']['fr-fr'] = "";
+$text['description-description']['fr-ca'] = "Entrez le descriptif";
+$text['description-description']['fr-fr'] = "Entrez le descriptif";
 $text['description-description']['he-il'] = "";
 $text['description-description']['it-it'] = "Inserire la descrizione.";
 $text['description-description']['nl-nl'] = "";
@@ -4561,12 +4604,12 @@ $text['description-enabled']['de-de'] = "Select the current state.";
 $text['description-enabled']['el-gr'] = "Select the current state.";
 $text['description-enabled']['es-cl'] = "Select the current state.";
 $text['description-enabled']['es-mx'] = "Select the current state.";
-$text['description-enabled']['fr-ca'] = "Select the current state.";
-$text['description-enabled']['fr-fr'] = "Select the current state.";
+$text['description-enabled']['fr-ca'] = "Sélectionnez l'état actuel.";
+$text['description-enabled']['fr-fr'] = "Sélectionnez l'état actuel.";
 $text['description-enabled']['he-il'] = "Select the current state.";
 $text['description-enabled']['it-it'] = "Select the current state.";
 $text['description-enabled']['nl-nl'] = "Select the current state.";
-$text['description-enabled']['pl-pl'] = "Select the current state.";
+$text['description-enabled']['pl-pl'] = "Wybierz obecny stan.";
 $text['description-enabled']['pt-br'] = "Select the current state.";
 $text['description-enabled']['pt-pt'] = "Select the current state.";
 $text['description-enabled']['ro-ro'] = "Select the current state.";
@@ -4605,12 +4648,12 @@ $text['description-domain_name']['de-ch'] = "";
 $text['description-domain_name']['de-de'] = "";
 $text['description-domain_name']['es-cl'] = "";
 $text['description-domain_name']['es-mx'] = "";
-$text['description-domain_name']['fr-ca'] = "";
-$text['description-domain_name']['fr-fr'] = "";
+$text['description-domain_name']['fr-ca'] = "Sélectionnez le domaine";
+$text['description-domain_name']['fr-fr'] = "Sélectionnez le domaine";
 $text['description-domain_name']['he-il'] = "";
 $text['description-domain_name']['it-it'] = "";
 $text['description-domain_name']['nl-nl'] = "";
-$text['description-domain_name']['pl-pl'] = "";
+$text['description-domain_name']['pl-pl'] = "Wybierz domenę";
 $text['description-domain_name']['pt-br'] = "";
 $text['description-domain_name']['pt-pt'] = "";
 $text['description-domain_name']['ro-ro'] = "";
@@ -4651,8 +4694,8 @@ $text['option-expanded']['el-gr'] = "Expanded";
 $text['option-expanded']['es-cl'] = "Expanded";
 $text['option-expanded']['es-mx'] = "Expanded";
 $text['option-expanded']['fr-ca'] = "Expanded";
-$text['option-expanded']['fr-fr'] = "Expanded";
-$text['option-expanded']['he-il'] = "Expanded";
+$text['option-expanded']['fr-fr'] = "Étendu";
+$text['option-expanded']['he-il'] = "Étendu";
 $text['option-expanded']['it-it'] = "Expanded";
 $text['option-expanded']['nl-nl'] = "Expanded";
 $text['option-expanded']['pl-pl'] = "Expanded";
@@ -4673,8 +4716,8 @@ $text['option-contracted']['de-de'] = "Contracted";
 $text['option-contracted']['el-gr'] = "Contracted";
 $text['option-contracted']['es-cl'] = "Contracted";
 $text['option-contracted']['es-mx'] = "Contracted";
-$text['option-contracted']['fr-ca'] = "Contracted";
-$text['option-contracted']['fr-fr'] = "Contracted";
+$text['option-contracted']['fr-ca'] = "Contracté";
+$text['option-contracted']['fr-fr'] = "Contracté";
 $text['option-contracted']['he-il'] = "Contracted";
 $text['option-contracted']['it-it'] = "Contracted";
 $text['option-contracted']['nl-nl'] = "Contracted";
@@ -4696,8 +4739,8 @@ $text['option-hidden']['de-de'] = "Hidden";
 $text['option-hidden']['el-gr'] = "Hidden";
 $text['option-hidden']['es-cl'] = "Hidden";
 $text['option-hidden']['es-mx'] = "Hidden";
-$text['option-hidden']['fr-ca'] = "Hidden";
-$text['option-hidden']['fr-fr'] = "Hidden";
+$text['option-hidden']['fr-ca'] = "Caché";
+$text['option-hidden']['fr-fr'] = "Caché";
 $text['option-hidden']['he-il'] = "Hidden";
 $text['option-hidden']['it-it'] = "Hidden";
 $text['option-hidden']['nl-nl'] = "Hidden";
@@ -4802,4 +4845,50 @@ $text['option-fixed']['sv-se'] = "Fixed";
 $text['option-fixed']['uk-ua'] = "Fixed";
 $text['option-fixed']['tr-tr'] = "Fixed";
 
+$text['option-automatic']['en-us'] = "Automatic";
+$text['option-automatic']['en-gb'] = "Automatic";
+$text['option-automatic']['ar-eg'] = "Automatic";
+$text['option-automatic']['de-at'] = "Automatic";
+$text['option-automatic']['de-ch'] = "Automatic";
+$text['option-automatic']['de-de'] = "Automatic";
+$text['option-automatic']['el-gr'] = "Automatic";
+$text['option-automatic']['es-cl'] = "Automatic";
+$text['option-automatic']['es-mx'] = "Automatic";
+$text['option-automatic']['fr-ca'] = "Automatic";
+$text['option-automatic']['fr-fr'] = "Automatic";
+$text['option-automatic']['he-il'] = "Automatic";
+$text['option-automatic']['it-it'] = "Automatic";
+$text['option-automatic']['nl-nl'] = "Automatic";
+$text['option-automatic']['pl-pl'] = "Automatic";
+$text['option-automatic']['pt-br'] = "Automatic";
+$text['option-automatic']['pt-pt'] = "Automatic";
+$text['option-automatic']['ro-ro'] = "Automatic";
+$text['option-automatic']['ru-ru'] = "Automatic";
+$text['option-automatic']['sv-se'] = "Automatic";
+$text['option-automatic']['uk-ua'] = "Automatic";
+$text['option-automatic']['tr-tr'] = "Automatic";
+
+$text['option-manual']['en-us'] = "Manual";
+$text['option-manual']['en-gb'] = "Manual";
+$text['option-manual']['ar-eg'] = "Manual";
+$text['option-manual']['de-at'] = "Manual";
+$text['option-manual']['de-ch'] = "Manual";
+$text['option-manual']['de-de'] = "Manual";
+$text['option-manual']['el-gr'] = "Manual";
+$text['option-manual']['es-cl'] = "Manual";
+$text['option-manual']['es-mx'] = "Manual";
+$text['option-manual']['fr-ca'] = "Manual";
+$text['option-manual']['fr-fr'] = "Manual";
+$text['option-manual']['he-il'] = "Manual";
+$text['option-manual']['it-it'] = "Manual";
+$text['option-manual']['nl-nl'] = "Manual";
+$text['option-manual']['pl-pl'] = "Manual";
+$text['option-manual']['pt-br'] = "Manual";
+$text['option-manual']['pt-pt'] = "Manual";
+$text['option-manual']['ro-ro'] = "Manual";
+$text['option-manual']['ru-ru'] = "Manual";
+$text['option-manual']['sv-se'] = "Manual";
+$text['option-manual']['uk-ua'] = "Manual";
+$text['option-manual']['tr-tr'] = "Manual";
+
 ?>
diff --git a/resources/check_auth.php b/resources/check_auth.php
index f673726cc7..cbd266ba25 100644
--- a/resources/check_auth.php
+++ b/resources/check_auth.php
@@ -297,7 +297,17 @@
 
 		//if logged in, redirect to login destination
 			if (!isset($_REQUEST["key"])) {
-				if (isset($_SESSION['login']['destination']['url'])) {
+				if (isset($_SESSION['redirect_path'])) {
+					$redirect_path = $_SESSION['redirect_path'];
+					unset($_SESSION['redirect_path']);
+					// prevent open redirect attacks. redirect url shouldn't contain a hostname
+					$parsed_url = parse_url($redirect_path);
+					if ($parsed_url['host']) {
+						die("Was someone trying to hack you?");
+					}
+					header("Location: ".$redirect_path);
+				}
+				elseif (isset($_SESSION['login']['destination']['url'])) {
 					header("Location: ".$_SESSION['login']['destination']['url']);
 				} elseif (file_exists($_SERVER["PROJECT_ROOT"]."/core/dashboard/app_config.php")) {
 					header("Location: ".PROJECT_PATH."/core/dashboard/");
diff --git a/resources/cidr.php b/resources/cidr.php
new file mode 100644
index 0000000000..00efa89f0b
--- /dev/null
+++ b/resources/cidr.php
@@ -0,0 +1,42 @@
+<?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) 20018-2021
+	the Initial Developer. All Rights Reserved.
+
+	Contributor(s):
+	Mark J Crane <markjcrane@fusionpbx.com>
+*/
+
+//check the domain cidr range 
+	if (isset($_SESSION['domain']["cidr"]) && !defined('STDIN')) {
+		$found = false;
+		foreach($_SESSION['domain']["cidr"] as $cidr) {
+			if (check_cidr($cidr, $_SERVER['REMOTE_ADDR'])) {
+				$found = true;
+				break;
+			}
+		}
+		if (!$found) {
+			echo "access denied";
+			exit;
+		}
+	}
+ 
+ ?>
diff --git a/resources/classes/auto_loader.php b/resources/classes/auto_loader.php
new file mode 100644
index 0000000000..5075b96087
--- /dev/null
+++ b/resources/classes/auto_loader.php
@@ -0,0 +1,101 @@
+<?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-2021
+	the Initial Developer. All Rights Reserved.
+
+	Contributor(s):
+	Mark J Crane <markjcrane@fusionpbx.com>
+*/
+
+class auto_loader {
+
+	public function __construct() {
+		spl_autoload_register(array($this, 'loader'));
+	}
+
+	private function loader($class_name) {
+		//set the default value
+			$class_found = false;
+
+		//sanitize the class name
+			$class_name = preg_replace('[^a-zA-Z0-9_]', '', $class_name);
+
+		//save the log to the syslog server
+			if ($_REQUEST['debug'] == 'true') {
+				openlog("XML CDR", LOG_PID | LOG_PERROR, LOG_LOCAL0);
+			}
+
+		//find the most relevant class name
+			if (!$class_found && file_exists($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/resources/classes/".$class_name.".php")) {
+				//first priority
+				$path = $_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/resources/classes/".$class_name.".php";
+				$class_found = true;
+				if ($_REQUEST['debug'] == 'true') {
+					syslog(LOG_WARNING, "[php][autoloader] name: ".$class_name.", path: ".$path.", line: ".__line__);
+				}
+				include $path;
+			}
+			elseif (!$class_found && file_exists($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/core/".$class_name."/resources/classes/".$class_name.".php")) {
+				//second priority
+				$path = $_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/core/".$class_name."/resources/classes/".$class_name.".php";
+				$class_found = true;
+				if ($_REQUEST['debug'] == 'true') {
+					syslog(LOG_WARNING, "[php][autoloader] name: ".$class_name.", path: ".$path.", line: ".__line__);
+				}
+				include $path;
+			}
+			elseif (!$class_found && file_exists($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/app/".$class_name."/resources/classes/".$class_name.".php")) {
+				//third priority
+				$path = $_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/app/".$class_name."/resources/classes/".$class_name.".php";
+				$class_found = true;
+				if ($_REQUEST['debug'] == 'true') {
+					syslog(LOG_WARNING, "[php][autoloader] name: ".$class_name.", path: ".$path.", line: ".__line__);
+				}
+				include $path;
+			}
+
+		//use glob for a more exensive search for the classes (note: GLOB_BRACE doesn't work on some systems)
+			if (!$class_found && !class_exists($class_name)) {
+				//fourth priority
+				$results_1 = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/*/*/resources/classes/".$class_name.".php");
+				$results_2 = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/resources/classes/".$class_name.".php");
+				$results = array_merge((array)$results_1,(array)$results_2);
+				unset($results_1, $results_2);
+				foreach ($results as &$class_file) {
+					if (!$class_found) {
+						$class_found = true;
+						if ($_REQUEST['debug'] == 'true') {
+							syslog(LOG_WARNING, "[php][autoloader] name: ".$class_name.", path: ".$class_file.", line: ".__line__);
+						}
+						include $class_file;
+						break;
+					}
+				}
+				unset($results);
+			}
+
+		//save the log to the syslog server
+			if ($_REQUEST['debug'] == 'true') {
+				closelog();
+			}
+	}
+}
+
+?>
diff --git a/resources/classes/database.php b/resources/classes/database.php
index 2452f46511..ec62a0d2b9 100644
--- a/resources/classes/database.php
+++ b/resources/classes/database.php
@@ -17,7 +17,7 @@
 
 	The Initial Developer of the Original Code is
 	Mark J Crane <markjcrane@fusionpbx.com>
-	Copyright (C) 2010 - 2020
+	Copyright (C) 2010 - 2022
 	All Rights Reserved.
 
 	Contributor(s):
@@ -1039,12 +1039,15 @@ include "root.php";
 						}
 						$statement->bindParam(':remote_address', $_SERVER['REMOTE_ADDR']);
 						if (is_array($old_array)) {
-							$statement->bindParam(':transaction_old', json_encode($old_array, JSON_PRETTY_PRINT));
+							$old_json = json_encode($old_array, JSON_PRETTY_PRINT);
+							$statement->bindParam(':transaction_old', $old_json);
 						}
 						if (is_array($new_array)) {
-							$statement->bindParam(':transaction_new', json_encode($new_array, JSON_PRETTY_PRINT));
+							$new_json = json_encode($new_array, JSON_PRETTY_PRINT);
+							$statement->bindParam(':transaction_new', $new_json);
 						}
-						$statement->bindParam(':transaction_result', json_encode($this->message, JSON_PRETTY_PRINT));
+						$result = json_encode($this->message, JSON_PRETTY_PRINT);
+						$statement->bindParam(':transaction_result', $result);
 						$statement->execute();
 						unset($sql);
 					}
diff --git a/resources/classes/domains.php b/resources/classes/domains.php
index 681ea92d9d..5bc749ca42 100644
--- a/resources/classes/domains.php
+++ b/resources/classes/domains.php
@@ -759,7 +759,16 @@ if (!class_exists('domains')) {
 		 */
 		public function settings() {
 
-			//get the list of installed apps from the core and mod directories
+			//get an array of the default settings UUIDs
+				$sql = "select * from v_default_settings ";
+				$database = new database;
+				$result = $database->select($sql, null, 'all');
+				foreach($result as $row) {
+					$setting[$row['default_setting_uuid']] = 1;
+				}
+				unset($sql);
+
+			//get the list of default settings
 				$config_list = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/*/*/app_config.php");
 				$x=0;
 				foreach ($config_list as $config_path) {
@@ -769,109 +778,33 @@ if (!class_exists('domains')) {
 				$x = 0;
 				foreach ($apps as $app) {
 					if (is_array($app['default_settings'])) {
-						foreach ($app['default_settings'] as $setting) {
-								$array[$x] = ($setting);
-								$array[$x]['app_uuid'] = $app['uuid'];
+						foreach ($app['default_settings'] as $row) {
+							if (!isset($setting[$row['default_setting_uuid']])) {
+								$array['default_settings'][$x] = $row;
+								$array['default_settings'][$x]['app_uuid'] = $app['uuid'];
 								$x++;
+							}
 						}
 					}
 				}
 
-			//get an array of the default settings
-				$sql = "select * from v_default_settings ";
-				$sql .= "order by default_setting_category asc, default_setting_subcategory asc";
-				$database = new database;
-				$default_settings = $database->select($sql, null, 'all');
-				unset($sql);
-
-			//named array
-				foreach ($default_settings as $row) {
-					$default_settings[$row['default_setting_category']][$row['default_setting_subcategory']][$row['default_setting_name']]['uuid'] = $row['default_setting_uuid'];
-					$default_settings[$row['default_setting_category']][$row['default_setting_subcategory']][$row['default_setting_name']]['value'] = $row['default_setting_value'];
-					$default_settings[$row['default_setting_category']][$row['default_setting_subcategory']][$row['default_setting_name']]['app_uuid'] = $row['app_uuid'];
-					//echo "[".$row['default_setting_category']."][".$row['default_setting_subcategory']."][".$row['default_setting_name']."]  = ".$row['default_setting_value']."\n";
-				}
-
-			//update matching settings with the correct default_setting_uuid and app_uuid and if they exist remove them from the array
-				$x = 0;
-				foreach ($array as $row) {
-					$category = $row['default_setting_category'];
-					$subcategory = $row['default_setting_subcategory'];
-					$name = $row['default_setting_name'];
-
-					if (isset($default_settings[$category][$subcategory][$name]['value'])) {
-						//set the variables
-							$default_setting_uuid = $default_settings[$category][$subcategory][$name]['uuid'];
-							$app_uuid = $default_settings[$category][$subcategory][$name]['app_uuid'];
-						//update matching settings
-							if ($app_uuid == null) {
-								$sql = "update v_default_settings set ";
-								if ($default_setting_uuid != $row['default_setting_uuid']) {
-									$sql .= "default_setting_uuid = :default_setting_uuid, ";
-								}
-								$sql .= "app_uuid = :app_uuid ";
-								$sql .= "where default_setting_uuid = :default_setting_uuid';";
-								$parameters['default_setting_uuid'] = $row['default_setting_uuid'];
-								$parameters['app_uuid'] = $row['app_uuid'];
-								$database = new database;
-								$default_settings = $database->select($sql, $parameters, 'all');
-								unset($sql, $parameters);
-								//echo "\n";
-							}
-
-						//remove settings from the array that were found
-							unset($array[$x]);
-					}
-					$x++;
-				}
-				unset($default_settings);
-
-			//get the missing count
-				$array_count = count($array);
-
 			//add the missing default settings
 				if (is_array($array) && count($array) > 0) {
-					foreach ($array as $row) {
-						$sql = "insert into v_default_settings (";
-						$sql .= "default_setting_uuid, ";
-						$sql .= "default_setting_category, ";
-						$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";
-						$sql .= "(";
-						$sql .= ":default_setting_uuid, ";
-						$sql .= ":default_setting_category, ";
-						$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 .= ");";
-						$parameters['default_setting_uuid'] = $row['default_setting_uuid'];
-						$parameters['default_setting_category'] = $row['default_setting_category'];
-						$parameters['default_setting_subcategory'] = $row['default_setting_subcategory'];
-						$parameters['default_setting_name'] = $row['default_setting_name'];
-						$parameters['default_setting_value'] = $row['default_setting_value'];
-						if ($row['default_setting_order']) {
-							$parameters['default_setting_order'] = $row['default_setting_order'];
-						}
-						$parameters['default_setting_enabled'] = $row['default_setting_enabled'];
-						$parameters['default_setting_description'] = $row['default_setting_description'];
+					//grant temporary permissions
+						$p = new permissions;
+						$p->add('default_setting_add', 'temp');
+
+					//execute insert
 						$database = new database;
-						$default_settings = $database->select($sql, $parameters, 'all');
-						unset($sql, $parameters);
-					}
-					unset($array);
-				}		
+						$database->app_name = 'default_settings';
+						$database->app_uuid = '2c2453c0-1bea-4475-9f44-4d969650de09';
+						$database->save($array, false);
+						unset($array);
+
+					//revoke temporary permissions
+						$p->delete('default_setting_add', 'temp');
+				}
+
 		} //end settings method
 	}
 }
diff --git a/resources/classes/email.php b/resources/classes/email.php
new file mode 100644
index 0000000000..1931ba6717
--- /dev/null
+++ b/resources/classes/email.php
@@ -0,0 +1,549 @@
+<?php
+/*-
+ * Copyright (c) 2022 Mark J Crane <markjcrane@fusionpbx.com>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/**
+ * email class
+ *
+ * @method boolean send
+ */
+if (!class_exists('email')) {
+	class email {
+
+		/**
+		* declare the variables
+		*/
+		private $app_name;
+		private $app_uuid;
+		private $name;
+
+		public $domain_uuid;
+		public $method;
+		public $recipients;
+		public $subject;
+		public $body;
+		public $from_address;
+		public $from_name; 
+		public $priority;
+		public $debug_level; 
+		public $attachments; 
+		public $read_confirmation;
+		public $error;
+		public $response;
+
+		/**
+		 * called when the object is created
+		 */
+		public function __construct() {
+			//assign the variables
+			$this->app_name = 'email';
+			$this->name = 'email';
+			$this->app_uuid = '7a4fef67-5bf8-436a-ae25-7e3c03afcf96';
+			$this->priority = 0;
+			$this->debug_level = 3;
+			$this->read_confirmation = false;
+		}
+
+		/**
+		 * 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);
+			}
+		}
+
+		/**
+		 * parse raw emails
+		 */
+		public function parse($message) {
+			//includes
+			require_once('resources/pop3/mime_parser.php');
+			require_once('resources/pop3/rfc822_addresses.php');
+			if (file_exists($_SERVER["PROJECT_ROOT"]."/app/emails/email_transcription.php")) {
+				require_once($_SERVER["PROJECT_ROOT"]."/app/emails/email_transcription.php");
+			}
+
+			//parse the email message
+			$mime = new mime_parser_class;
+			$mime->decode_bodies = 1;
+			$parameters = array(
+				//'File'=>$message_file,
+
+				// Read a message from a string instead of a file
+				'Data' => $message,
+
+				// Save the message body parts to a directory
+				// 'SaveBody' => '/tmp',
+
+				// Do not retrieve or save message body parts
+				//   'SkipBody' => 1,
+			);
+			$success = $mime->Decode($parameters, $decoded);
+			unset($parameters);
+
+			if (!$success) {
+				echo "MIME message decoding error: ".HtmlSpecialChars($mime->error)."\n";
+			}
+			else {
+
+				//get the headers
+				$this->headers = json_decode($decoded[0]["Headers"]["x-headers:"], true);
+				$this->subject = $decoded[0]["Headers"]["subject:"];
+				$this->from_name = $decoded[0]["ExtractedAddresses"]["from:"][0]["name"];
+				$this->from_address = $decoded[0]["ExtractedAddresses"]["from:"][0]["address"];
+				$this->reply_to = $decoded[0]["Headers"]["reply-to:"];
+				$this->recipients = $decoded[0]["ExtractedAddresses"]["to:"];
+				$this->date = $decoded[0]["Headers"]["date:"];
+
+				//debug information
+				//view_array($decoded[0]);
+				//view_array($this);
+				//view_array($this->recipients);
+
+				//get the body
+				$this->body = ''; //$parts_array["Parts"][0]["Headers"]["content-type:"];
+
+				//get the body
+				$this->body = '';
+				$this->content_type = $decoded[0]['Headers']['content-type:'];
+				if (substr($this->content_type, 0, 15) == "multipart/mixed" || substr($this->content_type, 0, 21) == "multipart/alternative") {
+					foreach ($decoded[0]["Parts"] as $row) {
+						$body_content_type = $row["Headers"]["content-type:"];
+						if (substr($body_content_type, 0, 9) == "text/html") {
+							$this->body = $row["Body"];
+						}
+						if (substr($body_content_type, 0, 10) == "text/plain") { 
+							$body_plain = $row["Body"];
+							$this->body = $body_plain;
+						}
+					}
+				}
+				else {
+					$content_type_array = explode(";", $content_type);
+					$this->body = $decoded[0]["Body"];
+					//if ($content_type_array[0] == "text/html" || $content_type_array[0] == "text/plain") {
+					//	$body = $row["Body"];
+					//}
+				}
+
+				//get the attachments and add to the email
+				$x = 0;
+				foreach ($decoded[0]["Parts"] as &$parts_array) {
+					//image/tiff;name="testfax.tif"
+					//text/plain; charset=ISO-8859-1; format=flowed
+					$content_type = $parts_array["Parts"][0]["Headers"]["content-type:"];
+
+					//base64, 7bit
+					$content_transfer_encoding = $parts_array["Parts"][0]["Headers"]["content-transfer-encoding:"];
+
+					//inline;filename="testfax.tif"
+					$content_disposition = $parts_array["Parts"][0]["Headers"]["content-disposition"];
+
+					//testfax.tif
+					$file = $parts_array["FileName"];
+
+					//inline	
+					$filedisposition = $parts_array["FileDisposition"];
+
+					$body_part = $parts_array["BodyPart"];
+					$body_length = $parts_array["BodyLength"];
+
+					if (strlen($file) > 0) {
+						//get the file information
+							$file_ext = pathinfo($file, PATHINFO_EXTENSION);
+							$file_name = substr($file, 0, (strlen($file) - strlen($file_ext))-1 );
+							$encoding = "base64"; //base64_decode
+
+							switch ($file_ext){
+								case "wav":
+									$mime_type = "audio/x-wav";
+									break;
+								case "mp3":
+									$mime_type = "audio/x-mp3";
+									break;
+								case "pdf":
+									$mime_type = "application/pdf";
+									break;
+								case "tif":
+									$mime_type = "image/tiff";
+									break;
+								case "tiff":
+									$mime_type = "image/tiff";
+									break;
+								default:
+									$mime_type = "binary/octet-stream";
+									break;
+							}
+
+						//add attachment(s)
+							$this->attachments[$x]['type'] = 'string';
+							$this->attachments[$x]['name'] = $file;
+							$this->attachments[$x]['value'] = $parts_array["Body"];
+						
+						//increment the id
+							$x++;
+					}
+				}
+
+			}
+		}
+
+		/**
+		 * send emails
+		 */
+		public function send() {
+
+			//set the send_method if not already set
+			if (!isset($this->method)) {
+				if ($_SESSION['email_queue']['enabled']['boolean'] == 'true') {
+					$this->method = 'queue';
+				}
+				else {
+					$this->method = 'direct';
+				}
+			}
+
+			//add the email to the queue
+			if ($this->method == 'queue') {
+
+				//set the domain_uuid if not set
+				if (!isset($this->domain_uuid)) {
+					$this->domain_uuid = $_SESSION['domain_uuid'];
+				}
+
+				//add the email_queue_uuid
+				$email_queue_uuid = uuid();
+
+				//prepare the array
+				$array['email_queue'][0]['email_queue_uuid'] = $email_queue_uuid;
+				$array['email_queue'][0]['domain_uuid'] = $this->domain_uuid;
+				$array['email_queue'][0]['hostname'] = gethostname();
+				$array['email_queue'][0]['email_date'] = 'now()';
+				$array['email_queue'][0]['email_from'] = $this->from_address;
+				$array['email_queue'][0]['email_to'] = $this->recipients;
+				$array['email_queue'][0]['email_subject'] = $this->subject;
+				$array['email_queue'][0]['email_body'] = $this->body;
+				$array['email_queue'][0]['email_status'] = 'waiting';
+				$array['email_queue'][0]['email_retry_count'] = null;
+				//$array['email_queue'][0]['email_action_before'] = $email_action_before;
+				//$array['email_queue'][0]['email_action_after'] = $email_action_after;
+
+				//add email attachments
+				if (is_array($this->attachments) && sizeof($this->attachments) > 0) {
+					$y = 0;
+					foreach ($this->attachments as $attachment) {
+						//set the name of the file
+						if (strlen($attachment['value']) < 255 && file_exists($attachment['value'])) {
+							$attachment['name'] = $attachment['name'] != '' ? $attachment['name'] : basename($attachment['value']);
+							$attachment['type'] = strtolower(pathinfo($attachment['value'], PATHINFO_EXTENSION));
+						}
+
+						//add the attachments to the array
+						$array['email_queue_attachments'][$y]['email_queue_attachment_uuid'] = uuid();
+						$array['email_queue_attachments'][$y]['email_queue_uuid'] = $email_queue_uuid;
+						$array['email_queue_attachments'][$y]['domain_uuid'] = $_SESSION['domain_uuid'];
+						$array['email_queue_attachments'][$y]['email_attachment_type'] = $attachment['type'];
+						$array['email_queue_attachments'][$y]['email_attachment_name'] = $attachment['name'];
+						if (strlen($attachment['value']) < 255 && file_exists($attachment['value'])) {
+							$array['email_queue_attachments'][$y]['email_attachment_path'] = pathinfo($attachment['value'], PATHINFO_DIRNAME);
+						}
+						else {
+							$array['email_queue_attachments'][$y]['email_attachment_base64'] = base64_decode($attachment['value']);
+						}
+						$y++;
+					}
+				}
+
+				//add temporary permissions
+				$p = new permissions;
+				$p->add("email_queue_add", 'temp');
+				$p->add("email_queue_attachment_add", 'temp');
+
+				//save the dialplan
+				$database = new database;
+				$database->app_name = 'email';
+				$database->app_uuid = 'e24b5dab-3bcc-42e8-99c1-19b0c558c2d7';
+				$database->save($array);
+				//$dialplan_response = $database->message;
+				unset($array);
+
+				//remove temporary permissions
+				$p->delete("dialplan_add", 'temp');
+				$p->delete("dialplan_detail_add", 'temp');
+
+			}
+
+			//send the email directly
+			if ($this->method == 'direct') {
+				/*
+				RECIPIENTS NOTE:
+
+					Pass in a single email address...
+
+						user@domain.com
+
+					Pass in a comma or semi-colon delimited string of e-mail addresses...
+
+						user@domain.com,user2@domain2.com,user3@domain3.com
+						user@domain.com;user2@domain2.com;user3@domain3.com
+
+					Pass in a simple array of email addresses...
+
+						Array (
+							[0] => user@domain.com
+							[1] => user2@domain2.com
+							[2] => user3@domain3.com
+						)
+
+					Pass in a multi-dimentional array of addresses (delivery, address, name)...
+
+						Array (
+							[0] => Array (
+								[delivery] => to
+								[address] => user@domain.com
+								[name] => user 1
+								)
+							[1] => Array (
+								[delivery] => cc
+								[address] => user2@domain2.com
+								[name] => user 2
+								)
+							[2] => Array (
+								[delivery] => bcc
+								[address] => user3@domain3.com
+								[name] => user 3
+								)
+						)
+
+				ATTACHMENTS NOTE:
+
+					Pass in as many files as necessary in an array in the following format...
+
+						Array (
+							[0] => Array (
+								[type] => file (or 'path')
+								[name] => filename.ext
+								[value] => /folder/filename.ext
+								)
+							[1] => Array (
+								[type] => string
+								[name] => filename.ext
+								[value] => (string of file contents - if base64, will be decoded automatically)
+								)
+						)
+
+				ERROR RESPONSE:
+
+					Error messages are stored in the variable passed into $this->error BY REFERENCE
+				*/
+
+				try {
+					//include the phpmailer classes
+					include_once("resources/phpmailer/class.phpmailer.php");
+					include_once("resources/phpmailer/class.smtp.php");
+
+					//create the email object and set general settings
+					$mail = new PHPMailer();
+					$mail->IsSMTP();
+					if ($_SESSION['email']['smtp_hostname']['text'] != '') {
+						$mail->Hostname = $_SESSION['email']['smtp_hostname']['text'];
+					}
+					$mail->Host = $_SESSION['email']['smtp_host']['text'];
+					if (is_numeric($_SESSION['email']['smtp_port']['numeric'])) {
+						$mail->Port = $_SESSION['email']['smtp_port']['numeric'];
+					}
+
+					if ($_SESSION['email']['smtp_auth']['text'] == "true") {
+						$mail->SMTPAuth = true;
+						$mail->Username = $_SESSION['email']['smtp_username']['text'];
+						$mail->Password = $_SESSION['email']['smtp_password']['text'];
+					}
+					else {
+						$mail->SMTPAuth = false;
+					}
+
+					$smtp_secure = true;
+					if ($_SESSION['email']['smtp_secure']['text'] == "") {
+						$mail->SMTPSecure = 'none';
+						$mail->SMTPAutoTLS = false;
+						$smtp_secure = false;
+					}
+					elseif ($_SESSION['email']['smtp_secure']['text'] == "none") {
+						$mail->SMTPSecure = 'none';
+						$mail->SMTPAutoTLS = false;
+						$smtp_secure = false;
+					}
+					else {
+						$mail->SMTPSecure = $_SESSION['email']['smtp_secure']['text'];
+					}
+
+					if ($smtp_secure && isset($_SESSION['email']['smtp_validate_certificate']) && $_SESSION['email']['smtp_validate_certificate']['boolean'] == "false") {
+						//bypass certificate check e.g. for self-signed certificates
+						$smtp_options['ssl']['verify_peer'] = false;
+						$smtp_options['ssl']['verify_peer_name'] = false;
+						$smtp_options['ssl']['allow_self_signed'] = true;
+					}
+
+					//used to set the SSL version
+					if ($smtp_secure && isset($_SESSION['email']['smtp_crypto_method'])) {
+						$smtp_options['ssl']['crypto_method'] = $_SESSION['email']['smtp_crypto_method']['text'];
+					}
+
+					//add SMTP Options if the array exists
+					if (is_array($smtp_options)) {
+						$mail->SMTPOptions = $smtp_options;
+					}
+
+					$this->from_address = ($this->from_address != '') ? $this->from_address : $_SESSION['email']['smtp_from']['text'];
+					$this->from_name = ($this->from_name != '') ? $this->from_name : $_SESSION['email']['smtp_from_name']['text'];
+					$mail->SetFrom($this->from_address, $this->from_name);
+					$mail->AddReplyTo($this->from_address, $this->from_name);
+					$mail->Subject = $this->subject;
+					$mail->MsgHTML($this->body);
+					$mail->Priority = $this->priority;
+					if ($this->read_confirmation) {
+						$mail->AddCustomHeader('X-Confirm-Reading-To: '.$this->from_address);
+						$mail->AddCustomHeader('Return-Receipt-To: '.$this->from_address);
+						$mail->AddCustomHeader('Disposition-Notification-To: '.$this->from_address);
+					}
+					if (is_numeric($this->debug_level) && $this->debug_level > 0) {
+						$mail->SMTPDebug = $this->debug_level;
+					}
+
+					//add the email recipients
+					$address_found = false;
+					if (!is_array($this->recipients)) { // must be a single or delimited recipient address(s)
+						$this->recipients = str_replace(' ', '', $this->recipients);
+						$this->recipients = str_replace(',', ';', $this->recipients);
+						$this->recipients = explode(';', $this->recipients); // convert to array of addresses
+					}
+
+					foreach ($this->recipients as $this->recipient) {
+						if (is_array($this->recipient)) { // check if each recipient has multiple fields
+							if ($this->recipient["address"] != '' && valid_email($this->recipient["address"])) { // check if valid address
+								switch ($this->recipient["delivery"]) {
+									case "cc" :		$mail->AddCC($this->recipient["address"], ($this->recipient["name"]) ? $this->recipient["name"] : $this->recipient["address"]);			break;
+									case "bcc" :	$mail->AddBCC($this->recipient["address"], ($this->recipient["name"]) ? $this->recipient["name"] : $this->recipient["address"]);			break;
+									default :		$mail->AddAddress($this->recipient["address"], ($this->recipient["name"]) ? $this->recipient["name"] : $this->recipient["address"]);
+								}
+								$address_found = true;
+							}
+						}
+						else if ($this->recipient != '' && valid_email($this->recipient)) { // check if recipient value is simply (only) an address
+							$mail->AddAddress($this->recipient);
+							$address_found = true;
+						}
+					}
+
+					if (!$address_found) {
+						$this->error = "No valid e-mail address provided.";
+						return false;
+					}
+
+					//add email attachments
+					if (is_array($this->attachments) && sizeof($this->attachments) > 0) {
+						foreach ($this->attachments as $attachment) {
+
+							//set the name of the file
+							$attachment['name'] = $attachment['name'] != '' ? $attachment['name'] : basename($attachment['value']);
+
+							//set the mime type
+							switch (substr($attachment['name'], -4)) {
+								case ".png":
+									$attachment['mime_type'] = 'image/png';
+									break;
+								case ".pdf":
+									$attachment['mime_type'] = 'application/pdf';
+									break;
+								case ".mp3":
+									$attachment['mime_type'] = 'audio/mpeg';
+									break;
+								case ".wav":
+									$attachment['mime_type'] = 'audio/x-wav';
+									break;
+								case "opus":
+									$attachment['mime_type'] = 'audio/opus';
+									break;
+								case ".ogg":
+									$attachment['mime_type'] = 'audio/ogg';
+									break;
+							}
+
+							//add the attachments
+							if (strlen($attachment['value']) < 255 && file_exists($attachment['value'])) {
+								$mail->AddAttachment($attachment['value'], $attachment['name'], 'base64', $attachment['mime_type']);
+							}
+							else {
+								if (base64_encode(base64_decode($attachment['value'], true)) === $attachment['value']) {
+									$mail->AddStringAttachment(base64_decode($attachment['value']), $attachment['name'], 'base64', $attachment['mime_type']);
+								}
+								else {
+									$mail->AddStringAttachment($attachment['value'], $attachment['name'], 'base64', $attachment['mime_type']);
+								}
+							}
+						}
+					}
+
+					//send the email
+					if (!$mail->Send()) {
+						if (isset($mail->ErrorInfo) && strlen($mail->ErrorInfo) > 0) {
+							$this->error = $mail->ErrorInfo;
+						}
+						return false;
+					}
+
+					//cleanup the mail object
+					$mail->ClearAddresses();
+					$mail->SmtpClose();
+					unset($mail);
+					return true;
+
+				}
+				catch (Exception $e) {
+					$this->error = $mail->ErrorInfo;
+					return false;
+				}
+
+			}
+		}
+
+	}
+}
+
+/*
+$email = new email;
+$email->recipients = $recipients;
+$email->subject = $email_subject;
+$email->body = $email_body;
+$email->from_address = $email_from_address;
+$email->from_name = $email_from_name;
+$email->attachments = $email_attachments;
+$response = $mail->error;
+$sent = $email->send();
+*/
+
+?>
diff --git a/resources/classes/menu.php b/resources/classes/menu.php
index 95a275d263..1adae9bb0c 100644
--- a/resources/classes/menu.php
+++ b/resources/classes/menu.php
@@ -1042,17 +1042,23 @@ if (!class_exists('menu')) {
 				$html .= "			</ul>\n";
 
 				$html .= "			<ul class='navbar-nav ml-auto'>\n";
+				//current user
+					if ($_SESSION['theme']['user_visible']['text'] == 'true') {
+						$html .= "		<li class='nav-item'>\n";
+						$html .= "			<a class='header_user' href='".PROJECT_PATH."/core/users/user_edit.php?id=user' title=\"".$this->text['theme-label-user']."\"><i class='fas fa-".($_SESSION['theme']['body_header_icon_user']['text'] != '' ? $_SESSION['theme']['body_header_icon_user']['text'] : 'user-circle')." fa-lg fa-fw' style='margin-top: 6px; margin-right: 5px;'></i>".$_SESSION['username']."</a>";
+						$html .= "		</li>\n";
+					}
 				//domain name/selector
 					if (isset($_SESSION['username']) && $_SESSION['username'] != '' && permission_exists('domain_select') && count($_SESSION['domains']) > 1 && $_SESSION['theme']['domain_visible']['text'] == 'true') {
 						$html .= "		<li class='nav-item'>\n";
-						$html .= "			<a class='nav-link domain_selector_domain' href='#' title='".$this->text['theme-label-open_selector']."'>".escape($_SESSION['domain_name'])."</a>";
+						$html .= "			<a class='header_domain' href='#' id='header_domain_selector_domain' title='".$this->text['theme-label-open_selector']."'><i class='fas fa-".($_SESSION['theme']['body_header_icon_domain']['text'] != '' ? $_SESSION['theme']['body_header_icon_domain']['text'] : 'globe-americas')." fa-lg fa-fw' style='margin-top: 6px; margin-right: 5px;'></i>".escape($_SESSION['domain_name'])."</a>";
 						$html .= "		</li>\n";
 					}
 				//logout icon
 					if (isset($_SESSION['username']) && $_SESSION['username'] != '' && $_SESSION['theme']['logout_icon_visible']['text'] == "true") {
 						$username_full = $_SESSION['username'].((count($_SESSION['domains']) > 1) ? "@".$_SESSION["user_context"] : null);
 						$html .= "		<li class='nav-item'>\n";
-						$html .= "			<a class='nav-link logout_icon' href='#' title=\"".$this->text['theme-label-logout']."\" onclick=\"modal_open('modal-logout','btn_logout');\"><span class='fas fa-sign-out-alt'></span></a>";
+						$html .= "			<a class='logout_icon' href='#' title=\"".$this->text['theme-label-logout']."\" onclick=\"modal_open('modal-logout','btn_logout');\"><span class='fas fa-sign-out-alt'></span></a>";
 						$html .= "		</li>\n";
 						unset($username_full);
 					}
diff --git a/resources/classes/switch_settings.php b/resources/classes/switch_settings.php
index ef63d63d24..efa437bbfd 100644
--- a/resources/classes/switch_settings.php
+++ b/resources/classes/switch_settings.php
@@ -156,7 +156,7 @@ if (!class_exists('switch_settings')) {
 				$array[$x]['default_setting_description'] = '';
 				$x++;
 				$array[$x]['default_setting_category'] = 'switch';
-				$array[$x]['default_setting_subcategory'] = 'phrases';
+				$array[$x]['default_setting_subcategory'] = 'languages';
 				$array[$x]['default_setting_name'] = 'dir';
 				$array[$x]['default_setting_value'] = $vars['conf_dir'].'/languages';
 				$array[$x]['default_setting_enabled'] = 'true';
@@ -239,7 +239,8 @@ if (!class_exists('switch_settings')) {
 							$array['default_settings'][$i]['default_setting_value'] = $row['default_setting_value'];
 							$array['default_settings'][$i]['default_setting_enabled'] = $row['default_setting_enabled'];
 							$array['default_settings'][$i]['default_setting_description'] = $row['default_setting_description'];
-						$i++;
+						//increment the row id
+							$i++;
 					}
 					if (is_array($array) && @sizeof($array) != 0) {
 						//grant temporary permissions
@@ -250,7 +251,6 @@ if (!class_exists('switch_settings')) {
 							$database->app_name = 'switch_settings';
 							$database->app_uuid = '84e91084-a227-43cd-ae99-a0f8ed61eb8b';
 							$database->save($array);
-							unset($array);
 						//revoke temporary permissions
 							$p->delete('default_setting_add', 'temp');
 					}
@@ -258,10 +258,12 @@ if (!class_exists('switch_settings')) {
 				}
 
 			//set the default settings
-				foreach ($array as $row) {
-					if (!isset($_SESSION['switch'][$row['default_setting_subcategory']])) {
-						if ($row['default_setting_enabled'] != "false") {
-							$_SESSION['switch'][$row['default_setting_subcategory']] = $row['default_setting_value'];
+				if (is_array($array)) {
+					foreach ($array as $row) {
+						if (!isset($_SESSION['switch'][$row['default_setting_subcategory']])) {
+							if ($row['default_setting_enabled'] != "false") {
+								$_SESSION['switch'][$row['default_setting_subcategory']] = $row['default_setting_value'];
+							}
 						}
 					}
 				}
diff --git a/resources/functions.php b/resources/functions.php
index 4c32b8e452..538b8ca832 100644
--- a/resources/functions.php
+++ b/resources/functions.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-2021
+	Portions created by the Initial Developer are Copyright (C) 2008-2022
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -57,7 +57,7 @@
 				if(function_exists('mysql_real_escape_string')){
 					$tmp_str = mysql_real_escape_string($string);
 				}
-				else{
+				else {
 					$tmp_str = mysqli_real_escape_string($db, $string);
 				}
 				if (strlen($tmp_str)) {
@@ -1064,13 +1064,7 @@ function number_pad($number,$n) {
 // validate email address syntax
 	if(!function_exists('valid_email')) {
 		function valid_email($email) {
-			$regex = '/^[A-z0-9][\w.-]*@[A-z0-9][\w\-\.]+(\.[A-z0-9]{2,7})?$/';
-			if ($email != "" && preg_match($regex, $email) == 1) {
-				return true; // email address has valid syntax
-			}
-			else {
-				return false; // email address does not have valid syntax
-			}
+			return (filter_var($email, FILTER_VALIDATE_EMAIL)) ? true : false;
 		}
 	}
 
@@ -1309,7 +1303,7 @@ function number_pad($number,$n) {
 
 //function to send email
 	if (!function_exists('send_email')) {
-		function send_email($eml_recipients, $eml_subject, $eml_body, &$eml_error = '', $eml_from_address = '', $eml_from_name = '', $eml_priority = 3, $eml_debug_level = 0, $eml_attachments = '', $eml_read_confirmation = false) {
+		function send_email($email_recipients, $email_subject, $email_body, &$email_error = '', $email_from_address = '', $email_from_name = '', $email_priority = 3, $email_debug_level = 0, $email_attachments = '', $email_read_confirmation = false) {
 			/*
 			RECIPIENTS NOTE:
 
@@ -1369,160 +1363,54 @@ function number_pad($number,$n) {
 
 			ERROR RESPONSE:
 
-				Error messages are stored in the variable passed into $eml_error BY REFERENCE
+				Error messages are stored in the variable passed into $email_error BY REFERENCE
 
 			*/
 
-			try {
-				//include the phpmailer classes
-				include_once("resources/phpmailer/class.phpmailer.php");
-				include_once("resources/phpmailer/class.smtp.php");
+			//add the email recipients
+			$address_found = false;
+			if (!is_array($email_recipients)) { // must be a single or delimited recipient address(s)
+				$email_recipients = str_replace(' ', '', $email_recipients);
+				$email_recipients = str_replace(',', ';', $email_recipients);
+				$email_recipients = explode(';', $email_recipients); // convert to array of addresses
+			}
 
-				//regular expression to validate email addresses
-				$regexp = '/^[A-z0-9][\w.-]*@[A-z0-9][\w\-\.]+\.[A-z0-9]{2,7}$/';
-
-				//create the email object and set general settings
-				$mail = new PHPMailer();
-				$mail->IsSMTP();
-				if ($_SESSION['email']['smtp_hostname']['text'] != '') {
-					$mail->Hostname = $_SESSION['email']['smtp_hostname']['text'];
-				}
-				$mail->Host = $_SESSION['email']['smtp_host']['text'];
-				if (is_numeric($_SESSION['email']['smtp_port']['numeric'])) {
-					$mail->Port = $_SESSION['email']['smtp_port']['numeric'];
-				}
-				if ($_SESSION['email']['smtp_auth']['text'] == "true") {
-					$mail->SMTPAuth = $_SESSION['email']['smtp_auth']['text'];
-					$mail->Username = $_SESSION['email']['smtp_username']['text'];
-					$mail->Password = $_SESSION['email']['smtp_password']['text'];
-				}
-				else {
-					$mail->SMTPAuth = 'false';
-				}
-				if ($_SESSION['email']['smtp_secure']['text'] == "none") {
-					$_SESSION['email']['smtp_secure']['text'] = '';
-				}
-				if ($_SESSION['email']['smtp_secure']['text'] != '') {
-					$mail->SMTPSecure = $_SESSION['email']['smtp_secure']['text'];
-				}
-				if (isset($_SESSION['email']['smtp_validate_certificate']) && $_SESSION['email']['smtp_validate_certificate']['boolean'] == "false") {
-					// bypass TLS certificate check e.g. for self-signed certificates
-					$mail->SMTPOptions = array(
-						'ssl' => array(
-						'verify_peer' => false,
-						'verify_peer_name' => false,
-						'allow_self_signed' => true
-						)
-					);
-				}
-				$eml_from_address = ($eml_from_address != '') ? $eml_from_address : $_SESSION['email']['smtp_from']['text'];
-				$eml_from_name = ($eml_from_name != '') ? $eml_from_name : $_SESSION['email']['smtp_from_name']['text'];
-				$mail->SetFrom($eml_from_address, $eml_from_name);
-				$mail->AddReplyTo($eml_from_address, $eml_from_name);
-				$mail->Subject = $eml_subject;
-				$mail->MsgHTML($eml_body);
-				$mail->Priority = $eml_priority;
-				if ($eml_read_confirmation) {
-					$mail->AddCustomHeader('X-Confirm-Reading-To: '.$eml_from_address);
-					$mail->AddCustomHeader('Return-Receipt-To: '.$eml_from_address);
-					$mail->AddCustomHeader('Disposition-Notification-To: '.$eml_from_address);
-				}
-				if (is_numeric($eml_debug_level) && $eml_debug_level > 0) {
-					$mail->SMTPDebug = $eml_debug_level;
-				}
-
-				//add the email recipients
-				$address_found = false;
-				if (!is_array($eml_recipients)) { // must be a single or delimited recipient address(s)
-					$eml_recipients = str_replace(' ', '', $eml_recipients);
-					$eml_recipients = str_replace(array(';',','), ' ', $eml_recipients);
-					$eml_recipients = explode(' ', $eml_recipients); // convert to array of addresses
-				}
-				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;
-						}
-					}
-					else if ($eml_recipient != '' && preg_match($regexp, $eml_recipient) == 1) { // check if recipient value is simply (only) an address
-						$mail->AddAddress($eml_recipient);
+			foreach ($email_recipients as $email_recipient) {
+				if (is_array($email_recipient)) { // check if each recipient has multiple fields
+					if ($email_recipient["address"] != '' && valid_email($email_recipient["address"])) { // check if valid address
+						$recipients = $email_recipient["address"];
 						$address_found = true;
 					}
 				}
-
-				if (!$address_found) {
-					$eml_error = "No valid e-mail address provided.";
-					return false;
+				else if ($email_recipient != '' && valid_email($email_recipient)) { // check if recipient value is simply (only) an address
+					$email_recipients = $email_recipient;
+					$address_found = true;
 				}
-
-				//add email attachments
-				if (is_array($eml_attachments) && sizeof($eml_attachments) > 0) {
-					foreach ($eml_attachments as $attachment) {
-						//set the name of the file
-						$attachment['name'] = $attachment['name'] != '' ? $attachment['name'] : basename($attachment['value']);
-
-						//set the mime type
-						switch (substr($attachment['name'], -4)) {
-							case ".png":
-								$attachment['mime_type'] = 'image/png';
-								break;
-							case ".pdf":
-								$attachment['mime_type'] = 'application/pdf';
-								break;
-							case ".mp3":
-								$attachment['mime_type'] = 'audio/mpeg';
-								break;
-							case ".wav":
-								$attachment['mime_type'] = 'audio/x-wav';
-								break;
-							case ".opus":
-								$attachment['mime_type'] = 'audio/opus';
-								break;
-							case ".ogg":
-								$attachment['mime_type'] = 'audio/ogg';
-								break;
-						}
-
-						//add the attachments
-						if ($attachment['type'] == 'file' || $attachment['type'] == 'path') {
-							$mail->AddAttachment($attachment['value'], $attachment['name'], 'base64', $attachment['mime_type']);
-						}
-						else if ($attachment['type'] == 'string') {
-							if (base64_encode(base64_decode($attachment['value'], true)) === $attachment['value']) {
-								$mail->AddStringAttachment(base64_decode($attachment['value']), $attachment['name'], 'base64', $attachment['mime_type']);
-							}
-							else {
-								$mail->AddStringAttachment($attachment['value'], $attachment['name'], 'base64', $attachment['mime_type']);
-							}
-						}
-					}
-				}
-
-				//send the email
-				if (!$mail->Send()) {
-					if (isset($mail->ErrorInfo) && strlen($mail->ErrorInfo) > 0) {
-						$mailer_error = $mail->ErrorInfo;
-					}
-					return false;
-				}
-
-				//cleanup the mail object
-				$mail->ClearAddresses();
-				$mail->SmtpClose();
-				unset($mail);
-				return true;
-
 			}
-			catch (Exception $e) {
-				$eml_error = $mail->ErrorInfo;
+			if (is_array($recipients)) {
+				$email_recipients = implode(",", $recipients);
+			}
+			if (!$address_found) {
+				$email_error = "No valid e-mail address provided.";
 				return false;
 			}
 
+			//get the from address and name
+			$email_from_address = ($email_from_address != '') ? $email_from_address : $_SESSION['email']['smtp_from']['text'];
+			$email_from_name = ($email_from_name != '') ? $email_from_name : $_SESSION['email']['smtp_from_name']['text'];
+
+			//send email
+			$email = new email;
+			$email->recipients = $email_recipients;
+			$email->subject = $email_subject;
+			$email->body = $email_body;
+			$email->from_address = $email_from_address;
+			$email->from_name = $email_from_name;
+			$email->attachments = $email_attachments;
+			$email->debug_level = 3;
+			$sent = $email->send();
+			//$email_error = $email->email_error;
+
 		}
 	}
 
@@ -1610,21 +1498,6 @@ function number_pad($number,$n) {
 		}
 	}
 
-//email validate
-	if (!function_exists('email_validate')) {
-		function email_validate($strEmail){
-			$validRegExp =  '/^[a-zA-Z0-9\._-]+@[a-zA-Z0-9\._-]+\.[a-zA-Z]{2,3}$/';
-			// search email text for regular exp matches
-			preg_match($validRegExp, $strEmail, $matches, PREG_OFFSET_CAPTURE);
-			if (count($matches) == 0) {
-				return 0;
-			}
-			else {
-				return 1;
-			}
-		}
-	}
-
 //write javascript function that detects select key combinations to perform designated actions
 	if (!function_exists('key_press')) {
 		function key_press($key, $direction = 'up', $subject = 'document', $exceptions = array(), $prompt = null, $action = null, $script_wrapper = true) {
@@ -2187,8 +2060,8 @@ function number_pad($number,$n) {
 
 //convert bytes to readable human format
 	if (!function_exists('random_int')) {
-		function random_int() {
-			return rand ();
+		function random_int($min, $max) {
+			return rand ($min, $max);
 		}
 	}
 
@@ -2264,29 +2137,37 @@ function number_pad($number,$n) {
 	}
 
 // User exists
-        if (!function_exists('user_exists')) {
-                function user_exists($login, $domain_name = null) {
-                	//connect to freeswitch
-                        $fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
-                        if (!$fp) {
-                                return false;
-                        }
+	if (!function_exists('user_exists')) {
+		function user_exists($login, $domain_name = null) {
+			//connect to freeswitch
+			$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
+			if (!$fp) {
+				return false;
+			}
 
-               		//send the user_exists command to freeswitch
-                        if ($fp) {
-                                //build and send the mkdir command to freeswitch
-				if (is_null($domain_name)){
+			//send the user_exists command to freeswitch
+			if ($fp) {
+				if (is_null($domain_name)) {
 					$domain_name = $_SESSION['domain_name'];
 				}
 				$switch_cmd = "user_exists id '$login' '$domain_name'";
 				$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
 				fclose($fp);
-				return ($switch_result == 'true'?true:false);
-                        }
+				return ($switch_result == 'true' ? true: false);
+			}
 
 			//can not create directory
-                        return null;
-                }
-        }
+			return null;
+		}
+	}
+
+//include additional functions
+	$functions = glob("{".$_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/resources/functions/*.php,".$_SERVER["DOCUMENT_ROOT"].PROJECT_PATH."/*/*/resources/functions/*.php}", GLOB_BRACE);
+	foreach($functions as $function) {
+		$path = pathinfo($function);
+		if ($path['filename'] != 'transcribe') {
+			require($function);
+		}
+	}
 
 ?>
diff --git a/resources/login.php b/resources/login.php
index fd16a8083e..97b6d2afa4 100644
--- a/resources/login.php
+++ b/resources/login.php
@@ -254,6 +254,10 @@
 		$_SESSION['login']['destination']['url'] = PROJECT_PATH."/core/dashboard/";
 	}
 
+	if (strlen($_REQUEST['path']) > 0) {
+		$_SESSION['redirect_path'] = $_REQUEST['path'];
+	}
+
 //add the header
 	$document['title'] = $text['title-login'];
 	include "resources/header.php";
diff --git a/resources/pdo.php b/resources/pdo.php
index fbf18c265f..a165a3735b 100644
--- a/resources/pdo.php
+++ b/resources/pdo.php
@@ -347,35 +347,4 @@ if ($db_type == "pgsql") {
 		$domain_uuid = uuid();
 	}
 
-//check the domain cidr range 
-	if (isset($_SESSION['domain']["cidr"]) && !defined('STDIN')) {
-		$found = false;
-		foreach($_SESSION['domain']["cidr"] as $cidr) {
-			if (check_cidr($cidr, $_SERVER['REMOTE_ADDR'])) {
-				$found = true;
-				break;
-			}
-		}
-		if (!$found) {
-			echo "access denied";
-			exit;
-		}
-	}
-
-//check the api cidr range
-	if (isset($_SESSION['api']["cidr"])) {
-		$found = false;
-		foreach($_SESSION['api']["cidr"] as $cidr) {
-			if (check_cidr($cidr, $_SERVER['REMOTE_ADDR'])) {
-				$found = true;
-				break;
-			}
-		}
-		if (!$found) {
-			unset ($_REQUEST['key']);
-			unset ($_POST['key']);
-			unset ($_GET['key']);
-		}
-	}
-
 ?>
diff --git a/resources/phpmailer/class.phpmailer.php b/resources/phpmailer/class.phpmailer.php
index 0feaae9b4f..c248025cbf 100644
--- a/resources/phpmailer/class.phpmailer.php
+++ b/resources/phpmailer/class.phpmailer.php
@@ -1,2817 +1,4064 @@
 <?php
-/*~ class.phpmailer.php
-.---------------------------------------------------------------------------.
-|  Software: PHPMailer - PHP email class                                    |
-|   Version: 5.2.2                                                          |
-|      Site: https://code.google.com/a/apache-extras.org/p/phpmailer/       |
-| ------------------------------------------------------------------------- |
-|     Admin: Jim Jagielski (project admininistrator)                        |
-|   Authors: Andy Prevost (codeworxtech) codeworxtech@users.sourceforge.net |
-|          : Marcus Bointon (coolbru) coolbru@users.sourceforge.net         |
-|          : Jim Jagielski (jimjag) jimjag@gmail.com                        |
-|   Founder: Brent R. Matzelle (original founder)                           |
-| Copyright (c) 2010-2012, Jim Jagielski. All Rights Reserved.              |
-| Copyright (c) 2004-2009, Andy Prevost. All Rights Reserved.               |
-| Copyright (c) 2001-2003, Brent R. Matzelle                                |
-| ------------------------------------------------------------------------- |
-|   License: Distributed under the Lesser General Public License (LGPL)     |
-|            http://www.gnu.org/copyleft/lesser.html                        |
-| This program is distributed in the hope that it will be useful - WITHOUT  |
-| ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or     |
-| FITNESS FOR A PARTICULAR PURPOSE.                                         |
-'---------------------------------------------------------------------------'
-*/
-
 /**
- * PHPMailer - PHP email creation and transport class
- * NOTE: Requires PHP version 5 or later
+ * PHPMailer - PHP email creation and transport class.
+ * PHP Version 5
  * @package PHPMailer
- * @author Andy Prevost
- * @author Marcus Bointon
- * @author Jim Jagielski
+ * @link https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
+ * @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
+ * @author Jim Jagielski (jimjag) <jimjag@gmail.com>
+ * @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
+ * @author Brent R. Matzelle (original founder)
+ * @copyright 2012 - 2014 Marcus Bointon
  * @copyright 2010 - 2012 Jim Jagielski
  * @copyright 2004 - 2009 Andy Prevost
  * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ * @note This program is distributed in the hope that it will be useful - WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-if (version_compare(PHP_VERSION, '5.0.0', '<') ) exit("Sorry, this version of PHPMailer will only run on PHP version 5 or greater!\n");
-
 /**
- * PHP email creation and transport class
+ * PHPMailer - PHP email creation and transport class.
  * @package PHPMailer
+ * @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
+ * @author Jim Jagielski (jimjag) <jimjag@gmail.com>
+ * @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
+ * @author Brent R. Matzelle (original founder)
  */
-class PHPMailer {
+class PHPMailer
+{
+    /**
+     * The PHPMailer Version number.
+     * @var string
+     */
+    public $Version = '5.2.28';
 
-  /////////////////////////////////////////////////
-  // PROPERTIES, PUBLIC
-  /////////////////////////////////////////////////
+    /**
+     * Email priority.
+     * Options: null (default), 1 = High, 3 = Normal, 5 = low.
+     * When null, the header is not set at all.
+     * @var integer
+     */
+    public $Priority = null;
 
-  /**
-   * Email priority (1 = High, 3 = Normal, 5 = low).
-   * @var int
-   */
-  public $Priority          = 3;
+    /**
+     * The character set of the message.
+     * @var string
+     */
+    public $CharSet = 'UTF-8';
 
-  /**
-   * Sets the CharSet of the message.
-   * @var string
-   */
-  public $CharSet           = 'UTF-8';
+    /**
+     * The MIME Content-type of the message.
+     * @var string
+     */
+    public $ContentType = 'text/plain';
 
-  /**
-   * Sets the Content-type of the message.
-   * @var string
-   */
-  public $ContentType       = 'text/plain';
+    /**
+     * The message encoding.
+     * Options: "8bit", "7bit", "binary", "base64", and "quoted-printable".
+     * @var string
+     */
+    public $Encoding = 'base64';
 
-  /**
-   * Sets the Encoding of the message. Options for this are
-   *  "8bit", "7bit", "binary", "base64", and "quoted-printable".
-   * @var string
-   */
-  public $Encoding          = 'base64';
+    /**
+     * Holds the most recent mailer error message.
+     * @var string
+     */
+    public $ErrorInfo = '';
 
-  /**
-   * Holds the most recent mailer error message.
-   * @var string
-   */
-  public $ErrorInfo         = '';
+    /**
+     * The From email address for the message.
+     * @var string
+     */
+    public $From = 'root@localhost';
 
-  /**
-   * Sets the From email address for the message.
-   * @var string
-   */
-  public $From              = 'root@localhost';
+    /**
+     * The From name of the message.
+     * @var string
+     */
+    public $FromName = 'Root User';
 
-  /**
-   * Sets the From name of the message.
-   * @var string
-   */
-  public $FromName          = 'Root User';
+    /**
+     * The Sender email (Return-Path) of the message.
+     * If not empty, will be sent via -f to sendmail or as 'MAIL FROM' in smtp mode.
+     * @var string
+     */
+    public $Sender = '';
 
-  /**
-   * Sets the Sender email (Return-Path) of the message.  If not empty,
-   * will be sent via -f to sendmail or as 'MAIL FROM' in smtp mode.
-   * @var string
-   */
-  public $Sender            = '';
+    /**
+     * The Return-Path of the message.
+     * If empty, it will be set to either From or Sender.
+     * @var string
+     * @deprecated Email senders should never set a return-path header;
+     * it's the receiver's job (RFC5321 section 4.4), so this no longer does anything.
+     * @link https://tools.ietf.org/html/rfc5321#section-4.4 RFC5321 reference
+     */
+    public $ReturnPath = '';
 
-  /**
-   * Sets the Return-Path of the message.  If empty, it will
-   * be set to either From or Sender.
-   * @var string
-   */
-  public $ReturnPath        = '';
+    /**
+     * The Subject of the message.
+     * @var string
+     */
+    public $Subject = '';
 
-  /**
-   * Sets the Subject of the message.
-   * @var string
-   */
-  public $Subject           = '';
+    /**
+     * An HTML or plain text message body.
+     * If HTML then call isHTML(true).
+     * @var string
+     */
+    public $Body = '';
 
-  /**
-   * Sets the Body of the message.  This can be either an HTML or text body.
-   * If HTML then run IsHTML(true).
-   * @var string
-   */
-  public $Body              = '';
+    /**
+     * The plain-text message body.
+     * This body can be read by mail clients that do not have HTML email
+     * capability such as mutt & Eudora.
+     * Clients that can read HTML will view the normal Body.
+     * @var string
+     */
+    public $AltBody = '';
 
-  /**
-   * Sets the text-only body of the message.  This automatically sets the
-   * email to multipart/alternative.  This body can be read by mail
-   * clients that do not have HTML email capability such as mutt. Clients
-   * that can read HTML will view the normal Body.
-   * @var string
-   */
-  public $AltBody           = '';
+    /**
+     * An iCal message part body.
+     * Only supported in simple alt or alt_inline message types
+     * To generate iCal events, use the bundled extras/EasyPeasyICS.php class or iCalcreator
+     * @link http://sprain.ch/blog/downloads/php-class-easypeasyics-create-ical-files-with-php/
+     * @link http://kigkonsult.se/iCalcreator/
+     * @var string
+     */
+    public $Ical = '';
 
-  /**
-   * Stores the complete compiled MIME message body.
-   * @var string
-   * @access protected
-   */
-  protected $MIMEBody       = '';
+    /**
+     * The complete compiled MIME message body.
+     * @access protected
+     * @var string
+     */
+    protected $MIMEBody = '';
 
-  /**
-   * Stores the complete compiled MIME message headers.
-   * @var string
-   * @access protected
-   */
-  protected $MIMEHeader     = '';
+    /**
+     * The complete compiled MIME message headers.
+     * @var string
+     * @access protected
+     */
+    protected $MIMEHeader = '';
 
-  /**
-   * Stores the extra header list which CreateHeader() doesn't fold in
-   * @var string
-   * @access protected
-  */
-  protected $mailHeader     = '';
+    /**
+     * Extra headers that createHeader() doesn't fold in.
+     * @var string
+     * @access protected
+     */
+    protected $mailHeader = '';
 
-  /**
-   * Sets word wrapping on the body of the message to a given number of
-   * characters.
-   * @var int
-   */
-  public $WordWrap          = 0;
+    /**
+     * Word-wrap the message body to this number of chars.
+     * Set to 0 to not wrap. A useful value here is 78, for RFC2822 section 2.1.1 compliance.
+     * @var integer
+     */
+    public $WordWrap = 0;
 
-  /**
-   * Method to send mail: ("mail", "sendmail", or "smtp").
-   * @var string
-   */
-  public $Mailer            = 'mail';
+    /**
+     * Which method to use to send mail.
+     * Options: "mail", "sendmail", or "smtp".
+     * @var string
+     */
+    public $Mailer = 'mail';
 
-  /**
-   * Sets the path of the sendmail program.
-   * @var string
-   */
-  public $Sendmail          = '/usr/sbin/sendmail';
+    /**
+     * The path to the sendmail program.
+     * @var string
+     */
+    public $Sendmail = '/usr/sbin/sendmail';
 
-  /**
-   * Determine if mail() uses a fully sendmail compatible MTA that
-   * supports sendmail's "-oi -f" options
-   * @var boolean
-   */
-  public $UseSendmailOptions	= true;
+    /**
+     * Whether mail() uses a fully sendmail-compatible MTA.
+     * One which supports sendmail's "-oi -f" options.
+     * @var boolean
+     */
+    public $UseSendmailOptions = true;
 
-  /**
-   * Path to PHPMailer plugins.  Useful if the SMTP class
-   * is in a different directory than the PHP include path.
-   * @var string
-   */
-  public $PluginDir         = '';
+    /**
+     * Path to PHPMailer plugins.
+     * Useful if the SMTP class is not in the PHP include path.
+     * @var string
+     * @deprecated Should not be needed now there is an autoloader.
+     */
+    public $PluginDir = '';
 
-  /**
-   * Sets the email address that a reading confirmation will be sent.
-   * @var string
-   */
-  public $ConfirmReadingTo  = '';
+    /**
+     * The email address that a reading confirmation should be sent to, also known as read receipt.
+     * @var string
+     */
+    public $ConfirmReadingTo = '';
 
-  /**
-   * Sets the hostname to use in Message-Id and Received headers
-   * and as default HELO string. If empty, the value returned
-   * by SERVER_NAME is used or 'localhost.localdomain'.
-   * @var string
-   */
-  public $Hostname          = '';
+    /**
+     * The hostname to use in the Message-ID header and as default HELO string.
+     * If empty, PHPMailer attempts to find one with, in order,
+     * $_SERVER['SERVER_NAME'], gethostname(), php_uname('n'), or the value
+     * 'localhost.localdomain'.
+     * @var string
+     */
+    public $Hostname = '';
 
-  /**
-   * Sets the message ID to be used in the Message-Id header.
-   * If empty, a unique id will be generated.
-   * @var string
-   */
-  public $MessageID         = '';
+    /**
+     * An ID to be used in the Message-ID header.
+     * If empty, a unique id will be generated.
+     * You can set your own, but it must be in the format "<id@domain>",
+     * as defined in RFC5322 section 3.6.4 or it will be ignored.
+     * @see https://tools.ietf.org/html/rfc5322#section-3.6.4
+     * @var string
+     */
+    public $MessageID = '';
 
-  /**
-   * Sets the message Date to be used in the Date header.
-   * If empty, the current date will be added.
-   * @var string
-   */
-  public $MessageDate       = '';
+    /**
+     * The message Date to be used in the Date header.
+     * If empty, the current date will be added.
+     * @var string
+     */
+    public $MessageDate = '';
 
-  /////////////////////////////////////////////////
-  // PROPERTIES FOR SMTP
-  /////////////////////////////////////////////////
+    /**
+     * SMTP hosts.
+     * Either a single hostname or multiple semicolon-delimited hostnames.
+     * You can also specify a different port
+     * for each host by using this format: [hostname:port]
+     * (e.g. "smtp1.example.com:25;smtp2.example.com").
+     * You can also specify encryption type, for example:
+     * (e.g. "tls://smtp1.example.com:587;ssl://smtp2.example.com:465").
+     * Hosts will be tried in order.
+     * @var string
+     */
+    public $Host = 'localhost';
 
-  /**
-   * Sets the SMTP hosts.
-   *
-   * All hosts must be separated by a
-   * semicolon.  You can also specify a different port
-   * for each host by using this format: [hostname:port]
-   * (e.g. "smtp1.example.com:25;smtp2.example.com").
-   * Hosts will be tried in order.
-   * @var string
-   */
-  public $Host          = 'localhost';
+    /**
+     * The default SMTP server port.
+     * @var integer
+     * @TODO Why is this needed when the SMTP class takes care of it?
+     */
+    public $Port = 25;
 
-  /**
-   * Sets the default SMTP server port.
-   * @var int
-   */
-  public $Port          = 25;
+    /**
+     * The SMTP HELO of the message.
+     * Default is $Hostname. If $Hostname is empty, PHPMailer attempts to find
+     * one with the same method described above for $Hostname.
+     * @var string
+     * @see PHPMailer::$Hostname
+     */
+    public $Helo = '';
 
-  /**
-   * Sets the SMTP HELO of the message (Default is $Hostname).
-   * @var string
-   */
-  public $Helo          = '';
+    /**
+     * What kind of encryption to use on the SMTP connection.
+     * Options: '', 'ssl' or 'tls'
+     * @var string
+     */
+    public $SMTPSecure = '';
 
-  /**
-   * Sets connection prefix. Options are "", "ssl" or "tls"
-   * @var string
-   */
-  public $SMTPSecure    = '';
+    /**
+     * Whether to enable TLS encryption automatically if a server supports it,
+     * even if `SMTPSecure` is not set to 'tls'.
+     * Be aware that in PHP >= 5.6 this requires that the server's certificates are valid.
+     * @var boolean
+     */
+    public $SMTPAutoTLS = true;
 
-  /**
-   * Sets SMTP authentication. Utilizes the Username and Password variables.
-   * @var bool
-   */
-  public $SMTPAuth      = false;
+    /**
+     * Whether to use SMTP authentication.
+     * Uses the Username and Password properties.
+     * @var boolean
+     * @see PHPMailer::$Username
+     * @see PHPMailer::$Password
+     */
+    public $SMTPAuth = false;
 
-  /**
-   * Sets SMTP username.
-   * @var string
-   */
-  public $Username      = '';
+    /**
+     * Options array passed to stream_context_create when connecting via SMTP.
+     * @var array
+     */
+    public $SMTPOptions = array();
 
-  /**
-   * Sets SMTP password.
-   * @var string
-   */
-  public $Password      = '';
+    /**
+     * SMTP username.
+     * @var string
+     */
+    public $Username = '';
 
-  /**
-   *  Sets SMTP auth type. Options are LOGIN | PLAIN | NTLM  (default LOGIN)
-   *  @var string
-   */
-  public $AuthType      = '';
+    /**
+     * SMTP password.
+     * @var string
+     */
+    public $Password = '';
 
-  /**
-   *  Sets SMTP realm.
-   *  @var string
-   */
-  public $Realm         = '';
+    /**
+     * SMTP auth type.
+     * Options are CRAM-MD5, LOGIN, PLAIN, NTLM, XOAUTH2, attempted in that order if not specified
+     * @var string
+     */
+    public $AuthType = '';
 
-  /**
-   *  Sets SMTP workstation.
-   *  @var string
-   */
-  public $Workstation   = '';
+    /**
+     * SMTP realm.
+     * Used for NTLM auth
+     * @var string
+     */
+    public $Realm = '';
 
-  /**
-   * Sets the SMTP server timeout in seconds.
-   * This function will not work with the win32 version.
-   * @var int
-   */
-  public $Timeout       = 10;
+    /**
+     * SMTP workstation.
+     * Used for NTLM auth
+     * @var string
+     */
+    public $Workstation = '';
 
-  /**
-   * Sets SMTP class debugging on or off.
-   * @var bool
-   */
-  public $SMTPDebug     = false;
+    /**
+     * The SMTP server timeout in seconds.
+     * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2
+     * @var integer
+     */
+    public $Timeout = 300;
 
-  /**
-   * Sets the function/method to use for debugging output.
-   * Right now we only honor "echo" or "error_log"
-   * @var string
-   */
-  public $Debugoutput     = "echo";
+    /**
+     * SMTP class debug output mode.
+     * Debug output level.
+     * Options:
+     * * `0` No output
+     * * `1` Commands
+     * * `2` Data and commands
+     * * `3` As 2 plus connection status
+     * * `4` Low-level data output
+     * @var integer
+     * @see SMTP::$do_debug
+     */
+    public $SMTPDebug = 0;
 
-  /**
-   * Prevents the SMTP connection from being closed after each mail
-   * sending.  If this is set to true then to close the connection
-   * requires an explicit call to SmtpClose().
-   * @var bool
-   */
-  public $SMTPKeepAlive = false;
+    /**
+     * How to handle debug output.
+     * Options:
+     * * `echo` Output plain-text as-is, appropriate for CLI
+     * * `html` Output escaped, line breaks converted to `<br>`, appropriate for browser output
+     * * `error_log` Output to error log as configured in php.ini
+     *
+     * Alternatively, you can provide a callable expecting two params: a message string and the debug level:
+     * <code>
+     * $mail->Debugoutput = function($str, $level) {echo "debug level $level; message: $str";};
+     * </code>
+     * @var string|callable
+     * @see SMTP::$Debugoutput
+     */
+    public $Debugoutput = 'echo';
 
-  /**
-   * Provides the ability to have the TO field process individual
-   * emails, instead of sending to entire TO addresses
-   * @var bool
-   */
-  public $SingleTo      = false;
+    /**
+     * Whether to keep SMTP connection open after each message.
+     * If this is set to true then to close the connection
+     * requires an explicit call to smtpClose().
+     * @var boolean
+     */
+    public $SMTPKeepAlive = false;
 
-   /**
-   * If SingleTo is true, this provides the array to hold the email addresses
-   * @var bool
-   */
-  public $SingleToArray = array();
+    /**
+     * Whether to split multiple to addresses into multiple messages
+     * or send them all in one message.
+     * Only supported in `mail` and `sendmail` transports, not in SMTP.
+     * @var boolean
+     */
+    public $SingleTo = false;
 
- /**
-   * Provides the ability to change the generic line ending
-   * NOTE: The default remains '\n'. We force CRLF where we KNOW
-   *        it must be used via self::CRLF
-   * @var string
-   */
-  public $LE              = "\n";
+    /**
+     * Storage for addresses when SingleTo is enabled.
+     * @var array
+     * @TODO This should really not be public
+     */
+    public $SingleToArray = array();
 
-   /**
-   * Used with DKIM Signing
-   * required parameter if DKIM is enabled
-   *
-   * domain selector example domainkey
-   * @var string
-   */
-  public $DKIM_selector   = '';
+    /**
+     * Whether to generate VERP addresses on send.
+     * Only applicable when sending via SMTP.
+     * @link https://en.wikipedia.org/wiki/Variable_envelope_return_path
+     * @link http://www.postfix.org/VERP_README.html Postfix VERP info
+     * @var boolean
+     */
+    public $do_verp = false;
 
-  /**
-   * Used with DKIM Signing
-   * required if DKIM is enabled, in format of email address 'you@yourdomain.com' typically used as the source of the email
-   * @var string
-   */
-  public $DKIM_identity   = '';
+    /**
+     * Whether to allow sending messages with an empty body.
+     * @var boolean
+     */
+    public $AllowEmpty = false;
 
-  /**
-   * Used with DKIM Signing
-   * optional parameter if your private key requires a passphras
-   * @var string
-   */
-  public $DKIM_passphrase   = '';
+    /**
+     * The default line ending.
+     * @note The default remains "\n". We force CRLF where we know
+     *        it must be used via self::CRLF.
+     * @var string
+     */
+    public $LE = "\n";
 
-  /**
-   * Used with DKIM Singing
-   * required if DKIM is enabled, in format of email address 'domain.com'
-   * @var string
-   */
-  public $DKIM_domain     = '';
+    /**
+     * DKIM selector.
+     * @var string
+     */
+    public $DKIM_selector = '';
 
-  /**
-   * Used with DKIM Signing
-   * required if DKIM is enabled, path to private key file
-   * @var string
-   */
-  public $DKIM_private    = '';
+    /**
+     * DKIM Identity.
+     * Usually the email address used as the source of the email.
+     * @var string
+     */
+    public $DKIM_identity = '';
 
-  /**
-   * Callback Action function name.
-   * The function that handles the result of the send email action.
-   * It is called out by Send() for each email sent.
-   *
-   * Value can be:
-   * - 'function_name' for function names
-   * - 'Class::Method' for static method calls
-   * - array($object, 'Method') for calling methods on $object
-   * See http://php.net/is_callable manual page for more details.
-   *
-   * Parameters:
-   *   bool    $result        result of the send action
-   *   string  $to            email address of the recipient
-   *   string  $cc            cc email addresses
-   *   string  $bcc           bcc email addresses
-   *   string  $subject       the subject
-   *   string  $body          the email body
-   *   string  $from          email address of sender
-   * @var string
-   */
-  public $action_function = ''; //'callbackAction';
+    /**
+     * DKIM passphrase.
+     * Used if your key is encrypted.
+     * @var string
+     */
+    public $DKIM_passphrase = '';
 
-  /**
-   * Sets the PHPMailer Version number
-   * @var string
-   */
-  public $Version         = '5.2.2';
+    /**
+     * DKIM signing domain name.
+     * @example 'example.com'
+     * @var string
+     */
+    public $DKIM_domain = '';
 
-  /**
-   * What to use in the X-Mailer header
-   * @var string NULL for default, whitespace for None, or actual string to use
-   */
-  public $XMailer         = '';
+    /**
+     * DKIM private key file path.
+     * @var string
+     */
+    public $DKIM_private = '';
 
-  /////////////////////////////////////////////////
-  // PROPERTIES, PRIVATE AND PROTECTED
-  /////////////////////////////////////////////////
+    /**
+     * DKIM private key string.
+     * If set, takes precedence over `$DKIM_private`.
+     * @var string
+     */
+    public $DKIM_private_string = '';
 
-  /**
-   * @var SMTP An instance of the SMTP sender class
-   * @access protected
-   */
-  protected   $smtp           = null;
-  /**
-   * @var array An array of 'to' addresses
-   * @access protected
-   */
-  protected   $to             = array();
-  /**
-   * @var array An array of 'cc' addresses
-   * @access protected
-   */
-  protected   $cc             = array();
-  /**
-   * @var array An array of 'bcc' addresses
-   * @access protected
-   */
-  protected   $bcc            = array();
-  /**
-   * @var array An array of reply-to name and address
-   * @access protected
-   */
-  protected   $ReplyTo        = array();
-  /**
-   * @var array An array of all kinds of addresses: to, cc, bcc, replyto
-   * @access protected
-   */
-  protected   $all_recipients = array();
-  /**
-   * @var array An array of attachments
-   * @access protected
-   */
-  protected   $attachment     = array();
-  /**
-   * @var array An array of custom headers
-   * @access protected
-   */
-  protected   $CustomHeader   = array();
-  /**
-   * @var string The message's MIME type
-   * @access protected
-   */
-  protected   $message_type   = '';
-  /**
-   * @var array An array of MIME boundary strings
-   * @access protected
-   */
-  protected   $boundary       = array();
-  /**
-   * @var array An array of available languages
-   * @access protected
-   */
-  protected   $language       = array();
-  /**
-   * @var integer The number of errors encountered
-   * @access protected
-   */
-  protected   $error_count    = 0;
-  /**
-   * @var string The filename of a DKIM certificate file
-   * @access protected
-   */
-  protected   $sign_cert_file = '';
-  /**
-   * @var string The filename of a DKIM key file
-   * @access protected
-   */
-  protected   $sign_key_file  = '';
-  /**
-   * @var string The password of a DKIM key
-   * @access protected
-   */
-  protected   $sign_key_pass  = '';
-  /**
-   * @var boolean Whether to throw exceptions for errors
-   * @access protected
-   */
-  protected   $exceptions     = false;
+    /**
+     * Callback Action function name.
+     *
+     * The function that handles the result of the send email action.
+     * It is called out by send() for each email sent.
+     *
+     * Value can be any php callable: http://www.php.net/is_callable
+     *
+     * Parameters:
+     *   boolean $result        result of the send action
+     *   array   $to            email addresses of the recipients
+     *   array   $cc            cc email addresses
+     *   array   $bcc           bcc email addresses
+     *   string  $subject       the subject
+     *   string  $body          the email body
+     *   string  $from          email address of sender
+     * @var string
+     */
+    public $action_function = '';
 
-  /////////////////////////////////////////////////
-  // CONSTANTS
-  /////////////////////////////////////////////////
+    /**
+     * What to put in the X-Mailer header.
+     * Options: An empty string for PHPMailer default, whitespace for none, or a string to use
+     * @var string
+     */
+    public $XMailer = '';
 
-  const STOP_MESSAGE  = 0; // message only, continue processing
-  const STOP_CONTINUE = 1; // message?, likely ok to continue processing
-  const STOP_CRITICAL = 2; // message, plus full stop, critical error reached
-  const CRLF = "\r\n";     // SMTP RFC specified EOL
+    /**
+     * Which validator to use by default when validating email addresses.
+     * May be a callable to inject your own validator, but there are several built-in validators.
+     * @see PHPMailer::validateAddress()
+     * @var string|callable
+     * @static
+     */
+    public static $validator = 'auto';
 
-  /////////////////////////////////////////////////
-  // METHODS, VARIABLES
-  /////////////////////////////////////////////////
+    /**
+     * An instance of the SMTP sender class.
+     * @var SMTP
+     * @access protected
+     */
+    protected $smtp = null;
 
-  /**
-   * Calls actual mail() function, but in a safe_mode aware fashion
-   * Also, unless sendmail_path points to sendmail (or something that
-   * claims to be sendmail), don't pass params (not a perfect fix,
-   * but it will do)
-   * @param string $to To
-   * @param string $subject Subject
-   * @param string $body Message Body
-   * @param string $header Additional Header(s)
-   * @param string $params Params
-   * @access private
-   * @return bool
-   */
-  private function mail_passthru($to, $subject, $body, $header, $params) {
-    if ( ini_get('safe_mode') || !($this->UseSendmailOptions) ) {
-        $rt = @mail($to, $this->EncodeHeader($this->SecureHeader($subject)), $body, $header);
-    } else {
-        $rt = @mail($to, $this->EncodeHeader($this->SecureHeader($subject)), $body, $header, $params);
+    /**
+     * The array of 'to' names and addresses.
+     * @var array
+     * @access protected
+     */
+    protected $to = array();
+
+    /**
+     * The array of 'cc' names and addresses.
+     * @var array
+     * @access protected
+     */
+    protected $cc = array();
+
+    /**
+     * The array of 'bcc' names and addresses.
+     * @var array
+     * @access protected
+     */
+    protected $bcc = array();
+
+    /**
+     * The array of reply-to names and addresses.
+     * @var array
+     * @access protected
+     */
+    protected $ReplyTo = array();
+
+    /**
+     * An array of all kinds of addresses.
+     * Includes all of $to, $cc, $bcc
+     * @var array
+     * @access protected
+     * @see PHPMailer::$to @see PHPMailer::$cc @see PHPMailer::$bcc
+     */
+    protected $all_recipients = array();
+
+    /**
+     * An array of names and addresses queued for validation.
+     * In send(), valid and non duplicate entries are moved to $all_recipients
+     * and one of $to, $cc, or $bcc.
+     * This array is used only for addresses with IDN.
+     * @var array
+     * @access protected
+     * @see PHPMailer::$to @see PHPMailer::$cc @see PHPMailer::$bcc
+     * @see PHPMailer::$all_recipients
+     */
+    protected $RecipientsQueue = array();
+
+    /**
+     * An array of reply-to names and addresses queued for validation.
+     * In send(), valid and non duplicate entries are moved to $ReplyTo.
+     * This array is used only for addresses with IDN.
+     * @var array
+     * @access protected
+     * @see PHPMailer::$ReplyTo
+     */
+    protected $ReplyToQueue = array();
+
+    /**
+     * The array of attachments.
+     * @var array
+     * @access protected
+     */
+    protected $attachment = array();
+
+    /**
+     * The array of custom headers.
+     * @var array
+     * @access protected
+     */
+    protected $CustomHeader = array();
+
+    /**
+     * The most recent Message-ID (including angular brackets).
+     * @var string
+     * @access protected
+     */
+    protected $lastMessageID = '';
+
+    /**
+     * The message's MIME type.
+     * @var string
+     * @access protected
+     */
+    protected $message_type = '';
+
+    /**
+     * The array of MIME boundary strings.
+     * @var array
+     * @access protected
+     */
+    protected $boundary = array();
+
+    /**
+     * The array of available languages.
+     * @var array
+     * @access protected
+     */
+    protected $language = array();
+
+    /**
+     * The number of errors encountered.
+     * @var integer
+     * @access protected
+     */
+    protected $error_count = 0;
+
+    /**
+     * The S/MIME certificate file path.
+     * @var string
+     * @access protected
+     */
+    protected $sign_cert_file = '';
+
+    /**
+     * The S/MIME key file path.
+     * @var string
+     * @access protected
+     */
+    protected $sign_key_file = '';
+
+    /**
+     * The optional S/MIME extra certificates ("CA Chain") file path.
+     * @var string
+     * @access protected
+     */
+    protected $sign_extracerts_file = '';
+
+    /**
+     * The S/MIME password for the key.
+     * Used only if the key is encrypted.
+     * @var string
+     * @access protected
+     */
+    protected $sign_key_pass = '';
+
+    /**
+     * Whether to throw exceptions for errors.
+     * @var boolean
+     * @access protected
+     */
+    protected $exceptions = false;
+
+    /**
+     * Unique ID used for message ID and boundaries.
+     * @var string
+     * @access protected
+     */
+    protected $uniqueid = '';
+
+    /**
+     * Error severity: message only, continue processing.
+     */
+    const STOP_MESSAGE = 0;
+
+    /**
+     * Error severity: message, likely ok to continue processing.
+     */
+    const STOP_CONTINUE = 1;
+
+    /**
+     * Error severity: message, plus full stop, critical error reached.
+     */
+    const STOP_CRITICAL = 2;
+
+    /**
+     * SMTP RFC standard line ending.
+     */
+    const CRLF = "\r\n";
+
+    /**
+     * The maximum line length allowed by RFC 2822 section 2.1.1
+     * @var integer
+     */
+    const MAX_LINE_LENGTH = 998;
+
+    /**
+     * Constructor.
+     * @param boolean $exceptions Should we throw external exceptions?
+     */
+    public function __construct($exceptions = null)
+    {
+        if ($exceptions !== null) {
+            $this->exceptions = (boolean)$exceptions;
+        }
+        //Pick an appropriate debug output format automatically
+        $this->Debugoutput = (strpos(PHP_SAPI, 'cli') !== false ? 'echo' : 'html');
     }
-    return $rt;
-  }
 
-  /**
-   * Outputs debugging info via user-defined method
-   * @param string $str
-   */
-  private function edebug($str) {
-    if ($this->Debugoutput == "error_log") {
-        error_log($str);
-    } else {
-        echo $str;
+    /**
+     * Destructor.
+     */
+    public function __destruct()
+    {
+        //Close any open SMTP connection nicely
+        $this->smtpClose();
     }
-  }
 
-  /**
-   * Constructor
-   * @param boolean $exceptions Should we throw external exceptions?
-   */
-  public function __construct($exceptions = false) {
-    $this->exceptions = ($exceptions == true);
-  }
-
-  /**
-   * Sets message type to HTML.
-   * @param bool $ishtml
-   * @return void
-   */
-  public function IsHTML($ishtml = true) {
-    if ($ishtml) {
-      $this->ContentType = 'text/html';
-    } else {
-      $this->ContentType = 'text/plain';
-    }
-  }
-
-  /**
-   * Sets Mailer to send message using SMTP.
-   * @return void
-   * @deprecated
-   */
-  public function IsSMTP() {
-    $this->Mailer = 'smtp';
-  }
-
-  /**
-   * Sets Mailer to send message using PHP mail() function.
-   * @return void
-   * @deprecated
-   */
-  public function IsMail() {
-    $this->Mailer = 'mail';
-  }
-
-  /**
-   * Sets Mailer to send message using the $Sendmail program.
-   * @return void
-   * @deprecated
-   */
-  public function IsSendmail() {
-    if (!stristr(ini_get('sendmail_path'), 'sendmail')) {
-      $this->Sendmail = '/var/qmail/bin/sendmail';
-    }
-    $this->Mailer = 'sendmail';
-  }
-
-  /**
-   * Sets Mailer to send message using the qmail MTA.
-   * @return void
-   * @deprecated
-   */
-  public function IsQmail() {
-    if (stristr(ini_get('sendmail_path'), 'qmail')) {
-      $this->Sendmail = '/var/qmail/bin/sendmail';
-    }
-    $this->Mailer = 'sendmail';
-  }
-
-  /////////////////////////////////////////////////
-  // METHODS, RECIPIENTS
-  /////////////////////////////////////////////////
-
-  /**
-   * Adds a "To" address.
-   * @param string $address
-   * @param string $name
-   * @return boolean true on success, false if address already used
-   */
-  public function AddAddress($address, $name = '') {
-    return $this->AddAnAddress('to', $address, $name);
-  }
-
-  /**
-   * Adds a "Cc" address.
-   * Note: this function works with the SMTP mailer on win32, not with the "mail" mailer.
-   * @param string $address
-   * @param string $name
-   * @return boolean true on success, false if address already used
-   */
-  public function AddCC($address, $name = '') {
-    return $this->AddAnAddress('cc', $address, $name);
-  }
-
-  /**
-   * Adds a "Bcc" address.
-   * Note: this function works with the SMTP mailer on win32, not with the "mail" mailer.
-   * @param string $address
-   * @param string $name
-   * @return boolean true on success, false if address already used
-   */
-  public function AddBCC($address, $name = '') {
-    return $this->AddAnAddress('bcc', $address, $name);
-  }
-
-  /**
-   * Adds a "Reply-to" address.
-   * @param string $address
-   * @param string $name
-   * @return boolean
-   */
-  public function AddReplyTo($address, $name = '') {
-    return $this->AddAnAddress('Reply-To', $address, $name);
-  }
-
-  /**
-   * Adds an address to one of the recipient arrays
-   * Addresses that have been added already return false, but do not throw exceptions
-   * @param string $kind One of 'to', 'cc', 'bcc', 'ReplyTo'
-   * @param string $address The email address to send to
-   * @param string $name
-   * @throws phpmailerException
-   * @return boolean true on success, false if address already used or invalid in some way
-   * @access protected
-   */
-  protected function AddAnAddress($kind, $address, $name = '') {
-    if (!preg_match('/^(to|cc|bcc|Reply-To)$/', $kind)) {
-      $this->SetError($this->Lang('Invalid recipient array').': '.$kind);
-      if ($this->exceptions) {
-        throw new phpmailerException('Invalid recipient array: ' . $kind);
-      }
-      if ($this->SMTPDebug) {
-        $this->edebug($this->Lang('Invalid recipient array').': '.$kind);
-      }
-      return false;
-    }
-    $address = trim($address);
-    $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
-    if (!$this->ValidateAddress($address)) {
-      $this->SetError($this->Lang('invalid_address').': '. $address);
-      if ($this->exceptions) {
-        throw new phpmailerException($this->Lang('invalid_address').': '.$address);
-      }
-      if ($this->SMTPDebug) {
-        $this->edebug($this->Lang('invalid_address').': '.$address);
-      }
-      return false;
-    }
-    if ($kind != 'Reply-To') {
-      if (!isset($this->all_recipients[strtolower($address)])) {
-        array_push($this->$kind, array($address, $name));
-        $this->all_recipients[strtolower($address)] = true;
-        return true;
-      }
-    } else {
-      if (!array_key_exists(strtolower($address), $this->ReplyTo)) {
-        $this->ReplyTo[strtolower($address)] = array($address, $name);
-      return true;
-    }
-  }
-  return false;
-}
-
-/**
- * Set the From and FromName properties
- * @param string $address
- * @param string $name
- * @param int $auto Also set Reply-To and Sender
-   * @throws phpmailerException
- * @return boolean
- */
-  public function SetFrom($address, $name = '', $auto = 1) {
-    $address = trim($address);
-    $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
-    if (!$this->ValidateAddress($address)) {
-      $this->SetError($this->Lang('invalid_address').': '. $address);
-      if ($this->exceptions) {
-        throw new phpmailerException($this->Lang('invalid_address').': '.$address);
-      }
-      if ($this->SMTPDebug) {
-        $this->edebug($this->Lang('invalid_address').': '.$address);
-      }
-      return false;
-    }
-    $this->From = $address;
-    $this->FromName = $name;
-    if ($auto) {
-      if (empty($this->ReplyTo)) {
-        $this->AddAnAddress('Reply-To', $address, $name);
-      }
-      if (empty($this->Sender)) {
-        $this->Sender = $address;
-      }
-    }
-    return true;
-  }
-
-  /**
-   * Check that a string looks roughly like an email address should
-   * Static so it can be used without instantiation, public so people can overload
-   * Conforms to RFC5322: Uses *correct* regex on which FILTER_VALIDATE_EMAIL is
-   * based; So why not use FILTER_VALIDATE_EMAIL? Because it was broken to
-   * not allow a@b type valid addresses :(
-   * @link http://squiloople.com/2009/12/20/email-address-validation/
-   * @copyright regex Copyright Michael Rushton 2009-10 | http://squiloople.com/ | Feel free to use and redistribute this code. But please keep this copyright notice.
-   * @param string $address The email address to check
-   * @return boolean
-   * @static
-   * @access public
-   */
-  public static function ValidateAddress($address) {
-	return preg_match('/^(?!(?>(?1)"?(?>\\\[ -~]|[^"])"?(?1)){255,})(?!(?>(?1)"?(?>\\\[ -~]|[^"])"?(?1)){65,}@)((?>(?>(?>((?>(?>(?>\x0D\x0A)?[	 ])+|(?>[	 ]*\x0D\x0A)?[	 ]+)?)(\((?>(?2)(?>[\x01-\x08\x0B\x0C\x0E-\'*-\[\]-\x7F]|\\\[\x00-\x7F]|(?3)))*(?2)\)))+(?2))|(?2))?)([!#-\'*+\/-9=?^-~-]+|"(?>(?2)(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\x7F]))*(?2)")(?>(?1)\.(?1)(?4))*(?1)@(?!(?1)[a-z0-9-]{64,})(?1)(?>([a-z0-9](?>[a-z0-9-]*[a-z0-9])?)(?>(?1)\.(?!(?1)[a-z0-9-]{64,})(?1)(?5)){0,126}|\[(?:(?>IPv6:(?>([a-f0-9]{1,4})(?>:(?6)){7}|(?!(?:.*[a-f0-9][:\]]){7,})((?6)(?>:(?6)){0,5})?::(?7)?))|(?>(?>IPv6:(?>(?6)(?>:(?6)){5}:|(?!(?:.*[a-f0-9]:){5,})(?8)?::(?>((?6)(?>:(?6)){0,3}):)?))?(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])(?>\.(?9)){3}))\])(?1)$/isD', $address);
-  }
-
-  /////////////////////////////////////////////////
-  // METHODS, MAIL SENDING
-  /////////////////////////////////////////////////
-
-  /**
-   * Creates message and assigns Mailer. If the message is
-   * not sent successfully then it returns false.  Use the ErrorInfo
-   * variable to view description of the error.
-   * @throws phpmailerException
-   * @return bool
-   */
-  public function Send() {
-    try {
-      if(!$this->PreSend()) return false;
-      return $this->PostSend();
-    } catch (phpmailerException $e) {
-      $this->mailHeader = '';
-      $this->SetError($e->getMessage());
-      if ($this->exceptions) {
-        throw $e;
-      }
-      return false;
-    }
-  }
-
-  /**
-   * Prep mail by constructing all message entities
-   * @throws phpmailerException
-   * @return bool
-   */
-  public function PreSend() {
-    try {
-      $this->mailHeader = "";
-      if ((count($this->to) + count($this->cc) + count($this->bcc)) < 1) {
-        throw new phpmailerException($this->Lang('provide_address'), self::STOP_CRITICAL);
-      }
-
-      // Set whether the message is multipart/alternative
-      if(!empty($this->AltBody)) {
-        $this->ContentType = 'multipart/alternative';
-      }
-
-      $this->error_count = 0; // reset errors
-      $this->SetMessageType();
-      //Refuse to send an empty message
-      if (empty($this->Body)) {
-        throw new phpmailerException($this->Lang('empty_message'), self::STOP_CRITICAL);
-      }
-
-      $this->MIMEHeader = $this->CreateHeader();
-      $this->MIMEBody = $this->CreateBody();
-
-      // To capture the complete message when using mail(), create
-      // an extra header list which CreateHeader() doesn't fold in
-      if ($this->Mailer == 'mail') {
-        if (count($this->to) > 0) {
-          $this->mailHeader .= $this->AddrAppend("To", $this->to);
+    /**
+     * Call mail() in a safe_mode-aware fashion.
+     * Also, unless sendmail_path points to sendmail (or something that
+     * claims to be sendmail), don't pass params (not a perfect fix,
+     * but it will do)
+     * @param string $to To
+     * @param string $subject Subject
+     * @param string $body Message Body
+     * @param string $header Additional Header(s)
+     * @param string $params Params
+     * @access private
+     * @return boolean
+     */
+    private function mailPassthru($to, $subject, $body, $header, $params)
+    {
+        //Check overloading of mail function to avoid double-encoding
+        if (ini_get('mbstring.func_overload') & 1) {
+            $subject = $this->secureHeader($subject);
         } else {
-          $this->mailHeader .= $this->HeaderLine("To", "undisclosed-recipients:;");
+            $subject = $this->encodeHeader($this->secureHeader($subject));
         }
-        $this->mailHeader .= $this->HeaderLine('Subject', $this->EncodeHeader($this->SecureHeader(trim($this->Subject))));
-        // if(count($this->cc) > 0) {
-            // $this->mailHeader .= $this->AddrAppend("Cc", $this->cc);
-        // }
-      }
 
-      // digitally sign with DKIM if enabled
-      if (!empty($this->DKIM_domain) && !empty($this->DKIM_private) && !empty($this->DKIM_selector) && !empty($this->DKIM_domain) && file_exists($this->DKIM_private)) {
-        $header_dkim = $this->DKIM_Add($this->MIMEHeader, $this->EncodeHeader($this->SecureHeader($this->Subject)), $this->MIMEBody);
-        $this->MIMEHeader = str_replace("\r\n", "\n", $header_dkim) . $this->MIMEHeader;
-      }
-
-      return true;
-
-    } catch (phpmailerException $e) {
-      $this->SetError($e->getMessage());
-      if ($this->exceptions) {
-        throw $e;
-      }
-      return false;
-    }
-  }
-
-  /**
-   * Actual Email transport function
-   * Send the email via the selected mechanism
-   * @throws phpmailerException
-   * @return bool
-   */
-  public function PostSend() {
-    try {
-      // Choose the mailer and send through it
-      switch($this->Mailer) {
-        case 'sendmail':
-          return $this->SendmailSend($this->MIMEHeader, $this->MIMEBody);
-        case 'smtp':
-          return $this->SmtpSend($this->MIMEHeader, $this->MIMEBody);
-        case 'mail':
-          return $this->MailSend($this->MIMEHeader, $this->MIMEBody);
-        default:
-          return $this->MailSend($this->MIMEHeader, $this->MIMEBody);
-      }
-    } catch (phpmailerException $e) {
-      $this->SetError($e->getMessage());
-      if ($this->exceptions) {
-        throw $e;
-      }
-      if ($this->SMTPDebug) {
-        $this->edebug($e->getMessage()."\n");
-      }
-    }
-    return false;
-  }
-
-  /**
-   * Sends mail using the $Sendmail program.
-   * @param string $header The message headers
-   * @param string $body The message body
-   * @throws phpmailerException
-   * @access protected
-   * @return bool
-   */
-  protected function SendmailSend($header, $body) {
-    if ($this->Sender != '') {
-      $sendmail = sprintf("%s -oi -f%s -t", escapeshellcmd($this->Sendmail), escapeshellarg($this->Sender));
-    } else {
-      $sendmail = sprintf("%s -oi -t", escapeshellcmd($this->Sendmail));
-    }
-    if ($this->SingleTo === true) {
-      foreach ($this->SingleToArray as $val) {
-        if(!@$mail = popen($sendmail, 'w')) {
-          throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+        //Can't use additional_parameters in safe_mode, calling mail() with null params breaks
+        //@link http://php.net/manual/en/function.mail.php
+        if (ini_get('safe_mode') or !$this->UseSendmailOptions or is_null($params)) {
+            $result = @mail($to, $subject, $body, $header);
+        } else {
+            $result = @mail($to, $subject, $body, $header, $params);
+        }
+        return $result;
+    }
+    /**
+     * Output debugging info via user-defined method.
+     * Only generates output if SMTP debug output is enabled (@see SMTP::$do_debug).
+     * @see PHPMailer::$Debugoutput
+     * @see PHPMailer::$SMTPDebug
+     * @param string $str
+     */
+    protected function edebug($str)
+    {
+        if ($this->SMTPDebug <= 0) {
+            return;
+        }
+        //Avoid clash with built-in function names
+        if (!in_array($this->Debugoutput, array('error_log', 'html', 'echo')) and is_callable($this->Debugoutput)) {
+            call_user_func($this->Debugoutput, $str, $this->SMTPDebug);
+            return;
+        }
+        switch ($this->Debugoutput) {
+            case 'error_log':
+                //Don't output, just log
+                error_log($str);
+                break;
+            case 'html':
+                //Cleans up output a bit for a better looking, HTML-safe output
+                echo htmlentities(
+                    preg_replace('/[\r\n]+/', '', $str),
+                    ENT_QUOTES,
+                    'UTF-8'
+                )
+                . "<br>\n";
+                break;
+            case 'echo':
+            default:
+                //Normalize line breaks
+                $str = preg_replace('/\r\n?/ms', "\n", $str);
+                echo gmdate('Y-m-d H:i:s') . "\t" . str_replace(
+                    "\n",
+                    "\n                   \t                  ",
+                    trim($str)
+                ) . "\n";
         }
-        fputs($mail, "To: " . $val . "\n");
-        fputs($mail, $header);
-        fputs($mail, $body);
-        $result = pclose($mail);
-        // implement call back function if it exists
-        $isSent = ($result == 0) ? 1 : 0;
-        $this->doCallback($isSent, $val, $this->cc, $this->bcc, $this->Subject, $body);
-        if($result != 0) {
-          throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
-        }
-      }
-    } else {
-      if(!@$mail = popen($sendmail, 'w')) {
-        throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
-      }
-      fputs($mail, $header);
-      fputs($mail, $body);
-      $result = pclose($mail);
-      // implement call back function if it exists
-      $isSent = ($result == 0) ? 1 : 0;
-      $this->doCallback($isSent, $this->to, $this->cc, $this->bcc, $this->Subject, $body);
-      if($result != 0) {
-        throw new phpmailerException($this->Lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
-      }
     }
-    return true;
-  }
 
-  /**
-   * Sends mail using the PHP mail() function.
-   * @param string $header The message headers
-   * @param string $body The message body
+    /**
+     * Sets message type to HTML or plain.
+     * @param boolean $isHtml True for HTML mode.
+     * @return void
+     */
+    public function isHTML($isHtml = true)
+    {
+        if ($isHtml) {
+            $this->ContentType = 'text/html';
+        } else {
+            $this->ContentType = 'text/plain';
+        }
+    }
+
+    /**
+     * Send messages using SMTP.
+     * @return void
+     */
+    public function isSMTP()
+    {
+        $this->Mailer = 'smtp';
+    }
+
+    /**
+     * Send messages using PHP's mail() function.
+     * @return void
+     */
+    public function isMail()
+    {
+        $this->Mailer = 'mail';
+    }
+
+    /**
+     * Send messages using $Sendmail.
+     * @return void
+     */
+    public function isSendmail()
+    {
+        $ini_sendmail_path = ini_get('sendmail_path');
+
+        if (!stristr($ini_sendmail_path, 'sendmail')) {
+            $this->Sendmail = '/usr/sbin/sendmail';
+        } else {
+            $this->Sendmail = $ini_sendmail_path;
+        }
+        $this->Mailer = 'sendmail';
+    }
+
+    /**
+     * Send messages using qmail.
+     * @return void
+     */
+    public function isQmail()
+    {
+        $ini_sendmail_path = ini_get('sendmail_path');
+
+        if (!stristr($ini_sendmail_path, 'qmail')) {
+            $this->Sendmail = '/var/qmail/bin/qmail-inject';
+        } else {
+            $this->Sendmail = $ini_sendmail_path;
+        }
+        $this->Mailer = 'qmail';
+    }
+
+    /**
+     * Add a "To" address.
+     * @param string $address The email address to send to
+     * @param string $name
+     * @return boolean true on success, false if address already used or invalid in some way
+     */
+    public function addAddress($address, $name = '')
+    {
+        return $this->addOrEnqueueAnAddress('to', $address, $name);
+    }
+
+    /**
+     * Add a "CC" address.
+     * @note: This function works with the SMTP mailer on win32, not with the "mail" mailer.
+     * @param string $address The email address to send to
+     * @param string $name
+     * @return boolean true on success, false if address already used or invalid in some way
+     */
+    public function addCC($address, $name = '')
+    {
+        return $this->addOrEnqueueAnAddress('cc', $address, $name);
+    }
+
+    /**
+     * Add a "BCC" address.
+     * @note: This function works with the SMTP mailer on win32, not with the "mail" mailer.
+     * @param string $address The email address to send to
+     * @param string $name
+     * @return boolean true on success, false if address already used or invalid in some way
+     */
+    public function addBCC($address, $name = '')
+    {
+        return $this->addOrEnqueueAnAddress('bcc', $address, $name);
+    }
+
+    /**
+     * Add a "Reply-To" address.
+     * @param string $address The email address to reply to
+     * @param string $name
+     * @return boolean true on success, false if address already used or invalid in some way
+     */
+    public function addReplyTo($address, $name = '')
+    {
+        return $this->addOrEnqueueAnAddress('Reply-To', $address, $name);
+    }
+
+    /**
+     * Add an address to one of the recipient arrays or to the ReplyTo array. Because PHPMailer
+     * can't validate addresses with an IDN without knowing the PHPMailer::$CharSet (that can still
+     * be modified after calling this function), addition of such addresses is delayed until send().
+     * Addresses that have been added already return false, but do not throw exceptions.
+     * @param string $kind One of 'to', 'cc', 'bcc', or 'ReplyTo'
+     * @param string $address The email address to send, resp. to reply to
+     * @param string $name
      * @throws phpmailerException
-   * @access protected
-   * @return bool
-   */
-  protected function MailSend($header, $body) {
-    $toArr = array();
-    foreach($this->to as $t) {
-      $toArr[] = $this->AddrFormat($t);
-    }
-    $to = implode(', ', $toArr);
-
-    if (empty($this->Sender)) {
-      $params = "-oi ";
-    } else {
-      $params = sprintf("-oi -f%s", $this->Sender);
-    }
-    if ($this->Sender != '' and !ini_get('safe_mode')) {
-      $old_from = ini_get('sendmail_from');
-      ini_set('sendmail_from', $this->Sender);
-    }
-      $rt = false;
-    if ($this->SingleTo === true && count($toArr) > 1) {
-      foreach ($toArr as $val) {
-        $rt = $this->mail_passthru($val, $this->Subject, $body, $header, $params);
-        // implement call back function if it exists
-        $isSent = ($rt == 1) ? 1 : 0;
-        $this->doCallback($isSent, $val, $this->cc, $this->bcc, $this->Subject, $body);
-      }
-    } else {
-      $rt = $this->mail_passthru($to, $this->Subject, $body, $header, $params);
-      // implement call back function if it exists
-      $isSent = ($rt == 1) ? 1 : 0;
-      $this->doCallback($isSent, $to, $this->cc, $this->bcc, $this->Subject, $body);
-    }
-    if (isset($old_from)) {
-      ini_set('sendmail_from', $old_from);
-    }
-    if(!$rt) {
-      throw new phpmailerException($this->Lang('instantiate'), self::STOP_CRITICAL);
-    }
-    return true;
-  }
-
-  /**
-   * Sends mail via SMTP using PhpSMTP
-   * Returns false if there is a bad MAIL FROM, RCPT, or DATA input.
-   * @param string $header The message headers
-   * @param string $body The message body
-   * @throws phpmailerException
-   * @uses SMTP
-   * @access protected
-   * @return bool
-   */
-  protected function SmtpSend($header, $body) {
-    require_once $this->PluginDir . 'class.smtp.php';
-    $bad_rcpt = array();
-
-    if(!$this->SmtpConnect()) {
-      throw new phpmailerException($this->Lang('smtp_connect_failed'), self::STOP_CRITICAL);
-    }
-    $smtp_from = ($this->Sender == '') ? $this->From : $this->Sender;
-    if(!$this->smtp->Mail($smtp_from)) {
-      throw new phpmailerException($this->Lang('from_failed') . $smtp_from, self::STOP_CRITICAL);
-    }
-
-    // Attempt to send attach all recipients
-    foreach($this->to as $to) {
-      if (!$this->smtp->Recipient($to[0])) {
-        $bad_rcpt[] = $to[0];
-        // implement call back function if it exists
-        $isSent = 0;
-        $this->doCallback($isSent, $to[0], '', '', $this->Subject, $body);
-      } else {
-        // implement call back function if it exists
-        $isSent = 1;
-        $this->doCallback($isSent, $to[0], '', '', $this->Subject, $body);
-      }
-    }
-    foreach($this->cc as $cc) {
-      if (!$this->smtp->Recipient($cc[0])) {
-        $bad_rcpt[] = $cc[0];
-        // implement call back function if it exists
-        $isSent = 0;
-        $this->doCallback($isSent, '', $cc[0], '', $this->Subject, $body);
-      } else {
-        // implement call back function if it exists
-        $isSent = 1;
-        $this->doCallback($isSent, '', $cc[0], '', $this->Subject, $body);
-      }
-    }
-    foreach($this->bcc as $bcc) {
-      if (!$this->smtp->Recipient($bcc[0])) {
-        $bad_rcpt[] = $bcc[0];
-        // implement call back function if it exists
-        $isSent = 0;
-        $this->doCallback($isSent, '', '', $bcc[0], $this->Subject, $body);
-      } else {
-        // implement call back function if it exists
-        $isSent = 1;
-        $this->doCallback($isSent, '', '', $bcc[0], $this->Subject, $body);
-      }
-    }
-
-
-    if (count($bad_rcpt) > 0 ) { //Create error message for any bad addresses
-      $badaddresses = implode(', ', $bad_rcpt);
-      throw new phpmailerException($this->Lang('recipients_failed') . $badaddresses);
-    }
-    if(!$this->smtp->Data($header . $body)) {
-      throw new phpmailerException($this->Lang('data_not_accepted'), self::STOP_CRITICAL);
-    }
-    if($this->SMTPKeepAlive == true) {
-      $this->smtp->Reset();
-    } else {
-        $this->smtp->Quit();
-        $this->smtp->Close();
-    }
-    return true;
-  }
-
-  /**
-   * Initiates a connection to an SMTP server.
-   * Returns false if the operation failed.
-   * @uses SMTP
-   * @access public
-   * @throws phpmailerException
-   * @return bool
-   */
-  public function SmtpConnect() {
-    if(is_null($this->smtp)) {
-      $this->smtp = new SMTP;
-    }
-
-    $this->smtp->Timeout = $this->Timeout;
-    $this->smtp->do_debug = $this->SMTPDebug;
-    $hosts = explode(';', $this->Host);
-    $index = 0;
-    $connection = $this->smtp->Connected();
-
-    // Retry while there is no connection
-    try {
-      while($index < count($hosts) && !$connection) {
-        $hostinfo = array();
-        if (preg_match('/^(.+):([0-9]+)$/', $hosts[$index], $hostinfo)) {
-          $host = $hostinfo[1];
-          $port = $hostinfo[2];
-        } else {
-          $host = $hosts[$index];
-          $port = $this->Port;
-        }
-
-        $tls = ($this->SMTPSecure == 'tls');
-        $ssl = ($this->SMTPSecure == 'ssl');
-
-        if ($this->smtp->Connect(($ssl ? 'ssl://':'').$host, $port, $this->Timeout)) {
-
-          $hello = ($this->Helo != '' ? $this->Helo : $this->ServerHostname());
-          $this->smtp->Hello($hello);
-
-          if ($tls) {
-            if (!$this->smtp->StartTLS()) {
-              throw new phpmailerException($this->Lang('tls'));
+     * @return boolean true on success, false if address already used or invalid in some way
+     * @access protected
+     */
+    protected function addOrEnqueueAnAddress($kind, $address, $name)
+    {
+        $address = trim($address);
+        $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
+        if (($pos = strrpos($address, '@')) === false) {
+            // At-sign is misssing.
+            $error_message = $this->lang('invalid_address') . " (addAnAddress $kind): $address";
+            $this->setError($error_message);
+            $this->edebug($error_message);
+            if ($this->exceptions) {
+                throw new phpmailerException($error_message);
             }
-
-            //We must resend HELO after tls negotiation
-            $this->smtp->Hello($hello);
-          }
-
-          $connection = true;
-          if ($this->SMTPAuth) {
-            if (!$this->smtp->Authenticate($this->Username, $this->Password, $this->AuthType,
-                                           $this->Realm, $this->Workstation)) {
-              throw new phpmailerException($this->Lang('authenticate'));
-            }
-          }
+            return false;
         }
-        $index++;
-      if (!$connection) {
-        throw new phpmailerException($this->Lang('connect_host'));
-      }
-      }
-    } catch (phpmailerException $e) {
-      $this->smtp->Reset();
-      if ($this->exceptions) {
-        throw $e;
-      }
-    }
-    return true;
-  }
-
-  /**
-   * Closes the active SMTP session if one exists.
-   * @return void
-   */
-  public function SmtpClose() {
-    if ($this->smtp !== null) {
-      if($this->smtp->Connected()) {
-        $this->smtp->Quit();
-        $this->smtp->Close();
-      }
-    }
-  }
-
-  /**
-  * Sets the language for all class error messages.
-  * Returns false if it cannot load the language file.  The default language is English.
-  * @param string $langcode ISO 639-1 2-character language code (e.g. Portuguese: "br")
-  * @param string $lang_path Path to the language file directory
-   * @return bool
-  * @access public
-  */
-  function SetLanguage($langcode = 'en', $lang_path = 'language/') {
-    //Define full set of translatable strings
-    $PHPMAILER_LANG = array(
-      'authenticate'         => 'SMTP Error: Could not authenticate.',
-      'connect_host'         => 'SMTP Error: Could not connect to SMTP host.',
-      'data_not_accepted'    => 'SMTP Error: Data not accepted.',
-      'empty_message'        => 'Message body empty',
-      'encoding'             => 'Unknown encoding: ',
-      'execute'              => 'Could not execute: ',
-      'file_access'          => 'Could not access file: ',
-      'file_open'            => 'File Error: Could not open file: ',
-      'from_failed'          => 'The following From address failed: ',
-      'instantiate'          => 'Could not instantiate mail function.',
-      'invalid_address'      => 'Invalid address',
-      'mailer_not_supported' => ' mailer is not supported.',
-      'provide_address'      => 'You must provide at least one recipient email address.',
-      'recipients_failed'    => 'SMTP Error: The following recipients failed: ',
-      'signing'              => 'Signing Error: ',
-      'smtp_connect_failed'  => 'SMTP Connect() failed.',
-      'smtp_error'           => 'SMTP server error: ',
-      'variable_set'         => 'Cannot set or reset variable: '
-    );
-    //Overwrite language-specific strings. This way we'll never have missing translations - no more "language string failed to load"!
-    $l = true;
-    if ($langcode != 'en') { //There is no English translation file
-      $l = @include $lang_path.'phpmailer.lang-'.$langcode.'.php';
-    }
-    $this->language = $PHPMAILER_LANG;
-    return ($l == true); //Returns false if language not found
-  }
-
-  /**
-  * Return the current array of language strings
-  * @return array
-  */
-  public function GetTranslations() {
-    return $this->language;
-  }
-
-  /////////////////////////////////////////////////
-  // METHODS, MESSAGE CREATION
-  /////////////////////////////////////////////////
-
-  /**
-   * Creates recipient headers.
-   * @access public
-   * @param string $type
-   * @param array $addr
-   * @return string
-   */
-  public function AddrAppend($type, $addr) {
-    $addr_str = $type . ': ';
-    $addresses = array();
-    foreach ($addr as $a) {
-      $addresses[] = $this->AddrFormat($a);
-    }
-    $addr_str .= implode(', ', $addresses);
-    $addr_str .= $this->LE;
-
-    return $addr_str;
-  }
-
-  /**
-   * Formats an address correctly.
-   * @access public
-   * @param string $addr
-   * @return string
-   */
-  public function AddrFormat($addr) {
-    if (empty($addr[1])) {
-      return $this->SecureHeader($addr[0]);
-    } else {
-      return $this->EncodeHeader($this->SecureHeader($addr[1]), 'phrase') . " <" . $this->SecureHeader($addr[0]) . ">";
-    }
-  }
-
-  /**
-   * Wraps message for use with mailers that do not
-   * automatically perform wrapping and for quoted-printable.
-   * Original written by philippe.
-   * @param string $message The message to wrap
-   * @param integer $length The line length to wrap to
-   * @param boolean $qp_mode Whether to run in Quoted-Printable mode
-   * @access public
-   * @return string
-   */
-  public function WrapText($message, $length, $qp_mode = false) {
-    $soft_break = ($qp_mode) ? sprintf(" =%s", $this->LE) : $this->LE;
-    // If utf-8 encoding is used, we will need to make sure we don't
-    // split multibyte characters when we wrap
-    $is_utf8 = (strtolower($this->CharSet) == "utf-8");
-    $lelen = strlen($this->LE);
-    $crlflen = strlen(self::CRLF);
-
-    $message = $this->FixEOL($message);
-    if (substr($message, -$lelen) == $this->LE) {
-      $message = substr($message, 0, -$lelen);
-    }
-
-    $line = explode($this->LE, $message);   // Magic. We know FixEOL uses $LE
-    $message = '';
-    for ($i = 0 ;$i < count($line); $i++) {
-      $line_part = explode(' ', $line[$i]);
-      $buf = '';
-      for ($e = 0; $e<count($line_part); $e++) {
-        $word = $line_part[$e];
-        if ($qp_mode and (strlen($word) > $length)) {
-          $space_left = $length - strlen($buf) - $crlflen;
-          if ($e != 0) {
-            if ($space_left > 20) {
-              $len = $space_left;
-              if ($is_utf8) {
-                $len = $this->UTF8CharBoundary($word, $len);
-              } elseif (substr($word, $len - 1, 1) == "=") {
-                $len--;
-              } elseif (substr($word, $len - 2, 1) == "=") {
-                $len -= 2;
-              }
-              $part = substr($word, 0, $len);
-              $word = substr($word, $len);
-              $buf .= ' ' . $part;
-              $message .= $buf . sprintf("=%s", self::CRLF);
+        $params = array($kind, $address, $name);
+        // Enqueue addresses with IDN until we know the PHPMailer::$CharSet.
+        if ($this->has8bitChars(substr($address, ++$pos)) and $this->idnSupported()) {
+            if ($kind != 'Reply-To') {
+                if (!array_key_exists($address, $this->RecipientsQueue)) {
+                    $this->RecipientsQueue[$address] = $params;
+                    return true;
+                }
             } else {
-              $message .= $buf . $soft_break;
+                if (!array_key_exists($address, $this->ReplyToQueue)) {
+                    $this->ReplyToQueue[$address] = $params;
+                    return true;
+                }
             }
+            return false;
+        }
+        // Immediately add standard addresses without IDN.
+        return call_user_func_array(array($this, 'addAnAddress'), $params);
+    }
+
+    /**
+     * Add an address to one of the recipient arrays or to the ReplyTo array.
+     * Addresses that have been added already return false, but do not throw exceptions.
+     * @param string $kind One of 'to', 'cc', 'bcc', or 'ReplyTo'
+     * @param string $address The email address to send, resp. to reply to
+     * @param string $name
+     * @throws phpmailerException
+     * @return boolean true on success, false if address already used or invalid in some way
+     * @access protected
+     */
+    protected function addAnAddress($kind, $address, $name = '')
+    {
+        if (!in_array($kind, array('to', 'cc', 'bcc', 'Reply-To'))) {
+            $error_message = $this->lang('Invalid recipient kind: ') . $kind;
+            $this->setError($error_message);
+            $this->edebug($error_message);
+            if ($this->exceptions) {
+                throw new phpmailerException($error_message);
+            }
+            return false;
+        }
+        if (!$this->validateAddress($address)) {
+            $error_message = $this->lang('invalid_address') . " (addAnAddress $kind): $address";
+            $this->setError($error_message);
+            $this->edebug($error_message);
+            if ($this->exceptions) {
+                throw new phpmailerException($error_message);
+            }
+            return false;
+        }
+        if ($kind != 'Reply-To') {
+            if (!array_key_exists(strtolower($address), $this->all_recipients)) {
+                array_push($this->$kind, array($address, $name));
+                $this->all_recipients[strtolower($address)] = true;
+                return true;
+            }
+        } else {
+            if (!array_key_exists(strtolower($address), $this->ReplyTo)) {
+                $this->ReplyTo[strtolower($address)] = array($address, $name);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Parse and validate a string containing one or more RFC822-style comma-separated email addresses
+     * of the form "display name <address>" into an array of name/address pairs.
+     * Uses the imap_rfc822_parse_adrlist function if the IMAP extension is available.
+     * Note that quotes in the name part are removed.
+     * @param string $addrstr The address list string
+     * @param bool $useimap Whether to use the IMAP extension to parse the list
+     * @return array
+     * @link http://www.andrew.cmu.edu/user/agreen1/testing/mrbs/web/Mail/RFC822.php A more careful implementation
+     */
+    public function parseAddresses($addrstr, $useimap = true)
+    {
+        $addresses = array();
+        if ($useimap and function_exists('imap_rfc822_parse_adrlist')) {
+            //Use this built-in parser if it's available
+            $list = imap_rfc822_parse_adrlist($addrstr, '');
+            foreach ($list as $address) {
+                if ($address->host != '.SYNTAX-ERROR.') {
+                    if ($this->validateAddress($address->mailbox . '@' . $address->host)) {
+                        $addresses[] = array(
+                            'name' => (property_exists($address, 'personal') ? $address->personal : ''),
+                            'address' => $address->mailbox . '@' . $address->host
+                        );
+                    }
+                }
+            }
+        } else {
+            //Use this simpler parser
+            $list = explode(',', $addrstr);
+            foreach ($list as $address) {
+                $address = trim($address);
+                //Is there a separate name part?
+                if (strpos($address, '<') === false) {
+                    //No separate name, just use the whole thing
+                    if ($this->validateAddress($address)) {
+                        $addresses[] = array(
+                            'name' => '',
+                            'address' => $address
+                        );
+                    }
+                } else {
+                    list($name, $email) = explode('<', $address);
+                    $email = trim(str_replace('>', '', $email));
+                    if ($this->validateAddress($email)) {
+                        $addresses[] = array(
+                            'name' => trim(str_replace(array('"', "'"), '', $name)),
+                            'address' => $email
+                        );
+                    }
+                }
+            }
+        }
+        return $addresses;
+    }
+
+    /**
+     * Set the From and FromName properties.
+     * @param string $address
+     * @param string $name
+     * @param boolean $auto Whether to also set the Sender address, defaults to true
+     * @throws phpmailerException
+     * @return boolean
+     */
+    public function setFrom($address, $name = '', $auto = true)
+    {
+        $address = trim($address);
+        $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
+        // Don't validate now addresses with IDN. Will be done in send().
+        if (($pos = strrpos($address, '@')) === false or
+            (!$this->has8bitChars(substr($address, ++$pos)) or !$this->idnSupported()) and
+            !$this->validateAddress($address)) {
+            $error_message = $this->lang('invalid_address') . " (setFrom) $address";
+            $this->setError($error_message);
+            $this->edebug($error_message);
+            if ($this->exceptions) {
+                throw new phpmailerException($error_message);
+            }
+            return false;
+        }
+        $this->From = $address;
+        $this->FromName = $name;
+        if ($auto) {
+            if (empty($this->Sender)) {
+                $this->Sender = $address;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Return the Message-ID header of the last email.
+     * Technically this is the value from the last time the headers were created,
+     * but it's also the message ID of the last sent message except in
+     * pathological cases.
+     * @return string
+     */
+    public function getLastMessageID()
+    {
+        return $this->lastMessageID;
+    }
+
+    /**
+     * Check that a string looks like an email address.
+     * @param string $address The email address to check
+     * @param string|callable $patternselect A selector for the validation pattern to use :
+     * * `auto` Pick best pattern automatically;
+     * * `pcre8` Use the squiloople.com pattern, requires PCRE > 8.0, PHP >= 5.3.2, 5.2.14;
+     * * `pcre` Use old PCRE implementation;
+     * * `php` Use PHP built-in FILTER_VALIDATE_EMAIL;
+     * * `html5` Use the pattern given by the HTML5 spec for 'email' type form input elements.
+     * * `noregex` Don't use a regex: super fast, really dumb.
+     * Alternatively you may pass in a callable to inject your own validator, for example:
+     * PHPMailer::validateAddress('user@example.com', function($address) {
+     *     return (strpos($address, '@') !== false);
+     * });
+     * You can also set the PHPMailer::$validator static to a callable, allowing built-in methods to use your validator.
+     * @return boolean
+     * @static
+     * @access public
+     */
+    public static function validateAddress($address, $patternselect = null)
+    {
+        if (is_null($patternselect)) {
+            $patternselect = self::$validator;
+        }
+        if (is_callable($patternselect)) {
+            return call_user_func($patternselect, $address);
+        }
+        //Reject line breaks in addresses; it's valid RFC5322, but not RFC5321
+        if (strpos($address, "\n") !== false or strpos($address, "\r") !== false) {
+            return false;
+        }
+        if (!$patternselect or $patternselect == 'auto') {
+            //Check this constant first so it works when extension_loaded() is disabled by safe mode
+            //Constant was added in PHP 5.2.4
+            if (defined('PCRE_VERSION')) {
+                //This pattern can get stuck in a recursive loop in PCRE <= 8.0.2
+                if (version_compare(PCRE_VERSION, '8.0.3') >= 0) {
+                    $patternselect = 'pcre8';
+                } else {
+                    $patternselect = 'pcre';
+                }
+            } elseif (function_exists('extension_loaded') and extension_loaded('pcre')) {
+                //Fall back to older PCRE
+                $patternselect = 'pcre';
+            } else {
+                //Filter_var appeared in PHP 5.2.0 and does not require the PCRE extension
+                if (version_compare(PHP_VERSION, '5.2.0') >= 0) {
+                    $patternselect = 'php';
+                } else {
+                    $patternselect = 'noregex';
+                }
+            }
+        }
+        switch ($patternselect) {
+            case 'pcre8':
+                /**
+                 * Uses the same RFC5322 regex on which FILTER_VALIDATE_EMAIL is based, but allows dotless domains.
+                 * @link http://squiloople.com/2009/12/20/email-address-validation/
+                 * @copyright 2009-2010 Michael Rushton
+                 * Feel free to use and redistribute this code. But please keep this copyright notice.
+                 */
+                return (boolean)preg_match(
+                    '/^(?!(?>(?1)"?(?>\\\[ -~]|[^"])"?(?1)){255,})(?!(?>(?1)"?(?>\\\[ -~]|[^"])"?(?1)){65,}@)' .
+                    '((?>(?>(?>((?>(?>(?>\x0D\x0A)?[\t ])+|(?>[\t ]*\x0D\x0A)?[\t ]+)?)(\((?>(?2)' .
+                    '(?>[\x01-\x08\x0B\x0C\x0E-\'*-\[\]-\x7F]|\\\[\x00-\x7F]|(?3)))*(?2)\)))+(?2))|(?2))?)' .
+                    '([!#-\'*+\/-9=?^-~-]+|"(?>(?2)(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\x7F]))*' .
+                    '(?2)")(?>(?1)\.(?1)(?4))*(?1)@(?!(?1)[a-z0-9-]{64,})(?1)(?>([a-z0-9](?>[a-z0-9-]*[a-z0-9])?)' .
+                    '(?>(?1)\.(?!(?1)[a-z0-9-]{64,})(?1)(?5)){0,126}|\[(?:(?>IPv6:(?>([a-f0-9]{1,4})(?>:(?6)){7}' .
+                    '|(?!(?:.*[a-f0-9][:\]]){8,})((?6)(?>:(?6)){0,6})?::(?7)?))|(?>(?>IPv6:(?>(?6)(?>:(?6)){5}:' .
+                    '|(?!(?:.*[a-f0-9]:){6,})(?8)?::(?>((?6)(?>:(?6)){0,4}):)?))?(25[0-5]|2[0-4][0-9]|1[0-9]{2}' .
+                    '|[1-9]?[0-9])(?>\.(?9)){3}))\])(?1)$/isD',
+                    $address
+                );
+            case 'pcre':
+                //An older regex that doesn't need a recent PCRE
+                return (boolean)preg_match(
+                    '/^(?!(?>"?(?>\\\[ -~]|[^"])"?){255,})(?!(?>"?(?>\\\[ -~]|[^"])"?){65,}@)(?>' .
+                    '[!#-\'*+\/-9=?^-~-]+|"(?>(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\xFF]))*")' .
+                    '(?>\.(?>[!#-\'*+\/-9=?^-~-]+|"(?>(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\xFF]))*"))*' .
+                    '@(?>(?![a-z0-9-]{64,})(?>[a-z0-9](?>[a-z0-9-]*[a-z0-9])?)(?>\.(?![a-z0-9-]{64,})' .
+                    '(?>[a-z0-9](?>[a-z0-9-]*[a-z0-9])?)){0,126}|\[(?:(?>IPv6:(?>(?>[a-f0-9]{1,4})(?>:' .
+                    '[a-f0-9]{1,4}){7}|(?!(?:.*[a-f0-9][:\]]){8,})(?>[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,6})?' .
+                    '::(?>[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,6})?))|(?>(?>IPv6:(?>[a-f0-9]{1,4}(?>:' .
+                    '[a-f0-9]{1,4}){5}:|(?!(?:.*[a-f0-9]:){6,})(?>[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,4})?' .
+                    '::(?>(?:[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,4}):)?))?(?>25[0-5]|2[0-4][0-9]|1[0-9]{2}' .
+                    '|[1-9]?[0-9])(?>\.(?>25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}))\])$/isD',
+                    $address
+                );
+            case 'html5':
+                /**
+                 * This is the pattern used in the HTML5 spec for validation of 'email' type form input elements.
+                 * @link http://www.whatwg.org/specs/web-apps/current-work/#e-mail-state-(type=email)
+                 */
+                return (boolean)preg_match(
+                    '/^[a-zA-Z0-9.!#$%&\'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}' .
+                    '[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/sD',
+                    $address
+                );
+            case 'noregex':
+                //No PCRE! Do something _very_ approximate!
+                //Check the address is 3 chars or longer and contains an @ that's not the first or last char
+                return (strlen($address) >= 3
+                    and strpos($address, '@') >= 1
+                    and strpos($address, '@') != strlen($address) - 1);
+            case 'php':
+            default:
+                return (boolean)filter_var($address, FILTER_VALIDATE_EMAIL);
+        }
+    }
+
+    /**
+     * Tells whether IDNs (Internationalized Domain Names) are supported or not. This requires the
+     * "intl" and "mbstring" PHP extensions.
+     * @return bool "true" if required functions for IDN support are present
+     */
+    public function idnSupported()
+    {
+        // @TODO: Write our own "idn_to_ascii" function for PHP <= 5.2.
+        return function_exists('idn_to_ascii') and function_exists('mb_convert_encoding');
+    }
+
+    /**
+     * Converts IDN in given email address to its ASCII form, also known as punycode, if possible.
+     * Important: Address must be passed in same encoding as currently set in PHPMailer::$CharSet.
+     * This function silently returns unmodified address if:
+     * - No conversion is necessary (i.e. domain name is not an IDN, or is already in ASCII form)
+     * - Conversion to punycode is impossible (e.g. required PHP functions are not available)
+     *   or fails for any reason (e.g. domain has characters not allowed in an IDN)
+     * @see PHPMailer::$CharSet
+     * @param string $address The email address to convert
+     * @return string The encoded address in ASCII form
+     */
+    public function punyencodeAddress($address)
+    {
+        // Verify we have required functions, CharSet, and at-sign.
+        if ($this->idnSupported() and
+            !empty($this->CharSet) and
+            ($pos = strrpos($address, '@')) !== false) {
+            $domain = substr($address, ++$pos);
+            // Verify CharSet string is a valid one, and domain properly encoded in this CharSet.
+            if ($this->has8bitChars($domain) and @mb_check_encoding($domain, $this->CharSet)) {
+                $domain = mb_convert_encoding($domain, 'UTF-8', $this->CharSet);
+                if (($punycode = defined('INTL_IDNA_VARIANT_UTS46') ?
+                    idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46) :
+                    idn_to_ascii($domain)) !== false) {
+                    return substr($address, 0, $pos) . $punycode;
+                }
+            }
+        }
+        return $address;
+    }
+
+    /**
+     * Create a message and send it.
+     * Uses the sending method specified by $Mailer.
+     * @throws phpmailerException
+     * @return boolean false on error - See the ErrorInfo property for details of the error.
+     */
+    public function send()
+    {
+        try {
+            if (!$this->preSend()) {
+                return false;
+            }
+            return $this->postSend();
+        } catch (phpmailerException $exc) {
+            $this->mailHeader = '';
+            $this->setError($exc->getMessage());
+            if ($this->exceptions) {
+                throw $exc;
+            }
+            return false;
+        }
+    }
+
+    /**
+     * Prepare a message for sending.
+     * @throws phpmailerException
+     * @return boolean
+     */
+    public function preSend()
+    {
+        try {
+            $this->error_count = 0; // Reset errors
+            $this->mailHeader = '';
+
+            // Dequeue recipient and Reply-To addresses with IDN
+            foreach (array_merge($this->RecipientsQueue, $this->ReplyToQueue) as $params) {
+                $params[1] = $this->punyencodeAddress($params[1]);
+                call_user_func_array(array($this, 'addAnAddress'), $params);
+            }
+            if ((count($this->to) + count($this->cc) + count($this->bcc)) < 1) {
+                throw new phpmailerException($this->lang('provide_address'), self::STOP_CRITICAL);
+            }
+
+            // Validate From, Sender, and ConfirmReadingTo addresses
+            foreach (array('From', 'Sender', 'ConfirmReadingTo') as $address_kind) {
+                $this->$address_kind = trim($this->$address_kind);
+                if (empty($this->$address_kind)) {
+                    continue;
+                }
+                $this->$address_kind = $this->punyencodeAddress($this->$address_kind);
+                if (!$this->validateAddress($this->$address_kind)) {
+                    $error_message = $this->lang('invalid_address') . ' (punyEncode) ' . $this->$address_kind;
+                    $this->setError($error_message);
+                    $this->edebug($error_message);
+                    if ($this->exceptions) {
+                        throw new phpmailerException($error_message);
+                    }
+                    return false;
+                }
+            }
+
+            // Set whether the message is multipart/alternative
+            if ($this->alternativeExists()) {
+                $this->ContentType = 'multipart/alternative';
+            }
+
+            $this->setMessageType();
+            // Refuse to send an empty message unless we are specifically allowing it
+            if (!$this->AllowEmpty and empty($this->Body)) {
+                throw new phpmailerException($this->lang('empty_message'), self::STOP_CRITICAL);
+            }
+
+            // Create body before headers in case body makes changes to headers (e.g. altering transfer encoding)
+            $this->MIMEHeader = '';
+            $this->MIMEBody = $this->createBody();
+            // createBody may have added some headers, so retain them
+            $tempheaders = $this->MIMEHeader;
+            $this->MIMEHeader = $this->createHeader();
+            $this->MIMEHeader .= $tempheaders;
+
+            // To capture the complete message when using mail(), create
+            // an extra header list which createHeader() doesn't fold in
+            if ($this->Mailer == 'mail') {
+                if (count($this->to) > 0) {
+                    $this->mailHeader .= $this->addrAppend('To', $this->to);
+                } else {
+                    $this->mailHeader .= $this->headerLine('To', 'undisclosed-recipients:;');
+                }
+                $this->mailHeader .= $this->headerLine(
+                    'Subject',
+                    $this->encodeHeader($this->secureHeader(trim($this->Subject)))
+                );
+            }
+
+            // Sign with DKIM if enabled
+            if (!empty($this->DKIM_domain)
+                and !empty($this->DKIM_selector)
+                and (!empty($this->DKIM_private_string)
+                    or (!empty($this->DKIM_private)
+                        and self::isPermittedPath($this->DKIM_private)
+                        and file_exists($this->DKIM_private)
+                    )
+                )
+            ) {
+                $header_dkim = $this->DKIM_Add(
+                    $this->MIMEHeader . $this->mailHeader,
+                    $this->encodeHeader($this->secureHeader($this->Subject)),
+                    $this->MIMEBody
+                );
+                $this->MIMEHeader = rtrim($this->MIMEHeader, "\r\n ") . self::CRLF .
+                    str_replace("\r\n", "\n", $header_dkim) . self::CRLF;
+            }
+            return true;
+        } catch (phpmailerException $exc) {
+            $this->setError($exc->getMessage());
+            if ($this->exceptions) {
+                throw $exc;
+            }
+            return false;
+        }
+    }
+
+    /**
+     * Actually send a message.
+     * Send the email via the selected mechanism
+     * @throws phpmailerException
+     * @return boolean
+     */
+    public function postSend()
+    {
+        try {
+            // Choose the mailer and send through it
+            switch ($this->Mailer) {
+                case 'sendmail':
+                case 'qmail':
+                    return $this->sendmailSend($this->MIMEHeader, $this->MIMEBody);
+                case 'smtp':
+                    return $this->smtpSend($this->MIMEHeader, $this->MIMEBody);
+                case 'mail':
+                    return $this->mailSend($this->MIMEHeader, $this->MIMEBody);
+                default:
+                    $sendMethod = $this->Mailer.'Send';
+                    if (method_exists($this, $sendMethod)) {
+                        return $this->$sendMethod($this->MIMEHeader, $this->MIMEBody);
+                    }
+
+                    return $this->mailSend($this->MIMEHeader, $this->MIMEBody);
+            }
+        } catch (phpmailerException $exc) {
+            $this->setError($exc->getMessage());
+            $this->edebug($exc->getMessage());
+            if ($this->exceptions) {
+                throw $exc;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Send mail using the $Sendmail program.
+     * @param string $header The message headers
+     * @param string $body The message body
+     * @see PHPMailer::$Sendmail
+     * @throws phpmailerException
+     * @access protected
+     * @return boolean
+     */
+    protected function sendmailSend($header, $body)
+    {
+        // CVE-2016-10033, CVE-2016-10045: Don't pass -f if characters will be escaped.
+        if (!empty($this->Sender) and self::isShellSafe($this->Sender)) {
+            if ($this->Mailer == 'qmail') {
+                $sendmailFmt = '%s -f%s';
+            } else {
+                $sendmailFmt = '%s -oi -f%s -t';
+            }
+        } else {
+            if ($this->Mailer == 'qmail') {
+                $sendmailFmt = '%s';
+            } else {
+                $sendmailFmt = '%s -oi -t';
+            }
+        }
+
+        // TODO: If possible, this should be changed to escapeshellarg.  Needs thorough testing.
+        $sendmail = sprintf($sendmailFmt, escapeshellcmd($this->Sendmail), $this->Sender);
+
+        if ($this->SingleTo) {
+            foreach ($this->SingleToArray as $toAddr) {
+                if (!@$mail = popen($sendmail, 'w')) {
+                    throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+                }
+                fputs($mail, 'To: ' . $toAddr . "\n");
+                fputs($mail, $header);
+                fputs($mail, $body);
+                $result = pclose($mail);
+                $this->doCallback(
+                    ($result == 0),
+                    array($toAddr),
+                    $this->cc,
+                    $this->bcc,
+                    $this->Subject,
+                    $body,
+                    $this->From
+                );
+                if ($result != 0) {
+                    throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+                }
+            }
+        } else {
+            if (!@$mail = popen($sendmail, 'w')) {
+                throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+            }
+            fputs($mail, $header);
+            fputs($mail, $body);
+            $result = pclose($mail);
+            $this->doCallback(
+                ($result == 0),
+                $this->to,
+                $this->cc,
+                $this->bcc,
+                $this->Subject,
+                $body,
+                $this->From
+            );
+            if ($result != 0) {
+                throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Fix CVE-2016-10033 and CVE-2016-10045 by disallowing potentially unsafe shell characters.
+     *
+     * Note that escapeshellarg and escapeshellcmd are inadequate for our purposes, especially on Windows.
+     * @param string $string The string to be validated
+     * @see https://github.com/PHPMailer/PHPMailer/issues/924 CVE-2016-10045 bug report
+     * @access protected
+     * @return boolean
+     */
+    protected static function isShellSafe($string)
+    {
+        // Future-proof
+        if (escapeshellcmd($string) !== $string
+            or !in_array(escapeshellarg($string), array("'$string'", "\"$string\""))
+        ) {
+            return false;
+        }
+
+        $length = strlen($string);
+
+        for ($i = 0; $i < $length; $i++) {
+            $c = $string[$i];
+
+            // All other characters have a special meaning in at least one common shell, including = and +.
+            // Full stop (.) has a special meaning in cmd.exe, but its impact should be negligible here.
+            // Note that this does permit non-Latin alphanumeric characters based on the current locale.
+            if (!ctype_alnum($c) && strpos('@_-.', $c) === false) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Check whether a file path is of a permitted type.
+     * Used to reject URLs and phar files from functions that access local file paths,
+     * such as addAttachment.
+     * @param string $path A relative or absolute path to a file.
+     * @return bool
+     */
+    protected static function isPermittedPath($path)
+    {
+        return !preg_match('#^[a-z]+://#i', $path);
+    }
+
+    /**
+     * Send mail using the PHP mail() function.
+     * @param string $header The message headers
+     * @param string $body The message body
+     * @link http://www.php.net/manual/en/book.mail.php
+     * @throws phpmailerException
+     * @access protected
+     * @return boolean
+     */
+    protected function mailSend($header, $body)
+    {
+        $toArr = array();
+        foreach ($this->to as $toaddr) {
+            $toArr[] = $this->addrFormat($toaddr);
+        }
+        $to = implode(', ', $toArr);
+
+        $params = null;
+        //This sets the SMTP envelope sender which gets turned into a return-path header by the receiver
+        if (!empty($this->Sender) and $this->validateAddress($this->Sender)) {
+            // CVE-2016-10033, CVE-2016-10045: Don't pass -f if characters will be escaped.
+            if (self::isShellSafe($this->Sender)) {
+                $params = sprintf('-f%s', $this->Sender);
+            }
+        }
+        if (!empty($this->Sender) and !ini_get('safe_mode') and $this->validateAddress($this->Sender)) {
+            $old_from = ini_get('sendmail_from');
+            ini_set('sendmail_from', $this->Sender);
+        }
+        $result = false;
+        if ($this->SingleTo and count($toArr) > 1) {
+            foreach ($toArr as $toAddr) {
+                $result = $this->mailPassthru($toAddr, $this->Subject, $body, $header, $params);
+                $this->doCallback($result, array($toAddr), $this->cc, $this->bcc, $this->Subject, $body, $this->From);
+            }
+        } else {
+            $result = $this->mailPassthru($to, $this->Subject, $body, $header, $params);
+            $this->doCallback($result, $this->to, $this->cc, $this->bcc, $this->Subject, $body, $this->From);
+        }
+        if (isset($old_from)) {
+            ini_set('sendmail_from', $old_from);
+        }
+        if (!$result) {
+            throw new phpmailerException($this->lang('instantiate'), self::STOP_CRITICAL);
+        }
+        return true;
+    }
+
+    /**
+     * Get an instance to use for SMTP operations.
+     * Override this function to load your own SMTP implementation
+     * @return SMTP
+     */
+    public function getSMTPInstance()
+    {
+        if (!is_object($this->smtp)) {
+            $this->smtp = new SMTP;
+        }
+        return $this->smtp;
+    }
+
+    /**
+     * Send mail via SMTP.
+     * Returns false if there is a bad MAIL FROM, RCPT, or DATA input.
+     * Uses the PHPMailerSMTP class by default.
+     * @see PHPMailer::getSMTPInstance() to use a different class.
+     * @param string $header The message headers
+     * @param string $body The message body
+     * @throws phpmailerException
+     * @uses SMTP
+     * @access protected
+     * @return boolean
+     */
+    protected function smtpSend($header, $body)
+    {
+        $bad_rcpt = array();
+        if (!$this->smtpConnect($this->SMTPOptions)) {
+            throw new phpmailerException($this->lang('smtp_connect_failed'), self::STOP_CRITICAL);
+        }
+        if (!empty($this->Sender) and $this->validateAddress($this->Sender)) {
+            $smtp_from = $this->Sender;
+        } else {
+            $smtp_from = $this->From;
+        }
+        if (!$this->smtp->mail($smtp_from)) {
+            $this->setError($this->lang('from_failed') . $smtp_from . ' : ' . implode(',', $this->smtp->getError()));
+            throw new phpmailerException($this->ErrorInfo, self::STOP_CRITICAL);
+        }
+
+        // Attempt to send to all recipients
+        foreach (array($this->to, $this->cc, $this->bcc) as $togroup) {
+            foreach ($togroup as $to) {
+                if (!$this->smtp->recipient($to[0])) {
+                    $error = $this->smtp->getError();
+                    $bad_rcpt[] = array('to' => $to[0], 'error' => $error['detail']);
+                    $isSent = false;
+                } else {
+                    $isSent = true;
+                }
+                $this->doCallback($isSent, array($to[0]), array(), array(), $this->Subject, $body, $this->From);
+            }
+        }
+
+        // Only send the DATA command if we have viable recipients
+        if ((count($this->all_recipients) > count($bad_rcpt)) and !$this->smtp->data($header . $body)) {
+            throw new phpmailerException($this->lang('data_not_accepted'), self::STOP_CRITICAL);
+        }
+        if ($this->SMTPKeepAlive) {
+            $this->smtp->reset();
+        } else {
+            $this->smtp->quit();
+            $this->smtp->close();
+        }
+        //Create error message for any bad addresses
+        if (count($bad_rcpt) > 0) {
+            $errstr = '';
+            foreach ($bad_rcpt as $bad) {
+                $errstr .= $bad['to'] . ': ' . $bad['error'];
+            }
+            throw new phpmailerException(
+                $this->lang('recipients_failed') . $errstr,
+                self::STOP_CONTINUE
+            );
+        }
+        return true;
+    }
+
+    /**
+     * Initiate a connection to an SMTP server.
+     * Returns false if the operation failed.
+     * @param array $options An array of options compatible with stream_context_create()
+     * @uses SMTP
+     * @access public
+     * @throws phpmailerException
+     * @return boolean
+     */
+    public function smtpConnect($options = null)
+    {
+        if (is_null($this->smtp)) {
+            $this->smtp = $this->getSMTPInstance();
+        }
+
+        //If no options are provided, use whatever is set in the instance
+        if (is_null($options)) {
+            $options = $this->SMTPOptions;
+        }
+
+        // Already connected?
+        if ($this->smtp->connected()) {
+            return true;
+        }
+
+        $this->smtp->setTimeout($this->Timeout);
+        $this->smtp->setDebugLevel($this->SMTPDebug);
+        $this->smtp->setDebugOutput($this->Debugoutput);
+        $this->smtp->setVerp($this->do_verp);
+        $hosts = explode(';', $this->Host);
+        $lastexception = null;
+
+        foreach ($hosts as $hostentry) {
+            $hostinfo = array();
+            if (!preg_match(
+                '/^((ssl|tls):\/\/)*([a-zA-Z0-9\.-]*|\[[a-fA-F0-9:]+\]):?([0-9]*)$/',
+                trim($hostentry),
+                $hostinfo
+            )) {
+                // Not a valid host entry
+                $this->edebug('Ignoring invalid host: ' . $hostentry);
+                continue;
+            }
+            // $hostinfo[2]: optional ssl or tls prefix
+            // $hostinfo[3]: the hostname
+            // $hostinfo[4]: optional port number
+            // The host string prefix can temporarily override the current setting for SMTPSecure
+            // If it's not specified, the default value is used
+            $prefix = '';
+            $secure = $this->SMTPSecure;
+            $tls = ($this->SMTPSecure == 'tls');
+            if ('ssl' == $hostinfo[2] or ('' == $hostinfo[2] and 'ssl' == $this->SMTPSecure)) {
+                $prefix = 'ssl://';
+                $tls = false; // Can't have SSL and TLS at the same time
+                $secure = 'ssl';
+            } elseif ($hostinfo[2] == 'tls') {
+                $tls = true;
+                // tls doesn't use a prefix
+                $secure = 'tls';
+            }
+            //Do we need the OpenSSL extension?
+            $sslext = defined('OPENSSL_ALGO_SHA1');
+            if ('tls' === $secure or 'ssl' === $secure) {
+                //Check for an OpenSSL constant rather than using extension_loaded, which is sometimes disabled
+                if (!$sslext) {
+                    throw new phpmailerException($this->lang('extension_missing').'openssl', self::STOP_CRITICAL);
+                }
+            }
+            $host = $hostinfo[3];
+            $port = $this->Port;
+            $tport = (integer)$hostinfo[4];
+            if ($tport > 0 and $tport < 65536) {
+                $port = $tport;
+            }
+            if ($this->smtp->connect($prefix . $host, $port, $this->Timeout, $options)) {
+                try {
+                    if ($this->Helo) {
+                        $hello = $this->Helo;
+                    } else {
+                        $hello = $this->serverHostname();
+                    }
+                    $this->smtp->hello($hello);
+                    //Automatically enable TLS encryption if:
+                    // * it's not disabled
+                    // * we have openssl extension
+                    // * we are not already using SSL
+                    // * the server offers STARTTLS
+                    if ($this->SMTPAutoTLS and $sslext and $secure != 'ssl' and $this->smtp->getServerExt('STARTTLS')) {
+                        $tls = true;
+                    }
+                    if ($tls) {
+                        if (!$this->smtp->startTLS()) {
+                            throw new phpmailerException($this->lang('connect_host'));
+                        }
+                        // We must resend EHLO after TLS negotiation
+                        $this->smtp->hello($hello);
+                    }
+                    if ($this->SMTPAuth) {
+                        if (!$this->smtp->authenticate(
+                            $this->Username,
+                            $this->Password,
+                            $this->AuthType,
+                            $this->Realm,
+                            $this->Workstation
+                        )
+                        ) {
+                            throw new phpmailerException($this->lang('authenticate'));
+                        }
+                    }
+                    return true;
+                } catch (phpmailerException $exc) {
+                    $lastexception = $exc;
+                    $this->edebug($exc->getMessage());
+                    // We must have connected, but then failed TLS or Auth, so close connection nicely
+                    $this->smtp->quit();
+                }
+            }
+        }
+        // If we get here, all connection attempts have failed, so close connection hard
+        $this->smtp->close();
+        // As we've caught all exceptions, just report whatever the last one was
+        if ($this->exceptions and !is_null($lastexception)) {
+            throw $lastexception;
+        }
+        return false;
+    }
+
+    /**
+     * Close the active SMTP session if one exists.
+     * @return void
+     */
+    public function smtpClose()
+    {
+        if (is_a($this->smtp, 'SMTP')) {
+            if ($this->smtp->connected()) {
+                $this->smtp->quit();
+                $this->smtp->close();
+            }
+        }
+    }
+
+    /**
+     * Set the language for error messages.
+     * Returns false if it cannot load the language file.
+     * The default language is English.
+     * @param string $langcode ISO 639-1 2-character language code (e.g. French is "fr")
+     * @param string $lang_path Path to the language file directory, with trailing separator (slash)
+     * @return boolean
+     * @access public
+     */
+    public function setLanguage($langcode = 'en', $lang_path = '')
+    {
+        // Backwards compatibility for renamed language codes
+        $renamed_langcodes = array(
+            'br' => 'pt_br',
+            'cz' => 'cs',
+            'dk' => 'da',
+            'no' => 'nb',
+            'se' => 'sv',
+            'sr' => 'rs'
+        );
+
+        if (isset($renamed_langcodes[$langcode])) {
+            $langcode = $renamed_langcodes[$langcode];
+        }
+
+        // Define full set of translatable strings in English
+        $PHPMAILER_LANG = array(
+            'authenticate' => 'SMTP Error: Could not authenticate.',
+            'connect_host' => 'SMTP Error: Could not connect to SMTP host.',
+            'data_not_accepted' => 'SMTP Error: data not accepted.',
+            'empty_message' => 'Message body empty',
+            'encoding' => 'Unknown encoding: ',
+            'execute' => 'Could not execute: ',
+            'file_access' => 'Could not access file: ',
+            'file_open' => 'File Error: Could not open file: ',
+            'from_failed' => 'The following From address failed: ',
+            'instantiate' => 'Could not instantiate mail function.',
+            'invalid_address' => 'Invalid address: ',
+            'mailer_not_supported' => ' mailer is not supported.',
+            'provide_address' => 'You must provide at least one recipient email address.',
+            'recipients_failed' => 'SMTP Error: The following recipients failed: ',
+            'signing' => 'Signing Error: ',
+            'smtp_connect_failed' => 'SMTP connect() failed.',
+            'smtp_error' => 'SMTP server error: ',
+            'variable_set' => 'Cannot set or reset variable: ',
+            'extension_missing' => 'Extension missing: '
+        );
+        if (empty($lang_path)) {
+            // Calculate an absolute path so it can work if CWD is not here
+            $lang_path = dirname(__FILE__). DIRECTORY_SEPARATOR . 'language'. DIRECTORY_SEPARATOR;
+        }
+        //Validate $langcode
+        if (!preg_match('/^[a-z]{2}(?:_[a-zA-Z]{2})?$/', $langcode)) {
+            $langcode = 'en';
+        }
+        $foundlang = true;
+        $lang_file = $lang_path . 'phpmailer.lang-' . $langcode . '.php';
+        // There is no English translation file
+        if ($langcode != 'en') {
+            // Make sure language file path is readable
+            if (!self::isPermittedPath($lang_file) or !is_readable($lang_file)) {
+                $foundlang = false;
+            } else {
+                // Overwrite language-specific strings.
+                // This way we'll never have missing translation keys.
+                $foundlang = include $lang_file;
+            }
+        }
+        $this->language = $PHPMAILER_LANG;
+        return (boolean)$foundlang; // Returns false if language not found
+    }
+
+    /**
+     * Get the array of strings for the current language.
+     * @return array
+     */
+    public function getTranslations()
+    {
+        return $this->language;
+    }
+
+    /**
+     * Create recipient headers.
+     * @access public
+     * @param string $type
+     * @param array $addr An array of recipient,
+     * where each recipient is a 2-element indexed array with element 0 containing an address
+     * and element 1 containing a name, like:
+     * array(array('joe@example.com', 'Joe User'), array('zoe@example.com', 'Zoe User'))
+     * @return string
+     */
+    public function addrAppend($type, $addr)
+    {
+        $addresses = array();
+        foreach ($addr as $address) {
+            $addresses[] = $this->addrFormat($address);
+        }
+        return $type . ': ' . implode(', ', $addresses) . $this->LE;
+    }
+
+    /**
+     * Format an address for use in a message header.
+     * @access public
+     * @param array $addr A 2-element indexed array, element 0 containing an address, element 1 containing a name
+     *      like array('joe@example.com', 'Joe User')
+     * @return string
+     */
+    public function addrFormat($addr)
+    {
+        if (empty($addr[1])) { // No name provided
+            return $this->secureHeader($addr[0]);
+        } else {
+            return $this->encodeHeader($this->secureHeader($addr[1]), 'phrase') . ' <' . $this->secureHeader(
+                $addr[0]
+            ) . '>';
+        }
+    }
+
+    /**
+     * Word-wrap message.
+     * For use with mailers that do not automatically perform wrapping
+     * and for quoted-printable encoded messages.
+     * Original written by philippe.
+     * @param string $message The message to wrap
+     * @param integer $length The line length to wrap to
+     * @param boolean $qp_mode Whether to run in Quoted-Printable mode
+     * @access public
+     * @return string
+     */
+    public function wrapText($message, $length, $qp_mode = false)
+    {
+        if ($qp_mode) {
+            $soft_break = sprintf(' =%s', $this->LE);
+        } else {
+            $soft_break = $this->LE;
+        }
+        // If utf-8 encoding is used, we will need to make sure we don't
+        // split multibyte characters when we wrap
+        $is_utf8 = (strtolower($this->CharSet) == 'utf-8');
+        $lelen = strlen($this->LE);
+        $crlflen = strlen(self::CRLF);
+
+        $message = $this->fixEOL($message);
+        //Remove a trailing line break
+        if (substr($message, -$lelen) == $this->LE) {
+            $message = substr($message, 0, -$lelen);
+        }
+
+        //Split message into lines
+        $lines = explode($this->LE, $message);
+        //Message will be rebuilt in here
+        $message = '';
+        foreach ($lines as $line) {
+            $words = explode(' ', $line);
             $buf = '';
-          }
-          while (strlen($word) > 0) {
-            $len = $length;
-            if ($is_utf8) {
-              $len = $this->UTF8CharBoundary($word, $len);
-            } elseif (substr($word, $len - 1, 1) == "=") {
-              $len--;
-            } elseif (substr($word, $len - 2, 1) == "=") {
-              $len -= 2;
-            }
-            $part = substr($word, 0, $len);
-            $word = substr($word, $len);
+            $firstword = true;
+            foreach ($words as $word) {
+                if ($qp_mode and (strlen($word) > $length)) {
+                    $space_left = $length - strlen($buf) - $crlflen;
+                    if (!$firstword) {
+                        if ($space_left > 20) {
+                            $len = $space_left;
+                            if ($is_utf8) {
+                                $len = $this->utf8CharBoundary($word, $len);
+                            } elseif (substr($word, $len - 1, 1) == '=') {
+                                $len--;
+                            } elseif (substr($word, $len - 2, 1) == '=') {
+                                $len -= 2;
+                            }
+                            $part = substr($word, 0, $len);
+                            $word = substr($word, $len);
+                            $buf .= ' ' . $part;
+                            $message .= $buf . sprintf('=%s', self::CRLF);
+                        } else {
+                            $message .= $buf . $soft_break;
+                        }
+                        $buf = '';
+                    }
+                    while (strlen($word) > 0) {
+                        if ($length <= 0) {
+                            break;
+                        }
+                        $len = $length;
+                        if ($is_utf8) {
+                            $len = $this->utf8CharBoundary($word, $len);
+                        } elseif (substr($word, $len - 1, 1) == '=') {
+                            $len--;
+                        } elseif (substr($word, $len - 2, 1) == '=') {
+                            $len -= 2;
+                        }
+                        $part = substr($word, 0, $len);
+                        $word = substr($word, $len);
 
-            if (strlen($word) > 0) {
-              $message .= $part . sprintf("=%s", self::CRLF);
+                        if (strlen($word) > 0) {
+                            $message .= $part . sprintf('=%s', self::CRLF);
+                        } else {
+                            $buf = $part;
+                        }
+                    }
+                } else {
+                    $buf_o = $buf;
+                    if (!$firstword) {
+                        $buf .= ' ';
+                    }
+                    $buf .= $word;
+
+                    if (strlen($buf) > $length and $buf_o != '') {
+                        $message .= $buf_o . $soft_break;
+                        $buf = $word;
+                    }
+                }
+                $firstword = false;
+            }
+            $message .= $buf . self::CRLF;
+        }
+
+        return $message;
+    }
+
+    /**
+     * Find the last character boundary prior to $maxLength in a utf-8
+     * quoted-printable encoded string.
+     * Original written by Colin Brown.
+     * @access public
+     * @param string $encodedText utf-8 QP text
+     * @param integer $maxLength Find the last character boundary prior to this length
+     * @return integer
+     */
+    public function utf8CharBoundary($encodedText, $maxLength)
+    {
+        $foundSplitPos = false;
+        $lookBack = 3;
+        while (!$foundSplitPos) {
+            $lastChunk = substr($encodedText, $maxLength - $lookBack, $lookBack);
+            $encodedCharPos = strpos($lastChunk, '=');
+            if (false !== $encodedCharPos) {
+                // Found start of encoded character byte within $lookBack block.
+                // Check the encoded byte value (the 2 chars after the '=')
+                $hex = substr($encodedText, $maxLength - $lookBack + $encodedCharPos + 1, 2);
+                $dec = hexdec($hex);
+                if ($dec < 128) {
+                    // Single byte character.
+                    // If the encoded char was found at pos 0, it will fit
+                    // otherwise reduce maxLength to start of the encoded char
+                    if ($encodedCharPos > 0) {
+                        $maxLength = $maxLength - ($lookBack - $encodedCharPos);
+                    }
+                    $foundSplitPos = true;
+                } elseif ($dec >= 192) {
+                    // First byte of a multi byte character
+                    // Reduce maxLength to split at start of character
+                    $maxLength = $maxLength - ($lookBack - $encodedCharPos);
+                    $foundSplitPos = true;
+                } elseif ($dec < 192) {
+                    // Middle byte of a multi byte character, look further back
+                    $lookBack += 3;
+                }
             } else {
-              $buf = $part;
+                // No encoded character found
+                $foundSplitPos = true;
+            }
+        }
+        return $maxLength;
+    }
+
+    /**
+     * Apply word wrapping to the message body.
+     * Wraps the message body to the number of chars set in the WordWrap property.
+     * You should only do this to plain-text bodies as wrapping HTML tags may break them.
+     * This is called automatically by createBody(), so you don't need to call it yourself.
+     * @access public
+     * @return void
+     */
+    public function setWordWrap()
+    {
+        if ($this->WordWrap < 1) {
+            return;
+        }
+
+        switch ($this->message_type) {
+            case 'alt':
+            case 'alt_inline':
+            case 'alt_attach':
+            case 'alt_inline_attach':
+                $this->AltBody = $this->wrapText($this->AltBody, $this->WordWrap);
+                break;
+            default:
+                $this->Body = $this->wrapText($this->Body, $this->WordWrap);
+                break;
+        }
+    }
+
+    /**
+     * Assemble message headers.
+     * @access public
+     * @return string The assembled headers
+     */
+    public function createHeader()
+    {
+        $result = '';
+
+        $result .= $this->headerLine('Date', $this->MessageDate == '' ? self::rfcDate() : $this->MessageDate);
+
+        // To be created automatically by mail()
+        if ($this->SingleTo) {
+            if ($this->Mailer != 'mail') {
+                foreach ($this->to as $toaddr) {
+                    $this->SingleToArray[] = $this->addrFormat($toaddr);
+                }
             }
-          }
         } else {
-          $buf_o = $buf;
-          $buf .= ($e == 0) ? $word : (' ' . $word);
-
-          if (strlen($buf) > $length and $buf_o != '') {
-            $message .= $buf_o . $soft_break;
-            $buf = $word;
-          }
+            if (count($this->to) > 0) {
+                if ($this->Mailer != 'mail') {
+                    $result .= $this->addrAppend('To', $this->to);
+                }
+            } elseif (count($this->cc) == 0) {
+                $result .= $this->headerLine('To', 'undisclosed-recipients:;');
+            }
         }
-      }
-      $message .= $buf . self::CRLF;
-    }
 
-    return $message;
-  }
+        $result .= $this->addrAppend('From', array(array(trim($this->From), $this->FromName)));
 
-  /**
-   * Finds last character boundary prior to maxLength in a utf-8
-   * quoted (printable) encoded string.
-   * Original written by Colin Brown.
-   * @access public
-   * @param string $encodedText utf-8 QP text
-   * @param int    $maxLength   find last character boundary prior to this length
-   * @return int
-   */
-  public function UTF8CharBoundary($encodedText, $maxLength) {
-    $foundSplitPos = false;
-    $lookBack = 3;
-    while (!$foundSplitPos) {
-      $lastChunk = substr($encodedText, $maxLength - $lookBack, $lookBack);
-      $encodedCharPos = strpos($lastChunk, "=");
-      if ($encodedCharPos !== false) {
-        // Found start of encoded character byte within $lookBack block.
-        // Check the encoded byte value (the 2 chars after the '=')
-        $hex = substr($encodedText, $maxLength - $lookBack + $encodedCharPos + 1, 2);
-        $dec = hexdec($hex);
-        if ($dec < 128) { // Single byte character.
-          // If the encoded char was found at pos 0, it will fit
-          // otherwise reduce maxLength to start of the encoded char
-          $maxLength = ($encodedCharPos == 0) ? $maxLength :
-          $maxLength - ($lookBack - $encodedCharPos);
-          $foundSplitPos = true;
-        } elseif ($dec >= 192) { // First byte of a multi byte character
-          // Reduce maxLength to split at start of character
-          $maxLength = $maxLength - ($lookBack - $encodedCharPos);
-          $foundSplitPos = true;
-        } elseif ($dec < 192) { // Middle byte of a multi byte character, look further back
-          $lookBack += 3;
+        // sendmail and mail() extract Cc from the header before sending
+        if (count($this->cc) > 0) {
+            $result .= $this->addrAppend('Cc', $this->cc);
         }
-      } else {
-        // No encoded character found
-        $foundSplitPos = true;
-      }
-    }
-    return $maxLength;
-  }
 
-
-  /**
-   * Set the body wrapping.
-   * @access public
-   * @return void
-   */
-  public function SetWordWrap() {
-    if($this->WordWrap < 1) {
-      return;
-    }
-
-    switch($this->message_type) {
-      case 'alt':
-      case 'alt_inline':
-      case 'alt_attach':
-      case 'alt_inline_attach':
-        $this->AltBody = $this->WrapText($this->AltBody, $this->WordWrap);
-        break;
-      default:
-        $this->Body = $this->WrapText($this->Body, $this->WordWrap);
-        break;
-    }
-  }
-
-  /**
-   * Assembles message header.
-   * @access public
-   * @return string The assembled header
-   */
-  public function CreateHeader() {
-    $result = '';
-
-    // Set the boundaries
-    $uniq_id = md5(uniqid(time()));
-    $this->boundary[1] = 'b1_' . $uniq_id;
-    $this->boundary[2] = 'b2_' . $uniq_id;
-    $this->boundary[3] = 'b3_' . $uniq_id;
-
-    if ($this->MessageDate == '') {
-      $result .= $this->HeaderLine('Date', self::RFCDate());
-    } else {
-      $result .= $this->HeaderLine('Date', $this->MessageDate);
-    }
-
-    if ($this->ReturnPath) {
-      $result .= $this->HeaderLine('Return-Path', trim($this->ReturnPath));
-    } elseif ($this->Sender == '') {
-      $result .= $this->HeaderLine('Return-Path', trim($this->From));
-    } else {
-      $result .= $this->HeaderLine('Return-Path', trim($this->Sender));
-    }
-
-    // To be created automatically by mail()
-    if($this->Mailer != 'mail') {
-      if ($this->SingleTo === true) {
-        foreach($this->to as $t) {
-          $this->SingleToArray[] = $this->AddrFormat($t);
+        // sendmail and mail() extract Bcc from the header before sending
+        if ((
+                $this->Mailer == 'sendmail' or $this->Mailer == 'qmail' or $this->Mailer == 'mail'
+            )
+            and count($this->bcc) > 0
+        ) {
+            $result .= $this->addrAppend('Bcc', $this->bcc);
         }
-      } else {
-        if(count($this->to) > 0) {
-          $result .= $this->AddrAppend('To', $this->to);
-        } elseif (count($this->cc) == 0) {
-          $result .= $this->HeaderLine('To', 'undisclosed-recipients:;');
+
+        if (count($this->ReplyTo) > 0) {
+            $result .= $this->addrAppend('Reply-To', $this->ReplyTo);
         }
-      }
-    }
 
-    $from = array();
-    $from[0][0] = trim($this->From);
-    $from[0][1] = $this->FromName;
-    $result .= $this->AddrAppend('From', $from);
+        // mail() sets the subject itself
+        if ($this->Mailer != 'mail') {
+            $result .= $this->headerLine('Subject', $this->encodeHeader($this->secureHeader($this->Subject)));
+        }
 
-    // sendmail and mail() extract Cc from the header before sending
-    if(count($this->cc) > 0) {
-      $result .= $this->AddrAppend('Cc', $this->cc);
-    }
-
-    // sendmail and mail() extract Bcc from the header before sending
-    if((($this->Mailer == 'sendmail') || ($this->Mailer == 'mail')) && (count($this->bcc) > 0)) {
-      $result .= $this->AddrAppend('Bcc', $this->bcc);
-    }
-
-    if(count($this->ReplyTo) > 0) {
-      $result .= $this->AddrAppend('Reply-To', $this->ReplyTo);
-    }
-
-    // mail() sets the subject itself
-    if($this->Mailer != 'mail') {
-      $result .= $this->HeaderLine('Subject', $this->EncodeHeader($this->SecureHeader($this->Subject)));
-    }
-
-    if($this->MessageID != '') {
-      $result .= $this->HeaderLine('Message-ID', $this->MessageID);
-    } else {
-      $result .= sprintf("Message-ID: <%s@%s>%s", $uniq_id, $this->ServerHostname(), $this->LE);
-    }
-    $result .= $this->HeaderLine('X-Priority', $this->Priority);
-    if ($this->XMailer == '') {
-        $result .= $this->HeaderLine('X-Mailer', 'PHPMailer '.$this->Version.' (http://code.google.com/a/apache-extras.org/p/phpmailer/)');
-    } else {
-      $myXmailer = trim($this->XMailer);
-      if ($myXmailer) {
-        $result .= $this->HeaderLine('X-Mailer', $myXmailer);
-      }
-    }
-
-    if($this->ConfirmReadingTo != '') {
-      $result .= $this->HeaderLine('Disposition-Notification-To', '<' . trim($this->ConfirmReadingTo) . '>');
-    }
-
-    // Add custom headers
-    for($index = 0; $index < count($this->CustomHeader); $index++) {
-      $result .= $this->HeaderLine(trim($this->CustomHeader[$index][0]), $this->EncodeHeader(trim($this->CustomHeader[$index][1])));
-    }
-    if (!$this->sign_key_file) {
-      $result .= $this->HeaderLine('MIME-Version', '1.0');
-      $result .= $this->GetMailMIME();
-    }
-
-    return $result;
-  }
-
-  /**
-   * Returns the message MIME.
-   * @access public
-   * @return string
-   */
-  public function GetMailMIME() {
-    $result = '';
-    switch($this->message_type) {
-      case 'inline':
-        $result .= $this->HeaderLine('Content-Type', 'multipart/related;');
-        $result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"');
-        break;
-      case 'attach':
-      case 'inline_attach':
-      case 'alt_attach':
-      case 'alt_inline_attach':
-        $result .= $this->HeaderLine('Content-Type', 'multipart/mixed;');
-        $result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"');
-        break;
-      case 'alt':
-      case 'alt_inline':
-        $result .= $this->HeaderLine('Content-Type', 'multipart/alternative;');
-        $result .= $this->TextLine("\tboundary=\"" . $this->boundary[1] . '"');
-        break;
-      default:
-        // Catches case 'plain': and case '':
-        $result .= $this->HeaderLine('Content-Transfer-Encoding', $this->Encoding);
-        $result .= $this->TextLine('Content-Type: '.$this->ContentType.'; charset='.$this->CharSet);
-        break;
-    }
-
-    if($this->Mailer != 'mail') {
-      $result .= $this->LE;
-    }
-
-    return $result;
-  }
-
-  /**
-   * Returns the MIME message (headers and body). Only really valid post PreSend().
-   * @access public
-   * @return string
-   */
-  public function GetSentMIMEMessage() {
-    return $this->MIMEHeader . $this->mailHeader . self::CRLF . $this->MIMEBody;
-  }
-
-
-  /**
-   * Assembles the message body.  Returns an empty string on failure.
-   * @access public
-   * @throws phpmailerException
-   * @return string The assembled message body
-   */
-  public function CreateBody() {
-    $body = '';
-
-    if ($this->sign_key_file) {
-      $body .= $this->GetMailMIME().$this->LE;
-    }
-
-    $this->SetWordWrap();
-
-    switch($this->message_type) {
-      case 'inline':
-        $body .= $this->GetBoundary($this->boundary[1], '', '', '');
-        $body .= $this->EncodeString($this->Body, $this->Encoding);
-        $body .= $this->LE.$this->LE;
-        $body .= $this->AttachAll("inline", $this->boundary[1]);
-        break;
-      case 'attach':
-        $body .= $this->GetBoundary($this->boundary[1], '', '', '');
-        $body .= $this->EncodeString($this->Body, $this->Encoding);
-        $body .= $this->LE.$this->LE;
-        $body .= $this->AttachAll("attachment", $this->boundary[1]);
-        break;
-      case 'inline_attach':
-        $body .= $this->TextLine("--" . $this->boundary[1]);
-        $body .= $this->HeaderLine('Content-Type', 'multipart/related;');
-        $body .= $this->TextLine("\tboundary=\"" . $this->boundary[2] . '"');
-        $body .= $this->LE;
-        $body .= $this->GetBoundary($this->boundary[2], '', '', '');
-        $body .= $this->EncodeString($this->Body, $this->Encoding);
-        $body .= $this->LE.$this->LE;
-        $body .= $this->AttachAll("inline", $this->boundary[2]);
-        $body .= $this->LE;
-        $body .= $this->AttachAll("attachment", $this->boundary[1]);
-        break;
-      case 'alt':
-        $body .= $this->GetBoundary($this->boundary[1], '', 'text/plain', '');
-        $body .= $this->EncodeString($this->AltBody, $this->Encoding);
-        $body .= $this->LE.$this->LE;
-        $body .= $this->GetBoundary($this->boundary[1], '', 'text/html', '');
-        $body .= $this->EncodeString($this->Body, $this->Encoding);
-        $body .= $this->LE.$this->LE;
-        $body .= $this->EndBoundary($this->boundary[1]);
-        break;
-      case 'alt_inline':
-        $body .= $this->GetBoundary($this->boundary[1], '', 'text/plain', '');
-        $body .= $this->EncodeString($this->AltBody, $this->Encoding);
-        $body .= $this->LE.$this->LE;
-        $body .= $this->TextLine("--" . $this->boundary[1]);
-        $body .= $this->HeaderLine('Content-Type', 'multipart/related;');
-        $body .= $this->TextLine("\tboundary=\"" . $this->boundary[2] . '"');
-        $body .= $this->LE;
-        $body .= $this->GetBoundary($this->boundary[2], '', 'text/html', '');
-        $body .= $this->EncodeString($this->Body, $this->Encoding);
-        $body .= $this->LE.$this->LE;
-        $body .= $this->AttachAll("inline", $this->boundary[2]);
-        $body .= $this->LE;
-        $body .= $this->EndBoundary($this->boundary[1]);
-        break;
-      case 'alt_attach':
-        $body .= $this->TextLine("--" . $this->boundary[1]);
-        $body .= $this->HeaderLine('Content-Type', 'multipart/alternative;');
-        $body .= $this->TextLine("\tboundary=\"" . $this->boundary[2] . '"');
-        $body .= $this->LE;
-        $body .= $this->GetBoundary($this->boundary[2], '', 'text/plain', '');
-        $body .= $this->EncodeString($this->AltBody, $this->Encoding);
-        $body .= $this->LE.$this->LE;
-        $body .= $this->GetBoundary($this->boundary[2], '', 'text/html', '');
-        $body .= $this->EncodeString($this->Body, $this->Encoding);
-        $body .= $this->LE.$this->LE;
-        $body .= $this->EndBoundary($this->boundary[2]);
-        $body .= $this->LE;
-        $body .= $this->AttachAll("attachment", $this->boundary[1]);
-        break;
-      case 'alt_inline_attach':
-        $body .= $this->TextLine("--" . $this->boundary[1]);
-        $body .= $this->HeaderLine('Content-Type', 'multipart/alternative;');
-        $body .= $this->TextLine("\tboundary=\"" . $this->boundary[2] . '"');
-        $body .= $this->LE;
-        $body .= $this->GetBoundary($this->boundary[2], '', 'text/plain', '');
-        $body .= $this->EncodeString($this->AltBody, $this->Encoding);
-        $body .= $this->LE.$this->LE;
-        $body .= $this->TextLine("--" . $this->boundary[2]);
-        $body .= $this->HeaderLine('Content-Type', 'multipart/related;');
-        $body .= $this->TextLine("\tboundary=\"" . $this->boundary[3] . '"');
-        $body .= $this->LE;
-        $body .= $this->GetBoundary($this->boundary[3], '', 'text/html', '');
-        $body .= $this->EncodeString($this->Body, $this->Encoding);
-        $body .= $this->LE.$this->LE;
-        $body .= $this->AttachAll("inline", $this->boundary[3]);
-        $body .= $this->LE;
-        $body .= $this->EndBoundary($this->boundary[2]);
-        $body .= $this->LE;
-        $body .= $this->AttachAll("attachment", $this->boundary[1]);
-        break;
-      default:
-        // catch case 'plain' and case ''
-        $body .= $this->EncodeString($this->Body, $this->Encoding);
-        break;
-    }
-
-    if ($this->IsError()) {
-      $body = '';
-    } elseif ($this->sign_key_file) {
-      try {
-        $file = tempnam('', 'mail');
-        file_put_contents($file, $body); //TODO check this worked
-        $signed = tempnam("", "signed");
-        if (@openssl_pkcs7_sign($file, $signed, "file://".$this->sign_cert_file, array("file://".$this->sign_key_file, $this->sign_key_pass), NULL)) {
-          @unlink($file);
-          $body = file_get_contents($signed);
-          @unlink($signed);
+        // Only allow a custom message ID if it conforms to RFC 5322 section 3.6.4
+        // https://tools.ietf.org/html/rfc5322#section-3.6.4
+        if ('' != $this->MessageID and preg_match('/^<.*@.*>$/', $this->MessageID)) {
+            $this->lastMessageID = $this->MessageID;
         } else {
-          @unlink($file);
-          @unlink($signed);
-          throw new phpmailerException($this->Lang("signing").openssl_error_string());
+            $this->lastMessageID = sprintf('<%s@%s>', $this->uniqueid, $this->serverHostname());
         }
-      } catch (phpmailerException $e) {
+        $result .= $this->headerLine('Message-ID', $this->lastMessageID);
+        if (!is_null($this->Priority)) {
+            $result .= $this->headerLine('X-Priority', $this->Priority);
+        }
+        if ($this->XMailer == '') {
+            $result .= $this->headerLine(
+                'X-Mailer',
+                'PHPMailer ' . $this->Version . ' (https://github.com/PHPMailer/PHPMailer)'
+            );
+        } else {
+            $myXmailer = trim($this->XMailer);
+            if ($myXmailer) {
+                $result .= $this->headerLine('X-Mailer', $myXmailer);
+            }
+        }
+
+        if ($this->ConfirmReadingTo != '') {
+            $result .= $this->headerLine('Disposition-Notification-To', '<' . $this->ConfirmReadingTo . '>');
+        }
+
+        // Add custom headers
+        foreach ($this->CustomHeader as $header) {
+            $result .= $this->headerLine(
+                trim($header[0]),
+                $this->encodeHeader(trim($header[1]))
+            );
+        }
+        if (!$this->sign_key_file) {
+            $result .= $this->headerLine('MIME-Version', '1.0');
+            $result .= $this->getMailMIME();
+        }
+
+        return $result;
+    }
+
+    /**
+     * Get the message MIME type headers.
+     * @access public
+     * @return string
+     */
+    public function getMailMIME()
+    {
+        $result = '';
+        $ismultipart = true;
+        switch ($this->message_type) {
+            case 'inline':
+                $result .= $this->headerLine('Content-Type', 'multipart/related;');
+                $result .= $this->textLine("\tboundary=\"" . $this->boundary[1] . '"');
+                break;
+            case 'attach':
+            case 'inline_attach':
+            case 'alt_attach':
+            case 'alt_inline_attach':
+                $result .= $this->headerLine('Content-Type', 'multipart/mixed;');
+                $result .= $this->textLine("\tboundary=\"" . $this->boundary[1] . '"');
+                break;
+            case 'alt':
+            case 'alt_inline':
+                $result .= $this->headerLine('Content-Type', 'multipart/alternative;');
+                $result .= $this->textLine("\tboundary=\"" . $this->boundary[1] . '"');
+                break;
+            default:
+                // Catches case 'plain': and case '':
+                $result .= $this->textLine('Content-Type: ' . $this->ContentType . '; charset=' . $this->CharSet);
+                $ismultipart = false;
+                break;
+        }
+        // RFC1341 part 5 says 7bit is assumed if not specified
+        if ($this->Encoding != '7bit') {
+            // RFC 2045 section 6.4 says multipart MIME parts may only use 7bit, 8bit or binary CTE
+            if ($ismultipart) {
+                if ($this->Encoding == '8bit') {
+                    $result .= $this->headerLine('Content-Transfer-Encoding', '8bit');
+                }
+                // The only remaining alternatives are quoted-printable and base64, which are both 7bit compatible
+            } else {
+                $result .= $this->headerLine('Content-Transfer-Encoding', $this->Encoding);
+            }
+        }
+
+        if ($this->Mailer != 'mail') {
+            $result .= $this->LE;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Returns the whole MIME message.
+     * Includes complete headers and body.
+     * Only valid post preSend().
+     * @see PHPMailer::preSend()
+     * @access public
+     * @return string
+     */
+    public function getSentMIMEMessage()
+    {
+        return rtrim($this->MIMEHeader . $this->mailHeader, "\n\r") . self::CRLF . self::CRLF . $this->MIMEBody;
+    }
+
+    /**
+     * Create unique ID
+     * @return string
+     */
+    protected function generateId() {
+        return md5(uniqid(time()));
+    }
+
+    /**
+     * Assemble the message body.
+     * Returns an empty string on failure.
+     * @access public
+     * @throws phpmailerException
+     * @return string The assembled message body
+     */
+    public function createBody()
+    {
         $body = '';
-        if ($this->exceptions) {
-          throw $e;
-        }
-      }
-    }
+        //Create unique IDs and preset boundaries
+        $this->uniqueid = $this->generateId();
+        $this->boundary[1] = 'b1_' . $this->uniqueid;
+        $this->boundary[2] = 'b2_' . $this->uniqueid;
+        $this->boundary[3] = 'b3_' . $this->uniqueid;
 
-    return $body;
-  }
-
-  /**
-   * Returns the start of a message boundary.
-   * @access protected
-   * @param string $boundary
-   * @param string $charSet
-   * @param string $contentType
-   * @param string $encoding
-   * @return string
-   */
-  protected function GetBoundary($boundary, $charSet, $contentType, $encoding) {
-    $result = '';
-    if($charSet == '') {
-      $charSet = $this->CharSet;
-    }
-    if($contentType == '') {
-      $contentType = $this->ContentType;
-    }
-    if($encoding == '') {
-      $encoding = $this->Encoding;
-    }
-    $result .= $this->TextLine('--' . $boundary);
-    $result .= sprintf("Content-Type: %s; charset=%s", $contentType, $charSet);
-    $result .= $this->LE;
-    $result .= $this->HeaderLine('Content-Transfer-Encoding', $encoding);
-    $result .= $this->LE;
-
-    return $result;
-  }
-
-  /**
-   * Returns the end of a message boundary.
-   * @access protected
-   * @param string $boundary
-   * @return string
-   */
-  protected function EndBoundary($boundary) {
-    return $this->LE . '--' . $boundary . '--' . $this->LE;
-  }
-
-  /**
-   * Sets the message type.
-   * @access protected
-   * @return void
-   */
-  protected function SetMessageType() {
-    $this->message_type = array();
-    if($this->AlternativeExists()) $this->message_type[] = "alt";
-    if($this->InlineImageExists()) $this->message_type[] = "inline";
-    if($this->AttachmentExists()) $this->message_type[] = "attach";
-    $this->message_type = implode("_", $this->message_type);
-    if($this->message_type == "") $this->message_type = "plain";
-  }
-
-  /**
-   *  Returns a formatted header line.
-   * @access public
-   * @param string $name
-   * @param string $value
-   * @return string
-   */
-  public function HeaderLine($name, $value) {
-    return $name . ': ' . $value . $this->LE;
-  }
-
-  /**
-   * Returns a formatted mail line.
-   * @access public
-   * @param string $value
-   * @return string
-   */
-  public function TextLine($value) {
-    return $value . $this->LE;
-  }
-
-  /////////////////////////////////////////////////
-  // CLASS METHODS, ATTACHMENTS
-  /////////////////////////////////////////////////
-
-  /**
-   * Adds an attachment from a path on the filesystem.
-   * Returns false if the file could not be found
-   * or accessed.
-   * @param string $path Path to the attachment.
-   * @param string $name Overrides the attachment name.
-   * @param string $encoding File encoding (see $Encoding).
-   * @param string $type File extension (MIME) type.
-   * @throws phpmailerException
-   * @return bool
-   */
-  public function AddAttachment($path, $name = '', $encoding = 'base64', $type = 'application/octet-stream') {
-    try {
-      if ( !@is_file($path) ) {
-        throw new phpmailerException($this->Lang('file_access') . $path, self::STOP_CONTINUE);
-      }
-      $filename = basename($path);
-      if ( $name == '' ) {
-        $name = $filename;
-      }
-
-      $this->attachment[] = array(
-        0 => $path,
-        1 => $filename,
-        2 => $name,
-        3 => $encoding,
-        4 => $type,
-        5 => false,  // isStringAttachment
-        6 => 'attachment',
-        7 => 0
-      );
-
-    } catch (phpmailerException $e) {
-      $this->SetError($e->getMessage());
-      if ($this->exceptions) {
-        throw $e;
-      }
-      if ($this->SMTPDebug) {
-        $this->edebug($e->getMessage()."\n");
-      }
-      if ( $e->getCode() == self::STOP_CRITICAL ) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  /**
-  * Return the current array of attachments
-  * @return array
-  */
-  public function GetAttachments() {
-    return $this->attachment;
-  }
-
-  /**
-   * Attaches all fs, string, and binary attachments to the message.
-   * Returns an empty string on failure.
-   * @access protected
-   * @param string $disposition_type
-   * @param string $boundary
-   * @return string
-   */
-  protected function AttachAll($disposition_type, $boundary) {
-    // Return text of body
-    $mime = array();
-    $cidUniq = array();
-    $incl = array();
-
-    // Add all attachments
-    foreach ($this->attachment as $attachment) {
-      // CHECK IF IT IS A VALID DISPOSITION_FILTER
-      if($attachment[6] == $disposition_type) {
-        // Check for string attachment
-        $string = '';
-        $path = '';
-        $bString = $attachment[5];
-        if ($bString) {
-          $string = $attachment[0];
-        } else {
-          $path = $attachment[0];
+        if ($this->sign_key_file) {
+            $body .= $this->getMailMIME() . $this->LE;
         }
 
-        $inclhash = md5(serialize($attachment));
-        if (in_array($inclhash, $incl)) { continue; }
-        $incl[]      = $inclhash;
-        $filename    = $attachment[1];
-        $name        = $attachment[2];
-        $encoding    = $attachment[3];
-        $type        = $attachment[4];
-        $disposition = $attachment[6];
-        $cid         = $attachment[7];
-        if ( $disposition == 'inline' && isset($cidUniq[$cid]) ) { continue; }
-        $cidUniq[$cid] = true;
+        $this->setWordWrap();
 
-        $mime[] = sprintf("--%s%s", $boundary, $this->LE);
-        $mime[] = sprintf("Content-Type: %s; name=\"%s\"%s", $type, $this->EncodeHeader($this->SecureHeader($name)), $this->LE);
-        $mime[] = sprintf("Content-Transfer-Encoding: %s%s", $encoding, $this->LE);
-
-        if($disposition == 'inline') {
-          $mime[] = sprintf("Content-ID: <%s>%s", $cid, $this->LE);
+        $bodyEncoding = $this->Encoding;
+        $bodyCharSet = $this->CharSet;
+        //Can we do a 7-bit downgrade?
+        if ($bodyEncoding == '8bit' and !$this->has8bitChars($this->Body)) {
+            $bodyEncoding = '7bit';
+            //All ISO 8859, Windows codepage and UTF-8 charsets are ascii compatible up to 7-bit
+            $bodyCharSet = 'us-ascii';
+        }
+        //If lines are too long, and we're not already using an encoding that will shorten them,
+        //change to quoted-printable transfer encoding for the body part only
+        if ('base64' != $this->Encoding and self::hasLineLongerThanMax($this->Body)) {
+            $bodyEncoding = 'quoted-printable';
         }
 
-        $mime[] = sprintf("Content-Disposition: %s; filename=\"%s\"%s", $disposition, $this->EncodeHeader($this->SecureHeader($name)), $this->LE.$this->LE);
-
-        // Encode as string attachment
-        if($bString) {
-          $mime[] = $this->EncodeString($string, $encoding);
-          if($this->IsError()) {
-            return '';
-          }
-          $mime[] = $this->LE.$this->LE;
-        } else {
-          $mime[] = $this->EncodeFile($path, $encoding);
-          if($this->IsError()) {
-            return '';
-          }
-          $mime[] = $this->LE.$this->LE;
+        $altBodyEncoding = $this->Encoding;
+        $altBodyCharSet = $this->CharSet;
+        //Can we do a 7-bit downgrade?
+        if ($altBodyEncoding == '8bit' and !$this->has8bitChars($this->AltBody)) {
+            $altBodyEncoding = '7bit';
+            //All ISO 8859, Windows codepage and UTF-8 charsets are ascii compatible up to 7-bit
+            $altBodyCharSet = 'us-ascii';
         }
-      }
-    }
-
-    $mime[] = sprintf("--%s--%s", $boundary, $this->LE);
-
-    return implode("", $mime);
-  }
-
-  /**
-   * Encodes attachment in requested format.
-   * Returns an empty string on failure.
-   * @param string $path The full path to the file
-   * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable'
-   * @throws phpmailerException
-   * @see EncodeFile()
-   * @access protected
-   * @return string
-   */
-  protected function EncodeFile($path, $encoding = 'base64') {
-    try {
-      if (!is_readable($path)) {
-        throw new phpmailerException($this->Lang('file_open') . $path, self::STOP_CONTINUE);
-      }
-      //  if (!function_exists('get_magic_quotes')) {
-      //    function get_magic_quotes() {
-      //      return false;
-      //    }
-      //  }
-      $magic_quotes = get_magic_quotes_runtime();
-      if ($magic_quotes) {
-        if (version_compare(PHP_VERSION, '5.3.0', '<')) {
-          set_magic_quotes_runtime(0);
-        } else {
-          ini_set('magic_quotes_runtime', 0);
+        //If lines are too long, and we're not already using an encoding that will shorten them,
+        //change to quoted-printable transfer encoding for the alt body part only
+        if ('base64' != $altBodyEncoding and self::hasLineLongerThanMax($this->AltBody)) {
+            $altBodyEncoding = 'quoted-printable';
         }
-      }
-      $file_buffer  = file_get_contents($path);
-      $file_buffer  = $this->EncodeString($file_buffer, $encoding);
-      if ($magic_quotes) {
-        if (version_compare(PHP_VERSION, '5.3.0', '<')) {
-          set_magic_quotes_runtime($magic_quotes);
-        } else {
-          ini_set('magic_quotes_runtime', $magic_quotes);
+        //Use this as a preamble in all multipart message types
+        $mimepre = "This is a multi-part message in MIME format." . $this->LE . $this->LE;
+        switch ($this->message_type) {
+            case 'inline':
+                $body .= $mimepre;
+                $body .= $this->getBoundary($this->boundary[1], $bodyCharSet, '', $bodyEncoding);
+                $body .= $this->encodeString($this->Body, $bodyEncoding);
+                $body .= $this->LE . $this->LE;
+                $body .= $this->attachAll('inline', $this->boundary[1]);
+                break;
+            case 'attach':
+                $body .= $mimepre;
+                $body .= $this->getBoundary($this->boundary[1], $bodyCharSet, '', $bodyEncoding);
+                $body .= $this->encodeString($this->Body, $bodyEncoding);
+                $body .= $this->LE . $this->LE;
+                $body .= $this->attachAll('attachment', $this->boundary[1]);
+                break;
+            case 'inline_attach':
+                $body .= $mimepre;
+                $body .= $this->textLine('--' . $this->boundary[1]);
+                $body .= $this->headerLine('Content-Type', 'multipart/related;');
+                $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
+                $body .= $this->LE;
+                $body .= $this->getBoundary($this->boundary[2], $bodyCharSet, '', $bodyEncoding);
+                $body .= $this->encodeString($this->Body, $bodyEncoding);
+                $body .= $this->LE . $this->LE;
+                $body .= $this->attachAll('inline', $this->boundary[2]);
+                $body .= $this->LE;
+                $body .= $this->attachAll('attachment', $this->boundary[1]);
+                break;
+            case 'alt':
+                $body .= $mimepre;
+                $body .= $this->getBoundary($this->boundary[1], $altBodyCharSet, 'text/plain', $altBodyEncoding);
+                $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
+                $body .= $this->LE . $this->LE;
+                $body .= $this->getBoundary($this->boundary[1], $bodyCharSet, 'text/html', $bodyEncoding);
+                $body .= $this->encodeString($this->Body, $bodyEncoding);
+                $body .= $this->LE . $this->LE;
+                if (!empty($this->Ical)) {
+                    $body .= $this->getBoundary($this->boundary[1], '', 'text/calendar; method=REQUEST', '');
+                    $body .= $this->encodeString($this->Ical, $this->Encoding);
+                    $body .= $this->LE . $this->LE;
+                }
+                $body .= $this->endBoundary($this->boundary[1]);
+                break;
+            case 'alt_inline':
+                $body .= $mimepre;
+                $body .= $this->getBoundary($this->boundary[1], $altBodyCharSet, 'text/plain', $altBodyEncoding);
+                $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
+                $body .= $this->LE . $this->LE;
+                $body .= $this->textLine('--' . $this->boundary[1]);
+                $body .= $this->headerLine('Content-Type', 'multipart/related;');
+                $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
+                $body .= $this->LE;
+                $body .= $this->getBoundary($this->boundary[2], $bodyCharSet, 'text/html', $bodyEncoding);
+                $body .= $this->encodeString($this->Body, $bodyEncoding);
+                $body .= $this->LE . $this->LE;
+                $body .= $this->attachAll('inline', $this->boundary[2]);
+                $body .= $this->LE;
+                $body .= $this->endBoundary($this->boundary[1]);
+                break;
+            case 'alt_attach':
+                $body .= $mimepre;
+                $body .= $this->textLine('--' . $this->boundary[1]);
+                $body .= $this->headerLine('Content-Type', 'multipart/alternative;');
+                $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
+                $body .= $this->LE;
+                $body .= $this->getBoundary($this->boundary[2], $altBodyCharSet, 'text/plain', $altBodyEncoding);
+                $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
+                $body .= $this->LE . $this->LE;
+                $body .= $this->getBoundary($this->boundary[2], $bodyCharSet, 'text/html', $bodyEncoding);
+                $body .= $this->encodeString($this->Body, $bodyEncoding);
+                $body .= $this->LE . $this->LE;
+                $body .= $this->endBoundary($this->boundary[2]);
+                $body .= $this->LE;
+                $body .= $this->attachAll('attachment', $this->boundary[1]);
+                break;
+            case 'alt_inline_attach':
+                $body .= $mimepre;
+                $body .= $this->textLine('--' . $this->boundary[1]);
+                $body .= $this->headerLine('Content-Type', 'multipart/alternative;');
+                $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
+                $body .= $this->LE;
+                $body .= $this->getBoundary($this->boundary[2], $altBodyCharSet, 'text/plain', $altBodyEncoding);
+                $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
+                $body .= $this->LE . $this->LE;
+                $body .= $this->textLine('--' . $this->boundary[2]);
+                $body .= $this->headerLine('Content-Type', 'multipart/related;');
+                $body .= $this->textLine("\tboundary=\"" . $this->boundary[3] . '"');
+                $body .= $this->LE;
+                $body .= $this->getBoundary($this->boundary[3], $bodyCharSet, 'text/html', $bodyEncoding);
+                $body .= $this->encodeString($this->Body, $bodyEncoding);
+                $body .= $this->LE . $this->LE;
+                $body .= $this->attachAll('inline', $this->boundary[3]);
+                $body .= $this->LE;
+                $body .= $this->endBoundary($this->boundary[2]);
+                $body .= $this->LE;
+                $body .= $this->attachAll('attachment', $this->boundary[1]);
+                break;
+            default:
+                // Catch case 'plain' and case '', applies to simple `text/plain` and `text/html` body content types
+                //Reset the `Encoding` property in case we changed it for line length reasons
+                $this->Encoding = $bodyEncoding;
+                $body .= $this->encodeString($this->Body, $this->Encoding);
+                break;
         }
-      }
-      return $file_buffer;
-    } catch (Exception $e) {
-      $this->SetError($e->getMessage());
-      return '';
-    }
-  }
 
-  /**
-   * Encodes string to requested format.
-   * Returns an empty string on failure.
-   * @param string $str The text to encode
-   * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable'
-   * @access public
-   * @return string
-   */
-  public function EncodeString($str, $encoding = 'base64') {
-    $encoded = '';
-    switch(strtolower($encoding)) {
-      case 'base64':
-        $encoded = chunk_split(base64_encode($str), 76, $this->LE);
-        break;
-      case '7bit':
-      case '8bit':
-        $encoded = $this->FixEOL($str);
-        //Make sure it ends with a line break
-        if (substr($encoded, -(strlen($this->LE))) != $this->LE)
-          $encoded .= $this->LE;
-        break;
-      case 'binary':
-        $encoded = $str;
-        break;
-      case 'quoted-printable':
-        $encoded = $this->EncodeQP($str);
-        break;
-      default:
-        $this->SetError($this->Lang('encoding') . $encoding);
-        break;
-    }
-    return $encoded;
-  }
-
-  /**
-   * Encode a header string to best (shortest) of Q, B, quoted or none.
-   * @access public
-   * @param string $str
-   * @param string $position
-   * @return string
-   */
-  public function EncodeHeader($str, $position = 'text') {
-    $x = 0;
-
-    switch (strtolower($position)) {
-      case 'phrase':
-        if (!preg_match('/[\200-\377]/', $str)) {
-          // Can't use addslashes as we don't know what value has magic_quotes_sybase
-          $encoded = addcslashes($str, "\0..\37\177\\\"");
-          if (($str == $encoded) && !preg_match('/[^A-Za-z0-9!#$%&\'*+\/=?^_`{|}~ -]/', $str)) {
-            return ($encoded);
-          } else {
-            return ("\"$encoded\"");
-          }
+        if ($this->isError()) {
+            $body = '';
+        } elseif ($this->sign_key_file) {
+            try {
+                if (!defined('PKCS7_TEXT')) {
+                    throw new phpmailerException($this->lang('extension_missing') . 'openssl');
+                }
+                // @TODO would be nice to use php://temp streams here, but need to wrap for PHP < 5.1
+                $file = tempnam(sys_get_temp_dir(), 'mail');
+                if (false === file_put_contents($file, $body)) {
+                    throw new phpmailerException($this->lang('signing') . ' Could not write temp file');
+                }
+                $signed = tempnam(sys_get_temp_dir(), 'signed');
+                //Workaround for PHP bug https://bugs.php.net/bug.php?id=69197
+                if (empty($this->sign_extracerts_file)) {
+                    $sign = @openssl_pkcs7_sign(
+                        $file,
+                        $signed,
+                        'file://' . realpath($this->sign_cert_file),
+                        array('file://' . realpath($this->sign_key_file), $this->sign_key_pass),
+                        null
+                    );
+                } else {
+                    $sign = @openssl_pkcs7_sign(
+                        $file,
+                        $signed,
+                        'file://' . realpath($this->sign_cert_file),
+                        array('file://' . realpath($this->sign_key_file), $this->sign_key_pass),
+                        null,
+                        PKCS7_DETACHED,
+                        $this->sign_extracerts_file
+                    );
+                }
+                if ($sign) {
+                    @unlink($file);
+                    $body = file_get_contents($signed);
+                    @unlink($signed);
+                    //The message returned by openssl contains both headers and body, so need to split them up
+                    $parts = explode("\n\n", $body, 2);
+                    $this->MIMEHeader .= $parts[0] . $this->LE . $this->LE;
+                    $body = $parts[1];
+                } else {
+                    @unlink($file);
+                    @unlink($signed);
+                    throw new phpmailerException($this->lang('signing') . openssl_error_string());
+                }
+            } catch (phpmailerException $exc) {
+                $body = '';
+                if ($this->exceptions) {
+                    throw $exc;
+                }
+            }
         }
-        $x = preg_match_all('/[^\040\041\043-\133\135-\176]/', $str, $matches);
-        break;
-      case 'comment':
-        $x = preg_match_all('/[()"]/', $str, $matches);
-        // Fall-through
-      case 'text':
-      default:
-        $x += preg_match_all('/[\000-\010\013\014\016-\037\177-\377]/', $str, $matches);
-        break;
+        return $body;
     }
 
-    if ($x == 0) {
-      return ($str);
-    }
-
-    $maxlen = 75 - 7 - strlen($this->CharSet);
-    // Try to select the encoding which should produce the shortest output
-    if (strlen($str)/3 < $x) {
-      $encoding = 'B';
-      if (function_exists('mb_strlen') && $this->HasMultiBytes($str)) {
-        // Use a custom function which correctly encodes and wraps long
-        // multibyte strings without breaking lines within a character
-        $encoded = $this->Base64EncodeWrapMB($str, "\n");
-      } else {
-        $encoded = base64_encode($str);
-        $maxlen -= $maxlen % 4;
-        $encoded = trim(chunk_split($encoded, $maxlen, "\n"));
-      }
-    } else {
-      $encoding = 'Q';
-      $encoded = $this->EncodeQ($str, $position);
-      $encoded = $this->WrapText($encoded, $maxlen, true);
-      $encoded = str_replace('='.self::CRLF, "\n", trim($encoded));
-    }
-
-    $encoded = preg_replace('/^(.*)$/m', " =?".$this->CharSet."?$encoding?\\1?=", $encoded);
-    $encoded = trim(str_replace("\n", $this->LE, $encoded));
-
-    return $encoded;
-  }
-
-  /**
-   * Checks if a string contains multibyte characters.
-   * @access public
-   * @param string $str multi-byte text to wrap encode
-   * @return bool
-   */
-  public function HasMultiBytes($str) {
-    if (function_exists('mb_strlen')) {
-      return (strlen($str) > mb_strlen($str, $this->CharSet));
-    } else { // Assume no multibytes (we can't handle without mbstring functions anyway)
-      return false;
-    }
-  }
-
-  /**
-   * Correctly encodes and wraps long multibyte strings for mail headers
-   * without breaking lines within a character.
-   * Adapted from a function by paravoid at http://uk.php.net/manual/en/function.mb-encode-mimeheader.php
-   * @access public
-   * @param string $str multi-byte text to wrap encode
-   * @param string $lf string to use as linefeed/end-of-line
-   * @return string
-   */
-  public function Base64EncodeWrapMB($str, $lf=null) {
-    $start = "=?".$this->CharSet."?B?";
-    $end = "?=";
-    $encoded = "";
-    if ($lf === null) {
-      $lf = $this->LE;
-    }
-
-    $mb_length = mb_strlen($str, $this->CharSet);
-    // Each line must have length <= 75, including $start and $end
-    $length = 75 - strlen($start) - strlen($end);
-    // Average multi-byte ratio
-    $ratio = $mb_length / strlen($str);
-    // Base64 has a 4:3 ratio
-    $offset = $avgLength = floor($length * $ratio * .75);
-
-    for ($i = 0; $i < $mb_length; $i += $offset) {
-      $lookBack = 0;
-
-      do {
-        $offset = $avgLength - $lookBack;
-        $chunk = mb_substr($str, $i, $offset, $this->CharSet);
-        $chunk = base64_encode($chunk);
-        $lookBack++;
-      }
-      while (strlen($chunk) > $length);
-
-      $encoded .= $chunk . $lf;
-    }
-
-    // Chomp the last linefeed
-    $encoded = substr($encoded, 0, -strlen($lf));
-    return $encoded;
-  }
-
-  /**
-  * Encode string to quoted-printable.
-  * Only uses standard PHP, slow, but will always work
-  * @access public
-   * @param string $input
-  * @param integer $line_max Number of chars allowed on a line before wrapping
-   * @param bool $space_conv
-   * @internal param string $string the text to encode
-  * @return string
-  */
-  public function EncodeQPphp( $input = '', $line_max = 76, $space_conv = false) {
-    $hex = array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F');
-    $lines = preg_split('/(?:\r\n|\r|\n)/', $input);
-    $eol = "\r\n";
-    $escape = '=';
-    $output = '';
-    while( list(, $line) = each($lines) ) {
-      $linlen = strlen($line);
-      $newline = '';
-      for($i = 0; $i < $linlen; $i++) {
-        $c = substr( $line, $i, 1 );
-        $dec = ord( $c );
-        if ( ( $i == 0 ) && ( $dec == 46 ) ) { // convert first point in the line into =2E
-          $c = '=2E';
+    /**
+     * Return the start of a message boundary.
+     * @access protected
+     * @param string $boundary
+     * @param string $charSet
+     * @param string $contentType
+     * @param string $encoding
+     * @return string
+     */
+    protected function getBoundary($boundary, $charSet, $contentType, $encoding)
+    {
+        $result = '';
+        if ($charSet == '') {
+            $charSet = $this->CharSet;
         }
-        if ( $dec == 32 ) {
-          if ( $i == ( $linlen - 1 ) ) { // convert space at eol only
-            $c = '=20';
-          } else if ( $space_conv ) {
-            $c = '=20';
-          }
-        } elseif ( ($dec == 61) || ($dec < 32 ) || ($dec > 126) ) { // always encode "\t", which is *not* required
-          $h2 = (integer)floor($dec/16);
-          $h1 = (integer)floor($dec%16);
-          $c = $escape.$hex[$h2].$hex[$h1];
+        if ($contentType == '') {
+            $contentType = $this->ContentType;
         }
-        if ( (strlen($newline) + strlen($c)) >= $line_max ) { // CRLF is not counted
-          $output .= $newline.$escape.$eol; //  soft line break; " =\r\n" is okay
-          $newline = '';
-          // check if newline first character will be point or not
-          if ( $dec == 46 ) {
-            $c = '=2E';
-          }
+        if ($encoding == '') {
+            $encoding = $this->Encoding;
         }
-        $newline .= $c;
-      } // end of for
-      $output .= $newline.$eol;
-    } // end of while
-    return $output;
-  }
+        $result .= $this->textLine('--' . $boundary);
+        $result .= sprintf('Content-Type: %s; charset=%s', $contentType, $charSet);
+        $result .= $this->LE;
+        // RFC1341 part 5 says 7bit is assumed if not specified
+        if ($encoding != '7bit') {
+            $result .= $this->headerLine('Content-Transfer-Encoding', $encoding);
+        }
+        $result .= $this->LE;
 
-  /**
-  * Encode string to RFC2045 (6.7) quoted-printable format
-  * Uses a PHP5 stream filter to do the encoding about 64x faster than the old version
-  * Also results in same content as you started with after decoding
-  * @see EncodeQPphp()
-  * @access public
-  * @param string $string the text to encode
-  * @param integer $line_max Number of chars allowed on a line before wrapping
-  * @param boolean $space_conv Dummy param for compatibility with existing EncodeQP function
-  * @return string
-  * @author Marcus Bointon
-  */
-  public function EncodeQP($string, $line_max = 76, $space_conv = false) {
-    if (function_exists('quoted_printable_encode')) { //Use native function if it's available (>= PHP5.3)
-      return quoted_printable_encode($string);
-    }
-    $filters = stream_get_filters();
-    if (!in_array('convert.*', $filters)) { //Got convert stream filter?
-      return $this->EncodeQPphp($string, $line_max, $space_conv); //Fall back to old implementation
-    }
-    $fp = fopen('php://temp/', 'r+');
-    $string = preg_replace('/\r\n?/', $this->LE, $string); //Normalise line breaks
-    $params = array('line-length' => $line_max, 'line-break-chars' => $this->LE);
-    $s = stream_filter_append($fp, 'convert.quoted-printable-encode', STREAM_FILTER_READ, $params);
-    fputs($fp, $string);
-    rewind($fp);
-    $out = stream_get_contents($fp);
-    stream_filter_remove($s);
-    $out = preg_replace('/^\./m', '=2E', $out); //Encode . if it is first char on a line, workaround for bug in Exchange
-    fclose($fp);
-    return $out;
-  }
-
-  /**
-   * Encode string to q encoding.
-   * @link http://tools.ietf.org/html/rfc2047
-   * @param string $str the text to encode
-   * @param string $position Where the text is going to be used, see the RFC for what that means
-   * @access public
-   * @return string
-   */
-  public function EncodeQ($str, $position = 'text') {
-    //There should not be any EOL in the string
-	$pattern="";
-    $encoded = str_replace(array("\r", "\n"), '', $str);
-    switch (strtolower($position)) {
-      case 'phrase':
-        $pattern = '^A-Za-z0-9!*+\/ -';
-        break;
-
-      case 'comment':
-        $pattern = '\(\)"';
-        //note that we dont break here!
-        //for this reason we build the $pattern withoud including delimiters and []
-
-      case 'text':
-      default:
-        //Replace every high ascii, control =, ? and _ characters
-        //We put \075 (=) as first value to make sure it's the first one in being converted, preventing double encode
-        $pattern = '\075\000-\011\013\014\016-\037\077\137\177-\377' . $pattern;
-        break;
+        return $result;
     }
 
-    if (preg_match_all("/[{$pattern}]/", $encoded, $matches)) {
-      foreach (array_unique($matches[0]) as $char) {
-        $encoded = str_replace($char, '=' . sprintf('%02X', ord($char)), $encoded);
-      }
+    /**
+     * Return the end of a message boundary.
+     * @access protected
+     * @param string $boundary
+     * @return string
+     */
+    protected function endBoundary($boundary)
+    {
+        return $this->LE . '--' . $boundary . '--' . $this->LE;
     }
 
-    //Replace every spaces to _ (more readable than =20)
-    return str_replace(' ', '_', $encoded);
-}
-
-
-  /**
-   * Adds a string or binary attachment (non-filesystem) to the list.
-   * This method can be used to attach ascii or binary data,
-   * such as a BLOB record from a database.
-   * @param string $string String attachment data.
-   * @param string $filename Name of the attachment.
-   * @param string $encoding File encoding (see $Encoding).
-   * @param string $type File extension (MIME) type.
-   * @return void
-   */
-  public function AddStringAttachment($string, $filename, $encoding = 'base64', $type = 'application/octet-stream') {
-    // Append to $attachment array
-    $this->attachment[] = array(
-      0 => $string,
-      1 => $filename,
-      2 => basename($filename),
-      3 => $encoding,
-      4 => $type,
-      5 => true,  // isStringAttachment
-      6 => 'attachment',
-      7 => 0
-    );
-  }
-
-  /**
-   * Adds an embedded attachment.  This can include images, sounds, and
-   * just about any other document.  Make sure to set the $type to an
-   * image type.  For JPEG images use "image/jpeg" and for GIF images
-   * use "image/gif".
-   * @param string $path Path to the attachment.
-   * @param string $cid Content ID of the attachment.  Use this to identify
-   *        the Id for accessing the image in an HTML form.
-   * @param string $name Overrides the attachment name.
-   * @param string $encoding File encoding (see $Encoding).
-   * @param string $type File extension (MIME) type.
-   * @return bool
-   */
-  public function AddEmbeddedImage($path, $cid, $name = '', $encoding = 'base64', $type = 'application/octet-stream') {
-
-    if ( !@is_file($path) ) {
-      $this->SetError($this->Lang('file_access') . $path);
-      return false;
+    /**
+     * Set the message type.
+     * PHPMailer only supports some preset message types, not arbitrary MIME structures.
+     * @access protected
+     * @return void
+     */
+    protected function setMessageType()
+    {
+        $type = array();
+        if ($this->alternativeExists()) {
+            $type[] = 'alt';
+        }
+        if ($this->inlineImageExists()) {
+            $type[] = 'inline';
+        }
+        if ($this->attachmentExists()) {
+            $type[] = 'attach';
+        }
+        $this->message_type = implode('_', $type);
+        if ($this->message_type == '') {
+            //The 'plain' message_type refers to the message having a single body element, not that it is plain-text
+            $this->message_type = 'plain';
+        }
     }
 
-    $filename = basename($path);
-    if ( $name == '' ) {
-      $name = $filename;
+    /**
+     * Format a header line.
+     * @access public
+     * @param string $name
+     * @param string $value
+     * @return string
+     */
+    public function headerLine($name, $value)
+    {
+        return $name . ': ' . $value . $this->LE;
     }
 
-    // Append to $attachment array
-    $this->attachment[] = array(
-      0 => $path,
-      1 => $filename,
-      2 => $name,
-      3 => $encoding,
-      4 => $type,
-      5 => false,  // isStringAttachment
-      6 => 'inline',
-      7 => $cid
-    );
+    /**
+     * Return a formatted mail line.
+     * @access public
+     * @param string $value
+     * @return string
+     */
+    public function textLine($value)
+    {
+        return $value . $this->LE;
+    }
 
-    return true;
-  }
+    /**
+     * Add an attachment from a path on the filesystem.
+     * Never use a user-supplied path to a file!
+     * Returns false if the file could not be found or read.
+     * Explicitly *does not* support passing URLs; PHPMailer is not an HTTP client.
+     * If you need to do that, fetch the resource yourself and pass it in via a local file or string.
+     * @param string $path Path to the attachment.
+     * @param string $name Overrides the attachment name.
+     * @param string $encoding File encoding (see $Encoding).
+     * @param string $type File extension (MIME) type.
+     * @param string $disposition Disposition to use
+     * @throws phpmailerException
+     * @return boolean
+     */
+    public function addAttachment($path, $name = '', $encoding = 'base64', $type = '', $disposition = 'attachment')
+    {
+        try {
+            if (!self::isPermittedPath($path) or !@is_file($path)) {
+                throw new phpmailerException($this->lang('file_access') . $path, self::STOP_CONTINUE);
+            }
 
-  /**
-   * Adds an embedded stringified attachment.  This can include images, sounds, and
-   * just about any other document.  Make sure to set the $type to an
-   * image type.  For JPEG images use "image/jpeg" and for GIF images
-   * use "image/gif".
-   * @param string $string The attachment.
-   * @param string $cid Content ID of the attachment.  Use this to identify
-   *        the Id for accessing the image in an HTML form.
-   * @param string $name Overrides the attachment name.
-   * @param string $encoding File encoding (see $Encoding).
-   * @param string $type File extension (MIME) type.
-   * @return bool
-   */
-  public function AddStringEmbeddedImage($string, $cid, $name = '', $encoding = 'base64', $type = 'application/octet-stream') {
-    // Append to $attachment array
-    $this->attachment[] = array(
-      0 => $string,
-      1 => $name,
-      2 => $name,
-      3 => $encoding,
-      4 => $type,
-      5 => true,  // isStringAttachment
-      6 => 'inline',
-      7 => $cid
-    );
-  }
+            // If a MIME type is not specified, try to work it out from the file name
+            if ($type == '') {
+                $type = self::filenameToType($path);
+            }
 
-  /**
-   * Returns true if an inline attachment is present.
-   * @access public
-   * @return bool
-   */
-  public function InlineImageExists() {
-    foreach($this->attachment as $attachment) {
-      if ($attachment[6] == 'inline') {
+            $filename = basename($path);
+            if ($name == '') {
+                $name = $filename;
+            }
+
+            $this->attachment[] = array(
+                0 => $path,
+                1 => $filename,
+                2 => $name,
+                3 => $encoding,
+                4 => $type,
+                5 => false, // isStringAttachment
+                6 => $disposition,
+                7 => 0
+            );
+
+        } catch (phpmailerException $exc) {
+            $this->setError($exc->getMessage());
+            $this->edebug($exc->getMessage());
+            if ($this->exceptions) {
+                throw $exc;
+            }
+            return false;
+        }
         return true;
-      }
     }
-    return false;
-  }
 
-  /**
-   * Returns true if an attachment (non-inline) is present.
-   * @return bool
-   */
-  public function AttachmentExists() {
-    foreach($this->attachment as $attachment) {
-      if ($attachment[6] == 'attachment') {
+    /**
+     * Return the array of attachments.
+     * @return array
+     */
+    public function getAttachments()
+    {
+        return $this->attachment;
+    }
+
+    /**
+     * Attach all file, string, and binary attachments to the message.
+     * Returns an empty string on failure.
+     * @access protected
+     * @param string $disposition_type
+     * @param string $boundary
+     * @return string
+     */
+    protected function attachAll($disposition_type, $boundary)
+    {
+        // Return text of body
+        $mime = array();
+        $cidUniq = array();
+        $incl = array();
+
+        // Add all attachments
+        foreach ($this->attachment as $attachment) {
+            // Check if it is a valid disposition_filter
+            if ($attachment[6] == $disposition_type) {
+                // Check for string attachment
+                $string = '';
+                $path = '';
+                $bString = $attachment[5];
+                if ($bString) {
+                    $string = $attachment[0];
+                } else {
+                    $path = $attachment[0];
+                }
+
+                $inclhash = md5(serialize($attachment));
+                if (in_array($inclhash, $incl)) {
+                    continue;
+                }
+                $incl[] = $inclhash;
+                $name = $attachment[2];
+                $encoding = $attachment[3];
+                $type = $attachment[4];
+                $disposition = $attachment[6];
+                $cid = $attachment[7];
+                if ($disposition == 'inline' && array_key_exists($cid, $cidUniq)) {
+                    continue;
+                }
+                $cidUniq[$cid] = true;
+
+                $mime[] = sprintf('--%s%s', $boundary, $this->LE);
+                //Only include a filename property if we have one
+                if (!empty($name)) {
+                    $mime[] = sprintf(
+                        'Content-Type: %s; name="%s"%s',
+                        $type,
+                        $this->encodeHeader($this->secureHeader($name)),
+                        $this->LE
+                    );
+                } else {
+                    $mime[] = sprintf(
+                        'Content-Type: %s%s',
+                        $type,
+                        $this->LE
+                    );
+                }
+                // RFC1341 part 5 says 7bit is assumed if not specified
+                if ($encoding != '7bit') {
+                    $mime[] = sprintf('Content-Transfer-Encoding: %s%s', $encoding, $this->LE);
+                }
+
+                if ($disposition == 'inline') {
+                    $mime[] = sprintf('Content-ID: <%s>%s', $cid, $this->LE);
+                }
+
+                // If a filename contains any of these chars, it should be quoted,
+                // but not otherwise: RFC2183 & RFC2045 5.1
+                // Fixes a warning in IETF's msglint MIME checker
+                // Allow for bypassing the Content-Disposition header totally
+                if (!(empty($disposition))) {
+                    $encoded_name = $this->encodeHeader($this->secureHeader($name));
+                    if (preg_match('/[ \(\)<>@,;:\\"\/\[\]\?=]/', $encoded_name)) {
+                        $mime[] = sprintf(
+                            'Content-Disposition: %s; filename="%s"%s',
+                            $disposition,
+                            $encoded_name,
+                            $this->LE . $this->LE
+                        );
+                    } else {
+                        if (!empty($encoded_name)) {
+                            $mime[] = sprintf(
+                                'Content-Disposition: %s; filename=%s%s',
+                                $disposition,
+                                $encoded_name,
+                                $this->LE . $this->LE
+                            );
+                        } else {
+                            $mime[] = sprintf(
+                                'Content-Disposition: %s%s',
+                                $disposition,
+                                $this->LE . $this->LE
+                            );
+                        }
+                    }
+                } else {
+                    $mime[] = $this->LE;
+                }
+
+                // Encode as string attachment
+                if ($bString) {
+                    $mime[] = $this->encodeString($string, $encoding);
+                    if ($this->isError()) {
+                        return '';
+                    }
+                    $mime[] = $this->LE . $this->LE;
+                } else {
+                    $mime[] = $this->encodeFile($path, $encoding);
+                    if ($this->isError()) {
+                        return '';
+                    }
+                    $mime[] = $this->LE . $this->LE;
+                }
+            }
+        }
+
+        $mime[] = sprintf('--%s--%s', $boundary, $this->LE);
+
+        return implode('', $mime);
+    }
+
+    /**
+     * Encode a file attachment in requested format.
+     * Returns an empty string on failure.
+     * @param string $path The full path to the file
+     * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable'
+     * @throws phpmailerException
+     * @access protected
+     * @return string
+     */
+    protected function encodeFile($path, $encoding = 'base64')
+    {
+        try {
+            if (!self::isPermittedPath($path) or !file_exists($path)) {
+                throw new phpmailerException($this->lang('file_open') . $path, self::STOP_CONTINUE);
+            }
+            $magic_quotes = false;
+            if( version_compare(PHP_VERSION, '7.4.0', '<') ) {
+                $magic_quotes = get_magic_quotes_runtime();
+            }
+            if ($magic_quotes) {
+                if (version_compare(PHP_VERSION, '5.3.0', '<')) {
+                    set_magic_quotes_runtime(false);
+                } else {
+                    //Doesn't exist in PHP 5.4, but we don't need to check because
+                    //get_magic_quotes_runtime always returns false in 5.4+
+                    //so it will never get here
+                    ini_set('magic_quotes_runtime', false);
+                }
+            }
+            $file_buffer = file_get_contents($path);
+            $file_buffer = $this->encodeString($file_buffer, $encoding);
+            if ($magic_quotes) {
+                if (version_compare(PHP_VERSION, '5.3.0', '<')) {
+                    set_magic_quotes_runtime($magic_quotes);
+                } else {
+                    ini_set('magic_quotes_runtime', $magic_quotes);
+                }
+            }
+            return $file_buffer;
+        } catch (Exception $exc) {
+            $this->setError($exc->getMessage());
+            return '';
+        }
+    }
+
+    /**
+     * Encode a string in requested format.
+     * Returns an empty string on failure.
+     * @param string $str The text to encode
+     * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable'
+     * @access public
+     * @return string
+     */
+    public function encodeString($str, $encoding = 'base64')
+    {
+        $encoded = '';
+        switch (strtolower($encoding)) {
+            case 'base64':
+                $encoded = chunk_split(base64_encode($str), 76, $this->LE);
+                break;
+            case '7bit':
+            case '8bit':
+                $encoded = $this->fixEOL($str);
+                // Make sure it ends with a line break
+                if (substr($encoded, -(strlen($this->LE))) != $this->LE) {
+                    $encoded .= $this->LE;
+                }
+                break;
+            case 'binary':
+                $encoded = $str;
+                break;
+            case 'quoted-printable':
+                $encoded = $this->encodeQP($str);
+                break;
+            default:
+                $this->setError($this->lang('encoding') . $encoding);
+                break;
+        }
+        return $encoded;
+    }
+
+    /**
+     * Encode a header string optimally.
+     * Picks shortest of Q, B, quoted-printable or none.
+     * @access public
+     * @param string $str
+     * @param string $position
+     * @return string
+     */
+    public function encodeHeader($str, $position = 'text')
+    {
+        $matchcount = 0;
+        switch (strtolower($position)) {
+            case 'phrase':
+                if (!preg_match('/[\200-\377]/', $str)) {
+                    // Can't use addslashes as we don't know the value of magic_quotes_sybase
+                    $encoded = addcslashes($str, "\0..\37\177\\\"");
+                    if (($str == $encoded) && !preg_match('/[^A-Za-z0-9!#$%&\'*+\/=?^_`{|}~ -]/', $str)) {
+                        return ($encoded);
+                    } else {
+                        return ("\"$encoded\"");
+                    }
+                }
+                $matchcount = preg_match_all('/[^\040\041\043-\133\135-\176]/', $str, $matches);
+                break;
+            /** @noinspection PhpMissingBreakStatementInspection */
+            case 'comment':
+                $matchcount = preg_match_all('/[()"]/', $str, $matches);
+                // Intentional fall-through
+            case 'text':
+            default:
+                $matchcount += preg_match_all('/[\000-\010\013\014\016-\037\177-\377]/', $str, $matches);
+                break;
+        }
+
+        //There are no chars that need encoding
+        if ($matchcount == 0) {
+            return ($str);
+        }
+
+        $maxlen = 75 - 7 - strlen($this->CharSet);
+        // Try to select the encoding which should produce the shortest output
+        if ($matchcount > strlen($str) / 3) {
+            // More than a third of the content will need encoding, so B encoding will be most efficient
+            $encoding = 'B';
+            if (function_exists('mb_strlen') && $this->hasMultiBytes($str)) {
+                // Use a custom function which correctly encodes and wraps long
+                // multibyte strings without breaking lines within a character
+                $encoded = $this->base64EncodeWrapMB($str, "\n");
+            } else {
+                $encoded = base64_encode($str);
+                $maxlen -= $maxlen % 4;
+                $encoded = trim(chunk_split($encoded, $maxlen, "\n"));
+            }
+        } else {
+            $encoding = 'Q';
+            $encoded = $this->encodeQ($str, $position);
+            $encoded = $this->wrapText($encoded, $maxlen, true);
+            $encoded = str_replace('=' . self::CRLF, "\n", trim($encoded));
+        }
+
+        $encoded = preg_replace('/^(.*)$/m', ' =?' . $this->CharSet . "?$encoding?\\1?=", $encoded);
+        $encoded = trim(str_replace("\n", $this->LE, $encoded));
+
+        return $encoded;
+    }
+
+    /**
+     * Check if a string contains multi-byte characters.
+     * @access public
+     * @param string $str multi-byte text to wrap encode
+     * @return boolean
+     */
+    public function hasMultiBytes($str)
+    {
+        if (function_exists('mb_strlen')) {
+            return (strlen($str) > mb_strlen($str, $this->CharSet));
+        } else { // Assume no multibytes (we can't handle without mbstring functions anyway)
+            return false;
+        }
+    }
+
+    /**
+     * Does a string contain any 8-bit chars (in any charset)?
+     * @param string $text
+     * @return boolean
+     */
+    public function has8bitChars($text)
+    {
+        return (boolean)preg_match('/[\x80-\xFF]/', $text);
+    }
+
+    /**
+     * Encode and wrap long multibyte strings for mail headers
+     * without breaking lines within a character.
+     * Adapted from a function by paravoid
+     * @link http://www.php.net/manual/en/function.mb-encode-mimeheader.php#60283
+     * @access public
+     * @param string $str multi-byte text to wrap encode
+     * @param string $linebreak string to use as linefeed/end-of-line
+     * @return string
+     */
+    public function base64EncodeWrapMB($str, $linebreak = null)
+    {
+        $start = '=?' . $this->CharSet . '?B?';
+        $end = '?=';
+        $encoded = '';
+        if ($linebreak === null) {
+            $linebreak = $this->LE;
+        }
+
+        $mb_length = mb_strlen($str, $this->CharSet);
+        // Each line must have length <= 75, including $start and $end
+        $length = 75 - strlen($start) - strlen($end);
+        // Average multi-byte ratio
+        $ratio = $mb_length / strlen($str);
+        // Base64 has a 4:3 ratio
+        $avgLength = floor($length * $ratio * .75);
+
+        for ($i = 0; $i < $mb_length; $i += $offset) {
+            $lookBack = 0;
+            do {
+                $offset = $avgLength - $lookBack;
+                $chunk = mb_substr($str, $i, $offset, $this->CharSet);
+                $chunk = base64_encode($chunk);
+                $lookBack++;
+            } while (strlen($chunk) > $length);
+            $encoded .= $chunk . $linebreak;
+        }
+
+        // Chomp the last linefeed
+        $encoded = substr($encoded, 0, -strlen($linebreak));
+        return $encoded;
+    }
+
+    /**
+     * Encode a string in quoted-printable format.
+     * According to RFC2045 section 6.7.
+     * @access public
+     * @param string $string The text to encode
+     * @param integer $line_max Number of chars allowed on a line before wrapping
+     * @return string
+     * @link http://www.php.net/manual/en/function.quoted-printable-decode.php#89417 Adapted from this comment
+     */
+    public function encodeQP($string, $line_max = 76)
+    {
+        // Use native function if it's available (>= PHP5.3)
+        if (function_exists('quoted_printable_encode')) {
+            return quoted_printable_encode($string);
+        }
+        // Fall back to a pure PHP implementation
+        $string = str_replace(
+            array('%20', '%0D%0A.', '%0D%0A', '%'),
+            array(' ', "\r\n=2E", "\r\n", '='),
+            rawurlencode($string)
+        );
+        return preg_replace('/[^\r\n]{' . ($line_max - 3) . '}[^=\r\n]{2}/', "$0=\r\n", $string);
+    }
+
+    /**
+     * Backward compatibility wrapper for an old QP encoding function that was removed.
+     * @see PHPMailer::encodeQP()
+     * @access public
+     * @param string $string
+     * @param integer $line_max
+     * @param boolean $space_conv
+     * @return string
+     * @deprecated Use encodeQP instead.
+     */
+    public function encodeQPphp(
+        $string,
+        $line_max = 76,
+        /** @noinspection PhpUnusedParameterInspection */ $space_conv = false
+    ) {
+        return $this->encodeQP($string, $line_max);
+    }
+
+    /**
+     * Encode a string using Q encoding.
+     * @link http://tools.ietf.org/html/rfc2047
+     * @param string $str the text to encode
+     * @param string $position Where the text is going to be used, see the RFC for what that means
+     * @access public
+     * @return string
+     */
+    public function encodeQ($str, $position = 'text')
+    {
+        // There should not be any EOL in the string
+        $pattern = '';
+        $encoded = str_replace(array("\r", "\n"), '', $str);
+        switch (strtolower($position)) {
+            case 'phrase':
+                // RFC 2047 section 5.3
+                $pattern = '^A-Za-z0-9!*+\/ -';
+                break;
+            /** @noinspection PhpMissingBreakStatementInspection */
+            case 'comment':
+                // RFC 2047 section 5.2
+                $pattern = '\(\)"';
+                // intentional fall-through
+                // for this reason we build the $pattern without including delimiters and []
+            case 'text':
+            default:
+                // RFC 2047 section 5.1
+                // Replace every high ascii, control, =, ? and _ characters
+                $pattern = '\000-\011\013\014\016-\037\075\077\137\177-\377' . $pattern;
+                break;
+        }
+        $matches = array();
+        if (preg_match_all("/[{$pattern}]/", $encoded, $matches)) {
+            // If the string contains an '=', make sure it's the first thing we replace
+            // so as to avoid double-encoding
+            $eqkey = array_search('=', $matches[0]);
+            if (false !== $eqkey) {
+                unset($matches[0][$eqkey]);
+                array_unshift($matches[0], '=');
+            }
+            foreach (array_unique($matches[0]) as $char) {
+                $encoded = str_replace($char, '=' . sprintf('%02X', ord($char)), $encoded);
+            }
+        }
+        // Replace every spaces to _ (more readable than =20)
+        return str_replace(' ', '_', $encoded);
+    }
+
+    /**
+     * Add a string or binary attachment (non-filesystem).
+     * This method can be used to attach ascii or binary data,
+     * such as a BLOB record from a database.
+     * @param string $string String attachment data.
+     * @param string $filename Name of the attachment.
+     * @param string $encoding File encoding (see $Encoding).
+     * @param string $type File extension (MIME) type.
+     * @param string $disposition Disposition to use
+     * @return void
+     */
+    public function addStringAttachment(
+        $string,
+        $filename,
+        $encoding = 'base64',
+        $type = '',
+        $disposition = 'attachment'
+    ) {
+        // If a MIME type is not specified, try to work it out from the file name
+        if ($type == '') {
+            $type = self::filenameToType($filename);
+        }
+        // Append to $attachment array
+        $this->attachment[] = array(
+            0 => $string,
+            1 => $filename,
+            2 => basename($filename),
+            3 => $encoding,
+            4 => $type,
+            5 => true, // isStringAttachment
+            6 => $disposition,
+            7 => 0
+        );
+    }
+
+    /**
+     * Add an embedded (inline) attachment from a file.
+     * This can include images, sounds, and just about any other document type.
+     * These differ from 'regular' attachments in that they are intended to be
+     * displayed inline with the message, not just attached for download.
+     * This is used in HTML messages that embed the images
+     * the HTML refers to using the $cid value.
+     * Never use a user-supplied path to a file!
+     * @param string $path Path to the attachment.
+     * @param string $cid Content ID of the attachment; Use this to reference
+     *        the content when using an embedded image in HTML.
+     * @param string $name Overrides the attachment name.
+     * @param string $encoding File encoding (see $Encoding).
+     * @param string $type File MIME type.
+     * @param string $disposition Disposition to use
+     * @return boolean True on successfully adding an attachment
+     */
+    public function addEmbeddedImage($path, $cid, $name = '', $encoding = 'base64', $type = '', $disposition = 'inline')
+    {
+        if (!self::isPermittedPath($path) or !@is_file($path)) {
+            $this->setError($this->lang('file_access') . $path);
+            return false;
+        }
+
+        // If a MIME type is not specified, try to work it out from the file name
+        if ($type == '') {
+            $type = self::filenameToType($path);
+        }
+
+        $filename = basename($path);
+        if ($name == '') {
+            $name = $filename;
+        }
+
+        // Append to $attachment array
+        $this->attachment[] = array(
+            0 => $path,
+            1 => $filename,
+            2 => $name,
+            3 => $encoding,
+            4 => $type,
+            5 => false, // isStringAttachment
+            6 => $disposition,
+            7 => $cid
+        );
         return true;
-      }
-    }
-    return false;
-  }
-
-  /**
-   * Does this message have an alternative body set?
-   * @return bool
-   */
-  public function AlternativeExists() {
-    return !empty($this->AltBody);
-  }
-
-  /////////////////////////////////////////////////
-  // CLASS METHODS, MESSAGE RESET
-  /////////////////////////////////////////////////
-
-  /**
-   * Clears all recipients assigned in the TO array.  Returns void.
-   * @return void
-   */
-  public function ClearAddresses() {
-    foreach($this->to as $to) {
-      unset($this->all_recipients[strtolower($to[0])]);
-    }
-    $this->to = array();
-  }
-
-  /**
-   * Clears all recipients assigned in the CC array.  Returns void.
-   * @return void
-   */
-  public function ClearCCs() {
-    foreach($this->cc as $cc) {
-      unset($this->all_recipients[strtolower($cc[0])]);
-    }
-    $this->cc = array();
-  }
-
-  /**
-   * Clears all recipients assigned in the BCC array.  Returns void.
-   * @return void
-   */
-  public function ClearBCCs() {
-    foreach($this->bcc as $bcc) {
-      unset($this->all_recipients[strtolower($bcc[0])]);
-    }
-    $this->bcc = array();
-  }
-
-  /**
-   * Clears all recipients assigned in the ReplyTo array.  Returns void.
-   * @return void
-   */
-  public function ClearReplyTos() {
-    $this->ReplyTo = array();
-  }
-
-  /**
-   * Clears all recipients assigned in the TO, CC and BCC
-   * array.  Returns void.
-   * @return void
-   */
-  public function ClearAllRecipients() {
-    $this->to = array();
-    $this->cc = array();
-    $this->bcc = array();
-    $this->all_recipients = array();
-  }
-
-  /**
-   * Clears all previously set filesystem, string, and binary
-   * attachments.  Returns void.
-   * @return void
-   */
-  public function ClearAttachments() {
-    $this->attachment = array();
-  }
-
-  /**
-   * Clears all custom headers.  Returns void.
-   * @return void
-   */
-  public function ClearCustomHeaders() {
-    $this->CustomHeader = array();
-  }
-
-  /////////////////////////////////////////////////
-  // CLASS METHODS, MISCELLANEOUS
-  /////////////////////////////////////////////////
-
-  /**
-   * Adds the error message to the error container.
-   * @access protected
-   * @param string $msg
-   * @return void
-   */
-  protected function SetError($msg) {
-    $this->error_count++;
-    if ($this->Mailer == 'smtp' and !is_null($this->smtp)) {
-      $lasterror = $this->smtp->getError();
-      if (!empty($lasterror) and array_key_exists('smtp_msg', $lasterror)) {
-        $msg .= '<p>' . $this->Lang('smtp_error') . $lasterror['smtp_msg'] . "</p>\n";
-      }
-    }
-    $this->ErrorInfo = $msg;
-  }
-
-  /**
-   * Returns the proper RFC 822 formatted date.
-   * @access public
-   * @return string
-   * @static
-   */
-  public static function RFCDate() {
-    $tz = date('Z');
-    $tzs = ($tz < 0) ? '-' : '+';
-    $tz = abs($tz);
-    $tz = (int)($tz/3600)*100 + ($tz%3600)/60;
-    $result = sprintf("%s %s%04d", date('D, j M Y H:i:s'), $tzs, $tz);
-
-    return $result;
-  }
-
-  /**
-   * Returns the server hostname or 'localhost.localdomain' if unknown.
-   * @access protected
-   * @return string
-   */
-  protected function ServerHostname() {
-    if (!empty($this->Hostname)) {
-      $result = $this->Hostname;
-    } elseif (isset($_SERVER['SERVER_NAME'])) {
-      $result = $_SERVER['SERVER_NAME'];
-    } else {
-      $result = 'localhost.localdomain';
     }
 
-    return $result;
-  }
-
-  /**
-   * Returns a message in the appropriate language.
-   * @access protected
-   * @param string $key
-   * @return string
-   */
-  protected function Lang($key) {
-    if(count($this->language) < 1) {
-      $this->SetLanguage('en'); // set the default language
-    }
-
-    if(isset($this->language[$key])) {
-      return $this->language[$key];
-    } else {
-      return 'Language string failed to load: ' . $key;
-    }
-  }
-
-  /**
-   * Returns true if an error occurred.
-   * @access public
-   * @return bool
-   */
-  public function IsError() {
-    return ($this->error_count > 0);
-  }
-
-  /**
-   * Changes every end of line from CRLF, CR or LF to $this->LE.
-   * @access public
-   * @param string $str String to FixEOL
-   * @return string
-   */
-  public function FixEOL($str) {
-	// condense down to \n
-	$nstr = str_replace(array("\r\n", "\r"), "\n", $str);
-	// Now convert LE as needed
-	if ($this->LE !== "\n") {
-		$nstr = str_replace("\n", $this->LE, $nstr);
-	}
-    return  $nstr;
-  }
-
-  /**
-   * Adds a custom header. $name value can be overloaded to contain
-   * both header name and value (name:value)
-   * @access public
-   * @param string $name custom header name
-   * @param string $value header value
-   * @return void
-   */
-  public function AddCustomHeader($name, $value=null) {
-	if ($value === null) {
-		// Value passed in as name:value
-		$this->CustomHeader[] = explode(':', $name, 2);
-	} else {
-		$this->CustomHeader[] = array($name, $value);
-	}
-  }
-
-  /**
-   * Evaluates the message and returns modifications for inline images and backgrounds
-   * @access public
-   * @param string $message Text to be HTML modified
-   * @param string $basedir baseline directory for path
-   * @return string $message
-   */
-  public function MsgHTML($message, $basedir = '') {
-    preg_match_all("/(src|background)=[\"'](.*)[\"']/Ui", $message, $images);
-    if(isset($images[2])) {
-      foreach($images[2] as $i => $url) {
-        // do not change urls for absolute images (thanks to corvuscorax)
-        if (!preg_match('#^[A-z]+://#', $url)) {
-          $filename = basename($url);
-          $directory = dirname($url);
-          if ($directory == '.') {
-            $directory = '';
-          }
-          $cid = 'cid:' . md5($filename);
-          $ext = pathinfo($filename, PATHINFO_EXTENSION);
-          $mimeType  = self::_mime_types($ext);
-          if ( strlen($basedir) > 1 && substr($basedir, -1) != '/') { $basedir .= '/'; }
-          if ( strlen($directory) > 1 && substr($directory, -1) != '/') { $directory .= '/'; }
-          if ( $this->AddEmbeddedImage($basedir.$directory.$filename, md5($filename), $filename, 'base64', $mimeType) ) {
-            $message = preg_replace("/".$images[1][$i]."=[\"']".preg_quote($url, '/')."[\"']/Ui", $images[1][$i]."=\"".$cid."\"", $message);
-          }
+    /**
+     * Add an embedded stringified attachment.
+     * This can include images, sounds, and just about any other document type.
+     * Be sure to set the $type to an image type for images:
+     * JPEG images use 'image/jpeg', GIF uses 'image/gif', PNG uses 'image/png'.
+     * @param string $string The attachment binary data.
+     * @param string $cid Content ID of the attachment; Use this to reference
+     *        the content when using an embedded image in HTML.
+     * @param string $name
+     * @param string $encoding File encoding (see $Encoding).
+     * @param string $type MIME type.
+     * @param string $disposition Disposition to use
+     * @return boolean True on successfully adding an attachment
+     */
+    public function addStringEmbeddedImage(
+        $string,
+        $cid,
+        $name = '',
+        $encoding = 'base64',
+        $type = '',
+        $disposition = 'inline'
+    ) {
+        // If a MIME type is not specified, try to work it out from the name
+        if ($type == '' and !empty($name)) {
+            $type = self::filenameToType($name);
         }
-      }
+
+        // Append to $attachment array
+        $this->attachment[] = array(
+            0 => $string,
+            1 => $name,
+            2 => $name,
+            3 => $encoding,
+            4 => $type,
+            5 => true, // isStringAttachment
+            6 => $disposition,
+            7 => $cid
+        );
+        return true;
     }
-    $this->IsHTML(true);
-    $this->Body = $message;
-    if (empty($this->AltBody)) {
-        $textMsg = trim(strip_tags(preg_replace('/<(head|title|style|script)[^>]*>.*?<\/\\1>/s', '', $message)));
-        if (!empty($textMsg)) {
-            $this->AltBody = html_entity_decode($textMsg, ENT_QUOTES, $this->CharSet);
+
+    /**
+     * Check if an inline attachment is present.
+     * @access public
+     * @return boolean
+     */
+    public function inlineImageExists()
+    {
+        foreach ($this->attachment as $attachment) {
+            if ($attachment[6] == 'inline') {
+                return true;
+            }
         }
-    }
-    if (empty($this->AltBody)) {
-      $this->AltBody = 'To view this email message, open it in a program that understands HTML!' . "\n\n";
-    }
-    return $message;
-  }
-
-  /**
-   * Gets the MIME type of the embedded or inline image
-   * @param string $ext File extension
-   * @access public
-   * @return string MIME type of ext
-   * @static
-   */
-  public static function _mime_types($ext = '') {
-    $mimes = array(
-      'xl'    =>  'application/excel',
-      'hqx'   =>  'application/mac-binhex40',
-      'cpt'   =>  'application/mac-compactpro',
-      'bin'   =>  'application/macbinary',
-      'doc'   =>  'application/msword',
-      'word'  =>  'application/msword',
-      'class' =>  'application/octet-stream',
-      'dll'   =>  'application/octet-stream',
-      'dms'   =>  'application/octet-stream',
-      'exe'   =>  'application/octet-stream',
-      'lha'   =>  'application/octet-stream',
-      'lzh'   =>  'application/octet-stream',
-      'psd'   =>  'application/octet-stream',
-      'sea'   =>  'application/octet-stream',
-      'so'    =>  'application/octet-stream',
-      'oda'   =>  'application/oda',
-      'pdf'   =>  'application/pdf',
-      'ai'    =>  'application/postscript',
-      'eps'   =>  'application/postscript',
-      'ps'    =>  'application/postscript',
-      'smi'   =>  'application/smil',
-      'smil'  =>  'application/smil',
-      'mif'   =>  'application/vnd.mif',
-      'xls'   =>  'application/vnd.ms-excel',
-      'ppt'   =>  'application/vnd.ms-powerpoint',
-      'wbxml' =>  'application/vnd.wap.wbxml',
-      'wmlc'  =>  'application/vnd.wap.wmlc',
-      'dcr'   =>  'application/x-director',
-      'dir'   =>  'application/x-director',
-      'dxr'   =>  'application/x-director',
-      'dvi'   =>  'application/x-dvi',
-      'gtar'  =>  'application/x-gtar',
-      'php3'  =>  'application/x-httpd-php',
-      'php4'  =>  'application/x-httpd-php',
-      'php'   =>  'application/x-httpd-php',
-      'phtml' =>  'application/x-httpd-php',
-      'phps'  =>  'application/x-httpd-php-source',
-      'js'    =>  'application/x-javascript',
-      'swf'   =>  'application/x-shockwave-flash',
-      'sit'   =>  'application/x-stuffit',
-      'tar'   =>  'application/x-tar',
-      'tgz'   =>  'application/x-tar',
-      'xht'   =>  'application/xhtml+xml',
-      'xhtml' =>  'application/xhtml+xml',
-      'zip'   =>  'application/zip',
-      'mid'   =>  'audio/midi',
-      'midi'  =>  'audio/midi',
-      'mp2'   =>  'audio/mpeg',
-      'mp3'   =>  'audio/mpeg',
-      'mpga'  =>  'audio/mpeg',
-      'aif'   =>  'audio/x-aiff',
-      'aifc'  =>  'audio/x-aiff',
-      'aiff'  =>  'audio/x-aiff',
-      'ram'   =>  'audio/x-pn-realaudio',
-      'rm'    =>  'audio/x-pn-realaudio',
-      'rpm'   =>  'audio/x-pn-realaudio-plugin',
-      'ra'    =>  'audio/x-realaudio',
-      'wav'   =>  'audio/x-wav',
-      'bmp'   =>  'image/bmp',
-      'gif'   =>  'image/gif',
-      'jpeg'  =>  'image/jpeg',
-      'jpe'   =>  'image/jpeg',
-      'jpg'   =>  'image/jpeg',
-      'png'   =>  'image/png',
-      'tiff'  =>  'image/tiff',
-      'tif'   =>  'image/tiff',
-      'eml'   =>  'message/rfc822',
-      'css'   =>  'text/css',
-      'html'  =>  'text/html',
-      'htm'   =>  'text/html',
-      'shtml' =>  'text/html',
-      'log'   =>  'text/plain',
-      'text'  =>  'text/plain',
-      'txt'   =>  'text/plain',
-      'rtx'   =>  'text/richtext',
-      'rtf'   =>  'text/rtf',
-      'xml'   =>  'text/xml',
-      'xsl'   =>  'text/xml',
-      'mpeg'  =>  'video/mpeg',
-      'mpe'   =>  'video/mpeg',
-      'mpg'   =>  'video/mpeg',
-      'mov'   =>  'video/quicktime',
-      'qt'    =>  'video/quicktime',
-      'rv'    =>  'video/vnd.rn-realvideo',
-      'avi'   =>  'video/x-msvideo',
-      'movie' =>  'video/x-sgi-movie'
-    );
-    return (!isset($mimes[strtolower($ext)])) ? 'application/octet-stream' : $mimes[strtolower($ext)];
-  }
-
-  /**
-  * Set (or reset) Class Objects (variables)
-  *
-  * Usage Example:
-  * $page->set('X-Priority', '3');
-  *
-  * @access public
-  * @param string $name Parameter Name
-  * @param mixed $value Parameter Value
-  * NOTE: will not work with arrays, there are no arrays to set/reset
-   * @throws phpmailerException
-   * @return bool
-  * @todo Should this not be using __set() magic function?
-  */
-  public function set($name, $value = '') {
-    try {
-      if (isset($this->$name) ) {
-        $this->$name = $value;
-      } else {
-        throw new phpmailerException($this->Lang('variable_set') . $name, self::STOP_CRITICAL);
-      }
-    } catch (Exception $e) {
-      $this->SetError($e->getMessage());
-      if ($e->getCode() == self::STOP_CRITICAL) {
         return false;
-      }
     }
-    return true;
-  }
 
-  /**
-   * Strips newlines to prevent header injection.
-   * @access public
-   * @param string $str String
-   * @return string
-   */
-  public function SecureHeader($str) {
-    return trim(str_replace(array("\r", "\n"), '', $str));
-  }
-
-  /**
-   * Set the private key file and password to sign the message.
-   *
-   * @access public
-   * @param $cert_filename
-   * @param string $key_filename Parameter File Name
-   * @param string $key_pass Password for private key
-   */
-  public function Sign($cert_filename, $key_filename, $key_pass) {
-    $this->sign_cert_file = $cert_filename;
-    $this->sign_key_file = $key_filename;
-    $this->sign_key_pass = $key_pass;
-  }
-
-  /**
-   * Set the private key file and password to sign the message.
-   *
-   * @access public
-   * @param string $txt
-   * @return string
-   */
-  public function DKIM_QP($txt) {
-    $line = '';
-    for ($i = 0; $i < strlen($txt); $i++) {
-      $ord = ord($txt[$i]);
-      if ( ((0x21 <= $ord) && ($ord <= 0x3A)) || $ord == 0x3C || ((0x3E <= $ord) && ($ord <= 0x7E)) ) {
-        $line .= $txt[$i];
-      } else {
-        $line .= "=".sprintf("%02X", $ord);
-      }
+    /**
+     * Check if an attachment (non-inline) is present.
+     * @return boolean
+     */
+    public function attachmentExists()
+    {
+        foreach ($this->attachment as $attachment) {
+            if ($attachment[6] == 'attachment') {
+                return true;
+            }
+        }
+        return false;
     }
-    return $line;
-  }
 
-  /**
-   * Generate DKIM signature
-   *
-   * @access public
-   * @param string $s Header
-   * @return string
-   */
-  public function DKIM_Sign($s) {
-    $privKeyStr = file_get_contents($this->DKIM_private);
-    if ($this->DKIM_passphrase != '') {
-      $privKey = openssl_pkey_get_private($privKeyStr, $this->DKIM_passphrase);
-    } else {
-      $privKey = $privKeyStr;
+    /**
+     * Check if this message has an alternative body set.
+     * @return boolean
+     */
+    public function alternativeExists()
+    {
+        return !empty($this->AltBody);
     }
-    if (openssl_sign($s, $signature, $privKey)) {
-      return base64_encode($signature);
-    }
-    return '';
-  }
 
-  /**
-   * Generate DKIM Canonicalization Header
-   *
-   * @access public
-   * @param string $s Header
-   * @return string
-   */
-  public function DKIM_HeaderC($s) {
-    $s = preg_replace("/\r\n\s+/", " ", $s);
-    $lines = explode("\r\n", $s);
-    foreach ($lines as $key => $line) {
-      list($heading, $value) = explode(":", $line, 2);
-      $heading = strtolower($heading);
-      $value = preg_replace("/\s+/", " ", $value) ; // Compress useless spaces
-      $lines[$key] = $heading.":".trim($value) ; // Don't forget to remove WSP around the value
+    /**
+     * Clear queued addresses of given kind.
+     * @access protected
+     * @param string $kind 'to', 'cc', or 'bcc'
+     * @return void
+     */
+    public function clearQueuedAddresses($kind)
+    {
+        $RecipientsQueue = $this->RecipientsQueue;
+        foreach ($RecipientsQueue as $address => $params) {
+            if ($params[0] == $kind) {
+                unset($this->RecipientsQueue[$address]);
+            }
+        }
     }
-    $s = implode("\r\n", $lines);
-    return $s;
-  }
 
-  /**
-   * Generate DKIM Canonicalization Body
-   *
-   * @access public
-   * @param string $body Message Body
-   * @return string
-   */
-  public function DKIM_BodyC($body) {
-    if ($body == '') return "\r\n";
-    // stabilize line endings
-    $body = str_replace("\r\n", "\n", $body);
-    $body = str_replace("\n", "\r\n", $body);
-    // END stabilize line endings
-    while (substr($body, strlen($body) - 4, 4) == "\r\n\r\n") {
-      $body = substr($body, 0, strlen($body) - 2);
+    /**
+     * Clear all To recipients.
+     * @return void
+     */
+    public function clearAddresses()
+    {
+        foreach ($this->to as $to) {
+            unset($this->all_recipients[strtolower($to[0])]);
+        }
+        $this->to = array();
+        $this->clearQueuedAddresses('to');
     }
-    return $body;
-  }
 
-  /**
-   * Create the DKIM header, body, as new header
-   *
-   * @access public
-   * @param string $headers_line Header lines
-   * @param string $subject Subject
-   * @param string $body Body
-   * @return string
-   */
-  public function DKIM_Add($headers_line, $subject, $body) {
-    $DKIMsignatureType    = 'rsa-sha1'; // Signature & hash algorithms
-    $DKIMcanonicalization = 'relaxed/simple'; // Canonicalization of header/body
-    $DKIMquery            = 'dns/txt'; // Query method
-    $DKIMtime             = time() ; // Signature Timestamp = seconds since 00:00:00 - Jan 1, 1970 (UTC time zone)
-    $subject_header       = "Subject: $subject";
-    $headers              = explode($this->LE, $headers_line);
-	$from_header          = "";
-	$to_header            = "";
-    foreach($headers as $header) {
-      if (strpos($header, 'From:') === 0) {
-        $from_header = $header;
-      } elseif (strpos($header, 'To:') === 0) {
-        $to_header = $header;
-      }
+    /**
+     * Clear all CC recipients.
+     * @return void
+     */
+    public function clearCCs()
+    {
+        foreach ($this->cc as $cc) {
+            unset($this->all_recipients[strtolower($cc[0])]);
+        }
+        $this->cc = array();
+        $this->clearQueuedAddresses('cc');
     }
-    $from     = str_replace('|', '=7C', $this->DKIM_QP($from_header));
-    $to       = str_replace('|', '=7C', $this->DKIM_QP($to_header));
-    $subject  = str_replace('|', '=7C', $this->DKIM_QP($subject_header)) ; // Copied header fields (dkim-quoted-printable
-    $body     = $this->DKIM_BodyC($body);
-    $DKIMlen  = strlen($body) ; // Length of body
-    $DKIMb64  = base64_encode(pack("H*", sha1($body))) ; // Base64 of packed binary SHA-1 hash of body
-    $ident    = ($this->DKIM_identity == '')? '' : " i=" . $this->DKIM_identity . ";";
-    $dkimhdrs = "DKIM-Signature: v=1; a=" . $DKIMsignatureType . "; q=" . $DKIMquery . "; l=" . $DKIMlen . "; s=" . $this->DKIM_selector . ";\r\n".
-                "\tt=" . $DKIMtime . "; c=" . $DKIMcanonicalization . ";\r\n".
-                "\th=From:To:Subject;\r\n".
-                "\td=" . $this->DKIM_domain . ";" . $ident . "\r\n".
-                "\tz=$from\r\n".
-                "\t|$to\r\n".
-                "\t|$subject;\r\n".
-                "\tbh=" . $DKIMb64 . ";\r\n".
-                "\tb=";
-    $toSign   = $this->DKIM_HeaderC($from_header . "\r\n" . $to_header . "\r\n" . $subject_header . "\r\n" . $dkimhdrs);
-    $signed   = $this->DKIM_Sign($toSign);
-    return "X-PHPMAILER-DKIM: code.google.com/a/apache-extras.org/p/phpmailer/\r\n".$dkimhdrs.$signed."\r\n";
-  }
 
-  /**
-   * Perform callback
-   * @param boolean $isSent
-   * @param string $to
-   * @param string $cc
-   * @param string $bcc
-   * @param string $subject
-   * @param string $body
-   * @param string $from
-   */
-  protected function doCallback($isSent, $to, $cc, $bcc, $subject, $body, $from=null) {
-    if (!empty($this->action_function) && is_callable($this->action_function)) {
-      $params = array($isSent, $to, $cc, $bcc, $subject, $body, $from);
-      call_user_func_array($this->action_function, $params);
+    /**
+     * Clear all BCC recipients.
+     * @return void
+     */
+    public function clearBCCs()
+    {
+        foreach ($this->bcc as $bcc) {
+            unset($this->all_recipients[strtolower($bcc[0])]);
+        }
+        $this->bcc = array();
+        $this->clearQueuedAddresses('bcc');
+    }
+
+    /**
+     * Clear all ReplyTo recipients.
+     * @return void
+     */
+    public function clearReplyTos()
+    {
+        $this->ReplyTo = array();
+        $this->ReplyToQueue = array();
+    }
+
+    /**
+     * Clear all recipient types.
+     * @return void
+     */
+    public function clearAllRecipients()
+    {
+        $this->to = array();
+        $this->cc = array();
+        $this->bcc = array();
+        $this->all_recipients = array();
+        $this->RecipientsQueue = array();
+    }
+
+    /**
+     * Clear all filesystem, string, and binary attachments.
+     * @return void
+     */
+    public function clearAttachments()
+    {
+        $this->attachment = array();
+    }
+
+    /**
+     * Clear all custom headers.
+     * @return void
+     */
+    public function clearCustomHeaders()
+    {
+        $this->CustomHeader = array();
+    }
+
+    /**
+     * Add an error message to the error container.
+     * @access protected
+     * @param string $msg
+     * @return void
+     */
+    protected function setError($msg)
+    {
+        $this->error_count++;
+        if ($this->Mailer == 'smtp' and !is_null($this->smtp)) {
+            $lasterror = $this->smtp->getError();
+            if (!empty($lasterror['error'])) {
+                $msg .= $this->lang('smtp_error') . $lasterror['error'];
+                if (!empty($lasterror['detail'])) {
+                    $msg .= ' Detail: '. $lasterror['detail'];
+                }
+                if (!empty($lasterror['smtp_code'])) {
+                    $msg .= ' SMTP code: ' . $lasterror['smtp_code'];
+                }
+                if (!empty($lasterror['smtp_code_ex'])) {
+                    $msg .= ' Additional SMTP info: ' . $lasterror['smtp_code_ex'];
+                }
+            }
+        }
+        $this->ErrorInfo = $msg;
+    }
+
+    /**
+     * Return an RFC 822 formatted date.
+     * @access public
+     * @return string
+     * @static
+     */
+    public static function rfcDate()
+    {
+        // Set the time zone to whatever the default is to avoid 500 errors
+        // Will default to UTC if it's not set properly in php.ini
+        date_default_timezone_set(@date_default_timezone_get());
+        return date('D, j M Y H:i:s O');
+    }
+
+    /**
+     * Get the server hostname.
+     * Returns 'localhost.localdomain' if unknown.
+     * @access protected
+     * @return string
+     */
+    protected function serverHostname()
+    {
+        $result = 'localhost.localdomain';
+        if (!empty($this->Hostname)) {
+            $result = $this->Hostname;
+        } elseif (isset($_SERVER) and array_key_exists('SERVER_NAME', $_SERVER) and !empty($_SERVER['SERVER_NAME'])) {
+            $result = $_SERVER['SERVER_NAME'];
+        } elseif (function_exists('gethostname') && gethostname() !== false) {
+            $result = gethostname();
+        } elseif (php_uname('n') !== false) {
+            $result = php_uname('n');
+        }
+        return $result;
+    }
+
+    /**
+     * Get an error message in the current language.
+     * @access protected
+     * @param string $key
+     * @return string
+     */
+    protected function lang($key)
+    {
+        if (count($this->language) < 1) {
+            $this->setLanguage('en'); // set the default language
+        }
+
+        if (array_key_exists($key, $this->language)) {
+            if ($key == 'smtp_connect_failed') {
+                //Include a link to troubleshooting docs on SMTP connection failure
+                //this is by far the biggest cause of support questions
+                //but it's usually not PHPMailer's fault.
+                return $this->language[$key] . ' https://github.com/PHPMailer/PHPMailer/wiki/Troubleshooting';
+            }
+            return $this->language[$key];
+        } else {
+            //Return the key as a fallback
+            return $key;
+        }
+    }
+
+    /**
+     * Check if an error occurred.
+     * @access public
+     * @return boolean True if an error did occur.
+     */
+    public function isError()
+    {
+        return ($this->error_count > 0);
+    }
+
+    /**
+     * Ensure consistent line endings in a string.
+     * Changes every end of line from CRLF, CR or LF to $this->LE.
+     * @access public
+     * @param string $str String to fixEOL
+     * @return string
+     */
+    public function fixEOL($str)
+    {
+        // Normalise to \n
+        $nstr = str_replace(array("\r\n", "\r"), "\n", $str);
+        // Now convert LE as needed
+        if ($this->LE !== "\n") {
+            $nstr = str_replace("\n", $this->LE, $nstr);
+        }
+        return $nstr;
+    }
+
+    /**
+     * Add a custom header.
+     * $name value can be overloaded to contain
+     * both header name and value (name:value)
+     * @access public
+     * @param string $name Custom header name
+     * @param string $value Header value
+     * @return void
+     */
+    public function addCustomHeader($name, $value = null)
+    {
+        if ($value === null) {
+            // Value passed in as name:value
+            $this->CustomHeader[] = explode(':', $name, 2);
+        } else {
+            $this->CustomHeader[] = array($name, $value);
+        }
+    }
+
+    /**
+     * Returns all custom headers.
+     * @return array
+     */
+    public function getCustomHeaders()
+    {
+        return $this->CustomHeader;
+    }
+
+    /**
+     * Create a message body from an HTML string.
+     * Automatically inlines images and creates a plain-text version by converting the HTML,
+     * overwriting any existing values in Body and AltBody.
+     * Do not source $message content from user input!
+     * $basedir is prepended when handling relative URLs, e.g. <img src="/images/a.png"> and must not be empty
+     * will look for an image file in $basedir/images/a.png and convert it to inline.
+     * If you don't provide a $basedir, relative paths will be left untouched (and thus probably break in email)
+     * If you don't want to apply these transformations to your HTML, just set Body and AltBody directly.
+     * @access public
+     * @param string $message HTML message string
+     * @param string $basedir Absolute path to a base directory to prepend to relative paths to images
+     * @param boolean|callable $advanced Whether to use the internal HTML to text converter
+     *    or your own custom converter @see PHPMailer::html2text()
+     * @return string $message The transformed message Body
+     */
+    public function msgHTML($message, $basedir = '', $advanced = false)
+    {
+        preg_match_all('/(src|background)=["\'](.*)["\']/Ui', $message, $images);
+        if (array_key_exists(2, $images)) {
+            if (strlen($basedir) > 1 && substr($basedir, -1) != '/') {
+                // Ensure $basedir has a trailing /
+                $basedir .= '/';
+            }
+            foreach ($images[2] as $imgindex => $url) {
+                // Convert data URIs into embedded images
+                if (preg_match('#^data:(image[^;,]*)(;base64)?,#', $url, $match)) {
+                    $data = substr($url, strpos($url, ','));
+                    if ($match[2]) {
+                        $data = base64_decode($data);
+                    } else {
+                        $data = rawurldecode($data);
+                    }
+                    $cid = md5($url) . '@phpmailer.0'; // RFC2392 S 2
+                    if ($this->addStringEmbeddedImage($data, $cid, 'embed' . $imgindex, 'base64', $match[1])) {
+                        $message = str_replace(
+                            $images[0][$imgindex],
+                            $images[1][$imgindex] . '="cid:' . $cid . '"',
+                            $message
+                        );
+                    }
+                    continue;
+                }
+                if (
+                    // Only process relative URLs if a basedir is provided (i.e. no absolute local paths)
+                    !empty($basedir)
+                    // Ignore URLs containing parent dir traversal (..)
+                    && (strpos($url, '..') === false)
+                    // Do not change urls that are already inline images
+                    && substr($url, 0, 4) !== 'cid:'
+                    // Do not change absolute URLs, including anonymous protocol
+                    && !preg_match('#^[a-z][a-z0-9+.-]*:?//#i', $url)
+                ) {
+                    $filename = basename($url);
+                    $directory = dirname($url);
+                    if ($directory == '.') {
+                        $directory = '';
+                    }
+                    $cid = md5($url) . '@phpmailer.0'; // RFC2392 S 2
+                    if (strlen($directory) > 1 && substr($directory, -1) != '/') {
+                        $directory .= '/';
+                    }
+                    if ($this->addEmbeddedImage(
+                        $basedir . $directory . $filename,
+                        $cid,
+                        $filename,
+                        'base64',
+                        self::_mime_types((string)self::mb_pathinfo($filename, PATHINFO_EXTENSION))
+                    )
+                    ) {
+                        $message = preg_replace(
+                            '/' . $images[1][$imgindex] . '=["\']' . preg_quote($url, '/') . '["\']/Ui',
+                            $images[1][$imgindex] . '="cid:' . $cid . '"',
+                            $message
+                        );
+                    }
+                }
+            }
+        }
+        $this->isHTML(true);
+        // Convert all message body line breaks to CRLF, makes quoted-printable encoding work much better
+        $this->Body = $this->normalizeBreaks($message);
+        $this->AltBody = $this->normalizeBreaks($this->html2text($message, $advanced));
+        if (!$this->alternativeExists()) {
+            $this->AltBody = 'To view this email message, open it in a program that understands HTML!' .
+                self::CRLF . self::CRLF;
+        }
+        return $this->Body;
+    }
+
+    /**
+     * Convert an HTML string into plain text.
+     * This is used by msgHTML().
+     * Note - older versions of this function used a bundled advanced converter
+     * which was been removed for license reasons in #232.
+     * Example usage:
+     * <code>
+     * // Use default conversion
+     * $plain = $mail->html2text($html);
+     * // Use your own custom converter
+     * $plain = $mail->html2text($html, function($html) {
+     *     $converter = new MyHtml2text($html);
+     *     return $converter->get_text();
+     * });
+     * </code>
+     * @param string $html The HTML text to convert
+     * @param boolean|callable $advanced Any boolean value to use the internal converter,
+     *   or provide your own callable for custom conversion.
+     * @return string
+     */
+    public function html2text($html, $advanced = false)
+    {
+        if (is_callable($advanced)) {
+            return call_user_func($advanced, $html);
+        }
+        return html_entity_decode(
+            trim(strip_tags(preg_replace('/<(head|title|style|script)[^>]*>.*?<\/\\1>/si', '', $html))),
+            ENT_QUOTES,
+            $this->CharSet
+        );
+    }
+
+    /**
+     * Get the MIME type for a file extension.
+     * @param string $ext File extension
+     * @access public
+     * @return string MIME type of file.
+     * @static
+     */
+    public static function _mime_types($ext = '')
+    {
+        $mimes = array(
+            'xl'    => 'application/excel',
+            'js'    => 'application/javascript',
+            'hqx'   => 'application/mac-binhex40',
+            'cpt'   => 'application/mac-compactpro',
+            'bin'   => 'application/macbinary',
+            'doc'   => 'application/msword',
+            'word'  => 'application/msword',
+            'xlsx'  => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+            'xltx'  => 'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
+            'potx'  => 'application/vnd.openxmlformats-officedocument.presentationml.template',
+            'ppsx'  => 'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
+            'pptx'  => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+            'sldx'  => 'application/vnd.openxmlformats-officedocument.presentationml.slide',
+            'docx'  => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+            'dotx'  => 'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
+            'xlam'  => 'application/vnd.ms-excel.addin.macroEnabled.12',
+            'xlsb'  => 'application/vnd.ms-excel.sheet.binary.macroEnabled.12',
+            'class' => 'application/octet-stream',
+            'dll'   => 'application/octet-stream',
+            'dms'   => 'application/octet-stream',
+            'exe'   => 'application/octet-stream',
+            'lha'   => 'application/octet-stream',
+            'lzh'   => 'application/octet-stream',
+            'psd'   => 'application/octet-stream',
+            'sea'   => 'application/octet-stream',
+            'so'    => 'application/octet-stream',
+            'oda'   => 'application/oda',
+            'pdf'   => 'application/pdf',
+            'ai'    => 'application/postscript',
+            'eps'   => 'application/postscript',
+            'ps'    => 'application/postscript',
+            'smi'   => 'application/smil',
+            'smil'  => 'application/smil',
+            'mif'   => 'application/vnd.mif',
+            'xls'   => 'application/vnd.ms-excel',
+            'ppt'   => 'application/vnd.ms-powerpoint',
+            'wbxml' => 'application/vnd.wap.wbxml',
+            'wmlc'  => 'application/vnd.wap.wmlc',
+            'dcr'   => 'application/x-director',
+            'dir'   => 'application/x-director',
+            'dxr'   => 'application/x-director',
+            'dvi'   => 'application/x-dvi',
+            'gtar'  => 'application/x-gtar',
+            'php3'  => 'application/x-httpd-php',
+            'php4'  => 'application/x-httpd-php',
+            'php'   => 'application/x-httpd-php',
+            'phtml' => 'application/x-httpd-php',
+            'phps'  => 'application/x-httpd-php-source',
+            'swf'   => 'application/x-shockwave-flash',
+            'sit'   => 'application/x-stuffit',
+            'tar'   => 'application/x-tar',
+            'tgz'   => 'application/x-tar',
+            'xht'   => 'application/xhtml+xml',
+            'xhtml' => 'application/xhtml+xml',
+            'zip'   => 'application/zip',
+            'mid'   => 'audio/midi',
+            'midi'  => 'audio/midi',
+            'mp2'   => 'audio/mpeg',
+            'mp3'   => 'audio/mpeg',
+            'mpga'  => 'audio/mpeg',
+            'aif'   => 'audio/x-aiff',
+            'aifc'  => 'audio/x-aiff',
+            'aiff'  => 'audio/x-aiff',
+            'ram'   => 'audio/x-pn-realaudio',
+            'rm'    => 'audio/x-pn-realaudio',
+            'rpm'   => 'audio/x-pn-realaudio-plugin',
+            'ra'    => 'audio/x-realaudio',
+            'wav'   => 'audio/x-wav',
+            'bmp'   => 'image/bmp',
+            'gif'   => 'image/gif',
+            'jpeg'  => 'image/jpeg',
+            'jpe'   => 'image/jpeg',
+            'jpg'   => 'image/jpeg',
+            'png'   => 'image/png',
+            'tiff'  => 'image/tiff',
+            'tif'   => 'image/tiff',
+            'eml'   => 'message/rfc822',
+            'css'   => 'text/css',
+            'html'  => 'text/html',
+            'htm'   => 'text/html',
+            'shtml' => 'text/html',
+            'log'   => 'text/plain',
+            'text'  => 'text/plain',
+            'txt'   => 'text/plain',
+            'rtx'   => 'text/richtext',
+            'rtf'   => 'text/rtf',
+            'vcf'   => 'text/vcard',
+            'vcard' => 'text/vcard',
+            'xml'   => 'text/xml',
+            'xsl'   => 'text/xml',
+            'mpeg'  => 'video/mpeg',
+            'mpe'   => 'video/mpeg',
+            'mpg'   => 'video/mpeg',
+            'mov'   => 'video/quicktime',
+            'qt'    => 'video/quicktime',
+            'rv'    => 'video/vnd.rn-realvideo',
+            'avi'   => 'video/x-msvideo',
+            'movie' => 'video/x-sgi-movie'
+        );
+        if (array_key_exists(strtolower($ext), $mimes)) {
+            return $mimes[strtolower($ext)];
+        }
+        return 'application/octet-stream';
+    }
+
+    /**
+     * Map a file name to a MIME type.
+     * Defaults to 'application/octet-stream', i.e.. arbitrary binary data.
+     * @param string $filename A file name or full path, does not need to exist as a file
+     * @return string
+     * @static
+     */
+    public static function filenameToType($filename)
+    {
+        // In case the path is a URL, strip any query string before getting extension
+        $qpos = strpos($filename, '?');
+        if (false !== $qpos) {
+            $filename = substr($filename, 0, $qpos);
+        }
+        $pathinfo = self::mb_pathinfo($filename);
+        return self::_mime_types($pathinfo['extension']);
+    }
+
+    /**
+     * Multi-byte-safe pathinfo replacement.
+     * Drop-in replacement for pathinfo(), but multibyte-safe, cross-platform-safe, old-version-safe.
+     * Works similarly to the one in PHP >= 5.2.0
+     * @link http://www.php.net/manual/en/function.pathinfo.php#107461
+     * @param string $path A filename or path, does not need to exist as a file
+     * @param integer|string $options Either a PATHINFO_* constant,
+     *      or a string name to return only the specified piece, allows 'filename' to work on PHP < 5.2
+     * @return string|array
+     * @static
+     */
+    public static function mb_pathinfo($path, $options = null)
+    {
+        $ret = array('dirname' => '', 'basename' => '', 'extension' => '', 'filename' => '');
+        $pathinfo = array();
+        if (preg_match('%^(.*?)[\\\\/]*(([^/\\\\]*?)(\.([^\.\\\\/]+?)|))[\\\\/\.]*$%im', $path, $pathinfo)) {
+            if (array_key_exists(1, $pathinfo)) {
+                $ret['dirname'] = $pathinfo[1];
+            }
+            if (array_key_exists(2, $pathinfo)) {
+                $ret['basename'] = $pathinfo[2];
+            }
+            if (array_key_exists(5, $pathinfo)) {
+                $ret['extension'] = $pathinfo[5];
+            }
+            if (array_key_exists(3, $pathinfo)) {
+                $ret['filename'] = $pathinfo[3];
+            }
+        }
+        switch ($options) {
+            case PATHINFO_DIRNAME:
+            case 'dirname':
+                return $ret['dirname'];
+            case PATHINFO_BASENAME:
+            case 'basename':
+                return $ret['basename'];
+            case PATHINFO_EXTENSION:
+            case 'extension':
+                return $ret['extension'];
+            case PATHINFO_FILENAME:
+            case 'filename':
+                return $ret['filename'];
+            default:
+                return $ret;
+        }
+    }
+
+    /**
+     * Set or reset instance properties.
+     * You should avoid this function - it's more verbose, less efficient, more error-prone and
+     * harder to debug than setting properties directly.
+     * Usage Example:
+     * `$mail->set('SMTPSecure', 'tls');`
+     *   is the same as:
+     * `$mail->SMTPSecure = 'tls';`
+     * @access public
+     * @param string $name The property name to set
+     * @param mixed $value The value to set the property to
+     * @return boolean
+     * @TODO Should this not be using the __set() magic function?
+     */
+    public function set($name, $value = '')
+    {
+        if (property_exists($this, $name)) {
+            $this->$name = $value;
+            return true;
+        } else {
+            $this->setError($this->lang('variable_set') . $name);
+            return false;
+        }
+    }
+
+    /**
+     * Strip newlines to prevent header injection.
+     * @access public
+     * @param string $str
+     * @return string
+     */
+    public function secureHeader($str)
+    {
+        return trim(str_replace(array("\r", "\n"), '', $str));
+    }
+
+    /**
+     * Normalize line breaks in a string.
+     * Converts UNIX LF, Mac CR and Windows CRLF line breaks into a single line break format.
+     * Defaults to CRLF (for message bodies) and preserves consecutive breaks.
+     * @param string $text
+     * @param string $breaktype What kind of line break to use, defaults to CRLF
+     * @return string
+     * @access public
+     * @static
+     */
+    public static function normalizeBreaks($text, $breaktype = "\r\n")
+    {
+        return preg_replace('/(\r\n|\r|\n)/ms', $breaktype, $text);
+    }
+
+    /**
+     * Set the public and private key files and password for S/MIME signing.
+     * @access public
+     * @param string $cert_filename
+     * @param string $key_filename
+     * @param string $key_pass Password for private key
+     * @param string $extracerts_filename Optional path to chain certificate
+     */
+    public function sign($cert_filename, $key_filename, $key_pass, $extracerts_filename = '')
+    {
+        $this->sign_cert_file = $cert_filename;
+        $this->sign_key_file = $key_filename;
+        $this->sign_key_pass = $key_pass;
+        $this->sign_extracerts_file = $extracerts_filename;
+    }
+
+    /**
+     * Quoted-Printable-encode a DKIM header.
+     * @access public
+     * @param string $txt
+     * @return string
+     */
+    public function DKIM_QP($txt)
+    {
+        $line = '';
+        for ($i = 0; $i < strlen($txt); $i++) {
+            $ord = ord($txt[$i]);
+            if (((0x21 <= $ord) && ($ord <= 0x3A)) || $ord == 0x3C || ((0x3E <= $ord) && ($ord <= 0x7E))) {
+                $line .= $txt[$i];
+            } else {
+                $line .= '=' . sprintf('%02X', $ord);
+            }
+        }
+        return $line;
+    }
+
+    /**
+     * Generate a DKIM signature.
+     * @access public
+     * @param string $signHeader
+     * @throws phpmailerException
+     * @return string The DKIM signature value
+     */
+    public function DKIM_Sign($signHeader)
+    {
+        if (!defined('PKCS7_TEXT')) {
+            if ($this->exceptions) {
+                throw new phpmailerException($this->lang('extension_missing') . 'openssl');
+            }
+            return '';
+        }
+        $privKeyStr = !empty($this->DKIM_private_string) ? $this->DKIM_private_string : file_get_contents($this->DKIM_private);
+        if ('' != $this->DKIM_passphrase) {
+            $privKey = openssl_pkey_get_private($privKeyStr, $this->DKIM_passphrase);
+        } else {
+            $privKey = openssl_pkey_get_private($privKeyStr);
+        }
+        //Workaround for missing digest algorithms in old PHP & OpenSSL versions
+        //@link http://stackoverflow.com/a/11117338/333340
+        if (version_compare(PHP_VERSION, '5.3.0') >= 0 and
+            in_array('sha256WithRSAEncryption', openssl_get_md_methods(true))) {
+            if (openssl_sign($signHeader, $signature, $privKey, 'sha256WithRSAEncryption')) {
+                openssl_pkey_free($privKey);
+                return base64_encode($signature);
+            }
+        } else {
+            $pinfo = openssl_pkey_get_details($privKey);
+            $hash = hash('sha256', $signHeader);
+            //'Magic' constant for SHA256 from RFC3447
+            //@link https://tools.ietf.org/html/rfc3447#page-43
+            $t = '3031300d060960864801650304020105000420' . $hash;
+            $pslen = $pinfo['bits'] / 8 - (strlen($t) / 2 + 3);
+            $eb = pack('H*', '0001' . str_repeat('FF', $pslen) . '00' . $t);
+
+            if (openssl_private_encrypt($eb, $signature, $privKey, OPENSSL_NO_PADDING)) {
+                openssl_pkey_free($privKey);
+                return base64_encode($signature);
+            }
+        }
+        openssl_pkey_free($privKey);
+        return '';
+    }
+
+    /**
+     * Generate a DKIM canonicalization header.
+     * @access public
+     * @param string $signHeader Header
+     * @return string
+     */
+    public function DKIM_HeaderC($signHeader)
+    {
+        $signHeader = preg_replace('/\r\n\s+/', ' ', $signHeader);
+        $lines = explode("\r\n", $signHeader);
+        foreach ($lines as $key => $line) {
+            list($heading, $value) = explode(':', $line, 2);
+            $heading = strtolower($heading);
+            $value = preg_replace('/\s{2,}/', ' ', $value); // Compress useless spaces
+            $lines[$key] = $heading . ':' . trim($value); // Don't forget to remove WSP around the value
+        }
+        $signHeader = implode("\r\n", $lines);
+        return $signHeader;
+    }
+
+    /**
+     * Generate a DKIM canonicalization body.
+     * @access public
+     * @param string $body Message Body
+     * @return string
+     */
+    public function DKIM_BodyC($body)
+    {
+        if ($body == '') {
+            return "\r\n";
+        }
+        // stabilize line endings
+        $body = str_replace("\r\n", "\n", $body);
+        $body = str_replace("\n", "\r\n", $body);
+        // END stabilize line endings
+        while (substr($body, strlen($body) - 4, 4) == "\r\n\r\n") {
+            $body = substr($body, 0, strlen($body) - 2);
+        }
+        return $body;
+    }
+
+    /**
+     * Create the DKIM header and body in a new message header.
+     * @access public
+     * @param string $headers_line Header lines
+     * @param string $subject Subject
+     * @param string $body Body
+     * @return string
+     */
+    public function DKIM_Add($headers_line, $subject, $body)
+    {
+        $DKIMsignatureType = 'rsa-sha256'; // Signature & hash algorithms
+        $DKIMcanonicalization = 'relaxed/simple'; // Canonicalization of header/body
+        $DKIMquery = 'dns/txt'; // Query method
+        $DKIMtime = time(); // Signature Timestamp = seconds since 00:00:00 - Jan 1, 1970 (UTC time zone)
+        $subject_header = "Subject: $subject";
+        $headers = explode($this->LE, $headers_line);
+        $from_header = '';
+        $to_header = '';
+        $date_header = '';
+        $current = '';
+        foreach ($headers as $header) {
+            if (strpos($header, 'From:') === 0) {
+                $from_header = $header;
+                $current = 'from_header';
+            } elseif (strpos($header, 'To:') === 0) {
+                $to_header = $header;
+                $current = 'to_header';
+            } elseif (strpos($header, 'Date:') === 0) {
+                $date_header = $header;
+                $current = 'date_header';
+            } else {
+                if (!empty($$current) && strpos($header, ' =?') === 0) {
+                    $$current .= $header;
+                } else {
+                    $current = '';
+                }
+            }
+        }
+        $from = str_replace('|', '=7C', $this->DKIM_QP($from_header));
+        $to = str_replace('|', '=7C', $this->DKIM_QP($to_header));
+        $date = str_replace('|', '=7C', $this->DKIM_QP($date_header));
+        $subject = str_replace(
+            '|',
+            '=7C',
+            $this->DKIM_QP($subject_header)
+        ); // Copied header fields (dkim-quoted-printable)
+        $body = $this->DKIM_BodyC($body);
+        $DKIMlen = strlen($body); // Length of body
+        $DKIMb64 = base64_encode(pack('H*', hash('sha256', $body))); // Base64 of packed binary SHA-256 hash of body
+        if ('' == $this->DKIM_identity) {
+            $ident = '';
+        } else {
+            $ident = ' i=' . $this->DKIM_identity . ';';
+        }
+        $dkimhdrs = 'DKIM-Signature: v=1; a=' .
+            $DKIMsignatureType . '; q=' .
+            $DKIMquery . '; l=' .
+            $DKIMlen . '; s=' .
+            $this->DKIM_selector .
+            ";\r\n" .
+            "\tt=" . $DKIMtime . '; c=' . $DKIMcanonicalization . ";\r\n" .
+            "\th=From:To:Date:Subject;\r\n" .
+            "\td=" . $this->DKIM_domain . ';' . $ident . "\r\n" .
+            "\tz=$from\r\n" .
+            "\t|$to\r\n" .
+            "\t|$date\r\n" .
+            "\t|$subject;\r\n" .
+            "\tbh=" . $DKIMb64 . ";\r\n" .
+            "\tb=";
+        $toSign = $this->DKIM_HeaderC(
+            $from_header . "\r\n" .
+            $to_header . "\r\n" .
+            $date_header . "\r\n" .
+            $subject_header . "\r\n" .
+            $dkimhdrs
+        );
+        $signed = $this->DKIM_Sign($toSign);
+        return $dkimhdrs . $signed . "\r\n";
+    }
+
+    /**
+     * Detect if a string contains a line longer than the maximum line length allowed.
+     * @param string $str
+     * @return boolean
+     * @static
+     */
+    public static function hasLineLongerThanMax($str)
+    {
+        //+2 to include CRLF line break for a 1000 total
+        return (boolean)preg_match('/^(.{'.(self::MAX_LINE_LENGTH + 2).',})/m', $str);
+    }
+
+    /**
+     * Allows for public read access to 'to' property.
+     * @note: Before the send() call, queued addresses (i.e. with IDN) are not yet included.
+     * @access public
+     * @return array
+     */
+    public function getToAddresses()
+    {
+        return $this->to;
+    }
+
+    /**
+     * Allows for public read access to 'cc' property.
+     * @note: Before the send() call, queued addresses (i.e. with IDN) are not yet included.
+     * @access public
+     * @return array
+     */
+    public function getCcAddresses()
+    {
+        return $this->cc;
+    }
+
+    /**
+     * Allows for public read access to 'bcc' property.
+     * @note: Before the send() call, queued addresses (i.e. with IDN) are not yet included.
+     * @access public
+     * @return array
+     */
+    public function getBccAddresses()
+    {
+        return $this->bcc;
+    }
+
+    /**
+     * Allows for public read access to 'ReplyTo' property.
+     * @note: Before the send() call, queued addresses (i.e. with IDN) are not yet included.
+     * @access public
+     * @return array
+     */
+    public function getReplyToAddresses()
+    {
+        return $this->ReplyTo;
+    }
+
+    /**
+     * Allows for public read access to 'all_recipients' property.
+     * @note: Before the send() call, queued addresses (i.e. with IDN) are not yet included.
+     * @access public
+     * @return array
+     */
+    public function getAllRecipientAddresses()
+    {
+        return $this->all_recipients;
+    }
+
+    /**
+     * Perform a callback.
+     * @param boolean $isSent
+     * @param array $to
+     * @param array $cc
+     * @param array $bcc
+     * @param string $subject
+     * @param string $body
+     * @param string $from
+     */
+    protected function doCallback($isSent, $to, $cc, $bcc, $subject, $body, $from)
+    {
+        if (!empty($this->action_function) && is_callable($this->action_function)) {
+            $params = array($isSent, $to, $cc, $bcc, $subject, $body, $from);
+            call_user_func_array($this->action_function, $params);
+        }
     }
-  }
 }
 
 /**
- * Exception handler for PHPMailer
+ * PHPMailer exception handler
  * @package PHPMailer
  */
-class phpmailerException extends Exception {
-  /**
-   * Prettify error message output
-   * @return string
-   */
-  public function errorMessage() {
-    $errorMsg = '<strong>' . $this->getMessage() . "</strong><br />\n";
-    return $errorMsg;
-  }
+class phpmailerException extends Exception
+{
+    /**
+     * Prettify error message output
+     * @return string
+     */
+    public function errorMessage()
+    {
+        $errorMsg = '<strong>' . htmlspecialchars($this->getMessage()) . "</strong><br />\n";
+        return $errorMsg;
+    }
 }
-?>
diff --git a/resources/phpmailer/class.pop3.php b/resources/phpmailer/class.pop3.php
index f4172a5b55..e07a5697b9 100644
--- a/resources/phpmailer/class.pop3.php
+++ b/resources/phpmailer/class.pop3.php
@@ -1,418 +1,407 @@
 <?php
-/*~ class.pop3.php
-.---------------------------------------------------------------------------.
-|  Software: PHPMailer - PHP email class                                    |
-|   Version: 5.2.2                                                          |
-|      Site: https://code.google.com/a/apache-extras.org/p/phpmailer/       |
-| ------------------------------------------------------------------------- |
-|     Admin: Jim Jagielski (project admininistrator)                        |
-|   Authors: Andy Prevost (codeworxtech) codeworxtech@users.sourceforge.net |
-|          : Marcus Bointon (coolbru) coolbru@users.sourceforge.net         |
-|          : Jim Jagielski (jimjag) jimjag@gmail.com                        |
-|   Founder: Brent R. Matzelle (original founder)                           |
-| Copyright (c) 2010-2012, Jim Jagielski. All Rights Reserved.              |
-| Copyright (c) 2004-2009, Andy Prevost. All Rights Reserved.               |
-| Copyright (c) 2001-2003, Brent R. Matzelle                                |
-| ------------------------------------------------------------------------- |
-|   License: Distributed under the Lesser General Public License (LGPL)     |
-|            http://www.gnu.org/copyleft/lesser.html                        |
-| This program is distributed in the hope that it will be useful - WITHOUT  |
-| ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or     |
-| FITNESS FOR A PARTICULAR PURPOSE.                                         |
-'---------------------------------------------------------------------------'
-*/
-
 /**
- * PHPMailer - PHP POP Before SMTP Authentication Class
- * NOTE: Designed for use with PHP version 5 and up
+ * PHPMailer POP-Before-SMTP Authentication Class.
+ * PHP Version 5
  * @package PHPMailer
- * @author Andy Prevost
- * @author Marcus Bointon
- * @author Jim Jagielski
+ * @link https://github.com/PHPMailer/PHPMailer/
+ * @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
+ * @author Jim Jagielski (jimjag) <jimjag@gmail.com>
+ * @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
+ * @author Brent R. Matzelle (original founder)
+ * @copyright 2012 - 2014 Marcus Bointon
  * @copyright 2010 - 2012 Jim Jagielski
  * @copyright 2004 - 2009 Andy Prevost
- * @license http://www.gnu.org/copyleft/lesser.html Distributed under the Lesser General Public License (LGPL)
+ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ * @note This program is distributed in the hope that it will be useful - WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
  */
 
 /**
- * PHP POP-Before-SMTP Authentication Class
- *
- * Version 5.2.2
- *
- * @license: LGPL, see PHPMailer License
- *
- * Specifically for PHPMailer to allow POP before SMTP authentication.
- * Does not yet work with APOP - if you have an APOP account, contact Jim Jagielski
- * and we can test changes to this script.
- *
- * This class is based on the structure of the SMTP class originally authored by Chris Ryan
- *
- * This class is rfc 1939 compliant and implements all the commands
- * required for POP3 connection, authentication and disconnection.
- *
+ * PHPMailer POP-Before-SMTP Authentication Class.
+ * Specifically for PHPMailer to use for RFC1939 POP-before-SMTP authentication.
+ * Does not support APOP.
  * @package PHPMailer
- * @author Richard Davey (orig) <rich@corephp.co.uk>
- * @author Andy Prevost
- * @author Jim Jagielski
+ * @author Richard Davey (original author) <rich@corephp.co.uk>
+ * @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
+ * @author Jim Jagielski (jimjag) <jimjag@gmail.com>
+ * @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
  */
+class POP3
+{
+    /**
+     * The POP3 PHPMailer Version number.
+     * @var string
+     * @access public
+     */
+    public $Version = '5.2.28';
 
-class POP3 {
-  /**
-   * Default POP3 port
-   * @var int
-   */
-  public $POP3_PORT = 110;
+    /**
+     * Default POP3 port number.
+     * @var integer
+     * @access public
+     */
+    public $POP3_PORT = 110;
 
-  /**
-   * Default Timeout
-   * @var int
-   */
-  public $POP3_TIMEOUT = 30;
+    /**
+     * Default timeout in seconds.
+     * @var integer
+     * @access public
+     */
+    public $POP3_TIMEOUT = 30;
 
-  /**
-   * POP3 Carriage Return + Line Feed
-   * @var string
-   */
-  public $CRLF = "\r\n";
+    /**
+     * POP3 Carriage Return + Line Feed.
+     * @var string
+     * @access public
+     * @deprecated Use the constant instead
+     */
+    public $CRLF = "\r\n";
 
-  /**
-   * Displaying Debug warnings? (0 = now, 1+ = yes)
-   * @var int
-   */
-  public $do_debug = 2;
+    /**
+     * Debug display level.
+     * Options: 0 = no, 1+ = yes
+     * @var integer
+     * @access public
+     */
+    public $do_debug = 0;
 
-  /**
-   * POP3 Mail Server
-   * @var string
-   */
-  public $host;
+    /**
+     * POP3 mail server hostname.
+     * @var string
+     * @access public
+     */
+    public $host;
 
-  /**
-   * POP3 Port
-   * @var int
-   */
-  public $port;
+    /**
+     * POP3 port number.
+     * @var integer
+     * @access public
+     */
+    public $port;
 
-  /**
-   * POP3 Timeout Value
-   * @var int
-   */
-  public $tval;
+    /**
+     * POP3 Timeout Value in seconds.
+     * @var integer
+     * @access public
+     */
+    public $tval;
 
-  /**
-   * POP3 Username
-   * @var string
-   */
-  public $username;
+    /**
+     * POP3 username
+     * @var string
+     * @access public
+     */
+    public $username;
 
-  /**
-   * POP3 Password
-   * @var string
-   */
-  public $password;
+    /**
+     * POP3 password.
+     * @var string
+     * @access public
+     */
+    public $password;
 
-  /**
-   * Sets the POP3 PHPMailer Version number
-   * @var string
-   */
-  public $Version         = '5.2.2';
+    /**
+     * Resource handle for the POP3 connection socket.
+     * @var resource
+     * @access protected
+     */
+    protected $pop_conn;
 
-  /////////////////////////////////////////////////
-  // PROPERTIES, PRIVATE AND PROTECTED
-  /////////////////////////////////////////////////
+    /**
+     * Are we connected?
+     * @var boolean
+     * @access protected
+     */
+    protected $connected = false;
 
-  /**
-   * @var resource Resource handle for the POP connection socket
-   */
-  private $pop_conn;
-  /**
-   * @var boolean Are we connected?
-   */
-  private $connected;
-  /**
-   * @var array Error container
-   */
-  private $error;     //  Error log array
+    /**
+     * Error container.
+     * @var array
+     * @access protected
+     */
+    protected $errors = array();
 
-  /**
-   * Constructor, sets the initial values
-   * @access public
-   * @return POP3
-   */
-  public function __construct() {
-    $this->pop_conn  = 0;
-    $this->connected = false;
-    $this->error     = null;
-  }
+    /**
+     * Line break constant
+     */
+    const CRLF = "\r\n";
 
-  /**
-   * Combination of public events - connect, login, disconnect
-   * @access public
-   * @param string $host
-   * @param bool|int $port
-   * @param bool|int $tval
-   * @param string $username
-   * @param string $password
-   * @param int $debug_level
-   * @return bool
-   */
-  public function Authorise ($host, $port = false, $tval = false, $username, $password, $debug_level = 0) {
-    $this->host = $host;
-
-    //  If no port value is passed, retrieve it
-    if ($port == false) {
-      $this->port = $this->POP3_PORT;
-    } else {
-      $this->port = $port;
+    /**
+     * Simple static wrapper for all-in-one POP before SMTP
+     * @param $host
+     * @param integer|boolean $port The port number to connect to
+     * @param integer|boolean $timeout The timeout value
+     * @param string $username
+     * @param string $password
+     * @param integer $debug_level
+     * @return boolean
+     */
+    public static function popBeforeSmtp(
+        $host,
+        $port = false,
+        $timeout = false,
+        $username = '',
+        $password = '',
+        $debug_level = 0
+    ) {
+        $pop = new POP3;
+        return $pop->authorise($host, $port, $timeout, $username, $password, $debug_level);
     }
 
-    //  If no port value is passed, retrieve it
-    if ($tval == false) {
-      $this->tval = $this->POP3_TIMEOUT;
-    } else {
-      $this->tval = $tval;
+    /**
+     * Authenticate with a POP3 server.
+     * A connect, login, disconnect sequence
+     * appropriate for POP-before SMTP authorisation.
+     * @access public
+     * @param string $host The hostname to connect to
+     * @param integer|boolean $port The port number to connect to
+     * @param integer|boolean $timeout The timeout value
+     * @param string $username
+     * @param string $password
+     * @param integer $debug_level
+     * @return boolean
+     */
+    public function authorise($host, $port = false, $timeout = false, $username = '', $password = '', $debug_level = 0)
+    {
+        $this->host = $host;
+        // If no port value provided, use default
+        if (false === $port) {
+            $this->port = $this->POP3_PORT;
+        } else {
+            $this->port = (integer)$port;
+        }
+        // If no timeout value provided, use default
+        if (false === $timeout) {
+            $this->tval = $this->POP3_TIMEOUT;
+        } else {
+            $this->tval = (integer)$timeout;
+        }
+        $this->do_debug = $debug_level;
+        $this->username = $username;
+        $this->password = $password;
+        //  Reset the error log
+        $this->errors = array();
+        //  connect
+        $result = $this->connect($this->host, $this->port, $this->tval);
+        if ($result) {
+            $login_result = $this->login($this->username, $this->password);
+            if ($login_result) {
+                $this->disconnect();
+                return true;
+            }
+        }
+        // We need to disconnect regardless of whether the login succeeded
+        $this->disconnect();
+        return false;
     }
 
-    $this->do_debug = $debug_level;
-    $this->username = $username;
-    $this->password = $password;
+    /**
+     * Connect to a POP3 server.
+     * @access public
+     * @param string $host
+     * @param integer|boolean $port
+     * @param integer $tval
+     * @return boolean
+     */
+    public function connect($host, $port = false, $tval = 30)
+    {
+        //  Are we already connected?
+        if ($this->connected) {
+            return true;
+        }
 
-    //  Refresh the error log
-    $this->error = null;
+        //On Windows this will raise a PHP Warning error if the hostname doesn't exist.
+        //Rather than suppress it with @fsockopen, capture it cleanly instead
+        set_error_handler(array($this, 'catchWarning'));
 
-    //  Connect
-    $result = $this->Connect($this->host, $this->port, $this->tval);
+        if (false === $port) {
+            $port = $this->POP3_PORT;
+        }
 
-    if ($result) {
-      $login_result = $this->Login($this->username, $this->password);
+        //  connect to the POP3 server
+        $this->pop_conn = fsockopen(
+            $host, //  POP3 Host
+            $port, //  Port #
+            $errno, //  Error Number
+            $errstr, //  Error Message
+            $tval
+        ); //  Timeout (seconds)
+        //  Restore the error handler
+        restore_error_handler();
 
-      if ($login_result) {
-        $this->Disconnect();
+        //  Did we connect?
+        if (false === $this->pop_conn) {
+            //  It would appear not...
+            $this->setError(array(
+                'error' => "Failed to connect to server $host on port $port",
+                'errno' => $errno,
+                'errstr' => $errstr
+            ));
+            return false;
+        }
 
-        return true;
-      }
+        //  Increase the stream time-out
+        stream_set_timeout($this->pop_conn, $tval, 0);
 
+        //  Get the POP3 server response
+        $pop3_response = $this->getResponse();
+        //  Check for the +OK
+        if ($this->checkResponse($pop3_response)) {
+            //  The connection is established and the POP3 server is talking
+            $this->connected = true;
+            return true;
+        }
+        return false;
     }
 
-    //  We need to disconnect regardless if the login succeeded
-    $this->Disconnect();
+    /**
+     * Log in to the POP3 server.
+     * Does not support APOP (RFC 2828, 4949).
+     * @access public
+     * @param string $username
+     * @param string $password
+     * @return boolean
+     */
+    public function login($username = '', $password = '')
+    {
+        if (!$this->connected) {
+            $this->setError('Not connected to POP3 server');
+        }
+        if (empty($username)) {
+            $username = $this->username;
+        }
+        if (empty($password)) {
+            $password = $this->password;
+        }
 
-    return false;
-  }
-
-  /**
-   * Connect to the POP3 server
-   * @access public
-   * @param string $host
-   * @param bool|int $port
-   * @param integer $tval
-   * @return boolean
-   */
-  public function Connect ($host, $port = false, $tval = 30) {
-    //  Are we already connected?
-    if ($this->connected) {
-      return true;
+        // Send the Username
+        $this->sendString("USER $username" . self::CRLF);
+        $pop3_response = $this->getResponse();
+        if ($this->checkResponse($pop3_response)) {
+            // Send the Password
+            $this->sendString("PASS $password" . self::CRLF);
+            $pop3_response = $this->getResponse();
+            if ($this->checkResponse($pop3_response)) {
+                return true;
+            }
+        }
+        return false;
     }
 
-    /*
-    On Windows this will raise a PHP Warning error if the hostname doesn't exist.
-    Rather than supress it with @fsockopen, let's capture it cleanly instead
-    */
-
-    set_error_handler(array(&$this, 'catchWarning'));
-
-    //  Connect to the POP3 server
-    $this->pop_conn = fsockopen($host,    //  POP3 Host
-                  $port,    //  Port #
-                  $errno,   //  Error Number
-                  $errstr,  //  Error Message
-                  $tval);   //  Timeout (seconds)
-
-    //  Restore the error handler
-    restore_error_handler();
-
-    //  Does the Error Log now contain anything?
-    if ($this->error && $this->do_debug >= 1) {
-      $this->displayErrors();
+    /**
+     * Disconnect from the POP3 server.
+     * @access public
+     */
+    public function disconnect()
+    {
+        $this->sendString('QUIT');
+        //The QUIT command may cause the daemon to exit, which will kill our connection
+        //So ignore errors here
+        try {
+            @fclose($this->pop_conn);
+        } catch (Exception $e) {
+            //Do nothing
+        };
     }
 
-    //  Did we connect?
-    if ($this->pop_conn == false) {
-      //  It would appear not...
-      $this->error = array(
-        'error' => "Failed to connect to server $host on port $port",
-        'errno' => $errno,
-        'errstr' => $errstr
-      );
-
-      if ($this->do_debug >= 1) {
-        $this->displayErrors();
-      }
-
-      return false;
+    /**
+     * Get a response from the POP3 server.
+     * $size is the maximum number of bytes to retrieve
+     * @param integer $size
+     * @return string
+     * @access protected
+     */
+    protected function getResponse($size = 128)
+    {
+        $response = fgets($this->pop_conn, $size);
+        if ($this->do_debug >= 1) {
+            echo "Server -> Client: $response";
+        }
+        return $response;
     }
 
-    //  Increase the stream time-out
-
-    //  Check for PHP 4.3.0 or later
-    if (version_compare(phpversion(), '5.0.0', 'ge')) {
-      stream_set_timeout($this->pop_conn, $tval, 0);
-    } else {
-      //  Does not work on Windows
-      if (substr(PHP_OS, 0, 3) !== 'WIN') {
-        socket_set_timeout($this->pop_conn, $tval, 0);
-      }
+    /**
+     * Send raw data to the POP3 server.
+     * @param string $string
+     * @return integer
+     * @access protected
+     */
+    protected function sendString($string)
+    {
+        if ($this->pop_conn) {
+            if ($this->do_debug >= 2) { //Show client messages when debug >= 2
+                echo "Client -> Server: $string";
+            }
+            return fwrite($this->pop_conn, $string, strlen($string));
+        }
+        return 0;
     }
 
-    //  Get the POP3 server response
-    $pop3_response = $this->getResponse();
-
-    //  Check for the +OK
-    if ($this->checkResponse($pop3_response)) {
-    //  The connection is established and the POP3 server is talking
-    $this->connected = true;
-      return true;
-    }
-    return false;
-  }
-
-  /**
-   * Login to the POP3 server (does not support APOP yet)
-   * @access public
-   * @param string $username
-   * @param string $password
-   * @return boolean
-   */
-  public function Login ($username = '', $password = '') {
-    if ($this->connected == false) {
-      $this->error = 'Not connected to POP3 server';
-
-      if ($this->do_debug >= 1) {
-        $this->displayErrors();
-      }
+    /**
+     * Checks the POP3 server response.
+     * Looks for for +OK or -ERR.
+     * @param string $string
+     * @return boolean
+     * @access protected
+     */
+    protected function checkResponse($string)
+    {
+        if (substr($string, 0, 3) !== '+OK') {
+            $this->setError(array(
+                'error' => "Server reported an error: $string",
+                'errno' => 0,
+                'errstr' => ''
+            ));
+            return false;
+        } else {
+            return true;
+        }
     }
 
-    if (empty($username)) {
-      $username = $this->username;
+    /**
+     * Add an error to the internal error store.
+     * Also display debug output if it's enabled.
+     * @param $error
+     * @access protected
+     */
+    protected function setError($error)
+    {
+        $this->errors[] = $error;
+        if ($this->do_debug >= 1) {
+            echo '<pre>';
+            foreach ($this->errors as $error) {
+                print_r($error);
+            }
+            echo '</pre>';
+        }
     }
 
-    if (empty($password)) {
-      $password = $this->password;
+    /**
+     * Get an array of error messages, if any.
+     * @return array
+     */
+    public function getErrors()
+    {
+        return $this->errors;
     }
 
-    $pop_username = "USER $username" . $this->CRLF;
-    $pop_password = "PASS $password" . $this->CRLF;
-
-    //  Send the Username
-    $this->sendString($pop_username);
-    $pop3_response = $this->getResponse();
-
-    if ($this->checkResponse($pop3_response)) {
-      //  Send the Password
-      $this->sendString($pop_password);
-      $pop3_response = $this->getResponse();
-
-      if ($this->checkResponse($pop3_response)) {
-        return true;
-      }
+    /**
+     * POP3 connection error handler.
+     * @param integer $errno
+     * @param string $errstr
+     * @param string $errfile
+     * @param integer $errline
+     * @access protected
+     */
+    protected function catchWarning($errno, $errstr, $errfile, $errline)
+    {
+        $this->setError(array(
+            'error' => "Connecting to the POP3 server raised a PHP warning: ",
+            'errno' => $errno,
+            'errstr' => $errstr,
+            'errfile' => $errfile,
+            'errline' => $errline
+        ));
     }
-    return false;
-  }
-
-  /**
-   * Disconnect from the POP3 server
-   * @access public
-   */
-  public function Disconnect () {
-    $this->sendString('QUIT');
-
-    fclose($this->pop_conn);
-  }
-
-  /////////////////////////////////////////////////
-  //  Private Methods
-  /////////////////////////////////////////////////
-
-  /**
-   * Get the socket response back.
-   * $size is the maximum number of bytes to retrieve
-   * @access private
-   * @param integer $size
-   * @return string
-   */
-  private function getResponse ($size = 128) {
-    $pop3_response = fgets($this->pop_conn, $size);
-
-    return $pop3_response;
-  }
-
-  /**
-   * Send a string down the open socket connection to the POP3 server
-   * @access private
-   * @param string $string
-   * @return integer
-   */
-  private function sendString ($string) {
-    $bytes_sent = fwrite($this->pop_conn, $string, strlen($string));
-
-    return $bytes_sent;
-  }
-
-  /**
-   * Checks the POP3 server response for +OK or -ERR
-   * @access private
-   * @param string $string
-   * @return boolean
-   */
-  private function checkResponse ($string) {
-    if (substr($string, 0, 3) !== '+OK') {
-      $this->error = array(
-        'error' => "Server reported an error: $string",
-        'errno' => 0,
-        'errstr' => ''
-      );
-
-      if ($this->do_debug >= 1) {
-        $this->displayErrors();
-      }
-
-      return false;
-    } else {
-      return true;
-    }
-
-  }
-
-  /**
-   * If debug is enabled, display the error message array
-   * @access private
-   */
-  private function displayErrors () {
-    echo '<pre>';
-
-    foreach ($this->error as $single_error) {
-      print_r($single_error);
-    }
-
-    echo '</pre>';
-  }
-
-  /**
-   * Takes over from PHP for the socket warning handler
-   * @access private
-   * @param integer $errno
-   * @param string $errstr
-   * @param string $errfile
-   * @param integer $errline
-   */
-  private function catchWarning ($errno, $errstr, $errfile, $errline) {
-    $this->error[] = array(
-      'error' => "Connecting to the POP3 server raised a PHP warning: ",
-      'errno' => $errno,
-      'errstr' => $errstr
-    );
-  }
-
-  //  End of class
 }
-?>
diff --git a/resources/phpmailer/class.smtp.php b/resources/phpmailer/class.smtp.php
index 8d9cd7d9ef..d2b9a0ab2f 100644
--- a/resources/phpmailer/class.smtp.php
+++ b/resources/phpmailer/class.smtp.php
@@ -1,1003 +1,1276 @@
 <?php
-/*~ class.smtp.php
-.---------------------------------------------------------------------------.
-|  Software: PHPMailer - PHP email class                                    |
-|   Version: 5.2.2                                                          |
-|      Site: https://code.google.com/a/apache-extras.org/p/phpmailer/       |
-| ------------------------------------------------------------------------- |
-|     Admin: Jim Jagielski (project admininistrator)                        |
-|   Authors: Andy Prevost (codeworxtech) codeworxtech@users.sourceforge.net |
-|          : Marcus Bointon (coolbru) coolbru@users.sourceforge.net         |
-|          : Jim Jagielski (jimjag) jimjag@gmail.com                        |
-|   Founder: Brent R. Matzelle (original founder)                           |
-| Copyright (c) 2010-2012, Jim Jagielski. All Rights Reserved.              |
-| Copyright (c) 2004-2009, Andy Prevost. All Rights Reserved.               |
-| Copyright (c) 2001-2003, Brent R. Matzelle                                |
-| ------------------------------------------------------------------------- |
-|   License: Distributed under the Lesser General Public License (LGPL)     |
-|            http://www.gnu.org/copyleft/lesser.html                        |
-| This program is distributed in the hope that it will be useful - WITHOUT  |
-| ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or     |
-| FITNESS FOR A PARTICULAR PURPOSE.                                         |
-'---------------------------------------------------------------------------'
-*/
-
 /**
- * PHPMailer - PHP SMTP email transport class
- * NOTE: Designed for use with PHP version 5 and up
+ * PHPMailer RFC821 SMTP email transport class.
+ * PHP Version 5
  * @package PHPMailer
- * @author Andy Prevost
- * @author Marcus Bointon
- * @copyright 2004 - 2008 Andy Prevost
- * @author Jim Jagielski
+ * @link https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
+ * @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
+ * @author Jim Jagielski (jimjag) <jimjag@gmail.com>
+ * @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
+ * @author Brent R. Matzelle (original founder)
+ * @copyright 2014 Marcus Bointon
  * @copyright 2010 - 2012 Jim Jagielski
- * @license http://www.gnu.org/copyleft/lesser.html Distributed under the Lesser General Public License (LGPL)
+ * @copyright 2004 - 2009 Andy Prevost
+ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ * @note This program is distributed in the hope that it will be useful - WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
  */
 
 /**
- * PHP RFC821 SMTP client
- *
- * Implements all the RFC 821 SMTP commands except TURN which will always return a not implemented error.
- * SMTP also provides some utility methods for sending mail to an SMTP server.
- * @author Chris Ryan
+ * PHPMailer RFC821 SMTP email transport class.
+ * Implements RFC 821 SMTP commands and provides some utility methods for sending mail to an SMTP server.
  * @package PHPMailer
+ * @author Chris Ryan
+ * @author Marcus Bointon <phpmailer@synchromedia.co.uk>
  */
-
-class SMTP {
-  /**
-   *  SMTP server port
-   *  @var int
-   */
-  public $SMTP_PORT = 25;
-
-  /**
-   *  SMTP reply line ending (don't change)
-   *  @var string
-   */
-  public $CRLF = "\r\n";
-
-  /**
-   *  Sets whether debugging is turned on
-   *  @var bool
-   */
-  public $do_debug;       // the level of debug to perform
-
-  /**
-   * Sets the function/method to use for debugging output.
-   * Right now we only honor "echo" or "error_log"
-   * @var string
-   */
-  public $Debugoutput     = "echo";
-
-  /**
-   *  Sets VERP use on/off (default is off)
-   *  @var bool
-   */
-  public $do_verp = false;
-
-  /**
-   * Sets the SMTP timeout value for reads, in seconds
-   * @var int
-   */
-  public $Timeout         = 15;
-
-  /**
-   * Sets the SMTP timelimit value for reads, in seconds
-   * @var int
-   */
-  public $Timelimit       = 30;
-
-  /**
-   * Sets the SMTP PHPMailer Version number
-   * @var string
-   */
-  public $Version         = '5.2.2';
-
-  /////////////////////////////////////////////////
-  // PROPERTIES, PRIVATE AND PROTECTED
-  /////////////////////////////////////////////////
-
-  /**
-   * @var resource The socket to the server
-   */
-  private $smtp_conn;
-  /**
-   * @var string Error message, if any, for the last call
-   */
-  private $error;
-  /**
-   * @var string The reply the server sent to us for HELO
-   */
-  private $helo_rply;
-
-  /**
-   * Outputs debugging info via user-defined method
-   * @param string $str
-   */
-  private function edebug($str) {
-    if ($this->Debugoutput == "error_log") {
-        error_log($str);
-    } else {
-        echo $str;
-    }
-  }
-
-  /**
-   * Initialize the class so that the data is in a known state.
-   * @access public
-   * @return SMTP
-   */
-  public function __construct() {
-    $this->smtp_conn = 0;
-    $this->error = null;
-    $this->helo_rply = null;
-
-    $this->do_debug = 0;
-  }
-
-  /////////////////////////////////////////////////
-  // CONNECTION FUNCTIONS
-  /////////////////////////////////////////////////
-
-  /**
-   * Connect to the server specified on the port specified.
-   * If the port is not specified use the default SMTP_PORT.
-   * If tval is specified then a connection will try and be
-   * established with the server for that number of seconds.
-   * If tval is not specified the default is 30 seconds to
-   * try on the connection.
-   *
-   * SMTP CODE SUCCESS: 220
-   * SMTP CODE FAILURE: 421
-   * @access public
-   * @param string $host
-   * @param int $port
-   * @param int $tval
-   * @return bool
-   */
-  public function Connect($host, $port = 0, $tval = 30) {
-    // set the error val to null so there is no confusion
-    $this->error = null;
-
-    // make sure we are __not__ connected
-    if($this->connected()) {
-      // already connected, generate error
-      $this->error = array("error" => "Already connected to a server");
-      return false;
-    }
-
-    if(empty($port)) {
-      $port = $this->SMTP_PORT;
-    }
-
-    // connect to the smtp server
-    $this->smtp_conn = @fsockopen($host,    // the host of the server
-                                 $port,    // the port to use
-                                 $errno,   // error number if any
-                                 $errstr,  // error message if any
-                                 $tval);   // give up after ? secs
-    // verify we connected properly
-    if(empty($this->smtp_conn)) {
-      $this->error = array("error" => "Failed to connect to server",
-                           "errno" => $errno,
-                           "errstr" => $errstr);
-      if($this->do_debug >= 1) {
-        $this->edebug("SMTP -> ERROR: " . $this->error["error"] . ": $errstr ($errno)" . $this->CRLF . '<br />');
-      }
-      return false;
-    }
-
-    // SMTP server can take longer to respond, give longer timeout for first read
-    // Windows does not have support for this timeout function
-    if(substr(PHP_OS, 0, 3) != "WIN") {
-     $max = ini_get('max_execution_time');
-     if ($max != 0 && $tval > $max) { // don't bother if unlimited
-      @set_time_limit($tval);
-     }
-     stream_set_timeout($this->smtp_conn, $tval, 0);
-    }
-
-    // get any announcement
-    $announce = $this->get_lines();
-
-    if($this->do_debug >= 2) {
-      $this->edebug("SMTP -> FROM SERVER:" . $announce . $this->CRLF . '<br />');
-    }
-
-    return true;
-  }
-
-  /**
-   * Initiate a TLS communication with the server.
-   *
-   * SMTP CODE 220 Ready to start TLS
-   * SMTP CODE 501 Syntax error (no parameters allowed)
-   * SMTP CODE 454 TLS not available due to temporary reason
-   * @access public
-   * @return bool success
-   */
-  public function StartTLS() {
-    $this->error = null; # to avoid confusion
-
-    if(!$this->connected()) {
-      $this->error = array("error" => "Called StartTLS() without being connected");
-      return false;
-    }
-
-    fputs($this->smtp_conn,"STARTTLS" . $this->CRLF);
-
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
-
-    if($this->do_debug >= 2) {
-      $this->edebug("SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />');
-    }
-
-    if($code != 220) {
-      $this->error =
-         array("error"     => "STARTTLS not accepted from server",
-               "smtp_code" => $code,
-               "smtp_msg"  => substr($rply,4));
-      if($this->do_debug >= 1) {
-        $this->edebug("SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />');
-      }
-      return false;
-    }
-
-    // Begin encrypted connection
-    if(!stream_socket_enable_crypto($this->smtp_conn, true, STREAM_CRYPTO_METHOD_TLS_CLIENT)) {
-      return false;
-    }
-
-    return true;
-  }
-
-  /**
-   * Performs SMTP authentication.  Must be run after running the
-   * Hello() method.  Returns true if successfully authenticated.
-   * @access public
-   * @param string $username
-   * @param string $password
-   * @param string $authtype
-   * @param string $realm
-   * @param string $workstation
-   * @return bool
-   */
-  public function Authenticate($username, $password, $authtype='LOGIN', $realm='', $workstation='') {
-    if (empty($authtype)) {
-      $authtype = 'LOGIN';
-    }
-
-    switch ($authtype) {
-      case 'PLAIN':
-        // Start authentication
-        fputs($this->smtp_conn,"AUTH PLAIN" . $this->CRLF);
-    
-        $rply = $this->get_lines();
-        $code = substr($rply,0,3);
-    
-        if($code != 334) {
-          $this->error =
-            array("error" => "AUTH not accepted from server",
-                  "smtp_code" => $code,
-                  "smtp_msg" => substr($rply,4));
-          if($this->do_debug >= 1) {
-            $this->edebug("SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />');
-          }
-          return false;
-        }
-        // Send encoded username and password
-        fputs($this->smtp_conn, base64_encode("\0".$username."\0".$password) . $this->CRLF);
-
-        $rply = $this->get_lines();
-        $code = substr($rply,0,3);
-    
-        if($code != 235) {
-          $this->error =
-            array("error" => "Authentication not accepted from server",
-                  "smtp_code" => $code,
-                  "smtp_msg" => substr($rply,4));
-          if($this->do_debug >= 1) {
-            $this->edebug("SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />');
-          }
-          return false;
-        }
-        break;
-      case 'LOGIN':
-        // Start authentication
-        fputs($this->smtp_conn,"AUTH LOGIN" . $this->CRLF);
-    
-        $rply = $this->get_lines();
-        $code = substr($rply,0,3);
-    
-        if($code != 334) {
-          $this->error =
-            array("error" => "AUTH not accepted from server",
-                  "smtp_code" => $code,
-                  "smtp_msg" => substr($rply,4));
-          if($this->do_debug >= 1) {
-            $this->edebug("SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />');
-          }
-          return false;
-        }
-    
-        // Send encoded username
-        fputs($this->smtp_conn, base64_encode($username) . $this->CRLF);
-    
-        $rply = $this->get_lines();
-        $code = substr($rply,0,3);
-    
-        if($code != 334) {
-          $this->error =
-            array("error" => "Username not accepted from server",
-                  "smtp_code" => $code,
-                  "smtp_msg" => substr($rply,4));
-          if($this->do_debug >= 1) {
-            $this->edebug("SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />');
-          }
-          return false;
-        }
-    
-        // Send encoded password
-        fputs($this->smtp_conn, base64_encode($password) . $this->CRLF);
-    
-        $rply = $this->get_lines();
-        $code = substr($rply,0,3);
-    
-        if($code != 235) {
-          $this->error =
-            array("error" => "Password not accepted from server",
-                  "smtp_code" => $code,
-                  "smtp_msg" => substr($rply,4));
-          if($this->do_debug >= 1) {
-            $this->edebug("SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />');
-          }
-          return false;
-        }
-        break;
-      case 'NTLM':
-        /*
-         * ntlm_sasl_client.php
-         ** Bundled with Permission
-         **
-         ** How to telnet in windows: http://technet.microsoft.com/en-us/library/aa995718%28EXCHG.65%29.aspx
-         ** PROTOCOL Documentation http://curl.haxx.se/rfc/ntlm.html#ntlmSmtpAuthentication
-         */
-        require_once('ntlm_sasl_client.php');
-        $temp = new stdClass();
-        $ntlm_client = new ntlm_sasl_client_class;
-        if(! $ntlm_client->Initialize($temp)){//let's test if every function its available
-            $this->error = array("error" => $temp->error);
-            if($this->do_debug >= 1) {
-                $this->edebug("You need to enable some modules in your php.ini file: " . $this->error["error"] . $this->CRLF);
-            }
-            return false;
-        }
-        $msg1 = $ntlm_client->TypeMsg1($realm, $workstation);//msg1
-        
-        fputs($this->smtp_conn,"AUTH NTLM " . base64_encode($msg1) . $this->CRLF);
-
-        $rply = $this->get_lines();
-        $code = substr($rply,0,3);
-        
-
-        if($code != 334) {
-            $this->error =
-                array("error" => "AUTH not accepted from server",
-                      "smtp_code" => $code,
-                      "smtp_msg" => substr($rply,4));
-            if($this->do_debug >= 1) {
-                $this->edebug("SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF);
-            }
-            return false;
-        }
-        
-        $challange = substr($rply,3);//though 0 based, there is a white space after the 3 digit number....//msg2
-        $challange = base64_decode($challange);
-        $ntlm_res = $ntlm_client->NTLMResponse(substr($challange,24,8),$password);
-        $msg3 = $ntlm_client->TypeMsg3($ntlm_res,$username,$realm,$workstation);//msg3
-        // Send encoded username
-        fputs($this->smtp_conn, base64_encode($msg3) . $this->CRLF);
-
-        $rply = $this->get_lines();
-        $code = substr($rply,0,3);
-
-        if($code != 235) {
-            $this->error =
-                array("error" => "Could not authenticate",
-                      "smtp_code" => $code,
-                      "smtp_msg" => substr($rply,4));
-            if($this->do_debug >= 1) {
-                $this->edebug("SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF);
-            }
-            return false;
-        }
-        break;
-    }
-    return true;
-  }
-
-  /**
-   * Returns true if connected to a server otherwise false
-   * @access public
-   * @return bool
-   */
-  public function Connected() {
-    if(!empty($this->smtp_conn)) {
-      $sock_status = socket_get_status($this->smtp_conn);
-      if($sock_status["eof"]) {
-        // the socket is valid but we are not connected
-        if($this->do_debug >= 1) {
-            $this->edebug("SMTP -> NOTICE:" . $this->CRLF . "EOF caught while checking if connected");
-        }
-        $this->Close();
-        return false;
-      }
-      return true; // everything looks good
-    }
-    return false;
-  }
-
-  /**
-   * Closes the socket and cleans up the state of the class.
-   * It is not considered good to use this function without
-   * first trying to use QUIT.
-   * @access public
-   * @return void
-   */
-  public function Close() {
-    $this->error = null; // so there is no confusion
-    $this->helo_rply = null;
-    if(!empty($this->smtp_conn)) {
-      // close the connection and cleanup
-      fclose($this->smtp_conn);
-      $this->smtp_conn = 0;
-    }
-  }
-
-  /////////////////////////////////////////////////
-  // SMTP COMMANDS
-  /////////////////////////////////////////////////
-
-  /**
-   * Issues a data command and sends the msg_data to the server
-   * finializing the mail transaction. $msg_data is the message
-   * that is to be send with the headers. Each header needs to be
-   * on a single line followed by a <CRLF> with the message headers
-   * and the message body being seperated by and additional <CRLF>.
-   *
-   * Implements rfc 821: DATA <CRLF>
-   *
-   * SMTP CODE INTERMEDIATE: 354
-   *     [data]
-   *     <CRLF>.<CRLF>
-   *     SMTP CODE SUCCESS: 250
-   *     SMTP CODE FAILURE: 552,554,451,452
-   * SMTP CODE FAILURE: 451,554
-   * SMTP CODE ERROR  : 500,501,503,421
-   * @access public
-   * @param string $msg_data
-   * @return bool
-   */
-  public function Data($msg_data) {
-    $this->error = null; // so no confusion is caused
-
-    if(!$this->connected()) {
-      $this->error = array(
-              "error" => "Called Data() without being connected");
-      return false;
-    }
-
-    fputs($this->smtp_conn,"DATA" . $this->CRLF);
-
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
-
-    if($this->do_debug >= 2) {
-      $this->edebug("SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />');
-    }
-
-    if($code != 354) {
-      $this->error =
-        array("error" => "DATA command not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        $this->edebug("SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />');
-      }
-      return false;
-    }
-
-    /* the server is ready to accept data!
-     * according to rfc 821 we should not send more than 1000
-     * including the CRLF
-     * characters on a single line so we will break the data up
-     * into lines by \r and/or \n then if needed we will break
-     * each of those into smaller lines to fit within the limit.
-     * in addition we will be looking for lines that start with
-     * a period '.' and append and additional period '.' to that
-     * line. NOTE: this does not count towards limit.
+class SMTP
+{
+    /**
+     * The PHPMailer SMTP version number.
+     * @var string
      */
+    const VERSION = '5.2.28';
 
-    // normalize the line breaks so we know the explode works
-    $msg_data = str_replace("\r\n","\n",$msg_data);
-    $msg_data = str_replace("\r","\n",$msg_data);
-    $lines = explode("\n",$msg_data);
-
-    /* we need to find a good way to determine is headers are
-     * in the msg_data or if it is a straight msg body
-     * currently I am assuming rfc 822 definitions of msg headers
-     * and if the first field of the first line (':' sperated)
-     * does not contain a space then it _should_ be a header
-     * and we can process all lines before a blank "" line as
-     * headers.
+    /**
+     * SMTP line break constant.
+     * @var string
      */
+    const CRLF = "\r\n";
 
-    $field = substr($lines[0],0,strpos($lines[0],":"));
-    $in_headers = false;
-    if(!empty($field) && !strstr($field," ")) {
-      $in_headers = true;
+    /**
+     * The SMTP port to use if one is not specified.
+     * @var integer
+     */
+    const DEFAULT_SMTP_PORT = 25;
+
+    /**
+     * The maximum line length allowed by RFC 2822 section 2.1.1
+     * @var integer
+     */
+    const MAX_LINE_LENGTH = 998;
+
+    /**
+     * Debug level for no output
+     */
+    const DEBUG_OFF = 0;
+
+    /**
+     * Debug level to show client -> server messages
+     */
+    const DEBUG_CLIENT = 1;
+
+    /**
+     * Debug level to show client -> server and server -> client messages
+     */
+    const DEBUG_SERVER = 2;
+
+    /**
+     * Debug level to show connection status, client -> server and server -> client messages
+     */
+    const DEBUG_CONNECTION = 3;
+
+    /**
+     * Debug level to show all messages
+     */
+    const DEBUG_LOWLEVEL = 4;
+
+    /**
+     * The PHPMailer SMTP Version number.
+     * @var string
+     * @deprecated Use the `VERSION` constant instead
+     * @see SMTP::VERSION
+     */
+    public $Version = '5.2.28';
+
+    /**
+     * SMTP server port number.
+     * @var integer
+     * @deprecated This is only ever used as a default value, so use the `DEFAULT_SMTP_PORT` constant instead
+     * @see SMTP::DEFAULT_SMTP_PORT
+     */
+    public $SMTP_PORT = 25;
+
+    /**
+     * SMTP reply line ending.
+     * @var string
+     * @deprecated Use the `CRLF` constant instead
+     * @see SMTP::CRLF
+     */
+    public $CRLF = "\r\n";
+
+    /**
+     * Debug output level.
+     * Options:
+     * * self::DEBUG_OFF (`0`) No debug output, default
+     * * self::DEBUG_CLIENT (`1`) Client commands
+     * * self::DEBUG_SERVER (`2`) Client commands and server responses
+     * * self::DEBUG_CONNECTION (`3`) As DEBUG_SERVER plus connection status
+     * * self::DEBUG_LOWLEVEL (`4`) Low-level data output, all messages
+     * @var integer
+     */
+    public $do_debug = self::DEBUG_OFF;
+
+    /**
+     * How to handle debug output.
+     * Options:
+     * * `echo` Output plain-text as-is, appropriate for CLI
+     * * `html` Output escaped, line breaks converted to `<br>`, appropriate for browser output
+     * * `error_log` Output to error log as configured in php.ini
+     *
+     * Alternatively, you can provide a callable expecting two params: a message string and the debug level:
+     * <code>
+     * $smtp->Debugoutput = function($str, $level) {echo "debug level $level; message: $str";};
+     * </code>
+     * @var string|callable
+     */
+    public $Debugoutput = 'echo';
+
+    /**
+     * Whether to use VERP.
+     * @link http://en.wikipedia.org/wiki/Variable_envelope_return_path
+     * @link http://www.postfix.org/VERP_README.html Info on VERP
+     * @var boolean
+     */
+    public $do_verp = false;
+
+    /**
+     * The timeout value for connection, in seconds.
+     * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2
+     * This needs to be quite high to function correctly with hosts using greetdelay as an anti-spam measure.
+     * @link http://tools.ietf.org/html/rfc2821#section-4.5.3.2
+     * @var integer
+     */
+    public $Timeout = 300;
+
+    /**
+     * How long to wait for commands to complete, in seconds.
+     * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2
+     * @var integer
+     */
+    public $Timelimit = 300;
+
+    /**
+     * @var array Patterns to extract an SMTP transaction id from reply to a DATA command.
+     * The first capture group in each regex will be used as the ID.
+     */
+    protected $smtp_transaction_id_patterns = array(
+        'exim' => '/[0-9]{3} OK id=(.*)/',
+        'sendmail' => '/[0-9]{3} 2.0.0 (.*) Message/',
+        'postfix' => '/[0-9]{3} 2.0.0 Ok: queued as (.*)/'
+    );
+
+    /**
+     * @var string The last transaction ID issued in response to a DATA command,
+     * if one was detected
+     */
+    protected $last_smtp_transaction_id;
+
+    /**
+     * The socket for the server connection.
+     * @var resource
+     */
+    protected $smtp_conn;
+
+    /**
+     * Error information, if any, for the last SMTP command.
+     * @var array
+     */
+    protected $error = array(
+        'error' => '',
+        'detail' => '',
+        'smtp_code' => '',
+        'smtp_code_ex' => ''
+    );
+
+    /**
+     * The reply the server sent to us for HELO.
+     * If null, no HELO string has yet been received.
+     * @var string|null
+     */
+    protected $helo_rply = null;
+
+    /**
+     * The set of SMTP extensions sent in reply to EHLO command.
+     * Indexes of the array are extension names.
+     * Value at index 'HELO' or 'EHLO' (according to command that was sent)
+     * represents the server name. In case of HELO it is the only element of the array.
+     * Other values can be boolean TRUE or an array containing extension options.
+     * If null, no HELO/EHLO string has yet been received.
+     * @var array|null
+     */
+    protected $server_caps = null;
+
+    /**
+     * The most recent reply received from the server.
+     * @var string
+     */
+    protected $last_reply = '';
+
+    /**
+     * Output debugging info via a user-selected method.
+     * @see SMTP::$Debugoutput
+     * @see SMTP::$do_debug
+     * @param string $str Debug string to output
+     * @param integer $level The debug level of this message; see DEBUG_* constants
+     * @return void
+     */
+    protected function edebug($str, $level = 0)
+    {
+        if ($level > $this->do_debug) {
+            return;
+        }
+        //Avoid clash with built-in function names
+        if (!in_array($this->Debugoutput, array('error_log', 'html', 'echo')) and is_callable($this->Debugoutput)) {
+            call_user_func($this->Debugoutput, $str, $level);
+            return;
+        }
+        switch ($this->Debugoutput) {
+            case 'error_log':
+                //Don't output, just log
+                error_log($str);
+                break;
+            case 'html':
+                //Cleans up output a bit for a better looking, HTML-safe output
+                echo gmdate('Y-m-d H:i:s') . ' ' . htmlentities(
+                    preg_replace('/[\r\n]+/', '', $str),
+                    ENT_QUOTES,
+                    'UTF-8'
+                ) . "<br>\n";
+                break;
+            case 'echo':
+            default:
+                //Normalize line breaks
+                $str = preg_replace('/(\r\n|\r|\n)/ms', "\n", $str);
+                echo gmdate('Y-m-d H:i:s') . "\t" . str_replace(
+                    "\n",
+                    "\n                   \t                  ",
+                    trim($str)
+                ) . "\n";
+        }
     }
 
-    $max_line_length = 998; // used below; set here for ease in change
-
-    while(list(,$line) = @each($lines)) {
-      $lines_out = null;
-      if($line == "" && $in_headers) {
-        $in_headers = false;
-      }
-      // ok we need to break this line up into several smaller lines
-      while(strlen($line) > $max_line_length) {
-        $pos = strrpos(substr($line,0,$max_line_length)," ");
-
-        // Patch to fix DOS attack
-        if(!$pos) {
-          $pos = $max_line_length - 1;
-          $lines_out[] = substr($line,0,$pos);
-          $line = substr($line,$pos);
+    /**
+     * Connect to an SMTP server.
+     * @param string $host SMTP server IP or host name
+     * @param integer $port The port number to connect to
+     * @param integer $timeout How long to wait for the connection to open
+     * @param array $options An array of options for stream_context_create()
+     * @access public
+     * @return boolean
+     */
+    public function connect($host, $port = null, $timeout = 30, $options = array())
+    {
+        static $streamok;
+        //This is enabled by default since 5.0.0 but some providers disable it
+        //Check this once and cache the result
+        if (is_null($streamok)) {
+            $streamok = function_exists('stream_socket_client');
+        }
+        // Clear errors to avoid confusion
+        $this->setError('');
+        // Make sure we are __not__ connected
+        if ($this->connected()) {
+            // Already connected, generate error
+            $this->setError('Already connected to a server');
+            return false;
+        }
+        if (empty($port)) {
+            $port = self::DEFAULT_SMTP_PORT;
+        }
+        // Connect to the SMTP server
+        $this->edebug(
+            "Connection: opening to $host:$port, timeout=$timeout, options=" .
+            var_export($options, true),
+            self::DEBUG_CONNECTION
+        );
+        $errno = 0;
+        $errstr = '';
+        if ($streamok) {
+            $socket_context = stream_context_create($options);
+            set_error_handler(array($this, 'errorHandler'));
+            $this->smtp_conn = stream_socket_client(
+                $host . ":" . $port,
+                $errno,
+                $errstr,
+                $timeout,
+                STREAM_CLIENT_CONNECT,
+                $socket_context
+            );
+            restore_error_handler();
         } else {
-          $lines_out[] = substr($line,0,$pos);
-          $line = substr($line,$pos + 1);
+            //Fall back to fsockopen which should work in more places, but is missing some features
+            $this->edebug(
+                "Connection: stream_socket_client not available, falling back to fsockopen",
+                self::DEBUG_CONNECTION
+            );
+            set_error_handler(array($this, 'errorHandler'));
+            $this->smtp_conn = fsockopen(
+                $host,
+                $port,
+                $errno,
+                $errstr,
+                $timeout
+            );
+            restore_error_handler();
+        }
+        // Verify we connected properly
+        if (!is_resource($this->smtp_conn)) {
+            $this->setError(
+                'Failed to connect to server',
+                $errno,
+                $errstr
+            );
+            $this->edebug(
+                'SMTP ERROR: ' . $this->error['error']
+                . ": $errstr ($errno)",
+                self::DEBUG_CLIENT
+            );
+            return false;
+        }
+        $this->edebug('Connection: opened', self::DEBUG_CONNECTION);
+        // SMTP server can take longer to respond, give longer timeout for first read
+        // Windows does not have support for this timeout function
+        if (substr(PHP_OS, 0, 3) != 'WIN') {
+            $max = ini_get('max_execution_time');
+            // Don't bother if unlimited
+            if ($max != 0 && $timeout > $max) {
+                @set_time_limit($timeout);
+            }
+            stream_set_timeout($this->smtp_conn, $timeout, 0);
+        }
+        // Get any announcement
+        $announce = $this->get_lines();
+        $this->edebug('SERVER -> CLIENT: ' . $announce, self::DEBUG_SERVER);
+        return true;
+    }
+
+    /**
+     * Initiate a TLS (encrypted) session.
+     * @access public
+     * @return boolean
+     */
+    public function startTLS()
+    {
+        if (!$this->sendCommand('STARTTLS', 'STARTTLS', 220)) {
+            return false;
         }
 
-        /* if processing headers add a LWSP-char to the front of new line
-         * rfc 822 on long msg headers
-         */
-        if($in_headers) {
-          $line = "\t" . $line;
+        //Allow the best TLS version(s) we can
+        $crypto_method = STREAM_CRYPTO_METHOD_TLS_CLIENT;
+
+        //PHP 5.6.7 dropped inclusion of TLS 1.1 and 1.2 in STREAM_CRYPTO_METHOD_TLS_CLIENT
+        //so add them back in manually if we can
+        if (defined('STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT')) {
+            $crypto_method |= STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT;
+            $crypto_method |= STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT;
         }
-      }
-      $lines_out[] = $line;
 
-      // send the lines to the server
-      while(list(,$line_out) = @each($lines_out)) {
-        if(strlen($line_out) > 0)
-        {
-          if(substr($line_out, 0, 1) == ".") {
-            $line_out = "." . $line_out;
-          }
+        // Begin encrypted connection
+        set_error_handler(array($this, 'errorHandler'));
+        $crypto_ok = stream_socket_enable_crypto(
+            $this->smtp_conn,
+            true,
+            $crypto_method
+        );
+        restore_error_handler();
+        return $crypto_ok;
+    }
+
+    /**
+     * Perform SMTP authentication.
+     * Must be run after hello().
+     * @see hello()
+     * @param string $username The user name
+     * @param string $password The password
+     * @param string $authtype The auth type (PLAIN, LOGIN, NTLM, CRAM-MD5, XOAUTH2)
+     * @param string $realm The auth realm for NTLM
+     * @param string $workstation The auth workstation for NTLM
+     * @param null|OAuth $OAuth An optional OAuth instance (@see PHPMailerOAuth)
+     * @return bool True if successfully authenticated.* @access public
+     */
+    public function authenticate(
+        $username,
+        $password,
+        $authtype = null,
+        $realm = '',
+        $workstation = '',
+        $OAuth = null
+    ) {
+        if (!$this->server_caps) {
+            $this->setError('Authentication is not allowed before HELO/EHLO');
+            return false;
         }
-        fputs($this->smtp_conn,$line_out . $this->CRLF);
-      }
+
+        if (array_key_exists('EHLO', $this->server_caps)) {
+            // SMTP extensions are available; try to find a proper authentication method
+            if (!array_key_exists('AUTH', $this->server_caps)) {
+                $this->setError('Authentication is not allowed at this stage');
+                // 'at this stage' means that auth may be allowed after the stage changes
+                // e.g. after STARTTLS
+                return false;
+            }
+
+            self::edebug('Auth method requested: ' . ($authtype ? $authtype : 'UNKNOWN'), self::DEBUG_LOWLEVEL);
+            self::edebug(
+                'Auth methods available on the server: ' . implode(',', $this->server_caps['AUTH']),
+                self::DEBUG_LOWLEVEL
+            );
+
+            if (empty($authtype)) {
+                foreach (array('CRAM-MD5', 'LOGIN', 'PLAIN', 'NTLM', 'XOAUTH2') as $method) {
+                    if (in_array($method, $this->server_caps['AUTH'])) {
+                        $authtype = $method;
+                        break;
+                    }
+                }
+                if (empty($authtype)) {
+                    $this->setError('No supported authentication methods found');
+                    return false;
+                }
+                self::edebug('Auth method selected: ' . $authtype, self::DEBUG_LOWLEVEL);
+            }
+
+            if (!in_array($authtype, $this->server_caps['AUTH'])) {
+                $this->setError("The requested authentication method \"$authtype\" is not supported by the server");
+                return false;
+            }
+        } elseif (empty($authtype)) {
+            $authtype = 'LOGIN';
+        }
+        switch ($authtype) {
+            case 'PLAIN':
+                // Start authentication
+                if (!$this->sendCommand('AUTH', 'AUTH PLAIN', 334)) {
+                    return false;
+                }
+                // Send encoded username and password
+                if (!$this->sendCommand(
+                    'User & Password',
+                    base64_encode("\0" . $username . "\0" . $password),
+                    235
+                )
+                ) {
+                    return false;
+                }
+                break;
+            case 'LOGIN':
+                // Start authentication
+                if (!$this->sendCommand('AUTH', 'AUTH LOGIN', 334)) {
+                    return false;
+                }
+                if (!$this->sendCommand("Username", base64_encode($username), 334)) {
+                    return false;
+                }
+                if (!$this->sendCommand("Password", base64_encode($password), 235)) {
+                    return false;
+                }
+                break;
+            case 'XOAUTH2':
+                //If the OAuth Instance is not set. Can be a case when PHPMailer is used
+                //instead of PHPMailerOAuth
+                if (is_null($OAuth)) {
+                    return false;
+                }
+                $oauth = $OAuth->getOauth64();
+
+                // Start authentication
+                if (!$this->sendCommand('AUTH', 'AUTH XOAUTH2 ' . $oauth, 235)) {
+                    return false;
+                }
+                break;
+            case 'NTLM':
+                /*
+                 * ntlm_sasl_client.php
+                 * Bundled with Permission
+                 *
+                 * How to telnet in windows:
+                 * http://technet.microsoft.com/en-us/library/aa995718%28EXCHG.65%29.aspx
+                 * PROTOCOL Docs http://curl.haxx.se/rfc/ntlm.html#ntlmSmtpAuthentication
+                 */
+                require_once 'extras/ntlm_sasl_client.php';
+                $temp = new stdClass;
+                $ntlm_client = new ntlm_sasl_client_class;
+                //Check that functions are available
+                if (!$ntlm_client->initialize($temp)) {
+                    $this->setError($temp->error);
+                    $this->edebug(
+                        'You need to enable some modules in your php.ini file: '
+                        . $this->error['error'],
+                        self::DEBUG_CLIENT
+                    );
+                    return false;
+                }
+                //msg1
+                $msg1 = $ntlm_client->typeMsg1($realm, $workstation); //msg1
+
+                if (!$this->sendCommand(
+                    'AUTH NTLM',
+                    'AUTH NTLM ' . base64_encode($msg1),
+                    334
+                )
+                ) {
+                    return false;
+                }
+                //Though 0 based, there is a white space after the 3 digit number
+                //msg2
+                $challenge = substr($this->last_reply, 3);
+                $challenge = base64_decode($challenge);
+                $ntlm_res = $ntlm_client->NTLMResponse(
+                    substr($challenge, 24, 8),
+                    $password
+                );
+                //msg3
+                $msg3 = $ntlm_client->typeMsg3(
+                    $ntlm_res,
+                    $username,
+                    $realm,
+                    $workstation
+                );
+                // send encoded username
+                return $this->sendCommand('Username', base64_encode($msg3), 235);
+            case 'CRAM-MD5':
+                // Start authentication
+                if (!$this->sendCommand('AUTH CRAM-MD5', 'AUTH CRAM-MD5', 334)) {
+                    return false;
+                }
+                // Get the challenge
+                $challenge = base64_decode(substr($this->last_reply, 4));
+
+                // Build the response
+                $response = $username . ' ' . $this->hmac($challenge, $password);
+
+                // send encoded credentials
+                return $this->sendCommand('Username', base64_encode($response), 235);
+            default:
+                $this->setError("Authentication method \"$authtype\" is not supported");
+                return false;
+        }
+        return true;
     }
 
-    // message data has been sent
-    fputs($this->smtp_conn, $this->CRLF . "." . $this->CRLF);
+    /**
+     * Calculate an MD5 HMAC hash.
+     * Works like hash_hmac('md5', $data, $key)
+     * in case that function is not available
+     * @param string $data The data to hash
+     * @param string $key The key to hash with
+     * @access protected
+     * @return string
+     */
+    protected function hmac($data, $key)
+    {
+        if (function_exists('hash_hmac')) {
+            return hash_hmac('md5', $data, $key);
+        }
 
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
+        // The following borrowed from
+        // http://php.net/manual/en/function.mhash.php#27225
 
-    if($this->do_debug >= 2) {
-      $this->edebug("SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />');
+        // RFC 2104 HMAC implementation for php.
+        // Creates an md5 HMAC.
+        // Eliminates the need to install mhash to compute a HMAC
+        // by Lance Rushing
+
+        $bytelen = 64; // byte length for md5
+        if (strlen($key) > $bytelen) {
+            $key = pack('H*', md5($key));
+        }
+        $key = str_pad($key, $bytelen, chr(0x00));
+        $ipad = str_pad('', $bytelen, chr(0x36));
+        $opad = str_pad('', $bytelen, chr(0x5c));
+        $k_ipad = $key ^ $ipad;
+        $k_opad = $key ^ $opad;
+
+        return md5($k_opad . pack('H*', md5($k_ipad . $data)));
     }
 
-    if($code != 250) {
-      $this->error =
-        array("error" => "DATA not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        $this->edebug("SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />');
-      }
-      return false;
-    }
-    return true;
-  }
-
-  /**
-   * Sends the HELO command to the smtp server.
-   * This makes sure that we and the server are in
-   * the same known state.
-   *
-   * Implements from rfc 821: HELO <SP> <domain> <CRLF>
-   *
-   * SMTP CODE SUCCESS: 250
-   * SMTP CODE ERROR  : 500, 501, 504, 421
-   * @access public
-   * @param string $host
-   * @return bool
-   */
-  public function Hello($host = '') {
-    $this->error = null; // so no confusion is caused
-
-    if(!$this->connected()) {
-      $this->error = array(
-            "error" => "Called Hello() without being connected");
-      return false;
-    }
-
-    // if hostname for HELO was not specified send default
-    if(empty($host)) {
-      // determine appropriate default to send to server
-      $host = "localhost";
-    }
-
-    // Send extended hello first (RFC 2821)
-    if(!$this->SendHello("EHLO", $host)) {
-      if(!$this->SendHello("HELO", $host)) {
+    /**
+     * Check connection state.
+     * @access public
+     * @return boolean True if connected.
+     */
+    public function connected()
+    {
+        if (is_resource($this->smtp_conn)) {
+            $sock_status = stream_get_meta_data($this->smtp_conn);
+            if ($sock_status['eof']) {
+                // The socket is valid but we are not connected
+                $this->edebug(
+                    'SMTP NOTICE: EOF caught while checking if connected',
+                    self::DEBUG_CLIENT
+                );
+                $this->close();
+                return false;
+            }
+            return true; // everything looks good
+        }
         return false;
-      }
     }
 
-    return true;
-  }
-
-  /**
-   * Sends a HELO/EHLO command.
-   * @access private
-   * @param string $hello
-   * @param string $host
-   * @return bool
-   */
-  private function SendHello($hello, $host) {
-    fputs($this->smtp_conn, $hello . " " . $host . $this->CRLF);
-
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
-
-    if($this->do_debug >= 2) {
-      $this->edebug("SMTP -> FROM SERVER: " . $rply . $this->CRLF . '<br />');
-    }
-
-    if($code != 250) {
-      $this->error =
-        array("error" => $hello . " not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        $this->edebug("SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />');
-      }
-      return false;
-    }
-
-    $this->helo_rply = $rply;
-
-    return true;
-  }
-
-  /**
-   * Starts a mail transaction from the email address specified in
-   * $from. Returns true if successful or false otherwise. If True
-   * the mail transaction is started and then one or more Recipient
-   * commands may be called followed by a Data command.
-   *
-   * Implements rfc 821: MAIL <SP> FROM:<reverse-path> <CRLF>
-   *
-   * SMTP CODE SUCCESS: 250
-   * SMTP CODE SUCCESS: 552,451,452
-   * SMTP CODE SUCCESS: 500,501,421
-   * @access public
-   * @param string $from
-   * @return bool
-   */
-  public function Mail($from) {
-    $this->error = null; // so no confusion is caused
-
-    if(!$this->connected()) {
-      $this->error = array(
-              "error" => "Called Mail() without being connected");
-      return false;
-    }
-
-    $useVerp = ($this->do_verp ? " XVERP" : "");
-    fputs($this->smtp_conn,"MAIL FROM:<" . $from . ">" . $useVerp . $this->CRLF);
-
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
-
-    if($this->do_debug >= 2) {
-      $this->edebug("SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />');
-    }
-
-    if($code != 250) {
-      $this->error =
-        array("error" => "MAIL not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        $this->edebug("SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />');
-      }
-      return false;
-    }
-    return true;
-  }
-
-  /**
-   * Sends the quit command to the server and then closes the socket
-   * if there is no error or the $close_on_error argument is true.
-   *
-   * Implements from rfc 821: QUIT <CRLF>
-   *
-   * SMTP CODE SUCCESS: 221
-   * SMTP CODE ERROR  : 500
-   * @access public
-   * @param bool $close_on_error
-   * @return bool
-   */
-  public function Quit($close_on_error = true) {
-    $this->error = null; // so there is no confusion
-
-    if(!$this->connected()) {
-      $this->error = array(
-              "error" => "Called Quit() without being connected");
-      return false;
-    }
-
-    // send the quit command to the server
-    fputs($this->smtp_conn,"quit" . $this->CRLF);
-
-    // get any good-bye messages
-    $byemsg = $this->get_lines();
-
-    if($this->do_debug >= 2) {
-      $this->edebug("SMTP -> FROM SERVER:" . $byemsg . $this->CRLF . '<br />');
-    }
-
-    $rval = true;
-    $e = null;
-
-    $code = substr($byemsg,0,3);
-    if($code != 221) {
-      // use e as a tmp var cause Close will overwrite $this->error
-      $e = array("error" => "SMTP server rejected quit command",
-                 "smtp_code" => $code,
-                 "smtp_rply" => substr($byemsg,4));
-      $rval = false;
-      if($this->do_debug >= 1) {
-        $this->edebug("SMTP -> ERROR: " . $e["error"] . ": " . $byemsg . $this->CRLF . '<br />');
-      }
-    }
-
-    if(empty($e) || $close_on_error) {
-      $this->Close();
-    }
-
-    return $rval;
-  }
-
-  /**
-   * Sends the command RCPT to the SMTP server with the TO: argument of $to.
-   * Returns true if the recipient was accepted false if it was rejected.
-   *
-   * Implements from rfc 821: RCPT <SP> TO:<forward-path> <CRLF>
-   *
-   * SMTP CODE SUCCESS: 250,251
-   * SMTP CODE FAILURE: 550,551,552,553,450,451,452
-   * SMTP CODE ERROR  : 500,501,503,421
-   * @access public
-   * @param string $to
-   * @return bool
-   */
-  public function Recipient($to) {
-    $this->error = null; // so no confusion is caused
-
-    if(!$this->connected()) {
-      $this->error = array(
-              "error" => "Called Recipient() without being connected");
-      return false;
-    }
-
-    fputs($this->smtp_conn,"RCPT TO:<" . $to . ">" . $this->CRLF);
-
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
-
-    if($this->do_debug >= 2) {
-      $this->edebug("SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />');
-    }
-
-    if($code != 250 && $code != 251) {
-      $this->error =
-        array("error" => "RCPT not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        $this->edebug("SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />');
-      }
-      return false;
-    }
-    return true;
-  }
-
-  /**
-   * Sends the RSET command to abort and transaction that is
-   * currently in progress. Returns true if successful false
-   * otherwise.
-   *
-   * Implements rfc 821: RSET <CRLF>
-   *
-   * SMTP CODE SUCCESS: 250
-   * SMTP CODE ERROR  : 500,501,504,421
-   * @access public
-   * @return bool
-   */
-  public function Reset() {
-    $this->error = null; // so no confusion is caused
-
-    if(!$this->connected()) {
-      $this->error = array(
-              "error" => "Called Reset() without being connected");
-      return false;
-    }
-
-    fputs($this->smtp_conn,"RSET" . $this->CRLF);
-
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
-
-    if($this->do_debug >= 2) {
-      $this->edebug("SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />');
-    }
-
-    if($code != 250) {
-      $this->error =
-        array("error" => "RSET failed",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        $this->edebug("SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />');
-      }
-      return false;
-    }
-
-    return true;
-  }
-
-  /**
-   * Starts a mail transaction from the email address specified in
-   * $from. Returns true if successful or false otherwise. If True
-   * the mail transaction is started and then one or more Recipient
-   * commands may be called followed by a Data command. This command
-   * will send the message to the users terminal if they are logged
-   * in and send them an email.
-   *
-   * Implements rfc 821: SAML <SP> FROM:<reverse-path> <CRLF>
-   *
-   * SMTP CODE SUCCESS: 250
-   * SMTP CODE SUCCESS: 552,451,452
-   * SMTP CODE SUCCESS: 500,501,502,421
-   * @access public
-   * @param string $from
-   * @return bool
-   */
-  public function SendAndMail($from) {
-    $this->error = null; // so no confusion is caused
-
-    if(!$this->connected()) {
-      $this->error = array(
-          "error" => "Called SendAndMail() without being connected");
-      return false;
-    }
-
-    fputs($this->smtp_conn,"SAML FROM:" . $from . $this->CRLF);
-
-    $rply = $this->get_lines();
-    $code = substr($rply,0,3);
-
-    if($this->do_debug >= 2) {
-      $this->edebug("SMTP -> FROM SERVER:" . $rply . $this->CRLF . '<br />');
-    }
-
-    if($code != 250) {
-      $this->error =
-        array("error" => "SAML not accepted from server",
-              "smtp_code" => $code,
-              "smtp_msg" => substr($rply,4));
-      if($this->do_debug >= 1) {
-        $this->edebug("SMTP -> ERROR: " . $this->error["error"] . ": " . $rply . $this->CRLF . '<br />');
-      }
-      return false;
-    }
-    return true;
-  }
-
-  /**
-   * This is an optional command for SMTP that this class does not
-   * support. This method is here to make the RFC821 Definition
-   * complete for this class and __may__ be implimented in the future
-   *
-   * Implements from rfc 821: TURN <CRLF>
-   *
-   * SMTP CODE SUCCESS: 250
-   * SMTP CODE FAILURE: 502
-   * SMTP CODE ERROR  : 500, 503
-   * @access public
-   * @return bool
-   */
-  public function Turn() {
-    $this->error = array("error" => "This method, TURN, of the SMTP ".
-                                    "is not implemented");
-    if($this->do_debug >= 1) {
-      $this->edebug("SMTP -> NOTICE: " . $this->error["error"] . $this->CRLF . '<br />');
-    }
-    return false;
-  }
-
-  /**
-  * Get the current error
-  * @access public
-  * @return array
-  */
-  public function getError() {
-    return $this->error;
-  }
-
-  /////////////////////////////////////////////////
-  // INTERNAL FUNCTIONS
-  /////////////////////////////////////////////////
-
-  /**
-   * Read in as many lines as possible
-   * either before eof or socket timeout occurs on the operation.
-   * With SMTP we can tell if we have more lines to read if the
-   * 4th character is '-' symbol. If it is a space then we don't
-   * need to read anything else.
-   * @access private
-   * @return string
-   */
-  private function get_lines() {
-    $data = "";
-    $endtime = 0;
-    /* If for some reason the fp is bad, don't inf loop */
-    if (!is_resource($this->smtp_conn)) {
-      return $data;
-    }
-    stream_set_timeout($this->smtp_conn, $this->Timeout);
-    if ($this->Timelimit > 0) {
-      $endtime = time() + $this->Timelimit;
-    }
-    while(is_resource($this->smtp_conn) && !feof($this->smtp_conn)) {
-      $str = @fgets($this->smtp_conn,515);
-      if($this->do_debug >= 4) {
-        $this->edebug("SMTP -> get_lines(): \$data was \"$data\"" . $this->CRLF . '<br />');
-        $this->edebug("SMTP -> get_lines(): \$str is \"$str\"" . $this->CRLF . '<br />');
-      }
-      $data .= $str;
-      if($this->do_debug >= 4) {
-        $this->edebug("SMTP -> get_lines(): \$data is \"$data\"" . $this->CRLF . '<br />');
-      }
-      // if 4th character is a space, we are done reading, break the loop
-      if(substr($str,3,1) == " ") { break; }
-      // Timed-out? Log and break
-      $info = stream_get_meta_data($this->smtp_conn);
-      if ($info['timed_out']) {
-        if($this->do_debug >= 4) {
-          $this->edebug("SMTP -> get_lines(): timed-out (" . $this->Timeout . " seconds) <br />");
+    /**
+     * Close the socket and clean up the state of the class.
+     * Don't use this function without first trying to use QUIT.
+     * @see quit()
+     * @access public
+     * @return void
+     */
+    public function close()
+    {
+        $this->setError('');
+        $this->server_caps = null;
+        $this->helo_rply = null;
+        if (is_resource($this->smtp_conn)) {
+            // close the connection and cleanup
+            fclose($this->smtp_conn);
+            $this->smtp_conn = null; //Makes for cleaner serialization
+            $this->edebug('Connection: closed', self::DEBUG_CONNECTION);
         }
-        break;
-      }
-      // Now check if reads took too long
-      if ($endtime) {
-        if (time() > $endtime) {
-          if($this->do_debug >= 4) {
-            $this->edebug("SMTP -> get_lines(): timelimit reached (" . $this->Timelimit . " seconds) <br />");
-          }
-          break;
-        }
-      }
     }
-    return $data;
-  }
 
+    /**
+     * Send an SMTP DATA command.
+     * Issues a data command and sends the msg_data to the server,
+     * finializing the mail transaction. $msg_data is the message
+     * that is to be send with the headers. Each header needs to be
+     * on a single line followed by a <CRLF> with the message headers
+     * and the message body being separated by and additional <CRLF>.
+     * Implements rfc 821: DATA <CRLF>
+     * @param string $msg_data Message data to send
+     * @access public
+     * @return boolean
+     */
+    public function data($msg_data)
+    {
+        //This will use the standard timelimit
+        if (!$this->sendCommand('DATA', 'DATA', 354)) {
+            return false;
+        }
+
+        /* The server is ready to accept data!
+         * According to rfc821 we should not send more than 1000 characters on a single line (including the CRLF)
+         * so we will break the data up into lines by \r and/or \n then if needed we will break each of those into
+         * smaller lines to fit within the limit.
+         * We will also look for lines that start with a '.' and prepend an additional '.'.
+         * NOTE: this does not count towards line-length limit.
+         */
+
+        // Normalize line breaks before exploding
+        $lines = explode("\n", str_replace(array("\r\n", "\r"), "\n", $msg_data));
+
+        /* To distinguish between a complete RFC822 message and a plain message body, we check if the first field
+         * of the first line (':' separated) does not contain a space then it _should_ be a header and we will
+         * process all lines before a blank line as headers.
+         */
+
+        $field = substr($lines[0], 0, strpos($lines[0], ':'));
+        $in_headers = false;
+        if (!empty($field) && strpos($field, ' ') === false) {
+            $in_headers = true;
+        }
+
+        foreach ($lines as $line) {
+            $lines_out = array();
+            if ($in_headers and $line == '') {
+                $in_headers = false;
+            }
+            //Break this line up into several smaller lines if it's too long
+            //Micro-optimisation: isset($str[$len]) is faster than (strlen($str) > $len),
+            while (isset($line[self::MAX_LINE_LENGTH])) {
+                //Working backwards, try to find a space within the last MAX_LINE_LENGTH chars of the line to break on
+                //so as to avoid breaking in the middle of a word
+                $pos = strrpos(substr($line, 0, self::MAX_LINE_LENGTH), ' ');
+                //Deliberately matches both false and 0
+                if (!$pos) {
+                    //No nice break found, add a hard break
+                    $pos = self::MAX_LINE_LENGTH - 1;
+                    $lines_out[] = substr($line, 0, $pos);
+                    $line = substr($line, $pos);
+                } else {
+                    //Break at the found point
+                    $lines_out[] = substr($line, 0, $pos);
+                    //Move along by the amount we dealt with
+                    $line = substr($line, $pos + 1);
+                }
+                //If processing headers add a LWSP-char to the front of new line RFC822 section 3.1.1
+                if ($in_headers) {
+                    $line = "\t" . $line;
+                }
+            }
+            $lines_out[] = $line;
+
+            //Send the lines to the server
+            foreach ($lines_out as $line_out) {
+                //RFC2821 section 4.5.2
+                if (!empty($line_out) and $line_out[0] == '.') {
+                    $line_out = '.' . $line_out;
+                }
+                $this->client_send($line_out . self::CRLF);
+            }
+        }
+
+        //Message data has been sent, complete the command
+        //Increase timelimit for end of DATA command
+        $savetimelimit = $this->Timelimit;
+        $this->Timelimit = $this->Timelimit * 2;
+        $result = $this->sendCommand('DATA END', '.', 250);
+        $this->recordLastTransactionID();
+        //Restore timelimit
+        $this->Timelimit = $savetimelimit;
+        return $result;
+    }
+
+    /**
+     * Send an SMTP HELO or EHLO command.
+     * Used to identify the sending server to the receiving server.
+     * This makes sure that client and server are in a known state.
+     * Implements RFC 821: HELO <SP> <domain> <CRLF>
+     * and RFC 2821 EHLO.
+     * @param string $host The host name or IP to connect to
+     * @access public
+     * @return boolean
+     */
+    public function hello($host = '')
+    {
+        //Try extended hello first (RFC 2821)
+        return (boolean)($this->sendHello('EHLO', $host) or $this->sendHello('HELO', $host));
+    }
+
+    /**
+     * Send an SMTP HELO or EHLO command.
+     * Low-level implementation used by hello()
+     * @see hello()
+     * @param string $hello The HELO string
+     * @param string $host The hostname to say we are
+     * @access protected
+     * @return boolean
+     */
+    protected function sendHello($hello, $host)
+    {
+        $noerror = $this->sendCommand($hello, $hello . ' ' . $host, 250);
+        $this->helo_rply = $this->last_reply;
+        if ($noerror) {
+            $this->parseHelloFields($hello);
+        } else {
+            $this->server_caps = null;
+        }
+        return $noerror;
+    }
+
+    /**
+     * Parse a reply to HELO/EHLO command to discover server extensions.
+     * In case of HELO, the only parameter that can be discovered is a server name.
+     * @access protected
+     * @param string $type - 'HELO' or 'EHLO'
+     */
+    protected function parseHelloFields($type)
+    {
+        $this->server_caps = array();
+        $lines = explode("\n", $this->helo_rply);
+
+        foreach ($lines as $n => $s) {
+            //First 4 chars contain response code followed by - or space
+            $s = trim(substr($s, 4));
+            if (empty($s)) {
+                continue;
+            }
+            $fields = explode(' ', $s);
+            if (!empty($fields)) {
+                if (!$n) {
+                    $name = $type;
+                    $fields = $fields[0];
+                } else {
+                    $name = array_shift($fields);
+                    switch ($name) {
+                        case 'SIZE':
+                            $fields = ($fields ? $fields[0] : 0);
+                            break;
+                        case 'AUTH':
+                            if (!is_array($fields)) {
+                                $fields = array();
+                            }
+                            break;
+                        default:
+                            $fields = true;
+                    }
+                }
+                $this->server_caps[$name] = $fields;
+            }
+        }
+    }
+
+    /**
+     * Send an SMTP MAIL command.
+     * Starts a mail transaction from the email address specified in
+     * $from. Returns true if successful or false otherwise. If True
+     * the mail transaction is started and then one or more recipient
+     * commands may be called followed by a data command.
+     * Implements rfc 821: MAIL <SP> FROM:<reverse-path> <CRLF>
+     * @param string $from Source address of this message
+     * @access public
+     * @return boolean
+     */
+    public function mail($from)
+    {
+        $useVerp = ($this->do_verp ? ' XVERP' : '');
+        return $this->sendCommand(
+            'MAIL FROM',
+            'MAIL FROM:<' . $from . '>' . $useVerp,
+            250
+        );
+    }
+
+    /**
+     * Send an SMTP QUIT command.
+     * Closes the socket if there is no error or the $close_on_error argument is true.
+     * Implements from rfc 821: QUIT <CRLF>
+     * @param boolean $close_on_error Should the connection close if an error occurs?
+     * @access public
+     * @return boolean
+     */
+    public function quit($close_on_error = true)
+    {
+        $noerror = $this->sendCommand('QUIT', 'QUIT', 221);
+        $err = $this->error; //Save any error
+        if ($noerror or $close_on_error) {
+            $this->close();
+            $this->error = $err; //Restore any error from the quit command
+        }
+        return $noerror;
+    }
+
+    /**
+     * Send an SMTP RCPT command.
+     * Sets the TO argument to $toaddr.
+     * Returns true if the recipient was accepted false if it was rejected.
+     * Implements from rfc 821: RCPT <SP> TO:<forward-path> <CRLF>
+     * @param string $address The address the message is being sent to
+     * @access public
+     * @return boolean
+     */
+    public function recipient($address)
+    {
+        return $this->sendCommand(
+            'RCPT TO',
+            'RCPT TO:<' . $address . '>',
+            array(250, 251)
+        );
+    }
+
+    /**
+     * Send an SMTP RSET command.
+     * Abort any transaction that is currently in progress.
+     * Implements rfc 821: RSET <CRLF>
+     * @access public
+     * @return boolean True on success.
+     */
+    public function reset()
+    {
+        return $this->sendCommand('RSET', 'RSET', 250);
+    }
+
+    /**
+     * Send a command to an SMTP server and check its return code.
+     * @param string $command The command name - not sent to the server
+     * @param string $commandstring The actual command to send
+     * @param integer|array $expect One or more expected integer success codes
+     * @access protected
+     * @return boolean True on success.
+     */
+    protected function sendCommand($command, $commandstring, $expect)
+    {
+        if (!$this->connected()) {
+            $this->setError("Called $command without being connected");
+            return false;
+        }
+        //Reject line breaks in all commands
+        if (strpos($commandstring, "\n") !== false or strpos($commandstring, "\r") !== false) {
+            $this->setError("Command '$command' contained line breaks");
+            return false;
+        }
+        $this->client_send($commandstring . self::CRLF);
+
+        $this->last_reply = $this->get_lines();
+        // Fetch SMTP code and possible error code explanation
+        $matches = array();
+        if (preg_match("/^([0-9]{3})[ -](?:([0-9]\\.[0-9]\\.[0-9]) )?/", $this->last_reply, $matches)) {
+            $code = $matches[1];
+            $code_ex = (count($matches) > 2 ? $matches[2] : null);
+            // Cut off error code from each response line
+            $detail = preg_replace(
+                "/{$code}[ -]" .
+                ($code_ex ? str_replace('.', '\\.', $code_ex) . ' ' : '') . "/m",
+                '',
+                $this->last_reply
+            );
+        } else {
+            // Fall back to simple parsing if regex fails
+            $code = substr($this->last_reply, 0, 3);
+            $code_ex = null;
+            $detail = substr($this->last_reply, 4);
+        }
+
+        $this->edebug('SERVER -> CLIENT: ' . $this->last_reply, self::DEBUG_SERVER);
+
+        if (!in_array($code, (array)$expect)) {
+            $this->setError(
+                "$command command failed",
+                $detail,
+                $code,
+                $code_ex
+            );
+            $this->edebug(
+                'SMTP ERROR: ' . $this->error['error'] . ': ' . $this->last_reply,
+                self::DEBUG_CLIENT
+            );
+            return false;
+        }
+
+        $this->setError('');
+        return true;
+    }
+
+    /**
+     * Send an SMTP SAML command.
+     * Starts a mail transaction from the email address specified in $from.
+     * Returns true if successful or false otherwise. If True
+     * the mail transaction is started and then one or more recipient
+     * commands may be called followed by a data command. This command
+     * will send the message to the users terminal if they are logged
+     * in and send them an email.
+     * Implements rfc 821: SAML <SP> FROM:<reverse-path> <CRLF>
+     * @param string $from The address the message is from
+     * @access public
+     * @return boolean
+     */
+    public function sendAndMail($from)
+    {
+        return $this->sendCommand('SAML', "SAML FROM:$from", 250);
+    }
+
+    /**
+     * Send an SMTP VRFY command.
+     * @param string $name The name to verify
+     * @access public
+     * @return boolean
+     */
+    public function verify($name)
+    {
+        return $this->sendCommand('VRFY', "VRFY $name", array(250, 251));
+    }
+
+    /**
+     * Send an SMTP NOOP command.
+     * Used to keep keep-alives alive, doesn't actually do anything
+     * @access public
+     * @return boolean
+     */
+    public function noop()
+    {
+        return $this->sendCommand('NOOP', 'NOOP', 250);
+    }
+
+    /**
+     * Send an SMTP TURN command.
+     * This is an optional command for SMTP that this class does not support.
+     * This method is here to make the RFC821 Definition complete for this class
+     * and _may_ be implemented in future
+     * Implements from rfc 821: TURN <CRLF>
+     * @access public
+     * @return boolean
+     */
+    public function turn()
+    {
+        $this->setError('The SMTP TURN command is not implemented');
+        $this->edebug('SMTP NOTICE: ' . $this->error['error'], self::DEBUG_CLIENT);
+        return false;
+    }
+
+    /**
+     * Send raw data to the server.
+     * @param string $data The data to send
+     * @access public
+     * @return integer|boolean The number of bytes sent to the server or false on error
+     */
+    public function client_send($data)
+    {
+        $this->edebug("CLIENT -> SERVER: $data", self::DEBUG_CLIENT);
+        set_error_handler(array($this, 'errorHandler'));
+        $result = fwrite($this->smtp_conn, $data);
+        restore_error_handler();
+        return $result;
+    }
+
+    /**
+     * Get the latest error.
+     * @access public
+     * @return array
+     */
+    public function getError()
+    {
+        return $this->error;
+    }
+
+    /**
+     * Get SMTP extensions available on the server
+     * @access public
+     * @return array|null
+     */
+    public function getServerExtList()
+    {
+        return $this->server_caps;
+    }
+
+    /**
+     * A multipurpose method
+     * The method works in three ways, dependent on argument value and current state
+     *   1. HELO/EHLO was not sent - returns null and set up $this->error
+     *   2. HELO was sent
+     *     $name = 'HELO': returns server name
+     *     $name = 'EHLO': returns boolean false
+     *     $name = any string: returns null and set up $this->error
+     *   3. EHLO was sent
+     *     $name = 'HELO'|'EHLO': returns server name
+     *     $name = any string: if extension $name exists, returns boolean True
+     *       or its options. Otherwise returns boolean False
+     * In other words, one can use this method to detect 3 conditions:
+     *  - null returned: handshake was not or we don't know about ext (refer to $this->error)
+     *  - false returned: the requested feature exactly not exists
+     *  - positive value returned: the requested feature exists
+     * @param string $name Name of SMTP extension or 'HELO'|'EHLO'
+     * @return mixed
+     */
+    public function getServerExt($name)
+    {
+        if (!$this->server_caps) {
+            $this->setError('No HELO/EHLO was sent');
+            return null;
+        }
+
+        // the tight logic knot ;)
+        if (!array_key_exists($name, $this->server_caps)) {
+            if ($name == 'HELO') {
+                return $this->server_caps['EHLO'];
+            }
+            if ($name == 'EHLO' || array_key_exists('EHLO', $this->server_caps)) {
+                return false;
+            }
+            $this->setError('HELO handshake was used. Client knows nothing about server extensions');
+            return null;
+        }
+
+        return $this->server_caps[$name];
+    }
+
+    /**
+     * Get the last reply from the server.
+     * @access public
+     * @return string
+     */
+    public function getLastReply()
+    {
+        return $this->last_reply;
+    }
+
+    /**
+     * Read the SMTP server's response.
+     * Either before eof or socket timeout occurs on the operation.
+     * With SMTP we can tell if we have more lines to read if the
+     * 4th character is '-' symbol. If it is a space then we don't
+     * need to read anything else.
+     * @access protected
+     * @return string
+     */
+    protected function get_lines()
+    {
+        // If the connection is bad, give up straight away
+        if (!is_resource($this->smtp_conn)) {
+            return '';
+        }
+        $data = '';
+        $endtime = 0;
+        stream_set_timeout($this->smtp_conn, $this->Timeout);
+        if ($this->Timelimit > 0) {
+            $endtime = time() + $this->Timelimit;
+        }
+        while (is_resource($this->smtp_conn) && !feof($this->smtp_conn)) {
+            $str = @fgets($this->smtp_conn, 515);
+            $this->edebug("SMTP -> get_lines(): \$data is \"$data\"", self::DEBUG_LOWLEVEL);
+            $this->edebug("SMTP -> get_lines(): \$str is  \"$str\"", self::DEBUG_LOWLEVEL);
+            $data .= $str;
+            // If response is only 3 chars (not valid, but RFC5321 S4.2 says it must be handled),
+            // or 4th character is a space, we are done reading, break the loop,
+            // string array access is a micro-optimisation over strlen
+            if (!isset($str[3]) or (isset($str[3]) and $str[3] == ' ')) {
+                break;
+            }
+            // Timed-out? Log and break
+            $info = stream_get_meta_data($this->smtp_conn);
+            if ($info['timed_out']) {
+                $this->edebug(
+                    'SMTP -> get_lines(): timed-out (' . $this->Timeout . ' sec)',
+                    self::DEBUG_LOWLEVEL
+                );
+                break;
+            }
+            // Now check if reads took too long
+            if ($endtime and time() > $endtime) {
+                $this->edebug(
+                    'SMTP -> get_lines(): timelimit reached (' .
+                    $this->Timelimit . ' sec)',
+                    self::DEBUG_LOWLEVEL
+                );
+                break;
+            }
+        }
+        return $data;
+    }
+
+    /**
+     * Enable or disable VERP address generation.
+     * @param boolean $enabled
+     */
+    public function setVerp($enabled = false)
+    {
+        $this->do_verp = $enabled;
+    }
+
+    /**
+     * Get VERP address generation mode.
+     * @return boolean
+     */
+    public function getVerp()
+    {
+        return $this->do_verp;
+    }
+
+    /**
+     * Set error messages and codes.
+     * @param string $message The error message
+     * @param string $detail Further detail on the error
+     * @param string $smtp_code An associated SMTP error code
+     * @param string $smtp_code_ex Extended SMTP code
+     */
+    protected function setError($message, $detail = '', $smtp_code = '', $smtp_code_ex = '')
+    {
+        $this->error = array(
+            'error' => $message,
+            'detail' => $detail,
+            'smtp_code' => $smtp_code,
+            'smtp_code_ex' => $smtp_code_ex
+        );
+    }
+
+    /**
+     * Set debug output method.
+     * @param string|callable $method The name of the mechanism to use for debugging output, or a callable to handle it.
+     */
+    public function setDebugOutput($method = 'echo')
+    {
+        $this->Debugoutput = $method;
+    }
+
+    /**
+     * Get debug output method.
+     * @return string
+     */
+    public function getDebugOutput()
+    {
+        return $this->Debugoutput;
+    }
+
+    /**
+     * Set debug output level.
+     * @param integer $level
+     */
+    public function setDebugLevel($level = 0)
+    {
+        $this->do_debug = $level;
+    }
+
+    /**
+     * Get debug output level.
+     * @return integer
+     */
+    public function getDebugLevel()
+    {
+        return $this->do_debug;
+    }
+
+    /**
+     * Set SMTP timeout.
+     * @param integer $timeout
+     */
+    public function setTimeout($timeout = 0)
+    {
+        $this->Timeout = $timeout;
+    }
+
+    /**
+     * Get SMTP timeout.
+     * @return integer
+     */
+    public function getTimeout()
+    {
+        return $this->Timeout;
+    }
+
+    /**
+     * Reports an error number and string.
+     * @param integer $errno The error number returned by PHP.
+     * @param string $errmsg The error message returned by PHP.
+     * @param string $errfile The file the error occurred in
+     * @param integer $errline The line number the error occurred on
+     */
+    protected function errorHandler($errno, $errmsg, $errfile = '', $errline = 0)
+    {
+        $notice = 'Connection failed.';
+        $this->setError(
+            $notice,
+            $errno,
+            $errmsg
+        );
+        $this->edebug(
+            $notice . ' Error #' . $errno . ': ' . $errmsg . " [$errfile line $errline]",
+            self::DEBUG_CONNECTION
+        );
+    }
+
+    /**
+     * Extract and return the ID of the last SMTP transaction based on
+     * a list of patterns provided in SMTP::$smtp_transaction_id_patterns.
+     * Relies on the host providing the ID in response to a DATA command.
+     * If no reply has been received yet, it will return null.
+     * If no pattern was matched, it will return false.
+     * @return bool|null|string
+     */
+    protected function recordLastTransactionID()
+    {
+        $reply = $this->getLastReply();
+
+        if (empty($reply)) {
+            $this->last_smtp_transaction_id = null;
+        } else {
+            $this->last_smtp_transaction_id = false;
+            foreach ($this->smtp_transaction_id_patterns as $smtp_transaction_id_pattern) {
+                if (preg_match($smtp_transaction_id_pattern, $reply, $matches)) {
+                    $this->last_smtp_transaction_id = $matches[1];
+                }
+            }
+        }
+
+        return $this->last_smtp_transaction_id;
+    }
+
+    /**
+     * Get the queue/transaction ID of the last SMTP transaction
+     * If no reply has been received yet, it will return null.
+     * If no pattern was matched, it will return false.
+     * @return bool|null|string
+     * @see recordLastTransactionID()
+     */
+    public function getLastTransactionID()
+    {
+        return $this->last_smtp_transaction_id;
+    }
 }
-?>
diff --git a/resources/require.php b/resources/require.php
index 31a620650e..e60c640b0b 100644
--- a/resources/require.php
+++ b/resources/require.php
@@ -28,7 +28,7 @@
 	include "root.php";
 
 //find and include the config.php file
-    $config_exists = false;
+	$config_exists = false;
 	if (file_exists("/etc/fusionpbx/config.php")) {
 		$config_exists = true;
 		include "/etc/fusionpbx/config.php";
@@ -43,79 +43,7 @@
 	}
 
 //class auto loader
-	if (!class_exists('auto_loader')) {
-		class auto_loader {
-			public function __construct() {
-				spl_autoload_register(array($this, 'loader'));
-			}
-			private function loader($class_name) {
-				//set the default value
-					$class_found = false;
-
-				//sanitize the class name
-					$class_name = preg_replace('[^a-zA-Z0-9_]', '', $class_name);
-
-				//save the log to the syslog server
-					if ($_REQUEST['debug'] == 'true') {
-						openlog("XML CDR", LOG_PID | LOG_PERROR, LOG_LOCAL0);
-					}
-
-				//find the most relevant class name
-					if (!$class_found && file_exists($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/resources/classes/".$class_name.".php")) {
-						//first priority
-						$path = $_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/resources/classes/".$class_name.".php";
-						$class_found = true;
-						if ($_REQUEST['debug'] == 'true') {
-							syslog(LOG_WARNING, "[php][autoloader] name: ".$class_name.", path: ".$path.", line: ".__line__);
-						}
-						include $path;
-					}
-					elseif (!$class_found && file_exists($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/core/".$class_name."/resources/classes/".$class_name.".php")) {
-						//second priority
-						$path = $_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/core/".$class_name."/resources/classes/".$class_name.".php";
-						$class_found = true;
-						if ($_REQUEST['debug'] == 'true') {
-							syslog(LOG_WARNING, "[php][autoloader] name: ".$class_name.", path: ".$path.", line: ".__line__);
-						}
-						include $path;
-					}
-					elseif (!$class_found && file_exists($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/app/".$class_name."/resources/classes/".$class_name.".php")) {
-						//third priority
-						$path = $_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/app/".$class_name."/resources/classes/".$class_name.".php";
-						$class_found = true;
-						if ($_REQUEST['debug'] == 'true') {
-							syslog(LOG_WARNING, "[php][autoloader] name: ".$class_name.", path: ".$path.", line: ".__line__);
-						}
-						include $path;
-					}
-
-				//use glob for a more exensive search for the classes (note: GLOB_BRACE doesn't work on some systems)
-					if (!$class_found && !class_exists($class_name)) {
-						//fourth priority
-						$results_1 = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/*/*/resources/classes/".$class_name.".php");
-						$results_2 = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/resources/classes/".$class_name.".php");
-						$results = array_merge((array)$results_1,(array)$results_2);
-						unset($results_1, $results_2);
-						foreach ($results as &$class_file) {
-							if (!$class_found) {
-								$class_found = true;
-								if ($_REQUEST['debug'] == 'true') {
-									syslog(LOG_WARNING, "[php][autoloader] name: ".$class_name.", path: ".$class_file.", line: ".__line__);
-								}
-								include $class_file;
-								break;
-							}
-						}
-						unset($results);
-					}
-
-				//save the log to the syslog server
-					if ($_REQUEST['debug'] == 'true') {
-						closelog();
-					}
-			}
-		}
-	}
+	include "resources/classes/auto_loader.php";
 	$autoload = new auto_loader();
 
 //additional includes
@@ -123,6 +51,7 @@
 	require_once "resources/functions.php";
 	if ($config_exists) {
 		require "resources/pdo.php";
+		require_once "resources/cidr.php";
 		if (file_exists($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/resources/switch.php")) {
 			require_once "resources/switch.php";
 		}
diff --git a/resources/switch.php b/resources/switch.php
index 76652fcdb3..70f0f86e0b 100644
--- a/resources/switch.php
+++ b/resources/switch.php
@@ -964,7 +964,9 @@ if (!function_exists('save_sip_profile_xml')) {
 
 		// make profile dir if needed
 			$profile_dir = $_SESSION['switch']['conf']['dir']."/sip_profiles";
-			if (!is_readable($profile_dir)) { event_socket_mkdir($profile_dir); }
+			if (!is_readable($profile_dir)) {
+				mkdir($profile_dir, 0770, false);
+			}
 
 		//get the sip profiles from the database
 			$sql = "select * from v_sip_profiles";
@@ -1021,7 +1023,9 @@ if (!function_exists('save_sip_profile_xml')) {
 						}
 
 					//if the directory does not exist then create it
-						if (!is_readable($profile_dir.'/'.$sip_profile_name)) { event_socket_mkdir($profile_dir.'/'.$sip_profile_name); }
+						if (!is_readable($profile_dir.'/'.$sip_profile_name)) {
+							mkdir($profile_dir.'/'.$sip_profile_name, 0770, false);
+						}
 
 				}
 				unset($result, $row);
diff --git a/resources/templates/conf/autoload_configs/conference.conf b/resources/templates/conf/autoload_configs/conference.conf
index 6e646a5631..7c9e925b7d 100644
--- a/resources/templates/conf/autoload_configs/conference.conf
+++ b/resources/templates/conf/autoload_configs/conference.conf
@@ -264,6 +264,147 @@
 			<param name="comfort-noise" value="true"/>
 		</profile>
 
+		<profile name="video-mcu-stereo">
+			<param name="domain" value="$${domain}"/>
+			<param name="rate" value="48000"/>
+			<param name="channels" value="2"/>
+			<param name="interval" value="20"/>
+			<param name="energy-level" value="200"/>
+			<!-- <param name="tts-engine" value="flite"/> -->
+			<!-- <param name="tts-voice" value="kal16"/> -->
+			<param name="muted-sound" value="conference/conf-muted.wav"/>
+			<param name="unmuted-sound" value="conference/conf-unmuted.wav"/>
+			<param name="alone-sound" value="conference/conf-alone.wav"/>
+			<param name="moh-sound" value="$${hold_music}"/>
+			<param name="enter-sound" value="tone_stream://%(200,0,500,600,700)"/>
+			<param name="exit-sound" value="tone_stream://%(500,0,300,200,100,50,25)"/>
+			<param name="kicked-sound" value="conference/conf-kicked.wav"/>
+			<param name="locked-sound" value="conference/conf-locked.wav"/>
+			<param name="is-locked-sound" value="conference/conf-is-locked.wav"/>
+			<param name="is-unlocked-sound" value="conference/conf-is-unlocked.wav"/>
+			<param name="pin-sound" value="conference/conf-pin.wav"/>
+			<param name="bad-pin-sound" value="conference/conf-bad-pin.wav"/>
+			<param name="caller-id-name" value="$${outbound_caller_name}"/>
+			<param name="caller-id-number" value="$${outbound_caller_id}"/>
+			<param name="comfort-noise" value="false"/>
+			<param name="conference-flags" value="livearray-json-status|json-events|video-floor-only|rfc-4579|livearray-sync|minimize-video-encoding|manage-inbound-video-bitrate|video-required-for-canvas|video-mute-exit-canvas|mute-detect"/>
+			<param name="video-auto-floor-msec" value="1000"/>
+			<param name="video-mode" value="mux"/>
+			<param name="video-layout-name" value="3x3"/>
+			<param name="video-layout-name" value="group:grid"/>
+			<param name="video-canvas-size" value="1920x1080"/>
+			<param name="video-canvas-bgcolor" value="#333333"/>
+			<param name="video-layout-bgcolor" value="#000000"/>
+			<param name="video-codec-bandwidth" value="3mb"/>
+			<param name="video-fps" value="30"/>
+			<!-- <param name="video-codec-config-profile-name" value="conference"/> -->
+		</profile>
+
+		<profile name="video-mcu-stereo-720">
+			<param name="domain" value="$${domain}"/>
+			<param name="rate" value="48000"/>
+			<param name="channels" value="2"/>
+			<param name="interval" value="20"/>
+			<param name="energy-level" value="200"/>
+			<!-- <param name="tts-engine" value="flite"/> -->
+			<!-- <param name="tts-voice" value="kal16"/> -->
+			<param name="muted-sound" value="conference/conf-muted.wav"/>
+			<param name="unmuted-sound" value="conference/conf-unmuted.wav"/>
+			<param name="alone-sound" value="conference/conf-alone.wav"/>
+			<param name="moh-sound" value="$${hold_music}"/>
+			<param name="enter-sound" value="tone_stream://%(200,0,500,600,700)"/>
+			<param name="exit-sound" value="tone_stream://%(500,0,300,200,100,50,25)"/>
+			<param name="kicked-sound" value="conference/conf-kicked.wav"/>
+			<param name="locked-sound" value="conference/conf-locked.wav"/>
+			<param name="is-locked-sound" value="conference/conf-is-locked.wav"/>
+			<param name="is-unlocked-sound" value="conference/conf-is-unlocked.wav"/>
+			<param name="pin-sound" value="conference/conf-pin.wav"/>
+			<param name="bad-pin-sound" value="conference/conf-bad-pin.wav"/>
+			<param name="caller-id-name" value="$${outbound_caller_name}"/>
+			<param name="caller-id-number" value="$${outbound_caller_id}"/>
+			<param name="comfort-noise" value="false"/>
+			<param name="conference-flags" value="livearray-json-status|json-events|video-floor-only|rfc-4579|livearray-sync|minimize-video-encoding|manage-inbound-video-bitrate|video-required-for-canvas|video-mute-exit-canvas|mute-detect"/>
+			<param name="video-auto-floor-msec" value="1000"/>
+			<param name="video-mode" value="mux"/>
+			<param name="video-layout-name" value="3x3"/>
+			<param name="video-layout-name" value="group:grid"/>
+			<param name="video-canvas-size" value="1280x720"/>
+			<param name="video-canvas-bgcolor" value="#333333"/>
+			<param name="video-layout-bgcolor" value="#000000"/>
+			<param name="video-codec-bandwidth" value="3mb"/>
+			<param name="video-fps" value="30"/>
+		</profile>
+
+		<profile name="video-mcu-stereo-480">
+			<param name="domain" value="$${domain}"/>
+			<param name="rate" value="48000"/>
+			<param name="channels" value="2"/>
+			<param name="interval" value="20"/>
+			<param name="energy-level" value="200"/>
+			<!-- <param name="tts-engine" value="flite"/> -->
+			<!-- <param name="tts-voice" value="kal16"/> -->
+			<param name="muted-sound" value="conference/conf-muted.wav"/>
+			<param name="unmuted-sound" value="conference/conf-unmuted.wav"/>
+			<param name="alone-sound" value="conference/conf-alone.wav"/>
+			<param name="moh-sound" value="$${hold_music}"/>
+			<param name="enter-sound" value="tone_stream://%(200,0,500,600,700)"/>
+			<param name="exit-sound" value="tone_stream://%(500,0,300,200,100,50,25)"/>
+			<param name="kicked-sound" value="conference/conf-kicked.wav"/>
+			<param name="locked-sound" value="conference/conf-locked.wav"/>
+			<param name="is-locked-sound" value="conference/conf-is-locked.wav"/>
+			<param name="is-unlocked-sound" value="conference/conf-is-unlocked.wav"/>
+			<param name="pin-sound" value="conference/conf-pin.wav"/>
+			<param name="bad-pin-sound" value="conference/conf-bad-pin.wav"/>
+			<param name="caller-id-name" value="$${outbound_caller_name}"/>
+			<param name="caller-id-number" value="$${outbound_caller_id}"/>
+			<param name="comfort-noise" value="false"/>
+			<param name="conference-flags" value="livearray-json-status|json-events|video-floor-only|rfc-4579|livearray-sync|minimize-video-encoding|manage-inbound-video-bitrate|video-required-for-canvas|video-mute-exit-canvas|mute-detect"/>
+			<param name="video-auto-floor-msec" value="1000"/>
+			<param name="video-mode" value="mux"/>
+			<param name="video-layout-name" value="3x3"/>
+			<param name="video-layout-name" value="group:grid"/>
+			<param name="video-canvas-size" value="640x480"/>
+			<param name="video-canvas-bgcolor" value="#333333"/>
+			<param name="video-layout-bgcolor" value="#000000"/>
+			<param name="video-codec-bandwidth" value="3mb"/>
+			<param name="video-fps" value="30"/>
+		</profile>
+
+		<profile name="video-mcu-stereo-320">
+			<param name="domain" value="$${domain}"/>
+			<param name="rate" value="48000"/>
+			<param name="channels" value="2"/>
+			<param name="interval" value="20"/>
+			<param name="energy-level" value="200"/>
+			<!-- <param name="tts-engine" value="flite"/> -->
+			<!-- <param name="tts-voice" value="kal16"/> -->
+			<param name="muted-sound" value="conference/conf-muted.wav"/>
+			<param name="unmuted-sound" value="conference/conf-unmuted.wav"/>
+			<param name="alone-sound" value="conference/conf-alone.wav"/>
+			<param name="moh-sound" value="$${hold_music}"/>
+			<param name="enter-sound" value="tone_stream://%(200,0,500,600,700)"/>
+			<param name="exit-sound" value="tone_stream://%(500,0,300,200,100,50,25)"/>
+			<param name="kicked-sound" value="conference/conf-kicked.wav"/>
+			<param name="locked-sound" value="conference/conf-locked.wav"/>
+			<param name="is-locked-sound" value="conference/conf-is-locked.wav"/>
+			<param name="is-unlocked-sound" value="conference/conf-is-unlocked.wav"/>
+			<param name="pin-sound" value="conference/conf-pin.wav"/>
+			<param name="bad-pin-sound" value="conference/conf-bad-pin.wav"/>
+			<param name="caller-id-name" value="$${outbound_caller_name}"/>
+			<param name="caller-id-number" value="$${outbound_caller_id}"/>
+			<param name="comfort-noise" value="false"/>
+			<param name="conference-flags" value="livearray-json-status|json-events|video-floor-only|rfc-4579|livearray-sync|minimize-video-encoding|manage-inbound-video-bitrate|video-required-for-canvas|video-mute-exit-canvas|mute-detect"/>
+			<param name="video-auto-floor-msec" value="1000"/>
+			<param name="video-mode" value="mux"/>
+			<param name="video-layout-name" value="3x3"/>
+			<param name="video-layout-name" value="group:grid"/>
+			<param name="video-canvas-size" value="480x320"/>
+			<param name="video-canvas-bgcolor" value="#333333"/>
+			<param name="video-layout-bgcolor" value="#000000"/>
+			<param name="video-codec-bandwidth" value="3mb"/>
+			<param name="video-fps" value="30"/>
+		</profile>
+
 		<profile name="sla">
 			<param name="domain" value=""/>
 			<param name="rate" value="16000"/>
diff --git a/resources/templates/conf/autoload_configs/post_load_modules.conf.xml b/resources/templates/conf/autoload_configs/post_load_modules.conf.xml
index 8f4e132fa4..f4e39e8bd9 100644
--- a/resources/templates/conf/autoload_configs/post_load_modules.conf.xml
+++ b/resources/templates/conf/autoload_configs/post_load_modules.conf.xml
@@ -1,4 +1,6 @@
-<configuration name="post_load_modules.conf" description="Modules">
-  <modules>
-  </modules>
+<configuration name="post_load_modules.conf" description="Modules"> 
+	<modules> 
+		<!-- Video --> 
+		<load module="mod_av"/> 
+	</modules> 
 </configuration>
diff --git a/resources/templates/conf/autoload_configs/post_load_switch.conf.xml b/resources/templates/conf/autoload_configs/post_load_switch.conf.xml
index 1ebf4d51a1..734c772b88 100644
--- a/resources/templates/conf/autoload_configs/post_load_switch.conf.xml
+++ b/resources/templates/conf/autoload_configs/post_load_switch.conf.xml
@@ -1,6 +1,9 @@
 <configuration name="post_load_switch.conf" description="Core Configuration">
 	<settings>
-		<!--<param name="events-use-dispatch" value="false"/>-->
-		<!--<param name="initial-event-threads" value="1"/>-->
+		<!-- Event handler uses event queue when set to true. False uses a threaded solution. -->
+		<param name="events-use-dispatch" value="false"/>
+
+		<!-- SWITCH default is 1. Use this number of thread on startup. -->
+		<param name="initial-event-threads" value="8"/>
 	</settings>
 </configuration>
diff --git a/resources/templates/conf/autoload_configs/switch.conf.xml b/resources/templates/conf/autoload_configs/switch.conf.xml
index a543cfce7e..c1972a1ffd 100644
--- a/resources/templates/conf/autoload_configs/switch.conf.xml
+++ b/resources/templates/conf/autoload_configs/switch.conf.xml
@@ -160,6 +160,11 @@
 		<!-- Allow multiple registrations to the same account in the central registration table -->
 		<!-- <param name="multiple-registrations" value="true"/> -->
 
+		<!-- Event handler uses event queue when set to true. False uses a threaded solution. -->
+		<param name="events-use-dispatch" value="false"/>
+
+		<!-- SWITCH default is 1. Use this number of thread on startup. -->
+		<param name="initial-event-threads" value="8"/>
 	</settings>
 
 </configuration>
diff --git a/resources/templates/conf/sip_profiles/external-ipv6.xml.noload b/resources/templates/conf/sip_profiles/external-ipv6.xml.noload
index 4bf6ff2d46..e50fa28aa1 100644
--- a/resources/templates/conf/sip_profiles/external-ipv6.xml.noload
+++ b/resources/templates/conf/sip_profiles/external-ipv6.xml.noload
@@ -71,6 +71,11 @@
 		<param name="rtp-hold-timeout-sec" value="1800"/>
 		<!--<param name="enable-3pcc" value="true"/>-->
 
+		<!--session timers -->
+		<param name="session-timeout" value="0" enabled="true"/>
+		<param name="enable-timer" value="false" enabled="true"/>
+		<param name="minimum-session-expires" value="0" enabled="false"/>
+
 		<!-- TLS: disabled by default, set to "true" to enable -->
 		<param name="tls" value="$${external_ssl_enable}"/>
 		<!-- Set to true to not bind on the normal sip-port but only on the TLS port -->
diff --git a/resources/templates/conf/sip_profiles/external.xml.noload b/resources/templates/conf/sip_profiles/external.xml.noload
index 6ffd93ea6c..5dd49b949b 100644
--- a/resources/templates/conf/sip_profiles/external.xml.noload
+++ b/resources/templates/conf/sip_profiles/external.xml.noload
@@ -76,6 +76,11 @@
 		<param name="rtp-hold-timeout-sec" value="1800"/>
 		<!--<param name="enable-3pcc" value="true"/>-->
 
+		<!--session timers -->
+		<param name="session-timeout" value="0" enabled="true"/>
+		<param name="enable-timer" value="false" enabled="true"/>
+		<param name="minimum-session-expires" value="0" enabled="false"/>
+
 		<!-- TLS: disabled by default, set to "true" to enable -->
 		<param name="tls" value="$${external_ssl_enable}"/>
 		<!-- Set to true to not bind on the normal sip-port but only on the TLS port -->
diff --git a/resources/templates/conf/sip_profiles/internal-ipv6.xml.noload b/resources/templates/conf/sip_profiles/internal-ipv6.xml.noload
index c9fcf7b73e..b48c74e172 100644
--- a/resources/templates/conf/sip_profiles/internal-ipv6.xml.noload
+++ b/resources/templates/conf/sip_profiles/internal-ipv6.xml.noload
@@ -38,8 +38,12 @@
 		<param name="bitpacking" value="aal2" enabled="false"/>
 		<!--max number of open dialogs in proceeding -->
 		<param name="max-proceeding" value="1000" enabled="false"/>
+
 		<!--session timers for all call to expire after the specified seconds -->
-		<param name="session-timeout" value="1800" enabled="false"/>
+		<param name="session-timeout" value="0" enabled="true"/>
+		<param name="enable-timer" value="false" enabled="true"/>
+		<param name="minimum-session-expires" value="0" enabled="false"/>
+
 		<param name="multiple-registrations" value="true" enabled="false"/>
 		<!--set to 'greedy' if you want your codec list to take precedence -->
 		<param name="inbound-codec-negotiation" value="generous"/>
diff --git a/resources/templates/conf/sip_profiles/internal.xml.noload b/resources/templates/conf/sip_profiles/internal.xml.noload
index 667147540b..3b0fb349ad 100644
--- a/resources/templates/conf/sip_profiles/internal.xml.noload
+++ b/resources/templates/conf/sip_profiles/internal.xml.noload
@@ -111,11 +111,13 @@
 
 		<!-- Enable Compact SIP headers. -->
 		<param name="enable-compact-headers" value="true" enabled="false"/>
-		<!--
-		enable/disable session timers
-		-->
-		<param name="enable-timer" value="false" enabled="false"/>
-		<param name="minimum-session-expires" value="120" enabled="false"/>
+
+		<!--session timers -->
+		<param name="session-timeout" value="0" enabled="true"/>
+		<param name="enable-timer" value="false" enabled="true"/>
+		<param name="minimum-session-expires" value="0" enabled="false"/>
+		
+		<!-- apply inbound acl -->
 		<param name="apply-inbound-acl" value="domains"/>
 		<!--
 		This defines your local network, by default we detect your local network
diff --git a/resources/templates/conf/vars.xml b/resources/templates/conf/vars.xml
index 37e4334e45..c32915e07e 100644
--- a/resources/templates/conf/vars.xml
+++ b/resources/templates/conf/vars.xml
@@ -128,14 +128,10 @@
    <X-PRE-PROCESS cmd="set" data="sip_tls_version=tlsv1,tlsv1.1,tlsv1.2" category="SIP" enabled="true" uuid="3fff6ed5-fde0-49ca-abe6-7db15f7f54d4"/>
 
    <!-- SIP Profile: External -->
-   <X-PRE-PROCESS cmd="set" data="external_sip_port=5080" category="SIP Profile: External" enabled="true" uuid="9594ab5c-884a-4d16-87ec-1a9f5b9c3247"/>
-   <X-PRE-PROCESS cmd="set" data="external_tls_port=5081" category="SIP Profile: External" enabled="true" uuid="ea87e722-8b8f-4c11-b4cd-16eabd99450b"/>
    <X-PRE-PROCESS cmd="set" data="external_ssl_enable=false" category="SIP Profile: External" enabled="true" uuid="428d5aad-3116-4cfb-bbfa-d4c424707efb"/>
    <X-PRE-PROCESS cmd="set" data="external_ssl_dir=$${conf_dir}/tls" category="SIP Profile: External" enabled="true" uuid="ad813484-bd8a-4fe9-9342-82ef8834da96"/>
 
    <!-- SIP Profile: Internal -->
-   <X-PRE-PROCESS cmd="set" data="internal_sip_port=5060" category="SIP Profile: Internal" enabled="true" uuid="562e0395-4059-4421-b648-2ed991edb0fb"/>
-   <X-PRE-PROCESS cmd="set" data="internal_tls_port=5061" category="SIP Profile: Internal" enabled="true" uuid="82e185df-2835-419b-b79c-f5f3cf373c08"/>
    <X-PRE-PROCESS cmd="set" data="internal_ssl_enable=false" category="SIP Profile: Internal" enabled="true" uuid="ee58ced9-75b2-49ae-9595-ea95a3781d85"/>
    <X-PRE-PROCESS cmd="set" data="internal_ssl_dir=$${conf_dir}/tls" category="SIP Profile: Internal" enabled="true" uuid="c7daefd5-ac6d-4fed-b85a-40d7e8ad8c53"/>
 
diff --git a/resources/templates/provision/fanvil/x210/{$mac}.cfg b/resources/templates/provision/fanvil/x210/{$mac}.cfg
index 5b62b13468..2c05a9d446 100644
--- a/resources/templates/provision/fanvil/x210/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x210/{$mac}.cfg
@@ -4404,7 +4404,7 @@
         <FunkeyListFontColor>0xffffff</FunkeyListFontColor>
         <TalkingFontColor>0x262626</TalkingFontColor>
         <SidekeyLabelLength>0</SidekeyLabelLength>
-        <AppIconDisplay>1,1,1,1</AppIconDisplay>
+        <AppIconDisplay>{$fanvil_app_icon_display}</AppIconDisplay>
         <DisplayProvisionprompt>0</DisplayProvisionprompt>
         <DsskeyPage1Type>0</DsskeyPage1Type>
         <DsskeyPage2Type>0</DsskeyPage2Type>
diff --git a/resources/templates/provision/fanvil/x3u/{$mac}.cfg b/resources/templates/provision/fanvil/x3u/{$mac}.cfg
index 000c03fc71..e0413db775 100644
--- a/resources/templates/provision/fanvil/x3u/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x3u/{$mac}.cfg
@@ -1971,7 +1971,7 @@
         <OtherPopup>1</OtherPopup>
         <EnablePortMirror>0</EnablePortMirror>
         <SidekeyLabelLength>0</SidekeyLabelLength>
-        <AppIconDisplay>1,1,1,1</AppIconDisplay>
+        <AppIconDisplay>{$fanvil_app_icon_display}</AppIconDisplay>
         <DisplayProvisionprompt>0</DisplayProvisionprompt>
         <IdleTimeFontColor>0x262626</IdleTimeFontColor>
         <CommonTitleFontColor>0xffffff</CommonTitleFontColor>
diff --git a/resources/templates/provision/fanvil/x4u/{$mac}.cfg b/resources/templates/provision/fanvil/x4u/{$mac}.cfg
index d856baee3e..4060636763 100644
--- a/resources/templates/provision/fanvil/x4u/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x4u/{$mac}.cfg
@@ -2771,7 +2771,7 @@
         <internal index="2">
             {foreach $keys["memory"] as $row}
                 {if $row.device_key_id > 6 && $row.device_key_id <= 12}
-                <Fkey index="{$row.device_key_id-12}">
+                <Fkey index="{$row.device_key_id-6}">
                     <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>
@@ -2783,7 +2783,7 @@
         <internal index="3">
             {foreach $keys["memory"] as $row}
                 {if $row.device_key_id > 12 && $row.device_key_id <= 18}
-                <Fkey index="{$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>
@@ -2795,7 +2795,7 @@
         <internal index="4">
             {foreach $keys["memory"] as $row}
                 {if $row.device_key_id > 18 && $row.device_key_id <= 24}
-                <Fkey index="{$row.device_key_id-36}">
+                <Fkey index="{$row.device_key_id-18}">
                     <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>
@@ -2807,7 +2807,7 @@
         <internal index="5">
             {foreach $keys["memory"] as $row}
                 {if $row.device_key_id > 24 && $row.device_key_id <= 30}
-                <Fkey index="{$row.device_key_id-48}">
+                <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>
@@ -3061,7 +3061,7 @@
         <FunkeyListFontColor>0xffffff</FunkeyListFontColor>
         <TalkingFontColor>0x262626</TalkingFontColor>
         <SidekeyLabelLength>0</SidekeyLabelLength>
-        <AppIconDisplay>1,1,1,1</AppIconDisplay>
+        <AppIconDisplay>{$fanvil_app_icon_display}</AppIconDisplay>
         <DisplayProvisionprompt>0</DisplayProvisionprompt>
         <DsskeyPage1Type>0</DsskeyPage1Type>
         <DsskeyPage2Type>0</DsskeyPage2Type>
diff --git a/resources/templates/provision/fanvil/x5u/{$mac}.cfg b/resources/templates/provision/fanvil/x5u/{$mac}.cfg
index 16add4cab4..f048ef371e 100644
--- a/resources/templates/provision/fanvil/x5u/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x5u/{$mac}.cfg
@@ -3417,7 +3417,7 @@
         <internal index="2">
             {foreach $keys["memory"] as $row}
                 {if $row.device_key_id > 6 && $row.device_key_id <= 12}
-                <Fkey index="{$row.device_key_id-12}">
+                <Fkey index="{$row.device_key_id-6}">
                     <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>
@@ -3429,7 +3429,7 @@
         <internal index="3">
             {foreach $keys["memory"] as $row}
                 {if $row.device_key_id > 12 && $row.device_key_id <= 18}
-                <Fkey index="{$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>
@@ -3441,7 +3441,7 @@
         <internal index="4">
             {foreach $keys["memory"] as $row}
                 {if $row.device_key_id > 18 && $row.device_key_id <= 24}
-                <Fkey index="{$row.device_key_id-36}">
+                <Fkey index="{$row.device_key_id-18}">
                     <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>
@@ -3453,7 +3453,7 @@
         <internal index="5">
             {foreach $keys["memory"] as $row}
                 {if $row.device_key_id > 24 && $row.device_key_id <= 30}
-                <Fkey index="{$row.device_key_id-48}">
+                <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>
@@ -3723,7 +3723,7 @@
         <FunkeyListFontColor>0xffffff</FunkeyListFontColor>
         <TalkingFontColor>0x262626</TalkingFontColor>
         <SidekeyLabelLength>0</SidekeyLabelLength>
-        <AppIconDisplay>1,1,1,1</AppIconDisplay>
+        <AppIconDisplay>{$fanvil_app_icon_display}</AppIconDisplay>
         <DisplayProvisionprompt>0</DisplayProvisionprompt>
         <DsskeyPage1Type>0</DsskeyPage1Type>
         <DsskeyPage2Type>0</DsskeyPage2Type>
diff --git a/resources/templates/provision/fanvil/x6u/{$mac}.cfg b/resources/templates/provision/fanvil/x6u/{$mac}.cfg
index 9a002ef116..521cc8233d 100644
--- a/resources/templates/provision/fanvil/x6u/{$mac}.cfg
+++ b/resources/templates/provision/fanvil/x6u/{$mac}.cfg
@@ -4392,7 +4392,7 @@
         <FunkeyListFontColor>0xffffff</FunkeyListFontColor>
         <TalkingFontColor>0x262626</TalkingFontColor>
         <SidekeyLabelLength>0</SidekeyLabelLength>
-        <AppIconDisplay>1,1,1,1</AppIconDisplay>
+        <AppIconDisplay>{$fanvil_app_icon_display}</AppIconDisplay>
         <DisplayProvisionprompt>0</DisplayProvisionprompt>
         <DsskeyPage1Type>0</DsskeyPage1Type>
         <DsskeyPage2Type>0</DsskeyPage2Type>
diff --git a/resources/templates/provision/grandstream/dp750/{$mac}.xml b/resources/templates/provision/grandstream/dp750/{$mac}.xml
index 5ffe0529bc..3467988d94 100644
--- a/resources/templates/provision/grandstream/dp750/{$mac}.xml
+++ b/resources/templates/provision/grandstream/dp750/{$mac}.xml
@@ -2602,18 +2602,18 @@
 <!-- Number: 0,1,2 -->
 <!-- Mandatory  -->
 <!-- Reboot required  -->
-<P8>0</P8>
+<P8>{$grandstream_ip_address_mode}</P8>
 
 <!-- Preferred DNS server -->
 <!-- Mandatory  -->
-<P92>0</P92>
-<P93>0</P93>
-<P94>0</P94>
-<P95>0</P95>
+{if isset($grandstream_ipv4preferdns_1)}<P92>{$grandstream_ipv4preferdns_1}</P92>{else}<P92>0</P92>{/if}
+{if isset($grandstream_ipv4preferdns_2)}<P93>{$grandstream_ipv4preferdns_2}</P93>{else}<P93>0</P93>{/if}
+{if isset($grandstream_ipv4preferdns_3)}<P94>{$grandstream_ipv4preferdns_3}</P94>{else}<P94>0</P94>{/if}
+{if isset($grandstream_ipv4preferdns_4)}<P95>{$grandstream_ipv4preferdns_4}</P95>{else}<P95>0</P95>{/if}
 
 <!-- Host name (Option 12). Max length allowed is 32 bytes. -->
 <!-- String: address  -->
-<P146></P146>
+<P146>phone-{$mac|replace:'-':''}</P146>
 
 <!-- DHCP Domain -->
 <!-- String: address  -->
@@ -2635,34 +2635,34 @@
 <P269></P269>
 
 <!-- IP Address. Ignore if DHCP or PPPoE is used -->
-<!--  <P9>192</P9> -->
-<!--  <P10>168</P10> -->
-<!--  <P11>0</P11> -->
-<!--  <P12>160</P12> -->
+{if isset($grandstream_ipv4octet_1)}<P9>{$grandstream_ipv4octet_1}</P9>{else}<P9>192</P9>{/if}
+{if isset($grandstream_ipv4octet_2)}<P10>{$grandstream_ipv4octet_2}</P10>{else}<P10>168</P10>{/if}
+{if isset($grandstream_ipv4octet_3)}<P11>{$grandstream_ipv4octet_3}</P11>{else}<P11>1</P11>{/if}
+{if isset($grandstream_ipv4octet_4)}<P12>{$grandstream_ipv4octet_4}</P12>{else}<P12>102</P12>{/if}
 
 <!-- Subnet mask. Ignore if DHCP or PPPoE is used -->
-<!--  <P13>255</P13> -->
-<!--  <P14>255</P14> -->
-<!--  <P15>0</P15> -->
-<!--  <P16>0</P16> -->
+{if isset($grandstream_ipv4mask_1)}<P13>{$grandstream_ipv4mask_1}</P13>{else}<P13>255</P13>{/if}
+{if isset($grandstream_ipv4mask_2)}<P14>{$grandstream_ipv4mask_2}</P14>{else}<P14>255</P14>{/if}
+{if isset($grandstream_ipv4mask_3)}<P15>{$grandstream_ipv4mask_3}</P15>{else}<P15>0</P15>{/if}
+{if isset($grandstream_ipv4mask_4)}<P16>{$grandstream_ipv4mask_4}</P16>{else}<P16>0</P16>{/if}
 
 <!-- Gateway. Ignore if DHCP or PPPoE is used -->
-<!--  <P17>0</P17> -->
-<!--  <P18>0</P18> -->
-<!--  <P19>0</P19> -->
-<!--  <P20>0</P20> -->
+{if isset($grandstream_ipv4gw_1)}<P17>{$grandstream_ipv4gw_1}</P17>{else}<P17>192</P17>{/if}
+{if isset($grandstream_ipv4gw_2)}<P18>{$grandstream_ipv4gw_2}</P18>{else}<P18>168</P18>{/if}
+{if isset($grandstream_ipv4gw_3)}<P19>{$grandstream_ipv4gw_3}</P19>{else}<P19>2</P19>{/if}
+{if isset($grandstream_ipv4gw_4)}<P20>{$grandstream_ipv4gw_4}</P20>{else}<P20>1</P20>{/if}
 
 <!-- DNS server 1. Ignore if DHCP or PPPoE is used -->
-<!--  <P21>0</P21> -->
-<!--  <P22>0</P22> -->
-<!--  <P23>0</P23> -->
-<!--  <P24>0</P24> -->
+{if isset($grandstream_ipv4dns1_1)}<P21>{$grandstream_ipv4dns1_1}</P21>{else}<P21>0</P21>{/if}
+{if isset($grandstream_ipv4dns1_2)}<P22>{$grandstream_ipv4dns1_2}</P22>{else}<P22>0</P22>{/if}
+{if isset($grandstream_ipv4dns1_3)}<P23>{$grandstream_ipv4dns1_3}</P23>{else}<P23>0</P23>{/if}
+{if isset($grandstream_ipv4dns1_4)}<P24>{$grandstream_ipv4dns1_4}</P24>{else}<P24>0</P24>{/if}
 
 <!-- DNS server 2. Ignore if DHCP or PPPoE is used -->
-<!--  <P25>0</P25> -->
-<!--  <P26>0</P26> -->
-<!--  <P27>0</P27> -->
-<!--  <P28>0</P28> -->
+{if isset($grandstream_ipv4dns2_1)}<P25>{$grandstream_ipv4dns2_1}</P25>{else}<P25>0</P25>{/if}
+{if isset($grandstream_ipv4dns2_2)}<P26>{$grandstream_ipv4dns2_2}</P26>{else}<P26>0</P26>{/if}
+{if isset($grandstream_ipv4dns2_3)}<P27>{$grandstream_ipv4dns2_3}</P27>{else}<P27>0</P27>{/if}
+{if isset($grandstream_ipv4dns2_4)}<P28>{$grandstream_ipv4dns2_4}</P28>{else}<P28>0</P28>{/if}
 
 <!-- ################################################## -->
 <!-- #  Settings/Network Settings/Advanced Settings  ## -->
@@ -2691,7 +2691,7 @@
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
 {if isset($grandstream_lan_port_vlan) }
-<P27004>1</P27004>
+<P27004>{$grandstream_lan_port_vlan}</P27004>
 {else}
 <P27004>0</P27004>
 {/if}
@@ -2850,12 +2850,12 @@
 <!-- When set to Yes(1), it will override the configured provision path and method -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P20719>1</P20719>
+{if isset($grandstream_dhcp_option_override)}<P20719>{$grandstream_dhcp_option_override}</P20719>{else}<P20719>1</P20719>{/if}
 
 <!-- Automatic Upgrade. 0 - No, 1 - Check daily, 2 - Check weekly, 3 - Check every () minutes. Default is No. -->
 <!-- Number: 0,1,2,3 -->
 <!-- Mandatory -->
-<P20721>0</P20721>
+<P20721>1</P20721>
 
 <!-- Automatic Upgrade. Check for new firmware/config file every () minutes, unit is in minute, minimum 60 minutes, default is 7 days. P20721=3 -->
 <!-- Number: 60 to 5256000 -->
@@ -3209,7 +3209,7 @@
 <!-- Allow DHCP Option 2 to override time zone (If DHCP Option 2 is enabled, the timezone can be offset.) -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P143>1</P143>
+{if isset($grandstream_dhcp_option_2_timezone_override) }<P143>{$grandstream_dhcp_option_2_timezone_override}</P143>{else}<P143>0</P143>{/if}
 
 <!-- ######################### -->
 <!-- #  Maintenance/Syslog  ## -->
@@ -3268,11 +3268,7 @@
 <!-- Enable Phonebook XML Download. # 0 - No, 1 - YES, HTTP, 2 - YES, TFTP, 3 - Yes, HTTPS. Default is 0 -->
 <!-- Number: 0, 1, 2, 3 -->
 <!-- Mandatory -->
-{if isset($contact_grandstream)}
-<P330>1</P330>
-{else}
-<P330>0</P330>
-{/if}
+<P330>{$grandstream_phonebook_download}</P330>
 
 <!-- HTTP/HTTPS User Name -->
 <!-- String -->
@@ -3286,23 +3282,25 @@
 <!-- This is a string of up to 256 characters that should contain a path to the XML file. It MUST be in the host/path format. -->
 <!-- For example: directory.grandstream.com/engineering -->
 <!-- String -->
-{if isset($contact_grandstream)}
-<P331>{$grandstream_phonebook_xml_server_path}{$mac}/</P331>
-{elseif isset($grandstream_phonebook_xml_server_path)}
-<P331>{$grandstream_phonebook_xml_server_path}</P331>
+{if isset($grandstream_phonebook_xml_server_path)}
+    <P331>{$grandstream_phonebook_xml_server_path}/{$mac}</P331>
 {else}
-<P331></P331>
+    <P331></P331>
 {/if}
 
 <!-- Phonebook Download Interval (in minutes) -->
 <!-- Valid value range is 5-720. Default is 0 for disabled -->
 <!-- Number: 0, 5-720;  -->
-<P332>120</P332>
+{if isset($grandstream_phonebook_download_interval)}
+    <P332>{$grandstream_phonebook_download_interval}</P332>
+{else}
+    <P332>0</P332>
+{/if}
 
 <!-- Remove Manually-edited entries on Download. 0 - No, 1 - Yes. Default is 1 -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P333>1</P333>
+<P333>0</P333>
 
 <!-- ############################################### -->
 <!-- #  Phonebook/Global Phonebook LDAP Settings  ## -->
diff --git a/resources/templates/provision/grandstream/gxp2100/{$mac}.xml b/resources/templates/provision/grandstream/gxp2100/{$mac}.xml
index 4e4bf25103..732f6ff641 100644
--- a/resources/templates/provision/grandstream/gxp2100/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2100/{$mac}.xml
@@ -38,7 +38,7 @@
 
 <!--# SIP User ID-->
 <!--# String-->
-    <P35>{$account.1.display_name}</P35>
+    <P35>{$account.1.user_id}</P35>
 
 <!--# Authenticate ID-->
 <!--# String-->
@@ -3719,7 +3719,7 @@
 <!--# This is a string of up to 256 characters that should contain a path to the XML file-->
 <!--# It MUST be in the host/path format. For example: directory.grandstream.com/engineering-->
 <!--# String-->
-    <P341></P341>
+    <P341>{$grandstream_idle_screen_server_path}</P341>
 
 <!--# Server Path-->
 <!--# This is a string of up to 256 characters that should contain a path to the XML Application file-->
diff --git a/resources/templates/provision/grandstream/gxp2130/{$mac}.xml b/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
index 4d4179ff66..b50f97d067 100644
--- a/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
@@ -631,8 +631,12 @@
     <!-- # Jitter Buffer Type. 0 - Fixed, 1 - Adaptive. Default is 1 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
+    {if isset ($grandstream_jitter_adapt)}
+    <P133>{$grandstream_jitter_adapt}</P133>
+    {else}
     <P133>1</P133>
-
+    {/if}
+    
     <!-- # Jitter Buffer Length. 0 - 100ms, 1 - 200ms, 2 - 300ms, 3 - 400ms, 4 - 500ms, 5 - 600ms, 6 - 700ms, 7 - 800ms -->
     <!-- # Default is 2 -->
     <!-- # Number: 0, 1, 2, 3, 4, 5, 6, 7 -->
@@ -5844,81 +5848,81 @@
     <!-- ########################################## -->
     <!-- # IP Address. Ignore if DHCP or PPPoE is used -->
     <!-- # Number: 0 - 255 -->
-    <P9>192</P9>
+    {if isset($grandstream_ipv4octet_1)}<P9>{$grandstream_ipv4octet_1}</P9>{else}<P9>192</P9>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P10>168</P10>
+    {if isset($grandstream_ipv4octet_2)}<P10>{$grandstream_ipv4octet_2}</P10>{else}<P10>168</P10>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P11>1</P11>
+    {if isset($grandstream_ipv4octet_3)}<P11>{$grandstream_ipv4octet_3}</P11>{else}<P11>1</P11>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P12>102</P12>
+    {if isset($grandstream_ipv4octet_4)}<P12>{$grandstream_ipv4octet_4}</P12>{else}<P12>102</P12>{/if}
 
     <!-- # Subnet mask. Ignore if DHCP or PPPoE is used -->
     <!-- # Number: 0 - 255 -->
-    <P13>255</P13>
+    {if isset($grandstream_ipv4mask_1)}<P13>{$grandstream_ipv4mask_1}</P13>{else}<P13>255</P13>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P14>255</P14>
+    {if isset($grandstream_ipv4mask_2)}<P14>{$grandstream_ipv4mask_2}</P14>{else}<P14>255</P14>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P15>0</P15>
+    {if isset($grandstream_ipv4mask_3)}<P15>{$grandstream_ipv4mask_3}</P15>{else}<P15>0</P15>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P16>0</P16>
+    {if isset($grandstream_ipv4mask_4)}<P16>{$grandstream_ipv4mask_4}</P16>{else}<P16>0</P16>{/if}
 
     <!-- # Gateway. Ignore if DHCP or PPPoE is used -->
     <!-- # Number: 0 - 255 -->
-    <P17>192</P17>
+    {if isset($grandstream_ipv4gw_1)}<P17>{$grandstream_ipv4gw_1}</P17>{else}<P17>192</P17>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P18>168</P18>
+    {if isset($grandstream_ipv4gw_2)}<P18>{$grandstream_ipv4gw_2}</P18>{else}<P18>168</P18>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P19>2</P19>
+    {if isset($grandstream_ipv4gw_3)}<P19>{$grandstream_ipv4gw_3}</P19>{else}<P19>2</P19>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P20>1</P20>
+    {if isset($grandstream_ipv4gw_4)}<P20>{$grandstream_ipv4gw_4}</P20>{else}<P20>1</P20>{/if}
 
     <!-- # DNS 1 Server. Ignore if DHCP or PPPoE is used -->
     <!-- # Number: 0 - 255 -->
-    <P21>0</P21>
+    {if isset($grandstream_ipv4dns1_1)}<P21>{$grandstream_ipv4dns1_1}</P21>{else}<P21>0</P21>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P22>0</P22>
+    {if isset($grandstream_ipv4dns1_2)}<P22>{$grandstream_ipv4dns1_2}</P22>{else}<P22>0</P22>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P23>0</P23>
+    {if isset($grandstream_ipv4dns1_3)}<P23>{$grandstream_ipv4dns1_3}</P23>{else}<P23>0</P23>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P24>0</P24>
+    {if isset($grandstream_ipv4dns1_4)}<P24>{$grandstream_ipv4dns1_4}</P24>{else}<P24>0</P24>{/if}
 
     <!-- # DNS 2 Server. Ignore if DHCP or PPPoE is used -->
     <!-- # Number: 0 - 255 -->
-    <P25>0</P25>
+    {if isset($grandstream_ipv4dns2_1)}<P25>{$grandstream_ipv4dns2_1}</P25>{else}<P25>0</P25>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P26>0</P26>
+    {if isset($grandstream_ipv4dns2_2)}<P26>{$grandstream_ipv4dns2_2}</P26>{else}<P26>0</P26>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P27>0</P27>
+    {if isset($grandstream_ipv4dns2_3)}<P27>{$grandstream_ipv4dns2_3}</P27>{else}<P27>0</P27>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P28>0</P28>
+    {if isset($grandstream_ipv4dns2_4)}<P28>{$grandstream_ipv4dns2_4}</P28>{else}<P28>0</P28>{/if}
 
     <!-- # Preferred DNS server.  (if specified). -->
     <!-- # Number: 0 - 255 -->
-    <P92>0</P92>
+    {if isset($grandstream_ipv4preferdns_1)}<P92>{$grandstream_ipv4preferdns_1}</P92>{else}<P92>0</P92>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P93>0</P93>
+    {if isset($grandstream_ipv4preferdns_2)}<P93>{$grandstream_ipv4preferdns_2}</P93>{else}<P93>0</P93>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P94>0</P94>
+    {if isset($grandstream_ipv4preferdns_3)}<P94>{$grandstream_ipv4preferdns_3}</P94>{else}<P94>0</P94>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P95>0</P95>
+    {if isset($grandstream_ipv4preferdns_4)}<P95>{$grandstream_ipv4preferdns_4}</P95>{else}<P95>0</P95>{/if}
 
     <!-- # IPv6 Address type. 0 - Auto Configured, 1 - Statically Configured. Default is 0. -->
     <!-- # Number: 0, 1 -->
@@ -8433,11 +8437,13 @@
     <!-- ############################################################################## -->
     <!-- # Server Path -->
     <!-- # String -->
-    <P337></P337>
-
-    <!-- # Softkey Label -->
-    <!-- # String -->
-    <P352>XMLApp</P352>
+{if isset($xmlappurl)}
+    <P337>{$xmlappurl}?token={$xmlapptoken}</P337>
+    <P352>{$xmlapp}</P352>
+{elseif isset($xmlapp)}
+    <P337>https://{$server_address_1}/app/change-caller-id/app.php?token={$xmlapptoken}</P337>
+    <P352>{$xmlapp}</P352>
+{/if}
 
     <!-- # Default Background Color -->
     <!-- # String -->
@@ -8458,7 +8464,7 @@
     <!-- # Show Label Background. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P8345>0</P8345>
+    <P8345>{$grandstream_label_background}</P8345>
 
     <!-- # Use Long Label. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
@@ -8469,8 +8475,12 @@
     <!-- # Key Mode. 1 - Line Mode, 2 - Account Mode. Default is 1 -->
     <!-- # Number: 1, 2 -->
     <!-- # Mandatory -->
+    {if isset ($grandstream_key_mode)}
+    <P8369>{$grandstream_key_mode}</P8369>
+    {else}
     <P8369>1</P8369>
-
+    {/if}
+    
     <!-- # Transfer Mode via VPK. 0 - Blind Transfer, 1 - Attended Transfer, 2 - New Call. Default is 0 -->
     <!-- # Number: 0, 1, 2 -->
     <!-- # Mandatory -->
diff --git a/resources/templates/provision/grandstream/gxp2135/{$mac}.xml b/resources/templates/provision/grandstream/gxp2135/{$mac}.xml
index e42946a0a8..35f5bb980a 100644
--- a/resources/templates/provision/grandstream/gxp2135/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2135/{$mac}.xml
@@ -631,8 +631,12 @@
     <!-- # Jitter Buffer Type. 0 - Fixed, 1 - Adaptive. Default is 1 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
+    {if isset ($grandstream_jitter_adapt)}
+    <P133>{$grandstream_jitter_adapt}</P133>
+    {else}
     <P133>1</P133>
-
+    {/if}
+    
     <!-- # Jitter Buffer Length. 0 - 100ms, 1 - 200ms, 2 - 300ms, 3 - 400ms, 4 - 500ms, 5 - 600ms, 6 - 700ms, 7 - 800ms -->
     <!-- # Default is 2 -->
     <!-- # Number: 0, 1, 2, 3, 4, 5, 6, 7 -->
@@ -5844,81 +5848,81 @@
     <!-- ########################################## -->
     <!-- # IP Address. Ignore if DHCP or PPPoE is used -->
     <!-- # Number: 0 - 255 -->
-    <P9>192</P9>
+    {if isset($grandstream_ipv4octet_1)}<P9>{$grandstream_ipv4octet_1}</P9>{else}<P9>192</P9>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P10>168</P10>
+    {if isset($grandstream_ipv4octet_2)}<P10>{$grandstream_ipv4octet_2}</P10>{else}<P10>168</P10>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P11>1</P11>
+    {if isset($grandstream_ipv4octet_3)}<P11>{$grandstream_ipv4octet_3}</P11>{else}<P11>1</P11>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P12>102</P12>
+    {if isset($grandstream_ipv4octet_4)}<P12>{$grandstream_ipv4octet_4}</P12>{else}<P12>102</P12>{/if}
 
     <!-- # Subnet mask. Ignore if DHCP or PPPoE is used -->
     <!-- # Number: 0 - 255 -->
-    <P13>255</P13>
+    {if isset($grandstream_ipv4mask_1)}<P13>{$grandstream_ipv4mask_1}</P13>{else}<P13>255</P13>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P14>255</P14>
+    {if isset($grandstream_ipv4mask_2)}<P14>{$grandstream_ipv4mask_2}</P14>{else}<P14>255</P14>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P15>0</P15>
+    {if isset($grandstream_ipv4mask_3)}<P15>{$grandstream_ipv4mask_3}</P15>{else}<P15>0</P15>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P16>0</P16>
+    {if isset($grandstream_ipv4mask_4)}<P16>{$grandstream_ipv4mask_4}</P16>{else}<P16>0</P16>{/if}
 
     <!-- # Gateway. Ignore if DHCP or PPPoE is used -->
     <!-- # Number: 0 - 255 -->
-    <P17>192</P17>
+    {if isset($grandstream_ipv4gw_1)}<P17>{$grandstream_ipv4gw_1}</P17>{else}<P17>192</P17>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P18>168</P18>
+    {if isset($grandstream_ipv4gw_2)}<P18>{$grandstream_ipv4gw_2}</P18>{else}<P18>168</P18>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P19>2</P19>
+    {if isset($grandstream_ipv4gw_3)}<P19>{$grandstream_ipv4gw_3}</P19>{else}<P19>2</P19>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P20>1</P20>
+    {if isset($grandstream_ipv4gw_4)}<P20>{$grandstream_ipv4gw_4}</P20>{else}<P20>1</P20>{/if}
 
     <!-- # DNS 1 Server. Ignore if DHCP or PPPoE is used -->
     <!-- # Number: 0 - 255 -->
-    <P21>0</P21>
+    {if isset($grandstream_ipv4dns1_1)}<P21>{$grandstream_ipv4dns1_1}</P21>{else}<P21>0</P21>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P22>0</P22>
+    {if isset($grandstream_ipv4dns1_2)}<P22>{$grandstream_ipv4dns1_2}</P22>{else}<P22>0</P22>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P23>0</P23>
+    {if isset($grandstream_ipv4dns1_3)}<P23>{$grandstream_ipv4dns1_3}</P23>{else}<P23>0</P23>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P24>0</P24>
+    {if isset($grandstream_ipv4dns1_4)}<P24>{$grandstream_ipv4dns1_4}</P24>{else}<P24>0</P24>{/if}
 
     <!-- # DNS 2 Server. Ignore if DHCP or PPPoE is used -->
     <!-- # Number: 0 - 255 -->
-    <P25>0</P25>
+    {if isset($grandstream_ipv4dns2_1)}<P25>{$grandstream_ipv4dns2_1}</P25>{else}<P25>0</P25>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P26>0</P26>
+    {if isset($grandstream_ipv4dns2_2)}<P26>{$grandstream_ipv4dns2_2}</P26>{else}<P26>0</P26>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P27>0</P27>
+    {if isset($grandstream_ipv4dns2_3)}<P27>{$grandstream_ipv4dns2_3}</P27>{else}<P27>0</P27>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P28>0</P28>
+    {if isset($grandstream_ipv4dns2_4)}<P28>{$grandstream_ipv4dns2_4}</P28>{else}<P28>0</P28>{/if}
 
     <!-- # Preferred DNS server.  (if specified). -->
     <!-- # Number: 0 - 255 -->
-    <P92>0</P92>
+    {if isset($grandstream_ipv4preferdns_1)}<P92>{$grandstream_ipv4preferdns_1}</P92>{else}<P92>0</P92>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P93>0</P93>
+    {if isset($grandstream_ipv4preferdns_2)}<P93>{$grandstream_ipv4preferdns_2}</P93>{else}<P93>0</P93>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P94>0</P94>
+    {if isset($grandstream_ipv4preferdns_3)}<P94>{$grandstream_ipv4preferdns_3}</P94>{else}<P94>0</P94>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P95>0</P95>
+    {if isset($grandstream_ipv4preferdns_4)}<P95>{$grandstream_ipv4preferdns_4}</P95>{else}<P95>0</P95>{/if}
 
     <!-- # IPv6 Address type. 0 - Auto Configured, 1 - Statically Configured. Default is 0. -->
     <!-- # Number: 0, 1 -->
@@ -8433,11 +8437,13 @@
     <!-- ############################################################################## -->
     <!-- # Server Path -->
     <!-- # String -->
-    <P337></P337>
-
-    <!-- # Softkey Label -->
-    <!-- # String -->
-    <P352>XMLApp</P352>
+{if isset($xmlappurl)}
+    <P337>{$xmlappurl}?token={$xmlapptoken}</P337>
+    <P352>{$xmlapp}</P352>
+{elseif isset($xmlapp)}
+    <P337>https://{$server_address_1}/app/change-caller-id/app.php?token={$xmlapptoken}</P337>
+    <P352>{$xmlapp}</P352>
+{/if}
 
     <!-- # Default Background Color -->
     <!-- # String -->
@@ -8458,7 +8464,7 @@
     <!-- # Show Label Background. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P8345>0</P8345>
+    <P8345>{$grandstream_label_background}</P8345>
 
     <!-- # Use Long Label. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
@@ -8469,8 +8475,12 @@
     <!-- # Key Mode. 1 - Line Mode, 2 - Account Mode. Default is 1 -->
     <!-- # Number: 1, 2 -->
     <!-- # Mandatory -->
+    {if isset ($grandstream_key_mode)}
+    <P8369>{$grandstream_key_mode}</P8369>
+    {else}
     <P8369>1</P8369>
-
+    {/if}
+    
     <!-- # Transfer Mode via VPK. 0 - Blind Transfer, 1 - Attended Transfer, 2 - New Call. Default is 0 -->
     <!-- # Number: 0, 1, 2 -->
     <!-- # Mandatory -->
diff --git a/resources/templates/provision/grandstream/gxp2140/{$mac}.xml b/resources/templates/provision/grandstream/gxp2140/{$mac}.xml
index 4d4179ff66..b50f97d067 100644
--- a/resources/templates/provision/grandstream/gxp2140/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2140/{$mac}.xml
@@ -631,8 +631,12 @@
     <!-- # Jitter Buffer Type. 0 - Fixed, 1 - Adaptive. Default is 1 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
+    {if isset ($grandstream_jitter_adapt)}
+    <P133>{$grandstream_jitter_adapt}</P133>
+    {else}
     <P133>1</P133>
-
+    {/if}
+    
     <!-- # Jitter Buffer Length. 0 - 100ms, 1 - 200ms, 2 - 300ms, 3 - 400ms, 4 - 500ms, 5 - 600ms, 6 - 700ms, 7 - 800ms -->
     <!-- # Default is 2 -->
     <!-- # Number: 0, 1, 2, 3, 4, 5, 6, 7 -->
@@ -5844,81 +5848,81 @@
     <!-- ########################################## -->
     <!-- # IP Address. Ignore if DHCP or PPPoE is used -->
     <!-- # Number: 0 - 255 -->
-    <P9>192</P9>
+    {if isset($grandstream_ipv4octet_1)}<P9>{$grandstream_ipv4octet_1}</P9>{else}<P9>192</P9>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P10>168</P10>
+    {if isset($grandstream_ipv4octet_2)}<P10>{$grandstream_ipv4octet_2}</P10>{else}<P10>168</P10>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P11>1</P11>
+    {if isset($grandstream_ipv4octet_3)}<P11>{$grandstream_ipv4octet_3}</P11>{else}<P11>1</P11>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P12>102</P12>
+    {if isset($grandstream_ipv4octet_4)}<P12>{$grandstream_ipv4octet_4}</P12>{else}<P12>102</P12>{/if}
 
     <!-- # Subnet mask. Ignore if DHCP or PPPoE is used -->
     <!-- # Number: 0 - 255 -->
-    <P13>255</P13>
+    {if isset($grandstream_ipv4mask_1)}<P13>{$grandstream_ipv4mask_1}</P13>{else}<P13>255</P13>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P14>255</P14>
+    {if isset($grandstream_ipv4mask_2)}<P14>{$grandstream_ipv4mask_2}</P14>{else}<P14>255</P14>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P15>0</P15>
+    {if isset($grandstream_ipv4mask_3)}<P15>{$grandstream_ipv4mask_3}</P15>{else}<P15>0</P15>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P16>0</P16>
+    {if isset($grandstream_ipv4mask_4)}<P16>{$grandstream_ipv4mask_4}</P16>{else}<P16>0</P16>{/if}
 
     <!-- # Gateway. Ignore if DHCP or PPPoE is used -->
     <!-- # Number: 0 - 255 -->
-    <P17>192</P17>
+    {if isset($grandstream_ipv4gw_1)}<P17>{$grandstream_ipv4gw_1}</P17>{else}<P17>192</P17>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P18>168</P18>
+    {if isset($grandstream_ipv4gw_2)}<P18>{$grandstream_ipv4gw_2}</P18>{else}<P18>168</P18>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P19>2</P19>
+    {if isset($grandstream_ipv4gw_3)}<P19>{$grandstream_ipv4gw_3}</P19>{else}<P19>2</P19>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P20>1</P20>
+    {if isset($grandstream_ipv4gw_4)}<P20>{$grandstream_ipv4gw_4}</P20>{else}<P20>1</P20>{/if}
 
     <!-- # DNS 1 Server. Ignore if DHCP or PPPoE is used -->
     <!-- # Number: 0 - 255 -->
-    <P21>0</P21>
+    {if isset($grandstream_ipv4dns1_1)}<P21>{$grandstream_ipv4dns1_1}</P21>{else}<P21>0</P21>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P22>0</P22>
+    {if isset($grandstream_ipv4dns1_2)}<P22>{$grandstream_ipv4dns1_2}</P22>{else}<P22>0</P22>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P23>0</P23>
+    {if isset($grandstream_ipv4dns1_3)}<P23>{$grandstream_ipv4dns1_3}</P23>{else}<P23>0</P23>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P24>0</P24>
+    {if isset($grandstream_ipv4dns1_4)}<P24>{$grandstream_ipv4dns1_4}</P24>{else}<P24>0</P24>{/if}
 
     <!-- # DNS 2 Server. Ignore if DHCP or PPPoE is used -->
     <!-- # Number: 0 - 255 -->
-    <P25>0</P25>
+    {if isset($grandstream_ipv4dns2_1)}<P25>{$grandstream_ipv4dns2_1}</P25>{else}<P25>0</P25>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P26>0</P26>
+    {if isset($grandstream_ipv4dns2_2)}<P26>{$grandstream_ipv4dns2_2}</P26>{else}<P26>0</P26>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P27>0</P27>
+    {if isset($grandstream_ipv4dns2_3)}<P27>{$grandstream_ipv4dns2_3}</P27>{else}<P27>0</P27>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P28>0</P28>
+    {if isset($grandstream_ipv4dns2_4)}<P28>{$grandstream_ipv4dns2_4}</P28>{else}<P28>0</P28>{/if}
 
     <!-- # Preferred DNS server.  (if specified). -->
     <!-- # Number: 0 - 255 -->
-    <P92>0</P92>
+    {if isset($grandstream_ipv4preferdns_1)}<P92>{$grandstream_ipv4preferdns_1}</P92>{else}<P92>0</P92>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P93>0</P93>
+    {if isset($grandstream_ipv4preferdns_2)}<P93>{$grandstream_ipv4preferdns_2}</P93>{else}<P93>0</P93>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P94>0</P94>
+    {if isset($grandstream_ipv4preferdns_3)}<P94>{$grandstream_ipv4preferdns_3}</P94>{else}<P94>0</P94>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P95>0</P95>
+    {if isset($grandstream_ipv4preferdns_4)}<P95>{$grandstream_ipv4preferdns_4}</P95>{else}<P95>0</P95>{/if}
 
     <!-- # IPv6 Address type. 0 - Auto Configured, 1 - Statically Configured. Default is 0. -->
     <!-- # Number: 0, 1 -->
@@ -8433,11 +8437,13 @@
     <!-- ############################################################################## -->
     <!-- # Server Path -->
     <!-- # String -->
-    <P337></P337>
-
-    <!-- # Softkey Label -->
-    <!-- # String -->
-    <P352>XMLApp</P352>
+{if isset($xmlappurl)}
+    <P337>{$xmlappurl}?token={$xmlapptoken}</P337>
+    <P352>{$xmlapp}</P352>
+{elseif isset($xmlapp)}
+    <P337>https://{$server_address_1}/app/change-caller-id/app.php?token={$xmlapptoken}</P337>
+    <P352>{$xmlapp}</P352>
+{/if}
 
     <!-- # Default Background Color -->
     <!-- # String -->
@@ -8458,7 +8464,7 @@
     <!-- # Show Label Background. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P8345>0</P8345>
+    <P8345>{$grandstream_label_background}</P8345>
 
     <!-- # Use Long Label. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
@@ -8469,8 +8475,12 @@
     <!-- # Key Mode. 1 - Line Mode, 2 - Account Mode. Default is 1 -->
     <!-- # Number: 1, 2 -->
     <!-- # Mandatory -->
+    {if isset ($grandstream_key_mode)}
+    <P8369>{$grandstream_key_mode}</P8369>
+    {else}
     <P8369>1</P8369>
-
+    {/if}
+    
     <!-- # Transfer Mode via VPK. 0 - Blind Transfer, 1 - Attended Transfer, 2 - New Call. Default is 0 -->
     <!-- # Number: 0, 1, 2 -->
     <!-- # Mandatory -->
diff --git a/resources/templates/provision/grandstream/gxp2160/{$mac}.xml b/resources/templates/provision/grandstream/gxp2160/{$mac}.xml
index 4d4179ff66..71514ff3c6 100644
--- a/resources/templates/provision/grandstream/gxp2160/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2160/{$mac}.xml
@@ -631,7 +631,11 @@
     <!-- # Jitter Buffer Type. 0 - Fixed, 1 - Adaptive. Default is 1 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
+    {if isset ($grandstream_jitter_adapt)}
+    <P133>{$grandstream_jitter_adapt}</P133>
+    {else}
     <P133>1</P133>
+    {/if}
 
     <!-- # Jitter Buffer Length. 0 - 100ms, 1 - 200ms, 2 - 300ms, 3 - 400ms, 4 - 500ms, 5 - 600ms, 6 - 700ms, 7 - 800ms -->
     <!-- # Default is 2 -->
@@ -5844,81 +5848,81 @@
     <!-- ########################################## -->
     <!-- # IP Address. Ignore if DHCP or PPPoE is used -->
     <!-- # Number: 0 - 255 -->
-    <P9>192</P9>
+    {if isset($grandstream_ipv4octet_1)}<P9>{$grandstream_ipv4octet_1}</P9>{else}<P9>192</P9>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P10>168</P10>
+    {if isset($grandstream_ipv4octet_2)}<P10>{$grandstream_ipv4octet_2}</P10>{else}<P10>168</P10>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P11>1</P11>
+    {if isset($grandstream_ipv4octet_3)}<P11>{$grandstream_ipv4octet_3}</P11>{else}<P11>1</P11>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P12>102</P12>
+    {if isset($grandstream_ipv4octet_4)}<P12>{$grandstream_ipv4octet_4}</P12>{else}<P12>102</P12>{/if}
 
     <!-- # Subnet mask. Ignore if DHCP or PPPoE is used -->
     <!-- # Number: 0 - 255 -->
-    <P13>255</P13>
+    {if isset($grandstream_ipv4mask_1)}<P13>{$grandstream_ipv4mask_1}</P13>{else}<P13>255</P13>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P14>255</P14>
+    {if isset($grandstream_ipv4mask_2)}<P14>{$grandstream_ipv4mask_2}</P14>{else}<P14>255</P14>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P15>0</P15>
+    {if isset($grandstream_ipv4mask_3)}<P15>{$grandstream_ipv4mask_3}</P15>{else}<P15>0</P15>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P16>0</P16>
+    {if isset($grandstream_ipv4mask_4)}<P16>{$grandstream_ipv4mask_4}</P16>{else}<P16>0</P16>{/if}
 
     <!-- # Gateway. Ignore if DHCP or PPPoE is used -->
     <!-- # Number: 0 - 255 -->
-    <P17>192</P17>
+    {if isset($grandstream_ipv4gw_1)}<P17>{$grandstream_ipv4gw_1}</P17>{else}<P17>192</P17>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P18>168</P18>
+    {if isset($grandstream_ipv4gw_2)}<P18>{$grandstream_ipv4gw_2}</P18>{else}<P18>168</P18>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P19>2</P19>
+    {if isset($grandstream_ipv4gw_3)}<P19>{$grandstream_ipv4gw_3}</P19>{else}<P19>2</P19>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P20>1</P20>
+    {if isset($grandstream_ipv4gw_4)}<P20>{$grandstream_ipv4gw_4}</P20>{else}<P20>1</P20>{/if}
 
     <!-- # DNS 1 Server. Ignore if DHCP or PPPoE is used -->
     <!-- # Number: 0 - 255 -->
-    <P21>0</P21>
+    {if isset($grandstream_ipv4dns1_1)}<P21>{$grandstream_ipv4dns1_1}</P21>{else}<P21>0</P21>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P22>0</P22>
+    {if isset($grandstream_ipv4dns1_2)}<P22>{$grandstream_ipv4dns1_2}</P22>{else}<P22>0</P22>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P23>0</P23>
+    {if isset($grandstream_ipv4dns1_3)}<P23>{$grandstream_ipv4dns1_3}</P23>{else}<P23>0</P23>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P24>0</P24>
+    {if isset($grandstream_ipv4dns1_4)}<P24>{$grandstream_ipv4dns1_4}</P24>{else}<P24>0</P24>{/if}
 
     <!-- # DNS 2 Server. Ignore if DHCP or PPPoE is used -->
     <!-- # Number: 0 - 255 -->
-    <P25>0</P25>
+    {if isset($grandstream_ipv4dns2_1)}<P25>{$grandstream_ipv4dns2_1}</P25>{else}<P25>0</P25>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P26>0</P26>
+    {if isset($grandstream_ipv4dns2_2)}<P26>{$grandstream_ipv4dns2_2}</P26>{else}<P26>0</P26>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P27>0</P27>
+    {if isset($grandstream_ipv4dns2_3)}<P27>{$grandstream_ipv4dns2_3}</P27>{else}<P27>0</P27>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P28>0</P28>
+    {if isset($grandstream_ipv4dns2_4)}<P28>{$grandstream_ipv4dns2_4}</P28>{else}<P28>0</P28>{/if}
 
     <!-- # Preferred DNS server.  (if specified). -->
     <!-- # Number: 0 - 255 -->
-    <P92>0</P92>
+    {if isset($grandstream_ipv4preferdns_1)}<P92>{$grandstream_ipv4preferdns_1}</P92>{else}<P92>0</P92>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P93>0</P93>
+    {if isset($grandstream_ipv4preferdns_2)}<P93>{$grandstream_ipv4preferdns_2}</P93>{else}<P93>0</P93>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P94>0</P94>
+    {if isset($grandstream_ipv4preferdns_3)}<P94>{$grandstream_ipv4preferdns_3}</P94>{else}<P94>0</P94>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P95>0</P95>
+    {if isset($grandstream_ipv4preferdns_4)}<P95>{$grandstream_ipv4preferdns_4}</P95>{else}<P95>0</P95>{/if}
 
     <!-- # IPv6 Address type. 0 - Auto Configured, 1 - Statically Configured. Default is 0. -->
     <!-- # Number: 0, 1 -->
@@ -8433,11 +8437,13 @@
     <!-- ############################################################################## -->
     <!-- # Server Path -->
     <!-- # String -->
-    <P337></P337>
-
-    <!-- # Softkey Label -->
-    <!-- # String -->
-    <P352>XMLApp</P352>
+{if isset($xmlappurl)}
+    <P337>{$xmlappurl}?token={$xmlapptoken}</P337>
+    <P352>{$xmlapp}</P352>
+{elseif isset($xmlapp)}
+    <P337>https://{$server_address_1}/app/change-caller-id/app.php?token={$xmlapptoken}</P337>
+    <P352>{$xmlapp}</P352>
+{/if}
 
     <!-- # Default Background Color -->
     <!-- # String -->
@@ -8458,7 +8464,7 @@
     <!-- # Show Label Background. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P8345>0</P8345>
+    <P8345>{$grandstream_label_background}</P8345>
 
     <!-- # Use Long Label. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
@@ -8469,8 +8475,12 @@
     <!-- # Key Mode. 1 - Line Mode, 2 - Account Mode. Default is 1 -->
     <!-- # Number: 1, 2 -->
     <!-- # Mandatory -->
+    {if isset ($grandstream_key_mode)}
+    <P8369>{$grandstream_key_mode}</P8369>
+    {else}
     <P8369>1</P8369>
-
+    {/if}
+    
     <!-- # Transfer Mode via VPK. 0 - Blind Transfer, 1 - Attended Transfer, 2 - New Call. Default is 0 -->
     <!-- # Number: 0, 1, 2 -->
     <!-- # Mandatory -->
diff --git a/resources/templates/provision/grandstream/gxp2170/{$mac}.xml b/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
index 4d4179ff66..6ae0ffde13 100644
--- a/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
@@ -631,7 +631,11 @@
     <!-- # Jitter Buffer Type. 0 - Fixed, 1 - Adaptive. Default is 1 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
+    {if isset ($grandstream_jitter_adapt)}
+    <P133>{$grandstream_jitter_adapt}</P133>
+    {else}
     <P133>1</P133>
+    {/if}
 
     <!-- # Jitter Buffer Length. 0 - 100ms, 1 - 200ms, 2 - 300ms, 3 - 400ms, 4 - 500ms, 5 - 600ms, 6 - 700ms, 7 - 800ms -->
     <!-- # Default is 2 -->
@@ -5844,81 +5848,81 @@
     <!-- ########################################## -->
     <!-- # IP Address. Ignore if DHCP or PPPoE is used -->
     <!-- # Number: 0 - 255 -->
-    <P9>192</P9>
+    {if isset($grandstream_ipv4octet_1)}<P9>{$grandstream_ipv4octet_1}</P9>{else}<P9>192</P9>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P10>168</P10>
+    {if isset($grandstream_ipv4octet_2)}<P10>{$grandstream_ipv4octet_2}</P10>{else}<P10>168</P10>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P11>1</P11>
+    {if isset($grandstream_ipv4octet_3)}<P11>{$grandstream_ipv4octet_3}</P11>{else}<P11>1</P11>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P12>102</P12>
+    {if isset($grandstream_ipv4octet_4)}<P12>{$grandstream_ipv4octet_4}</P12>{else}<P12>102</P12>{/if}
 
     <!-- # Subnet mask. Ignore if DHCP or PPPoE is used -->
     <!-- # Number: 0 - 255 -->
-    <P13>255</P13>
+    {if isset($grandstream_ipv4mask_1)}<P13>{$grandstream_ipv4mask_1}</P13>{else}<P13>255</P13>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P14>255</P14>
+    {if isset($grandstream_ipv4mask_2)}<P14>{$grandstream_ipv4mask_2}</P14>{else}<P14>255</P14>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P15>0</P15>
+    {if isset($grandstream_ipv4mask_3)}<P15>{$grandstream_ipv4mask_3}</P15>{else}<P15>0</P15>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P16>0</P16>
+    {if isset($grandstream_ipv4mask_4)}<P16>{$grandstream_ipv4mask_4}</P16>{else}<P16>0</P16>{/if}
 
     <!-- # Gateway. Ignore if DHCP or PPPoE is used -->
     <!-- # Number: 0 - 255 -->
-    <P17>192</P17>
+    {if isset($grandstream_ipv4gw_1)}<P17>{$grandstream_ipv4gw_1}</P17>{else}<P17>192</P17>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P18>168</P18>
+    {if isset($grandstream_ipv4gw_2)}<P18>{$grandstream_ipv4gw_2}</P18>{else}<P18>168</P18>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P19>2</P19>
+    {if isset($grandstream_ipv4gw_3)}<P19>{$grandstream_ipv4gw_3}</P19>{else}<P19>2</P19>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P20>1</P20>
+    {if isset($grandstream_ipv4gw_4)}<P20>{$grandstream_ipv4gw_4}</P20>{else}<P20>1</P20>{/if}
 
     <!-- # DNS 1 Server. Ignore if DHCP or PPPoE is used -->
     <!-- # Number: 0 - 255 -->
-    <P21>0</P21>
+    {if isset($grandstream_ipv4dns1_1)}<P21>{$grandstream_ipv4dns1_1}</P21>{else}<P21>0</P21>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P22>0</P22>
+    {if isset($grandstream_ipv4dns1_2)}<P22>{$grandstream_ipv4dns1_2}</P22>{else}<P22>0</P22>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P23>0</P23>
+    {if isset($grandstream_ipv4dns1_3)}<P23>{$grandstream_ipv4dns1_3}</P23>{else}<P23>0</P23>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P24>0</P24>
+    {if isset($grandstream_ipv4dns1_4)}<P24>{$grandstream_ipv4dns1_4}</P24>{else}<P24>0</P24>{/if}
 
     <!-- # DNS 2 Server. Ignore if DHCP or PPPoE is used -->
     <!-- # Number: 0 - 255 -->
-    <P25>0</P25>
+    {if isset($grandstream_ipv4dns2_1)}<P25>{$grandstream_ipv4dns2_1}</P25>{else}<P25>0</P25>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P26>0</P26>
+    {if isset($grandstream_ipv4dns2_2)}<P26>{$grandstream_ipv4dns2_2}</P26>{else}<P26>0</P26>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P27>0</P27>
+    {if isset($grandstream_ipv4dns2_3)}<P27>{$grandstream_ipv4dns2_3}</P27>{else}<P27>0</P27>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P28>0</P28>
+    {if isset($grandstream_ipv4dns2_4)}<P28>{$grandstream_ipv4dns2_4}</P28>{else}<P28>0</P28>{/if}
 
     <!-- # Preferred DNS server.  (if specified). -->
     <!-- # Number: 0 - 255 -->
-    <P92>0</P92>
+    {if isset($grandstream_ipv4preferdns_1)}<P92>{$grandstream_ipv4preferdns_1}</P92>{else}<P92>0</P92>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P93>0</P93>
+    {if isset($grandstream_ipv4preferdns_2)}<P93>{$grandstream_ipv4preferdns_2}</P93>{else}<P93>0</P93>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P94>0</P94>
+    {if isset($grandstream_ipv4preferdns_3)}<P94>{$grandstream_ipv4preferdns_3}</P94>{else}<P94>0</P94>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P95>0</P95>
+    {if isset($grandstream_ipv4preferdns_4)}<P95>{$grandstream_ipv4preferdns_4}</P95>{else}<P95>0</P95>{/if}
 
     <!-- # IPv6 Address type. 0 - Auto Configured, 1 - Statically Configured. Default is 0. -->
     <!-- # Number: 0, 1 -->
@@ -8175,7 +8179,11 @@
     <!-- # When set to Yes(1), it will override the configured Time Zone setting if available  -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P143>1</P143>
+{if isset($grandstream_dhcp_option_2_timezone_override) }
+    <P143>{$grandstream_dhcp_option_2_timezone_override}</P143>
+{else}
+    <P143>0</P143>
+{/if}
 
     <!-- # Self Defined Time zone. Max length allowed is 64 characters -->
     <!-- # String -->
@@ -8433,11 +8441,13 @@
     <!-- ############################################################################## -->
     <!-- # Server Path -->
     <!-- # String -->
-    <P337></P337>
-
-    <!-- # Softkey Label -->
-    <!-- # String -->
-    <P352>XMLApp</P352>
+{if isset($xmlappurl)}
+    <P337>{$xmlappurl}?token={$xmlapptoken}</P337>
+    <P352>{$xmlapp}</P352>
+{elseif isset($xmlapp)}
+    <P337>https://{$server_address_1}/app/change-caller-id/app.php?token={$xmlapptoken}</P337>
+    <P352>{$xmlapp}</P352>
+{/if}
 
     <!-- # Default Background Color -->
     <!-- # String -->
@@ -8458,7 +8468,7 @@
     <!-- # Show Label Background. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P8345>0</P8345>
+    <P8345>{$grandstream_label_background}</P8345>
 
     <!-- # Use Long Label. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
@@ -8469,7 +8479,11 @@
     <!-- # Key Mode. 1 - Line Mode, 2 - Account Mode. Default is 1 -->
     <!-- # Number: 1, 2 -->
     <!-- # Mandatory -->
+    {if isset ($grandstream_key_mode)}
+    <P8369>{$grandstream_key_mode}</P8369>
+    {else}
     <P8369>1</P8369>
+    {/if}
 
     <!-- # Transfer Mode via VPK. 0 - Blind Transfer, 1 - Attended Transfer, 2 - New Call. Default is 0 -->
     <!-- # Number: 0, 1, 2 -->
diff --git a/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml b/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml
index 711124ebdb..37ee60eef0 100644
--- a/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml
@@ -3896,12 +3896,12 @@
 <P21641>5060</P21641>
 
 <!-- FXS 35 -->
-<P21002>{$account.34.user_id}</P21002>
-<P21066>{$account.34.user_id}</P21066>
-<P21130>{$account.34.password}</P21130>
-<P21194>{$account.34.display_name}</P21194>
+<P21002>{$account.35.user_id}</P21002>
+<P21066>{$account.35.user_id}</P21066>
+<P21130>{$account.35.password}</P21130>
+<P21194>{$account.35.display_name}</P21194>
 <P21258>0</P21258>
-{if !isset($account.34.user_id) && $grandstream_fxs_enabled == 0}
+{if !isset($account.35.user_id) && $grandstream_fxs_enabled == 0}
 <P21386>0</P21386>
 {else}
 <P21386>1</P21386>
@@ -3993,7 +3993,7 @@
 <!-- FXS 40 -->
 <P21007>{$account.40.user_id}</P21007>
 <P21071>{$account.40.user_id}</P21071>
-<P21145>{$account.40.password}</P21145>
+<P21135>{$account.40.password}</P21135>
 <P21199>{$account.40.display_name}</P21199>
 <P21263>0</P21263>
 {if !isset($account.40.user_id) && $grandstream_fxs_enabled == 0}
@@ -4012,7 +4012,7 @@
 <!-- FXS 41 -->
 <P21008>{$account.41.user_id}</P21008>
 <P21072>{$account.41.user_id}</P21072>
-<P21146>{$account.41.password}</P21146>
+<P21136>{$account.41.password}</P21136>
 <P21200>{$account.41.display_name}</P21200>
 <P21264>0</P21264>
 {if !isset($account.41.user_id) && $grandstream_fxs_enabled == 0}
@@ -4031,7 +4031,7 @@
 <!-- FXS 42 -->
 <P21009>{$account.42.user_id}</P21009>
 <P21073>{$account.42.user_id}</P21073>
-<P21147>{$account.42.password}</P21147>
+<P21137>{$account.42.password}</P21137>
 <P21201>{$account.42.display_name}</P21201>
 <P21265>0</P21265>
 {if !isset($account.42.user_id) && $grandstream_fxs_enabled == 0}
@@ -4050,7 +4050,7 @@
 <!-- FXS 43 -->
 <P21010>{$account.43.user_id}</P21010>
 <P21074>{$account.43.user_id}</P21074>
-<P21148>{$account.43.password}</P21148>
+<P21138>{$account.43.password}</P21138>
 <P21202>{$account.43.display_name}</P21202>
 <P21266>0</P21266>
 {if !isset($account.43.user_id) && $grandstream_fxs_enabled == 0}
diff --git a/resources/templates/provision/grandstream/ht801/{$mac}.xml b/resources/templates/provision/grandstream/ht801/{$mac}.xml
index cfb2471c88..caec1ab5b6 100644
--- a/resources/templates/provision/grandstream/ht801/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht801/{$mac}.xml
@@ -1199,7 +1199,7 @@
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
 {if isset($grandstream_fax_mode)}
-    <P228>1</P228>
+    <P228>{$grandstream_fax_mode}</P228>
 {else}
     <P228>0</P228>
 {/if}
diff --git a/resources/templates/provision/grandstream/wp810/phonebook.xml b/resources/templates/provision/grandstream/wp810/phonebook.xml
new file mode 100644
index 0000000000..deb211d001
--- /dev/null
+++ b/resources/templates/provision/grandstream/wp810/phonebook.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<AddressBook>
+
+	<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/wp810/{$mac}.xml b/resources/templates/provision/grandstream/wp810/{$mac}.xml
new file mode 100644
index 0000000000..8ec849d9e7
--- /dev/null
+++ b/resources/templates/provision/grandstream/wp810/{$mac}.xml
@@ -0,0 +1,2338 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!-- Grandstream XML Provisioning Configuration -->
+<gs_provision version="1">
+<mac>{$mac|replace:'-':''}</mac>
+  <config version="1">
+    <!-- Configuration Template For WP810 Firmware Version 1.0.9.17 -->
+    <!-- Account Settings -->
+    <!-- Account 1 -->
+    <!-- Account 1/General Settings -->
+    <!-- Account Active. 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P271>1</P271>
+
+    <!-- Account Name -->
+    <!-- String -->
+    <P270>{$account.1.display_name}</P270>
+
+    <!-- SIP Server -->
+    <!-- String -->
+{if $account.1.sip_transport != 'dns srv'}
+    <P47>{$account.1.server_address}:{$account.1.sip_port}</P47>
+{else}
+    <P47>{$account.1.server_address}</P47>
+{/if}
+
+    <!-- Secondary SIP Server -->
+    <!-- String -->
+{if $account.1.sip_transport != 'dns srv' && 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}
+
+    <!-- Outbound Proxy -->
+    <!-- String -->
+{if $account.1.sip_transport != 'dns srv' && 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}
+
+    <!-- Backup Outbound Proxy -->
+    <!-- String -->
+{if $account.1.sip_transport != 'dns srv' && 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}
+
+    <!-- SIP User ID -->
+    <!-- String -->
+    <P35>{$account.1.user_id}</P35>
+
+    <!-- Authenticate ID -->
+    <!-- String -->
+    <P36>{$account.1.auth_id}</P36>
+
+    <!-- Authenticate Password -->
+    <!-- String -->
+    <P34>{$account.1.password}</P34>
+
+    <!-- Name -->
+    <!-- String -->
+    <P3>{$account.1.display_name}</P3>
+
+    <!-- Voice Mail Access Number -->
+    <!-- String -->
+    <P33>{$voicemail_number}</P33>
+
+    <!-- Account Display -->
+    <!-- Number: 0, 1. 0 - User Name, 1 - User ID. Default is 0 -->
+    <!-- Mandatory -->
+    <P2380>0</P2380>
+
+    <!-- Account 1/Network Settings -->
+    <!-- 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}
+
+    <!-- DNS SRV Fail-over Mode. 0 - Default, 1 - Saved one until DNS TTL, 2 - Saved one until no response. Default is 0 -->
+    <!-- Number: 0,1,2 -->
+    <!-- Mandatory -->
+    <P26040>0</P26040>
+
+    <!-- Regiser Before DNS SRV Failover. 0 - No, 1 - Yes -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P29095>0</P29095>
+
+    <!-- Primary IP. Maximum 15 characters -->
+    <!-- String -->
+    <P2308></P2308>
+
+    <!-- Backup IP 1 -->
+    <!-- String -->
+    <P2309></P2309>
+
+    <!-- Backup IP 2 -->
+    <!-- String -->
+    <P2310></P2310>
+
+    <!-- NAT Traversal. 0 - No, 1 - STUN, 2 - keep alive, 3 - UPnP, 4 - Auto, 5 - VPN. Default is 4. -->
+    <!-- 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 -->
+    <P197></P197>
+
+    <!-- Account 1/SIP Settings/Basic Settings -->
+    <!-- TEL URI. 0 - Disabled, 1 - User=Phone, 2 - Enabled. Default is 0 -->
+    <!-- Number: 0, 1, 2 -->
+    <!-- Mandatory -->
+    <P63>0</P63>
+
+    <!-- SIP Registration. 0 - No, 1 - Yes. Default is 1 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P31>1</P31>
+
+    <!-- Unregister On Reboot. 0 - No, 1 - Yes, 2 - Instance. Default is 0 -->
+    <!-- Number: 0, 1, 2 -->
+    <!-- Mandatory -->
+    <P81>0</P81>
+
+    <!-- Register Expiration (in minutes). Default is 60. Max about 45 days -->
+    <!-- Number: 1 - 64800 -->
+    <!-- Mandatory -->
+{if isset($account.1.register_expires)}
+    <P32>{$account.1.register_expires}</P32>
+{else}
+    <P32>2</P32>
+{/if}
+
+    <!-- Subscribe Expiration (in minutes). Default is 60. Max about 45 days -->
+    <!-- Number: 1 - 64800 -->
+    <!-- Mandatory -->
+    <P26051>60</P26051>
+
+    <!-- Reregister Before Expiration (in seconds). Default is 0 seconds -->
+    <!-- Number: 0 - 64800 -->
+    <!-- Mandatory -->
+    <P2330>0</P2330>
+
+    <!-- Enable OPTIONS Keep Alive. 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0,1 -->
+    <!-- Mandatory -->
+    <P2397>0</P2397>
+
+    <!-- OPTIONS Keep Alive Interval. Default is 30 -->
+    <!-- Number -->
+    <!-- Mandatory -->
+    <P2398>30</P2398>
+
+    <!-- OPTIONS Keep Alive Max Lost. Default is 3 -->
+    <!-- Number -->
+    <!-- Mandatory -->
+    <P2399>3</P2399>
+
+    <!-- Local SIP Port. Default is 5060 -->
+    <!-- Number: 1024 - 65400 -->
+    <!-- Mandatory -->
+    <P40>5060</P40>
+
+    <!-- SIP Registration Failure Retry Wait Time (in seconds). Default is 20 -->
+    <!-- Number: 1 - 3600 -->
+    <!-- Mandatory -->
+    <P138>20</P138>
+
+    <!-- SIP T1 Timeout. RFC 3261 T1 value (RTT estimate) -->
+    <!-- 50 - 0.5 sec, 100 - 1 sec, 200 - 2 sec. Default is 50 -->
+    <!-- Number: 50, 100, 200 -->
+    <!-- Mandatory -->
+    <P209>50</P209>
+
+    <!-- SIP T2 Timeout. RFC 3261 T2 value. The maximum retransmit interval for non-INVITE requests and INVITE responses -->
+    <!-- 200 - 2 sec, 400 - 4 sec, 800 - 8 sec. Default is 400 -->
+    <!-- Number: 200, 400, 800 -->
+    <!-- Mandatory -->
+    <P250>400</P250>
+
+    <!-- SIP Transport. 0 - UDP, 1 - TCP, 2 - TLS/TCP. Default is 0 -->
+    <!-- Number: 0, 1, 2 -->
+    <!-- Mandatory -->
+{$tp=0}
+{if $sip_transport_1 == 'udp'}{$tp=0}{/if}
+{if $sip_transport_1 == 'tcp'}{$tp=1}{/if}
+{if $sip_transport_1 == 'tls'}{$tp=2}{/if}
+{if $sip_transport_1 == 'dns srv'}{$tp=1}{/if}
+    <P130>{$tp}</P130>
+
+    <!-- SIP Listening Mode. -->
+    <!-- 0 - Transport Only, 1 - Dual, 2 - Dual (BLF Enforced), 3 - Dual (Secured). Default is 0 -->
+    <!-- Number: 0,1,2,3 -->
+    <!-- Mandatory -->
+    <P26024>0</P26024>
+
+    <!-- SIP URI Scheme when using TLS. 0 - sip, 1 - sips. Default is 1 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P2329>1</P2329>
+
+    <!-- Use Actual Ephemeral Port in Contact with TCP/TLS. 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P2331>0</P2331>
+
+    <!-- Outbound Proxy Mode. 0 - in route, 1 - not in route, 2 - always send to -->
+    <!-- Number: 0, 1, 2 -->
+    <!-- Mandatory -->
+    <P2305>0</P2305>
+
+    <!-- Support SIP Instance ID. 0 - No, 1 - Yes. Default is 1 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P288>1</P288>
+
+    <!-- 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 -->
+    <!-- Mandatory -->
+    <P2319>0</P2319>
+
+    <!-- Enable 100rel. 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P272>0</P272>
+
+    <!-- Callee ID Display. 0 - Auto, 1 - Disabled, 2 - From Header. Default is 0 -->
+    <!-- Number: 0, 1, 2 -->
+    <!-- Mandatory -->
+    <P26025>0</P26025>
+
+    <!-- Caller ID Display. 0 - Auto, 1 - Disabled, 2 - From Header. Default is 2 -->
+    <!-- Number: 0, 1, 2 -->
+    <!-- Mandatory -->
+    <P2324>2</P2324>
+
+    <!-- Add Auth Header On Initial REGISTER -->
+    <!-- 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P2359>0</P2359>
+
+    <!-- Allow SIP Reset -->
+    <!-- 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P26015>0</P26015>
+
+    <!-- Ignore Alert-Info header -->
+    <!-- 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P26018>0</P26018>
+
+    <!-- Account 1/SIP Settings/Custom SIP Headers -->
+
+    <!-- Use Privacy Header -->
+    <!-- 0 - Default, 1 - No, 2 - Yes. Default is 0 -->
+    <!-- Number: 0, 1, 2 -->
+    <!-- Mandatory -->
+    <P2338>0</P2338>
+
+    <!-- Use P-Preferred-Identity Header -->
+    <!-- 0 - Default, 1 - No, 2 - Yes. Default is 0 -->
+    <!-- Number: 0, 1, 2 -->
+    <!-- Mandatory -->
+    <P2339>0</P2339>
+
+    <!-- Use P-Access-Network-Info Header -->
+    <!-- 0 - No, 1 - Yes. Default is 1 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P26058>1</P26058>
+
+    <!-- Use P-Emergency-Info Header -->
+    <!-- 0 - No, 1 - Yes. Default is 1 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P26059>1</P26059>
+
+    <!-- Use MAC Header -->
+    <!-- 0 - No, 1 - Only for REGISTER, 2 - Yes to all SIP. Default is 0 -->
+    <!-- Number: 0, 1, 2 -->
+    <!-- Mandatory -->
+    <P29090>0</P29090>
+
+    <!-- Add MAC in User-Agent -->
+    <!-- 0 – No, 1 – Yes except REGISTER, 2 – Yes to all SIP. Default is 0 -->
+    <!-- Number: 0, 1, 2 -->
+    <!-- Mandatory -->
+    <P26061>0</P26061>
+
+    <!-- Account 1/SIP Settings/Advanced Features -->
+    <!-- PUBLISH for Presence. 0 - Disabled, 1 - Enabled. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P188>0</P188>
+
+    <!-- Omit charset=UTF-8 in MESSAGE. 0 - Disabled, 1 - Enabled. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P2355>0</P2355>
+
+    <!-- Feature Key Synchronization 0 - Disabled, 1 - Enabled. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P2325>0</P2325>
+
+    <!-- Special Feature. 100 - Standard, 101 - Nortel MCS, 102- Broadsoft, 108 - CBCOM, -->
+    <!-- 109 - RNK, 110 - Sylantro, 117 - Huawei IMS, 119 - Phonepower, 120 - UCM Call Center -->
+    <!-- Default is 100 -->
+    <!-- Number: 100, 101, 102, 108, 109, 110, 117, 119, 120 -->
+    <!-- Mandatory -->
+    <P198>100</P198>
+
+    <!-- Account 1/SIP Settings/Session Timer -->
+    <!-- Enable Session Timer. 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P2395>0</P2395>
+
+    <!-- Session Expiration (in seconds). Default is 180 -->
+    <!-- Number: 90 - 64800 -->
+    <!-- Mandatory -->
+    <P260>180</P260>
+
+    <!-- Minimum SE (in seconds). Default is 90. This value must be lower than or equal to P260 -->
+    <!-- Number: 90 - 64800 -->
+    <!-- Mandatory -->
+    <P261>90</P261>
+
+    <!-- Caller Request Timer (Request for timer when calling). 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P262>0</P262>
+
+    <!-- Callee Request Timer (Request for timer when called. i.e. if remote party supports timer but did not request for one) -->
+    <!-- 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P263>0</P263>
+
+    <!-- Force Timer (Still use timer when remote party does not support timer). 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P264>0</P264>
+
+    <!-- UAC Specify Refresher. 0 - Omit, 1 - UAC, 2 - UAS. Default is 1 -->
+    <!-- Number: 0 - 2 -->
+    <!-- Mandatory -->
+    <P266>1</P266>
+
+    <!-- UAS Specify Refresher. 1 - UAC, 2 - UAS. Default is 1 -->
+    <!-- Number: 1, 2 -->
+    <!-- Mandatory -->
+    <P267>1</P267>
+
+    <!-- Force INVITE (Always refresh with INVITE instead of UPDATE even when remote party supports UPDATE). -->
+    <!-- 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P265>0</P265>
+
+    <!-- Account 1/SIP Settings/Security Settings -->
+    <!-- Check Domain Certificates. When set to Yes/Enabled, domain certificate will be checked as defined in RFC5922 -->
+    <!-- 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P2311>0</P2311>
+
+    <!-- Validate Certification Chain. 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P2367>0</P2367>
+
+    <!-- Validate Incoming Messages. 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P2306>0</P2306>
+
+    <!-- Check SIP User ID for incoming INVITE. 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P258>0</P258>
+
+    <!-- Accept Incoming SIP from Proxy Only. 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P2347>0</P2347>
+
+    <!-- Authenticate Incoming INVITE. 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P2346>0</P2346>
+
+    <!-- Account 1/Audio Settings -->
+    <!-- Preferred Vocoder -->
+    <!-- 0 - PCMU, 2 - G.726-32, 8 - PCMA, 9 - G.722, 18 - G.729A/B, 98 - iLBC, 123 - OPUS -->
+    <!-- choice 1. Default is 0 -->
+    <!-- Number: 0, 2, 8, 9, 18, 98, 123 -->
+    <!-- Mandatory -->
+    <P57>0</P57>
+
+    <!-- choice 2. Default is 8 -->
+    <!-- Number: 0, 2, 8, 9, 18, 98, 123 -->
+    <!-- Mandatory -->
+    <P58>8</P58>
+
+    <!-- choice 3. Default is 18 -->
+    <!-- Number: 0, 2, 8, 9, 18, 98, 123 -->
+    <!-- Mandatory -->
+    <P59>18</P59>
+
+    <!-- choice 4. Default is 9 -->
+    <!-- Number: 0, 2, 8, 9, 18, 98, 123 -->
+    <!-- Mandatory -->
+    <P60>9</P60>
+
+    <!-- choice 5. Default is 98 -->
+    <!-- Number: 0, 2, 8, 9, 18, 98, 123 -->
+    <!-- Mandatory -->
+    <P61>98</P61>
+
+    <!-- choice 6. Default is 2 -->
+    <!-- Number: 0, 2, 8, 9, 18, 98, 123 -->
+    <!-- Mandatory -->
+    <P62>2</P62>
+
+    <!-- choice 7. Default is 123 -->
+    <!-- Number: 0, 2, 8, 9, 18, 98, 123 -->
+    <!-- Mandatory -->
+    <P46>123</P46>
+
+    <!-- Use First Matching Vocoder in 200OK SDP. 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P2348>0</P2348>
+
+    <!-- Codec Negotiation Priority. 0 - Caller, 1 - Callee. Default is 1 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P29061>1</P29061>
+
+    <!-- Disable Multiple m line in SDP -->
+    <!-- 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P137>0</P137>
+
+    <!-- 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}
+
+    <!-- SRTP Key Length. 0 - AES 128&256 bit, 1 - AES 128 bit, 2 - AES 256 bit. Default is 0 -->
+    <!-- Default is 0 -->
+    <!-- Number: 0,1 -->
+    <!-- Mandatory -->
+    <P2383>0</P2383>
+
+    <!-- Crypto Life Time -->
+    <!-- 0 - No, 1 - Yes. Default is 1 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P2363>1</P2363>
+
+    <!-- Symmetric RTP. 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P291>0</P291>
+
+    <!-- Silence Suppression. 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P50>0</P50>
+
+    <!-- Jitter Buffer Type. 0 - Fixed, 1 - Adaptive. Default is 1 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P133>1</P133>
+
+    <!-- Jitter Buffer Length. 0 - 100ms, 1 - 200ms, 2 - 300ms, 3 - 400ms, 4 - 500ms, 5 - 600ms, 6 - 700ms, 7 - 800ms -->
+    <!-- Default is 2 -->
+    <!-- Number: 0, 1, 2, 3, 4, 5, 6, 7 -->
+    <!-- Mandatory -->
+    <P132>2</P132>
+
+    <!-- Voice Frames per TX (up to 10/20/32/64 frames for G711/G726/G723/other codecs respectively). Default is 2 -->
+    <!-- Number: 1 - 64 -->
+    <!-- Mandatory -->
+    <P37>2</P37>
+
+    <!-- G.726-32 Packing Mode. 0 - ITU, 1 - IETF. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P2323>0</P2323>
+
+    <!-- iLBC Frame Size. 0 - 20ms, 1 - 30ms. Default is 1 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P97>1</P97>
+
+    <!-- iLBC Payload Type. Default is 97 -->
+    <!-- Number: 96 - 127 -->
+    <!-- Mandatory -->
+    <P96>97</P96>
+
+    <!-- OPUS Payload Type. Default is 123 -->
+    <!-- Number: 96 - 127 -->
+    <!-- Mandatory -->
+    <P2385>123</P2385>
+
+    <!-- DTMF Payload Type. Default is 101 -->
+    <!-- Number: 96 - 127 -->
+    <!-- Mandatory -->
+    <P79>101</P79>
+
+    <!-- Send DTMF: In-audio. 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P2301>0</P2301>
+
+    <!-- Send DTMF: Via RTP (RFC2833). 0 - No, 1 - Yes. Default is 1 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P2302>1</P2302>
+
+    <!-- Send DTMF: Via SIP INFO. 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P2303>0</P2303>
+
+    <!-- Account 1/Call Settings -->
+    <!-- Dial Plan. Default value is { x+ | \+x+ | *x+ | *xx*x+ } -->
+    <!-- String -->
+    <!-- Mandatory -->
+    <P290>{$grandstream_dial_plan}</P290>
+
+    <!-- Call Log. 0 - Log All Calls, 1 - Log Incoming/Outgoing only (missed calls NOT recorded), 2 - Disable Call Log. Default is 0 -->
+    <!-- Number: 0, 1, 2 -->
+    <!-- Mandatory -->
+    <P182>0</P182>
+
+    <!-- Send Anonymous (caller ID will be blocked if set to Yes). 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P65>0</P65>
+
+    <!-- Anonymous Call Rejection. 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P129>0</P129>
+
+    <!-- Auto Answer. 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P90>0</P90>
+
+    <!-- Refer-To Use Target Contact. 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P135>0</P135>
+
+    <!-- Transfer on Conference Hangup. 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P2304>0</P2304>
+
+    <!-- Disable Recovery on Blind Transfer. 0 - No, 1 - Yes. Default is 1 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P2384>1</P2384>
+
+    <!-- Blind Transfer Wait Timeout. Default is 30 -->
+    <!-- Number: 30 - 300 -->
+    <!-- Mandatory -->
+    <P26070>30</P26070>
+
+    <!-- Key as Send. 0 - Disabled, 1 - Pound (#), 2 - Star (*). Default is 1 -->
+    <!-- Number: 0, 1, 2 -->
+    <!-- Mandatory -->
+    <P72>1</P72>
+
+    <!-- RFC2543 Hold. 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P26062>0</P26062>
+
+    <!-- Disable Call Waiting. 0 - Default, 1 - No, 2 - Yes. Default is 0 -->
+    <!-- Number: 0, 1, 2 -->
+    <!-- Mandatory -->
+    <P26063>0</P26063>
+
+    <!-- Account 1/Ringtone -->
+
+    <!-- Matching Incoming Caller ID. Matching Rule 1 -->
+    <!-- String -->
+    <P1488>{$grandstream_distinctive_ringtone_name_1}</P1488>
+
+    <!-- Matching Rule 1 Distinctive Ringtone -->
+    <!-- 0 - Default Ringtone -->
+    <!-- Number: 0-81 -->
+    <!-- Mandatory -->
+    <P1489>{$grandstream_distinctive_ringtone_1}</P1489>
+
+    <!-- Matching Incoming Caller ID. Matching Rule 2 -->
+    <!-- String -->
+    <P1490>{$grandstream_distinctive_ringtone_name_2}</P1490>
+
+    <!-- Matching Rule 2 Distinctive Ringtone -->
+    <!-- 0 - Default Ringtone -->
+    <!-- Number: 0-81 -->
+    <!-- Mandatory -->
+    <P1491>{$grandstream_distinctive_ringtone_2}</P1491>
+
+    <!-- Matching Incoming Caller ID. Matching Rule 3 -->
+    <!-- String -->
+    <P1492>{$grandstream_distinctive_ringtone_name_3}</P1492>
+
+    <!-- Matching Rule 3 Distinctive Ringtone -->
+    <!-- 0 - Default Ringtone -->
+    <!-- Number: 0-81 -->
+    <!-- Mandatory -->
+    <P1493>{$grandstream_distinctive_ringtone_3}</P1493>
+
+    <!-- Matching Incoming Caller ID. Matching Rule 4 -->
+    <!-- String -->
+    <P6716></P6716>
+
+    <!-- Matching Rule 4 Distinctive Ringtone -->
+    <!-- 0 - Default Ringtone -->
+    <!-- Number: 0-81 -->
+    <!-- Mandatory -->
+    <P6717>0</P6717>
+
+    <!-- Matching Incoming Caller ID. Matching Rule 5 -->
+    <!-- String -->
+    <P6718></P6718>
+
+    <!-- Matching Rule 5 Distinctive Ringtone -->
+    <!-- 0 - Default Ringtone -->
+    <!-- Number: 0-81 -->
+    <!-- Mandatory -->
+    <P6719>0</P6719>
+
+    <!-- Matching Incoming Caller ID. Matching Rule 6 -->
+    <!-- String -->
+    <P6720></P6720>
+
+    <!-- Matching Rule 6 Distinctive Ringtone -->
+    <!-- 0 - Default Ringtone -->
+    <!-- Number: 0-81 -->
+    <!-- Mandatory -->
+    <P6721>0</P6721>
+
+    <!-- Matching Incoming Caller ID. Matching Rule 7 -->
+    <!-- String -->
+    <P26064></P26064>
+
+    <!-- Matching Rule 7 Distinctive Ringtone -->
+    <!-- 0 - Default Ringtone -->
+    <!-- Number: 0-81 -->
+    <!-- Mandatory -->
+    <P26065>0</P26065>
+
+    <!-- Matching Incoming Caller ID. Matching Rule 8 -->
+    <!-- String -->
+    <P26066></P26066>
+
+    <!-- Matching Rule 8 Distinctive Ringtone -->
+    <!-- 0 - Default Ringtone -->
+    <!-- Number: 0-81 -->
+    <!-- Mandatory -->
+    <P26067>0</P26067>
+
+    <!-- Matching Incoming Caller ID. Matching Rule 9 -->
+    <!-- String -->
+    <P26068></P26068>
+
+    <!-- Matching Rule 9 Distinctive Ringtone -->
+    <!-- 0 - Default Ringtone -->
+    <!-- Number: 0-81 -->
+    <!-- Mandatory -->
+    <P26069>0</P26069>
+
+    <!-- Matching Incoming Caller ID. Matching Rule 10 -->
+    <!-- String -->
+    <P26096></P26096>
+
+    <!-- Matching Rule 10 Distinctive Ringtone -->
+    <!-- 0 - Default Ringtone -->
+    <!-- Number: 0-81 -->
+    <!-- Mandatory -->
+    <P26097>0</P26097>
+
+
+    <!-- Ring Timeout (in seconds). Default is 60 -->
+    <!-- Number: 30 - 3600 -->
+    <!-- Mandatory -->
+    <P1328>60</P1328>
+
+    <!-- Account 1/Intercom Settings -->
+    <!-- Allow Auto Answer by Call-Info/Alert-Info. 0 - No, 1 - Yes. Default is 1 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P298>1</P298>
+
+    <!-- Allow Barging by Call-Info/Alert-Info. 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P26019>0</P26019>
+
+    <!-- Custom Alert-Info for Auto Answer. -->
+    <!-- String -->
+    <P2356></P2356>
+
+    <!-- Account 1/Feature Codes -->
+    <!-- Enable Local Call Features. 0 - No, 1 - Yes. Default is 1 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P191>1</P191>
+
+    <!-- Account 2 -->
+    <!-- Account 2/General Settings -->
+    <!-- Account Active. 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+{if isset($account.2.password)}
+    <P401>1</P401>
+{else}
+    <P401>0</P401>
+{/if}
+
+    <!-- Account Name -->
+    <!-- String -->
+    <P417>{$account.2.display_name}</P417>
+
+    <!-- SIP Server -->
+    <!-- String -->
+{if $account.2.sip_transport != 'dns srv'}
+    <P402>{$account.2.server_address}:{$account.2.sip_port}</P402>
+{else}
+    <P402>{$account.2.server_address}</P402>
+{/if}
+
+    <!-- Secondary SIP Server -->
+    <!-- String -->
+{if $account.2.sip_transport != 'dns srv' && 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}
+
+    <!-- Outbound Proxy -->
+    <!-- String -->
+{if $account.2.sip_transport != 'dns srv' && 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 -->
+{if $account.2.sip_transport != 'dns srv' && 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}
+
+    <!-- SIP User ID -->
+    <!-- String -->
+    <P404>{$account.2.user_id}</P404>
+
+    <!-- Authenticate ID -->
+    <!-- String -->
+    <P405>{$account.2.auth_id}</P405>
+
+    <!-- Authenticate password -->
+    <!-- String -->
+    <P406>{$account.2.password}</P406>
+
+    <!-- Name -->
+    <!-- String -->
+    <P407>{$account.2.display_name}</P407>
+
+    <!-- Voice Mail UserID -->
+    <!-- String -->
+    <P426>{$voicemail_number}</P426>
+
+    <!-- Account Display -->
+    <!-- Number: 0, 1. 0 - User Name, 1 - User ID. Default is 0 -->
+    <!-- Mandatory -->
+    <P2480>0</P2480>
+
+    <!-- Account 2/Network Settings -->
+    <!-- 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}
+
+    <!-- DNS SRV Fail-over Mode. 0 - Default, 1 - Saved one until DNS TTL, 2 - Saved one until no response. Default is 0 -->
+    <!-- Number: 0,1,2 -->
+    <!-- Mandatory -->
+    <P26140>0</P26140>
+
+    <!-- Regiser Before DNS SRV Failover. 0 - No, 1 - Yes -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P29195>0</P29195>
+
+    <!-- Primary IP. Maximum 15 characters -->
+    <!-- String -->
+    <P2408></P2408>
+
+    <!-- Backup IP 1 -->
+    <!-- String -->
+    <P2409></P2409>
+
+    <!-- Backup IP 2 -->
+    <!-- String -->
+    <P2410></P2410>
+
+    <!-- NAT Traversal. 0 - No, 1 - STUN, 2 - keep alive, 3 - UPnP, 4 - Auto, 5 - VPN. Default is 4 -->
+    <!-- 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 -->
+    <P418></P418>
+
+    <!-- Account 2/SIP Settings/Basic Settings -->
+    <!-- TEL URI. 0 - Disabled, 1 - User=Phone, 2 - Enabled. Default is 0 -->
+    <!-- Number: 0, 1, 2 -->
+    <!-- Mandatory -->
+    <P409>0</P409>
+
+    <!-- SIP Registration. 0 - No, 1 - Yes. Default is 1 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P410>1</P410>
+
+    <!-- Unregister On Reboot. 0 - No, 1 - Yes, 2 - Instance. Default is 0 -->
+    <!-- Number: 0, 1, 2 -->
+    <!-- Mandatory -->
+    <P411>0</P411>
+
+    <!-- Register Expiration (in minutes). Default is 60. Max is 45 days -->
+    <!-- Number: 1 - 64800 -->
+    <!-- Mandatory -->
+{if isset($account.2.register_expires)}
+    <P412>{$account.2.register_expires}</P412>
+{else}
+    <P412>2</P412>
+{/if}
+
+    <!-- Subscribe Expiration. Default is 60. Max about 45 days -->
+    <!-- Number: 1 - 64800 -->
+    <!-- Mandatory -->
+    <P26151>60</P26151>
+
+    <!-- Reregister before Expiration (in seconds). Default is 0 seconds -->
+    <!-- Number: 0 - 64800 -->
+    <!-- Mandatory -->
+    <P2430>0</P2430>
+
+    <!-- Enable OPTIONS Keep Alive. 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0,1 -->
+    <!-- Mandatory -->
+    <P2497>0</P2497>
+
+    <!-- OPTIONS Keep Alive Interval. Default is 30 -->
+    <!-- Number -->
+    <!-- Mandatory -->
+    <P2498>30</P2498>
+
+    <!-- OPTIONS Keep Alive Max Lost. Default is 3 -->
+    <!-- Number -->
+    <!-- Mandatory -->
+    <P2499>3</P2499>
+
+    <!-- Local SIP port. Default is 5062 -->
+    <!-- Number: 1024 - 65400 -->
+    <!-- Mandatory -->
+    <P413>5062</P413>
+
+    <!-- SIP Registration Failure Retry Wait Time (in seconds). Default is 20 -->
+    <!-- Number: 1 - 3600 -->
+    <!-- Mandatory -->
+    <P471>20</P471>
+
+    <!-- SIP T1 Timeout. RFC 3261 T1 value (RTT estimate) -->
+    <!-- 50 - 0.5 sec, 100 - 1 sec, 200 - 2 sec. Default is 100 -->
+    <!-- Number: 50, 100, 200 -->
+    <!-- Mandatory -->
+    <P440>50</P440>
+
+    <!-- SIP T2 Timeout. RFC 3261 T2 value. The maximum retransmit interval for non-INVITE requests and INVITE responses -->
+    <!-- 200 - 2 sec, 400 - 4 sec, 800 - 8 sec. Default is 400 -->
+    <!-- Number: 200, 400, 800 -->
+    <!-- Mandatory -->
+    <P441>400</P441>
+
+    <!-- SIP Transport. 0 - UDP, 1 - TCP, 2 - TCP/TLS. Default is 0 -->
+    <!-- Number: 0, 1, 2 -->
+    <!-- Mandatory -->
+{$tp=0}
+{if $sip_transport_2 == 'udp'}{$tp=0}{/if}
+{if $sip_transport_2 == 'tcp'}{$tp=1}{/if}
+{if $sip_transport_2 == 'tls'}{$tp=2}{/if}
+{if $sip_transport_2 == 'dns srv'}{$tp=1}{/if}
+    <P448>{$tp}</P448>
+
+    <!-- SIP Listening Mode. -->
+    <!-- 0 - Transport Only, 1 - Dual, 2 - Dual (BLF Enforced), 3 - Dual (Secured). Default is 0 -->
+    <!-- Number: 0,1,2,3 -->
+    <!-- Mandatory -->
+    <P26124>0</P26124>
+
+    <!-- SIP URI Scheme when using TLS. 0 - sip, 1 - sips. Default is 1 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P2429>1</P2429>
+
+    <!-- Use Actual Ephemeral Port in Contact with TCP/TLS. 0 - No, 1- Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P2431>0</P2431>
+
+    <!-- Outbound Proxy Mode. 0 - in route, 1 - not in route, 2 - always send to -->
+    <!-- Number: 0, 1, 2 -->
+    <!-- Mandatory -->
+    <P2405>0</P2405>
+
+    <!-- Support SIP Instance ID. 0 - No, 1 - Yes. Default is 1 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P489>1</P489>
+
+    <!-- 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 -->
+    <!-- Mandatory -->
+    <P2419>0</P2419>
+
+    <!-- Enable 100rel. 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P435>0</P435>
+
+    <!-- Callee ID Display. 0 - Auto, 1 - Disabled, 2 - From Header. Default is 0 -->
+    <!-- Number: 0, 1, 2 -->
+    <!-- Mandatory -->
+    <P26125>0</P26125>
+
+    <!-- Caller ID Display. 0 - Auto, 1 - Disabled, 2 - From Header. Default is 2 -->
+    <!-- Number: 0, 1, 2 -->
+    <!-- Mandatory -->
+    <P2424>2</P2424>
+
+    <!-- Add Auth Header On Initial REGISTER -->
+    <!-- 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P2459>0</P2459>
+
+    <!-- Allow SIP Reset -->
+    <!-- 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P26115>0</P26115>
+
+    <!-- Ignore Alert-Info header -->
+    <!-- 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P26118>0</P26118>
+
+    <!-- Account 2/SIP Settings/Custom SIP Headers -->
+
+    <!-- Use Privacy Header -->
+    <!-- 0 - Default, 1 - No, 2 - Yes. Default is 0 -->
+    <!-- Number: 0, 1, 2 -->
+    <!-- Mandatory -->
+    <P2438>0</P2438>
+
+    <!-- Use P-Preferred-Identity Header -->
+    <!-- 0 - Default, 1 - No, 2 - Yes. Default is 0 -->
+    <!-- Number: 0, 1, 2 -->
+    <!-- Mandatory -->
+    <P2439>0</P2439>
+
+    <!-- Use P-Access-Network-Info Header -->
+    <!-- 0 - No, 1 - Yes. Default is 1 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P26158>1</P26158>
+
+    <!-- Use P-Emergency-Info Header -->
+    <!-- 0 - No, 1 - Yes. Default is 1 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P26159>1</P26159>
+
+    <!-- Use MAC Header -->
+    <!-- 0 - No, 1 - Only for REGISTER, 2 - Yes to all SIP. Default is 0 -->
+    <!-- Number: 0, 1, 2 -->
+    <!-- Mandatory -->
+    <P29190>0</P29190>
+
+    <!-- Add MAC in User-Agent -->
+    <!-- 0 – No, 1 – Yes except REGISTER, 2 – Yes to all SIP. Default is 0 -->
+    <!-- Number: 0, 1, 2 -->
+    <!-- Mandatory -->
+    <P26161>0</P26161>
+
+    <!-- Account 2/SIP Settings/Advanced Features -->
+    <!-- PUBLISH for Presence. 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P488>0</P488>
+
+    <!-- Omit charset=UTF-8 in MESSAGE. 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P2455>0</P2455>
+
+    <!-- Feature Key Synchronization 0 - Disabled, 1 - Enabled. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P2425>0</P2425>
+
+    <!-- Special Feature. 100 - Standard, 101 - Nortel MCS, 102- Broadsoft, 108 - CBCOM, -->
+    <!-- 109 - RNK, 110 - Sylantro, 117 - Huawei IMS, 119 - Phonepower, 120 - UCM Call Center -->
+    <!-- Default is 100 -->
+    <!-- Number: 100, 101, 102, 108, 109, 110, 117, 119, 120 -->
+    <!-- Mandatory -->
+    <P424>100</P424>
+
+    <!-- Account 2/SIP Settings/Session Timer -->
+    <!-- Enable Session Timer. 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P2495>0</P2495>
+
+    <!-- Session Expiration (in seconds). Default is 180 -->
+    <!-- Number: 90 - 64800 -->
+    <!-- Mandatory -->
+    <P434>180</P434>
+
+    <!-- Minimum SE (in seconds). Default is 90. This value must be lower than or equal to P434 -->
+    <!-- Number: 90 - 64800 -->
+    <!-- Mandatory -->
+    <P427>90</P427>
+
+    <!-- Caller Request Timer (Request for timer when calling). 0 - No, 1 - Yes -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P428>0</P428>
+
+    <!-- Callee Request Timer (Request for timer when called. i.e. if remote party supports timer but did not request for one) -->
+    <!-- 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P429>0</P429>
+
+    <!-- Force Timer (Still use timer when remote party does not support timer). 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P430>0</P430>
+
+    <!-- UAC Specify Refresher. 0 - Omit, 1 - UAC, 2 - UAS. Default is 1 -->
+    <!-- Number: 0 - 2 -->
+    <!-- Mandatory -->
+    <P432>1</P432>
+
+    <!-- UAS Specify Refresher. 1 - UAC, 2 - UAS. Default is 1 -->
+    <!-- Number: 1, 2 -->
+    <!-- Mandatory -->
+    <P433>1</P433>
+
+    <!-- Force INVITE (Always refresh with INVITE instead of UPDATE even when remote party supports UPDATE) -->
+    <!-- 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P431>0</P431>
+
+    <!-- Account 2/SIP Settings/Security Settings -->
+    <!-- Check Domain Certificates. 0 - No, 1 - Yes. When set to Yes/Enabled, the domain certificate will be checked as defined in RFC5922 -->
+    <!-- 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P2411>0</P2411>
+
+    <!-- Validate Certification Chain. 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P2467>0</P2467>
+
+    <!-- Validate Incoming Messages. 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P2406>0</P2406>
+
+    <!-- Check SIP User ID for incoming INVITE. 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P449>0</P449>
+
+    <!-- Accept Incoming SIP from Proxy Only. 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P2447>0</P2447>
+
+    <!-- Authenticate Incoming INVITE. 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P2446>0</P2446>
+
+    <!-- Account 2/Audio Settings -->
+    <!-- Preferred Vocoder -->
+    <!-- 0 - PCMU, 2 - G.726-32, 8 - PCMA, 9 - G.722, 18 - G.729A/B, 98 - iLBC, 125 - OPUS -->
+    <!-- choice 1. Default is 0 -->
+    <!-- Number: 0, 2, 8, 9, 18, 98, 123 -->
+    <!-- Mandatory -->
+    <P451>0</P451>
+
+    <!-- choice 2. Default is 8 -->
+    <!-- Number: 0, 2, 8, 9, 18, 98, 123 -->
+    <!-- Mandatory -->
+    <P452>8</P452>
+
+    <!-- choice 3. Default is 18 -->
+    <!-- Number: 0, 2, 8, 9, 18, 98, 123 -->
+    <!-- Mandatory -->
+    <P453>18</P453>
+
+    <!-- choice 4. Default is 9 -->
+    <!-- Number: 0, 2, 8, 9, 18, 98, 123 -->
+    <!-- Mandatory -->
+    <P454>9</P454>
+
+    <!-- choice 5. Default is 98 -->
+    <!-- Number: 0, 2, 8, 9, 18, 98, 123 -->
+    <!-- Mandatory -->
+    <P455>98</P455>
+
+    <!-- choice 6. Default is 2 -->
+    <!-- Number: 0, 2, 8, 9, 18, 98, 123 -->
+    <!-- Mandatory -->
+    <P456>2</P456>
+
+    <!-- choice 7. Default is 123 -->
+    <!-- Number: 0, 2, 8, 9, 18, 98, 123 -->
+    <!-- Mandatory -->
+    <P457>123</P457>
+
+    <!-- Use First Matching Vocoder in 200OK SDP. 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P2448>0</P2448>
+
+    <!-- Codec Negotiation Priority. 0 - Caller, 1 - Callee. Default is 1 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P29161>1</P29161>
+
+    <!-- Disable Multiple m line in SDP -->
+    <!-- 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P487>0</P487>
+
+    <!-- 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)}
+    <P443>{$grandstream_srtp}</P443>
+{else}
+    <P443>0</P443>
+{/if}
+
+    <!-- SRTP Key Length. 0 - AES 128&256 bit, 1 - AES 128 bit, 2 - AES 256 bit. Default is 0 -->
+    <!-- Default is 0 -->
+    <!-- Number: 0,1 -->
+    <!-- Mandatory -->
+    <P2483>0</P2483>
+
+    <!-- Crypto Life Time -->
+    <!-- 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P2463>0</P2463>
+
+    <!-- Symmetric RTP. 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P460>0</P460>
+
+    <!-- Silence Suppression 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P485>0</P485>
+
+    <!-- Jitter Buffer Type. 0 - Fixed, 1 - Adaptive. Default is 1 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P498>1</P498>
+
+    <!-- Jitter Buffer Length. -->
+    <!-- 0 - 100ms, 1 - 200ms, 2 - 300ms, 3 - 400ms, 4 - 500ms, 5 - 600ms, 6 - 700ms, 7 - 800ms. Default is 2 -->
+    <!-- Number: 0, 1, 2, 3, 4, 5, 6, 7 -->
+    <!-- Mandatory -->
+    <P497>2</P497>
+
+    <!-- Voice Frames per TX (up to 10/20/32/64 frames for G711/G726/G723/other codecs respectively). Default is 2 -->
+    <!-- Number: 1 - 64 -->
+    <!-- Mandatory -->
+    <P486>2</P486>
+
+    <!-- G.726-32 Packing Mode. 0 - ITU, 1 - IETF. default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P2423>0</P2423>
+
+    <!-- iLBC Frame Size. 0 - 20ms, 1 - 30ms. Default is 1 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P495>1</P495>
+
+    <!-- iLBC Payload Type. Default is 97 -->
+    <!-- Number: 96 - 127 -->
+    <!-- Mandatory -->
+    <P494>97</P494>
+
+    <!-- OPUS Payload Type. Default is 123 -->
+    <!-- Number: 96 - 127 -->
+    <!-- Mandatory -->
+    <P2485>123</P2485>
+
+    <!-- DTMF Payload Type. Default is 101 -->
+    <!-- Number: 96 - 127 -->
+    <!-- Mandatory -->
+    <P496>101</P496>
+
+    <!-- Send DTMF: In-audio. 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P2401>0</P2401>
+
+    <!-- Send DTMF: Via RTP (RFC2833). 0 - No, 1 - Yes. Default is 1 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P2402>1</P2402>
+
+    <!-- Send DTMF: Via SIP INFO. 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P2403>0</P2403>
+
+    <!-- Account 2/Call Settings -->
+    <!-- Dial Plan. Default is { x+ | \+x+ | *x+ | *xx*x+ } -->
+    <!-- String -->
+    <!-- Mandatory -->
+    <P459>{$grandstream_dial_plan}</P459>
+
+    <!-- Call Log. 0 - Log All Calls, 1 - Log Incoming/Outgoing only (missed calls NOT recorded), 2 - Disable Call Log. Default is 0 -->
+    <!-- Number: 0, 1, 2 -->
+    <!-- Mandatory -->
+    <P442>0</P442>
+
+    <!-- Send Anonymous (caller ID will be blocked if set to Yes). 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P421>0</P421>
+
+    <!-- Anonymous Call Rejection. 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P446>0</P446>
+
+    <!-- Auto Answer. 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P425>0</P425>
+
+    <!-- Refer-To Use Target Contact. 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P469>0</P469>
+
+    <!-- Transfer on Conference Hangup. 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P2404>0</P2404>
+
+    <!-- Disable Recovery on Blind Transfer. 0 - No, 1 - Yes. Default is 1 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P2484>1</P2484>
+
+    <!-- Blind Transfer Wait Timeout. Default is 30 -->
+    <!-- Number: 30 - 300 -->
+    <!-- Mandatory -->
+    <P26170>30</P26170>
+
+    <!-- Key as Send. 0 - Disabled, 1 - Pound (#), 2 - Star (*). Default is 1 -->
+    <!-- Number: 0, 1, 2 -->
+    <!-- Mandatory -->
+    <P492>1</P492>
+
+    <!-- RFC2543 Hold. 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P26162>0</P26162>
+
+    <!-- Disable Call Waiting. 0 - Default, 1 - No, 2 - Yes. Default is 0 -->
+    <!-- Number: 0, 1, 2 -->
+    <!-- Mandatory -->
+    <P26163>0</P26163>
+
+    <!-- Account 2/Ringtone -->
+
+    <!-- Matching Incoming Caller ID. Matching Rule 1 -->
+    <!-- String -->
+    <P1494></P1494>
+
+    <!-- Matching Rule 1 Distinctive Ringtone -->
+    <!-- 0 - Default Ringtone -->
+    <!-- Number: 0-81 -->
+    <!-- Mandatory -->
+    <P1495>0</P1495>
+
+    <!-- Matching Incoming Caller ID. Matching Rule 2. -->
+    <!-- String -->
+    <P1496></P1496>
+
+    <!-- Matching Rule 2 Distinctive Ringtone. -->
+    <!-- 0 - Default Ringtone -->
+    <!-- Number: 0-81 -->
+    <!-- Mandatory -->
+    <P1497>0</P1497>
+
+    <!-- Matching Incoming Caller ID. Matching Rule 3. -->
+    <!-- String -->
+    <P1498></P1498>
+
+    <!-- Matching Rule 3 Distinctive Ringtone. -->
+    <!-- 0 - Default Ringtone -->
+    <!-- Number: 0-81 -->
+    <!-- Mandatory -->
+    <P1499>0</P1499>
+
+    <!-- Matching Incoming Caller ID. Matching Rule 4 -->
+    <!-- String -->
+    <P6722></P6722>
+
+    <!-- Matching Rule 4 Distinctive Ringtone -->
+    <!-- 0 - Default Ringtone -->
+    <!-- Number: 0-81 -->
+    <!-- Mandatory -->
+    <P6723>0</P6723>
+
+    <!-- Matching Incoming Caller ID. Matching Rule 5 -->
+    <!-- String -->
+    <P6724></P6724>
+
+    <!-- Matching Rule 5 Distinctive Ringtone -->
+    <!-- 0 - Default Ringtone -->
+    <!-- Number: 0-81 -->
+    <!-- Mandatory -->
+    <P6725>0</P6725>
+
+    <!-- Matching Incoming Caller ID. Matching Rule 6 -->
+    <!-- String -->
+    <P6726></P6726>
+
+    <!-- Matching Rule 6 Distinctive Ringtone -->
+    <!-- 0 - Default Ringtone -->
+    <!-- Number: 0-81 -->
+    <!-- Mandatory -->
+    <P6727>0</P6727>
+
+    <!-- Matching Incoming Caller ID. Matching Rule 7 -->
+    <!-- String -->
+    <P26164></P26164>
+
+    <!-- Matching Rule 7 Distinctive Ringtone -->
+    <!-- 0 - Default Ringtone -->
+    <!-- Number: 0-81 -->
+    <!-- Mandatory -->
+    <P26165>0</P26165>
+
+    <!-- Matching Incoming Caller ID. Matching Rule 8 -->
+    <!-- String -->
+    <P26166></P26166>
+
+    <!-- Matching Rule 8 Distinctive Ringtone -->
+    <!-- 0 - Default Ringtone -->
+    <!-- Number: 0-81 -->
+    <!-- Mandatory -->
+    <P26167>0</P26167>
+
+    <!-- Matching Incoming Caller ID. Matching Rule 9 -->
+    <!-- String -->
+    <P26168></P26168>
+
+    <!-- Matching Rule 9 Distinctive Ringtone -->
+    <!-- 0 - Default Ringtone -->
+    <!-- Number: 0-81 -->
+    <!-- Mandatory -->
+    <P26169>0</P26169>
+
+    <!-- Matching Incoming Caller ID. Matching Rule 10 -->
+    <!-- String -->
+    <P26196></P26196>
+
+    <!-- Matching Rule 10 Distinctive Ringtone -->
+    <!-- 0 - Default Ringtone -->
+    <!-- Number: 0-81 -->
+    <!-- Mandatory -->
+    <P26197>0</P26197>
+
+    <!-- Ring Timeout (in seconds) Default is 60 -->
+    <!-- Number: 30 - 3600 -->
+    <!-- Mandatory -->
+    <P476>60</P476>
+
+    <!-- Account 2/Intercom Settings -->
+    <!-- Allow Auto Answer by Call-Info/Alert-Info. 0 - No, 1 - Yes. Default is 1 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P438>1</P438>
+
+    <!-- Allow Barging by Call-Info/Alert-Info. 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P26119>0</P26119>
+
+    <!-- Custom Alert-Info for Auto Answer. -->
+    <!-- String -->
+    <P2456></P2456>
+
+    <!-- Account 2/Feature Codes -->
+    <!-- Enable Local Call Features. 0 - No, 1 - Yes. Default is 1 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P420>1</P420>
+
+    <!-- Settings/General Settings -->
+    <!-- Local RTP Port. Default is 5004 -->
+    <!-- Number: 1024 - 65400. Must be even number -->
+    <!-- Mandatory -->
+    <P39>5004</P39>
+
+    <!-- Local RTP Port Range. Default is 200 -->
+    <!-- Number: 48 - 10000 -->
+    <!-- Mandatory -->
+    <P29610>200</P29610>
+
+    <!-- Use Random Port. 0 - No, 1 - Yes. Default is 1 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P78>1</P78>
+
+    <!-- Keep-Alive Interval (in seconds). Default is 20 -->
+    <!-- Number: 10 - 160 -->
+    <!-- Mandatory -->
+    <P84>20</P84>
+
+    <!-- Use NAT IP. This will enable our SIP client to use this IP in the SIP/SDP message. Example 64.3.153.50 -->
+    <!-- String: a-z, A-Z, 0-9, ".", ":" -->
+    <P101></P101>
+
+    <!-- STUN server -->
+    <!-- String -->
+    <P76></P76>
+
+    <!-- Delay Registration. Default is 0. -->
+    <!-- Number: 0 - 90 -->
+    <!-- Mandatory -->
+    <P8359>0</P8359>
+
+    <!-- Test Password Strength. Default is 0. -->
+    <!-- Number: 0, 1. 0 - No, 1 - Yes. -->
+    <!-- Mandatory -->
+    <P8468>0</P8468>
+
+    <!-- Allow Dial Through Popups -->
+    <!-- 1 - Yes,0 - No. Default is 0 -->
+    <!-- Number:0,1 -->
+    <!-- Mandatory -->
+    <P82261>0</P82261>
+
+    <!-- Settings/Call Features -->
+    <!-- Disable Call Waiting. 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P91>0</P91>
+
+    <!-- Disable Direct IP Call. 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P1310>0</P1310>
+
+    <!-- Do not Escape '#' as 23% in SIP URL. 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P1406>0</P1406>
+
+    <!-- Return Code When Refusing Incoming Call. Default is 0 -->
+    <!-- Number: 0,1,2,3. 0 - Busy(486), 1 - Temporarily Unavailable(480), 2 - Not Found(404), 3 - Decline(603). -->
+    <!-- Mandatory -->
+    <P8360>0</P8360>
+
+    <!-- Return Code When Enable DND. Default is 1 -->
+    <!-- Number: 0,1,2,3. 0 - Busy(486), 1 - Temporarily Unavailable(480), 2 - Not Found(404), 3 - Decline(603). -->
+    <!-- Mandatory -->
+    <P8361>1</P8361>
+
+    <!-- Allow Incoming Call Before Ringing.  0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P29609>0</P29609>
+
+    <!-- User-Agent Prefix -->
+    <!-- String -->
+    <P8358></P8358>
+
+    <!-- Auto Answer Delay -->
+    <!-- String -->
+    <P8486>0</P8486>
+
+    <!-- Settings/Call Features/Speed Dial -->
+    <!-- Speed Dial. For number 0, 2, 3, 4, 5, 6, 7, 8, 9 -->
+    <!-- String -->
+    <P23003></P23003>
+    <P23013></P23013>
+    <P23018></P23018>
+    <P23023></P23023>
+    <P23028></P23028>
+    <P23033></P23033>
+    <P23038></P23038>
+    <P23043></P23043>
+    <P23048></P23048>
+
+    <!-- Settings/Multicast Paging -->
+    <!-- Allowed in DND Mode. 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P8381>0</P8381>
+
+    <!-- Paging Barge. 0 - Disable, 1 - priority 1, 2 - priority 2, 3 - priority 3, -->
+    <!-- 4 - priority 4, 5 - priority 5, 6 - priority 6, 7 - priority 7, 8 - priority 8, -->
+    <!-- 9 - priority 9, 10 - priority 10. Default is 0. -->
+    <!-- Number: 0 - 10 -->
+    <!-- Mandatory -->
+    <P1566>0</P1566>
+
+    <!-- Paging Priority Active. 0 - Disabled, 1 - Enabled -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P1567>1</P1567>
+
+    <!-- Multicast Sender ID -->
+    <!-- String -->
+    <P8455></P8455>
+
+    <!-- Multicast Listening Address (Priority 1 ~ 10) -->
+    <!-- String -->
+    <P1569></P1569>
+    <P1571></P1571>
+    <P1573></P1573>
+    <P1575></P1575>
+    <P1577></P1577>
+    <P1579></P1579>
+    <P1581></P1581>
+    <P1583></P1583>
+    <P1585></P1585>
+    <P1587></P1587>
+
+    <!-- Multicast Listening Address Label (Priority 1 ~ 10) -->
+    <P1570></P1570>
+    <P1572></P1572>
+    <P1574></P1574>
+    <P1576></P1576>
+    <P1580></P1580>
+    <P1582></P1582>
+    <P1584></P1584>
+    <P1586></P1586>
+    <P1588></P1588>
+    <P1560></P1560>
+
+    <!-- Settings/Preferences -->
+
+    <!-- Settings/Preferences / Date and Time -->
+    <!-- NTP Server -->
+    <!-- String -->
+{if isset($ntp_server_primary)}
+    <P30>{$ntp_server_primary}</P30>
+{else}
+    <P30>pool.ntp.org</P30>
+{/if}
+
+    <!-- Secondary NTP Server -->
+    <!-- String -->
+    <P8333></P8333>
+
+    <!-- NTP Update Interval -->
+    <!-- String -->
+    <!-- Number: 5 - 1440. Default is 1440 -->
+    <P5005>1440</P5005>
+
+    <!-- Allow DHCP Option 42 to override NTP server. 0 - No, 1 - Yes. Default is 0 -->
+    <!-- When set to Yes(1), it will override the configured NTP server -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P144>0</P144>
+
+    <!-- Time Zone -->
+
+    <!-- Web GUI Option										P Value -->
+    <!-- Automatic												auto -->
+    <!-- GMT-12:00 (International Date Line West)				TAZ+12 -->
+    <!-- GMT-11:00 (Midway Island, Samoa) 						TAB+11 -->
+    <!-- GMT-10:00 (US Hawaiian Time) 							HAW10 -->
+    <!-- GMT-9:00 (US Alaska Time) 							AKST9AKDT -->
+    <!-- GMT-8:00 (US Pacific Time, Los Angeles)				PST8PDT -->
+    <!-- GMT-08:00 (Baja California)							PST8PDT,M3.2.0,M11.1.0 -->
+    <!-- GMT-07:00 (US Mountain Time, Denver) 					MST7MDT -->
+    <!-- GMT-07:00 (Mountain Time (Arizona, no DST)) 			MST7 -->
+    <!-- GMT-07:00 (Chihuahua, La Paz, Mazatlan)				MST7MDT,M4.1.0,M10.5.0 -->
+    <!-- GMT-06:00 (Central Time) 								CST6CDT -->
+    <!-- GMT-06:00 (Central America) 							CST+6 -->
+    <!-- GMT-06:00 (Guadalajara, Mexico City, Monterrey)		CST6CDT,M4.1.0,M10.5.0 -->
+    <!-- GMT-05:00 (Eastern Time)								EST5EDT -->
+    <!-- GMT-05:00 (Eastern Time without daylight saving) 		EST5 -->
+    <!-- GMT-04:30 (Caracas) 									TZf+4:30 -->
+    <!-- GMT-04:00 (Atlantic Time) 							AST4ADT -->
+    <!-- GMT-04:00 (Atlantic Time (New Brunswick)) 			AST4ADT,M3.2.0,M11.1.0 -->
+    <!-- GMT-04:00 (Santiago, Chile)							CLT4CLST,M9.1.6/24:00,M4.1.6/24:00 -->
+    <!-- GMT-03:30 (Newfoundland Time)							NST+3:30NDT+2:30,M4.1.0/00:01:00,M10.5.0/00:01:00 -->
+    <!-- GMT-03:00 (Greenland) 								TZK+3 -->
+    <!-- GMT-03:00 (Brazil, Sao Paulo) 						BRST+3BRDT+2,M11.1.0,M2.3.0 -->
+    <!-- GMT-02:00 (Argentina) 								UTC+3 -->
+    <!-- GMT-02:00 (Mid-Atlantic) 								TZL+2 -->
+    <!-- GMT-01:00 (Azores, Cape Verdi Is.) 					TZM+1 -->
+    <!-- GMT (Edinburgh, Casablanca, Monrovia) 				TZN+0 -->
+    <!-- GMT (London, Great Britain) 							GMT+0BST-1,M3.5.0/01:00:00,M10.5.0/02:00:00 -->
+    <!-- GMT (Lisbon, Portugal) 								WET-0WEST-1,M3.5.0/01:00:00,M10.5.0/02:00:00 -->
+    <!-- GMT (Dublin, Ireland) 								GMT+0IST-1,M3.5.0/01:00:00,M10.5.0/02:00:00 -->
+    <!-- GMT+01:00 (Paris, Vienna, Warsaw, Roma, Madrid, Prague, Berlin, Budapest, Amsterdam, Belgium)   CET-1CEST-2,M3.5.0/02:00:00,M10.5.0/03:00:00 -->
+    <!-- GMT+02:00 (Israel, Cairo, Athens, Istanbul, Buchrest) TZP-2 -->
+    <!-- GMT+02:00 (Helsinki, Athens, Tallinn) 				EET-2EEST-3,M3.5.0/03:00:00,M10.5.0/04:00:00 -->
+    <!-- GMT+02:00 (Kyiv, Ukraine) 							EET-2EEST,M3.5.0/3,M10.5.0/4 -->
+    <!-- GMT+03:00 (Kuwait, Baghdad, Tehran, Nairobi) 			TZQ-3 -->
+    <!-- GMT+03:00 (Moscow, Russia) 							MSK-3 -->
+    <!-- GMT+04:00 (Abu Dhabi, Baku) 							TZR-4 -->
+    <!-- GMT+05:00 (Islamabad, Ekaterinburg, Karachi, Tashkent)TZS-5 -->
+    <!-- GMT+05:30 (Chennai, New Delhi, Mumbai) 				TZT-5:30 -->
+    <!-- GMT+05:45 (Kathmandu) 								TZU-5:45 -->
+    <!-- GMT+06:00 (Almaty, Astana, Dhaka, Novosibirsk) 		TZV-6 -->
+    <!-- GMT+06:30 (Rangoon) 									TZW-6:30 -->
+    <!-- GMT+07:00 (Bankok, Hanoi, Krasnoyarsk) 				TZX-7 -->
+    <!-- GMT+07:00 (Jakarta) 									WIB-7 -->
+    <!-- GMT+08:00 (Beijing, Taipei, Kuala Lumpur, Irkutsk) 	TZY-8 -->
+    <!-- GMT+08:00 (Singapore) 								SGT-8 -->
+    <!-- GMT+08:00 (Ulaanbaatar, Mongolia) 					ULAT-8 -->
+    <!-- GMT+08:00 (Perth) 									WST-8 -->
+    <!-- GMT+09:00 (Japan, Korea, Yakutsk) 					TZZ-9 -->
+    <!-- GMT+09:30 (Adelaide) 									CST-9:30CDT-10:30,M10.1.0/02:00:00,M4.1.0/03:00:00 -->
+    <!-- GMT+09:30 (Darwin) 									CST-9:30 -->
+    <!-- GMT+10:00 (Guam) 										TZb-10 -->
+    <!-- GMT+10:00 (Hobart) 									EST-10EDT-11,M10.1.0/02:00:00,M4.1.0/03:00:00 -->
+    <!-- GMT+10:00 (Sydney, Melbourne, Canberra) 				EST-10EDT-11,M10.1.0/02:00:00,M4.1.0/03:00:00 -->
+    <!-- GMT+10:00 (Brisbane) 									EST-10 -->
+    <!-- GMT+11:00 (Magadan, Solomon Is., New Caledonia) 		TZc-11 -->
+    <!-- GMT+12:00 (Auckland, Wellington) 						NZST-12NZDT-13,M9.5.0/02:00:00,M4.1.0/03:00:00 -->
+    <!-- GMT+12:00 (Fiji) 										TZd-12 -->
+    <!-- GMT+13:00 (Nuku'alofa) 								TZe-13 -->
+    <!-- Self-Defined Time Zone								customize -->
+
+    <!-- String -->
+    <!-- Mandatory -->
+{if isset($grandstream_timezone) }
+    <P64>{$grandstream_timezone}</P64>
+{elseif isset($grandstream_gxp_time_zone) }
+    <P64>{$grandstream_gxp_time_zone}</P64>
+{else}
+    <P64>auto</P64>
+{/if}
+
+    <!-- Allow DHCP Option 2 to Override Time Zone Setting -->
+    <!-- Number: 0, 1 -->
+    <P143>1</P143>
+
+    <!-- Self Defined Time Zone. Max length allowed is 64 characters -->
+    <!-- String -->
+    <!-- Mandatory -->
+    <P246>MTZ+6MDT+5,M4.1.0,M11.1.0</P246>
+
+    <!-- Date Display Format -->
+    <!-- 0: yyyy-mm-dd      eg. 2011-10-31 -->
+    <!-- 1: mm-dd-yyyy      eg. 10-31-2011 -->
+    <!-- 2: dd-mm-yyyy      eg. 31-10-2011 -->
+    <!-- 3: dddd, MMMM dd   eg. Monday, October 31 -->
+    <!-- 4: MMMM dd, dddd   eg. October 31, Monday -->
+    <!-- Number: 0, 1, 2, 3, 4 -->
+    <!-- Mandatory -->
+    <P102>0</P102>
+
+    <!-- Time Display Format. 0 - 12 Hour, 1 - 24 Hour -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P122>0</P122>
+
+    <!-- Settings/Preferences / Language -->
+    <!-- Display Language. -->
+    <!-- auto - Auto, cs==Czech, de - German, en - English, es - Spanish, fr - French, -->
+    <!-- it - Italian,ja==Japanese,  pl==Polski, pt - Portuguese, ru #- Russian, -->
+    <!-- sv==Slovak, Tr==Turkish, zh - simplified_chinese -->
+    <P1362>auto</P1362>
+
+    <!-- Settings/Preferences / Ringtone -->
+
+    <!-- Call Progress Tones -->
+    <!-- Syntax: f1=val,f2=val[,c=on1/off1[-on2/off2[-on3/off3]]]; -->
+    <!-- (Frequencies are in Hz and cadence on and off are in 10ms) -->
+
+    <!-- Dial Tone -->
+    <!-- String -->
+    <!-- Mandatory -->
+    <P343>f1=350,f2=440;</P343>
+
+    <!-- Second Dial Tone -->
+    <!-- String -->
+    <!-- Mandatory -->
+    <P2909>f1=350,f2=440;</P2909>
+
+    <!-- Message Waiting -->
+    <!-- String -->
+    <!-- Mandatory -->
+    <P344>f1=350,f2=440,c=100/100-100/100-100/100--1/0;</P344>
+
+    <!-- Ring Back Tone -->
+    <!-- String -->
+    <!-- Mandatory -->
+    <P346>f1=440,f2=480,c=200/400;</P346>
+
+    <!-- Call-Waiting Tone -->
+    <!-- String -->
+    <!-- Mandatory -->
+    <P347>f1=440,f2=440,c=25/525;</P347>
+
+    <!-- Call-Waiting Tone Gain. 0 - Low, 1 - Medium, 2 - High. Default is 0 -->
+    <!-- Number: 0, 1, 2 -->
+    <!-- Mandatory -->
+    <P1555>0</P1555>
+
+    <!-- Busy Tone -->
+    <!-- String -->
+    <!-- Mandatory -->
+    <P348>f1=480,f2=620,c=50/50;</P348>
+
+    <!-- Network/Basic Settings -->
+    <!-- Host name, DHCP option 12. Max length allowed is 64 characters -->
+    <!-- String -->
+    <P146>phone-{$user_id_1}</P146>
+
+    <!-- Vendor Class ID, DHCP option 60. Max length allowed is 64 characters -->
+    <!-- String -->
+    <P148>Grandstream WP810</P148>
+
+    <!-- Network/Advanced Settings -->
+    <!-- HTTP Proxy -->
+    <!-- String -->
+    <P1552></P1552>
+
+    <!-- HTTPS Proxy -->
+    <!-- String -->
+    <P1553></P1553>
+
+    <!-- Bypass Proxy For -->
+    <!-- String -->
+    <P22011></P22011>
+
+    <!-- Layer 3 QoS for SIP -->
+    <!-- Number:0 - 63 -->
+    <!-- Mandatory -->
+    <P1558>26</P1558>
+
+    <!-- Layer 3 QoS for RTP -->
+    <!-- Number:0 - 63 -->
+    <!-- Mandatory -->
+    <P1559>46</P1559>
+
+    <!-- Network/Wi-Fi Settings -->
+    <!-- All network configuration has been deleted -->
+
+    <!-- Maintenance/ Web Access -->
+
+    <!-- End User Password -->
+    <!-- String: a-z, A-Z, 0-9 -->
+    <!-- P196 = -->
+
+    <!-- Admin Password for web interface -->
+    <!-- String: a-z, A-Z, 0-9 -->
+{if isset($admin_password)}
+    <P2>{$admin_password}</P2>
+{else}
+    <P2>{$mac|replace:'-':''}</P2>
+{/if}
+
+    <!-- Maintenance/Upgrade and Provisioning -->
+
+    <!-- Firmware Upgrade and Provisioning -->
+    <!-- 0 - Always Check For New Firmware -->
+    <!-- 1 - Check New Firmware only when F/W pre/suffix changes -->
+    <!-- 2 - Always Skip the Firmware Check -->
+    <!-- Number: 0, 1, 2 -->
+    <!-- Mandatory -->
+    <P238>0</P238>
+
+    <!-- Always Authenticate Before Challenge. 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P20713>0</P20713>
+
+    <!-- Validate Hostname in Certificate. 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <P22030>0</P22030>
+
+    <!-- Allow DHCP Option 43 and Option 66 to override server. 0 - No, 1 - Yes, 2 - Prefer, fallback when failed. Default is 1 -->
+    <!-- When set to Yes(1), it will override the configured provision path and method -->
+    <!-- Number: 0, 1, 2 -->
+    <!-- Mandatory -->
+{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>
+
+    <!-- Allow DHCP Option 120 to Override SIP Server -->
+    <!-- 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+{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, check for upgrade based on minute(s) setting, -->
+    <!-- 2 - Yes, check for upgrade based on Hour of Day setting, -->
+    <!-- 3 - Yes, check for upgrade based on Day of Week setting, -->
+    <!-- Default is No -->
+    <!-- Number: 0, 1, 2, 3 -->
+    <!-- Mandatory -->
+    <P194>1</P194>
+
+    <!-- Check for new firmware every () minutes. Default is 7 days. -->
+    <!-- Number: 60-86400 -->
+    <!-- Mandatory -->
+    <P193>1440</P193>
+
+    <!-- Randomized Automatic Upgrade. 0 - No, 1 - Yes. Default is No -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P8458>0</P8458>
+
+    <!-- Hour of the Day-Start (0-23). Default is 1 -->
+    <!-- Number: 0 - 23 -->
+    <P285>1</P285>
+
+    <!-- Hour of the Day-End (-1, 0-23). Default is 0 -->
+    <!-- Number: -1, 0 - 23 -->
+    <P8459>0</P8459>
+
+    <!-- Day of the Week (0-6). Default is 1 -->
+    <!-- Number: 0-6 -->
+    <P286>1</P286>
+
+    <!-- Disable SIP NOTIFY Authentication. 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0,1 -->
+    <!-- Mandatory -->
+    <P4428>0</P4428>
+
+    <!-- Config -->
+    <!-- Config Upgrade Via. 0 - TFTP,  1 - HTTP, 2 - HTTPS, 3 - FTP, 4 - FTPS. Default is 2 -->
+    <!-- Number: 0, 1, 2, 3, 4 -->
+    <!-- Mandatory -->
+    <P212>2</P212>
+
+    <!-- Config Server Path -->
+    <!-- String -->
+{if $grandstream_config_server_path=="none"}
+    <P237></P237>
+{elseif isset($grandstream_config_server_path)}
+    <P237>{$grandstream_config_server_path}</P237>
+{elseif isset($domain_name)}
+    <P237>{$domain_name}{$project_path}/app/provision</P237>
+{/if}
+
+    <!-- Config HTTP/HTTPS User Name -->
+    <!-- String -->
+    <P1360>{$http_auth_username}</P1360>
+
+    <!-- Config HTTP/HTTPS Password -->
+    <!-- String -->
+    <P1361>{$http_auth_password}</P1361>
+
+    <!-- Config File Prefix -->
+    <!-- String -->
+    <P234></P234>
+
+    <!-- Config File Postfix -->
+    <!-- String -->
+    <P235></P235>
+
+    <!-- XML Config File Password -->
+    <!-- String -->
+    <P1359></P1359>
+
+    <!-- Authenticate Conf File. 0 - No, 1 - Yes. Default is No -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P240>0</P240>
+
+    <!-- Download and Process ALL Available Config Files. 0 - No, 1 - Yes. Default is No -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P8467>0</P8467>
+
+    <!-- Firmware -->
+    <!-- Firmware Upgrade Via. 0 - TFTP,  1 - HTTP, 2 - HTTPS, 3 - FTP, 4 - FTPS. Default is 1. -->
+    <!-- Number: 0, 1, 2, 3, 4 -->
+    <!-- Mandatory -->
+    <P6767>1</P6767>
+
+    <!-- Firmware Server Path -->
+    <!-- String -->
+{if isset($grandstream_firmware_path)}
+    <P192>{$grandstream_firmware_path}</P192>
+{else}
+    <P192>{$domain_name}{$project_path}/app/provision</P192>
+{/if}
+
+    <!-- Firmware HTTP/HTTPS Username -->
+    <!-- String -->
+    <P6768></P6768>
+
+    <!-- Firmware HTTP/HTTPS Password -->
+    <!-- String -->
+    <P6769></P6769>
+
+    <!-- Firmware File Prefix -->
+    <!-- String -->
+    <P232></P232>
+
+    <!-- Firmware File Postfix -->
+    <!-- String -->
+    <P233></P233>
+
+    <!-- Maintenance/Syslog -->
+    <!-- Syslog Protocol. 0 - UDP, 1 - SSL/TLS. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P8402>0</P8402>
+
+    <!-- Syslog Server (name of the server, max length is 64 characters) -->
+    <!-- String -->
+    <P207>{$grandstream_syslog_server}</P207>
+
+    <!-- Syslog Level. 0 - NONE, 1 - DEBUG, 2 - INFO, 3 - WARNING, 4 - ERROR. Default is 0 -->
+    <!-- Number: 0, 1, 2, 3, 4 -->
+    <!-- Mandatory -->
+{if isset($grandstream_syslog_level)}
+    <P208>{$grandstream_syslog_level}</P208>
+{else}
+    <P208>0</P208>
+{/if}
+
+    <!-- Syslog Keyword Filtering -->
+    <!-- String -->
+    <P22129></P22129>
+
+    <!-- Send SIP Log. 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P1387>0</P1387>
+
+    <!-- Maintenance/Capture -->
+
+    <!-- Capture Location. 0 - Internal Storage, 1 - USB. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P82250>0</P82250>
+
+    <!-- USB Filename. -->
+    <!-- String. -->
+    <!-- Max Length: 64 -->
+    <P82255></P82255>
+
+    <!-- Capture Mode. 0 - Timed, 1 - Continuous -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P82259>0</P82259>
+
+    <!-- Capture Timer -->
+    <!-- Number: 0-2000 -->
+    <!-- Mandatory -->
+    <P82253>30</P82253>
+
+    <!-- Log File Rotation. 0 - No, 1 - Yes. Default is 1. -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P82254>1</P82254>
+
+    <!-- Max Log File Size. -->
+    <!-- Number: 1-10 -->
+    <!-- Mandatory -->
+    <P82251>1</P82251>
+
+    <!-- Max Log Files. -->
+    <!-- Number: 1, 2, 3 -->
+    <!-- Mandatory -->
+    <P82252>3</P82252>
+
+    <!-- Enable. 0 - No, 1 - Yes -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P82257>0</P82257>
+
+    <!-- Continuous Capture Days. -->
+    <!-- Number: 0 - 14 -->
+    <!-- Mandatory -->
+    <P82258>1</P82258>
+
+    <!-- Maintenance/TR-069 -->
+    <!-- Enable TR-069. 0 - No, 1 - Yes. -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P1409>1</P1409>
+
+    <!-- ACS URL -->
+    <!-- String -->
+    <P4503>https://acs.gdms.cloud</P4503>
+
+    <!-- TR-069 Username -->
+    <!-- String -->
+    <P4504></P4504>
+
+    <!-- TR-069 Password -->
+    <!-- String -->
+    <P4505></P4505>
+
+    <!-- Periodic Inform Enable. 0 - No, 1 - Yes. Default is 1 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P4506>1</P4506>
+
+    <!-- Periodic Inform Interval. Default is 60. -->
+    <!-- Number -->
+    <P4507>86400</P4507>
+
+    <!-- Connection Request Username -->
+    <!-- String: a-z, A-Z, 0-9 -->
+    <P4511></P4511>
+
+    <!-- Connection Request Password -->
+    <!-- String: a-z, A-Z, 0-9 -->
+    <P4512></P4512>
+
+    <!-- Connection Request Port. Default is 7547. -->
+    <!-- Number -->
+    <P4518>7547</P4518>
+
+    <!-- CPE SSL Certificate -->
+    <!-- String: a-z, A-Z, 0-9 -->
+    <P8220></P8220>
+
+    <!-- CPE SSL Private Key -->
+    <!-- String: a-z, A-Z, 0-9 -->
+    <P8221></P8221>
+
+    <!-- Randomized TR069 Startup. 0 - Disabled, 1 - Enabled. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P8487>0</P8487>
+
+
+    <!-- Maintenance/Security Settings/Security -->
+
+    <!-- Configuration via Keypad Menu. 0 - Unrestricted, 1 - Basic settings only, 2 - Constraint Mode, 3 - Locked Mode, 4 - Basic and Network Settings -->
+    <!-- Number:0, 1, 2, 3, 4 -->
+    <!-- Mandatory -->
+    <P1357>0</P1357>
+
+    <!-- Validate Server Certificates. 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P8463>0</P8463>
+
+    <!-- SIP TLS Certificate -->
+    <!-- String: a-z, A-Z, 0-9 -->
+    <!-- P280 = -->
+
+    <!-- SIP TLS Private Key -->
+    <!-- String: a-z, A-Z, 0-9 -->
+    <!-- P279 = -->
+
+    <!-- SIP TLS Private Key Password -->
+    <!-- String: a-z, A-Z, 0-9 -->
+    <P281></P281>
+
+    <!-- Web Access Mode. 0 - HTTPS, 1 - HTTP, 2 - Disabled, 3 - Both HTTP and HTTPS. Default is 0 -->
+    <!-- Number: 0, 1, 2, 3 -->
+    <!-- Mandatory -->
+    <P1650>0</P1650>
+
+    <!-- Enable User Web Access. 0 - Disabled, 1 - Enabled. Default is 1 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P8469>1</P8469>
+
+    <!-- HTTP Web Port. Default is 80 -->
+    <!-- Number -->
+    <!-- Mandatory -->
+    <P22120>80</P22120>
+
+    <!-- HTTPS Web Port. Default is 443 -->
+    <!-- Number -->
+    <!-- Mandatory -->
+    <P22121>443</P22121>
+
+    <!-- Disable SSH. 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <P276>0</P276>
+
+    <!-- Web Session Timeout(in minutes) -->
+    <!-- Number: 2 - 60. Default is 10 -->
+    <P28116>10</P28116>
+
+    <!-- Web Session Attempt Limit -->
+    <!-- Number: 1 - 10. Default is 5 -->
+    <P28117>5</P28117>
+
+    <!-- Minimum TLS Versions. -->
+    <!-- Number: 99, 10, 11, 12 -->
+    <!-- 10 - TLS 1.0, 11 - TLS 1.1, 12 - TLS 1.2 -->
+    <P22293>11</P22293>
+
+    <!-- Maximum TLS Versions. -->
+    <!-- Number: 99, 10, 11, 12 -->
+    <!-- 99 - Unlimited, 10 - TLS 1.0, 11 - TLS 1.1, 12 - TLS 1.2 -->
+    <P22294>99</P22294>
+
+
+    <!-- Maintenance/Security Settings/Trusted CA Certificates -->
+    <!-- Load CA Certificates. 0 - Default Certificates, 1 - Custom Certificates, 2 - All Certificates -->
+    <!-- Number: 0, 1, 2. Default is 0 -->
+    <P8502>0</P8502>
+
+    <!-- Maintenance/Packet Capture -->
+
+    <!-- Capture Location. 0 - Internal Storage, 1 - USB. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P2999>0</P2999>
+
+    <!-- With RTP Packets. 0 - No, 1 - Yes. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P6007>0</P6007>
+
+    <!-- USB Filename -->
+    <!-- String -->
+    <P6008>0</P6008>
+
+    <!-- Directory/Phonebook Management -->
+
+    <!-- Enable Phonebook XML Download. 0 - Disabled, 1 - Enabled, use HTTP, 2 - Enabled, use TFTP, 3 - Enabled, use HTTPS. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P330>{$grandstream_phonebook_download}</P330>
+
+    <!-- HTTP/HTTPS User Name. -->
+    <!-- String -->
+    <P6713>{$http_auth_username}</P6713>
+
+    <!-- HTTP/HTTPS Password -->
+    <!-- String -->
+    <P6714>{$http_auth_password}</P6714>
+
+    <!-- Phonebook XML Server Path -->
+    <!-- This is a string of up to 256 characters that should contain a path to the XML file. It MUST be in the host/path format. -->
+    <!-- For example: directory.grandstream.com/engineering -->
+    <!-- String -->
+{if isset($grandstream_phonebook_xml_server_path)}
+    <P331>{$grandstream_phonebook_xml_server_path}/{$mac}</P331>
+{else}
+    <P331></P331>
+{/if}
+
+    <!-- Phonebook Download Interval. In minute. When set to 0, automatic Phonebook download will be disabled. -->
+    <!-- Number: 0, 5-720 -->
+    <!-- Mandatory -->
+{if isset($grandstream_phonebook_download_interval)}
+    <P332>{$grandstream_phonebook_download_interval}</P332>
+{else}
+    <P332>0</P332>
+{/if}
+
+    <!-- Remove Manually-edited entries on Download. 0 - No, 1 - Yes. Default is 1 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+    <P333>1</P333>
+
+
+
+    <!-- Directory/LDAP -->
+
+    <!-- LDAP protocol. -->
+    <!-- 0 – LDAP, 1 – LDAPS. Default is 0 -->
+    <!-- Number: 0, 1 -->
+    <!-- Mandatory -->
+
+
+    <!-- Server Address -->
+    <!-- String -->
+
+
+    <!-- Port -->
+    <!-- Number -->
+    <!-- Mandatory -->
+
+
+    <!-- Base -->
+    <!-- String -->
+
+
+    <!-- User Name -->
+    <!-- String -->
+
+
+    <!-- Password -->
+    <!-- String -->
+
+
+    <!-- LDAP Number Filter -->
+    <!-- String -->
+
+
+    <!-- LDAP Name Attributes -->
+    <!-- String -->
+
+
+    <!-- LDAP Number Attributes -->
+    <!-- String -->
+
+
+    <!-- LDAP Display Name -->
+    <!-- String -->
+
+
+    <!-- Max. Hits. Default is 50 -->
+    <!-- Number: 1-3000 -->
+    <!-- Mandatory -->
+
+
+    <!-- Search Timeout. Default is 30 -->
+    <!-- Number: 0-80 -->
+    <!-- Mandatory -->
+
+
+    <!-- LDAP Lookup: Incoming Calls -->
+    <!-- 0 - Disabled, 1 - Enabled. Default is 0 -->
+    <!-- Mandatory -->
+
+
+    <!-- LDAP Lookup: Outgoing Calls -->
+    <!-- 0 - Disabled, 1 - Enabled. Default is 0 -->
+    <!-- Mandatory -->
+
+
+
+  </config>
+</gs_provision>
diff --git a/resources/templates/provision/polycom/3.x/{$mac}.cfg b/resources/templates/provision/polycom/3.x/{$mac}.cfg
index c049239c40..69452d6565 100644
--- a/resources/templates/provision/polycom/3.x/{$mac}.cfg
+++ b/resources/templates/provision/polycom/3.x/{$mac}.cfg
@@ -4,7 +4,7 @@
 		{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}.label="{$row.label}"
 
 		reg.{$row.line_number}.serverFeatureControl.cf="{$polycom_feature_key_sync}"
 		reg.{$row.line_number}.serverFeatureControl.dnd="{$polycom_feature_key_sync}"
diff --git a/resources/templates/provision/polycom/4.x/{$mac}.cfg b/resources/templates/provision/polycom/4.x/{$mac}.cfg
index 9f9c538e53..c00155db74 100644
--- a/resources/templates/provision/polycom/4.x/{$mac}.cfg
+++ b/resources/templates/provision/polycom/4.x/{$mac}.cfg
@@ -4,7 +4,7 @@
 
 		{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}.label="{$row.label}"
 
 		reg.{$row.line_number}.serverFeatureControl.cf="{$polycom_feature_key_sync}"
 		reg.{$row.line_number}.serverFeatureControl.dnd="{$polycom_feature_key_sync}"
@@ -79,6 +79,10 @@
 		device.sntp.gmtOffset="{$polycom_gmt_offset}"
 		device.prov.upgradeServer.set="1"
 		device.prov.upgradeServer="{$polycom_firmware_url}"
+		{if isset($polycom_cdp_enabled)}
+		device.net.cdpEnabled.set="1"
+		device.net.cdpEnabled="{$polycom_cdp_enabled}"
+		{/if}
 
 		{if isset($admin_password)}
 		device.auth.localUserPassword.set="1" 
diff --git a/resources/templates/provision/polycom/5.x/{$mac}.cfg b/resources/templates/provision/polycom/5.x/{$mac}.cfg
index b59e5a4030..38bfc698a2 100644
--- a/resources/templates/provision/polycom/5.x/{$mac}.cfg
+++ b/resources/templates/provision/polycom/5.x/{$mac}.cfg
@@ -3,7 +3,7 @@
 	<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}.label="{$row.label}"
 		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}
@@ -144,6 +144,14 @@
 		tcpIpApp.sntp.daylightSavings.stop.dayOfWeek.lastInMonth="0"
 	/>
 	<DIALPLAN
+		{if $polycom_emergency_customized == "true"}
+			dialplan.routing.server.1.address="{$polycom_emergency_server}"
+			dialplan.routing.server.1.port="{$polycom_emergency_port}"
+				{foreach $polycom_emergency_number as $number name=emergencynumbers}
+					dialplan.routing.emergency.{$smarty.foreach.emergencynumbers.iteration}.value="{$number}"
+					dialplan.routing.emergency.{$smarty.foreach.emergencynumbers.iteration}.server.1="1"
+				{/foreach}
+		{/if}
 		{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}
 	/>
diff --git a/resources/templates/provision/polycom/6.x/{$mac}.cfg b/resources/templates/provision/polycom/6.x/{$mac}.cfg
index 27cadf6090..702df37081 100644
--- a/resources/templates/provision/polycom/6.x/{$mac}.cfg
+++ b/resources/templates/provision/polycom/6.x/{$mac}.cfg
@@ -3,7 +3,7 @@
 	<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}.label="{$row.label}"
 		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}
@@ -140,6 +140,14 @@
 		tcpIpApp.sntp.daylightSavings.stop.dayOfWeek.lastInMonth="0"
 	/>
 	<DIALPLAN
+		{if $polycom_emergency_customized == "true"}
+			dialplan.routing.server.1.address="{$polycom_emergency_server}"
+			dialplan.routing.server.1.port="{$polycom_emergency_port}"
+				{foreach $polycom_emergency_number as $number name=emergencynumbers}
+					dialplan.routing.emergency.{$smarty.foreach.emergencynumbers.iteration}.value="{$number}"
+					dialplan.routing.emergency.{$smarty.foreach.emergencynumbers.iteration}.server.1="1"
+				{/foreach}
+		{/if}
 		{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}
 	/>
diff --git a/resources/templates/provision/polycom/8030/{$mac}-registration.cfg b/resources/templates/provision/polycom/8030/{$mac}-registration.cfg
index 3613518262..7b2f3888d9 100644
--- a/resources/templates/provision/polycom/8030/{$mac}-registration.cfg
+++ b/resources/templates/provision/polycom/8030/{$mac}-registration.cfg
@@ -6,7 +6,7 @@
 	<reg
 		reg.1.displayName="{$user_id_1}"
 		reg.1.address="{$user_id_1}"
-		reg.1.label="Line"
+		reg.1.label="{$label}"
 		reg.1.type="private"
 		reg.1.lcs=""
 		reg.1.thirdPartyName="{$display_name_1}"
@@ -26,7 +26,7 @@
 		reg.1.server.1.expires.lineSeize=""
 		reg.2.displayName="{$user_id_2}"
 		reg.2.address="{$user_id_2}"
-		reg.2.label="Line"
+		reg.2.label="{$label}"
 		reg.2.type="private"
 		reg.2.lcs=""
 		reg.2.thirdPartyName="{$display_name_2}"
@@ -46,7 +46,7 @@
 		reg.2.server.1.expires.lineSeize=""
 		reg.3.displayName="{$user_id_3}"
 		reg.3.address="{$user_id_3}"
-		reg.3.label="Line"
+		reg.3.label="{$label}"
 		reg.3.type="private"
 		reg.3.lcs=""
 		reg.3.thirdPartyName="{$display_name_3}"
diff --git a/resources/templates/provision/snom/D375/{$mac}.xml b/resources/templates/provision/snom/D375/{$mac}.xml
index d0fbe2950e..e44a81d76a 100644
--- a/resources/templates/provision/snom/D375/{$mac}.xml
+++ b/resources/templates/provision/snom/D375/{$mac}.xml
@@ -24,6 +24,10 @@
     <alert_external_ring_sound perm="">{if isset($snom_alert_external)}{$snom_alert_external}{else}Ringer1{/if}</alert_external_ring_sound>
     <alert_group_ring_text perm="">alert-group</alert_group_ring_text>
     <alert_group_ring_sound perm="">{if isset($snom_alert_group)}{$snom_alert_group}{else}Ringer1{/if}</alert_group_ring_sound>
+    <!-- Wallpaper (480x272px PNG)-->
+    <custom_bg_image_url perm="">{$snom_wallpaper_url}</custom_bg_image_url>
+    <!-- Expansion Mod (480x1280px PNG <2MB) -->
+    <expansion_module_background_image perm="">{$snom_exp_wallpaper_url}</expansion_module_background_image>
     <!-- SIP Settings -->
     <mwi_notification perm="">silent</mwi_notification>
     <mwi_dialtone perm="">stutter</mwi_dialtone>
diff --git a/resources/templates/provision/snom/D385/{$mac}.xml b/resources/templates/provision/snom/D385/{$mac}.xml
index fdb886b8b6..293787b164 100644
--- a/resources/templates/provision/snom/D385/{$mac}.xml
+++ b/resources/templates/provision/snom/D385/{$mac}.xml
@@ -24,6 +24,10 @@
     <alert_external_ring_sound perm="">{if isset($snom_alert_external)}{$snom_alert_external}{else}Ringer1{/if}</alert_external_ring_sound>
     <alert_group_ring_text perm="">alert-group</alert_group_ring_text>
     <alert_group_ring_sound perm="">{if isset($snom_alert_group)}{$snom_alert_group}{else}Ringer1{/if}</alert_group_ring_sound>
+    <!-- Wallpaper (480x272px PNG)-->
+    <custom_bg_image_url perm="">{$snom_wallpaper_url}</custom_bg_image_url>
+    <!-- Expansion Mod (480x1280px PNG <2MB) -->
+    <expansion_module_background_image perm="">{$snom_exp_wallpaper_url}</expansion_module_background_image>
     <!-- SIP Settings -->
     <mwi_notification perm="">silent</mwi_notification>
     <mwi_dialtone perm="">stutter</mwi_dialtone>
diff --git a/resources/templates/provision/snom/D717/{$mac}.xml b/resources/templates/provision/snom/D717/{$mac}.xml
index 3707dfa877..6b3ef9427b 100644
--- a/resources/templates/provision/snom/D717/{$mac}.xml
+++ b/resources/templates/provision/snom/D717/{$mac}.xml
@@ -24,6 +24,10 @@
     <alert_external_ring_sound perm="">{if isset($snom_alert_external)}{$snom_alert_external}{else}Ringer1{/if}</alert_external_ring_sound>
     <alert_group_ring_text perm="">alert-group</alert_group_ring_text>
     <alert_group_ring_sound perm="">{if isset($snom_alert_group)}{$snom_alert_group}{else}Ringer1{/if}</alert_group_ring_sound>
+    <!-- Wallpaper (426x240px PNG) (Firmware: 10.1.41.1+) -->
+    <custom_bg_image_url perm="">{$snom_wallpaper_url}</custom_bg_image_url>
+    <!-- Expansion Mod (480x1280px PNG <2MB) -->
+    <expansion_module_background_image perm="">{$snom_exp_wallpaper_url}</expansion_module_background_image>
     <!-- SIP Settings -->
     <mwi_notification perm="">silent</mwi_notification>
     <mwi_dialtone perm="">stutter</mwi_dialtone>
diff --git a/resources/templates/provision/snom/D735/{$mac}.xml b/resources/templates/provision/snom/D735/{$mac}.xml
index 6b9f463a92..8a7061592d 100644
--- a/resources/templates/provision/snom/D735/{$mac}.xml
+++ b/resources/templates/provision/snom/D735/{$mac}.xml
@@ -24,6 +24,10 @@
     <alert_external_ring_sound perm="">{if isset($snom_alert_external)}{$snom_alert_external}{else}Ringer1{/if}</alert_external_ring_sound>
     <alert_group_ring_text perm="">alert-group</alert_group_ring_text>
     <alert_group_ring_sound perm="">{if isset($snom_alert_group)}{$snom_alert_group}{else}Ringer1{/if}</alert_group_ring_sound>
+    <!-- Wallpaper (320x240px PNG)-->
+    <custom_bg_image_url perm="">{$snom_wallpaper_url}</custom_bg_image_url>
+    <!-- Expansion Mod (480x1280px PNG <2MB) -->
+    <expansion_module_background_image perm="">{$snom_exp_wallpaper_url}</expansion_module_background_image>
     <!-- SIP Settings -->
     <mwi_notification perm="">silent</mwi_notification>
     <mwi_dialtone perm="">stutter</mwi_dialtone>
diff --git a/resources/templates/provision/snom/D765/{$mac}.xml b/resources/templates/provision/snom/D765/{$mac}.xml
index af25af5f33..31c4cb0666 100644
--- a/resources/templates/provision/snom/D765/{$mac}.xml
+++ b/resources/templates/provision/snom/D765/{$mac}.xml
@@ -24,6 +24,10 @@
     <alert_external_ring_sound perm="">{if isset($snom_alert_external)}{$snom_alert_external}{else}Ringer1{/if}</alert_external_ring_sound>
     <alert_group_ring_text perm="">alert-group</alert_group_ring_text>
     <alert_group_ring_sound perm="">{if isset($snom_alert_group)}{$snom_alert_group}{else}Ringer1{/if}</alert_group_ring_sound>
+    <!-- Wallpaper (320x240px PNG)-->
+    <custom_bg_image_url perm="">{$snom_wallpaper_url}</custom_bg_image_url>
+    <!-- Expansion Mod (480x1280px PNG <2MB) -->
+    <expansion_module_background_image perm="">{$snom_exp_wallpaper_url}</expansion_module_background_image>
     <!-- SIP Settings -->
     <mwi_notification perm="">silent</mwi_notification>
     <mwi_dialtone perm="">stutter</mwi_dialtone>
diff --git a/resources/templates/provision/snom/D785/{$mac}.xml b/resources/templates/provision/snom/D785/{$mac}.xml
index d6705e3491..3f27347b10 100644
--- a/resources/templates/provision/snom/D785/{$mac}.xml
+++ b/resources/templates/provision/snom/D785/{$mac}.xml
@@ -24,6 +24,10 @@
     <alert_external_ring_sound perm="">{if isset($snom_alert_external)}{$snom_alert_external}{else}Ringer1{/if}</alert_external_ring_sound>
     <alert_group_ring_text perm="">alert-group</alert_group_ring_text>
     <alert_group_ring_sound perm="">{if isset($snom_alert_group)}{$snom_alert_group}{else}Ringer1{/if}</alert_group_ring_sound>
+    <!-- Wallpaper (480x272px PNG)-->
+    <custom_bg_image_url perm="">{$snom_wallpaper_url}</custom_bg_image_url>
+    <!-- Expansion Mod (480x1280px PNG <2MB) -->
+    <expansion_module_background_image perm="">{$snom_exp_wallpaper_url}</expansion_module_background_image>
     <!-- SIP Settings -->
     <mwi_notification perm="">silent</mwi_notification>
     <mwi_dialtone perm="">stutter</mwi_dialtone>
@@ -79,7 +83,7 @@
   <!-- Function Keys. View Key Types here: https://service.snom.com/display/wiki/Function+Key+Types -->
   <functionKeys e="2"> {assign var="maxKeys" value=77 - count($lines)}
     {foreach $lines as $row}
-      <fkey idx="{$row.line_number-1}" context="{$row.line_number}" label="{$row.display_name}" perm="RW">line</fkey>
+      <fkey idx="{$row.line_number-1}" context="{$row.line_number}" label="" perm="RW">line</fkey>
       {if $row@index eq 11}{break}{/if}
     {/foreach}
     {foreach $keys["line"] as $row}
diff --git a/resources/templates/provision/yealink/cp860/directory.xml b/resources/templates/provision/yealink/cp860/directory.xml
index 3e319dfb50..e730841a96 100644
--- a/resources/templates/provision/yealink/cp860/directory.xml
+++ b/resources/templates/provision/yealink/cp860/directory.xml
@@ -2,50 +2,58 @@
 {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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-	<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
 </DirectoryEntry>
 {elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
 <DirectoryEntry>
-{if $row.contact_name_given != ""}
+{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 != ""}
+{if $row.phone_number}
 	<Telephone>{$row.phone_number}</Telephone>
 {else}
 	<Telephone>{$row.phone_extension}</Telephone>
@@ -53,29 +61,29 @@
 </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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$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}
+{if isset($row.numbers)}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
 {/if}
 </DirectoryEntry>
 {/if}
diff --git a/resources/templates/provision/yealink/cp860/y000000000037.cfg b/resources/templates/provision/yealink/cp860/y000000000037.cfg
index 84f8cb3b99..62b710266a 100644
--- a/resources/templates/provision/yealink/cp860/y000000000037.cfg
+++ b/resources/templates/provision/yealink/cp860/y000000000037.cfg
@@ -1044,7 +1044,7 @@ bw.feature_key_sync = {$yealink_feature_key_sync}
 #######################################################################################
 #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}
+security.trust_certificates = {$yealink_trust_certificates}
 
 #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.
diff --git a/resources/templates/provision/yealink/cp860/{$mac}.cfg b/resources/templates/provision/yealink/cp860/{$mac}.cfg
index df70a6bf7a..5c75148bfe 100644
--- a/resources/templates/provision/yealink/cp860/{$mac}.cfg
+++ b/resources/templates/provision/yealink/cp860/{$mac}.cfg
@@ -13,7 +13,7 @@ account.1.enable = 1
 {else}
 account.1.enable = 0
 {/if}
-account.1.label = {$account.1.display_name}
+account.1.label = {$account.1.label}
 account.1.display_name = {$account.1.display_name}
 account.1.auth_name = {$account.1.auth_id}
 account.1.password = {$account.1.password}
@@ -143,7 +143,7 @@ account.1.nat.stun_server = {$stun_server}
 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
+account.1.nat.udp_update_enable = {if isset($account.1.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
 account.1.nat.udp_update_time = 30
@@ -527,7 +527,7 @@ account.2.enable = 1
 {else}
 account.2.enable = 0
 {/if}
-account.2.label = {$account.2.display_name}
+account.2.label = {$account.2.label}
 account.2.display_name = {$account.2.display_name}
 account.2.auth_name = {$account.2.auth_id}
 account.2.password = {$account.2.password}
@@ -646,7 +646,7 @@ account.2.nat.stun_server = {$stun_server}
 account.2.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.2.nat.udp_update_enable = 1
+account.2.nat.udp_update_enable = {if isset($account.2.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
 account.2.nat.udp_update_time = 30
@@ -1042,7 +1042,7 @@ account.3.enable = 1
 {else}
 account.3.enable = 0
 {/if}
-account.3.label = {$account.3.display_name}
+account.3.label = {$account.3.label}
 account.3.display_name = {$account.3.display_name}
 account.3.auth_name = {$account.3.auth_id}
 account.3.password = {$account.3.password}
@@ -1161,7 +1161,7 @@ account.3.nat.stun_server = {$stun_server}
 account.3.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.3.nat.udp_update_enable = 1
+account.3.nat.udp_update_enable = {if isset($account.3.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
 account.3.nat.udp_update_time = 30
@@ -1543,7 +1543,7 @@ account.4.enable = 1
 {else}
 account.4.enable = 0
 {/if}
-account.4.label = {$account.4.display_name}
+account.4.label = {$account.4.label}
 account.4.display_name = {$account.4.display_name}
 account.4.auth_name = {$account.4.auth_id}
 account.4.password = {$account.4.password}
@@ -1661,7 +1661,7 @@ account.4.nat.stun_server = {$stun_server}
 account.4.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.4.nat.udp_update_enable = 1
+account.4.nat.udp_update_enable = {if isset($account.4.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
 account.4.nat.udp_update_time = 30
@@ -2040,7 +2040,7 @@ account.5.enable = 1
 {else}
 account.5.enable = 0
 {/if}
-account.5.label = {$account.5.display_name}
+account.5.label = {$account.5.label}
 account.5.display_name = {$account.5.display_name}
 account.5.auth_name = {$account.5.auth_id}
 account.5.password = {$account.5.password}
@@ -2158,7 +2158,7 @@ account.5.nat.stun_server = {$stun_server}
 account.5.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.5.nat.udp_update_enable = 1
+account.5.nat.udp_update_enable = {if isset($account.5.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
 account.5.nat.udp_update_time = 30
@@ -2537,7 +2537,7 @@ account.6.enable = 1
 {else}
 account.6.enable = 0
 {/if}
-account.6.label = {$account.6.display_name}
+account.6.label = {$account.6.label}
 account.6.display_name = {$account.6.display_name}
 account.6.auth_name = {$account.6.auth_id}
 account.6.password = {$account.6.password}
@@ -2654,7 +2654,7 @@ account.6.nat.stun_server =
 account.6.nat.stun_port = 3478
 
 #Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
-account.6.nat.udp_update_enable = 1
+account.6.nat.udp_update_enable = {if isset($account.6.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
 account.6.nat.udp_update_time = 30
diff --git a/resources/templates/provision/yealink/cp920/directory.xml b/resources/templates/provision/yealink/cp920/directory.xml
index 3e319dfb50..e730841a96 100644
--- a/resources/templates/provision/yealink/cp920/directory.xml
+++ b/resources/templates/provision/yealink/cp920/directory.xml
@@ -2,50 +2,58 @@
 {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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-	<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
 </DirectoryEntry>
 {elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
 <DirectoryEntry>
-{if $row.contact_name_given != ""}
+{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 != ""}
+{if $row.phone_number}
 	<Telephone>{$row.phone_number}</Telephone>
 {else}
 	<Telephone>{$row.phone_extension}</Telephone>
@@ -53,29 +61,29 @@
 </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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$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}
+{if isset($row.numbers)}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
 {/if}
 </DirectoryEntry>
 {/if}
diff --git a/resources/templates/provision/yealink/cp920/y000000000078.cfg b/resources/templates/provision/yealink/cp920/y000000000078.cfg
index 0bdd92c16c..6b162b0d12 100644
--- a/resources/templates/provision/yealink/cp920/y000000000078.cfg
+++ b/resources/templates/provision/yealink/cp920/y000000000078.cfg
@@ -1041,7 +1041,7 @@ bw.feature_key_sync = {$yealink_feature_key_sync}
 #######################################################################################
 #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}
+security.trust_certificates = {$yealink_trust_certificates}
 
 #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.
diff --git a/resources/templates/provision/yealink/cp920/{$mac}.cfg b/resources/templates/provision/yealink/cp920/{$mac}.cfg
index 6726329ee3..b9b02277a9 100644
--- a/resources/templates/provision/yealink/cp920/{$mac}.cfg
+++ b/resources/templates/provision/yealink/cp920/{$mac}.cfg
@@ -13,7 +13,7 @@ account.1.enable = 1
 {else}
 account.1.enable = 0
 {/if}
-account.1.label = {$account.1.display_name}
+account.1.label = {$account.1.label}
 account.1.display_name = {$account.1.display_name}
 account.1.auth_name = {$account.1.auth_id}
 account.1.password = {$account.1.password}
@@ -142,7 +142,7 @@ account.1.nat.stun_server = {$stun_server}
 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
+account.1.nat.udp_update_enable = {if isset($account.1.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
 account.1.nat.udp_update_time = 30
@@ -526,7 +526,7 @@ account.2.enable = 1
 {else}
 account.2.enable = 0
 {/if}
-account.2.label = {$account.2.display_name}
+account.2.label = {$account.2.label}
 account.2.display_name = {$account.2.display_name}
 account.2.auth_name = {$account.2.auth_id}
 account.2.password = {$account.2.password}
@@ -645,7 +645,7 @@ account.2.nat.stun_server = {$stun_server}
 account.2.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.2.nat.udp_update_enable = 1
+account.2.nat.udp_update_enable = {if isset($account.2.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
 account.2.nat.udp_update_time = 30
@@ -1041,7 +1041,7 @@ account.3.enable = 1
 {else}
 account.3.enable = 0
 {/if}
-account.3.label = {$account.3.display_name}
+account.3.label = {$account.3.label}
 account.3.display_name = {$account.3.display_name}
 account.3.auth_name = {$account.3.auth_id}
 account.3.password = {$account.3.password}
@@ -1161,7 +1161,7 @@ account.3.nat.stun_server = {$stun_server}
 account.3.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.3.nat.udp_update_enable = 1
+account.3.nat.udp_update_enable = {if isset($account.3.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
 account.3.nat.udp_update_time = 30
@@ -1543,7 +1543,7 @@ account.4.enable = 1
 {else}
 account.4.enable = 0
 {/if}
-account.4.label = {$account.4.display_name}
+account.4.label = {$account.4.label}
 account.4.display_name = {$account.4.display_name}
 account.4.auth_name = {$account.4.auth_id}
 account.4.password = {$account.4.password}
@@ -1663,7 +1663,7 @@ account.4.nat.stun_server = {$stun_server}
 account.4.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.4.nat.udp_update_enable = 1
+account.4.nat.udp_update_enable = {if isset($account.4.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
 account.4.nat.udp_update_time = 30
@@ -2042,7 +2042,7 @@ account.5.enable = 1
 {else}
 account.5.enable = 0
 {/if}
-account.5.label = {$account.5.display_name}
+account.5.label = {$account.5.label}
 account.5.display_name = {$account.5.display_name}
 account.5.auth_name = {$account.5.auth_id}
 account.5.password = {$account.5.password}
@@ -2161,7 +2161,7 @@ account.5.nat.stun_server = {$stun_server}
 account.5.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.5.nat.udp_update_enable = 1
+account.5.nat.udp_update_enable = {if isset($account.5.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
 account.5.nat.udp_update_time = 30
@@ -2540,7 +2540,7 @@ account.6.enable = 1
 {else}
 account.6.enable = 0
 {/if}
-account.6.label = {$account.6.display_name}
+account.6.label = {$account.6.label}
 account.6.display_name = {$account.6.display_name}
 account.6.auth_name = {$account.6.auth_id}
 account.6.password = {$account.6.password}
@@ -2658,7 +2658,7 @@ account.6.nat.stun_server =
 account.6.nat.stun_port = 3478
 
 #Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
-account.6.nat.udp_update_enable = 1
+account.6.nat.udp_update_enable = {if isset($account.6.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
 account.6.nat.udp_update_time = 30
diff --git a/resources/templates/provision/yealink/cp960/directory.xml b/resources/templates/provision/yealink/cp960/directory.xml
index 3e319dfb50..e730841a96 100644
--- a/resources/templates/provision/yealink/cp960/directory.xml
+++ b/resources/templates/provision/yealink/cp960/directory.xml
@@ -2,50 +2,58 @@
 {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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-	<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
 </DirectoryEntry>
 {elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
 <DirectoryEntry>
-{if $row.contact_name_given != ""}
+{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 != ""}
+{if $row.phone_number}
 	<Telephone>{$row.phone_number}</Telephone>
 {else}
 	<Telephone>{$row.phone_extension}</Telephone>
@@ -53,29 +61,29 @@
 </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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$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}
+{if isset($row.numbers)}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
 {/if}
 </DirectoryEntry>
 {/if}
diff --git a/resources/templates/provision/yealink/cp960/y000000000073.cfg b/resources/templates/provision/yealink/cp960/y000000000073.cfg
index 4ca90b3792..d625142733 100644
--- a/resources/templates/provision/yealink/cp960/y000000000073.cfg
+++ b/resources/templates/provision/yealink/cp960/y000000000073.cfg
@@ -1043,7 +1043,7 @@ bw.feature_key_sync = {$yealink_feature_key_sync}
 #######################################################################################
 #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}
+security.trust_certificates = {$yealink_trust_certificates}
 
 #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.
@@ -1633,4 +1633,5 @@ firmware.url = {$yealink_firmware_url}/{$yealink_firmware_cp960}
 #######################################################################################
 ##                      APP                                                         ##       
 #######################################################################################
-{foreach $yealink_app_unavailable as $value}app.unavailable = {$value}{"\n"}{/foreach}
+pm.version = standard
+app.unavailable = {foreach $yealink_app_unavailable as $value}{$value}/{/foreach}
diff --git a/resources/templates/provision/yealink/cp960/{$mac}.cfg b/resources/templates/provision/yealink/cp960/{$mac}.cfg
index 687f53ae9f..33af265f57 100644
--- a/resources/templates/provision/yealink/cp960/{$mac}.cfg
+++ b/resources/templates/provision/yealink/cp960/{$mac}.cfg
@@ -13,7 +13,7 @@ account.1.enable = 1
 {else}
 account.1.enable = 0
 {/if}
-account.1.label = {$account.1.display_name}
+account.1.label = {$account.1.label}
 account.1.display_name = {$account.1.display_name}
 account.1.auth_name = {$account.1.auth_id}
 account.1.password = {$account.1.password}
@@ -143,7 +143,7 @@ account.1.nat.stun_server = {$stun_server}
 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
+account.1.nat.udp_update_enable = {if isset($account.1.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
 account.1.nat.udp_update_time = 30
@@ -528,7 +528,7 @@ account.2.enable = 1
 {else}
 account.2.enable = 0
 {/if}
-account.2.label = {$account.2.display_name}
+account.2.label = {$account.2.label}
 account.2.display_name = {$account.2.display_name}
 account.2.auth_name = {$account.2.auth_id}
 account.2.password = {$account.2.password}
@@ -647,7 +647,7 @@ account.2.nat.stun_server = {$stun_server}
 account.2.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.2.nat.udp_update_enable = 1
+account.2.nat.udp_update_enable = {if isset($account.2.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
 account.2.nat.udp_update_time = 30
@@ -1043,7 +1043,7 @@ account.3.enable = 1
 {else}
 account.3.enable = 0
 {/if}
-account.3.label = {$account.3.display_name}
+account.3.label = {$account.3.label}
 account.3.display_name = {$account.3.display_name}
 account.3.auth_name = {$account.3.auth_id}
 account.3.password = {$account.3.password}
@@ -1162,7 +1162,7 @@ account.3.nat.stun_server = {$stun_server}
 account.3.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.3.nat.udp_update_enable = 1
+account.3.nat.udp_update_enable = {if isset($account.3.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
 account.3.nat.udp_update_time = 30
@@ -1544,7 +1544,7 @@ account.4.enable = 1
 {else}
 account.4.enable = 0
 {/if}
-account.4.label = {$account.4.display_name}
+account.4.label = {$account.4.label}
 account.4.display_name = {$account.4.display_name}
 account.4.auth_name = {$account.4.auth_id}
 account.4.password = {$account.4.password}
@@ -1661,7 +1661,7 @@ account.4.nat.stun_server = {$stun_server}
 account.4.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.4.nat.udp_update_enable = 1
+account.4.nat.udp_update_enable = {if isset($account.4.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
 account.4.nat.udp_update_time = 30
@@ -2040,7 +2040,7 @@ account.5.enable = 1
 {else}
 account.5.enable = 0
 {/if}
-account.5.label = {$account.5.display_name}
+account.5.label = {$account.5.label}
 account.5.display_name = {$account.5.display_name}
 account.5.auth_name = {$account.5.auth_id}
 account.5.password = {$account.5.password}
@@ -2158,7 +2158,7 @@ account.5.nat.stun_server = {$stun_server}
 account.5.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.5.nat.udp_update_enable = 1
+account.5.nat.udp_update_enable = {if isset($account.5.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
 account.5.nat.udp_update_time = 30
@@ -2537,7 +2537,7 @@ account.6.enable = 1
 {else}
 account.6.enable = 0
 {/if}
-account.6.label = {$account.6.display_name}
+account.6.label = {$account.6.label}
 account.6.display_name = {$account.6.display_name}
 account.6.auth_name = {$account.6.auth_id}
 account.6.password = {$account.6.password}
@@ -2654,7 +2654,7 @@ account.6.nat.stun_server =
 account.6.nat.stun_port = 3478
 
 #Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
-account.6.nat.udp_update_enable = 1
+account.6.nat.udp_update_enable = {if isset($account.6.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
 account.6.nat.udp_update_time = 30
diff --git a/resources/templates/provision/yealink/t19p/directory.xml b/resources/templates/provision/yealink/t19p/directory.xml
index 3e319dfb50..e730841a96 100644
--- a/resources/templates/provision/yealink/t19p/directory.xml
+++ b/resources/templates/provision/yealink/t19p/directory.xml
@@ -2,50 +2,58 @@
 {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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-	<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
 </DirectoryEntry>
 {elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
 <DirectoryEntry>
-{if $row.contact_name_given != ""}
+{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 != ""}
+{if $row.phone_number}
 	<Telephone>{$row.phone_number}</Telephone>
 {else}
 	<Telephone>{$row.phone_extension}</Telephone>
@@ -53,29 +61,29 @@
 </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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$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}
+{if isset($row.numbers)}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
 {/if}
 </DirectoryEntry>
 {/if}
diff --git a/resources/templates/provision/yealink/t19p/y000000000053.cfg b/resources/templates/provision/yealink/t19p/y000000000053.cfg
index 31971ad2f2..e5e2a3cbea 100644
--- a/resources/templates/provision/yealink/t19p/y000000000053.cfg
+++ b/resources/templates/provision/yealink/t19p/y000000000053.cfg
@@ -1,4 +1,4 @@
-#!version:1.0.0.1
+ #!version:1.0.0.1
 
 ##File header "#!version:1.0.0.1" can not be edited or deleted.##
 
@@ -376,7 +376,7 @@ voice.group_spk_vol =
 
 #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}
+security.trust_certificates = {$yealink_trust_certificates}
 
 #Define the login username and password of the user, var and administrator.
 #If your username is defined as: security.user_name.admin = adminuser.
@@ -1193,7 +1193,7 @@ phone_setting.predial_autodial = 1
 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 =
+phone_setting.dialnow_delay = {$yealink_dialplan_dialnow_delay}
 
 #Enable or disable the user to customize the softkey layout; 0-Disabled (default), 1-Enabled;
 phone_setting.custom_softkey_enable =
@@ -1328,4 +1328,3 @@ web_item_level.url =
 #######################################################################################
 
 sip.call_fail_use_reason.enable = {$yealink_sip_call_fail_use_reason_enable}
-
diff --git a/resources/templates/provision/yealink/t19p/{$mac}.cfg b/resources/templates/provision/yealink/t19p/{$mac}.cfg
index 402f7282ab..189fe6fef6 100644
--- a/resources/templates/provision/yealink/t19p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t19p/{$mac}.cfg
@@ -15,7 +15,7 @@ account.1.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 1.
-account.1.label = {$account.1.display_name}
+account.1.label = {$account.1.label}
 
 #Configure the display name of account 1.
 account.1.display_name = {$account.1.display_name}
@@ -247,10 +247,10 @@ account.1.nat.stun_server = {$stun_server}
 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
+account.1.nat.udp_update_enable = {if isset($account.1.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.1.nat.udp_update_time =
+account.1.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.1.nat.rport = {$yealink_rport}
@@ -379,7 +379,7 @@ account.2.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 2.
-account.2.label = {$account.2.display_name}
+account.2.label = {$account.2.label}
 
 #Configure the display name of account 2.
 account.2.display_name = {$account.2.display_name}
@@ -599,11 +599,11 @@ 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 =
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.2.nat.udp_update_enable = {if isset($account.2.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.2.nat.udp_update_time =
+account.2.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.2.nat.rport = {$yealink_rport}
@@ -704,7 +704,7 @@ account.3.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 3.
-account.3.label = {$account.3.display_name}
+account.3.label = {$account.3.label}
 
 #Configure the display name of account 3.
 account.3.display_name = {$account.3.display_name}
@@ -924,11 +924,11 @@ 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 =
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.3.nat.udp_update_enable = {if isset($account.3.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.3.nat.udp_update_time =
+account.3.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.3.nat.rport = {$yealink_rport}
@@ -1029,7 +1029,7 @@ account.4.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 4.
-account.4.label = {$account.4.display_name}
+account.4.label = {$account.4.label}
 
 #Configure the display name of account 4.
 account.4.display_name = {$account.4.display_name}
@@ -1250,11 +1250,11 @@ 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 =
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.4.nat.udp_update_enable = {if isset($account.4.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.4.nat.udp_update_time =
+account.4.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.4.nat.rport = {$yealink_rport}
@@ -1358,7 +1358,7 @@ account.5.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 5.
-account.5.label = {$account.5.display_name}
+account.5.label = {$account.5.label}
 
 #Configure the display name of account 5.
 account.5.display_name = {$account.5.display_name}
@@ -1576,11 +1576,11 @@ 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 =
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.5.nat.udp_update_enable = {if isset($account.5.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.5.nat.udp_update_time =
+account.5.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.5.nat.rport = {$yealink_rport}
@@ -1681,7 +1681,7 @@ account.6.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 6.
-account.6.label = {$account.6.display_name}
+account.6.label = {$account.6.label}
 
 #Configure the display name of account 6.
 account.6.display_name = {$account.6.display_name}
@@ -1899,11 +1899,11 @@ 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 =
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.6.nat.udp_update_enable = {if isset($account.6.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.6.nat.udp_update_time =
+account.6.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.6.nat.rport = {$yealink_rport}
@@ -2043,4 +2043,3 @@ linekey.{$row.device_key_id}.label = {$row.device_key_label}
 
 
 {/foreach}
-
diff --git a/resources/templates/provision/yealink/t20p/directory.xml b/resources/templates/provision/yealink/t20p/directory.xml
index 3e319dfb50..e730841a96 100644
--- a/resources/templates/provision/yealink/t20p/directory.xml
+++ b/resources/templates/provision/yealink/t20p/directory.xml
@@ -2,50 +2,58 @@
 {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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-	<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
 </DirectoryEntry>
 {elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
 <DirectoryEntry>
-{if $row.contact_name_given != ""}
+{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 != ""}
+{if $row.phone_number}
 	<Telephone>{$row.phone_number}</Telephone>
 {else}
 	<Telephone>{$row.phone_extension}</Telephone>
@@ -53,29 +61,29 @@
 </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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$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}
+{if isset($row.numbers)}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
 {/if}
 </DirectoryEntry>
 {/if}
diff --git a/resources/templates/provision/yealink/t20p/y000000000007.cfg b/resources/templates/provision/yealink/t20p/y000000000007.cfg
index a7ac7b7da8..a115e6cdda 100644
--- a/resources/templates/provision/yealink/t20p/y000000000007.cfg
+++ b/resources/templates/provision/yealink/t20p/y000000000007.cfg
@@ -376,7 +376,7 @@ voice.group_spk_vol =
 
 #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}
+security.trust_certificates = {$yealink_trust_certificates}
 
 #Define the login username and password of the user, var and administrator.
 #If your username is defined as: security.user_name.admin = adminuser.
@@ -1193,7 +1193,7 @@ phone_setting.predial_autodial = 1
 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 =
+phone_setting.dialnow_delay = {$yealink_dialplan_dialnow_delay}
 
 #Enable or disable the user to customize the softkey layout; 0-Disabled (default), 1-Enabled;
 phone_setting.custom_softkey_enable =
@@ -1327,5 +1327,4 @@ web_item_level.url =
 ##                                   SIP Advanced                                    ##
 #######################################################################################
 
-sip.call_fail_use_reason.enable = {$yealink_sip_call_fail_use_reason_enable}
-
+sip.call_fail_use_reason.enable = {$yealink_sip_call_fail_use_reason_enable
diff --git a/resources/templates/provision/yealink/t20p/{$mac}.cfg b/resources/templates/provision/yealink/t20p/{$mac}.cfg
index 43152be860..2b2ab27aa7 100644
--- a/resources/templates/provision/yealink/t20p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t20p/{$mac}.cfg
@@ -15,7 +15,7 @@ account.1.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 1.
-account.1.label = {$account.1.display_name}
+account.1.label = {$account.1.label}
 
 #Configure the display name of account 1.
 account.1.display_name = {$account.1.display_name}
@@ -247,10 +247,10 @@ account.1.nat.stun_server = {$stun_server}
 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
+account.1.nat.udp_update_enable = {if isset($account.1.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.1.nat.udp_update_time =
+account.1.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.1.nat.rport = {$yealink_rport}
@@ -379,7 +379,7 @@ account.2.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 2.
-account.2.label = {$account.2.display_name}
+account.2.label = {$account.2.label}
 
 #Configure the display name of account 2.
 account.2.display_name = {$account.2.display_name}
@@ -601,11 +601,11 @@ 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 =
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.2.nat.udp_update_enable = {if isset($account.2.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.2.nat.udp_update_time =
+account.2.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.2.nat.rport = {$yealink_rport}
@@ -706,7 +706,7 @@ account.3.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 3.
-account.3.label = {$account.3.display_name}
+account.3.label = {$account.3.label}
 
 #Configure the display name of account 3.
 account.3.display_name = {$account.3.display_name}
@@ -926,11 +926,11 @@ 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 =
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.3.nat.udp_update_enable = {if isset($account.3.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.3.nat.udp_update_time =
+account.3.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.3.nat.rport = {$yealink_rport}
@@ -1031,7 +1031,7 @@ account.4.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 4.
-account.4.label = {$account.4.display_name}
+account.4.label = {$account.4.label}
 
 #Configure the display name of account 4.
 account.4.display_name = {$account.4.display_name}
@@ -1251,11 +1251,11 @@ 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 =
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.4.nat.udp_update_enable = {if isset($account.4.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.4.nat.udp_update_time =
+account.4.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.4.nat.rport = {$yealink_rport}
@@ -1359,7 +1359,7 @@ account.5.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 5.
-account.5.label = {$account.5.display_name}
+account.5.label = {$account.5.label}
 
 #Configure the display name of account 5.
 account.5.display_name = {$account.5.display_name}
@@ -1577,11 +1577,11 @@ 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 =
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.5.nat.udp_update_enable = {if isset($account.5.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.5.nat.udp_update_time =
+account.5.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.5.nat.rport = {$yealink_rport}
@@ -1682,7 +1682,7 @@ account.6.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 6.
-account.6.label = {$account.6.display_name}
+account.6.label = {$account.6.label}
 
 #Configure the display name of account 6.
 account.6.display_name = {$account.6.display_name}
@@ -1900,11 +1900,11 @@ 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 =
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.6.nat.udp_update_enable = {if isset($account.6.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.6.nat.udp_update_time =
+account.6.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.6.nat.rport = {$yealink_rport}
@@ -2045,4 +2045,3 @@ linekey.{$row.device_key_id}.label = {$row.device_key_label}
 
 
 {/foreach}
-
diff --git a/resources/templates/provision/yealink/t21p/directory.xml b/resources/templates/provision/yealink/t21p/directory.xml
index 3e319dfb50..e730841a96 100644
--- a/resources/templates/provision/yealink/t21p/directory.xml
+++ b/resources/templates/provision/yealink/t21p/directory.xml
@@ -2,50 +2,58 @@
 {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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-	<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
 </DirectoryEntry>
 {elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
 <DirectoryEntry>
-{if $row.contact_name_given != ""}
+{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 != ""}
+{if $row.phone_number}
 	<Telephone>{$row.phone_number}</Telephone>
 {else}
 	<Telephone>{$row.phone_extension}</Telephone>
@@ -53,29 +61,29 @@
 </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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$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}
+{if isset($row.numbers)}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
 {/if}
 </DirectoryEntry>
 {/if}
diff --git a/resources/templates/provision/yealink/t21p/y000000000052.cfg b/resources/templates/provision/yealink/t21p/y000000000052.cfg
index 7974aac10a..d77c92c55a 100644
--- a/resources/templates/provision/yealink/t21p/y000000000052.cfg
+++ b/resources/templates/provision/yealink/t21p/y000000000052.cfg
@@ -875,7 +875,7 @@ phone_setting.is_deal180 =
 phone_setting.show_code403 =
 
 #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 =
+phone_setting.dialnow_delay = {$yealink_dialplan_dialnow_delay}
 
 #Configure the emergency number, each separated by a comma. The default value is 112,911,110.
 phone_setting.emergency.number = {$yealink_emergency_number}
@@ -1023,7 +1023,7 @@ bw.feature_key_sync = {$yealink_feature_key_sync}
 #######################################################################################
 #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}
+security.trust_certificates = {$yealink_trust_certificates}
 
 #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.
@@ -1321,8 +1321,8 @@ expansion_module.2.key.{$row.device_key_id}.xml_phonebook =
 #Enable or disable the always forward feature; 0-Disabled (default), 1-Enabled;
 forward.always.enable =
 forward.always.target =
-forward.always.on_code = {$yealink_forward_always_on_code}
-forward.always.off_code = {$yealink_forward_always_off_code}
+forward.always.on_code = {$yealink_forward_always_on_code}
+forward.always.off_code = {$yealink_forward_always_off_code}
 
 #######################################################################################
 ##                                   Forward Busy                                    ##
diff --git a/resources/templates/provision/yealink/t21p/{$mac}.cfg b/resources/templates/provision/yealink/t21p/{$mac}.cfg
index d11c8a679f..d0ae9967f2 100644
--- a/resources/templates/provision/yealink/t21p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t21p/{$mac}.cfg
@@ -13,7 +13,7 @@ account.1.enable = 1
 {else}
 account.1.enable = 0
 {/if}
-account.1.label = {$account.1.display_name}
+account.1.label = {$account.1.label}
 account.1.display_name = {$account.1.display_name}
 account.1.auth_name = {$account.1.auth_id}
 account.1.password = {$account.1.password}
@@ -143,10 +143,10 @@ account.1.nat.stun_server = {$stun_server}
 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
+account.1.nat.udp_update_enable = {if isset($account.1.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.1.nat.udp_update_time = 30
+account.1.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.1.nat.rport = {$yealink_rport}
@@ -528,7 +528,7 @@ account.2.enable = 1
 {else}
 account.2.enable = 0
 {/if}
-account.2.label = {$account.2.display_name}
+account.2.label = {$account.2.label}
 account.2.display_name = {$account.2.display_name}
 account.2.auth_name = {$account.2.auth_id}
 account.2.password = {$account.2.password}
@@ -645,10 +645,10 @@ account.2.nat.stun_server = {$stun_server}
 account.2.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.2.nat.udp_update_enable = 1
+account.2.nat.udp_update_enable = {if isset($account.2.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.2.nat.udp_update_time = 30
+account.2.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.2.nat.rport = {$yealink_rport}
@@ -1041,7 +1041,7 @@ account.3.enable = 1
 {else}
 account.3.enable = 0
 {/if}
-account.3.label = {$account.3.display_name}
+account.3.label = {$account.3.label}
 account.3.display_name = {$account.3.display_name}
 account.3.auth_name = {$account.3.auth_id}
 account.3.password = {$account.3.password}
@@ -1158,10 +1158,10 @@ account.3.nat.stun_server = {$stun_server}
 account.3.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.3.nat.udp_update_enable = 1
+account.3.nat.udp_update_enable = {if isset($account.3.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.3.nat.udp_update_time = 30
+account.3.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.3.nat.rport = {$yealink_rport}
@@ -1537,7 +1537,7 @@ account.4.enable = 1
 {else}
 account.4.enable = 0
 {/if}
-account.4.label = {$account.4.display_name}
+account.4.label = {$account.4.label}
 account.4.display_name = {$account.4.display_name}
 account.4.auth_name = {$account.4.auth_id}
 account.4.password = {$account.4.password}
@@ -1654,10 +1654,10 @@ account.4.nat.stun_server = {$stun_server}
 account.4.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.4.nat.udp_update_enable = 1
+account.4.nat.udp_update_enable = {if isset($account.4.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.4.nat.udp_update_time = 30
+account.4.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.4.nat.rport = {$yealink_rport}
@@ -2033,7 +2033,7 @@ account.5.enable = 1
 {else}
 account.5.enable = 0
 {/if}
-account.5.label = {$account.5.display_name}
+account.5.label = {$account.5.label}
 account.5.display_name = {$account.5.display_name}
 account.5.auth_name = {$account.5.auth_id}
 account.5.password = {$account.5.password}
@@ -2150,10 +2150,10 @@ account.5.nat.stun_server = {$stun_server}
 account.5.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.5.nat.udp_update_enable = 1
+account.5.nat.udp_update_enable = {if isset($account.5.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.5.nat.udp_update_time = 30
+account.5.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.5.nat.rport = {$yealink_rport}
@@ -2529,7 +2529,7 @@ account.6.enable = 1
 {else}
 account.6.enable = 0
 {/if}
-account.6.label = {$account.6.display_name}
+account.6.label = {$account.6.label}
 account.6.display_name = {$account.6.display_name}
 account.6.auth_name = {$account.6.auth_id}
 account.6.password = {$account.6.password}
@@ -2645,10 +2645,10 @@ account.6.nat.stun_server =
 account.6.nat.stun_port = 3478
 
 #Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
-account.6.nat.udp_update_enable = 1
+account.6.nat.udp_update_enable = {if isset($account.6.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.6.nat.udp_update_time = 30
+account.6.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.6.nat.rport = {$yealink_rport}
diff --git a/resources/templates/provision/yealink/t22p/directory.xml b/resources/templates/provision/yealink/t22p/directory.xml
index 3e319dfb50..e730841a96 100644
--- a/resources/templates/provision/yealink/t22p/directory.xml
+++ b/resources/templates/provision/yealink/t22p/directory.xml
@@ -2,50 +2,58 @@
 {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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-	<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
 </DirectoryEntry>
 {elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
 <DirectoryEntry>
-{if $row.contact_name_given != ""}
+{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 != ""}
+{if $row.phone_number}
 	<Telephone>{$row.phone_number}</Telephone>
 {else}
 	<Telephone>{$row.phone_extension}</Telephone>
@@ -53,29 +61,29 @@
 </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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$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}
+{if isset($row.numbers)}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
 {/if}
 </DirectoryEntry>
 {/if}
diff --git a/resources/templates/provision/yealink/t22p/y000000000005.cfg b/resources/templates/provision/yealink/t22p/y000000000005.cfg
index ec3744478d..596ea213ed 100644
--- a/resources/templates/provision/yealink/t22p/y000000000005.cfg
+++ b/resources/templates/provision/yealink/t22p/y000000000005.cfg
@@ -376,7 +376,7 @@ voice.group_spk_vol =
 
 #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}
+security.trust_certificates = {$yealink_trust_certificates}
 
 #Define the login username and password of the user, var and administrator.
 #If your username is defined as: security.user_name.admin = adminuser.
@@ -1193,7 +1193,7 @@ phone_setting.predial_autodial = 1
 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 =
+phone_setting.dialnow_delay = {$yealink_dialplan_dialnow_delay}
 
 #Enable or disable the user to customize the softkey layout; 0-Disabled (default), 1-Enabled;
 phone_setting.custom_softkey_enable =
diff --git a/resources/templates/provision/yealink/t22p/{$mac}.cfg b/resources/templates/provision/yealink/t22p/{$mac}.cfg
index 402f7282ab..189fe6fef6 100644
--- a/resources/templates/provision/yealink/t22p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t22p/{$mac}.cfg
@@ -15,7 +15,7 @@ account.1.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 1.
-account.1.label = {$account.1.display_name}
+account.1.label = {$account.1.label}
 
 #Configure the display name of account 1.
 account.1.display_name = {$account.1.display_name}
@@ -247,10 +247,10 @@ account.1.nat.stun_server = {$stun_server}
 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
+account.1.nat.udp_update_enable = {if isset($account.1.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.1.nat.udp_update_time =
+account.1.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.1.nat.rport = {$yealink_rport}
@@ -379,7 +379,7 @@ account.2.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 2.
-account.2.label = {$account.2.display_name}
+account.2.label = {$account.2.label}
 
 #Configure the display name of account 2.
 account.2.display_name = {$account.2.display_name}
@@ -599,11 +599,11 @@ 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 =
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.2.nat.udp_update_enable = {if isset($account.2.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.2.nat.udp_update_time =
+account.2.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.2.nat.rport = {$yealink_rport}
@@ -704,7 +704,7 @@ account.3.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 3.
-account.3.label = {$account.3.display_name}
+account.3.label = {$account.3.label}
 
 #Configure the display name of account 3.
 account.3.display_name = {$account.3.display_name}
@@ -924,11 +924,11 @@ 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 =
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.3.nat.udp_update_enable = {if isset($account.3.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.3.nat.udp_update_time =
+account.3.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.3.nat.rport = {$yealink_rport}
@@ -1029,7 +1029,7 @@ account.4.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 4.
-account.4.label = {$account.4.display_name}
+account.4.label = {$account.4.label}
 
 #Configure the display name of account 4.
 account.4.display_name = {$account.4.display_name}
@@ -1250,11 +1250,11 @@ 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 =
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.4.nat.udp_update_enable = {if isset($account.4.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.4.nat.udp_update_time =
+account.4.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.4.nat.rport = {$yealink_rport}
@@ -1358,7 +1358,7 @@ account.5.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 5.
-account.5.label = {$account.5.display_name}
+account.5.label = {$account.5.label}
 
 #Configure the display name of account 5.
 account.5.display_name = {$account.5.display_name}
@@ -1576,11 +1576,11 @@ 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 =
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.5.nat.udp_update_enable = {if isset($account.5.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.5.nat.udp_update_time =
+account.5.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.5.nat.rport = {$yealink_rport}
@@ -1681,7 +1681,7 @@ account.6.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 6.
-account.6.label = {$account.6.display_name}
+account.6.label = {$account.6.label}
 
 #Configure the display name of account 6.
 account.6.display_name = {$account.6.display_name}
@@ -1899,11 +1899,11 @@ 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 =
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.6.nat.udp_update_enable = {if isset($account.6.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.6.nat.udp_update_time =
+account.6.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.6.nat.rport = {$yealink_rport}
@@ -2043,4 +2043,3 @@ linekey.{$row.device_key_id}.label = {$row.device_key_label}
 
 
 {/foreach}
-
diff --git a/resources/templates/provision/yealink/t23g/directory.xml b/resources/templates/provision/yealink/t23g/directory.xml
index 3e319dfb50..e730841a96 100644
--- a/resources/templates/provision/yealink/t23g/directory.xml
+++ b/resources/templates/provision/yealink/t23g/directory.xml
@@ -2,50 +2,58 @@
 {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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-	<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
 </DirectoryEntry>
 {elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
 <DirectoryEntry>
-{if $row.contact_name_given != ""}
+{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 != ""}
+{if $row.phone_number}
 	<Telephone>{$row.phone_number}</Telephone>
 {else}
 	<Telephone>{$row.phone_extension}</Telephone>
@@ -53,29 +61,29 @@
 </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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$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}
+{if isset($row.numbers)}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
 {/if}
 </DirectoryEntry>
 {/if}
diff --git a/resources/templates/provision/yealink/t23g/y000000000044.cfg b/resources/templates/provision/yealink/t23g/y000000000044.cfg
index 2b14360fd9..90f687042b 100644
--- a/resources/templates/provision/yealink/t23g/y000000000044.cfg
+++ b/resources/templates/provision/yealink/t23g/y000000000044.cfg
@@ -915,7 +915,7 @@ phone_setting.is_deal180 =
 phone_setting.show_code403 =
 
 #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 =
+phone_setting.dialnow_delay = {$yealink_dialplan_dialnow_delay}
 
 #Configure the emergency number, each separated by a comma. The default value is 112,911,110.
 phone_setting.emergency.number = {$yealink_emergency_number}
@@ -1063,7 +1063,7 @@ local.dsskey_type_config.mode =
 #######################################################################################
 #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}
+security.trust_certificates = {$yealink_trust_certificates}
 
 #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.
@@ -1361,8 +1361,8 @@ expansion_module.2.key.{$row.device_key_id}.xml_phonebook =
 #Enable or disable the always forward feature; 0-Disabled (default), 1-Enabled;
 forward.always.enable =
 forward.always.target =
-forward.always.on_code = {$yealink_forward_always_on_code}
-forward.always.off_code = {$yealink_forward_always_off_code}
+forward.always.on_code = {$yealink_forward_always_on_code}
+forward.always.off_code = {$yealink_forward_always_off_code}
 
 #######################################################################################
 ##                                   Forward Busy                                    ##
diff --git a/resources/templates/provision/yealink/t23g/{$mac}.cfg b/resources/templates/provision/yealink/t23g/{$mac}.cfg
index 30a654b5cf..94c043a9e6 100644
--- a/resources/templates/provision/yealink/t23g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t23g/{$mac}.cfg
@@ -13,7 +13,7 @@ account.1.enable = 1
 {else}
 account.1.enable = 0
 {/if}
-account.1.label = {$account.1.display_name}
+account.1.label = {$account.1.label}
 account.1.display_name = {$account.1.display_name}
 account.1.auth_name = {$account.1.auth_id}
 account.1.password = {$account.1.password}
@@ -156,10 +156,10 @@ account.1.nat.stun_server = {$stun_server}
 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
+account.1.nat.udp_update_enable = {if isset($account.1.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.1.nat.udp_update_time = 30
+account.1.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.1.nat.rport = {$yealink_rport}
@@ -541,7 +541,7 @@ account.2.enable = 1
 {else}
 account.2.enable = 0
 {/if}
-account.2.label = {$account.2.display_name}
+account.2.label = {$account.2.label}
 account.2.display_name = {$account.2.display_name}
 account.2.auth_name = {$account.2.auth_id}
 account.2.password = {$account.2.password}
@@ -661,10 +661,10 @@ account.2.nat.stun_server = {$stun_server}
 account.2.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.2.nat.udp_update_enable = 1
+account.2.nat.udp_update_enable = {if isset($account.2.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.2.nat.udp_update_time = 30
+account.2.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.2.nat.rport = {$yealink_rport}
@@ -1027,7 +1027,7 @@ account.3.enable = 1
 {else}
 account.3.enable = 0
 {/if}
-account.3.label = {$account.3.display_name}
+account.3.label = {$account.3.label}
 account.3.display_name = {$account.3.display_name}
 account.3.auth_name = {$account.3.auth_id}
 account.3.password = {$account.3.password}
@@ -1147,10 +1147,10 @@ account.3.nat.stun_server = {$stun_server}
 account.3.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.3.nat.udp_update_enable = 1
+account.3.nat.udp_update_enable = {if isset($account.3.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.3.nat.udp_update_time = 30
+account.3.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.3.nat.rport = {$yealink_rport}
@@ -1503,7 +1503,7 @@ account.4.enable = 1
 {else}
 account.4.enable = 0
 {/if}
-account.4.label = {$account.4.display_name}
+account.4.label = {$account.4.label}
 account.4.display_name = {$account.4.display_name}
 account.4.auth_name = {$account.4.auth_id}
 account.4.password = {$account.4.password}
@@ -1623,10 +1623,10 @@ account.4.nat.stun_server = {$stun_server}
 account.4.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.4.nat.udp_update_enable = 1
+account.4.nat.udp_update_enable = {if isset($account.4.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.4.nat.udp_update_time = 30
+account.4.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.4.nat.rport = {$yealink_rport}
@@ -1979,7 +1979,7 @@ account.5.enable = 1
 {else}
 account.5.enable = 0
 {/if}
-account.5.label = {$account.5.display_name}
+account.5.label = {$account.5.label}
 account.5.display_name = {$account.5.display_name}
 account.5.auth_name = {$account.5.auth_id}
 account.5.password = {$account.5.password}
@@ -2099,10 +2099,10 @@ account.5.nat.stun_server = {$stun_server}
 account.5.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.5.nat.udp_update_enable = 1
+account.5.nat.udp_update_enable = {if isset($account.5.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.5.nat.udp_update_time = 30
+account.5.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.5.nat.rport = {$yealink_rport}
@@ -2455,7 +2455,7 @@ account.6.enable = 1
 {else}
 account.6.enable = 0
 {/if}
-account.6.label = {$account.6.display_name}
+account.6.label = {$account.6.label}
 account.6.display_name = {$account.6.display_name}
 account.6.auth_name = {$account.6.auth_id}
 account.6.password = {$account.6.password}
@@ -2574,10 +2574,10 @@ account.6.nat.stun_server =
 account.6.nat.stun_port = 3478
 
 #Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
-account.6.nat.udp_update_enable = 1
+account.6.nat.udp_update_enable = {if isset($account.6.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.6.nat.udp_update_time = 30
+account.6.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.6.nat.rport = {$yealink_rport}
diff --git a/resources/templates/provision/yealink/t23p/directory.xml b/resources/templates/provision/yealink/t23p/directory.xml
index 3e319dfb50..e730841a96 100644
--- a/resources/templates/provision/yealink/t23p/directory.xml
+++ b/resources/templates/provision/yealink/t23p/directory.xml
@@ -2,50 +2,58 @@
 {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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-	<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
 </DirectoryEntry>
 {elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
 <DirectoryEntry>
-{if $row.contact_name_given != ""}
+{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 != ""}
+{if $row.phone_number}
 	<Telephone>{$row.phone_number}</Telephone>
 {else}
 	<Telephone>{$row.phone_extension}</Telephone>
@@ -53,29 +61,29 @@
 </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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$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}
+{if isset($row.numbers)}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
 {/if}
 </DirectoryEntry>
 {/if}
diff --git a/resources/templates/provision/yealink/t23p/y000000000044.cfg b/resources/templates/provision/yealink/t23p/y000000000044.cfg
index b75413db3a..94b0bb6875 100644
--- a/resources/templates/provision/yealink/t23p/y000000000044.cfg
+++ b/resources/templates/provision/yealink/t23p/y000000000044.cfg
@@ -1062,7 +1062,7 @@ local.dsskey_type_config.mode =
 #######################################################################################
 #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}
+security.trust_certificates = {$yealink_trust_certificates}
 
 #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.
@@ -1360,8 +1360,8 @@ expansion_module.2.key.{$row.device_key_id}.xml_phonebook =
 #Enable or disable the always forward feature; 0-Disabled (default), 1-Enabled;
 forward.always.enable =
 forward.always.target =
-forward.always.on_code = {$yealink_forward_always_on_code}
-forward.always.off_code = {$yealink_forward_always_off_code}
+forward.always.on_code = {$yealink_forward_always_on_code}
+forward.always.off_code = {$yealink_forward_always_off_code}
 
 #######################################################################################
 ##                                   Forward Busy                                    ##
diff --git a/resources/templates/provision/yealink/t23p/{$mac}.cfg b/resources/templates/provision/yealink/t23p/{$mac}.cfg
index f432568c91..0fe22fc1b9 100644
--- a/resources/templates/provision/yealink/t23p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t23p/{$mac}.cfg
@@ -13,7 +13,7 @@ account.1.enable = 1
 {else}
 account.1.enable = 0
 {/if}
-account.1.label = {$account.1.display_name}
+account.1.label = {$account.1.label}
 account.1.display_name = {$account.1.display_name}
 account.1.auth_name = {$account.1.auth_id}
 account.1.password = {$account.1.password}
@@ -142,10 +142,10 @@ account.1.nat.stun_server = {$stun_server}
 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
+account.1.nat.udp_update_enable = {if isset($account.1.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.1.nat.udp_update_time = 30
+account.1.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.1.nat.rport = {$yealink_rport}
@@ -527,7 +527,7 @@ account.2.enable = 1
 {else}
 account.2.enable = 0
 {/if}
-account.2.label = {$account.2.display_name}
+account.2.label = {$account.2.label}
 account.2.display_name = {$account.2.display_name}
 account.2.auth_name = {$account.2.auth_id}
 account.2.password = {$account.2.password}
@@ -647,10 +647,10 @@ account.2.nat.stun_server = {$stun_server}
 account.2.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.2.nat.udp_update_enable = 1
+account.2.nat.udp_update_enable = {if isset($account.2.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.2.nat.udp_update_time = 30
+account.2.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.2.nat.rport = {$yealink_rport}
@@ -1013,7 +1013,7 @@ account.3.enable = 1
 {else}
 account.3.enable = 0
 {/if}
-account.3.label = {$account.3.display_name}
+account.3.label = {$account.3.label}
 account.3.display_name = {$account.3.display_name}
 account.3.auth_name = {$account.3.auth_id}
 account.3.password = {$account.3.password}
@@ -1133,10 +1133,10 @@ account.3.nat.stun_server = {$stun_server}
 account.3.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.3.nat.udp_update_enable = 1
+account.3.nat.udp_update_enable = {if isset($account.3.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.3.nat.udp_update_time = 30
+account.3.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.3.nat.rport = {$yealink_rport}
@@ -1489,7 +1489,7 @@ account.4.enable = 1
 {else}
 account.4.enable = 0
 {/if}
-account.4.label = {$account.4.display_name}
+account.4.label = {$account.4.label}
 account.4.display_name = {$account.4.display_name}
 account.4.auth_name = {$account.4.auth_id}
 account.4.password = {$account.4.password}
@@ -1609,10 +1609,10 @@ account.4.nat.stun_server = {$stun_server}
 account.4.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.4.nat.udp_update_enable = 1
+account.4.nat.udp_update_enable = {if isset($account.4.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.4.nat.udp_update_time = 30
+account.4.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.4.nat.rport = {$yealink_rport}
@@ -1965,7 +1965,7 @@ account.5.enable = 1
 {else}
 account.5.enable = 0
 {/if}
-account.5.label = {$account.5.display_name}
+account.5.label = {$account.5.label}
 account.5.display_name = {$account.5.display_name}
 account.5.auth_name = {$account.5.auth_id}
 account.5.password = {$account.5.password}
@@ -2085,10 +2085,10 @@ account.5.nat.stun_server = {$stun_server}
 account.5.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.5.nat.udp_update_enable = 1
+account.5.nat.udp_update_enable = {if isset($account.5.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.5.nat.udp_update_time = 30
+account.5.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.5.nat.rport = {$yealink_rport}
@@ -2441,7 +2441,7 @@ account.6.enable = 1
 {else}
 account.6.enable = 0
 {/if}
-account.6.label = {$account.6.display_name}
+account.6.label = {$account.6.label}
 account.6.display_name = {$account.6.display_name}
 account.6.auth_name = {$account.6.auth_id}
 account.6.password = {$account.6.password}
@@ -2560,10 +2560,10 @@ account.6.nat.stun_server =
 account.6.nat.stun_port = 3478
 
 #Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
-account.6.nat.udp_update_enable = 1
+account.6.nat.udp_update_enable = {if isset($account.6.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.6.nat.udp_update_time = 30
+account.6.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.6.nat.rport = {$yealink_rport}
diff --git a/resources/templates/provision/yealink/t26p/directory.xml b/resources/templates/provision/yealink/t26p/directory.xml
index 3e319dfb50..e730841a96 100644
--- a/resources/templates/provision/yealink/t26p/directory.xml
+++ b/resources/templates/provision/yealink/t26p/directory.xml
@@ -2,50 +2,58 @@
 {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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-	<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
 </DirectoryEntry>
 {elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
 <DirectoryEntry>
-{if $row.contact_name_given != ""}
+{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 != ""}
+{if $row.phone_number}
 	<Telephone>{$row.phone_number}</Telephone>
 {else}
 	<Telephone>{$row.phone_extension}</Telephone>
@@ -53,29 +61,29 @@
 </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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$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}
+{if isset($row.numbers)}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
 {/if}
 </DirectoryEntry>
 {/if}
diff --git a/resources/templates/provision/yealink/t26p/y000000000004.cfg b/resources/templates/provision/yealink/t26p/y000000000004.cfg
index 7d962a307f..f49af0d7eb 100644
--- a/resources/templates/provision/yealink/t26p/y000000000004.cfg
+++ b/resources/templates/provision/yealink/t26p/y000000000004.cfg
@@ -376,7 +376,7 @@ voice.group_spk_vol =
 
 #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}
+security.trust_certificates = {$yealink_trust_certificates}
 
 #Define the login username and password of the user, var and administrator.
 #If your username is defined as: security.user_name.admin = adminuser.
@@ -1193,7 +1193,7 @@ phone_setting.predial_autodial = 1
 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 =
+phone_setting.dialnow_delay = {$yealink_dialplan_dialnow_delay}
 
 #Enable or disable the user to customize the softkey layout; 0-Disabled (default), 1-Enabled;
 phone_setting.custom_softkey_enable =
diff --git a/resources/templates/provision/yealink/t26p/{$mac}.cfg b/resources/templates/provision/yealink/t26p/{$mac}.cfg
index 0424805b83..c2652680cc 100644
--- a/resources/templates/provision/yealink/t26p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t26p/{$mac}.cfg
@@ -15,7 +15,7 @@ account.1.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 1.
-account.1.label = {$account.1.display_name}
+account.1.label = {$account.1.label}
 
 #Configure the display name of account 1.
 account.1.display_name = {$account.1.display_name}
@@ -247,10 +247,10 @@ account.1.nat.stun_server = {$stun_server}
 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
+account.1.nat.udp_update_enable = {if isset($account.1.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.1.nat.udp_update_time =
+account.1.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.1.nat.rport = {$yealink_rport}
@@ -379,7 +379,7 @@ account.2.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 2.
-account.2.label = {$account.2.display_name}
+account.2.label = {$account.2.label}
 
 #Configure the display name of account 2.
 account.2.display_name = {$account.2.display_name}
@@ -599,11 +599,11 @@ 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 =
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.2.nat.udp_update_enable = {if isset($account.2.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.2.nat.udp_update_time =
+account.2.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.2.nat.rport = {$yealink_rport}
@@ -704,7 +704,7 @@ account.3.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 3.
-account.3.label = {$account.3.display_name}
+account.3.label = {$account.3.label}
 
 #Configure the display name of account 3.
 account.3.display_name = {$account.3.display_name}
@@ -925,11 +925,11 @@ 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 =
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.3.nat.udp_update_enable = {if isset($account.3.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.3.nat.udp_update_time =
+account.3.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.3.nat.rport = {$yealink_rport}
@@ -1030,7 +1030,7 @@ account.4.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 4.
-account.4.label = {$account.4.display_name}
+account.4.label = {$account.4.label}
 
 #Configure the display name of account 4.
 account.4.display_name = {$account.4.display_name}
@@ -1250,11 +1250,11 @@ 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 =
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.4.nat.udp_update_enable = {if isset($account.4.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.4.nat.udp_update_time =
+account.4.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.4.nat.rport = {$yealink_rport}
@@ -1358,7 +1358,7 @@ account.5.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 5.
-account.5.label = {$account.5.display_name}
+account.5.label = {$account.5.label}
 
 #Configure the display name of account 5.
 account.5.display_name = {$account.5.display_name}
@@ -1576,11 +1576,11 @@ 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 =
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.5.nat.udp_update_enable = {if isset($account.5.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.5.nat.udp_update_time =
+account.5.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.5.nat.rport = {$yealink_rport}
@@ -1681,7 +1681,7 @@ account.6.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 6.
-account.6.label = {$account.6.display_name}
+account.6.label = {$account.6.label}
 
 #Configure the display name of account 6.
 account.6.display_name = {$account.6.display_name}
@@ -1899,11 +1899,11 @@ 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 =
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.6.nat.udp_update_enable = {if isset($account.6.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.6.nat.udp_update_time =
+account.6.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.6.nat.rport = {$yealink_rport}
diff --git a/resources/templates/provision/yealink/t27g/directory.xml b/resources/templates/provision/yealink/t27g/directory.xml
index 297b9e4108..86c7b6f8b5 100644
--- a/resources/templates/provision/yealink/t27g/directory.xml
+++ b/resources/templates/provision/yealink/t27g/directory.xml
@@ -2,50 +2,58 @@
 {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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-	<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
 </DirectoryEntry>
 {elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
 <DirectoryEntry>
-{if $row.contact_name_given != ""}
+{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 != ""}
+{if $row.phone_number}
 	<Telephone>{$row.phone_number}</Telephone>
 {else}
 	<Telephone>{$row.phone_extension}</Telephone>
@@ -53,29 +61,29 @@
 </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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$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}
+{if isset($row.numbers)}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
 {/if}
 </DirectoryEntry>
 {/if}
diff --git a/resources/templates/provision/yealink/t27g/y000000000069.cfg b/resources/templates/provision/yealink/t27g/y000000000069.cfg
index 57ab14df79..3f3d0351e7 100644
--- a/resources/templates/provision/yealink/t27g/y000000000069.cfg
+++ b/resources/templates/provision/yealink/t27g/y000000000069.cfg
@@ -1062,7 +1062,7 @@ local.dsskey_type_config.mode =
 #######################################################################################
 #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}
+security.trust_certificates = {$yealink_trust_certificates}
 
 #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.
diff --git a/resources/templates/provision/yealink/t27g/{$mac}.cfg b/resources/templates/provision/yealink/t27g/{$mac}.cfg
index 867997d05d..4a9a7e6a62 100644
--- a/resources/templates/provision/yealink/t27g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t27g/{$mac}.cfg
@@ -13,7 +13,7 @@ account.1.enable = 1
 {else}
 account.1.enable = 0
 {/if}
-account.1.label = {$account.1.display_name}
+account.1.label = {$account.1.label}
 account.1.display_name = {$account.1.display_name}
 account.1.auth_name = {$account.1.auth_id}
 account.1.password = {$account.1.password}
@@ -156,7 +156,7 @@ account.1.nat.stun_server = {$stun_server}
 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
+account.1.nat.udp_update_enable = {if isset($account.1.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
 account.1.nat.udp_update_time = 30
@@ -541,7 +541,7 @@ account.2.enable = 1
 {else}
 account.2.enable = 0
 {/if}
-account.2.label = {$account.2.display_name}
+account.2.label = {$account.2.label}
 account.2.display_name = {$account.2.display_name}
 account.2.auth_name = {$account.2.auth_id}
 account.2.password = {$account.2.password}
@@ -660,7 +660,7 @@ account.2.nat.stun_server = {$stun_server}
 account.2.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.2.nat.udp_update_enable = 1
+account.2.nat.udp_update_enable = {if isset($account.2.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
 account.2.nat.udp_update_time = 30
@@ -1026,7 +1026,7 @@ account.3.enable = 1
 {else}
 account.3.enable = 0
 {/if}
-account.3.label = {$account.3.display_name}
+account.3.label = {$account.3.label}
 account.3.display_name = {$account.3.display_name}
 account.3.auth_name = {$account.3.auth_id}
 account.3.password = {$account.3.password}
@@ -1145,7 +1145,7 @@ account.3.nat.stun_server = {$stun_server}
 account.3.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.3.nat.udp_update_enable = 1
+account.3.nat.udp_update_enable = {if isset($account.3.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
 account.3.nat.udp_update_time = 30
@@ -1501,7 +1501,7 @@ account.4.enable = 1
 {else}
 account.4.enable = 0
 {/if}
-account.4.label = {$account.4.display_name}
+account.4.label = {$account.4.label}
 account.4.display_name = {$account.4.display_name}
 account.4.auth_name = {$account.4.auth_id}
 account.4.password = {$account.4.password}
@@ -1620,7 +1620,7 @@ account.4.nat.stun_server = {$stun_server}
 account.4.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.4.nat.udp_update_enable = 1
+account.4.nat.udp_update_enable = {if isset($account.4.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
 account.4.nat.udp_update_time = 30
@@ -1976,7 +1976,7 @@ account.5.enable = 1
 {else}
 account.5.enable = 0
 {/if}
-account.5.label = {$account.5.display_name}
+account.5.label = {$account.5.label}
 account.5.display_name = {$account.5.display_name}
 account.5.auth_name = {$account.5.auth_id}
 account.5.password = {$account.5.password}
@@ -2095,7 +2095,7 @@ account.5.nat.stun_server = {$stun_server}
 account.5.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.5.nat.udp_update_enable = 1
+account.5.nat.udp_update_enable = {if isset($account.5.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
 account.5.nat.udp_update_time = 30
@@ -2451,7 +2451,7 @@ account.6.enable = 1
 {else}
 account.6.enable = 0
 {/if}
-account.6.label = {$account.6.display_name}
+account.6.label = {$account.6.label}
 account.6.display_name = {$account.6.display_name}
 account.6.auth_name = {$account.6.auth_id}
 account.6.password = {$account.6.password}
@@ -2569,7 +2569,7 @@ account.6.nat.stun_server =
 account.6.nat.stun_port = 3478
 
 #Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
-account.6.nat.udp_update_enable = 1
+account.6.nat.udp_update_enable = {if isset($account.6.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
 account.6.nat.udp_update_time = 30
@@ -3064,4 +3064,3 @@ expansion_module.6.key.{$row.device_key_id}.label = {$row.device_key_label}
 expansion_module.6.key.{$row.device_key_id}.xml_phonebook =
 
 {/foreach}
-
diff --git a/resources/templates/provision/yealink/t27p/directory.xml b/resources/templates/provision/yealink/t27p/directory.xml
index 3e319dfb50..e730841a96 100644
--- a/resources/templates/provision/yealink/t27p/directory.xml
+++ b/resources/templates/provision/yealink/t27p/directory.xml
@@ -2,50 +2,58 @@
 {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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-	<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
 </DirectoryEntry>
 {elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
 <DirectoryEntry>
-{if $row.contact_name_given != ""}
+{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 != ""}
+{if $row.phone_number}
 	<Telephone>{$row.phone_number}</Telephone>
 {else}
 	<Telephone>{$row.phone_extension}</Telephone>
@@ -53,29 +61,29 @@
 </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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$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}
+{if isset($row.numbers)}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
 {/if}
 </DirectoryEntry>
 {/if}
diff --git a/resources/templates/provision/yealink/t27p/y000000000045.cfg b/resources/templates/provision/yealink/t27p/y000000000045.cfg
index dec91252bb..51fbff054e 100644
--- a/resources/templates/provision/yealink/t27p/y000000000045.cfg
+++ b/resources/templates/provision/yealink/t27p/y000000000045.cfg
@@ -1063,7 +1063,7 @@ local.dsskey_type_config.mode =
 #######################################################################################
 #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}
+security.trust_certificates = {$yealink_trust_certificates}
 
 #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.
@@ -1362,8 +1362,8 @@ expansion_module.2.key.{$row.device_key_id}.xml_phonebook =
 #Enable or disable the always forward feature; 0-Disabled (default), 1-Enabled;
 forward.always.enable =
 forward.always.target =
-forward.always.on_code = {$yealink_forward_always_on_code}
-forward.always.off_code = {$yealink_forward_always_off_code}
+forward.always.on_code = {$yealink_forward_always_on_code}
+forward.always.off_code = {$yealink_forward_always_off_code}
 
 #######################################################################################
 ##                                   Forward Busy                                    ##
diff --git a/resources/templates/provision/yealink/t27p/{$mac}.cfg b/resources/templates/provision/yealink/t27p/{$mac}.cfg
index f67e0a4b0b..bc1908d900 100644
--- a/resources/templates/provision/yealink/t27p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t27p/{$mac}.cfg
@@ -13,7 +13,7 @@ account.1.enable = 1
 {else}
 account.1.enable = 0
 {/if}
-account.1.label = {$account.1.display_name}
+account.1.label = {$account.1.label}
 account.1.display_name = {$account.1.display_name}
 account.1.auth_name = {$account.1.auth_id}
 account.1.password = {$account.1.password}
@@ -156,10 +156,10 @@ account.1.nat.stun_server = {$stun_server}
 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
+account.1.nat.udp_update_enable = {if isset($account.1.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.1.nat.udp_update_time = 30
+account.1.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.1.nat.rport = {$yealink_rport}
@@ -541,7 +541,7 @@ account.2.enable = 1
 {else}
 account.2.enable = 0
 {/if}
-account.2.label = {$account.2.display_name}
+account.2.label = {$account.2.label}
 account.2.display_name = {$account.2.display_name}
 account.2.auth_name = {$account.2.auth_id}
 account.2.password = {$account.2.password}
@@ -660,10 +660,10 @@ account.2.nat.stun_server = {$stun_server}
 account.2.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.2.nat.udp_update_enable = 1
+account.2.nat.udp_update_enable = {if isset($account.2.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.2.nat.udp_update_time = 30
+account.2.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.2.nat.rport = {$yealink_rport}
@@ -1026,7 +1026,7 @@ account.3.enable = 1
 {else}
 account.3.enable = 0
 {/if}
-account.3.label = {$account.3.display_name}
+account.3.label = {$account.3.label}
 account.3.display_name = {$account.3.display_name}
 account.3.auth_name = {$account.3.auth_id}
 account.3.password = {$account.3.password}
@@ -1145,10 +1145,10 @@ account.3.nat.stun_server = {$stun_server}
 account.3.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.3.nat.udp_update_enable = 1
+account.3.nat.udp_update_enable = {if isset($account.3.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.3.nat.udp_update_time = 30
+account.3.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.3.nat.rport = {$yealink_rport}
@@ -1501,7 +1501,7 @@ account.4.enable = 1
 {else}
 account.4.enable = 0
 {/if}
-account.4.label = {$account.4.display_name}
+account.4.label = {$account.4.label}
 account.4.display_name = {$account.4.display_name}
 account.4.auth_name = {$account.4.auth_id}
 account.4.password = {$account.4.password}
@@ -1620,10 +1620,10 @@ account.4.nat.stun_server = {$stun_server}
 account.4.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.4.nat.udp_update_enable = 1
+account.4.nat.udp_update_enable = {if isset($account.4.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.4.nat.udp_update_time = 30
+account.4.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.4.nat.rport = {$yealink_rport}
@@ -1976,7 +1976,7 @@ account.5.enable = 1
 {else}
 account.5.enable = 0
 {/if}
-account.5.label = {$account.5.display_name}
+account.5.label = {$account.5.label}
 account.5.display_name = {$account.5.display_name}
 account.5.auth_name = {$account.5.auth_id}
 account.5.password = {$account.5.password}
@@ -2095,10 +2095,10 @@ account.5.nat.stun_server = {$stun_server}
 account.5.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.5.nat.udp_update_enable = 1
+account.5.nat.udp_update_enable = {if isset($account.5.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.5.nat.udp_update_time = 30
+account.5.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.5.nat.rport = {$yealink_rport}
@@ -2451,7 +2451,7 @@ account.6.enable = 1
 {else}
 account.6.enable = 0
 {/if}
-account.6.label = {$account.6.display_name}
+account.6.label = {$account.6.label}
 account.6.display_name = {$account.6.display_name}
 account.6.auth_name = {$account.6.auth_id}
 account.6.password = {$account.6.password}
@@ -2569,10 +2569,10 @@ account.6.nat.stun_server =
 account.6.nat.stun_port = 3478
 
 #Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
-account.6.nat.udp_update_enable = 1
+account.6.nat.udp_update_enable = {if isset($account.6.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.6.nat.udp_update_time = 30
+account.6.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.6.nat.rport = {$yealink_rport}
diff --git a/resources/templates/provision/yealink/t28p/directory.xml b/resources/templates/provision/yealink/t28p/directory.xml
index 3e319dfb50..e730841a96 100644
--- a/resources/templates/provision/yealink/t28p/directory.xml
+++ b/resources/templates/provision/yealink/t28p/directory.xml
@@ -2,50 +2,58 @@
 {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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-	<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
 </DirectoryEntry>
 {elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
 <DirectoryEntry>
-{if $row.contact_name_given != ""}
+{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 != ""}
+{if $row.phone_number}
 	<Telephone>{$row.phone_number}</Telephone>
 {else}
 	<Telephone>{$row.phone_extension}</Telephone>
@@ -53,29 +61,29 @@
 </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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$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}
+{if isset($row.numbers)}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
 {/if}
 </DirectoryEntry>
 {/if}
diff --git a/resources/templates/provision/yealink/t28p/y000000000000.cfg b/resources/templates/provision/yealink/t28p/y000000000000.cfg
index 902647d8c1..a3b27dba91 100644
--- a/resources/templates/provision/yealink/t28p/y000000000000.cfg
+++ b/resources/templates/provision/yealink/t28p/y000000000000.cfg
@@ -376,7 +376,7 @@ voice.group_spk_vol =
 
 #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}
+security.trust_certificates = {$yealink_trust_certificates}
 
 #Define the login username and password of the user, var and administrator.
 #If your username is defined as: security.user_name.admin = adminuser.
diff --git a/resources/templates/provision/yealink/t28p/{$mac}.cfg b/resources/templates/provision/yealink/t28p/{$mac}.cfg
index 0424805b83..c2652680cc 100644
--- a/resources/templates/provision/yealink/t28p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t28p/{$mac}.cfg
@@ -15,7 +15,7 @@ account.1.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 1.
-account.1.label = {$account.1.display_name}
+account.1.label = {$account.1.label}
 
 #Configure the display name of account 1.
 account.1.display_name = {$account.1.display_name}
@@ -247,10 +247,10 @@ account.1.nat.stun_server = {$stun_server}
 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
+account.1.nat.udp_update_enable = {if isset($account.1.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.1.nat.udp_update_time =
+account.1.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.1.nat.rport = {$yealink_rport}
@@ -379,7 +379,7 @@ account.2.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 2.
-account.2.label = {$account.2.display_name}
+account.2.label = {$account.2.label}
 
 #Configure the display name of account 2.
 account.2.display_name = {$account.2.display_name}
@@ -599,11 +599,11 @@ 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 =
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.2.nat.udp_update_enable = {if isset($account.2.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.2.nat.udp_update_time =
+account.2.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.2.nat.rport = {$yealink_rport}
@@ -704,7 +704,7 @@ account.3.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 3.
-account.3.label = {$account.3.display_name}
+account.3.label = {$account.3.label}
 
 #Configure the display name of account 3.
 account.3.display_name = {$account.3.display_name}
@@ -925,11 +925,11 @@ 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 =
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.3.nat.udp_update_enable = {if isset($account.3.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.3.nat.udp_update_time =
+account.3.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.3.nat.rport = {$yealink_rport}
@@ -1030,7 +1030,7 @@ account.4.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 4.
-account.4.label = {$account.4.display_name}
+account.4.label = {$account.4.label}
 
 #Configure the display name of account 4.
 account.4.display_name = {$account.4.display_name}
@@ -1250,11 +1250,11 @@ 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 =
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.4.nat.udp_update_enable = {if isset($account.4.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.4.nat.udp_update_time =
+account.4.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.4.nat.rport = {$yealink_rport}
@@ -1358,7 +1358,7 @@ account.5.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 5.
-account.5.label = {$account.5.display_name}
+account.5.label = {$account.5.label}
 
 #Configure the display name of account 5.
 account.5.display_name = {$account.5.display_name}
@@ -1576,11 +1576,11 @@ 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 =
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.5.nat.udp_update_enable = {if isset($account.5.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.5.nat.udp_update_time =
+account.5.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.5.nat.rport = {$yealink_rport}
@@ -1681,7 +1681,7 @@ account.6.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 6.
-account.6.label = {$account.6.display_name}
+account.6.label = {$account.6.label}
 
 #Configure the display name of account 6.
 account.6.display_name = {$account.6.display_name}
@@ -1899,11 +1899,11 @@ 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 =
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.6.nat.udp_update_enable = {if isset($account.6.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.6.nat.udp_update_time =
+account.6.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.6.nat.rport = {$yealink_rport}
diff --git a/resources/templates/provision/yealink/t29g/directory.xml b/resources/templates/provision/yealink/t29g/directory.xml
index 3e319dfb50..e730841a96 100644
--- a/resources/templates/provision/yealink/t29g/directory.xml
+++ b/resources/templates/provision/yealink/t29g/directory.xml
@@ -2,50 +2,58 @@
 {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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-	<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
 </DirectoryEntry>
 {elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
 <DirectoryEntry>
-{if $row.contact_name_given != ""}
+{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 != ""}
+{if $row.phone_number}
 	<Telephone>{$row.phone_number}</Telephone>
 {else}
 	<Telephone>{$row.phone_extension}</Telephone>
@@ -53,29 +61,29 @@
 </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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$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}
+{if isset($row.numbers)}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
 {/if}
 </DirectoryEntry>
 {/if}
diff --git a/resources/templates/provision/yealink/t29g/y000000000046.cfg b/resources/templates/provision/yealink/t29g/y000000000046.cfg
index fb203423dc..f6d3cf8861 100644
--- a/resources/templates/provision/yealink/t29g/y000000000046.cfg
+++ b/resources/templates/provision/yealink/t29g/y000000000046.cfg
@@ -1065,7 +1065,7 @@ local.dsskey_type_config.mode =
 #######################################################################################
 #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}
+security.trust_certificates = {$yealink_trust_certificates}
 
 #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.
@@ -1363,8 +1363,8 @@ expansion_module.2.key.{$row.device_key_id}.xml_phonebook =
 #Enable or disable the always forward feature; 0-Disabled (default), 1-Enabled;
 forward.always.enable =
 forward.always.target =
-forward.always.on_code = {$yealink_forward_always_on_code}
-forward.always.off_code = {$yealink_forward_always_off_code}
+forward.always.on_code = {$yealink_forward_always_on_code}
+forward.always.off_code = {$yealink_forward_always_off_code}
 
 #######################################################################################
 ##                                   Forward Busy                                    ##
diff --git a/resources/templates/provision/yealink/t29g/{$mac}.cfg b/resources/templates/provision/yealink/t29g/{$mac}.cfg
index 725072d368..0cda138ed6 100644
--- a/resources/templates/provision/yealink/t29g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t29g/{$mac}.cfg
@@ -13,7 +13,7 @@ account.1.enable = 1
 {else}
 account.1.enable = 0
 {/if}
-account.1.label = {$account.1.display_name}
+account.1.label = {$account.1.label}
 account.1.display_name = {$account.1.display_name}
 account.1.auth_name = {$account.1.auth_id}
 account.1.password = {$account.1.password}
@@ -156,10 +156,10 @@ account.1.nat.stun_server = {$stun_server}
 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
+account.1.nat.udp_update_enable = {if isset($account.1.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.1.nat.udp_update_time = 30
+account.1.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.1.nat.rport = {$yealink_rport}
@@ -541,7 +541,7 @@ account.2.enable = 1
 {else}
 account.2.enable = 0
 {/if}
-account.2.label = {$account.2.display_name}
+account.2.label = {$account.2.label}
 account.2.display_name = {$account.2.display_name}
 account.2.auth_name = {$account.2.auth_id}
 account.2.password = {$account.2.password}
@@ -661,10 +661,10 @@ account.2.nat.stun_server = {$stun_server}
 account.2.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.2.nat.udp_update_enable = 1
+account.2.nat.udp_update_enable = {if isset($account.2.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.2.nat.udp_update_time = 30
+account.2.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.2.nat.rport = {$yealink_rport}
@@ -1027,7 +1027,7 @@ account.3.enable = 1
 {else}
 account.3.enable = 0
 {/if}
-account.3.label = {$account.3.display_name}
+account.3.label = {$account.3.label}
 account.3.display_name = {$account.3.display_name}
 account.3.auth_name = {$account.3.auth_id}
 account.3.password = {$account.3.password}
@@ -1147,10 +1147,10 @@ account.3.nat.stun_server = {$stun_server}
 account.3.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.3.nat.udp_update_enable = 1
+account.3.nat.udp_update_enable = {if isset($account.3.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.3.nat.udp_update_time = 30
+account.3.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.3.nat.rport = {$yealink_rport}
@@ -1503,7 +1503,7 @@ account.4.enable = 1
 {else}
 account.4.enable = 0
 {/if}
-account.4.label = {$account.4.display_name}
+account.4.label = {$account.4.label}
 account.4.display_name = {$account.4.display_name}
 account.4.auth_name = {$account.4.auth_id}
 account.4.password = {$account.4.password}
@@ -1623,10 +1623,10 @@ account.4.nat.stun_server = {$stun_server}
 account.4.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.4.nat.udp_update_enable = 1
+account.4.nat.udp_update_enable = {if isset($account.4.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.4.nat.udp_update_time = 30
+account.4.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.4.nat.rport = {$yealink_rport}
@@ -1979,7 +1979,7 @@ account.5.enable = 1
 {else}
 account.5.enable = 0
 {/if}
-account.5.label = {$account.5.display_name}
+account.5.label = {$account.5.label}
 account.5.display_name = {$account.5.display_name}
 account.5.auth_name = {$account.5.auth_id}
 account.5.password = {$account.5.password}
@@ -2099,10 +2099,10 @@ account.5.nat.stun_server = {$stun_server}
 account.5.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.5.nat.udp_update_enable = 1
+account.5.nat.udp_update_enable = {if isset($account.5.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.5.nat.udp_update_time = 30
+account.5.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.5.nat.rport = {$yealink_rport}
@@ -2455,7 +2455,7 @@ account.6.enable = 1
 {else}
 account.6.enable = 0
 {/if}
-account.6.label = {$account.6.display_name}
+account.6.label = {$account.6.label}
 account.6.display_name = {$account.6.display_name}
 account.6.auth_name = {$account.6.auth_id}
 account.6.password = {$account.6.password}
@@ -2574,10 +2574,10 @@ account.6.nat.stun_server =
 account.6.nat.stun_port = 3478
 
 #Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
-account.6.nat.udp_update_enable = 1
+account.6.nat.udp_update_enable = {if isset($account.6.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.6.nat.udp_update_time = 30
+account.6.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.6.nat.rport = {$yealink_rport}
@@ -3069,4 +3069,3 @@ expansion_module.6.key.{$row.device_key_id}.label = {$row.device_key_label}
 expansion_module.6.key.{$row.device_key_id}.xml_phonebook =
 
 {/foreach}
-
diff --git a/resources/templates/provision/yealink/t2x/directory.xml b/resources/templates/provision/yealink/t2x/directory.xml
index 3e319dfb50..e730841a96 100644
--- a/resources/templates/provision/yealink/t2x/directory.xml
+++ b/resources/templates/provision/yealink/t2x/directory.xml
@@ -2,50 +2,58 @@
 {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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-	<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
 </DirectoryEntry>
 {elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
 <DirectoryEntry>
-{if $row.contact_name_given != ""}
+{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 != ""}
+{if $row.phone_number}
 	<Telephone>{$row.phone_number}</Telephone>
 {else}
 	<Telephone>{$row.phone_extension}</Telephone>
@@ -53,29 +61,29 @@
 </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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$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}
+{if isset($row.numbers)}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
 {/if}
 </DirectoryEntry>
 {/if}
diff --git a/resources/templates/provision/yealink/t2x/y000000000044.cfg b/resources/templates/provision/yealink/t2x/y000000000044.cfg
index 99c1e55c91..87ab0c1a81 100644
--- a/resources/templates/provision/yealink/t2x/y000000000044.cfg
+++ b/resources/templates/provision/yealink/t2x/y000000000044.cfg
@@ -1063,7 +1063,7 @@ local.dsskey_type_config.mode =
 #######################################################################################
 #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}
+security.trust_certificates = {$yealink_trust_certificates}
 
 #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.
@@ -1361,8 +1361,8 @@ expansion_module.2.key.{$row.device_key_id}.xml_phonebook =
 #Enable or disable the always forward feature; 0-Disabled (default), 1-Enabled;
 forward.always.enable =
 forward.always.target =
-forward.always.on_code = {$yealink_forward_always_on_code}
-forward.always.off_code = {$yealink_forward_always_off_code}
+forward.always.on_code = {$yealink_forward_always_on_code}
+forward.always.off_code = {$yealink_forward_always_off_code}
 
 #######################################################################################
 ##                                   Forward Busy                                    ##
diff --git a/resources/templates/provision/yealink/t2x/y000000000052.cfg b/resources/templates/provision/yealink/t2x/y000000000052.cfg
index 23f9b64f4f..0ffe878734 100644
--- a/resources/templates/provision/yealink/t2x/y000000000052.cfg
+++ b/resources/templates/provision/yealink/t2x/y000000000052.cfg
@@ -1023,7 +1023,7 @@ bw.feature_key_sync = {$yealink_feature_key_sync}
 #######################################################################################
 #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}
+security.trust_certificates = {$yealink_trust_certificates}
 
 #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.
@@ -1321,8 +1321,8 @@ expansion_module.2.key.{$row.device_key_id}.xml_phonebook =
 #Enable or disable the always forward feature; 0-Disabled (default), 1-Enabled;
 forward.always.enable =
 forward.always.target =
-forward.always.on_code = {$yealink_forward_always_on_code}
-forward.always.off_code = {$yealink_forward_always_off_code}
+forward.always.on_code = {$yealink_forward_always_on_code}
+forward.always.off_code = {$yealink_forward_always_off_code}
 
 #######################################################################################
 ##                                   Forward Busy                                    ##
diff --git a/resources/templates/provision/yealink/t2x/y000000000053.cfg b/resources/templates/provision/yealink/t2x/y000000000053.cfg
index b474bdcdcd..c96bfd7e09 100644
--- a/resources/templates/provision/yealink/t2x/y000000000053.cfg
+++ b/resources/templates/provision/yealink/t2x/y000000000053.cfg
@@ -376,7 +376,7 @@ voice.group_spk_vol =
 
 #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}
+security.trust_certificates = {$yealink_trust_certificates}
 
 #Define the login username and password of the user, var and administrator.
 #If your username is defined as: security.user_name.admin = adminuser.
diff --git a/resources/templates/provision/yealink/t2x/y000000000069.cfg b/resources/templates/provision/yealink/t2x/y000000000069.cfg
index ec026dcb2e..d8e2243c09 100644
--- a/resources/templates/provision/yealink/t2x/y000000000069.cfg
+++ b/resources/templates/provision/yealink/t2x/y000000000069.cfg
@@ -1062,7 +1062,7 @@ local.dsskey_type_config.mode =
 #######################################################################################
 #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}
+security.trust_certificates = {$yealink_trust_certificates}
 
 #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.
diff --git a/resources/templates/provision/yealink/t2x/{$mac}.cfg b/resources/templates/provision/yealink/t2x/{$mac}.cfg
index 3ebd98af97..32e18247f5 100644
--- a/resources/templates/provision/yealink/t2x/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t2x/{$mac}.cfg
@@ -13,7 +13,7 @@ account.{$row.line_number}.enable = 1
 {else}
 account.{$row.line_number}.enable = 0
 {/if}
-account.{$row.line_number}.label = {$account.{$row.line_number}.display_name}
+account.{$row.line_number}.label = {$account.{$row.line_number}.label}
 account.{$row.line_number}.display_name = {$account.{$row.line_number}.display_name}
 account.{$row.line_number}.auth_name = {$account.{$row.line_number}.auth_id}
 account.{$row.line_number}.password = {$account.{$row.line_number}.password}
diff --git a/resources/templates/provision/yealink/t31g/directory.xml b/resources/templates/provision/yealink/t31g/directory.xml
index 8dd8e49035..86c7b6f8b5 100644
--- a/resources/templates/provision/yealink/t31g/directory.xml
+++ b/resources/templates/provision/yealink/t31g/directory.xml
@@ -2,50 +2,58 @@
 {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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-	<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
 </DirectoryEntry>
 {elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
 <DirectoryEntry>
-{if $row.contact_name_given != ""}
+{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 != ""}
+{if $row.phone_number}
 	<Telephone>{$row.phone_number}</Telephone>
 {else}
 	<Telephone>{$row.phone_extension}</Telephone>
@@ -53,32 +61,31 @@
 </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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$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}
+{if isset($row.numbers)}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
 {/if}
 </DirectoryEntry>
 {/if}
 {/foreach}
 </YealinkIPPhoneDirectory>
-
diff --git a/resources/templates/provision/yealink/t31g/y000000000123.cfg b/resources/templates/provision/yealink/t31g/y000000000123.cfg
index e62b79783a..e15fe5d47e 100644
--- a/resources/templates/provision/yealink/t31g/y000000000123.cfg
+++ b/resources/templates/provision/yealink/t31g/y000000000123.cfg
@@ -1,12 +1,4 @@
 #!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.##
 
@@ -384,7 +376,7 @@ voice.group_spk_vol =
 
 #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}
+security.trust_certificates = {$yealink_trust_certificates}
 
 #Define the login username and password of the user, var and administrator.
 #If your username is defined as: security.user_name.admin = adminuser.
diff --git a/resources/templates/provision/yealink/t31g/{$mac}.cfg b/resources/templates/provision/yealink/t31g/{$mac}.cfg
index a05bfd1601..88dc35b694 100644
--- a/resources/templates/provision/yealink/t31g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t31g/{$mac}.cfg
@@ -15,7 +15,7 @@ account.1.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 1.
-account.1.label = {$account.1.display_name}
+account.1.label = {$account.1.label}
 
 #Configure the display name of account 1.
 account.1.display_name = {$account.1.display_name}
@@ -238,10 +238,10 @@ account.1.nat.stun_server = {$stun_server}
 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
+account.1.nat.udp_update_enable = {if isset($account.1.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.1.nat.udp_update_time =
+account.1.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.1.nat.rport = {$yealink_rport}
@@ -370,7 +370,7 @@ account.2.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 2.
-account.2.label = {$account.2.display_name}
+account.2.label = {$account.2.label}
 
 #Configure the display name of account 2.
 account.2.display_name = {$account.2.display_name}
@@ -582,11 +582,11 @@ 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 =
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.2.nat.udp_update_enable = {if isset($account.2.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.2.nat.udp_update_time =
+account.2.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.2.nat.rport = {$yealink_rport}
@@ -687,7 +687,7 @@ account.3.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 3.
-account.3.label = {$account.3.display_name}
+account.3.label = {$account.3.label}
 
 #Configure the display name of account 3.
 account.3.display_name = {$account.3.display_name}
@@ -899,11 +899,11 @@ 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 =
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.3.nat.udp_update_enable = {if isset($account.3.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.3.nat.udp_update_time =
+account.3.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.3.nat.rport = {$yealink_rport}
@@ -1004,7 +1004,7 @@ account.4.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 4.
-account.4.label = {$account.4.display_name}
+account.4.label = {$account.4.label}
 
 #Configure the display name of account 4.
 account.4.display_name = {$account.4.display_name}
@@ -1216,11 +1216,11 @@ 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 =
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.4.nat.udp_update_enable = {if isset($account.4.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.4.nat.udp_update_time =
+account.4.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.4.nat.rport = {$yealink_rport}
@@ -1324,7 +1324,7 @@ account.5.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 5.
-account.5.label = {$account.5.display_name}
+account.5.label = {$account.5.label}
 
 #Configure the display name of account 5.
 account.5.display_name = {$account.5.display_name}
@@ -1534,11 +1534,11 @@ 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 =
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.5.nat.udp_update_enable = {if isset($account.5.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.5.nat.udp_update_time =
+account.5.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.5.nat.rport = {$yealink_rport}
@@ -1639,7 +1639,7 @@ account.6.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 6.
-account.6.label = {$account.6.display_name}
+account.6.label = {$account.6.label}
 
 #Configure the display name of account 6.
 account.6.display_name = {$account.6.display_name}
@@ -1849,11 +1849,11 @@ 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 =
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.6.nat.udp_update_enable = {if isset($account.6.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.6.nat.udp_update_time =
+account.6.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.6.nat.rport = {$yealink_rport}
diff --git a/resources/templates/provision/yealink/t32g/directory.xml b/resources/templates/provision/yealink/t32g/directory.xml
index 3e319dfb50..e730841a96 100644
--- a/resources/templates/provision/yealink/t32g/directory.xml
+++ b/resources/templates/provision/yealink/t32g/directory.xml
@@ -2,50 +2,58 @@
 {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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-	<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
 </DirectoryEntry>
 {elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
 <DirectoryEntry>
-{if $row.contact_name_given != ""}
+{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 != ""}
+{if $row.phone_number}
 	<Telephone>{$row.phone_number}</Telephone>
 {else}
 	<Telephone>{$row.phone_extension}</Telephone>
@@ -53,29 +61,29 @@
 </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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$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}
+{if isset($row.numbers)}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
 {/if}
 </DirectoryEntry>
 {/if}
diff --git a/resources/templates/provision/yealink/t32g/y000000000032.cfg b/resources/templates/provision/yealink/t32g/y000000000032.cfg
index 6cae7a26fc..154dff88e6 100644
--- a/resources/templates/provision/yealink/t32g/y000000000032.cfg
+++ b/resources/templates/provision/yealink/t32g/y000000000032.cfg
@@ -376,7 +376,7 @@ voice.group_spk_vol =
 
 #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}
+security.trust_certificates = {$yealink_trust_certificates}
 
 #Define the login username and password of the user, var and administrator.
 #If your username is defined as: security.user_name.admin = adminuser.
diff --git a/resources/templates/provision/yealink/t32g/{$mac}.cfg b/resources/templates/provision/yealink/t32g/{$mac}.cfg
index 61d65c83f1..91444a2cdf 100644
--- a/resources/templates/provision/yealink/t32g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t32g/{$mac}.cfg
@@ -15,7 +15,7 @@ account.1.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 1.
-account.1.label = {$account.1.display_name}
+account.1.label = {$account.1.label}
 
 #Configure the display name of account 1.
 account.1.display_name = {$account.1.display_name}
@@ -238,10 +238,10 @@ account.1.nat.stun_server = {$stun_server}
 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
+account.1.nat.udp_update_enable = {if isset($account.1.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.1.nat.udp_update_time =
+account.1.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.1.nat.rport = {$yealink_rport}
@@ -370,7 +370,7 @@ account.2.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 2.
-account.2.label = {$account.2.display_name}
+account.2.label = {$account.2.label}
 
 #Configure the display name of account 2.
 account.2.display_name = {$account.2.display_name}
@@ -582,11 +582,11 @@ 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 =
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.2.nat.udp_update_enable = {if isset($account.2.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.2.nat.udp_update_time =
+account.2.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.2.nat.rport = {$yealink_rport}
@@ -687,7 +687,7 @@ account.3.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 3.
-account.3.label = {$account.3.display_name}
+account.3.label = {$account.3.label}
 
 #Configure the display name of account 3.
 account.3.display_name = {$account.3.display_name}
@@ -899,11 +899,11 @@ 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 =
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.3.nat.udp_update_enable = {if isset($account.3.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.3.nat.udp_update_time =
+account.3.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.3.nat.rport = {$yealink_rport}
@@ -1004,7 +1004,7 @@ account.4.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 4.
-account.4.label = {$account.4.display_name}
+account.4.label = {$account.4.label}
 
 #Configure the display name of account 4.
 account.4.display_name = {$account.4.display_name}
@@ -1216,11 +1216,11 @@ 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 =
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.4.nat.udp_update_enable = {if isset($account.4.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.4.nat.udp_update_time =
+account.4.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.4.nat.rport = {$yealink_rport}
@@ -1324,7 +1324,7 @@ account.5.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 5.
-account.5.label = {$account.5.display_name}
+account.5.label = {$account.5.label}
 
 #Configure the display name of account 5.
 account.5.display_name = {$account.5.display_name}
@@ -1534,11 +1534,11 @@ 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 =
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.5.nat.udp_update_enable = {if isset($account.5.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.5.nat.udp_update_time =
+account.5.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.5.nat.rport = {$yealink_rport}
@@ -1639,7 +1639,7 @@ account.6.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 6.
-account.6.label = {$account.6.display_name}
+account.6.label = {$account.6.label}
 
 #Configure the display name of account 6.
 account.6.display_name = {$account.6.display_name}
@@ -1849,11 +1849,11 @@ 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 =
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.6.nat.udp_update_enable = {if isset($account.6.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.6.nat.udp_update_time =
+account.6.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.6.nat.rport = {$yealink_rport}
diff --git a/resources/templates/provision/yealink/t33g/directory.xml b/resources/templates/provision/yealink/t33g/directory.xml
index 297b9e4108..86c7b6f8b5 100644
--- a/resources/templates/provision/yealink/t33g/directory.xml
+++ b/resources/templates/provision/yealink/t33g/directory.xml
@@ -2,50 +2,58 @@
 {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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-	<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
 </DirectoryEntry>
 {elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
 <DirectoryEntry>
-{if $row.contact_name_given != ""}
+{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 != ""}
+{if $row.phone_number}
 	<Telephone>{$row.phone_number}</Telephone>
 {else}
 	<Telephone>{$row.phone_extension}</Telephone>
@@ -53,29 +61,29 @@
 </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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$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}
+{if isset($row.numbers)}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
 {/if}
 </DirectoryEntry>
 {/if}
diff --git a/resources/templates/provision/yealink/t33g/y000000000124.cfg b/resources/templates/provision/yealink/t33g/y000000000124.cfg
index d5b65ccf12..bb166dc965 100644
--- a/resources/templates/provision/yealink/t33g/y000000000124.cfg
+++ b/resources/templates/provision/yealink/t33g/y000000000124.cfg
@@ -373,7 +373,7 @@ 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.trust_certificates = {$yealink_trust_certificates}
 
 static.security.user_password = {$var_name}:{$var_password}
 static.security.user_password = {$admin_name}:{$admin_password}
@@ -423,7 +423,7 @@ static.auto_provision.encryption.config =
 
 
 #######################################################################################
-##                                   Trnasfer                                        ##       
+##                                   Transfer                                        ##       
 #######################################################################################
 dialplan.transfer.mode = {$yealink_transfer_mode}
 transfer.on_hook_trans_enable = {$yealink_transfer_onhook}
@@ -483,7 +483,7 @@ features.headset_training=
 features.headset_prior=
 features.dtmf.replace_tran =
 features.dtmf.transfer =
-phone_setting.ringing_timeout=
+phone_setting.ringing_timeout = {$yealink_ringing_timeout}
 phone_setting.ringback_timeout=
 
 features.keep_mute.enable=
@@ -1490,10 +1490,14 @@ dialplan_replace_rule.url=
 dialplan.replace.line_id.1=
 dialplan.replace.replace.1=
 dialplan.replace.prefix.1=
-phone_setting.dialnow_delay=
+phone_setting.dialnow_delay = {$yealink_dialplan_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 =
@@ -1549,20 +1553,43 @@ 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=
+features.power_saving.enable = {$yealink_ps_enabled}
+##Written in 24hr
+features.power_saving.power_led_flash.on_time = {$yealink_ps_led_on}
+features.power_saving.power_led_flash.off_time = {$yealink_ps_led_off}
+
+##Written in 24hr, values should be comma delimited, e.g. 9,17
+{if isset($yealink_ps_days_all)}
+features.power_saving.office_hour.monday = {$yealink_ps_days_all}
+features.power_saving.office_hour.tuesday = {$yealink_ps_days_all}
+features.power_saving.office_hour.wednesday = {$yealink_ps_days_all}
+features.power_saving.office_hour.thursday = {$yealink_ps_days_all}
+features.power_saving.office_hour.friday = {$yealink_ps_days_all}
+features.power_saving.office_hour.saturday = {$yealink_ps_days_all}
+features.power_saving.office_hour.sunday = {$yealink_ps_days_all}
+{elseif isset($yealink_ps_days_workweek)}
+features.power_saving.office_hour.monday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.tuesday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.wednesday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.thursday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.friday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday}
+features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday}
+{else}
+features.power_saving.office_hour.monday = {$yealink_ps_day_monday}
+features.power_saving.office_hour.tuesday = {$yealink_ps_day_tuesday}
+features.power_saving.office_hour.wednesday = {$yealink_ps_day_wednesday}
+features.power_saving.office_hour.thursday = {$yealink_ps_day_thursday}
+features.power_saving.office_hour.friday = {$yealink_ps_day_friday}
+features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday}
+features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday}
+{/if}
+
+##Written in minutes
+features.power_saving.user_input_ext.idle_timeout = {$yealink_ps_idle_timeout}
+features.power_saving.off_hour.idle_timeout = {$yealink_ps_offhour_timeout}
+features.power_saving.office_hour.idle_timeout = {$yealink_ps_hour_timeout}
+features.power_saving.intelligent_mode = {$yealink_ps_intel_mode}
 
 
 #######################################################################################
diff --git a/resources/templates/provision/yealink/t33g/{$mac}.cfg b/resources/templates/provision/yealink/t33g/{$mac}.cfg
index 52ce42a131..265eb1556a 100644
--- a/resources/templates/provision/yealink/t33g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t33g/{$mac}.cfg
@@ -5,7 +5,7 @@
 ##T33P/T33G :X ranges from 1 to 4
 ##T30/T30P Not Support
 #######################################################################################
-##                                   Trnasfer                                        ##       
+##                                   Transfer                                        ##       
 #######################################################################################
 account.1.phone_setting.call_appearance.transfer_via_new_linekey= {$yealink_transfer_via_new_linekey}
 
@@ -118,7 +118,7 @@ account.1.enable = 1
 {else}
 account.1.enable = 0
 {/if}
-account.1.label = {$account.1.display_name}
+account.1.label = {$account.1.label}
 account.1.display_name = {$account.1.display_name}
 account.1.auth_name = {$account.1.auth_id}
 
@@ -187,8 +187,8 @@ account.1.auto_answer=
 ################################################################
 #                      Account Advanced                       ##
 ################################################################
-account.1.nat.udp_update_enable=
-account.1.nat.udp_update_time=
+account.1.nat.udp_update_enable = {if isset($account.1.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+account.1.nat.udp_update_time = 30
 account.1.nat.rport= {$yealink_rport}
 
 account.1.dtmf.type= {$yealink_dtmf_type}
@@ -689,7 +689,7 @@ account.2.enable = 1
 {else}
 account.2.enable = 0
 {/if}
-account.2.label = {$account.2.display_name}
+account.2.label = {$account.2.label}
 account.2.display_name = {$account.2.display_name}
 account.2.auth_name = {$account.2.auth_id}
 
@@ -758,8 +758,8 @@ account.2.auto_answer=
 ################################################################
 #                      Account Advanced                       ##
 ################################################################
-account.2.nat.udp_update_enable=
-account.2.nat.udp_update_time=
+account.2.nat.udp_update_enable = {if isset($account.2.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+account.2.nat.udp_update_time = 30
 account.2.nat.rport=  {$yealink_rport}
 
 account.2.dtmf.type= {$yealink_dtmf_type}
@@ -1257,7 +1257,7 @@ account.3.enable = 1
 {else}
 account.3.enable = 0
 {/if}
-account.3.label = {$account.3.display_name}
+account.3.label = {$account.3.label}
 account.3.display_name = {$account.3.display_name}
 account.3.auth_name = {$account.3.auth_id}
 
@@ -1326,8 +1326,8 @@ account.3.auto_answer=
 ################################################################
 #                      Account Advanced                       ##
 ################################################################
-account.3.nat.udp_update_enable=
-account.3.nat.udp_update_time=
+account.3.nat.udp_update_enable = {if isset($account.3.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+account.3.nat.udp_update_time = 30
 account.3.nat.rport= {$yealink_rport}
 
 account.3.dtmf.type= {$yealink_dtmf_type}
@@ -1825,7 +1825,7 @@ account.4.enable = 1
 {else}
 account.4.enable = 0
 {/if}
-account.4.label = {$account.4.display_name}
+account.4.label = {$account.4.label}
 account.4.display_name = {$account.4.display_name}
 account.4.auth_name = {$account.4.auth_id}
 
@@ -1894,8 +1894,8 @@ account.4.auto_answer=
 ################################################################
 #                      Account Advanced                       ##
 ################################################################
-account.4.nat.udp_update_enable=
-account.4.nat.udp_update_time=
+account.4.nat.udp_update_enable = {if isset($account.4.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+account.4.nat.udp_update_time = 30
 account.4.nat.rport= {$yealink_rport}
 
 account.4.dtmf.type= {$yealink_dtmf_type}
@@ -2276,4 +2276,3 @@ account.4.acd.call_information=
 #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/directory.xml b/resources/templates/provision/yealink/t38g/directory.xml
index 3e319dfb50..e730841a96 100644
--- a/resources/templates/provision/yealink/t38g/directory.xml
+++ b/resources/templates/provision/yealink/t38g/directory.xml
@@ -2,50 +2,58 @@
 {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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-	<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
 </DirectoryEntry>
 {elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
 <DirectoryEntry>
-{if $row.contact_name_given != ""}
+{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 != ""}
+{if $row.phone_number}
 	<Telephone>{$row.phone_number}</Telephone>
 {else}
 	<Telephone>{$row.phone_extension}</Telephone>
@@ -53,29 +61,29 @@
 </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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$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}
+{if isset($row.numbers)}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
 {/if}
 </DirectoryEntry>
 {/if}
diff --git a/resources/templates/provision/yealink/t38g/y000000000038.cfg b/resources/templates/provision/yealink/t38g/y000000000038.cfg
index 3dcd310596..c17653a309 100644
--- a/resources/templates/provision/yealink/t38g/y000000000038.cfg
+++ b/resources/templates/provision/yealink/t38g/y000000000038.cfg
@@ -376,7 +376,7 @@ voice.group_spk_vol =
 
 #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}
+security.trust_certificates = {$yealink_trust_certificates}
 
 #Define the login username and password of the user, var and administrator.
 #If your username is defined as: security.user_name.admin = adminuser.
diff --git a/resources/templates/provision/yealink/t38g/{$mac}.cfg b/resources/templates/provision/yealink/t38g/{$mac}.cfg
index 61d65c83f1..91444a2cdf 100644
--- a/resources/templates/provision/yealink/t38g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t38g/{$mac}.cfg
@@ -15,7 +15,7 @@ account.1.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 1.
-account.1.label = {$account.1.display_name}
+account.1.label = {$account.1.label}
 
 #Configure the display name of account 1.
 account.1.display_name = {$account.1.display_name}
@@ -238,10 +238,10 @@ account.1.nat.stun_server = {$stun_server}
 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
+account.1.nat.udp_update_enable = {if isset($account.1.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.1.nat.udp_update_time =
+account.1.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.1.nat.rport = {$yealink_rport}
@@ -370,7 +370,7 @@ account.2.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 2.
-account.2.label = {$account.2.display_name}
+account.2.label = {$account.2.label}
 
 #Configure the display name of account 2.
 account.2.display_name = {$account.2.display_name}
@@ -582,11 +582,11 @@ 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 =
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.2.nat.udp_update_enable = {if isset($account.2.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.2.nat.udp_update_time =
+account.2.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.2.nat.rport = {$yealink_rport}
@@ -687,7 +687,7 @@ account.3.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 3.
-account.3.label = {$account.3.display_name}
+account.3.label = {$account.3.label}
 
 #Configure the display name of account 3.
 account.3.display_name = {$account.3.display_name}
@@ -899,11 +899,11 @@ 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 =
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.3.nat.udp_update_enable = {if isset($account.3.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.3.nat.udp_update_time =
+account.3.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.3.nat.rport = {$yealink_rport}
@@ -1004,7 +1004,7 @@ account.4.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 4.
-account.4.label = {$account.4.display_name}
+account.4.label = {$account.4.label}
 
 #Configure the display name of account 4.
 account.4.display_name = {$account.4.display_name}
@@ -1216,11 +1216,11 @@ 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 =
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.4.nat.udp_update_enable = {if isset($account.4.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.4.nat.udp_update_time =
+account.4.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.4.nat.rport = {$yealink_rport}
@@ -1324,7 +1324,7 @@ account.5.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 5.
-account.5.label = {$account.5.display_name}
+account.5.label = {$account.5.label}
 
 #Configure the display name of account 5.
 account.5.display_name = {$account.5.display_name}
@@ -1534,11 +1534,11 @@ 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 =
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.5.nat.udp_update_enable = {if isset($account.5.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.5.nat.udp_update_time =
+account.5.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.5.nat.rport = {$yealink_rport}
@@ -1639,7 +1639,7 @@ account.6.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 6.
-account.6.label = {$account.6.display_name}
+account.6.label = {$account.6.label}
 
 #Configure the display name of account 6.
 account.6.display_name = {$account.6.display_name}
@@ -1849,11 +1849,11 @@ 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 =
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.6.nat.udp_update_enable = {if isset($account.6.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.6.nat.udp_update_time =
+account.6.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.6.nat.rport = {$yealink_rport}
diff --git a/resources/templates/provision/yealink/t40g/directory.xml b/resources/templates/provision/yealink/t40g/directory.xml
index 297b9e4108..86c7b6f8b5 100644
--- a/resources/templates/provision/yealink/t40g/directory.xml
+++ b/resources/templates/provision/yealink/t40g/directory.xml
@@ -2,50 +2,58 @@
 {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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-	<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
 </DirectoryEntry>
 {elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
 <DirectoryEntry>
-{if $row.contact_name_given != ""}
+{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 != ""}
+{if $row.phone_number}
 	<Telephone>{$row.phone_number}</Telephone>
 {else}
 	<Telephone>{$row.phone_extension}</Telephone>
@@ -53,29 +61,29 @@
 </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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$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}
+{if isset($row.numbers)}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
 {/if}
 </DirectoryEntry>
 {/if}
diff --git a/resources/templates/provision/yealink/t40g/y000000000076.cfg b/resources/templates/provision/yealink/t40g/y000000000076.cfg
index 52464ee8e6..a8e2a2c61a 100644
--- a/resources/templates/provision/yealink/t40g/y000000000076.cfg
+++ b/resources/templates/provision/yealink/t40g/y000000000076.cfg
@@ -1065,7 +1065,7 @@ local.dsskey_type_config.mode =
 #######################################################################################
 #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}
+security.trust_certificates = {$yealink_trust_certificates}
 
 #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.
diff --git a/resources/templates/provision/yealink/t40g/{$mac}.cfg b/resources/templates/provision/yealink/t40g/{$mac}.cfg
index aedec45126..28841ca689 100644
--- a/resources/templates/provision/yealink/t40g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t40g/{$mac}.cfg
@@ -13,7 +13,7 @@ account.1.enable = 1
 {else}
 account.1.enable = 0
 {/if}
-account.1.label = {$account.1.display_name}
+account.1.label = {$account.1.label}
 account.1.display_name = {$account.1.display_name}
 account.1.auth_name = {$account.1.auth_id}
 account.1.password = {$account.1.password}
@@ -156,7 +156,7 @@ account.1.nat.stun_server = {$stun_server}
 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
+account.1.nat.udp_update_enable = {if isset($account.1.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
 account.1.nat.udp_update_time = 30
@@ -541,7 +541,7 @@ account.2.enable = 1
 {else}
 account.2.enable = 0
 {/if}
-account.2.label = {$account.2.display_name}
+account.2.label = {$account.2.label}
 account.2.display_name = {$account.2.display_name}
 account.2.auth_name = {$account.2.auth_id}
 account.2.password = {$account.2.password}
@@ -661,7 +661,7 @@ account.2.nat.stun_server = {$stun_server}
 account.2.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.2.nat.udp_update_enable = 1
+account.2.nat.udp_update_enable = {if isset($account.2.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
 account.2.nat.udp_update_time = 30
@@ -1057,7 +1057,7 @@ account.3.enable = 1
 {else}
 account.3.enable = 0
 {/if}
-account.3.label = {$account.3.display_name}
+account.3.label = {$account.3.label}
 account.3.display_name = {$account.3.display_name}
 account.3.auth_name = {$account.3.auth_id}
 account.3.password = {$account.3.password}
@@ -1177,7 +1177,7 @@ account.3.nat.stun_server = {$stun_server}
 account.3.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.3.nat.udp_update_enable = 1
+account.3.nat.udp_update_enable = {if isset($account.3.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
 account.3.nat.udp_update_time = 30
@@ -1556,7 +1556,7 @@ account.4.enable = 1
 {else}
 account.4.enable = 0
 {/if}
-account.4.label = {$account.4.display_name}
+account.4.label = {$account.4.label}
 account.4.display_name = {$account.4.display_name}
 account.4.auth_name = {$account.4.auth_id}
 account.4.password = {$account.4.password}
@@ -1676,7 +1676,7 @@ account.4.nat.stun_server = {$stun_server}
 account.4.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.4.nat.udp_update_enable = 1
+account.4.nat.udp_update_enable = {if isset($account.4.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
 account.4.nat.udp_update_time = 30
@@ -2055,7 +2055,7 @@ account.5.enable = 1
 {else}
 account.5.enable = 0
 {/if}
-account.5.label = {$account.5.display_name}
+account.5.label = {$account.5.label}
 account.5.display_name = {$account.5.display_name}
 account.5.auth_name = {$account.5.auth_id}
 account.5.password = {$account.5.password}
@@ -2175,7 +2175,7 @@ account.5.nat.stun_server = {$stun_server}
 account.5.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.5.nat.udp_update_enable = 1
+account.5.nat.udp_update_enable = {if isset($account.5.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
 account.5.nat.udp_update_time = 30
@@ -2554,7 +2554,7 @@ account.6.enable = 1
 {else}
 account.6.enable = 0
 {/if}
-account.6.label = {$account.6.display_name}
+account.6.label = {$account.6.label}
 account.6.display_name = {$account.6.display_name}
 account.6.auth_name = {$account.6.auth_id}
 account.6.password = {$account.6.password}
@@ -2673,7 +2673,7 @@ account.6.nat.stun_server =
 account.6.nat.stun_port = 3478
 
 #Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
-account.6.nat.udp_update_enable = 1
+account.6.nat.udp_update_enable = {if isset($account.6.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
 account.6.nat.udp_update_time = 30
diff --git a/resources/templates/provision/yealink/t40p/directory.xml b/resources/templates/provision/yealink/t40p/directory.xml
index 297b9e4108..86c7b6f8b5 100644
--- a/resources/templates/provision/yealink/t40p/directory.xml
+++ b/resources/templates/provision/yealink/t40p/directory.xml
@@ -2,50 +2,58 @@
 {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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-	<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
 </DirectoryEntry>
 {elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
 <DirectoryEntry>
-{if $row.contact_name_given != ""}
+{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 != ""}
+{if $row.phone_number}
 	<Telephone>{$row.phone_number}</Telephone>
 {else}
 	<Telephone>{$row.phone_extension}</Telephone>
@@ -53,29 +61,29 @@
 </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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$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}
+{if isset($row.numbers)}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
 {/if}
 </DirectoryEntry>
 {/if}
diff --git a/resources/templates/provision/yealink/t40p/y000000000054.cfg b/resources/templates/provision/yealink/t40p/y000000000054.cfg
index a95fad6020..75481dbe5c 100644
--- a/resources/templates/provision/yealink/t40p/y000000000054.cfg
+++ b/resources/templates/provision/yealink/t40p/y000000000054.cfg
@@ -1046,7 +1046,7 @@ bw.feature_key_sync = {$yealink_feature_key_sync}
 #######################################################################################
 #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}
+security.trust_certificates = {$yealink_trust_certificates}
 
 #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.
diff --git a/resources/templates/provision/yealink/t40p/{$mac}.cfg b/resources/templates/provision/yealink/t40p/{$mac}.cfg
index 8602ce0f41..aa0558e532 100644
--- a/resources/templates/provision/yealink/t40p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t40p/{$mac}.cfg
@@ -13,7 +13,7 @@ account.1.enable = 1
 {else}
 account.1.enable = 0
 {/if}
-account.1.label = {$account.1.display_name}
+account.1.label = {$account.1.label}
 account.1.display_name = {$account.1.display_name}
 account.1.auth_name = {$account.1.auth_id}
 account.1.password = {$account.1.password}
@@ -148,7 +148,7 @@ account.1.nat.stun_server = {$stun_server}
 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
+account.1.nat.udp_update_enable = {if isset($account.1.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
 account.1.nat.udp_update_time = 30
@@ -533,7 +533,7 @@ account.2.enable = 1
 {else}
 account.2.enable = 0
 {/if}
-account.2.label = {$account.2.display_name}
+account.2.label = {$account.2.label}
 account.2.display_name = {$account.2.display_name}
 account.2.auth_name = {$account.2.auth_id}
 account.2.password = {$account.2.password}
@@ -661,7 +661,7 @@ account.2.nat.stun_server = {$stun_server}
 account.2.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.2.nat.udp_update_enable = 1
+account.2.nat.udp_update_enable = {if isset($account.2.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
 account.2.nat.udp_update_time = 30
@@ -1057,7 +1057,7 @@ account.3.enable = 1
 {else}
 account.3.enable = 0
 {/if}
-account.3.label = {$account.3.display_name}
+account.3.label = {$account.3.label}
 account.3.display_name = {$account.3.display_name}
 account.3.auth_name = {$account.3.auth_id}
 account.3.password = {$account.3.password}
@@ -1179,7 +1179,7 @@ account.3.nat.stun_server = {$stun_server}
 account.3.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.3.nat.udp_update_enable = 1
+account.3.nat.udp_update_enable = {if isset($account.3.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
 account.3.nat.udp_update_time = 30
@@ -1558,7 +1558,7 @@ account.4.enable = 1
 {else}
 account.4.enable = 0
 {/if}
-account.4.label = {$account.4.display_name}
+account.4.label = {$account.4.label}
 account.4.display_name = {$account.4.display_name}
 account.4.auth_name = {$account.4.auth_id}
 account.4.password = {$account.4.password}
@@ -1680,7 +1680,7 @@ account.4.nat.stun_server = {$stun_server}
 account.4.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.4.nat.udp_update_enable = 1
+account.4.nat.udp_update_enable = {if isset($account.4.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
 account.4.nat.udp_update_time = 30
@@ -2059,7 +2059,7 @@ account.5.enable = 1
 {else}
 account.5.enable = 0
 {/if}
-account.5.label = {$account.5.display_name}
+account.5.label = {$account.5.label}
 account.5.display_name = {$account.5.display_name}
 account.5.auth_name = {$account.5.auth_id}
 account.5.password = {$account.5.password}
@@ -2181,7 +2181,7 @@ account.5.nat.stun_server = {$stun_server}
 account.5.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.5.nat.udp_update_enable = 1
+account.5.nat.udp_update_enable = {if isset($account.5.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
 account.5.nat.udp_update_time = 30
@@ -2560,7 +2560,7 @@ account.6.enable = 1
 {else}
 account.6.enable = 0
 {/if}
-account.6.label = {$account.6.display_name}
+account.6.label = {$account.6.label}
 account.6.display_name = {$account.6.display_name}
 account.6.auth_name = {$account.6.auth_id}
 account.6.password = {$account.6.password}
@@ -2681,7 +2681,7 @@ account.6.nat.stun_server =
 account.6.nat.stun_port = 3478
 
 #Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
-account.6.nat.udp_update_enable = 1
+account.6.nat.udp_update_enable = {if isset($account.6.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
 account.6.nat.udp_update_time = 30
diff --git a/resources/templates/provision/yealink/t41p/directory.xml b/resources/templates/provision/yealink/t41p/directory.xml
index 3e319dfb50..e730841a96 100644
--- a/resources/templates/provision/yealink/t41p/directory.xml
+++ b/resources/templates/provision/yealink/t41p/directory.xml
@@ -2,50 +2,58 @@
 {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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-	<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
 </DirectoryEntry>
 {elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
 <DirectoryEntry>
-{if $row.contact_name_given != ""}
+{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 != ""}
+{if $row.phone_number}
 	<Telephone>{$row.phone_number}</Telephone>
 {else}
 	<Telephone>{$row.phone_extension}</Telephone>
@@ -53,29 +61,29 @@
 </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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$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}
+{if isset($row.numbers)}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
 {/if}
 </DirectoryEntry>
 {/if}
diff --git a/resources/templates/provision/yealink/t41p/y000000000036.cfg b/resources/templates/provision/yealink/t41p/y000000000036.cfg
index b353c8e508..71429d2ee9 100644
--- a/resources/templates/provision/yealink/t41p/y000000000036.cfg
+++ b/resources/templates/provision/yealink/t41p/y000000000036.cfg
@@ -1064,7 +1064,7 @@ local.dsskey_type_config.mode =
 #######################################################################################
 #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}
+security.trust_certificates = {$yealink_trust_certificates}
 
 #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.
@@ -1362,8 +1362,8 @@ expansion_module.2.key.{$row.device_key_id}.xml_phonebook =
 #Enable or disable the always forward feature; 0-Disabled (default), 1-Enabled;
 forward.always.enable =
 forward.always.target =
-forward.always.on_code = {$yealink_forward_always_on_code}
-forward.always.off_code = {$yealink_forward_always_off_code}
+forward.always.on_code = {$yealink_forward_always_on_code}
+forward.always.off_code = {$yealink_forward_always_off_code}
 
 #######################################################################################
 ##                                   Forward Busy                                    ##
diff --git a/resources/templates/provision/yealink/t41p/{$mac}.cfg b/resources/templates/provision/yealink/t41p/{$mac}.cfg
index 86b4884605..ca9894cc65 100644
--- a/resources/templates/provision/yealink/t41p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t41p/{$mac}.cfg
@@ -13,7 +13,7 @@ account.1.enable = 1
 {else}
 account.1.enable = 0
 {/if}
-account.1.label = {$account.1.display_name}
+account.1.label = {$account.1.label}
 account.1.display_name = {$account.1.display_name}
 account.1.auth_name = {$account.1.auth_id}
 account.1.password = {$account.1.password}
@@ -142,10 +142,10 @@ account.1.nat.stun_server = {$stun_server}
 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
+account.1.nat.udp_update_enable = {if isset($account.1.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.1.nat.udp_update_time = 30
+account.1.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.1.nat.rport = {$yealink_rport}
@@ -527,7 +527,7 @@ account.2.enable = 1
 {else}
 account.2.enable = 0
 {/if}
-account.2.label = {$account.2.display_name}
+account.2.label = {$account.2.label}
 account.2.display_name = {$account.2.display_name}
 account.2.auth_name = {$account.2.auth_id}
 account.2.password = {$account.2.password}
@@ -644,10 +644,10 @@ account.2.nat.stun_server = {$stun_server}
 account.2.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.2.nat.udp_update_enable = 1
+account.2.nat.udp_update_enable = {if isset($account.2.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.2.nat.udp_update_time = 30
+account.2.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.2.nat.rport = {$yealink_rport}
@@ -1040,7 +1040,7 @@ account.3.enable = 1
 {else}
 account.3.enable = 0
 {/if}
-account.3.label = {$account.3.display_name}
+account.3.label = {$account.3.label}
 account.3.display_name = {$account.3.display_name}
 account.3.auth_name = {$account.3.auth_id}
 account.3.password = {$account.3.password}
@@ -1157,10 +1157,10 @@ account.3.nat.stun_server = {$stun_server}
 account.3.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.3.nat.udp_update_enable = 1
+account.3.nat.udp_update_enable = {if isset($account.3.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.3.nat.udp_update_time = 30
+account.3.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.3.nat.rport = {$yealink_rport}
@@ -1536,7 +1536,7 @@ account.4.enable = 1
 {else}
 account.4.enable = 0
 {/if}
-account.4.label = {$account.4.display_name}
+account.4.label = {$account.4.label}
 account.4.display_name = {$account.4.display_name}
 account.4.auth_name = {$account.4.auth_id}
 account.4.password = {$account.4.password}
@@ -1653,10 +1653,10 @@ account.4.nat.stun_server = {$stun_server}
 account.4.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.4.nat.udp_update_enable = 1
+account.4.nat.udp_update_enable = {if isset($account.4.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.4.nat.udp_update_time = 30
+account.4.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.4.nat.rport = {$yealink_rport}
@@ -2032,7 +2032,7 @@ account.5.enable = 1
 {else}
 account.5.enable = 0
 {/if}
-account.5.label = {$account.5.display_name}
+account.5.label = {$account.5.label}
 account.5.display_name = {$account.5.display_name}
 account.5.auth_name = {$account.5.auth_id}
 account.5.password = {$account.5.password}
@@ -2149,10 +2149,10 @@ account.5.nat.stun_server = {$stun_server}
 account.5.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.5.nat.udp_update_enable = 1
+account.5.nat.udp_update_enable = {if isset($account.5.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.5.nat.udp_update_time = 30
+account.5.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.5.nat.rport = {$yealink_rport}
@@ -2528,7 +2528,7 @@ account.6.enable = 1
 {else}
 account.6.enable = 0
 {/if}
-account.6.label = {$account.6.display_name}
+account.6.label = {$account.6.label}
 account.6.display_name = {$account.6.display_name}
 account.6.auth_name = {$account.6.auth_id}
 account.6.password = {$account.6.password}
@@ -2644,10 +2644,10 @@ account.6.nat.stun_server =
 account.6.nat.stun_port = 3478
 
 #Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
-account.6.nat.udp_update_enable = 1
+account.6.nat.udp_update_enable = {if isset($account.6.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.6.nat.udp_update_time = 30
+account.6.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.6.nat.rport = {$yealink_rport}
diff --git a/resources/templates/provision/yealink/t41s/directory.xml b/resources/templates/provision/yealink/t41s/directory.xml
index 297b9e4108..86c7b6f8b5 100644
--- a/resources/templates/provision/yealink/t41s/directory.xml
+++ b/resources/templates/provision/yealink/t41s/directory.xml
@@ -2,50 +2,58 @@
 {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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-	<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
 </DirectoryEntry>
 {elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
 <DirectoryEntry>
-{if $row.contact_name_given != ""}
+{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 != ""}
+{if $row.phone_number}
 	<Telephone>{$row.phone_number}</Telephone>
 {else}
 	<Telephone>{$row.phone_extension}</Telephone>
@@ -53,29 +61,29 @@
 </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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$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}
+{if isset($row.numbers)}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
 {/if}
 </DirectoryEntry>
 {/if}
diff --git a/resources/templates/provision/yealink/t41s/y000000000068.cfg b/resources/templates/provision/yealink/t41s/y000000000068.cfg
index e9a9596a3a..e148727e4b 100644
--- a/resources/templates/provision/yealink/t41s/y000000000068.cfg
+++ b/resources/templates/provision/yealink/t41s/y000000000068.cfg
@@ -340,7 +340,7 @@ 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.trust_certificates = {$yealink_trust_certificates}
 
 static.security.user_password = {$var_name}:{$var_password}
 static.security.user_password = {$admin_name}:{$admin_password}
@@ -445,7 +445,7 @@ features.headset_training=
 features.headset_prior=
 features.dtmf.replace_tran =
 features.dtmf.transfer =
-phone_setting.ringing_timeout=
+phone_setting.ringing_timeout = {$yealink_ringing_timeout}
 phone_setting.ringback_timeout=
 features.hold_trans_delay=
 transfer.multi_call_trans_enable =
@@ -1413,20 +1413,43 @@ 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=
+features.power_saving.enable = {$yealink_ps_enabled}
+##Written in 24hr
+features.power_saving.power_led_flash.on_time = {$yealink_ps_led_on}
+features.power_saving.power_led_flash.off_time = {$yealink_ps_led_off}
+
+##Written in 24hr, values should be comma delimited, e.g. 9,17
+{if isset($yealink_ps_days_all)}
+features.power_saving.office_hour.monday = {$yealink_ps_days_all}
+features.power_saving.office_hour.tuesday = {$yealink_ps_days_all}
+features.power_saving.office_hour.wednesday = {$yealink_ps_days_all}
+features.power_saving.office_hour.thursday = {$yealink_ps_days_all}
+features.power_saving.office_hour.friday = {$yealink_ps_days_all}
+features.power_saving.office_hour.saturday = {$yealink_ps_days_all}
+features.power_saving.office_hour.sunday = {$yealink_ps_days_all}
+{elseif isset($yealink_ps_days_workweek)}
+features.power_saving.office_hour.monday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.tuesday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.wednesday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.thursday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.friday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday}
+features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday}
+{else}
+features.power_saving.office_hour.monday = {$yealink_ps_day_monday}
+features.power_saving.office_hour.tuesday = {$yealink_ps_day_tuesday}
+features.power_saving.office_hour.wednesday = {$yealink_ps_day_wednesday}
+features.power_saving.office_hour.thursday = {$yealink_ps_day_thursday}
+features.power_saving.office_hour.friday = {$yealink_ps_day_friday}
+features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday}
+features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday}
+{/if}
+
+##Written in minutes
+features.power_saving.user_input_ext.idle_timeout = {$yealink_ps_idle_timeout}
+features.power_saving.off_hour.idle_timeout = {$yealink_ps_offhour_timeout}
+features.power_saving.office_hour.idle_timeout = {$yealink_ps_hour_timeout}
+features.power_saving.intelligent_mode = {$yealink_ps_intel_mode}
 
 
 #######################################################################################
diff --git a/resources/templates/provision/yealink/t41s/{$mac}.cfg b/resources/templates/provision/yealink/t41s/{$mac}.cfg
index f89a4641e8..85c87d65a3 100644
--- a/resources/templates/provision/yealink/t41s/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t41s/{$mac}.cfg
@@ -18,7 +18,7 @@ account.{$row.line_number}.enable = 1
 {else}
 account.{$row.line_number}.enable = 0
 {/if}
-account.{$row.line_number}.label = {$account.{$row.line_number}.display_name}
+account.{$row.line_number}.label = {$account.{$row.line_number}.label}
 account.{$row.line_number}.display_name = {$account.{$row.line_number}.display_name}
 account.{$row.line_number}.auth_name = {$account.{$row.line_number}.auth_id}
 account.{$row.line_number}.password = {$account.{$row.line_number}.password}
diff --git a/resources/templates/provision/yealink/t42g/directory.xml b/resources/templates/provision/yealink/t42g/directory.xml
index 3e319dfb50..e730841a96 100644
--- a/resources/templates/provision/yealink/t42g/directory.xml
+++ b/resources/templates/provision/yealink/t42g/directory.xml
@@ -2,50 +2,58 @@
 {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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-	<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
 </DirectoryEntry>
 {elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
 <DirectoryEntry>
-{if $row.contact_name_given != ""}
+{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 != ""}
+{if $row.phone_number}
 	<Telephone>{$row.phone_number}</Telephone>
 {else}
 	<Telephone>{$row.phone_extension}</Telephone>
@@ -53,29 +61,29 @@
 </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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$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}
+{if isset($row.numbers)}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
 {/if}
 </DirectoryEntry>
 {/if}
diff --git a/resources/templates/provision/yealink/t42g/y000000000029.cfg b/resources/templates/provision/yealink/t42g/y000000000029.cfg
index c001279ee9..03dae5ab05 100644
--- a/resources/templates/provision/yealink/t42g/y000000000029.cfg
+++ b/resources/templates/provision/yealink/t42g/y000000000029.cfg
@@ -1045,7 +1045,7 @@ bw.feature_key_sync = {$yealink_feature_key_sync}
 #######################################################################################
 #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}
+security.trust_certificates = {$yealink_trust_certificates}
 
 #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.
@@ -1343,8 +1343,8 @@ expansion_module.2.key.{$row.device_key_id}.xml_phonebook =
 #Enable or disable the always forward feature; 0-Disabled (default), 1-Enabled;
 forward.always.enable =
 forward.always.target =
-forward.always.on_code = {$yealink_forward_always_on_code}
-forward.always.off_code = {$yealink_forward_always_off_code}
+forward.always.on_code = {$yealink_forward_always_on_code}
+forward.always.off_code = {$yealink_forward_always_off_code}
 
 #######################################################################################
 ##                                   Forward Busy                                    ##
diff --git a/resources/templates/provision/yealink/t42g/{$mac}.cfg b/resources/templates/provision/yealink/t42g/{$mac}.cfg
index 02c95b98f5..6e92ea8a2e 100644
--- a/resources/templates/provision/yealink/t42g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t42g/{$mac}.cfg
@@ -13,7 +13,7 @@ account.1.enable = 1
 {else}
 account.1.enable = 0
 {/if}
-account.1.label = {$account.1.display_name}
+account.1.label = {$account.1.label}
 account.1.display_name = {$account.1.display_name}
 account.1.auth_name = {$account.1.auth_id}
 account.1.password = {$account.1.password}
@@ -156,10 +156,10 @@ account.1.nat.stun_server = {$stun_server}
 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
+account.1.nat.udp_update_enable = {if isset($account.1.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.1.nat.udp_update_time = 30
+account.1.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.1.nat.rport = {$yealink_rport}
@@ -541,7 +541,7 @@ account.2.enable = 1
 {else}
 account.2.enable = 0
 {/if}
-account.2.label = {$account.2.display_name}
+account.2.label = {$account.2.label}
 account.2.display_name = {$account.2.display_name}
 account.2.auth_name = {$account.2.auth_id}
 account.2.password = {$account.2.password}
@@ -661,10 +661,10 @@ account.2.nat.stun_server = {$stun_server}
 account.2.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.2.nat.udp_update_enable = 1
+account.2.nat.udp_update_enable = {if isset($account.2.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.2.nat.udp_update_time = 30
+account.2.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.2.nat.rport = {$yealink_rport}
@@ -1027,7 +1027,7 @@ account.3.enable = 1
 {else}
 account.3.enable = 0
 {/if}
-account.3.label = {$account.3.display_name}
+account.3.label = {$account.3.label}
 account.3.display_name = {$account.3.display_name}
 account.3.auth_name = {$account.3.auth_id}
 account.3.password = {$account.3.password}
@@ -1147,10 +1147,10 @@ account.3.nat.stun_server = {$stun_server}
 account.3.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.3.nat.udp_update_enable = 1
+account.3.nat.udp_update_enable = {if isset($account.3.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.3.nat.udp_update_time = 30
+account.3.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.3.nat.rport = {$yealink_rport}
@@ -1503,7 +1503,7 @@ account.4.enable = 1
 {else}
 account.4.enable = 0
 {/if}
-account.4.label = {$account.4.display_name}
+account.4.label = {$account.4.label}
 account.4.display_name = {$account.4.display_name}
 account.4.auth_name = {$account.4.auth_id}
 account.4.password = {$account.4.password}
@@ -1623,10 +1623,10 @@ account.4.nat.stun_server = {$stun_server}
 account.4.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.4.nat.udp_update_enable = 1
+account.4.nat.udp_update_enable = {if isset($account.4.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.4.nat.udp_update_time = 30
+account.4.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.4.nat.rport = {$yealink_rport}
@@ -1979,7 +1979,7 @@ account.5.enable = 1
 {else}
 account.5.enable = 0
 {/if}
-account.5.label = {$account.5.display_name}
+account.5.label = {$account.5.label}
 account.5.display_name = {$account.5.display_name}
 account.5.auth_name = {$account.5.auth_id}
 account.5.password = {$account.5.password}
@@ -2099,10 +2099,10 @@ account.5.nat.stun_server = {$stun_server}
 account.5.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.5.nat.udp_update_enable = 1
+account.5.nat.udp_update_enable = {if isset($account.5.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.5.nat.udp_update_time = 30
+account.5.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.5.nat.rport = {$yealink_rport}
@@ -2455,7 +2455,7 @@ account.6.enable = 1
 {else}
 account.6.enable = 0
 {/if}
-account.6.label = {$account.6.display_name}
+account.6.label = {$account.6.label}
 account.6.display_name = {$account.6.display_name}
 account.6.auth_name = {$account.6.auth_id}
 account.6.password = {$account.6.password}
@@ -2574,10 +2574,10 @@ account.6.nat.stun_server =
 account.6.nat.stun_port = 3478
 
 #Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
-account.6.nat.udp_update_enable = 1
+account.6.nat.udp_update_enable = {if isset($account.6.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.6.nat.udp_update_time = 30
+account.6.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.6.nat.rport = {$yealink_rport}
diff --git a/resources/templates/provision/yealink/t42s/directory.xml b/resources/templates/provision/yealink/t42s/directory.xml
index 297b9e4108..86c7b6f8b5 100644
--- a/resources/templates/provision/yealink/t42s/directory.xml
+++ b/resources/templates/provision/yealink/t42s/directory.xml
@@ -2,50 +2,58 @@
 {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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-	<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
 </DirectoryEntry>
 {elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
 <DirectoryEntry>
-{if $row.contact_name_given != ""}
+{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 != ""}
+{if $row.phone_number}
 	<Telephone>{$row.phone_number}</Telephone>
 {else}
 	<Telephone>{$row.phone_extension}</Telephone>
@@ -53,29 +61,29 @@
 </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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$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}
+{if isset($row.numbers)}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
 {/if}
 </DirectoryEntry>
 {/if}
diff --git a/resources/templates/provision/yealink/t42s/y000000000067.cfg b/resources/templates/provision/yealink/t42s/y000000000067.cfg
index 5e5c83d32c..9a61192c22 100644
--- a/resources/templates/provision/yealink/t42s/y000000000067.cfg
+++ b/resources/templates/provision/yealink/t42s/y000000000067.cfg
@@ -341,7 +341,7 @@ 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.trust_certificates = {$yealink_trust_certificates}
 
 static.security.user_password = {$var_name}:{$var_password}
 static.security.user_password = {$admin_name}:{$admin_password}
@@ -416,7 +416,8 @@ features.anonymous_response_code=
 ##                          Call Configuration                                       ##
 #######################################################################################
 phone_setting.incoming_call_when_dialing.priority=
-phone_setting.hold_or_swap.mode=
+{if isset($yealink_hold_or_swap_mode)}phone_setting.hold_or_swap.mode = {$yealink_hold_or_swap_mode}{else}phone_setting.hold_or_swap.mode = 0{/if}
+
 features.play_held_tone.interval=
 features.play_held_tone.delay=
 features.play_held_tone.enable=
@@ -446,7 +447,7 @@ features.headset_training=
 features.headset_prior=
 features.dtmf.replace_tran =
 features.dtmf.transfer =
-phone_setting.ringing_timeout=
+phone_setting.ringing_timeout = {$yealink_ringing_timeout}
 phone_setting.ringback_timeout=
 features.hold_trans_delay=
 transfer.multi_call_trans_enable =
@@ -1410,20 +1411,43 @@ 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=
+features.power_saving.enable = {$yealink_ps_enabled}
+##Written in 24hr
+features.power_saving.power_led_flash.on_time = {$yealink_ps_led_on}
+features.power_saving.power_led_flash.off_time = {$yealink_ps_led_off}
+
+##Written in 24hr, values should be comma delimited, e.g. 9,17
+{if isset($yealink_ps_days_all)}
+features.power_saving.office_hour.monday = {$yealink_ps_days_all}
+features.power_saving.office_hour.tuesday = {$yealink_ps_days_all}
+features.power_saving.office_hour.wednesday = {$yealink_ps_days_all}
+features.power_saving.office_hour.thursday = {$yealink_ps_days_all}
+features.power_saving.office_hour.friday = {$yealink_ps_days_all}
+features.power_saving.office_hour.saturday = {$yealink_ps_days_all}
+features.power_saving.office_hour.sunday = {$yealink_ps_days_all}
+{elseif isset($yealink_ps_days_workweek)}
+features.power_saving.office_hour.monday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.tuesday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.wednesday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.thursday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.friday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday}
+features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday}
+{else}
+features.power_saving.office_hour.monday = {$yealink_ps_day_monday}
+features.power_saving.office_hour.tuesday = {$yealink_ps_day_tuesday}
+features.power_saving.office_hour.wednesday = {$yealink_ps_day_wednesday}
+features.power_saving.office_hour.thursday = {$yealink_ps_day_thursday}
+features.power_saving.office_hour.friday = {$yealink_ps_day_friday}
+features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday}
+features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday}
+{/if}
+
+##Written in minutes
+features.power_saving.user_input_ext.idle_timeout = {$yealink_ps_idle_timeout}
+features.power_saving.off_hour.idle_timeout = {$yealink_ps_offhour_timeout}
+features.power_saving.office_hour.idle_timeout = {$yealink_ps_hour_timeout}
+features.power_saving.intelligent_mode = {$yealink_ps_intel_mode}
 
 
 #######################################################################################
diff --git a/resources/templates/provision/yealink/t42s/{$mac}.cfg b/resources/templates/provision/yealink/t42s/{$mac}.cfg
index d0ad16b777..46656adf49 100644
--- a/resources/templates/provision/yealink/t42s/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t42s/{$mac}.cfg
@@ -13,7 +13,7 @@ account.1.enable = 1
 {else}
 account.1.enable = 0
 {/if}
-account.1.label = {$account.1.display_name}
+account.1.label = {$account.1.label}
 account.1.display_name = {$account.1.display_name}
 account.1.auth_name = {$account.1.auth_id}
 account.1.password = {$account.1.password}
@@ -156,10 +156,10 @@ account.1.nat.stun_server = {$stun_server}
 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
+account.1.nat.udp_update_enable = {if isset($account.1.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.1.nat.udp_update_time = 30
+account.1.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.1.nat.rport = {$yealink_rport}
@@ -540,7 +540,7 @@ account.2.enable = 1
 {else}
 account.2.enable = 0
 {/if}
-account.2.label = {$account.2.display_name}
+account.2.label = {$account.2.label}
 account.2.display_name = {$account.2.display_name}
 account.2.auth_name = {$account.2.auth_id}
 account.2.password = {$account.2.password}
@@ -660,10 +660,10 @@ account.2.nat.stun_server = {$stun_server}
 account.2.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.2.nat.udp_update_enable = 1
+account.2.nat.udp_update_enable = {if isset($account.2.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.2.nat.udp_update_time = 30
+account.2.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.2.nat.rport = {$yealink_rport}
@@ -1027,7 +1027,7 @@ account.3.enable = 1
 {else}
 account.3.enable = 0
 {/if}
-account.3.label = {$account.3.display_name}
+account.3.label = {$account.3.label}
 account.3.display_name = {$account.3.display_name}
 account.3.auth_name = {$account.3.auth_id}
 account.3.password = {$account.3.password}
@@ -1147,10 +1147,10 @@ account.3.nat.stun_server = {$stun_server}
 account.3.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.3.nat.udp_update_enable = 1
+account.3.nat.udp_update_enable = {if isset($account.3.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.3.nat.udp_update_time = 30
+account.3.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.3.nat.rport = {$yealink_rport}
@@ -1503,7 +1503,7 @@ account.4.enable = 1
 {else}
 account.4.enable = 0
 {/if}
-account.4.label = {$account.4.display_name}
+account.4.label = {$account.4.label}
 account.4.display_name = {$account.4.display_name}
 account.4.auth_name = {$account.4.auth_id}
 account.4.password = {$account.4.password}
@@ -1623,10 +1623,10 @@ account.4.nat.stun_server = {$stun_server}
 account.4.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.4.nat.udp_update_enable = 1
+account.4.nat.udp_update_enable = {if isset($account.4.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.4.nat.udp_update_time = 30
+account.4.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.4.nat.rport = {$yealink_rport}
@@ -1974,7 +1974,7 @@ account.5.enable = 1
 {else}
 account.5.enable = 0
 {/if}
-account.5.label = {$account.5.display_name}
+account.5.label = {$account.5.label}
 account.5.display_name = {$account.5.display_name}
 account.5.auth_name = {$account.5.auth_id}
 account.5.password = {$account.5.password}
@@ -2094,10 +2094,10 @@ account.5.nat.stun_server = {$stun_server}
 account.5.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.5.nat.udp_update_enable = 1
+account.5.nat.udp_update_enable = {if isset($account.5.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.5.nat.udp_update_time = 30
+account.5.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.5.nat.rport = {$yealink_rport}
@@ -2445,7 +2445,7 @@ account.6.enable = 1
 {else}
 account.6.enable = 0
 {/if}
-account.6.label = {$account.6.display_name}
+account.6.label = {$account.6.label}
 account.6.display_name = {$account.6.display_name}
 account.6.auth_name = {$account.6.auth_id}
 account.6.password = {$account.6.password}
@@ -2564,10 +2564,10 @@ account.6.nat.stun_server =
 account.6.nat.stun_port = 3478
 
 #Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
-account.6.nat.udp_update_enable = 1
+account.6.nat.udp_update_enable = {if isset($account.6.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.6.nat.udp_update_time = 30
+account.6.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.6.nat.rport = {$yealink_rport}
diff --git a/resources/templates/provision/yealink/t43u/directory.xml b/resources/templates/provision/yealink/t43u/directory.xml
index 297b9e4108..86c7b6f8b5 100644
--- a/resources/templates/provision/yealink/t43u/directory.xml
+++ b/resources/templates/provision/yealink/t43u/directory.xml
@@ -2,50 +2,58 @@
 {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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-	<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
 </DirectoryEntry>
 {elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
 <DirectoryEntry>
-{if $row.contact_name_given != ""}
+{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 != ""}
+{if $row.phone_number}
 	<Telephone>{$row.phone_number}</Telephone>
 {else}
 	<Telephone>{$row.phone_extension}</Telephone>
@@ -53,29 +61,29 @@
 </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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$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}
+{if isset($row.numbers)}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
 {/if}
 </DirectoryEntry>
 {/if}
diff --git a/resources/templates/provision/yealink/t43u/y000000000107.cfg b/resources/templates/provision/yealink/t43u/y000000000107.cfg
index 83863cc605..0478091b48 100644
--- a/resources/templates/provision/yealink/t43u/y000000000107.cfg
+++ b/resources/templates/provision/yealink/t43u/y000000000107.cfg
@@ -374,7 +374,7 @@ 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.trust_certificates = {$yealink_trust_certificates}
 
 static.security.user_password = {$var_name}:{$var_password}
 static.security.user_password = {$admin_name}:{$admin_password}
@@ -424,7 +424,7 @@ static.auto_provision.encryption.config =
 
 
 #######################################################################################
-##                                   Trnasfer                                        ##
+##                                   Transfer                                        ##
 #######################################################################################
 dialplan.transfer.mode = {$yealink_transfer_mode}
 transfer.on_hook_trans_enable = {$yealink_transfer_onhook}
@@ -484,7 +484,7 @@ features.headset_training=
 features.headset_prior=
 features.dtmf.replace_tran =
 features.dtmf.transfer =
-phone_setting.ringing_timeout=
+phone_setting.ringing_timeout = {$yealink_ringing_timeout}
 phone_setting.ringback_timeout=
 
 features.keep_mute.enable=
@@ -1509,8 +1509,27 @@ 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}
+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                                    ##
@@ -1554,20 +1573,43 @@ 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=
+features.power_saving.enable = {$yealink_ps_enabled}
+##Written in 24hr
+features.power_saving.power_led_flash.on_time = {$yealink_ps_led_on}
+features.power_saving.power_led_flash.off_time = {$yealink_ps_led_off}
+
+##Written in 24hr, values should be comma delimited, e.g. 9,17
+{if isset($yealink_ps_days_all)}
+features.power_saving.office_hour.monday = {$yealink_ps_days_all}
+features.power_saving.office_hour.tuesday = {$yealink_ps_days_all}
+features.power_saving.office_hour.wednesday = {$yealink_ps_days_all}
+features.power_saving.office_hour.thursday = {$yealink_ps_days_all}
+features.power_saving.office_hour.friday = {$yealink_ps_days_all}
+features.power_saving.office_hour.saturday = {$yealink_ps_days_all}
+features.power_saving.office_hour.sunday = {$yealink_ps_days_all}
+{elseif isset($yealink_ps_days_workweek)}
+features.power_saving.office_hour.monday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.tuesday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.wednesday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.thursday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.friday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday}
+features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday}
+{else}
+features.power_saving.office_hour.monday = {$yealink_ps_day_monday}
+features.power_saving.office_hour.tuesday = {$yealink_ps_day_tuesday}
+features.power_saving.office_hour.wednesday = {$yealink_ps_day_wednesday}
+features.power_saving.office_hour.thursday = {$yealink_ps_day_thursday}
+features.power_saving.office_hour.friday = {$yealink_ps_day_friday}
+features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday}
+features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday}
+{/if}
+
+##Written in minutes
+features.power_saving.user_input_ext.idle_timeout = {$yealink_ps_idle_timeout}
+features.power_saving.off_hour.idle_timeout = {$yealink_ps_offhour_timeout}
+features.power_saving.office_hour.idle_timeout = {$yealink_ps_hour_timeout}
+features.power_saving.intelligent_mode = {$yealink_ps_intel_mode}
 
 
 #######################################################################################
diff --git a/resources/templates/provision/yealink/t43u/{$mac}.cfg b/resources/templates/provision/yealink/t43u/{$mac}.cfg
index 5ef8b0aa0c..25aa42e476 100644
--- a/resources/templates/provision/yealink/t43u/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t43u/{$mac}.cfg
@@ -114,7 +114,7 @@ account.1.enable = 1
 {else}
 account.1.enable = 0
 {/if}
-account.1.label = {$account.1.display_name}
+account.1.label = {$account.1.label}
 account.1.display_name = {$account.1.display_name}
 account.1.auth_name = {$account.1.auth_id}
 
@@ -183,8 +183,8 @@ account.1.auto_answer=
 ################################################################
 #                      Account Advanced                       ##
 ################################################################
-account.1.nat.udp_update_enable=
-account.1.nat.udp_update_time=
+account.1.nat.udp_update_enable = {if isset($account.1.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+account.1.nat.udp_update_time = 30
 account.1.nat.rport= {$yealink_rport}
 
 account.1.dtmf.type= {$yealink_dtmf_type}
@@ -682,7 +682,7 @@ account.2.enable = 1
 {else}
 account.2.enable = 0
 {/if}
-account.2.label = {$account.2.display_name}
+account.2.label = {$account.2.label}
 account.2.display_name = {$account.2.display_name}
 account.2.auth_name = {$account.2.auth_id}
 
@@ -751,8 +751,8 @@ account.2.auto_answer=
 ################################################################
 #                      Account Advanced                       ##
 ################################################################
-account.2.nat.udp_update_enable=
-account.2.nat.udp_update_time=
+account.2.nat.udp_update_enable = {if isset($account.2.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+account.2.nat.udp_update_time = 30
 account.2.nat.rport=  {$yealink_rport}
 
 account.2.dtmf.type= {$yealink_dtmf_type}
@@ -1250,7 +1250,7 @@ account.3.enable = 1
 {else}
 account.3.enable = 0
 {/if}
-account.3.label = {$account.3.display_name}
+account.3.label = {$account.3.label}
 account.3.display_name = {$account.3.display_name}
 account.3.auth_name = {$account.3.auth_id}
 
@@ -1319,8 +1319,8 @@ account.3.auto_answer=
 ################################################################
 #                      Account Advanced                       ##
 ################################################################
-account.3.nat.udp_update_enable=
-account.3.nat.udp_update_time=
+account.3.nat.udp_update_enable = {if isset($account.3.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+account.3.nat.udp_update_time = 30
 account.3.nat.rport= {$yealink_rport}
 
 account.3.dtmf.type= {$yealink_dtmf_type}
@@ -1818,7 +1818,7 @@ account.4.enable = 1
 {else}
 account.4.enable = 0
 {/if}
-account.4.label = {$account.4.display_name}
+account.4.label = {$account.4.label}
 account.4.display_name = {$account.4.display_name}
 account.4.auth_name = {$account.4.auth_id}
 
@@ -1887,8 +1887,8 @@ account.4.auto_answer=
 ################################################################
 #                      Account Advanced                       ##
 ################################################################
-account.4.nat.udp_update_enable=
-account.4.nat.udp_update_time=
+account.4.nat.udp_update_enable = {if isset($account.4.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+account.4.nat.udp_update_time = 30
 account.4.nat.rport= {$yealink_rport}
 
 account.4.dtmf.type= {$yealink_dtmf_type}
@@ -2386,7 +2386,7 @@ account.5.enable = 1
 {else}
 account.5.enable = 0
 {/if}
-account.5.label = {$account.5.display_name}
+account.5.label = {$account.5.label}
 account.5.display_name = {$account.5.display_name}
 account.5.auth_name = {$account.5.auth_id}
 
@@ -2455,8 +2455,8 @@ account.5.auto_answer=
 ################################################################
 #                      Account Advanced                       ##
 ################################################################
-account.5.nat.udp_update_enable=
-account.5.nat.udp_update_time=
+account.5.nat.udp_update_enable = {if isset($account.5.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+account.5.nat.udp_update_time = 30
 account.5.nat.rport= {$yealink_rport}
 
 account.5.dtmf.type= {$yealink_dtmf_type}
@@ -2954,7 +2954,7 @@ account.6.enable = 1
 {else}
 account.6.enable = 0
 {/if}
-account.6.label = {$account.6.display_name}
+account.6.label = {$account.6.label}
 account.6.display_name = {$account.6.display_name}
 account.6.auth_name = {$account.6.auth_id}
 
@@ -3023,8 +3023,8 @@ account.6.auto_answer=
 ################################################################
 #                      Account Advanced                       ##
 ################################################################
-account.6.nat.udp_update_enable=
-account.6.nat.udp_update_time=
+account.6.nat.udp_update_enable = {if isset($account.6.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+account.6.nat.udp_update_time = 30
 account.6.nat.rport= {$yealink_rport}
 
 account.6.dtmf.type= {$yealink_dtmf_type}
diff --git a/resources/templates/provision/yealink/t46g/directory.xml b/resources/templates/provision/yealink/t46g/directory.xml
index 3e319dfb50..e730841a96 100644
--- a/resources/templates/provision/yealink/t46g/directory.xml
+++ b/resources/templates/provision/yealink/t46g/directory.xml
@@ -2,50 +2,58 @@
 {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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-	<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
 </DirectoryEntry>
 {elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
 <DirectoryEntry>
-{if $row.contact_name_given != ""}
+{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 != ""}
+{if $row.phone_number}
 	<Telephone>{$row.phone_number}</Telephone>
 {else}
 	<Telephone>{$row.phone_extension}</Telephone>
@@ -53,29 +61,29 @@
 </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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$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}
+{if isset($row.numbers)}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
 {/if}
 </DirectoryEntry>
 {/if}
diff --git a/resources/templates/provision/yealink/t46g/y000000000028.cfg b/resources/templates/provision/yealink/t46g/y000000000028.cfg
index e471281f20..2baf85e40d 100644
--- a/resources/templates/provision/yealink/t46g/y000000000028.cfg
+++ b/resources/templates/provision/yealink/t46g/y000000000028.cfg
@@ -1051,7 +1051,7 @@ bw.feature_key_sync = {$yealink_feature_key_sync}
 #######################################################################################
 #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}
+security.trust_certificates = {$yealink_trust_certificates}
 
 #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.
diff --git a/resources/templates/provision/yealink/t46g/{$mac}.cfg b/resources/templates/provision/yealink/t46g/{$mac}.cfg
index 5af5ab0e81..4f6b7a92b3 100644
--- a/resources/templates/provision/yealink/t46g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t46g/{$mac}.cfg
@@ -13,7 +13,7 @@ account.1.enable = 1
 {else}
 account.1.enable = 0
 {/if}
-account.1.label = {$account.1.display_name}
+account.1.label = {$account.1.label}
 account.1.display_name = {$account.1.display_name}
 account.1.auth_name = {$account.1.auth_id}
 account.1.password = {$account.1.password}
@@ -156,10 +156,10 @@ account.1.nat.stun_server = {$stun_server}
 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
+account.1.nat.udp_update_enable = {if isset($account.1.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.1.nat.udp_update_time = 30
+account.1.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.1.nat.rport = {$yealink_rport}
@@ -542,7 +542,7 @@ account.2.enable = 1
 {else}
 account.2.enable = 0
 {/if}
-account.2.label = {$account.2.display_name}
+account.2.label = {$account.2.label}
 account.2.display_name = {$account.2.display_name}
 account.2.auth_name = {$account.2.auth_id}
 account.2.password = {$account.2.password}
@@ -662,10 +662,10 @@ account.2.nat.stun_server = {$stun_server}
 account.2.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.2.nat.udp_update_enable = 1
+account.2.nat.udp_update_enable = {if isset($account.2.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.2.nat.udp_update_time = 30
+account.2.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.2.nat.rport = {$yealink_rport}
@@ -1028,7 +1028,7 @@ account.3.enable = 1
 {else}
 account.3.enable = 0
 {/if}
-account.3.label = {$account.3.display_name}
+account.3.label = {$account.3.label}
 account.3.display_name = {$account.3.display_name}
 account.3.auth_name = {$account.3.auth_id}
 account.3.password = {$account.3.password}
@@ -1148,10 +1148,10 @@ account.3.nat.stun_server = {$stun_server}
 account.3.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.3.nat.udp_update_enable = 1
+account.3.nat.udp_update_enable = {if isset($account.3.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.3.nat.udp_update_time = 30
+account.3.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.3.nat.rport = {$yealink_rport}
@@ -1504,7 +1504,7 @@ account.4.enable = 1
 {else}
 account.4.enable = 0
 {/if}
-account.4.label = {$account.4.display_name}
+account.4.label = {$account.4.label}
 account.4.display_name = {$account.4.display_name}
 account.4.auth_name = {$account.4.auth_id}
 account.4.password = {$account.4.password}
@@ -1624,10 +1624,10 @@ account.4.nat.stun_server = {$stun_server}
 account.4.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.4.nat.udp_update_enable = 1
+account.4.nat.udp_update_enable = {if isset($account.4.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.4.nat.udp_update_time = 30
+account.4.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.4.nat.rport = {$yealink_rport}
@@ -1980,7 +1980,7 @@ account.5.enable = 1
 {else}
 account.5.enable = 0
 {/if}
-account.5.label = {$account.5.display_name}
+account.5.label = {$account.5.label}
 account.5.display_name = {$account.5.display_name}
 account.5.auth_name = {$account.5.auth_id}
 account.5.password = {$account.5.password}
@@ -2100,10 +2100,10 @@ account.5.nat.stun_server = {$stun_server}
 account.5.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.5.nat.udp_update_enable = 1
+account.5.nat.udp_update_enable = {if isset($account.5.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.5.nat.udp_update_time = 30
+account.5.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.5.nat.rport = {$yealink_rport}
@@ -2456,7 +2456,7 @@ account.6.enable = 1
 {else}
 account.6.enable = 0
 {/if}
-account.6.label = {$account.6.display_name}
+account.6.label = {$account.6.label}
 account.6.display_name = {$account.6.display_name}
 account.6.auth_name = {$account.6.auth_id}
 account.6.password = {$account.6.password}
@@ -2575,10 +2575,10 @@ account.6.nat.stun_server =
 account.6.nat.stun_port = 3478
 
 #Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
-account.6.nat.udp_update_enable = 1
+account.6.nat.udp_update_enable = {if isset($account.6.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.6.nat.udp_update_time = 30
+account.6.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.6.nat.rport = {$yealink_rport}
diff --git a/resources/templates/provision/yealink/t46s/directory.xml b/resources/templates/provision/yealink/t46s/directory.xml
index 297b9e4108..86c7b6f8b5 100644
--- a/resources/templates/provision/yealink/t46s/directory.xml
+++ b/resources/templates/provision/yealink/t46s/directory.xml
@@ -2,50 +2,58 @@
 {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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-	<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
 </DirectoryEntry>
 {elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
 <DirectoryEntry>
-{if $row.contact_name_given != ""}
+{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 != ""}
+{if $row.phone_number}
 	<Telephone>{$row.phone_number}</Telephone>
 {else}
 	<Telephone>{$row.phone_extension}</Telephone>
@@ -53,29 +61,29 @@
 </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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$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}
+{if isset($row.numbers)}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
 {/if}
 </DirectoryEntry>
 {/if}
diff --git a/resources/templates/provision/yealink/t46s/y000000000066.cfg b/resources/templates/provision/yealink/t46s/y000000000066.cfg
index 4509b48b54..7234c58adb 100644
--- a/resources/templates/provision/yealink/t46s/y000000000066.cfg
+++ b/resources/templates/provision/yealink/t46s/y000000000066.cfg
@@ -341,7 +341,7 @@ 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.trust_certificates = {$yealink_trust_certificates}
 
 static.security.user_password = {$var_name}:{$var_password}
 static.security.user_password = {$admin_name}:{$admin_password}
@@ -416,7 +416,8 @@ features.anonymous_response_code=
 ##                          Call Configuration                                       ##
 #######################################################################################
 phone_setting.incoming_call_when_dialing.priority=
-phone_setting.hold_or_swap.mode=
+{if isset($yealink_hold_or_swap_mode)}phone_setting.hold_or_swap.mode = {$yealink_hold_or_swap_mode}{else}phone_setting.hold_or_swap.mode = 0{/if}
+
 features.play_held_tone.interval=
 features.play_held_tone.delay=
 features.play_held_tone.enable=
@@ -446,7 +447,7 @@ features.headset_training=
 features.headset_prior=
 features.dtmf.replace_tran =
 features.dtmf.transfer =
-phone_setting.ringing_timeout=
+phone_setting.ringing_timeout = {$yealink_ringing_timeout}
 phone_setting.ringback_timeout=
 features.hold_trans_delay=
 transfer.multi_call_trans_enable =
@@ -991,8 +992,8 @@ forward.no_answer.on_code=
 forward.no_answer.off_code=
 forward.busy.off_code=
 forward.busy.on_code=
-forward.always.off_code = {$yealink_forward_always_off_code}
-forward.always.on_code = {$yealink_forward_always_on_code}
+forward.always.off_code = {$yealink_forward_always_off_code}
+forward.always.on_code = {$yealink_forward_always_on_code}
 forward.no_answer.target=
 forward.busy.target=
 forward.always.target=
@@ -1054,7 +1055,7 @@ 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=
+voice_mail.number.1 = {$voicemail_number}
 
 
 #######################################################################################  
@@ -1093,7 +1094,7 @@ voice.handset_send=
 voice.handfree_send =
 voice.headset_send =
 features.intercom.headset_prior.enable=
-features.ringer_device.is_use_headset=
+features.ringer_device.is_use_headset = {$yealink_headset_ringer}
 
 
 #######################################################################################  
@@ -1330,7 +1331,7 @@ dialplan_replace_rule.url=
 dialplan.replace.line_id.1=
 dialplan.replace.replace.1=
 dialplan.replace.prefix.1=
-phone_setting.dialnow_delay=
+phone_setting.dialnow_delay = {$yealink_dialplan_dialnow_delay}
 dialplan_dialnow.url=
 dialnow.item.1=
 dialplan.dialnow.line_id.1=
@@ -1411,20 +1412,43 @@ 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=
+features.power_saving.enable = {$yealink_ps_enabled}
+##Written in 24hr
+features.power_saving.power_led_flash.on_time = {$yealink_ps_led_on}
+features.power_saving.power_led_flash.off_time = {$yealink_ps_led_off}
+
+##Written in 24hr, values should be comma delimited, e.g. 9,17
+{if isset($yealink_ps_days_all)}
+features.power_saving.office_hour.monday = {$yealink_ps_days_all}
+features.power_saving.office_hour.tuesday = {$yealink_ps_days_all}
+features.power_saving.office_hour.wednesday = {$yealink_ps_days_all}
+features.power_saving.office_hour.thursday = {$yealink_ps_days_all}
+features.power_saving.office_hour.friday = {$yealink_ps_days_all}
+features.power_saving.office_hour.saturday = {$yealink_ps_days_all}
+features.power_saving.office_hour.sunday = {$yealink_ps_days_all}
+{elseif isset($yealink_ps_days_workweek)}
+features.power_saving.office_hour.monday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.tuesday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.wednesday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.thursday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.friday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday}
+features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday}
+{else}
+features.power_saving.office_hour.monday = {$yealink_ps_day_monday}
+features.power_saving.office_hour.tuesday = {$yealink_ps_day_tuesday}
+features.power_saving.office_hour.wednesday = {$yealink_ps_day_wednesday}
+features.power_saving.office_hour.thursday = {$yealink_ps_day_thursday}
+features.power_saving.office_hour.friday = {$yealink_ps_day_friday}
+features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday}
+features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday}
+{/if}
+
+##Written in minutes
+features.power_saving.user_input_ext.idle_timeout = {$yealink_ps_idle_timeout}
+features.power_saving.off_hour.idle_timeout = {$yealink_ps_offhour_timeout}
+features.power_saving.office_hour.idle_timeout = {$yealink_ps_hour_timeout}
+features.power_saving.intelligent_mode = {$yealink_ps_intel_mode}
 
 
 #######################################################################################
diff --git a/resources/templates/provision/yealink/t46s/{$mac}.cfg b/resources/templates/provision/yealink/t46s/{$mac}.cfg
index 2f78171ac8..01442f40f6 100644
--- a/resources/templates/provision/yealink/t46s/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t46s/{$mac}.cfg
@@ -13,7 +13,7 @@ account.1.enable = 1
 {else}
 account.1.enable = 0
 {/if}
-account.1.label = {$account.1.display_name}
+account.1.label = {$account.1.label}
 account.1.display_name = {$account.1.display_name}
 account.1.auth_name = {$account.1.auth_id}
 account.1.password = {$account.1.password}
@@ -156,10 +156,10 @@ account.1.nat.stun_server = {$stun_server}
 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
+account.1.nat.udp_update_enable = {if isset($account.1.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.1.nat.udp_update_time = 30
+account.1.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.1.nat.rport = {$yealink_rport}
@@ -540,7 +540,7 @@ account.2.enable = 1
 {else}
 account.2.enable = 0
 {/if}
-account.2.label = {$account.2.display_name}
+account.2.label = {$account.2.label}
 account.2.display_name = {$account.2.display_name}
 account.2.auth_name = {$account.2.auth_id}
 account.2.password = {$account.2.password}
@@ -660,10 +660,10 @@ account.2.nat.stun_server = {$stun_server}
 account.2.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.2.nat.udp_update_enable = 1
+account.2.nat.udp_update_enable = {if isset($account.2.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.2.nat.udp_update_time = 30
+account.2.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.2.nat.rport = {$yealink_rport}
@@ -1030,7 +1030,7 @@ account.3.enable = 1
 {else}
 account.3.enable = 0
 {/if}
-account.3.label = {$account.3.display_name}
+account.3.label = {$account.3.label}
 account.3.display_name = {$account.3.display_name}
 account.3.auth_name = {$account.3.auth_id}
 account.3.password = {$account.3.password}
@@ -1150,10 +1150,10 @@ account.3.nat.stun_server = {$stun_server}
 account.3.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.3.nat.udp_update_enable = 1
+account.3.nat.udp_update_enable = {if isset($account.3.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.3.nat.udp_update_time = 30
+account.3.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.3.nat.rport = {$yealink_rport}
@@ -1511,7 +1511,7 @@ account.4.enable = 1
 {else}
 account.4.enable = 0
 {/if}
-account.4.label = {$account.4.display_name}
+account.4.label = {$account.4.label}
 account.4.display_name = {$account.4.display_name}
 account.4.auth_name = {$account.4.auth_id}
 account.4.password = {$account.4.password}
@@ -1631,10 +1631,10 @@ account.4.nat.stun_server = {$stun_server}
 account.4.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.4.nat.udp_update_enable = 1
+account.4.nat.udp_update_enable = {if isset($account.4.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.4.nat.udp_update_time = 30
+account.4.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.4.nat.rport = {$yealink_rport}
@@ -1987,7 +1987,7 @@ account.5.enable = 1
 {else}
 account.5.enable = 0
 {/if}
-account.5.label = {$account.5.display_name}
+account.5.label = {$account.5.label}
 account.5.display_name = {$account.5.display_name}
 account.5.auth_name = {$account.5.auth_id}
 account.5.password = {$account.5.password}
@@ -2107,10 +2107,10 @@ account.5.nat.stun_server = {$stun_server}
 account.5.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.5.nat.udp_update_enable = 1
+account.5.nat.udp_update_enable = {if isset($account.5.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.5.nat.udp_update_time = 30
+account.5.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.5.nat.rport = {$yealink_rport}
@@ -2463,7 +2463,7 @@ account.6.enable = 1
 {else}
 account.6.enable = 0
 {/if}
-account.6.label = {$account.6.display_name}
+account.6.label = {$account.6.label}
 account.6.display_name = {$account.6.display_name}
 account.6.auth_name = {$account.6.auth_id}
 account.6.password = {$account.6.password}
@@ -2582,10 +2582,10 @@ account.6.nat.stun_server =
 account.6.nat.stun_port = 3478
 
 #Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
-account.6.nat.udp_update_enable = 1
+account.6.nat.udp_update_enable = {if isset($account.6.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.6.nat.udp_update_time = 30
+account.6.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.6.nat.rport = {$yealink_rport}
diff --git a/resources/templates/provision/yealink/t46u/directory.xml b/resources/templates/provision/yealink/t46u/directory.xml
new file mode 100644
index 0000000000..86c7b6f8b5
--- /dev/null
+++ b/resources/templates/provision/yealink/t46u/directory.xml
@@ -0,0 +1,91 @@
+<YealinkIPPhoneDirectory>
+{foreach $contacts as $row}
+{if $smarty.get.contacts == "users" && $row.category == "users"}
+<DirectoryEntry>
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</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_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</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_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
+{/if}
+{if isset($row.numbers)}
+{foreach $row.numbers as $number}
+{if $number.phone_number}
+	<Telephone>{$number.phone_number}</Telephone>
+{else}
+	<Telephone>{$number.phone_extension}</Telephone>
+{/if}
+{/foreach}
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
+{/if}
+</DirectoryEntry>
+{/if}
+{/foreach}
+</YealinkIPPhoneDirectory>
diff --git a/resources/templates/provision/yealink/t46u/y000000000108.cfg b/resources/templates/provision/yealink/t46u/y000000000108.cfg
index f21d0215a1..fe540e8d73 100644
--- a/resources/templates/provision/yealink/t46u/y000000000108.cfg
+++ b/resources/templates/provision/yealink/t46u/y000000000108.cfg
@@ -374,7 +374,7 @@ 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.trust_certificates = {$yealink_trust_certificates}
 
 static.security.user_password = {$var_name}:{$var_password}
 static.security.user_password = {$admin_name}:{$admin_password}
@@ -424,7 +424,7 @@ static.auto_provision.encryption.config =
 
 
 #######################################################################################
-##                                   Trnasfer                                        ##
+##                                   Transfer                                        ##
 #######################################################################################
 dialplan.transfer.mode = {$yealink_transfer_mode}
 transfer.on_hook_trans_enable = {$yealink_transfer_onhook}
@@ -484,7 +484,7 @@ features.headset_training=
 features.headset_prior=
 features.dtmf.replace_tran =
 features.dtmf.transfer =
-phone_setting.ringing_timeout=
+phone_setting.ringing_timeout = {$yealink_ringing_timeout}
 phone_setting.ringback_timeout=
 
 features.keep_mute.enable=
@@ -1491,10 +1491,14 @@ dialplan_replace_rule.url=
 dialplan.replace.line_id.1=
 dialplan.replace.replace.1=
 dialplan.replace.prefix.1=
-phone_setting.dialnow_delay=
+phone_setting.dialnow_delay = {$yealink_dialplan_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 =
@@ -1505,8 +1509,27 @@ 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}
+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                                    ##
@@ -1550,20 +1573,43 @@ 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=
+features.power_saving.enable = {$yealink_ps_enabled}
+##Written in 24hr
+features.power_saving.power_led_flash.on_time = {$yealink_ps_led_on}
+features.power_saving.power_led_flash.off_time = {$yealink_ps_led_off}
+
+##Written in 24hr, values should be comma delimited, e.g. 9,17
+{if isset($yealink_ps_days_all)}
+features.power_saving.office_hour.monday = {$yealink_ps_days_all}
+features.power_saving.office_hour.tuesday = {$yealink_ps_days_all}
+features.power_saving.office_hour.wednesday = {$yealink_ps_days_all}
+features.power_saving.office_hour.thursday = {$yealink_ps_days_all}
+features.power_saving.office_hour.friday = {$yealink_ps_days_all}
+features.power_saving.office_hour.saturday = {$yealink_ps_days_all}
+features.power_saving.office_hour.sunday = {$yealink_ps_days_all}
+{elseif isset($yealink_ps_days_workweek)}
+features.power_saving.office_hour.monday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.tuesday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.wednesday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.thursday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.friday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday}
+features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday}
+{else}
+features.power_saving.office_hour.monday = {$yealink_ps_day_monday}
+features.power_saving.office_hour.tuesday = {$yealink_ps_day_tuesday}
+features.power_saving.office_hour.wednesday = {$yealink_ps_day_wednesday}
+features.power_saving.office_hour.thursday = {$yealink_ps_day_thursday}
+features.power_saving.office_hour.friday = {$yealink_ps_day_friday}
+features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday}
+features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday}
+{/if}
+
+##Written in minutes
+features.power_saving.user_input_ext.idle_timeout = {$yealink_ps_idle_timeout}
+features.power_saving.off_hour.idle_timeout = {$yealink_ps_offhour_timeout}
+features.power_saving.office_hour.idle_timeout = {$yealink_ps_hour_timeout}
+features.power_saving.intelligent_mode = {$yealink_ps_intel_mode}
 
 
 #######################################################################################
@@ -1588,7 +1634,12 @@ phone_setting.backgrounds =  Config:yealink_t46u_wallpaper.png
 phone_setting.backgrounds_with_dsskey_unfold=
 
 ##expansion_module.backgrounds(Only support T5XW/T54S/T52S/T43U/T46U/T48U)
+wallpaper_upload.url = {$yealink_t46u_wallpaper_expansion}
+{if isset($yealink_t46u_wallpaper_expansion_filename)}
+expansion_module.backgrounds=Config:{$yealink_t46u_wallpaper_expansion_filename}
+{else}
 expansion_module.backgrounds=
+{/if}
 
 
 #######################################################################################
@@ -1950,4 +2001,3 @@ 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
index 123bc52211..e0d184a06b 100644
--- a/resources/templates/provision/yealink/t46u/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t46u/{$mac}.cfg
@@ -114,7 +114,7 @@ account.1.enable = 1
 {else}
 account.1.enable = 0
 {/if}
-account.1.label = {$account.1.display_name}
+account.1.label = {$account.1.label}
 account.1.display_name = {$account.1.display_name}
 account.1.auth_name = {$account.1.auth_id}
 
@@ -183,8 +183,8 @@ account.1.auto_answer=
 ################################################################
 #                      Account Advanced                       ##
 ################################################################
-account.1.nat.udp_update_enable=
-account.1.nat.udp_update_time=
+account.1.nat.udp_update_enable = {if isset($account.1.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+account.1.nat.udp_update_time = 30
 account.1.nat.rport= {$yealink_rport}
 
 account.1.dtmf.type= {$yealink_dtmf_type}
@@ -677,7 +677,7 @@ account.2.enable = 1
 {else}
 account.2.enable = 0
 {/if}
-account.2.label = {$account.2.display_name}
+account.2.label = {$account.2.label}
 account.2.display_name = {$account.2.display_name}
 account.2.auth_name = {$account.2.auth_id}
 
@@ -746,8 +746,8 @@ account.2.auto_answer=
 ################################################################
 #                      Account Advanced                       ##
 ################################################################
-account.2.nat.udp_update_enable=
-account.2.nat.udp_update_time=
+account.2.nat.udp_update_enable = {if isset($account.2.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+account.2.nat.udp_update_time = 30
 account.2.nat.rport=  {$yealink_rport}
 
 account.2.dtmf.type= {$yealink_dtmf_type}
@@ -1240,7 +1240,7 @@ account.3.enable = 1
 {else}
 account.3.enable = 0
 {/if}
-account.3.label = {$account.3.display_name}
+account.3.label = {$account.3.label}
 account.3.display_name = {$account.3.display_name}
 account.3.auth_name = {$account.3.auth_id}
 
@@ -1309,8 +1309,8 @@ account.3.auto_answer=
 ################################################################
 #                      Account Advanced                       ##
 ################################################################
-account.3.nat.udp_update_enable=
-account.3.nat.udp_update_time=
+account.3.nat.udp_update_enable = {if isset($account.3.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+account.3.nat.udp_update_time = 30
 account.3.nat.rport= {$yealink_rport}
 
 account.3.dtmf.type= {$yealink_dtmf_type}
@@ -1803,7 +1803,7 @@ account.4.enable = 1
 {else}
 account.4.enable = 0
 {/if}
-account.4.label = {$account.4.display_name}
+account.4.label = {$account.4.label}
 account.4.display_name = {$account.4.display_name}
 account.4.auth_name = {$account.4.auth_id}
 
@@ -1872,8 +1872,8 @@ account.4.auto_answer=
 ################################################################
 #                      Account Advanced                       ##
 ################################################################
-account.4.nat.udp_update_enable=
-account.4.nat.udp_update_time=
+account.4.nat.udp_update_enable = {if isset($account.4.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+account.4.nat.udp_update_time = 30
 account.4.nat.rport= {$yealink_rport}
 
 account.4.dtmf.type= {$yealink_dtmf_type}
@@ -2366,7 +2366,7 @@ account.5.enable = 1
 {else}
 account.5.enable = 0
 {/if}
-account.5.label = {$account.5.display_name}
+account.5.label = {$account.5.label}
 account.5.display_name = {$account.5.display_name}
 account.5.auth_name = {$account.5.auth_id}
 
@@ -2435,8 +2435,8 @@ account.5.auto_answer=
 ################################################################
 #                      Account Advanced                       ##
 ################################################################
-account.5.nat.udp_update_enable=
-account.5.nat.udp_update_time=
+account.5.nat.udp_update_enable = {if isset($account.5.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+account.5.nat.udp_update_time = 30
 account.5.nat.rport= {$yealink_rport}
 
 account.5.dtmf.type= {$yealink_dtmf_type}
@@ -2929,7 +2929,7 @@ account.6.enable = 1
 {else}
 account.6.enable = 0
 {/if}
-account.6.label = {$account.6.display_name}
+account.6.label = {$account.6.label}
 account.6.display_name = {$account.6.display_name}
 account.6.auth_name = {$account.6.auth_id}
 
@@ -2998,8 +2998,8 @@ account.6.auto_answer=
 ################################################################
 #                      Account Advanced                       ##
 ################################################################
-account.6.nat.udp_update_enable=
-account.6.nat.udp_update_time=
+account.6.nat.udp_update_enable = {if isset($account.6.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+account.6.nat.udp_update_time = 30
 account.6.nat.rport= {$yealink_rport}
 
 account.6.dtmf.type= {$yealink_dtmf_type}
diff --git a/resources/templates/provision/yealink/t48g/directory.xml b/resources/templates/provision/yealink/t48g/directory.xml
index 3e319dfb50..e730841a96 100644
--- a/resources/templates/provision/yealink/t48g/directory.xml
+++ b/resources/templates/provision/yealink/t48g/directory.xml
@@ -2,50 +2,58 @@
 {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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-	<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
 </DirectoryEntry>
 {elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
 <DirectoryEntry>
-{if $row.contact_name_given != ""}
+{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 != ""}
+{if $row.phone_number}
 	<Telephone>{$row.phone_number}</Telephone>
 {else}
 	<Telephone>{$row.phone_extension}</Telephone>
@@ -53,29 +61,29 @@
 </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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$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}
+{if isset($row.numbers)}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
 {/if}
 </DirectoryEntry>
 {/if}
diff --git a/resources/templates/provision/yealink/t48g/y000000000035.cfg b/resources/templates/provision/yealink/t48g/y000000000035.cfg
index 7016c43b57..b0ace85c2c 100644
--- a/resources/templates/provision/yealink/t48g/y000000000035.cfg
+++ b/resources/templates/provision/yealink/t48g/y000000000035.cfg
@@ -1044,7 +1044,7 @@ bw.feature_key_sync = {$yealink_feature_key_sync}
 #######################################################################################
 #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}
+security.trust_certificates = {$yealink_trust_certificates}
 
 #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.
@@ -1342,8 +1342,8 @@ expansion_module.2.key.{$row.device_key_id}.xml_phonebook =
 #Enable or disable the always forward feature; 0-Disabled (default), 1-Enabled;
 forward.always.enable =
 forward.always.target =
-forward.always.on_code = {$yealink_forward_always_on_code}
-forward.always.off_code = {$yealink_forward_always_off_code}
+forward.always.on_code = {$yealink_forward_always_on_code}
+forward.always.off_code = {$yealink_forward_always_off_code}
 
 #######################################################################################
 ##                                   Forward Busy                                    ##
diff --git a/resources/templates/provision/yealink/t48g/{$mac}.cfg b/resources/templates/provision/yealink/t48g/{$mac}.cfg
index 521d006b2a..2e53a0a9de 100644
--- a/resources/templates/provision/yealink/t48g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t48g/{$mac}.cfg
@@ -13,7 +13,7 @@ account.1.enable = 1
 {else}
 account.1.enable = 0
 {/if}
-account.1.label = {$account.1.display_name}
+account.1.label = {$account.1.label}
 account.1.display_name = {$account.1.display_name}
 account.1.auth_name = {$account.1.auth_id}
 account.1.password = {$account.1.password}
@@ -156,10 +156,10 @@ account.1.nat.stun_server = {$stun_server}
 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
+account.1.nat.udp_update_enable = {if isset($account.1.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.1.nat.udp_update_time = 30
+account.1.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.1.nat.rport = {$yealink_rport}
@@ -541,7 +541,7 @@ account.2.enable = 1
 {else}
 account.2.enable = 0
 {/if}
-account.2.label = {$account.2.display_name}
+account.2.label = {$account.2.label}
 account.2.display_name = {$account.2.display_name}
 account.2.auth_name = {$account.2.auth_id}
 account.2.password = {$account.2.password}
@@ -661,10 +661,10 @@ account.2.nat.stun_server = {$stun_server}
 account.2.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.2.nat.udp_update_enable = 1
+account.2.nat.udp_update_enable = {if isset($account.2.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.2.nat.udp_update_time = 30
+account.2.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.2.nat.rport = {$yealink_rport}
@@ -1027,7 +1027,7 @@ account.3.enable = 1
 {else}
 account.3.enable = 0
 {/if}
-account.3.label = {$account.3.display_name}
+account.3.label = {$account.3.label}
 account.3.display_name = {$account.3.display_name}
 account.3.auth_name = {$account.3.auth_id}
 account.3.password = {$account.3.password}
@@ -1147,10 +1147,10 @@ account.3.nat.stun_server = {$stun_server}
 account.3.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.3.nat.udp_update_enable = 1
+account.3.nat.udp_update_enable = {if isset($account.3.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.3.nat.udp_update_time = 30
+account.3.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.3.nat.rport = {$yealink_rport}
@@ -1503,7 +1503,7 @@ account.4.enable = 1
 {else}
 account.4.enable = 0
 {/if}
-account.4.label = {$account.4.display_name}
+account.4.label = {$account.4.label}
 account.4.display_name = {$account.4.display_name}
 account.4.auth_name = {$account.4.auth_id}
 account.4.password = {$account.4.password}
@@ -1623,10 +1623,10 @@ account.4.nat.stun_server = {$stun_server}
 account.4.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.4.nat.udp_update_enable = 1
+account.4.nat.udp_update_enable = {if isset($account.4.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.4.nat.udp_update_time = 30
+account.4.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.4.nat.rport = {$yealink_rport}
@@ -1979,7 +1979,7 @@ account.5.enable = 1
 {else}
 account.5.enable = 0
 {/if}
-account.5.label = {$account.5.display_name}
+account.5.label = {$account.5.label}
 account.5.display_name = {$account.5.display_name}
 account.5.auth_name = {$account.5.auth_id}
 account.5.password = {$account.5.password}
@@ -2099,10 +2099,10 @@ account.5.nat.stun_server = {$stun_server}
 account.5.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.5.nat.udp_update_enable = 1
+account.5.nat.udp_update_enable = {if isset($account.5.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.5.nat.udp_update_time = 30
+account.5.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.5.nat.rport = {$yealink_rport}
@@ -2455,7 +2455,7 @@ account.6.enable = 1
 {else}
 account.6.enable = 0
 {/if}
-account.6.label = {$account.6.display_name}
+account.6.label = {$account.6.label}
 account.6.display_name = {$account.6.display_name}
 account.6.auth_name = {$account.6.auth_id}
 account.6.password = {$account.6.password}
@@ -2574,10 +2574,10 @@ account.6.nat.stun_server =
 account.6.nat.stun_port = 3478
 
 #Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
-account.6.nat.udp_update_enable = 1
+account.6.nat.udp_update_enable = {if isset($account.6.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.6.nat.udp_update_time = 30
+account.6.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.6.nat.rport = {$yealink_rport}
@@ -3078,4 +3078,3 @@ expansion_module.6.key.{$row.device_key_id}.label = {$row.device_key_label}
 expansion_module.6.key.{$row.device_key_id}.xml_phonebook =
 
 {/foreach}
-
diff --git a/resources/templates/provision/yealink/t48s/directory.xml b/resources/templates/provision/yealink/t48s/directory.xml
index 297b9e4108..86c7b6f8b5 100644
--- a/resources/templates/provision/yealink/t48s/directory.xml
+++ b/resources/templates/provision/yealink/t48s/directory.xml
@@ -2,50 +2,58 @@
 {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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-	<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
 </DirectoryEntry>
 {elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
 <DirectoryEntry>
-{if $row.contact_name_given != ""}
+{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 != ""}
+{if $row.phone_number}
 	<Telephone>{$row.phone_number}</Telephone>
 {else}
 	<Telephone>{$row.phone_extension}</Telephone>
@@ -53,29 +61,29 @@
 </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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$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}
+{if isset($row.numbers)}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
 {/if}
 </DirectoryEntry>
 {/if}
diff --git a/resources/templates/provision/yealink/t48s/y000000000065.cfg b/resources/templates/provision/yealink/t48s/y000000000065.cfg
index 7d0fbccd68..2daa9ec0e3 100644
--- a/resources/templates/provision/yealink/t48s/y000000000065.cfg
+++ b/resources/templates/provision/yealink/t48s/y000000000065.cfg
@@ -381,7 +381,7 @@ 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.trust_certificates = {$yealink_trust_certificates}
 
 static.security.user_password = {$var_name}:{$var_password}
 static.security.user_password = {$admin_name}:{$admin_password}
@@ -456,7 +456,8 @@ features.anonymous_response_code=
 ##                          Call Configuration                                       ##
 #######################################################################################
 phone_setting.incoming_call_when_dialing.priority=
-phone_setting.hold_or_swap.mode=
+{if isset($yealink_hold_or_swap_mode)}phone_setting.hold_or_swap.mode = {$yealink_hold_or_swap_mode}{else}phone_setting.hold_or_swap.mode = 0{/if}
+
 features.play_held_tone.interval=
 features.play_held_tone.delay=
 features.play_held_tone.enable=
@@ -486,7 +487,7 @@ features.headset_training=
 features.headset_prior=
 features.dtmf.replace_tran =
 features.dtmf.transfer =
-phone_setting.ringing_timeout=
+phone_setting.ringing_timeout = {$yealink_ringing_timeout}
 phone_setting.ringback_timeout=
 features.hold_trans_delay=
 transfer.multi_call_trans_enable =
@@ -1379,7 +1380,7 @@ dialplan_replace_rule.url=
 dialplan.replace.line_id.1=
 dialplan.replace.replace.1=
 dialplan.replace.prefix.1=
-phone_setting.dialnow_delay=
+phone_setting.dialnow_delay = {$yealink_dialplan_dialnow_delay}
 dialplan_dialnow.url=
 dialnow.item.1=
 dialplan.dialnow.line_id.1=
@@ -1460,20 +1461,43 @@ 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=
+features.power_saving.enable = {$yealink_ps_enabled}
+##Written in 24hr
+features.power_saving.power_led_flash.on_time = {$yealink_ps_led_on}
+features.power_saving.power_led_flash.off_time = {$yealink_ps_led_off}
+
+##Written in 24hr, values should be comma delimited, e.g. 9,17
+{if isset($yealink_ps_days_all)}
+features.power_saving.office_hour.monday = {$yealink_ps_days_all}
+features.power_saving.office_hour.tuesday = {$yealink_ps_days_all}
+features.power_saving.office_hour.wednesday = {$yealink_ps_days_all}
+features.power_saving.office_hour.thursday = {$yealink_ps_days_all}
+features.power_saving.office_hour.friday = {$yealink_ps_days_all}
+features.power_saving.office_hour.saturday = {$yealink_ps_days_all}
+features.power_saving.office_hour.sunday = {$yealink_ps_days_all}
+{elseif isset($yealink_ps_days_workweek)}
+features.power_saving.office_hour.monday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.tuesday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.wednesday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.thursday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.friday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday}
+features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday}
+{else}
+features.power_saving.office_hour.monday = {$yealink_ps_day_monday}
+features.power_saving.office_hour.tuesday = {$yealink_ps_day_tuesday}
+features.power_saving.office_hour.wednesday = {$yealink_ps_day_wednesday}
+features.power_saving.office_hour.thursday = {$yealink_ps_day_thursday}
+features.power_saving.office_hour.friday = {$yealink_ps_day_friday}
+features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday}
+features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday}
+{/if}
+
+##Written in minutes
+features.power_saving.user_input_ext.idle_timeout = {$yealink_ps_idle_timeout}
+features.power_saving.off_hour.idle_timeout = {$yealink_ps_offhour_timeout}
+features.power_saving.office_hour.idle_timeout = {$yealink_ps_hour_timeout}
+features.power_saving.intelligent_mode = {$yealink_ps_intel_mode}
 
 
 #######################################################################################
diff --git a/resources/templates/provision/yealink/t48s/{$mac}.cfg b/resources/templates/provision/yealink/t48s/{$mac}.cfg
index 3058905f95..b13108b171 100644
--- a/resources/templates/provision/yealink/t48s/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t48s/{$mac}.cfg
@@ -13,7 +13,7 @@ account.1.enable = 1
 {else}
 account.1.enable = 0
 {/if}
-account.1.label = {$account.1.display_name}
+account.1.label = {$account.1.label}
 account.1.display_name = {$account.1.display_name}
 account.1.auth_name = {$account.1.auth_id}
 account.1.password = {$account.1.password}
@@ -156,7 +156,7 @@ account.1.nat.stun_server = {$stun_server}
 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
+account.1.nat.udp_update_enable = {if isset($account.1.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
 account.1.nat.udp_update_time = 30
@@ -540,7 +540,7 @@ account.2.enable = 1
 {else}
 account.2.enable = 0
 {/if}
-account.2.label = {$account.2.display_name}
+account.2.label = {$account.2.label}
 account.2.display_name = {$account.2.display_name}
 account.2.auth_name = {$account.2.auth_id}
 account.2.password = {$account.2.password}
@@ -660,7 +660,7 @@ account.2.nat.stun_server = {$stun_server}
 account.2.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.2.nat.udp_update_enable = 1
+account.2.nat.udp_update_enable = {if isset($account.2.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
 account.2.nat.udp_update_time = 30
@@ -1026,7 +1026,7 @@ account.3.enable = 1
 {else}
 account.3.enable = 0
 {/if}
-account.3.label = {$account.3.display_name}
+account.3.label = {$account.3.label}
 account.3.display_name = {$account.3.display_name}
 account.3.auth_name = {$account.3.auth_id}
 account.3.password = {$account.3.password}
@@ -1146,7 +1146,7 @@ account.3.nat.stun_server = {$stun_server}
 account.3.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.3.nat.udp_update_enable = 1
+account.3.nat.udp_update_enable = {if isset($account.3.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
 account.3.nat.udp_update_time = 30
@@ -1503,7 +1503,7 @@ account.4.enable = 1
 {else}
 account.4.enable = 0
 {/if}
-account.4.label = {$account.4.display_name}
+account.4.label = {$account.4.label}
 account.4.display_name = {$account.4.display_name}
 account.4.auth_name = {$account.4.auth_id}
 account.4.password = {$account.4.password}
@@ -1623,7 +1623,7 @@ account.4.nat.stun_server = {$stun_server}
 account.4.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.4.nat.udp_update_enable = 1
+account.4.nat.udp_update_enable = {if isset($account.4.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
 account.4.nat.udp_update_time = 30
@@ -1975,7 +1975,7 @@ account.5.enable = 1
 {else}
 account.5.enable = 0
 {/if}
-account.5.label = {$account.5.display_name}
+account.5.label = {$account.5.label}
 account.5.display_name = {$account.5.display_name}
 account.5.auth_name = {$account.5.auth_id}
 account.5.password = {$account.5.password}
@@ -2095,7 +2095,7 @@ account.5.nat.stun_server = {$stun_server}
 account.5.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.5.nat.udp_update_enable = 1
+account.5.nat.udp_update_enable = {if isset($account.5.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
 account.5.nat.udp_update_time = 30
@@ -2447,7 +2447,7 @@ account.6.enable = 1
 {else}
 account.6.enable = 0
 {/if}
-account.6.label = {$account.6.display_name}
+account.6.label = {$account.6.label}
 account.6.display_name = {$account.6.display_name}
 account.6.auth_name = {$account.6.auth_id}
 account.6.password = {$account.6.password}
@@ -2566,7 +2566,7 @@ account.6.nat.stun_server =
 account.6.nat.stun_port = 3478
 
 #Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
-account.6.nat.udp_update_enable = 1
+account.6.nat.udp_update_enable = {if isset($account.6.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
 account.6.nat.udp_update_time = 30
@@ -3057,4 +3057,3 @@ expansion_module.6.key.{$row.device_key_id}.label = {$row.device_key_label}
 expansion_module.6.key.{$row.device_key_id}.xml_phonebook =
 
 {/foreach}
-
diff --git a/resources/templates/provision/yealink/t48u/directory.xml b/resources/templates/provision/yealink/t48u/directory.xml
new file mode 100644
index 0000000000..86c7b6f8b5
--- /dev/null
+++ b/resources/templates/provision/yealink/t48u/directory.xml
@@ -0,0 +1,91 @@
+<YealinkIPPhoneDirectory>
+{foreach $contacts as $row}
+{if $smarty.get.contacts == "users" && $row.category == "users"}
+<DirectoryEntry>
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</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_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</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_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
+{/if}
+{if isset($row.numbers)}
+{foreach $row.numbers as $number}
+{if $number.phone_number}
+	<Telephone>{$number.phone_number}</Telephone>
+{else}
+	<Telephone>{$number.phone_extension}</Telephone>
+{/if}
+{/foreach}
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
+{/if}
+</DirectoryEntry>
+{/if}
+{/foreach}
+</YealinkIPPhoneDirectory>
diff --git a/resources/templates/provision/yealink/t48u/favorite_setting.xml b/resources/templates/provision/yealink/t48u/favorite_setting.xml
new file mode 100644
index 0000000000..ba7275358e
--- /dev/null
+++ b/resources/templates/provision/yealink/t48u/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/t48u/super_search.xml b/resources/templates/provision/yealink/t48u/super_search.xml
new file mode 100644
index 0000000000..31f9f2bf47
--- /dev/null
+++ b/resources/templates/provision/yealink/t48u/super_search.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<root_super_search>
+	<item id_name="local_directory_search" display_name="Local Directory" priority="1" enable="1" />
+	<item id_name="calllog_search" display_name="History" priority="2" enable="1" />
+	<item id_name="remote_directory_search" display_name="Remote Phone Book" priority="3" enable="1" />
+	<!-- <item id_name="ldap_search" display_name="LDAP" priority="4" enable="0" dev="T19 T21 T23 T40 T40G T27 T27G T29 T41 T42 T42S T41S T46 T46S T54S T52 T48 T48S T49 T61 T66 T69 T69S CP860 DECT CP920 T54W T53W T53 T57W"/> -->
+</root_super_search>
diff --git a/resources/templates/provision/yealink/t48u/y000000000000.boot b/resources/templates/provision/yealink/t48u/y000000000000.boot
new file mode 100644
index 0000000000..a041c7bba8
--- /dev/null
+++ b/resources/templates/provision/yealink/t48u/y000000000000.boot
@@ -0,0 +1,7 @@
+#!version:1.0.0.1
+## The header above must appear as-is in the first line
+
+include:config "y000000000109.cfg"
+include:config "{$mac}.cfg"
+
+overwrite_mode = {$yealink_overwrite_mode}
diff --git a/resources/templates/provision/yealink/t48u/y000000000109.cfg b/resources/templates/provision/yealink/t48u/y000000000109.cfg
new file mode 100644
index 0000000000..c44e83a90d
--- /dev/null
+++ b/resources/templates/provision/yealink/t48u/y000000000109.cfg
@@ -0,0 +1,1995 @@
+#!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_t48u}
+
+
+#######################################################################################
+##                            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 = {$yealink_trust_certificates}
+
+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 = 
+
+
+
+
+#######################################################################################
+##                                   Transfer                                        ##
+#######################################################################################
+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 = {$yealink_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 = {$yealink_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 = {$yealink_forward_always_off_code}
+forward.always.on_code = {$yealink_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.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= {$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= {$yealink_screensaver_wait}
+screensaver.xml_browser.url=
+
+
+
+#######################################################################################
+##                                  Power Saving                                     ##
+#######################################################################################
+features.power_saving.enable = {$yealink_ps_enabled}
+##Written in 24hr
+features.power_saving.power_led_flash.on_time = {$yealink_ps_led_on}
+features.power_saving.power_led_flash.off_time = {$yealink_ps_led_off}
+
+##Written in 24hr, values should be comma delimited, e.g. 9,17
+{if isset($yealink_ps_days_all)}
+features.power_saving.office_hour.monday = {$yealink_ps_days_all}
+features.power_saving.office_hour.tuesday = {$yealink_ps_days_all}
+features.power_saving.office_hour.wednesday = {$yealink_ps_days_all}
+features.power_saving.office_hour.thursday = {$yealink_ps_days_all}
+features.power_saving.office_hour.friday = {$yealink_ps_days_all}
+features.power_saving.office_hour.saturday = {$yealink_ps_days_all}
+features.power_saving.office_hour.sunday = {$yealink_ps_days_all}
+{elseif isset($yealink_ps_days_workweek)}
+features.power_saving.office_hour.monday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.tuesday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.wednesday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.thursday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.friday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday}
+features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday}
+{else}
+features.power_saving.office_hour.monday = {$yealink_ps_day_monday}
+features.power_saving.office_hour.tuesday = {$yealink_ps_day_tuesday}
+features.power_saving.office_hour.wednesday = {$yealink_ps_day_wednesday}
+features.power_saving.office_hour.thursday = {$yealink_ps_day_thursday}
+features.power_saving.office_hour.friday = {$yealink_ps_day_friday}
+features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday}
+features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday}
+{/if}
+
+##Written in minutes
+features.power_saving.user_input_ext.idle_timeout = {$yealink_ps_idle_timeout}
+features.power_saving.off_hour.idle_timeout = {$yealink_ps_offhour_timeout}
+features.power_saving.office_hour.idle_timeout = {$yealink_ps_hour_timeout}
+features.power_saving.intelligent_mode = {$yealink_ps_intel_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_t48u_wallpaper}
+{if isset($yealink_t48u_wallpaper_filename)}
+phone_setting.backgrounds =  Config:{$yealink_t48u_wallpaper_filename}
+{else}
+phone_setting.backgrounds =  Config:yealink_t48u_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/t48u/{$mac}.cfg b/resources/templates/provision/yealink/t48u/{$mac}.cfg
new file mode 100644
index 0000000000..e0d184a06b
--- /dev/null
+++ b/resources/templates/provision/yealink/t48u/{$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.label}
+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 = {if isset($account.1.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+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=
+
+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{elseif $nway_conference == 'false'}0{/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.label}
+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 = {if isset($account.2.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+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=
+
+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{elseif $nway_conference == 'false'}0{/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.label}
+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 = {if isset($account.3.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+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=
+
+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{elseif $nway_conference == 'false'}0{/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.label}
+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 = {if isset($account.4.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+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=
+
+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{elseif $nway_conference == 'false'}0{/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.label}
+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 = {if isset($account.5.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+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=
+
+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{elseif $nway_conference == 'false'}0{/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.label}
+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 = {if isset($account.6.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+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=
+
+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{elseif $nway_conference == 'false'}0{/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/t49g/directory.xml b/resources/templates/provision/yealink/t49g/directory.xml
index 3e319dfb50..e730841a96 100644
--- a/resources/templates/provision/yealink/t49g/directory.xml
+++ b/resources/templates/provision/yealink/t49g/directory.xml
@@ -2,50 +2,58 @@
 {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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-	<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
 </DirectoryEntry>
 {elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
 <DirectoryEntry>
-{if $row.contact_name_given != ""}
+{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 != ""}
+{if $row.phone_number}
 	<Telephone>{$row.phone_number}</Telephone>
 {else}
 	<Telephone>{$row.phone_extension}</Telephone>
@@ -53,29 +61,29 @@
 </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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$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}
+{if isset($row.numbers)}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
 {/if}
 </DirectoryEntry>
 {/if}
diff --git a/resources/templates/provision/yealink/t49g/y000000000051.cfg b/resources/templates/provision/yealink/t49g/y000000000051.cfg
index 4e9def2d83..20edaa8cdb 100644
--- a/resources/templates/provision/yealink/t49g/y000000000051.cfg
+++ b/resources/templates/provision/yealink/t49g/y000000000051.cfg
@@ -1004,7 +1004,7 @@ bw.feature_key_sync = {$yealink_feature_key_sync}
 #######################################################################################
 #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}
+security.trust_certificates = {$yealink_trust_certificates}
 
 #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.
@@ -1302,8 +1302,8 @@ expansion_module.2.key.{$row.device_key_id}.xml_phonebook =
 #Enable or disable the always forward feature; 0-Disabled (default), 1-Enabled;
 forward.always.enable =
 forward.always.target =
-forward.always.on_code = {$yealink_forward_always_on_code}
-forward.always.off_code = {$yealink_forward_always_off_code}
+forward.always.on_code = {$yealink_forward_always_on_code}
+forward.always.off_code = {$yealink_forward_always_off_code}
 
 #######################################################################################
 ##                                   Forward Busy                                    ##
diff --git a/resources/templates/provision/yealink/t49g/{$mac}.cfg b/resources/templates/provision/yealink/t49g/{$mac}.cfg
index 8936aed453..c5f31d63fc 100644
--- a/resources/templates/provision/yealink/t49g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t49g/{$mac}.cfg
@@ -13,7 +13,7 @@ account.1.enable = 1
 {else}
 account.1.enable = 0
 {/if}
-account.1.label = {$account.1.display_name}
+account.1.label = {$account.1.label}
 account.1.display_name = {$account.1.display_name}
 account.1.auth_name = {$account.1.auth_id}
 account.1.password = {$account.1.password}
@@ -156,10 +156,10 @@ account.1.nat.stun_server = {$stun_server}
 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
+account.1.nat.udp_update_enable = {if isset($account.1.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.1.nat.udp_update_time = 30
+account.1.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.1.nat.rport = {$yealink_rport}
@@ -541,7 +541,7 @@ account.2.enable = 1
 {else}
 account.2.enable = 0
 {/if}
-account.2.label = {$account.2.display_name}
+account.2.label = {$account.2.label}
 account.2.display_name = {$account.2.display_name}
 account.2.auth_name = {$account.2.auth_id}
 account.2.password = {$account.2.password}
@@ -661,10 +661,10 @@ account.2.nat.stun_server = {$stun_server}
 account.2.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.2.nat.udp_update_enable = 1
+account.2.nat.udp_update_enable = {if isset($account.2.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.2.nat.udp_update_time = 30
+account.2.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.2.nat.rport = {$yealink_rport}
@@ -1066,7 +1066,7 @@ account.3.enable = 1
 {else}
 account.3.enable = 0
 {/if}
-account.3.label = {$account.3.display_name}
+account.3.label = {$account.3.label}
 account.3.display_name = {$account.3.display_name}
 account.3.auth_name = {$account.3.auth_id}
 account.3.password = {$account.3.password}
@@ -1186,10 +1186,10 @@ account.3.nat.stun_server = {$stun_server}
 account.3.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.3.nat.udp_update_enable = 1
+account.3.nat.udp_update_enable = {if isset($account.3.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.3.nat.udp_update_time = 30
+account.3.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.3.nat.rport = {$yealink_rport}
@@ -1565,7 +1565,7 @@ account.4.enable = 1
 {else}
 account.4.enable = 0
 {/if}
-account.4.label = {$account.4.display_name}
+account.4.label = {$account.4.label}
 account.4.display_name = {$account.4.display_name}
 account.4.auth_name = {$account.4.auth_id}
 account.4.password = {$account.4.password}
@@ -1685,10 +1685,10 @@ account.4.nat.stun_server = {$stun_server}
 account.4.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.4.nat.udp_update_enable = 1
+account.4.nat.udp_update_enable = {if isset($account.4.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.4.nat.udp_update_time = 30
+account.4.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.4.nat.rport = {$yealink_rport}
@@ -2064,7 +2064,7 @@ account.5.enable = 1
 {else}
 account.5.enable = 0
 {/if}
-account.5.label = {$account.5.display_name}
+account.5.label = {$account.5.label}
 account.5.display_name = {$account.5.display_name}
 account.5.auth_name = {$account.5.auth_id}
 account.5.password = {$account.5.password}
@@ -2184,10 +2184,10 @@ account.5.nat.stun_server = {$stun_server}
 account.5.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.5.nat.udp_update_enable = 1
+account.5.nat.udp_update_enable = {if isset($account.5.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.5.nat.udp_update_time = 30
+account.5.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.5.nat.rport = {$yealink_rport}
@@ -2563,7 +2563,7 @@ account.6.enable = 1
 {else}
 account.6.enable = 0
 {/if}
-account.6.label = {$account.6.display_name}
+account.6.label = {$account.6.label}
 account.6.display_name = {$account.6.display_name}
 account.6.auth_name = {$account.6.auth_id}
 account.6.password = {$account.6.password}
@@ -2682,10 +2682,10 @@ account.6.nat.stun_server =
 account.6.nat.stun_port = 3478
 
 #Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
-account.6.nat.udp_update_enable = 1
+account.6.nat.udp_update_enable = {if isset($account.6.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.6.nat.udp_update_time = 30
+account.6.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.6.nat.rport = {$yealink_rport}
diff --git a/resources/templates/provision/yealink/t4x/directory.xml b/resources/templates/provision/yealink/t4x/directory.xml
index 297b9e4108..86c7b6f8b5 100644
--- a/resources/templates/provision/yealink/t4x/directory.xml
+++ b/resources/templates/provision/yealink/t4x/directory.xml
@@ -2,50 +2,58 @@
 {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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-	<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
 </DirectoryEntry>
 {elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
 <DirectoryEntry>
-{if $row.contact_name_given != ""}
+{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 != ""}
+{if $row.phone_number}
 	<Telephone>{$row.phone_number}</Telephone>
 {else}
 	<Telephone>{$row.phone_extension}</Telephone>
@@ -53,29 +61,29 @@
 </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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$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}
+{if isset($row.numbers)}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
 {/if}
 </DirectoryEntry>
 {/if}
diff --git a/resources/templates/provision/yealink/t4x/y000000000028.cfg b/resources/templates/provision/yealink/t4x/y000000000028.cfg
index 817ab34fc7..b86d775276 100644
--- a/resources/templates/provision/yealink/t4x/y000000000028.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000028.cfg
@@ -1044,7 +1044,7 @@ bw.feature_key_sync = {$yealink_feature_key_sync}
 #######################################################################################
 #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}
+security.trust_certificates = {$yealink_trust_certificates}
 
 #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.
@@ -1360,8 +1360,8 @@ expansion_module.2.key.{$row.device_key_id}.xml_phonebook =
 #Enable or disable the always forward feature; 0-Disabled (default), 1-Enabled;
 forward.always.enable =
 forward.always.target =
-forward.always.on_code = {$yealink_forward_always_on_code}
-forward.always.off_code = {$yealink_forward_always_off_code}
+forward.always.on_code = {$yealink_forward_always_on_code}
+forward.always.off_code = {$yealink_forward_always_off_code}
 
 #######################################################################################
 ##                                   Forward Busy                                    ##
diff --git a/resources/templates/provision/yealink/t4x/y000000000029.cfg b/resources/templates/provision/yealink/t4x/y000000000029.cfg
index 3bed6174ba..2c3369fb13 100644
--- a/resources/templates/provision/yealink/t4x/y000000000029.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000029.cfg
@@ -1045,7 +1045,7 @@ bw.feature_key_sync = {$yealink_feature_key_sync}
 #######################################################################################
 #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}
+security.trust_certificates = {$yealink_trust_certificates}
 
 #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.
@@ -1343,8 +1343,8 @@ expansion_module.2.key.{$row.device_key_id}.xml_phonebook =
 #Enable or disable the always forward feature; 0-Disabled (default), 1-Enabled;
 forward.always.enable =
 forward.always.target =
-forward.always.on_code = {$yealink_forward_always_on_code}
-forward.always.off_code = {$yealink_forward_always_off_code}
+forward.always.on_code = {$yealink_forward_always_on_code}
+forward.always.off_code = {$yealink_forward_always_off_code}
 
 #######################################################################################
 ##                                   Forward Busy                                    ##
diff --git a/resources/templates/provision/yealink/t4x/y000000000035.cfg b/resources/templates/provision/yealink/t4x/y000000000035.cfg
index 4f0a8e79db..fc9333a07c 100644
--- a/resources/templates/provision/yealink/t4x/y000000000035.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000035.cfg
@@ -1044,7 +1044,7 @@ bw.feature_key_sync = {$yealink_feature_key_sync}
 #######################################################################################
 #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}
+security.trust_certificates = {$yealink_trust_certificates}
 
 #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.
@@ -1342,8 +1342,8 @@ expansion_module.2.key.{$row.device_key_id}.xml_phonebook =
 #Enable or disable the always forward feature; 0-Disabled (default), 1-Enabled;
 forward.always.enable =
 forward.always.target =
-forward.always.on_code = {$yealink_forward_always_on_code}
-forward.always.off_code = {$yealink_forward_always_off_code}
+forward.always.on_code = {$yealink_forward_always_on_code}
+forward.always.off_code = {$yealink_forward_always_off_code}
 
 #######################################################################################
 ##                                   Forward Busy                                    ##
diff --git a/resources/templates/provision/yealink/t4x/y000000000036.cfg b/resources/templates/provision/yealink/t4x/y000000000036.cfg
index 4e27649ff6..f6731195df 100644
--- a/resources/templates/provision/yealink/t4x/y000000000036.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000036.cfg
@@ -1064,7 +1064,7 @@ local.dsskey_type_config.mode =
 #######################################################################################
 #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}
+security.trust_certificates = {$yealink_trust_certificates}
 
 #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.
@@ -1362,8 +1362,8 @@ expansion_module.2.key.{$row.device_key_id}.xml_phonebook =
 #Enable or disable the always forward feature; 0-Disabled (default), 1-Enabled;
 forward.always.enable =
 forward.always.target =
-forward.always.on_code = {$yealink_forward_always_on_code}
-forward.always.off_code = {$yealink_forward_always_off_code}
+forward.always.on_code = {$yealink_forward_always_on_code}
+forward.always.off_code = {$yealink_forward_always_off_code}
 
 #######################################################################################
 ##                                   Forward Busy                                    ##
diff --git a/resources/templates/provision/yealink/t4x/y000000000054.cfg b/resources/templates/provision/yealink/t4x/y000000000054.cfg
index c5247e5a3a..3643a46a14 100644
--- a/resources/templates/provision/yealink/t4x/y000000000054.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000054.cfg
@@ -1046,7 +1046,7 @@ bw.feature_key_sync = {$yealink_feature_key_sync}
 #######################################################################################
 #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}
+security.trust_certificates = {$yealink_trust_certificates}
 
 #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.
diff --git a/resources/templates/provision/yealink/t4x/y000000000065.cfg b/resources/templates/provision/yealink/t4x/y000000000065.cfg
index 94bdea4238..813a179824 100644
--- a/resources/templates/provision/yealink/t4x/y000000000065.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000065.cfg
@@ -381,7 +381,7 @@ static.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.trust_certificates = {$yealink_trust_certificates}
 static.security.user_password = {$var_name}:{$var_password}
 static.security.user_password = {$admin_name}:{$admin_password}
 static.security.user_password = {$user_name}:{$user_password}
@@ -485,7 +485,7 @@ features.headset_training=
 features.headset_prior=
 features.dtmf.replace_tran =
 features.dtmf.transfer =
-phone_setting.ringing_timeout=
+phone_setting.ringing_timeout = {$yealink_ringing_timeout}
 phone_setting.ringback_timeout=
 features.hold_trans_delay=
 transfer.multi_call_trans_enable =
@@ -1460,10 +1460,11 @@ screensaver.xml_browser.url=
 ##                                  Power Saving                                     ##
 #######################################################################################
 features.power_saving.enable = {$yealink_ps_enabled}
-
+##Written in 24hr
 features.power_saving.power_led_flash.on_time = {$yealink_ps_led_on}
 features.power_saving.power_led_flash.off_time = {$yealink_ps_led_off}
 
+##Written in 24hr, values should be comma delimited, e.g. 9,17
 {if isset($yealink_ps_days_all)}
 features.power_saving.office_hour.monday = {$yealink_ps_days_all}
 features.power_saving.office_hour.tuesday = {$yealink_ps_days_all}
@@ -1490,6 +1491,7 @@ features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday}
 features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday}
 {/if}
 
+##Written in minutes
 features.power_saving.user_input_ext.idle_timeout = {$yealink_ps_idle_timeout}
 features.power_saving.off_hour.idle_timeout = {$yealink_ps_offhour_timeout}
 features.power_saving.office_hour.idle_timeout = {$yealink_ps_hour_timeout}
diff --git a/resources/templates/provision/yealink/t4x/y000000000066.cfg b/resources/templates/provision/yealink/t4x/y000000000066.cfg
index 90b0f91020..7c6957a478 100644
--- a/resources/templates/provision/yealink/t4x/y000000000066.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000066.cfg
@@ -340,7 +340,7 @@ static.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.trust_certificates = {$yealink_trust_certificates}
 static.security.user_password = {$var_name}:{$var_password}
 static.security.user_password = {$admin_name}:{$admin_password}
 static.security.user_password = {$user_name}:{$user_password}
@@ -444,7 +444,7 @@ features.headset_training=
 features.headset_prior=
 features.dtmf.replace_tran =
 features.dtmf.transfer =
-phone_setting.ringing_timeout=
+phone_setting.ringing_timeout = {$yealink_ringing_timeout}
 phone_setting.ringback_timeout=
 features.hold_trans_delay=
 transfer.multi_call_trans_enable =
@@ -1410,10 +1410,11 @@ screensaver.xml_browser.url=
 ##                                  Power Saving                                     ##
 #######################################################################################
 features.power_saving.enable = {$yealink_ps_enabled}
-
+##Written in 24hr
 features.power_saving.power_led_flash.on_time = {$yealink_ps_led_on}
 features.power_saving.power_led_flash.off_time = {$yealink_ps_led_off}
 
+##Written in 24hr, values should be comma delimited, e.g. 9,17
 {if isset($yealink_ps_days_all)}
 features.power_saving.office_hour.monday = {$yealink_ps_days_all}
 features.power_saving.office_hour.tuesday = {$yealink_ps_days_all}
@@ -1440,6 +1441,7 @@ features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday}
 features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday}
 {/if}
 
+##Written in minutes
 features.power_saving.user_input_ext.idle_timeout = {$yealink_ps_idle_timeout}
 features.power_saving.off_hour.idle_timeout = {$yealink_ps_offhour_timeout}
 features.power_saving.office_hour.idle_timeout = {$yealink_ps_hour_timeout}
diff --git a/resources/templates/provision/yealink/t4x/y000000000067.cfg b/resources/templates/provision/yealink/t4x/y000000000067.cfg
index 86a9325c8d..4cbb3f5341 100644
--- a/resources/templates/provision/yealink/t4x/y000000000067.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000067.cfg
@@ -340,7 +340,7 @@ static.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.trust_certificates = {$yealink_trust_certificates}
 static.security.user_password = {$var_name}:{$var_password}
 static.security.user_password = {$admin_name}:{$admin_password}
 static.security.user_password = {$user_name}:{$user_password}
@@ -444,7 +444,7 @@ features.headset_training=
 features.headset_prior=
 features.dtmf.replace_tran =
 features.dtmf.transfer =
-phone_setting.ringing_timeout=
+phone_setting.ringing_timeout = {$yealink_ringing_timeout}
 phone_setting.ringback_timeout=
 features.hold_trans_delay=
 transfer.multi_call_trans_enable =
@@ -1409,10 +1409,11 @@ screensaver.xml_browser.url=
 ##                                  Power Saving                                     ##
 #######################################################################################
 features.power_saving.enable = {$yealink_ps_enabled}
-
+##Written in 24hr
 features.power_saving.power_led_flash.on_time = {$yealink_ps_led_on}
 features.power_saving.power_led_flash.off_time = {$yealink_ps_led_off}
 
+##Written in 24hr, values should be comma delimited, e.g. 9,17
 {if isset($yealink_ps_days_all)}
 features.power_saving.office_hour.monday = {$yealink_ps_days_all}
 features.power_saving.office_hour.tuesday = {$yealink_ps_days_all}
@@ -1439,6 +1440,7 @@ features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday}
 features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday}
 {/if}
 
+##Written in minutes
 features.power_saving.user_input_ext.idle_timeout = {$yealink_ps_idle_timeout}
 features.power_saving.off_hour.idle_timeout = {$yealink_ps_offhour_timeout}
 features.power_saving.office_hour.idle_timeout = {$yealink_ps_hour_timeout}
diff --git a/resources/templates/provision/yealink/t4x/y000000000068.cfg b/resources/templates/provision/yealink/t4x/y000000000068.cfg
index 170425bd20..84546c45cc 100644
--- a/resources/templates/provision/yealink/t4x/y000000000068.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000068.cfg
@@ -340,7 +340,7 @@ static.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.trust_certificates = {$yealink_trust_certificates}
 static.security.user_password = {$var_name}:{$var_password}
 static.security.user_password = {$admin_name}:{$admin_password}
 static.security.user_password = {$user_name}:{$user_password}
@@ -444,7 +444,7 @@ features.headset_training=
 features.headset_prior=
 features.dtmf.replace_tran =
 features.dtmf.transfer =
-phone_setting.ringing_timeout=
+phone_setting.ringing_timeout = {$yealink_ringing_timeout}
 phone_setting.ringback_timeout=
 features.hold_trans_delay=
 transfer.multi_call_trans_enable =
@@ -1413,10 +1413,11 @@ screensaver.xml_browser.url=
 ##                                  Power Saving                                     ##
 #######################################################################################
 features.power_saving.enable = {$yealink_ps_enabled}
-
+##Written in 24hr
 features.power_saving.power_led_flash.on_time = {$yealink_ps_led_on}
 features.power_saving.power_led_flash.off_time = {$yealink_ps_led_off}
 
+##Written in 24hr, values should be comma delimited, e.g. 9,17
 {if isset($yealink_ps_days_all)}
 features.power_saving.office_hour.monday = {$yealink_ps_days_all}
 features.power_saving.office_hour.tuesday = {$yealink_ps_days_all}
@@ -1443,6 +1444,7 @@ features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday}
 features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday}
 {/if}
 
+##Written in minutes
 features.power_saving.user_input_ext.idle_timeout = {$yealink_ps_idle_timeout}
 features.power_saving.off_hour.idle_timeout = {$yealink_ps_offhour_timeout}
 features.power_saving.office_hour.idle_timeout = {$yealink_ps_hour_timeout}
diff --git a/resources/templates/provision/yealink/t4x/y000000000076.cfg b/resources/templates/provision/yealink/t4x/y000000000076.cfg
index 01f72595f5..7fec33aad9 100644
--- a/resources/templates/provision/yealink/t4x/y000000000076.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000076.cfg
@@ -1064,7 +1064,7 @@ local.dsskey_type_config.mode =
 #######################################################################################
 #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}
+security.trust_certificates = {$yealink_trust_certificates}
 
 #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.
diff --git a/resources/templates/provision/yealink/t4x/y000000000107.cfg b/resources/templates/provision/yealink/t4x/y000000000107.cfg
index 94bdea4238..813a179824 100644
--- a/resources/templates/provision/yealink/t4x/y000000000107.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000107.cfg
@@ -381,7 +381,7 @@ static.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.trust_certificates = {$yealink_trust_certificates}
 static.security.user_password = {$var_name}:{$var_password}
 static.security.user_password = {$admin_name}:{$admin_password}
 static.security.user_password = {$user_name}:{$user_password}
@@ -485,7 +485,7 @@ features.headset_training=
 features.headset_prior=
 features.dtmf.replace_tran =
 features.dtmf.transfer =
-phone_setting.ringing_timeout=
+phone_setting.ringing_timeout = {$yealink_ringing_timeout}
 phone_setting.ringback_timeout=
 features.hold_trans_delay=
 transfer.multi_call_trans_enable =
@@ -1460,10 +1460,11 @@ screensaver.xml_browser.url=
 ##                                  Power Saving                                     ##
 #######################################################################################
 features.power_saving.enable = {$yealink_ps_enabled}
-
+##Written in 24hr
 features.power_saving.power_led_flash.on_time = {$yealink_ps_led_on}
 features.power_saving.power_led_flash.off_time = {$yealink_ps_led_off}
 
+##Written in 24hr, values should be comma delimited, e.g. 9,17
 {if isset($yealink_ps_days_all)}
 features.power_saving.office_hour.monday = {$yealink_ps_days_all}
 features.power_saving.office_hour.tuesday = {$yealink_ps_days_all}
@@ -1490,6 +1491,7 @@ features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday}
 features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday}
 {/if}
 
+##Written in minutes
 features.power_saving.user_input_ext.idle_timeout = {$yealink_ps_idle_timeout}
 features.power_saving.off_hour.idle_timeout = {$yealink_ps_offhour_timeout}
 features.power_saving.office_hour.idle_timeout = {$yealink_ps_hour_timeout}
diff --git a/resources/templates/provision/yealink/t4x/y000000000108.cfg b/resources/templates/provision/yealink/t4x/y000000000108.cfg
index 669f55694c..4225719b21 100644
--- a/resources/templates/provision/yealink/t4x/y000000000108.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000108.cfg
@@ -340,7 +340,7 @@ static.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.trust_certificates = {$yealink_trust_certificates}
 static.security.user_password = {$var_name}:{$var_password}
 static.security.user_password = {$admin_name}:{$admin_password}
 static.security.user_password = {$user_name}:{$user_password}
@@ -444,7 +444,7 @@ features.headset_training=
 features.headset_prior=
 features.dtmf.replace_tran =
 features.dtmf.transfer =
-phone_setting.ringing_timeout=
+phone_setting.ringing_timeout = {$yealink_ringing_timeout}
 phone_setting.ringback_timeout=
 features.hold_trans_delay=
 transfer.multi_call_trans_enable =
@@ -1410,10 +1410,11 @@ screensaver.xml_browser.url=
 ##                                  Power Saving                                     ##
 #######################################################################################
 features.power_saving.enable = {$yealink_ps_enabled}
-
+##Written in 24hr
 features.power_saving.power_led_flash.on_time = {$yealink_ps_led_on}
 features.power_saving.power_led_flash.off_time = {$yealink_ps_led_off}
 
+##Written in 24hr, values should be comma delimited, e.g. 9,17
 {if isset($yealink_ps_days_all)}
 features.power_saving.office_hour.monday = {$yealink_ps_days_all}
 features.power_saving.office_hour.tuesday = {$yealink_ps_days_all}
@@ -1440,6 +1441,7 @@ features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday}
 features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday}
 {/if}
 
+##Written in minutes
 features.power_saving.user_input_ext.idle_timeout = {$yealink_ps_idle_timeout}
 features.power_saving.off_hour.idle_timeout = {$yealink_ps_offhour_timeout}
 features.power_saving.office_hour.idle_timeout = {$yealink_ps_hour_timeout}
diff --git a/resources/templates/provision/yealink/t4x/y000000000109.cfg b/resources/templates/provision/yealink/t4x/y000000000109.cfg
index 94bdea4238..813a179824 100644
--- a/resources/templates/provision/yealink/t4x/y000000000109.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000109.cfg
@@ -381,7 +381,7 @@ static.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.trust_certificates = {$yealink_trust_certificates}
 static.security.user_password = {$var_name}:{$var_password}
 static.security.user_password = {$admin_name}:{$admin_password}
 static.security.user_password = {$user_name}:{$user_password}
@@ -485,7 +485,7 @@ features.headset_training=
 features.headset_prior=
 features.dtmf.replace_tran =
 features.dtmf.transfer =
-phone_setting.ringing_timeout=
+phone_setting.ringing_timeout = {$yealink_ringing_timeout}
 phone_setting.ringback_timeout=
 features.hold_trans_delay=
 transfer.multi_call_trans_enable =
@@ -1460,10 +1460,11 @@ screensaver.xml_browser.url=
 ##                                  Power Saving                                     ##
 #######################################################################################
 features.power_saving.enable = {$yealink_ps_enabled}
-
+##Written in 24hr
 features.power_saving.power_led_flash.on_time = {$yealink_ps_led_on}
 features.power_saving.power_led_flash.off_time = {$yealink_ps_led_off}
 
+##Written in 24hr, values should be comma delimited, e.g. 9,17
 {if isset($yealink_ps_days_all)}
 features.power_saving.office_hour.monday = {$yealink_ps_days_all}
 features.power_saving.office_hour.tuesday = {$yealink_ps_days_all}
@@ -1490,6 +1491,7 @@ features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday}
 features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday}
 {/if}
 
+##Written in minutes
 features.power_saving.user_input_ext.idle_timeout = {$yealink_ps_idle_timeout}
 features.power_saving.off_hour.idle_timeout = {$yealink_ps_offhour_timeout}
 features.power_saving.office_hour.idle_timeout = {$yealink_ps_hour_timeout}
diff --git a/resources/templates/provision/yealink/t4x/y000000000116.cfg b/resources/templates/provision/yealink/t4x/y000000000116.cfg
index 86a9325c8d..4cbb3f5341 100644
--- a/resources/templates/provision/yealink/t4x/y000000000116.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000116.cfg
@@ -340,7 +340,7 @@ static.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.trust_certificates = {$yealink_trust_certificates}
 static.security.user_password = {$var_name}:{$var_password}
 static.security.user_password = {$admin_name}:{$admin_password}
 static.security.user_password = {$user_name}:{$user_password}
@@ -444,7 +444,7 @@ features.headset_training=
 features.headset_prior=
 features.dtmf.replace_tran =
 features.dtmf.transfer =
-phone_setting.ringing_timeout=
+phone_setting.ringing_timeout = {$yealink_ringing_timeout}
 phone_setting.ringback_timeout=
 features.hold_trans_delay=
 transfer.multi_call_trans_enable =
@@ -1409,10 +1409,11 @@ screensaver.xml_browser.url=
 ##                                  Power Saving                                     ##
 #######################################################################################
 features.power_saving.enable = {$yealink_ps_enabled}
-
+##Written in 24hr
 features.power_saving.power_led_flash.on_time = {$yealink_ps_led_on}
 features.power_saving.power_led_flash.off_time = {$yealink_ps_led_off}
 
+##Written in 24hr, values should be comma delimited, e.g. 9,17
 {if isset($yealink_ps_days_all)}
 features.power_saving.office_hour.monday = {$yealink_ps_days_all}
 features.power_saving.office_hour.tuesday = {$yealink_ps_days_all}
@@ -1439,6 +1440,7 @@ features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday}
 features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday}
 {/if}
 
+##Written in minutes
 features.power_saving.user_input_ext.idle_timeout = {$yealink_ps_idle_timeout}
 features.power_saving.off_hour.idle_timeout = {$yealink_ps_offhour_timeout}
 features.power_saving.office_hour.idle_timeout = {$yealink_ps_hour_timeout}
diff --git a/resources/templates/provision/yealink/t4x/{$mac}.cfg b/resources/templates/provision/yealink/t4x/{$mac}.cfg
index 7dc01d9b7f..14e0cb1749 100644
--- a/resources/templates/provision/yealink/t4x/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t4x/{$mac}.cfg
@@ -14,7 +14,7 @@ account.{$row.line_number}.enable = 1
 {else}
 account.{$row.line_number}.enable = 0
 {/if}
-account.{$row.line_number}.label = {$account.{$row.line_number}.display_name}
+account.{$row.line_number}.label = {$account.{$row.line_number}.label}
 account.{$row.line_number}.display_name = {$account.{$row.line_number}.display_name}
 account.{$row.line_number}.auth_name = {$account.{$row.line_number}.auth_id}
 account.{$row.line_number}.password = {$account.{$row.line_number}.password}
diff --git a/resources/templates/provision/yealink/t52s/directory.xml b/resources/templates/provision/yealink/t52s/directory.xml
index 297b9e4108..86c7b6f8b5 100644
--- a/resources/templates/provision/yealink/t52s/directory.xml
+++ b/resources/templates/provision/yealink/t52s/directory.xml
@@ -2,50 +2,58 @@
 {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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-	<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
 </DirectoryEntry>
 {elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
 <DirectoryEntry>
-{if $row.contact_name_given != ""}
+{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 != ""}
+{if $row.phone_number}
 	<Telephone>{$row.phone_number}</Telephone>
 {else}
 	<Telephone>{$row.phone_extension}</Telephone>
@@ -53,29 +61,29 @@
 </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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$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}
+{if isset($row.numbers)}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
 {/if}
 </DirectoryEntry>
 {/if}
diff --git a/resources/templates/provision/yealink/t52s/y000000000074.cfg b/resources/templates/provision/yealink/t52s/y000000000074.cfg
index 0facbfe63c..8804bcccda 100644
--- a/resources/templates/provision/yealink/t52s/y000000000074.cfg
+++ b/resources/templates/provision/yealink/t52s/y000000000074.cfg
@@ -451,7 +451,7 @@ features.headset_training=
 features.headset_prior=
 features.dtmf.replace_tran =
 features.dtmf.transfer =
-phone_setting.ringing_timeout=
+phone_setting.ringing_timeout = {$yealink_ringing_timeout}
 phone_setting.ringback_timeout=
 features.hold_trans_delay=
 transfer.multi_call_trans_enable =
@@ -1410,20 +1410,43 @@ 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}
+features.power_saving.enable = {$yealink_ps_enabled}
+##Written in 24hr
+features.power_saving.power_led_flash.on_time = {$yealink_ps_led_on}
+features.power_saving.power_led_flash.off_time = {$yealink_ps_led_off}
+
+##Written in 24hr, values should be comma delimited, e.g. 9,17
+{if isset($yealink_ps_days_all)}
+features.power_saving.office_hour.monday = {$yealink_ps_days_all}
+features.power_saving.office_hour.tuesday = {$yealink_ps_days_all}
+features.power_saving.office_hour.wednesday = {$yealink_ps_days_all}
+features.power_saving.office_hour.thursday = {$yealink_ps_days_all}
+features.power_saving.office_hour.friday = {$yealink_ps_days_all}
+features.power_saving.office_hour.saturday = {$yealink_ps_days_all}
+features.power_saving.office_hour.sunday = {$yealink_ps_days_all}
+{elseif isset($yealink_ps_days_workweek)}
+features.power_saving.office_hour.monday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.tuesday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.wednesday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.thursday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.friday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday}
+features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday}
+{else}
+features.power_saving.office_hour.monday = {$yealink_ps_day_monday}
+features.power_saving.office_hour.tuesday = {$yealink_ps_day_tuesday}
+features.power_saving.office_hour.wednesday = {$yealink_ps_day_wednesday}
+features.power_saving.office_hour.thursday = {$yealink_ps_day_thursday}
+features.power_saving.office_hour.friday = {$yealink_ps_day_friday}
+features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday}
+features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday}
+{/if}
+
+##Written in minutes
+features.power_saving.user_input_ext.idle_timeout = {$yealink_ps_idle_timeout}
+features.power_saving.off_hour.idle_timeout = {$yealink_ps_offhour_timeout}
+features.power_saving.office_hour.idle_timeout = {$yealink_ps_hour_timeout}
+features.power_saving.intelligent_mode = {$yealink_ps_intel_mode}
 
 
 #######################################################################################
diff --git a/resources/templates/provision/yealink/t52s/{$mac}.cfg b/resources/templates/provision/yealink/t52s/{$mac}.cfg
index db8bdc0c6f..4ecc32c1b7 100644
--- a/resources/templates/provision/yealink/t52s/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t52s/{$mac}.cfg
@@ -200,7 +200,7 @@ account.1.enable = 1
 {else}
 account.1.enable = 0
 {/if}
-account.1.label = {$account.1.display_name}
+account.1.label = {$account.1.label}
 account.1.display_name = {$account.1.display_name}
 account.1.auth_name = {$account.1.auth_id}
 account.1.password = {$account.1.password}
@@ -266,7 +266,7 @@ account.2.enable = 1
 {else}
 account.2.enable = 0
 {/if}
-account.2.label = {$account.2.display_name}
+account.2.label = {$account.2.label}
 account.2.display_name = {$account.2.display_name}
 account.2.auth_name = {$account.2.auth_id}
 account.2.password = {$account.2.password}
@@ -338,8 +338,8 @@ account.2.auto_answer=
 ################################################################
 #                      Account Advanced                       ##
 ################################################################
-account.1.nat.udp_update_enable= 3
-account.1.nat.udp_update_time= 30
+account.1.nat.udp_update_enable = {if isset($account.1.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+account.1.nat.udp_update_time = 30
 account.1.nat.rport= {$yealink_rport}
 
 account.1.dtmf.type= {$yealink_dtmf_type}
@@ -364,8 +364,8 @@ account.1.session_timer.enable= {$yealink_session_timer}
 account.1.conf_type = {if $nway_conference == 'true'}2{elseif $nway_conference == 'false'}0{/if}
 account.1.sip_server_type=
 
-account.2.nat.udp_update_enable= 3
-account.2.nat.udp_update_time= 30
+account.2.nat.udp_update_enable = {if isset($account.2.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+account.2.nat.udp_update_time = 30
 account.2.nat.rport= {$yealink_rport}
 
 account.2.dtmf.type= {$yealink_dtmf_type}
diff --git a/resources/templates/provision/yealink/t53/directory.xml b/resources/templates/provision/yealink/t53/directory.xml
index 297b9e4108..86c7b6f8b5 100644
--- a/resources/templates/provision/yealink/t53/directory.xml
+++ b/resources/templates/provision/yealink/t53/directory.xml
@@ -2,50 +2,58 @@
 {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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-	<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
 </DirectoryEntry>
 {elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
 <DirectoryEntry>
-{if $row.contact_name_given != ""}
+{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 != ""}
+{if $row.phone_number}
 	<Telephone>{$row.phone_number}</Telephone>
 {else}
 	<Telephone>{$row.phone_extension}</Telephone>
@@ -53,29 +61,29 @@
 </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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$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}
+{if isset($row.numbers)}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
 {/if}
 </DirectoryEntry>
 {/if}
diff --git a/resources/templates/provision/yealink/t53/y000000000095.cfg b/resources/templates/provision/yealink/t53/y000000000095.cfg
index a7cf6600f5..26c19a8499 100644
--- a/resources/templates/provision/yealink/t53/y000000000095.cfg
+++ b/resources/templates/provision/yealink/t53/y000000000095.cfg
@@ -355,7 +355,7 @@ 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.trust_certificates = {$yealink_trust_certificates}
 
 security.tls_cipher_list = {$yealink_security_tls_cipher_list}
 
@@ -416,7 +416,7 @@ static.auto_provision.encryption.config =
 
 
 #######################################################################################
-##                                   Trnasfer                                        ##       
+##                                   Transfer                                        ##       
 #######################################################################################
 features.transfer_type= {$yealink_transfer_type}
 dialplan.transfer.mode = {$yealink_transfer_mode}
@@ -447,7 +447,8 @@ features.anonymous_response_code=
 ##                          Call Configuration                                       ##       
 #######################################################################################
 phone_setting.incoming_call_when_dialing.priority=
-phone_setting.hold_or_swap.mode=
+{if isset($yealink_hold_or_swap_mode)}phone_setting.hold_or_swap.mode = {$yealink_hold_or_swap_mode}{else}phone_setting.hold_or_swap.mode = 0{/if}
+
 features.play_held_tone.interval=
 features.play_held_tone.delay=
 features.play_held_tone.enable=
@@ -477,7 +478,7 @@ features.headset_training=
 features.headset_prior=
 features.dtmf.replace_tran =
 features.dtmf.transfer =
-phone_setting.ringing_timeout=
+phone_setting.ringing_timeout = {$yealink_ringing_timeout}
 phone_setting.ringback_timeout=
 
 features.keep_mute.enable=
@@ -1559,20 +1560,43 @@ 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}
+features.power_saving.enable = {$yealink_ps_enabled}
+##Written in 24hr
+features.power_saving.power_led_flash.on_time = {$yealink_ps_led_on}
+features.power_saving.power_led_flash.off_time = {$yealink_ps_led_off}
+
+##Written in 24hr, values should be comma delimited, e.g. 9,17
+{if isset($yealink_ps_days_all)}
+features.power_saving.office_hour.monday = {$yealink_ps_days_all}
+features.power_saving.office_hour.tuesday = {$yealink_ps_days_all}
+features.power_saving.office_hour.wednesday = {$yealink_ps_days_all}
+features.power_saving.office_hour.thursday = {$yealink_ps_days_all}
+features.power_saving.office_hour.friday = {$yealink_ps_days_all}
+features.power_saving.office_hour.saturday = {$yealink_ps_days_all}
+features.power_saving.office_hour.sunday = {$yealink_ps_days_all}
+{elseif isset($yealink_ps_days_workweek)}
+features.power_saving.office_hour.monday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.tuesday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.wednesday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.thursday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.friday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday}
+features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday}
+{else}
+features.power_saving.office_hour.monday = {$yealink_ps_day_monday}
+features.power_saving.office_hour.tuesday = {$yealink_ps_day_tuesday}
+features.power_saving.office_hour.wednesday = {$yealink_ps_day_wednesday}
+features.power_saving.office_hour.thursday = {$yealink_ps_day_thursday}
+features.power_saving.office_hour.friday = {$yealink_ps_day_friday}
+features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday}
+features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday}
+{/if}
+
+##Written in minutes
+features.power_saving.user_input_ext.idle_timeout = {$yealink_ps_idle_timeout}
+features.power_saving.off_hour.idle_timeout = {$yealink_ps_offhour_timeout}
+features.power_saving.office_hour.idle_timeout = {$yealink_ps_hour_timeout}
+features.power_saving.intelligent_mode = {$yealink_ps_intel_mode}
 
 
 #######################################################################################
diff --git a/resources/templates/provision/yealink/t53/{$mac}.cfg b/resources/templates/provision/yealink/t53/{$mac}.cfg
index 5ad109b6a3..65b7d5de10 100644
--- a/resources/templates/provision/yealink/t53/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t53/{$mac}.cfg
@@ -4,7 +4,7 @@
 ##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                                        ##       
+##                                   Transfer                                        ##       
 #######################################################################################
 account.1.phone_setting.call_appearance.transfer_via_new_linekey=
 
@@ -113,7 +113,7 @@ account.1.enable = 1
 {else}
 account.1.enable = 0
 {/if}
-account.1.label = {$account.1.display_name}
+account.1.label = {$account.1.label}
 account.1.display_name = {$account.1.display_name}
 account.1.auth_name = {$account.1.auth_id}
 account.1.password = {$account.1.password}
@@ -182,8 +182,8 @@ account.1.auto_answer=
 ################################################################
 #                      Account Advanced                       ##
 ################################################################
-account.1.nat.udp_update_enable= 3
-account.1.nat.udp_update_time= 30
+account.1.nat.udp_update_enable = {if isset($account.1.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+account.1.nat.udp_update_time = 30
 account.1.nat.rport= {$yealink_rport}
 
 account.1.dtmf.type= {$yealink_dtmf_type}
@@ -564,7 +564,7 @@ bw.virtual_user.1.xsi.user=
 
 
 #######################################################################################
-##                                   Trnasfer                                        ##       
+##                                   Transfer                                        ##       
 #######################################################################################
 account.2.phone_setting.call_appearance.transfer_via_new_linekey=
 
@@ -652,7 +652,7 @@ account.2.enable = 1
 {else}
 account.2.enable = 0
 {/if}
-account.2.label = {$account.2.display_name}
+account.2.label = {$account.2.label}
 account.2.display_name = {$account.2.display_name}
 account.2.auth_name = {$account.2.auth_id}
 account.2.password = {$account.2.password}
@@ -721,8 +721,8 @@ account.2.auto_answer=
 ################################################################
 #                      Account Advanced                       ##
 ################################################################
-account.2.nat.udp_update_enable= 3
-account.2.nat.udp_update_time= 30
+account.2.nat.udp_update_enable = {if isset($account.2.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+account.2.nat.udp_update_time = 30
 account.2.nat.rport= {$yealink_rport}
 
 account.2.dtmf.type= {$yealink_dtmf_type}
@@ -1090,7 +1090,7 @@ pstn.account.2.label=
 
 
 #######################################################################################
-##                                   Trnasfer                                        ##       
+##                                   Transfer                                        ##       
 #######################################################################################
 account.1.phone_setting.call_appearance.transfer_via_new_linekey=
 
@@ -1179,7 +1179,7 @@ account.3.enable = 1
 {else}
 account.3.enable = 0
 {/if}
-account.3.label = {$account.3.display_name}
+account.3.label = {$account.3.label}
 account.3.display_name = {$account.3.display_name}
 account.3.auth_name = {$account.3.auth_id}
 account.3.password = {$account.3.password}
@@ -1248,8 +1248,8 @@ account.3.auto_answer=
 ################################################################
 #                      Account Advanced                       ##
 ################################################################
-account.3.nat.udp_update_enable= 3
-account.3.nat.udp_update_time= 30
+account.3.nat.udp_update_enable = {if isset($account.3.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+account.3.nat.udp_update_time = 30
 account.3.nat.rport= {$yealink_rport}
 
 account.3.dtmf.type= {$yealink_dtmf_type}
@@ -1617,7 +1617,7 @@ pstn.account.3.label=
 
 
 #######################################################################################
-##                                   Trnasfer                                        ##       
+##                                   Transfer                                        ##       
 #######################################################################################
 account.4.phone_setting.call_appearance.transfer_via_new_linekey=
 
@@ -1706,7 +1706,7 @@ account.4.enable = 1
 {else}
 account.4.enable = 0
 {/if}
-account.4.label = {$account.4.display_name}
+account.4.label = {$account.4.label}
 account.4.display_name = {$account.4.display_name}
 account.4.auth_name = {$account.4.auth_id}
 account.4.password = {$account.4.password}
@@ -1775,8 +1775,8 @@ account.4.auto_answer=
 ################################################################
 #                      Account Advanced                       ##
 ################################################################
-account.4.nat.udp_update_enable= 3
-account.4.nat.udp_update_time= 30
+account.4.nat.udp_update_enable = {if isset($account.4.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+account.4.nat.udp_update_time = 30
 account.4.nat.rport= {$yealink_rport}
 
 account.4.dtmf.type= {$yealink_dtmf_type}
@@ -2143,7 +2143,7 @@ pstn.account.4.label=
 
 
 #######################################################################################
-##                                   Trnasfer                                        ##       
+##                                   Transfer                                        ##       
 #######################################################################################
 account.5.phone_setting.call_appearance.transfer_via_new_linekey=
 
@@ -2232,7 +2232,7 @@ account.5.enable = 1
 {else}
 account.5.enable = 0
 {/if}
-account.5.label = {$account.5.display_name}
+account.5.label = {$account.5.label}
 account.5.display_name = {$account.5.display_name}
 account.5.auth_name = {$account.5.auth_id}
 account.5.password = {$account.5.password}
@@ -2301,8 +2301,8 @@ account.5.auto_answer=
 ################################################################
 #                      Account Advanced                       ##
 ################################################################
-account.5.nat.udp_update_enable= 3
-account.5.nat.udp_update_time= 30
+account.5.nat.udp_update_enable = {if isset($account.5.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+account.5.nat.udp_update_time = 30
 account.5.nat.rport= {$yealink_rport}
 
 account.5.dtmf.type= {$yealink_dtmf_type}
@@ -2683,7 +2683,7 @@ bw.virtual_user.1.xsi.user=
 
 
 #######################################################################################
-##                                   Trnasfer                                        ##       
+##                                   Transfer                                        ##       
 #######################################################################################
 account.6.phone_setting.call_appearance.transfer_via_new_linekey=
 
@@ -2772,7 +2772,7 @@ account.6.enable = 1
 {else}
 account.6.enable = 0
 {/if}
-account.6.label = {$account.6.display_name}
+account.6.label = {$account.6.label}
 account.6.display_name = {$account.6.display_name}
 account.6.auth_name = {$account.6.auth_id}
 account.6.password = {$account.6.password}
@@ -2841,8 +2841,8 @@ account.6.auto_answer=
 ################################################################
 #                      Account Advanced                       ##
 ################################################################
-account.6.nat.udp_update_enable= 3
-account.6.nat.udp_update_time= 30
+account.6.nat.udp_update_enable = {if isset($account.6.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+account.6.nat.udp_update_time = 30
 account.6.nat.rport= {$yealink_rport}
 
 account.6.dtmf.type= {$yealink_dtmf_type}
@@ -3210,7 +3210,7 @@ pstn.account.6.label=
 
 
 #######################################################################################
-##                                   Trnasfer                                        ##       
+##                                   Transfer                                        ##       
 #######################################################################################
 account.7.phone_setting.call_appearance.transfer_via_new_linekey=
 
@@ -3299,7 +3299,7 @@ account.7.enable = 1
 {else}
 account.7.enable = 0
 {/if}
-account.7.label = {$account.7.display_name}
+account.7.label = {$account.7.label}
 account.7.display_name = {$account.7.display_name}
 account.7.auth_name = {$account.7.auth_id}
 account.7.password = {$account.7.password}
@@ -3368,8 +3368,8 @@ account.7.auto_answer=
 ################################################################
 #                      Account Advanced                       ##
 ################################################################
-account.7.nat.udp_update_enable= 3
-account.7.nat.udp_update_time= 30
+account.7.nat.udp_update_enable = {if isset($account.7.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+account.7.nat.udp_update_time = 30
 account.7.nat.rport= {$yealink_rport}
 
 account.7.dtmf.type= {$yealink_dtmf_type}
@@ -3737,7 +3737,7 @@ pstn.account.7.label=
 
 
 #######################################################################################
-##                                   Trnasfer                                        ##       
+##                                   Transfer                                        ##       
 #######################################################################################
 account.8.phone_setting.call_appearance.transfer_via_new_linekey=
 
@@ -3826,7 +3826,7 @@ account.8.enable = 1
 {else}
 account.8.enable = 0
 {/if}
-account.8.label = {$account.8.display_name}
+account.8.label = {$account.8.label}
 account.8.display_name = {$account.8.display_name}
 account.8.auth_name = {$account.8.auth_id}
 account.8.password = {$account.8.password}
@@ -3895,8 +3895,8 @@ account.8.auto_answer=
 ################################################################
 #                      Account Advanced                       ##
 ################################################################
-account.8.nat.udp_update_enable= 3
-account.8.nat.udp_update_time= 30
+account.8.nat.udp_update_enable = {if isset($account.8.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+account.8.nat.udp_update_time = 30
 account.8.nat.rport= {$yealink_rport}
 
 account.8.dtmf.type= {$yealink_dtmf_type}
@@ -4264,7 +4264,7 @@ pstn.account.8.label=
 
 
 #######################################################################################
-##                                   Trnasfer                                        ##       
+##                                   Transfer                                        ##       
 #######################################################################################
 account.9.phone_setting.call_appearance.transfer_via_new_linekey=
 
@@ -4353,7 +4353,7 @@ account.9.enable = 1
 {else}
 account.9.enable = 0
 {/if}
-account.9.label = {$account.9.display_name}
+account.9.label = {$account.9.label}
 account.9.display_name = {$account.9.display_name}
 account.9.auth_name = {$account.9.auth_id}
 account.9.password = {$account.9.password}
@@ -4422,8 +4422,8 @@ account.9.auto_answer=
 ################################################################
 #                      Account Advanced                       ##
 ################################################################
-account.9.nat.udp_update_enable= 3
-account.9.nat.udp_update_time= 30
+account.9.nat.udp_update_enable = {if isset($account.9.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+account.9.nat.udp_update_time = 30
 account.9.nat.rport= {$yealink_rport}
 
 account.9.dtmf.type= {$yealink_dtmf_type}
@@ -4791,7 +4791,7 @@ pstn.account.9.label=
 
 
 #######################################################################################
-##                                   Trnasfer                                        ##       
+##                                   Transfer                                        ##       
 #######################################################################################
 account.10.phone_setting.call_appearance.transfer_via_new_linekey=
 
@@ -4880,7 +4880,7 @@ account.10.enable = 1
 {else}
 account.10.enable = 0
 {/if}
-account.10.label = {$account.10.display_name}
+account.10.label = {$account.10.label}
 account.10.display_name = {$account.10.display_name}
 account.10.auth_name = {$account.10.auth_id}
 account.10.password = {$account.10.password}
@@ -4949,8 +4949,8 @@ account.10.auto_answer=
 ################################################################
 #                      Account Advanced                       ##
 ################################################################
-account.10.nat.udp_update_enable= 3
-account.10.nat.udp_update_time= 30
+account.10.nat.udp_update_enable = {if isset($account.10.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+account.10.nat.udp_update_time = 30
 account.10.nat.rport= {$yealink_rport}
 
 account.10.dtmf.type= {$yealink_dtmf_type}
@@ -5314,5 +5314,3 @@ account.10.acd.call_information=
 #######################################################################################
 pstn.account.10.enable=
 pstn.account.10.label=
-
-
diff --git a/resources/templates/provision/yealink/t53w/directory.xml b/resources/templates/provision/yealink/t53w/directory.xml
index 297b9e4108..86c7b6f8b5 100644
--- a/resources/templates/provision/yealink/t53w/directory.xml
+++ b/resources/templates/provision/yealink/t53w/directory.xml
@@ -2,50 +2,58 @@
 {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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-	<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
 </DirectoryEntry>
 {elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
 <DirectoryEntry>
-{if $row.contact_name_given != ""}
+{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 != ""}
+{if $row.phone_number}
 	<Telephone>{$row.phone_number}</Telephone>
 {else}
 	<Telephone>{$row.phone_extension}</Telephone>
@@ -53,29 +61,29 @@
 </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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$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}
+{if isset($row.numbers)}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
 {/if}
 </DirectoryEntry>
 {/if}
diff --git a/resources/templates/provision/yealink/t53w/y000000000095.cfg b/resources/templates/provision/yealink/t53w/y000000000095.cfg
index 94ef22dfab..71d02a8fc8 100644
--- a/resources/templates/provision/yealink/t53w/y000000000095.cfg
+++ b/resources/templates/provision/yealink/t53w/y000000000095.cfg
@@ -355,7 +355,7 @@ 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.trust_certificates = {$yealink_trust_certificates}
 
 security.tls_cipher_list = {$yealink_security_tls_cipher_list}
 
@@ -416,7 +416,7 @@ static.auto_provision.encryption.config =
 
 
 #######################################################################################
-##                                   Trnasfer                                        ##       
+##                                   Transfer                                        ##       
 #######################################################################################
 features.transfer_type= {$yealink_transfer_type}
 dialplan.transfer.mode = {$yealink_transfer_mode}
@@ -447,7 +447,8 @@ features.anonymous_response_code=
 ##                          Call Configuration                                       ##       
 #######################################################################################
 phone_setting.incoming_call_when_dialing.priority=
-phone_setting.hold_or_swap.mode=
+{if isset($yealink_hold_or_swap_mode)}phone_setting.hold_or_swap.mode = {$yealink_hold_or_swap_mode}{else}phone_setting.hold_or_swap.mode = 0{/if}
+
 features.play_held_tone.interval=
 features.play_held_tone.delay=
 features.play_held_tone.enable=
@@ -477,7 +478,7 @@ features.headset_training=
 features.headset_prior=
 features.dtmf.replace_tran =
 features.dtmf.transfer =
-phone_setting.ringing_timeout=
+phone_setting.ringing_timeout = {$yealink_ringing_timeout}
 phone_setting.ringback_timeout=
 
 features.keep_mute.enable=
@@ -1563,20 +1564,43 @@ 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}
+features.power_saving.enable = {$yealink_ps_enabled}
+##Written in 24hr
+features.power_saving.power_led_flash.on_time = {$yealink_ps_led_on}
+features.power_saving.power_led_flash.off_time = {$yealink_ps_led_off}
+
+##Written in 24hr, values should be comma delimited, e.g. 9,17
+{if isset($yealink_ps_days_all)}
+features.power_saving.office_hour.monday = {$yealink_ps_days_all}
+features.power_saving.office_hour.tuesday = {$yealink_ps_days_all}
+features.power_saving.office_hour.wednesday = {$yealink_ps_days_all}
+features.power_saving.office_hour.thursday = {$yealink_ps_days_all}
+features.power_saving.office_hour.friday = {$yealink_ps_days_all}
+features.power_saving.office_hour.saturday = {$yealink_ps_days_all}
+features.power_saving.office_hour.sunday = {$yealink_ps_days_all}
+{elseif isset($yealink_ps_days_workweek)}
+features.power_saving.office_hour.monday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.tuesday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.wednesday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.thursday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.friday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday}
+features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday}
+{else}
+features.power_saving.office_hour.monday = {$yealink_ps_day_monday}
+features.power_saving.office_hour.tuesday = {$yealink_ps_day_tuesday}
+features.power_saving.office_hour.wednesday = {$yealink_ps_day_wednesday}
+features.power_saving.office_hour.thursday = {$yealink_ps_day_thursday}
+features.power_saving.office_hour.friday = {$yealink_ps_day_friday}
+features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday}
+features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday}
+{/if}
+
+##Written in minutes
+features.power_saving.user_input_ext.idle_timeout = {$yealink_ps_idle_timeout}
+features.power_saving.off_hour.idle_timeout = {$yealink_ps_offhour_timeout}
+features.power_saving.office_hour.idle_timeout = {$yealink_ps_hour_timeout}
+features.power_saving.intelligent_mode = {$yealink_ps_intel_mode}
 
 
 #######################################################################################
diff --git a/resources/templates/provision/yealink/t53w/{$mac}.cfg b/resources/templates/provision/yealink/t53w/{$mac}.cfg
index 05428c2ea2..b0407fac31 100644
--- a/resources/templates/provision/yealink/t53w/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t53w/{$mac}.cfg
@@ -4,7 +4,7 @@
 ##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                                        ##       
+##                                   Transfer                                        ##       
 #######################################################################################
 account.1.phone_setting.call_appearance.transfer_via_new_linekey=
 
@@ -113,7 +113,7 @@ account.1.enable = 1
 {else}
 account.1.enable = 0
 {/if}
-account.1.label = {$account.1.display_name}
+account.1.label = {$account.1.label}
 account.1.display_name = {$account.1.display_name}
 account.1.auth_name = {$account.1.auth_id}
 account.1.password = {$account.1.password}
@@ -183,8 +183,8 @@ account.1.auto_answer=
 ################################################################
 #                      Account Advanced                       ##
 ################################################################
-account.1.nat.udp_update_enable= 3
-account.1.nat.udp_update_time= 30
+account.1.nat.udp_update_enable = {if isset($account.1.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+account.1.nat.udp_update_time = 30
 account.1.nat.rport= {$yealink_rport}
 
 account.1.dtmf.type= {$yealink_dtmf_type}
@@ -565,7 +565,7 @@ bw.virtual_user.1.xsi.user=
 
 
 #######################################################################################
-##                                   Trnasfer                                        ##       
+##                                   Transfer                                        ##       
 #######################################################################################
 account.2.phone_setting.call_appearance.transfer_via_new_linekey=
 
@@ -653,7 +653,7 @@ account.2.enable = 1
 {else}
 account.2.enable = 0
 {/if}
-account.2.label = {$account.2.display_name}
+account.2.label = {$account.2.label}
 account.2.display_name = {$account.2.display_name}
 account.2.auth_name = {$account.2.auth_id}
 account.2.password = {$account.2.password}
@@ -723,8 +723,8 @@ account.2.auto_answer=
 ################################################################
 #                      Account Advanced                       ##
 ################################################################
-account.2.nat.udp_update_enable= 3
-account.2.nat.udp_update_time= 30
+account.2.nat.udp_update_enable = {if isset($account.2.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+account.2.nat.udp_update_time = 30
 account.2.nat.rport= {$yealink_rport}
 
 account.2.dtmf.type= {$yealink_dtmf_type}
@@ -1092,7 +1092,7 @@ pstn.account.2.label=
 
 
 #######################################################################################
-##                                   Trnasfer                                        ##       
+##                                   Transfer                                        ##       
 #######################################################################################
 account.1.phone_setting.call_appearance.transfer_via_new_linekey=
 
@@ -1181,7 +1181,7 @@ account.3.enable = 1
 {else}
 account.3.enable = 0
 {/if}
-account.3.label = {$account.3.display_name}
+account.3.label = {$account.3.label}
 account.3.display_name = {$account.3.display_name}
 account.3.auth_name = {$account.3.auth_id}
 account.3.password = {$account.3.password}
@@ -1251,8 +1251,8 @@ account.3.auto_answer=
 ################################################################
 #                      Account Advanced                       ##
 ################################################################
-account.3.nat.udp_update_enable= 3
-account.3.nat.udp_update_time= 30
+account.3.nat.udp_update_enable = {if isset($account.3.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+account.3.nat.udp_update_time = 30
 account.3.nat.rport= {$yealink_rport}
 
 account.3.dtmf.type= {$yealink_dtmf_type}
@@ -1620,7 +1620,7 @@ pstn.account.3.label=
 
 
 #######################################################################################
-##                                   Trnasfer                                        ##       
+##                                   Transfer                                        ##       
 #######################################################################################
 account.4.phone_setting.call_appearance.transfer_via_new_linekey=
 
@@ -1709,7 +1709,7 @@ account.4.enable = 1
 {else}
 account.4.enable = 0
 {/if}
-account.4.label = {$account.4.display_name}
+account.4.label = {$account.4.label}
 account.4.display_name = {$account.4.display_name}
 account.4.auth_name = {$account.4.auth_id}
 account.4.password = {$account.4.password}
@@ -1779,8 +1779,8 @@ account.4.auto_answer=
 ################################################################
 #                      Account Advanced                       ##
 ################################################################
-account.4.nat.udp_update_enable= 3
-account.4.nat.udp_update_time= 30
+account.4.nat.udp_update_enable = {if isset($account.4.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+account.4.nat.udp_update_time = 30
 account.4.nat.rport= {$yealink_rport}
 
 account.4.dtmf.type= {$yealink_dtmf_type}
@@ -2147,7 +2147,7 @@ pstn.account.4.label=
 
 
 #######################################################################################
-##                                   Trnasfer                                        ##       
+##                                   Transfer                                        ##       
 #######################################################################################
 account.5.phone_setting.call_appearance.transfer_via_new_linekey=
 
@@ -2236,7 +2236,7 @@ account.5.enable = 1
 {else}
 account.5.enable = 0
 {/if}
-account.5.label = {$account.5.display_name}
+account.5.label = {$account.5.label}
 account.5.display_name = {$account.5.display_name}
 account.5.auth_name = {$account.5.auth_id}
 account.5.password = {$account.5.password}
@@ -2306,8 +2306,8 @@ account.5.auto_answer=
 ################################################################
 #                      Account Advanced                       ##
 ################################################################
-account.5.nat.udp_update_enable= 3
-account.5.nat.udp_update_time= 30
+account.5.nat.udp_update_enable = {if isset($account.5.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+account.5.nat.udp_update_time = 30
 account.5.nat.rport= {$yealink_rport}
 
 account.5.dtmf.type= {$yealink_dtmf_type}
@@ -2688,7 +2688,7 @@ bw.virtual_user.1.xsi.user=
 
 
 #######################################################################################
-##                                   Trnasfer                                        ##       
+##                                   Transfer                                        ##       
 #######################################################################################
 account.6.phone_setting.call_appearance.transfer_via_new_linekey=
 
@@ -2777,7 +2777,7 @@ account.6.enable = 1
 {else}
 account.6.enable = 0
 {/if}
-account.6.label = {$account.6.display_name}
+account.6.label = {$account.6.label}
 account.6.display_name = {$account.6.display_name}
 account.6.auth_name = {$account.6.auth_id}
 account.6.password = {$account.6.password}
@@ -2847,8 +2847,8 @@ account.6.auto_answer=
 ################################################################
 #                      Account Advanced                       ##
 ################################################################
-account.6.nat.udp_update_enable= 3
-account.6.nat.udp_update_time= 30
+account.6.nat.udp_update_enable = {if isset($account.6.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+account.6.nat.udp_update_time = 30
 account.6.nat.rport= {$yealink_rport}
 
 account.6.dtmf.type= {$yealink_dtmf_type}
@@ -3216,7 +3216,7 @@ pstn.account.6.label=
 
 
 #######################################################################################
-##                                   Trnasfer                                        ##       
+##                                   Transfer                                        ##       
 #######################################################################################
 account.7.phone_setting.call_appearance.transfer_via_new_linekey=
 
@@ -3305,7 +3305,7 @@ account.7.enable = 1
 {else}
 account.7.enable = 0
 {/if}
-account.7.label = {$account.7.display_name}
+account.7.label = {$account.7.label}
 account.7.display_name = {$account.7.display_name}
 account.7.auth_name = {$account.7.auth_id}
 account.7.password = {$account.7.password}
@@ -3375,8 +3375,8 @@ account.7.auto_answer=
 ################################################################
 #                      Account Advanced                       ##
 ################################################################
-account.7.nat.udp_update_enable= 3
-account.7.nat.udp_update_time= 30
+account.7.nat.udp_update_enable = {if isset($account.7.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+account.7.nat.udp_update_time = 30
 account.7.nat.rport= {$yealink_rport}
 
 account.7.dtmf.type= {$yealink_dtmf_type}
@@ -3744,7 +3744,7 @@ pstn.account.7.label=
 
 
 #######################################################################################
-##                                   Trnasfer                                        ##       
+##                                   Transfer                                        ##       
 #######################################################################################
 account.8.phone_setting.call_appearance.transfer_via_new_linekey=
 
@@ -3833,7 +3833,7 @@ account.8.enable = 1
 {else}
 account.8.enable = 0
 {/if}
-account.8.label = {$account.8.display_name}
+account.8.label = {$account.8.label}
 account.8.display_name = {$account.8.display_name}
 account.8.auth_name = {$account.8.auth_id}
 account.8.password = {$account.8.password}
@@ -3903,8 +3903,8 @@ account.8.auto_answer=
 ################################################################
 #                      Account Advanced                       ##
 ################################################################
-account.8.nat.udp_update_enable= 3
-account.8.nat.udp_update_time= 30
+account.8.nat.udp_update_enable = {if isset($account.8.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+account.8.nat.udp_update_time = 30
 account.8.nat.rport= {$yealink_rport}
 
 account.8.dtmf.type= {$yealink_dtmf_type}
@@ -4272,7 +4272,7 @@ pstn.account.8.label=
 
 
 #######################################################################################
-##                                   Trnasfer                                        ##       
+##                                   Transfer                                        ##       
 #######################################################################################
 account.9.phone_setting.call_appearance.transfer_via_new_linekey=
 
@@ -4361,7 +4361,7 @@ account.9.enable = 1
 {else}
 account.9.enable = 0
 {/if}
-account.9.label = {$account.9.display_name}
+account.9.label = {$account.9.label}
 account.9.display_name = {$account.9.display_name}
 account.9.auth_name = {$account.9.auth_id}
 account.9.password = {$account.9.password}
@@ -4431,8 +4431,8 @@ account.9.auto_answer=
 ################################################################
 #                      Account Advanced                       ##
 ################################################################
-account.9.nat.udp_update_enable= 3
-account.9.nat.udp_update_time= 30
+account.9.nat.udp_update_enable = {if isset($account.9.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+account.9.nat.udp_update_time = 30
 account.9.nat.rport= {$yealink_rport}
 
 account.9.dtmf.type= {$yealink_dtmf_type}
@@ -4800,7 +4800,7 @@ pstn.account.9.label=
 
 
 #######################################################################################
-##                                   Trnasfer                                        ##       
+##                                   Transfer                                        ##       
 #######################################################################################
 account.10.phone_setting.call_appearance.transfer_via_new_linekey=
 
@@ -4889,7 +4889,7 @@ account.10.enable = 1
 {else}
 account.10.enable = 0
 {/if}
-account.10.label = {$account.10.display_name}
+account.10.label = {$account.10.label}
 account.10.display_name = {$account.10.display_name}
 account.10.auth_name = {$account.10.auth_id}
 account.10.password = {$account.10.password}
@@ -4959,8 +4959,8 @@ account.10.auto_answer=
 ################################################################
 #                      Account Advanced                       ##
 ################################################################
-account.10.nat.udp_update_enable= 3
-account.10.nat.udp_update_time= 30
+account.10.nat.udp_update_enable = {if isset($account.10.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+account.10.nat.udp_update_time = 30
 account.10.nat.rport= {$yealink_rport}
 
 account.10.dtmf.type= {$yealink_dtmf_type}
@@ -5324,5 +5324,3 @@ account.10.acd.call_information=
 #######################################################################################
 pstn.account.10.enable=
 pstn.account.10.label=
-
-
diff --git a/resources/templates/provision/yealink/t54s/directory.xml b/resources/templates/provision/yealink/t54s/directory.xml
index 297b9e4108..86c7b6f8b5 100644
--- a/resources/templates/provision/yealink/t54s/directory.xml
+++ b/resources/templates/provision/yealink/t54s/directory.xml
@@ -2,50 +2,58 @@
 {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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-	<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
 </DirectoryEntry>
 {elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
 <DirectoryEntry>
-{if $row.contact_name_given != ""}
+{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 != ""}
+{if $row.phone_number}
 	<Telephone>{$row.phone_number}</Telephone>
 {else}
 	<Telephone>{$row.phone_extension}</Telephone>
@@ -53,29 +61,29 @@
 </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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$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}
+{if isset($row.numbers)}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
 {/if}
 </DirectoryEntry>
 {/if}
diff --git a/resources/templates/provision/yealink/t54s/y000000000070.cfg b/resources/templates/provision/yealink/t54s/y000000000070.cfg
index 6c53ebb483..ac932bc65d 100644
--- a/resources/templates/provision/yealink/t54s/y000000000070.cfg
+++ b/resources/templates/provision/yealink/t54s/y000000000070.cfg
@@ -339,7 +339,7 @@ static.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.trust_certificates = {$yealink_trust_certificates}
 
 security.tls_cipher_list = 
 {if isset($user_name) }
@@ -450,7 +450,7 @@ features.headset_training=
 features.headset_prior=
 features.dtmf.replace_tran =
 features.dtmf.transfer =
-phone_setting.ringing_timeout=
+phone_setting.ringing_timeout = {$yealink_ringing_timeout}
 phone_setting.ringback_timeout=
 features.hold_trans_delay=
 transfer.multi_call_trans_enable =
@@ -1408,20 +1408,43 @@ 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}
+features.power_saving.enable = {$yealink_ps_enabled}
+##Written in 24hr
+features.power_saving.power_led_flash.on_time = {$yealink_ps_led_on}
+features.power_saving.power_led_flash.off_time = {$yealink_ps_led_off}
+
+##Written in 24hr, values should be comma delimited, e.g. 9,17
+{if isset($yealink_ps_days_all)}
+features.power_saving.office_hour.monday = {$yealink_ps_days_all}
+features.power_saving.office_hour.tuesday = {$yealink_ps_days_all}
+features.power_saving.office_hour.wednesday = {$yealink_ps_days_all}
+features.power_saving.office_hour.thursday = {$yealink_ps_days_all}
+features.power_saving.office_hour.friday = {$yealink_ps_days_all}
+features.power_saving.office_hour.saturday = {$yealink_ps_days_all}
+features.power_saving.office_hour.sunday = {$yealink_ps_days_all}
+{elseif isset($yealink_ps_days_workweek)}
+features.power_saving.office_hour.monday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.tuesday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.wednesday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.thursday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.friday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday}
+features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday}
+{else}
+features.power_saving.office_hour.monday = {$yealink_ps_day_monday}
+features.power_saving.office_hour.tuesday = {$yealink_ps_day_tuesday}
+features.power_saving.office_hour.wednesday = {$yealink_ps_day_wednesday}
+features.power_saving.office_hour.thursday = {$yealink_ps_day_thursday}
+features.power_saving.office_hour.friday = {$yealink_ps_day_friday}
+features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday}
+features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday}
+{/if}
+
+##Written in minutes
+features.power_saving.user_input_ext.idle_timeout = {$yealink_ps_idle_timeout}
+features.power_saving.off_hour.idle_timeout = {$yealink_ps_offhour_timeout}
+features.power_saving.office_hour.idle_timeout = {$yealink_ps_hour_timeout}
+features.power_saving.intelligent_mode = {$yealink_ps_intel_mode}
 
 
 #######################################################################################
diff --git a/resources/templates/provision/yealink/t54s/{$mac}.cfg b/resources/templates/provision/yealink/t54s/{$mac}.cfg
index 59e0b3ff49..580a2203c0 100644
--- a/resources/templates/provision/yealink/t54s/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t54s/{$mac}.cfg
@@ -200,7 +200,7 @@ account.1.enable = 1
 {else}
 account.1.enable = 0
 {/if}
-account.1.label = {$account.1.display_name}
+account.1.label = {$account.1.label}
 account.1.display_name = {$account.1.display_name}
 account.1.auth_name = {$account.1.auth_id}
 account.1.password = {$account.1.password}
@@ -339,8 +339,8 @@ account.2.auto_answer=
 ################################################################
 #                      Account Advanced                       ##
 ################################################################
-account.1.nat.udp_update_enable= 3
-account.1.nat.udp_update_time= 30
+account.1.nat.udp_update_enable = {if isset($account.1.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+account.1.nat.udp_update_time = 30
 account.1.nat.rport= {$yealink_rport}
 
 account.1.dtmf.type= {$yealink_dtmf_type}
@@ -365,8 +365,8 @@ account.1.session_timer.enable= {$yealink_session_timer}
 account.1.conf_type = {if $nway_conference == 'true'}2{elseif $nway_conference == 'false'}0{/if}
 account.1.sip_server_type=
 
-account.2.nat.udp_update_enable= 3
-account.2.nat.udp_update_time= 30
+account.2.nat.udp_update_enable = {if isset($account.2.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+account.2.nat.udp_update_time = 30
 account.2.nat.rport= {$yealink_rport}
 
 account.2.dtmf.type= {$yealink_dtmf_type}
diff --git a/resources/templates/provision/yealink/t54w/directory.xml b/resources/templates/provision/yealink/t54w/directory.xml
index 297b9e4108..86c7b6f8b5 100644
--- a/resources/templates/provision/yealink/t54w/directory.xml
+++ b/resources/templates/provision/yealink/t54w/directory.xml
@@ -2,50 +2,58 @@
 {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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-	<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
 </DirectoryEntry>
 {elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
 <DirectoryEntry>
-{if $row.contact_name_given != ""}
+{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 != ""}
+{if $row.phone_number}
 	<Telephone>{$row.phone_number}</Telephone>
 {else}
 	<Telephone>{$row.phone_extension}</Telephone>
@@ -53,29 +61,29 @@
 </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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$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}
+{if isset($row.numbers)}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
 {/if}
 </DirectoryEntry>
 {/if}
diff --git a/resources/templates/provision/yealink/t54w/y000000000096.cfg b/resources/templates/provision/yealink/t54w/y000000000096.cfg
index c01340dacd..89b3f9bd1a 100644
--- a/resources/templates/provision/yealink/t54w/y000000000096.cfg
+++ b/resources/templates/provision/yealink/t54w/y000000000096.cfg
@@ -355,7 +355,7 @@ 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.trust_certificates = {$yealink_trust_certificates}
 
 security.tls_cipher_list = {$yealink_security_tls_cipher_list}
 
@@ -416,7 +416,7 @@ static.auto_provision.encryption.config =
 
 
 #######################################################################################
-##                                   Trnasfer                                        ##       
+##                                   Transfer                                        ##       
 #######################################################################################
 features.transfer_type= {$yealink_transfer_type}
 dialplan.transfer.mode = {$yealink_transfer_mode}
@@ -447,7 +447,8 @@ features.anonymous_response_code=
 ##                          Call Configuration                                       ##       
 #######################################################################################
 phone_setting.incoming_call_when_dialing.priority=
-phone_setting.hold_or_swap.mode=
+{if isset($yealink_hold_or_swap_mode)}phone_setting.hold_or_swap.mode = {$yealink_hold_or_swap_mode}{else}phone_setting.hold_or_swap.mode = 0{/if}
+
 features.play_held_tone.interval=
 features.play_held_tone.delay=
 features.play_held_tone.enable=
@@ -477,7 +478,7 @@ features.headset_training=
 features.headset_prior=
 features.dtmf.replace_tran =
 features.dtmf.transfer =
-phone_setting.ringing_timeout=
+phone_setting.ringing_timeout = {$yealink_ringing_timeout}
 phone_setting.ringback_timeout=
 
 features.keep_mute.enable=
@@ -1145,8 +1146,8 @@ features.dnd.allow= {$yealink_dnd_allow}
 features.dnd_mode=
 features.dnd.enable=
 
-features.dnd.off_code= *79
-features.dnd.on_code= *78
+features.dnd.off_code= {$yealink_dnd_off_code}
+features.dnd.on_code= {$yealink_dnd_on_code}
 
 features.dnd.emergency_authorized_number=
 features.dnd.emergency_enable= 1
@@ -1565,20 +1566,43 @@ 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}
+features.power_saving.enable = {$yealink_ps_enabled}
+##Written in 24hr
+features.power_saving.power_led_flash.on_time = {$yealink_ps_led_on}
+features.power_saving.power_led_flash.off_time = {$yealink_ps_led_off}
+
+##Written in 24hr, values should be comma delimited, e.g. 9,17
+{if isset($yealink_ps_days_all)}
+features.power_saving.office_hour.monday = {$yealink_ps_days_all}
+features.power_saving.office_hour.tuesday = {$yealink_ps_days_all}
+features.power_saving.office_hour.wednesday = {$yealink_ps_days_all}
+features.power_saving.office_hour.thursday = {$yealink_ps_days_all}
+features.power_saving.office_hour.friday = {$yealink_ps_days_all}
+features.power_saving.office_hour.saturday = {$yealink_ps_days_all}
+features.power_saving.office_hour.sunday = {$yealink_ps_days_all}
+{elseif isset($yealink_ps_days_workweek)}
+features.power_saving.office_hour.monday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.tuesday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.wednesday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.thursday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.friday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday}
+features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday}
+{else}
+features.power_saving.office_hour.monday = {$yealink_ps_day_monday}
+features.power_saving.office_hour.tuesday = {$yealink_ps_day_tuesday}
+features.power_saving.office_hour.wednesday = {$yealink_ps_day_wednesday}
+features.power_saving.office_hour.thursday = {$yealink_ps_day_thursday}
+features.power_saving.office_hour.friday = {$yealink_ps_day_friday}
+features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday}
+features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday}
+{/if}
+
+##Written in minutes
+features.power_saving.user_input_ext.idle_timeout = {$yealink_ps_idle_timeout}
+features.power_saving.off_hour.idle_timeout = {$yealink_ps_offhour_timeout}
+features.power_saving.office_hour.idle_timeout = {$yealink_ps_hour_timeout}
+features.power_saving.intelligent_mode = {$yealink_ps_intel_mode}
 
 
 #######################################################################################
diff --git a/resources/templates/provision/yealink/t54w/{$mac}.cfg b/resources/templates/provision/yealink/t54w/{$mac}.cfg
index b28f886f07..198567e996 100644
--- a/resources/templates/provision/yealink/t54w/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t54w/{$mac}.cfg
@@ -15,7 +15,7 @@
 ## account.X.enable = ?????????????????????????????????????????????????????????????????????????????????????????????????????????????
 
 #######################################################################################
-##                                   Trnasfer                                        ##       
+##                                   Transfer                                        ##       
 #######################################################################################
 account.{$row.line_number}.phone_setting.call_appearance.transfer_via_new_linekey=
 
@@ -100,7 +100,7 @@ account.{$row.line_number}.codec.g729.enable= {if isset($yealink_codec_g729_enab
 
 account.{$row.line_number}.codec.g722.priority= {if isset($yealink_codec_g722_priority)}{$yealink_codec_g722_priority}{else}0{/if}
 
-account.{$row.line_number}.codec.g722.enable= {if isset($yealink_codec_g722_enable)}1{else}0{/if}
+account.{$row.line_number}.codec.g722.enable= {if isset($yealink_codec_g722_enable)}{$yealink_codec_g722_enable}{else}0{/if}
 
 account.{$row.line_number}.codec.G722_1_24kpbs.priority=
 account.{$row.line_number}.codec.G722_1_24kpbs.enable=
@@ -119,7 +119,7 @@ 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}.label = {$row.label}
 account.{$row.line_number}.display_name = {$row.display_name}
 account.{$row.line_number}.auth_name = {$row.auth_id}
 account.{$row.line_number}.password = {$row.password}
diff --git a/resources/templates/provision/yealink/t56a/directory.xml b/resources/templates/provision/yealink/t56a/directory.xml
index 297b9e4108..86c7b6f8b5 100644
--- a/resources/templates/provision/yealink/t56a/directory.xml
+++ b/resources/templates/provision/yealink/t56a/directory.xml
@@ -2,50 +2,58 @@
 {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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-	<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
 </DirectoryEntry>
 {elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
 <DirectoryEntry>
-{if $row.contact_name_given != ""}
+{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 != ""}
+{if $row.phone_number}
 	<Telephone>{$row.phone_number}</Telephone>
 {else}
 	<Telephone>{$row.phone_extension}</Telephone>
@@ -53,29 +61,29 @@
 </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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$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}
+{if isset($row.numbers)}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
 {/if}
 </DirectoryEntry>
 {/if}
diff --git a/resources/templates/provision/yealink/t56a/y000000000056.cfg b/resources/templates/provision/yealink/t56a/y000000000056.cfg
index 3fda5d507a..8dbbe6d215 100644
--- a/resources/templates/provision/yealink/t56a/y000000000056.cfg
+++ b/resources/templates/provision/yealink/t56a/y000000000056.cfg
@@ -874,7 +874,7 @@ phone_setting.is_deal180 =
 phone_setting.show_code403 =
 
 phone_setting.ringback_timeout =
-phone_setting.ringing_timeout =
+phone_setting.ringing_timeout = {$yealink_ringing_timeout}
 
 phone_setting.page_tip = 
 phone_setting.predial_autodial = 
@@ -1006,7 +1006,7 @@ static.security.user_password = {$var_name}:{$var_password}
 ###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}
+static.security.trust_certificates = {$yealink_trust_certificates}
 
 ###It configures the source certificates for the phone to authenticate for TLS connection.
 ###0-Default certificates,1-Custom certificates,2-All certificates.
@@ -1494,7 +1494,7 @@ voice.side_tone =
 static.security.default_access_level =
 static.auto_provision.attempt_expired_time = 
 phone_setting.ringback_timeout = 
-phone_setting.ringing_timeout =  
+phone_setting.ringing_timeout = {$yealink_ringing_timeout}  
 
 
 #######################################################################################
diff --git a/resources/templates/provision/yealink/t56a/{$mac}.cfg b/resources/templates/provision/yealink/t56a/{$mac}.cfg
index 87b3ce9f74..0e1d2d658f 100644
--- a/resources/templates/provision/yealink/t56a/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t56a/{$mac}.cfg
@@ -11,7 +11,7 @@ account.1.enable = 1
 {else}
 account.1.enable = 0
 {/if}
-account.1.label = {$account.1.display_name}
+account.1.label = {$account.1.label}
 account.1.display_name = {$account.1.display_name}
 account.1.auth_name = {$account.1.auth_id} 
 {if isset($account.1.server.1.address)}
@@ -111,9 +111,9 @@ account.1.reg_fail_retry_interval =
 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.
+##0-Disabled,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
+account.1.nat.udp_update_enable = {if isset($account.1.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 ##It configures the keep-alive interval (in seconds) for account X.
 ##The default value is 30.Integer from 15 to 2147483647
@@ -484,7 +484,7 @@ account.2.enable = 1
 {else}
 account.2.enable = 0
 {/if}
-account.2.label = {$account.2.display_name}
+account.2.label = {$account.2.label}
 account.2.display_name = {$account.2.display_name}
 account.2.auth_name = {$account.2.auth_id}
 account.2.password = {$account.2.password}
@@ -576,13 +576,13 @@ account.2.reg_fail_retry_interval =
 ##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.
+##0-Disabled,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 = 
+account.2.nat.udp_update_enable = {if isset($account.2.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 ##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 = 
+account.2.nat.udp_update_time = 30
 
 ##It enables or disables NAT Rport feature for account X.0-Disabled,1-Enabled
 ##The default value is 0.
@@ -946,7 +946,7 @@ account.3.enable = 1
 {else}
 account.3.enable = 0
 {/if}
-account.3.label = {$account.3.display_name}
+account.3.label = {$account.3.label}
 account.3.display_name = {$account.3.display_name}
 account.3.auth_name = {$account.3.auth_id}
 account.3.password = {$account.3.password}
@@ -1040,13 +1040,13 @@ account.3.reg_fail_retry_interval =
 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.
+##0-Disabled,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 = 
+account.3.nat.udp_update_enable = {if isset($account.3.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 ##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 = 
+account.3.nat.udp_update_time = 30
 
 ##It enables or disables NAT Rport feature for account X.0-Disabled,1-Enabled
 ##The default value is 0.
@@ -1409,7 +1409,7 @@ account.4.enable = 1
 {else}
 account.4.enable = 0
 {/if}
-account.4.label = {$account.4.display_name}
+account.4.label = {$account.4.label}
 account.4.display_name = {$account.4.display_name}
 account.4.auth_name = {$account.4.auth_id}
 account.4.password = {$account.4.password}
@@ -1499,13 +1499,13 @@ account.4.reg_fail_retry_interval =
 ##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.
+##0-Disabled,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 = 
+account.4.nat.udp_update_enable = {if isset($account.4.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 ##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 = 
+account.4.nat.udp_update_time = 30
 
 ##It enables or disables NAT Rport feature for account X.0-Disabled,1-Enabled
 ##The default value is 0.
@@ -1875,7 +1875,7 @@ account.5.enable = 1
 {else}
 account.5.enable = 0
 {/if}
-account.5.label = {$account.5.display_name}
+account.5.label = {$account.5.label}
 account.5.display_name = {$account.5.display_name}
 account.5.auth_name = {$account.5.auth_id}
 account.5.password = {$account.5.password}
@@ -1966,13 +1966,13 @@ account.5.reg_fail_retry_interval =
 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.
+##0-Disabled,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 = 
+account.5.nat.udp_update_enable = {if isset($account.5.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 ##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 = 
+account.5.nat.udp_update_time = 30
 
 ##It enables or disables NAT Rport feature for account X.0-Disabled,1-Enabled
 ##The default value is 0.
@@ -2344,7 +2344,7 @@ account.6.enable = 1
 {else}
 account.6.enable = 0
 {/if}
-account.6.label = {$account.6.display_name}
+account.6.label = {$account.6.label}
 account.6.display_name = {$account.6.display_name}
 account.6.auth_name = {$account.6.auth_id}
 account.6.password = {$account.6.password}
@@ -2437,13 +2437,13 @@ 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.
+##0-Disabled,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 = 
+account.6.nat.udp_update_enable = {if isset($account.6.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 ##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 = 
+account.6.nat.udp_update_time = 30
 
 ##It enables or disables NAT Rport feature for account X.0-Disabled,1-Enabled
 ##The default value is 0.
diff --git a/resources/templates/provision/yealink/t57w/directory.xml b/resources/templates/provision/yealink/t57w/directory.xml
index 297b9e4108..86c7b6f8b5 100644
--- a/resources/templates/provision/yealink/t57w/directory.xml
+++ b/resources/templates/provision/yealink/t57w/directory.xml
@@ -2,50 +2,58 @@
 {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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-	<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
 </DirectoryEntry>
 {elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
 <DirectoryEntry>
-{if $row.contact_name_given != ""}
+{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 != ""}
+{if $row.phone_number}
 	<Telephone>{$row.phone_number}</Telephone>
 {else}
 	<Telephone>{$row.phone_extension}</Telephone>
@@ -53,29 +61,29 @@
 </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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$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}
+{if isset($row.numbers)}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
 {/if}
 </DirectoryEntry>
 {/if}
diff --git a/resources/templates/provision/yealink/t57w/y000000000097.cfg b/resources/templates/provision/yealink/t57w/y000000000097.cfg
index 37c79ffc8e..2cbb4fea0c 100644
--- a/resources/templates/provision/yealink/t57w/y000000000097.cfg
+++ b/resources/templates/provision/yealink/t57w/y000000000097.cfg
@@ -356,7 +356,7 @@ 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.trust_certificates = {$yealink_trust_certificates}
 
 security.tls_cipher_list = {$yealink_security_tls_cipher_list}
 
@@ -417,7 +417,7 @@ static.auto_provision.encryption.config =
 
 
 #######################################################################################
-##                                   Trnasfer                                        ##       
+##                                   Transfer                                        ##       
 #######################################################################################
 features.transfer_type= {$yealink_transfer_type}
 dialplan.transfer.mode = {$yealink_transfer_mode}
@@ -448,7 +448,8 @@ features.anonymous_response_code=
 ##                          Call Configuration                                       ##       
 #######################################################################################
 phone_setting.incoming_call_when_dialing.priority=
-phone_setting.hold_or_swap.mode=
+{if isset($yealink_hold_or_swap_mode)}phone_setting.hold_or_swap.mode = {$yealink_hold_or_swap_mode}{else}phone_setting.hold_or_swap.mode = 0{/if}
+
 features.play_held_tone.interval=
 features.play_held_tone.delay=
 features.play_held_tone.enable=
@@ -478,7 +479,7 @@ features.headset_training=
 features.headset_prior=
 features.dtmf.replace_tran =
 features.dtmf.transfer =
-phone_setting.ringing_timeout=
+phone_setting.ringing_timeout = {$yealink_ringing_timeout}
 phone_setting.ringback_timeout=
 
 features.keep_mute.enable=
@@ -1479,7 +1480,7 @@ dialplan_replace_rule.url=
 dialplan.replace.line_id.1=
 dialplan.replace.replace.1=
 dialplan.replace.prefix.1=
-phone_setting.dialnow_delay=
+phone_setting.dialnow_delay = {$yealink_dialplan_dialnow_delay}
 dialplan_dialnow.url=
 dialplan.dialnow.line_id.1=
 
@@ -1564,20 +1565,43 @@ 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}
+features.power_saving.enable = {$yealink_ps_enabled}
+##Written in 24hr
+features.power_saving.power_led_flash.on_time = {$yealink_ps_led_on}
+features.power_saving.power_led_flash.off_time = {$yealink_ps_led_off}
+
+##Written in 24hr, values should be comma delimited, e.g. 9,17
+{if isset($yealink_ps_days_all)}
+features.power_saving.office_hour.monday = {$yealink_ps_days_all}
+features.power_saving.office_hour.tuesday = {$yealink_ps_days_all}
+features.power_saving.office_hour.wednesday = {$yealink_ps_days_all}
+features.power_saving.office_hour.thursday = {$yealink_ps_days_all}
+features.power_saving.office_hour.friday = {$yealink_ps_days_all}
+features.power_saving.office_hour.saturday = {$yealink_ps_days_all}
+features.power_saving.office_hour.sunday = {$yealink_ps_days_all}
+{elseif isset($yealink_ps_days_workweek)}
+features.power_saving.office_hour.monday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.tuesday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.wednesday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.thursday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.friday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday}
+features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday}
+{else}
+features.power_saving.office_hour.monday = {$yealink_ps_day_monday}
+features.power_saving.office_hour.tuesday = {$yealink_ps_day_tuesday}
+features.power_saving.office_hour.wednesday = {$yealink_ps_day_wednesday}
+features.power_saving.office_hour.thursday = {$yealink_ps_day_thursday}
+features.power_saving.office_hour.friday = {$yealink_ps_day_friday}
+features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday}
+features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday}
+{/if}
+
+##Written in minutes
+features.power_saving.user_input_ext.idle_timeout = {$yealink_ps_idle_timeout}
+features.power_saving.off_hour.idle_timeout = {$yealink_ps_offhour_timeout}
+features.power_saving.office_hour.idle_timeout = {$yealink_ps_hour_timeout}
+features.power_saving.intelligent_mode = {$yealink_ps_intel_mode}
 
 
 #######################################################################################
@@ -1973,4 +1997,3 @@ phone_setting.end_call_on_hook.enable=
 
 directory_setting.shared_contact.enable=
 shared_contact_list.url=
-
diff --git a/resources/templates/provision/yealink/t57w/{$mac}.cfg b/resources/templates/provision/yealink/t57w/{$mac}.cfg
index f0c5d53409..c65392b85b 100644
--- a/resources/templates/provision/yealink/t57w/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t57w/{$mac}.cfg
@@ -4,7 +4,7 @@
 ##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                                        ##       
+##                                   Transfer                                        ##       
 #######################################################################################
 account.1.phone_setting.call_appearance.transfer_via_new_linekey=
 
@@ -114,7 +114,7 @@ account.1.enable = 1
 {else}
 account.1.enable = 0
 {/if}
-account.1.label = {$account.1.display_name}
+account.1.label = {$account.1.label}
 account.1.display_name = {$account.1.display_name}
 account.1.auth_name = {$account.1.auth_id}
 account.1.password = {$account.1.password}
@@ -183,8 +183,8 @@ account.1.auto_answer=
 ################################################################
 #                      Account Advanced                       ##
 ################################################################
-account.1.nat.udp_update_enable= 3
-account.1.nat.udp_update_time= 30
+account.1.nat.udp_update_enable = {if isset($account.1.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+account.1.nat.udp_update_time = 30
 account.1.nat.rport= {$yealink_rport}
 
 account.1.dtmf.type= {$yealink_dtmf_type}
@@ -565,7 +565,7 @@ bw.virtual_user.1.xsi.user=
 
 
 #######################################################################################
-##                                   Trnasfer                                        ##       
+##                                   Transfer                                        ##       
 #######################################################################################
 account.2.phone_setting.call_appearance.transfer_via_new_linekey=
 
@@ -653,7 +653,7 @@ account.2.enable = 1
 {else}
 account.2.enable = 0
 {/if}
-account.2.label = {$account.2.display_name}
+account.2.label = {$account.2.label}
 account.2.display_name = {$account.2.display_name}
 account.2.auth_name = {$account.2.auth_id}
 account.2.password = {$account.2.password}
@@ -722,8 +722,8 @@ account.2.auto_answer=
 ################################################################
 #                      Account Advanced                       ##
 ################################################################
-account.2.nat.udp_update_enable= 3
-account.2.nat.udp_update_time= 30
+account.2.nat.udp_update_enable = {if isset($account.2.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+account.2.nat.udp_update_time = 30
 account.2.nat.rport= {$yealink_rport}
 
 account.2.dtmf.type= {$yealink_dtmf_type}
@@ -1091,7 +1091,7 @@ pstn.account.2.label=
 
 
 #######################################################################################
-##                                   Trnasfer                                        ##       
+##                                   Transfer                                        ##       
 #######################################################################################
 account.1.phone_setting.call_appearance.transfer_via_new_linekey=
 
@@ -1180,7 +1180,7 @@ account.3.enable = 1
 {else}
 account.3.enable = 0
 {/if}
-account.3.label = {$account.3.display_name}
+account.3.label = {$account.3.label}
 account.3.display_name = {$account.3.display_name}
 account.3.auth_name = {$account.3.auth_id}
 account.3.password = {$account.3.password}
@@ -1249,8 +1249,8 @@ account.3.auto_answer=
 ################################################################
 #                      Account Advanced                       ##
 ################################################################
-account.3.nat.udp_update_enable= 3
-account.3.nat.udp_update_time= 30
+account.3.nat.udp_update_enable = {if isset($account.3.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+account.3.nat.udp_update_time = 30
 account.3.nat.rport= {$yealink_rport}
 
 account.3.dtmf.type= {$yealink_dtmf_type}
@@ -1618,7 +1618,7 @@ pstn.account.3.label=
 
 
 #######################################################################################
-##                                   Trnasfer                                        ##       
+##                                   Transfer                                        ##       
 #######################################################################################
 account.4.phone_setting.call_appearance.transfer_via_new_linekey=
 
@@ -1707,7 +1707,7 @@ account.4.enable = 1
 {else}
 account.4.enable = 0
 {/if}
-account.4.label = {$account.4.display_name}
+account.4.label = {$account.4.label}
 account.4.display_name = {$account.4.display_name}
 account.4.auth_name = {$account.4.auth_id}
 account.4.password = {$account.4.password}
@@ -1776,8 +1776,8 @@ account.4.auto_answer=
 ################################################################
 #                      Account Advanced                       ##
 ################################################################
-account.4.nat.udp_update_enable= 3
-account.4.nat.udp_update_time= 30
+account.4.nat.udp_update_enable = {if isset($account.4.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+account.4.nat.udp_update_time = 30
 account.4.nat.rport= {$yealink_rport}
 
 account.4.dtmf.type= {$yealink_dtmf_type}
@@ -2144,7 +2144,7 @@ pstn.account.4.label=
 
 
 #######################################################################################
-##                                   Trnasfer                                        ##       
+##                                   Transfer                                        ##       
 #######################################################################################
 account.5.phone_setting.call_appearance.transfer_via_new_linekey=
 
@@ -2233,7 +2233,7 @@ account.5.enable = 1
 {else}
 account.5.enable = 0
 {/if}
-account.5.label = {$account.5.display_name}
+account.5.label = {$account.5.label}
 account.5.display_name = {$account.5.display_name}
 account.5.auth_name = {$account.5.auth_id}
 account.5.password = {$account.5.password}
@@ -2302,8 +2302,8 @@ account.5.auto_answer=
 ################################################################
 #                      Account Advanced                       ##
 ################################################################
-account.5.nat.udp_update_enable= 3
-account.5.nat.udp_update_time= 30
+account.5.nat.udp_update_enable = {if isset($account.5.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+account.5.nat.udp_update_time = 30
 account.5.nat.rport= {$yealink_rport}
 
 account.5.dtmf.type= {$yealink_dtmf_type}
@@ -2684,7 +2684,7 @@ bw.virtual_user.1.xsi.user=
 
 
 #######################################################################################
-##                                   Trnasfer                                        ##       
+##                                   Transfer                                        ##       
 #######################################################################################
 account.6.phone_setting.call_appearance.transfer_via_new_linekey=
 
@@ -2773,7 +2773,7 @@ account.6.enable = 1
 {else}
 account.6.enable = 0
 {/if}
-account.6.label = {$account.6.display_name}
+account.6.label = {$account.6.label}
 account.6.display_name = {$account.6.display_name}
 account.6.auth_name = {$account.6.auth_id}
 account.6.password = {$account.6.password}
@@ -2842,8 +2842,8 @@ account.6.auto_answer=
 ################################################################
 #                      Account Advanced                       ##
 ################################################################
-account.6.nat.udp_update_enable= 3
-account.6.nat.udp_update_time= 30
+account.6.nat.udp_update_enable = {if isset($account.6.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+account.6.nat.udp_update_time = 30
 account.6.nat.rport= {$yealink_rport}
 
 account.6.dtmf.type= {$yealink_dtmf_type}
@@ -3211,7 +3211,7 @@ pstn.account.6.label=
 
 
 #######################################################################################
-##                                   Trnasfer                                        ##       
+##                                   Transfer                                        ##       
 #######################################################################################
 account.7.phone_setting.call_appearance.transfer_via_new_linekey=
 
@@ -3300,7 +3300,7 @@ account.7.enable = 1
 {else}
 account.7.enable = 0
 {/if}
-account.7.label = {$account.7.display_name}
+account.7.label = {$account.7.label}
 account.7.display_name = {$account.7.display_name}
 account.7.auth_name = {$account.7.auth_id}
 account.7.password = {$account.7.password}
@@ -3369,8 +3369,8 @@ account.7.auto_answer=
 ################################################################
 #                      Account Advanced                       ##
 ################################################################
-account.7.nat.udp_update_enable= 3
-account.7.nat.udp_update_time= 30
+account.7.nat.udp_update_enable = {if isset($account.7.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+account.7.nat.udp_update_time = 30
 account.7.nat.rport= {$yealink_rport}
 
 account.7.dtmf.type= {$yealink_dtmf_type}
@@ -3738,7 +3738,7 @@ pstn.account.7.label=
 
 
 #######################################################################################
-##                                   Trnasfer                                        ##       
+##                                   Transfer                                        ##       
 #######################################################################################
 account.8.phone_setting.call_appearance.transfer_via_new_linekey=
 
@@ -3827,7 +3827,7 @@ account.8.enable = 1
 {else}
 account.8.enable = 0
 {/if}
-account.8.label = {$account.8.display_name}
+account.8.label = {$account.8.label}
 account.8.display_name = {$account.8.display_name}
 account.8.auth_name = {$account.8.auth_id}
 account.8.password = {$account.8.password}
@@ -3896,8 +3896,8 @@ account.8.auto_answer=
 ################################################################
 #                      Account Advanced                       ##
 ################################################################
-account.8.nat.udp_update_enable= 3
-account.8.nat.udp_update_time= 30
+account.8.nat.udp_update_enable = {if isset($account.8.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+account.8.nat.udp_update_time = 30
 account.8.nat.rport= {$yealink_rport}
 
 account.8.dtmf.type= {$yealink_dtmf_type}
@@ -4265,7 +4265,7 @@ pstn.account.8.label=
 
 
 #######################################################################################
-##                                   Trnasfer                                        ##       
+##                                   Transfer                                        ##       
 #######################################################################################
 account.9.phone_setting.call_appearance.transfer_via_new_linekey=
 
@@ -4354,7 +4354,7 @@ account.9.enable = 1
 {else}
 account.9.enable = 0
 {/if}
-account.9.label = {$account.9.display_name}
+account.9.label = {$account.9.label}
 account.9.display_name = {$account.9.display_name}
 account.9.auth_name = {$account.9.auth_id}
 account.9.password = {$account.9.password}
@@ -4423,8 +4423,8 @@ account.9.auto_answer=
 ################################################################
 #                      Account Advanced                       ##
 ################################################################
-account.9.nat.udp_update_enable= 3
-account.9.nat.udp_update_time= 30
+account.9.nat.udp_update_enable = {if isset($account.9.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+account.9.nat.udp_update_time = 30
 account.9.nat.rport= {$yealink_rport}
 
 account.9.dtmf.type= {$yealink_dtmf_type}
@@ -4792,7 +4792,7 @@ pstn.account.9.label=
 
 
 #######################################################################################
-##                                   Trnasfer                                        ##       
+##                                   Transfer                                        ##       
 #######################################################################################
 account.10.phone_setting.call_appearance.transfer_via_new_linekey=
 
@@ -4881,7 +4881,7 @@ account.10.enable = 1
 {else}
 account.10.enable = 0
 {/if}
-account.10.label = {$account.10.display_name}
+account.10.label = {$account.10.label}
 account.10.display_name = {$account.10.display_name}
 account.10.auth_name = {$account.10.auth_id}
 account.10.password = {$account.10.password}
@@ -4950,8 +4950,8 @@ account.10.auto_answer=
 ################################################################
 #                      Account Advanced                       ##
 ################################################################
-account.10.nat.udp_update_enable= 3
-account.10.nat.udp_update_time= 30
+account.10.nat.udp_update_enable = {if isset($account.10.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+account.10.nat.udp_update_time = 30
 account.10.nat.rport= {$yealink_rport}
 
 account.10.dtmf.type= {$yealink_dtmf_type}
@@ -5315,5 +5315,3 @@ account.10.acd.call_information=
 #######################################################################################
 pstn.account.10.enable=
 pstn.account.10.label=
-
-
diff --git a/resources/templates/provision/yealink/t58a/directory.xml b/resources/templates/provision/yealink/t58a/directory.xml
index 297b9e4108..86c7b6f8b5 100644
--- a/resources/templates/provision/yealink/t58a/directory.xml
+++ b/resources/templates/provision/yealink/t58a/directory.xml
@@ -2,50 +2,58 @@
 {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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-	<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
 </DirectoryEntry>
 {elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
 <DirectoryEntry>
-{if $row.contact_name_given != ""}
+{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 != ""}
+{if $row.phone_number}
 	<Telephone>{$row.phone_number}</Telephone>
 {else}
 	<Telephone>{$row.phone_extension}</Telephone>
@@ -53,29 +61,29 @@
 </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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$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}
+{if isset($row.numbers)}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
 {/if}
 </DirectoryEntry>
 {/if}
diff --git a/resources/templates/provision/yealink/t58a/y000000000058.cfg b/resources/templates/provision/yealink/t58a/y000000000058.cfg
index 4b096c2129..0427b2d51a 100644
--- a/resources/templates/provision/yealink/t58a/y000000000058.cfg
+++ b/resources/templates/provision/yealink/t58a/y000000000058.cfg
@@ -873,7 +873,7 @@ phone_setting.is_deal180 =
 phone_setting.show_code403 =
 
 phone_setting.ringback_timeout =
-phone_setting.ringing_timeout =
+phone_setting.ringing_timeout = {$yealink_ringing_timeout}
 
 phone_setting.page_tip = 
 phone_setting.predial_autodial = 
@@ -1005,7 +1005,7 @@ static.security.user_password = {$var_name}:{$var_password}
 ###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}
+static.security.trust_certificates = {$yealink_trust_certificates}
 
 ###It configures the source certificates for the phone to authenticate for TLS connection.
 ###0-Default certificates,1-Custom certificates,2-All certificates.
@@ -1493,7 +1493,7 @@ voice.side_tone =
 static.security.default_access_level =
 static.auto_provision.attempt_expired_time = 
 phone_setting.ringback_timeout = 
-phone_setting.ringing_timeout =  
+phone_setting.ringing_timeout = {$yealink_ringing_timeout}  
 
 
 #######################################################################################
@@ -1570,4 +1570,5 @@ expansion_module.1.key.1.extension =
 #######################################################################################
 ##                      APP                                                         ##       
 #######################################################################################
-{foreach $yealink_app_unavailable as $value}app.unavailable = {$value}{"\n"}{/foreach}
+pm.version = standard
+app.unavailable = {foreach $yealink_app_unavailable as $value}{$value}/{/foreach}
diff --git a/resources/templates/provision/yealink/t58a/{$mac}.cfg b/resources/templates/provision/yealink/t58a/{$mac}.cfg
index 87b3ce9f74..0e1d2d658f 100644
--- a/resources/templates/provision/yealink/t58a/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t58a/{$mac}.cfg
@@ -11,7 +11,7 @@ account.1.enable = 1
 {else}
 account.1.enable = 0
 {/if}
-account.1.label = {$account.1.display_name}
+account.1.label = {$account.1.label}
 account.1.display_name = {$account.1.display_name}
 account.1.auth_name = {$account.1.auth_id} 
 {if isset($account.1.server.1.address)}
@@ -111,9 +111,9 @@ account.1.reg_fail_retry_interval =
 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.
+##0-Disabled,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
+account.1.nat.udp_update_enable = {if isset($account.1.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 ##It configures the keep-alive interval (in seconds) for account X.
 ##The default value is 30.Integer from 15 to 2147483647
@@ -484,7 +484,7 @@ account.2.enable = 1
 {else}
 account.2.enable = 0
 {/if}
-account.2.label = {$account.2.display_name}
+account.2.label = {$account.2.label}
 account.2.display_name = {$account.2.display_name}
 account.2.auth_name = {$account.2.auth_id}
 account.2.password = {$account.2.password}
@@ -576,13 +576,13 @@ account.2.reg_fail_retry_interval =
 ##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.
+##0-Disabled,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 = 
+account.2.nat.udp_update_enable = {if isset($account.2.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 ##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 = 
+account.2.nat.udp_update_time = 30
 
 ##It enables or disables NAT Rport feature for account X.0-Disabled,1-Enabled
 ##The default value is 0.
@@ -946,7 +946,7 @@ account.3.enable = 1
 {else}
 account.3.enable = 0
 {/if}
-account.3.label = {$account.3.display_name}
+account.3.label = {$account.3.label}
 account.3.display_name = {$account.3.display_name}
 account.3.auth_name = {$account.3.auth_id}
 account.3.password = {$account.3.password}
@@ -1040,13 +1040,13 @@ account.3.reg_fail_retry_interval =
 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.
+##0-Disabled,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 = 
+account.3.nat.udp_update_enable = {if isset($account.3.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 ##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 = 
+account.3.nat.udp_update_time = 30
 
 ##It enables or disables NAT Rport feature for account X.0-Disabled,1-Enabled
 ##The default value is 0.
@@ -1409,7 +1409,7 @@ account.4.enable = 1
 {else}
 account.4.enable = 0
 {/if}
-account.4.label = {$account.4.display_name}
+account.4.label = {$account.4.label}
 account.4.display_name = {$account.4.display_name}
 account.4.auth_name = {$account.4.auth_id}
 account.4.password = {$account.4.password}
@@ -1499,13 +1499,13 @@ account.4.reg_fail_retry_interval =
 ##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.
+##0-Disabled,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 = 
+account.4.nat.udp_update_enable = {if isset($account.4.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 ##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 = 
+account.4.nat.udp_update_time = 30
 
 ##It enables or disables NAT Rport feature for account X.0-Disabled,1-Enabled
 ##The default value is 0.
@@ -1875,7 +1875,7 @@ account.5.enable = 1
 {else}
 account.5.enable = 0
 {/if}
-account.5.label = {$account.5.display_name}
+account.5.label = {$account.5.label}
 account.5.display_name = {$account.5.display_name}
 account.5.auth_name = {$account.5.auth_id}
 account.5.password = {$account.5.password}
@@ -1966,13 +1966,13 @@ account.5.reg_fail_retry_interval =
 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.
+##0-Disabled,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 = 
+account.5.nat.udp_update_enable = {if isset($account.5.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 ##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 = 
+account.5.nat.udp_update_time = 30
 
 ##It enables or disables NAT Rport feature for account X.0-Disabled,1-Enabled
 ##The default value is 0.
@@ -2344,7 +2344,7 @@ account.6.enable = 1
 {else}
 account.6.enable = 0
 {/if}
-account.6.label = {$account.6.display_name}
+account.6.label = {$account.6.label}
 account.6.display_name = {$account.6.display_name}
 account.6.auth_name = {$account.6.auth_id}
 account.6.password = {$account.6.password}
@@ -2437,13 +2437,13 @@ 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.
+##0-Disabled,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 = 
+account.6.nat.udp_update_enable = {if isset($account.6.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 ##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 = 
+account.6.nat.udp_update_time = 30
 
 ##It enables or disables NAT Rport feature for account X.0-Disabled,1-Enabled
 ##The default value is 0.
diff --git a/resources/templates/provision/yealink/t58v/directory.xml b/resources/templates/provision/yealink/t58v/directory.xml
index 297b9e4108..86c7b6f8b5 100644
--- a/resources/templates/provision/yealink/t58v/directory.xml
+++ b/resources/templates/provision/yealink/t58v/directory.xml
@@ -2,50 +2,58 @@
 {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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-	<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
 </DirectoryEntry>
 {elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
 <DirectoryEntry>
-{if $row.contact_name_given != ""}
+{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 != ""}
+{if $row.phone_number}
 	<Telephone>{$row.phone_number}</Telephone>
 {else}
 	<Telephone>{$row.phone_extension}</Telephone>
@@ -53,29 +61,29 @@
 </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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$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}
+{if isset($row.numbers)}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
 {/if}
 </DirectoryEntry>
 {/if}
diff --git a/resources/templates/provision/yealink/t58v/y000000000058.cfg b/resources/templates/provision/yealink/t58v/y000000000058.cfg
index 4e9a1af7d5..6a7ff72602 100644
--- a/resources/templates/provision/yealink/t58v/y000000000058.cfg
+++ b/resources/templates/provision/yealink/t58v/y000000000058.cfg
@@ -874,7 +874,7 @@ phone_setting.is_deal180 =
 phone_setting.show_code403 =
 
 phone_setting.ringback_timeout =
-phone_setting.ringing_timeout =
+phone_setting.ringing_timeout = {$yealink_ringing_timeout}
 
 phone_setting.page_tip = 
 phone_setting.predial_autodial = 
@@ -1006,7 +1006,7 @@ static.security.user_password = {$var_name}:{$var_password}
 ###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}
+static.security.trust_certificates = {$yealink_trust_certificates}
 
 ###It configures the source certificates for the phone to authenticate for TLS connection.
 ###0-Default certificates,1-Custom certificates,2-All certificates.
@@ -1494,7 +1494,7 @@ voice.side_tone =
 static.security.default_access_level =
 static.auto_provision.attempt_expired_time = 
 phone_setting.ringback_timeout = 
-phone_setting.ringing_timeout =  
+phone_setting.ringing_timeout = {$yealink_ringing_timeout}  
 
 
 #######################################################################################
@@ -1586,3 +1586,11 @@ features.doorphone.%d.phone_number =
 features.doorphone.%d.send_audio =
 features.doorphone.%d.send_video =
 features.doorphone.%d.unlock_pin =
+
+
+#######################################################################################
+##                      APP                                                          ##
+#######################################################################################
+pm.version = standard
+app.unavailable = {foreach $yealink_app_unavailable as $value}{$value}/{/foreach}
+
diff --git a/resources/templates/provision/yealink/t58v/{$mac}.cfg b/resources/templates/provision/yealink/t58v/{$mac}.cfg
index e57919a6ef..a46901378d 100644
--- a/resources/templates/provision/yealink/t58v/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t58v/{$mac}.cfg
@@ -14,7 +14,7 @@ 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}.label = {$row.label}
 account.{$row.line_number}.display_name = {$row.display_name}
 account.{$row.line_number}.auth_name = {$row.auth_id}
 {if isset($row.server.1.address)}
@@ -117,7 +117,7 @@ account.{$row.line_number}.reg_fail_retry_interval =
 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.
+##0-Disabled,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
 
diff --git a/resources/templates/provision/yealink/t58w/directory.xml b/resources/templates/provision/yealink/t58w/directory.xml
new file mode 100644
index 0000000000..86c7b6f8b5
--- /dev/null
+++ b/resources/templates/provision/yealink/t58w/directory.xml
@@ -0,0 +1,91 @@
+<YealinkIPPhoneDirectory>
+{foreach $contacts as $row}
+{if $smarty.get.contacts == "users" && $row.category == "users"}
+<DirectoryEntry>
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</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_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</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_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
+{/if}
+{if isset($row.numbers)}
+{foreach $row.numbers as $number}
+{if $number.phone_number}
+	<Telephone>{$number.phone_number}</Telephone>
+{else}
+	<Telephone>{$number.phone_extension}</Telephone>
+{/if}
+{/foreach}
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
+{/if}
+</DirectoryEntry>
+{/if}
+{/foreach}
+</YealinkIPPhoneDirectory>
diff --git a/resources/templates/provision/yealink/t58w/favorite_setting.xml b/resources/templates/provision/yealink/t58w/favorite_setting.xml
new file mode 100644
index 0000000000..ba7275358e
--- /dev/null
+++ b/resources/templates/provision/yealink/t58w/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/t58w/y000000000000.boot b/resources/templates/provision/yealink/t58w/y000000000000.boot
new file mode 100644
index 0000000000..8d795c624b
--- /dev/null
+++ b/resources/templates/provision/yealink/t58w/y000000000000.boot
@@ -0,0 +1,11 @@
+#!version:1.0.0.1
+## The header above must appear as-is in the first line
+
+
+##[$MODEL]include:config <xxx.cfg>
+##[$MODEL,$MODEL]include:config "xxx.cfg"  
+  
+include:config "y000000000150.cfg"
+include:config "{$mac}.cfg"
+
+overwrite_mode = {$yealink_overwrite_mode}
diff --git a/resources/templates/provision/yealink/t58w/y000000000150.cfg b/resources/templates/provision/yealink/t58w/y000000000150.cfg
new file mode 100644
index 0000000000..258f2ae877
--- /dev/null
+++ b/resources/templates/provision/yealink/t58w/y000000000150.cfg
@@ -0,0 +1,2587 @@
+#!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 =
+
+
+#######################################################################################
+##                                    Hostname                                       ##
+#######################################################################################
+static.network.dhcp_host_name =
+
+
+#######################################################################################
+##                                 Network Internet                                  ##
+#######################################################################################
+static.network.ip_address_mode = {$yealink_ip_address_mode}
+
+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 =
+
+#####v84SP4新需求新增###
+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=
+static.network.dns.retry_times=
+static.network.preference=
+static.network.redundancy.failback.timeout=
+static.network.redundancy.mode=
+static.network.static_nat.addr= {$yealink_static_nat}
+static.network.static_nat.enable= {if isset($yealink_static_nat)}1{else}0{/if}
+static.security.server_ssl_method=
+
+#######################################################################################
+##                                   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 = {$yealink_vlan_pc_id}
+static.network.vlan.internet_port_priority = {$yealink_vlan_cos}
+static.network.vlan.pc_port_enable = 
+static.network.vlan.pc_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}
+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 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 = {$yealink_lldp_enable}
+static.network.lldp.packet_interval =   {$yealink_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=
+
+#####V84SP4新需求新增####
+features.rtp_symmetric.enable=
+phone_setting.early_media.rtp_sniffer.timeout=
+
+#######################################################################################
+##                                   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 =
+
+####V84SP4新需求新增#####
+syslog.usb.enable=
+
+#######################################################################################
+##                                   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 = {$yealink_autop_power_on}
+
+#######################################################################################
+##                                   Autop PNP                                       ##
+#######################################################################################
+static.auto_provision.pnp_enable = {$yealink_autop_pnp}
+
+#######################################################################################
+##                                   Autop DHCP                                      ##
+#######################################################################################
+static.auto_provision.dhcp_option.enable = 
+static.auto_provision.dhcp_option.list_user_options = 
+
+#######################################################################################
+##                                   Autop Repeat                                    ##
+#######################################################################################
+static.auto_provision.repeat.enable = {$yealink_autop_repeat_enable}
+static.auto_provision.repeat.minutes = {$yealink_autop_repeat_minutes}
+
+#######################################################################################
+##                                   Autop Weekly                                    ##
+#######################################################################################
+static.auto_provision.weekly.enable = {$yealink_autop_weekly_enable}
+static.auto_provision.weekly.dayofweek = {$yealink_autop_weekly_dayofweek}
+static.auto_provision.weekly.begin_time = {$yealink_autop_weekly_begin_time}
+static.auto_provision.weekly.end_time = {$yealink_autop_weekly_end_time}
+static.auto_provision.weekly_upgrade_interval = {$yealink_autop_weekly_interval}
+#######################################################################################
+##                                   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 = 
+
+######V84SP4新需求新增####
+static.auto_provision.config_version.com=
+static.auto_provision.config_version.mac=
+static.auto_provision.custom.upload_method=
+static.auto_provision.dhcp_option.list_user6_options=
+static.auto_provision.dns_resolv_nosys=
+static.auto_provision.dns_resolv_nretry=
+static.auto_provision.dns_resolv_timeout=
+static.auto_provision.encryption.call_log=
+static.auto_provision.encryption.directory=
+static.auto_provision.pnp_check_url.enable=
+static.auto_provision.user_agent_mac.enable=
+
+
+#######################################################################################
+##                                   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.listen_port =
+sip.tls_listen_port =
+sip.trust_ctrl = {$yealink_trust_ctrl}
+static.sip.nat_stun.enable =
+static.sip.nat_stun.server =
+static.sip.nat_stun.port = {if isset($stun_port)}{$stun_port}{else}3478{/if}
+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 = 
+
+##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.(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}
+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=
+
+####V84SP4新需求新增#######
+phone_setting.disable_account_without_username.enable=
+sip.dhcp.option120.mode=
+sip.dns_transport_type=
+
+sip.loopback.auto_answer.mode=
+sip.loopback.enable=
+sip.loopback_type=
+sip.mac_in_ua=
+
+sip.pkt_loopback_directed_payload=
+sip.pkt_loopback_encapsulated_payload=
+sip.pkt_loopback_mode=
+sip.reliable_protocol.timerae.enable=
+sip.requesturi.e164.addglobalprefix=
+sip.reserve_characters=
+sip.sdp_early_answer_or_offer=
+sip.send_keepalive_by_socket=
+sip.skip_redundant_failover_addr=
+sip.sub_refresh_random=
+sip.unreg_with_socket_close=
+static.ice.enable=
+static.sip.nat_turn.enable=
+static.sip.nat_turn.password=
+static.sip.nat_turn.port=
+static.sip.nat_turn.server=
+static.sip.nat_turn.username=
+
+#######################################################################################
+##                                   Echo Cancellation                               ##
+#######################################################################################
+voice.vad = {$yealink_vad}
+voice.cng = {$yealink_cng}
+voice.echo_cancellation = {$yealink_echo_cancellation}
+voice.ans_nb.enable =
+voice.tns.enable =
+
+#######################################################################################
+##                                   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 = 
+
+#######################################################################################
+##                                   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 = {$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}
+
+
+#######################################################################################
+##                                   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 =  {$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_wait_times = {$yealink_zero_touch_wait}
+static.zero_touch.network_fail_delay_times = {$yealink_zero_touch_delay}
+
+
+#######################################################################################
+##                                   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 = {$yealink_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} = 
+
+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 = {$yealink_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 = 
+
+####V84SP4新增####
+directory_setting.remote_phone_book.enable=
+directory_setting.remote_phone_book.priority=
+search_in_dialing.remote_phone_book.enable=
+search_in_dialing.remote_phone_book.priority=
+
+#######################################################################################
+##                                   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}
+ldap.customize_label=
+
+####V84SP4新增####
+directory_setting.ldap.enable=
+directory_setting.ldap.priority=
+search_in_dialing.ldap.enable=
+search_in_dialing.ldap.priority=
+ldap.anonymous_bind_operation.enable=
+ldap.custom_extra_attr_name=
+ldap.display_extra_attr=
+ldap.extra_attr=
+ldap.numb_display_mode=
+ldap.search_type=
+
+phone_setting.reverse_lookup.contact_list.replace.pattern=
+phone_setting.reverse_lookup.contact_list.replace.with=
+phone_setting.reverse_lookup.incoming_call.replace.pattern=
+phone_setting.reverse_lookup.incoming_call.replace.with=
+
+#######################################################################################
+##                                   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.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 = 
+
+####V84SP4新需求新增#######
+features.show_default_account=
+phone_setting.change_183_to_180=
+
+
+#######################################################################################
+##                                   Features Forward                                ##
+#######################################################################################
+
+features.fwd_mode =
+features.fwd_diversion_enable = 
+
+####v84SP4新需求新增###
+features.fwd.allow = {$yealink_fwd_allow}
+forward.idle_access_always_fwd.enable=
+phone_setting.ring_duration=
+
+#######################################################################################
+##                                   Features DND                                    ##
+#######################################################################################
+
+features.dnd_mode = 
+features.dnd.enable = 
+features.dnd.on_code = {$yealink_dnd_on_code}
+features.dnd.off_code = {$yealink_dnd_off_code}
+features.dnd_refuse_code = 
+features.dnd.emergency_enable = 
+features.dnd.emergency_authorized_number = 
+
+###V84SP4新需求新增#######
+features.dnd.allow= {$yealink_dnd_allow}
+features.dnd.large_icon.enable=
+features.keep_dnd.enable=
+
+#######################################################################################
+##                                   Features Bluetooth                              ##
+#######################################################################################
+features.bluetooth_enable = features.bluetooth_enable
+static.bluetooth.function.enable =
+features.bluetooth_adapter_name= {$yealink_bluetooth_name}
+
+voice.bluetooth_headset_send=
+####V85 add##########
+bluetooth.high_encryption.enable=
+#######################################################################################
+##                                   Features BLF(BLF/BLF List)                      ##
+#######################################################################################
+##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 = 
+
+
+###########V84SP4新需求加入#######
+blf.enhanced.callin.callin.action=
+blf.enhanced.callin.enable=
+blf.enhanced.callin.idle.action=
+blf.enhanced.callin.led=
+blf.enhanced.callin.talking.action=
+blf.enhanced.callout.callin.action=
+blf.enhanced.callout.enable=
+blf.enhanced.callout.idle.action=
+blf.enhanced.callout.led=
+blf.enhanced.callout.talking.action=
+blf.enhanced.dnd.enable=
+blf.enhanced.dnd.led=
+blf.enhanced.hold.enable=
+blf.enhanced.hold.led=
+blf.enhanced.idle.callin.action=
+blf.enhanced.idle.enable=
+blf.enhanced.idle.idle.action=
+blf.enhanced.idle.led=
+blf.enhanced.idle.talking.action=
+blf.enhanced.parked.callin.action=
+blf.enhanced.parked.enable=
+blf.enhanced.parked.idle.action=
+blf.enhanced.parked.led=
+blf.enhanced.parked.talking.action=
+blf.enhanced.talking.callin.action=
+blf.enhanced.talking.enable=
+blf.enhanced.talking.idle.action=
+blf.enhanced.talking.led=
+blf.enhanced.talking.talking.action=
+
+blf.listen_barge_in_code=
+blf.normal_barge_in_code=
+blf.whisper_barge_in_code=
+
+features.auto_release_bla_line=
+features.blf.intercom_mode.enable=
+features.blf.ring_type = {$yealink_blf_ring_type}
+features.blf.show_callinfo.enable=
+features.blf_extension.mode=
+
+
+
+
+
+#######################################################################################
+##                                   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 =
+
+#####V84SP4新需求新增#######
+
+features.intercom.feature_access_code=
+features.intercom.mode=
+
+#######################################################################################
+##                                   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 =
+
+####V84SP4新需求新增#####
+features.dtmf.min_interval=
+
+#######################################################################################
+##                                   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=
+
+####V84SP4新需求新增#######
+features.call_log_merge.enable=
+search_in_dialing.history.enable=
+search_in_dialing.history.priority=
+
+#######################################################################################
+##                                   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 =
+
+#######################################################################################
+##                                   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 = {$yealink_ringing_timeout}
+
+phone_setting.page_tip = 
+phone_setting.predial_autodial = 1
+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 = {$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}
+{if isset($yealink_t54w_wallpaper_filename)}
+phone_setting.backgrounds = Config:{$yealink_t54w_wallpaper_filename}
+{else}
+phone_setting.backgrounds = Config:yealink_t54w_wallpaper.png
+{/if}
+wallpaper_upload.url = {$yealink_t54w_wallpaper}
+expansion_module.backgrounds = {$yealink_wallpaper_expansion}
+
+#######################################################################################
+##                                   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}
+
+
+######V84SP4新需求加入#######
+custom.features.dsskey_lock_type=
+custom.features.dsskey_unlock_password=
+
+
+#######################################################################################
+##                                   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=
+
+#####V84SP4新需求新增#######
+##Multicast(X ranges from 1 to 31.)
+#3multicast.listen_address.X.volume=
+
+multicast.listen_address.1.volume=
+multicast.receive.enhance_volume=
+
+#######################################################################################
+##                                   Super Search									 ##
+#######################################################################################
+super_search.recent_call = 
+super_search.url = {$yealink_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 = {$yealink_trust_certificates}
+
+###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 =
+security.tls_cipher_list = {$yealink_security_tls_cipher_list}
+
+#######################################################################################
+##                                   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}
+
+###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.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 = 
+
+##########################################################################################
+##         	               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.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}
+
+#programablekey.1.type =
+#programablekey.1.line = 
+#programablekey.1.value =
+#programablekey.1.history_type =
+#programablekey.1.label =
+#programablekey.1.xml_phonebook =
+#programablekey.1.extension=
+
+#######################################################################################  
+##                                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-T58/T56/VP59: X ranges from 1 to 3, Y ranges from 1 to 60）##
+
+{foreach $keys["expansion"] as $row}
+expansion_module.key.{$row.device_key_id}.type = {$row.device_key_type}
+expansion_module.key.{$row.device_key_id}.label =
+expansion_module.key.{$row.device_key_id}.value = {$row.device_key_value}
+expansion_module.key.{$row.device_key_id}.line = {$row.device_key_line}
+expansion_module.key.{$row.device_key_id}.extension = {$row.device_key_extension}
+expansion_module.key.{$row.device_key_id}.xml_phonebook = {$row.device_key_label}
+expansion_module.page_tip.blf_call_in.led =
+expansion_module.page_tip.blf_call_in.enable =
+{/foreach}
+
+######V84SP4新需求新增#######
+expkey.type_range.custom=
+linekey.type_range.custom=
+programablekey.type_range.custom=
+
+phone_setting.keytype_sequence=
+phone_setting.uc_favorite_sequence_type=
+
+#######################################################################################
+##                                   Forward Always                                  ##
+#######################################################################################
+forward.always.enable = 
+forward.always.target = 
+forward.always.on_code = {$yealink_forward_always_on_code}
+forward.always.off_code = {$yealink_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 = 
+
+####v84SP4新需求新增###
+features.forward.no_answer.show_ring_times=
+
+#######################################################################################
+##                                   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 =
+
+#####V84SP4新需求加入#######
+action_url.peripheral_information=
+action_url.vpn_ip=
+
+#######################################################################################
+##                                   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= https://{if isset($http_auth_username)}{$http_auth_username}:{$http_auth_password}@{/if}{$domain_name}/app/provision/?file=favorite_setting.xml
+
+
+
+####V84SP4新增####
+directory.search_default_input_method=
+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=
+search_in_dialing.local_directory.enable=
+search_in_dialing.local_directory.priority=
+
+phone_setting.contact_photo_display.enable=
+local_contact.icon_image.url=
+phone_setting.icon.delete=
+phone_setting.icon.url=
+local.dsskey_type_config.mode=
+local_contact.data.delete=
+local_contact.favorite.enable=
+phone_setting.favorite_sequence_type=
+phone_setting.search_t9.enable=
+
+#######################################################################################
+##                                   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 = {$yealink_firmware_url}/{$yealink_firmware_t54w}
+
+#######################################################################################
+##                                             RTCP                                  ##
+#######################################################################################
+phone_setting.vq_rtcpxr.interval_report.enable = {$yealink_rtcpxr_interval_report_enable}
+phone_setting.vq_rtcpxr.session_report.enable = {$yealink_rtcpxr_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_delay_threshold_critical = {$yealink_rtcpxr_delay_threshold_critical}
+phone_setting.vq_rtcpxr_delay_threshold_warning = {$yealink_rtcpxr_delay_threshold_warning}
+phone_setting.vq_rtcpxr_display_jitter.enable = {$yealink_rtcpxr_disp_enable}
+phone_setting.vq_rtcpxr_display_jitter_buffer_max.enable = {$yealink_rtcpxr_disp_enable}
+phone_setting.vq_rtcpxr_display_local_call_id.enable = {$yealink_rtcpxr_disp_enable}
+phone_setting.vq_rtcpxr_display_local_codec.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_remote_call_id.enable = {$yealink_rtcpxr_disp_enable}
+phone_setting.vq_rtcpxr_display_remote_codec.enable = {$yealink_rtcpxr_disp_enable}
+phone_setting.vq_rtcpxr_display_round_trip_delay.enable = {$yealink_rtcpxr_disp_enable}
+phone_setting.vq_rtcpxr_display_start_time.enable = {$yealink_rtcpxr_disp_enable}
+phone_setting.vq_rtcpxr_display_stop_time.enable = {$yealink_rtcpxr_disp_enable}
+phone_setting.vq_rtcpxr_display_symm_oneway_delay.enable = {$yealink_rtcpxr_disp_enable}
+phone_setting.vq_rtcpxr_interval_period = {$yealink_rtcpxr_interval}
+phone_setting.vq_rtcpxr_moslq_threshold_critical = {$yealink_rtcpxr_mos_threshold_critical}
+phone_setting.vq_rtcpxr_moslq_threshold_warning = {$yealink_rtcpxr_mos_threshold_warning}
+voice.rtcp.enable = {$yealink_rtcp_enable}
+voice.rtcp_xr.enable = {$yealink_rtcpxr_enable}
+voice.rtcp_cname = {$yealink_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 = 0
+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 =
+
+###V84SP4新需求新增#####
+static.network.wifi.internet_port.gateway=
+static.network.wifi.internet_port.ip=
+static.network.wifi.internet_port.mask=
+static.network.wifi.internet_port.type=
+static.network.wifi.ip_address_mode=
+static.network.wifi.ipv6_icmp_v6.enable=
+static.network.wifi.ipv6_internet_port.gateway=
+static.network.wifi.ipv6_internet_port.ip=
+static.network.wifi.ipv6_internet_port.type=
+static.network.wifi.ipv6_prefix=
+static.network.wifi.ipv6_primary_dns=
+static.network.wifi.ipv6_secondary_dns=
+static.network.wifi.ipv6_static_dns_enable=
+static.network.wifi.preference=
+static.network.wifi.primary_dns=
+static.network.wifi.secondary_dns=
+static.network.wifi.static_dns_enable=
+
+#######################################################################################
+##                              V80-SP2 Add                                          ##
+#######################################################################################
+##Add Time 2016.5.26
+features.power_saving.enable = {$yealink_ps_enabled}
+
+##Written in minutes
+features.power_saving.office_hour.idle_timeout = {$yealink_ps_hour_timeout}
+features.power_saving.off_hour.idle_timeout = {$yealink_ps_offhour_timeout}
+features.power_saving.user_input_ext.idle_timeout = {$yealink_ps_idle_timeout}
+
+##Written in 24hr, values should be comma delimited, e.g. 9,17
+{if isset($yealink_ps_days_all)}
+features.power_saving.office_hour.monday = {$yealink_ps_days_all}
+features.power_saving.office_hour.tuesday = {$yealink_ps_days_all}
+features.power_saving.office_hour.wednesday = {$yealink_ps_days_all}
+features.power_saving.office_hour.thursday = {$yealink_ps_days_all}
+features.power_saving.office_hour.friday = {$yealink_ps_days_all}
+features.power_saving.office_hour.saturday = {$yealink_ps_days_all}
+features.power_saving.office_hour.sunday = {$yealink_ps_days_all}
+{elseif isset($yealink_ps_days_workweek)}
+features.power_saving.office_hour.monday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.tuesday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.wednesday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.thursday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.friday = {$yealink_ps_days_workweek}
+features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday}
+features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday}
+{else}
+features.power_saving.office_hour.monday = {$yealink_ps_day_monday}
+features.power_saving.office_hour.tuesday = {$yealink_ps_day_tuesday}
+features.power_saving.office_hour.wednesday = {$yealink_ps_day_wednesday}
+features.power_saving.office_hour.thursday = {$yealink_ps_day_thursday}
+features.power_saving.office_hour.friday = {$yealink_ps_day_friday}
+features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday}
+features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday}
+{/if}
+
+screensaver.wait_time = {$yealink_screensaver_wait}
+
+##V83 Add
+features.power_saving.power_led_flash.off_time = {$yealink_ps_led_off}
+features.power_saving.power_led_flash.on_time = {$yealink_ps_led_on}
+screensaver.type = {$yealink_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=
+
+#####V84SP4新增####
+dialplan.transfer.mode=
+
+##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=
+
+#####V84SP4新增-E911####
+###(X ranges from 1 to 255.)########
+###dialplan.emergency.held.request_element.X.name=###
+###dialplan.emergency.held.request_element.X.value=###
+
+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.secondary.server_url=
+dialplan.emergency.held.server_url=
+
+#######################################################################################
+##                              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 =
+##Written in minutes
+features.power_saving.intelligent_mode = {$yealink_ps_intel_mode}
+
+features.blf_active_backlight.enable =                                    
+features.intercom.headset_prior.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}
+
+####V84SP4新需求新增#######
+lcl.datetime.date.format=
+
+
+#######################################################################################
+##                                    Broadsoft ACD                                  ##
+#######################################################################################
+acd.enable=
+acd.auto_available_timer=
+
+######V84SP4新增####
+acd.available_fixed_display.enable=
+acd.disp_code_fixed_display.enable=
+acd.logout_fixed_display.enable=
+acd.trace_fixed_display.enable=
+features.homescreen_softkey.acd.enable=
+features.homescreen_softkey.acd.enable=
+
+#######################################################################################
+##                              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 =
+
+######V84SP4新需求加入#######
+
+bw.flexible_seating.remember_password.ldap.enable=
+bw.xsi.directory.alphabetized_by_lastname.enable=
+
+features.homescreen_softkey.hoteling.enable=
+features.homescreen_softkey.hoteling.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 =
+
+#####V84SP4新需求加入#######
+default_input_method.xsi_password=
+
+#######################################################################################
+##                         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=
+
+####V84SP4新需求新增#######
+features.call_park.direct_send.enable=
+features.call_park.line_restriction.enable=
+features.call_park.park_mode=
+features.call_park.performby_holdhardkey.enable=
+
+features.parked_call_monitor.blf.ring_type=
+features.parked_call_monitor.blf_audio_enable=
+features.parked_call_monitor.blf_visual_enable=
+
+#######################################################################################
+##                           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 = {$yealink_direct_pickup_enable}
+features.pickup.direct_pickup_code = **
+features.pickup.blf_visual_enable =
+features.pickup.blf_audio_enable = 
+
+####V84SP4新需求新增#######
+features.pickup.blf_audio.list=
+features.pickup.blf_visual.list=
+features.pickup_display.method=
+
+#######################################################################################
+##                               Encryption                                          ##
+####################################################################################### 
+static.auto_provision.encryption.config = 
+
+#######################################################################################
+##                              Android phone-T58V/VP59 Add                          ##
+#######################################################################################
+##Add Time 2016.9.2
+
+static.wifi.802_11e.enable =
+phone_setting.permit_silent_mode.enable =
+sip.h264.peer_resolution.default = 
+
+######doorphone.x(x ranges from 1 to 99)###
+###features.doorphone.x.display_name =
+###features.doorphone.x.full_screen =
+###features.doorphone.x.phone_number =
+###features.doorphone.x.send_audio =
+###features.doorphone.x.send_video =
+###features.doorphone.x.unlock_pin =
+###features.doorphone.x.autopreview.enable =
+###features.doorphone.x.httpapi.password =
+###features.doorphone.x.httpapi.username =
+###features.doorphone.x.video.stream.httpurl =
+###features.doorphone.x.videopreview.enable =
+###features.doorphone.x.device_model =
+
+features.doorphone.1.display_name =
+features.doorphone.1.full_screen =
+features.doorphone.1.phone_number =
+features.doorphone.1.send_audio =
+features.doorphone.1.send_video =
+features.doorphone.1.unlock_pin =
+features.doorphone.1.autopreview.enable =
+features.doorphone.1.httpapi.password =
+features.doorphone.1.httpapi.username =
+features.doorphone.1.video.stream.httpurl =
+features.doorphone.1.videopreview.enable =
+features.doorphone.1.device_model =
+features.doorphone.amount =
+
+
+features.csta_control.enable = 
+static.network.ethernet_as_wifi.enable =
+
+static.security.default_ssl_method = {$yealink_security_default_ssl_method}
+features.video_call_bandwidth = 
+video.enable =
+features.default_layout =
+
+######V84新需求新增######
+
+features.doorphone.X.autopreview_record.enable=
+features.doorphone.X.device_model=
+
+#######################################################################################
+##                      APP                                                          ##
+#######################################################################################
+app.install_url = 
+app.uninstall =
+app.unavailable =
+app.autorun =
+
+
+pm.gms_install_url = 
+pm.gms_uninstall =
+
+####V84SP4新需求加入#######
+app.auto_arrange.enable=
+
+#######################################################################################
+##                      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 =
+
+####V84SP4新需求新增#####
+###EDK Soft Keys(X ranges from 1 to 10)
+###softkey.X.softkey_id=
+###softkey.X.use.dialing=
+###softkey.X.use.dialtone=
+softkey.1.softkey_id=
+softkey.1.use.dialing=
+softkey.1.use.dialtone=
+
+#######################################################################################  
+##                               Voice Mail                                          ##
+#######################################################################################
+features.voice_mail_alert.enable=
+features.voice_mail_tone_enable=
+features.hide_feature_access_codes.enable = {$yealink_hide_feature_access_codes_enable}
+
+#######################################################################################  
+##                                XML                                                ##
+####################################################################################### 
+push_xml.server=
+push_xml.sip_notify=
+push_xml.block_in_calling=
+features.xml_browser.loading_tip.delay =
+
+#####V84SP4新增####
+default_input_method.xml_browser_input_screen=
+features.xml_browser.pwd=
+features.xml_browser.user_name=
+hoteling.authentication_mode=
+
+push_xml.password=
+push_xml.phonebook.search.delay=
+push_xml.username=
+#####x ranges 1 to 5####
+###remote_phonebook.data.X.password=
+###remote_phonebook.data.X.username=
+
+remote_phonebook.data.1.password=
+remote_phonebook.data.1.username=
+
+{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 USB                                     ##
+#######################################################################################
+##V83 Add
+static.usb.power.enable =
+static.usbdisk.function.enable =
+
+#######################################################################################
+##                                  Acoustic Shield                                  ##
+#######################################################################################
+##V83 Add
+features.acoustic_shield.level=
+features.acoustic_shield.mode=
+
+#######################################################################################
+##                                  Google Contact                                   ##
+#######################################################################################
+##V83 Add
+google_contact_server.enable=
+
+#######################################################################################
+##                                  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= {$yealink_usb_record_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 =
+####V84SP4新增####
+features.system_function_bar.hide=
+
+#######################################################################################
+##                                    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-- EP包中配置，模板SP4开始去掉          ##
+#######################################################################################
+
+
+#######################################################################################
+##                          Contact Backup                                           ##
+#######################################################################################
+static.auto_provision.local_contact.backup.path =
+static.auto_provision.local_contact.backup.enable=
+
+
+
+#######################################################################################
+##                          Call Configuration                                       ##
+#######################################################################################
+######V84SP4新增####
+default_input_method.dialing=
+features.auto_answer.first_call_only=
+features.auto_answer.ring_type=
+
+features.call.dialtone_time_out=
+features.call_out_history_by_off_hook.enable=
+features.conference.local.enable=
+features.conference.with_previous_call.enable=
+
+features.congestion_tone.codelist=
+features.custom_auto_answer_tone.enable=
+features.custom_softkey_dynamic.enable=
+
+features.handset_mode.enable=
+features.headset.ctrl_call.enable=
+features.headset_mode.enable=
+
+features.mute.autoanswer_mute.enable=
+features.no_answer_code=
+
+features.ignore_incoming_call.enable=
+features.play_held_tone.delay=
+features.play_held_tone.enable=
+features.play_held_tone.interval=
+features.play_hold_tone.interval=
+features.speaker_mode.enable=
+features.station_name.scrolling_display=
+features.station_name.value =
+features.transfer_keep_session2_after_failed.enable=
+force.voice.ring_vol=
+
+phone_setting.incoming_call.horizontal_roll_interval=
+phone_setting.incoming_call.reject.enable=
+phone_setting.incoming_call_when_dialing.priority=
+{if isset($yealink_hold_or_swap_mode)}phone_setting.hold_or_swap.mode = {$yealink_hold_or_swap_mode}{else}phone_setting.hold_or_swap.mode = 0{/if}
+phone_setting.call_appearance.calls_per_linekey=
+phone_setting.call_appearance.conference_via_new_linekey=
+phone_setting.call_appearance.transfer_via_new_linekey={$yealink_transfer_via_new_linekey}
+phone_setting.call_display_name.mode=
+phone_setting.custom_softkey.apply_to_states=
+phone_setting.end_call_net_disconnect.enable=
+
+####V84SP4新增-仅T58/VP59支持#####
+voice.handset.tia4965.enable = 
+voice.headset.tia4965.enable = 
+
+
+#######################################################################################
+##                                   Genbend Setting                                 ##
+#######################################################################################
+######V84SP4新需求新增####
+
+directory_setting.gb_gab_directory.enable=
+directory_setting.gb_gab_directory.priority=
+directory_setting.gb_pab_directory.enable=
+directory_setting.gb_pab_directory.priority=
+directory_setting.presence_list.enable=
+directory_setting.presence_list.priority=
+search_in_dialing.gb_pab_directory.enable=
+search_in_dialing.gb_pab_directory.priority=
+
+gb.emergency_instant_messages.displaytimeout=
+gb.emergency_instant_messages.enable=
+features.emergency_instant_messages.ring_type=
+
+features.pab.enable
+features.pab.soupuser
+
+gb.presence.enable=
+gb.presence.line=
+gb.sopi.enable=
+gb.sopi.gab.enable=
+gb.sopi.gab.retain_search_filter=
+gb.sopi.pab.enable=
+gb.sopi.pab.match_in_calling.enable=
+gb.sopi.password=
+gb.sopi.service_url=
+gb.sopi.username=
+
+#######################################################################################
+##                                   IME Settings                                    ##
+#######################################################################################
+######V84SP4新需求新增#####
+gui_input_method.delete=
+gui_input_method.url=
+
+#######################################################################################
+##                                    Codec                                          ##
+#######################################################################################
+####V84SP4新需求新增####
+voice.g726.aal2.enable=
+
+
+#######################################################################################
+##                   CP960特有的common配置                                           ##
+#######################################################################################
+bluetooth.a2dp_sink=
+bluetooth.connect_confirm.enable=
+features.cp_star_connection.master.enable=
+features.cp_star_connection.master.mac=
+features.cp_star_connection.slave.X.mac=
+
+features.dect_mic.mute.mode=
+features.exit_dnd_mode_enable=
+features.play_mute_tone.enable=
+features.play_mute_tone.interval=
+
+static.network.port.max_rtpport=
+static.network.port.min_rtpport=
+
+###shortcutkey(x ranges form 1 to 6)
+###shortcutkey.X.icon=
+###shortcutkey.X.label=
+###shortcutkey.X.type=
+###shortcutkey.X.value=
+shortcutkey.1.icon=
+shortcutkey.1.label=
+shortcutkey.1.type=
+shortcutkey.1.value=
+
+####V85 add
+phone_setting.usb.pc_mode.audio_union=
+phone_setting.usb.pc_mode.default_conference=
+phone_setting.usb.pc_mode=
+
+#######################################################################################
+##                                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=
+dialplan.emergency.held.request_element.x.name=
+dialplan.emergency.held.request_element.x.value=
+dialplan.emergency.held.request_type=
+dialplan.emergency.held.secondary.server_url=
+dialplan.emergency.held.server_url=
+features.headset.group_listen_in_talking_enable=
+features.intercom.video.mute=
+features.noise_filtering_rev.enable=
+features.out_of_service_alert.enable=
+features.out_of_service_alert_time=
+features.paging_auto_resume.enable=
+features.recording_file.delete_method=
+features.recording_upload.enable=
+features.recording_upload.server.address=
+features.recording_upload.server.password=
+features.recording_upload.server.username=
+features.recording_upload_action=
+features.voice_mail_key_lamp_field.enable=
+hoteling.authorized_call.X.value=
+hoteling.http_request_server=
+hoteling.password=
+over_the_air.url.cp930w=
+phone_setting.autop_led_flash_enable=
+phone_setting.call_display_name.mode=
+phone_setting.call_remote_end_when_hold.busy_tone.enable=
+phone_setting.hide_dsskey.mode=
+phone_setting.idle_clock_display.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.wifiap.channel=
+static.wifiap.dhcpd.mode=
+static.wifiap.dhcpd.segment=
+static.wifiap.enable=
+static.wifiap.generation=
+static.wifiap.password=
+static.wifiap.security_mode=
+static.wifiap.ssid=
+unify.enable=
+features.transfer_complete.prompt.enable =
+
+#######################################################################################
+##                                V86  add                                           ##
+#######################################################################################
+alarm.*.handset_stop.enable=
+alarm.*.name=
+alarm.*.pre_alarm.delay=
+alarm.*.pre_alarm.handset_stop.enable=
+alarm.*.ring.enable=
+alarm.*.trigger_delay=
+alarm.*.type=
+alarm.*.weekly.begin_time=
+alarm.*.weekly.dayofweek=
+alarm.*.weekly.end_time=
+alarm.server.address=
+alarm.server.expires=
+alarm.server.port=
+alarm.server.retry_counts=
+alarm.server.transport_type=
+ddp.*.features.pickup.blf_audio.list=
+ddp.*.features.pickup.blf_audio_enable=
+ddp.*.features.pickup.blf_visual.list=
+ddp.*.features.pickup.blf_visual_enable=
+ddp.*.linekey.*.extension=
+ddp.*.linekey.*.label=
+ddp.*.linekey.*.line=
+ddp.*.linekey.*.type=
+ddp.*.linekey.*.value=
+directory.containing_search.additional_sorting_mode=
+dm.enterprise_id=
+dm.site_id=
+features.accessibility.large_text.enable=
+features.analog_headset.mode=
+features.anonymous.feature_key_sync.enable=
+features.blf_key_state_display.enable=
+features.call_out_directory_by_off_hook.enable=
+features.caller_name_type_on_call=
+features.font.size=
+features.keep_mute.mode=
+features.missed_call_icon_event=
+features.network.8021x_upload.mode=
+features.transfer.mode=
+firmware.usb_headset.server=
+firmware.usb_headset.server.appid=
+firmware.usb_headset.server.special_num=
+firmware.usb_headset.url=
+gb.sopi.gab.default_search=
+gb.sopi.gab.default_search_keywords=
+gb.sopi.gab.default_search_type=
+handset.*.alarm.number=
+handset.*.alarm.template=
+static.network.dns_list.mode=
+static.network.wifi.dns_list.mode=
+over_the_air.url.t54w_dd10k=
+over_the_air.url.w59r=
+packet_capture.interface=
+phone_setting.called_party_info_display_method=
+phone_setting.fwd_and_dnd.suspension_prompt=
+phone_setting.headset_image.url=
+phone_setting.local_directory_order.type=
+phone_setting.message_call.rule=
+phone_setting.old_mail_display.enable=
+phone_setting.phone_lock.emergency.number_rule=
+phone_setting.recorder_tone.enable=
+phone_setting.vq_rtcpxr.min_callduration=
+phone_setting.wifi_security_check.enable=
+screensaver.xml_browser.url = {$yealink_screensaver_xml_url}
+static.security.802_1x.ca_cert=
+static.security.802_1x.cn_validation=
+static.security.802_1x.dev_cert=
+static.security.802_1x.ssl_method=
+static.security.802_1x.tls_cipher_list=
+static.security.802_1x.trust_certificates=
+static.security.auto_provision.ca_cert=
+static.security.auto_provision.cn_validation=
+static.security.auto_provision.dev_cert=
+static.security.auto_provision.ssl_method=
+static.security.auto_provision.tls_cipher_list=
+static.security.auto_provision.trust_certificates=
+static.security.dm.ca_cert=
+static.security.dm.cn_validation=
+static.security.dm.dev_cert=
+static.security.dm.ssl_method=
+static.security.dm.tls_cipher_list=
+static.security.dm.trust_certificates=
+static.security.ldap.ca_cert=
+static.security.remote_phonebook.ca_cert=
+static.security.remote_phonebook.cn_validation=
+static.security.remote_phonebook.dev_cert=
+static.security.remote_phonebook.ssl_method=
+static.security.remote_phonebook.tls_cipher_list=
+static.security.remote_phonebook.trust_certificates=
+static.security.sip.ca_cert=
+static.security.sip.cn_validation=
+static.security.sip.dev_cert=
+static.security.sip.ssl_method=
+static.security.sip.tls_cipher_list=
+static.security.sip.trust_certificates=
+static.security.sopi.ca_cert=
+static.security.sopi.cn_validation=
+static.security.sopi.dev_cert=
+static.security.sopi.ssl_method=
+static.security.sopi.tls_cipher_list=
+static.security.sopi.trust_certificates=
+static.security.tr069.ca_cert=
+static.security.tr069.cn_validation=
+static.security.tr069.dev_cert=
+static.security.tr069.ssl_method=
+static.security.tr069.tls_cipher_list=
+static.security.tr069.trust_certificates=
+static.security.web_limited_access_level=
+static.security.web_server.cn_validation=
+static.security.web_server.dev_cert=
+static.security.web_server.ssl_method=
+static.security.web_server.tls_cipher_list=
+static.security.web_server.trust_certificates=
+static.security.xml_browser.ca_cert=
+static.security.xml_browser.cn_validation=
+static.security.xml_browser.dev_cert=
+static.security.xml_browser.ssl_method=
+static.security.xml_browser.tls_cipher_list=
+static.static.security.xml_browser.trust_certificates=
+static.security.xmpp_xsi.ca_cert=
+static.security.xmpp_xsi.cn_validation=
+static.security.xmpp_xsi.dev_cert=
+static.security.xmpp_xsi.ssl_method=
+static.security.xmpp_xsi.tls_cipher_list=
+static.security.xmpp_xsi.trust_certificates=
+server_certificates.*.url=
+server_certificates.url=
+sip.emergency_call.mode=
+static.security.password_use_default.mode=
+voice.intercom.tone_vol=
+wifiap.brocast_ssid=1
+xmlbrowser_icon.delete=
+xmlbrowser_icon_upload.url=
+#######################################################################################
+##                                T58W  add                                          ##
+#######################################################################################
+features.lower_your_voice_alarm.enable=
+
diff --git a/resources/templates/provision/yealink/t58w/{$mac}.cfg b/resources/templates/provision/yealink/t58w/{$mac}.cfg
new file mode 100644
index 0000000000..71c39493e1
--- /dev/null
+++ b/resources/templates/provision/yealink/t58w/{$mac}.cfg
@@ -0,0 +1,685 @@
+#!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.*:(T58/T56A/VP59: X ranges from 1 to 16. CP960: X ranges from 1 to 1.)##
+
+{foreach $lines as $row}
+
+#######################################################################################
+##                           Account1 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.label}
+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}
+
+account.{$row.line_number}.outbound_proxy_enable = {if isset($row.outbound_proxy_primary)}1{else}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_1_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}
+
+{if isset($outbound_proxy_fallback_interval)}
+account.{$row.line_number}.outbound_proxy_fallback_interval = {$outbound_proxy_fallback_interval}
+{else}
+account.{$row.line_number}.outbound_proxy_fallback_interval = 120
+{/if}
+
+####V84SP4#####
+account.{$row.line_number}.outbound_proxy.1.failback_mode= 
+account.{$row.line_number}.outbound_proxy.1.failback_subscribe.enable= 
+account.{$row.line_number}.outbound_proxy.1.failback_timeout= 
+account.{$row.line_number}.outbound_proxy.1.invite_retry_counts=
+account.{$row.line_number}.outbound_proxy.1.only_signal_with_registered=
+account.{$row.line_number}.outbound_proxy.1.register_on_enable=
+account.{$row.line_number}.outbound_proxy.1.retry_counts=
+account.{$row.line_number}.invite_with_rpid_header.enable=
+account.{$row.line_number}.auto_answer_mute_enable=
+
+##It configures the transport type for account 1. 0-UDP,1-TCP,2-TLS,3-DNS-NAPTR
+##The default value is 0.
+account.{$row.line_number}.sip_server.1.transport_type = 
+
+##It configures the backup server transport type for account 1. 0-UDP,1-TCP,2-TLS,3-DNS-NAPTR
+##The default value is 0. 
+account.{$row.line_number}.sip_server.2.transport_type = 
+
+#######################################################################################
+##                          Failback (SIP Backup Server)                             ##
+#######################################################################################
+
+account.{$row.line_number}.naptr_build = 0
+account.{$row.line_number}.fallback.redundancy_type = 0
+account.{$row.line_number}.fallback.timeout = 3600
+
+{if isset($row.server.1.address)}
+account.{$row.line_number}.sip_server.1.address= {$row.server.1.address} 
+{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
+
+account.{$row.line_number}.sip_server.2.address = {$row.server.2.address}
+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 = 
+account.{$row.line_number}.register_expires_overlap = 
+account.{$row.line_number}.subscribe_expires_overlap =
+
+####V84SP4#####
+account.{$row.line_number}.outbound_proxy.1.failback_subscribe.enable=
+account.{$row.line_number}.outbound_proxy.1.invite_retry_counts=
+account.{$row.line_number}.outbound_proxy.1.only_signal_with_registered=
+account.{$row.line_number}.outbound_proxy.2.failback_subscribe.enable=
+account.{$row.line_number}.outbound_proxy.2.invite_retry_counts=
+account.{$row.line_number}.outbound_proxy.2.only_signal_with_registered=
+account.{$row.line_number}.sip_server.1.only_signal_with_registered=
+account.{$row.line_number}.sip_server.2.only_signal_with_registered=
+account.{$row.line_number}.sip_server.1.failback_subscribe.enable=
+account.{$row.line_number}.sip_server.2.failback_subscribe.enable=
+
+#######################################################################################
+##                           Register Advanced                                       ##
+#######################################################################################
+##It configures the SIP server type for account X.0-Default,2-BroadSoft,4-Cosmocom,6-UCAP
+##The default value is 0.
+
+#Configure the SIP server type 0-Default (default), 2-BroadSoft, 4-Cosmocom
+account.{$row.line_number}.sip_server_type = 
+#Enable or disable the phone to send the account log-off message first and then send account register message when rebooting the phone 0-Disabled (default), 1-Enabled
+
+account.{$row.line_number}.unregister_on_reboot = 
+
+#Enable or disable the phone to send the MAC address and line number in the Register message 0-Disabled (default), 1-Enabled
+account.{$row.line_number}.register_mac = 
+account.{$row.line_number}.register_line = 
+
+#Configure the interval (in seconds) the phone retries to register when account1 fails to register. It ranges from 0 to 1800, the default value is 30.
+account.{$row.line_number}.reg_fail_retry_interval = 
+
+#Specify whether to encrypt the SIP messages 0-Disabled (default), 1-Forced, 2-Negotiated
+account.{$row.line_number}.srtp_encryption = {$yealink_srtp_encryption}
+
+######################################################################################
+##                     NAT Settings                                                 ##
+######################################################################################
+##It enables or disables the NAT traversal for account X.0-Disabled (default),1-Enabled 1-STUN
+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.
+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_1}
+
+
+#######################################################################################
+##                            Account1 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=
+
+#####V84SP4####
+account.{$row.line_number}.sip_server_mode=
+
+
+#######################################################################################
+##                            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 = {$yealink_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 = 3600
+
+
+##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 = 1
+
+##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= 3600
+
+
+account.{$row.line_number}.display_mwi.enable=
+account.{$row.line_number}.subscribe_register =
+#######################################################################################
+##                                    Broadsoft ACD                                  ##
+#######################################################################################
+account.{$row.line_number}.acd.enable= 0
+account.{$row.line_number}.acd.unavailable_reason_enable= 0
+account.{$row.line_number}.acd.initial_state= 1
+
+##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=
+
+####V84SP4#####
+###account.X.acd.available
+###account.X.acd.available_url
+###account.X.acd.away_url
+###account.X.acd.call_information=
+###account.X.acd.refresh_url=
+account.{$row.line_number}.acd.available
+account.{$row.line_number}.acd.available_url
+account.{$row.line_number}.acd.away_url
+account.{$row.line_number}.acd.call_information=
+account.{$row.line_number}.acd.refresh_url=
+#######################################################################################
+##                                 Broadsoft  Call Center                            ##
+#######################################################################################
+####V84SP4#####
+##The value Y must be continuous(Y ranges from 1 to 100).
+#account.X.bw_disp_code.Y=
+#account.X.bw_disp_code_name.Y=
+
+account.{$row.line_number}.bw_disp_code.1=
+account.{$row.line_number}.bw_disp_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 = 1800
+
+##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 = 0
+
+##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= 
+
+#####V84SP4#####
+account.{$row.line_number}.blf_list_call_parked_code=
+account.{$row.line_number}.blf_list_call_parked_list=
+
+
+#######################################################################################
+##                            BLA/SCA                                                ##
+#######################################################################################
+##It enables or disables Broadsoft SCA feature for account X.0-Disabled,1-Broadsoft SCA.
+##The default value is 0.
+
+{if isset($row.shared_line)}
+account.{$row.line_number}.shared_line = {$row.shared_line}
+{else}
+account.{$row.line_number}.shared_line = 0
+{/if}
+
+##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=
+
+####V84SP4####
+account.{$row.line_number}.share_line.cancel_private_code=
+account.{$row.line_number}.share_line.enable_private_code=
+
+####V85####
+account.X.shared_line.idle_details=
+
+#######################################################################################
+##                            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.X.codec.<payload_type>.enable####
+###account.X.codec.<payload_type>.priority####
+
+account.{$row.line_number}.codec.ilbc_15_2kbps.priority= 0
+account.{$row.line_number}.codec.ilbc_15_2kbps.enable= 0
+account.{$row.line_number}.codec.ilbc_13_33kbps.priority= {if isset($yealink_codec_iLBC_priority)}{$yealink_codec_iLBC_priority}{else}0{/if}
+account.{$row.line_number}.codec.ilbc_13_33kbps.enable = {if isset($yealink_codec_iLBC_enable)}1{else}0{/if}
+
+account.{$row.line_number}.codec.g722.enable = {if isset($yealink_codec_g722_enable)}{$yealink_codec_g722_enable}{else}0{/if}
+account.{$row.line_number}.codec.g722.priority = {if isset($yealink_codec_g722_priority)}{$yealink_codec_g722_priority}{else}0{/if}
+
+account.{$row.line_number}.codec.g729.enable = {if isset($yealink_codec_g729_enable)}1{else}0{/if}
+account.{$row.line_number}.codec.g729.priority = {if isset($yealink_codec_g729_priority)}{$yealink_codec_g729_priority}{else}0{/if}
+
+account.{$row.line_number}.codec.g723_53.enable = {if isset($yealink_codec_g723_53_enable)}1{else}0{/if}
+account.{$row.line_number}.codec.g723_53.priority = {if isset($yealink_codec_g723_53_priority)}{$yealink_codec_g723_53_priority}{else}0{/if}
+
+account.{$row.line_number}.codec.g723_63.enable = {if isset($yealink_codec_g723_63_enable)}1{else}0{/if}
+account.{$row.line_number}.codec.g723_63.priority = {if isset($yealink_codec_g723_63_priority)}{$yealink_codec_g723_63_priority}{else}0{/if}
+
+account.{$row.line_number}.codec.g726_16.enable = {if isset($yealink_codec_g726_16_enable)}1{else}0{/if} 
+account.{$row.line_number}.codec.g726_16.priority = {if isset($yealink_codec_g726_16_priority)}{$yealink_codec_g726_16_priority}{else}0{/if}
+
+account.{$row.line_number}.codec.g726_24.enable = {if isset($yealink_codec_g726_24_enable)}1{else}0{/if}
+account.{$row.line_number}.codec.g726_24.priority = {if isset($yealink_codec_g726_24_priority)}{$yealink_codec_g726_24_priority}{else}0{/if}
+
+account.{$row.line_number}.codec.g726_32.enable = {if isset($yealink_codec_g726_32_enable)}1{else}0{/if}
+account.{$row.line_number}.codec.g726_32.priority = {if isset($yealink_codec_g726_32_priority)}{$yealink_codec_g726_32_priority}{else}0{/if}
+
+account.{$row.line_number}.codec.g726_40.enable = {if isset($yealink_codec_g726_40_enable)}1{else}0{/if}
+account.{$row.line_number}.codec.g726_40.priority = {if isset($yealink_codec_g726_40_priority)}{$yealink_codec_g726_40_priority}{else}0{/if}
+
+account.{$row.line_number}.codec.ilbc.enable = 
+account.{$row.line_number}.codec.ilbc.priority = 
+
+account.{$row.line_number}.codec.opus.enable = {if isset($yealink_codec_opus_enable)}1{else}0{/if}
+account.{$row.line_number}.codec.opus.priority = {if isset($yealink_codec_opus_priority)}{$yealink_codec_opus_priority}{else}0{/if}
+account.{$row.line_number}.codec.opus.para=
+
+account.{$row.line_number}.codec.pcmu.enable = {if isset($yealink_codec_pcmu_enable)}1{else}0{/if}
+account.{$row.line_number}.codec.pcmu.priority = {if isset($yealink_codec_pcmu_priority)}{$yealink_codec_pcmu_priority}{else}0{/if}
+
+account.{$row.line_number}.codec.pcma.enable = {if isset($yealink_codec_pcma_enable)}1{else}0{/if}
+account.{$row.line_number}.codec.pcma.priority = {if isset($yealink_codec_pcma_priority)}{$yealink_codec_pcma_priority}{else}0{/if}
+
+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.X.video.<payload_type>.enable####
+####account.X.video.<payload_type>.priority####
+
+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 =
+
+#######################################################################################
+##                            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 = 0
+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 =
+
+####V84SP4#####
+account.{$row.line_number}.anonymous_call.server_base_only=
+
+#######################################################################################
+##                            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 = 0
+
+##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                                                   ##
+#######################################################################################
+#Configure the DTMF type 0-INBAND, 1-RFC2833 (default), 2-SIP INFO, 3-AUTO+SIP INFO
+account.{$row.line_number}.dtmf.type = {$yealink_dtmf_type}
+
+#Configure the DTMF info type when using the SIP INFO 0-Disabled (default), 1-DTMF-Relay, 2-DTMF, 3-Telephone-Event
+account.{$row.line_number}.dtmf.info_type = 
+
+#Configure the RFC2833 payload. It ranges from 96 to 255, the default value is 101.
+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 = 1
+
+#######################################################################################
+##                                   Trnasfer                                        ##
+#######################################################################################
+###V84SP4#####
+account.{$row.line_number}.phone_setting.call_appearance.transfer_via_new_linekey=
+
+
+#######################################################################################
+##                            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 = {if $nway_conference == 'true'}2{elseif $nway_conference == 'false'}0{/if}
+
+##It configures the network conference URI for account X.
+##The default value is blank.
+account.{$row.line_number}.conf_uri = {if $nway_conference == 'true'}nway{$row.user_id}@{$row.server_address}{/if}
+
+###V84SP4#####
+account.{$row.line_number}.phone_setting.call_appearance.conference_via_new_linekey=
+
+###V85#####
+account.X.networkconf_type=
+
+#######################################################################################
+##                            CID Source                                             ##
+#######################################################################################
+#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.{$row.line_number}.cid_source =  {$yealink_cid_source}
+
+account.{$row.line_number}.cid_source_privacy = 1
+account.{$row.line_number}.cid_source_ppi = 1
+
+#Configure the presentation of the callee ID 0-PAI-PRID, 1-DIALED DIGITS (default), 2-RFC4916
+account.{$row.line_number}.cp_source = 2
+
+#######################################################################################
+##                            Session Timer                                          ##
+#######################################################################################
+account.{$row.line_number}.session_timer.enable = 
+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 = 
+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 = 
+
+#####V84SP4####
+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=
+
+
+#######################################################################################
+##                           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=
+#######################################################################################
+##                           VP59/T58V-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 =
+
+####V84SP4#####
+account.{$row.line_number}.feature_key_sync.enable
+account.{$row.line_number}.forward.feature_key_sync.enable
+account.{$row.line_number}.dnd.feature_key_sync.enable
+
+#######################################################################################
+##                        Broadsoft Flexible Seating                                 ##
+#######################################################################################
+##VP59/T58V-V40 Add
+account.{$row.line_number}.flexible_seating.enable=
+account.{$row.line_number}.hoteling.pin=
+account.{$row.line_number}.hoteling.mode=
+
+#######################################################################################
+##                         Broadsoft Hoteling                                        ##
+#######################################################################################
+##VP59/T58V-V40 Add
+account.{$row.line_number}.hoteling.enable= 0
+account.{$row.line_number}.hoteling.user_id= 0
+account.{$row.line_number}.hoteling.password= 0
+account.{$row.line_number}.hoteling.expires=
+account.{$row.line_number}.hoteling.auto_login_enable= 0
+
+#######################################################################################
+##                         Call Configuration                                        ##
+#######################################################################################
+
+####V84SP4#####
+account.{$row.line_number}.auto_label.enable=
+account.{$row.line_number}.auto_label.rule=
+account.{$row.line_number}.phone_setting.call_appearance.calls_per_linekey=
+
+{/foreach}
+
+#######################################################################################
+##                         PSTN                                                      ##
+#######################################################################################
+
+###V85####
+pstn.account.x.auto_answer_mute_enable=
+pstn.account.x.auto_answer=
+pstn.account.x.enable=
+pstn.account.x.label=
+pstn.account.x.missed_calllog=
+pstn.account.x.ring_type=
+###V86####
+account.*.codec.g729ab.enable=
+account.*.codec.g729ab.priority=
diff --git a/resources/templates/provision/yealink/t5x/directory.xml b/resources/templates/provision/yealink/t5x/directory.xml
index 3e319dfb50..e730841a96 100644
--- a/resources/templates/provision/yealink/t5x/directory.xml
+++ b/resources/templates/provision/yealink/t5x/directory.xml
@@ -2,50 +2,58 @@
 {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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-	<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
 </DirectoryEntry>
 {elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
 <DirectoryEntry>
-{if $row.contact_name_given != ""}
+{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 != ""}
+{if $row.phone_number}
 	<Telephone>{$row.phone_number}</Telephone>
 {else}
 	<Telephone>{$row.phone_extension}</Telephone>
@@ -53,29 +61,29 @@
 </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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$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}
+{if isset($row.numbers)}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
 {/if}
 </DirectoryEntry>
 {/if}
diff --git a/resources/templates/provision/yealink/t5x/y000000000070.cfg b/resources/templates/provision/yealink/t5x/y000000000070.cfg
index 04decbd007..457be384fb 100644
--- a/resources/templates/provision/yealink/t5x/y000000000070.cfg
+++ b/resources/templates/provision/yealink/t5x/y000000000070.cfg
@@ -339,7 +339,7 @@ static.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.trust_certificates = {$yealink_trust_certificates}
 security.tls_cipher_list = {$yealink_security_tls_cipher_list}
 {if isset($user_name) }
 static.security.user_name.user = {$user_name}
@@ -449,7 +449,7 @@ features.headset_training=
 features.headset_prior=
 features.dtmf.replace_tran =
 features.dtmf.transfer =
-phone_setting.ringing_timeout=
+phone_setting.ringing_timeout = {$yealink_ringing_timeout}
 phone_setting.ringback_timeout=
 features.hold_trans_delay=
 transfer.multi_call_trans_enable =
@@ -1408,10 +1408,11 @@ screensaver.xml_browser.url= {$yealink_screensaver_xml_url}
 ##                                  Power Saving                                     ##
 #######################################################################################
 features.power_saving.enable = {$yealink_ps_enabled}
-
+##Written in 24hr
 features.power_saving.power_led_flash.on_time = {$yealink_ps_led_on}
 features.power_saving.power_led_flash.off_time = {$yealink_ps_led_off}
 
+##Written in 24hr, values should be comma delimited, e.g. 9,17
 {if isset($yealink_ps_days_all)}
 features.power_saving.office_hour.monday = {$yealink_ps_days_all}
 features.power_saving.office_hour.tuesday = {$yealink_ps_days_all}
@@ -1438,6 +1439,7 @@ features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday}
 features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday}
 {/if}
 
+##Written in minutes
 features.power_saving.user_input_ext.idle_timeout = {$yealink_ps_idle_timeout}
 features.power_saving.off_hour.idle_timeout = {$yealink_ps_offhour_timeout}
 features.power_saving.office_hour.idle_timeout = {$yealink_ps_hour_timeout}
diff --git a/resources/templates/provision/yealink/t5x/y000000000095.cfg b/resources/templates/provision/yealink/t5x/y000000000095.cfg
index 44f961512b..62c1c8996d 100644
--- a/resources/templates/provision/yealink/t5x/y000000000095.cfg
+++ b/resources/templates/provision/yealink/t5x/y000000000095.cfg
@@ -354,7 +354,7 @@ static.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.trust_certificates = {$yealink_trust_certificates}
 security.tls_cipher_list = {$yealink_security_tls_cipher_list}
 {if isset($user_name) }
 static.security.user_name.user = {$user_name}
@@ -410,7 +410,7 @@ static.auto_provision.encryption.config =
 
 
 #######################################################################################
-##                                   Trnasfer                                        ##       
+##                                   Transfer                                        ##       
 #######################################################################################
 features.transfer_type= {$yealink_transfer_type}
 dialplan.transfer.mode = {$yealink_transfer_mode}
@@ -471,7 +471,7 @@ features.headset_training=
 features.headset_prior=
 features.dtmf.replace_tran =
 features.dtmf.transfer =
-phone_setting.ringing_timeout=
+phone_setting.ringing_timeout = {$yealink_ringing_timeout}
 phone_setting.ringback_timeout=
 
 features.keep_mute.enable=
@@ -1558,10 +1558,11 @@ screensaver.xml_browser.url= {$yealink_screensaver_xml_url}
 ##                                  Power Saving                                     ##
 #######################################################################################
 features.power_saving.enable = {$yealink_ps_enabled}
-
+##Written in 24hr
 features.power_saving.power_led_flash.on_time = {$yealink_ps_led_on}
 features.power_saving.power_led_flash.off_time = {$yealink_ps_led_off}
 
+##Written in 24hr, values should be comma delimited, e.g. 9,17
 {if isset($yealink_ps_days_all)}
 features.power_saving.office_hour.monday = {$yealink_ps_days_all}
 features.power_saving.office_hour.tuesday = {$yealink_ps_days_all}
@@ -1588,6 +1589,7 @@ features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday}
 features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday}
 {/if}
 
+##Written in minutes
 features.power_saving.user_input_ext.idle_timeout = {$yealink_ps_idle_timeout}
 features.power_saving.off_hour.idle_timeout = {$yealink_ps_offhour_timeout}
 features.power_saving.office_hour.idle_timeout = {$yealink_ps_hour_timeout}
diff --git a/resources/templates/provision/yealink/t5x/y000000000096.cfg b/resources/templates/provision/yealink/t5x/y000000000096.cfg
index 9906e06fc3..74ab20df18 100644
--- a/resources/templates/provision/yealink/t5x/y000000000096.cfg
+++ b/resources/templates/provision/yealink/t5x/y000000000096.cfg
@@ -354,7 +354,7 @@ static.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.trust_certificates = {$yealink_trust_certificates}
 security.tls_cipher_list = {$yealink_security_tls_cipher_list} 
 {if isset($user_name) }
 static.security.user_name.user = {$user_name}
@@ -411,7 +411,7 @@ static.auto_provision.encryption.config =
 
 
 #######################################################################################
-##                                   Trnasfer                                        ##       
+##                                   Transfer                                        ##       
 #######################################################################################
 features.transfer_type= {$yealink_transfer_type}
 dialplan.transfer.mode = {$yealink_transfer_mode}
@@ -472,7 +472,7 @@ features.headset_training=
 features.headset_prior=
 features.dtmf.replace_tran =
 features.dtmf.transfer =
-phone_setting.ringing_timeout=
+phone_setting.ringing_timeout = {$yealink_ringing_timeout}
 phone_setting.ringback_timeout=
 
 features.keep_mute.enable=
@@ -1559,10 +1559,11 @@ screensaver.xml_browser.url= {$yealink_screensaver_xml_url}
 ##                                  Power Saving                                     ##
 #######################################################################################
 features.power_saving.enable = {$yealink_ps_enabled}
-
+##Written in 24hr
 features.power_saving.power_led_flash.on_time = {$yealink_ps_led_on}
 features.power_saving.power_led_flash.off_time = {$yealink_ps_led_off}
 
+##Written in 24hr, values should be comma delimited, e.g. 9,17
 {if isset($yealink_ps_days_all)}
 features.power_saving.office_hour.monday = {$yealink_ps_days_all}
 features.power_saving.office_hour.tuesday = {$yealink_ps_days_all}
@@ -1589,6 +1590,7 @@ features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday}
 features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday}
 {/if}
 
+##Written in minutes
 features.power_saving.user_input_ext.idle_timeout = {$yealink_ps_idle_timeout}
 features.power_saving.off_hour.idle_timeout = {$yealink_ps_offhour_timeout}
 features.power_saving.office_hour.idle_timeout = {$yealink_ps_hour_timeout}
diff --git a/resources/templates/provision/yealink/t5x/y000000000097.cfg b/resources/templates/provision/yealink/t5x/y000000000097.cfg
index c6764c0294..c51484ad83 100644
--- a/resources/templates/provision/yealink/t5x/y000000000097.cfg
+++ b/resources/templates/provision/yealink/t5x/y000000000097.cfg
@@ -354,7 +354,7 @@ static.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.trust_certificates = {$yealink_trust_certificates}
 security.tls_cipher_list = {$yealink_security_tls_cipher_list}
 {if isset($user_name) }
 static.security.user_name.user = {$user_name}
@@ -411,7 +411,7 @@ static.auto_provision.encryption.config =
 
 
 #######################################################################################
-##                                   Trnasfer                                        ##       
+##                                   Transfer                                        ##       
 #######################################################################################
 features.transfer_type= {$yealink_transfer_type}
 dialplan.transfer.mode = {$yealink_transfer_mode}
@@ -472,7 +472,7 @@ features.headset_training=
 features.headset_prior=
 features.dtmf.replace_tran =
 features.dtmf.transfer =
-phone_setting.ringing_timeout=
+phone_setting.ringing_timeout = {$yealink_ringing_timeout}
 phone_setting.ringback_timeout=
 
 features.keep_mute.enable=
@@ -1559,10 +1559,11 @@ screensaver.xml_browser.url= {$yealink_screensaver_xml_url}
 ##                                  Power Saving                                     ##
 #######################################################################################
 features.power_saving.enable = {$yealink_ps_enabled}
-
+##Written in 24hr
 features.power_saving.power_led_flash.on_time = {$yealink_ps_led_on}
 features.power_saving.power_led_flash.off_time = {$yealink_ps_led_off}
 
+##Written in 24hr, values should be comma delimited, e.g. 9,17
 {if isset($yealink_ps_days_all)}
 features.power_saving.office_hour.monday = {$yealink_ps_days_all}
 features.power_saving.office_hour.tuesday = {$yealink_ps_days_all}
@@ -1589,6 +1590,7 @@ features.power_saving.office_hour.saturday = {$yealink_ps_day_saturday}
 features.power_saving.office_hour.sunday = {$yealink_ps_day_sunday}
 {/if}
 
+##Written in minutes
 features.power_saving.user_input_ext.idle_timeout = {$yealink_ps_idle_timeout}
 features.power_saving.off_hour.idle_timeout = {$yealink_ps_offhour_timeout}
 features.power_saving.office_hour.idle_timeout = {$yealink_ps_hour_timeout}
diff --git a/resources/templates/provision/yealink/t5x/{$mac}.cfg b/resources/templates/provision/yealink/t5x/{$mac}.cfg
index 757a7f53b4..d1f3df465b 100644
--- a/resources/templates/provision/yealink/t5x/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t5x/{$mac}.cfg
@@ -15,7 +15,7 @@ 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}.label = {$row.label}
 account.{$row.line_number}.display_name = {$row.display_name}
 account.{$row.line_number}.auth_name = {$row.auth_id}
 account.{$row.line_number}.password = {$row.password}
diff --git a/resources/templates/provision/yealink/vp530/directory.xml b/resources/templates/provision/yealink/vp530/directory.xml
index 3e319dfb50..e730841a96 100644
--- a/resources/templates/provision/yealink/vp530/directory.xml
+++ b/resources/templates/provision/yealink/vp530/directory.xml
@@ -2,50 +2,58 @@
 {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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-	<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
 </DirectoryEntry>
 {elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
 <DirectoryEntry>
-{if $row.contact_name_given != ""}
+{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 != ""}
+{if $row.phone_number}
 	<Telephone>{$row.phone_number}</Telephone>
 {else}
 	<Telephone>{$row.phone_extension}</Telephone>
@@ -53,29 +61,29 @@
 </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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$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}
+{if isset($row.numbers)}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
 {/if}
 </DirectoryEntry>
 {/if}
diff --git a/resources/templates/provision/yealink/vp530/y000000000023.cfg b/resources/templates/provision/yealink/vp530/y000000000023.cfg
index f9e0db8d69..709441088e 100644
--- a/resources/templates/provision/yealink/vp530/y000000000023.cfg
+++ b/resources/templates/provision/yealink/vp530/y000000000023.cfg
@@ -290,7 +290,7 @@ voice.ring_vol =
 
 #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}
+security.trust_certificates = {$yealink_trust_certificates}
 
 #Set the password of the user or the administrator, the value format is: user:password or admin:password;
 #security.user_password = admin:admin123
diff --git a/resources/templates/provision/yealink/vp530/{$mac}.cfg b/resources/templates/provision/yealink/vp530/{$mac}.cfg
index ea28a079b2..5b35b47dd8 100644
--- a/resources/templates/provision/yealink/vp530/{$mac}.cfg
+++ b/resources/templates/provision/yealink/vp530/{$mac}.cfg
@@ -13,7 +13,7 @@ account.1.enable = 1
 {else}
 account.1.enable = 0
 {/if}
-account.1.label = {$account.1.display_name}
+account.1.label = {$account.1.label}
 account.1.display_name = {$account.1.display_name}
 account.1.auth_name = {$account.1.auth_id}
 account.1.password = {$account.1.password}
@@ -137,10 +137,10 @@ account.1.nat.stun_server = {$stun_server}
 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
+account.1.nat.udp_update_enable = {if isset($account.1.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.1.nat.udp_update_time = 30
+account.1.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.1.nat.rport = {$yealink_rport_1}
@@ -635,10 +635,10 @@ account.2.nat.stun_server = {$stun_server}
 account.2.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.2.nat.udp_update_enable = 1
+account.2.nat.udp_update_enable = {if isset($account.2.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.2.nat.udp_update_time = 30
+account.2.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.2.nat.rport = {$yealink_rport_2}
@@ -1144,10 +1144,10 @@ account.3.nat.stun_server = {$stun_server}
 account.3.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.3.nat.udp_update_enable = 1
+account.3.nat.udp_update_enable = {if isset($account.3.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.3.nat.udp_update_time = 30
+account.3.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.3.nat.rport = {$yealink_rport_3}
@@ -1636,10 +1636,10 @@ account.4.nat.stun_server = {$stun_server}
 account.4.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.4.nat.udp_update_enable = 1
+account.4.nat.udp_update_enable = {if isset($account.4.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.4.nat.udp_update_time = 30
+account.4.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.4.nat.rport = {$yealink_rport_4}
@@ -2128,10 +2128,10 @@ account.5.nat.stun_server = {$stun_server}
 account.5.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.5.nat.udp_update_enable = 1
+account.5.nat.udp_update_enable = {if isset($account.5.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.5.nat.udp_update_time = 30
+account.5.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.5.nat.rport = {$yealink_rport_5}
@@ -2619,10 +2619,10 @@ account.6.nat.stun_server =
 account.6.nat.stun_port = 3478
 
 #Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
-account.6.nat.udp_update_enable = 1
+account.6.nat.udp_update_enable = {if isset($account.6.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.6.nat.udp_update_time = 30
+account.6.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.6.nat.rport = {$yealink_rport_6}
diff --git a/resources/templates/provision/yealink/vp59/directory.xml b/resources/templates/provision/yealink/vp59/directory.xml
index 297b9e4108..86c7b6f8b5 100644
--- a/resources/templates/provision/yealink/vp59/directory.xml
+++ b/resources/templates/provision/yealink/vp59/directory.xml
@@ -2,50 +2,58 @@
 {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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-	<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
 </DirectoryEntry>
 {elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
 <DirectoryEntry>
-{if $row.contact_name_given != ""}
+{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 != ""}
+{if $row.phone_number}
 	<Telephone>{$row.phone_number}</Telephone>
 {else}
 	<Telephone>{$row.phone_extension}</Telephone>
@@ -53,29 +61,29 @@
 </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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$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}
+{if isset($row.numbers)}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
 {/if}
 </DirectoryEntry>
 {/if}
diff --git a/resources/templates/provision/yealink/vp59/y000000000091.cfg b/resources/templates/provision/yealink/vp59/y000000000091.cfg
index 6526e36734..20c4b8736e 100644
--- a/resources/templates/provision/yealink/vp59/y000000000091.cfg
+++ b/resources/templates/provision/yealink/vp59/y000000000091.cfg
@@ -789,7 +789,7 @@ phone_setting.is_deal180 =
 phone_setting.show_code403 =
 
 phone_setting.ringback_timeout =
-phone_setting.ringing_timeout =
+phone_setting.ringing_timeout = {$yealink_ringing_timeout}
 
 phone_setting.page_tip = 
 phone_setting.predial_autodial = 
@@ -908,7 +908,7 @@ static.security.user_password = {$admin_name}:{$admin_password}
 ###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}
+static.security.trust_certificates = {$yealink_trust_certificates}
 
 ###It configures the source certificates for the phone to authenticate for TLS connection.
 ###0-Default certificates,1-Custom certificates,2-All certificates.
@@ -1529,22 +1529,6 @@ features.video_call_bandwidth =
 video.enable =
 features.default_layout =
 
-#######################################################################################
-##                      APP                                                         ##       
-#######################################################################################
-app.install_url = 
-app.uninstall =
-{foreach $yealink_app_unavailable as $value}app.unavailable = {$value}{"\n"}{/foreach}
-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                                    ##       
@@ -1774,4 +1758,22 @@ search_in_dialing.meta_directory.enable =
 ##                          Contact Backup                                           ##       
 #######################################################################################
 static.auto_provision.local_contact.backup.path =
-static.auto_provision.local_contact.backup.enable=
+static.auto_provision.local_contact.backup.enable =
+
+#######################################################################################
+##                      APP                                                         ##       
+#######################################################################################
+app.install_url = 
+app.uninstall =
+pm.version = standard
+app.unavailable = {foreach $yealink_app_unavailable as $value}{$value}/{/foreach}
+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 =
+
diff --git a/resources/templates/provision/yealink/vp59/{$mac}.cfg b/resources/templates/provision/yealink/vp59/{$mac}.cfg
index e1c245547f..dcd54ad973 100644
--- a/resources/templates/provision/yealink/vp59/{$mac}.cfg
+++ b/resources/templates/provision/yealink/vp59/{$mac}.cfg
@@ -13,7 +13,7 @@ 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}.label = {$row.label}
 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}
@@ -108,7 +108,7 @@ account.{$row.line_number}.srtp_encryption =
 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.
+##0-Disabled,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
 
diff --git a/resources/templates/provision/yealink/w52p/directory.xml b/resources/templates/provision/yealink/w52p/directory.xml
index 3e319dfb50..e730841a96 100644
--- a/resources/templates/provision/yealink/w52p/directory.xml
+++ b/resources/templates/provision/yealink/w52p/directory.xml
@@ -2,50 +2,58 @@
 {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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-	<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
 </DirectoryEntry>
 {elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
 <DirectoryEntry>
-{if $row.contact_name_given != ""}
+{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 != ""}
+{if $row.phone_number}
 	<Telephone>{$row.phone_number}</Telephone>
 {else}
 	<Telephone>{$row.phone_extension}</Telephone>
@@ -53,29 +61,29 @@
 </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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$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}
+{if isset($row.numbers)}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
 {/if}
 </DirectoryEntry>
 {/if}
diff --git a/resources/templates/provision/yealink/w52p/y000000000025.cfg b/resources/templates/provision/yealink/w52p/y000000000025.cfg
index 1806153dee..2c01390816 100644
--- a/resources/templates/provision/yealink/w52p/y000000000025.cfg
+++ b/resources/templates/provision/yealink/w52p/y000000000025.cfg
@@ -190,7 +190,7 @@ bw.feature_key_sync = {$yealink_feature_key_sync}
 
 #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}
+security.trust_certificates = {$yealink_trust_certificates}
 
 #Set the password of the user or the administrator, the value format is: user:password or admin:password;
 {if isset($user_name) }
diff --git a/resources/templates/provision/yealink/w52p/{$mac}.cfg b/resources/templates/provision/yealink/w52p/{$mac}.cfg
index 0ddd832911..40072d9083 100644
--- a/resources/templates/provision/yealink/w52p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/w52p/{$mac}.cfg
@@ -15,7 +15,7 @@ account.1.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 1.
-account.1.label = {$account.1.display_name}
+account.1.label = {$account.1.label}
 
 #Configure the display name of account 1.
 account.1.display_name = {$account.1.display_name}
@@ -176,10 +176,10 @@ account.1.nat.stun_server = {$stun_server}
 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
+account.1.nat.udp_update_enable = {if isset($account.1.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.1.nat.udp_update_time =
+account.1.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.1.nat.rport = {$yealink_rport}
@@ -347,7 +347,7 @@ account.2.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 1.
-account.2.label = {$account.2.display_name}
+account.2.label = {$account.2.label}
 
 #Configure the display name of account 1.
 account.2.display_name = {$account.2.display_name}
@@ -496,11 +496,11 @@ 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 =
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.2.nat.udp_update_enable = {if isset($account.2.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.2.nat.udp_update_time =
+account.2.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.2.nat.rport = {$yealink_rport}
@@ -620,7 +620,7 @@ account.3.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 1.
-account.3.label = {$account.3.display_name}
+account.3.label = {$account.3.label}
 
 #Configure the display name of account 1.
 account.3.display_name = {$account.3.display_name}
@@ -769,11 +769,11 @@ 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 =
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.3.nat.udp_update_enable = {if isset($account.3.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.3.nat.udp_update_time =
+account.3.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.3.nat.rport = {$yealink_rport}
@@ -893,7 +893,7 @@ account.4.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 1.
-account.4.label = {$account.4.display_name}
+account.4.label = {$account.4.label}
 
 #Configure the display name of account 1.
 account.4.display_name = {$account.4.display_name}
@@ -1043,11 +1043,11 @@ 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 =
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.4.nat.udp_update_enable = {if isset($account.4.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.4.nat.udp_update_time =
+account.4.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.4.nat.rport = {$yealink_rport}
@@ -1168,7 +1168,7 @@ account.5.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 1.
-account.5.label = {$account.5.display_name}
+account.5.label = {$account.5.label}
 
 #Configure the display name of account 1.
 account.5.display_name = {$account.5.display_name}
@@ -1317,11 +1317,11 @@ 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 =
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.5.nat.udp_update_enable = {if isset($account.5.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.5.nat.udp_update_time =
+account.5.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.5.nat.rport = {$yealink_rport}
diff --git a/resources/templates/provision/yealink/w56p/directory.xml b/resources/templates/provision/yealink/w56p/directory.xml
index 297b9e4108..86c7b6f8b5 100644
--- a/resources/templates/provision/yealink/w56p/directory.xml
+++ b/resources/templates/provision/yealink/w56p/directory.xml
@@ -2,50 +2,58 @@
 {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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-	<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
 </DirectoryEntry>
 {elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
 <DirectoryEntry>
-{if $row.contact_name_given != ""}
+{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 != ""}
+{if $row.phone_number}
 	<Telephone>{$row.phone_number}</Telephone>
 {else}
 	<Telephone>{$row.phone_extension}</Telephone>
@@ -53,29 +61,29 @@
 </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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$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}
+{if isset($row.numbers)}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
 {/if}
 </DirectoryEntry>
 {/if}
diff --git a/resources/templates/provision/yealink/w56p/y000000000025.cfg b/resources/templates/provision/yealink/w56p/y000000000025.cfg
index 82d5d41c9e..63bb005aa3 100644
--- a/resources/templates/provision/yealink/w56p/y000000000025.cfg
+++ b/resources/templates/provision/yealink/w56p/y000000000025.cfg
@@ -190,7 +190,7 @@ bw.feature_key_sync = {$yealink_feature_key_sync}
 
 #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}
+security.trust_certificates = {$yealink_trust_certificates}
 
 #Set the password of the user or the administrator, the value format is: user:password or admin:password;
 {if isset($user_name) }
diff --git a/resources/templates/provision/yealink/w56p/{$mac}.cfg b/resources/templates/provision/yealink/w56p/{$mac}.cfg
index 34a3c4bc49..60a83c4e10 100644
--- a/resources/templates/provision/yealink/w56p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/w56p/{$mac}.cfg
@@ -15,7 +15,7 @@ account.1.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 1.
-account.1.label = {$account.1.display_name}
+account.1.label = {$account.1.label}
 
 #Configure the display name of account 1.
 account.1.display_name = {$account.1.display_name}
@@ -176,10 +176,10 @@ account.1.nat.stun_server = {$stun_server}
 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
+account.1.nat.udp_update_enable = {if isset($account.1.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.1.nat.udp_update_time =
+account.1.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.1.nat.rport = {$yealink_rport}
@@ -332,7 +332,7 @@ account.2.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 1.
-account.2.label = {$account.2.display_name}
+account.2.label = {$account.2.label}
 
 #Configure the display name of account 1.
 account.2.display_name = {$account.2.display_name}
@@ -481,11 +481,11 @@ 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 =
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.2.nat.udp_update_enable = {if isset($account.2.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.2.nat.udp_update_time =
+account.2.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.2.nat.rport = {$yealink_rport}
@@ -590,7 +590,7 @@ account.3.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 1.
-account.3.label = {$account.3.display_name}
+account.3.label = {$account.3.label}
 
 #Configure the display name of account 1.
 account.3.display_name = {$account.3.display_name}
@@ -739,11 +739,11 @@ 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 =
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.3.nat.udp_update_enable = {if isset($account.3.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.3.nat.udp_update_time =
+account.3.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.3.nat.rport = {$yealink_rport}
@@ -848,7 +848,7 @@ account.4.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 1.
-account.4.label = {$account.4.display_name}
+account.4.label = {$account.4.label}
 
 #Configure the display name of account 1.
 account.4.display_name = {$account.4.display_name}
@@ -998,11 +998,11 @@ 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 =
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.4.nat.udp_update_enable = {if isset($account.4.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.4.nat.udp_update_time =
+account.4.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.4.nat.rport = {$yealink_rport}
@@ -1108,7 +1108,7 @@ account.5.enable = 0
 {/if}
 
 #Configure the label displayed on the LCD screen for account 1.
-account.5.label = {$account.5.display_name}
+account.5.label = {$account.5.label}
 
 #Configure the display name of account 1.
 account.5.display_name = {$account.5.display_name}
@@ -1257,11 +1257,11 @@ 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 =
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.5.nat.udp_update_enable = {if isset($account.5.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.5.nat.udp_update_time =
+account.5.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.5.nat.rport = {$yealink_rport}
diff --git a/resources/templates/provision/yealink/w60b/directory.xml b/resources/templates/provision/yealink/w60b/directory.xml
index 297b9e4108..86c7b6f8b5 100644
--- a/resources/templates/provision/yealink/w60b/directory.xml
+++ b/resources/templates/provision/yealink/w60b/directory.xml
@@ -2,50 +2,58 @@
 {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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
-{/if}
-{else}
-	<Name>{$row.effective_caller_id_name}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
 {/if}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
 </DirectoryEntry>
 {elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
 <DirectoryEntry>
-{if $row.contact_name_given != ""}
+{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 != ""}
+{if $row.phone_number}
 	<Telephone>{$row.phone_number}</Telephone>
 {else}
 	<Telephone>{$row.phone_extension}</Telephone>
@@ -53,29 +61,29 @@
 </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}
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$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}
+{if isset($row.numbers)}
 {foreach $row.numbers as $number}
-{if $number.phone_number != ""}
+{if $number.phone_number}
 	<Telephone>{$number.phone_number}</Telephone>
-{else}		
+{else}
 	<Telephone>{$number.phone_extension}</Telephone>
 {/if}
 {/foreach}
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
 {/if}
 </DirectoryEntry>
 {/if}
diff --git a/resources/templates/provision/yealink/w60b/y000000000077.cfg b/resources/templates/provision/yealink/w60b/y000000000077.cfg
index 190db69835..169526a4b0 100644
--- a/resources/templates/provision/yealink/w60b/y000000000077.cfg
+++ b/resources/templates/provision/yealink/w60b/y000000000077.cfg
@@ -190,7 +190,7 @@ bw.feature_key_sync = {$yealink_feature_key_sync}
 
 #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}
+security.trust_certificates = {$yealink_trust_certificates}
 
 #Set the password of the user or the administrator, the value format is: user:password or admin:password;
 {if isset($user_name) }
diff --git a/resources/templates/provision/yealink/w60b/{$mac}.cfg b/resources/templates/provision/yealink/w60b/{$mac}.cfg
index 7146af437a..b51a82e7dc 100644
--- a/resources/templates/provision/yealink/w60b/{$mac}.cfg
+++ b/resources/templates/provision/yealink/w60b/{$mac}.cfg
@@ -10,7 +10,7 @@
 #Basic Settings
 account.1.enable = {if isset($account.1.password)}1{else}0{/if}{""}
 
-account.1.label = {$account.1.display_name}
+account.1.label = {$account.1.label}
 account.1.display_name = {$account.1.display_name}
 
 {if isset($account.1.server.1.address)}
@@ -147,7 +147,7 @@ account.1.nat.stun_server = {$stun_server}
 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
+account.1.nat.udp_update_enable = {if isset($account.1.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
 account.1.nat.udp_update_time = 30
@@ -300,7 +300,7 @@ voice_mail.number.1 = {$voicemail_number}
 #Basic Settings
 account.2.enable = {if isset($account.2.password) }1{else}0{/if}{""}
 
-account.2.label = {$account.2.display_name}
+account.2.label = {$account.2.label}
 account.2.display_name = {$account.2.display_name}
 
 {if isset($account.2.server.1.address)}
@@ -440,11 +440,11 @@ 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 =
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.2.nat.udp_update_enable = {if isset($account.2.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.2.nat.udp_update_time =
+account.2.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.2.nat.rport = {$yealink_rport}
@@ -546,7 +546,7 @@ voice_mail.number.2 = {$voicemail_number}
 #Basic Settings
 account.3.enable = {if isset($account.3.password) }1{else}0{/if}{""}
 
-account.3.label = {$account.3.display_name}
+account.3.label = {$account.3.label}
 account.3.display_name = {$account.3.display_name}
 
 {if isset($account.3.server.1.address)}
@@ -686,11 +686,11 @@ 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 =
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.3.nat.udp_update_enable = {if isset($account.3.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.3.nat.udp_update_time =
+account.3.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.3.nat.rport = {$yealink_rport}
@@ -792,7 +792,7 @@ voice_mail.number.3 = {$voicemail_number}
 #Basic Settings
 account.4.enable = {if isset($account.4.password) }1{else}0{/if}{""}
 
-account.4.label = {$account.4.display_name}
+account.4.label = {$account.4.label}
 account.4.display_name = {$account.4.display_name}
 
 {if isset($account.4.server.1.address)}
@@ -931,11 +931,11 @@ 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 =
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.4.nat.udp_update_enable = {if isset($account.4.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.4.nat.udp_update_time =
+account.4.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.4.nat.rport = {$yealink_rport}
@@ -1038,7 +1038,7 @@ voice_mail.number.4 = {$voicemail_number}
 #Basic Settings
 account.5.enable = {if isset($account.5.password) }1{else}0{/if}{""}
 
-account.5.label = {$account.5.display_name}
+account.5.label = {$account.5.label}
 account.5.display_name = {$account.5.display_name}
 
 {if isset($account.5.server.1.address)}
@@ -1178,11 +1178,11 @@ 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 =
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.5.nat.udp_update_enable = {if isset($account.5.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.5.nat.udp_update_time =
+account.5.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.5.nat.rport = {$yealink_rport}
@@ -1303,7 +1303,7 @@ network.internet_port.gateway =
 #Basic Settings
 account.6.enable = {if isset($account.6.password) }1{else}0{/if}{""}
 
-account.6.label = {$account.6.display_name}
+account.6.label = {$account.6.label}
 account.6.display_name = {$account.6.display_name}
 
 {if isset($account.6.server.1.address)}
@@ -1443,11 +1443,11 @@ account.6.nat.stun_server = {$stun_server}
 #Configure the STUN server port, the default value is 3478.
 account.6.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.6.nat.udp_update_enable =
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.6.nat.udp_update_enable = {if isset($account.6.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.6.nat.udp_update_time =
+account.6.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.6.nat.rport = {$yealink_rport}
@@ -1568,7 +1568,7 @@ network.internet_port.gateway =
 #Basic Settings
 account.7.enable = {if isset($account.7.user_password) }1{else}0{/if}{""}
 
-account.7.label = {$account.7.display_name}
+account.7.label = {$account.7.label}
 account.7.display_name = {$account.7.display_name}
 
 {if isset($account.7.server.1.address)}
@@ -1708,11 +1708,11 @@ account.7.nat.stun_server = {$stun_server}
 #Configure the STUN server port, the default value is 3478.
 account.7.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.7.nat.udp_update_enable =
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.7.nat.udp_update_enable = {if isset($account.7.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.7.nat.udp_update_time =
+account.7.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.7.nat.rport = {$yealink_rport}
@@ -1833,7 +1833,7 @@ network.internet_port.gateway =
 #Basic Settings
 account.8.enable = {if isset($account.8.user_password) }1{else}0{/if}{""}
 
-account.8.label = {$account.8.display_name}
+account.8.label = {$account.8.label}
 account.8.display_name = {$account.8.display_name}
 
 {if isset($account.8.server.1.address)}
@@ -1973,11 +1973,11 @@ account.8.nat.stun_server = {$stun_server}
 #Configure the STUN server port, the default value is 3478.
 account.8.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.8.nat.udp_update_enable =
+#Enable or disable the NAT keep-alive; 0-Disabled, 1-Default (default), 2-Option, 3-Notify;
+account.8.nat.udp_update_enable = {if isset($account.8.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
 
 #Specify the keep-alive interval (in seconds), the default value is 30.
-account.8.nat.udp_update_time =
+account.8.nat.udp_update_time = 30
 
 #Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
 account.8.nat.rport = {$yealink_rport}
diff --git a/resources/templates/provision/yealink/w7xp/directory.xml b/resources/templates/provision/yealink/w7xp/directory.xml
new file mode 100644
index 0000000000..86c7b6f8b5
--- /dev/null
+++ b/resources/templates/provision/yealink/w7xp/directory.xml
@@ -0,0 +1,91 @@
+<YealinkIPPhoneDirectory>
+{foreach $contacts as $row}
+{if $smarty.get.contacts == "users" && $row.category == "users"}
+<DirectoryEntry>
+{if $row.contact_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</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_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</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_organization && $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_organization}, {$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_organization && $row.contact_name_given == "" && $row.contact_name_family == ""}
+	<Name>{$row.contact_organization}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family && $row.contact_organization == ""}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given && $row.contact_name_family}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{elseif $row.contact_name_given}
+	<Name>{$row.contact_name_given}</Name>
+{elseif $row.contact_name_family}
+	<Name>{$row.contact_name_family}</Name>
+{/if}
+{if isset($row.numbers)}
+{foreach $row.numbers as $number}
+{if $number.phone_number}
+	<Telephone>{$number.phone_number}</Telephone>
+{else}
+	<Telephone>{$number.phone_extension}</Telephone>
+{/if}
+{/foreach}
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
+{/if}
+</DirectoryEntry>
+{/if}
+{/foreach}
+</YealinkIPPhoneDirectory>
diff --git a/resources/templates/provision/yealink/w7xp/favorite_setting.xml b/resources/templates/provision/yealink/w7xp/favorite_setting.xml
new file mode 100644
index 0000000000..ba7275358e
--- /dev/null
+++ b/resources/templates/provision/yealink/w7xp/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/w7xp/y000000000000.boot b/resources/templates/provision/yealink/w7xp/y000000000000.boot
new file mode 100644
index 0000000000..a0d8ff513e
--- /dev/null
+++ b/resources/templates/provision/yealink/w7xp/y000000000000.boot
@@ -0,0 +1,7 @@
+#!version:1.0.0.1
+## The header above must appear as-is in the first line
+
+include:config "y000000000146.cfg"
+include:config "{$mac}.cfg"
+
+overwrite_mode = {$yealink_overwrite_mode}
diff --git a/resources/templates/provision/yealink/w7xp/y000000000146.cfg b/resources/templates/provision/yealink/w7xp/y000000000146.cfg
new file mode 100644
index 0000000000..ff7d13f2df
--- /dev/null
+++ b/resources/templates/provision/yealink/w7xp/y000000000146.cfg
@@ -0,0 +1,605 @@
+#!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, submask, 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 =
+
+#Enable or disable the VLAN of WAN port; 0-Disabled(default), 1-Enabled;
+#Require reboot;
+network.vlan.internet_port_enable = {$yealink_vlan_enable}
+
+#Configure the VLAN ID, it ranges from 1 to 4094, the default value is 1.
+#Require reboot;
+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 =
+
+#Enable or disable the DHCP to obtain the information of the VLAN; 0-Disabled; 1-Enabled (default);
+#Require reboot;
+network.vlan.dhcp_enable =
+
+#Configure the DHCP option to obtain the information of the VLAN. It ranges from 0 to 255.
+#Multiple options separated by a comma. It supports up to 5 options in all.
+#Require reboot;
+network.vlan.dhcp_option =
+
+#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 12780.
+#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 40.
+#Require reboot;
+network.qos.rtptos =
+
+#Configure the SIP QOS. It ranges from 0 to 63, the default value is 26.
+#Require reboot;
+network.qos.signaltos =
+
+#Configure the 802.1x mode; 0-Disabled (default), 1-Enabled (EAP-MD5);
+#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 60.
+#Require reboot;
+network.lldp.packet_interval =
+
+#######################################################################################
+##                                   Syslog Server                                   ##
+#######################################################################################
+
+#Configure the syslog mode; 0-Local, 1-Server,the default value is 0;
+#Require reboot;
+syslog.mode =
+
+#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 =
+
+#######################################################################################
+##                                   Auto Provisioning                               ##
+#######################################################################################
+
+#Enable or disable the Plug and Play feature; 0-Disabled, 1-Enabled(default);
+auto_provision.pnp_enable = 1
+
+#Enable or disable the phone to check new configuration when powered on; 0-Disabled, 1-Enabled (default);
+auto_provision.mode = 1
+
+#Enable or disable the phone to check the new configuration repeatedly; 0-Disabled (default), 1-Enabled;
+auto_provision.repeat.enable = 1
+
+#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.enalbe =
+
+#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 =
+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 username and password for downloading.
+auto_provision.server.username = {$http_auth_username}
+auto_provision.server.password = {$http_auth_password}
+
+#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 =
+
+#Enable or disable the DHCP option mode; 0-Disabled, 1-Enabled (default);
+auto_provision.dhcp_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 =
+
+#######################################################################################
+##                                   Phone Features                                  ##
+#######################################################################################
+
+#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 =
+
+#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 (default), 1-Enabled;
+transfer.blind_tran_on_hook_enable =
+transfer.on_hook_trans_enable =
+
+#Enable or disable to access the web user interface of phone using the http/https protocol;
+#0-Disabled,1-Enabled (default);
+#Require Reboot;
+wui.https_enable =
+wui.http_enable =
+
+#Enable or disable the feature key synchronization, 0-Disabled (default), 1-Enabled;
+bw.feature_key_sync = {$yealink_feature_key_sync}
+
+#######################################################################################
+##                                   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 = {$yealink_trust_certificates}
+
+#Set the password of the user or the administrator, the value format is: user:password or admin:password;
+{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}
+
+base.pin_code =
+
+#######################################################################################
+##                                   Language Settings                               ##
+#######################################################################################
+
+#Specify the web language, the valid values are: English, Chinese_S, German, Italian and Turkish;
+lang.wui =
+
+#######################################################################################
+##                                   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 =
+
+#######################################################################################
+##                                   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 replace rule. X ranges from 1 to 10;
+#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 =
+
+#######################################################################################
+##                                   Phone Settings                                  ##
+#######################################################################################
+
+#Configure the return code when activating DND; 404-No Found, 480-Temporarily not available (default), 486-Busy here;
+#features.dnd_refuse_code = 480
+
+#Configure the return code when refusing a call. The valid values are 404, 480, 486 (default).
+features.normal_refuse_code = 486
+
+account.X.dnd.on_code =
+account.X.dnd.off_code =
+
+#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 phone to dial the IP address directly; 0-Disabled, 1-Enabled (default);
+features.direct_ip_call_enable = 0
+sip.trust_ctrl=1
+
+#Enable or disable the phone to save the call history; 0-Disabled, 1-Enabled (default);
+features.save_call_history =
+
+#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
+
+#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 = 1
+
+#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
+
+#######################################################################################
+##                                   Base_Upgrade                                    ##
+#######################################################################################
+firmware.url = {$yealink_firmware_url}/{$yealink_firmware_w60b}
+
+#######################################################################################
+##                                  Handset_upgrade                                  ##
+#######################################################################################
+
+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
+
+#######################################################################################
+##                                   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/Replace Rule             ##
+#######################################################################################
+auto_dst.url = {$yealink_auto_dst_url}
+dialplan_replace_rule.url =
+blacklist.url =
+handset.X.contact_list.url =
+
+#######################################################################################
+##                                   Customized Factory Configurations               ##
+#######################################################################################
+#Configure the access URL for downloading the customized factory configurations;
+custom_factory_configuration.url =
+
+#######################################################################################
+##                                   OpenVPN                                         ##
+#######################################################################################
+#Configure the access URL for downloading the open VPN tar;
+openvpn.url = {$yealink_openvpn_url}
+
+
+#######################################################################################
+##         	    Remote Phonebook                                                     ##
+#######################################################################################
+
+#Configure the access URL and dispaly name of the remote phonebook. X ranges from 1 to 5.
+remote_phonebook.display_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 = http://{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 = http://{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 = http://{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}
+
+#######################################################################################
+##                                   Network Directory                               ##
+#######################################################################################
+
+#Configure the interval(in minutes) for the phone to update phonebook,(1440 by default);
+directory.update_time_interval =
+
+#Enable or disable the phone to match the incoming call with the contact in the remote phonebook; 0-Disabled, 1-Enabled(default);
+directory.incoming_call_match_enable =
+
+#Enable or disable the broadsoft directory; 0-Disabled (default), 1-Enabled;
+bw.directory_enable =
+
+#Network Phonebook
+xsi.host =
+xsi.user =
+xsi.password =
+bw_phonebook.group_enable = 1
+bw_phonebook.group_common_enable = 0
+bw_phonebook.enterprise_enable = 0
+bw_phonebook.enterprise_common_enable = 0
+bw_phonebook.personal_enable = 0
+bw_phonebook.update_interval = 1440
+
+#Network Call Log
+bw_phonebook.call_log_enable = 0
+
+#######################################################################################
+##                                   Echo Cancellation                               ##
+#######################################################################################
+voice.cng = {$yealink_cng}
+voice.vad = {$yealink_vad}
+
+#######################################################################################
+##                                   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}
+
+#######################################################################################
+##                                   Tone                                            ##
+#######################################################################################
+voice.tone.country = Custom
+voice.tone.dial =
+voice.tone.ring =
+voice.tone.busy =
+voice.tone.callwaiting =
+
+
+#######################################################################################
+##                                   Number Assignment                               ##
+#######################################################################################
+#The line accept to incoming(1,2,3,4,5);X ranges from 1 to 5
+#handset.X.incoming_lines = 1,2,3,4
+
+handset.1.incoming_lines = {$yealink_handset_1_incoming_lines}
+handset.2.incoming_lines = {$yealink_handset_2_incoming_lines}
+handset.3.incoming_lines = {$yealink_handset_3_incoming_lines}
+handset.4.incoming_lines = {$yealink_handset_4_incoming_lines}
+handset.5.incoming_lines = {$yealink_handset_5_incoming_lines}
+handset.6.incoming_lines = {$yealink_handset_6_incoming_lines}
+handset.7.incoming_lines = {$yealink_handset_7_incoming_lines}
+handset.8.incoming_lines = {$yealink_handset_8_incoming_lines}
+
+#The line accept to call out(1,2,3,4,5)
+#handset.X.dial_out_lines = 1,2,5
+#handset.X.dial_out_default_line = 1
+
+handset.1.dial_out_lines = {$yealink_handset_1_dial_out_lines}
+handset.1.dial_out_default_line = {$yealink_handset_1_out_default_line}
+
+handset.2.dial_out_lines = {$yealink_handset_2_dial_out_lines}
+handset.2.dial_out_default_line = {$yealink_handset_2_out_default_line}
+
+handset.3.dial_out_lines = {$yealink_handset_3_dial_out_lines}
+handset.3.dial_out_default_line = {$yealink_handset_3_out_default_line}
+
+handset.4.dial_out_lines = {$yealink_handset_4_dial_out_lines}
+handset.4.dial_out_default_line = {$yealink_handset_4_out_default_line}
+
+handset.5.dial_out_lines = {$yealink_handset_5_dial_out_lines}
+handset.5.dial_out_default_line = {$yealink_handset_5_out_default_line}
+
+handset.6.dial_out_lines = {$yealink_handset_6_dial_out_lines}
+handset.6.dial_out_default_line = {$yealink_handset_6_out_default_line}
+
+handset.7.dial_out_lines = {$yealink_handset_7_dial_out_lines}
+handset.7.dial_out_default_line = {$yealink_handset_7_out_default_line}
+
+handset.8.dial_out_lines = {$yealink_handset_8_dial_out_lines}
+handset.8.dial_out_default_line = {$yealink_handset_8_out_default_line}
+
+handset.1.name = {$display_name_1}
+handset.2.name = {$display_name_2}
+handset.3.name = {$display_name_3}
+handset.4.name = {$display_name_4}
+handset.5.name = {$display_name_5}
+handset.6.name = {$display_name_6}
+handset.7.name = {$display_name_7}
+handset.8.name = {$display_name_8}
+
+#######################################################################################
+##                                   Language Settings                               ##
+#######################################################################################
+{if isset({$yealink_language_gui})}static.lang.gui = {$yealink_language_gui}{else}static.lang.gui = English{/if}
+
+
+#######################################################################################
+##                                   Auto Provisioning Code                          ##
+#######################################################################################
+
+#This feature allows user to trigger the auto provisioning by pressing a predefined string on the phone.
+#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 =
+
+
+#######################################################################################
+##                                   TR069                                           ##
+#######################################################################################
+#The TR069 feature is only applicable to some designated firmware version.
+#All settings of TR069 require reboot.
+#Enable or disable the TR069 feature; 0-Disabled (default), 1-Enabled;
+
+managementserver.enable =
+managementserver.username =
+managementserver.password =
+managementserver.url =
+managementserver.periodic_inform_enable =
+managementserver.periodic_inform_interval =
+managementserver.connection_request_username =
+managementserver.connection_request_password =
+
+
+#######################################################################################
+##                                   SNMP                                            ##
+#######################################################################################
+#Enable or disable the SNMP feature; 0-Disabled (default), 1-Enabled;
+#Require reboot;
+network.snmp.enable =
+network.snmp.port =
+
+#Configure the IP address(es) of the trusted SNMP server,multiple IP addresses must be separated by a space.
+#Require reboot;
+network.snmp.trust_ip =
+
+#######################################################################################
+##                                   SIP Advanced                                    ##
+#######################################################################################
+
+sip.call_fail_use_reason.enable = {$yealink_sip_call_fail_use_reason_enable}
diff --git a/resources/templates/provision/yealink/w7xp/{$mac}.cfg b/resources/templates/provision/yealink/w7xp/{$mac}.cfg
new file mode 100644
index 0000000000..b51a82e7dc
--- /dev/null
+++ b/resources/templates/provision/yealink/w7xp/{$mac}.cfg
@@ -0,0 +1,2105 @@
+#!version:1.0.0.1
+#{$microtime}
+
+##File header "#!version:1.0.0.1" can not be edited or deleted.##
+
+#######################################################################################
+##                                   Account 1 Settings                              ##
+#######################################################################################
+
+#Basic Settings
+account.1.enable = {if isset($account.1.password)}1{else}0{/if}{""}
+
+account.1.label = {$account.1.label}
+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_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}{""}
+
+account.1.expires = {$account.1.register_expires}
+account.1.outbound_host = {$account.1.outbound_proxy}
+account.1.outbound_port = {$account.1.sip_port}
+
+#Server Redundancy
+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.transport_type = {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}{""}
+
+account.1.sip_server.2.expires= {$account.1.register_expires}
+account.1.retry_counts = 3
+
+#Basic Proxy Settings
+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.1.port = {if isset($account.1.sip_port)}{$account.1.sip_port}{else}5060{/if}{""}
+
+account.1.outbound_proxy.2.address = {$account.1.outbound_proxy_secondary}
+
+account.1.outbound_proxy.2.port = {if isset($account.1.sip_port)}{$account.1.sip_port}{else}5060{/if}{""}
+account.1.fallback.timeout = {$yealink_outbound_proxy_fallback_interval}
+
+#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 =
+
+#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 = {$yealink_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 = 3600
+
+#Configure the type of SIP header to carry the caller ID; 0-FROM (default), 1-PAI;
+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 =
+
+#Configure the way of encrypting the message; 0-Disabled (default), 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 =
+
+#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 = 0
+
+#Enable or disable the phone to send the MAC address 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 =
+
+#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, 1-DTMF-Relay (default), 2-DTMF, 3-Telephone-Event;
+account.1.dtmf.info_type =
+
+
+#######################################################################################
+##                                   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 = {if isset($account.1.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+
+#Specify the keep-alive interval (in seconds), the default value is 30.
+account.1.nat.udp_update_time = 30
+
+#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 =
+
+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
+
+
+
+#######################################################################################
+##         	                   Call Forward                                          ##
+#######################################################################################
+#Enable or disable the always forward, 0-Disabled(default), 1-Enabled;
+account.1.always_fwd.enable =
+
+#Configure the target phonenumber that the phone will forward the call to;
+account.1.always_fwd.target =
+
+#Configure the on/off code for always forward;
+
+
+#Enable or disable the busy forward, 0-Disabled(default), 1-Enabled;
+account.1.busy_fwd.enable =
+account.1.busy_fwd.target =
+
+
+#Enable or disable the no answer forward, 0-Disabled(default), 1-Enabled;
+#Configure the waiting ring times before forwarding, ranges from 0 to 20 (by default);
+account.1.timeout_fwd.enable =
+account.1.timeout_fwd.target =
+account.1.timeout_fwd.timeout =
+
+
+#######################################################################################
+##                          DND                                                      ##
+#######################################################################################
+
+#Configure the DND key mode; 0-Phone mode (default), 1-Custom mode.
+features.dnd_mode =
+
+#Enable or disable the DND feautre for account1; 0-Disabled (default), 1-Enabled;
+account.1.dnd.enable =
+
+#Configure the DND on code and off code for account1.
+
+account.1.sip_trust_ctrl = 1
+
+voice_mail.number.1 = {$voicemail_number}
+
+#######################################################################################
+##                                   Account 2 Settings                              ##
+#######################################################################################
+
+#Basic Settings
+account.2.enable = {if isset($account.2.password) }1{else}0{/if}{""}
+
+account.2.label = {$account.2.label}
+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}
+
+{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}{""}
+
+account.2.expires = {$account.2.register_expires}
+account.2.outbound_host = {$account.2.outbound_proxy}
+account.2.outbound_port = {$account.2.sip_port}
+
+#Server Redundancy
+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.transport_type = {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}{""}
+
+account.2.sip_server.2.expires= {$account.2.register_expires}
+account.2.retry_counts = 3
+
+#Basic Proxy Settings
+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 = {if isset($account.2.sip_port)}{$account.2.sip_port}{else}5060{/if}{""}
+
+account.2.outbound_proxy.2.address = {$account.2.outbound_proxy_secondary}
+account.2.outbound_proxy.2.port = {if isset($account.2.sip_port)}{$account.2.sip_port}{else}5060{/if}{""}
+
+account.2.fallback.timeout = {$yealink_outbound_proxy_fallback_interval}
+
+#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 1, 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, 1-Enabled (default);
+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 = {$yealink_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 = 3600
+
+#Configure the type of SIP header to carry the caller ID; 0-FROM (default), 1-PAI;
+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 =
+
+#Configure the way of encrypting the message; 0-Disabled (default), 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 =
+
+#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 = 0
+
+#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 1 fails to register. It ranges from 0 to 1800, the default value is 30.
+account.2.reg_fail_retry_interval =
+
+#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, 1-DTMF-Relay (default), 2-DTMF, 3-Telephone-Event;
+account.2.dtmf.info_type =
+
+
+#######################################################################################
+##                                   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-Default (default), 2-Option, 3-Notify;
+account.2.nat.udp_update_enable = {if isset($account.2.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+
+#Specify the keep-alive interval (in seconds), the default value is 30.
+account.2.nat.udp_update_time = 30
+
+#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 =
+
+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 =0
+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 = 0
+account.2.codec.7.payload_type = G726-32
+account.2.codec.7.priority = 0
+account.2.codec.7.rtpmap = 2
+
+account.2.codec.8.enable = 0
+account.2.codec.8.payload_type = iLBC_13_3
+account.2.codec.8.priority = 0
+account.2.codec.8.rtpmap = 97
+
+account.2.codec.9.enable = 0
+account.2.codec.9.payload_type = iLBC_15_2
+account.2.codec.9.priority = 0
+account.2.codec.9.rtpmap = 97
+
+#######################################################################################
+##         	                   Call Forward                                          ##
+#######################################################################################
+#Enable or disable the always forward, 0-Disabled(default), 1-Enabled;
+account.2.always_fwd.enable =
+
+#Configure the target phonenumber that the phone will forward the call to;
+account.2.always_fwd.target =
+
+#Configure the on/off code for always forward;
+
+
+#Enable or disable the busy forward, 0-Disabled(default), 1-Enabled;
+account.2.busy_fwd.enable =
+account.2.busy_fwd.target =
+
+
+#Enable or disable the no answer forward, 0-Disabled(default), 1-Enabled;
+#Configure the waiting ring times before forwarding, ranges from 0 to 20 (by default);
+account.2.timeout_fwd.enable =
+account.2.timeout_fwd.target =
+account.2.timeout_fwd.timeout =
+
+
+#######################################################################################
+##                          DND                                                      ##
+#######################################################################################
+
+#Configure the DND key mode; 0-Phone mode (default), 1-Custom mode.
+features.dnd_mode =
+
+#Enable or disable the DND feautre for account2; 0-Disabled (default), 1-Enabled;
+account.2.dnd.enable =
+
+#Configure the DND on code and off code for account1.
+
+account.2.sip_trust_ctrl = 1
+
+voice_mail.number.2 = {$voicemail_number}
+
+#######################################################################################
+##                                   Account 3 Settings                              ##
+#######################################################################################
+
+#Basic Settings
+account.3.enable = {if isset($account.3.password) }1{else}0{/if}{""}
+
+account.3.label = {$account.3.label}
+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}
+
+{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}{""}
+
+account.3.expires = {$register_expires}
+account.3.outbound_host = {$outbound_proxy}
+account.3.outbound_port = {$sip_port}
+
+#Server Redundancy
+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.transport_type = {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}{""}
+
+account.3.sip_server.2.expires= {$account.3.register_expires}
+account.3.retry_counts = 3
+
+#Basic Proxy Settings
+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 = {if isset($account.3.sip_port)}{$account.3.sip_port}{else}5060{/if}{""}
+
+account.3.outbound_proxy.2.address = {$account.3.outbound_proxy_secondary}
+account.3.outbound_proxy.2.port = {if isset($account.3.sip_port)}{$account.3.sip_port}{else}5060{/if}{""}
+a
+ccount.3.fallback.timeout = {$yealink_outbound_proxy_fallback_interval}
+
+#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 1, 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, 1-Enabled (default);
+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 = {$yealink_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 = 3600
+
+#Configure the type of SIP header to carry the caller ID; 0-FROM (default), 1-PAI;
+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 =
+
+#Configure the way of encrypting the message; 0-Disabled (default), 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 =
+
+#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 = 0
+
+#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 the line 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 1 fails to register. It ranges from 0 to 1800, the default value is 30.
+account.3.reg_fail_retry_interval =
+
+#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, 1-DTMF-Relay (default), 2-DTMF, 3-Telephone-Event;
+account.3.dtmf.info_type =
+
+
+#######################################################################################
+##                                   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-Default (default), 2-Option, 3-Notify;
+account.3.nat.udp_update_enable = {if isset($account.3.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+
+#Specify the keep-alive interval (in seconds), the default value is 30.
+account.3.nat.udp_update_time = 30
+
+#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 =
+
+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 =0
+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 = 0
+account.3.codec.7.payload_type = G726-32
+account.3.codec.7.priority = 0
+account.3.codec.7.rtpmap = 2
+
+account.3.codec.8.enable = 0
+account.3.codec.8.payload_type = iLBC_13_3
+account.3.codec.8.priority = 0
+account.3.codec.8.rtpmap = 97
+
+account.3.codec.9.enable = 0
+account.3.codec.9.payload_type = iLBC_15_2
+account.3.codec.9.priority = 0
+account.3.codec.9.rtpmap = 97
+
+#######################################################################################
+##         	                   Call Forward                                          ##
+#######################################################################################
+#Enable or disable the always forward, 0-Disabled(default), 1-Enabled;
+account.3.always_fwd.enable =
+
+#Configure the target phonenumber that the phone will forward the call to;
+account.3.always_fwd.target =
+
+#Configure the on/off code for always forward;
+
+
+#Enable or disable the busy forward, 0-Disabled(default), 1-Enabled;
+account.3.busy_fwd.enable =
+account.3.busy_fwd.target =
+
+
+#Enable or disable the no answer forward, 0-Disabled(default), 1-Enabled;
+#Configure the waiting ring times before forwarding, ranges from 0 to 20 (by default);
+account.3.timeout_fwd.enable =
+account.3.timeout_fwd.target =
+account.3.timeout_fwd.timeout =
+
+
+#######################################################################################
+##                          DND                                                      ##
+#######################################################################################
+
+#Configure the DND key mode; 0-Phone mode (default), 1-Custom mode.
+features.dnd_mode =
+
+#Enable or disable the DND feautre for account3; 0-Disabled (default), 1-Enabled;
+account.3.dnd.enable =
+
+#Configure the DND on code and off code for account3.
+
+account.3.sip_trust_ctrl = 1
+
+voice_mail.number.3 = {$voicemail_number}
+
+#######################################################################################
+##                                   Account 4 Settings                              ##
+#######################################################################################
+
+#Basic Settings
+account.4.enable = {if isset($account.4.password) }1{else}0{/if}{""}
+
+account.4.label = {$account.4.label}
+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}
+
+{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}{""}
+
+account.4.expires = {$account.4.register_expires}
+account.4.outbound_host = {$account.4.outbound_proxy}
+account.4.outbound_port = {$account.4.sip_port}
+
+#Server Redundancy
+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.transport_type = {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}{""}
+
+account.4.sip_server.2.expires= {$account.4.register_expires}
+account.4.retry_counts = 3
+
+#Basic Proxy Settings
+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 = {if isset($account.4.sip_port)}{$account.4.sip_port}{else}5060{/if}{""}
+
+account.4.outbound_proxy.2.address = {$account.4.outbound_proxy_secondary}
+account.4.outbound_proxy.2.port = {if isset($account.4.sip_port)}{$account.4.sip_port}{else}5060{/if}{""}
+
+account.4.fallback.timeout = {$yealink_outbound_proxy_fallback_interval}
+
+#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 1, 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, 1-Enabled (default);
+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 = {$yealink_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 = 3600
+
+#Configure the type of SIP header to carry the caller ID; 0-FROM (default), 1-PAI;
+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 =
+
+#Configure the way of encrypting the message; 0-Disabled (default), 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 =
+
+#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 = 0
+
+#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 the line 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 1 fails to register. It ranges from 0 to 1800, the default value is 30.
+account.4.reg_fail_retry_interval =
+
+#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, 1-DTMF-Relay (default), 2-DTMF, 3-Telephone-Event;
+account.4.dtmf.info_type =
+
+#######################################################################################
+##                                   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-Default (default), 2-Option, 3-Notify;
+account.4.nat.udp_update_enable = {if isset($account.4.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+
+#Specify the keep-alive interval (in seconds), the default value is 30.
+account.4.nat.udp_update_time = 30
+
+#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 =
+
+
+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 =0
+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 = 0
+account.4.codec.7.payload_type = G726-32
+account.4.codec.7.priority = 0
+account.4.codec.7.rtpmap = 2
+
+account.4.codec.8.enable = 0
+account.4.codec.8.payload_type = iLBC_13_3
+account.4.codec.8.priority = 0
+account.4.codec.8.rtpmap = 97
+
+account.4.codec.9.enable = 0
+account.4.codec.9.payload_type = iLBC_15_2
+account.4.codec.9.priority = 0
+account.4.codec.9.rtpmap = 97
+
+#######################################################################################
+##         	                   Call Forward                                          ##
+#######################################################################################
+#Enable or disable the always forward, 0-Disabled(default), 1-Enabled;
+account.4.always_fwd.enable =
+
+#Configure the target phonenumber that the phone will forward the call to;
+account.4.always_fwd.target =
+
+#Configure the on/off code for always forward;
+
+
+#Enable or disable the busy forward, 0-Disabled(default), 1-Enabled;
+account.4.busy_fwd.enable =
+account.4.busy_fwd.target =
+
+
+#Enable or disable the no answer forward, 0-Disabled(default), 1-Enabled;
+#Configure the waiting ring times before forwarding, ranges from 0 to 20 (by default);
+account.4.timeout_fwd.enable =
+account.4.timeout_fwd.target =
+account.4.timeout_fwd.timeout =
+
+
+#######################################################################################
+##                          DND                                                      ##
+#######################################################################################
+
+#Configure the DND key mode; 0-Phone mode (default), 1-Custom mode.
+features.dnd_mode =
+
+#Enable or disable the DND feautre for account4; 0-Disabled (default), 1-Enabled;
+account.4.dnd.enable =
+
+#Configure the DND on code and off code for account4.
+
+account.4.sip_trust_ctrl = 1
+
+voice_mail.number.4 = {$voicemail_number}
+
+#######################################################################################
+##                                   Account 5 Settings                              ##
+#######################################################################################
+
+#Basic Settings
+account.5.enable = {if isset($account.5.password) }1{else}0{/if}{""}
+
+account.5.label = {$account.5.label}
+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}
+
+{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}{""}
+
+account.5.expires = {$account.5.register_expires}
+account.5.outbound_host = {$account.5.outbound_proxy}
+account.5.outbound_port = {$account.5.sip_port}
+
+#Server Redundancy
+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.transport_type = {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}{""}
+
+account.5.sip_server.2.expires= {$account.5.register_expires}
+account.5.retry_counts = 3
+
+#Basic Proxy Settings
+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 = {if isset($account.5.sip_port)}{$account.5.sip_port}{else}5060{/if}{""}
+
+account.5.outbound_proxy.2.address = {$account.5.outbound_proxy_secondary}
+account.5.outbound_proxy.2.port = {if isset($account.5.sip_port)}{$account.4.sip_port}{else}5060{/if}{""}
+
+account.5.fallback.timeout = {$yealink_outbound_proxy_fallback_interval}
+
+#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 1, 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, 1-Enabled (default);
+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 = {$yealink_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 = 3600
+
+#Configure the type of SIP header to carry the caller ID; 0-FROM (default), 1-PAI;
+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 =
+
+#Configure the way of encrypting the message; 0-Disabled (default), 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 =
+
+#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 = 0
+
+#Enable or disable the phone to send the MAC address in the Register message; 0-Disabled (default), 1-Enabled;
+account.5.register_mac =
+
+#Enable or disable the phone to send the line number in the Register message; 0-Disabled, 1-Enabled (default);
+account.5.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.5.reg_fail_retry_interval =
+
+#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, 1-DTMF-Relay (default), 2-DTMF, 3-Telephone-Event;
+account.5.dtmf.info_type =
+
+
+#######################################################################################
+##                                   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-Default (default), 2-Option, 3-Notify;
+account.5.nat.udp_update_enable = {if isset($account.5.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+
+#Specify the keep-alive interval (in seconds), the default value is 30.
+account.5.nat.udp_update_time = 30
+
+#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 values of T1, T2, T3 are 0.5, 4, 5.
+account.5.advanced.timer_t1 =
+account.5.advanced.timer_t2 =
+account.5.advanced.timer_t4 =
+
+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 =0
+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 = 0
+account.5.codec.7.payload_type = G726-32
+account.5.codec.7.priority = 0
+account.5.codec.7.rtpmap = 2
+
+account.5.codec.8.enable = 0
+account.5.codec.8.payload_type = iLBC_13_3
+account.5.codec.8.priority = 0
+account.5.codec.8.rtpmap = 97
+
+account.5.codec.9.enable = 0
+account.5.codec.9.payload_type = iLBC_15_2
+account.5.codec.9.priority = 0
+account.5.codec.9.rtpmap = 97
+
+#######################################################################################
+##         	                   Call Forward                                          ##
+#######################################################################################
+#Enable or disable the always forward, 0-Disabled(default), 1-Enabled;
+account.5.always_fwd.enable =
+
+#Configure the target phonenumber that the phone will forward the call to;
+account.5.always_fwd.target =
+
+#Configure the on/off code for always forward;
+
+
+#Enable or disable the busy forward, 0-Disabled(default), 1-Enabled;
+account.5.busy_fwd.enable =
+account.5.busy_fwd.target =
+
+
+#Enable or disable the no answer forward, 0-Disabled(default), 1-Enabled;
+#Configure the waiting ring times before forwarding, ranges from 0 to 20 (by default);
+account.5.timeout_fwd.enable =
+account.5.timeout_fwd.target =
+account.5.timeout_fwd.timeout =
+
+
+#######################################################################################
+##                          DND                                                      ##
+#######################################################################################
+
+#Configure the DND key mode; 0-Phone mode (default), 1-Custom mode.
+features.dnd_mode =
+
+#Enable or disable the DND feautre for account5; 0-Disabled (default), 1-Enabled;
+account.5.dnd.enable =
+
+#Configure the DND on code and off code for account5.
+
+account.5.sip_trust_ctrl = 1
+
+voice_mail.number.5 = {$voicemail_number}
+
+#######################################################################################
+##                                   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, submask, gateway and DNS server.
+#Require reboot;
+network.internet_port.ip =
+network.internet_port.mask =
+network.internet_port.gateway =
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}{""}
+
+{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}{""}
+
+#######################################################################################
+##                                   Account 6 Settings                              ##
+#######################################################################################
+
+#Basic Settings
+account.6.enable = {if isset($account.6.password) }1{else}0{/if}{""}
+
+account.6.label = {$account.6.label}
+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}
+
+{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
+ccount.6.expires = {$account.6.register_expires}
+account.6.outbound_host = {$account.6.outbound_proxy}
+account.6.outbound_port = {$account.6.sip_port}
+
+#Server Redundancy
+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.transport_type = {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}{""}
+
+account.6.sip_server.2.expires= {$account.6.register_expires}
+account.6.retry_counts = 3
+
+#Basic Proxy Settings
+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 = {if isset($account.6.sip_port)}{$account.6.sip_port}{else}5060{/if}{""}
+
+account.6.outbound_proxy.2.address = {$account.6.outbound_proxy_secondary}
+account.6.outbound_proxy.2.port = {if isset($account.6.sip_port)}{$account.6.sip_port}{else}5060{/if}{""}
+
+account.6.fallback.timeout = {$yealink_outbound_proxy_fallback_interval}
+
+#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 1, 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, 1-Enabled (default);
+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 = {$yealink_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 = 3600
+
+#Configure the type of SIP header to carry the caller ID; 0-FROM (default), 1-PAI;
+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 =
+
+#Configure the way of encrypting the message; 0-Disabled (default), 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 =
+
+#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
+
+#Enable or disable the phone to send the MAC address in the Register message; 0-Disabled (default), 1-Enabled;
+account.6.register_mac =
+
+#Enable or disable the phone to send the line number in the Register message; 0-Disabled, 1-Enabled (default);
+account.6.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.6.reg_fail_retry_interval =
+
+#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, 1-DTMF-Relay (default), 2-DTMF, 3-Telephone-Event;
+account.6.dtmf.info_type =
+
+
+#######################################################################################
+##                                   NAT Settings                                    ##
+#######################################################################################
+
+#Enable or disable the NAT traversal; 0-Disabled (default), 1-STUN;
+account.6.nat.nat_traversal = {if isset($stun_server)}1{else}0{/if}{""}
+
+#Configure the STUN server address.
+account.6.nat.stun_server = {$stun_server}
+
+#Configure the STUN server port, the default value is 3478.
+account.6.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.6.nat.udp_update_enable = {if isset($account.6.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+
+#Specify the keep-alive interval (in seconds), the default value is 30.
+account.6.nat.udp_update_time = 30
+
+#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 values of T1, T2, T3 are 0.5, 4, 5.
+account.6.advanced.timer_t1 =
+account.6.advanced.timer_t2 =
+account.6.advanced.timer_t4 =
+
+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_63
+account.6.codec.3.priority =0
+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 = 0
+account.6.codec.7.payload_type = G726-32
+account.6.codec.7.priority = 0
+account.6.codec.7.rtpmap = 2
+
+account.6.codec.8.enable = 0
+account.6.codec.8.payload_type = iLBC_13_3
+account.6.codec.8.priority = 0
+account.6.codec.8.rtpmap = 97
+
+account.6.codec.9.enable = 0
+account.6.codec.9.payload_type = iLBC_15_2
+account.6.codec.9.priority = 0
+account.6.codec.9.rtpmap = 97
+
+#######################################################################################
+##         	                   Call Forward                                          ##
+#######################################################################################
+#Enable or disable the always forward, 0-Disabled(default), 1-Enabled;
+account.6.always_fwd.enable =
+
+#Configure the target phonenumber that the phone will forward the call to;
+account.6.always_fwd.target =
+
+#Configure the on/off code for always forward;
+
+
+#Enable or disable the busy forward, 0-Disabled(default), 1-Enabled;
+account.6.busy_fwd.enable =
+account.6.busy_fwd.target =
+
+
+#Enable or disable the no answer forward, 0-Disabled(default), 1-Enabled;
+#Configure the waiting ring times before forwarding, ranges from 0 to 20 (by default);
+account.6.timeout_fwd.enable =
+account.6.timeout_fwd.target =
+account.6.timeout_fwd.timeout =
+
+
+#######################################################################################
+##                          DND                                                      ##
+#######################################################################################
+
+#Configure the DND key mode; 0-Phone mode (default), 1-Custom mode.
+features.dnd_mode =
+
+#Enable or disable the DND feautre for account5; 0-Disabled (default), 1-Enabled;
+account.6.dnd.enable =
+
+#Configure the DND on code and off code for account5.
+
+account.6.sip_trust_ctrl = 1
+
+voice_mail.number.6 = {$voicemail_number}
+
+#######################################################################################
+##                                   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, submask, gateway and DNS server.
+#Require reboot;
+network.internet_port.ip =
+network.internet_port.mask =
+network.internet_port.gateway =
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}{""}
+
+{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}{""}
+
+#######################################################################################
+##                                   Account 7 Settings                              ##
+#######################################################################################
+
+#Basic Settings
+account.7.enable = {if isset($account.7.user_password) }1{else}0{/if}{""}
+
+account.7.label = {$account.7.label}
+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}
+
+{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}{""}
+
+account.7.expires = {$account.7.register_expires}
+account.7.outbound_host = {$account.7.outbound_proxy}
+account.7.outbound_port = {$account.7.sip_port}
+
+#Server Redundancy
+account.7.sip_server.2.address= {$account.7.server_address}
+account.7.sip_server.2.port= {$account.7.sip_port}
+account.7.sip_server.2.transport_type = {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}{""}
+
+account.7.sip_server.2.expires= {$account.7.register_expires}
+account.7.retry_counts = 3
+
+#Basic Proxy Settings
+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}
+account.7.outbound_proxy.1.port = {if isset($account.7.sip_port)}{$account.7.outbound_sip_port}{else}5060{/if}{""}
+
+account.7.outbound_proxy.2.address = {$account.7.outbound_proxy_secondary}
+account.7.outbound_proxy.2.port = {if isset($account.7.sip_port)}{$account.7.sip_port}{else}5060{/if}{""}
+
+account.7.fallback.timeout = {$yealink_outbound_proxy_fallback_interval}
+
+#Enable or disable the anonymous call feature; 0-Disabled (default), 1-Enabled;
+account.7.anonymous_call =
+
+#Configure the on code and off code of the anonymous call feature.
+account.7.anonymous_call_oncode =
+account.7.anonymous_call_offcode =
+
+#Enable or disable the reject anonymous call feature; 0-Disabled (default), 1-Enabled;
+account.7.reject_anonymous_call =
+
+#Configure the on code and off code of the reject anonymous call feature.
+account.7.anonymous_reject_oncode =
+account.7.anonymous_reject_offcode =
+
+#Configure the SIP port for account 1, the default value is 5060.
+account.7.sip_listen_port =
+
+#Configure the register expiry time (in seconds), the default value is 3600.
+account.7.expires = {$register_expires_7}
+
+#Enable or disable the 100 reliable retransmission; 0-Disabled, 1-Enabled (default);
+account.7.100rel_enable = {$yealink_retransmission}
+
+#Enable or disable the resource reservation; 0-Disabled (default), 1-Enabled;
+account.7.precondition =
+
+#Enable or disable the phone to subscribe the register status; 0-Disabled (default), 1-Enabled;
+account.7.subscribe_register =
+
+#Enable or disable the phone to subscribe the message waiting indicator; 0-Disabled (default), 1-Enabled;
+account.7.subscribe_mwi = {$yealink_subscribe_mwi}
+
+#Configure MWI subscribe expiry time (in seconds). It ranges from 0 to 84600, the default value is 3600.
+account.7.subscribe_mwi_expires = 3600
+
+#Configure the type of SIP header to carry the caller ID; 0-FROM (default), 1-PAI;
+account.7.cid_source = {$yealink_cid_source}
+
+#Configure the presentation of the callee ID; 0-PAI-PRID, 1-DIALED DIGITS (default), 2-RFC4916;
+account.7.cp_source = 2
+
+#Enable or disable the session timer; 0-Disabled (default), 1-Enabled;
+account.7.session_timer.enable = {$yealink_session_timer}
+
+#Configure the refresh session timer interval (in seconds). It ranges from 1 to 9999.
+account.7.session_timer.expires =
+
+#Configure the session timer refresher; 0-Uac (default), 1-Uas;
+account.7.session_timer.refresher =
+
+#Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled;
+account.7.enable_user_equal_phone =
+
+#Configure the way of encrypting the message; 0-Disabled (default), 1-Forced, 2-Negotiated;
+account.7.srtp_encryption =
+
+#Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60.
+account.7.ptime =
+
+#Enable or disable the phone to subscribe to the voicemail through the message waiting indicator; 0-Disabled (default), 1-Enabled;
+account.7.subscribe_mwi_to_vm = 0
+
+#Enable or disable the phone to send the MAC address in the Register message; 0-Disabled (default), 1-Enabled;
+account.7.register_mac =
+
+#Enable or disable the phone to send the line number in the Register message; 0-Disabled, 1-Enabled (default);
+account.7.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.7.reg_fail_retry_interval =
+
+#Enable or disable the SIP signal encode; 0-Disabled (default), 1-Enabled (RC 4);
+account.7.enable_signal_encode =
+
+#Configure the key for encoding.
+account.7.signal_encode_key =
+
+#Configure the DTMF type; 0-INBAND, 1-RFC2833 (default), 2-SIP INFO, 3-AUTO+SIP INFO;
+account.7.dtmf.type = {$yealink_dtmf_type}
+
+#Configure the RFC2833 payload. It ranges from 96 to 225, the default value is 101.
+account.7.dtmf.dtmf_payload =
+
+#Configure the DTMF info type when using the SIP INFO; 0-Disabled, 1-DTMF-Relay (default), 2-DTMF, 3-Telephone-Event;
+account.7.dtmf.info_type =
+
+
+#######################################################################################
+##                                   NAT Settings                                    ##
+#######################################################################################
+
+#Enable or disable the NAT traversal; 0-Disabled (default), 1-STUN;
+account.7.nat.nat_traversal = {if isset($stun_server)}1{else}0{/if}{""}
+
+#Configure the STUN server address.
+account.7.nat.stun_server = {$stun_server}
+
+#Configure the STUN server port, the default value is 3478.
+account.7.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.7.nat.udp_update_enable = {if isset($account.7.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+
+#Specify the keep-alive interval (in seconds), the default value is 30.
+account.7.nat.udp_update_time = 30
+
+#Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
+account.7.nat.rport = {$yealink_rport}
+
+#Configure the session timer (in seconds), the default values of T1, T2, T3 are 0.5, 4, 5.
+account.7.advanced.timer_t1 =
+account.7.advanced.timer_t2 =
+account.7.advanced.timer_t4 =
+
+account.7.codec.1.enable = 1
+account.7.codec.1.payload_type = PCMU
+account.7.codec.1.priority = 1
+account.7.codec.1.rtpmap = 0
+
+account.7.codec.2.enable = 1
+account.7.codec.2.payload_type = PCMA
+account.7.codec.2.priority = 2
+account.7.codec.2.rtpmap = 8
+
+account.7.codec.3.enable = 0
+account.7.codec.3.payload_type = G723_73
+account.7.codec.3.priority =0
+account.7.codec.3.rtpmap = 4
+
+account.7.codec.4.enable = 0
+account.7.codec.4.payload_type = G723_73
+account.7.codec.4.priority = 0
+account.7.codec.4.rtpmap = 4
+
+account.7.codec.5.enable = 1
+account.7.codec.5.payload_type = G729
+account.7.codec.5.priority = 3
+account.7.codec.5.rtpmap = 18
+
+account.7.codec.6.enable = 1
+account.7.codec.6.payload_type = G722
+account.7.codec.6.priority = 4
+account.7.codec.6.rtpmap = 9
+
+account.7.codec.7.enable = 0
+account.7.codec.7.payload_type = G726-32
+account.7.codec.7.priority = 0
+account.7.codec.7.rtpmap = 2
+
+account.7.codec.8.enable = 0
+account.7.codec.8.payload_type = iLBC_13_3
+account.7.codec.8.priority = 0
+account.7.codec.8.rtpmap = 97
+
+account.7.codec.9.enable = 0
+account.7.codec.9.payload_type = iLBC_15_2
+account.7.codec.9.priority = 0
+account.7.codec.9.rtpmap = 97
+
+#######################################################################################
+##         	                   Call Forward                                          ##
+#######################################################################################
+#Enable or disable the always forward, 0-Disabled(default), 1-Enabled;
+account.7.always_fwd.enable =
+
+#Configure the target phonenumber that the phone will forward the call to;
+account.7.always_fwd.target =
+
+#Configure the on/off code for always forward;
+
+
+#Enable or disable the busy forward, 0-Disabled(default), 1-Enabled;
+account.7.busy_fwd.enable =
+account.7.busy_fwd.target =
+
+
+#Enable or disable the no answer forward, 0-Disabled(default), 1-Enabled;
+#Configure the waiting ring times before forwarding, ranges from 0 to 20 (by default);
+account.7.timeout_fwd.enable =
+account.7.timeout_fwd.target =
+account.7.timeout_fwd.timeout =
+
+
+#######################################################################################
+##                          DND                                                      ##
+#######################################################################################
+
+#Configure the DND key mode; 0-Phone mode (default), 1-Custom mode.
+features.dnd_mode =
+
+#Enable or disable the DND feautre for account5; 0-Disabled (default), 1-Enabled;
+account.7.dnd.enable =
+
+#Configure the DND on code and off code for account5.
+
+account.7.sip_trust_ctrl = 1
+
+voice_mail.number.7= {$voicemail_number}
+
+#######################################################################################
+##                                   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, submask, gateway and DNS server.
+#Require reboot;
+network.internet_port.ip =
+network.internet_port.mask =
+network.internet_port.gateway =
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}{""}
+
+{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}{""}
+
+#######################################################################################
+##                                   Account 8 Settings                              ##
+#######################################################################################
+
+#Basic Settings
+account.8.enable = {if isset($account.8.user_password) }1{else}0{/if}{""}
+
+account.8.label = {$account.8.label}
+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}
+
+{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}{""}
+
+account.8.expires = {$account.8.register_expires}
+account.8.outbound_host = {$account.8.outbound_proxy}
+account.8.outbound_port = {$account.8.sip_port}
+
+#Server Redundancy
+account.8.sip_server.2.address= {$account.8.server_address}
+account.8.sip_server.2.port= {$account.8.sip_port}
+account.8.sip_server.2.transport_type = {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}{""}
+
+account.8.sip_server.2.expires= {$account.8.register_expires}
+account.8.retry_counts = 3
+
+#Basic Proxy Settings
+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}
+account.8.outbound_proxy.1.port = {if isset($account.8.sip_port)}{$account.8.sip_port}{else}5060{/if}{""}
+
+account.8.outbound_proxy.2.address = {$account.8.outbound_proxy_secondary}
+account.8.outbound_proxy.2.port = {if isset($account.8.sip_port)}{$account.8.sip_port}{else}5060{/if}{""}
+
+account.8.fallback.timeout = {$yealink_outbound_proxy_fallback_interval}
+
+#Enable or disable the anonymous call feature; 0-Disabled (default), 1-Enabled;
+account.8.anonymous_call =
+
+#Configure the on code and off code of the anonymous call feature.
+account.8.anonymous_call_oncode =
+account.8.anonymous_call_offcode =
+
+#Enable or disable the reject anonymous call feature; 0-Disabled (default), 1-Enabled;
+account.8.reject_anonymous_call =
+
+#Configure the on code and off code of the reject anonymous call feature.
+account.8.anonymous_reject_oncode =
+account.8.anonymous_reject_offcode =
+
+#Configure the SIP port for account 1, the default value is 5060.
+account.8.sip_listen_port =
+
+#Configure the register expiry time (in seconds), the default value is 3600.
+account.8.expires = {$account.8.register_expires}
+
+#Enable or disable the 100 reliable retransmission; 0-Disabled, 1-Enabled (default);
+account.8.100rel_enable = {$yealink_retransmission}
+
+#Enable or disable the resource reservation; 0-Disabled (default), 1-Enabled;
+account.8.precondition =
+
+#Enable or disable the phone to subscribe the register status; 0-Disabled (default), 1-Enabled;
+account.8.subscribe_register =
+
+#Enable or disable the phone to subscribe the message waiting indicator; 0-Disabled (default), 1-Enabled;
+account.8.subscribe_mwi = {$yealink_subscribe_mwi}
+
+#Configure MWI subscribe expiry time (in seconds). It ranges from 0 to 84600, the default value is 3600.
+account.8.subscribe_mwi_expires = 3600
+
+#Configure the type of SIP header to carry the caller ID; 0-FROM (default), 1-PAI;
+account.8.cid_source = {$yealink_cid_source}
+
+#Configure the presentation of the callee ID; 0-PAI-PRID, 1-DIALED DIGITS (default), 2-RFC4916;
+account.8.cp_source = 2
+
+#Enable or disable the session timer; 0-Disabled (default), 1-Enabled;
+account.8.session_timer.enable = {$yealink_session_timer}
+
+#Configure the refresh session timer interval (in seconds). It ranges from 1 to 9999.
+account.8.session_timer.expires =
+
+#Configure the session timer refresher; 0-Uac (default), 1-Uas;
+account.8.session_timer.refresher =
+
+#Enable or disable the "user=phone"; 0-Disabled (default), 1-Enabled;
+account.8.enable_user_equal_phone =
+
+#Configure the way of encrypting the message; 0-Disabled (default), 1-Forced, 2-Negotiated;
+account.8.srtp_encryption =
+
+#Configure the RTP packet time. The valid values are 0 (Disabled), 10, 20 (default), 30, 40, 50, 60.
+account.8.ptime =
+
+#Enable or disable the phone to subscribe to the voicemail through the message waiting indicator; 0-Disabled (default), 1-Enabled;
+account.8.subscribe_mwi_to_vm = 0
+
+#Enable or disable the phone to send the MAC address in the Register message; 0-Disabled (default), 1-Enabled;
+account.8.register_mac =
+
+#Enable or disable the phone to send the line number in the Register message; 0-Disabled, 1-Enabled (default);
+account.8.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.8.reg_fail_retry_interval =
+
+#Enable or disable the SIP signal encode; 0-Disabled (default), 1-Enabled (RC 4);
+account.8.enable_signal_encode =
+
+#Configure the key for encoding.
+account.8.signal_encode_key =
+
+#Configure the DTMF type; 0-INBAND, 1-RFC2833 (default), 2-SIP INFO, 3-AUTO+SIP INFO;
+account.8.dtmf.type = {$yealink_dtmf_type}
+
+#Configure the RFC2833 payload. It ranges from 96 to 225, the default value is 101.
+account.8.dtmf.dtmf_payload =
+
+#Configure the DTMF info type when using the SIP INFO; 0-Disabled, 1-DTMF-Relay (default), 2-DTMF, 3-Telephone-Event;
+account.8.dtmf.info_type =
+
+
+#######################################################################################
+##                                   NAT Settings                                    ##
+#######################################################################################
+
+#Enable or disable the NAT traversal; 0-Disabled (default), 1-STUN;
+account.8.nat.nat_traversal = {if isset($stun_server)}1{else}0{/if}{""}
+
+#Configure the STUN server address.
+account.8.nat.stun_server = {$stun_server}
+
+#Configure the STUN server port, the default value is 3478.
+account.8.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.8.nat.udp_update_enable = {if isset($account.8.password)}{if isset($yealink_udp_update_enable)}{$yealink_udp_update_enable}{else}3{/if}{else}1{/if}{""}
+
+#Specify the keep-alive interval (in seconds), the default value is 30.
+account.8.nat.udp_update_time = 30
+
+#Enable or disable the NAT Rport; 0-Disabled (default), 1-Enabled;
+account.8.nat.rport = {$yealink_rport}
+
+#Configure the session timer (in seconds), the default values of T1, T2, T3 are 0.5, 4, 5.
+account.8.advanced.timer_t1 =
+account.8.advanced.timer_t2 =
+account.8.advanced.timer_t4 =
+
+account.8.codec.1.enable = 1
+account.8.codec.1.payload_type = PCMU
+account.8.codec.1.priority = 1
+account.8.codec.1.rtpmap = 0
+
+account.8.codec.2.enable = 1
+account.8.codec.2.payload_type = PCMA
+account.8.codec.2.priority = 2
+account.8.codec.2.rtpmap = 8
+
+account.8.codec.3.enable = 0
+account.8.codec.3.payload_type = G723_83
+account.8.codec.3.priority =0
+account.8.codec.3.rtpmap = 4
+
+account.8.codec.4.enable = 0
+account.8.codec.4.payload_type = G723_83
+account.8.codec.4.priority = 0
+account.8.codec.4.rtpmap = 4
+
+account.8.codec.5.enable = 1
+account.8.codec.5.payload_type = G729
+account.8.codec.5.priority = 3
+account.8.codec.5.rtpmap = 18
+
+account.8.codec.6.enable = 1
+account.8.codec.6.payload_type = G722
+account.8.codec.6.priority = 4
+account.8.codec.6.rtpmap = 9
+
+account.8.codec.7.enable = 0
+account.8.codec.7.payload_type = G726-32
+account.8.codec.7.priority = 0
+account.8.codec.7.rtpmap = 2
+
+account.8.codec.8.enable = 0
+account.8.codec.8.payload_type = iLBC_13_3
+account.8.codec.8.priority = 0
+account.8.codec.8.rtpmap = 97
+
+account.8.codec.9.enable = 0
+account.8.codec.9.payload_type = iLBC_15_2
+account.8.codec.9.priority = 0
+account.8.codec.9.rtpmap = 97
+
+#######################################################################################
+##         	                   Call Forward                                          ##
+#######################################################################################
+#Enable or disable the always forward, 0-Disabled(default), 1-Enabled;
+account.8.always_fwd.enable =
+
+#Configure the target phonenumber that the phone will forward the call to;
+account.8.always_fwd.target =
+
+#Configure the on/off code for always forward;
+
+
+#Enable or disable the busy forward, 0-Disabled(default), 1-Enabled;
+account.8.busy_fwd.enable =
+account.8.busy_fwd.target =
+
+
+#Enable or disable the no answer forward, 0-Disabled(default), 1-Enabled;
+#Configure the waiting ring times before forwarding, ranges from 0 to 20 (by default);
+account.8.timeout_fwd.enable =
+account.8.timeout_fwd.target =
+account.8.timeout_fwd.timeout =
+
+
+#######################################################################################
+##                          DND                                                      ##
+#######################################################################################
+
+#Configure the DND key mode; 0-Phone mode (default), 1-Custom mode.
+features.dnd_mode =
+
+#Enable or disable the DND feautre for account5; 0-Disabled (default), 1-Enabled;
+account.8.dnd.enable =
+
+#Configure the DND on code and off code for account5.
+
+account.8.sip_trust_ctrl = 1
+
+voice_mail.number.8 = {$voicemail_number}
+
+#######################################################################################
+##                                   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, submask, gateway and DNS server.
+#Require reboot;
+network.internet_port.ip =
+network.internet_port.mask =
+network.internet_port.gateway =
+{if isset($dns_server_primary)}network.primary_dns = {$dns_server_primary}{/if}{""}
+
+{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/secure/fax_to_email.php b/secure/fax_to_email.php
index cbc1400224..3a3f3914ff 100644
--- a/secure/fax_to_email.php
+++ b/secure/fax_to_email.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-2018
+	Portions created by the Initial Developer are Copyright (C) 2008-2022
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -110,8 +110,9 @@ if (!function_exists('tiff2pdf')) {
 		$fax_file_name = $tiff_file['filename'];
 		$pdf_file_name = path_join( $dir_fax, $fax_file_name . '.pdf' );
 
-		if (file_exists($pdf_file_name))
+		if (file_exists($pdf_file_name)) {
 			return $pdf_file_name;
+		}
 
 		$dir_fax_temp = $_SESSION['server']['temp']['dir'];
 		if (!$dir_fax_temp){
@@ -192,84 +193,6 @@ if (!function_exists('tiff2pdf')) {
 	}
 }
 
-if (!function_exists('fax_enqueue')) {
-	function fax_enqueue($fax_uuid, $fax_file, $wav_file, $reply_address, $fax_uri, $fax_dtmf, $dial_string) {
-		global $db_type;
-
-		$fax_task_uuid = uuid();
-		$dial_string .= "fax_task_uuid='".$fax_task_uuid."',";
-		$description = ''; //! @todo add description
-		if ($db_type == "pgsql") {
-			$date_utc_now_sql  = "NOW()";
-		}
-		if ($db_type == "mysql") {
-			$date_utc_now_sql  = "UTC_TIMESTAMP()";
-		}
-		if ($db_type == "sqlite") {
-			$date_utc_now_sql  = "datetime('now')";
-		}
-
-		$sql = "insert into v_fax_tasks";
-		$sql .= "( ";
-		$sql .= "fax_task_uuid, ";
-		$sql .= "fax_uuid, ";
-		$sql .= "task_next_time, ";
-		$sql .= "task_lock_time, ";
-		$sql .= "task_fax_file, ";
-		$sql .= "task_wav_file, ";
-		$sql .= "task_uri, ";
-		$sql .= "task_dial_string, ";
-		$sql .= "task_dtmf, ";
-		$sql .= "task_interrupted, ";
-		$sql .= "task_status, ";
-		$sql .= "task_no_answer_counter, ";
-		$sql .= "task_no_answer_retry_counter,";
-		$sql .= "task_retry_counter, ";
-		$sql .= "task_reply_address, ";
-		$sql .= "task_description ";
-		$sql .= ") ";
-		$sql .= "values ( ";
-		$sql .= ":fax_task_uuid, ";
-		$sql .= ":fax_uuid, ";
-		$sql .= $date_utc_now_sql.", ";
-		$sql .= "null, ";
-		$sql .= ":fax_file, ";
-		$sql .= ":wav_file, ";
-		$sql .= ":fax_uri, ";
-		$sql .= ":dial_string, ";
-		$sql .= ":fax_dtmf, ";
-		$sql .= "'false', ";
-		$sql .= "0, ";
-		$sql .= "0, ";
-		$sql .= "0, ";
-		$sql .= "0, ";
-		$sql .= ":reply_address, ";
-		$sql .= ":description ";
-		$sql .= ") ";
-		$parameters['fax_task_uuid'] = $fax_task_uuid;
-		$parameters['fax_uuid'] = $fax_uuid;
-		$parameters['fax_file'] = $fax_file;
-		$parameters['wav_file'] = $wav_file;
-		$parameters['fax_uri'] = $fax_uri;
-		$parameters['dial_string'] = $dial_string;
-		$parameters['fax_dtmf'] = $fax_dtmf;
-		$parameters['reply_address'] = $reply_address;
-		$parameters['description'] = $description;
-		$database = new database;
-		$database->execute($sql, $parameters);
-		$response = $database->message();
-		if ($response['message'] == 'OK' && $response['code'] == '200') {
-			return 'Success';
-		}
-		else{
-			//! @todo log error
-			view_array($response);
-			return 'Failed';
-		}
-		unset($sql, $parameters, $response);
-	}
-}
-
 if (!function_exists('fax_split_dtmf')) {
 	function fax_split_dtmf(&$fax_number, &$fax_dtmf){
 		$tmp = array();
@@ -312,7 +235,7 @@ if (!function_exists('fax_split_dtmf')) {
 		$caller_id_name = $_REQUEST["caller_id_name"];
 		$caller_id_number = $_REQUEST["caller_id_number"];
 		$fax_relay = $_REQUEST["retry"];
-		$mailfrom_address = $_REQUEST["mailfrom_address"];
+		$mail_from_address = $_REQUEST["mailfrom_address"];
 	}
 	else {
 		$tmp_array = explode("=", $_SERVER["argv"][1]);
@@ -352,14 +275,13 @@ if (!function_exists('fax_split_dtmf')) {
 		unset($tmp_array);
 	
 		$tmp_array = explode("=", $_SERVER["argv"][10]);
-		$mailfrom_address = $tmp_array[1];
+		$mail_from_address = $tmp_array[1];
 		unset($tmp_array);
 
 		//$tmp_array = explode("=", $_SERVER["argv"][10]);
 		//$destination_number = $tmp_array[1];
 		//unset($tmp_array);
 	}
-	$mailto_address = $fax_email;
 
 //get the fax file name (only) if a full path
 	$fax_path = pathinfo($fax_file);
@@ -388,73 +310,25 @@ if (!function_exists('fax_split_dtmf')) {
 	unset($sql, $parameters, $result);
 
 //prepare smtp server settings
-	// load default smtp settings
-	$smtp['method'] = $_SESSION['email']['smtp_method']['text'];
-	$smtp['host'] = (strlen($_SESSION['email']['smtp_host']['text'])?$_SESSION['email']['smtp_host']['text']:'127.0.0.1');
-	if (isset($_SESSION['email']['smtp_port'])) {
-		$smtp['port'] = (int)$_SESSION['email']['smtp_port']['numeric'];
-	}
-	else {
-		$smtp['port'] = 0;
-	}
-
-	$smtp['secure'] = $_SESSION['email']['smtp_secure']['text'];
-	$smtp['auth'] = $_SESSION['email']['smtp_auth']['text'];
-	$smtp['username'] = $_SESSION['email']['smtp_username']['text'];
-	$smtp['password'] = $_SESSION['email']['smtp_password']['text'];
-	$smtp['from'] = $_SESSION['email']['smtp_from']['text'];
-	$smtp['from_name'] = $_SESSION['email']['smtp_from_name']['text'];
-
+	$email_from_address = $_SESSION['email']['smtp_from']['text'];
+	$email_from_name = $_SESSION['email']['smtp_from_name']['text'];
 	if (isset($_SESSION['fax']['smtp_from']['text']) && strlen($_SESSION['fax']['smtp_from']['text']) > 0) {
-		$smtp['from'] = $_SESSION['fax']['smtp_from']['text'];
+		$email_from_address = $_SESSION['fax']['smtp_from']['text'];
 	}
 	if (isset($_SESSION['fax']['smtp_from_name']['text']) && strlen($_SESSION['fax']['smtp_from_name']['text']) > 0) {
-		$smtp['from_name'] = $_SESSION['fax']['smtp_from_name']['text'];
+		$email_from_name = $_SESSION['fax']['smtp_from_name']['text'];
 	}
 
-	// overwrite with domain-specific smtp server settings, if any
-	if (is_uuid($domain_uuid)) {
-		$sql = "select ";
-		$sql .= "domain_setting_subcategory, ";
-		$sql .= "domain_setting_value ";
-		$sql .= "from v_domain_settings ";
-		$sql .= "where domain_uuid = :domain_uuid ";
-		$sql .= "and ( ";
-		$sql .= "domain_setting_category = 'email' ";
-		$sql .= "or domain_setting_category = 'fax' ";
-		$sql .= ") ";
-		$sql .= "and domain_setting_name = 'text' ";
-		$sql .= "and domain_setting_enabled = 'true' ";
-		$parameters['domain_name'] = $domain_name;
-		$database = new database;
-		$result = $database->select($sql, $parameters, 'all');
-		if (is_array($result) && @sizeof($result) != 0) {
-			foreach ($result as $row) {
-				if ($row['domain_setting_value'] != '') {
-					$smtp[str_replace('smtp_','',$row["domain_setting_subcategory"])] = $row['domain_setting_value'];
-				}
-			}
-		}
-		unset($sql, $parameters, $result, $row);
-	}
-
-	// value adjustments
-	$smtp['method'] = ($smtp['method'] == '') ? 'smtp' : $smtp['method'];
-	$smtp['auth'] = ($smtp['auth'] == "true") ? true : false;
-	$smtp['password'] = ($smtp['password'] != '') ? $smtp['password'] : null;
-	$smtp['secure'] = ($smtp['secure'] != "none") ? $smtp['secure'] : null;
-	$smtp['username'] = ($smtp['username'] != '') ? $smtp['username'] : null;
-
-//get the fax details from the database
+//get the fax settings from the database
 	$sql = "select * from v_fax ";
 	$sql .= "where domain_uuid = :domain_uuid ";
 	$sql .= "and fax_extension = :fax_extension ";
-	$parameters['domain_uuid'] = $_SESSION["domain_uuid"];
+	$parameters['domain_uuid'] = $domain_uuid;
 	$parameters['fax_extension'] = $fax_extension;
 	$database = new database;
 	$row = $database->select($sql, $parameters, 'row');
 	if (is_array($row) && @sizeof($row) != 0) {
-		//$fax_email = $row["fax_email"];
+		$fax_email = $row["fax_email"];
 		$fax_uuid = $row["fax_uuid"];
 		$fax_accountcode = $row["fax_accountcode"];
 		$fax_prefix = $row["fax_prefix"];
@@ -464,6 +338,7 @@ if (!function_exists('fax_split_dtmf')) {
 		$fax_forward_number = $row["fax_forward_number"];
 		$fax_description = $row["fax_description"];
 		$fax_email_inbound_subject_tag = $row['fax_email_inbound_subject_tag'];
+		$mail_to_address = $fax_email;
 	}
 	unset($sql, $parameters, $row);
 
@@ -478,7 +353,7 @@ if (!function_exists('fax_split_dtmf')) {
 
 //used for debug
 	echo "fax_prefix: $fax_prefix\n";
-	echo "mailto_adress: $mailto_address\n";
+	echo "mail_to_adress: $mail_to_address\n";
 	echo "fax_email: $fax_email\n";
 	echo "fax_extension: $fax_extension\n";
 	echo "fax_name: $fax_file_only\n";
@@ -503,195 +378,230 @@ if (!function_exists('fax_split_dtmf')) {
 			$fax_forward_number = $fax_prefix.$tmp[0];
 		}
 
-		echo "fax_forward_number: $fax_forward_number\n";
-		if (strlen($fax_forward_number) > 0) {
-			fax_split_dtmf($fax_forward_number, $fax_dtmf);
+		if (isset($fax_forward_number) && strlen($fax_forward_number) > 0) {
+			//show info
+				echo "fax_forward_number: $fax_forward_number\n";
+		
+			//add fax to the fax queue or send it directly
+			if ($_SESSION['fax_queue']['enabled']['boolean'] == 'true') {
+				//build an array to add the fax to the queue
+				$array['fax_queue'][0]['fax_queue_uuid'] = uuid();
+				$array['fax_queue'][0]['domain_uuid'] = $domain_uuid;
+				$array['fax_queue'][0]['fax_uuid'] = $fax_uuid;
+				$array['fax_queue'][0]['fax_date'] = 'now()';
+				$array['fax_queue'][0]['hostname'] = gethostname();
+				$array['fax_queue'][0]['fax_caller_id_name'] = $fax_caller_id_name;
+				$array['fax_queue'][0]['fax_caller_id_number'] = $fax_caller_id_number;
+				$array['fax_queue'][0]['fax_number'] = $fax_forward_number;
+				$array['fax_queue'][0]['fax_prefix'] = $fax_prefix;
+				$array['fax_queue'][0]['fax_email_address'] = $mail_to_address;
+				$array['fax_queue'][0]['fax_file'] = $fax_file;
+				$array['fax_queue'][0]['fax_status'] = 'waiting';
+				$array['fax_queue'][0]['fax_retry_count'] = 0;
+				$array['fax_queue'][0]['fax_accountcode'] = $fax_accountcode;
 
-			$fax_send_mode = $_SESSION['fax']['send_mode']['text'];
-			if (strlen($fax_send_mode) == 0){
-				$fax_send_mode = 'direct';
-			}
+				//add temporary permisison
+				$p = new permissions;
+				$p->add('fax_queue_add', 'temp');
 
-			$route_array = outbound_route_to_bridge($_SESSION['domain_uuid'], $fax_forward_number);
-			if (count($route_array) == 0) {
-				//send the internal call to the registered extension
-					$fax_uri = "user/".$fax_forward_number."@".$domain_name;
-					$fax_variables = "";
+				//save the data
+				$database = new database;
+				$database->app_name = 'fax queue';
+				$database->app_uuid = '3656287f-4b22-4cf1-91f6-00386bf488f4';
+				$database->save($array);
+
+				//remove temporary permisison
+				$p->delete('fax_queue_add', 'temp');
+				
+				//add message to show in the browser
+				message::add($text['confirm-queued']);
 			}
 			else {
-				//send the external call
-					$fax_uri = $route_array[0];
-					$fax_variables = "";
-					foreach($_SESSION['fax']['variable'] as $variable) {
-						$fax_variables .= $variable.",";
-					}
-			}
+				fax_split_dtmf($fax_forward_number, $fax_dtmf);
 
-			$dial_string = "absolute_codec_string='PCMU,PCMA',";
-			$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                . "',";
+				$fax_send_mode = $_SESSION['fax']['send_mode']['text'];
+				if (strlen($fax_send_mode) == 0){
+					$fax_send_mode = 'direct';
+				}
 
-			if ($fax_send_mode != 'queue') {
-				$dial_string .= $fax_variables;
-				$dial_string .= "mailto_address='"     . $mailto_address   . "',";
-				$dial_string .= "mailfrom_address='"   . $mailfrom_address . "',";
-				$dial_string .= "fax_uri=" . $fax_uri  . ",";
-				$dial_string .= "fax_retry_attempts=1" . ",";
-				$dial_string .= "fax_retry_limit=20"   . ",";
-				$dial_string .= "fax_retry_sleep=180"  . ",";
-				$dial_string .= "fax_verbose=true"     . ",";
-				$dial_string .= "fax_use_ecm=off"      . ",";
-				$dial_string .= "api_hangup_hook='lua fax_retry.lua'";
-				$dial_string = "{" . $dial_string . "}" . $fax_uri." &txfax('".$fax_file."')";
+				$route_array = outbound_route_to_bridge($domain_uuid, $fax_forward_number);
+				if (count($route_array) == 0) {
+					//send the internal call to the registered extension
+						$fax_uri = "user/".$fax_forward_number."@".$domain_name;
+						$fax_variables = "";
+				}
+				else {
+					//send the external call
+						$fax_uri = $route_array[0];
+						$fax_variables = "";
+						foreach($_SESSION['fax']['variable'] as $variable) {
+							$fax_variables .= $variable.",";
+						}
+				}
 
-				//get the event socket information
-					$sql = "select * from v_settings ";
-					$database = new database;
-					$row = $database->select($sql, $parameters, 'row');
-					if (is_array($row) && @sizeof($row) != 0) {
-						$event_socket_ip_address = $row["event_socket_ip_address"];
-						$event_socket_port = $row["event_socket_port"];
-						$event_socket_password = $row["event_socket_password"];
-					}
-					unset($sql);
+				//build the dial string
+				$dial_string = "absolute_codec_string='PCMU,PCMA',";
+				$dial_string .= "accountcode='"                  . $fax_accountcode         . "',";
+				$dial_string .= "sip_h_X-accountcode='"          . $fax_accountcode         . "',";
+				$dial_string .= "domain_uuid="                   . $domain_uuid . ",";
+				$dial_string .= "domain_name="                   . $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                . "',";
 
-				//create the event socket connection
-					$fp = event_socket_create($event_socket_ip_address, $event_socket_port, $event_socket_password);
+				if ($fax_send_mode != 'queue') {
+					//add more ot the dial string
+						$dial_string .= $fax_variables;
+						$dial_string .= "mailto_address='"     . $mail_to_address   . "',";
+						$dial_string .= "mailfrom_address='"   . $mail_from_address . "',";
+						$dial_string .= "fax_uri=" . $fax_uri  . ",";
+						$dial_string .= "fax_retry_attempts=1" . ",";
+						$dial_string .= "fax_retry_limit=20"   . ",";
+						$dial_string .= "fax_retry_sleep=180"  . ",";
+						$dial_string .= "fax_verbose=true"     . ",";
+						$dial_string .= "fax_use_ecm=off"      . ",";
+						$dial_string .= "api_hangup_hook='lua fax_retry.lua'";
+						$dial_string = "{" . $dial_string . "}" . $fax_uri." &txfax('".$fax_file."')";
 
-				//send the command with event socket
-					if ($fp) {
-						//prepare the fax originate command
-							$cmd = "api originate ".$dial_string;
-						//send info to the log
-							echo "fax forward\n";
-							echo $cmd."\n";
-						//send the command to event socket
-							$response = event_socket_request($fp, $cmd);
-							$response = str_replace("\n", "", $response);
-						//send info to the log
-							echo "response: ".$response."\n";
-						//get the uuid
-							$uuid = str_replace("+OK ", "", $response);
-						//close event socket
-							fclose($fp);
-					}
-			}
-			else{
-				$wav_file = '';
-				$response = fax_enqueue($fax_uuid, $fax_file, $wav_file, $mailto_address, $fax_uri, $fax_dtmf, $dial_string);
+					//get the event socket information
+						$sql = "select * from v_settings ";
+						$database = new database;
+						$row = $database->select($sql, $parameters, 'row');
+						if (is_array($row) && @sizeof($row) != 0) {
+							$event_socket_ip_address = $row["event_socket_ip_address"];
+							$event_socket_port = $row["event_socket_port"];
+							$event_socket_password = $row["event_socket_password"];
+						}
+						unset($sql);
+
+					//create the event socket connection
+						$fp = event_socket_create($event_socket_ip_address, $event_socket_port, $event_socket_password);
+
+					//send the command with event socket
+						if ($fp) {
+							//prepare the fax originate command
+								$cmd = "api originate ".$dial_string;
+							//send info to the log
+								echo "fax forward\n";
+								echo $cmd."\n";
+							//send the command to event socket
+								$response = event_socket_request($fp, $cmd);
+								$response = str_replace("\n", "", $response);
+							//send info to the log
+								echo "response: ".$response."\n";
+							//get the uuid
+								$uuid = str_replace("+OK ", "", $response);
+							//close event socket
+								fclose($fp);
+						}
+				}
 			}
 		}
 	}
 
 //send the email
 	if (strlen($fax_email) > 0 && file_exists($fax_file)) {
-		//prepare the message
-			$tmp_subject = (($fax_email_inbound_subject_tag != '') ? "[".$fax_email_inbound_subject_tag."]" : "Fax Received").": ".$fax_file_name;
 
-			$tmp_text_html = "<br><strong>Fax Received</strong><br><br>";
-			$tmp_text_html .= "Name: ".$fax_file_name."<br>";
-			$tmp_text_html .= "Extension: ".$fax_extension."<br>";
-			$tmp_text_html .= "Messages: ".$fax_messages."<br>";
-			$tmp_text_html .= $fax_file_warning."<br>";
-			if ($fax_relay == 'yes') {
-				$tmp_subject = "Fax Received for Relay: ".$fax_file_name;
-				$tmp_text_html .= "<br>This message arrived successfully from your fax machine, and has been queued for outbound fax delivery. You will be notified later as to the success or failure of this fax.<br>";
-			}
-			$tmp_text_plain = strip_tags(str_replace("<br>", "\n", $tmp_text_html));
+		//get the language code
+			$language_code = $_SESSION['domain']['language']['code'];
 
-		//prepare the mail object
-			$mail = new PHPMailer();
-			if (isset($smtp['method'])) {
-				switch($smtp['method']) {
-					case 'sendmail': $mail->IsSendmail(); break;
-					case 'qmail': $mail->IsQmail(); break;
-					case 'mail': $mail->IsMail(); break;
-					default: $mail->IsSMTP(); break;
-				}
+		//get the template subcategory
+			if ($fax_relay == 'true') {
+				$template_subcategory = 'relay';
 			}
 			else {
-				$mail->IsSMTP(); // set mailer to use SMTP
+				$template_subcategory = 'inbound';
 			}
 
-		//optionally skip certificate validation
-			if (isset($_SESSION['email']['smtp_validate_certificate'])) {
-				if ($_SESSION['email']['smtp_validate_certificate']['boolean'] == "false") {
-
-					// this works around TLS certificate problems e.g. self-signed certificates
-					$mail->SMTPOptions = array(
-						'ssl' => array(
-						'verify_peer' => false,
-						'verify_peer_name' => false,
-						'allow_self_signed' => true
-						)
-					);
+		//get the email template from the database
+			if (isset($fax_email) && strlen($fax_email) > 0) {
+				$sql = "select template_subject, template_body from v_email_templates ";
+				$sql .= "where (domain_uuid = :domain_uuid or domain_uuid is null) ";
+				$sql .= "and template_language = :template_language ";
+				$sql .= "and template_category = :template_category ";
+				$sql .= "and template_subcategory = :template_subcategory ";
+				$sql .= "and template_type = :template_type ";
+				$sql .= "and template_enabled = 'true' ";
+				$parameters['domain_uuid'] = $domain_uuid;
+				$parameters['template_language'] = $language_code;
+				$parameters['template_category'] = 'fax';
+				$parameters['template_subcategory'] = $template_subcategory;
+				$parameters['template_type'] = 'html';
+				$database = new database;
+				$row = $database->select($sql, $parameters, 'row');
+				if (is_array($row)) {
+					$email_subject = $row['template_subject'];
+					$email_body = $row['template_body'];
 				}
+				unset($sql, $parameters);
 			}
 
-			if ($smtp['auth'] == "true") {
-				$mail->SMTPAuth = $smtp['auth']; // turn on/off SMTP authentication
-			}
-			$mail->Host = $smtp['host'];
-			if (strlen($smtp['port']) > 0) {
-				$mail->Port = $smtp['port'];
-			}
-			if (strlen($smtp['secure']) > 0 && $smtp['secure'] != 'none') {
-				$mail->SMTPSecure = $smtp['secure'];
-			}
-			if ($smtp['username'] != '') {
-				$mail->Username = $smtp['username'];
-				$mail->Password = $smtp['password'];
-			}
-			$mail->SMTPDebug  = 2;
-			$mail->From = $smtp['from'];
-			$mail->FromName = $smtp['from_name'];
-			$mail->Subject = $tmp_subject;
-			$mail->AltBody = $tmp_text_plain;
-			$mail->MsgHTML($tmp_text_html);
+		//replace variables in email subject
+			$email_subject = str_replace('${domain_name}', $domain_name, $email_subject);
+			$email_subject = str_replace('${fax_file_name}', $fax_file_name, $email_subject);
+			$email_subject = str_replace('${fax_extension}', $fax_extension, $email_subject);
+			$email_subject = str_replace('${fax_messages}', $fax_messages, $email_subject);
+			$email_subject = str_replace('${fax_file_warning}', $fax_file_warning, $email_subject);
+			$email_subject = str_replace('${fax_subject_tag}', $fax_email_inbound_subject_tag, $email_subject);
 
-			$tmp_to = $fax_email;
-			$tmp_to = str_replace(";", ",", $tmp_to);
-			$tmp_to_array = explode(",", $tmp_to);
-			foreach($tmp_to_array as $tmp_to_row) {
-				if (strlen($tmp_to_row) > 0) {
-					echo "tmp_to_row: $tmp_to_row\n";
-					$mail->AddAddress(trim($tmp_to_row));
+		//replace variables in email body
+			$email_body = str_replace('${domain_name}', $domain_name, $email_body);
+			$email_body = str_replace('${fax_file_name}', $fax_file_name, $email_body);
+			$email_body = str_replace('${fax_extension}', $fax_extension, $email_body);
+			$email_body = str_replace('${fax_messages}', $fax_messages, $email_body);
+			$email_body = str_replace('${fax_file_warning}', $fax_file_warning, $email_body);
+			$email_body = str_replace('${fax_subject_tag}', $fax_email_inbound_subject_tag, $email_body);
+
+		//debug info
+			//echo "<hr />\n";
+			//echo "email_address ".$fax_email."<br />\n";
+			//echo "email_subject ".$email_subject."<br />\n";
+			//echo "email_body ".$email_body."<br />\n";
+			//echo "<hr />\n";
+
+		//send the email
+			if (isset($fax_email) && strlen($fax_email) > 0) {
+				//add the attachment
+				if (strlen($fax_file_name) > 0) {
+					$email_attachments[0]['type'] = 'file';
+					if ($pdf_file && file_exists($pdf_file)) {
+						$email_attachments[0]['name'] = $fax_file_name.'.pdf';
+						$email_attachments[0]['value'] = $pdf_file;
+					}
+					else {
+						$email_attachments[0]['name'] = $fax_file_name.'.tif';
+						$email_attachments[0]['value'] = $fax_file;
+					}
 				}
+
+				//$email_response = send_email($email_address, $email_subject, $email_body);
+				$email = new email;
+				$email->recipients = $fax_email;
+				$email->subject = $email_subject;
+				$email->body = $email_body;
+				$email->from_address = $email_from_address;
+				$email->from_name = $email_from_name;
+				$email->attachments = $email_attachments;
+				//$email->debug_level = 3;
+				$response = $mail->error;
+				$sent = $email->send();
 			}
 
 		//output to the log
-			echo "smtp_host: ".$smtp['host']."\n";
-			echo "smtp_from: ".$smtp['from']."\n";
-			echo "smtp_from_name: ".$smtp['from_name']."\n";
-			echo "tmp_subject: $tmp_subject\n";
-
-		//add the attachments
-			if (strlen($fax_file_name) > 0) {
-				if ($pdf_file && file_exists($pdf_file)) {
-					$mail->AddAttachment($pdf_file); // pdf attachment
-				}
-				else {
-					$mail->AddAttachment($fax_file); // tif attachment
-				}
-				//$filename='fax.tif'; $encoding = "base64"; $type = "image/tif";
-				//$mail->AddStringAttachment(base64_decode($strfax),$filename,$encoding,$type);
-			}
+			echo "email_from_address: ".$email_from_address."\n";
+			echo "email_from_name: ".$email_from_address."\n";
+			echo "email_subject: $email_subject\n";
 
 		//send the email
-			if (!$mail->Send()) {
-				echo "Mailer Error: " . $mail->ErrorInfo;
-				$email_status=$mail;
+			if ($sent) {
+				echo "Mailer Error";
+				$email_status='failed';
 			}
 			else {
 				echo "Message sent!";
-				$email_status="ok";
+				$email_status='ok';
 			}
 	}
 
@@ -707,7 +617,7 @@ if (!function_exists('fax_split_dtmf')) {
 	//        failed_fax_emails.sh - this is created when we have a email we need to re-send.  At the time it is created, an at job is created to execute it in 3 minutes time,
 	//            this allows us to try sending the email again at that time.  If the file exists but there is no at job this is because there are no longer any emails queued
 	//            as we have successfully sent them all.
-	if (strlen($fax_email) > 0 && file_exists($fax_file)) {
+	if ($_SESSION['fax_queue']['enabled']['boolean'] != 'true' && strlen($fax_email) > 0 && file_exists($fax_file)) {
 		if (stristr(PHP_OS, 'WIN')) {
 			//not compatible with windows
 		}
@@ -734,6 +644,7 @@ if (!function_exists('fax_split_dtmf')) {
 					$tmp_response = exec("chmod 777 ".$_SESSION['server']['temp']['dir']."/failed_fax_emails.sh");
 				//note we use batch in order to execute when system load is low.  Alternatively this could be replaced with AT.
 					$tmp_response = exec("at -f ".$_SESSION['server']['temp']['dir']."/failed_fax_emails.sh now + 3 minutes");
+				
 			}
 		}
 	}
diff --git a/secure/v_mailto.php b/secure/v_mailto.php
index ccaa2780c6..f2491bb906 100644
--- a/secure/v_mailto.php
+++ b/secure/v_mailto.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-2021
+	Portions created by the Initial Developer are Copyright (C) 2008-2022
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -80,292 +80,38 @@
 	//echo "Message: \n".$msg."\n";
 
 //includes
-	require_once('resources/pop3/mime_parser.php');
-	require_once('resources/pop3/rfc822_addresses.php');
-	if (file_exists($_SERVER["PROJECT_ROOT"]."/app/emails/email_transcription.php")) {
-		require_once($_SERVER["PROJECT_ROOT"]."/app/emails/email_transcription.php");
-	}
+	//require_once('resources/pop3/mime_parser.php');
+	//require_once('resources/pop3/rfc822_addresses.php');
+	//if (file_exists($_SERVER["PROJECT_ROOT"]."/app/emails/email_transcription.php")) {
+	//	require_once($_SERVER["PROJECT_ROOT"]."/app/emails/email_transcription.php");
+	//}
 
-//parse the email message
-	$mime = new mime_parser_class;
-	$mime->decode_bodies = 1;
-	$parameters = array(
-		//'File'=>$message_file,
+//parse the email
+	$email = new email;
+	$email->parse($msg);
+	$email->debug_level = 0;
+	$email->method = 'direct';
+	$headers = $email->headers;
+	$sent = $email->send();
 
-		// Read a message from a string instead of a file
-		'Data' => $msg,
-
-		// Save the message body parts to a directory
-		// 'SaveBody' => '/tmp',
-
-		// Do not retrieve or save message body parts
-		//   'SkipBody' => 1,
-	);
-	$success = $mime->Decode($parameters, $decoded);
-	unset($parameters);
-
-	if (!$success) {
-		echo "MIME message decoding error: ".HtmlSpecialChars($mime->error)."\n";
-	}
-	else {
-		//get the headers
-			//print_r($decoded[0]);
-			$headers = json_decode($decoded[0]["Headers"]["x-headers:"], true);
-			$subject = $decoded[0]["Headers"]["subject:"];
-			$from = $decoded[0]["Headers"]["from:"];
-			$reply_to = $decoded[0]["Headers"]["reply-to:"];
-			$to = $decoded[0]["Headers"]["to:"];
-			$date = $decoded[0]["Headers"]["date:"];
-
-		//get the body
-			$body = ''; //$parts_array["Parts"][0]["Headers"]["content-type:"];
-
-		//get the body
-			$body = '';
-			$content_type = $decoded[0]['Headers']['content-type:'];
-			if (substr($content_type, 0, 15) == "multipart/mixed" || substr($content_type, 0, 21) == "multipart/alternative") {
-				foreach ($decoded[0]["Parts"] as $row) {
-					$body_content_type = $row["Headers"]["content-type:"];
-					if (substr($body_content_type, 0, 9) == "text/html") { $body = $row["Body"]; }
-					if (substr($body_content_type, 0, 10) == "text/plain") { $body_plain = $row["Body"];  $body = $body_plain; }
-				}
-			}
-			else {
-				$content_type_array = explode(";", $content_type);
-				$body = $decoded[0]["Body"];
-				//if ($content_type_array[0] == "text/html" || $content_type_array[0] == "text/plain") {
-				//	$body = $row["Body"];
-				//}
-			}
-	}
-
-//prepare smtp server settings
-	//load default smtp settings
-	if ($_SESSION['email']['smtp_hostname']['text'] != '') { 
-		$smtp['hostname'] = $_SESSION['email']['smtp_hostname']['text'];
-	}
-	$smtp['host'] 		= (strlen($_SESSION['email']['smtp_host']['text'])?$_SESSION['email']['smtp_host']['text']:'127.0.0.1');
-	if (isset($_SESSION['email']['smtp_port'])) {
-		$smtp['port'] = (int) $_SESSION['email']['smtp_port']['numeric'];
-	}
-	else {
-		$smtp['port'] = 0;
-	}
-	$smtp['secure'] 	= $_SESSION['email']['smtp_secure']['text'];
-	$smtp['auth'] 		= $_SESSION['email']['smtp_auth']['text'];
-	$smtp['username'] 	= $_SESSION['email']['smtp_username']['text'];
-	$smtp['password'] 	= $_SESSION['email']['smtp_password']['text'];
-	$smtp['from'] 		= $_SESSION['email']['smtp_from']['text'];
-	$smtp['from_name'] 	= $_SESSION['email']['smtp_from_name']['text'];
-
-	if (isset($_SESSION['voicemail']['smtp_from']) && strlen($_SESSION['voicemail']['smtp_from']['text']) > 0) {
-		$smtp['from'] = $_SESSION['voicemail']['smtp_from']['text'];
-	}
-	if (isset($_SESSION['voicemail']['smtp_from_name']) && strlen($_SESSION['voicemail']['smtp_from_name']['text']) > 0) {
-		$smtp['from_name'] = $_SESSION['voicemail']['smtp_from_name']['text'];
-	}
-
-	//overwrite with domain-specific smtp server settings, if any
-	if (is_uuid($headers["X-FusionPBX-Domain-UUID"])) {
-		$sql = "select domain_setting_subcategory, domain_setting_value ";
-		$sql .= "from v_domain_settings ";
-		$sql .= "where domain_uuid = :domain_uuid ";
-		$sql .= "and (domain_setting_category = 'email' or domain_setting_category = 'voicemail') ";
-		$sql .= "and domain_setting_enabled = 'true' ";
-		$parameters['domain_uuid'] = $headers["X-FusionPBX-Domain-UUID"];
-		$database = new database;
-		$result = $database->select($sql, $parameters, 'all');
-		if (is_array($result) && @sizeof($result) != 0) {
-			foreach ($result as $row) {
-				if ($row['domain_setting_value'] != '') {
-					$smtp[str_replace('smtp_','',$row["domain_setting_subcategory"])] = $row['domain_setting_value'];
-				}
-			}
-		}
-		unset($sql, $parameters, $result, $row);
-	}
-	//value adjustments
-	$smtp['auth'] 		= ($smtp['auth'] == "true") ? true : false;
-	$smtp['password'] 	= ($smtp['password'] != '') ? $smtp['password'] : null;
-	$smtp['secure'] 	= ($smtp['secure'] != "none") ? $smtp['secure'] : null;
-	$smtp['username'] 	= ($smtp['username'] != '') ? $smtp['username'] : null;
+//debug information
+	/*
+	echo "<pre>\n";
+	echo "recipients ".print_r($email->recipients)."\n";
+	echo "recipients ".$email->recipients."\n";
+	echo "subject ".$email->subject."\n";
+	echo "body ".$email->body."\n";
+	echo "from_address ".$email->from_address."\n";
+	echo "from_name ".$email->from_name."\n";
+	echo "headers ".print_r($email->headers)."\n";
+	//echo "attachments ".print_r($email->attachments)."\n";
+	echo "</pre>\n";
+	exit;
+	*/
 
 //send the email
-	include_once "resources/phpmailer/class.phpmailer.php";
-	include_once "resources/phpmailer/class.smtp.php";
-
-//create the mail object
-	$mail = new PHPMailer();
-	if (isset($_SESSION['email']['method'])) {
-		switch ($_SESSION['email']['method']['text']) {
-			case 'sendmail': $mail->IsSendmail(); break;
-			case 'qmail': $mail->IsQmail(); break;
-			case 'mail': $mail->IsMail(); break;
-			default: $mail->IsSMTP(); break;
-		}
-	}
-	else {
-		$mail->IsSMTP();
-	}
-
-//optional bypass TLS certificate check e.g. for self-signed certificates
-	if (isset($_SESSION['email']['smtp_validate_certificate'])) {
-		if ($_SESSION['email']['smtp_validate_certificate']['boolean'] == "false") {
-			// this is needed to work around TLS certificate problems
-			$mail->SMTPOptions = array(
-				'ssl' => array(
-				'verify_peer' => false,
-				'verify_peer_name' => false,
-				'allow_self_signed' => true
-				)
-			);
-		}
-	}
-
-//smtp connection details
-	$mail->SMTPAuth = $smtp['auth'];
-	if (isset($smtp['hostname'])) { 
-		$mail->Hostname = $smtp['hostname'];
-	}
-	$mail->Host = $smtp['host'];
-	if ($smtp['port']!=0) $mail->Port=$smtp['port'];
-	if ($smtp['secure'] != '') {
-		$mail->SMTPSecure = $smtp['secure'];
-	}
-	if ($smtp['auth']) {
-		$mail->Username = $smtp['username'];
-		$mail->Password = $smtp['password'];
-	}
-	$mail->SMTPDebug  = 2;
-
-//add information to the log
-	if (sizeof($headers)>0) {
-		foreach ($headers as $header => $value) {
-			echo $header.": ".$value."\n";
-		}
-	}
-	echo "Subject: ".$subject."\n";
-	echo "From: ".$from."\n";
-	echo "Reply-to: ".$reply_to."\n";
-	echo "To: ".$to."\n";
-	echo "Date: ".$date."\n";
-	//echo "Body: ".$body."\n";
-
-//add to, from, fromname, custom headers and subject to the email
-	$mail->From = $smtp['from'] ;
-	$mail->FromName = $smtp['from_name'];
-	if (sizeof($headers)>0) {
-		foreach ($headers as $header => $value) {
-			$mail->addCustomHeader($header.": ".$value);
-		}
-	}
-	$mail->Subject = $subject;
-
-//add the reciepients
-	$to = trim($to, "<>");
-	$to = str_replace(" ", "", $to);
-	$to = str_replace(";", ",", $to);
-	$to_array = explode(",", $to);
-	if (count($to_array) == 1) {
-		$mail->AddAddress($to);
-	}
-	else {
-		foreach ($to_array as $to_row) {
-			if (strlen($to_row) > 0) {
-				echo "Add Address: $to_row\n";
-				if ($_SESSION['email']['address_type']['text'] == 'add_address') {
-					$mail->AddAddress(trim($to_row));
-				}
-				elseif ($_SESSION['email']['address_type']['text'] == 'add_bcc') {
-					$mail->AddBCC(trim($to_row));
-				}
-				else {
-					$mail->AddAddress(trim($to_row));
-				}
-			}
-		}
-	}
-
-//get the attachments and add to the email
-	if ($success) {
-		foreach ($decoded[0]["Parts"] as &$parts_array) {
-			$content_type = $parts_array["Parts"][0]["Headers"]["content-type:"];
-				//image/tiff;name="testfax.tif"
-				//text/plain; charset=ISO-8859-1; format=flowed
-			$content_transfer_encoding = $parts_array["Parts"][0]["Headers"]["content-transfer-encoding:"];
-				//base64
-				//7bit
-			$content_disposition = $parts_array["Parts"][0]["Headers"]["content-disposition"];
-				//inline;filename="testfax.tif"
-			$file = $parts_array["FileName"];
-				//testfax.tif
-			$filedisposition = $parts_array["FileDisposition"];
-				//inline
-			$bodypart = $parts_array["BodyPart"];
-			$bodylength = $parts_array["BodyLength"];
-
-			if (strlen($file) > 0) {
-				//get the file information
-					$file_ext = pathinfo($file, PATHINFO_EXTENSION);
-					$file_name = substr($file, 0, (strlen($file) - strlen($file_ext))-1 );
-					$encoding = "base64"; //base64_decode
-
-					switch ($file_ext){
-						case "wav":
-							$mime_type = "audio/x-wav";
-							break;
-						case "mp3":
-							$mime_type = "audio/x-mp3";
-							break;
-						case "pdf":
-							$mime_type = "application/pdf";
-							break;
-						case "tif":
-							$mime_type = "image/tiff";
-							break;
-						case "tiff":
-							$mime_type = "image/tiff";
-							break;
-						default:
-							$mime_type = "binary/octet-stream";
-							break;
-					}
-
-				//add an attachment
-					$mail->AddStringAttachment($parts_array["Body"],$file,$encoding,$mime_type);
-					if (function_exists('get_transcription')) {
-						$attachments_array = $mail->GetAttachments();
-						$transcription = get_transcription($attachments_array[0]);
-						echo "Transcription: " . $transcription;
-					}
-					else {
-						$transcription = '';
-					}
-			}
-		}
-	}
-
-//add the body to the email
-	$body_plain = remove_tags($body);
-	//echo "body_plain = $body_plain\n";
-	if ((substr($body, 0, 5) == "<html") || (substr($body, 0, 9) == "<!doctype")) {
-		$mail->ContentType = "text/html";
-		$mail->Body = $body."<br><br>".nl2br($transcription);
-		$mail->AltBody = $body_plain."\n\n$transcription";
-		$mail->isHTML(true);
-	}
-	else {
-		//$mail->Body = ($body != '') ? $body : $body_plain;
-		$mail->Body = $body_plain."\n\n$transcription";
-		$mail->AltBody = $body_plain."\n\n$transcription";
-		$mail->isHTML(false);
-	}
-	$mail->CharSet = "utf-8";
-
-//send the email
-	if (!$mail->Send()) {
-		$mailer_error = $mail->ErrorInfo;
-		echo "Mailer Error: ".$mailer_error."\n\n";
+	if (!$sent) {
+		echo "Mailer Error: ".$email_error."\n\n";
 
 		$call_uuid = $headers["X-FusionPBX-Call-UUID"];
 		if ($resend == true) {
@@ -380,9 +126,13 @@
 					if (is_uuid($call_uuid)) {
 						$array['email_logs'][0]['call_uuid'] = $call_uuid;
 					}
-					$array['email_logs'][0]['domain_uuid'] = $headers["X-FusionPBX-Domain-UUID"];
+					if (isset($headers["X-FusionPBX-Domain-UUID"])) {
+						$array['email_logs'][0]['domain_uuid'] = $headers["X-FusionPBX-Domain-UUID"];
+					}
 					$array['email_logs'][0]['sent_date'] = 'now()';
-					$array['email_logs'][0]['type'] = $headers["X-FusionPBX-Email-Type"];
+					if (isset($headers["X-FusionPBX-Email-Type"])) {
+						$array['email_logs'][0]['type'] = $headers["X-FusionPBX-Email-Type"];
+					}
 					$array['email_logs'][0]['status'] = 'failed';
 					$array['email_logs'][0]['email'] = str_replace("'", "''", $msg);
 
diff --git a/themes/default/app_config.php b/themes/default/app_config.php
index 64b6ba3d9d..09e8652d93 100644
--- a/themes/default/app_config.php
+++ b/themes/default/app_config.php
@@ -16,8 +16,8 @@
 		$apps[$x]['description']['de-de'] = "Standard Theme";
 		$apps[$x]['description']['es-cl'] = "";
 		$apps[$x]['description']['es-mx'] = "";
-		$apps[$x]['description']['fr-ca'] = "";
-		$apps[$x]['description']['fr-fr'] = "";
+		$apps[$x]['description']['fr-ca'] = "Thème par Défaut";
+		$apps[$x]['description']['fr-fr'] = "Thème par Défaut";
 		$apps[$x]['description']['he-il'] = "";
 		$apps[$x]['description']['it-it'] = "";
 		$apps[$x]['description']['nl-nl'] = "";
@@ -31,6 +31,14 @@
 
 	//default settings
 		$y=0;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "e46af53d-0dd7-4b2b-9806-f790a477f245";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "domain_visible";
+		$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_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the visibility of the name of the domain currently being managed.";
+		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "4c8df6ee-5858-40ee-b90f-b3b1d066a91c";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "background_color";
@@ -55,13 +63,29 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set a secondary background color, for a gradient effect.";
 		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "e46af53d-0dd7-4b2b-9806-f790a477f245";
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "18a0c698-738e-4d88-a592-115dde20730f";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "domain_visible";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "header_user_visible";
 		$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_enabled'] = "true";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the visibility of the name of the domain currently being managed.";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the visibility of the username currently logged in.";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "425427bb-ac21-4c8f-9ec3-ef8fecd78f8f";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "header_user_color_hover";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "#fd9c03";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the text hover color (and opacity) for header user name.";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "b999bb99-2224-48f0-8a61-38c4f75c9869";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "header_domain_color_hover";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "#fd9c03";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the text hover color (and opacity) for header domain name.";
 		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "4a92f422-934f-4ae9-b918-fa932cb1e089";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
@@ -1895,6 +1919,14 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the submenu indicator icon to use for the contract action (default: chevron-up).";
 		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "65398bd8-3a00-4c01-a632-53ef4f0ce5f9";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "menu_side_item_main_sub_close";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "automatic";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set how an open submenu closes when a different one is opened (default: automatic).";
+		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "97a620e1-d7b2-4550-8648-726c3029143d";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "action_bar_border_top";
diff --git a/themes/default/app_languages.php b/themes/default/app_languages.php
index 3997238652..db34ec5c79 100644
--- a/themes/default/app_languages.php
+++ b/themes/default/app_languages.php
@@ -102,8 +102,8 @@ $text['theme-button-close']['de-de'] = "Schließen";
 $text['theme-button-close']['el-gr'] = "Κλείσιμο";
 $text['theme-button-close']['es-cl'] = "Cerca";
 $text['theme-button-close']['es-mx'] = "Cerca"; //copied from es-cl
-$text['theme-button-close']['fr-ca'] = "Proche"; //copied from fr-fr
-$text['theme-button-close']['fr-fr'] = "Proche";
+$text['theme-button-close']['fr-ca'] = "Fermer";
+$text['theme-button-close']['fr-fr'] = "Fermer";
 $text['theme-button-close']['he-il'] = "";
 $text['theme-button-close']['it-it'] = "Chiudi";
 $text['theme-button-close']['nl-nl'] = "";
@@ -148,8 +148,8 @@ $text['theme-label-copyright']['de-de'] = "Urheberrecht";
 $text['theme-label-copyright']['el-gr'] = "Copyright";
 $text['theme-label-copyright']['es-cl'] = "";
 $text['theme-label-copyright']['es-mx'] = "";
-$text['theme-label-copyright']['fr-ca'] = "";
-$text['theme-label-copyright']['fr-fr'] = "";
+$text['theme-label-copyright']['fr-ca'] = "Droits D'Auteur";
+$text['theme-label-copyright']['fr-fr'] = "Droits D'Auteur";
 $text['theme-label-copyright']['he-il'] = "";
 $text['theme-label-copyright']['it-it'] = "Copyright";
 $text['theme-label-copyright']['nl-nl'] = "";
@@ -171,8 +171,8 @@ $text['theme-label-all_rights_reserved']['de-de'] = "Alle Rechte vorbehalten";
 $text['theme-label-all_rights_reserved']['el-gr'] = "All rights reserved.";
 $text['theme-label-all_rights_reserved']['es-cl'] = "";
 $text['theme-label-all_rights_reserved']['es-mx'] = "";
-$text['theme-label-all_rights_reserved']['fr-ca'] = "";
-$text['theme-label-all_rights_reserved']['fr-fr'] = "";
+$text['theme-label-all_rights_reserved']['fr-ca'] = "Tous les droits réservés";
+$text['theme-label-all_rights_reserved']['fr-fr'] = "Tous les droits réservés";
 $text['theme-label-all_rights_reserved']['he-il'] = "";
 $text['theme-label-all_rights_reserved']['it-it'] = "Tutti i diritti riservati.";
 $text['theme-label-all_rights_reserved']['nl-nl'] = "";
@@ -240,8 +240,8 @@ $text['theme-label-expand_menu']['de-de'] = "Expand Menu";
 $text['theme-label-expand_menu']['el-gr'] = "Expand Menu";
 $text['theme-label-expand_menu']['es-cl'] = "Expand Menu";
 $text['theme-label-expand_menu']['es-mx'] = "Expand Menu";
-$text['theme-label-expand_menu']['fr-ca'] = "Expand Menu";
-$text['theme-label-expand_menu']['fr-fr'] = "Expand Menu";
+$text['theme-label-expand_menu']['fr-ca'] = "Étendre le Menu";
+$text['theme-label-expand_menu']['fr-fr'] = "Étendre le Menu";
 $text['theme-label-expand_menu']['he-il'] = "Expand Menu";
 $text['theme-label-expand_menu']['it-it'] = "Expand Menu";
 $text['theme-label-expand_menu']['nl-nl'] = "Expand Menu";
@@ -263,8 +263,8 @@ $text['theme-label-contract_menu']['de-de'] = "Contract Menu";
 $text['theme-label-contract_menu']['el-gr'] = "Contract Menu";
 $text['theme-label-contract_menu']['es-cl'] = "Contract Menu";
 $text['theme-label-contract_menu']['es-mx'] = "Contract Menu";
-$text['theme-label-contract_menu']['fr-ca'] = "Contract Menu";
-$text['theme-label-contract_menu']['fr-fr'] = "Contract Menu";
+$text['theme-label-contract_menu']['fr-ca'] = "Contracter Menu";
+$text['theme-label-contract_menu']['fr-fr'] = "Contracter Menu";
 $text['theme-label-contract_menu']['he-il'] = "Contract Menu";
 $text['theme-label-contract_menu']['it-it'] = "Contract Menu";
 $text['theme-label-contract_menu']['nl-nl'] = "Contract Menu";
@@ -286,8 +286,8 @@ $text['theme-label-pin_menu']['de-de'] = "Pin Menu";
 $text['theme-label-pin_menu']['el-gr'] = "Pin Menu";
 $text['theme-label-pin_menu']['es-cl'] = "Pin Menu";
 $text['theme-label-pin_menu']['es-mx'] = "Pin Menu";
-$text['theme-label-pin_menu']['fr-ca'] = "Pin Menu";
-$text['theme-label-pin_menu']['fr-fr'] = "Pin Menu";
+$text['theme-label-pin_menu']['fr-ca'] = "Épingler Menu";
+$text['theme-label-pin_menu']['fr-fr'] = "Épingler Menu";
 $text['theme-label-pin_menu']['he-il'] = "Pin Menu";
 $text['theme-label-pin_menu']['it-it'] = "Pin Menu";
 $text['theme-label-pin_menu']['nl-nl'] = "Pin Menu";
@@ -309,8 +309,8 @@ $text['theme-label-unpin_menu']['de-de'] = "Unpin Menu";
 $text['theme-label-unpin_menu']['el-gr'] = "Unpin Menu";
 $text['theme-label-unpin_menu']['es-cl'] = "Unpin Menu";
 $text['theme-label-unpin_menu']['es-mx'] = "Unpin Menu";
-$text['theme-label-unpin_menu']['fr-ca'] = "Unpin Menu";
-$text['theme-label-unpin_menu']['fr-fr'] = "Unpin Menu";
+$text['theme-label-unpin_menu']['fr-ca'] = "Désépingler Menu";
+$text['theme-label-unpin_menu']['fr-fr'] = "Désépingler Menu";
 $text['theme-label-unpin_menu']['he-il'] = "Unpin Menu";
 $text['theme-label-unpin_menu']['it-it'] = "Unpin Menu";
 $text['theme-label-unpin_menu']['nl-nl'] = "Unpin Menu";
@@ -332,8 +332,8 @@ $text['theme-message-menu_expanded']['de-de'] = "Menu Pinned";
 $text['theme-message-menu_expanded']['el-gr'] = "Menu Pinned";
 $text['theme-message-menu_expanded']['es-cl'] = "Menu Pinned";
 $text['theme-message-menu_expanded']['es-mx'] = "Menu Pinned";
-$text['theme-message-menu_expanded']['fr-ca'] = "Menu Pinned";
-$text['theme-message-menu_expanded']['fr-fr'] = "Menu Pinned";
+$text['theme-message-menu_expanded']['fr-ca'] = "Menu Épinglé";
+$text['theme-message-menu_expanded']['fr-fr'] = "Menu Épinglé";
 $text['theme-message-menu_expanded']['he-il'] = "Menu Pinned";
 $text['theme-message-menu_expanded']['it-it'] = "Menu Pinned";
 $text['theme-message-menu_expanded']['nl-nl'] = "Menu Pinned";
@@ -355,8 +355,8 @@ $text['theme-message-menu_contracted']['de-de'] = "Menu Unpinned";
 $text['theme-message-menu_contracted']['el-gr'] = "Menu Unpinned";
 $text['theme-message-menu_contracted']['es-cl'] = "Menu Unpinned";
 $text['theme-message-menu_contracted']['es-mx'] = "Menu Unpinned";
-$text['theme-message-menu_contracted']['fr-ca'] = "Menu Unpinned";
-$text['theme-message-menu_contracted']['fr-fr'] = "Menu Unpinned";
+$text['theme-message-menu_contracted']['fr-ca'] = "Menu Désépinglé";
+$text['theme-message-menu_contracted']['fr-fr'] = "Menu Désépinglé";
 $text['theme-message-menu_contracted']['he-il'] = "Menu Unpinned";
 $text['theme-message-menu_contracted']['it-it'] = "Menu Unpinned";
 $text['theme-message-menu_contracted']['nl-nl'] = "Menu Unpinned";
@@ -378,8 +378,8 @@ $text['theme-message-menu_reset']['de-de'] = "Menu State Reset";
 $text['theme-message-menu_reset']['el-gr'] = "Menu State Reset";
 $text['theme-message-menu_reset']['es-cl'] = "Menu State Reset";
 $text['theme-message-menu_reset']['es-mx'] = "Menu State Reset";
-$text['theme-message-menu_reset']['fr-ca'] = "Menu State Reset";
-$text['theme-message-menu_reset']['fr-fr'] = "Menu State Reset";
+$text['theme-message-menu_reset']['fr-ca'] = "Réinitialisation de l'État du Menu";
+$text['theme-message-menu_reset']['fr-fr'] = "Réinitialisation de l'État du Menu";
 $text['theme-message-menu_reset']['he-il'] = "Menu State Reset";
 $text['theme-message-menu_reset']['it-it'] = "Menu State Reset";
 $text['theme-message-menu_reset']['nl-nl'] = "Menu State Reset";
@@ -392,4 +392,4 @@ $text['theme-message-menu_reset']['sv-se'] = "Menu State Reset";
 $text['theme-message-menu_reset']['uk-ua'] = "Menu State Reset";
 $text['theme-message-menu_reset']['tr-tr'] = "Menu State Reset";
 
-?>
\ No newline at end of file
+?>
diff --git a/themes/default/css.php b/themes/default/css.php
index 586fc87fa3..89337cbe6c 100644
--- a/themes/default/css.php
+++ b/themes/default/css.php
@@ -391,26 +391,38 @@ header('Expires: '.gmdate('D, d M Y H:i:s',time()+3600).' GMT');
 		opacity: 0.30;
 		}
 
-	/* domain name/selector */
-	a.domain_selector_domain {
-		color: <?php echo ($_SESSION['theme']['domain_color']['text'] != '') ? $_SESSION['theme']['domain_color']['text'] : 'rgba(255,255,255,0.8)'; ?>;
+	/* header domain/user name */
+	ul.navbar-nav > li.nav-item > a.header_user,
+	ul.navbar-nav > li.nav-item > a.header_domain {
+		font-family: <?php echo ($_SESSION['theme']['menu_main_text_font']['text'] != '') ? $_SESSION['theme']['menu_main_text_font']['text'] : 'arial'; ?>;
+		font-size: <?php echo ($_SESSION['theme']['menu_main_text_size']['text'] != '') ? $_SESSION['theme']['menu_main_text_size']['text'] : '10.25pt'; ?>;
+		color: <?php echo ($_SESSION['theme']['menu_main_text_color']['text'] != '') ? $_SESSION['theme']['menu_main_text_color']['text'] : '#fff'; ?>;
+		padding: 10px;
 		}
 
-	a.domain_selector_domain:hover,
-	a.domain_selector_domain:focus,
-	a.domain_selector_domain:active {
-		color: <?php echo ($_SESSION['theme']['domain_color_hover']['text'] != '') ? $_SESSION['theme']['domain_color_hover']['text'] : 'rgba(255,255,255,1.0)'; ?>;
+	ul.navbar-nav > li.nav-item:hover > a.header_user,
+	ul.navbar-nav > li.nav-item:focus > a.header_user,
+	ul.navbar-nav > li.nav-item:active > a.header_user {
+		color: <?php echo ($_SESSION['theme']['header_user_color_hover']['text'] != '') ? $_SESSION['theme']['header_user_color_hover']['text'] : '#1892E6'; ?>;
+		}
+
+	ul.navbar-nav > li.nav-item:hover > a.header_domain,
+	ul.navbar-nav > li.nav-item:focus > a.header_domain,
+	ul.navbar-nav > li.nav-item:active > a.header_domain {
+		color: <?php echo ($_SESSION['theme']['header_domain_color_hover']['text'] != '') ? $_SESSION['theme']['header_domain_color_hover']['text'] : '#1892E6'; ?>;
 		}
 
 	/* logout icon */
 	a.logout_icon {
 		color: <?php echo ($_SESSION['theme']['logout_icon_color']['text'] != '') ? $_SESSION['theme']['logout_icon_color']['text'] : 'rgba(255,255,255,0.8)'; ?>;
+		padding: 14px 10px;
 		}
 
 	a.logout_icon:hover,
 	a.logout_icon:focus,
 	a.logout_icon:active {
 		color: <?php echo ($_SESSION['theme']['logout_icon_color_hover']['text'] != '') ? $_SESSION['theme']['logout_icon_color_hover']['text'] : 'rgba(255,255,255,1.0)'; ?>;
+		background: <?php echo ($_SESSION['theme']['menu_main_background_color_hover']['text'] != '') ? $_SESSION['theme']['menu_main_background_color_hover']['text'] : '#fd9c03'; ?>
 		}
 
 	a#header_logout_icon {
@@ -1947,12 +1959,12 @@ header('Expires: '.gmdate('D, d M Y H:i:s',time()+3600).' GMT');
 		-moz-border-radius: 5px;
 		-webkit-border-radius: 5px;
 		border-radius: 5px;
-		-webkit-box-shadow: 0 0 3px #e5e9f0;
-		-moz-box-shadow: 0 0 3px #e5e9f0;
-		box-shadow: 0 0 3px #e5e9f0;
+		-webkit-box-shadow: 0 0 3px <?php echo $_SESSION['theme']['form_table_field_background_color']['text']; ?>;
+		-moz-box-shadow: 0 0 3px <?php echo $_SESSION['theme']['form_table_field_background_color']['text']; ?>;
+		box-shadow: 0 0 3px <?php echo $_SESSION['theme']['form_table_field_background_color']['text']; ?>;
 		border-width: 1px 3px;
-		border-color: #b9c5d8 #c5d1e5;
-		background-color: #e5eaf5;
+		border-color: <?php echo $_SESSION['theme']['operator_panel_border_color']['text']; ?>;
+		background-color: <?php echo $_SESSION['theme']['form_table_label_background_color']['text']; ?>;
 		cursor: default;
 		}
 
@@ -1966,13 +1978,14 @@ header('Expires: '.gmdate('D, d M Y H:i:s',time()+3600).' GMT');
 		-moz-border-radius: 5px;
 		-webkit-border-radius: 5px;
 		border-radius: 5px;
-		-webkit-box-shadow: 0 0 3px #e5e9f0;
-		-moz-box-shadow: 0 0 3px #e5e9f0;
-		box-shadow: 0 0 3px #e5e9f0;
+		-webkit-box-shadow: 0 0 3px <?php echo $_SESSION['theme']['form_table_field_background_color']['text']; ?>;
+		-moz-box-shadow: 0 0 3px <?php echo $_SESSION['theme']['form_table_field_background_color']['text']; ?>;
+		box-shadow: 0 0 3px <?php echo $_SESSION['theme']['form_table_field_background_color']['text']; ?>;
 		border-width: 1px 3px;
-		border-color: #b9c5d8 #c5d1e5;
-		background-color: #e5eaf5;
+		border-color: <?php echo $_SESSION['theme']['operator_panel_border_color']['text']; ?>;
+		background-color: <?php echo $_SESSION['theme']['form_table_label_background_color']['text']; ?>;
 		cursor: not-allowed;
+		opacity: 0.5;
 		}
 		
 		div.off_ext:after {
@@ -1987,7 +2000,8 @@ header('Expires: '.gmdate('D, d M Y H:i:s',time()+3600).' GMT');
 			top: 0;
 			left: 0;
 			right: 0;
-			background: rgba(255, 255, 255, 0.5);
+			background: <?php echo $_SESSION['theme']['form_table_field_background_color']['text']; ?>;
+			opacity: 0.5;
 		}
 
 	div.op_state_active {
@@ -2008,7 +2022,7 @@ header('Expires: '.gmdate('D, d M Y H:i:s',time()+3600).' GMT');
 		-moz-border-radius: 5px;
 		-webkit-border-radius: 5px;
 		border-radius: 5px;
-		background-color: #e5eaf5;
+		background-color: <?php echo $_SESSION['theme']['operator_panel_sub_background_color']['text']; ?>;
 		-moz-border-radius: 5px;
 		-webkit-border-radius: 5px;
 		border-radius: 5px;
@@ -2039,7 +2053,7 @@ header('Expires: '.gmdate('D, d M Y H:i:s',time()+3600).' GMT');
 		-moz-border-radius: 5px;
 		-webkit-border-radius: 5px;
 		border-radius: 5px;
-		background-color: #f0f2f6;
+		background-color: <?php echo $_SESSION['theme']['operator_panel_main_background_color']['text']; ?>;
 		}
 
 	td.op_state_ringing {
@@ -2282,6 +2296,7 @@ header('Expires: '.gmdate('D, d M Y H:i:s',time()+3600).' GMT');
 		*/
 		padding-top: 3px;
 		padding-bottom: 15px;
+		overflow-y: auto;
 		}
 
 	@media(min-width: 0px) and (max-width: 1199px) {
diff --git a/themes/default/template.php b/themes/default/template.php
index edaf4960e7..a44583b113 100644
--- a/themes/default/template.php
+++ b/themes/default/template.php
@@ -213,9 +213,15 @@
 					$('#sub_arrow_'+item_id).toggleClass(['fa-{/literal}{$settings.theme.menu_side_item_main_sub_icon_contract}{literal}','fa-{/literal}{$settings.theme.menu_side_item_main_sub_icon_expand}{literal}']);
 					$('.sub_arrows').not('#sub_arrow_'+item_id).removeClass('fa-{/literal}{$settings.theme.menu_side_item_main_sub_icon_contract}{literal}').addClass('fa-{/literal}{$settings.theme.menu_side_item_main_sub_icon_expand}{literal}');
 					$('#sub_'+item_id).slideToggle(180, function() {
-						if (!$(this).is(':hidden')) {
-							$('.menu_side_sub').not($(this)).slideUp(180);
-						}
+						{/literal}
+						{if $settings.theme.menu_side_item_main_sub_close != 'manual'}
+							{literal}
+							if (!$(this).is(':hidden')) {
+								$('.menu_side_sub').not($(this)).slideUp(180);
+							}
+							{/literal}
+						{/if}
+						{literal}
 					});
 				}