diff --git a/resources/templates/provision/polycom/5.x/{$mac}.cfg b/resources/templates/provision/polycom/5.x/{$mac}.cfg
index 9059298586..09f1b330a9 100755
--- a/resources/templates/provision/polycom/5.x/{$mac}.cfg
+++ b/resources/templates/provision/polycom/5.x/{$mac}.cfg
@@ -4,16 +4,13 @@
 	{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=""
 		reg.{$row.line_number}.auth.userId="{$row.user_id}"
 		reg.{$row.line_number}.auth.password="{$row.password}"
-		reg.{$row.line_number}.lineKeys="{$line_key_value_{$row.line_number}}"
+                reg.{$row.line_number}.lineKeys="{$line_key_value_{$row.line_number}}"
 		{if isset($row.outbound_proxy)}reg.{$row.line_number}.outboundProxy.address = "{$row.outbound_proxy}"{/if}
 		{if isset($row.sip_port)}reg.{$row.line_number}.outboundProxy.port="{$row.sip_port}"{else}reg.{$row.line_number}.outboundProxy.port="5060"{/if}
 		{if $row.sip_transport == ''}reg.{$row.line_number}.outboundProxy.transport="TCPOnly"{/if}
@@ -83,6 +80,18 @@
 		{else}
 		device.prov.serverName="{$domain_name}"
 		{/if}
+		{if isset($polycom_syslog_server)}
+		device.syslog.serverName.set="1"
+		device.syslog.serverName="{$polycom_syslog_server}"
+		device.syslog.transport.set="1"
+		device.syslog.transport="{$polycom_syslog_transport}"
+		device.syslog.facility.set="1"
+		device.syslog.facility="{$polycom_syslog_facility}"
+		device.syslog.renderLevel.set="1"
+		device.syslog.renderLevel="{$polycom_syslog_renderlevel}"
+		device.syslog.prependMac.set="1"
+		device.syslog.prependMac="{$polycom_syslog_prependmac}"
+		{/if}
 	/>
 	<SNTP
 		tcpIpApp.sntp.resyncPeriod="86400"
@@ -177,7 +186,7 @@
 		voIpProt.server.2.failOver.onlySignalWithRegistered="1" 
 		voIpProt.server.2.failOver.failBack.mode="duration"
 		voIpProt.server.2.failOver.failBack.timeout="120"
-		feature.bluetooth.radioOn="{$polycom_bluetooth_radio_on}"
+		{if isset($polycom_bluetooth_radio_on)}feature.bluetooth.radioOn="{$polycom_bluetooth_radio_on}"{/if}
 		feature.broadsoftUcOne.enabled="0"
 		voice.volume.persist.handset="1"
 		voice.volume.persist.handsfree="1"
@@ -201,9 +210,9 @@
 		voice.aec.hf.enable="1"
 		voice.aec.hs.enable="1"
 		dir.local.readonly="{$polycom_contact_list_readonly}"
-		video.enable="{$polycom_video_enable}"
-		video.callMode.default="{$polycom_video_audio_call_mode}"
-		feature.audioVideoToggle.enabled="{$polycom_video_audio_toggle}"
+		{if isset($polycom_video_enable)}video.enable="{$polycom_video_enable}"{/if}
+		{if isset($polycom_video_audio_call_mode)}video.callMode.default="{$polycom_video_audio_call_mode}"	{/if}
+		{if isset($polycom_video_audio_toggle)}feature.audioVideoToggle.enabled="{$polycom_video_audio_toggle}"	{/if}
 		msg.mwi.{$row.line_number}.callBackMode="contact"
 		msg.mwi.{$row.line_number}.callBack="{$voicemail_number}"
 		feature.intercom.enable="{$polycom_intercom_enable}"