diff --git a/resources/templates/provision/yealink/t42g/{$mac}.cfg b/resources/templates/provision/yealink/t42g/{$mac}.cfg
index 2e7ce16894..99f976c4bc 100644
--- a/resources/templates/provision/yealink/t42g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t42g/{$mac}.cfg
@@ -23,8 +23,6 @@ account.1.outbound_proxy_enable =
 account.1.outbound_host = {$outbound_proxy_1}
 account.1.outbound_port = 5060
 account.1.sip_listen_port = 5060
-#Configure the register expiry time (in seconds), the default value is 3600.
-account.1.expires = {$register_expires_1}
 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
 {if $sip_transport_1 == 'udp'}account.1.transport = 0{/if}
 {if $sip_transport_1 == 'tcp'}account.1.transport = 1{/if}
@@ -40,14 +38,15 @@ account.1.expires = {$register_expires_1}
 
 account.1.reregister_enable = 0
 account.1.retry_counts = 
-account.1.failback_mode = 0 
+account.1.failback_mode = 0
 account.1.failback_timeout = 3600
 account.1.naptr_build = 0
 account.1.fallback.redundancy_type = 0
 account.1.fallback.timeout = 120
 account.1.sip_server.1.address = 
 account.1.sip_server.1.port = 5060
-account.1.sip_server.1.expires = 3600
+#Configure the register expiry time (in seconds), the default value is 3600.
+account.1.sip_server.1.expires = {$register_expires_1}
 account.1.sip_server.1.retry_counts = 3
 account.1.sip_server.1.failback_mode = 0
 account.1.sip_server.1.failback_timeout = 3600
@@ -481,8 +480,6 @@ account.2.outbound_proxy_enable =
 account.2.outbound_host = {$outbound_proxy_2}
 account.2.outbound_port = 5060
 account.2.sip_listen_port = 5060
-#Configure the register expiry time (in seconds), the default value is 3600.
-account.2.expires = {$register_expires_2}
 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
 {if $sip_transport_2 == 'udp'}account.2.transport = 0{/if}
 {if $sip_transport_2 == 'tcp'}account.2.transport = 1{/if}
@@ -505,7 +502,8 @@ account.2.fallback.redundancy_type = 0
 account.2.fallback.timeout = 120
 account.2.sip_server.1.address = 
 account.2.sip_server.1.port = 5060
-account.2.sip_server.1.expires = 3600
+#Configure the register expiry time (in seconds), the default value is 3600.
+account.2.sip_server.1.expires = {$register_expires_2}
 account.2.sip_server.1.retry_counts = 3
 account.2.sip_server.1.failback_mode = 0
 account.2.sip_server.1.failback_timeout = 3600
@@ -976,8 +974,6 @@ account.3.outbound_proxy_enable =
 account.3.outbound_host = {$outbound_proxy_3}
 account.3.outbound_port = 5060
 account.3.sip_listen_port = 5060
-#Configure the register expiry time (in seconds), the default value is 3600.
-account.3.expires = {$register_expires_3}
 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
 {if $sip_transport_3 == 'udp'}account.3.transport = 0{/if}
 {if $sip_transport_3 == 'tcp'}account.3.transport = 1{/if}
@@ -1000,7 +996,8 @@ account.3.fallback.redundancy_type = 0
 account.3.fallback.timeout = 120
 account.3.sip_server.1.address = 
 account.3.sip_server.1.port = 5060
-account.3.sip_server.1.expires = 3600
+#Configure the register expiry time (in seconds), the default value is 3600.
+account.3.sip_server.1.expires = {$register_expires_3}
 account.3.sip_server.1.retry_counts = 3
 account.3.sip_server.1.failback_mode = 0
 account.3.sip_server.1.failback_timeout = 3600
@@ -1471,8 +1468,6 @@ account.4.outbound_proxy_enable =
 account.4.outbound_host = {$outbound_proxy_4}
 account.4.outbound_port = 5060
 account.4.sip_listen_port = 5060
-#Configure the register expiry time (in seconds), the default value is 3600.
-account.4.expires = {$register_expires_4}
 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
 {if $sip_transport_4 == 'udp'}account.4.transport = 0{/if}
 {if $sip_transport_4 == 'tcp'}account.4.transport = 1{/if}
@@ -1494,7 +1489,8 @@ account.4.fallback.redundancy_type = 0
 account.4.fallback.timeout = 120
 account.4.sip_server.1.address = 
 account.4.sip_server.1.port = 5060
-account.4.sip_server.1.expires = 3600
+#Configure the register expiry time (in seconds), the default value is 3600.
+account.4.sip_server.1.expires = {$register_expires_4}
 account.4.sip_server.1.retry_counts = 3
 account.4.sip_server.1.failback_mode = 0
 account.4.sip_server.1.failback_timeout = 3600
@@ -1964,8 +1960,6 @@ account.5.outbound_proxy_enable =
 account.5.outbound_host = {$outbound_proxy_5}
 account.5.outbound_port = 5060
 account.5.sip_listen_port = 5060
-#Configure the register expiry time (in seconds), the default value is 3600.
-account.5.expires = {$register_expires_5}
 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
 {if $sip_transport_5 == 'udp'}account.5.transport = 0{/if}
 {if $sip_transport_5 == 'tcp'}account.5.transport = 1{/if}
@@ -1987,7 +1981,8 @@ account.5.fallback.redundancy_type = 0
 account.5.fallback.timeout = 120
 account.5.sip_server.1.address = 
 account.5.sip_server.1.port = 5060
-account.5.sip_server.1.expires = 3600
+#Configure the register expiry time (in seconds), the default value is 3600.
+account.5.sip_server.1.expires = {$register_expires_5}
 account.5.sip_server.1.retry_counts = 3
 account.5.sip_server.1.failback_mode = 0
 account.5.sip_server.1.failback_timeout = 3600
@@ -2457,8 +2452,6 @@ account.6.outbound_proxy_enable =
 account.6.outbound_host = {$outbound_proxy_6}
 account.6.outbound_port = 5060
 account.6.sip_listen_port = 5060
-#Configure the register expiry time (in seconds), the default value is 3600.
-account.6.expires = {$register_expires_6}
 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
 {if $sip_transport_6 == 'udp'}account.6.transport = 0{/if}
 {if $sip_transport_6 == 'tcp'}account.6.transport = 1{/if}
@@ -2480,7 +2473,8 @@ account.6.fallback.redundancy_type = 0
 account.6.fallback.timeout = 120
 account.6.sip_server.1.address = 
 account.6.sip_server.1.port = 5060
-account.6.sip_server.1.expires = 3600
+#Configure the register expiry time (in seconds), the default value is 3600.
+account.6.sip_server.1.expires = {$register_expires_6}
 account.6.sip_server.1.retry_counts = 3
 account.6.sip_server.1.failback_mode = 0
 account.6.sip_server.1.failback_timeout = 3600
diff --git a/resources/templates/provision/yealink/t46g/{$mac}.cfg b/resources/templates/provision/yealink/t46g/{$mac}.cfg
index 2e7ce16894..34333ebe4e 100644
--- a/resources/templates/provision/yealink/t46g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t46g/{$mac}.cfg
@@ -23,8 +23,6 @@ account.1.outbound_proxy_enable =
 account.1.outbound_host = {$outbound_proxy_1}
 account.1.outbound_port = 5060
 account.1.sip_listen_port = 5060
-#Configure the register expiry time (in seconds), the default value is 3600.
-account.1.expires = {$register_expires_1}
 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
 {if $sip_transport_1 == 'udp'}account.1.transport = 0{/if}
 {if $sip_transport_1 == 'tcp'}account.1.transport = 1{/if}
@@ -40,14 +38,15 @@ account.1.expires = {$register_expires_1}
 
 account.1.reregister_enable = 0
 account.1.retry_counts = 
-account.1.failback_mode = 0 
+account.1.failback_mode = 0
 account.1.failback_timeout = 3600
 account.1.naptr_build = 0
 account.1.fallback.redundancy_type = 0
 account.1.fallback.timeout = 120
 account.1.sip_server.1.address = 
 account.1.sip_server.1.port = 5060
-account.1.sip_server.1.expires = 3600
+#Configure the register expiry time (in seconds), the default value is 3600.
+account.1.sip_server.1.expires = {$register_expires_1}
 account.1.sip_server.1.retry_counts = 3
 account.1.sip_server.1.failback_mode = 0
 account.1.sip_server.1.failback_timeout = 3600
@@ -481,8 +480,6 @@ account.2.outbound_proxy_enable =
 account.2.outbound_host = {$outbound_proxy_2}
 account.2.outbound_port = 5060
 account.2.sip_listen_port = 5060
-#Configure the register expiry time (in seconds), the default value is 3600.
-account.2.expires = {$register_expires_2}
 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
 {if $sip_transport_2 == 'udp'}account.2.transport = 0{/if}
 {if $sip_transport_2 == 'tcp'}account.2.transport = 1{/if}
@@ -505,7 +502,8 @@ account.2.fallback.redundancy_type = 0
 account.2.fallback.timeout = 120
 account.2.sip_server.1.address = 
 account.2.sip_server.1.port = 5060
-account.2.sip_server.1.expires = 3600
+#Configure the register expiry time (in seconds), the default value is 3600.
+account.2.sip_server.1.expires = {$register_expires_2}
 account.2.sip_server.1.retry_counts = 3
 account.2.sip_server.1.failback_mode = 0
 account.2.sip_server.1.failback_timeout = 3600
@@ -976,15 +974,12 @@ account.3.outbound_proxy_enable =
 account.3.outbound_host = {$outbound_proxy_3}
 account.3.outbound_port = 5060
 account.3.sip_listen_port = 5060
-#Configure the register expiry time (in seconds), the default value is 3600.
-account.3.expires = {$register_expires_3}
 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
 {if $sip_transport_3 == 'udp'}account.3.transport = 0{/if}
 {if $sip_transport_3 == 'tcp'}account.3.transport = 1{/if}
 {if $sip_transport_3 == 'tls'}account.3.transport = 2{/if}
 {if $sip_transport_3 == 'dns srv'}account.3.transport = 3{/if}
 
-
 #######################################################################################
 ##                          Failback                                                 ##
 #######################################################################################
@@ -1000,7 +995,8 @@ account.3.fallback.redundancy_type = 0
 account.3.fallback.timeout = 120
 account.3.sip_server.1.address = 
 account.3.sip_server.1.port = 5060
-account.3.sip_server.1.expires = 3600
+#Configure the register expiry time (in seconds), the default value is 3600.
+account.3.sip_server.1.expires = {$register_expires_3}
 account.3.sip_server.1.retry_counts = 3
 account.3.sip_server.1.failback_mode = 0
 account.3.sip_server.1.failback_timeout = 3600
@@ -1471,8 +1467,6 @@ account.4.outbound_proxy_enable =
 account.4.outbound_host = {$outbound_proxy_4}
 account.4.outbound_port = 5060
 account.4.sip_listen_port = 5060
-#Configure the register expiry time (in seconds), the default value is 3600.
-account.4.expires = {$register_expires_4}
 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
 {if $sip_transport_4 == 'udp'}account.4.transport = 0{/if}
 {if $sip_transport_4 == 'tcp'}account.4.transport = 1{/if}
@@ -1494,7 +1488,8 @@ account.4.fallback.redundancy_type = 0
 account.4.fallback.timeout = 120
 account.4.sip_server.1.address = 
 account.4.sip_server.1.port = 5060
-account.4.sip_server.1.expires = 3600
+#Configure the register expiry time (in seconds), the default value is 3600.
+account.4.sip_server.1.expires = {$register_expires_4}
 account.4.sip_server.1.retry_counts = 3
 account.4.sip_server.1.failback_mode = 0
 account.4.sip_server.1.failback_timeout = 3600
@@ -1964,8 +1959,6 @@ account.5.outbound_proxy_enable =
 account.5.outbound_host = {$outbound_proxy_5}
 account.5.outbound_port = 5060
 account.5.sip_listen_port = 5060
-#Configure the register expiry time (in seconds), the default value is 3600.
-account.5.expires = {$register_expires_5}
 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
 {if $sip_transport_5 == 'udp'}account.5.transport = 0{/if}
 {if $sip_transport_5 == 'tcp'}account.5.transport = 1{/if}
@@ -1987,7 +1980,8 @@ account.5.fallback.redundancy_type = 0
 account.5.fallback.timeout = 120
 account.5.sip_server.1.address = 
 account.5.sip_server.1.port = 5060
-account.5.sip_server.1.expires = 3600
+#Configure the register expiry time (in seconds), the default value is 3600.
+account.5.sip_server.1.expires = {$register_expires_5}
 account.5.sip_server.1.retry_counts = 3
 account.5.sip_server.1.failback_mode = 0
 account.5.sip_server.1.failback_timeout = 3600
@@ -2457,8 +2451,6 @@ account.6.outbound_proxy_enable =
 account.6.outbound_host = {$outbound_proxy_6}
 account.6.outbound_port = 5060
 account.6.sip_listen_port = 5060
-#Configure the register expiry time (in seconds), the default value is 3600.
-account.6.expires = {$register_expires_6}
 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
 {if $sip_transport_6 == 'udp'}account.6.transport = 0{/if}
 {if $sip_transport_6 == 'tcp'}account.6.transport = 1{/if}
@@ -2480,7 +2472,8 @@ account.6.fallback.redundancy_type = 0
 account.6.fallback.timeout = 120
 account.6.sip_server.1.address = 
 account.6.sip_server.1.port = 5060
-account.6.sip_server.1.expires = 3600
+#Configure the register expiry time (in seconds), the default value is 3600.
+account.6.sip_server.1.expires = {$register_expires_6}
 account.6.sip_server.1.retry_counts = 3
 account.6.sip_server.1.failback_mode = 0
 account.6.sip_server.1.failback_timeout = 3600
diff --git a/resources/templates/provision/yealink/t48g/{$mac}.cfg b/resources/templates/provision/yealink/t48g/{$mac}.cfg
index 93efdbbd92..b402e8e669 100644
--- a/resources/templates/provision/yealink/t48g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t48g/{$mac}.cfg
@@ -23,8 +23,6 @@ account.1.outbound_proxy_enable =
 account.1.outbound_host = {$outbound_proxy_1}
 account.1.outbound_port = 5060
 account.1.sip_listen_port = 5060
-#Configure the register expiry time (in seconds), the default value is 3600.
-account.1.expires = {$register_expires_1}
 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
 {if $sip_transport_1 == 'udp'}account.1.transport = 0{/if}
 {if $sip_transport_1 == 'tcp'}account.1.transport = 1{/if}
@@ -40,14 +38,15 @@ account.1.expires = {$register_expires_1}
 
 account.1.reregister_enable = 0
 account.1.retry_counts = 
-account.1.failback_mode = 0 
+account.1.failback_mode = 0
 account.1.failback_timeout = 3600
 account.1.naptr_build = 0
 account.1.fallback.redundancy_type = 0
 account.1.fallback.timeout = 120
 account.1.sip_server.1.address = 
 account.1.sip_server.1.port = 5060
-account.1.sip_server.1.expires = 3600
+#Configure the register expiry time (in seconds), the default value is 3600.
+account.1.sip_server.1.expires = {$register_expires_1}
 account.1.sip_server.1.retry_counts = 3
 account.1.sip_server.1.failback_mode = 0
 account.1.sip_server.1.failback_timeout = 3600
@@ -481,8 +480,6 @@ account.2.outbound_proxy_enable =
 account.2.outbound_host = {$outbound_proxy_2}
 account.2.outbound_port = 5060
 account.2.sip_listen_port = 5060
-#Configure the register expiry time (in seconds), the default value is 3600.
-account.2.expires = {$register_expires_2}
 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
 {if $sip_transport_2 == 'udp'}account.2.transport = 0{/if}
 {if $sip_transport_2 == 'tcp'}account.2.transport = 1{/if}
@@ -505,7 +502,8 @@ account.2.fallback.redundancy_type = 0
 account.2.fallback.timeout = 120
 account.2.sip_server.1.address = 
 account.2.sip_server.1.port = 5060
-account.2.sip_server.1.expires = 3600
+#Configure the register expiry time (in seconds), the default value is 3600.
+account.2.sip_server.1.expires = {$register_expires_2}
 account.2.sip_server.1.retry_counts = 3
 account.2.sip_server.1.failback_mode = 0
 account.2.sip_server.1.failback_timeout = 3600
@@ -975,8 +973,6 @@ account.3.outbound_proxy_enable =
 account.3.outbound_host = {$outbound_proxy_3}
 account.3.outbound_port = 5060
 account.3.sip_listen_port = 5060
-#Configure the register expiry time (in seconds), the default value is 3600.
-account.3.expires = {$register_expires_3}
 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
 {if $sip_transport_3 == 'udp'}account.3.transport = 0{/if}
 {if $sip_transport_3 == 'tcp'}account.3.transport = 1{/if}
@@ -998,7 +994,8 @@ account.3.fallback.redundancy_type = 0
 account.3.fallback.timeout = 120
 account.3.sip_server.1.address = 
 account.3.sip_server.1.port = 5060
-account.3.sip_server.1.expires = 3600
+#Configure the register expiry time (in seconds), the default value is 3600.
+account.3.sip_server.1.expires = {$register_expires_3}
 account.3.sip_server.1.retry_counts = 3
 account.3.sip_server.1.failback_mode = 0
 account.3.sip_server.1.failback_timeout = 3600
@@ -1469,8 +1466,6 @@ account.4.outbound_proxy_enable =
 account.4.outbound_host = {$outbound_proxy_4}
 account.4.outbound_port = 5060
 account.4.sip_listen_port = 5060
-#Configure the register expiry time (in seconds), the default value is 3600.
-account.4.expires = {$register_expires_4}
 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
 {if $sip_transport_4 == 'udp'}account.4.transport = 0{/if}
 {if $sip_transport_4 == 'tcp'}account.4.transport = 1{/if}
@@ -1492,7 +1487,8 @@ account.4.fallback.redundancy_type = 0
 account.4.fallback.timeout = 120
 account.4.sip_server.1.address = 
 account.4.sip_server.1.port = 5060
-account.4.sip_server.1.expires = 3600
+#Configure the register expiry time (in seconds), the default value is 3600.
+account.4.sip_server.1.expires = {$register_expires_4}
 account.4.sip_server.1.retry_counts = 3
 account.4.sip_server.1.failback_mode = 0
 account.4.sip_server.1.failback_timeout = 3600
@@ -1962,8 +1958,6 @@ account.5.outbound_proxy_enable =
 account.5.outbound_host = {$outbound_proxy_5}
 account.5.outbound_port = 5060
 account.5.sip_listen_port = 5060
-#Configure the register expiry time (in seconds), the default value is 3600.
-account.5.expires = {$register_expires_5}
 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
 {if $sip_transport_5 == 'udp'}account.5.transport = 0{/if}
 {if $sip_transport_5 == 'tcp'}account.5.transport = 1{/if}
@@ -1985,7 +1979,8 @@ account.5.fallback.redundancy_type = 0
 account.5.fallback.timeout = 120
 account.5.sip_server.1.address = 
 account.5.sip_server.1.port = 5060
-account.5.sip_server.1.expires = 3600
+#Configure the register expiry time (in seconds), the default value is 3600.
+account.5.sip_server.1.expires = {$register_expires_5}
 account.5.sip_server.1.retry_counts = 3
 account.5.sip_server.1.failback_mode = 0
 account.5.sip_server.1.failback_timeout = 3600
@@ -2455,8 +2450,6 @@ account.6.outbound_proxy_enable =
 account.6.outbound_host = {$outbound_proxy_6}
 account.6.outbound_port = 5060
 account.6.sip_listen_port = 5060
-#Configure the register expiry time (in seconds), the default value is 3600.
-account.6.expires = {$register_expires_6}
 #Configure the transport type; 0-UDP (default), 1-TCP, 2-TLS, 3-DNS SRV;
 {if $sip_transport_6 == 'udp'}account.6.transport = 0{/if}
 {if $sip_transport_6 == 'tcp'}account.6.transport = 1{/if}
@@ -2478,7 +2471,8 @@ account.6.fallback.redundancy_type = 0
 account.6.fallback.timeout = 120
 account.6.sip_server.1.address = 
 account.6.sip_server.1.port = 5060
-account.6.sip_server.1.expires = 3600
+#Configure the register expiry time (in seconds), the default value is 3600.
+account.6.sip_server.1.expires = {$register_expires_6}
 account.6.sip_server.1.retry_counts = 3
 account.6.sip_server.1.failback_mode = 0
 account.6.sip_server.1.failback_timeout = 3600