diff --git a/resources/templates/provision/polycom/5.x/{$mac}.cfg b/resources/templates/provision/polycom/5.x/{$mac}.cfg
index 824e665a73..8eb995153f 100755
--- a/resources/templates/provision/polycom/5.x/{$mac}.cfg
+++ b/resources/templates/provision/polycom/5.x/{$mac}.cfg
@@ -2,7 +2,7 @@
 <PHONE>
 	<REGISTRATION
 		{foreach $lines as $row}reg.{$row.line_number}.displayName="{$row.display_name}"
-		reg.{$row.line_number}.address="{$row.user_id}"
+		reg.{$row.line_number}.address="{$row.user_id}@{$row.server_address}"
 		reg.{$row.line_number}.label="{$row.display_name}"
 		reg.{$row.line_number}.type="private"
 		reg.{$row.line_number}.auth.userId="{$row.user_id}"
@@ -17,9 +17,16 @@
 		{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.outbound_proxy_primary)}
+		reg.{$row.line_number}.server.1.address="{$row.outbound_proxy_primary}"
+		{else}
 		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}
+		{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}
@@ -28,6 +35,19 @@
 
 		{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.outbound_proxy_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 $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}
 	/>
 	<DEVICE_SETTINGS
@@ -121,6 +141,18 @@
 		voIpProt.SIP.specialEvent.checkSync.alwaysReboot="1"
 		voIpProt.SIP.requestValidation.1.request="INVITE" 
 		voIpProt.SIP.requestValidation.1.method="source"
+
+		voIpProt.server.1.failOver.reRegisterOn="1"
+		voIpProt.server.1.failOver.failRegistrationOn="1"
+		voIpProt.server.1.failOver.onlySignalWithRegistered="1" 
+		voIpProt.server.1.failOver.failBack.mode="duration"
+		voIpProt.server.1.failOver.failBack.timeout="120"
+		voIpProt.server.2.failOver.reRegisterOn="1"
+		voIpProt.server.2.failOver.failRegistrationOn="1"
+		voIpProt.server.2.failOver.onlySignalWithRegistered="1" 
+		voIpProt.server.2.failOver.failBack.mode="duration"
+		voIpProt.server.2.failOver.failBack.timeout="120"
+
 		feature.broadsoftUcOne.enabled="0"
 		voice.volume.persist.handset="1"
 		voice.volume.persist.handsfree="1"