diff --git a/resources/templates/provision/cisco/spa504g/{$mac}.xml b/resources/templates/provision/cisco/spa504g/{$mac}.xml
index 40a1a0fa0d..302fc5290a 100644
--- a/resources/templates/provision/cisco/spa504g/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa504g/{$mac}.xml
@@ -161,22 +161,50 @@
 <Screen_Saver_Enable group="Phone/General">No</Screen_Saver_Enable>
 <Screen_Saver_Wait group="Phone/General">300</Screen_Saver_Wait>
 <Screen_Saver_Icon group="Phone/General">Background Picture</Screen_Saver_Icon>
-<Extension_1_ group="Phone/Line_Key_1">1</Extension_1_>
-<Short_Name_1_ group="Phone/Line_Key_1">$USER</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"/>
-<Extension_2_ group="Phone/Line_Key_2">1</Extension_2_>
-<Short_Name_2_ group="Phone/Line_Key_2">$USER</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"/>
-<Extension_3_ group="Phone/Line_Key_3">1</Extension_3_>
-<Short_Name_3_ group="Phone/Line_Key_3">$USER</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"/>
-<Extension_4_ group="Phone/Line_Key_4">1</Extension_4_>
-<Short_Name_4_ group="Phone/Line_Key_4">$USER</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"/>
+{if $key_type_1 == 'line'}
+	<Extension_1_ group="Phone/Line_Key_1">{$key_id_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"/>
+{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}
+{if $key_type_2 == 'line'}
+	<Extension_2_ group="Phone/Line_Key_2">{$key_id_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}
+{if $key_type_3 == 'line'}
+	<Extension_3_ group="Phone/Line_Key_3">{$key_id_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}
+{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}
 <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"/>