From 0fa3dcba3aca8e05c90f19256f2cb1e1a432a05d Mon Sep 17 00:00:00 2001
From: Mark Crane <markjcrane@gmail.com>
Date: Wed, 15 Jan 2014 23:53:25 +0000
Subject: [PATCH] Update Cisco SPA provisioning templates to get the key
 assignment working.

---
 .../provision/cisco/spa301/{$mac}.xml         |   2 +-
 .../provision/cisco/spa303/{$mac}.xml         |   6 +-
 .../provision/cisco/spa501g/{$mac}.xml        |  20 +-
 .../provision/cisco/spa502g/{$mac}.xml        |   2 +-
 .../provision/cisco/spa504g/{$mac}.xml        | 457 +++++++++---------
 .../provision/cisco/spa508g/{$mac}.xml        |  20 +-
 .../provision/cisco/spa509g/{$mac}.xml        |  28 +-
 .../provision/cisco/spa512g/{$mac}.xml        |   2 +-
 .../provision/cisco/spa514g/{$mac}.xml        |   8 +-
 .../provision/cisco/spa525g/{$mac}.xml        |  28 +-
 10 files changed, 287 insertions(+), 286 deletions(-)

diff --git a/resources/templates/provision/cisco/spa301/{$mac}.xml b/resources/templates/provision/cisco/spa301/{$mac}.xml
index 89ccd394c5..fb1a1e555c 100644
--- a/resources/templates/provision/cisco/spa301/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa301/{$mac}.xml
@@ -338,7 +338,7 @@
 
 <!-- Phone/Line_Key_1 -->
 {if $key_type_1 == 'line'}
-	<Extension_1_ group="Phone/Line_Key_1">{$key_id_1}</Extension_1_> 
+	<Extension_1_ group="Phone/Line_Key_1">{$key_value_1}</Extension_1_> 
 <!-- options: 1/2/3/4/5/6/7/8/9/10/11/12/Disabled -->
 	<Short_Name_1_ group="Phone/Line_Key_1">{$key_label_1}</Short_Name_1_>
 	<Share_Call_Appearance_1_ group="Phone/Line_Key_1">private</Share_Call_Appearance_1_> 
diff --git a/resources/templates/provision/cisco/spa303/{$mac}.xml b/resources/templates/provision/cisco/spa303/{$mac}.xml
index b37471bcce..d1d5c702f7 100644
--- a/resources/templates/provision/cisco/spa303/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa303/{$mac}.xml
@@ -1640,7 +1640,7 @@
 
 <!-- Phone/Line_Key_1 -->
 {if $key_type_1 == 'line'}
-	<Extension_1_ group="Phone/Line_Key_1">{$key_id_1}</Extension_1_> <!-- options: 1/2/3/4/5/6/7/8/9/10/11/12/Disabled -->
+	<Extension_1_ group="Phone/Line_Key_1">{$key_value_1}</Extension_1_> <!-- options: 1/2/3/4/5/6/7/8/9/10/11/12/Disabled -->
 	<Short_Name_1_ group="Phone/Line_Key_1">{$key_label_1}</Short_Name_1_>
 	<Share_Call_Appearance_1_ group="Phone/Line_Key_1">private</Share_Call_Appearance_1_> <!-- options: private/shared -->
 	<Extended_Function_1_ group="Phone/Line_Key_1"/>
@@ -1653,7 +1653,7 @@
 
 <!-- Phone/Line_Key_2 -->
 {if $key_type_2 == 'line'}
-	<Extension_2_ group="Phone/Line_Key_2">{$key_id_2}</Extension_2_> <!-- options: 1/2/3/4/5/6/7/8/9/10/11/12/Disabled -->
+	<Extension_2_ group="Phone/Line_Key_2">{$key_value_2}</Extension_2_> <!-- options: 1/2/3/4/5/6/7/8/9/10/11/12/Disabled -->
 	<Short_Name_2_ group="Phone/Line_Key_2">{$key_label_2}</Short_Name_2_>
 	<Share_Call_Appearance_2_ group="Phone/Line_Key_2">private</Share_Call_Appearance_2_> <!-- options: private/shared -->
 	<Extended_Function_2_ group="Phone/Line_Key_2"/>
@@ -1666,7 +1666,7 @@
 
 <!-- Phone/Line_Key_3 -->
 {if $key_type_3 == 'line'}
-	<Extension_3_ group="Phone/Line_Key_3">{$key_id_3}</Extension_3_> <!-- options: 1/2/3/4/5/6/7/8/9/10/11/12/Disabled -->
+	<Extension_3_ group="Phone/Line_Key_3">{$key_value_3}</Extension_3_> <!-- options: 1/2/3/4/5/6/7/8/9/10/11/12/Disabled -->
 	<Short_Name_3_ group="Phone/Line_Key_3">{$key_label_3}</Short_Name_3_>
 	<Share_Call_Appearance_3_ group="Phone/Line_Key_3">private</Share_Call_Appearance_3_> <!-- options: private/shared -->
 	<Extended_Function_3_ group="Phone/Line_Key_3"/>
diff --git a/resources/templates/provision/cisco/spa501g/{$mac}.xml b/resources/templates/provision/cisco/spa501g/{$mac}.xml
index 681dad86a6..65d14fd718 100644
--- a/resources/templates/provision/cisco/spa501g/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa501g/{$mac}.xml
@@ -344,7 +344,7 @@
 
 <!-- Phone/Line_Key_1 -->
 {if $key_type_1 == 'line'}
-	<Extension_1_ group="Phone/Line_Key_1">{$key_id_1}</Extension_1_>
+	<Extension_1_ group="Phone/Line_Key_1">{$key_value_1}</Extension_1_>
 	<Short_Name_1_ group="Phone/Line_Key_1">{$key_label_1}</Short_Name_1_>
 	<Share_Call_Appearance_1_ group="Phone/Line_Key_1">private</Share_Call_Appearance_1_>
 	<Extended_Function_1_ group="Phone/Line_Key_1"/>
@@ -358,7 +358,7 @@
 
 <!-- Phone/Line_Key_2 -->
 {if $key_type_2 == 'line'}
-	<Extension_2_ group="Phone/Line_Key_2">{$key_id_2}</Extension_2_>
+	<Extension_2_ group="Phone/Line_Key_2">{$key_value_2}</Extension_2_>
 	<Short_Name_2_ group="Phone/Line_Key_2">{$key_label_2}</Short_Name_2_>
 	<Share_Call_Appearance_2_ group="Phone/Line_Key_2">private</Share_Call_Appearance_2_>
 	<Extended_Function_2_ group="Phone/Line_Key_2"/>
@@ -372,7 +372,7 @@
 
 <!-- Phone/Line_Key_3 -->
 {if $key_type_3 == 'line'}
-	<Extension_3_ group="Phone/Line_Key_3">{$key_id_3}</Extension_3_>
+	<Extension_3_ group="Phone/Line_Key_3">{$key_value_3}</Extension_3_>
 	<Short_Name_3_ group="Phone/Line_Key_3">{$key_label_3}</Short_Name_3_>
 	<Share_Call_Appearance_3_ group="Phone/Line_Key_3">private</Share_Call_Appearance_3_>
 	<Extended_Function_3_ group="Phone/Line_Key_3"/>
@@ -386,7 +386,7 @@
 
 <!-- Phone/Line_Key_4 -->
 {if $key_type_4 == 'line'}
-	<Extension_4_ group="Phone/Line_Key_4">{$key_id_4}</Extension_4_>
+	<Extension_4_ group="Phone/Line_Key_4">{$key_value_4}</Extension_4_>
 	<Short_Name_4_ group="Phone/Line_Key_4">{$key_label_4}</Short_Name_4_>
 	<Share_Call_Appearance_4_ group="Phone/Line_Key_4">private</Share_Call_Appearance_4_>
 	<Extended_Function_4_ group="Phone/Line_Key_4"/>
@@ -400,7 +400,7 @@
 
 <!-- Phone/Line_Key_5 -->
 {if $key_type_5 == 'line'}
-	<Extension_5_ group="Phone/Line_Key_5">{$key_id_5}</Extension_5_>
+	<Extension_5_ group="Phone/Line_Key_5">{$key_value_5}</Extension_5_>
 	<Short_Name_5_ group="Phone/Line_Key_5">{$key_label_5}</Short_Name_5_>
 	<Share_Call_Appearance_5_ group="Phone/Line_Key_5">private</Share_Call_Appearance_5_>
 	<Extended_Function_5_ group="Phone/Line_Key_5"/>
@@ -414,8 +414,8 @@
 
 <!-- Phone/Line_Key_6 -->
 {if $key_type_6 == 'line'}
-	<Extension_6_ group="Phone/Line_Key_6">{$key_id_5}</Extension_6_>
-	<Short_Name_6_ group="Phone/Line_Key_6">{$key_label_5}</Short_Name_6_>
+	<Extension_6_ group="Phone/Line_Key_6">{$key_value_6}</Extension_6_>
+	<Short_Name_6_ group="Phone/Line_Key_6">{$key_label_6}</Short_Name_6_>
 	<Share_Call_Appearance_6_ group="Phone/Line_Key_6">private</Share_Call_Appearance_6_>
 	<Extended_Function_6_ group="Phone/Line_Key_6"/>
 {else}
@@ -428,8 +428,8 @@
 
 <!-- Phone/Line_Key_7 -->
 {if $key_type_7 == 'line'}
-	<Extension_7_ group="Phone/Line_Key_7">{$key_id_5}</Extension_7_>
-	<Short_Name_7_ group="Phone/Line_Key_7">{$key_label_5}</Short_Name_7_>
+	<Extension_7_ group="Phone/Line_Key_7">{$key_value_7}</Extension_7_>
+	<Short_Name_7_ group="Phone/Line_Key_7">{$key_label_7}</Short_Name_7_>
 	<Share_Call_Appearance_7_ group="Phone/Line_Key_7">private</Share_Call_Appearance_7_>
 	<Extended_Function_7_ group="Phone/Line_Key_7"/>
 {else}
@@ -442,7 +442,7 @@
 
 <!-- Phone/Line_Key_8 -->
 {if $key_type_8 == 'line'}
-	<Extension_8_ group="Phone/Line_Key_8">{$key_id_8}</Extension_8_>
+	<Extension_8_ group="Phone/Line_Key_8">{$key_value_8}</Extension_8_>
 	<Short_Name_8_ group="Phone/Line_Key_8">{$key_label_8}</Short_Name_8_>
 	<Share_Call_Appearance_8_ group="Phone/Line_Key_8">private</Share_Call_Appearance_8_>
 	<Extended_Function_8_ group="Phone/Line_Key_8"/>
diff --git a/resources/templates/provision/cisco/spa502g/{$mac}.xml b/resources/templates/provision/cisco/spa502g/{$mac}.xml
index dcb2d4bb1a..aab4ad0395 100644
--- a/resources/templates/provision/cisco/spa502g/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa502g/{$mac}.xml
@@ -358,7 +358,7 @@
 
 <!-- Phone/Line_Key_1 -->
 {if $key_type_1 == 'line'}
-	<Extension_1_ group="Phone/Line_Key_1">{$key_id_1}</Extension_1_>
+	<Extension_1_ group="Phone/Line_Key_1">{$key_value_1}</Extension_1_>
 	<Short_Name_1_ group="Phone/Line_Key_1">{$key_label_1}</Short_Name_1_>
 	<Share_Call_Appearance_1_ group="Phone/Line_Key_1">private</Share_Call_Appearance_1_>
 	<Extended_Function_1_ group="Phone/Line_Key_1"/>
diff --git a/resources/templates/provision/cisco/spa504g/{$mac}.xml b/resources/templates/provision/cisco/spa504g/{$mac}.xml
index 2bb69ace19..7b6da73a98 100644
--- a/resources/templates/provision/cisco/spa504g/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa504g/{$mac}.xml
@@ -1,9 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
 <flat-profile>
-<Syslog_Server group="System/Optional_Network_Configuration"/>
-<Debug_Server group="System/Optional_Network_Configuration"/>
+<Syslog_Server group="System/Optional_Network_Configuration" />
+<Debug_Server group="System/Optional_Network_Configuration" />
 <Debug_Level group="System/Optional_Network_Configuration">0</Debug_Level>
 <Primary_NTP_Server group="System/Optional_Network_Configuration">pool.ntp.org</Primary_NTP_Server>
-<Secondary_NTP_Server group="System/Optional_Network_Configuration"/>
+<Secondary_NTP_Server group="System/Optional_Network_Configuration" />
 <Enable_VLAN group="System/VLAN_Settings">No</Enable_VLAN>
 <Enable_CDP group="System/VLAN_Settings">Yes</Enable_CDP>
 <VLAN_ID group="System/VLAN_Settings">1</VLAN_ID>
@@ -15,8 +16,8 @@
 <Max_Auth group="SIP/SIP_Parameters">2</Max_Auth>
 <SIP_User_Agent_Name group="SIP/SIP_Parameters">$VERSION</SIP_User_Agent_Name>
 <SIP_Server_Name group="SIP/SIP_Parameters">$VERSION</SIP_Server_Name>
-<SIP_Reg_User_Agent_Name group="SIP/SIP_Parameters"/>
-<SIP_Accept_Language group="SIP/SIP_Parameters"/>
+<SIP_Reg_User_Agent_Name group="SIP/SIP_Parameters" />
+<SIP_Accept_Language group="SIP/SIP_Parameters" />
 <DTMF_Relay_MIME_Type group="SIP/SIP_Parameters">application/dtmf-relay</DTMF_Relay_MIME_Type>
 <Remove_Last_Reg group="SIP/SIP_Parameters">No</Remove_Last_Reg>
 <Use_Compact_Header group="SIP/SIP_Parameters">No</Use_Compact_Header>
@@ -49,18 +50,18 @@
 <Reg_Max_Expires group="SIP/SIP_Timer_Values__sec_">7200</Reg_Max_Expires>
 <Reg_Retry_Intvl group="SIP/SIP_Timer_Values__sec_">30</Reg_Retry_Intvl>
 <Reg_Retry_Long_Intvl group="SIP/SIP_Timer_Values__sec_">1200</Reg_Retry_Long_Intvl>
-<Reg_Retry_Random_Delay group="SIP/SIP_Timer_Values__sec_"/>
-<Reg_Retry_Long_Random_Delay group="SIP/SIP_Timer_Values__sec_"/>
-<Reg_Retry_Intvl_Cap group="SIP/SIP_Timer_Values__sec_"/>
+<Reg_Retry_Random_Delay group="SIP/SIP_Timer_Values__sec_" />
+<Reg_Retry_Long_Random_Delay group="SIP/SIP_Timer_Values__sec_" />
+<Reg_Retry_Intvl_Cap group="SIP/SIP_Timer_Values__sec_" />
 <Sub_Min_Expires group="SIP/SIP_Timer_Values__sec_">10</Sub_Min_Expires>
 <Sub_Max_Expires group="SIP/SIP_Timer_Values__sec_">7200</Sub_Max_Expires>
 <Sub_Retry_Intvl group="SIP/SIP_Timer_Values__sec_">10</Sub_Retry_Intvl>
-<SIT1_RSC group="SIP/Response_Status_Code_Handling"/>
-<SIT2_RSC group="SIP/Response_Status_Code_Handling"/>
-<SIT3_RSC group="SIP/Response_Status_Code_Handling"/>
-<SIT4_RSC group="SIP/Response_Status_Code_Handling"/>
-<Try_Backup_RSC group="SIP/Response_Status_Code_Handling"/>
-<Retry_Reg_RSC group="SIP/Response_Status_Code_Handling"/>
+<SIT1_RSC group="SIP/Response_Status_Code_Handling" />
+<SIT2_RSC group="SIP/Response_Status_Code_Handling" />
+<SIT3_RSC group="SIP/Response_Status_Code_Handling" />
+<SIT4_RSC group="SIP/Response_Status_Code_Handling" />
+<Try_Backup_RSC group="SIP/Response_Status_Code_Handling" />
+<Retry_Reg_RSC group="SIP/Response_Status_Code_Handling" />
 <RTP_Port_Min group="SIP/RTP_Parameters">16384</RTP_Port_Min>
 <RTP_Port_Max group="SIP/RTP_Parameters">16538</RTP_Port_Max>
 <RTP_Packet_Size group="SIP/RTP_Parameters">0.020</RTP_Packet_Size>
@@ -70,7 +71,7 @@
 <Symmetric_RTP group="SIP/RTP_Parameters">No</Symmetric_RTP>
 <Stats_In_BYE group="SIP/RTP_Parameters">No</Stats_In_BYE>
 <AVT_Dynamic_Payload group="SIP/SDP_Payload_Types">101</AVT_Dynamic_Payload>
-<INFOREQ_Dynamic_Payload group="SIP/SDP_Payload_Types"/>
+<INFOREQ_Dynamic_Payload group="SIP/SDP_Payload_Types" />
 <G726r16_Dynamic_Payload group="SIP/SDP_Payload_Types">98</G726r16_Dynamic_Payload>
 <G726r24_Dynamic_Payload group="SIP/SDP_Payload_Types">97</G726r24_Dynamic_Payload>
 <G726r32_Dynamic_Payload group="SIP/SDP_Payload_Types">2</G726r32_Dynamic_Payload>
@@ -98,9 +99,9 @@
 <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>
 <STUN_Test_Enable group="SIP/NAT_Support_Parameters">No</STUN_Test_Enable>
-<STUN_Server group="SIP/NAT_Support_Parameters"/>
-<EXT_IP group="SIP/NAT_Support_Parameters"/>
-<EXT_RTP_Port_Min group="SIP/NAT_Support_Parameters"/>
+<STUN_Server group="SIP/NAT_Support_Parameters" />
+<EXT_IP group="SIP/NAT_Support_Parameters" />
+<EXT_RTP_Port_Min group="SIP/NAT_Support_Parameters" />
 <NAT_Keep_Alive_Intvl group="SIP/NAT_Support_Parameters">15</NAT_Keep_Alive_Intvl>
 <Linksys_Key_System group="SIP/Linksys_Key_System_Parameters">No</Linksys_Key_System>
 <Force_LAN_Codec group="SIP/Linksys_Key_System_Parameters">none</Force_LAN_Codec>
@@ -112,50 +113,50 @@
 <Forced_Resync_Delay group="Provisioning/Configuration_Profile">14400</Forced_Resync_Delay>
 <Resync_From_SIP group="Provisioning/Configuration_Profile">Yes</Resync_From_SIP>
 <Resync_After_Upgrade_Attempt group="Provisioning/Configuration_Profile">Yes</Resync_After_Upgrade_Attempt>
-<Resync_Trigger_1 group="Provisioning/Configuration_Profile"/>
-<Resync_Trigger_2 group="Provisioning/Configuration_Profile"/>
+<Resync_Trigger_1 group="Provisioning/Configuration_Profile" />
+<Resync_Trigger_2 group="Provisioning/Configuration_Profile" />
 <Resync_Fails_On_FNF group="Provisioning/Configuration_Profile">Yes</Resync_Fails_On_FNF>
 <Profile_Rule group="Provisioning/Configuration_Profile">http://{$domain_name}{$project_path}/app/provision/?mac=$MA</Profile_Rule>
-<Profile_Rule_B group="Provisioning/Configuration_Profile"/>
-<Profile_Rule_C group="Provisioning/Configuration_Profile"/>
-<Profile_Rule_D group="Provisioning/Configuration_Profile"/>
+<Profile_Rule_B group="Provisioning/Configuration_Profile" />
+<Profile_Rule_C group="Provisioning/Configuration_Profile" />
+<Profile_Rule_D group="Provisioning/Configuration_Profile" />
 <Log_Resync_Request_Msg group="Provisioning/Configuration_Profile">$PN $MAC -- Requesting resync $SCHEME://$SERVIP:$PORT$PATH</Log_Resync_Request_Msg>
 <Log_Resync_Success_Msg group="Provisioning/Configuration_Profile">$PN $MAC -- Successful resync $SCHEME://$SERVIP:$PORT$PATH</Log_Resync_Success_Msg>
 <Log_Resync_Failure_Msg group="Provisioning/Configuration_Profile">$PN $MAC -- Resync failed: $ERR</Log_Resync_Failure_Msg>
-<Report_Rule group="Provisioning/Configuration_Profile"/>
+<Report_Rule group="Provisioning/Configuration_Profile" />
 <User_Configurable_Resync group="Provisioning/Configuration_Profile">No</User_Configurable_Resync>
 <Upgrade_Enable group="Provisioning/Firmware_Upgrade">Yes</Upgrade_Enable>
 <Upgrade_Error_Retry_Delay group="Provisioning/Firmware_Upgrade">3600</Upgrade_Error_Retry_Delay>
-<Downgrade_Rev_Limit group="Provisioning/Firmware_Upgrade"/>
-<Upgrade_Rule group="Provisioning/Firmware_Upgrade"/>
+<Downgrade_Rev_Limit group="Provisioning/Firmware_Upgrade" />
+<Upgrade_Rule group="Provisioning/Firmware_Upgrade" />
 <Log_Upgrade_Request_Msg group="Provisioning/Firmware_Upgrade">$PN $MAC -- Requesting upgrade $SCHEME://$SERVIP:$PORT$PATH</Log_Upgrade_Request_Msg>
 <Log_Upgrade_Success_Msg group="Provisioning/Firmware_Upgrade">$PN $MAC -- Successful upgrade $SCHEME://$SERVIP:$PORT$PATH -- $ERR</Log_Upgrade_Success_Msg>
 <Log_Upgrade_Failure_Msg group="Provisioning/Firmware_Upgrade">$PN $MAC -- Upgrade failed: $ERR</Log_Upgrade_Failure_Msg>
-<License_Keys group="Provisioning/Firmware_Upgrade"/>
-<GPP_A group="Provisioning/General_Purpose_Parameters"/>
-<GPP_B group="Provisioning/General_Purpose_Parameters"/>
-<GPP_C group="Provisioning/General_Purpose_Parameters"/>
-<GPP_D group="Provisioning/General_Purpose_Parameters"/>
-<GPP_E group="Provisioning/General_Purpose_Parameters"/>
-<GPP_F group="Provisioning/General_Purpose_Parameters"/>
-<GPP_G group="Provisioning/General_Purpose_Parameters"/>
-<GPP_H group="Provisioning/General_Purpose_Parameters"/>
-<GPP_I group="Provisioning/General_Purpose_Parameters"/>
-<GPP_J group="Provisioning/General_Purpose_Parameters"/>
-<GPP_K group="Provisioning/General_Purpose_Parameters"/>
-<GPP_L group="Provisioning/General_Purpose_Parameters"/>
-<GPP_M group="Provisioning/General_Purpose_Parameters"/>
-<GPP_N group="Provisioning/General_Purpose_Parameters"/>
-<GPP_O group="Provisioning/General_Purpose_Parameters"/>
-<GPP_P group="Provisioning/General_Purpose_Parameters"/>
+<License_Keys group="Provisioning/Firmware_Upgrade" />
+<GPP_A group="Provisioning/General_Purpose_Parameters" />
+<GPP_B group="Provisioning/General_Purpose_Parameters" />
+<GPP_C group="Provisioning/General_Purpose_Parameters" />
+<GPP_D group="Provisioning/General_Purpose_Parameters" />
+<GPP_E group="Provisioning/General_Purpose_Parameters" />
+<GPP_F group="Provisioning/General_Purpose_Parameters" />
+<GPP_G group="Provisioning/General_Purpose_Parameters" />
+<GPP_H group="Provisioning/General_Purpose_Parameters" />
+<GPP_I group="Provisioning/General_Purpose_Parameters" />
+<GPP_J group="Provisioning/General_Purpose_Parameters" />
+<GPP_K group="Provisioning/General_Purpose_Parameters" />
+<GPP_L group="Provisioning/General_Purpose_Parameters" />
+<GPP_M group="Provisioning/General_Purpose_Parameters" />
+<GPP_N group="Provisioning/General_Purpose_Parameters" />
+<GPP_O group="Provisioning/General_Purpose_Parameters" />
+<GPP_P group="Provisioning/General_Purpose_Parameters" />
 <Time_Zone group="Regional/Miscellaneous">GMT{$time_zone_offset}</Time_Zone>
-<Time_Offset__HH_mm_ group="Regional/Miscellaneous"/>
-<Daylight_Saving_Time_Rule group="Regional/Miscellaneous"/>
+<Time_Offset__HH_mm_ group="Regional/Miscellaneous" />
+<Daylight_Saving_Time_Rule group="Regional/Miscellaneous" />
 <Daylight_Saving_Time_Enable group="Regional/Miscellaneous">No</Daylight_Saving_Time_Enable>
 <Station_Name group="Phone/General">{$display_name_1}</Station_Name>
 <Voice_Mail_Number group="Phone/General">*97</Voice_Mail_Number>
-<Text_Logo group="Phone/General"/>
-<BMP_Picture_Download_URL group="Phone/General"/>
+<Text_Logo group="Phone/General" />
+<BMP_Picture_Download_URL group="Phone/General" />
 <Select_Logo group="Phone/General">Default</Select_Logo>
 <Select_Background_Picture group="Phone/General">None</Select_Background_Picture>
 <Screen_Saver_Enable group="Phone/General">No</Screen_Saver_Enable>
@@ -164,7 +165,7 @@
 
 <!-- Phone/Line_Key_1 -->
 {if $key_type_1 == 'line'}
-	<Extension_1_ group="Phone/Line_Key_1">{$key_id_1}</Extension_1_>
+	<Extension_1_ group="Phone/Line_Key_1">{$key_value_1}</Extension_1_>
 	<Short_Name_1_ group="Phone/Line_Key_1">{$key_label_1}</Short_Name_1_>
 	<Share_Call_Appearance_1_ group="Phone/Line_Key_1">private</Share_Call_Appearance_1_>
 	<Extended_Function_1_ group="Phone/Line_Key_1"/>
@@ -177,7 +178,7 @@
 
 <!-- Phone/Line_Key_2 -->
 {if $key_type_2 == 'line'}
-	<Extension_2_ group="Phone/Line_Key_2">{$key_id_2}</Extension_2_>
+	<Extension_2_ group="Phone/Line_Key_2">{$key_value_2}</Extension_2_>
 	<Short_Name_2_ group="Phone/Line_Key_2">{$key_label_2}</Short_Name_2_>
 	<Share_Call_Appearance_2_ group="Phone/Line_Key_2">private</Share_Call_Appearance_2_>
 	<Extended_Function_2_ group="Phone/Line_Key_2"/>
@@ -190,7 +191,7 @@
 
 <!-- Phone/Line_Key_3 -->
 {if $key_type_3 == 'line'}
-	<Extension_3_ group="Phone/Line_Key_3">{$key_id_3}</Extension_3_>
+	<Extension_3_ group="Phone/Line_Key_3">{$key_value_3}</Extension_3_>
 	<Short_Name_3_ group="Phone/Line_Key_3">{$key_label_3}</Short_Name_3_>
 	<Share_Call_Appearance_3_ group="Phone/Line_Key_3">private</Share_Call_Appearance_3_>
 	<Extended_Function_3_ group="Phone/Line_Key_3"/>
@@ -216,22 +217,22 @@
 
 <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">No</SCA_Barge-In_Enable>
-<Idle_LED group="Phone/Line_Key_LED_Pattern"/>
-<Remote_Undefined_LED group="Phone/Line_Key_LED_Pattern"/>
-<Local_Seized_LED group="Phone/Line_Key_LED_Pattern"/>
-<Remote_Seized_LED group="Phone/Line_Key_LED_Pattern"/>
-<Local_Progressing_LED group="Phone/Line_Key_LED_Pattern"/>
-<Remote_Progressing_LED group="Phone/Line_Key_LED_Pattern"/>
-<Local_Ringing_LED group="Phone/Line_Key_LED_Pattern"/>
-<Remote_Ringing_LED group="Phone/Line_Key_LED_Pattern"/>
-<Local_Active_LED group="Phone/Line_Key_LED_Pattern"/>
-<Remote_Active_LED group="Phone/Line_Key_LED_Pattern"/>
-<Local_Held_LED group="Phone/Line_Key_LED_Pattern"/>
-<Remote_Held_LED group="Phone/Line_Key_LED_Pattern"/>
-<Register_Failed_LED group="Phone/Line_Key_LED_Pattern"/>
-<Disabled_LED group="Phone/Line_Key_LED_Pattern"/>
-<Registering_LED group="Phone/Line_Key_LED_Pattern"/>
-<Call_Back_Active_LED group="Phone/Line_Key_LED_Pattern"/>
+<Idle_LED group="Phone/Line_Key_LED_Pattern" />
+<Remote_Undefined_LED group="Phone/Line_Key_LED_Pattern" />
+<Local_Seized_LED group="Phone/Line_Key_LED_Pattern" />
+<Remote_Seized_LED group="Phone/Line_Key_LED_Pattern" />
+<Local_Progressing_LED group="Phone/Line_Key_LED_Pattern" />
+<Remote_Progressing_LED group="Phone/Line_Key_LED_Pattern" />
+<Local_Ringing_LED group="Phone/Line_Key_LED_Pattern" />
+<Remote_Ringing_LED group="Phone/Line_Key_LED_Pattern" />
+<Local_Active_LED group="Phone/Line_Key_LED_Pattern" />
+<Remote_Active_LED group="Phone/Line_Key_LED_Pattern" />
+<Local_Held_LED group="Phone/Line_Key_LED_Pattern" />
+<Remote_Held_LED group="Phone/Line_Key_LED_Pattern" />
+<Register_Failed_LED group="Phone/Line_Key_LED_Pattern" />
+<Disabled_LED group="Phone/Line_Key_LED_Pattern" />
+<Registering_LED group="Phone/Line_Key_LED_Pattern" />
+<Call_Back_Active_LED group="Phone/Line_Key_LED_Pattern" />
 <Conference_Serv group="Phone/Supplementary_Services">Yes</Conference_Serv>
 <Attn_Transfer_Serv group="Phone/Supplementary_Services">Yes</Attn_Transfer_Serv>
 <Blind_Transfer_Serv group="Phone/Supplementary_Services">Yes</Blind_Transfer_Serv>
@@ -267,26 +268,26 @@
 <Headset_Additional_Input_Gain group="Phone/Audio_Input_Gain__dB_">0</Headset_Additional_Input_Gain>
 <Speakerphone_Additional_Input_Gain group="Phone/Audio_Input_Gain__dB_">0</Speakerphone_Additional_Input_Gain>
 <LDAP_Dir_Enable group="Phone/LDAP_Corporate_Directory_Search">No</LDAP_Dir_Enable>
-<LDAP_Corp_Dir_Name group="Phone/LDAP_Corporate_Directory_Search"/>
-<LDAP_Server group="Phone/LDAP_Corporate_Directory_Search"/>
+<LDAP_Corp_Dir_Name group="Phone/LDAP_Corporate_Directory_Search" />
+<LDAP_Server group="Phone/LDAP_Corporate_Directory_Search" />
 <LDAP_Auth_Method group="Phone/LDAP_Corporate_Directory_Search">None</LDAP_Auth_Method>
-<LDAP_Client_DN group="Phone/LDAP_Corporate_Directory_Search"/>
-<LDAP_Username group="Phone/LDAP_Corporate_Directory_Search"/>
-<LDAP_Password group="Phone/LDAP_Corporate_Directory_Search"/>
-<LDAP_Search_Base group="Phone/LDAP_Corporate_Directory_Search"/>
-<LDAP_Last_Name_Filter group="Phone/LDAP_Corporate_Directory_Search"/>
-<LDAP_First_Name_Filter group="Phone/LDAP_Corporate_Directory_Search"/>
-<LDAP_Search_Item_3 group="Phone/LDAP_Corporate_Directory_Search"/>
-<LDAP_Item_3_Filter group="Phone/LDAP_Corporate_Directory_Search"/>
-<LDAP_Search_Item_4 group="Phone/LDAP_Corporate_Directory_Search"/>
-<LDAP_item_4_Filter group="Phone/LDAP_Corporate_Directory_Search"/>
-<LDAP_Display_Attrs group="Phone/LDAP_Corporate_Directory_Search"/>
-<LDAP_Number_Mapping group="Phone/LDAP_Corporate_Directory_Search"/>
+<LDAP_Client_DN group="Phone/LDAP_Corporate_Directory_Search" />
+<LDAP_Username group="Phone/LDAP_Corporate_Directory_Search" />
+<LDAP_Password group="Phone/LDAP_Corporate_Directory_Search" />
+<LDAP_Search_Base group="Phone/LDAP_Corporate_Directory_Search" />
+<LDAP_Last_Name_Filter group="Phone/LDAP_Corporate_Directory_Search" />
+<LDAP_First_Name_Filter group="Phone/LDAP_Corporate_Directory_Search" />
+<LDAP_Search_Item_3 group="Phone/LDAP_Corporate_Directory_Search" />
+<LDAP_Item_3_Filter group="Phone/LDAP_Corporate_Directory_Search" />
+<LDAP_Search_Item_4 group="Phone/LDAP_Corporate_Directory_Search" />
+<LDAP_item_4_Filter group="Phone/LDAP_Corporate_Directory_Search" />
+<LDAP_Display_Attrs group="Phone/LDAP_Corporate_Directory_Search" />
+<LDAP_Number_Mapping group="Phone/LDAP_Corporate_Directory_Search" />
 <EM_Enable group="Phone/Extension_Mobility">No</EM_Enable>
-<EM_User_Domain group="Phone/Extension_Mobility"/>
+<EM_User_Domain group="Phone/Extension_Mobility" />
 <Line_Enable_1_ group="Ext_1/General">Yes</Line_Enable_1_>
 <Share_Ext_1_ group="Ext_1/Share_Line_Appearance">private</Share_Ext_1_>
-<Shared_User_ID_1_ group="Ext_1/Share_Line_Appearance"/>
+<Shared_User_ID_1_ group="Ext_1/Share_Line_Appearance" />
 <Subscription_Expires_1_ group="Ext_1/Share_Line_Appearance">3600</Subscription_Expires_1_>
 <NAT_Mapping_Enable_1_ group="Ext_1/NAT_Settings">No</NAT_Mapping_Enable_1_>
 <NAT_Keep_Alive_Enable_1_ group="Ext_1/NAT_Settings">No</NAT_Keep_Alive_Enable_1_>
@@ -301,9 +302,9 @@
 <SIP_Transport_1_ group="Ext_1/SIP_Settings">{$sip_transport_1}</SIP_Transport_1_>
 <SIP_Port_1_ group="Ext_1/SIP_Settings">{$sip_port_1}</SIP_Port_1_>
 <SIP_100REL_Enable_1_ group="Ext_1/SIP_Settings">No</SIP_100REL_Enable_1_>
-<EXT_SIP_Port_1_ group="Ext_1/SIP_Settings"/>
+<EXT_SIP_Port_1_ group="Ext_1/SIP_Settings" />
 <Auth_Resync-Reboot_1_ group="Ext_1/SIP_Settings">Yes</Auth_Resync-Reboot_1_>
-<SIP_Proxy-Require_1_ group="Ext_1/SIP_Settings"/>
+<SIP_Proxy-Require_1_ group="Ext_1/SIP_Settings" />
 <SIP_Remote-Party-ID_1_ group="Ext_1/SIP_Settings">No</SIP_Remote-Party-ID_1_>
 <Referor_Bye_Delay_1_ group="Ext_1/SIP_Settings">4</Referor_Bye_Delay_1_>
 <Refer-To_Target_Contact_1_ group="Ext_1/SIP_Settings">No</Refer-To_Target_Contact_1_>
@@ -316,20 +317,20 @@
 <Use_Anonymous_With_RPID_1_ group="Ext_1/SIP_Settings">Yes</Use_Anonymous_With_RPID_1_>
 <Set_G729_annexb_1_ group="Ext_1/SIP_Settings">none</Set_G729_annexb_1_>
 <Blind_Attn-Xfer_Enable_1_ group="Ext_1/Call_Feature_Settings">No</Blind_Attn-Xfer_Enable_1_>
-<MOH_Server_1_ group="Ext_1/Call_Feature_Settings"/>
+<MOH_Server_1_ group="Ext_1/Call_Feature_Settings" />
 <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__>
-<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"/>
-<Mailbox_ID_1_ group="Ext_1/Call_Feature_Settings"/>
-<Voice_Mail_Server_1_ group="Ext_1/Call_Feature_Settings"/>
-<State_Agent_1_ group="Ext_1/Call_Feature_Settings"/>
+<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" />
+<Mailbox_ID_1_ group="Ext_1/Call_Feature_Settings" />
+<Voice_Mail_Server_1_ group="Ext_1/Call_Feature_Settings" />
+<State_Agent_1_ group="Ext_1/Call_Feature_Settings" />
 <CFWD_Notify_Serv_1_ group="Ext_1/Call_Feature_Settings">No</CFWD_Notify_Serv_1_>
-<CFWD_Notifier_1_ group="Ext_1/Call_Feature_Settings"/>
-<Proxy_1_ group="Ext_1/Proxy_and_Registration">{$domain_name}</Proxy_1_>
+<CFWD_Notifier_1_ group="Ext_1/Call_Feature_Settings" />
+<Proxy_1_ group="Ext_1/Proxy_and_Registration">{$server_address_1}</Proxy_1_>
 <Use_Outbound_Proxy_1_ group="Ext_1/Proxy_and_Registration">No</Use_Outbound_Proxy_1_>
-<Outbound_Proxy_1_ group="Ext_1/Proxy_and_Registration"/>
+<Outbound_Proxy_1_ group="Ext_1/Proxy_and_Registration" />
 <Use_OB_Proxy_In_Dialog_1_ group="Ext_1/Proxy_and_Registration">Yes</Use_OB_Proxy_In_Dialog_1_>
 <Register_1_ group="Ext_1/Proxy_and_Registration">Yes</Register_1_>
 <Make_Call_Without_Reg_1_ group="Ext_1/Proxy_and_Registration">No</Make_Call_Without_Reg_1_>
@@ -343,9 +344,9 @@
 <User_ID_1_ group="Ext_1/Subscriber_Information">{$user_id_1}</User_ID_1_>
 <Password_1_ group="Ext_1/Subscriber_Information">{$user_password_1}</Password_1_>
 <Use_Auth_ID_1_ group="Ext_1/Subscriber_Information">No</Use_Auth_ID_1_>
-<Auth_ID_1_ group="Ext_1/Subscriber_Information"/>
-<Mini_Certificate_1_ group="Ext_1/Subscriber_Information"/>
-<SRTP_Private_Key_1_ group="Ext_1/Subscriber_Information"/>
+<Auth_ID_1_ group="Ext_1/Subscriber_Information" />
+<Mini_Certificate_1_ group="Ext_1/Subscriber_Information" />
+<SRTP_Private_Key_1_ group="Ext_1/Subscriber_Information" />
 <Preferred_Codec_1_ group="Ext_1/Audio_Configuration">G711u</Preferred_Codec_1_>
 <Use_Pref_Codec_Only_1_ group="Ext_1/Audio_Configuration">No</Use_Pref_Codec_Only_1_>
 <Second_Preferred_Codec_1_ group="Ext_1/Audio_Configuration">Unspecified</Second_Preferred_Codec_1_>
@@ -361,12 +362,12 @@
 <Silence_Supp_Enable_1_ group="Ext_1/Audio_Configuration">No</Silence_Supp_Enable_1_>
 <DTMF_Tx_Method_1_ group="Ext_1/Audio_Configuration">Auto</DTMF_Tx_Method_1_>
 <Dial_Plan_1_ group="Ext_1/Dial_Plan">(*xxxxxxx|*xxxxxx|*xxxxx|*xxxx|*xxx|*xx*|*x|**xxxxx|**xxxx|**xxx|**xx|[3469]11|0|00|[2-9]xxxxxx|1xxx[2-9]xxxxxxS0|xxxxxxxxxxxx.)</Dial_Plan_1_>
-<Caller_ID_Map_1_ group="Ext_1/Dial_Plan"/>
+<Caller_ID_Map_1_ group="Ext_1/Dial_Plan" />
 <Enable_IP_Dialing_1_ group="Ext_1/Dial_Plan">Yes</Enable_IP_Dialing_1_>
-<Emergency_Number_1_ group="Ext_1/Dial_Plan"/>
+<Emergency_Number_1_ group="Ext_1/Dial_Plan" />
 <Line_Enable_2_ group="Ext_2/General">Yes</Line_Enable_2_>
 <Share_Ext_2_ group="Ext_2/Share_Line_Appearance">private</Share_Ext_2_>
-<Shared_User_ID_2_ group="Ext_2/Share_Line_Appearance"/>
+<Shared_User_ID_2_ group="Ext_2/Share_Line_Appearance" />
 <Subscription_Expires_2_ group="Ext_2/Share_Line_Appearance">3600</Subscription_Expires_2_>
 <NAT_Mapping_Enable_2_ group="Ext_2/NAT_Settings">No</NAT_Mapping_Enable_2_>
 <NAT_Keep_Alive_Enable_2_ group="Ext_2/NAT_Settings">No</NAT_Keep_Alive_Enable_2_>
@@ -381,9 +382,9 @@
 <SIP_Transport_2_ group="Ext_2/SIP_Settings">{$sip_transport_2}</SIP_Transport_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"/>
+<EXT_SIP_Port_2_ group="Ext_2/SIP_Settings" />
 <Auth_Resync-Reboot_2_ group="Ext_2/SIP_Settings">Yes</Auth_Resync-Reboot_2_>
-<SIP_Proxy-Require_2_ group="Ext_2/SIP_Settings"/>
+<SIP_Proxy-Require_2_ group="Ext_2/SIP_Settings" />
 <SIP_Remote-Party-ID_2_ group="Ext_2/SIP_Settings">No</SIP_Remote-Party-ID_2_>
 <Referor_Bye_Delay_2_ group="Ext_2/SIP_Settings">4</Referor_Bye_Delay_2_>
 <Refer-To_Target_Contact_2_ group="Ext_2/SIP_Settings">No</Refer-To_Target_Contact_2_>
@@ -396,20 +397,20 @@
 <Use_Anonymous_With_RPID_2_ group="Ext_2/SIP_Settings">Yes</Use_Anonymous_With_RPID_2_>
 <Set_G729_annexb_2_ group="Ext_2/SIP_Settings">none</Set_G729_annexb_2_>
 <Blind_Attn-Xfer_Enable_2_ group="Ext_2/Call_Feature_Settings">No</Blind_Attn-Xfer_Enable_2_>
-<MOH_Server_2_ group="Ext_2/Call_Feature_Settings"/>
+<MOH_Server_2_ group="Ext_2/Call_Feature_Settings" />
 <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__>
-<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"/>
-<Mailbox_ID_2_ group="Ext_2/Call_Feature_Settings"/>
-<Voice_Mail_Server_2_ group="Ext_2/Call_Feature_Settings"/>
-<State_Agent_2_ group="Ext_2/Call_Feature_Settings"/>
+<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" />
+<Mailbox_ID_2_ group="Ext_2/Call_Feature_Settings" />
+<Voice_Mail_Server_2_ group="Ext_2/Call_Feature_Settings" />
+<State_Agent_2_ group="Ext_2/Call_Feature_Settings" />
 <CFWD_Notify_Serv_2_ group="Ext_2/Call_Feature_Settings">No</CFWD_Notify_Serv_2_>
-<CFWD_Notifier_2_ group="Ext_2/Call_Feature_Settings"/>
-<Proxy_2_ group="Ext_2/Proxy_and_Registration">{$domain_name}</Proxy_2_>
+<CFWD_Notifier_2_ group="Ext_2/Call_Feature_Settings" />
+<Proxy_2_ group="Ext_2/Proxy_and_Registration">{$server_address_2}</Proxy_2_>
 <Use_Outbound_Proxy_2_ group="Ext_2/Proxy_and_Registration">No</Use_Outbound_Proxy_2_>
-<Outbound_Proxy_2_ group="Ext_2/Proxy_and_Registration"/>
+<Outbound_Proxy_2_ group="Ext_2/Proxy_and_Registration" />
 <Use_OB_Proxy_In_Dialog_2_ group="Ext_2/Proxy_and_Registration">Yes</Use_OB_Proxy_In_Dialog_2_>
 <Register_2_ group="Ext_2/Proxy_and_Registration">Yes</Register_2_>
 <Make_Call_Without_Reg_2_ group="Ext_2/Proxy_and_Registration">No</Make_Call_Without_Reg_2_>
@@ -423,9 +424,9 @@
 <User_ID_2_ group="Ext_2/Subscriber_Information">{$user_id_2}</User_ID_2_>
 <Password_2_ group="Ext_2/Subscriber_Information">{$user_password_2}</Password_2_>
 <Use_Auth_ID_2_ group="Ext_2/Subscriber_Information">No</Use_Auth_ID_2_>
-<Auth_ID_2_ group="Ext_2/Subscriber_Information"/>
-<Mini_Certificate_2_ group="Ext_2/Subscriber_Information"/>
-<SRTP_Private_Key_2_ group="Ext_2/Subscriber_Information"/>
+<Auth_ID_2_ group="Ext_2/Subscriber_Information" />
+<Mini_Certificate_2_ group="Ext_2/Subscriber_Information" />
+<SRTP_Private_Key_2_ group="Ext_2/Subscriber_Information" />
 <Preferred_Codec_2_ group="Ext_2/Audio_Configuration">G711u</Preferred_Codec_2_>
 <Use_Pref_Codec_Only_2_ group="Ext_2/Audio_Configuration">No</Use_Pref_Codec_Only_2_>
 <Second_Preferred_Codec_2_ group="Ext_2/Audio_Configuration">Unspecified</Second_Preferred_Codec_2_>
@@ -441,12 +442,12 @@
 <Silence_Supp_Enable_2_ group="Ext_2/Audio_Configuration">No</Silence_Supp_Enable_2_>
 <DTMF_Tx_Method_2_ group="Ext_2/Audio_Configuration">Auto</DTMF_Tx_Method_2_>
 <Dial_Plan_2_ group="Ext_2/Dial_Plan">(*xxxxxxx|*xxxxxx|*xxxxx|*xxxx|*xxx|*xx*|*x|**xxxxx|**xxxx|**xxx|**xx|[3469]11|0|00|[2-9]xxxxxx|1xxx[2-9]xxxxxxS0|xxxxxxxxxxxx.)</Dial_Plan_2_>
-<Caller_ID_Map_2_ group="Ext_2/Dial_Plan"/>
+<Caller_ID_Map_2_ group="Ext_2/Dial_Plan" />
 <Enable_IP_Dialing_2_ group="Ext_2/Dial_Plan">Yes</Enable_IP_Dialing_2_>
-<Emergency_Number_2_ group="Ext_2/Dial_Plan"/>
+<Emergency_Number_2_ group="Ext_2/Dial_Plan" />
 <Line_Enable_3_ group="Ext_3/General">Yes</Line_Enable_3_>
 <Share_Ext_3_ group="Ext_3/Share_Line_Appearance">private</Share_Ext_3_>
-<Shared_User_ID_3_ group="Ext_3/Share_Line_Appearance"/>
+<Shared_User_ID_3_ group="Ext_3/Share_Line_Appearance" />
 <Subscription_Expires_3_ group="Ext_3/Share_Line_Appearance">3600</Subscription_Expires_3_>
 <NAT_Mapping_Enable_3_ group="Ext_3/NAT_Settings">No</NAT_Mapping_Enable_3_>
 <NAT_Keep_Alive_Enable_3_ group="Ext_3/NAT_Settings">No</NAT_Keep_Alive_Enable_3_>
@@ -461,9 +462,9 @@
 <SIP_Transport_3_ group="Ext_3/SIP_Settings">{$sip_transport_3}</SIP_Transport_3_>
 <SIP_Port_3_ group="Ext_3/SIP_Settings">{$sip_port_3}</SIP_Port_3_>
 <SIP_100REL_Enable_3_ group="Ext_3/SIP_Settings">No</SIP_100REL_Enable_3_>
-<EXT_SIP_Port_3_ group="Ext_3/SIP_Settings"/>
+<EXT_SIP_Port_3_ group="Ext_3/SIP_Settings" />
 <Auth_Resync-Reboot_3_ group="Ext_3/SIP_Settings">Yes</Auth_Resync-Reboot_3_>
-<SIP_Proxy-Require_3_ group="Ext_3/SIP_Settings"/>
+<SIP_Proxy-Require_3_ group="Ext_3/SIP_Settings" />
 <SIP_Remote-Party-ID_3_ group="Ext_3/SIP_Settings">No</SIP_Remote-Party-ID_3_>
 <Referor_Bye_Delay_3_ group="Ext_3/SIP_Settings">4</Referor_Bye_Delay_3_>
 <Refer-To_Target_Contact_3_ group="Ext_3/SIP_Settings">No</Refer-To_Target_Contact_3_>
@@ -476,20 +477,20 @@
 <Use_Anonymous_With_RPID_3_ group="Ext_3/SIP_Settings">Yes</Use_Anonymous_With_RPID_3_>
 <Set_G729_annexb_3_ group="Ext_3/SIP_Settings">none</Set_G729_annexb_3_>
 <Blind_Attn-Xfer_Enable_3_ group="Ext_3/Call_Feature_Settings">No</Blind_Attn-Xfer_Enable_3_>
-<MOH_Server_3_ group="Ext_3/Call_Feature_Settings"/>
+<MOH_Server_3_ group="Ext_3/Call_Feature_Settings" />
 <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__>
-<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"/>
-<Mailbox_ID_3_ group="Ext_3/Call_Feature_Settings"/>
-<Voice_Mail_Server_3_ group="Ext_3/Call_Feature_Settings"/>
-<State_Agent_3_ group="Ext_3/Call_Feature_Settings"/>
+<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" />
+<Mailbox_ID_3_ group="Ext_3/Call_Feature_Settings" />
+<Voice_Mail_Server_3_ group="Ext_3/Call_Feature_Settings" />
+<State_Agent_3_ group="Ext_3/Call_Feature_Settings" />
 <CFWD_Notify_Serv_3_ group="Ext_3/Call_Feature_Settings">No</CFWD_Notify_Serv_3_>
-<CFWD_Notifier_3_ group="Ext_3/Call_Feature_Settings"/>
-<Proxy_3_ group="Ext_3/Proxy_and_Registration">{$domain_name}</Proxy_3_>
+<CFWD_Notifier_3_ group="Ext_3/Call_Feature_Settings" />
+<Proxy_3_ group="Ext_3/Proxy_and_Registration">{$server_address_3</Proxy_3_>
 <Use_Outbound_Proxy_3_ group="Ext_3/Proxy_and_Registration">No</Use_Outbound_Proxy_3_>
-<Outbound_Proxy_3_ group="Ext_3/Proxy_and_Registration"/>
+<Outbound_Proxy_3_ group="Ext_3/Proxy_and_Registration" />
 <Use_OB_Proxy_In_Dialog_3_ group="Ext_3/Proxy_and_Registration">Yes</Use_OB_Proxy_In_Dialog_3_>
 <Register_3_ group="Ext_3/Proxy_and_Registration">Yes</Register_3_>
 <Make_Call_Without_Reg_3_ group="Ext_3/Proxy_and_Registration">No</Make_Call_Without_Reg_3_>
@@ -503,9 +504,9 @@
 <User_ID_3_ group="Ext_3/Subscriber_Information">{$user_id_3}</User_ID_3_>
 <Password_3_ group="Ext_3/Subscriber_Information">{$user_password_3}</Password_3_>
 <Use_Auth_ID_3_ group="Ext_3/Subscriber_Information">No</Use_Auth_ID_3_>
-<Auth_ID_3_ group="Ext_3/Subscriber_Information"/>
-<Mini_Certificate_3_ group="Ext_3/Subscriber_Information"/>
-<SRTP_Private_Key_3_ group="Ext_3/Subscriber_Information"/>
+<Auth_ID_3_ group="Ext_3/Subscriber_Information" />
+<Mini_Certificate_3_ group="Ext_3/Subscriber_Information" />
+<SRTP_Private_Key_3_ group="Ext_3/Subscriber_Information" />
 <Preferred_Codec_3_ group="Ext_3/Audio_Configuration">G711u</Preferred_Codec_3_>
 <Use_Pref_Codec_Only_3_ group="Ext_3/Audio_Configuration">No</Use_Pref_Codec_Only_3_>
 <Second_Preferred_Codec_3_ group="Ext_3/Audio_Configuration">Unspecified</Second_Preferred_Codec_3_>
@@ -521,12 +522,12 @@
 <Silence_Supp_Enable_3_ group="Ext_3/Audio_Configuration">No</Silence_Supp_Enable_3_>
 <DTMF_Tx_Method_3_ group="Ext_3/Audio_Configuration">Auto</DTMF_Tx_Method_3_>
 <Dial_Plan_3_ group="Ext_3/Dial_Plan">(*xxxxxxx|*xxxxxx|*xxxxx|*xxxx|*xxx|*xx*|*x|**xxxxx|**xxxx|**xxx|**xx|[3469]11|0|00|[2-9]xxxxxx|1xxx[2-9]xxxxxxS0|xxxxxxxxxxxx.)</Dial_Plan_3_>
-<Caller_ID_Map_3_ group="Ext_3/Dial_Plan"/>
+<Caller_ID_Map_3_ group="Ext_3/Dial_Plan" />
 <Enable_IP_Dialing_3_ group="Ext_3/Dial_Plan">Yes</Enable_IP_Dialing_3_>
-<Emergency_Number_3_ group="Ext_3/Dial_Plan"/>
+<Emergency_Number_3_ group="Ext_3/Dial_Plan" />
 <Line_Enable_4_ group="Ext_4/General">Yes</Line_Enable_4_>
 <Share_Ext_4_ group="Ext_4/Share_Line_Appearance">private</Share_Ext_4_>
-<Shared_User_ID_4_ group="Ext_4/Share_Line_Appearance"/>
+<Shared_User_ID_4_ group="Ext_4/Share_Line_Appearance" />
 <Subscription_Expires_4_ group="Ext_4/Share_Line_Appearance">3600</Subscription_Expires_4_>
 <NAT_Mapping_Enable_4_ group="Ext_4/NAT_Settings">No</NAT_Mapping_Enable_4_>
 <NAT_Keep_Alive_Enable_4_ group="Ext_4/NAT_Settings">No</NAT_Keep_Alive_Enable_4_>
@@ -541,9 +542,9 @@
 <SIP_Transport_4_ group="Ext_4/SIP_Settings">{$sip_transport_4}</SIP_Transport_4_>
 <SIP_Port_4_ group="Ext_4/SIP_Settings">{$sip_port_4}</SIP_Port_4_>
 <SIP_100REL_Enable_4_ group="Ext_4/SIP_Settings">No</SIP_100REL_Enable_4_>
-<EXT_SIP_Port_4_ group="Ext_4/SIP_Settings"/>
+<EXT_SIP_Port_4_ group="Ext_4/SIP_Settings" />
 <Auth_Resync-Reboot_4_ group="Ext_4/SIP_Settings">Yes</Auth_Resync-Reboot_4_>
-<SIP_Proxy-Require_4_ group="Ext_4/SIP_Settings"/>
+<SIP_Proxy-Require_4_ group="Ext_4/SIP_Settings" />
 <SIP_Remote-Party-ID_4_ group="Ext_4/SIP_Settings">No</SIP_Remote-Party-ID_4_>
 <Referor_Bye_Delay_4_ group="Ext_4/SIP_Settings">4</Referor_Bye_Delay_4_>
 <Refer-To_Target_Contact_4_ group="Ext_4/SIP_Settings">No</Refer-To_Target_Contact_4_>
@@ -556,20 +557,20 @@
 <Use_Anonymous_With_RPID_4_ group="Ext_4/SIP_Settings">Yes</Use_Anonymous_With_RPID_4_>
 <Set_G729_annexb_4_ group="Ext_4/SIP_Settings">none</Set_G729_annexb_4_>
 <Blind_Attn-Xfer_Enable_4_ group="Ext_4/Call_Feature_Settings">No</Blind_Attn-Xfer_Enable_4_>
-<MOH_Server_4_ group="Ext_4/Call_Feature_Settings"/>
+<MOH_Server_4_ group="Ext_4/Call_Feature_Settings" />
 <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__>
-<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"/>
-<Mailbox_ID_4_ group="Ext_4/Call_Feature_Settings"/>
-<Voice_Mail_Server_4_ group="Ext_4/Call_Feature_Settings"/>
-<State_Agent_4_ group="Ext_4/Call_Feature_Settings"/>
+<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" />
+<Mailbox_ID_4_ group="Ext_4/Call_Feature_Settings" />
+<Voice_Mail_Server_4_ group="Ext_4/Call_Feature_Settings" />
+<State_Agent_4_ group="Ext_4/Call_Feature_Settings" />
 <CFWD_Notify_Serv_4_ group="Ext_4/Call_Feature_Settings">No</CFWD_Notify_Serv_4_>
-<CFWD_Notifier_4_ group="Ext_4/Call_Feature_Settings"/>
-<Proxy_4_ group="Ext_4/Proxy_and_Registration">{$domain_name}</Proxy_4_>
+<CFWD_Notifier_4_ group="Ext_4/Call_Feature_Settings" />
+<Proxy_4_ group="Ext_4/Proxy_and_Registration">{$server_address_4}</Proxy_4_>
 <Use_Outbound_Proxy_4_ group="Ext_4/Proxy_and_Registration">No</Use_Outbound_Proxy_4_>
-<Outbound_Proxy_4_ group="Ext_4/Proxy_and_Registration"/>
+<Outbound_Proxy_4_ group="Ext_4/Proxy_and_Registration" />
 <Use_OB_Proxy_In_Dialog_4_ group="Ext_4/Proxy_and_Registration">Yes</Use_OB_Proxy_In_Dialog_4_>
 <Register_4_ group="Ext_4/Proxy_and_Registration">Yes</Register_4_>
 <Make_Call_Without_Reg_4_ group="Ext_4/Proxy_and_Registration">No</Make_Call_Without_Reg_4_>
@@ -583,9 +584,9 @@
 <User_ID_4_ group="Ext_4/Subscriber_Information">{$user_id_4}</User_ID_4_>
 <Password_4_ group="Ext_4/Subscriber_Information">{$user_password_4}</Password_4_>
 <Use_Auth_ID_4_ group="Ext_4/Subscriber_Information">No</Use_Auth_ID_4_>
-<Auth_ID_4_ group="Ext_4/Subscriber_Information"/>
-<Mini_Certificate_4_ group="Ext_4/Subscriber_Information"/>
-<SRTP_Private_Key_4_ group="Ext_4/Subscriber_Information"/>
+<Auth_ID_4_ group="Ext_4/Subscriber_Information" />
+<Mini_Certificate_4_ group="Ext_4/Subscriber_Information" />
+<SRTP_Private_Key_4_ group="Ext_4/Subscriber_Information" />
 <Preferred_Codec_4_ group="Ext_4/Audio_Configuration">G711u</Preferred_Codec_4_>
 <Use_Pref_Codec_Only_4_ group="Ext_4/Audio_Configuration">No</Use_Pref_Codec_Only_4_>
 <Second_Preferred_Codec_4_ group="Ext_4/Audio_Configuration">Unspecified</Second_Preferred_Codec_4_>
@@ -601,21 +602,21 @@
 <Silence_Supp_Enable_4_ group="Ext_4/Audio_Configuration">No</Silence_Supp_Enable_4_>
 <DTMF_Tx_Method_4_ group="Ext_4/Audio_Configuration">Auto</DTMF_Tx_Method_4_>
 <Dial_Plan_4_ group="Ext_4/Dial_Plan">(*xxxxxxx|*xxxxxx|*xxxxx|*xxxx|*xxx|*xx*|*x|**xxxxx|**xxxx|**xxx|**xx|[3469]11|0|00|[2-9]xxxxxx|1xxx[2-9]xxxxxxS0|xxxxxxxxxxxx.)</Dial_Plan_4_>
-<Caller_ID_Map_4_ group="Ext_4/Dial_Plan"/>
+<Caller_ID_Map_4_ group="Ext_4/Dial_Plan" />
 <Enable_IP_Dialing_4_ group="Ext_4/Dial_Plan">Yes</Enable_IP_Dialing_4_>
-<Emergency_Number_4_ group="Ext_4/Dial_Plan"/>
-<Cfwd_All_Dest group="User/Call_Forward"/>
-<Cfwd_Busy_Dest group="User/Call_Forward"/>
-<Cfwd_No_Ans_Dest group="User/Call_Forward"/>
+<Emergency_Number_4_ group="Ext_4/Dial_Plan" />
+<Cfwd_All_Dest group="User/Call_Forward" />
+<Cfwd_Busy_Dest group="User/Call_Forward" />
+<Cfwd_No_Ans_Dest group="User/Call_Forward" />
 <Cfwd_No_Ans_Delay group="User/Call_Forward">20</Cfwd_No_Ans_Delay>
-<Speed_Dial_2 group="User/Speed_Dial"/>
-<Speed_Dial_3 group="User/Speed_Dial"/>
-<Speed_Dial_4 group="User/Speed_Dial"/>
-<Speed_Dial_5 group="User/Speed_Dial"/>
-<Speed_Dial_6 group="User/Speed_Dial"/>
-<Speed_Dial_7 group="User/Speed_Dial"/>
-<Speed_Dial_8 group="User/Speed_Dial"/>
-<Speed_Dial_9 group="User/Speed_Dial"/>
+<Speed_Dial_2 group="User/Speed_Dial" />
+<Speed_Dial_3 group="User/Speed_Dial" />
+<Speed_Dial_4 group="User/Speed_Dial" />
+<Speed_Dial_5 group="User/Speed_Dial" />
+<Speed_Dial_6 group="User/Speed_Dial" />
+<Speed_Dial_7 group="User/Speed_Dial" />
+<Speed_Dial_8 group="User/Speed_Dial" />
+<Speed_Dial_9 group="User/Speed_Dial" />
 <CW_Setting group="User/Supplementary_Services">Yes</CW_Setting>
 <Block_CID_Setting group="User/Supplementary_Services">No</Block_CID_Setting>
 <Block_ANC_Setting group="User/Supplementary_Services">No</Block_ANC_Setting>
@@ -657,68 +658,68 @@
 <Server_Type group="Attendant_Console/General">Broadsoft</Server_Type>
 <Test_Mode_Enable group="Attendant_Console/General">No</Test_Mode_Enable>
 <Attendant_Console_Call_Pickup_Code group="Attendant_Console/General">*98</Attendant_Console_Call_Pickup_Code>
-<Unit_1_Key_1 group="Attendant_Console/Unit_1"/>
-<Unit_1_Key_2 group="Attendant_Console/Unit_1"/>
-<Unit_1_Key_3 group="Attendant_Console/Unit_1"/>
-<Unit_1_Key_4 group="Attendant_Console/Unit_1"/>
-<Unit_1_Key_5 group="Attendant_Console/Unit_1"/>
-<Unit_1_Key_6 group="Attendant_Console/Unit_1"/>
-<Unit_1_Key_7 group="Attendant_Console/Unit_1"/>
-<Unit_1_Key_8 group="Attendant_Console/Unit_1"/>
-<Unit_1_Key_9 group="Attendant_Console/Unit_1"/>
-<Unit_1_Key_10 group="Attendant_Console/Unit_1"/>
-<Unit_1_Key_11 group="Attendant_Console/Unit_1"/>
-<Unit_1_Key_12 group="Attendant_Console/Unit_1"/>
-<Unit_1_Key_13 group="Attendant_Console/Unit_1"/>
-<Unit_1_Key_14 group="Attendant_Console/Unit_1"/>
-<Unit_1_Key_15 group="Attendant_Console/Unit_1"/>
-<Unit_1_Key_16 group="Attendant_Console/Unit_1"/>
-<Unit_1_Key_17 group="Attendant_Console/Unit_1"/>
-<Unit_1_Key_18 group="Attendant_Console/Unit_1"/>
-<Unit_1_Key_19 group="Attendant_Console/Unit_1"/>
-<Unit_1_Key_20 group="Attendant_Console/Unit_1"/>
-<Unit_1_Key_21 group="Attendant_Console/Unit_1"/>
-<Unit_1_Key_22 group="Attendant_Console/Unit_1"/>
-<Unit_1_Key_23 group="Attendant_Console/Unit_1"/>
-<Unit_1_Key_24 group="Attendant_Console/Unit_1"/>
-<Unit_1_Key_25 group="Attendant_Console/Unit_1"/>
-<Unit_1_Key_26 group="Attendant_Console/Unit_1"/>
-<Unit_1_Key_27 group="Attendant_Console/Unit_1"/>
-<Unit_1_Key_28 group="Attendant_Console/Unit_1"/>
-<Unit_1_Key_29 group="Attendant_Console/Unit_1"/>
-<Unit_1_Key_30 group="Attendant_Console/Unit_1"/>
-<Unit_1_Key_31 group="Attendant_Console/Unit_1"/>
-<Unit_1_Key_32 group="Attendant_Console/Unit_1"/>
-<Unit_2_Key_1 group="Attendant_Console/Unit_2"/>
-<Unit_2_Key_2 group="Attendant_Console/Unit_2"/>
-<Unit_2_Key_3 group="Attendant_Console/Unit_2"/>
-<Unit_2_Key_4 group="Attendant_Console/Unit_2"/>
-<Unit_2_Key_5 group="Attendant_Console/Unit_2"/>
-<Unit_2_Key_6 group="Attendant_Console/Unit_2"/>
-<Unit_2_Key_7 group="Attendant_Console/Unit_2"/>
-<Unit_2_Key_8 group="Attendant_Console/Unit_2"/>
-<Unit_2_Key_9 group="Attendant_Console/Unit_2"/>
-<Unit_2_Key_10 group="Attendant_Console/Unit_2"/>
-<Unit_2_Key_11 group="Attendant_Console/Unit_2"/>
-<Unit_2_Key_12 group="Attendant_Console/Unit_2"/>
-<Unit_2_Key_13 group="Attendant_Console/Unit_2"/>
-<Unit_2_Key_14 group="Attendant_Console/Unit_2"/>
-<Unit_2_Key_15 group="Attendant_Console/Unit_2"/>
-<Unit_2_Key_16 group="Attendant_Console/Unit_2"/>
-<Unit_2_Key_17 group="Attendant_Console/Unit_2"/>
-<Unit_2_Key_18 group="Attendant_Console/Unit_2"/>
-<Unit_2_Key_19 group="Attendant_Console/Unit_2"/>
-<Unit_2_Key_20 group="Attendant_Console/Unit_2"/>
-<Unit_2_Key_21 group="Attendant_Console/Unit_2"/>
-<Unit_2_Key_22 group="Attendant_Console/Unit_2"/>
-<Unit_2_Key_23 group="Attendant_Console/Unit_2"/>
-<Unit_2_Key_24 group="Attendant_Console/Unit_2"/>
-<Unit_2_Key_25 group="Attendant_Console/Unit_2"/>
-<Unit_2_Key_26 group="Attendant_Console/Unit_2"/>
-<Unit_2_Key_27 group="Attendant_Console/Unit_2"/>
-<Unit_2_Key_28 group="Attendant_Console/Unit_2"/>
-<Unit_2_Key_29 group="Attendant_Console/Unit_2"/>
-<Unit_2_Key_30 group="Attendant_Console/Unit_2"/>
-<Unit_2_Key_31 group="Attendant_Console/Unit_2"/>
-<Unit_2_Key_32 group="Attendant_Console/Unit_2"/>
+<Unit_1_Key_1 group="Attendant_Console/Unit_1" />
+<Unit_1_Key_2 group="Attendant_Console/Unit_1" />
+<Unit_1_Key_3 group="Attendant_Console/Unit_1" />
+<Unit_1_Key_4 group="Attendant_Console/Unit_1" />
+<Unit_1_Key_5 group="Attendant_Console/Unit_1" />
+<Unit_1_Key_6 group="Attendant_Console/Unit_1" />
+<Unit_1_Key_7 group="Attendant_Console/Unit_1" />
+<Unit_1_Key_8 group="Attendant_Console/Unit_1" />
+<Unit_1_Key_9 group="Attendant_Console/Unit_1" />
+<Unit_1_Key_10 group="Attendant_Console/Unit_1" />
+<Unit_1_Key_11 group="Attendant_Console/Unit_1" />
+<Unit_1_Key_12 group="Attendant_Console/Unit_1" />
+<Unit_1_Key_13 group="Attendant_Console/Unit_1" />
+<Unit_1_Key_14 group="Attendant_Console/Unit_1" />
+<Unit_1_Key_15 group="Attendant_Console/Unit_1" />
+<Unit_1_Key_16 group="Attendant_Console/Unit_1" />
+<Unit_1_Key_17 group="Attendant_Console/Unit_1" />
+<Unit_1_Key_18 group="Attendant_Console/Unit_1" />
+<Unit_1_Key_19 group="Attendant_Console/Unit_1" />
+<Unit_1_Key_20 group="Attendant_Console/Unit_1" />
+<Unit_1_Key_21 group="Attendant_Console/Unit_1" />
+<Unit_1_Key_22 group="Attendant_Console/Unit_1" />
+<Unit_1_Key_23 group="Attendant_Console/Unit_1" />
+<Unit_1_Key_24 group="Attendant_Console/Unit_1" />
+<Unit_1_Key_25 group="Attendant_Console/Unit_1" />
+<Unit_1_Key_26 group="Attendant_Console/Unit_1" />
+<Unit_1_Key_27 group="Attendant_Console/Unit_1" />
+<Unit_1_Key_28 group="Attendant_Console/Unit_1" />
+<Unit_1_Key_29 group="Attendant_Console/Unit_1" />
+<Unit_1_Key_30 group="Attendant_Console/Unit_1" />
+<Unit_1_Key_31 group="Attendant_Console/Unit_1" />
+<Unit_1_Key_32 group="Attendant_Console/Unit_1" />
+<Unit_2_Key_1 group="Attendant_Console/Unit_2" />
+<Unit_2_Key_2 group="Attendant_Console/Unit_2" />
+<Unit_2_Key_3 group="Attendant_Console/Unit_2" />
+<Unit_2_Key_4 group="Attendant_Console/Unit_2" />
+<Unit_2_Key_5 group="Attendant_Console/Unit_2" />
+<Unit_2_Key_6 group="Attendant_Console/Unit_2" />
+<Unit_2_Key_7 group="Attendant_Console/Unit_2" />
+<Unit_2_Key_8 group="Attendant_Console/Unit_2" />
+<Unit_2_Key_9 group="Attendant_Console/Unit_2" />
+<Unit_2_Key_10 group="Attendant_Console/Unit_2" />
+<Unit_2_Key_11 group="Attendant_Console/Unit_2" />
+<Unit_2_Key_12 group="Attendant_Console/Unit_2" />
+<Unit_2_Key_13 group="Attendant_Console/Unit_2" />
+<Unit_2_Key_14 group="Attendant_Console/Unit_2" />
+<Unit_2_Key_15 group="Attendant_Console/Unit_2" />
+<Unit_2_Key_16 group="Attendant_Console/Unit_2" />
+<Unit_2_Key_17 group="Attendant_Console/Unit_2" />
+<Unit_2_Key_18 group="Attendant_Console/Unit_2" />
+<Unit_2_Key_19 group="Attendant_Console/Unit_2" />
+<Unit_2_Key_20 group="Attendant_Console/Unit_2" />
+<Unit_2_Key_21 group="Attendant_Console/Unit_2" />
+<Unit_2_Key_22 group="Attendant_Console/Unit_2" />
+<Unit_2_Key_23 group="Attendant_Console/Unit_2" />
+<Unit_2_Key_24 group="Attendant_Console/Unit_2" />
+<Unit_2_Key_25 group="Attendant_Console/Unit_2" />
+<Unit_2_Key_26 group="Attendant_Console/Unit_2" />
+<Unit_2_Key_27 group="Attendant_Console/Unit_2" />
+<Unit_2_Key_28 group="Attendant_Console/Unit_2" />
+<Unit_2_Key_29 group="Attendant_Console/Unit_2" />
+<Unit_2_Key_30 group="Attendant_Console/Unit_2" />
+<Unit_2_Key_31 group="Attendant_Console/Unit_2" />
+<Unit_2_Key_32 group="Attendant_Console/Unit_2" />
 </flat-profile>
diff --git a/resources/templates/provision/cisco/spa508g/{$mac}.xml b/resources/templates/provision/cisco/spa508g/{$mac}.xml
index 6209b22691..af1a77c66f 100644
--- a/resources/templates/provision/cisco/spa508g/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa508g/{$mac}.xml
@@ -357,7 +357,7 @@
 
 <!-- Phone/Line_Key_1 -->
 {if $key_type_1 == 'line'}
-	<Extension_1_ group="Phone/Line_Key_1">{$key_id_1}</Extension_1_>
+	<Extension_1_ group="Phone/Line_Key_1">{$key_value_1}</Extension_1_>
 	<Short_Name_1_ group="Phone/Line_Key_1">{$key_label_1}</Short_Name_1_>
 	<Share_Call_Appearance_1_ group="Phone/Line_Key_1">private</Share_Call_Appearance_1_>
 	<Extended_Function_1_ group="Phone/Line_Key_1"/>
@@ -370,7 +370,7 @@
 
 <!-- Phone/Line_Key_2 -->
 {if $key_type_2 == 'line'}
-	<Extension_2_ group="Phone/Line_Key_2">{$key_id_2}</Extension_2_>
+	<Extension_2_ group="Phone/Line_Key_2">{$key_value_2}</Extension_2_>
 	<Short_Name_2_ group="Phone/Line_Key_2">{$key_label_2}</Short_Name_2_>
 	<Share_Call_Appearance_2_ group="Phone/Line_Key_2">private</Share_Call_Appearance_2_>
 	<Extended_Function_2_ group="Phone/Line_Key_2"/>
@@ -383,7 +383,7 @@
 
 <!-- Phone/Line_Key_3 -->
 {if $key_type_3 == 'line'}
-	<Extension_3_ group="Phone/Line_Key_3">{$key_id_3}</Extension_3_>
+	<Extension_3_ group="Phone/Line_Key_3">{$key_value_3}</Extension_3_>
 	<Short_Name_3_ group="Phone/Line_Key_3">{$key_label_3}</Short_Name_3_>
 	<Share_Call_Appearance_3_ group="Phone/Line_Key_3">private</Share_Call_Appearance_3_>
 	<Extended_Function_3_ group="Phone/Line_Key_3"/>
@@ -396,7 +396,7 @@
 
 <!-- Phone/Line_Key_4 -->
 {if $key_type_4 == 'line'}
-	<Extension_4_ group="Phone/Line_Key_4">{$key_id_4}</Extension_4_>
+	<Extension_4_ group="Phone/Line_Key_4">{$key_value_4}</Extension_4_>
 	<Short_Name_4_ group="Phone/Line_Key_4">{$key_label_4}</Short_Name_4_>
 	<Share_Call_Appearance_4_ group="Phone/Line_Key_4">private</Share_Call_Appearance_4_>
 	<Extended_Function_4_ group="Phone/Line_Key_4"/>
@@ -409,7 +409,7 @@
 
 <!-- Phone/Line_Key_5 -->
 {if $key_type_5 == 'line'}
-	<Extension_5_ group="Phone/Line_Key_5">{$key_id_5}</Extension_5_>
+	<Extension_5_ group="Phone/Line_Key_5">{$key_value_5}</Extension_5_>
 	<Short_Name_5_ group="Phone/Line_Key_5">{$key_label_5}</Short_Name_5_>
 	<Share_Call_Appearance_5_ group="Phone/Line_Key_5">private</Share_Call_Appearance_5_>
 	<Extended_Function_5_ group="Phone/Line_Key_5"/>
@@ -422,8 +422,8 @@
 
 <!-- Phone/Line_Key_6 -->
 {if $key_type_6 == 'line'}
-	<Extension_6_ group="Phone/Line_Key_6">{$key_id_5}</Extension_6_>
-	<Short_Name_6_ group="Phone/Line_Key_6">{$key_label_5}</Short_Name_6_>
+	<Extension_6_ group="Phone/Line_Key_6">{$key_value_6}</Extension_6_>
+	<Short_Name_6_ group="Phone/Line_Key_6">{$key_label_6}</Short_Name_6_>
 	<Share_Call_Appearance_6_ group="Phone/Line_Key_6">private</Share_Call_Appearance_6_>
 	<Extended_Function_6_ group="Phone/Line_Key_6"/>
 {else}
@@ -435,8 +435,8 @@
 
 <!-- Phone/Line_Key_7 -->
 {if $key_type_7 == 'line'}
-	<Extension_7_ group="Phone/Line_Key_7">{$key_id_5}</Extension_7_>
-	<Short_Name_7_ group="Phone/Line_Key_7">{$key_label_5}</Short_Name_7_>
+	<Extension_7_ group="Phone/Line_Key_7">{$key_value_7}</Extension_7_>
+	<Short_Name_7_ group="Phone/Line_Key_7">{$key_label_7}</Short_Name_7_>
 	<Share_Call_Appearance_7_ group="Phone/Line_Key_7">private</Share_Call_Appearance_7_>
 	<Extended_Function_7_ group="Phone/Line_Key_7"/>
 {else}
@@ -448,7 +448,7 @@
 
 <!-- Phone/Line_Key_8 -->
 {if $key_type_8 == 'line'}
-	<Extension_8_ group="Phone/Line_Key_8">{$key_id_8}</Extension_8_>
+	<Extension_8_ group="Phone/Line_Key_8">{$key_value_8}</Extension_8_>
 	<Short_Name_8_ group="Phone/Line_Key_8">{$key_label_8}</Short_Name_8_>
 	<Share_Call_Appearance_8_ group="Phone/Line_Key_8">private</Share_Call_Appearance_8_>
 	<Extended_Function_8_ group="Phone/Line_Key_8"/>
diff --git a/resources/templates/provision/cisco/spa509g/{$mac}.xml b/resources/templates/provision/cisco/spa509g/{$mac}.xml
index 72910ee9eb..06d1ce634e 100644
--- a/resources/templates/provision/cisco/spa509g/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa509g/{$mac}.xml
@@ -358,7 +358,7 @@
 
 <!-- Phone/Line_Key_1 -->
 {if $key_type_1 == 'line'}
-	<Extension_1_ group="Phone/Line_Key_1">{$key_id_1}</Extension_1_>
+	<Extension_1_ group="Phone/Line_Key_1">{$key_value_1}</Extension_1_>
 	<Short_Name_1_ group="Phone/Line_Key_1">{$key_label_1}</Short_Name_1_>
 	<Share_Call_Appearance_1_ group="Phone/Line_Key_1">private</Share_Call_Appearance_1_>
 	<Extended_Function_1_ group="Phone/Line_Key_1"/>
@@ -371,7 +371,7 @@
 
 <!-- Phone/Line_Key_2 -->
 {if $key_type_2 == 'line'}
-	<Extension_2_ group="Phone/Line_Key_2">{$key_id_2}</Extension_2_>
+	<Extension_2_ group="Phone/Line_Key_2">{$key_value_2}</Extension_2_>
 	<Short_Name_2_ group="Phone/Line_Key_2">{$key_label_2}</Short_Name_2_>
 	<Share_Call_Appearance_2_ group="Phone/Line_Key_2">private</Share_Call_Appearance_2_>
 	<Extended_Function_2_ group="Phone/Line_Key_2"/>
@@ -384,7 +384,7 @@
 
 <!-- Phone/Line_Key_3 -->
 {if $key_type_3 == 'line'}
-	<Extension_3_ group="Phone/Line_Key_3">{$key_id_3}</Extension_3_>
+	<Extension_3_ group="Phone/Line_Key_3">{$key_value_3}</Extension_3_>
 	<Short_Name_3_ group="Phone/Line_Key_3">{$key_label_3}</Short_Name_3_>
 	<Share_Call_Appearance_3_ group="Phone/Line_Key_3">private</Share_Call_Appearance_3_>
 	<Extended_Function_3_ group="Phone/Line_Key_3"/>
@@ -397,7 +397,7 @@
 
 <!-- Phone/Line_Key_4 -->
 {if $key_type_4 == 'line'}
-	<Extension_4_ group="Phone/Line_Key_4">{$key_id_4}</Extension_4_>
+	<Extension_4_ group="Phone/Line_Key_4">{$key_value_4}</Extension_4_>
 	<Short_Name_4_ group="Phone/Line_Key_4">{$key_label_4}</Short_Name_4_>
 	<Share_Call_Appearance_4_ group="Phone/Line_Key_4">private</Share_Call_Appearance_4_>
 	<Extended_Function_4_ group="Phone/Line_Key_4"/>
@@ -410,7 +410,7 @@
 
 <!-- Phone/Line_Key_5 -->
 {if $key_type_5 == 'line'}
-	<Extension_5_ group="Phone/Line_Key_5">{$key_id_5}</Extension_5_>
+	<Extension_5_ group="Phone/Line_Key_5">{$key_value_5}</Extension_5_>
 	<Short_Name_5_ group="Phone/Line_Key_5">{$key_label_5}</Short_Name_5_>
 	<Share_Call_Appearance_5_ group="Phone/Line_Key_5">private</Share_Call_Appearance_5_>
 	<Extended_Function_5_ group="Phone/Line_Key_5"/>
@@ -423,8 +423,8 @@
 
 <!-- Phone/Line_Key_6 -->
 {if $key_type_6 == 'line'}
-	<Extension_6_ group="Phone/Line_Key_6">{$key_id_5}</Extension_6_>
-	<Short_Name_6_ group="Phone/Line_Key_6">{$key_label_5}</Short_Name_6_>
+	<Extension_6_ group="Phone/Line_Key_6">{$key_value_6}</Extension_6_>
+	<Short_Name_6_ group="Phone/Line_Key_6">{$key_label_6}</Short_Name_6_>
 	<Share_Call_Appearance_6_ group="Phone/Line_Key_6">private</Share_Call_Appearance_6_>
 	<Extended_Function_6_ group="Phone/Line_Key_6"/>
 {else}
@@ -436,8 +436,8 @@
 
 <!-- Phone/Line_Key_7 -->
 {if $key_type_7 == 'line'}
-	<Extension_7_ group="Phone/Line_Key_7">{$key_id_5}</Extension_7_>
-	<Short_Name_7_ group="Phone/Line_Key_7">{$key_label_5}</Short_Name_7_>
+	<Extension_7_ group="Phone/Line_Key_7">{$key_value_7}</Extension_7_>
+	<Short_Name_7_ group="Phone/Line_Key_7">{$key_label_7}</Short_Name_7_>
 	<Share_Call_Appearance_7_ group="Phone/Line_Key_7">private</Share_Call_Appearance_7_>
 	<Extended_Function_7_ group="Phone/Line_Key_7"/>
 {else}
@@ -449,7 +449,7 @@
 
 <!-- Phone/Line_Key_8 -->
 {if $key_type_8 == 'line'}
-	<Extension_8_ group="Phone/Line_Key_8">{$key_id_8}</Extension_8_>
+	<Extension_8_ group="Phone/Line_Key_8">{$key_value_8}</Extension_8_>
 	<Short_Name_8_ group="Phone/Line_Key_8">{$key_label_8}</Short_Name_8_>
 	<Share_Call_Appearance_8_ group="Phone/Line_Key_8">private</Share_Call_Appearance_8_>
 	<Extended_Function_8_ group="Phone/Line_Key_8"/>
@@ -462,7 +462,7 @@
 
 <!-- Phone/Line_Key_9 -->
 {if $key_type_9 == 'line'}
-	<Extension_9_ group="Phone/Line_Key_9">{$key_id_9}</Extension_9_>
+	<Extension_9_ group="Phone/Line_Key_9">{$key_value_9}</Extension_9_>
 	<Short_Name_9_ group="Phone/Line_Key_9">{$key_label_9}</Short_Name_9_>
 	<Share_Call_Appearance_9_ group="Phone/Line_Key_9">private</Share_Call_Appearance_9_>
 	<Extended_Function_9_ group="Phone/Line_Key_9"/>
@@ -475,7 +475,7 @@
 
 <!-- Phone/Line_Key_10 -->
 {if $key_type_10 == 'line'}
-	<Extension_10_ group="Phone/Line_Key_10">{$key_id_10}</Extension_10_>
+	<Extension_10_ group="Phone/Line_Key_10">{$key_value_10}</Extension_10_>
 	<Short_Name_10_ group="Phone/Line_Key_10">{$key_label_10}</Short_Name_10_>
 	<Share_Call_Appearance_10_ group="Phone/Line_Key_10">private</Share_Call_Appearance_10_>
 	<Extended_Function_10_ group="Phone/Line_Key_10"/>
@@ -488,7 +488,7 @@
 
 <!-- Phone/Line_Key_11 -->
 {if $key_type_11 == 'line'}
-	<Extension_11_ group="Phone/Line_Key_11">{$key_id_11}</Extension_11_>
+	<Extension_11_ group="Phone/Line_Key_11">{$key_value_11}</Extension_11_>
 	<Short_Name_11_ group="Phone/Line_Key_11">{$key_label_11}</Short_Name_11_>
 	<Share_Call_Appearance_11_ group="Phone/Line_Key_11">private</Share_Call_Appearance_11_>
 	<Extended_Function_11_ group="Phone/Line_Key_11"/>
@@ -501,7 +501,7 @@
 
 <!-- Phone/Line_Key_12 -->
 {if $key_type_12 == 'line'}
-	<Extension_12_ group="Phone/Line_Key_12">{$key_id_12}</Extension_12_>
+	<Extension_12_ group="Phone/Line_Key_12">{$key_value_12}</Extension_12_>
 	<Short_Name_12_ group="Phone/Line_Key_12">{$key_label_12}</Short_Name_12_>
 	<Share_Call_Appearance_12_ group="Phone/Line_Key_12">private</Share_Call_Appearance_12_>
 	<Extended_Function_12_ group="Phone/Line_Key_12"/>
diff --git a/resources/templates/provision/cisco/spa512g/{$mac}.xml b/resources/templates/provision/cisco/spa512g/{$mac}.xml
index 29ba5fd9e6..77ba58699c 100644
--- a/resources/templates/provision/cisco/spa512g/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa512g/{$mac}.xml
@@ -359,7 +359,7 @@
 
 <!-- Phone/Line_Key_1-->
 {if $key_type_1 == 'line'}
-	<Extension_1_ group="Phone/Line_Key_1">{$key_id_1}</Extension_1_>
+	<Extension_1_ group="Phone/Line_Key_1">{$key_value_1}</Extension_1_>
 	<Short_Name_1_ group="Phone/Line_Key_1">{$key_label_1}</Short_Name_1_>
 	<Share_Call_Appearance_1_ group="Phone/Line_Key_1">private</Share_Call_Appearance_1_>
 	<Extended_Function_1_ group="Phone/Line_Key_1"/>
diff --git a/resources/templates/provision/cisco/spa514g/{$mac}.xml b/resources/templates/provision/cisco/spa514g/{$mac}.xml
index 34a8814cb3..c242afbc56 100644
--- a/resources/templates/provision/cisco/spa514g/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa514g/{$mac}.xml
@@ -141,7 +141,7 @@
 
 <!-- Phone/Line_Key_1 -->
 {if $key_type_1 == 'line'}
-	<Extension_1_ group="Phone/Line_Key_1">{$key_id_1}</Extension_1_>
+	<Extension_1_ group="Phone/Line_Key_1">{$key_value_1}</Extension_1_>
 	<Short_Name_1_ group="Phone/Line_Key_1">{$key_label_1}</Short_Name_1_>
 	<Share_Call_Appearance_1_ group="Phone/Line_Key_1">private</Share_Call_Appearance_1_>
 	<Extended_Function_1_ group="Phone/Line_Key_1"/>
@@ -154,7 +154,7 @@
 
 <!-- Phone/Line_Key_2 -->
 {if $key_type_2 == 'line'}
-	<Extension_2_ group="Phone/Line_Key_2">{$key_id_2}</Extension_2_>
+	<Extension_2_ group="Phone/Line_Key_2">{$key_value_2}</Extension_2_>
 	<Short_Name_2_ group="Phone/Line_Key_2">{$key_label_2}</Short_Name_2_>
 	<Share_Call_Appearance_2_ group="Phone/Line_Key_2">private</Share_Call_Appearance_2_>
 	<Extended_Function_2_ group="Phone/Line_Key_2"/>
@@ -167,7 +167,7 @@
 
 <!-- Phone/Line_Key_3 -->
 {if $key_type_3 == 'line'}
-	<Extension_3_ group="Phone/Line_Key_3">{$key_id_3}</Extension_3_>
+	<Extension_3_ group="Phone/Line_Key_3">{$key_value_3}</Extension_3_>
 	<Short_Name_3_ group="Phone/Line_Key_3">{$key_label_3}</Short_Name_3_>
 	<Share_Call_Appearance_3_ group="Phone/Line_Key_3">private</Share_Call_Appearance_3_>
 	<Extended_Function_3_ group="Phone/Line_Key_3"/>
@@ -180,7 +180,7 @@
 
 <!-- Phone/Line_Key_4 -->
 {if $key_type_4 == 'line'}
-	<Extension_4_ group="Phone/Line_Key_4">{$key_id_4}</Extension_4_>
+	<Extension_4_ group="Phone/Line_Key_4">{$key_value_4}</Extension_4_>
 	<Short_Name_4_ group="Phone/Line_Key_4">{$key_label_4}</Short_Name_4_>
 	<Share_Call_Appearance_4_ group="Phone/Line_Key_4">private</Share_Call_Appearance_4_>
 	<Extended_Function_4_ group="Phone/Line_Key_4"/>
diff --git a/resources/templates/provision/cisco/spa525g/{$mac}.xml b/resources/templates/provision/cisco/spa525g/{$mac}.xml
index bacdb1c38d..192fee483b 100644
--- a/resources/templates/provision/cisco/spa525g/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa525g/{$mac}.xml
@@ -1640,7 +1640,7 @@
 
 <!-- Phone/Line_Key_1 -->
 {if $key_type_1 == 'line'}
-	<Extension_1_ group="Phone/Line_Key_1">{$key_id_1}</Extension_1_> <!-- options: 1/2/3/4/5/6/7/8/9/10/11/12/Disabled -->
+	<Extension_1_ group="Phone/Line_Key_1">{$key_value_1}</Extension_1_> <!-- options: 1/2/3/4/5/6/7/8/9/10/11/12/Disabled -->
 	<Short_Name_1_ group="Phone/Line_Key_1">{$key_label_1}</Short_Name_1_>
 	<Share_Call_Appearance_1_ group="Phone/Line_Key_1">private</Share_Call_Appearance_1_> <!-- options: private/shared -->
 	<Extended_Function_1_ group="Phone/Line_Key_1"/>
@@ -1653,7 +1653,7 @@
 
 <!-- Phone/Line_Key_2 -->
 {if $key_type_2 == 'line'}
-	<Extension_2_ group="Phone/Line_Key_2">{$key_id_2}</Extension_2_> <!-- options: 1/2/3/4/5/6/7/8/9/10/11/12/Disabled -->
+	<Extension_2_ group="Phone/Line_Key_2">{$key_value_2}</Extension_2_> <!-- options: 1/2/3/4/5/6/7/8/9/10/11/12/Disabled -->
 	<Short_Name_2_ group="Phone/Line_Key_2">{$key_label_2}</Short_Name_2_>
 	<Share_Call_Appearance_2_ group="Phone/Line_Key_2">private</Share_Call_Appearance_2_> <!-- options: private/shared -->
 	<Extended_Function_2_ group="Phone/Line_Key_2"/>
@@ -1666,7 +1666,7 @@
 
 <!-- Phone/Line_Key_3 -->
 {if $key_type_3 == 'line'}
-	<Extension_3_ group="Phone/Line_Key_3">{$key_id_3}</Extension_3_> <!-- options: 1/2/3/4/5/6/7/8/9/10/11/12/Disabled -->
+	<Extension_3_ group="Phone/Line_Key_3">{$key_value_3}</Extension_3_> <!-- options: 1/2/3/4/5/6/7/8/9/10/11/12/Disabled -->
 	<Short_Name_3_ group="Phone/Line_Key_3">{$key_label_3}</Short_Name_3_>
 	<Share_Call_Appearance_3_ group="Phone/Line_Key_3">private</Share_Call_Appearance_3_> <!-- options: private/shared -->
 	<Extended_Function_3_ group="Phone/Line_Key_3"/>
@@ -1679,7 +1679,7 @@
 
 <!-- Phone/Line_Key_4 -->
 {if $key_type_4 == 'line'}
-	<Extension_4_ group="Phone/Line_Key_4">{$key_id_4}</Extension_4_>
+	<Extension_4_ group="Phone/Line_Key_4">{$key_value_4}</Extension_4_>
 	<Short_Name_4_ group="Phone/Line_Key_4">{$key_label_4}</Short_Name_4_>
 	<Share_Call_Appearance_4_ group="Phone/Line_Key_4">private</Share_Call_Appearance_4_>
 	<Extended_Function_4_ group="Phone/Line_Key_4"/>
@@ -1692,7 +1692,7 @@
 
 <!-- Phone/Line_Key_5 -->
 {if $key_type_5 == 'line'}
-	<Extension_5_ group="Phone/Line_Key_5">{$key_id_5}</Extension_5_>
+	<Extension_5_ group="Phone/Line_Key_5">{$key_value_5}</Extension_5_>
 	<Short_Name_5_ group="Phone/Line_Key_5">{$key_label_5}</Short_Name_5_>
 	<Share_Call_Appearance_5_ group="Phone/Line_Key_5">private</Share_Call_Appearance_5_>
 	<Extended_Function_5_ group="Phone/Line_Key_5"/>
@@ -1705,8 +1705,8 @@
 
 <!-- Phone/Line_Key_6 -->
 {if $key_type_6 == 'line'}
-	<Extension_6_ group="Phone/Line_Key_6">{$key_id_5}</Extension_6_>
-	<Short_Name_6_ group="Phone/Line_Key_6">{$key_label_5}</Short_Name_6_>
+	<Extension_6_ group="Phone/Line_Key_6">{$key_value_6}</Extension_6_>
+	<Short_Name_6_ group="Phone/Line_Key_6">{$key_label_6}</Short_Name_6_>
 	<Share_Call_Appearance_6_ group="Phone/Line_Key_6">private</Share_Call_Appearance_6_>
 	<Extended_Function_6_ group="Phone/Line_Key_6"/>
 {else}
@@ -1718,8 +1718,8 @@
 
 <!-- Phone/Line_Key_7 -->
 {if $key_type_7 == 'line'}
-	<Extension_7_ group="Phone/Line_Key_7">{$key_id_5}</Extension_7_>
-	<Short_Name_7_ group="Phone/Line_Key_7">{$key_label_5}</Short_Name_7_>
+	<Extension_7_ group="Phone/Line_Key_7">{$key_value_7}</Extension_7_>
+	<Short_Name_7_ group="Phone/Line_Key_7">{$key_label_7}</Short_Name_7_>
 	<Share_Call_Appearance_7_ group="Phone/Line_Key_7">private</Share_Call_Appearance_7_>
 	<Extended_Function_7_ group="Phone/Line_Key_7"/>
 {else}
@@ -1731,7 +1731,7 @@
 
 <!-- Phone/Line_Key_8 -->
 {if $key_type_8 == 'line'}
-	<Extension_8_ group="Phone/Line_Key_8">{$key_id_8}</Extension_8_>
+	<Extension_8_ group="Phone/Line_Key_8">{$key_value_8}</Extension_8_>
 	<Short_Name_8_ group="Phone/Line_Key_8">{$key_label_8}</Short_Name_8_>
 	<Share_Call_Appearance_8_ group="Phone/Line_Key_8">private</Share_Call_Appearance_8_>
 	<Extended_Function_8_ group="Phone/Line_Key_8"/>
@@ -1744,7 +1744,7 @@
 
 <!-- Phone/Line_Key_9 -->
 {if $key_type_9 == 'line'}
-	<Extension_9_ group="Phone/Line_Key_9">{$key_id_9}</Extension_9_>
+	<Extension_9_ group="Phone/Line_Key_9">{$key_value_9}</Extension_9_>
 	<Short_Name_9_ group="Phone/Line_Key_9">{$key_label_9}</Short_Name_9_>
 	<Share_Call_Appearance_9_ group="Phone/Line_Key_9">private</Share_Call_Appearance_9_>
 	<Extended_Function_9_ group="Phone/Line_Key_9"/>
@@ -1757,7 +1757,7 @@
 
 <!-- Phone/Line_Key_10 -->
 {if $key_type_10 == 'line'}
-	<Extension_10_ group="Phone/Line_Key_10">{$key_id_10}</Extension_10_>
+	<Extension_10_ group="Phone/Line_Key_10">{$key_value_10}</Extension_10_>
 	<Short_Name_10_ group="Phone/Line_Key_10">{$key_label_10}</Short_Name_10_>
 	<Share_Call_Appearance_10_ group="Phone/Line_Key_10">private</Share_Call_Appearance_10_>
 	<Extended_Function_10_ group="Phone/Line_Key_10"/>
@@ -1770,7 +1770,7 @@
 
 <!-- Phone/Line_Key_11 -->
 {if $key_type_11 == 'line'}
-	<Extension_11_ group="Phone/Line_Key_11">{$key_id_11}</Extension_11_>
+	<Extension_11_ group="Phone/Line_Key_11">{$key_value_11}</Extension_11_>
 	<Short_Name_11_ group="Phone/Line_Key_11">{$key_label_11}</Short_Name_11_>
 	<Share_Call_Appearance_11_ group="Phone/Line_Key_11">private</Share_Call_Appearance_11_>
 	<Extended_Function_11_ group="Phone/Line_Key_11"/>
@@ -1783,7 +1783,7 @@
 
 <!-- Phone/Line_Key_12 -->
 {if $key_type_12 == 'line'}
-	<Extension_12_ group="Phone/Line_Key_12">{$key_id_12}</Extension_12_>
+	<Extension_12_ group="Phone/Line_Key_12">{$key_value_12}</Extension_12_>
 	<Short_Name_12_ group="Phone/Line_Key_12">{$key_label_12}</Short_Name_12_>
 	<Share_Call_Appearance_12_ group="Phone/Line_Key_12">private</Share_Call_Appearance_12_>
 	<Extended_Function_12_ group="Phone/Line_Key_12"/>