diff --git a/app/devices/app_languages.php b/app/devices/app_languages.php
index 577792fd96..7b7118fae8 100644
--- a/app/devices/app_languages.php
+++ b/app/devices/app_languages.php
@@ -1728,6 +1728,97 @@ $text['label-automata']['de-at'] = "automata";
 $text['label-automata']['ar-eg'] = "";
 $text['label-automata']['he'] = "";
 
+$text['label-messages']['en-us'] = "Messages";
+$text['label-messages']['es-cl'] = "Messages";
+$text['label-messages']['pt-pt'] = "Messages";
+$text['label-messages']['fr-fr'] = "Messages";
+$text['label-messages']['pt-br'] = "Messages";
+$text['label-messages']['pl'] = "Messages";
+$text['label-messages']['uk'] = "Messages";
+$text['label-messages']['sv-se'] = "Messages";
+$text['label-messages']['ro'] = "Messages";
+$text['label-messages']['de-at'] = "Messages";
+$text['label-messages']['ar-eg'] = "Messages";
+$text['label-messages']['he'] = "Messages";
+
+$text['label-micmute']['en-us'] = "MicMute";
+$text['label-micmute']['es-cl'] = "MicMute";
+$text['label-micmute']['pt-pt'] = "MicMute";
+$text['label-micmute']['fr-fr'] = "MicMute";
+$text['label-micmute']['pt-br'] = "MicMute";
+$text['label-micmute']['pl'] = "MicMute";
+$text['label-micmute']['uk'] = "MicMute";
+$text['label-micmute']['sv-se'] = "MicMute";
+$text['label-micmute']['ro'] = "MicMute";
+$text['label-micmute']['de-at'] = "MicMute";
+$text['label-micmute']['ar-eg'] = "MicMute";
+$text['label-micmute']['he'] = "MicMute";
+
+$text['label-redial']['en-us'] = "Redial";
+$text['label-redial']['es-cl'] = "Redial";
+$text['label-redial']['pt-pt'] = "Redial";
+$text['label-redial']['fr-fr'] = "Redial";
+$text['label-redial']['pt-br'] = "Redial";
+$text['label-redial']['pl'] = "Redial";
+$text['label-redial']['uk'] = "Redial";
+$text['label-redial']['sv-se'] = "Redial";
+$text['label-redial']['ro'] = "Redial";
+$text['label-redial']['de-at'] = "Redial";
+$text['label-redial']['ar-eg'] = "Redial";
+$text['label-redial']['he'] = "Redial";
+
+$text['label-null']['en-us'] = "Null";
+$text['label-null']['es-cl'] = "Null";
+$text['label-null']['pt-pt'] = "Null";
+$text['label-null']['fr-fr'] = "Null";
+$text['label-null']['pt-br'] = "Null";
+$text['label-null']['pl'] = "Null";
+$text['label-null']['uk'] = "Null";
+$text['label-null']['sv-se'] = "Null";
+$text['label-null']['ro'] = "Null";
+$text['label-null']['de-at'] = "Null";
+$text['label-null']['ar-eg'] = "Null";
+$text['label-null']['he'] = "Null";
+
+$text['label-speeddial']['en-us'] = "SpeedDial";
+$text['label-speeddial']['es-cl'] = "SpeedDial";
+$text['label-speeddial']['pt-pt'] = "SpeedDial";
+$text['label-speeddial']['fr-fr'] = "SpeedDial";
+$text['label-speeddial']['pt-br'] = "SpeedDial";
+$text['label-speeddial']['pl'] = "SpeedDial";
+$text['label-speeddial']['uk'] = "SpeedDial";
+$text['label-speeddial']['sv-se'] = "SpeedDial";
+$text['label-speeddial']['ro'] = "SpeedDial";
+$text['label-speeddial']['de-at'] = "SpeedDial";
+$text['label-speeddial']['ar-eg'] = "SpeedDial";
+$text['label-speeddial']['he'] = "SpeedDial";
+
+$text['label-speeddialmenu']['en-us'] = "SpeedDialMenu";
+$text['label-speeddialmenu']['es-cl'] = "SpeedDialMenu";
+$text['label-speeddialmenu']['pt-pt'] = "SpeedDialMenu";
+$text['label-speeddialmenu']['fr-fr'] = "SpeedDialMenu";
+$text['label-speeddialmenu']['pt-br'] = "SpeedDialMenu";
+$text['label-speeddialmenu']['pl'] = "SpeedDialMenu";
+$text['label-speeddialmenu']['uk'] = "SpeedDialMenu";
+$text['label-speeddialmenu']['sv-se'] = "SpeedDialMenu";
+$text['label-speeddialmenu']['ro'] = "SpeedDialMenu";
+$text['label-speeddialmenu']['de-at'] = "SpeedDialMenu";
+$text['label-speeddialmenu']['ar-eg'] = "SpeedDialMenu";
+$text['label-speeddialmenu']['he'] = "SpeedDialMenu";
+
+$text['label-url']['en-us'] = "URL";
+$text['label-url']['es-cl'] = "URL";
+$text['label-url']['pt-pt'] = "URL";
+$text['label-url']['fr-fr'] = "URL";
+$text['label-url']['pt-br'] = "URL";
+$text['label-url']['pl'] = "URL";
+$text['label-url']['uk'] = "URL";
+$text['label-url']['sv-se'] = "URL";
+$text['label-url']['ro'] = "URL";
+$text['label-url']['de-at'] = "URL";
+$text['label-url']['ar-eg'] = "URL";
+$text['label-url']['he'] = "URL";
+
 $text['label-auto_answer']['en-us'] = "Auto Answer";
 $text['label-auto_answer']['es-cl'] = "Respuesta Automática";
 $text['label-auto_answer']['pt-pt'] = "Resposta Automática";
diff --git a/app/devices/device_edit.php b/app/devices/device_edit.php
index af2231ef23..20fc4e00c1 100644
--- a/app/devices/device_edit.php
+++ b/app/devices/device_edit.php
@@ -964,6 +964,13 @@ require_once "resources/require.php";
 					<option value='line' <?php if ($row['device_key_type'] == "line") { echo $selected;$found=true; } ?>><?php echo $text['label-line'] ?></option>
 					<option value='automata' <?php if ($row['device_key_type'] == "automata") { echo $selected;$found=true; } ?>><?php echo $text['label-automata'] ?></option>
 					<option value='normal' <?php if ($row['device_key_type'] == "normal") { echo $selected;$found=true; } ?>><?php echo $text['label-normal'] ?></option>
+					<option value='Messages' <?php if ($row['device_key_type'] == "Messages") { echo $selected;$found=true; } ?>><?php echo $text['label-messages'] ?></option>
+					<option value='MicMute' <?php if ($row['device_key_type'] == "MicMute") { echo $selected;$found=true; } ?>><?php echo $text['label-micmute'] ?></option>
+					<option value='Redial' <?php if ($row['device_key_type'] == "Redial") { echo $selected;$found=true; } ?>><?php echo $text['label-redial'] ?></option>
+					<option value='Null' <?php if ($row['device_key_type'] == "Null") { echo $selected;$found=true; } ?>><?php echo $text['label-null'] ?></option>
+					<option value='SpeedDial' <?php if ($row['device_key_type'] == "SpeedDial") { echo $selected;$found=true; } ?>><?php echo $text['label-speeddial'] ?></option>
+					<option value='SpeedDialMenu' <?php if ($row['device_key_type'] == "SpeedDialMenu") { echo $selected;$found=true; } ?>><?php echo $text['label-speeddialmenu'] ?></option>
+					<option value='URL' <?php if ($row['device_key_type'] == "URL") { echo $selected;$found=true; } ?>><?php echo $text['label-url'] ?></option>
 					<?php
 					if (strlen($device_vendor) == 0) { echo "</optgroup>"; }
 				}
diff --git a/resources/templates/provision/polycom/4.x/{$mac}.cfg b/resources/templates/provision/polycom/4.x/{$mac}.cfg
index b5d9431b66..868b864a97 100644
--- a/resources/templates/provision/polycom/4.x/{$mac}.cfg
+++ b/resources/templates/provision/polycom/4.x/{$mac}.cfg
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <PHONE>
 	<REGISTRATION
-		{foreach $lines as $row}reg.{$row.line_number}.displayName="{$row.user_id}"
+		{foreach $lines as $row}reg.{$row.line_number}.displayName="{$row.display_name}"
 		reg.{$row.line_number}.address="{$row.user_id}"
-		reg.{$row.line_number}.label="{$row.user_id}"
+		reg.{$row.line_number}.label="{$row.display_name}"
 		reg.{$row.line_number}.type="private"
 		reg.{$row.line_number}.auth.userId="{$row.user_id}" 
 		reg.{$row.line_number}.auth.password="{$row.password}"
@@ -57,12 +57,26 @@
 		attendant.behaviors.display.remoteCallerID.normal="1"
 		attendant.behaviors.display.spontaneousCallAppearances.automata="1"
 		attendant.behaviors.display.spontaneousCallAppearances.normal="0"
-		{foreach $keys as $row}{if $row.device_key_category == "line"}{if $row.device_key_type != "line"}attendant.resourceList.{$row.device_key_id}.address="{$row.device_key_value}"
-		attendant.resourceList.{$row.device_key_id}.callAddress=""
-		attendant.resourceList.{$row.device_key_id}.label="{$row.device_key_label}"
-		attendant.resourceList.{$row.device_key_id}.proceedingIsRecipient="0" 
-		attendant.resourceList.{$row.device_key_id}.type="{$row.device_key_type}"
-		{/if}{/if}
+		feature.enhancedFeatureKeys.enabled="1"
+		{foreach $keys as $row}
+			{if $row.device_key_category == "line"}
+				{if $row.device_key_type == "automata" && $row.device_key_type == "normal"}
+					attendant.resourceList.{$row.device_key_id}.address="{$row.device_key_value}"
+					attendant.resourceList.{$row.device_key_id}.callAddress=""
+					attendant.resourceList.{$row.device_key_id}.label="{$row.device_key_label}"
+					attendant.resourceList.{$row.device_key_id}.proceedingIsRecipient="0" 
+					attendant.resourceList.{$row.device_key_id}.type="{$row.device_key_type}"
+				{else}
+					{if $row.device_key_type != "line"}
+						{if $row.device_key_type == "URL"}
+							key.{$row.device_key_id}.function.prim="{$row.device_key_value}"
+						{else}
+							key.{$row.device_key_id}.function.prim="{$row.device_key_type}"
+							key.{$row.device_key_id}.subPoint.prim="{$row.device_key_value}"
+						{/if}
+					{/if}
+				{/if}
+			{/if}
 		{/foreach}
 	/>
 	<MULTICAST_PAGING
@@ -79,5 +93,6 @@
 		voice.volume.persist.handset="1"
 		{if $headset_mode != ''}up.handsfreeMode="1" 
 		up.headsetMode="{$headset_mode}"{/if}
+		{if $analog_headset_option != ''}up.analogHeadsetOption="{$analog_headset_option}"{/if}
 	/>
 </PHONE>
\ No newline at end of file
diff --git a/resources/templates/provision/polycom/5.x/{$mac}.cfg b/resources/templates/provision/polycom/5.x/{$mac}.cfg
index b5d9431b66..868b864a97 100755
--- a/resources/templates/provision/polycom/5.x/{$mac}.cfg
+++ b/resources/templates/provision/polycom/5.x/{$mac}.cfg
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <PHONE>
 	<REGISTRATION
-		{foreach $lines as $row}reg.{$row.line_number}.displayName="{$row.user_id}"
+		{foreach $lines as $row}reg.{$row.line_number}.displayName="{$row.display_name}"
 		reg.{$row.line_number}.address="{$row.user_id}"
-		reg.{$row.line_number}.label="{$row.user_id}"
+		reg.{$row.line_number}.label="{$row.display_name}"
 		reg.{$row.line_number}.type="private"
 		reg.{$row.line_number}.auth.userId="{$row.user_id}" 
 		reg.{$row.line_number}.auth.password="{$row.password}"
@@ -57,12 +57,26 @@
 		attendant.behaviors.display.remoteCallerID.normal="1"
 		attendant.behaviors.display.spontaneousCallAppearances.automata="1"
 		attendant.behaviors.display.spontaneousCallAppearances.normal="0"
-		{foreach $keys as $row}{if $row.device_key_category == "line"}{if $row.device_key_type != "line"}attendant.resourceList.{$row.device_key_id}.address="{$row.device_key_value}"
-		attendant.resourceList.{$row.device_key_id}.callAddress=""
-		attendant.resourceList.{$row.device_key_id}.label="{$row.device_key_label}"
-		attendant.resourceList.{$row.device_key_id}.proceedingIsRecipient="0" 
-		attendant.resourceList.{$row.device_key_id}.type="{$row.device_key_type}"
-		{/if}{/if}
+		feature.enhancedFeatureKeys.enabled="1"
+		{foreach $keys as $row}
+			{if $row.device_key_category == "line"}
+				{if $row.device_key_type == "automata" && $row.device_key_type == "normal"}
+					attendant.resourceList.{$row.device_key_id}.address="{$row.device_key_value}"
+					attendant.resourceList.{$row.device_key_id}.callAddress=""
+					attendant.resourceList.{$row.device_key_id}.label="{$row.device_key_label}"
+					attendant.resourceList.{$row.device_key_id}.proceedingIsRecipient="0" 
+					attendant.resourceList.{$row.device_key_id}.type="{$row.device_key_type}"
+				{else}
+					{if $row.device_key_type != "line"}
+						{if $row.device_key_type == "URL"}
+							key.{$row.device_key_id}.function.prim="{$row.device_key_value}"
+						{else}
+							key.{$row.device_key_id}.function.prim="{$row.device_key_type}"
+							key.{$row.device_key_id}.subPoint.prim="{$row.device_key_value}"
+						{/if}
+					{/if}
+				{/if}
+			{/if}
 		{/foreach}
 	/>
 	<MULTICAST_PAGING
@@ -79,5 +93,6 @@
 		voice.volume.persist.handset="1"
 		{if $headset_mode != ''}up.handsfreeMode="1" 
 		up.headsetMode="{$headset_mode}"{/if}
+		{if $analog_headset_option != ''}up.analogHeadsetOption="{$analog_headset_option}"{/if}
 	/>
 </PHONE>
\ No newline at end of file