diff --git a/resources/templates/provision/yealink/t54s/{$mac}.cfg b/resources/templates/provision/yealink/t54s/{$mac}.cfg
index 727fb852c2..ab563670fe 100644
--- a/resources/templates/provision/yealink/t54s/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t54s/{$mac}.cfg
@@ -99,17 +99,36 @@ account.1.sip_server.1.port= {$sip_port_1}
 account.1.sip_server.1.expires= {$register_expires_1}
 account.1.sip_server.1.retry_counts= 3
 
-account.1.sip_server.2.address=
-account.1.sip_server.2.port=
-account.1.sip_server.2.transport_type=
+account.1.sip_server.2.address= {$server_address_2}
+account.1.sip_server.2.port= {$sip_port_2}
+
+
+{if $sip_transport_1 == 'udp'}account.1.sip_server.2.transport_type = 0{/if}
+{if $sip_transport_1 == 'tcp'}account.1.sip_server.2.transport_type = 1{/if}
+{if $sip_transport_1 == 'tls'}account.1.sip_server.2.transport_type = 2{/if}
+{if $sip_transport_1 == 'dns srv'}account.1.sip_server.2.transport_type = 3{/if}
+
 account.1.sip_server.2.expires= {$register_expires_2}
 account.1.sip_server.2.retry_counts= 3
 
-account.1.outbound_proxy_enable=
-account.1.outbound_proxy.1.address=
-account.1.outbound_proxy.1.port=
-account.1.outbound_proxy.2.address=
-account.1.outbound_proxy.2.port=
+account.1.outbound_proxy_enable= {if isset($outbound_proxy_primary_1)}1{else}0{/if}
+
+account.1.outbound_proxy.1.address= {$outbound_proxy_primary_1}
+
+{if isset($outbound_proxy_1_port)}
+account.1.outbound_proxy.1.port = {$outbound_proxy_1_port}
+{else}
+account.1.outbound_proxy.1.port = 5060
+{/if}
+
+account.1.outbound_proxy.2.address= {$outbound_proxy_secondary_1}
+
+{if isset($outbound_proxy_1_port)}
+account.1.outbound_proxy.2.port = {$outbound_proxy_2_port}
+{else}
+account.1.outbound_proxy.2.port = 5060
+{/if}
+
 account.1.outbound_proxy_fallback_interval=
 account.1.nat.nat_traversal=