From b3f16569fdd427b0d310640acd74485c6342af3a Mon Sep 17 00:00:00 2001
From: Alex <40072887+alexdcrane@users.noreply.github.com>
Date: Mon, 24 Oct 2022 16:09:01 -0600
Subject: [PATCH] Update multiple registration (#6488)

* Update {$mac}.cfg
---
 .../provision/yealink/cp860/{$mac}.cfg        |  7 +++
 .../provision/yealink/cp920/{$mac}.cfg        |  7 +++
 .../provision/yealink/cp925/{$mac}.cfg        |  7 +++
 .../provision/yealink/cp960/{$mac}.cfg        |  7 +++
 .../provision/yealink/t23g/{$mac}.cfg         |  7 +++
 .../provision/yealink/t27g/{$mac}.cfg         |  7 +++
 .../provision/yealink/t29g/{$mac}.cfg         |  7 +++
 .../provision/yealink/t2x/{$mac}.cfg          |  7 +++
 .../provision/yealink/t31g/{$mac}.cfg         |  4 ++
 .../provision/yealink/t32g/{$mac}.cfg         |  4 ++
 .../provision/yealink/t33g/{$mac}.cfg         |  8 ++-
 .../provision/yealink/t38g/{$mac}.cfg         |  4 ++
 .../provision/yealink/t40g/{$mac}.cfg         |  7 +++
 .../provision/yealink/t41s/{$mac}.cfg         |  7 +++
 .../provision/yealink/t42g/{$mac}.cfg         |  7 +++
 .../provision/yealink/t42s/{$mac}.cfg         |  7 +++
 .../provision/yealink/t42u/{$mac}.cfg         |  7 +++
 .../provision/yealink/t46g/{$mac}.cfg         |  7 +++
 .../provision/yealink/t46s/{$mac}.cfg         |  7 +++
 .../provision/yealink/t46u/{$mac}.cfg         |  8 ++-
 .../provision/yealink/t48g/{$mac}.cfg         |  7 +++
 .../provision/yealink/t48s/{$mac}.cfg         |  7 +++
 .../provision/yealink/t49g/{$mac}.cfg         |  7 +++
 .../provision/yealink/t4x/{$mac}.cfg          |  7 +++
 .../provision/yealink/t52s/{$mac}.cfg         | 10 +++-
 .../provision/yealink/t53/{$mac}.cfg          | 10 +++-
 .../provision/yealink/t53w/{$mac}.cfg         |  9 ++-
 .../provision/yealink/t54s/{$mac}.cfg         | 10 +++-
 .../provision/yealink/t54w/{$mac}.cfg         |  9 ++-
 .../provision/yealink/t57w/{$mac}.cfg         | 10 +++-
 .../provision/yealink/t58w/{$mac}.cfg         | 58 ++++++++++++++-----
 .../provision/yealink/t5x/{$mac}.cfg          | 11 ++++
 .../provision/yealink/vp530/{$mac}.cfg        | 11 ++++
 .../provision/yealink/vp59/{$mac}.cfg         |  6 ++
 .../provision/yealink/w52p/{$mac}.cfg         |  4 ++
 .../provision/yealink/w56p/{$mac}.cfg         |  4 ++
 .../provision/yealink/w60b/{$mac}.cfg         |  7 ++-
 .../provision/yealink/w70b/{$mac}.cfg         |  7 ++-
 .../provision/yealink/w7xp/{$mac}.cfg         |  7 ++-
 39 files changed, 302 insertions(+), 32 deletions(-)

diff --git a/resources/templates/provision/yealink/cp860/{$mac}.cfg b/resources/templates/provision/yealink/cp860/{$mac}.cfg
index db4037e849..621a0f6c5b 100644
--- a/resources/templates/provision/yealink/cp860/{$mac}.cfg
+++ b/resources/templates/provision/yealink/cp860/{$mac}.cfg
@@ -17,12 +17,19 @@ account.1.label = {$account.1.label}
 account.1.display_name = {$account.1.display_name}
 account.1.auth_name = {$account.1.auth_id}
 account.1.password = {$account.1.password}
+
 {if isset($account.1.server.1.address)}
 account.1.user_name = {$account.1.user_id}@{$account.1.server_address}
 {else}
 account.1.user_name = {$account.1.user_id}
 {/if}
+
+{if isset($account.1.server.1.address)}
+account.1.sip_server.1.address = {$account.1.server.1.address}
+{else}
 account.1.sip_server_host = {$account.1.server_address}
+{/if}
+
 account.1.sip_server_port = {$account.1.sip_port}
 
 account.1.outbound_host = {$account.1.outbound_proxy}
diff --git a/resources/templates/provision/yealink/cp920/{$mac}.cfg b/resources/templates/provision/yealink/cp920/{$mac}.cfg
index 17db1d9888..ba7a1fdf97 100644
--- a/resources/templates/provision/yealink/cp920/{$mac}.cfg
+++ b/resources/templates/provision/yealink/cp920/{$mac}.cfg
@@ -17,12 +17,19 @@ account.1.label = {$account.1.label}
 account.1.display_name = {$account.1.display_name}
 account.1.auth_name = {$account.1.auth_id}
 account.1.password = {$account.1.password}
+
 {if isset($account.1.server.1.address)}
 account.1.user_name = {$account.1.user_id}@{$account.1.server_address}
 {else}
 account.1.user_name = {$account.1.user_id}
 {/if}
+
+{if isset($account.1.server.1.address)}
+account.1.sip_server.1.address = {$account.1.server.1.address}
+{else}
 account.1.sip_server_host = {$account.1.server_address}
+{/if}
+
 account.1.sip_server_port = {$account.1.sip_port}
 account.1.outbound_host = {$account.1.outbound_proxy}
 account.1.outbound_port = {$account.1.sip_port}
diff --git a/resources/templates/provision/yealink/cp925/{$mac}.cfg b/resources/templates/provision/yealink/cp925/{$mac}.cfg
index 17db1d9888..ba7a1fdf97 100644
--- a/resources/templates/provision/yealink/cp925/{$mac}.cfg
+++ b/resources/templates/provision/yealink/cp925/{$mac}.cfg
@@ -17,12 +17,19 @@ account.1.label = {$account.1.label}
 account.1.display_name = {$account.1.display_name}
 account.1.auth_name = {$account.1.auth_id}
 account.1.password = {$account.1.password}
+
 {if isset($account.1.server.1.address)}
 account.1.user_name = {$account.1.user_id}@{$account.1.server_address}
 {else}
 account.1.user_name = {$account.1.user_id}
 {/if}
+
+{if isset($account.1.server.1.address)}
+account.1.sip_server.1.address = {$account.1.server.1.address}
+{else}
 account.1.sip_server_host = {$account.1.server_address}
+{/if}
+
 account.1.sip_server_port = {$account.1.sip_port}
 account.1.outbound_host = {$account.1.outbound_proxy}
 account.1.outbound_port = {$account.1.sip_port}
diff --git a/resources/templates/provision/yealink/cp960/{$mac}.cfg b/resources/templates/provision/yealink/cp960/{$mac}.cfg
index 7884ac15ce..ba95bb1632 100644
--- a/resources/templates/provision/yealink/cp960/{$mac}.cfg
+++ b/resources/templates/provision/yealink/cp960/{$mac}.cfg
@@ -17,12 +17,19 @@ account.1.label = {$account.1.label}
 account.1.display_name = {$account.1.display_name}
 account.1.auth_name = {$account.1.auth_id}
 account.1.password = {$account.1.password}
+
 {if isset($account.1.server.1.address)}
 account.1.user_name = {$account.1.user_id}@{$account.1.server_address}
 {else}
 account.1.user_name = {$account.1.user_id}
 {/if}
+
+{if isset($account.1.server.1.address)}
+account.1.sip_server.1.address = {$account.1.server.1.address}
+{else}
 account.1.sip_server_host = {$account.1.server_address}
+{/if}
+
 account.1.sip_server_port = {$account.1.sip_port}
 
 account.1.outbound_host = {$account.1.outbound_proxy}
diff --git a/resources/templates/provision/yealink/t23g/{$mac}.cfg b/resources/templates/provision/yealink/t23g/{$mac}.cfg
index 0bd842130d..3e86cfd4a8 100644
--- a/resources/templates/provision/yealink/t23g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t23g/{$mac}.cfg
@@ -17,12 +17,19 @@ account.1.label = {$account.1.label}
 account.1.display_name = {$account.1.display_name}
 account.1.auth_name = {$account.1.auth_id}
 account.1.password = {$account.1.password}
+
 {if isset($account.1.server.1.address)}
 account.1.user_name = {$account.1.user_id}@{$account.1.server_address}
 {else}
 account.1.user_name = {$account.1.user_id}
 {/if}
+
+{if isset($account.1.server.1.address)}
+account.1.sip_server.1.address = {$account.1.server.1.address}
+{else}
 account.1.sip_server_host = {$account.1.server_address}
+{/if}
+
 account.1.sip_server_port = {$account.1.sip_port}
 account.1.outbound_host = {$account.1.outbound_proxy}
 account.1.outbound_port = {$account.1.sip_port}
diff --git a/resources/templates/provision/yealink/t27g/{$mac}.cfg b/resources/templates/provision/yealink/t27g/{$mac}.cfg
index 9f7d704ea6..f560365f7a 100644
--- a/resources/templates/provision/yealink/t27g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t27g/{$mac}.cfg
@@ -17,12 +17,19 @@ account.1.label = {$account.1.label}
 account.1.display_name = {$account.1.display_name}
 account.1.auth_name = {$account.1.auth_id}
 account.1.password = {$account.1.password}
+
 {if isset($account.1.server.1.address)}
 account.1.user_name = {$account.1.user_id}@{$account.1.server_address}
 {else}
 account.1.user_name = {$account.1.user_id}
 {/if}
+
+{if isset($account.1.server.1.address)}
+account.1.sip_server.1.address = {$account.1.server.1.address}
+{else}
 account.1.sip_server_host = {$account.1.server_address}
+{/if}
+
 account.1.sip_server_port = {$account.1.sip_port}
 account.1.outbound_host = {$account.1.outbound_proxy}
 account.1.outbound_port = {$account.1.sip_port}
diff --git a/resources/templates/provision/yealink/t29g/{$mac}.cfg b/resources/templates/provision/yealink/t29g/{$mac}.cfg
index 457ce430cf..2964a60c24 100644
--- a/resources/templates/provision/yealink/t29g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t29g/{$mac}.cfg
@@ -17,12 +17,19 @@ account.1.label = {$account.1.label}
 account.1.display_name = {$account.1.display_name}
 account.1.auth_name = {$account.1.auth_id}
 account.1.password = {$account.1.password}
+
 {if isset($account.1.server.1.address)}
 account.1.user_name = {$account.1.user_id}@{$account.1.server_address}
 {else}
 account.1.user_name = {$account.1.user_id}
 {/if}
+
+{if isset($account.1.server.1.address)}
+account.1.sip_server.1.address = {$account.1.server.1.address}
+{else}
 account.1.sip_server_host = {$account.1.server_address}
+{/if}
+
 account.1.sip_server_port = {$account.1.sip_port}
 account.1.outbound_host = {$account.1.outbound_proxy}
 account.1.outbound_port = {$account.1.sip_port}
diff --git a/resources/templates/provision/yealink/t2x/{$mac}.cfg b/resources/templates/provision/yealink/t2x/{$mac}.cfg
index 5ae93d6331..f9c24bb688 100644
--- a/resources/templates/provision/yealink/t2x/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t2x/{$mac}.cfg
@@ -17,12 +17,19 @@ account.{$row.line_number}.label = {$account.{$row.line_number}.label}
 account.{$row.line_number}.display_name = {$account.{$row.line_number}.display_name}
 account.{$row.line_number}.auth_name = {$account.{$row.line_number}.auth_id}
 account.{$row.line_number}.password = {$account.{$row.line_number}.password}
+
 {if isset($account.{$row.line_number}.server.1.address)}
 account.{$row.line_number}.user_name = {$account.{$row.line_number}.user_id}@{$account.{$row.line_number}.server_address}
 {else}
 account.{$row.line_number}.user_name = {$account.{$row.line_number}.user_id}
 {/if}
+
+{if isset($row.server.1.address)}
+account.{$row.line_number}.sip_server.1.address = {$row.server.1.address} 
+{else}
 account.{$row.line_number}.sip_server_host = {$account.{$row.line_number}.server_address}
+{/if}
+
 account.{$row.line_number}.sip_server_port = {$account.{$row.line_number}.sip_port}
 account.{$row.line_number}.outbound_host = {$account.{$row.line_number}.outbound_proxy}
 account.{$row.line_number}.outbound_port = {$account.{$row.line_number}.sip_port}
diff --git a/resources/templates/provision/yealink/t31g/{$mac}.cfg b/resources/templates/provision/yealink/t31g/{$mac}.cfg
index 5a4c0d2e67..942b0eaf5d 100644
--- a/resources/templates/provision/yealink/t31g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t31g/{$mac}.cfg
@@ -35,7 +35,11 @@ account.1.user_name = {$account.1.user_id}
 account.1.sip_trust_ctrl = 1
 
 #Configure the SIP server address.
+{if isset($account.1.server.1.address)}
+account.1.sip_server.1.address = {$account.1.server.1.address}
+{else}
 account.1.sip_server_host = {$account.1.server_address}
+{/if}
 
 #Specify the port for the SIP server. The default value is 5060.
 account.1.sip_server_port = {$account.1.sip_port}
diff --git a/resources/templates/provision/yealink/t32g/{$mac}.cfg b/resources/templates/provision/yealink/t32g/{$mac}.cfg
index 84b64901fd..28df5fa8c6 100644
--- a/resources/templates/provision/yealink/t32g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t32g/{$mac}.cfg
@@ -35,7 +35,11 @@ account.1.user_name = {$account.1.user_id}
 account.1.sip_trust_ctrl = 1
 
 #Configure the SIP server address.
+{if isset($account.1.server.1.address)}
+account.1.sip_server.1.address = {$account.1.server.1.address}
+{else}
 account.1.sip_server_host = {$account.1.server_address}
+{/if}
 
 #Specify the port for the SIP server. The default value is 5060.
 account.1.sip_server_port = {$account.1.sip_port}
diff --git a/resources/templates/provision/yealink/t33g/{$mac}.cfg b/resources/templates/provision/yealink/t33g/{$mac}.cfg
index f885b69650..bff70fd4b2 100644
--- a/resources/templates/provision/yealink/t33g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t33g/{$mac}.cfg
@@ -129,7 +129,13 @@ account.1.user_name = {$account.1.user_id}
 {/if}
 
 account.1.password = {$account.1.password}
-account.1.sip_server.1.address= {$account.1.server_address}
+
+{if isset($account.1.server.1.address)}
+account.1.sip_server.1.address = {$account.1.server.1.address}
+{else}
+account.1.sip_server.1.address = {$account.1.server_address}
+{/if}
+
 account.1.sip_server_port = {$account.1.sip_port}
 
 
diff --git a/resources/templates/provision/yealink/t38g/{$mac}.cfg b/resources/templates/provision/yealink/t38g/{$mac}.cfg
index 84b64901fd..28df5fa8c6 100644
--- a/resources/templates/provision/yealink/t38g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t38g/{$mac}.cfg
@@ -35,7 +35,11 @@ account.1.user_name = {$account.1.user_id}
 account.1.sip_trust_ctrl = 1
 
 #Configure the SIP server address.
+{if isset($account.1.server.1.address)}
+account.1.sip_server.1.address = {$account.1.server.1.address}
+{else}
 account.1.sip_server_host = {$account.1.server_address}
+{/if}
 
 #Specify the port for the SIP server. The default value is 5060.
 account.1.sip_server_port = {$account.1.sip_port}
diff --git a/resources/templates/provision/yealink/t40g/{$mac}.cfg b/resources/templates/provision/yealink/t40g/{$mac}.cfg
index 80f58d7c1e..21f3fb6535 100644
--- a/resources/templates/provision/yealink/t40g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t40g/{$mac}.cfg
@@ -17,12 +17,19 @@ account.1.label = {$account.1.label}
 account.1.display_name = {$account.1.display_name}
 account.1.auth_name = {$account.1.auth_id}
 account.1.password = {$account.1.password}
+
 {if isset($account.1.server.1.address)}
 account.1.user_name = {$account.1.user_id}@{$account.1.server_address}
 {else}
 account.1.user_name = {$account.1.user_id}
 {/if}
+
+{if isset($account.1.server.1.address)}
+account.1.sip_server.1.address = {$account.1.server.1.address}
+{else}
 account.1.sip_server_host = {$account.1.server_address}
+{/if}
+
 account.1.sip_server_port = {$account.1.sip_port}
 account.1.outbound_host = {$account.1.outbound_proxy}
 account.1.outbound_port = {$account.1.sip_port}
diff --git a/resources/templates/provision/yealink/t41s/{$mac}.cfg b/resources/templates/provision/yealink/t41s/{$mac}.cfg
index e1e5aa59eb..e9fcdc172c 100644
--- a/resources/templates/provision/yealink/t41s/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t41s/{$mac}.cfg
@@ -22,12 +22,19 @@ account.{$row.line_number}.label = {$row.label}
 account.{$row.line_number}.display_name = {$row.display_name}
 account.{$row.line_number}.auth_name = {$row.auth_id}
 account.{$row.line_number}.password = {$row.password}
+
 {if isset($row.server.1.address)}
 account.{$row.line_number}.user_name = {$row.user_id}@{$row.server_address}
 {else}
 account.{$row.line_number}.user_name = {$row.user_id}
 {/if}
+
+{if isset($row.server.1.address)}
+account.{$row.line_number}.sip_server.1.address = {$row.server.1.address}
+{else}
 account.{$row.line_number}.sip_server_host = {$row.server_address}
+{/if}
+
 account.{$row.line_number}.sip_server_port = {$row.sip_port}
 account.{$row.line_number}.outbound_host = {$row.outbound_proxy}
 account.{$row.line_number}.outbound_port = {$row.sip_port}
diff --git a/resources/templates/provision/yealink/t42g/{$mac}.cfg b/resources/templates/provision/yealink/t42g/{$mac}.cfg
index dbfe253fef..18e3c65872 100644
--- a/resources/templates/provision/yealink/t42g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t42g/{$mac}.cfg
@@ -17,12 +17,19 @@ account.1.label = {$account.1.label}
 account.1.display_name = {$account.1.display_name}
 account.1.auth_name = {$account.1.auth_id}
 account.1.password = {$account.1.password}
+
 {if isset($account.1.server.1.address)}
 account.1.user_name = {$account.1.user_id}@{$account.1.server_address}
 {else}
 account.1.user_name = {$account.1.user_id}
 {/if}
+
+{if isset($account.1.server.1.address)}
+account.1.sip_server.1.address = {$account.1.server.1.address}
+{else}
 account.1.sip_server_host = {$account.1.server_address}
+{/if}
+
 account.1.sip_server_port = {$account.1.sip_port}
 account.1.outbound_host = {$account.1.outbound_proxy}
 account.1.outbound_port = {$account.1.sip_port}
diff --git a/resources/templates/provision/yealink/t42s/{$mac}.cfg b/resources/templates/provision/yealink/t42s/{$mac}.cfg
index 5cdeda2bdd..cbb9131303 100644
--- a/resources/templates/provision/yealink/t42s/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t42s/{$mac}.cfg
@@ -17,12 +17,19 @@ account.1.label = {$account.1.label}
 account.1.display_name = {$account.1.display_name}
 account.1.auth_name = {$account.1.auth_id}
 account.1.password = {$account.1.password}
+
 {if isset($account.1.server.1.address)}
 account.1.user_name = {$account.1.user_id}@{$account.1.server_address}
 {else}
 account.1.user_name = {$account.1.user_id}
 {/if}
+
+{if isset($account.1.server.1.address)}
+account.1.sip_server.1.address = {$account.1.server.1.address}
+{else}
 account.1.sip_server_host = {$account.1.server_address}
+{/if}
+
 account.1.sip_server_port = {$account.1.sip_port}
 account.1.outbound_host = {$account.1.outbound_proxy}
 account.1.outbound_port = {$account.1.sip_port}
diff --git a/resources/templates/provision/yealink/t42u/{$mac}.cfg b/resources/templates/provision/yealink/t42u/{$mac}.cfg
index dbfe253fef..18e3c65872 100644
--- a/resources/templates/provision/yealink/t42u/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t42u/{$mac}.cfg
@@ -17,12 +17,19 @@ account.1.label = {$account.1.label}
 account.1.display_name = {$account.1.display_name}
 account.1.auth_name = {$account.1.auth_id}
 account.1.password = {$account.1.password}
+
 {if isset($account.1.server.1.address)}
 account.1.user_name = {$account.1.user_id}@{$account.1.server_address}
 {else}
 account.1.user_name = {$account.1.user_id}
 {/if}
+
+{if isset($account.1.server.1.address)}
+account.1.sip_server.1.address = {$account.1.server.1.address}
+{else}
 account.1.sip_server_host = {$account.1.server_address}
+{/if}
+
 account.1.sip_server_port = {$account.1.sip_port}
 account.1.outbound_host = {$account.1.outbound_proxy}
 account.1.outbound_port = {$account.1.sip_port}
diff --git a/resources/templates/provision/yealink/t46g/{$mac}.cfg b/resources/templates/provision/yealink/t46g/{$mac}.cfg
index 3e82c20a0c..b4598e3397 100644
--- a/resources/templates/provision/yealink/t46g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t46g/{$mac}.cfg
@@ -17,12 +17,19 @@ account.1.label = {$account.1.label}
 account.1.display_name = {$account.1.display_name}
 account.1.auth_name = {$account.1.auth_id}
 account.1.password = {$account.1.password}
+
 {if isset($account.1.server.1.address)}
 account.1.user_name = {$account.1.user_id}@{$account.1.server_address}
 {else}
 account.1.user_name = {$account.1.user_id}
 {/if}
+
+{if isset($account.1.server.1.address)}
+account.1.sip_server.1.address = {$account.1.server.1.address}
+{else}
 account.1.sip_server_host = {$account.1.server_address}
+{/if}
+
 account.1.sip_server_port = {$account.1.sip_port}
 account.1.outbound_host = {$account.1.outbound_proxy}
 account.1.outbound_port = {$account.1.sip_port}
diff --git a/resources/templates/provision/yealink/t46s/{$mac}.cfg b/resources/templates/provision/yealink/t46s/{$mac}.cfg
index 48854c19fc..59e00cea7a 100644
--- a/resources/templates/provision/yealink/t46s/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t46s/{$mac}.cfg
@@ -17,12 +17,19 @@ account.1.label = {$account.1.label}
 account.1.display_name = {$account.1.display_name}
 account.1.auth_name = {$account.1.auth_id}
 account.1.password = {$account.1.password}
+
 {if isset($account.1.server.1.address)}
 account.1.user_name = {$account.1.user_id}@{$account.1.server_address}
 {else}
 account.1.user_name = {$account.1.user_id}
 {/if}
+
+{if isset($account.1.server.1.address)}
+account.1.sip_server.1.address = {$account.1.server.1.address}
+{else}
 account.1.sip_server_host = {$account.1.server_address}
+{/if}
+
 account.1.sip_server_port = {$account.1.sip_port}
 account.1.outbound_host = {$account.1.outbound_proxy}
 account.1.outbound_port = {$account.1.sip_port}
diff --git a/resources/templates/provision/yealink/t46u/{$mac}.cfg b/resources/templates/provision/yealink/t46u/{$mac}.cfg
index 7f928d7f24..64627f1a28 100644
--- a/resources/templates/provision/yealink/t46u/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t46u/{$mac}.cfg
@@ -125,7 +125,13 @@ account.1.user_name = {$account.1.user_id}
 {/if}
 
 account.1.password = {$account.1.password}
-account.1.sip_server.1.address= {$account.1.server_address}
+
+{if isset($account.1.server.1.address)}
+account.1.sip_server.1.address = {$account.1.server.1.address}
+{else}
+account.1.sip_server.1.address = {$account.1.server_address}
+{/if}
+
 account.1.sip_server_port = {$account.1.sip_port}
 
 
diff --git a/resources/templates/provision/yealink/t48g/{$mac}.cfg b/resources/templates/provision/yealink/t48g/{$mac}.cfg
index 8d6398ef07..50977157bb 100644
--- a/resources/templates/provision/yealink/t48g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t48g/{$mac}.cfg
@@ -17,12 +17,19 @@ account.1.label = {$account.1.label}
 account.1.display_name = {$account.1.display_name}
 account.1.auth_name = {$account.1.auth_id}
 account.1.password = {$account.1.password}
+
 {if isset($account.1.server.1.address)}
 account.1.user_name = {$account.1.user_id}@{$account.1.server_address}
 {else}
 account.1.user_name = {$account.1.user_id}
 {/if}
+
+{if isset($account.1.server.1.address)}
+account.1.sip_server.1.address = {$account.1.server.1.address}
+{else}
 account.1.sip_server_host = {$account.1.server_address}
+{/if}
+
 account.1.sip_server_port = {$account.1.sip_port}
 account.1.outbound_host = {$account.1.outbound_proxy}
 account.1.outbound_port = {$account.1.sip_port}
diff --git a/resources/templates/provision/yealink/t48s/{$mac}.cfg b/resources/templates/provision/yealink/t48s/{$mac}.cfg
index d5e4f06168..0ffb8de192 100644
--- a/resources/templates/provision/yealink/t48s/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t48s/{$mac}.cfg
@@ -17,12 +17,19 @@ account.1.label = {$account.1.label}
 account.1.display_name = {$account.1.display_name}
 account.1.auth_name = {$account.1.auth_id}
 account.1.password = {$account.1.password}
+
 {if isset($account.1.server.1.address)}
 account.1.user_name = {$account.1.user_id}@{$account.1.server_address}
 {else}
 account.1.user_name = {$account.1.user_id}
 {/if}
+
+{if isset($account.1.server.1.address)}
+account.1.sip_server.1.address = {$account.1.server.1.address}
+{else}
 account.1.sip_server_host = {$account.1.server_address}
+{/if}
+
 account.1.sip_server_port = {$account.1.sip_port}
 account.1.outbound_host = {$account.1.outbound_proxy}
 account.1.outbound_port = {$account.1.sip_port}
diff --git a/resources/templates/provision/yealink/t49g/{$mac}.cfg b/resources/templates/provision/yealink/t49g/{$mac}.cfg
index 0138c0e665..647d7283d2 100644
--- a/resources/templates/provision/yealink/t49g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t49g/{$mac}.cfg
@@ -17,12 +17,19 @@ account.1.label = {$account.1.label}
 account.1.display_name = {$account.1.display_name}
 account.1.auth_name = {$account.1.auth_id}
 account.1.password = {$account.1.password}
+
 {if isset($account.1.server.1.address)}
 account.1.user_name = {$account.1.user_id}@{$account.1.server_address}
 {else}
 account.1.user_name = {$account.1.user_id}
 {/if}
+
+{if isset($account.1.server.1.address)}
+account.1.sip_server.1.address = {$account.1.server.1.address}
+{else}
 account.1.sip_server_host = {$account.1.server_address}
+{/if}
+
 account.1.sip_server_port = {$account.1.sip_port}
 account.1.outbound_host = {$account.1.outbound_proxy}
 account.1.outbound_port = {$account.1.sip_port}
diff --git a/resources/templates/provision/yealink/t4x/{$mac}.cfg b/resources/templates/provision/yealink/t4x/{$mac}.cfg
index 36de0827b2..d9de5fd9e3 100644
--- a/resources/templates/provision/yealink/t4x/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t4x/{$mac}.cfg
@@ -18,12 +18,19 @@ account.{$row.line_number}.label = {$account.{$row.line_number}.label}
 account.{$row.line_number}.display_name = {$account.{$row.line_number}.display_name}
 account.{$row.line_number}.auth_name = {$account.{$row.line_number}.auth_id}
 account.{$row.line_number}.password = {$account.{$row.line_number}.password}
+
 {if isset($account.{$row.line_number}.server.1.address)}
 account.{$row.line_number}.user_name = {$account.{$row.line_number}.user_id}@{$account.{$row.line_number}.server_address}
 {else}
 account.{$row.line_number}.user_name = {$account.{$row.line_number}.user_id}
 {/if}
+
+{if isset($row.server.1.address)}
+account.{$row.line_number}.sip_server.1.address = {$row.server.1.address} 
+{else}
 account.{$row.line_number}.sip_server_host = {$account.{$row.line_number}.server_address}
+{/if}
+
 account.{$row.line_number}.sip_server_port = {$account.{$row.line_number}.sip_port}
 account.{$row.line_number}.outbound_host = {$account.{$row.line_number}.outbound_proxy}
 account.{$row.line_number}.outbound_port = {$account.{$row.line_number}.sip_port}
diff --git a/resources/templates/provision/yealink/t52s/{$mac}.cfg b/resources/templates/provision/yealink/t52s/{$mac}.cfg
index 0b0db1a2c0..3d184913d8 100644
--- a/resources/templates/provision/yealink/t52s/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t52s/{$mac}.cfg
@@ -204,14 +204,20 @@ account.1.label = {$account.1.label}
 account.1.display_name = {$account.1.display_name}
 account.1.auth_name = {$account.1.auth_id}
 account.1.password = {$account.1.password}
+
 {if isset($account.1.server.1.address)}
 account.1.user_name = {$account.1.user_id}@{$account.1.server_address}
 {else}
 account.1.user_name = {$account.1.user_id}
 {/if}
 
-account.1.sip_server.1.address= {$account.1.server_address}
-account.1.sip_server.1.port= {$account.1.sip_port}
+{if isset($account.1.server.1.address)}
+account.1.sip_server.1.address = {$account.1.server.1.address}
+{else}
+account.1.sip_server.1.address = {$account.1.server_address}
+{/if}
+
+account.1.sip_server.1.port = {$account.1.sip_port}
 
 
 {if $account.1.sip_transport == 'udp'}account.1.sip_server.1.transport_type = 0{/if}
diff --git a/resources/templates/provision/yealink/t53/{$mac}.cfg b/resources/templates/provision/yealink/t53/{$mac}.cfg
index 705e2947b6..1e097429f8 100644
--- a/resources/templates/provision/yealink/t53/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t53/{$mac}.cfg
@@ -117,14 +117,20 @@ account.1.label = {$account.1.label}
 account.1.display_name = {$account.1.display_name}
 account.1.auth_name = {$account.1.auth_id}
 account.1.password = {$account.1.password}
+
 {if isset($account.1.server.1.address)}
 account.1.user_name = {$account.1.user_id}@{$account.1.server_address}
 {else}
 account.1.user_name = {$account.1.user_id}
 {/if}
 
-account.1.sip_server.1.address= {$account.1.server_address}
-account.1.sip_server.1.port= {$account.1.sip_port}
+{if isset($account.1.server.1.address)}
+account.1.sip_server.1.address = {$account.1.server.1.address}
+{else}
+account.1.sip_server.1.address = {$account.1.server_address}
+{/if}
+
+account.1.sip_server.1.port = {$account.1.sip_port}
 
 
 {if $account.1.sip_transport == 'udp'}account.1.sip_server.1.transport_type = 0{/if}
diff --git a/resources/templates/provision/yealink/t53w/{$mac}.cfg b/resources/templates/provision/yealink/t53w/{$mac}.cfg
index 844b069100..6d19798e14 100644
--- a/resources/templates/provision/yealink/t53w/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t53w/{$mac}.cfg
@@ -117,15 +117,20 @@ account.1.label = {$account.1.label}
 account.1.display_name = {$account.1.display_name}
 account.1.auth_name = {$account.1.auth_id}
 account.1.password = {$account.1.password}
+
 {if isset($account.1.server.1.address)}
 account.1.user_name = {$account.1.user_id}@{$account.1.server_address}
 {else}
 account.1.user_name = {$account.1.user_id}
 {/if}
 
-{if isset($account.1.server.1.address)} account.1.sip_server.1.address= {$account.1.server.1.address} {else} account.1.sip_server.1.address= {$account.1.server_address} {/if}
+{if isset($account.1.server.1.address)}
+account.1.sip_server.1.address = {$account.1.server.1.address}
+{else}
+account.1.sip_server.1.address = {$account.1.server_address}
+{/if}
 
-account.1.sip_server.1.port= {$account.1.sip_port}
+account.1.sip_server.1.port = {$account.1.sip_port}
 
 
 {if $account.1.sip_transport == 'udp'}account.1.sip_server.1.transport_type = 0{/if}
diff --git a/resources/templates/provision/yealink/t54s/{$mac}.cfg b/resources/templates/provision/yealink/t54s/{$mac}.cfg
index 1eda2bc0d8..749b55770d 100644
--- a/resources/templates/provision/yealink/t54s/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t54s/{$mac}.cfg
@@ -204,14 +204,20 @@ account.1.label = {$account.1.label}
 account.1.display_name = {$account.1.display_name}
 account.1.auth_name = {$account.1.auth_id}
 account.1.password = {$account.1.password}
+
 {if isset($account.1.server.1.address)}
 account.1.user_name = {$account.1.user_id}@{$account.1.server_address}
 {else}
 account.1.user_name = {$account.1.user_id}
 {/if}
 
-account.1.sip_server.1.address= {$account.1.server_address}
-account.1.sip_server.1.port= {$account.1.sip_port}
+{if isset($account.1.server.1.address)}
+account.1.sip_server.1.address = {$account.1.server.1.address}
+{else}
+account.1.sip_server.1.address = {$account.1.server_address}
+{/if}
+
+account.1.sip_server.1.port = {$account.1.sip_port}
 
 
 {if $account.1.sip_transport == 'udp'}account.1.sip_server.1.transport_type = 0{/if}
diff --git a/resources/templates/provision/yealink/t54w/{$mac}.cfg b/resources/templates/provision/yealink/t54w/{$mac}.cfg
index b24bc05a67..2b885d22f2 100644
--- a/resources/templates/provision/yealink/t54w/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t54w/{$mac}.cfg
@@ -123,15 +123,20 @@ account.{$row.line_number}.label = {$row.label}
 account.{$row.line_number}.display_name = {$row.display_name}
 account.{$row.line_number}.auth_name = {$row.auth_id}
 account.{$row.line_number}.password = {$row.password}
+
 {if isset($row.server.1.address)}
 account.{$row.line_number}.user_name = {$row.user_id}@{$row.server_address}
 {else}
 account.{$row.line_number}.user_name = {$row.user_id}
 {/if}
 
-{if isset($row.server.1.address)} account.{$row.line_number}.sip_server.1.address= {$row.server.1.address} {else} account.{$row.line_number}.sip_server.1.address= {$row.server_address} {/if}
+{if isset($row.server.1.address)}
+account.{$row.line_number}.sip_server.1.address = {$row.server.1.address}
+{else}
+account.{$row.line_number}.sip_server.1.address = {$row.server_address}
+{/if}
 
-account.{$row.line_number}.sip_server.1.port= {$row.sip_port}
+account.{$row.line_number}.sip_server.1.port = {$row.sip_port}
 
 {if $account.{$row.line_number}.sip_transport == 'udp'}account.{$row.line_number}.sip_server.1.transport_type = 0{/if}
 {if $account.{$row.line_number}.sip_transport == 'tcp'}account.{$row.line_number}.sip_server.1.transport_type = 1{/if}
diff --git a/resources/templates/provision/yealink/t57w/{$mac}.cfg b/resources/templates/provision/yealink/t57w/{$mac}.cfg
index d1c971c36d..b946bd33b8 100644
--- a/resources/templates/provision/yealink/t57w/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t57w/{$mac}.cfg
@@ -118,14 +118,20 @@ account.1.label = {$account.1.label}
 account.1.display_name = {$account.1.display_name}
 account.1.auth_name = {$account.1.auth_id}
 account.1.password = {$account.1.password}
+
 {if isset($account.1.server.1.address)}
 account.1.user_name = {$account.1.user_id}@{$account.1.server_address}
 {else}
 account.1.user_name = {$account.1.user_id}
 {/if}
 
-account.1.sip_server.1.address= {$account.1.server_address}
-account.1.sip_server.1.port= {$account.1.sip_port}
+{if isset($account.1.server.1.address)}
+account.1.sip_server.1.address = {$account.1.server.1.address}
+{else}
+account.1.sip_server.1.address = {$account.1.server_address}
+{/if}
+
+account.1.sip_server.1.port = {$account.1.sip_port}
 
 
 {if $account.1.sip_transport == 'udp'}account.1.sip_server.1.transport_type = 0{/if}
diff --git a/resources/templates/provision/yealink/t58w/{$mac}.cfg b/resources/templates/provision/yealink/t58w/{$mac}.cfg
index d24ebc0937..46c40b21cd 100644
--- a/resources/templates/provision/yealink/t58w/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t58w/{$mac}.cfg
@@ -6,9 +6,10 @@
 {foreach $lines as $row}
 
 #######################################################################################
-##                           Account1 Basic Settings                                 ##
+##                           Account Basic Settings                                 ##
 #######################################################################################
-{if isset({$row.password})}
+
+{if isset($row.password) }
 account.{$row.line_number}.enable = 1
 {else}
 account.{$row.line_number}.enable = 0
@@ -16,20 +17,53 @@ account.{$row.line_number}.enable = 0
 account.{$row.line_number}.label = {$row.label}
 account.{$row.line_number}.display_name = {$row.display_name}
 account.{$row.line_number}.auth_name = {$row.auth_id}
-account.{$row.line_number}.user_name = {$row.user_id}
 account.{$row.line_number}.password = {$row.password}
 
-account.{$row.line_number}.outbound_proxy_enable = {if isset($row.outbound_proxy_primary)}1{else}0{/if}{"\n"}
-account.{$row.line_number}.outbound_proxy.1.address = {$row.outbound_proxy_primary}
+{if isset($row.server.1.address)}
+account.{$row.line_number}.user_name = {$row.user_id}@{$row.server_address}
+{else}
+account.{$row.line_number}.user_name = {$row.user_id}
+{/if}
+
+{if isset($row.server.1.address)}
+account.{$row.line_number}.sip_server.1.address = {$row.server.1.address}
+{else}
+account.{$row.line_number}.sip_server.1.address = {$row.server_address}
+{/if}
+
+account.{$row.line_number}.sip_server.1.port = {$row.sip_port}
+
+{if $account.{$row.line_number}.sip_transport == 'udp'}account.{$row.line_number}.sip_server.1.transport_type = 0{/if}
+{if $account.{$row.line_number}.sip_transport == 'tcp'}account.{$row.line_number}.sip_server.1.transport_type = 1{/if}
+{if $account.{$row.line_number}.sip_transport == 'tls'}account.{$row.line_number}.sip_server.1.transport_type = 2{/if}
+{if $account.{$row.line_number}.sip_transport == 'dns srv'}account.{$row.line_number}.sip_server.1.transport_type = 3{/if}
+
+account.{$row.line_number}.sip_server.1.expires= {$row.register_expires}
+account.{$row.line_number}.sip_server.1.retry_counts= 3
+
+account.{$row.line_number}.sip_server.2.address= {$row.server.2.address}
+account.{$row.line_number}.sip_server.2.port= {$row.sip_port}
+
+{if $account.{$row.line_number}.sip_transport == 'udp'}account.{$row.line_number}.sip_server.2.transport_type = 0{/if}
+{if $account.{$row.line_number}.sip_transport == 'tcp'}account.{$row.line_number}.sip_server.2.transport_type = 1{/if}
+{if $account.{$row.line_number}.sip_transport == 'tls'}account.{$row.line_number}.sip_server.2.transport_type = 2{/if}
+{if $account.{$row.line_number}.sip_transport == 'dns srv'}account.{$row.line_number}.sip_server.2.transport_type = 3{/if}
+
+account.{$row.line_number}.sip_server.2.expires= {$row.register_expires}
+account.{$row.line_number}.sip_server.2.retry_counts= 3
+
+account.{$row.line_number}.outbound_proxy_enable= {if isset($row.outbound_proxy_primary)}1{else}0{/if}
+
+account.{$row.line_number}.outbound_proxy.1.address= {$row.outbound_proxy_primary}
+
 {if isset($outbound_proxy_1_port)}
 account.{$row.line_number}.outbound_proxy.1.port = {$outbound_proxy_1_port}
 {else}
 account.{$row.line_number}.outbound_proxy.1.port = {$row.sip_port}
 {/if}
 
-account.{$row.line_number}.dial_tone =
+account.{$row.line_number}.outbound_proxy.2.address= {$row.outbound_proxy_secondary}
 
-account.{$row.line_number}.outbound_proxy.2.address = {$row.outbound_proxy_secondary}
 {if isset($outbound_proxy_1_port)}
 account.{$row.line_number}.outbound_proxy.2.port = {$outbound_proxy_2_port}
 {else}
@@ -42,6 +76,8 @@ account.{$row.line_number}.outbound_proxy_fallback_interval = {$outbound_proxy_f
 account.{$row.line_number}.outbound_proxy_fallback_interval = 120
 {/if}
 
+account.{$row.line_number}.nat.nat_traversal=
+
 ####V84SP4#####
 account.{$row.line_number}.outbound_proxy.1.failback_mode= 
 account.{$row.line_number}.outbound_proxy.1.failback_subscribe.enable= 
@@ -53,14 +89,6 @@ account.{$row.line_number}.outbound_proxy.1.retry_counts=
 account.{$row.line_number}.invite_with_rpid_header.enable=
 account.{$row.line_number}.auto_answer_mute_enable=
 
-##It configures the transport type for account 1. 0-UDP,1-TCP,2-TLS,3-DNS-NAPTR
-##The default value is 0.
-account.{$row.line_number}.sip_server.1.transport_type = 
-
-##It configures the backup server transport type for account 1. 0-UDP,1-TCP,2-TLS,3-DNS-NAPTR
-##The default value is 0. 
-account.{$row.line_number}.sip_server.2.transport_type = 
-
 #######################################################################################
 ##                          Failback (SIP Backup Server)                             ##
 #######################################################################################
diff --git a/resources/templates/provision/yealink/t5x/{$mac}.cfg b/resources/templates/provision/yealink/t5x/{$mac}.cfg
index 70d11b6db2..672c289127 100644
--- a/resources/templates/provision/yealink/t5x/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t5x/{$mac}.cfg
@@ -19,8 +19,19 @@ account.{$row.line_number}.label = {$row.label}
 account.{$row.line_number}.display_name = {$row.display_name}
 account.{$row.line_number}.auth_name = {$row.auth_id}
 account.{$row.line_number}.password = {$row.password}
+
+{if isset($row.server.1.address)}
+account.{$row.line_number}.user_name = {$row.user_id}@{$row.server_address}
+{else}
 account.{$row.line_number}.user_name = {$row.user_id}
+{/if}
+
+{if isset($row.server.1.address)}
+account.{$row.line_number}.sip_server.1.address = {$row.server.1.address} 
+{else}
 account.{$row.line_number}.sip_server_host = {$row.server_address}
+{/if}
+
 account.{$row.line_number}.sip_server_port = {$row.sip_port}
 account.{$row.line_number}.outbound_host = {$row.outbound_proxy}
 account.{$row.line_number}.outbound_port = {$row.sip_port}
diff --git a/resources/templates/provision/yealink/vp530/{$mac}.cfg b/resources/templates/provision/yealink/vp530/{$mac}.cfg
index faf8f952f7..1fb38fc23f 100644
--- a/resources/templates/provision/yealink/vp530/{$mac}.cfg
+++ b/resources/templates/provision/yealink/vp530/{$mac}.cfg
@@ -17,8 +17,19 @@ account.1.label = {$account.1.label}
 account.1.display_name = {$account.1.display_name}
 account.1.auth_name = {$account.1.auth_id}
 account.1.password = {$account.1.password}
+
+{if isset($account.1.server.1.address)}
+account.1.user_name = {$account.1.user_id}@{$account.1.server_address}
+{else}
 account.1.user_name = {$account.1.user_id}
+{/if}
+
+{if isset($account.1.server.1.address)}
+account.1.sip_server.1.address = {$account.1.server.1.address}
+{else}
 account.1.sip_server_host = {$account.1.server_address}
+{/if}
+
 account.1.sip_server_port = {$account.1.sip_port}
 account.1.outbound_host = {$account.1.outbound_proxy}
 account.1.outbound_port = {$account.1.sip_port}
diff --git a/resources/templates/provision/yealink/vp59/{$mac}.cfg b/resources/templates/provision/yealink/vp59/{$mac}.cfg
index ac335ac5ae..c5ba5da2ff 100644
--- a/resources/templates/provision/yealink/vp59/{$mac}.cfg
+++ b/resources/templates/provision/yealink/vp59/{$mac}.cfg
@@ -16,7 +16,13 @@ account.{$row.line_number}.enable = 0
 account.{$row.line_number}.label = {$row.label}
 account.{$row.line_number}.display_name = {$row.display_name}
 account.{$row.line_number}.auth_name = {$row.auth_id}
+
+{if isset($row.server.1.address)}
+account.{$row.line_number}.user_name = {$row.user_id}@{$row.server_address}
+{else}
 account.{$row.line_number}.user_name = {$row.user_id}
+{/if}
+
 account.{$row.line_number}.password = {$row.password}
 {if isset($account.{$row.line_number}.outbound_proxy_primary)}
 account.{$row.line_number}.outbound_proxy_enable = 1
diff --git a/resources/templates/provision/yealink/w52p/{$mac}.cfg b/resources/templates/provision/yealink/w52p/{$mac}.cfg
index d9caf592c9..c8843f836f 100644
--- a/resources/templates/provision/yealink/w52p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/w52p/{$mac}.cfg
@@ -32,7 +32,11 @@ account.1.user_name = {$account.1.user_id}
 {/if}
 
 #Configure the SIP server address.
+{if isset($account.1.server.1.address)}
+account.1.sip_server.1.address = {$account.1.server.1.address}
+{else}
 account.1.sip_server_host = {$account.1.server_address}
+{/if}
 
 #Specify the port for the SIP server. The default value is 5060.
 account.1.sip_server_port = {$account.1.sip_port}
diff --git a/resources/templates/provision/yealink/w56p/{$mac}.cfg b/resources/templates/provision/yealink/w56p/{$mac}.cfg
index 78465681a9..eb4b83f7d2 100644
--- a/resources/templates/provision/yealink/w56p/{$mac}.cfg
+++ b/resources/templates/provision/yealink/w56p/{$mac}.cfg
@@ -32,7 +32,11 @@ account.1.user_name = {$account.1.user_id}
 {/if}
 
 #Configure the SIP server address.
+{if isset($account.1.server.1.address)}
+account.1.sip_server.1.address = {$account.1.server.1.address}
+{else}
 account.1.sip_server_host = {$account.1.server_address}
+{/if}
 
 #Specify the port for the SIP server. The default value is 5060.
 account.1.sip_server_port = {$account.1.sip_port}
diff --git a/resources/templates/provision/yealink/w60b/{$mac}.cfg b/resources/templates/provision/yealink/w60b/{$mac}.cfg
index a6a22b7827..a4a4a2d0bf 100644
--- a/resources/templates/provision/yealink/w60b/{$mac}.cfg
+++ b/resources/templates/provision/yealink/w60b/{$mac}.cfg
@@ -18,7 +18,12 @@ account.1.user_name = {$account.1.user_id}@{$account.1.server_address}
 {else}
 account.1.user_name = {$account.1.user_id}
 {/if}
-{if isset($account.1.server.1.address)} account.1.sip_server.1.address= {$account.1.server.1.address} {else} account.1.sip_server.1.address= {$account.1.server_address} {/if}
+
+{if isset($account.1.server.1.address)}
+account.1.sip_server.1.address = {$account.1.server.1.address}
+{else}
+account.1.sip_server.1.address = {$account.1.server_address}
+{/if}
 
 account.1.auth_name = {$account.1.user_id}
 account.1.password = {$account.1.password}
diff --git a/resources/templates/provision/yealink/w70b/{$mac}.cfg b/resources/templates/provision/yealink/w70b/{$mac}.cfg
index a6a22b7827..a4a4a2d0bf 100644
--- a/resources/templates/provision/yealink/w70b/{$mac}.cfg
+++ b/resources/templates/provision/yealink/w70b/{$mac}.cfg
@@ -18,7 +18,12 @@ account.1.user_name = {$account.1.user_id}@{$account.1.server_address}
 {else}
 account.1.user_name = {$account.1.user_id}
 {/if}
-{if isset($account.1.server.1.address)} account.1.sip_server.1.address= {$account.1.server.1.address} {else} account.1.sip_server.1.address= {$account.1.server_address} {/if}
+
+{if isset($account.1.server.1.address)}
+account.1.sip_server.1.address = {$account.1.server.1.address}
+{else}
+account.1.sip_server.1.address = {$account.1.server_address}
+{/if}
 
 account.1.auth_name = {$account.1.user_id}
 account.1.password = {$account.1.password}
diff --git a/resources/templates/provision/yealink/w7xp/{$mac}.cfg b/resources/templates/provision/yealink/w7xp/{$mac}.cfg
index 31b08f697d..65334878dd 100644
--- a/resources/templates/provision/yealink/w7xp/{$mac}.cfg
+++ b/resources/templates/provision/yealink/w7xp/{$mac}.cfg
@@ -18,7 +18,12 @@ account.1.user_name = {$account.1.user_id}@{$account.1.server_address}
 {else}
 account.1.user_name = {$account.1.user_id}
 {/if}
-{if isset($account.1.server.1.address)} account.1.sip_server.1.address= {$account.1.server.1.address} {else} account.1.sip_server.1.address= {$account.1.server_address} {/if}
+
+{if isset($account.1.server.1.address)}
+account.1.sip_server.1.address = {$account.1.server.1.address}
+{else}
+account.1.sip_server.1.address = {$account.1.server_address}
+{/if}
 
 account.1.auth_name = {$account.1.user_id}
 account.1.password = {$account.1.password}