diff --git a/resources/templates/provision/polycom/4.x/{$mac}.cfg b/resources/templates/provision/polycom/4.x/{$mac}.cfg
index e5c16b6f1..ea0d907b3 100644
--- a/resources/templates/provision/polycom/4.x/{$mac}.cfg
+++ b/resources/templates/provision/polycom/4.x/{$mac}.cfg
@@ -2,13 +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}"
 		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=""
@@ -29,8 +29,11 @@
 		{else}
 		reg.{$row.line_number}.server.1.address="{$row.server_address}"
 		{/if}
-		{if isset($row.sip_port)}reg.{$row.line_number}.server.1.port="{$row.sip_port}"{else}reg.{$row.line_number}.server.1.port="5060"{/if}
-
+		{if isset($row.sip_port)}
+		reg.{$row.line_number}.server.1.port="{$row.sip_port}"
+		{else}
+		reg.{$row.line_number}.server.1.port="5060"
+		{/if}
 		{if $row.sip_transport == ''}reg.{$row.line_number}.server.1.transport="TCPOnly"{/if}
 		{if $row.sip_transport == 'tcp'}reg.{$row.line_number}.server.1.transport="TCPOnly"{/if}
 		{if $row.sip_transport == 'udp'}reg.{$row.line_number}.server.1.transport="UDPOnly"{/if}
@@ -69,13 +72,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"
@@ -174,11 +182,24 @@
 			up.oneTouchVoiceMail="0"
 		{/if}
 		exchange.server.url="0.0.0.0"
+		up.warningLevel="2"
 		call.defaultTransferType="{$polycom_default_transfer_method}"
 		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$"