diff --git a/app/extensions/resources/classes/extension.php b/app/extensions/resources/classes/extension.php
index 9aebf89096..4092486d3c 100644
--- a/app/extensions/resources/classes/extension.php
+++ b/app/extensions/resources/classes/extension.php
@@ -42,6 +42,7 @@
 		public $effective_caller_id_number;
 		public $outbound_caller_id_name;
 		public $outbound_caller_id_number;
+		public $emergency_caller_id_name;
 		public $emergency_caller_id_number;
 		public $directory_full_name;
 		public $directory_visible;
@@ -311,6 +312,9 @@
 							if (strlen($row['outbound_caller_id_number']) > 0) {
 								$xml .= "      <variable name=\"outbound_caller_id_number\" value=\"" . $row['outbound_caller_id_number'] . "\"/>\n";
 							}
+							if (strlen($row['emergency_caller_id_name']) > 0) {
+								$xml .= "      <variable name=\"emergency_caller_id_name\" value=\"" . $row['emergency_caller_id_name'] . "\"/>\n";
+							}
 							if (strlen($row['emergency_caller_id_number']) > 0) {
 								$xml .= "      <variable name=\"emergency_caller_id_number\" value=\"" . $row['emergency_caller_id_number'] . "\"/>\n";
 							}
diff --git a/resources/install/scripts/app/xml_handler/resources/scripts/directory/directory.lua b/resources/install/scripts/app/xml_handler/resources/scripts/directory/directory.lua
index 0421323827..928dbc3bab 100644
--- a/resources/install/scripts/app/xml_handler/resources/scripts/directory/directory.lua
+++ b/resources/install/scripts/app/xml_handler/resources/scripts/directory/directory.lua
@@ -232,6 +232,7 @@
 								effective_caller_id_number = row.effective_caller_id_number;
 								outbound_caller_id_name = row.outbound_caller_id_name;
 								outbound_caller_id_number = row.outbound_caller_id_number;
+								emergency_caller_id_name = row.emergency_caller_id_name;
 								emergency_caller_id_number = row.emergency_caller_id_number;
 								directory_full_name = row.directory_full_name;
 								directory_visible = row.directory_visible;
@@ -300,6 +301,7 @@
 							effective_caller_id_number = row.effective_caller_id_number;
 							outbound_caller_id_name = row.outbound_caller_id_name;
 							outbound_caller_id_number = row.outbound_caller_id_number;
+							emergency_caller_id_name = row.emergency_caller_id_name;
 							emergency_caller_id_number = row.emergency_caller_id_number;
 							directory_full_name = row.directory_full_name;
 							directory_visible = row.directory_visible;
@@ -389,6 +391,9 @@
 							if (string.len(outbound_caller_id_number) > 0) then
 								table.insert(xml, [[								<variable name="outbound_caller_id_number" value="]] .. outbound_caller_id_number .. [["/>]]);
 							end
+							if (string.len(emergency_caller_id_name) > 0) then
+								table.insert(xml, [[								<variable name="emergency_caller_id_name" value="]] .. emergency_caller_id_name .. [["/>]]);
+							end
 							if (string.len(emergency_caller_id_number) > 0) then
 								table.insert(xml, [[								<variable name="emergency_caller_id_number" value="]] .. emergency_caller_id_number .. [["/>]]);
 							end