diff --git a/resources/templates/provision/yealink/t28p/{$mac}.cfg b/resources/templates/provision/yealink/t28p/{$mac}.cfg
index 7b51513efe..06624db3f9 100644
--- a/resources/templates/provision/yealink/t28p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t28p/{$mac}.cfg
@@ -36,7 +36,7 @@ account.1.sip_server_host = {$server_address_1}
 account.1.sip_server_port = {$sip_port_1}
 
 #Enable or disable the use of the outbound proxy server; 0-Disabled (default), 1-Enabled;
-account.1.outbound_proxy_enable =
+
 
 #Specify the IP address or domain name of the outbound proxy server.
 account.1.outbound_host = {$outbound_proxy_1}
@@ -50,6 +50,21 @@ account.1.outbound_port =
 {if $sip_transport_1 == 'tls'}account.1.transport = 2{/if}
 {if $sip_transport_1 == 'dns srv'}account.1.transport = 3{/if}
 
+account.1.outbound_proxy.1.address = {$outbound_proxy_primary_1}
+account.1.outbound_proxy.2.address = {$outbound_proxy_secondary_1}
+account.1.outbound_proxy_enable = {if isset($outbound_proxy_primary_1)}1{else}0{/if}
+
+{if isset($outbound_proxy_1_port)}
+account.1.outbound_proxy.1.port = {$outbound_proxy_1_port}
+{else}
+account.1.outbound_proxy.1.port = 5060
+{/if}
+{if isset($outbound_proxy_1_port)}
+account.1.outbound_proxy.2.port = {$outbound_proxy_2_port}
+{else}
+account.1.outbound_proxy.2.port = 5060
+{/if}
+
 
 #Configure the address of the backup outbound proxy server.
 account.1.backup_outbound_host =
@@ -350,7 +365,7 @@ account.2.sip_server_host = {$server_address_2}
 account.2.sip_server_port = {$sip_port_2}
 
 #Enable or disable the use of the outbound proxy server; 0-Disabled (default), 1-Enabled;
-account.2.outbound_proxy_enable =
+
 
 #Specify the IP address or domain name of the outbound proxy server.
 account.2.outbound_host = {$outbound_proxy_2}
@@ -364,6 +379,10 @@ account.2.outbound_port =
 {if $sip_transport_2 == 'tls'}account.2.transport = 2{/if}
 {if $sip_transport_2 == 'dns srv'}account.2.transport = 3{/if}
 
+account.2.outbound_proxy.1.address = {$outbound_proxy_primary_2}
+account.2.outbound_proxy.2.address = {$outbound_proxy_secondary_2}
+account.2.outbound_proxy_enable = {if isset($outbound_proxy_primary_2)}1{else}0{/if}
+
 #Configure the address of the backup outbound proxy server.
 account.2.backup_outbound_host =
 
@@ -663,7 +682,7 @@ account.3.sip_server_host = {$server_address_3}
 account.3.sip_server_port = {$sip_port_3}
 
 #Enable or disable the use of the outbound proxy server; 0-Disabled (default), 1-Enabled;
-account.3.outbound_proxy_enable =
+
 
 #Specify the IP address or domain name of the outbound proxy server.
 account.3.outbound_host = {$outbound_proxy_3}
@@ -677,6 +696,11 @@ account.3.outbound_port =
 {if $sip_transport_3 == 'tls'}account.3.transport = 2{/if}
 {if $sip_transport_3 == 'dns srv'}account.3.transport = 3{/if}
 
+account.3.outbound_proxy.1.address = {$outbound_proxy_primary_3}
++account.3.outbound_proxy.2.address = {$outbound_proxy_secondary_3}
++account.3.outbound_proxy_enable = {if isset($outbound_proxy_primary_3)}1{else}0{/if}
+
+
 #Configure the address of the backup outbound proxy server.
 account.3.backup_outbound_host =
 
@@ -976,7 +1000,7 @@ account.4.sip_server_host = {$server_address_4}
 account.4.sip_server_port = {$sip_port_4}
 
 #Enable or disable the use of the outbound proxy server; 0-Disabled (default), 1-Enabled;
-account.4.outbound_proxy_enable =
+
 
 #Specify the IP address or domain name of the outbound proxy server.
 account.4.outbound_host = {$outbound_proxy_4}
@@ -990,6 +1014,10 @@ account.4.outbound_port =
 {if $sip_transport_4 == 'tls'}account.4.transport = 2{/if}
 {if $sip_transport_4 == 'dns srv'}account.4.transport = 3{/if}
 
+account.4.outbound_proxy.1.address = {$outbound_proxy_primary_4}
+account.4.outbound_proxy.2.address = {$outbound_proxy_secondary_4}
+account.4.outbound_proxy_enable = {if isset($outbound_proxy_primary_4)}1{else}0{/if}
+
 #Configure the address of the backup outbound proxy server.
 account.4.backup_outbound_host =
 
@@ -1292,7 +1320,7 @@ account.5.sip_server_host = {$server_address_5}
 account.5.sip_server_port = {$sip_port_5}
 
 #Enable or disable the use of the outbound proxy server; 0-Disabled (default), 1-Enabled;
-account.5.outbound_proxy_enable =
+
 
 #Specify the IP address or domain name of the outbound proxy server.
 account.5.outbound_host = {$outbound_proxy_5}
@@ -1306,6 +1334,10 @@ account.5.outbound_port =
 {if $sip_transport_5 == 'tls'}account.5.transport = 2{/if}
 {if $sip_transport_5 == 'dns srv'}account.5.transport = 3{/if}
 
+account.5.outbound_proxy.1.address = {$outbound_proxy_primary_5}
+account.5.outbound_proxy.2.address = {$outbound_proxy_secondary_5}
+account.5.outbound_proxy_enable = {if isset($outbound_proxy_primary_5)}1{else}0{/if}
+
 #Configure the address of the backup outbound proxy server.
 account.5.backup_outbound_host =
 
@@ -1603,7 +1635,7 @@ account.6.sip_server_host = {$server_address_6}
 account.6.sip_server_port = {$sip_port_6}
 
 #Enable or disable the use of the outbound proxy server; 0-Disabled (default), 1-Enabled;
-account.6.outbound_proxy_enable =
+
 
 #Specify the IP address or domain name of the outbound proxy server.
 account.6.outbound_host = {$outbound_proxy_6}
@@ -1617,6 +1649,10 @@ account.6.outbound_port =
 {if $sip_transport_6 == 'tls'}account.6.transport = 2{/if}
 {if $sip_transport_6 == 'dns srv'}account.6.transport = 3{/if}
 
+account.6.outbound_proxy.1.address = {$outbound_proxy_primary_6}
+account.6.outbound_proxy.2.address = {$outbound_proxy_secondary_6}
+account.6.outbound_proxy_enable = {if isset($outbound_proxy_primary_6)}1{else}0{/if}
+
 #Configure the address of the backup outbound proxy server.
 account.6.backup_outbound_host =
 
@@ -1667,10 +1703,10 @@ account.6.precondition =
 account.6.subscribe_register =
 
 #Enable or disable the phone to subscribe the message waiting indicator; 0-Disabled (default), 1-Enabled;
-account.6.subscribe_mwi =
+account.6.subscribe_mwi = 0
 
 #Configure MWI subscribe expiry time (in seconds). It ranges from 0 to 84600, the default value is 3600.
-account.6.subscribe_mwi_expires =
+account.6.subscribe_mwi_expires = 3600
 
 #Configure the type of SIP header(s) to carry the caller ID; 0-FROM (default), 1-PAI 2-PAI-FROM, 3-PRID-PAI-FROM, 4-PAI-RPID-FROM, 5-RPID-FROM;
 account.6.cid_source =
@@ -1717,7 +1753,7 @@ account.6.auto_answer =
 account.6.missed_calllog =
 
 #Enable or disable the phone to subscribe to the voicemail through the message waiting indicator; 0-Disabled (default), 1-Enabled;
-account.6.subscribe_mwi_to_vm =
+account.6.subscribe_mwi_to_vm = 0
 
 #Enable or disable the phone to send the MAC address and line number in the Register message; 0-Disabled (default), 1-Enabled;
 account.6.register_mac =
@@ -1978,6 +2014,17 @@ memorykey.{$row.device_key_id}.sub_type =
 #The value 0 of the "proramablekey.x.line" stands for Auto, it means the first available line.
 #But, when the programmable key is configured as Pick Up, the value 0 stands for line 1.
 
+{foreach $keys as $row}
+	{if $row.device_key_category == "programmable"}
+		programablekey.{$row.device_key_id}.type = {$row.device_key_type}
+		programablekey.{$row.device_key_id}.line = {$row.device_key_line}
+		programablekey.{$row.device_key_id}.value = {$row.device_key_value}
+		programablekey.{$row.device_key_id}.xml_phonebook =
+		programablekey.{$row.device_key_id}.history_type =
+		programablekey.{$row.device_key_id}.label = {$row.device_key_label}
+	{/if}
+{/foreach}
+
 #programablekey.x.value =
 #programablekey.x.xml_phonebook--Specify the desired remote phonebook/local group/BSFT phonebook for the programmable key. This parameter is only appilicable to the feature XML Group/Local Group/Broadsoft Group.
 #programablekey.x.history_type =
@@ -2028,16 +2075,26 @@ programablekey.3.label =
 #expansion_module.x.key.y.label =
 #expansion_module.X.key.Y.xml_phonebook =
 
+{$rownum = 1}
+
 {foreach $keys as $row}
 {if $row.device_key_category == "expansion"}
-#Expansion module 1 key {$row.device_key_id}
+{if $rownum <= 40}
 expansion_module.1.key.{$row.device_key_id}.type = {$row.device_key_type}
 expansion_module.1.key.{$row.device_key_id}.line = {$row.device_key_line}
 expansion_module.1.key.{$row.device_key_id}.value = {$row.device_key_value}
 expansion_module.1.key.{$row.device_key_id}.pickup_value = {$row.device_key_extension}
 expansion_module.1.key.{$row.device_key_id}.label = {$row.device_key_label}
 expansion_module.1.key.{$row.device_key_id}.xml_phonebook =
-
+{else}
+expansion_module.2.key.{$row.device_key_id - 40}.type = {$row.device_key_type}
+expansion_module.2.key.{$row.device_key_id - 40}.line = {$row.device_key_line}
+expansion_module.2.key.{$row.device_key_id - 40}.value = {$row.device_key_value}
+expansion_module.2.key.{$row.device_key_id - 40}.extension = {$row.device_key_extension}
+expansion_module.2.key.{$row.device_key_id - 40}.label = {$row.device_key_label}
+expansion_module.2.key.{$row.device_key_id - 40}.xml_phonebook =
+{/if}
+{$rownum = $rownum + 1}
 {/if}
 {/foreach}