diff --git a/resources/templates/provision/cisco/spa501g/{$mac}.xml b/resources/templates/provision/cisco/spa501g/{$mac}.xml
index 4b4bb06de3..0032bc86f6 100644
--- a/resources/templates/provision/cisco/spa501g/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa501g/{$mac}.xml
@@ -151,7 +151,7 @@
 <Handle_VIA_received group="SIP/NAT_Support_Parameters">No</Handle_VIA_received>
 <Handle_VIA_rport group="SIP/NAT_Support_Parameters">{$spa_handle_via_rport}</Handle_VIA_rport>
 <Insert_VIA_received group="SIP/NAT_Support_Parameters">No</Insert_VIA_received>
-<Insert_VIA_rport group="SIP/NAT_Support_Parameters">{spa_insert_via_rport}</Insert_VIA_rport>
+<Insert_VIA_rport group="SIP/NAT_Support_Parameters">{$spa_insert_via_rport}</Insert_VIA_rport>
 <Substitute_VIA_Addr group="SIP/NAT_Support_Parameters">No</Substitute_VIA_Addr>
 <Send_Resp_To_Src_Port group="SIP/NAT_Support_Parameters">No</Send_Resp_To_Src_Port>
 <STUN_Enable group="SIP/NAT_Support_Parameters">No</STUN_Enable>
@@ -346,25 +346,20 @@
 <Voice_Mail_Number group="Phone/General">{$voicemail_number}</Voice_Mail_Number>
 
 {foreach $keys["line"] as $row}
-{if $row.device_key_type == "line"}
+{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 -->
 <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}">private</Share_Call_Appearance_{$row.device_key_id}_> <!-- options: private/shared -->
-<Extended_Function_{$row.device_key_id}_ group="Phone/Line_Key_{$row.device_key_id}"/>
-{else}
-<Extension_{$row.device_key_id}_ group="Phone/Line_Key_{$row.device_key_id}">Disabled</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}">private</Share_Call_Appearance_{$row.device_key_id}_> <!-- options: private/shared -->
+<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}_>
-{/if}
 
+{/if}
 {/foreach}
 
 <!-- Phone/Miscellaneous_Line_Key_Settings -->
 <Line_ID_Mapping group="Phone/Miscellaneous_Line_Key_Settings">Vertical First</Line_ID_Mapping>
-<SCA_Barge-In_Enable group="Phone/Miscellaneous_Line_Key_Settings">No</SCA_Barge-In_Enable>
-<SCA_Sticky_Auto_Line_Seize group="Phone/Miscellaneous_Line_Key_Settings">No</SCA_Sticky_Auto_Line_Seize>
+<SCA_Line_ID_Mapping group="Phone/Miscellaneous_Line_Key_Settings">Vertical First</SCA_Line_ID_Mapping>
+<SCA_Barge-In_Enable group="Phone/Miscellaneous_Line_Key_Settings">Yes</SCA_Barge-In_Enable>
 <Line_Navigation group="Phone/Miscellaneous_Line_Key_Settings">Per Line</Line_Navigation>
 
 <!-- Phone/Line_Key_LED_Pattern -->
@@ -439,7 +434,7 @@
 <Line_Enable_1_ group="Ext_1/General">Yes</Line_Enable_1_>
 
 <!-- Ext_1/Share_Line_Appearance -->
-<Share_Ext_1_ group="Ext_1/Share_Line_Appearance">private</Share_Ext_1_>
+<Share_Ext_1_ group="Ext_1/Share_Line_Appearance">{if $shared_line_1 == "shared"}shared{else}private{/if}</Share_Ext_1_>
 <Shared_User_ID_1_ group="Ext_1/Share_Line_Appearance" />
 <Subscription_Expires_1_ group="Ext_1/Share_Line_Appearance">3600</Subscription_Expires_1_>
 <Restrict_MWI_1_ group="Ext_1/Share_Line_Appearance">No</Restrict_MWI_1_>
@@ -486,6 +481,7 @@
 <Message_Waiting_1_ group="Ext_1/Call_Feature_Settings">No</Message_Waiting_1_>
 <Auth_Page_1_ group="Ext_1/Call_Feature_Settings">No</Auth_Page_1_>
 <Default_Ring__1__ group="Ext_1/Call_Feature_Settings">1</Default_Ring__1__>
+<Feature_Key_Sync_1_ group="Ext_1/Call_Feature_Settings">{$spa_feature_key_sync}</Feature_Key_Sync_1_>
 <Auth_Page_Realm_1_ group="Ext_1/Call_Feature_Settings" />
 <Conference_Bridge_URL_1_ group="Ext_1/Call_Feature_Settings" />
 <Auth_Page_Password_1_ group="Ext_1/Call_Feature_Settings" />
@@ -562,7 +558,7 @@
 <Line_Enable_2_ group="Ext_2/General">Yes</Line_Enable_2_>
 
 <!-- Ext_2/Share_Line_Appearance -->
-<Share_Ext_2_ group="Ext_2/Share_Line_Appearance">private</Share_Ext_2_>
+<Share_Ext_2_ group="Ext_2/Share_Line_Appearance">{if $shared_line_2 == "shared"}shared{else}private{/if}</Share_Ext_2_>
 <Shared_User_ID_2_ group="Ext_2/Share_Line_Appearance" />
 <Subscription_Expires_2_ group="Ext_2/Share_Line_Appearance">3600</Subscription_Expires_2_>
 <Restrict_MWI_2_ group="Ext_2/Share_Line_Appearance">No</Restrict_MWI_2_>
@@ -584,7 +580,7 @@
 
 <!-- Ext_2/SIP_Settings -->
 <SIP_Transport_2_ group="Ext_2/SIP_Settings">{$sip_transport_2|upper}</SIP_Transport_2_>
-<SIP_Port_2_ group="Ext_2/SIP_Settings">{$sip_transport_2}</SIP_Port_2_>
+<SIP_Port_2_ group="Ext_2/SIP_Settings">{$sip_port_2}</SIP_Port_2_>
 <SIP_100REL_Enable_2_ group="Ext_2/SIP_Settings">No</SIP_100REL_Enable_2_>
 <EXT_SIP_Port_2_ group="Ext_2/SIP_Settings" />
 <Auth_Resync-Reboot_2_ group="Ext_2/SIP_Settings">Yes</Auth_Resync-Reboot_2_>
@@ -609,6 +605,7 @@
 <Message_Waiting_2_ group="Ext_2/Call_Feature_Settings">No</Message_Waiting_2_>
 <Auth_Page_2_ group="Ext_2/Call_Feature_Settings">No</Auth_Page_2_>
 <Default_Ring__2__ group="Ext_2/Call_Feature_Settings">1</Default_Ring__2__>
+<Feature_Key_Sync_2_ group="Ext_2/Call_Feature_Settings">{$spa_feature_key_sync}</Feature_Key_Sync_2_>
 <Auth_Page_Realm_2_ group="Ext_2/Call_Feature_Settings" />
 <Conference_Bridge_URL_2_ group="Ext_2/Call_Feature_Settings" />
 <Auth_Page_Password_2_ group="Ext_2/Call_Feature_Settings" />
@@ -685,7 +682,7 @@
 <Line_Enable_3_ group="Ext_3/General">Yes</Line_Enable_3_>
 
 <!-- Ext_3/Share_Line_Appearance -->
-<Share_Ext_3_ group="Ext_3/Share_Line_Appearance">private</Share_Ext_3_>
+<Share_Ext_3_ group="Ext_3/Share_Line_Appearance">{if $shared_line_3 == "shared"}shared{else}private{/if}</Share_Ext_3_>
 <Shared_User_ID_3_ group="Ext_3/Share_Line_Appearance" />
 <Subscription_Expires_3_ group="Ext_3/Share_Line_Appearance">3600</Subscription_Expires_3_>
 <Restrict_MWI_3_ group="Ext_3/Share_Line_Appearance">No</Restrict_MWI_3_>
@@ -732,6 +729,7 @@
 <Message_Waiting_3_ group="Ext_3/Call_Feature_Settings">No</Message_Waiting_3_>
 <Auth_Page_3_ group="Ext_3/Call_Feature_Settings">No</Auth_Page_3_>
 <Default_Ring__3__ group="Ext_3/Call_Feature_Settings">1</Default_Ring__3__>
+<Feature_Key_Sync_3_ group="Ext_3/Call_Feature_Settings">{$spa_feature_key_sync}</Feature_Key_Sync_3_>
 <Auth_Page_Realm_3_ group="Ext_3/Call_Feature_Settings" />
 <Conference_Bridge_URL_3_ group="Ext_3/Call_Feature_Settings" />
 <Auth_Page_Password_3_ group="Ext_3/Call_Feature_Settings" />
@@ -808,7 +806,7 @@
 <Line_Enable_4_ group="Ext_4/General">Yes</Line_Enable_4_>
 
 <!-- Ext_4/Share_Line_Appearance -->
-<Share_Ext_4_ group="Ext_4/Share_Line_Appearance">private</Share_Ext_4_>
+<Share_Ext_4_ group="Ext_4/Share_Line_Appearance">{if $shared_line_4 == "shared"}shared{else}private{/if}</Share_Ext_4_>
 <Shared_User_ID_4_ group="Ext_4/Share_Line_Appearance" />
 <Subscription_Expires_4_ group="Ext_4/Share_Line_Appearance">3600</Subscription_Expires_4_>
 <Restrict_MWI_4_ group="Ext_4/Share_Line_Appearance">No</Restrict_MWI_4_>
@@ -855,6 +853,7 @@
 <Message_Waiting_4_ group="Ext_4/Call_Feature_Settings">No</Message_Waiting_4_>
 <Auth_Page_4_ group="Ext_4/Call_Feature_Settings">No</Auth_Page_4_>
 <Default_Ring__4__ group="Ext_4/Call_Feature_Settings">1</Default_Ring__4__>
+<Feature_Key_Sync_4_ group="Ext_4/Call_Feature_Settings">{$spa_feature_key_sync}</Feature_Key_Sync_4_>
 <Auth_Page_Realm_4_ group="Ext_4/Call_Feature_Settings" />
 <Conference_Bridge_URL_4_ group="Ext_4/Call_Feature_Settings" />
 <Auth_Page_Password_4_ group="Ext_4/Call_Feature_Settings" />
@@ -931,7 +930,7 @@
 <Line_Enable_5_ group="Ext_5/General">Yes</Line_Enable_5_>
 
 <!-- Ext_5/Share_Line_Appearance -->
-<Share_Ext_5_ group="Ext_5/Share_Line_Appearance">private</Share_Ext_5_>
+<Share_Ext_5_ group="Ext_5/Share_Line_Appearance">{if $shared_line_5 == "shared"}shared{else}private{/if}</Share_Ext_5_>
 <Shared_User_ID_5_ group="Ext_5/Share_Line_Appearance" />
 <Subscription_Expires_5_ group="Ext_5/Share_Line_Appearance">3600</Subscription_Expires_5_>
 <Restrict_MWI_5_ group="Ext_5/Share_Line_Appearance">No</Restrict_MWI_5_>
@@ -978,6 +977,7 @@
 <Message_Waiting_5_ group="Ext_5/Call_Feature_Settings">No</Message_Waiting_5_>
 <Auth_Page_5_ group="Ext_5/Call_Feature_Settings">No</Auth_Page_5_>
 <Default_Ring__5__ group="Ext_5/Call_Feature_Settings">1</Default_Ring__5__>
+<Feature_Key_Sync_5_ group="Ext_5/Call_Feature_Settings">{$spa_feature_key_sync}</Feature_Key_Sync_5_>
 <Auth_Page_Realm_5_ group="Ext_5/Call_Feature_Settings" />
 <Conference_Bridge_URL_5_ group="Ext_5/Call_Feature_Settings" />
 <Auth_Page_Password_5_ group="Ext_5/Call_Feature_Settings" />
@@ -1054,7 +1054,7 @@
 <Line_Enable_6_ group="Ext_6/General">Yes</Line_Enable_6_>
 
 <!-- Ext_6/Share_Line_Appearance -->
-<Share_Ext_6_ group="Ext_6/Share_Line_Appearance">private</Share_Ext_6_>
+<Share_Ext_6_ group="Ext_6/Share_Line_Appearance">{if $shared_line_6 == "shared"}shared{else}private{/if}</Share_Ext_6_>
 <Shared_User_ID_6_ group="Ext_6/Share_Line_Appearance" />
 <Subscription_Expires_6_ group="Ext_6/Share_Line_Appearance">3600</Subscription_Expires_6_>
 <Restrict_MWI_6_ group="Ext_6/Share_Line_Appearance">No</Restrict_MWI_6_>
@@ -1101,6 +1101,7 @@
 <Message_Waiting_6_ group="Ext_6/Call_Feature_Settings">No</Message_Waiting_6_>
 <Auth_Page_6_ group="Ext_6/Call_Feature_Settings">No</Auth_Page_6_>
 <Default_Ring__6__ group="Ext_6/Call_Feature_Settings">1</Default_Ring__6__>
+<Feature_Key_Sync_6_ group="Ext_6/Call_Feature_Settings">{$spa_feature_key_sync}</Feature_Key_Sync_6_>
 <Auth_Page_Realm_6_ group="Ext_6/Call_Feature_Settings" />
 <Conference_Bridge_URL_6_ group="Ext_6/Call_Feature_Settings" />
 <Auth_Page_Password_6_ group="Ext_6/Call_Feature_Settings" />
@@ -1177,7 +1178,7 @@
 <Line_Enable_7_ group="Ext_7/General">Yes</Line_Enable_7_>
 
 <!-- Ext_7/Share_Line_Appearance -->
-<Share_Ext_7_ group="Ext_7/Share_Line_Appearance">private</Share_Ext_7_>
+<Share_Ext_7_ group="Ext_7/Share_Line_Appearance">{if $shared_line_7 == "shared"}shared{else}private{/if}</Share_Ext_7_>
 <Shared_User_ID_7_ group="Ext_7/Share_Line_Appearance" />
 <Subscription_Expires_7_ group="Ext_7/Share_Line_Appearance">3600</Subscription_Expires_7_>
 <Restrict_MWI_7_ group="Ext_7/Share_Line_Appearance">No</Restrict_MWI_7_>
@@ -1224,6 +1225,7 @@
 <Message_Waiting_7_ group="Ext_7/Call_Feature_Settings">No</Message_Waiting_7_>
 <Auth_Page_7_ group="Ext_7/Call_Feature_Settings">No</Auth_Page_7_>
 <Default_Ring__7__ group="Ext_7/Call_Feature_Settings">1</Default_Ring__7__>
+<Feature_Key_Sync_7_ group="Ext_7/Call_Feature_Settings">{$spa_feature_key_sync}</Feature_Key_Sync_7_>
 <Auth_Page_Realm_7_ group="Ext_7/Call_Feature_Settings" />
 <Conference_Bridge_URL_7_ group="Ext_7/Call_Feature_Settings" />
 <Auth_Page_Password_7_ group="Ext_7/Call_Feature_Settings" />
@@ -1300,7 +1302,7 @@
 <Line_Enable_8_ group="Ext_8/General">Yes</Line_Enable_8_>
 
 <!-- Ext_8/Share_Line_Appearance -->
-<Share_Ext_8_ group="Ext_8/Share_Line_Appearance">private</Share_Ext_8_>
+<Share_Ext_8_ group="Ext_8/Share_Line_Appearance">{if $shared_line_8 == "shared"}shared{else}private{/if}</Share_Ext_8_>
 <Shared_User_ID_8_ group="Ext_8/Share_Line_Appearance" />
 <Subscription_Expires_8_ group="Ext_8/Share_Line_Appearance">3600</Subscription_Expires_8_>
 <Restrict_MWI_8_ group="Ext_8/Share_Line_Appearance">No</Restrict_MWI_8_>
@@ -1347,6 +1349,7 @@
 <Message_Waiting_8_ group="Ext_8/Call_Feature_Settings">No</Message_Waiting_8_>
 <Auth_Page_8_ group="Ext_8/Call_Feature_Settings">No</Auth_Page_8_>
 <Default_Ring__8__ group="Ext_8/Call_Feature_Settings">1</Default_Ring__8__>
+<Feature_Key_Sync_8_ group="Ext_8/Call_Feature_Settings">{$spa_feature_key_sync}</Feature_Key_Sync_8_>
 <Auth_Page_Realm_8_ group="Ext_8/Call_Feature_Settings" />
 <Conference_Bridge_URL_8_ group="Ext_8/Call_Feature_Settings" />
 <Auth_Page_Password_8_ group="Ext_8/Call_Feature_Settings" />