diff --git a/resources/templates/provision/polycom/5.x/{$mac}.cfg b/resources/templates/provision/polycom/5.x/{$mac}.cfg
index 65ac735489..a36cf80ec4 100644
--- a/resources/templates/provision/polycom/5.x/{$mac}.cfg
+++ b/resources/templates/provision/polycom/5.x/{$mac}.cfg
@@ -7,44 +7,45 @@
 		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}"
-                {if isset($line_key_value_{$row.line_number})}reg.{$row.line_number}.lineKeys="{$line_key_value_{$row.line_number}}"{else}reg.{$row.line_number}.lineKeys="1"{/if}
+		{if isset($row.line_keys)}reg.{$row.line_number}.lineKeys="{$row.line_keys}"{else}reg.{$row.line_number}.lineKeys="1"{/if}
+
 		{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}
 		{if $row.sip_transport == 'tcp'}reg.{$row.line_number}.outboundProxy.transport="TCPOnly"{/if}
 		{if $row.sip_transport == 'udp'}reg.{$row.line_number}.outboundProxy.transport="UDPOnly"{/if}
 		{if $row.sip_transport == 'tls'}reg.{$row.line_number}.outboundProxy.transport="TLS" {/if}
 		{if $row.sip_transport == 'dns srv'}reg.{$row.line_number}.outboundProxy.transport="DNSnaptr"{/if}
-		{if isset($row.server_address_primary)}
-		reg.{$row.line_number}.server.1.address="{$row.server_address_primary}"
-		{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.server_address_primary)}reg.{$row.line_number}.server.1.address="{$row.server_address_primary}"{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 $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}
 		{if $row.sip_transport == 'tls'}reg.{$row.line_number}.server.1.transport="TLS" {/if}
 		{if $row.sip_transport == 'dns srv'}reg.{$row.line_number}.server.1.transport="DNSnaptr"{/if}
+
 		{if isset($row.register_expires)}reg.{$row.line_number}.server.1.expires="{$row.register_expires}"{else}reg.{$row.line_number}.server.1.expires="{$row.register_expires}"{/if}
+
 		reg.{$row.line_number}.server.2.address="{$row.server_address_secondary}"
-		{if isset($row.sip_port)}
-		reg.{$row.line_number}.server.2.port="{$row.sip_port}"
-		{else}reg.{$row.line_number}.server.1.port="5060"
-		{/if}
+		{if isset($row.sip_port)}reg.{$row.line_number}.server.2.port="{$row.sip_port}"{else}reg.{$row.line_number}.server.1.port="5060"{/if}
+
 		{if $row.sip_transport == ''}reg.{$row.line_number}.server.2.transport="TCPOnly"{/if}
 		{if $row.sip_transport == 'tcp'}reg.{$row.line_number}.server.2.transport="TCPOnly"{/if}
 		{if $row.sip_transport == 'udp'}reg.{$row.line_number}.server.2.transport="UDPOnly"{/if}
 		{if $row.sip_transport == 'tls'}reg.{$row.line_number}.server.2.transport="TLS" {/if}
 		{if $row.sip_transport == 'dns srv'}reg.{$row.line_number}.server.2.transport="DNSnaptr"{/if}
+
 		{if isset($row.register_expires)}reg.{$row.line_number}.server.2.expires="{$row.register_expires}"{else}reg.{$row.line_number}.server.2.expires="{$row.register_expires}"{/if}
+
 	{/foreach}
 	/>
 	<SECURITY
@@ -64,7 +65,6 @@
 		device.sec.TLS.profile.cipherSuite1="{$polycom_platform_profile_cipher_suite}"
 		{/if}		
 	/>
-
 	<DEVICE_SETTINGS
 		device.set="1"
 		device.baseProfile.set="1"