diff --git a/resources/templates/provision/polycom/5.x/{$mac}.cfg b/resources/templates/provision/polycom/5.x/{$mac}.cfg
index 98352619c2..fddcf41d69 100755
--- a/resources/templates/provision/polycom/5.x/{$mac}.cfg
+++ b/resources/templates/provision/polycom/5.x/{$mac}.cfg
@@ -2,12 +2,13 @@
 <PHONE>
 	<REGISTRATION
 
-		reg.{$row.line_number}.serverFeatureControl.cf="{$polycom_feature_key_sync}"
-		reg.{$row.line_number}.serverFeatureControl.dnd="{$polycom_feature_key_sync}"
-
 		{foreach $lines as $row}reg.{$row.line_number}.displayName="{$row.display_name}"
 		reg.{$row.line_number}.address="{$row.user_id}@{$row.server_address}"
 		reg.{$row.line_number}.label="{$row.display_name}"
+
+		reg.{$row.line_number}.serverFeatureControl.cf="{$polycom_feature_key_sync}"
+		reg.{$row.line_number}.serverFeatureControl.dnd="{$polycom_feature_key_sync}"
+
 		{if isset($row.shared_line)}reg.{$row.line_number}.type="{$row.shared_line}"{else}reg.{$row.line_number}.type="private"{/if}
 
 		reg.{$row.line_number}.thirdPartyName=""
@@ -58,8 +59,8 @@
 	/>
 	<DEVICE_SETTINGS
 		device.set="1"
-                device.baseProfile.set="1"
-                device.baseProfile="Generic"
+		device.baseProfile.set="1"
+		device.baseProfile="Generic"
 		device.sntp.serverName="{$ntp_server_primary}"
 		device.sntp.gmtOffset="{$polycom_gmt_offset}"
 		{if isset($admin_password)}
@@ -73,13 +74,18 @@
 		{if isset($dns_server_primary)}device.dns.serverAddress="{$dns_server_primary}"{/if}
 		{if isset($dns_server_secondary)}device.dns.altSrvAddress="{$dns_server_secondary}"{/if}
 		{if isset($polycom_provision_url)}
+		device.prov.serverName.set="1"
 		device.prov.serverName="{$polycom_provision_url}"
+		device.prov.serverType.set="1"
+		device.prov.serverType="{$polycom_server_type}"
+		device.prov.user.set="1"
+		device.prov.user="{$http_auth_username}"
+		device.prov.password.set="1"
+		device.prov.password="{$http_auth_password}"
+		device.prov.tagSerialNo="1"
 		{else}
 		device.prov.serverName="{$domain_name}"
 		{/if}
-		device.prov.serverType="{$polycom_server_type}"
-		device.prov.user="{$http_auth_username}"
-		device.prov.password="{$http_auth_password}"
 	/>
 	<SNTP
 		tcpIpApp.sntp.resyncPeriod="86400"
@@ -196,7 +202,19 @@
 		call.callWaiting.enable="{$polycom_call_waiting}"
 		call.callWaiting.ring="beep"
 		call.callsPerLineKey="{$polycom_calls_per_line_key}"
+
+		prov.polling.enabled="{$polycom_provision_polling_enabled}"
+		prov.polling.time="03:00"
+		feature.urlDialing.enabled="0"
+		powerSaving.enable="0"
+		up.headsetMode="1"
+		voice.aec.hf.enable="1"
+		voice.aec.hs.enable="1"
+
+		msg.mwi.{$row.line_number}.callBackMode="contact"
+		msg.mwi.{$row.line_number}.callBack="{$voicemail_number}"
 	/>
+
 	<SOFT_KEYS
 		softkey.1.label="VMTransfer"
 		softkey.1.action="^*99$P1N4$$Trefer$"
@@ -206,7 +224,8 @@
 		efk.efkprompt.1.status="1"
 		efk.efkprompt.1.type="numeric"
 	/>
+
 	<usb 
-		feature.callRecording.enabled="1"
+		feature.callRecording.enabled="0"
 	/>
 </PHONE>