From 2fca558eb88a397fd482a5083baee119a72ab44c Mon Sep 17 00:00:00 2001
From: agree <37550360+greenbea@users.noreply.github.com>
Date: Thu, 8 Jul 2021 02:46:03 -0400
Subject: [PATCH] Yealink add call forward code variables (#5990)

* Yealink add call forward code variables

* change all to always

* change all to always
---
 app/yealink/app_config.php                       | 16 ++++++++++++++++
 .../provision/yealink/cp860/y000000000037.cfg    |  4 ++--
 .../provision/yealink/cp920/y000000000078.cfg    |  4 ++--
 .../provision/yealink/cp960/y000000000073.cfg    |  4 ++--
 .../templates/provision/yealink/t19p/{$mac}.cfg  |  4 ++--
 .../templates/provision/yealink/t20p/{$mac}.cfg  |  4 ++--
 .../provision/yealink/t21p/y000000000052.cfg     |  4 ++--
 .../templates/provision/yealink/t22p/{$mac}.cfg  |  4 ++--
 .../provision/yealink/t23g/y000000000044.cfg     |  4 ++--
 .../provision/yealink/t23p/y000000000044.cfg     |  4 ++--
 .../templates/provision/yealink/t26p/{$mac}.cfg  |  4 ++--
 .../provision/yealink/t27g/y000000000069.cfg     |  4 ++--
 .../provision/yealink/t27p/y000000000045.cfg     |  4 ++--
 .../templates/provision/yealink/t28p/{$mac}.cfg  |  4 ++--
 .../provision/yealink/t29g/y000000000046.cfg     |  4 ++--
 .../provision/yealink/t2x/y000000000044.cfg      |  4 ++--
 .../provision/yealink/t2x/y000000000052.cfg      |  4 ++--
 .../provision/yealink/t2x/y000000000069.cfg      |  4 ++--
 .../templates/provision/yealink/t31g/{$mac}.cfg  |  4 ++--
 .../templates/provision/yealink/t32g/{$mac}.cfg  |  4 ++--
 .../provision/yealink/t33g/y000000000124.cfg     |  4 ++--
 .../templates/provision/yealink/t38g/{$mac}.cfg  |  4 ++--
 .../provision/yealink/t40g/y000000000076.cfg     |  4 ++--
 .../provision/yealink/t40p/y000000000054.cfg     |  4 ++--
 .../provision/yealink/t41p/y000000000036.cfg     |  4 ++--
 .../provision/yealink/t41s/y000000000068.cfg     |  4 ++--
 .../provision/yealink/t42g/y000000000029.cfg     |  4 ++--
 .../provision/yealink/t42s/y000000000067.cfg     |  4 ++--
 .../provision/yealink/t43u/y000000000107.cfg     |  4 ++--
 .../provision/yealink/t46g/y000000000028.cfg     |  4 ++--
 .../provision/yealink/t46s/y000000000066.cfg     |  4 ++--
 .../provision/yealink/t46u/y000000000108.cfg     |  4 ++--
 .../provision/yealink/t48g/y000000000035.cfg     |  4 ++--
 .../provision/yealink/t48s/y000000000065.cfg     |  4 ++--
 .../provision/yealink/t49g/y000000000051.cfg     |  4 ++--
 .../provision/yealink/t4x/y000000000028.cfg      |  4 ++--
 .../provision/yealink/t4x/y000000000029.cfg      |  4 ++--
 .../provision/yealink/t4x/y000000000035.cfg      |  4 ++--
 .../provision/yealink/t4x/y000000000036.cfg      |  4 ++--
 .../provision/yealink/t4x/y000000000054.cfg      |  4 ++--
 .../provision/yealink/t4x/y000000000065.cfg      |  4 ++--
 .../provision/yealink/t4x/y000000000066.cfg      |  4 ++--
 .../provision/yealink/t4x/y000000000067.cfg      |  4 ++--
 .../provision/yealink/t4x/y000000000068.cfg      |  4 ++--
 .../provision/yealink/t4x/y000000000076.cfg      |  4 ++--
 .../provision/yealink/t4x/y000000000107.cfg      |  4 ++--
 .../provision/yealink/t4x/y000000000108.cfg      |  4 ++--
 .../provision/yealink/t4x/y000000000109.cfg      |  4 ++--
 .../provision/yealink/t4x/y000000000116.cfg      |  4 ++--
 .../provision/yealink/t52s/y000000000074.cfg     |  4 ++--
 .../provision/yealink/t53/y000000000095.cfg      |  4 ++--
 .../provision/yealink/t53w/y000000000095.cfg     |  4 ++--
 .../provision/yealink/t54s/y000000000070.cfg     |  4 ++--
 .../provision/yealink/t54w/y000000000096.cfg     |  4 ++--
 .../provision/yealink/t56a/y000000000056.cfg     |  4 ++--
 .../provision/yealink/t57w/y000000000097.cfg     |  4 ++--
 .../provision/yealink/t58a/y000000000058.cfg     |  4 ++--
 .../provision/yealink/t58v/y000000000058.cfg     |  4 ++--
 .../provision/yealink/t5x/y000000000070.cfg      |  4 ++--
 .../provision/yealink/t5x/y000000000095.cfg      |  4 ++--
 .../provision/yealink/t5x/y000000000096.cfg      |  4 ++--
 .../provision/yealink/t5x/y000000000097.cfg      |  4 ++--
 .../provision/yealink/vp59/y000000000091.cfg     |  4 ++--
 63 files changed, 140 insertions(+), 124 deletions(-)

diff --git a/app/yealink/app_config.php b/app/yealink/app_config.php
index 25f3430653..31e6649714 100644
--- a/app/yealink/app_config.php
+++ b/app/yealink/app_config.php
@@ -1425,5 +1425,21 @@
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = "6h";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Options: 1h, 2h, 3h or 6h, the default is 6h";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "06f33638-df48-11eb-a35d-536492a496c1";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_forward_always_on_code";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "*72";
+		$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'] = "8250e104-df48-11eb-a35e-536492a496c1";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_forward_always_off_code";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$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'] = "";
 
 ?>
diff --git a/resources/templates/provision/yealink/cp860/y000000000037.cfg b/resources/templates/provision/yealink/cp860/y000000000037.cfg
index e0a8350083..84f8cb3b99 100644
--- a/resources/templates/provision/yealink/cp860/y000000000037.cfg
+++ b/resources/templates/provision/yealink/cp860/y000000000037.cfg
@@ -1344,8 +1344,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 =
-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/cp920/y000000000078.cfg b/resources/templates/provision/yealink/cp920/y000000000078.cfg
index aab5770823..0bdd92c16c 100644
--- a/resources/templates/provision/yealink/cp920/y000000000078.cfg
+++ b/resources/templates/provision/yealink/cp920/y000000000078.cfg
@@ -1341,8 +1341,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 =
-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/cp960/y000000000073.cfg b/resources/templates/provision/yealink/cp960/y000000000073.cfg
index 02fe07f817..4ca90b3792 100644
--- a/resources/templates/provision/yealink/cp960/y000000000073.cfg
+++ b/resources/templates/provision/yealink/cp960/y000000000073.cfg
@@ -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 =
-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/t19p/{$mac}.cfg b/resources/templates/provision/yealink/t19p/{$mac}.cfg
index 905ab5c9b5..5ef4e8867a 100644
--- a/resources/templates/provision/yealink/t19p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t19p/{$mac}.cfg
@@ -2003,8 +2003,8 @@ forward.always.enable =
 forward.always.target =
 
 #Configure the on code and off code to always forward.
-forward.always.on_code =
-forward.always.off_code =
+forward.always.on_code = {$yealink_forward_always_on_code}
+forward.always.off_code = {$yealink_forward_always_off_code}
 
 #Enable or disable the busy forward; 0-Disabled (default), 1-Enabled;
 forward.busy.enable =
diff --git a/resources/templates/provision/yealink/t20p/{$mac}.cfg b/resources/templates/provision/yealink/t20p/{$mac}.cfg
index 0466994bb7..6cae244c84 100644
--- a/resources/templates/provision/yealink/t20p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t20p/{$mac}.cfg
@@ -2004,8 +2004,8 @@ forward.always.enable =
 forward.always.target =
 
 #Configure the on code and off code to always forward.
-forward.always.on_code =
-forward.always.off_code =
+forward.always.on_code = {$yealink_forward_always_on_code}
+forward.always.off_code = {$yealink_forward_always_off_code}
 
 #Enable or disable the busy forward; 0-Disabled (default), 1-Enabled;
 forward.busy.enable =
diff --git a/resources/templates/provision/yealink/t21p/y000000000052.cfg b/resources/templates/provision/yealink/t21p/y000000000052.cfg
index ca94d0b7b4..7974aac10a 100644
--- a/resources/templates/provision/yealink/t21p/y000000000052.cfg
+++ b/resources/templates/provision/yealink/t21p/y000000000052.cfg
@@ -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 =
-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/t22p/{$mac}.cfg b/resources/templates/provision/yealink/t22p/{$mac}.cfg
index 905ab5c9b5..5ef4e8867a 100644
--- a/resources/templates/provision/yealink/t22p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t22p/{$mac}.cfg
@@ -2003,8 +2003,8 @@ forward.always.enable =
 forward.always.target =
 
 #Configure the on code and off code to always forward.
-forward.always.on_code =
-forward.always.off_code =
+forward.always.on_code = {$yealink_forward_always_on_code}
+forward.always.off_code = {$yealink_forward_always_off_code}
 
 #Enable or disable the busy forward; 0-Disabled (default), 1-Enabled;
 forward.busy.enable =
diff --git a/resources/templates/provision/yealink/t23g/y000000000044.cfg b/resources/templates/provision/yealink/t23g/y000000000044.cfg
index 69dd69c2e3..2b14360fd9 100644
--- a/resources/templates/provision/yealink/t23g/y000000000044.cfg
+++ b/resources/templates/provision/yealink/t23g/y000000000044.cfg
@@ -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 =
-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/y000000000044.cfg b/resources/templates/provision/yealink/t23p/y000000000044.cfg
index 36dceaa243..b75413db3a 100644
--- a/resources/templates/provision/yealink/t23p/y000000000044.cfg
+++ b/resources/templates/provision/yealink/t23p/y000000000044.cfg
@@ -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 =
-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/t26p/{$mac}.cfg b/resources/templates/provision/yealink/t26p/{$mac}.cfg
index eba8c16256..afe0ddbcac 100644
--- a/resources/templates/provision/yealink/t26p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t26p/{$mac}.cfg
@@ -2003,8 +2003,8 @@ forward.always.enable =
 forward.always.target =
 
 #Configure the on code and off code to always forward.
-forward.always.on_code =
-forward.always.off_code =
+forward.always.on_code = {$yealink_forward_always_on_code}
+forward.always.off_code = {$yealink_forward_always_off_code}
 
 #Enable or disable the busy forward; 0-Disabled (default), 1-Enabled;
 forward.busy.enable =
diff --git a/resources/templates/provision/yealink/t27g/y000000000069.cfg b/resources/templates/provision/yealink/t27g/y000000000069.cfg
index 7398301746..57ab14df79 100644
--- a/resources/templates/provision/yealink/t27g/y000000000069.cfg
+++ b/resources/templates/provision/yealink/t27g/y000000000069.cfg
@@ -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 =
-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/y000000000045.cfg b/resources/templates/provision/yealink/t27p/y000000000045.cfg
index 031519cba8..dec91252bb 100644
--- a/resources/templates/provision/yealink/t27p/y000000000045.cfg
+++ b/resources/templates/provision/yealink/t27p/y000000000045.cfg
@@ -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 =
-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/t28p/{$mac}.cfg b/resources/templates/provision/yealink/t28p/{$mac}.cfg
index eba8c16256..afe0ddbcac 100644
--- a/resources/templates/provision/yealink/t28p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t28p/{$mac}.cfg
@@ -2003,8 +2003,8 @@ forward.always.enable =
 forward.always.target =
 
 #Configure the on code and off code to always forward.
-forward.always.on_code =
-forward.always.off_code =
+forward.always.on_code = {$yealink_forward_always_on_code}
+forward.always.off_code = {$yealink_forward_always_off_code}
 
 #Enable or disable the busy forward; 0-Disabled (default), 1-Enabled;
 forward.busy.enable =
diff --git a/resources/templates/provision/yealink/t29g/y000000000046.cfg b/resources/templates/provision/yealink/t29g/y000000000046.cfg
index dfc8ad2134..fb203423dc 100644
--- a/resources/templates/provision/yealink/t29g/y000000000046.cfg
+++ b/resources/templates/provision/yealink/t29g/y000000000046.cfg
@@ -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 =
-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/y000000000044.cfg b/resources/templates/provision/yealink/t2x/y000000000044.cfg
index 9b78012cfd..99c1e55c91 100644
--- a/resources/templates/provision/yealink/t2x/y000000000044.cfg
+++ b/resources/templates/provision/yealink/t2x/y000000000044.cfg
@@ -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 =
-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 c1b0d1f452..23f9b64f4f 100644
--- a/resources/templates/provision/yealink/t2x/y000000000052.cfg
+++ b/resources/templates/provision/yealink/t2x/y000000000052.cfg
@@ -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 =
-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/y000000000069.cfg b/resources/templates/provision/yealink/t2x/y000000000069.cfg
index a7a52264d3..ec026dcb2e 100644
--- a/resources/templates/provision/yealink/t2x/y000000000069.cfg
+++ b/resources/templates/provision/yealink/t2x/y000000000069.cfg
@@ -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 =
-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/t31g/{$mac}.cfg b/resources/templates/provision/yealink/t31g/{$mac}.cfg
index 0c7ea66439..e6a1617dea 100644
--- a/resources/templates/provision/yealink/t31g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t31g/{$mac}.cfg
@@ -1953,8 +1953,8 @@ forward.always.enable =
 forward.always.target =
 
 #Configure the on code and off code to always forward.
-forward.always.on_code =
-forward.always.off_code =
+forward.always.on_code = {$yealink_forward_always_on_code}
+forward.always.off_code = {$yealink_forward_always_off_code}
 
 #Enable or disable the busy forward; 0-Disabled (default), 1-Enabled;
 forward.busy.enable =
diff --git a/resources/templates/provision/yealink/t32g/{$mac}.cfg b/resources/templates/provision/yealink/t32g/{$mac}.cfg
index 35635f9ce1..c9da901e9d 100644
--- a/resources/templates/provision/yealink/t32g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t32g/{$mac}.cfg
@@ -1953,8 +1953,8 @@ forward.always.enable =
 forward.always.target =
 
 #Configure the on code and off code to always forward.
-forward.always.on_code =
-forward.always.off_code =
+forward.always.on_code = {$yealink_forward_always_on_code}
+forward.always.off_code = {$yealink_forward_always_off_code}
 
 #Enable or disable the busy forward; 0-Disabled (default), 1-Enabled;
 forward.busy.enable =
diff --git a/resources/templates/provision/yealink/t33g/y000000000124.cfg b/resources/templates/provision/yealink/t33g/y000000000124.cfg
index 2b0210cf61..6bd1b4ab74 100644
--- a/resources/templates/provision/yealink/t33g/y000000000124.cfg
+++ b/resources/templates/provision/yealink/t33g/y000000000124.cfg
@@ -1130,8 +1130,8 @@ forward.no_answer.on_code=
 forward.no_answer.off_code=
 forward.busy.off_code=
 forward.busy.on_code=
-forward.always.off_code=
-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=
diff --git a/resources/templates/provision/yealink/t38g/{$mac}.cfg b/resources/templates/provision/yealink/t38g/{$mac}.cfg
index 35635f9ce1..c9da901e9d 100644
--- a/resources/templates/provision/yealink/t38g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t38g/{$mac}.cfg
@@ -1953,8 +1953,8 @@ forward.always.enable =
 forward.always.target =
 
 #Configure the on code and off code to always forward.
-forward.always.on_code =
-forward.always.off_code =
+forward.always.on_code = {$yealink_forward_always_on_code}
+forward.always.off_code = {$yealink_forward_always_off_code}
 
 #Enable or disable the busy forward; 0-Disabled (default), 1-Enabled;
 forward.busy.enable =
diff --git a/resources/templates/provision/yealink/t40g/y000000000076.cfg b/resources/templates/provision/yealink/t40g/y000000000076.cfg
index c0a477d95c..52464ee8e6 100644
--- a/resources/templates/provision/yealink/t40g/y000000000076.cfg
+++ b/resources/templates/provision/yealink/t40g/y000000000076.cfg
@@ -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 =
-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/t40p/y000000000054.cfg b/resources/templates/provision/yealink/t40p/y000000000054.cfg
index 5c96ad14af..a95fad6020 100644
--- a/resources/templates/provision/yealink/t40p/y000000000054.cfg
+++ b/resources/templates/provision/yealink/t40p/y000000000054.cfg
@@ -1344,8 +1344,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 =
-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/y000000000036.cfg b/resources/templates/provision/yealink/t41p/y000000000036.cfg
index 3f0dfcd902..b353c8e508 100644
--- a/resources/templates/provision/yealink/t41p/y000000000036.cfg
+++ b/resources/templates/provision/yealink/t41p/y000000000036.cfg
@@ -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 =
-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/t41s/y000000000068.cfg b/resources/templates/provision/yealink/t41s/y000000000068.cfg
index 867a1d6743..908b58c2e6 100644
--- a/resources/templates/provision/yealink/t41s/y000000000068.cfg
+++ b/resources/templates/provision/yealink/t41s/y000000000068.cfg
@@ -991,8 +991,8 @@ forward.no_answer.on_code=
 forward.no_answer.off_code=
 forward.busy.off_code=
 forward.busy.on_code=
-forward.always.off_code=
-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=
diff --git a/resources/templates/provision/yealink/t42g/y000000000029.cfg b/resources/templates/provision/yealink/t42g/y000000000029.cfg
index 68334def11..c001279ee9 100644
--- a/resources/templates/provision/yealink/t42g/y000000000029.cfg
+++ b/resources/templates/provision/yealink/t42g/y000000000029.cfg
@@ -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 =
-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/t42s/y000000000067.cfg b/resources/templates/provision/yealink/t42s/y000000000067.cfg
index 9047438464..82bec5e1df 100644
--- a/resources/templates/provision/yealink/t42s/y000000000067.cfg
+++ b/resources/templates/provision/yealink/t42s/y000000000067.cfg
@@ -990,8 +990,8 @@ forward.no_answer.on_code=
 forward.no_answer.off_code=
 forward.busy.off_code=
 forward.busy.on_code=
-forward.always.off_code=
-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=
diff --git a/resources/templates/provision/yealink/t43u/y000000000107.cfg b/resources/templates/provision/yealink/t43u/y000000000107.cfg
index a194d52358..ac1b5d7f0b 100644
--- a/resources/templates/provision/yealink/t43u/y000000000107.cfg
+++ b/resources/templates/provision/yealink/t43u/y000000000107.cfg
@@ -1135,8 +1135,8 @@ forward.no_answer.on_code=
 forward.no_answer.off_code=
 forward.busy.off_code=
 forward.busy.on_code=
-forward.always.off_code=
-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=
diff --git a/resources/templates/provision/yealink/t46g/y000000000028.cfg b/resources/templates/provision/yealink/t46g/y000000000028.cfg
index e60cdf37b0..c3580659f3 100644
--- a/resources/templates/provision/yealink/t46g/y000000000028.cfg
+++ b/resources/templates/provision/yealink/t46g/y000000000028.cfg
@@ -1369,8 +1369,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 =
-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/t46s/y000000000066.cfg b/resources/templates/provision/yealink/t46s/y000000000066.cfg
index 88a01dd154..4509b48b54 100644
--- a/resources/templates/provision/yealink/t46s/y000000000066.cfg
+++ b/resources/templates/provision/yealink/t46s/y000000000066.cfg
@@ -991,8 +991,8 @@ forward.no_answer.on_code=
 forward.no_answer.off_code=
 forward.busy.off_code=
 forward.busy.on_code=
-forward.always.off_code=
-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=
diff --git a/resources/templates/provision/yealink/t46u/y000000000108.cfg b/resources/templates/provision/yealink/t46u/y000000000108.cfg
index dfc315da53..7434ab0979 100644
--- a/resources/templates/provision/yealink/t46u/y000000000108.cfg
+++ b/resources/templates/provision/yealink/t46u/y000000000108.cfg
@@ -1131,8 +1131,8 @@ forward.no_answer.on_code=
 forward.no_answer.off_code=
 forward.busy.off_code=
 forward.busy.on_code=
-forward.always.off_code=
-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=
diff --git a/resources/templates/provision/yealink/t48g/y000000000035.cfg b/resources/templates/provision/yealink/t48g/y000000000035.cfg
index 547328b615..7016c43b57 100644
--- a/resources/templates/provision/yealink/t48g/y000000000035.cfg
+++ b/resources/templates/provision/yealink/t48g/y000000000035.cfg
@@ -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 =
-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/t48s/y000000000065.cfg b/resources/templates/provision/yealink/t48s/y000000000065.cfg
index 78f2879403..8366391ded 100644
--- a/resources/templates/provision/yealink/t48s/y000000000065.cfg
+++ b/resources/templates/provision/yealink/t48s/y000000000065.cfg
@@ -1040,8 +1040,8 @@ forward.no_answer.on_code=
 forward.no_answer.off_code=
 forward.busy.off_code=
 forward.busy.on_code=
-forward.always.off_code=
-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=
diff --git a/resources/templates/provision/yealink/t49g/y000000000051.cfg b/resources/templates/provision/yealink/t49g/y000000000051.cfg
index ecbaf9b512..4e9def2d83 100644
--- a/resources/templates/provision/yealink/t49g/y000000000051.cfg
+++ b/resources/templates/provision/yealink/t49g/y000000000051.cfg
@@ -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 =
-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/y000000000028.cfg b/resources/templates/provision/yealink/t4x/y000000000028.cfg
index 20deb364fd..817ab34fc7 100644
--- a/resources/templates/provision/yealink/t4x/y000000000028.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000028.cfg
@@ -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 =
-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 0b9339b541..3bed6174ba 100644
--- a/resources/templates/provision/yealink/t4x/y000000000029.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000029.cfg
@@ -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 =
-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 8d430759e2..4f0a8e79db 100644
--- a/resources/templates/provision/yealink/t4x/y000000000035.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000035.cfg
@@ -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 =
-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 924427ab59..4e27649ff6 100644
--- a/resources/templates/provision/yealink/t4x/y000000000036.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000036.cfg
@@ -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 =
-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 acb78a459e..c5247e5a3a 100644
--- a/resources/templates/provision/yealink/t4x/y000000000054.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000054.cfg
@@ -1344,8 +1344,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 =
-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/y000000000065.cfg b/resources/templates/provision/yealink/t4x/y000000000065.cfg
index e87d7be8ad..5b224d4ef4 100644
--- a/resources/templates/provision/yealink/t4x/y000000000065.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000065.cfg
@@ -1039,8 +1039,8 @@ forward.no_answer.on_code=
 forward.no_answer.off_code=
 forward.busy.off_code=
 forward.busy.on_code=
-forward.always.off_code=
-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=
diff --git a/resources/templates/provision/yealink/t4x/y000000000066.cfg b/resources/templates/provision/yealink/t4x/y000000000066.cfg
index 68d0586da0..29d05535de 100644
--- a/resources/templates/provision/yealink/t4x/y000000000066.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000066.cfg
@@ -989,8 +989,8 @@ forward.no_answer.on_code=
 forward.no_answer.off_code=
 forward.busy.off_code=
 forward.busy.on_code=
-forward.always.off_code=
-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=
diff --git a/resources/templates/provision/yealink/t4x/y000000000067.cfg b/resources/templates/provision/yealink/t4x/y000000000067.cfg
index aa7b082fb0..ef51c6d78c 100644
--- a/resources/templates/provision/yealink/t4x/y000000000067.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000067.cfg
@@ -988,8 +988,8 @@ forward.no_answer.on_code=
 forward.no_answer.off_code=
 forward.busy.off_code=
 forward.busy.on_code=
-forward.always.off_code=
-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=
diff --git a/resources/templates/provision/yealink/t4x/y000000000068.cfg b/resources/templates/provision/yealink/t4x/y000000000068.cfg
index 30cfff5030..0a92e26397 100644
--- a/resources/templates/provision/yealink/t4x/y000000000068.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000068.cfg
@@ -990,8 +990,8 @@ forward.no_answer.on_code=
 forward.no_answer.off_code=
 forward.busy.off_code=
 forward.busy.on_code=
-forward.always.off_code=
-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=
diff --git a/resources/templates/provision/yealink/t4x/y000000000076.cfg b/resources/templates/provision/yealink/t4x/y000000000076.cfg
index 237f10fab9..01f72595f5 100644
--- a/resources/templates/provision/yealink/t4x/y000000000076.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000076.cfg
@@ -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 =
-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/y000000000107.cfg b/resources/templates/provision/yealink/t4x/y000000000107.cfg
index e87d7be8ad..5b224d4ef4 100644
--- a/resources/templates/provision/yealink/t4x/y000000000107.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000107.cfg
@@ -1039,8 +1039,8 @@ forward.no_answer.on_code=
 forward.no_answer.off_code=
 forward.busy.off_code=
 forward.busy.on_code=
-forward.always.off_code=
-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=
diff --git a/resources/templates/provision/yealink/t4x/y000000000108.cfg b/resources/templates/provision/yealink/t4x/y000000000108.cfg
index 79d9571d10..4803b8e431 100644
--- a/resources/templates/provision/yealink/t4x/y000000000108.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000108.cfg
@@ -989,8 +989,8 @@ forward.no_answer.on_code=
 forward.no_answer.off_code=
 forward.busy.off_code=
 forward.busy.on_code=
-forward.always.off_code=
-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=
diff --git a/resources/templates/provision/yealink/t4x/y000000000109.cfg b/resources/templates/provision/yealink/t4x/y000000000109.cfg
index e87d7be8ad..5b224d4ef4 100644
--- a/resources/templates/provision/yealink/t4x/y000000000109.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000109.cfg
@@ -1039,8 +1039,8 @@ forward.no_answer.on_code=
 forward.no_answer.off_code=
 forward.busy.off_code=
 forward.busy.on_code=
-forward.always.off_code=
-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=
diff --git a/resources/templates/provision/yealink/t4x/y000000000116.cfg b/resources/templates/provision/yealink/t4x/y000000000116.cfg
index aa7b082fb0..ef51c6d78c 100644
--- a/resources/templates/provision/yealink/t4x/y000000000116.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000116.cfg
@@ -988,8 +988,8 @@ forward.no_answer.on_code=
 forward.no_answer.off_code=
 forward.busy.off_code=
 forward.busy.on_code=
-forward.always.off_code=
-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=
diff --git a/resources/templates/provision/yealink/t52s/y000000000074.cfg b/resources/templates/provision/yealink/t52s/y000000000074.cfg
index f9f02aaa2e..5f0c015d79 100644
--- a/resources/templates/provision/yealink/t52s/y000000000074.cfg
+++ b/resources/templates/provision/yealink/t52s/y000000000074.cfg
@@ -988,8 +988,8 @@ forward.no_answer.on_code=
 forward.no_answer.off_code=
 forward.busy.off_code=
 forward.busy.on_code=
-forward.always.off_code=
-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=
diff --git a/resources/templates/provision/yealink/t53/y000000000095.cfg b/resources/templates/provision/yealink/t53/y000000000095.cfg
index 827da250d9..8fc8c9a414 100644
--- a/resources/templates/provision/yealink/t53/y000000000095.cfg
+++ b/resources/templates/provision/yealink/t53/y000000000095.cfg
@@ -1114,8 +1114,8 @@ forward.no_answer.on_code=
 forward.no_answer.off_code=
 forward.busy.off_code=
 forward.busy.on_code=
-forward.always.off_code=
-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=
diff --git a/resources/templates/provision/yealink/t53w/y000000000095.cfg b/resources/templates/provision/yealink/t53w/y000000000095.cfg
index 68a752f70a..628fb8dd4f 100644
--- a/resources/templates/provision/yealink/t53w/y000000000095.cfg
+++ b/resources/templates/provision/yealink/t53w/y000000000095.cfg
@@ -1118,8 +1118,8 @@ forward.no_answer.on_code=
 forward.no_answer.off_code=
 forward.busy.off_code=
 forward.busy.on_code=
-forward.always.off_code=
-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=
diff --git a/resources/templates/provision/yealink/t54s/y000000000070.cfg b/resources/templates/provision/yealink/t54s/y000000000070.cfg
index fa6a3acf7f..65c8bf0a2c 100644
--- a/resources/templates/provision/yealink/t54s/y000000000070.cfg
+++ b/resources/templates/provision/yealink/t54s/y000000000070.cfg
@@ -986,8 +986,8 @@ forward.no_answer.on_code=
 forward.no_answer.off_code=
 forward.busy.off_code=
 forward.busy.on_code=
-forward.always.off_code=
-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=
diff --git a/resources/templates/provision/yealink/t54w/y000000000096.cfg b/resources/templates/provision/yealink/t54w/y000000000096.cfg
index e4275fb694..4d133f8d56 100644
--- a/resources/templates/provision/yealink/t54w/y000000000096.cfg
+++ b/resources/templates/provision/yealink/t54w/y000000000096.cfg
@@ -1120,8 +1120,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_all_off_code}
-forward.always.on_code= {$yealink_forward_all_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=
diff --git a/resources/templates/provision/yealink/t56a/y000000000056.cfg b/resources/templates/provision/yealink/t56a/y000000000056.cfg
index 604d677359..3fda5d507a 100644
--- a/resources/templates/provision/yealink/t56a/y000000000056.cfg
+++ b/resources/templates/provision/yealink/t56a/y000000000056.cfg
@@ -1220,8 +1220,8 @@ expansion_module.2.key.{$row.device_key_id}.xml_phonebook =
 #######################################################################################
 forward.always.enable = 
 forward.always.target = 
-forward.always.on_code = 
-forward.always.off_code = 
+forward.always.on_code = {$yealink_forward_always_on_code}
+forward.always.off_code = {$yealink_forward_always_off_code}
 
 
 #######################################################################################
diff --git a/resources/templates/provision/yealink/t57w/y000000000097.cfg b/resources/templates/provision/yealink/t57w/y000000000097.cfg
index e52217a850..88967318f8 100644
--- a/resources/templates/provision/yealink/t57w/y000000000097.cfg
+++ b/resources/templates/provision/yealink/t57w/y000000000097.cfg
@@ -1119,8 +1119,8 @@ forward.no_answer.on_code=
 forward.no_answer.off_code=
 forward.busy.off_code=
 forward.busy.on_code=
-forward.always.off_code=
-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=
diff --git a/resources/templates/provision/yealink/t58a/y000000000058.cfg b/resources/templates/provision/yealink/t58a/y000000000058.cfg
index c99ca701ee..4b096c2129 100644
--- a/resources/templates/provision/yealink/t58a/y000000000058.cfg
+++ b/resources/templates/provision/yealink/t58a/y000000000058.cfg
@@ -1219,8 +1219,8 @@ expansion_module.2.key.{$row.device_key_id}.xml_phonebook =
 #######################################################################################
 forward.always.enable = 
 forward.always.target = 
-forward.always.on_code = 
-forward.always.off_code = 
+forward.always.on_code = {$yealink_forward_always_on_code}
+forward.always.off_code = {$yealink_forward_always_off_code}
 
 
 #######################################################################################
diff --git a/resources/templates/provision/yealink/t58v/y000000000058.cfg b/resources/templates/provision/yealink/t58v/y000000000058.cfg
index b8e1a21bbc..4e9a1af7d5 100644
--- a/resources/templates/provision/yealink/t58v/y000000000058.cfg
+++ b/resources/templates/provision/yealink/t58v/y000000000058.cfg
@@ -1220,8 +1220,8 @@ expansion_module.2.key.{$row.device_key_id}.xml_phonebook =
 #######################################################################################
 forward.always.enable = 
 forward.always.target = 
-forward.always.on_code = 
-forward.always.off_code = 
+forward.always.on_code = {$yealink_forward_always_on_code}
+forward.always.off_code = {$yealink_forward_always_off_code}
 
 
 #######################################################################################
diff --git a/resources/templates/provision/yealink/t5x/y000000000070.cfg b/resources/templates/provision/yealink/t5x/y000000000070.cfg
index 59e051b9bf..53755782f3 100644
--- a/resources/templates/provision/yealink/t5x/y000000000070.cfg
+++ b/resources/templates/provision/yealink/t5x/y000000000070.cfg
@@ -985,8 +985,8 @@ forward.no_answer.on_code=
 forward.no_answer.off_code=
 forward.busy.off_code=
 forward.busy.on_code=
-forward.always.off_code=
-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=
diff --git a/resources/templates/provision/yealink/t5x/y000000000095.cfg b/resources/templates/provision/yealink/t5x/y000000000095.cfg
index 2ebfd0f30f..f1f8576110 100644
--- a/resources/templates/provision/yealink/t5x/y000000000095.cfg
+++ b/resources/templates/provision/yealink/t5x/y000000000095.cfg
@@ -1112,8 +1112,8 @@ forward.no_answer.on_code=
 forward.no_answer.off_code=
 forward.busy.off_code=
 forward.busy.on_code=
-forward.always.off_code=
-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=
diff --git a/resources/templates/provision/yealink/t5x/y000000000096.cfg b/resources/templates/provision/yealink/t5x/y000000000096.cfg
index be1e65f8d1..47865cf3fd 100644
--- a/resources/templates/provision/yealink/t5x/y000000000096.cfg
+++ b/resources/templates/provision/yealink/t5x/y000000000096.cfg
@@ -1113,8 +1113,8 @@ forward.no_answer.on_code=
 forward.no_answer.off_code=
 forward.busy.off_code=
 forward.busy.on_code=
-forward.always.off_code=
-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=
diff --git a/resources/templates/provision/yealink/t5x/y000000000097.cfg b/resources/templates/provision/yealink/t5x/y000000000097.cfg
index 1a70286d30..c158fa0716 100644
--- a/resources/templates/provision/yealink/t5x/y000000000097.cfg
+++ b/resources/templates/provision/yealink/t5x/y000000000097.cfg
@@ -1113,8 +1113,8 @@ forward.no_answer.on_code=
 forward.no_answer.off_code=
 forward.busy.off_code=
 forward.busy.on_code=
-forward.always.off_code=
-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=
diff --git a/resources/templates/provision/yealink/vp59/y000000000091.cfg b/resources/templates/provision/yealink/vp59/y000000000091.cfg
index 7319c63aa3..6526e36734 100644
--- a/resources/templates/provision/yealink/vp59/y000000000091.cfg
+++ b/resources/templates/provision/yealink/vp59/y000000000091.cfg
@@ -1017,8 +1017,8 @@ programablekey.X.extension
 #######################################################################################
 forward.always.enable = 
 forward.always.target = 
-forward.always.on_code = 
-forward.always.off_code = 
+forward.always.on_code = {$yealink_forward_always_on_code}
+forward.always.off_code = {$yealink_forward_always_off_code}
 
 #######################################################################################
 ##                                   Forward Busy                                    ##