diff --git a/resources/templates/provision/polycom/vvx/{$mac}-registration.cfg b/resources/templates/provision/polycom/vvx/{$mac}-registration.cfg
index 8884a118e7..ba048bd2ea 100644
--- a/resources/templates/provision/polycom/vvx/{$mac}-registration.cfg
+++ b/resources/templates/provision/polycom/vvx/{$mac}-registration.cfg
@@ -4,68 +4,35 @@
 
 <phone1>
 	<reg
-		reg.1.displayName="{$user_id_1}" 
-		reg.1.address="{$user_id_1}"
-		reg.1.label="{$user_id_1}" 
-		reg.1.type="private" 
-		reg.1.lcs="" 
-		reg.1.thirdPartyName="{$display_name_1}" 
-		reg.1.auth.userId="{$user_id_1}" 
-		reg.1.auth.password="{$user_password_1}"
-		reg.1.lineKeys="{$line_key_value_1}" 
+		{foreach $lines as $row}reg.{$row.line_number}.displayName="{$row.user_id}" 
+		reg.{$row.line_number}.address="{$row.user_id}" 
+		reg.{$row.line_number}.label="{$row.user_id}" 
+		reg.{$row.line_number}.type="private" 
+		reg.{$row.line_number}.lcs="" 
+		reg.{$row.line_number}.thirdPartyName="{$row.display_name}" 
+		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.1.auth.optimizedInFailover="" 
-		reg.1.server.1.address="{$server_address_1}" 
-		reg.1.server.1.port="5060" 
-		reg.1.server.1.transport="TCPOnly" 
-		reg.1.server.2.transport="TCPOnly" 
-		reg.1.server.1.expires="" 
-		reg.1.server.1.expires.overlap="" 
-		reg.1.server.1.register="" 
-		reg.1.server.1.retryTimeOut="" 
-		reg.1.server.1.retryMaxCount="" 
-		reg.1.server.1.expires.lineSeize=""
+		reg.{$row.line_number}.server.1.address="{$row.server_address}"
+		{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}
 
-		reg.2.displayname="{$user_id_2}" 
-		reg.2.address="{$user_id_2}"
-		reg.2.label="{$user_id_2}" 
-		reg.2.type="private" 
-		reg.2.lcs="" 
-		reg.2.thirdPartyName="{$display_name_2}" 
-		reg.2.auth.userId="{$user_id_2}" 
-		reg.2.auth.password="{$user_password_2}"
-		reg.2.lineKeys="{$line_key_value_2}" 
-		reg.2.auth.optimizedInFailover="" 
-		reg.2.server.1.address="{$server_address_2}" 
-		reg.2.server.1.port="5060" 
-		reg.2.server.1.transport="TCPOnly" 
-		reg.2.server.2.transport="TCPOnly" 
-		reg.2.server.1.expires="" 
-		reg.2.server.1.expires.overlap="" 
-		reg.2.server.1.register="" 
-		reg.2.server.1.retryTimeOut="" 
-		reg.2.server.1.retryMaxCount="" 
-		reg.2.server.1.expires.lineSeize=""
-
-		reg.3.displayName="{$user_id_3}" 
-		reg.3.address="{$user_id_3}"
-		reg.3.label="Line" 
-		reg.3.type="private" 
-		reg.3.lcs="" 
-		reg.3.thirdPartyName="{$display_name_3}" 
-		reg.3.auth.userId="{$user_id_3}" 
-		reg.3.auth.password="{$user_password_3}"
-		reg.3.lineKeys="{$line_key_value_3}" 
-		reg.3.auth.optimizedInFailover="" 
-		reg.3.server.1.address="{$server_address_3}" 
-		reg.3.server.1.port="5060" 
-		reg.3.server.1.transport="TCPOnly" 
-		reg.3.server.2.transport="TCPOnly" 
-		reg.3.server.1.expires="" 
-		reg.3.server.1.expires.overlap="" 
-		reg.3.server.1.register="" 
-		reg.3.server.1.retryTimeOut="" 
-		reg.3.server.1.retryMaxCount="" 
-		reg.3.server.1.expires.lineSeize="" />
+		reg.{$row.line_number}.server.2.transport="TCPOnly"
+		{if isset($row.sip_port)}reg.{$row.line_number}.server.1.expires="{$row.register_expires}"{else}reg.{$row.line_number}.server.1.expires="120"{/if}
+		
+		reg.{$row.line_number}.server.1.expires.overlap="" 
+		reg.{$row.line_number}.server.1.register="" 
+		reg.{$row.line_number}.server.1.retryTimeOut="" 
+		reg.{$row.line_number}.server.1.retryMaxCount="" 
+		reg.{$row.line_number}.server.1.expires.lineSeize="" 
+	
+		{/foreach}/>
 
 	<attendant attendant.reg="1" attendant.ringType="ringer1" attendant.uri="">
 		<attendant.behaviors>