diff --git a/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml
index 019ab596a1..6b332cfd4e 100644
--- a/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml
@@ -3592,8 +3592,7 @@ Outgoing calls. 0 - No, 1 - Yes. Default is 0 -->
     <!-- Extension Boards FOR GXP2110 and GXP2120 ONLY -->
     <!-- Extension Board 1 Settings. mode 23000, line 23001, label, 23002, value 23003 -->
 {$start_id = 23000}
-{foreach $keys as $row}
-{if $row.device_key_category == "expansion"}
+{foreach $keys["expansion"] as $row}
 {$key_id = $row.device_key_id - 1}
 {$type_id = $start_id + ($key_id * 5)}
 {$line_id = ($start_id + 1) + ($key_id * 5)}
@@ -3615,7 +3614,6 @@ Outgoing calls. 0 - No, 1 - Yes. Default is 0 -->
     <P{$line_id}>{$row.device_key_line}</P{$line_id}>
     <P{$label_id}>{$row.device_key_label}</P{$label_id}>
     <P{$value_id}>{$row.device_key_value}</P{$value_id}>
-{/if}
 {/foreach}
 
   </config>
diff --git a/resources/templates/provision/mitel/5324/MN_{$mac}.cfg b/resources/templates/provision/mitel/5324/MN_{$mac}.cfg
index 5166f30fbf..170dfa1acd 100644
--- a/resources/templates/provision/mitel/5324/MN_{$mac}.cfg
+++ b/resources/templates/provision/mitel/5324/MN_{$mac}.cfg
@@ -267,7 +267,7 @@
 	<snmp>0</snmp>
 	<srtp>0</srtp>
 <pkDescription>
-{foreach $keys as $row}
+{foreach $keys["line"] as $row}
 {if $row.device_key_line == "1"}{$feature = "6"}{$user_id = $user_id_1}{/if}
 {if $row.device_key_line == "2"}{$feature = "7"}{$user_id = $user_id_2}{/if}
 {if $row.device_key_line == "3"}{$feature = "8"}{$user_id = $user_id_3}{/if}
diff --git a/resources/templates/provision/mitel/5330/MN_{$mac}.cfg b/resources/templates/provision/mitel/5330/MN_{$mac}.cfg
index 7e52978c0d..8eeefce6ea 100644
--- a/resources/templates/provision/mitel/5330/MN_{$mac}.cfg
+++ b/resources/templates/provision/mitel/5330/MN_{$mac}.cfg
@@ -267,7 +267,7 @@
 	<snmp>0</snmp>
 	<srtp>0</srtp>
 <pkDescription>
-{foreach $keys as $row}
+{foreach $keys["line"] as $row}
 {if $row.device_key_line == "1"}{$feature = "6"}{$user_id = $user_id_1}{/if}
 {if $row.device_key_line == "2"}{$feature = "7"}{$user_id = $user_id_2}{/if}
 {if $row.device_key_line == "3"}{$feature = "8"}{$user_id = $user_id_3}{/if}
diff --git a/resources/templates/provision/mitel/5340/MN_{$mac}.cfg b/resources/templates/provision/mitel/5340/MN_{$mac}.cfg
index 5166f30fbf..170dfa1acd 100644
--- a/resources/templates/provision/mitel/5340/MN_{$mac}.cfg
+++ b/resources/templates/provision/mitel/5340/MN_{$mac}.cfg
@@ -267,7 +267,7 @@
 	<snmp>0</snmp>
 	<srtp>0</srtp>
 <pkDescription>
-{foreach $keys as $row}
+{foreach $keys["line"] as $row}
 {if $row.device_key_line == "1"}{$feature = "6"}{$user_id = $user_id_1}{/if}
 {if $row.device_key_line == "2"}{$feature = "7"}{$user_id = $user_id_2}{/if}
 {if $row.device_key_line == "3"}{$feature = "8"}{$user_id = $user_id_3}{/if}
diff --git a/resources/templates/provision/snom/3xx/{$mac}.xml b/resources/templates/provision/snom/3xx/{$mac}.xml
index 4bf3c626b6..0e22bce81a 100644
--- a/resources/templates/provision/snom/3xx/{$mac}.xml
+++ b/resources/templates/provision/snom/3xx/{$mac}.xml
@@ -85,19 +85,19 @@
 <codec_priority_list idx="12" perm="">g722,pcmu,pcma,gsm,g726-32,aal2-g726-32,g723,g729,telephone-event</codec_priority_list>
 </phone-settings>
 <functionKeys e="2">
-{foreach $keys as $row}
+{foreach $keys["line"] as $row}
 {if $row.device_key_line == ""}
-    {if $row.device_key_category == "line"}
-    <fkey idx="{$row.device_key_id-1}" context="active" label="{$row.device_key_label}" perm="">{$row.device_key_type} {$row.device_key_value} {$row.device_key_extension}</fkey>
-    {else}
-    <fkey idx="{$row.device_key_id}" context="active" label="" perm="">line</fkey>
-    {/if}
+	{if $row.device_key_type == "line"}
+		<fkey idx="{$row.device_key_id}" context="active" label="" perm="">line</fkey>
+	{else}
+		<fkey idx="{$row.device_key_id-1}" context="active" label="{$row.device_key_label}" perm="">{$row.device_key_type} {$row.device_key_value} {$row.device_key_extension}</fkey>
+	{/if}
 {else}
-    {if $row.device_key_category == "line"}
-    <fkey idx="{$row.device_key_id-1}" context="{$row.device_key_line}" label="{$row.device_key_label}" perm="">{$row.device_key_type} {$row.device_key_value} {$row.device_key_extension}</fkey>
-    {else}
-    <fkey idx="{$row.device_key_id}" context="active" label="" perm="">line</fkey>
-    {/if}
+	{if $row.device_key_type == "line"}
+		<fkey idx="{$row.device_key_id}" context="active" label="" perm="">line</fkey>
+	{else}
+		<fkey idx="{$row.device_key_id-1}" context="{$row.device_key_line}" label="{$row.device_key_label}" perm="">{$row.device_key_type} {$row.device_key_value} {$row.device_key_extension}</fkey>
+	{/if}
 {/if}
 {/foreach}
 </functionKeys>
diff --git a/resources/templates/provision/snom/7xx/{$mac}.xml b/resources/templates/provision/snom/7xx/{$mac}.xml
index 41b64a3b7f..e30fd75bed 100644
--- a/resources/templates/provision/snom/7xx/{$mac}.xml
+++ b/resources/templates/provision/snom/7xx/{$mac}.xml
@@ -90,19 +90,9 @@
 <codec_priority_list idx="12" perm="">g722,pcmu,pcma,gsm,g726-32,aal2-g726-32,g723,g729,telephone-event</codec_priority_list>
 </phone-settings>
 <functionKeys e="2">
-{foreach $keys as $row}
+{foreach $keys["line"] as $row}
 {if $row.device_key_line == ""}
-    {if $row.device_key_category == "line"}
     <fkey idx="{$row.device_key_id-1}" context="active" label="{$row.device_key_label}" perm="">{$row.device_key_type} {$row.device_key_value} {$row.device_key_extension}</fkey>
-    {else}
-    <fkey idx="{$row.device_key_id}" context="active" label="" perm="">line</fkey>
-    {/if}
-{else}
-    {if $row.device_key_category == "line"}
-    <fkey idx="{$row.device_key_id-1}" context="{$row.device_key_line}" label="{$row.device_key_label}" perm="">{$row.device_key_type} {$row.device_key_value} {$row.device_key_extension}</fkey>
-    {else}
-    <fkey idx="{$row.device_key_id}" context="active" label="" perm="">line</fkey>
-    {/if}
 {/if}
 {/foreach}
 </functionKeys>
diff --git a/resources/templates/provision/snom/8xx/{$mac}.xml b/resources/templates/provision/snom/8xx/{$mac}.xml
index 4bf3c626b6..0e22bce81a 100644
--- a/resources/templates/provision/snom/8xx/{$mac}.xml
+++ b/resources/templates/provision/snom/8xx/{$mac}.xml
@@ -85,19 +85,19 @@
 <codec_priority_list idx="12" perm="">g722,pcmu,pcma,gsm,g726-32,aal2-g726-32,g723,g729,telephone-event</codec_priority_list>
 </phone-settings>
 <functionKeys e="2">
-{foreach $keys as $row}
+{foreach $keys["line"] as $row}
 {if $row.device_key_line == ""}
-    {if $row.device_key_category == "line"}
-    <fkey idx="{$row.device_key_id-1}" context="active" label="{$row.device_key_label}" perm="">{$row.device_key_type} {$row.device_key_value} {$row.device_key_extension}</fkey>
-    {else}
-    <fkey idx="{$row.device_key_id}" context="active" label="" perm="">line</fkey>
-    {/if}
+	{if $row.device_key_type == "line"}
+		<fkey idx="{$row.device_key_id}" context="active" label="" perm="">line</fkey>
+	{else}
+		<fkey idx="{$row.device_key_id-1}" context="active" label="{$row.device_key_label}" perm="">{$row.device_key_type} {$row.device_key_value} {$row.device_key_extension}</fkey>
+	{/if}
 {else}
-    {if $row.device_key_category == "line"}
-    <fkey idx="{$row.device_key_id-1}" context="{$row.device_key_line}" label="{$row.device_key_label}" perm="">{$row.device_key_type} {$row.device_key_value} {$row.device_key_extension}</fkey>
-    {else}
-    <fkey idx="{$row.device_key_id}" context="active" label="" perm="">line</fkey>
-    {/if}
+	{if $row.device_key_type == "line"}
+		<fkey idx="{$row.device_key_id}" context="active" label="" perm="">line</fkey>
+	{else}
+		<fkey idx="{$row.device_key_id-1}" context="{$row.device_key_line}" label="{$row.device_key_label}" perm="">{$row.device_key_type} {$row.device_key_value} {$row.device_key_extension}</fkey>
+	{/if}
 {/if}
 {/foreach}
 </functionKeys>