diff --git a/resources/templates/provision/cisco/8811/{$mac}.xml b/resources/templates/provision/cisco/8811/{$mac}.xml
index 94a5608f0d..d52570fba2 100644
--- a/resources/templates/provision/cisco/8811/{$mac}.xml
+++ b/resources/templates/provision/cisco/8811/{$mac}.xml
@@ -130,17 +130,17 @@
 <Insert_VIA_rport ua="na">{$spa_insert_via_rport}</Insert_VIA_rport>
 <Substitute_VIA_Addr ua="na">No</Substitute_VIA_Addr>
 <Send_Resp_To_Src_Port ua="na">No</Send_Resp_To_Src_Port>
-<STUN_Enable ua="na">No</STUN_Enable>
+<STUN_Enable ua="na">{if isset($stun_server)}Yes{else}No{/if}</STUN_Enable>
 <STUN_Test_Enable ua="na">No</STUN_Test_Enable>
-<STUN_Server ua="na"/>
+<STUN_Server ua="na">{$stun_server}</STUN_Server>
 <EXT_IP ua="na"/>
 <EXT_RTP_Port_Min ua="na">0</EXT_RTP_Port_Min>
-<NAT_Keep_Alive_Intvl ua="na">15</NAT_Keep_Alive_Intvl>
+<NAT_Keep_Alive_Intvl ua="na">90</NAT_Keep_Alive_Intvl>
 <Redirect_Keep_Alive ua="na">No</Redirect_Keep_Alive>
 <!-- Configuration Profile -->
 <Provision_Enable ua="na">Yes</Provision_Enable>
 <Resync_On_Reset ua="na">Yes</Resync_On_Reset>
-<Resync_Random_Delay ua="na">2</Resync_Random_Delay>
+<Resync_Random_Delay ua="na">1</Resync_Random_Delay>
 <Resync_At__HHmm_ ua="na"/>
 <Resync_At_Random_Delay ua="na">600</Resync_At_Random_Delay>
 <Resync_Periodic ua="na">0</Resync_Periodic>
@@ -174,7 +174,7 @@
 <Log_Upgrade_Success_Msg ua="na">$PN $MAC -- Successful upgrade $SCHEME://$SERVIP:$PORT$PATH -- $ERR</Log_Upgrade_Success_Msg>
 <Log_Upgrade_Failure_Msg ua="na">$PN $MAC -- Upgrade failed: $ERR</Log_Upgrade_Failure_Msg>
 <!-- CA Settings -->
-<Custom_CA_Rule ua="na"/>
+<Custom_CA_Rule ua="na">{$cisco_custom_ca_rule}</Custom_CA_Rule>
 <!-- HTTP Settings -->
 <HTTP_User_Agent_Name ua="na">$VERSION ($MA)</HTTP_User_Agent_Name>
 <!-- Problem Report Tool -->
@@ -474,8 +474,12 @@
 <Enable_Broadsoft_Hoteling_1_ ua="na">No</Enable_Broadsoft_Hoteling_1_>
 <Hoteling_Subscription_Expires_1_ ua="na">3600</Hoteling_Subscription_Expires_1_>
 <!-- Proxy and Registration -->
-<Proxy_1_ ua="na">{$domain_name}</Proxy_1_>
+<Proxy_1_ ua="na">{$account.1.server_address}</Proxy_1_>
+{if isset($account.1.outbound_proxy_primary)}
 <Outbound_Proxy_1_ ua="na">{$account.1.outbound_proxy_primary}</Outbound_Proxy_1_>
+{else}
+<Outbound_Proxy_1_ ua="na">{$account.1.server_address}</Outbound_Proxy_1_>
+{/if}
 <Alternate_Proxy_1_ ua="na"/>
 <Alternate_Outbound_Proxy_1_ ua="na"/>
 <Use_OB_Proxy_In_Dialog_1_ ua="na">Yes</Use_OB_Proxy_In_Dialog_1_>
@@ -1446,7 +1450,7 @@
 <Call_Pickup_Audio_Notification ua="na">No</Call_Pickup_Audio_Notification>
 <Attendant_Console_LCD_Brightness ua="na">12</Attendant_Console_LCD_Brightness>
 <BXfer_To_Starcode_Enable ua="na">No</BXfer_To_Starcode_Enable>
-<BXfer_On_Speed_Dial_Enable ua="na">No</BXfer_On_Speed_Dial_Enable>
+<BXfer_On_Speed_Dial_Enable ua="na">Yes</BXfer_On_Speed_Dial_Enable>
 <BLF_Label_Display_Mode ua="na">Name</BLF_Label_Display_Mode>
 <!-- Unit 1 -->
 {foreach $keys["expansion"] as $row}
diff --git a/resources/templates/provision/cisco/8832/{$mac}.xml b/resources/templates/provision/cisco/8832/{$mac}.xml
index 94a5608f0d..d52570fba2 100644
--- a/resources/templates/provision/cisco/8832/{$mac}.xml
+++ b/resources/templates/provision/cisco/8832/{$mac}.xml
@@ -130,17 +130,17 @@
 <Insert_VIA_rport ua="na">{$spa_insert_via_rport}</Insert_VIA_rport>
 <Substitute_VIA_Addr ua="na">No</Substitute_VIA_Addr>
 <Send_Resp_To_Src_Port ua="na">No</Send_Resp_To_Src_Port>
-<STUN_Enable ua="na">No</STUN_Enable>
+<STUN_Enable ua="na">{if isset($stun_server)}Yes{else}No{/if}</STUN_Enable>
 <STUN_Test_Enable ua="na">No</STUN_Test_Enable>
-<STUN_Server ua="na"/>
+<STUN_Server ua="na">{$stun_server}</STUN_Server>
 <EXT_IP ua="na"/>
 <EXT_RTP_Port_Min ua="na">0</EXT_RTP_Port_Min>
-<NAT_Keep_Alive_Intvl ua="na">15</NAT_Keep_Alive_Intvl>
+<NAT_Keep_Alive_Intvl ua="na">90</NAT_Keep_Alive_Intvl>
 <Redirect_Keep_Alive ua="na">No</Redirect_Keep_Alive>
 <!-- Configuration Profile -->
 <Provision_Enable ua="na">Yes</Provision_Enable>
 <Resync_On_Reset ua="na">Yes</Resync_On_Reset>
-<Resync_Random_Delay ua="na">2</Resync_Random_Delay>
+<Resync_Random_Delay ua="na">1</Resync_Random_Delay>
 <Resync_At__HHmm_ ua="na"/>
 <Resync_At_Random_Delay ua="na">600</Resync_At_Random_Delay>
 <Resync_Periodic ua="na">0</Resync_Periodic>
@@ -174,7 +174,7 @@
 <Log_Upgrade_Success_Msg ua="na">$PN $MAC -- Successful upgrade $SCHEME://$SERVIP:$PORT$PATH -- $ERR</Log_Upgrade_Success_Msg>
 <Log_Upgrade_Failure_Msg ua="na">$PN $MAC -- Upgrade failed: $ERR</Log_Upgrade_Failure_Msg>
 <!-- CA Settings -->
-<Custom_CA_Rule ua="na"/>
+<Custom_CA_Rule ua="na">{$cisco_custom_ca_rule}</Custom_CA_Rule>
 <!-- HTTP Settings -->
 <HTTP_User_Agent_Name ua="na">$VERSION ($MA)</HTTP_User_Agent_Name>
 <!-- Problem Report Tool -->
@@ -474,8 +474,12 @@
 <Enable_Broadsoft_Hoteling_1_ ua="na">No</Enable_Broadsoft_Hoteling_1_>
 <Hoteling_Subscription_Expires_1_ ua="na">3600</Hoteling_Subscription_Expires_1_>
 <!-- Proxy and Registration -->
-<Proxy_1_ ua="na">{$domain_name}</Proxy_1_>
+<Proxy_1_ ua="na">{$account.1.server_address}</Proxy_1_>
+{if isset($account.1.outbound_proxy_primary)}
 <Outbound_Proxy_1_ ua="na">{$account.1.outbound_proxy_primary}</Outbound_Proxy_1_>
+{else}
+<Outbound_Proxy_1_ ua="na">{$account.1.server_address}</Outbound_Proxy_1_>
+{/if}
 <Alternate_Proxy_1_ ua="na"/>
 <Alternate_Outbound_Proxy_1_ ua="na"/>
 <Use_OB_Proxy_In_Dialog_1_ ua="na">Yes</Use_OB_Proxy_In_Dialog_1_>
@@ -1446,7 +1450,7 @@
 <Call_Pickup_Audio_Notification ua="na">No</Call_Pickup_Audio_Notification>
 <Attendant_Console_LCD_Brightness ua="na">12</Attendant_Console_LCD_Brightness>
 <BXfer_To_Starcode_Enable ua="na">No</BXfer_To_Starcode_Enable>
-<BXfer_On_Speed_Dial_Enable ua="na">No</BXfer_On_Speed_Dial_Enable>
+<BXfer_On_Speed_Dial_Enable ua="na">Yes</BXfer_On_Speed_Dial_Enable>
 <BLF_Label_Display_Mode ua="na">Name</BLF_Label_Display_Mode>
 <!-- Unit 1 -->
 {foreach $keys["expansion"] as $row}
diff --git a/resources/templates/provision/cisco/8841/{$mac}.xml b/resources/templates/provision/cisco/8841/{$mac}.xml
index 94a5608f0d..d52570fba2 100644
--- a/resources/templates/provision/cisco/8841/{$mac}.xml
+++ b/resources/templates/provision/cisco/8841/{$mac}.xml
@@ -130,17 +130,17 @@
 <Insert_VIA_rport ua="na">{$spa_insert_via_rport}</Insert_VIA_rport>
 <Substitute_VIA_Addr ua="na">No</Substitute_VIA_Addr>
 <Send_Resp_To_Src_Port ua="na">No</Send_Resp_To_Src_Port>
-<STUN_Enable ua="na">No</STUN_Enable>
+<STUN_Enable ua="na">{if isset($stun_server)}Yes{else}No{/if}</STUN_Enable>
 <STUN_Test_Enable ua="na">No</STUN_Test_Enable>
-<STUN_Server ua="na"/>
+<STUN_Server ua="na">{$stun_server}</STUN_Server>
 <EXT_IP ua="na"/>
 <EXT_RTP_Port_Min ua="na">0</EXT_RTP_Port_Min>
-<NAT_Keep_Alive_Intvl ua="na">15</NAT_Keep_Alive_Intvl>
+<NAT_Keep_Alive_Intvl ua="na">90</NAT_Keep_Alive_Intvl>
 <Redirect_Keep_Alive ua="na">No</Redirect_Keep_Alive>
 <!-- Configuration Profile -->
 <Provision_Enable ua="na">Yes</Provision_Enable>
 <Resync_On_Reset ua="na">Yes</Resync_On_Reset>
-<Resync_Random_Delay ua="na">2</Resync_Random_Delay>
+<Resync_Random_Delay ua="na">1</Resync_Random_Delay>
 <Resync_At__HHmm_ ua="na"/>
 <Resync_At_Random_Delay ua="na">600</Resync_At_Random_Delay>
 <Resync_Periodic ua="na">0</Resync_Periodic>
@@ -174,7 +174,7 @@
 <Log_Upgrade_Success_Msg ua="na">$PN $MAC -- Successful upgrade $SCHEME://$SERVIP:$PORT$PATH -- $ERR</Log_Upgrade_Success_Msg>
 <Log_Upgrade_Failure_Msg ua="na">$PN $MAC -- Upgrade failed: $ERR</Log_Upgrade_Failure_Msg>
 <!-- CA Settings -->
-<Custom_CA_Rule ua="na"/>
+<Custom_CA_Rule ua="na">{$cisco_custom_ca_rule}</Custom_CA_Rule>
 <!-- HTTP Settings -->
 <HTTP_User_Agent_Name ua="na">$VERSION ($MA)</HTTP_User_Agent_Name>
 <!-- Problem Report Tool -->
@@ -474,8 +474,12 @@
 <Enable_Broadsoft_Hoteling_1_ ua="na">No</Enable_Broadsoft_Hoteling_1_>
 <Hoteling_Subscription_Expires_1_ ua="na">3600</Hoteling_Subscription_Expires_1_>
 <!-- Proxy and Registration -->
-<Proxy_1_ ua="na">{$domain_name}</Proxy_1_>
+<Proxy_1_ ua="na">{$account.1.server_address}</Proxy_1_>
+{if isset($account.1.outbound_proxy_primary)}
 <Outbound_Proxy_1_ ua="na">{$account.1.outbound_proxy_primary}</Outbound_Proxy_1_>
+{else}
+<Outbound_Proxy_1_ ua="na">{$account.1.server_address}</Outbound_Proxy_1_>
+{/if}
 <Alternate_Proxy_1_ ua="na"/>
 <Alternate_Outbound_Proxy_1_ ua="na"/>
 <Use_OB_Proxy_In_Dialog_1_ ua="na">Yes</Use_OB_Proxy_In_Dialog_1_>
@@ -1446,7 +1450,7 @@
 <Call_Pickup_Audio_Notification ua="na">No</Call_Pickup_Audio_Notification>
 <Attendant_Console_LCD_Brightness ua="na">12</Attendant_Console_LCD_Brightness>
 <BXfer_To_Starcode_Enable ua="na">No</BXfer_To_Starcode_Enable>
-<BXfer_On_Speed_Dial_Enable ua="na">No</BXfer_On_Speed_Dial_Enable>
+<BXfer_On_Speed_Dial_Enable ua="na">Yes</BXfer_On_Speed_Dial_Enable>
 <BLF_Label_Display_Mode ua="na">Name</BLF_Label_Display_Mode>
 <!-- Unit 1 -->
 {foreach $keys["expansion"] as $row}
diff --git a/resources/templates/provision/cisco/8845/{$mac}.xml b/resources/templates/provision/cisco/8845/{$mac}.xml
index 94a5608f0d..d52570fba2 100644
--- a/resources/templates/provision/cisco/8845/{$mac}.xml
+++ b/resources/templates/provision/cisco/8845/{$mac}.xml
@@ -130,17 +130,17 @@
 <Insert_VIA_rport ua="na">{$spa_insert_via_rport}</Insert_VIA_rport>
 <Substitute_VIA_Addr ua="na">No</Substitute_VIA_Addr>
 <Send_Resp_To_Src_Port ua="na">No</Send_Resp_To_Src_Port>
-<STUN_Enable ua="na">No</STUN_Enable>
+<STUN_Enable ua="na">{if isset($stun_server)}Yes{else}No{/if}</STUN_Enable>
 <STUN_Test_Enable ua="na">No</STUN_Test_Enable>
-<STUN_Server ua="na"/>
+<STUN_Server ua="na">{$stun_server}</STUN_Server>
 <EXT_IP ua="na"/>
 <EXT_RTP_Port_Min ua="na">0</EXT_RTP_Port_Min>
-<NAT_Keep_Alive_Intvl ua="na">15</NAT_Keep_Alive_Intvl>
+<NAT_Keep_Alive_Intvl ua="na">90</NAT_Keep_Alive_Intvl>
 <Redirect_Keep_Alive ua="na">No</Redirect_Keep_Alive>
 <!-- Configuration Profile -->
 <Provision_Enable ua="na">Yes</Provision_Enable>
 <Resync_On_Reset ua="na">Yes</Resync_On_Reset>
-<Resync_Random_Delay ua="na">2</Resync_Random_Delay>
+<Resync_Random_Delay ua="na">1</Resync_Random_Delay>
 <Resync_At__HHmm_ ua="na"/>
 <Resync_At_Random_Delay ua="na">600</Resync_At_Random_Delay>
 <Resync_Periodic ua="na">0</Resync_Periodic>
@@ -174,7 +174,7 @@
 <Log_Upgrade_Success_Msg ua="na">$PN $MAC -- Successful upgrade $SCHEME://$SERVIP:$PORT$PATH -- $ERR</Log_Upgrade_Success_Msg>
 <Log_Upgrade_Failure_Msg ua="na">$PN $MAC -- Upgrade failed: $ERR</Log_Upgrade_Failure_Msg>
 <!-- CA Settings -->
-<Custom_CA_Rule ua="na"/>
+<Custom_CA_Rule ua="na">{$cisco_custom_ca_rule}</Custom_CA_Rule>
 <!-- HTTP Settings -->
 <HTTP_User_Agent_Name ua="na">$VERSION ($MA)</HTTP_User_Agent_Name>
 <!-- Problem Report Tool -->
@@ -474,8 +474,12 @@
 <Enable_Broadsoft_Hoteling_1_ ua="na">No</Enable_Broadsoft_Hoteling_1_>
 <Hoteling_Subscription_Expires_1_ ua="na">3600</Hoteling_Subscription_Expires_1_>
 <!-- Proxy and Registration -->
-<Proxy_1_ ua="na">{$domain_name}</Proxy_1_>
+<Proxy_1_ ua="na">{$account.1.server_address}</Proxy_1_>
+{if isset($account.1.outbound_proxy_primary)}
 <Outbound_Proxy_1_ ua="na">{$account.1.outbound_proxy_primary}</Outbound_Proxy_1_>
+{else}
+<Outbound_Proxy_1_ ua="na">{$account.1.server_address}</Outbound_Proxy_1_>
+{/if}
 <Alternate_Proxy_1_ ua="na"/>
 <Alternate_Outbound_Proxy_1_ ua="na"/>
 <Use_OB_Proxy_In_Dialog_1_ ua="na">Yes</Use_OB_Proxy_In_Dialog_1_>
@@ -1446,7 +1450,7 @@
 <Call_Pickup_Audio_Notification ua="na">No</Call_Pickup_Audio_Notification>
 <Attendant_Console_LCD_Brightness ua="na">12</Attendant_Console_LCD_Brightness>
 <BXfer_To_Starcode_Enable ua="na">No</BXfer_To_Starcode_Enable>
-<BXfer_On_Speed_Dial_Enable ua="na">No</BXfer_On_Speed_Dial_Enable>
+<BXfer_On_Speed_Dial_Enable ua="na">Yes</BXfer_On_Speed_Dial_Enable>
 <BLF_Label_Display_Mode ua="na">Name</BLF_Label_Display_Mode>
 <!-- Unit 1 -->
 {foreach $keys["expansion"] as $row}
diff --git a/resources/templates/provision/cisco/8851/{$mac}.xml b/resources/templates/provision/cisco/8851/{$mac}.xml
index 94a5608f0d..d52570fba2 100644
--- a/resources/templates/provision/cisco/8851/{$mac}.xml
+++ b/resources/templates/provision/cisco/8851/{$mac}.xml
@@ -130,17 +130,17 @@
 <Insert_VIA_rport ua="na">{$spa_insert_via_rport}</Insert_VIA_rport>
 <Substitute_VIA_Addr ua="na">No</Substitute_VIA_Addr>
 <Send_Resp_To_Src_Port ua="na">No</Send_Resp_To_Src_Port>
-<STUN_Enable ua="na">No</STUN_Enable>
+<STUN_Enable ua="na">{if isset($stun_server)}Yes{else}No{/if}</STUN_Enable>
 <STUN_Test_Enable ua="na">No</STUN_Test_Enable>
-<STUN_Server ua="na"/>
+<STUN_Server ua="na">{$stun_server}</STUN_Server>
 <EXT_IP ua="na"/>
 <EXT_RTP_Port_Min ua="na">0</EXT_RTP_Port_Min>
-<NAT_Keep_Alive_Intvl ua="na">15</NAT_Keep_Alive_Intvl>
+<NAT_Keep_Alive_Intvl ua="na">90</NAT_Keep_Alive_Intvl>
 <Redirect_Keep_Alive ua="na">No</Redirect_Keep_Alive>
 <!-- Configuration Profile -->
 <Provision_Enable ua="na">Yes</Provision_Enable>
 <Resync_On_Reset ua="na">Yes</Resync_On_Reset>
-<Resync_Random_Delay ua="na">2</Resync_Random_Delay>
+<Resync_Random_Delay ua="na">1</Resync_Random_Delay>
 <Resync_At__HHmm_ ua="na"/>
 <Resync_At_Random_Delay ua="na">600</Resync_At_Random_Delay>
 <Resync_Periodic ua="na">0</Resync_Periodic>
@@ -174,7 +174,7 @@
 <Log_Upgrade_Success_Msg ua="na">$PN $MAC -- Successful upgrade $SCHEME://$SERVIP:$PORT$PATH -- $ERR</Log_Upgrade_Success_Msg>
 <Log_Upgrade_Failure_Msg ua="na">$PN $MAC -- Upgrade failed: $ERR</Log_Upgrade_Failure_Msg>
 <!-- CA Settings -->
-<Custom_CA_Rule ua="na"/>
+<Custom_CA_Rule ua="na">{$cisco_custom_ca_rule}</Custom_CA_Rule>
 <!-- HTTP Settings -->
 <HTTP_User_Agent_Name ua="na">$VERSION ($MA)</HTTP_User_Agent_Name>
 <!-- Problem Report Tool -->
@@ -474,8 +474,12 @@
 <Enable_Broadsoft_Hoteling_1_ ua="na">No</Enable_Broadsoft_Hoteling_1_>
 <Hoteling_Subscription_Expires_1_ ua="na">3600</Hoteling_Subscription_Expires_1_>
 <!-- Proxy and Registration -->
-<Proxy_1_ ua="na">{$domain_name}</Proxy_1_>
+<Proxy_1_ ua="na">{$account.1.server_address}</Proxy_1_>
+{if isset($account.1.outbound_proxy_primary)}
 <Outbound_Proxy_1_ ua="na">{$account.1.outbound_proxy_primary}</Outbound_Proxy_1_>
+{else}
+<Outbound_Proxy_1_ ua="na">{$account.1.server_address}</Outbound_Proxy_1_>
+{/if}
 <Alternate_Proxy_1_ ua="na"/>
 <Alternate_Outbound_Proxy_1_ ua="na"/>
 <Use_OB_Proxy_In_Dialog_1_ ua="na">Yes</Use_OB_Proxy_In_Dialog_1_>
@@ -1446,7 +1450,7 @@
 <Call_Pickup_Audio_Notification ua="na">No</Call_Pickup_Audio_Notification>
 <Attendant_Console_LCD_Brightness ua="na">12</Attendant_Console_LCD_Brightness>
 <BXfer_To_Starcode_Enable ua="na">No</BXfer_To_Starcode_Enable>
-<BXfer_On_Speed_Dial_Enable ua="na">No</BXfer_On_Speed_Dial_Enable>
+<BXfer_On_Speed_Dial_Enable ua="na">Yes</BXfer_On_Speed_Dial_Enable>
 <BLF_Label_Display_Mode ua="na">Name</BLF_Label_Display_Mode>
 <!-- Unit 1 -->
 {foreach $keys["expansion"] as $row}
diff --git a/resources/templates/provision/cisco/8861/{$mac}.xml b/resources/templates/provision/cisco/8861/{$mac}.xml
index 8eebd0fc17..d52570fba2 100644
--- a/resources/templates/provision/cisco/8861/{$mac}.xml
+++ b/resources/templates/provision/cisco/8861/{$mac}.xml
@@ -130,17 +130,17 @@
 <Insert_VIA_rport ua="na">{$spa_insert_via_rport}</Insert_VIA_rport>
 <Substitute_VIA_Addr ua="na">No</Substitute_VIA_Addr>
 <Send_Resp_To_Src_Port ua="na">No</Send_Resp_To_Src_Port>
-<STUN_Enable ua="na">No</STUN_Enable>
+<STUN_Enable ua="na">{if isset($stun_server)}Yes{else}No{/if}</STUN_Enable>
 <STUN_Test_Enable ua="na">No</STUN_Test_Enable>
-<STUN_Server ua="na"/>
+<STUN_Server ua="na">{$stun_server}</STUN_Server>
 <EXT_IP ua="na"/>
 <EXT_RTP_Port_Min ua="na">0</EXT_RTP_Port_Min>
-<NAT_Keep_Alive_Intvl ua="na">15</NAT_Keep_Alive_Intvl>
+<NAT_Keep_Alive_Intvl ua="na">90</NAT_Keep_Alive_Intvl>
 <Redirect_Keep_Alive ua="na">No</Redirect_Keep_Alive>
 <!-- Configuration Profile -->
 <Provision_Enable ua="na">Yes</Provision_Enable>
 <Resync_On_Reset ua="na">Yes</Resync_On_Reset>
-<Resync_Random_Delay ua="na">2</Resync_Random_Delay>
+<Resync_Random_Delay ua="na">1</Resync_Random_Delay>
 <Resync_At__HHmm_ ua="na"/>
 <Resync_At_Random_Delay ua="na">600</Resync_At_Random_Delay>
 <Resync_Periodic ua="na">0</Resync_Periodic>
@@ -174,7 +174,7 @@
 <Log_Upgrade_Success_Msg ua="na">$PN $MAC -- Successful upgrade $SCHEME://$SERVIP:$PORT$PATH -- $ERR</Log_Upgrade_Success_Msg>
 <Log_Upgrade_Failure_Msg ua="na">$PN $MAC -- Upgrade failed: $ERR</Log_Upgrade_Failure_Msg>
 <!-- CA Settings -->
-<Custom_CA_Rule ua="na"/>
+<Custom_CA_Rule ua="na">{$cisco_custom_ca_rule}</Custom_CA_Rule>
 <!-- HTTP Settings -->
 <HTTP_User_Agent_Name ua="na">$VERSION ($MA)</HTTP_User_Agent_Name>
 <!-- Problem Report Tool -->
@@ -475,7 +475,11 @@
 <Hoteling_Subscription_Expires_1_ ua="na">3600</Hoteling_Subscription_Expires_1_>
 <!-- Proxy and Registration -->
 <Proxy_1_ ua="na">{$account.1.server_address}</Proxy_1_>
+{if isset($account.1.outbound_proxy_primary)}
 <Outbound_Proxy_1_ ua="na">{$account.1.outbound_proxy_primary}</Outbound_Proxy_1_>
+{else}
+<Outbound_Proxy_1_ ua="na">{$account.1.server_address}</Outbound_Proxy_1_>
+{/if}
 <Alternate_Proxy_1_ ua="na"/>
 <Alternate_Outbound_Proxy_1_ ua="na"/>
 <Use_OB_Proxy_In_Dialog_1_ ua="na">Yes</Use_OB_Proxy_In_Dialog_1_>
@@ -1446,7 +1450,7 @@
 <Call_Pickup_Audio_Notification ua="na">No</Call_Pickup_Audio_Notification>
 <Attendant_Console_LCD_Brightness ua="na">12</Attendant_Console_LCD_Brightness>
 <BXfer_To_Starcode_Enable ua="na">No</BXfer_To_Starcode_Enable>
-<BXfer_On_Speed_Dial_Enable ua="na">No</BXfer_On_Speed_Dial_Enable>
+<BXfer_On_Speed_Dial_Enable ua="na">Yes</BXfer_On_Speed_Dial_Enable>
 <BLF_Label_Display_Mode ua="na">Name</BLF_Label_Display_Mode>
 <!-- Unit 1 -->
 {foreach $keys["expansion"] as $row}
diff --git a/resources/templates/provision/cisco/8865/{$mac}.xml b/resources/templates/provision/cisco/8865/{$mac}.xml
index 10a3104756..d52570fba2 100644
--- a/resources/templates/provision/cisco/8865/{$mac}.xml
+++ b/resources/templates/provision/cisco/8865/{$mac}.xml
@@ -130,20 +130,20 @@
 <Insert_VIA_rport ua="na">{$spa_insert_via_rport}</Insert_VIA_rport>
 <Substitute_VIA_Addr ua="na">No</Substitute_VIA_Addr>
 <Send_Resp_To_Src_Port ua="na">No</Send_Resp_To_Src_Port>
-<STUN_Enable ua="na">No</STUN_Enable>
+<STUN_Enable ua="na">{if isset($stun_server)}Yes{else}No{/if}</STUN_Enable>
 <STUN_Test_Enable ua="na">No</STUN_Test_Enable>
-<STUN_Server ua="na"/>
+<STUN_Server ua="na">{$stun_server}</STUN_Server>
 <EXT_IP ua="na"/>
 <EXT_RTP_Port_Min ua="na">0</EXT_RTP_Port_Min>
-<NAT_Keep_Alive_Intvl ua="na">15</NAT_Keep_Alive_Intvl>
+<NAT_Keep_Alive_Intvl ua="na">90</NAT_Keep_Alive_Intvl>
 <Redirect_Keep_Alive ua="na">No</Redirect_Keep_Alive>
 <!-- Configuration Profile -->
 <Provision_Enable ua="na">Yes</Provision_Enable>
 <Resync_On_Reset ua="na">Yes</Resync_On_Reset>
-<Resync_Random_Delay ua="na">2</Resync_Random_Delay>
+<Resync_Random_Delay ua="na">1</Resync_Random_Delay>
 <Resync_At__HHmm_ ua="na"/>
 <Resync_At_Random_Delay ua="na">600</Resync_At_Random_Delay>
-<Resync_Periodic ua="na">3600</Resync_Periodic>
+<Resync_Periodic ua="na">0</Resync_Periodic>
 <Resync_Error_Retry_Delay ua="na">3600</Resync_Error_Retry_Delay>
 <Forced_Resync_Delay ua="na">14400</Forced_Resync_Delay>
 <Resync_From_SIP ua="na">Yes</Resync_From_SIP>
@@ -174,7 +174,7 @@
 <Log_Upgrade_Success_Msg ua="na">$PN $MAC -- Successful upgrade $SCHEME://$SERVIP:$PORT$PATH -- $ERR</Log_Upgrade_Success_Msg>
 <Log_Upgrade_Failure_Msg ua="na">$PN $MAC -- Upgrade failed: $ERR</Log_Upgrade_Failure_Msg>
 <!-- CA Settings -->
-<Custom_CA_Rule ua="na"/>
+<Custom_CA_Rule ua="na">{$cisco_custom_ca_rule}</Custom_CA_Rule>
 <!-- HTTP Settings -->
 <HTTP_User_Agent_Name ua="na">$VERSION ($MA)</HTTP_User_Agent_Name>
 <!-- Problem Report Tool -->
@@ -256,10 +256,10 @@
 <Secure_One_Call_Act_Code ua="na">*18</Secure_One_Call_Act_Code>
 <Secure_One_Call_Deact_Code ua="na">*19</Secure_One_Call_Deact_Code>
 <Paging_Code ua="na">*96</Paging_Code>
-<Call_Park_Code ua="na">*68</Call_Park_Code>
-<Call_Pickup_Code ua="na">{$voicemail_number}</Call_Pickup_Code>
-<Call_Unpark_Code ua="na">*88</Call_Unpark_Code>
-<Group_Call_Pickup_Code ua="na">*98</Group_Call_Pickup_Code>
+<Call_Park_Code ua="na">#68</Call_Park_Code>
+<Call_Pickup_Code ua="na">#97</Call_Pickup_Code>
+<Call_Unpark_Code ua="na">#88</Call_Unpark_Code>
+<Group_Call_Pickup_Code ua="na">#98</Group_Call_Pickup_Code>
 <Referral_Services_Codes ua="na"/>
 <Feature_Dial_Services_Codes ua="na"/>
 <!-- Vertical Service Announcement Codes -->
@@ -306,7 +306,7 @@
 {foreach $keys["line"] as $row}
 {if $row.device_key_category == "line"}
 <!-- Phone/Line_Key_{$row.device_key_id} -->
-<Extension_{$row.device_key_id}_ group="Phone/Line_Key_{$row.device_key_id}">{$row.device_key_line}</Extension_{$row.device_key_id}_> <!-- options: 1/2/3/4/5/6/7/8/9/10/11/12/Disabled -->
+<Extension_{$row.device_key_id}_ group="Phone/Line_Key_{$row.device_key_id}">{if $row.device_key_type == "disabled"}Disabled{else}{$row.device_key_line}{/if}</Extension_{$row.device_key_id}_> <!-- options: 1/2/3/4/5/6/7/8/9/10/11/12/Disabled -->
 <Short_Name_{$row.device_key_id}_ group="Phone/Line_Key_{$row.device_key_id}">{$row.device_key_label}</Short_Name_{$row.device_key_id}_>
 <Share_Call_Appearance_{$row.device_key_id}_ group="Phone/Line_Key_{$row.device_key_id}">{if $row.device_key_type == "shared"}shared{else}private{/if}</Share_Call_Appearance_{$row.device_key_id}_> <!-- options: private/shared -->
 <Extended_Function_{$row.device_key_id}_ group="Phone/Line_Key_{$row.device_key_id}">{$row.device_key_value}</Extended_Function_{$row.device_key_id}_>
@@ -474,8 +474,12 @@
 <Enable_Broadsoft_Hoteling_1_ ua="na">No</Enable_Broadsoft_Hoteling_1_>
 <Hoteling_Subscription_Expires_1_ ua="na">3600</Hoteling_Subscription_Expires_1_>
 <!-- Proxy and Registration -->
-<Proxy_1_ ua="na">{$domain_name}</Proxy_1_>
+<Proxy_1_ ua="na">{$account.1.server_address}</Proxy_1_>
+{if isset($account.1.outbound_proxy_primary)}
 <Outbound_Proxy_1_ ua="na">{$account.1.outbound_proxy_primary}</Outbound_Proxy_1_>
+{else}
+<Outbound_Proxy_1_ ua="na">{$account.1.server_address}</Outbound_Proxy_1_>
+{/if}
 <Alternate_Proxy_1_ ua="na"/>
 <Alternate_Outbound_Proxy_1_ ua="na"/>
 <Use_OB_Proxy_In_Dialog_1_ ua="na">Yes</Use_OB_Proxy_In_Dialog_1_>
@@ -515,7 +519,7 @@
 <!-- Dial Plan -->
 <Dial_Plan_1_ ua="na">{$spa_dial_plan}</Dial_Plan_1_>
 <Caller_ID_Map_1_ ua="na"/>
-<Enable_URI_Dialing_1_ ua="na">No</Enable_URI_Dialing_1_>
+<Enable_URI_Dialing_1_ ua="na">Yes</Enable_URI_Dialing_1_>
 <Emergency_Number_1_ ua="na"/>
 <!-- General -->
 <Line_Enable_2_ ua="na">Yes</Line_Enable_2_>
@@ -609,7 +613,7 @@
 <!-- Dial Plan -->
 <Dial_Plan_2_ ua="na">{$spa_dial_plan}</Dial_Plan_2_>
 <Caller_ID_Map_2_ ua="na"/>
-<Enable_URI_Dialing_2_ ua="na">No</Enable_URI_Dialing_2_>
+<Enable_URI_Dialing_2_ ua="na">Yes</Enable_URI_Dialing_2_>
 <Emergency_Number_2_ ua="na"/>
 <!-- General -->
 <Line_Enable_3_ ua="na">Yes</Line_Enable_3_>
@@ -703,7 +707,7 @@
 <!-- Dial Plan -->
 <Dial_Plan_3_ ua="na">{$spa_dial_plan}</Dial_Plan_3_>
 <Caller_ID_Map_3_ ua="na"/>
-<Enable_URI_Dialing_3_ ua="na">No</Enable_URI_Dialing_3_>
+<Enable_URI_Dialing_3_ ua="na">Yes</Enable_URI_Dialing_3_>
 <Emergency_Number_3_ ua="na"/>
 <!-- General -->
 <Line_Enable_4_ ua="na">Yes</Line_Enable_4_>
@@ -798,7 +802,7 @@
 <!-- Dial Plan -->
 <Dial_Plan_4_ ua="na">{$spa_dial_plan}</Dial_Plan_4_>
 <Caller_ID_Map_4_ ua="na"/>
-<Enable_URI_Dialing_4_ ua="na">No</Enable_URI_Dialing_4_>
+<Enable_URI_Dialing_4_ ua="na">Yes</Enable_URI_Dialing_4_>
 <Emergency_Number_4_ ua="na"/>
 <!-- General -->
 <Line_Enable_5_ ua="na">Yes</Line_Enable_5_>
@@ -892,7 +896,7 @@
 <!-- Dial Plan -->
 <Dial_Plan_5_ ua="na">{$spa_dial_plan}</Dial_Plan_5_>
 <Caller_ID_Map_5_ ua="na"/>
-<Enable_URI_Dialing_5_ ua="na">No</Enable_URI_Dialing_5_>
+<Enable_URI_Dialing_5_ ua="na">Yes</Enable_URI_Dialing_5_>
 <Emergency_Number_5_ ua="na"/>
 <!-- General -->
 <Line_Enable_6_ ua="na">Yes</Line_Enable_6_>
@@ -986,7 +990,7 @@
 <!-- Dial Plan -->
 <Dial_Plan_6_ ua="na">{$spa_dial_plan}</Dial_Plan_6_>
 <Caller_ID_Map_6_ ua="na"/>
-<Enable_URI_Dialing_6_ ua="na">No</Enable_URI_Dialing_6_>
+<Enable_URI_Dialing_6_ ua="na">Yes</Enable_URI_Dialing_6_>
 <Emergency_Number_6_ ua="na"/>
 <!-- General -->
 <Line_Enable_7_ ua="na">Yes</Line_Enable_7_>
@@ -1079,7 +1083,7 @@
 <!-- Dial Plan -->
 <Dial_Plan_7_ ua="na">{$spa_dial_plan}</Dial_Plan_7_>
 <Caller_ID_Map_7_ ua="na"/>
-<Enable_URI_Dialing_7_ ua="na">No</Enable_URI_Dialing_7_>
+<Enable_URI_Dialing_7_ ua="na">Yes</Enable_URI_Dialing_7_>
 <Emergency_Number_7_ ua="na"/>
 <!-- General -->
 <Line_Enable_8_ ua="na">Yes</Line_Enable_8_>
@@ -1173,7 +1177,7 @@
 <!-- Dial Plan -->
 <Dial_Plan_8_ ua="na">{$spa_dial_plan}</Dial_Plan_8_>
 <Caller_ID_Map_8_ ua="na"/>
-<Enable_URI_Dialing_8_ ua="na">No</Enable_URI_Dialing_8_>
+<Enable_URI_Dialing_8_ ua="na">Yes</Enable_URI_Dialing_8_>
 <Emergency_Number_8_ ua="na"/>
 <!-- General -->
 <Line_Enable_9_ ua="na">Yes</Line_Enable_9_>
@@ -1267,7 +1271,7 @@
 <!-- Dial Plan -->
 <Dial_Plan_9_ ua="na">{$spa_dial_plan}</Dial_Plan_9_>
 <Caller_ID_Map_9_ ua="na"/>
-<Enable_URI_Dialing_9_ ua="na">No</Enable_URI_Dialing_9_>
+<Enable_URI_Dialing_9_ ua="na">Yes</Enable_URI_Dialing_9_>
 <Emergency_Number_9_ ua="na"/>
 <!-- General -->
 <Line_Enable_10_ ua="na">Yes</Line_Enable_10_>
@@ -1361,7 +1365,7 @@
 <!-- Dial Plan -->
 <Dial_Plan_10_ ua="na">{$spa_dial_plan}</Dial_Plan_10_>
 <Caller_ID_Map_10_ ua="na"/>
-<Enable_URI_Dialing_10_ ua="na">No</Enable_URI_Dialing_10_>
+<Enable_URI_Dialing_10_ ua="na">Yes</Enable_URI_Dialing_10_>
 <Emergency_Number_10_ ua="na"/>
 <!-- Hold Reminder -->
 <Hold_Reminder_Timer ua="rw">0</Hold_Reminder_Timer>
@@ -1446,7 +1450,7 @@
 <Call_Pickup_Audio_Notification ua="na">No</Call_Pickup_Audio_Notification>
 <Attendant_Console_LCD_Brightness ua="na">12</Attendant_Console_LCD_Brightness>
 <BXfer_To_Starcode_Enable ua="na">No</BXfer_To_Starcode_Enable>
-<BXfer_On_Speed_Dial_Enable ua="na">No</BXfer_On_Speed_Dial_Enable>
+<BXfer_On_Speed_Dial_Enable ua="na">Yes</BXfer_On_Speed_Dial_Enable>
 <BLF_Label_Display_Mode ua="na">Name</BLF_Label_Display_Mode>
 <!-- Unit 1 -->
 {foreach $keys["expansion"] as $row}