diff --git a/app/extensions/resources/classes/extension.php b/app/extensions/resources/classes/extension.php
index 9d3f74f987..9f2e0a693e 100644
--- a/app/extensions/resources/classes/extension.php
+++ b/app/extensions/resources/classes/extension.php
@@ -368,6 +368,27 @@
 										$xml .= "      <variable name=\"proxy_media\" value=\"true\"/>\n";
 										break;
 							}
+							if (strlen($row['forward_all_enabled']) > 0) {
+								$xml .= "      <variable name=\"forward_all_enabled\" value=\"" . $row['forward_all_enabled'] . "\"/>\n";
+							}
+							if (strlen($row['forward_all_destination']) > 0) {
+								$xml .= "      <variable name=\"forward_all_destination\" value=\"" . $row['forward_all_destination'] . "\"/>\n";
+							}
+							if (strlen($row['forward_busy_enabled']) > 0) {
+								$xml .= "      <variable name=\"forward_busy_enabled\" value=\"" . $row['forward_busy_enabled'] . "\"/>\n";
+							}
+							if (strlen($row['forward_busy_destination']) > 0) {
+								$xml .= "      <variable name=\"forward_busy_destination\" value=\"" . $row['forward_busy_destination'] . "\"/>\n";
+							}
+							if (strlen($row['forward_no_answer_enabled']) > 0) {
+								$xml .= "      <variable name=\"forward_no_answer_enabled\" value=\"" . $row['forward_no_answer_enabled'] . "\"/>\n";
+							}
+							if (strlen($row['forward_no_answer_destination']) > 0) {
+								$xml .= "      <variable name=\"forward_no_answer_destination\" value=\"" . $row['forward_no_answer_destination'] . "\"/>\n";
+							}
+							if (strlen($row['do_not_disturb']) > 0) {
+								$xml .= "      <variable name=\"do_not_disturb\" value=\"" . $row['do_not_disturb'] . "\"/>\n";
+							}
 							$xml .= "    </variables>\n";
 							$xml .= "  </user>\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 f6897f465c..580f799f01 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
@@ -454,6 +454,27 @@
 							if (sip_bypass_media == "proxy-media") then
 								table.insert(xml, [[								<variable name="proxy_media" value="true"/>]]);
 							end
+							if (string.len(forward_all_enabled) > 0) then
+								table.insert(xml, [[								<variable name="forward_all_enabled" value="forward_all_enabled"/>]]);
+							end
+							if (string.len(forward_all_destination) > 0) then
+								table.insert(xml, [[								<variable name="forward_all_destination" value="forward_all_destination"/>]]);
+							end
+							if (string.len(forward_busy_enabled) > 0) then
+								table.insert(xml, [[								<variable name="forward_busy_enabled" value="forward_busy_enabled"/>]]);
+							end
+							if (string.len(forward_busy_destination) > 0) then
+								table.insert(xml, [[								<variable name="forward_busy_destination" value="forward_busy_destination"/>]]);
+							end
+							if (string.len(forward_no_answer_enabled) > 0) then
+								table.insert(xml, [[								<variable name="forward_no_answer_enabled" value="forward_no_answer_enabled"/>]]);
+							end
+							if (string.len(forward_no_answer_destination) > 0) then
+								table.insert(xml, [[								<variable name="forward_no_answer_destination" value="forward_no_answer_destination"/>]]);
+							end
+							if (string.len(do_not_disturb) > 0) then
+								table.insert(xml, [[								<variable name="do_not_disturb" value="do_not_disturb"/>]]);
+							end
 							table.insert(xml, [[								<variable name="record_stereo" value="true"/>]]);
 							table.insert(xml, [[								<variable name="transfer_fallback_extension" value="operator"/>]]);
 							table.insert(xml, [[								<variable name="export_vars" value="domain_name"/>]]);