diff --git a/resources/templates/provision/mitel/5324/MN_{$mac}.cfg b/resources/templates/provision/mitel/5324/MN_{$mac}.cfg
index 032e4ac9b0..785286ce3a 100644
--- a/resources/templates/provision/mitel/5324/MN_{$mac}.cfg
+++ b/resources/templates/provision/mitel/5324/MN_{$mac}.cfg
@@ -267,30 +267,23 @@
 	<snmp>0</snmp>
 	<srtp>0</srtp>
 	<pkDescription>
-		<Key Line="25" Fea="6" Des="Line 1" Addr="" Addr2="" Mode="1" Mode2="1" UserID="{$user_id_1}"></Key>
-		<Key Line="26" Fea="0" Des="" Addr="" Addr2="" Mode="1" Mode2="1" UserID=""></Key>
-		<Key Line="27" Fea="7" Des="Line 2" Addr="" Addr2="" Mode="1" Mode2="1" UserID="{$user_id_1}"></Key>
-		<Key Line="28" Fea="0" Des="" Addr="" Addr2="" Mode="1" Mode2="1" UserID=""></Key>
-		<Key Line="29" Fea="8" Des="Line 3" Addr="" Addr2="" Mode="1" Mode2="1" UserID="{$user_id_1}"></Key>
-		<Key Line="30" Fea="0" Des="" Addr="" Addr2="" Mode="1" Mode2="1" UserID=""></Key>
-		<Key Line="31" Fea="9" Des="Line 4" Addr="" Addr2="" Mode="1" Mode2="1" UserID="{$user_id_1}"></Key>
-		<Key Line="32" Fea="0" Des="" Addr="" Addr2="" Mode="1" Mode2="1" UserID=""></Key>
-		<Key Line="33" Fea="0" Des="" Addr="" Addr2="" Mode="1" Mode2="1" UserID=""></Key>
-		<Key Line="34" Fea="0" Des="" Addr="" Addr2="" Mode="1" Mode2="1" UserID=""></Key>
-		<Key Line="35" Fea="0" Des="" Addr="" Addr2="" Mode="1" Mode2="1" UserID=""></Key>
-		<Key Line="36" Fea="0" Des="" Addr="" Addr2="" Mode="1" Mode2="1" UserID=""></Key>
-		<Key Line="37" Fea="0" Des="" Addr="" Addr2="" Mode="1" Mode2="1" UserID=""></Key>
-		<Key Line="38" Fea="0" Des="" Addr="" Addr2="" Mode="1" Mode2="1" UserID=""></Key>
-		<Key Line="39" Fea="0" Des="" Addr="" Addr2="" Mode="1" Mode2="1" UserID=""></Key>
-		<Key Line="40" Fea="0" Des="" Addr="" Addr2="" Mode="1" Mode2="1" UserID=""></Key>
-		<!--<Key Line="41" Fea="19" Des="Weather" Addr="http://weather.yahooapis.com/forecastrss?p=CAXX0343" Addr2="" Mode="1" Mode2="1" UserID=""></Key>-->
-		<Key Line="42" Fea="0" Des="" Addr="" Addr2="" Mode="1" Mode2="1" UserID=""></Key>
-		<Key Line="43" Fea="4" Des="Headset" Addr="" Addr2="" Mode="1" Mode2="1" UserID=""></Key>
-		<Key Line="44" Fea="0" Des="" Addr="" Addr2="" Mode="1" Mode2="1" UserID=""></Key>
-		<Key Line="45" Fea="3" Des="Advisory" Addr="" Addr2="" Mode="1" Mode2="1" UserID=""></Key>
-		<Key Line="46" Fea="0" Des="" Addr="" Addr2="" Mode="1" Mode2="1" UserID=""></Key>
-		<Key Line="47" Fea="2" Des="Call logs" Addr="" Addr2="" Mode="1" Mode2="1" UserID=""></Key>
-		<Key Line="48" Fea="0" Des="" Addr="" Addr2="" Mode="1" Mode2="1" UserID=""></Key>
+		<!-- 25-48 keys -->
+		{foreach $keys as $row}
+		#Configure Line Key {$row.device_key_id}
+		{if $row.device_key_category == "line"}
+			{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}
+			{if $row.device_key_line == "4"}{$feature = "9"}{$user_id = $user_id_4}{/if}
+			{if $row.device_key_line == "5"}{$feature = "10"}{$user_id = $user_id_5}{/if}
+			{if $row.device_key_line == "6"}{$feature = "11"}{$user_id = $user_id_6}{/if}
+			{if $row.device_key_line == "7"}{$feature = "12"}{$user_id = $user_id_7}{/if}
+			{if $row.device_key_line == "8"}{$feature = "13"}{$user_id = $user_id_8}{/if}
+			<Key Line="{$row.device_key_line}" Fea="{$feature}" Des="{$row.device_key_label}" Addr="" Addr2="" Mode="1" Mode2="1" UserID="{$user_id}"></Key>
+		{/else}
+			<Key Line="{$row.device_key_line}" Fea="{$device_key_type}" Des="{$row.device_key_label}" Addr="" Addr2="" Mode="1" Mode2="1" UserID="{$user_id}"></Key>
+		{/if}
+		{/foreach}
 	</pkDescription>
 	<webdialurl></webdialurl>
 	<cw_tone>1</cw_tone>
diff --git a/resources/templates/provision/mitel/5340/MN_{$mac}.cfg b/resources/templates/provision/mitel/5340/MN_{$mac}.cfg
index 0cc9e1d55b..4d937002c9 100644
--- a/resources/templates/provision/mitel/5340/MN_{$mac}.cfg
+++ b/resources/templates/provision/mitel/5340/MN_{$mac}.cfg
@@ -267,30 +267,23 @@
 	<snmp>0</snmp>
 	<srtp>0</srtp>
 	<pkDescription>
-		<Key Line="25" Fea="6" Des="Line 1" Addr="" Addr2="" Mode="1" Mode2="1" UserID="{$user_id_1}"></Key>
-		<Key Line="26" Fea="0" Des="" Addr="" Addr2="" Mode="1" Mode2="1" UserID=""></Key>
-		<Key Line="27" Fea="7" Des="Line 2" Addr="" Addr2="" Mode="1" Mode2="1" UserID="{$user_id_1}"></Key>
-		<Key Line="28" Fea="0" Des="" Addr="" Addr2="" Mode="1" Mode2="1" UserID=""></Key>
-		<Key Line="29" Fea="8" Des="Line 3" Addr="" Addr2="" Mode="1" Mode2="1" UserID="{$user_id_1}"></Key>
-		<Key Line="30" Fea="0" Des="" Addr="" Addr2="" Mode="1" Mode2="1" UserID=""></Key>
-		<Key Line="31" Fea="9" Des="Line 4" Addr="" Addr2="" Mode="1" Mode2="1" UserID="{$user_id_1}"></Key>
-		<Key Line="32" Fea="0" Des="" Addr="" Addr2="" Mode="1" Mode2="1" UserID=""></Key>
-		<Key Line="33" Fea="0" Des="" Addr="" Addr2="" Mode="1" Mode2="1" UserID=""></Key>
-		<Key Line="34" Fea="0" Des="" Addr="" Addr2="" Mode="1" Mode2="1" UserID=""></Key>
-		<Key Line="35" Fea="0" Des="" Addr="" Addr2="" Mode="1" Mode2="1" UserID=""></Key>
-		<Key Line="36" Fea="0" Des="" Addr="" Addr2="" Mode="1" Mode2="1" UserID=""></Key>
-		<Key Line="37" Fea="0" Des="" Addr="" Addr2="" Mode="1" Mode2="1" UserID=""></Key>
-		<Key Line="38" Fea="0" Des="" Addr="" Addr2="" Mode="1" Mode2="1" UserID=""></Key>
-		<Key Line="39" Fea="0" Des="" Addr="" Addr2="" Mode="1" Mode2="1" UserID=""></Key>
-		<Key Line="40" Fea="0" Des="" Addr="" Addr2="" Mode="1" Mode2="1" UserID=""></Key>
-		<!--<Key Line="41" Fea="19" Des="Weather" Addr="http://weather.yahooapis.com/forecastrss?p=CAXX0343" Addr2="" Mode="1" Mode2="1" UserID=""></Key>-->
-		<Key Line="42" Fea="0" Des="" Addr="" Addr2="" Mode="1" Mode2="1" UserID=""></Key>
-		<Key Line="43" Fea="4" Des="Headset" Addr="" Addr2="" Mode="1" Mode2="1" UserID=""></Key>
-		<Key Line="44" Fea="0" Des="" Addr="" Addr2="" Mode="1" Mode2="1" UserID=""></Key>
-		<Key Line="45" Fea="3" Des="Advisory" Addr="" Addr2="" Mode="1" Mode2="1" UserID=""></Key>
-		<Key Line="46" Fea="0" Des="" Addr="" Addr2="" Mode="1" Mode2="1" UserID=""></Key>
-		<Key Line="47" Fea="2" Des="Call logs" Addr="" Addr2="" Mode="1" Mode2="1" UserID=""></Key>
-		<Key Line="48" Fea="0" Des="" Addr="" Addr2="" Mode="1" Mode2="1" UserID=""></Key>
+		<!-- 25-48 keys -->
+		{foreach $keys as $row}
+		#Configure Line Key {$row.device_key_id}
+		{if $row.device_key_category == "line"}
+			{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}
+			{if $row.device_key_line == "4"}{$feature = "9"}{$user_id = $user_id_4}{/if}
+			{if $row.device_key_line == "5"}{$feature = "10"}{$user_id = $user_id_5}{/if}
+			{if $row.device_key_line == "6"}{$feature = "11"}{$user_id = $user_id_6}{/if}
+			{if $row.device_key_line == "7"}{$feature = "12"}{$user_id = $user_id_7}{/if}
+			{if $row.device_key_line == "8"}{$feature = "13"}{$user_id = $user_id_8}{/if}
+			<Key Line="{$row.device_key_line}" Fea="{$feature}" Des="{$row.device_key_label}" Addr="" Addr2="" Mode="1" Mode2="1" UserID="{$user_id}"></Key>
+		{/else}
+			<Key Line="{$row.device_key_line}" Fea="{$device_key_type}" Des="{$row.device_key_label}" Addr="" Addr2="" Mode="1" Mode2="1" UserID="{$user_id}"></Key>
+		{/if}
+		{/foreach}
 	</pkDescription>
 	<webdialurl></webdialurl>
 	<cw_tone>1</cw_tone>