diff --git a/resources/templates/provision/polycom/4.x/{$mac}.cfg b/resources/templates/provision/polycom/4.x/{$mac}.cfg
index 5501ca8a29..9b2d228c46 100644
--- a/resources/templates/provision/polycom/4.x/{$mac}.cfg
+++ b/resources/templates/provision/polycom/4.x/{$mac}.cfg
@@ -5,7 +5,7 @@
 		reg.{$row.line_number}.address="{$row.user_id}"
 		reg.{$row.line_number}.label="{$row.display_name}"
 		reg.{$row.line_number}.type="private"
-		reg.{$row.line_number}.auth.userId="{$row.user_id}" 
+		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}}"
 		{if isset($row.outbound_proxy)}reg.{$row.line_number}.outboundProxy.address = "{$row.outbound_proxy}"{/if}
@@ -34,9 +34,9 @@
 		device.sntp.serverName="pool.ntp.org"
 		device.sntp.gmtOffset="{$polycom_gmt_offset}"
 		device.auth.localAdminPassword.set="1"
-		device.auth.localAdminPassword="{$admin_password}" 
+		device.auth.localAdminPassword="{$admin_password}"
 	/>
-	<SNTP 
+	<SNTP
 		tcpIpApp.sntp.resyncPeriod="86400"
 		tcpIpApp.sntp.address="pool.ntp.org" tcpIpApp.sntp.address.overrideDHCP="0"
 		tcpIpApp.sntp.gmtOffset="{$polycom_gmt_offset}" tcpIpApp.sntp.gmtOffset.overrideDHCP="0"
@@ -64,7 +64,7 @@
 					attendant.resourceList.{$row.device_key_id}.address="{$row.device_key_value}"
 					attendant.resourceList.{$row.device_key_id}.callAddress=""
 					attendant.resourceList.{$row.device_key_id}.label="{$row.device_key_label}"
-					attendant.resourceList.{$row.device_key_id}.proceedingIsRecipient="0" 
+					attendant.resourceList.{$row.device_key_id}.proceedingIsRecipient="0"
 					attendant.resourceList.{$row.device_key_id}.type="{$row.device_key_type}"
 				{else}
 					{if $row.device_key_type != "line"}
@@ -91,7 +91,7 @@
 		voIpProt.SIP.specialEvent.checkSync.alwaysReboot="1"
 		feature.broadsoftUcOne.enabled="0"
 		voice.volume.persist.handset="1"
-		{if $headset_mode != ''}up.handsfreeMode="1" 
+		{if $headset_mode != ''}up.handsfreeMode="1"
 		up.headsetMode="{$headset_mode}"{/if}
 		{if $analog_headset_option != ''}up.analogHeadsetOption="{$analog_headset_option}"{/if}
 	/>
diff --git a/resources/templates/provision/polycom/5.x/{$mac}.cfg b/resources/templates/provision/polycom/5.x/{$mac}.cfg
index 5501ca8a29..9b2d228c46 100755
--- a/resources/templates/provision/polycom/5.x/{$mac}.cfg
+++ b/resources/templates/provision/polycom/5.x/{$mac}.cfg
@@ -5,7 +5,7 @@
 		reg.{$row.line_number}.address="{$row.user_id}"
 		reg.{$row.line_number}.label="{$row.display_name}"
 		reg.{$row.line_number}.type="private"
-		reg.{$row.line_number}.auth.userId="{$row.user_id}" 
+		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}}"
 		{if isset($row.outbound_proxy)}reg.{$row.line_number}.outboundProxy.address = "{$row.outbound_proxy}"{/if}
@@ -34,9 +34,9 @@
 		device.sntp.serverName="pool.ntp.org"
 		device.sntp.gmtOffset="{$polycom_gmt_offset}"
 		device.auth.localAdminPassword.set="1"
-		device.auth.localAdminPassword="{$admin_password}" 
+		device.auth.localAdminPassword="{$admin_password}"
 	/>
-	<SNTP 
+	<SNTP
 		tcpIpApp.sntp.resyncPeriod="86400"
 		tcpIpApp.sntp.address="pool.ntp.org" tcpIpApp.sntp.address.overrideDHCP="0"
 		tcpIpApp.sntp.gmtOffset="{$polycom_gmt_offset}" tcpIpApp.sntp.gmtOffset.overrideDHCP="0"
@@ -64,7 +64,7 @@
 					attendant.resourceList.{$row.device_key_id}.address="{$row.device_key_value}"
 					attendant.resourceList.{$row.device_key_id}.callAddress=""
 					attendant.resourceList.{$row.device_key_id}.label="{$row.device_key_label}"
-					attendant.resourceList.{$row.device_key_id}.proceedingIsRecipient="0" 
+					attendant.resourceList.{$row.device_key_id}.proceedingIsRecipient="0"
 					attendant.resourceList.{$row.device_key_id}.type="{$row.device_key_type}"
 				{else}
 					{if $row.device_key_type != "line"}
@@ -91,7 +91,7 @@
 		voIpProt.SIP.specialEvent.checkSync.alwaysReboot="1"
 		feature.broadsoftUcOne.enabled="0"
 		voice.volume.persist.handset="1"
-		{if $headset_mode != ''}up.handsfreeMode="1" 
+		{if $headset_mode != ''}up.handsfreeMode="1"
 		up.headsetMode="{$headset_mode}"{/if}
 		{if $analog_headset_option != ''}up.analogHeadsetOption="{$analog_headset_option}"{/if}
 	/>
diff --git a/resources/templates/provision/polycom/650/{$mac}-registration.cfg b/resources/templates/provision/polycom/650/{$mac}-registration.cfg
index c88ae13caa..d9830613dc 100644
--- a/resources/templates/provision/polycom/650/{$mac}-registration.cfg
+++ b/resources/templates/provision/polycom/650/{$mac}-registration.cfg
@@ -4,87 +4,87 @@
 
 <phone1>
 	<reg
-		reg.1.displayName="{$user_id_1}" 
+		reg.1.displayName="{$user_id_1}"
 		reg.1.address="{$user_id_1}"
-		reg.1.label="Line" 
-		reg.1.type="private" 
-		reg.1.lcs="" 
-		reg.1.thirdPartyName="{$display_name_1}" 
-		reg.1.auth.userId="{$user_id_1}" 
+		reg.1.label="Line"
+		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="1" 
-		reg.1.auth.optimizedInFailover="" 
-		reg.1.server.1.address="{$server_address_1}" 
-		reg.1.server.1.port="5060" 
-		reg.1.server.1.transport="DNSsnaptr" 
-		reg.1.server.2.transport="DNSnaptr" 
-		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.lineKeys="1"
+		reg.1.auth.optimizedInFailover=""
+		reg.1.server.1.address="{$server_address_1}"
+		reg.1.server.1.port="5060"
+		reg.1.server.1.transport="DNSsnaptr"
+		reg.1.server.2.transport="DNSnaptr"
+		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.2.displayName="{$user_id_2}" 
+		reg.2.displayName="{$user_id_2}"
 		reg.2.address="{$user_id_2}"
-		reg.2.label="Line" 
-		reg.2.type="private" 
-		reg.2.lcs="" 
-		reg.2.thirdPartyName="{$display_name_2}" 
-		reg.2.auth.userId="{$user_id_2}" 
+		reg.2.label="Line"
+		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="1" 
-		reg.2.auth.optimizedInFailover="" 
-		reg.2.server.1.address="{$server_address_2}" 
-		reg.2.server.1.port="5060" 
-		reg.2.server.1.transport="DNSsnaptr" 
-		reg.2.server.2.transport="DNSnaptr" 
-		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.lineKeys="1"
+		reg.2.auth.optimizedInFailover=""
+		reg.2.server.1.address="{$server_address_2}"
+		reg.2.server.1.port="5060"
+		reg.2.server.1.transport="DNSsnaptr"
+		reg.2.server.2.transport="DNSnaptr"
+		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.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.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="1" 
-		reg.3.auth.optimizedInFailover="" 
-		reg.3.server.1.address="{$server_address_3}" 
-		reg.3.server.1.port="5060" 
-		reg.3.server.1.transport="DNSsnaptr" 
-		reg.3.server.2.transport="DNSnaptr" 
-		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.lineKeys="1"
+		reg.3.auth.optimizedInFailover=""
+		reg.3.server.1.address="{$server_address_3}"
+		reg.3.server.1.port="5060"
+		reg.3.server.1.transport="DNSsnaptr"
+		reg.3.server.2.transport="DNSnaptr"
+		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="" />
 
-	<msg msg.bypassInstantMessage="1"> 
+	<msg msg.bypassInstantMessage="1">
 		<mwi
-				msg.mwi.1.subscribe="" 
-				msg.mwi.1.callBackMode="contact" 
-				msg.mwi.1.callBack="*97" 
-				msg.mwi.2.subscribe="" 
-				msg.mwi.2.callBackMode="disabled" 
-				msg.mwi.2.callBack="" 
-				msg.mwi.3.subscribe="" 
-				msg.mwi.3.callBackMode="disabled" 
-				msg.mwi.3.callBack="" 
-				msg.mwi.4.subscribe="" 
-				msg.mwi.4.callBackMode="disabled" 
-				msg.mwi.4.callBack="" 
-				msg.mwi.5.subscribe="" 
-				msg.mwi.5.callBackMode="disabled" 
-				msg.mwi.5.callBack="" 
-				msg.mwi.6.subscribe="" 
-				msg.mwi.6.callBackMode="disabled" 
-				msg.mwi.6.callBack=""/> 
+				msg.mwi.1.subscribe=""
+				msg.mwi.1.callBackMode="contact"
+				msg.mwi.1.callBack="*97"
+				msg.mwi.2.subscribe=""
+				msg.mwi.2.callBackMode="disabled"
+				msg.mwi.2.callBack=""
+				msg.mwi.3.subscribe=""
+				msg.mwi.3.callBackMode="disabled"
+				msg.mwi.3.callBack=""
+				msg.mwi.4.subscribe=""
+				msg.mwi.4.callBackMode="disabled"
+				msg.mwi.4.callBack=""
+				msg.mwi.5.subscribe=""
+				msg.mwi.5.callBackMode="disabled"
+				msg.mwi.5.callBack=""
+				msg.mwi.6.subscribe=""
+				msg.mwi.6.callBackMode="disabled"
+				msg.mwi.6.callBack=""/>
 	</msg>
 </phone1>
 
diff --git a/resources/templates/provision/polycom/8030/{$mac}-registration.cfg b/resources/templates/provision/polycom/8030/{$mac}-registration.cfg
index c88ae13caa..d9830613dc 100644
--- a/resources/templates/provision/polycom/8030/{$mac}-registration.cfg
+++ b/resources/templates/provision/polycom/8030/{$mac}-registration.cfg
@@ -4,87 +4,87 @@
 
 <phone1>
 	<reg
-		reg.1.displayName="{$user_id_1}" 
+		reg.1.displayName="{$user_id_1}"
 		reg.1.address="{$user_id_1}"
-		reg.1.label="Line" 
-		reg.1.type="private" 
-		reg.1.lcs="" 
-		reg.1.thirdPartyName="{$display_name_1}" 
-		reg.1.auth.userId="{$user_id_1}" 
+		reg.1.label="Line"
+		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="1" 
-		reg.1.auth.optimizedInFailover="" 
-		reg.1.server.1.address="{$server_address_1}" 
-		reg.1.server.1.port="5060" 
-		reg.1.server.1.transport="DNSsnaptr" 
-		reg.1.server.2.transport="DNSnaptr" 
-		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.lineKeys="1"
+		reg.1.auth.optimizedInFailover=""
+		reg.1.server.1.address="{$server_address_1}"
+		reg.1.server.1.port="5060"
+		reg.1.server.1.transport="DNSsnaptr"
+		reg.1.server.2.transport="DNSnaptr"
+		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.2.displayName="{$user_id_2}" 
+		reg.2.displayName="{$user_id_2}"
 		reg.2.address="{$user_id_2}"
-		reg.2.label="Line" 
-		reg.2.type="private" 
-		reg.2.lcs="" 
-		reg.2.thirdPartyName="{$display_name_2}" 
-		reg.2.auth.userId="{$user_id_2}" 
+		reg.2.label="Line"
+		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="1" 
-		reg.2.auth.optimizedInFailover="" 
-		reg.2.server.1.address="{$server_address_2}" 
-		reg.2.server.1.port="5060" 
-		reg.2.server.1.transport="DNSsnaptr" 
-		reg.2.server.2.transport="DNSnaptr" 
-		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.lineKeys="1"
+		reg.2.auth.optimizedInFailover=""
+		reg.2.server.1.address="{$server_address_2}"
+		reg.2.server.1.port="5060"
+		reg.2.server.1.transport="DNSsnaptr"
+		reg.2.server.2.transport="DNSnaptr"
+		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.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.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="1" 
-		reg.3.auth.optimizedInFailover="" 
-		reg.3.server.1.address="{$server_address_3}" 
-		reg.3.server.1.port="5060" 
-		reg.3.server.1.transport="DNSsnaptr" 
-		reg.3.server.2.transport="DNSnaptr" 
-		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.lineKeys="1"
+		reg.3.auth.optimizedInFailover=""
+		reg.3.server.1.address="{$server_address_3}"
+		reg.3.server.1.port="5060"
+		reg.3.server.1.transport="DNSsnaptr"
+		reg.3.server.2.transport="DNSnaptr"
+		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="" />
 
-	<msg msg.bypassInstantMessage="1"> 
+	<msg msg.bypassInstantMessage="1">
 		<mwi
-				msg.mwi.1.subscribe="" 
-				msg.mwi.1.callBackMode="contact" 
-				msg.mwi.1.callBack="*97" 
-				msg.mwi.2.subscribe="" 
-				msg.mwi.2.callBackMode="disabled" 
-				msg.mwi.2.callBack="" 
-				msg.mwi.3.subscribe="" 
-				msg.mwi.3.callBackMode="disabled" 
-				msg.mwi.3.callBack="" 
-				msg.mwi.4.subscribe="" 
-				msg.mwi.4.callBackMode="disabled" 
-				msg.mwi.4.callBack="" 
-				msg.mwi.5.subscribe="" 
-				msg.mwi.5.callBackMode="disabled" 
-				msg.mwi.5.callBack="" 
-				msg.mwi.6.subscribe="" 
-				msg.mwi.6.callBackMode="disabled" 
-				msg.mwi.6.callBack=""/> 
+				msg.mwi.1.subscribe=""
+				msg.mwi.1.callBackMode="contact"
+				msg.mwi.1.callBack="*97"
+				msg.mwi.2.subscribe=""
+				msg.mwi.2.callBackMode="disabled"
+				msg.mwi.2.callBack=""
+				msg.mwi.3.subscribe=""
+				msg.mwi.3.callBackMode="disabled"
+				msg.mwi.3.callBack=""
+				msg.mwi.4.subscribe=""
+				msg.mwi.4.callBackMode="disabled"
+				msg.mwi.4.callBack=""
+				msg.mwi.5.subscribe=""
+				msg.mwi.5.callBackMode="disabled"
+				msg.mwi.5.callBack=""
+				msg.mwi.6.subscribe=""
+				msg.mwi.6.callBackMode="disabled"
+				msg.mwi.6.callBack=""/>
 	</msg>
 </phone1>
 
diff --git a/resources/templates/provision/polycom/vvx/features.cfg b/resources/templates/provision/polycom/vvx/features.cfg
index 9f3f42c3c2..77e1c6e080 100644
--- a/resources/templates/provision/polycom/vvx/features.cfg
+++ b/resources/templates/provision/polycom/vvx/features.cfg
@@ -6,31 +6,31 @@
   <attendant attendant.reg="1" attendant.ringType="ringer1" attendant.uri="">
     <attendant.behaviors>
       <attendant.behaviors.display>
-        <attendant.behaviors.display.remoteCallerID 
-          attendant.behaviors.display.remoteCallerID.automata="1" 
+        <attendant.behaviors.display.remoteCallerID
+          attendant.behaviors.display.remoteCallerID.automata="1"
           attendant.behaviors.display.remoteCallerID.normal="1">
         </attendant.behaviors.display.remoteCallerID>
-        <attendant.behaviors.display.spontaneousCallAppearances 
-          attendant.behaviors.display.spontaneousCallAppearances.automata="0" 
+        <attendant.behaviors.display.spontaneousCallAppearances
+          attendant.behaviors.display.spontaneousCallAppearances.automata="0"
           attendant.behaviors.display.spontaneousCallAppearances.normal="1">
         </attendant.behaviors.display.spontaneousCallAppearances>
       </attendant.behaviors.display>
     </attendant.behaviors>
-    <attendant.resourceList 
-      attendant.resourceList.1.address="park+*5901" 
-      attendant.resourceList.1.callAddress="" 
-      attendant.resourceList.1.label="Park 1" 
-      attendant.resourceList.1.proceedingIsRecipient="0" 
-      attendant.resourceList.1.type="automata" 
-      attendant.resourceList.2.address="park+*5902" 
-      attendant.resourceList.2.callAddress="" 
-      attendant.resourceList.2.label="Park 2" 
-      attendant.resourceList.2.proceedingIsRecipient="0" 
-      attendant.resourceList.2.type="automata" 
-      attendant.resourceList.3.address="park+*5903" 
-      attendant.resourceList.3.callAddress="" 
-      attendant.resourceList.3.label="Park 3" 
-      attendant.resourceList.3.proceedingIsRecipient="0" 
+    <attendant.resourceList
+      attendant.resourceList.1.address="park+*5901"
+      attendant.resourceList.1.callAddress=""
+      attendant.resourceList.1.label="Park 1"
+      attendant.resourceList.1.proceedingIsRecipient="0"
+      attendant.resourceList.1.type="automata"
+      attendant.resourceList.2.address="park+*5902"
+      attendant.resourceList.2.callAddress=""
+      attendant.resourceList.2.label="Park 2"
+      attendant.resourceList.2.proceedingIsRecipient="0"
+      attendant.resourceList.2.type="automata"
+      attendant.resourceList.3.address="park+*5903"
+      attendant.resourceList.3.callAddress=""
+      attendant.resourceList.3.label="Park 3"
+      attendant.resourceList.3.proceedingIsRecipient="0"
       attendant.resourceList.3.type="automata">
     </attendant.resourceList>
   </attendant>
diff --git a/resources/templates/provision/polycom/vvx/{$mac}-registration.cfg b/resources/templates/provision/polycom/vvx/{$mac}-registration.cfg
index fd17c075cc..f3b26365fd 100644
--- a/resources/templates/provision/polycom/vvx/{$mac}-registration.cfg
+++ b/resources/templates/provision/polycom/vvx/{$mac}-registration.cfg
@@ -4,16 +4,16 @@
 
 <phone1>
 	<reg
-		{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.{$row.line_number}.auth.optimizedInFailover="" 
+		{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.{$row.line_number}.auth.optimizedInFailover=""
 		{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}.server.1.port="5060"
@@ -32,32 +32,32 @@
 		{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.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="" 
+		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>
 			<attendant.behaviors.display>
-			<attendant.behaviors.display.remoteCallerID 
-				attendant.behaviors.display.remoteCallerID.automata="1" 
+			<attendant.behaviors.display.remoteCallerID
+				attendant.behaviors.display.remoteCallerID.automata="1"
 			  	attendant.behaviors.display.remoteCallerID.normal="1">
 			</attendant.behaviors.display.remoteCallerID>
-			<attendant.behaviors.display.spontaneousCallAppearances 
-	  			attendant.behaviors.display.spontaneousCallAppearances.automata="0" 
+			<attendant.behaviors.display.spontaneousCallAppearances
+	  			attendant.behaviors.display.spontaneousCallAppearances.automata="0"
 	  			attendant.behaviors.display.spontaneousCallAppearances.normal="1">
 			</attendant.behaviors.display.spontaneousCallAppearances>
 			</attendant.behaviors.display>
 		</attendant.behaviors>
-		<attendant.resourceList 
+		<attendant.resourceList
 			{foreach $keys as $row}{if $row.device_key_category == "line"}{if $row.device_key_type != "line"}attendant.resourceList.{$row.device_key_id}.address="{$row.device_key_value}"
 			attendant.resourceList.{$row.device_key_id}.callAddress=""
 			attendant.resourceList.{$row.device_key_id}.label="{$row.device_key_label}"
-			attendant.resourceList.{$row.device_key_id}.proceedingIsRecipient="0" 
+			attendant.resourceList.{$row.device_key_id}.proceedingIsRecipient="0"
 			attendant.resourceList.{$row.device_key_id}.type="{$row.device_key_type}"
 			{/if}{/if}
 
@@ -65,25 +65,25 @@
 		</attendant.resourceList>
 	</attendant>
 
-	<msg msg.bypassInstantMessage="1"> 
+	<msg msg.bypassInstantMessage="1">
 		<mwi
-			msg.mwi.1.subscribe="" 
-			msg.mwi.1.callBackMode="contact" 
-			msg.mwi.1.callBack="*97" 
-			msg.mwi.2.subscribe="" 
-			msg.mwi.2.callBackMode="disabled" 
-			msg.mwi.2.callBack="" 
-			msg.mwi.3.subscribe="" 
-			msg.mwi.3.callBackMode="disabled" 
-			msg.mwi.3.callBack="" 
-			msg.mwi.4.subscribe="" 
-			msg.mwi.4.callBackMode="disabled" 
-			msg.mwi.4.callBack="" 
-			msg.mwi.5.subscribe="" 
-			msg.mwi.5.callBackMode="disabled" 
-			msg.mwi.5.callBack="" 
-			msg.mwi.6.subscribe="" 
-			msg.mwi.6.callBackMode="disabled" 
-			msg.mwi.6.callBack=""/> 
+			msg.mwi.1.subscribe=""
+			msg.mwi.1.callBackMode="contact"
+			msg.mwi.1.callBack="*97"
+			msg.mwi.2.subscribe=""
+			msg.mwi.2.callBackMode="disabled"
+			msg.mwi.2.callBack=""
+			msg.mwi.3.subscribe=""
+			msg.mwi.3.callBackMode="disabled"
+			msg.mwi.3.callBack=""
+			msg.mwi.4.subscribe=""
+			msg.mwi.4.callBackMode="disabled"
+			msg.mwi.4.callBack=""
+			msg.mwi.5.subscribe=""
+			msg.mwi.5.callBackMode="disabled"
+			msg.mwi.5.callBack=""
+			msg.mwi.6.subscribe=""
+			msg.mwi.6.callBackMode="disabled"
+			msg.mwi.6.callBack=""/>
 	</msg>
 </phone1>
\ No newline at end of file