diff --git a/app/extensions/app_languages.php b/app/extensions/app_languages.php
index 29bf78049a..6e8b92ffa3 100644
--- a/app/extensions/app_languages.php
+++ b/app/extensions/app_languages.php
@@ -2557,6 +2557,27 @@ $text['description-emergency_caller_id_number']['ru-ru'] = "Введите ид
 $text['description-emergency_caller_id_number']['sv-se'] = "Ange nummer som skall visas vid nödsamtal.";
 $text['description-emergency_caller_id_number']['uk-ua'] = "";
 
+$text['description-emergency_caller_id_number-select']['en-us'] = "Select the emergency caller ID number.";
+$text['description-emergency_caller_id_number-select']['en-gb'] = "Select the emergency caller ID number.";
+$text['description-emergency_caller_id_number-select']['ar-eg'] = "";
+$text['description-emergency_caller_id_number-select']['de-at'] = "Wählen Sie die Anruferkennung (Nummer) für Notrufe."; //copied from de-de
+$text['description-emergency_caller_id_number-select']['de-ch'] = "Wählen Sie die Anruferkennung (Nummer) für Notrufe."; //copied from de-de
+$text['description-emergency_caller_id_number-select']['de-de'] = "Wählen Sie die Anruferkennung (Nummer) für Notrufe.";
+$text['description-emergency_caller_id_number-select']['es-cl'] = "Seleccione el número de Caller ID de emergencia.";
+$text['description-emergency_caller_id_number-select']['es-mx'] = "Seleccione el número de Caller ID de emergencia."; //copied from es-cl
+$text['description-emergency_caller_id_number-select']['fr-ca'] = "Choisir le numéro d'identification de l'appelant pour les urgences."; //copied from fr-fr
+$text['description-emergency_caller_id_number-select']['fr-fr'] = "Choisir le numéro d'identification de l'appelant pour les urgences.";
+$text['description-emergency_caller_id_number-select']['he-il'] = "";
+$text['description-emergency_caller_id_number-select']['it-it'] = "Inserisci l'ID Numero Chiamante di emergenza.";
+$text['description-emergency_caller_id_number-select']['nl-nl'] = "Voor de noodoproep CID hier.";
+$text['description-emergency_caller_id_number-select']['pl-pl'] = "Wybierz prezentację numeru dzwoniącego (emergency)";
+$text['description-emergency_caller_id_number-select']['pt-br'] = "Escolha o número ID de emergência do chamador.";
+$text['description-emergency_caller_id_number-select']['pt-pt'] = "Escolha o número de emergência do chamador.";
+$text['description-emergency_caller_id_number-select']['ro-ro'] = "";
+$text['description-emergency_caller_id_number-select']['ru-ru'] = "Введите идентификтор (caller ID) номера при экстренном вызове.";
+$text['description-emergency_caller_id_number-select']['sv-se'] = "Ange nummer som skall visas vid nödsamtal.";
+$text['description-emergency_caller_id_number-select']['uk-ua'] = "";
+
 $text['description-emergency_caller_id_name']['en-us'] = "Enter the emergency caller ID name here.";
 $text['description-emergency_caller_id_name']['en-gb'] = "Enter the emergency caller ID name here.";
 $text['description-emergency_caller_id_name']['ar-eg'] = "";
@@ -2578,6 +2599,27 @@ $text['description-emergency_caller_id_name']['ru-ru'] = "Введите иде
 $text['description-emergency_caller_id_name']['sv-se'] = "Ange namn som skall visas vid nödsamtal.";
 $text['description-emergency_caller_id_name']['uk-ua'] = "";
 
+$text['description-emergency_caller_id_name-select']['en-us'] = "Select the emergency caller ID name.";
+$text['description-emergency_caller_id_name-select']['en-gb'] = "Select the emergency caller ID name.";
+$text['description-emergency_caller_id_name-select']['ar-eg'] = "";
+$text['description-emergency_caller_id_name-select']['de-at'] = "Wählen Sie die Anruferkennung (Name) für Notrufe."; //copied from de-de
+$text['description-emergency_caller_id_name-select']['de-ch'] = "Wählen Sie die Anruferkennung (Name) für Notrufe."; //copied from de-de
+$text['description-emergency_caller_id_name-select']['de-de'] = "Wählen Sie die Anruferkennung (Name) für Notrufe.";
+$text['description-emergency_caller_id_name-select']['es-cl'] = "Seleccione el nombre de Caller ID de emergencia.";
+$text['description-emergency_caller_id_name-select']['es-mx'] = "Seleccione el nombre de Caller ID de emergencia."; //copied from es-cl
+$text['description-emergency_caller_id_name-select']['fr-ca'] = "Choisir le nom d'identification de l'appelant pour les urgences."; //copied from fr-fr
+$text['description-emergency_caller_id_name-select']['fr-fr'] = "Choisir le nom d'identification de l'appelant pour les urgences.";
+$text['description-emergency_caller_id_name-select']['he-il'] = "";
+$text['description-emergency_caller_id_name-select']['it-it'] = "Inserire l'ID Nome Chiamante di emergenza.";
+$text['description-emergency_caller_id_name-select']['nl-nl'] = "Voer noodoproep CID naam hier.";
+$text['description-emergency_caller_id_name-select']['pl-pl'] = "Wprowadź prezentację nazwy dzwoniącego (emergency)";
+$text['description-emergency_caller_id_name-select']['pt-br'] = "Escolha o nome ID de emergência do chamador.";
+$text['description-emergency_caller_id_name-select']['pt-pt'] = "Escolha o nome de emergência do chamador.";
+$text['description-emergency_caller_id_name-select']['ro-ro'] = "";
+$text['description-emergency_caller_id_name-select']['ru-ru'] = "Введите идентификтор (caller ID) Имени при экстренном вызове.";
+$text['description-emergency_caller_id_name-select']['sv-se'] = "Ange namn som skall visas vid nödsamtal.";
+$text['description-emergency_caller_id_name-select']['uk-ua'] = "";
+
 $text['description-effective_caller_id_number']['en-us'] = "Enter the internal caller ID number here.";
 $text['description-effective_caller_id_number']['en-gb'] = "Enter the internal caller ID number here.";
 $text['description-effective_caller_id_number']['ar-eg'] = "";
diff --git a/app/extensions/extension_edit.php b/app/extensions/extension_edit.php
index 8ea3ddff00..0ce914f317 100644
--- a/app/extensions/extension_edit.php
+++ b/app/extensions/extension_edit.php
@@ -17,7 +17,8 @@
 
 	The Initial Developer of the Original Code is
 	Mark J Crane <markjcrane@fusionpbx.com>
-	Copyright (C) 2008-2019 All Rights Reserved.
+	Portions created by the Initial Developer are Copyright (C) 2008-2020
+	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
 	Mark J Crane <markjcrane@fusionpbx.com>
@@ -25,7 +26,7 @@
 */
 
 //includes
-	include "root.php";
+	require_once "root.php";
 	require_once "resources/require.php";
 	require_once "resources/check_auth.php";
 
@@ -1274,7 +1275,7 @@
 		if (permission_exists('outbound_caller_id_select')) {
 			if (count($destinations) > 0) {
 				echo "	<select name='emergency_caller_id_name' id='emergency_caller_id_name' class='formfld'>\n";
-				echo "	<option value=''></option>\n";
+				echo "		<option value=''></option>\n";
 				foreach ($destinations as &$row) {
 					$tmp = $row["destination_caller_id_name"];
 					if(strlen($tmp) == 0){
@@ -1289,19 +1290,22 @@
 						}
 					}
 				}
-				echo "		</select>\n";
-				echo "<br />\n";
-				echo $text['description-outbound_caller_id_name-select']."\n";
+				echo "	</select>\n";
 			}
 			else {
 				echo "	<input type=\"button\" class=\"btn\" name=\"\" alt=\"".$text['button-add']."\" onclick=\"window.location='".PROJECT_PATH."/app/destinations/destinations.php'\" value='".$text['button-add']."'>\n";
 			}
 		}
 		else {
-			echo "    <input class='formfld' type='text' name='emergency_caller_id_name' maxlength='255' value=\"".escape($emergency_caller_id_name)."\">\n";
+			echo "	<input class='formfld' type='text' name='emergency_caller_id_name' maxlength='255' value=\"".escape($emergency_caller_id_name)."\">\n";
 		}
 		echo "<br />\n";
-		echo $text['description-emergency_caller_id_name']."\n";
+		if (permission_exists('outbound_caller_id_select') && count($destinations) > 0) {
+			echo $text['description-emergency_caller_id_name-select']."\n";
+		}
+		else {
+			echo $text['description-emergency_caller_id_name']."\n";
+		}
 		echo "</td>\n";
 		echo "</tr>\n";
 	}
@@ -1331,8 +1335,6 @@
 					}
 				}
 				echo "		</select>\n";
-				echo "<br />\n";
-				echo $text['description-outbound_caller_id_name-select']."\n";
 			}
 			else {
 				echo "	<input type=\"button\" class=\"btn\" name=\"\" alt=\"".$text['button-add']."\" onclick=\"window.location='".PROJECT_PATH."/app/destinations/destinations.php'\" value='".$text['button-add']."'>\n";
@@ -1342,7 +1344,12 @@
 			echo "    <input class='formfld' type='text' name='emergency_caller_id_number' maxlength='255' min='0' step='1' value=\"".escape($emergency_caller_id_number)."\">\n";
 		}
 		echo "<br />\n";
-		echo $text['description-emergency_caller_id_number']."\n";
+		if (permission_exists('outbound_caller_id_select') && count($destinations) > 0) {
+			echo $text['description-emergency_caller_id_number-select']."\n";
+		}
+		else {
+			echo $text['description-emergency_caller_id_number']."\n";
+		}
 		echo "</td>\n";
 		echo "</tr>\n";
 	}