diff --git a/resources/templates/provision/cisco/spa509g/{$mac}.xml b/resources/templates/provision/cisco/spa509g/{$mac}.xml
index 66ef4bb3ea..b09469019c 100644
--- a/resources/templates/provision/cisco/spa509g/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa509g/{$mac}.xml
@@ -1453,20 +1453,22 @@
 
 <!-- Ext_8/Proxy_and_Registration -->
 <Proxy_8_ group="Ext_8/Proxy_and_Registration">{$server_address_8}</Proxy_8_>
-<Outbound_Proxy_8_ group="Ext_8/Proxy_and_Registration" />
-<Alternate_Proxy_8_ group="Ext_8/Proxy_and_Registration" />
-<Alternate_Outbound_Proxy_8_ group="Ext_8/Proxy_and_Registration" />
-<Use_Outbound_Proxy_8_ group="Ext_8/Proxy_and_Registration">No</Use_Outbound_Proxy_8_>
+<Use_Outbound_Proxy_8_ group="Ext_8/Proxy_and_Registration">{if isset($outbound_proxy_primary_8)}Yes{else}No{/if}</Use_Outbound_Proxy_8_>
+<Outbound_Proxy_8_ group="Ext_8/Proxy_and_Registration">{$outbound_proxy_primary_8}</Outbound_Proxy_8_>
+<Alternate_Proxy_8_ group="Ext_8/Proxy_and_Registration">{$server_address_8}</Alternate_Proxy_8_>
+<Alternate_Outbound_Proxy_8_ group="Ext_8/Proxy_and_Registration">{$outbound_proxy_secondary_8}</Alternate_Outbound_Proxy_8_>
 <Use_OB_Proxy_In_Dialog_8_ group="Ext_8/Proxy_and_Registration">Yes</Use_OB_Proxy_In_Dialog_8_>
 <Register_8_ group="Ext_8/Proxy_and_Registration">Yes</Register_8_>
 <Make_Call_Without_Reg_8_ group="Ext_8/Proxy_and_Registration">No</Make_Call_Without_Reg_8_>
 <Register_Expires_8_ group="Ext_8/Proxy_and_Registration">{$register_expires_8}</Register_Expires_8_>
 <Ans_Call_Without_Reg_8_ group="Ext_8/Proxy_and_Registration">No</Ans_Call_Without_Reg_8_>
-<Use_DNS_SRV_8_ group="Ext_8/Proxy_and_Registration">No</Use_DNS_SRV_8_>
+{if $sip_transport_8 == 'dns srv'}<Use_DNS_SRV_8_ group="Ext_8/Proxy_and_Registration">Yes</Use_DNS_SRV_8_>{/if}
+{if $sip_transport_8 != 'dns srv'}<Use_DNS_SRV_8_ group="Ext_8/Proxy_and_Registration">No</Use_DNS_SRV_8_>{/if}
 <DNS_SRV_Auto_Prefix_8_ group="Ext_8/Proxy_and_Registration">No</DNS_SRV_Auto_Prefix_8_>
-<Proxy_Fallback_Intvl_8_ group="Ext_8/Proxy_and_Registration">3600</Proxy_Fallback_Intvl_8_>
+<Proxy_Fallback_Intvl_8_ group="Ext_8/Proxy_and_Registration">600</Proxy_Fallback_Intvl_8_>
 <Proxy_Redundancy_Method_8_ group="Ext_8/Proxy_and_Registration">Normal</Proxy_Redundancy_Method_8_>
-<Dual_Registration_8_ group="Ext_8/Proxy_and_Registration">No</Dual_Registration_8_>
+<Dual_Registration_8_ group="Ext_8/Proxy_and_Registration">{if isset($spa_dual_registration)}Yes{else}No{/if}</Dual_Registration_8_>
+<Auto_Register_When_Failover_8_ group="Ext_8/Proxy_and_Registration">{if isset($spa_register_when_failover)}Yes{else}No{/if}</Auto_Register_When_Failover_8_>
 
 <!-- Ext_8/Subscriber_Information -->
 <Display_Name_8_ group="Ext_8/Subscriber_Information">{$display_name_8}</Display_Name_8_>
@@ -1574,20 +1576,22 @@
 
 <!-- Ext_9/Proxy_and_Registration -->
 <Proxy_9_ group="Ext_9/Proxy_and_Registration">{$server_address_9}</Proxy_9_>
-<Outbound_Proxy_9_ group="Ext_9/Proxy_and_Registration" />
-<Alternate_Proxy_9_ group="Ext_9/Proxy_and_Registration" />
-<Alternate_Outbound_Proxy_9_ group="Ext_9/Proxy_and_Registration" />
-<Use_Outbound_Proxy_9_ group="Ext_9/Proxy_and_Registration">No</Use_Outbound_Proxy_9_>
+<Use_Outbound_Proxy_9_ group="Ext_9/Proxy_and_Registration">{if isset($outbound_proxy_primary_9)}Yes{else}No{/if}</Use_Outbound_Proxy_9_>
+<Outbound_Proxy_9_ group="Ext_9/Proxy_and_Registration">{$outbound_proxy_primary_9}</Outbound_Proxy_9_>
+<Alternate_Proxy_9_ group="Ext_9/Proxy_and_Registration">{$server_address_9}</Alternate_Proxy_9_>
+<Alternate_Outbound_Proxy_9_ group="Ext_9/Proxy_and_Registration">{$outbound_proxy_secondary_9}</Alternate_Outbound_Proxy_9_>
 <Use_OB_Proxy_In_Dialog_9_ group="Ext_9/Proxy_and_Registration">Yes</Use_OB_Proxy_In_Dialog_9_>
 <Register_9_ group="Ext_9/Proxy_and_Registration">Yes</Register_9_>
 <Make_Call_Without_Reg_9_ group="Ext_9/Proxy_and_Registration">No</Make_Call_Without_Reg_9_>
 <Register_Expires_9_ group="Ext_9/Proxy_and_Registration">{$register_expires_9}</Register_Expires_9_>
 <Ans_Call_Without_Reg_9_ group="Ext_9/Proxy_and_Registration">No</Ans_Call_Without_Reg_9_>
-<Use_DNS_SRV_9_ group="Ext_9/Proxy_and_Registration">No</Use_DNS_SRV_9_>
+{if $sip_transport_9 == 'dns srv'}<Use_DNS_SRV_9_ group="Ext_9/Proxy_and_Registration">Yes</Use_DNS_SRV_9_>{/if}
+{if $sip_transport_9 != 'dns srv'}<Use_DNS_SRV_9_ group="Ext_9/Proxy_and_Registration">No</Use_DNS_SRV_9_>{/if}
 <DNS_SRV_Auto_Prefix_9_ group="Ext_9/Proxy_and_Registration">No</DNS_SRV_Auto_Prefix_9_>
-<Proxy_Fallback_Intvl_9_ group="Ext_9/Proxy_and_Registration">3600</Proxy_Fallback_Intvl_9_>
+<Proxy_Fallback_Intvl_9_ group="Ext_9/Proxy_and_Registration">600</Proxy_Fallback_Intvl_9_>
 <Proxy_Redundancy_Method_9_ group="Ext_9/Proxy_and_Registration">Normal</Proxy_Redundancy_Method_9_>
-<Dual_Registration_9_ group="Ext_9/Proxy_and_Registration">No</Dual_Registration_9_>
+<Dual_Registration_9_ group="Ext_9/Proxy_and_Registration">{if isset($spa_dual_registration)}Yes{else}No{/if}</Dual_Registration_9_>
+<Auto_Register_When_Failover_9_ group="Ext_9/Proxy_and_Registration">{if isset($spa_register_when_failover)}Yes{else}No{/if}</Auto_Register_When_Failover_9_>
 
 <!-- Ext_9/Subscriber_Information -->
 <Display_Name_9_ group="Ext_9/Subscriber_Information">{$display_name_9}</Display_Name_9_>
@@ -1694,21 +1698,23 @@
 <Call_Park_Monitor_Enable_10_ group="Ext_10/Call_Feature_Settings">No</Call_Park_Monitor_Enable_10_>
 
 <!-- Ext_10/Proxy_and_Registration -->
-<Proxy_10_ group="Ext_10/Proxy_and_Registration">{$server_address_10}</Proxy_10_>
-<Outbound_Proxy_10_ group="Ext_10/Proxy_and_Registration" />
-<Alternate_Proxy_10_ group="Ext_10/Proxy_and_Registration" />
-<Alternate_Outbound_Proxy_10_ group="Ext_10/Proxy_and_Registration" />
-<Use_Outbound_Proxy_10_ group="Ext_10/Proxy_and_Registration">No</Use_Outbound_Proxy_10_>
+<Proxy_10_ group="Ext_10/Proxy_and_Registration">{$server_address_7}</Proxy_10_>
+<Use_Outbound_Proxy_10_ group="Ext_10/Proxy_and_Registration">{if isset($outbound_proxy_primary_10)}Yes{else}No{/if}</Use_Outbound_Proxy_10_>
+<Outbound_Proxy_10_ group="Ext_10/Proxy_and_Registration">{$outbound_proxy_primary_10}</Outbound_Proxy_10_>
+<Alternate_Proxy_10_ group="Ext_10/Proxy_and_Registration">{$server_address_10}</Alternate_Proxy_10_>
+<Alternate_Outbound_Proxy_10_ group="Ext_10/Proxy_and_Registration">{$outbound_proxy_secondary_10}</Alternate_Outbound_Proxy_10_>
 <Use_OB_Proxy_In_Dialog_10_ group="Ext_10/Proxy_and_Registration">Yes</Use_OB_Proxy_In_Dialog_10_>
 <Register_10_ group="Ext_10/Proxy_and_Registration">Yes</Register_10_>
 <Make_Call_Without_Reg_10_ group="Ext_10/Proxy_and_Registration">No</Make_Call_Without_Reg_10_>
 <Register_Expires_10_ group="Ext_10/Proxy_and_Registration">{$register_expires_10}</Register_Expires_10_>
 <Ans_Call_Without_Reg_10_ group="Ext_10/Proxy_and_Registration">No</Ans_Call_Without_Reg_10_>
-<Use_DNS_SRV_10_ group="Ext_10/Proxy_and_Registration">No</Use_DNS_SRV_10_>
+{if $sip_transport_10 == 'dns srv'}<Use_DNS_SRV_10_ group="Ext_10/Proxy_and_Registration">Yes</Use_DNS_SRV_10_>{/if}
+{if $sip_transport_10 != 'dns srv'}<Use_DNS_SRV_10_ group="Ext_10/Proxy_and_Registration">No</Use_DNS_SRV_10_>{/if}
 <DNS_SRV_Auto_Prefix_10_ group="Ext_10/Proxy_and_Registration">No</DNS_SRV_Auto_Prefix_10_>
-<Proxy_Fallback_Intvl_10_ group="Ext_10/Proxy_and_Registration">3600</Proxy_Fallback_Intvl_10_>
+<Proxy_Fallback_Intvl_10_ group="Ext_10/Proxy_and_Registration">600</Proxy_Fallback_Intvl_10_>
 <Proxy_Redundancy_Method_10_ group="Ext_10/Proxy_and_Registration">Normal</Proxy_Redundancy_Method_10_>
-<Dual_Registration_10_ group="Ext_10/Proxy_and_Registration">No</Dual_Registration_10_>
+<Dual_Registration_10_ group="Ext_10/Proxy_and_Registration">{if isset($spa_dual_registration)}Yes{else}No{/if}</Dual_Registration_10_>
+<Auto_Register_When_Failover_10_ group="Ext_10/Proxy_and_Registration">{if isset($spa_register_when_failover)}Yes{else}No{/if}</Auto_Register_When_Failover_10_>
 
 <!-- Ext_10/Subscriber_Information -->
 <Display_Name_10_ group="Ext_10/Subscriber_Information">{$display_name_10}</Display_Name_10_>
@@ -1816,20 +1822,22 @@
 
 <!-- Ext_11/Proxy_and_Registration -->
 <Proxy_11_ group="Ext_11/Proxy_and_Registration">{$server_address_11}</Proxy_11_>
-<Outbound_Proxy_11_ group="Ext_11/Proxy_and_Registration" />
-<Alternate_Proxy_11_ group="Ext_11/Proxy_and_Registration" />
-<Alternate_Outbound_Proxy_11_ group="Ext_11/Proxy_and_Registration" />
-<Use_Outbound_Proxy_11_ group="Ext_11/Proxy_and_Registration">No</Use_Outbound_Proxy_11_>
+<Use_Outbound_Proxy_11_ group="Ext_11/Proxy_and_Registration">{if isset($outbound_proxy_primary_11)}Yes{else}No{/if}</Use_Outbound_Proxy_11_>
+<Outbound_Proxy_11_ group="Ext_11/Proxy_and_Registration">{$outbound_proxy_primary_11}</Outbound_Proxy_11_>
+<Alternate_Proxy_11_ group="Ext_11/Proxy_and_Registration">{$server_address_11}</Alternate_Proxy_11_>
+<Alternate_Outbound_Proxy_11_ group="Ext_11/Proxy_and_Registration">{$outbound_proxy_secondary_11}</Alternate_Outbound_Proxy_11_>
 <Use_OB_Proxy_In_Dialog_11_ group="Ext_11/Proxy_and_Registration">Yes</Use_OB_Proxy_In_Dialog_11_>
 <Register_11_ group="Ext_11/Proxy_and_Registration">Yes</Register_11_>
 <Make_Call_Without_Reg_11_ group="Ext_11/Proxy_and_Registration">No</Make_Call_Without_Reg_11_>
 <Register_Expires_11_ group="Ext_11/Proxy_and_Registration">{$register_expires_11}</Register_Expires_11_>
 <Ans_Call_Without_Reg_11_ group="Ext_11/Proxy_and_Registration">No</Ans_Call_Without_Reg_11_>
-<Use_DNS_SRV_11_ group="Ext_11/Proxy_and_Registration">No</Use_DNS_SRV_11_>
+{if $sip_transport_11 == 'dns srv'}<Use_DNS_SRV_11_ group="Ext_11/Proxy_and_Registration">Yes</Use_DNS_SRV_11_>{/if}
+{if $sip_transport_11 != 'dns srv'}<Use_DNS_SRV_11_ group="Ext_11/Proxy_and_Registration">No</Use_DNS_SRV_11_>{/if}
 <DNS_SRV_Auto_Prefix_11_ group="Ext_11/Proxy_and_Registration">No</DNS_SRV_Auto_Prefix_11_>
-<Proxy_Fallback_Intvl_11_ group="Ext_11/Proxy_and_Registration">3600</Proxy_Fallback_Intvl_11_>
+<Proxy_Fallback_Intvl_11_ group="Ext_11/Proxy_and_Registration">600</Proxy_Fallback_Intvl_11_>
 <Proxy_Redundancy_Method_11_ group="Ext_11/Proxy_and_Registration">Normal</Proxy_Redundancy_Method_11_>
-<Dual_Registration_11_ group="Ext_11/Proxy_and_Registration">No</Dual_Registration_11_>
+<Dual_Registration_11_ group="Ext_11/Proxy_and_Registration">{if isset($spa_dual_registration)}Yes{else}No{/if}</Dual_Registration_11_>
+<Auto_Register_When_Failover_11_ group="Ext_11/Proxy_and_Registration">{if isset($spa_register_when_failover)}Yes{else}No{/if}</Auto_Register_When_Failover_11_>
 
 <!-- Ext_11/Subscriber_Information -->
 <Display_Name_11_ group="Ext_11/Subscriber_Information">{$display_name_11}</Display_Name_11_>
@@ -1937,20 +1945,22 @@
 
 <!-- Ext_12/Proxy_and_Registration -->
 <Proxy_12_ group="Ext_12/Proxy_and_Registration">{$server_address_12}</Proxy_12_>
-<Outbound_Proxy_12_ group="Ext_12/Proxy_and_Registration" />
-<Alternate_Proxy_12_ group="Ext_12/Proxy_and_Registration" />
-<Alternate_Outbound_Proxy_12_ group="Ext_12/Proxy_and_Registration" />
-<Use_Outbound_Proxy_12_ group="Ext_12/Proxy_and_Registration">No</Use_Outbound_Proxy_12_>
+<Use_Outbound_Proxy_12_ group="Ext_12/Proxy_and_Registration">{if isset($outbound_proxy_primary_12)}Yes{else}No{/if}</Use_Outbound_Proxy_12_>
+<Outbound_Proxy_12_ group="Ext_12/Proxy_and_Registration">{$outbound_proxy_primary_12}</Outbound_Proxy_12_>
+<Alternate_Proxy_12_ group="Ext_12/Proxy_and_Registration">{$server_address_12}</Alternate_Proxy_12_>
+<Alternate_Outbound_Proxy_12_ group="Ext_12/Proxy_and_Registration">{$outbound_proxy_secondary_12}</Alternate_Outbound_Proxy_12_>
 <Use_OB_Proxy_In_Dialog_12_ group="Ext_12/Proxy_and_Registration">Yes</Use_OB_Proxy_In_Dialog_12_>
 <Register_12_ group="Ext_12/Proxy_and_Registration">Yes</Register_12_>
 <Make_Call_Without_Reg_12_ group="Ext_12/Proxy_and_Registration">No</Make_Call_Without_Reg_12_>
 <Register_Expires_12_ group="Ext_12/Proxy_and_Registration">{$register_expires_12}</Register_Expires_12_>
 <Ans_Call_Without_Reg_12_ group="Ext_12/Proxy_and_Registration">No</Ans_Call_Without_Reg_12_>
-<Use_DNS_SRV_12_ group="Ext_12/Proxy_and_Registration">No</Use_DNS_SRV_12_>
+{if $sip_transport_12 == 'dns srv'}<Use_DNS_SRV_12_ group="Ext_12/Proxy_and_Registration">Yes</Use_DNS_SRV_12_>{/if}
+{if $sip_transport_12 != 'dns srv'}<Use_DNS_SRV_12_ group="Ext_12/Proxy_and_Registration">No</Use_DNS_SRV_12_>{/if}
 <DNS_SRV_Auto_Prefix_12_ group="Ext_12/Proxy_and_Registration">No</DNS_SRV_Auto_Prefix_12_>
-<Proxy_Fallback_Intvl_12_ group="Ext_12/Proxy_and_Registration">3600</Proxy_Fallback_Intvl_12_>
+<Proxy_Fallback_Intvl_12_ group="Ext_12/Proxy_and_Registration">600</Proxy_Fallback_Intvl_12_>
 <Proxy_Redundancy_Method_12_ group="Ext_12/Proxy_and_Registration">Normal</Proxy_Redundancy_Method_12_>
-<Dual_Registration_12_ group="Ext_12/Proxy_and_Registration">No</Dual_Registration_12_>
+<Dual_Registration_12_ group="Ext_12/Proxy_and_Registration">{if isset($spa_dual_registration)}Yes{else}No{/if}</Dual_Registration_12_>
+<Auto_Register_When_Failover_12_ group="Ext_12/Proxy_and_Registration">{if isset($spa_register_when_failover)}Yes{else}No{/if}</Auto_Register_When_Failover_12_>
 
 <!-- Ext_12/Subscriber_Information -->
 <Display_Name_12_ group="Ext_12/Subscriber_Information">{$display_name_12}</Display_Name_12_>