diff --git a/app/extensions/app_config.php b/app/extensions/app_config.php
index 8d83b9e9ef..2056b97d64 100644
--- a/app/extensions/app_config.php
+++ b/app/extensions/app_config.php
@@ -170,6 +170,10 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "emergency_caller_id_name";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
+		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "emergency_caller_id_number";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
diff --git a/app/extensions/app_languages.php b/app/extensions/app_languages.php
index 216554c7f5..0645dbbc2c 100644
--- a/app/extensions/app_languages.php
+++ b/app/extensions/app_languages.php
@@ -160,6 +160,16 @@
 	$text['description-outbound_caller_id_number-custom']['pt-pt'] = "Introduza o número externo (público) do chamador aqui.";
 	$text['description-outbound_caller_id_number-custom']['fr-fr'] = "Numéro d'appelant affiché pour les appels externes (public).";
 
+	$text['label-emergency_caller_id_name']['en-us'] = "Emergency Caller ID Name";
+	$text['label-emergency_caller_id_name']['es-cl'] = "Nombre de Caller ID de emergencia";
+	$text['label-emergency_caller_id_name']['pt-pt'] = "Nome de Emergência do Chamador";
+	$text['label-emergency_caller_id_name']['fr-fr'] = "Nom d'appelant pour les Urgences";
+
+	$text['description-emergency_caller_id_number']['en-us'] = "Enter the emergency caller ID name here.";
+	$text['description-emergency_caller_id_number']['es-cl'] = "Ingrese el nombre de Caller ID de emergencia aquí.";
+	$text['description-emergency_caller_id_number']['pt-pt'] = "Introduza o nome de emergência do chamador aqui.";
+	$text['description-emergency_caller_id_number']['fr-fr'] = "Entrez le nom d'identification de l'appelant d'urgence ici.";
+
 	$text['label-emergency_caller_id_number']['en-us'] = "Emergency Caller ID Number";
 	$text['label-emergency_caller_id_number']['es-cl'] = "Número de Caller ID de emergencia";
 	$text['label-emergency_caller_id_number']['pt-pt'] = "Número de Emergência do Chamador";
@@ -168,7 +178,7 @@
 	$text['description-emergency_caller_id_number']['en-us'] = "Enter the emergency caller ID number here.";
 	$text['description-emergency_caller_id_number']['es-cl'] = "Ingrese el número de Caller ID de emergencia aquí.";
 	$text['description-emergency_caller_id_number']['pt-pt'] = "Introduza o número de emergência do chamador aqui.";
-	$text['description-emergency_caller_id_number']['fr-fr'] = "";
+	$text['description-emergency_caller_id_number']['fr-fr'] = "Entrez le numéro d'identification de l'appelant d'urgence ici.";
 
 	$text['label-directory_full_name']['en-us'] = "Directory Full Name";
 	$text['label-directory_full_name']['es-cl'] = "Nombre Completo de Directorio";
diff --git a/app/extensions/extension_edit.php b/app/extensions/extension_edit.php
index f683e34b6b..09700b00df 100644
--- a/app/extensions/extension_edit.php
+++ b/app/extensions/extension_edit.php
@@ -61,6 +61,7 @@ else {
 			$effective_caller_id_number = check_str($_POST["effective_caller_id_number"]);
 			$outbound_caller_id_name = check_str($_POST["outbound_caller_id_name"]);
 			$outbound_caller_id_number = check_str($_POST["outbound_caller_id_number"]);
+			$emergency_caller_id_name = check_str($_POST["emergency_caller_id_name"]);
 			$emergency_caller_id_number = check_str($_POST["emergency_caller_id_number"]);
 			$directory_full_name = check_str($_POST["directory_full_name"]);
 			$directory_visible = check_str($_POST["directory_visible"]);
@@ -267,6 +268,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 		//if (strlen($effective_caller_id_name) == 0) { $msg .= $text['message-required']."Effective Caller ID Name<br>\n"; }
 		//if (strlen($effective_caller_id_number) == 0) { $msg .= $text['message-required']."Effective Caller ID Number<br>\n"; }
 		//if (strlen($outbound_caller_id_name) == 0) { $msg .= $text['message-required']."Outbound Caller ID Name<br>\n"; }
+		//if (strlen($emergency_caller_id_name) == 0) { $msg .= $text['message-required']."Emergency Caller ID Name<br>\n"; }
 		//if (strlen($outbound_caller_id_number) == 0) { $msg .= $text['message-required']."Outbound Caller ID Number<br>\n"; }
 		//if (strlen($emergency_caller_id_number) == 0) { $msg .= $text['message-required']."Emergency Caller ID Number<br>\n"; }
 		//if (strlen($directory_full_name) == 0) { $msg .= $text['message-required']."Directory Full Name<br>\n"; }
@@ -359,6 +361,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 							$sql .= "effective_caller_id_number, ";
 							$sql .= "outbound_caller_id_name, ";
 							$sql .= "outbound_caller_id_number, ";
+							$sql .= "emergency_caller_id_name, ";
 							$sql .= "emergency_caller_id_number, ";
 							$sql .= "directory_full_name, ";
 							$sql .= "directory_visible, ";
@@ -409,6 +412,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 							$sql .= "'$effective_caller_id_number', ";
 							$sql .= "'$outbound_caller_id_name', ";
 							$sql .= "'$outbound_caller_id_number', ";
+							$sql .= "'$emergency_caller_id_name', ";
 							$sql .= "'$emergency_caller_id_number', ";
 							$sql .= "'$directory_full_name', ";
 							$sql .= "'$directory_visible', ";
@@ -511,6 +515,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 					$sql .= "effective_caller_id_number = '$effective_caller_id_number', ";
 					$sql .= "outbound_caller_id_name = '$outbound_caller_id_name', ";
 					$sql .= "outbound_caller_id_number = '$outbound_caller_id_number', ";
+					$sql .= "emergency_caller_id_name = '$emergency_caller_id_name', ";
 					$sql .= "emergency_caller_id_number = '$emergency_caller_id_number', ";
 					$sql .= "directory_full_name = '$directory_full_name', ";
 					$sql .= "directory_visible = '$directory_visible', ";
@@ -1076,6 +1081,17 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</td>\n";
 	echo "</tr>\n";
 
+	echo "<tr>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "    ".$text['label-emergency_caller_id_name'].":\n";
+	echo "</td>\n";
+	echo "<td class='vtable' align='left'>\n";
+	echo "    <input class='formfld' type='text' name='emergency_caller_id_name' maxlength='255' value=\"$emergency_caller_id_name\">\n";
+	echo "<br />\n";
+	echo $text['description-emergency_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-emergency_caller_id_number'].":\n";