diff --git a/resources/templates/provision/cisco/spa301/{$mac}.xml b/resources/templates/provision/cisco/spa301/{$mac}.xml
index fb1a1e555c..8dfa4ecc14 100644
--- a/resources/templates/provision/cisco/spa301/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa301/{$mac}.xml
@@ -335,23 +335,22 @@
 <Station_Name group="Phone/General">{$display_name_1}</Station_Name>
 <Station_Display_Name group="Phone/General">{$display_name_1}</Station_Display_Name>
 <Voice_Mail_Number group="Phone/General">*97</Voice_Mail_Number>
-
-<!-- Phone/Line_Key_1 -->
-{if $key_type_1 == 'line'}
-	<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"/>
+
+{foreach $keys as $row}
+{if $row.device_key_category == "line"}
+<!-- Phone/Line_Key_{$row.device_key_id} -->
+<Extension_{$row.device_key_id}_ group="Phone/Line_Key_{$row.device_key_id}">{$row.device_key_value}</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_1_ group="Phone/Line_Key_1">Disabled</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">{$key_value_1}</Extended_Function_1_>
+<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 -->
+<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}
+
+{/foreach}
 
 <!-- Phone/Supplementary_Services -->
 <Conference_Serv group="Phone/Supplementary_Services">Yes</Conference_Serv>
diff --git a/resources/templates/provision/cisco/spa501g/{$mac}.xml b/resources/templates/provision/cisco/spa501g/{$mac}.xml
index 65d14fd718..9ca3f390d7 100644
--- a/resources/templates/provision/cisco/spa501g/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa501g/{$mac}.xml
@@ -340,119 +340,22 @@
 <Station_Name group="Phone/General">{$display_name_1}</Station_Name>
 <Station_Display_Name group="Phone/General">{$display_name_1}</Station_Display_Name>
 <Voice_Mail_Number group="Phone/General">*97</Voice_Mail_Number>
-  
-
-<!-- Phone/Line_Key_1 -->
-{if $key_type_1 == 'line'}
-	<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"/>
+  
+{foreach $keys as $row}
+{if $row.device_key_category == "line"}
+<!-- Phone/Line_Key_{$row.device_key_id} -->
+<Extension_{$row.device_key_id}_ group="Phone/Line_Key_{$row.device_key_id}">{$row.device_key_value}</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_1_ group="Phone/Line_Key_1">Disabled</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">{$key_value_1}</Extended_Function_1_>
-{/if}
-
-
-<!-- Phone/Line_Key_2 -->
-{if $key_type_2 == 'line'}
-	<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"/>
-{else}
-	<Extension_2_ group="Phone/Line_Key_2">Disabled</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">{$key_value_2}</Extended_Function_2_>
-{/if}
-
-
-<!-- Phone/Line_Key_3 -->
-{if $key_type_3 == 'line'}
-	<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"/>
-{else}
-	<Extension_3_ group="Phone/Line_Key_3">Disabled</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">{$key_value_3}</Extended_Function_3_>
-{/if}
-
-
-<!-- Phone/Line_Key_4 -->
-{if $key_type_4 == 'line'}
-	<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"/>
-{else}
-	<Extension_4_ group="Phone/Line_Key_4">Disabled</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">{$key_value_4}</Extended_Function_4_>
-{/if}
-
-
-<!-- Phone/Line_Key_5 -->
-{if $key_type_5 == 'line'}
-	<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"/>
-{else}
-	<Extension_5_ group="Phone/Line_Key_5">Disabled</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">{$key_value_5}</Extended_Function_5_>
-{/if}
-
-
-<!-- Phone/Line_Key_6 -->
-{if $key_type_6 == 'line'}
-	<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}
-	<Extension_6_ group="Phone/Line_Key_6">Disabled</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">{$key_value_6}</Extended_Function_6_>
-{/if}
-
-
-<!-- Phone/Line_Key_7 -->
-{if $key_type_7 == 'line'}
-	<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}
-	<Extension_7_ group="Phone/Line_Key_7">Disabled</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">{$key_value_7}</Extended_Function_7_>
-{/if}
-
-
-<!-- Phone/Line_Key_8 -->
-{if $key_type_8 == 'line'}
-	<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"/>
-{else}
-	<Extension_8_ group="Phone/Line_Key_8">Disabled</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">{$key_value_8}</Extended_Function_8_>
+<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 -->
+<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}
 
+{/foreach}
 
 <!-- Phone/Miscellaneous_Line_Key_Settings -->
 <Line_ID_Mapping group="Phone/Miscellaneous_Line_Key_Settings">Vertical First</Line_ID_Mapping>
diff --git a/resources/templates/provision/cisco/spa502g/{$mac}.xml b/resources/templates/provision/cisco/spa502g/{$mac}.xml
index aab4ad0395..53d889a1f7 100644
--- a/resources/templates/provision/cisco/spa502g/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa502g/{$mac}.xml
@@ -356,18 +356,21 @@
 <Screen_Saver_Wait group="Phone/General">300</Screen_Saver_Wait>
 <Screen_Saver_Icon group="Phone/General">Background Picture</Screen_Saver_Icon>
 
-<!-- Phone/Line_Key_1 -->
-{if $key_type_1 == 'line'}
-	<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"/>
+{foreach $keys as $row}
+{if $row.device_key_category == "line"}
+<!-- Phone/Line_Key_{$row.device_key_id} -->
+<Extension_{$row.device_key_id}_ group="Phone/Line_Key_{$row.device_key_id}">{$row.device_key_value}</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_1_ group="Phone/Line_Key_1">Disabled</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">{$key_value_1}</Extended_Function_1_>
+<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 -->
+<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}
+
+{/foreach}
 
 <!-- Phone/Miscellaneous_Line_Key_Settings -->
 <Call_Appearance_Per_Line group="Phone/Miscellaneous_Line_Key_Settings">2</Call_Appearance_Per_Line>
diff --git a/resources/templates/provision/cisco/spa504g/{$mac}.xml b/resources/templates/provision/cisco/spa504g/{$mac}.xml
index 1c85d6250b..d9c5e7a234 100644
--- a/resources/templates/provision/cisco/spa504g/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa504g/{$mac}.xml
@@ -163,57 +163,21 @@
 <Screen_Saver_Wait group="Phone/General">300</Screen_Saver_Wait>
 <Screen_Saver_Icon group="Phone/General">Background Picture</Screen_Saver_Icon>
 
-<!-- Phone/Line_Key_1 -->
-{if $key_type_1 == 'line'}
-	<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"/>
+{foreach $keys as $row}
+{if $row.device_key_category == "line"}
+<!-- Phone/Line_Key_{$row.device_key_id} -->
+<Extension_{$row.device_key_id}_ group="Phone/Line_Key_{$row.device_key_id}">{$row.device_key_value}</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_1_ group="Phone/Line_Key_1">Disabled</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">{$key_value_1}</Extended_Function_1_>
+<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 -->
+<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}
 
-<!-- Phone/Line_Key_2 -->
-{if $key_type_2 == 'line'}
-	<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"/>
-{else}
-	<Extension_2_ group="Phone/Line_Key_2">Disabled</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">{$key_value_2}</Extended_Function_2_>
-{/if}
-
-<!-- Phone/Line_Key_3 -->
-{if $key_type_3 == 'line'}
-	<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"/>
-{else}
-	<Extension_3_ group="Phone/Line_Key_3">Disabled</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">{$key_value_3}</Extended_Function_3_>
-{/if}
-
-<!-- Phone/Line_Key_4 -->
-{if $key_type_4 == 'line'}
-	<Extension_4_ group="Phone/Line_Key_4">{$key_id_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"/>
-{else}
-	<Extension_4_ group="Phone/Line_Key_4">Disabled</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">{$key_value_4}</Extended_Function_4_>
-{/if}
+{/foreach}
 
 <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>
diff --git a/resources/templates/provision/cisco/spa508g/{$mac}.xml b/resources/templates/provision/cisco/spa508g/{$mac}.xml
index af1a77c66f..8c1f8f4352 100644
--- a/resources/templates/provision/cisco/spa508g/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa508g/{$mac}.xml
@@ -355,109 +355,21 @@
 <Screen_Saver_Wait group="Phone/General">300</Screen_Saver_Wait>
 <Screen_Saver_Icon group="Phone/General">Background Picture</Screen_Saver_Icon>
 
-<!-- Phone/Line_Key_1 -->
-{if $key_type_1 == 'line'}
-	<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"/>
+{foreach $keys as $row}
+{if $row.device_key_category == "line"}
+<!-- Phone/Line_Key_{$row.device_key_id} -->
+<Extension_{$row.device_key_id}_ group="Phone/Line_Key_{$row.device_key_id}">{$row.device_key_value}</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_1_ group="Phone/Line_Key_1">Disabled</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">{$key_value_1}</Extended_Function_1_>
+<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 -->
+<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}
 
-<!-- Phone/Line_Key_2 -->
-{if $key_type_2 == 'line'}
-	<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"/>
-{else}
-	<Extension_2_ group="Phone/Line_Key_2">Disabled</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">{$key_value_2}</Extended_Function_2_>
-{/if}
-
-<!-- Phone/Line_Key_3 -->
-{if $key_type_3 == 'line'}
-	<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"/>
-{else}
-	<Extension_3_ group="Phone/Line_Key_3">Disabled</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">{$key_value_3}</Extended_Function_3_>
-{/if}
-
-<!-- Phone/Line_Key_4 -->
-{if $key_type_4 == 'line'}
-	<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"/>
-{else}
-	<Extension_4_ group="Phone/Line_Key_4">Disabled</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">{$key_value_4}</Extended_Function_4_>
-{/if}
-
-<!-- Phone/Line_Key_5 -->
-{if $key_type_5 == 'line'}
-	<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"/>
-{else}
-	<Extension_5_ group="Phone/Line_Key_5">Disabled</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">{$key_value_5}</Extended_Function_5_>
-{/if}
-
-<!-- Phone/Line_Key_6 -->
-{if $key_type_6 == 'line'}
-	<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}
-	<Extension_6_ group="Phone/Line_Key_6">Disabled</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">{$key_value_6}</Extended_Function_6_>
-{/if}
-
-<!-- Phone/Line_Key_7 -->
-{if $key_type_7 == 'line'}
-	<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}
-	<Extension_7_ group="Phone/Line_Key_7">Disabled</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">{$key_value_7}</Extended_Function_7_>
-{/if}
-
-<!-- Phone/Line_Key_8 -->
-{if $key_type_8 == 'line'}
-	<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"/>
-{else}
-	<Extension_8_ group="Phone/Line_Key_8">Disabled</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">{$key_value_8}</Extended_Function_8_>
-{/if}
+{/foreach}
 
 <!-- Phone/Miscellaneous_Line_Key_Settings -->
 <Line_ID_Mapping group="Phone/Miscellaneous_Line_Key_Settings">Vertical First</Line_ID_Mapping>
diff --git a/resources/templates/provision/cisco/spa509g/{$mac}.xml b/resources/templates/provision/cisco/spa509g/{$mac}.xml
index 06d1ce634e..69c270d9cf 100644
--- a/resources/templates/provision/cisco/spa509g/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa509g/{$mac}.xml
@@ -356,162 +356,21 @@
 <Screen_Saver_Wait group="Phone/General">300</Screen_Saver_Wait>
 <Screen_Saver_Icon group="Phone/General">Background Picture</Screen_Saver_Icon>
 
-<!-- Phone/Line_Key_1 -->
-{if $key_type_1 == 'line'}
-	<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"/>
+{foreach $keys as $row}
+{if $row.device_key_category == "line"}
+<!-- Phone/Line_Key_{$row.device_key_id} -->
+<Extension_{$row.device_key_id}_ group="Phone/Line_Key_{$row.device_key_id}">{$row.device_key_value}</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_1_ group="Phone/Line_Key_1">Disabled</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">{$key_value_1}</Extended_Function_1_>
-{/if}
-
-<!-- Phone/Line_Key_2 -->
-{if $key_type_2 == 'line'}
-	<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"/>
-{else}
-	<Extension_2_ group="Phone/Line_Key_2">Disabled</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">{$key_value_2}</Extended_Function_2_>
-{/if}
-
-<!-- Phone/Line_Key_3 -->
-{if $key_type_3 == 'line'}
-	<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"/>
-{else}
-	<Extension_3_ group="Phone/Line_Key_3">Disabled</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">{$key_value_3}</Extended_Function_3_>
-{/if}
-
-<!-- Phone/Line_Key_4 -->
-{if $key_type_4 == 'line'}
-	<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"/>
-{else}
-	<Extension_4_ group="Phone/Line_Key_4">Disabled</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">{$key_value_4}</Extended_Function_4_>
-{/if}
-
-<!-- Phone/Line_Key_5 -->
-{if $key_type_5 == 'line'}
-	<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"/>
-{else}
-	<Extension_5_ group="Phone/Line_Key_5">Disabled</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">{$key_value_5}</Extended_Function_5_>
-{/if}
-
-<!-- Phone/Line_Key_6 -->
-{if $key_type_6 == 'line'}
-	<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}
-	<Extension_6_ group="Phone/Line_Key_6">Disabled</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">{$key_value_6}</Extended_Function_6_>
-{/if}
-
-<!-- Phone/Line_Key_7 -->
-{if $key_type_7 == 'line'}
-	<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}
-	<Extension_7_ group="Phone/Line_Key_7">Disabled</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">{$key_value_7}</Extended_Function_7_>
-{/if}
-
-<!-- Phone/Line_Key_8 -->
-{if $key_type_8 == 'line'}
-	<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"/>
-{else}
-	<Extension_8_ group="Phone/Line_Key_8">Disabled</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">{$key_value_8}</Extended_Function_8_>
-{/if}
-
-<!-- Phone/Line_Key_9 -->
-{if $key_type_9 == 'line'}
-	<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"/>
-{else}
-	<Extension_9_ group="Phone/Line_Key_9">Disabled</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">{$key_value_9}</Extended_Function_9_>
-{/if}
-
-<!-- Phone/Line_Key_10 -->
-{if $key_type_10 == 'line'}
-	<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"/>
-{else}
-	<Extension_10_ group="Phone/Line_Key_10">Disabled</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">{$key_value_10}</Extended_Function_10_>
-{/if}
-
-<!-- Phone/Line_Key_11 -->
-{if $key_type_11 == 'line'}
-	<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"/>
-{else}
-	<Extension_11_ group="Phone/Line_Key_11">Disabled</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">{$key_value_11}</Extended_Function_11_>
-{/if}
-
-<!-- Phone/Line_Key_12 -->
-{if $key_type_12 == 'line'}
-	<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"/>
-{else}
-	<Extension_12_ group="Phone/Line_Key_12">Disabled</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">{$key_value_12}</Extended_Function_12_>
+<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 -->
+<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}
 
+{/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>
diff --git a/resources/templates/provision/cisco/spa512g/{$mac}.xml b/resources/templates/provision/cisco/spa512g/{$mac}.xml
index 77ba58699c..89e72ed5c7 100644
--- a/resources/templates/provision/cisco/spa512g/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa512g/{$mac}.xml
@@ -357,19 +357,22 @@
 <Screen_Saver_Wait group="Phone/General">300</Screen_Saver_Wait>
 <Screen_Saver_Icon group="Phone/General">Background Picture</Screen_Saver_Icon>
 
-<!-- Phone/Line_Key_1-->
-{if $key_type_1 == 'line'}
-	<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"/>
+{foreach $keys as $row}
+{if $row.device_key_category == "line"}
+<!-- Phone/Line_Key_{$row.device_key_id} -->
+<Extension_{$row.device_key_id}_ group="Phone/Line_Key_{$row.device_key_id}">{$row.device_key_value}</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_1_ group="Phone/Line_Key_1">Disabled</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">{$key_value_1}</Extended_Function_1_>
+<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 -->
+<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}
 
+{/foreach}
+
 <!-- Phone/Miscellaneous_Line_Key_Settings -->
 <Call_Appearance_Per_Line group="Phone/Miscellaneous_Line_Key_Settings">2</Call_Appearance_Per_Line>
 <Softkey_Navigation_Style group="Phone/Miscellaneous_Line_Key_Settings">Scrollable</Softkey_Navigation_Style>
diff --git a/resources/templates/provision/cisco/spa514g/{$mac}.xml b/resources/templates/provision/cisco/spa514g/{$mac}.xml
index c242afbc56..d00391096f 100644
--- a/resources/templates/provision/cisco/spa514g/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa514g/{$mac}.xml
@@ -139,57 +139,21 @@
 <Screen_Saver_Wait group="Phone/General">300</Screen_Saver_Wait>
 <Screen_Saver_Icon group="Phone/General">Background Picture</Screen_Saver_Icon>
 
-<!-- Phone/Line_Key_1 -->
-{if $key_type_1 == 'line'}
-	<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"/>
+{foreach $keys as $row}
+{if $row.device_key_category == "line"}
+<!-- Phone/Line_Key_{$row.device_key_id} -->
+<Extension_{$row.device_key_id}_ group="Phone/Line_Key_{$row.device_key_id}">{$row.device_key_value}</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_1_ group="Phone/Line_Key_1">Disabled</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">{$key_value_1}</Extended_Function_1_>
+<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 -->
+<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}
 
-<!-- Phone/Line_Key_2 -->
-{if $key_type_2 == 'line'}
-	<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"/>
-{else}
-	<Extension_2_ group="Phone/Line_Key_2">Disabled</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">{$key_value_2}</Extended_Function_2_>
-{/if}
-
-<!-- Phone/Line_Key_3 -->
-{if $key_type_3 == 'line'}
-	<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"/>
-{else}
-	<Extension_3_ group="Phone/Line_Key_3">Disabled</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">{$key_value_3}</Extended_Function_3_>
-{/if}
-
-<!-- Phone/Line_Key_4 -->
-{if $key_type_4 == 'line'}
-	<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"/>
-{else}
-	<Extension_4_ group="Phone/Line_Key_4">Disabled</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">{$key_value_4}</Extended_Function_4_>
-{/if}
+{/foreach}
 
 <!-- Phone/Miscellaneous_Line_Key_Settings -->
 <Line_ID_Mapping group="Phone/Miscellaneous_Line_Key_Settings">Vertical First</Line_ID_Mapping>
diff --git a/resources/templates/provision/cisco/spa525g/{$mac}.xml b/resources/templates/provision/cisco/spa525g/{$mac}.xml
index 192fee483b..0c4642c4ad 100644
--- a/resources/templates/provision/cisco/spa525g/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa525g/{$mac}.xml
@@ -1628,7 +1628,7 @@
 <!-- General -->
 <Station_Name ua="na">{$display_name_1}</Station_Name>
 <Station_Display_Name ua="na"></Station_Display_Name>
-<Voice_Mail_Number ua="na"></Voice_Mail_Number>
+<Voice_Mail_Number ua="na">*97</Voice_Mail_Number>
 <Text_Logo ua="na"></Text_Logo>
 <BMP_Picture_Download_URL ua="na"></BMP_Picture_Download_URL>
 <Select_Logo ua="na"></Select_Logo> <!-- options: Default/BMP Picture/Text Logo/None -->
@@ -1638,161 +1638,21 @@
 <Screen_Saver_Wait ua="rw">300</Screen_Saver_Wait>
 <Screen_Saver_Icon ua="rw">Background Picture</Screen_Saver_Icon> <!-- options: StationTime/Lock/Phone/DateTime/Background Picture -->
 
-<!-- Phone/Line_Key_1 -->
-{if $key_type_1 == 'line'}
-	<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"/>
+{foreach $keys as $row}
+{if $row.device_key_category == "line"}
+<!-- Phone/Line_Key_{$row.device_key_id} -->
+<Extension_{$row.device_key_id}_ group="Phone/Line_Key_{$row.device_key_id}">{$row.device_key_value}</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_1_ group="Phone/Line_Key_1">Disabled</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">{$key_value_1}</Extended_Function_1_>
+<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 -->
+<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}
 
-<!-- Phone/Line_Key_2 -->
-{if $key_type_2 == 'line'}
-	<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"/>
-{else}
-	<Extension_2_ group="Phone/Line_Key_2">Disabled</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">{$key_value_2}</Extended_Function_2_>
-{/if}
-
-<!-- Phone/Line_Key_3 -->
-{if $key_type_3 == 'line'}
-	<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"/>
-{else}
-	<Extension_3_ group="Phone/Line_Key_3">Disabled</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">{$key_value_3}</Extended_Function_3_>
-{/if}
-
-<!-- Phone/Line_Key_4 -->
-{if $key_type_4 == 'line'}
-	<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"/>
-{else}
-	<Extension_4_ group="Phone/Line_Key_4">Disabled</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">{$key_value_4}</Extended_Function_4_>
-{/if}
-
-<!-- Phone/Line_Key_5 -->
-{if $key_type_5 == 'line'}
-	<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"/>
-{else}
-	<Extension_5_ group="Phone/Line_Key_5">Disabled</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">{$key_value_5}</Extended_Function_5_>
-{/if}
-
-<!-- Phone/Line_Key_6 -->
-{if $key_type_6 == 'line'}
-	<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}
-	<Extension_6_ group="Phone/Line_Key_6">Disabled</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">{$key_value_6}</Extended_Function_6_>
-{/if}
-
-<!-- Phone/Line_Key_7 -->
-{if $key_type_7 == 'line'}
-	<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}
-	<Extension_7_ group="Phone/Line_Key_7">Disabled</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">{$key_value_7}</Extended_Function_7_>
-{/if}
-
-<!-- Phone/Line_Key_8 -->
-{if $key_type_8 == 'line'}
-	<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"/>
-{else}
-	<Extension_8_ group="Phone/Line_Key_8">Disabled</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">{$key_value_8}</Extended_Function_8_>
-{/if}
-
-<!-- Phone/Line_Key_9 -->
-{if $key_type_9 == 'line'}
-	<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"/>
-{else}
-	<Extension_9_ group="Phone/Line_Key_9">Disabled</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">{$key_value_9}</Extended_Function_9_>
-{/if}
-
-<!-- Phone/Line_Key_10 -->
-{if $key_type_10 == 'line'}
-	<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"/>
-{else}
-	<Extension_10_ group="Phone/Line_Key_10">Disabled</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">{$key_value_10}</Extended_Function_10_>
-{/if}
-
-<!-- Phone/Line_Key_11 -->
-{if $key_type_11 == 'line'}
-	<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"/>
-{else}
-	<Extension_11_ group="Phone/Line_Key_11">Disabled</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">{$key_value_11}</Extended_Function_11_>
-{/if}
-
-<!-- Phone/Line_Key_12 -->
-{if $key_type_12 == 'line'}
-	<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"/>
-{else}
-	<Extension_12_ group="Phone/Line_Key_12">Disabled</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">{$key_value_12}</Extended_Function_12_>
-{/if}
+{/foreach}
 
 <!-- Miscellaneous Line Key Settings -->
 <Line_ID_Mapping ua="na">Vertical First</Line_ID_Mapping> <!-- options: Horizontal First/Vertical First -->