diff --git a/resources/templates/provision/grandstream/gds3705/{$mac}.xml b/resources/templates/provision/grandstream/gds3705/{$mac}.xml
index 109ca488a9..402be297f6 100644
--- a/resources/templates/provision/grandstream/gds3705/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gds3705/{$mac}.xml
@@ -138,8 +138,8 @@
 <!-- ########################################################################################## -->
 ?>
     <!-- Time Zone -->
-    {if isset($grandstream_timezone) }
-    <P64>{$grandstream_timezone}</P64>
+    {if isset($grandstream_time_zone) }
+    <P64>{$grandstream_time_zone}</P64>
     {elseif isset($grandstream_gxp_time_zone) }
     <P64>{$grandstream_gxp_time_zone}</P64>
     {else}
diff --git a/resources/templates/provision/grandstream/gds3710/{$mac}.xml b/resources/templates/provision/grandstream/gds3710/{$mac}.xml
index 8c9311a371..0e67b81867 100644
--- a/resources/templates/provision/grandstream/gds3710/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gds3710/{$mac}.xml
@@ -210,8 +210,8 @@
   <!-- Date & Time -->
   <Module_Date_Time>
     <!-- Time Zone -->
-    {if isset($grandstream_timezone) }
-    <P64>{$grandstream_timezone}</P64>
+    {if isset($grandstream_time_zone) }
+    <P64>{$grandstream_time_zone}</P64>
     {elseif isset($grandstream_gxp_time_zone) }
     <P64>{$grandstream_gxp_time_zone}</P64>
     {else}
diff --git a/resources/templates/provision/grandstream/ghp6xx/{$mac}.xml b/resources/templates/provision/grandstream/ghp6xx/{$mac}.xml
index ed84b70ba7..6e16e2be9e 100644
--- a/resources/templates/provision/grandstream/ghp6xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ghp6xx/{$mac}.xml
@@ -1724,8 +1724,8 @@
 
 		<!-- # String -->
 		<!-- # Mandatory -->
-		{if isset($grandstream_timezone) }
-		<item name="dateTime.timezone">{$grandstream_timezone}</item>
+		{if isset($grandstream_time_zone) }
+		<item name="dateTime.timezone">{$grandstream_time_zone}</item>
 		{else}
 		<item name="dateTime.timezone">auto</item>
 		{/if}
diff --git a/resources/templates/provision/grandstream/grp2612w/{$mac}.xml b/resources/templates/provision/grandstream/grp2612w/{$mac}.xml
index 0f20a02791..423013911b 100644
--- a/resources/templates/provision/grandstream/grp2612w/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2612w/{$mac}.xml
@@ -138,7 +138,11 @@
 		<!-- NAT Traversal -->
 		<!-- No, STUN, KeepAlive, UPnP, Auto, VPN -->
 		<!-- Pvalue P52 -->
+		{if isset($grandstream_nat_traversal)}
+		<item name="account.{$row.line_number}.network.natTraversal">{$grandstream_nat_traversal}</item>
+		{else}
 		<item name="account.{$row.line_number}.network.natTraversal">Auto</item>
+		{/if}		
 
 		<!-- Support Rport (RFC 3581) -->
 		<!-- Yes, No -->
@@ -784,7 +788,7 @@
 
 		<!-- Distinctive Ring Tone -->
 		<!-- Pvalue P1489 -->
-		<item name="account.{$row.line_number}.ring.match.1.ringtone">5</item>
+		<item name="account.{$row.line_number}.ring.match.1.ringtone">{$grandstream_distinctive_ringtone_1}</item>
 
 		<!-- Match Incoming Caller ID. Matching Rule 2 -->
 		<!-- Pvalue P1490 -->
@@ -792,7 +796,7 @@
 
 		<!-- Distinctive Ring Tone -->
 		<!-- Pvalue P1491 -->
-		<item name="account.{$row.line_number}.ring.match.2.ringtone">5</item>
+		<item name="account.{$row.line_number}.ring.match.2.ringtone">{$grandstream_distinctive_ringtone_2}</item>
 
 		<!-- Match Incoming Caller ID. Matching Rule 3 -->
 		<!-- Pvalue P1492 -->
@@ -800,7 +804,7 @@
 
 		<!-- Distinctive Ring Tone -->
 		<!-- Pvalue P1493 -->
-		<item name="account.{$row.line_number}.ring.match.3.ringtone">5</item>
+		<item name="account.{$row.line_number}.ring.match.3.ringtone">{$grandstream_distinctive_ringtone_3}</item>
 
 		<!-- Match Incoming Caller ID. Matching Rule 4 -->
 		<!-- Pvalue P6716 -->
@@ -808,7 +812,7 @@
 
 		<!-- Distinctive Ring Tone -->
 		<!-- Pvalue P6717 -->
-		<item name="account.{$row.line_number}.ring.match.4.ringtone">5</item>
+		<item name="account.{$row.line_number}.ring.match.4.ringtone">{$grandstream_distinctive_ringtone_4}</item>
 
 		<!-- Match Incoming Caller ID. Matching Rule 5 -->
 		<!-- Pvalue P6718 -->
@@ -816,7 +820,7 @@
 
 		<!-- Distinctive Ring Tone -->
 		<!-- Pvalue P6719 -->
-		<item name="account.{$row.line_number}.ring.match.5.ringtone">5</item>
+		<item name="account.{$row.line_number}.ring.match.5.ringtone">{$grandstream_distinctive_ringtone_5}</item>
 
 		<!-- Match Incoming Caller ID. Matching Rule 6 -->
 		<!-- Pvalue P6720 -->
@@ -824,7 +828,7 @@
 
 		<!-- Distinctive Ring Tone -->
 		<!-- Pvalue P6721 -->
-		<item name="account.{$row.line_number}.ring.match.6.ringtone">5</item>
+		<item name="account.{$row.line_number}.ring.match.6.ringtone">{$grandstream_distinctive_ringtone_6}</item>
 
 		<!-- Match Incoming Caller ID. Matching Rule 7 -->
 		<!-- Pvalue P26064 -->
@@ -832,7 +836,7 @@
 
 		<!-- Distinctive Ring Tone -->
 		<!-- Pvalue P26065 -->
-		<item name="account.{$row.line_number}.ring.match.7.ringtone">5</item>
+		<item name="account.{$row.line_number}.ring.match.7.ringtone">{$grandstream_distinctive_ringtone_7}</item>
 
 		<!-- Match Incoming Caller ID. Matching Rule 8 -->
 		<!-- Pvalue P26066 -->
@@ -840,7 +844,7 @@
 
 		<!-- Distinctive Ring Tone -->
 		<!-- Pvalue P26067 -->
-		<item name="account.{$row.line_number}.ring.match.8.ringtone">5</item>
+		<item name="account.{$row.line_number}.ring.match.8.ringtone">{$grandstream_distinctive_ringtone_8}</item>
 
 		<!-- Match Incoming Caller ID. Matching Rule 9 -->
 		<!-- Pvalue P26068 -->
@@ -848,7 +852,7 @@
 
 		<!-- Distinctive Ring Tone -->
 		<!-- Pvalue P26069 -->
-		<item name="account.{$row.line_number}.ring.match.9.ringtone">5</item>
+		<item name="account.{$row.line_number}.ring.match.9.ringtone">{$grandstream_distinctive_ringtone_9}</item>
 
 		<!-- Match Incoming Caller ID. Matching Rule 10 -->
 		<!-- Pvalue P26096 -->
@@ -856,7 +860,7 @@
 
 		<!-- Distinctive Ring Tone -->
 		<!-- Pvalue P26097 -->
-		<item name="account.{$row.line_number}.ring.match.10.ringtone">5</item>
+		<item name="account.{$row.line_number}.ring.match.10.ringtone">{$grandstream_distinctive_ringtone_10}</item>
 
 		<!-- Ring Timeout -->
 		<!-- Number: 10 - 300 -->
@@ -903,21 +907,21 @@
 
 		<!-- DND Call Feature On -->
 		<!-- Pvalue P2344 -->
-		<item name="account.{$row.line_number}.featureCodes.dndOn"></item>
+		<item name="account.{$row.line_number}.featureCodes.dndOn">*78</item>
 
 		<!-- DND Call Feature Off  -->
 		<!-- Pvalue P2345 -->
-		<item name="account.{$row.line_number}.featureCodes.dndOff"></item>
+		<item name="account.{$row.line_number}.featureCodes.dndOff">*79</item>
 
 		<!-- #Call Forward Unconditionally (All) - On -->
 		<!-- # String -->
 		<!-- Pvalue P26013 -->
-		<item name="account.{$row.line_number}.featureCodes.callForwardUnconditionallyOn"></item>
+		<item name="account.{$row.line_number}.featureCodes.callForwardUnconditionallyOn">*72</item>
 
 		<!-- #Call Forward Unconditionally (All) - Off -->
 		<!-- # String -->
 		<!-- Pvalue P26014 -->
-		<item name="account.{$row.line_number}.featureCodes.callForwardUnconditionallyOff"></item>
+		<item name="account.{$row.line_number}.featureCodes.callForwardUnconditionallyOff">*73</item>
 
 		<!-- #Call Forward Unconditionally (All) - Target -->
 		<!-- # String -->
@@ -1201,13 +1205,13 @@
 		<!-- # Enable Manual VLAN Configuration. Yes or No. -->
 		<!-- # Mandatory -->
 		<!-- Pvalue P22174 -->
-		<item name="network.port.eth.1.vlan.enable">Yes</item>
+		<item name="network.port.eth.1.vlan.enable">{if isset($grandstream_lan_port_vlan)}Yes{else}No{/if}</item>
 
 		<!-- # Layer 2 QoS. 802.1Q/VLAN Tag (VLAN classification for RTP). Default is 0 -->
 		<!-- Layer 2 QoS 802.1Q/VLAN Tag (Ethernet) -->
 		<!-- Number: 0 - 4095 -->
 		<!-- Pvalue P51 -->
-		<item name="network.port.eth.1.vlan.tag">0</item>
+		<item name="network.port.eth.1.vlan.tag">{$grandstream_lan_port_vlan}</item>
 
 		<!-- 802.1p Priority Value (Ethernet) -->
 		<!-- Number: 0 - 7 -->
@@ -1217,11 +1221,15 @@
 		<!-- PC Port Mode -->
 		<!-- Enabled, Disabled, Mirrored -->
 		<!-- Pvalue P1348 -->
-		<item name="network.port.pc.mode">Enabled</item>
+		{if isset($grandstream_pc_mode)}
+		<item name="network.port.pc.mode">{if isset($grandstream_pc_mode)}{$grandstream_pc_mode}{/if}</item>
+		{else}
+		<item name="network.port.pc.mode">{if isset($grandstream_pc_port_vlan)}Enabled{else}Disabled{/if}</item>
+		{/if}
 
 		<!-- PC Port VLAN Tag  -->
 		<!-- Pvalue P229 -->
-		<item name="network.port.pc.vlan.tag">0</item>
+		<item name="network.port.pc.vlan.tag">{$grandstream_pc_port_vlan}</item>
 
 		<!-- PC Port Priority Value -->
 		<!-- Pvalue P230 -->
@@ -2500,7 +2508,11 @@
 
 		<!-- STUN Server -->
 		<!-- Pvalue P76 -->
+		{if isset($grandstream_stun_server) }
+		<item name="network.stunServer">{$grandstream_stun_server}</item>
+		{else}
 		<item name="network.stunServer"></item>
+		{/if}
 
 		<!-- # Delay Registration. Default is 0. -->
 		<!-- # Number: 0 - 90 -->
@@ -3676,15 +3688,27 @@
 
 		<!-- # HEADSET Key Mode. DefaultMode, ToggleHeadsetOrSpeaker. -->
 		<!-- Pvalue P1312 -->
+		{if isset($grandstream_headset_key_mode)}
+		<item name="audio.headset.keyMode">{$grandstream_headset_key_mode}</item>
+		{else}
 		<item name="audio.headset.keyMode">DefaultMode</item>
+		{/if}
 
 		<!-- # Headset Type. Normal, PlantronicsEHS. -->
 		<!-- Pvalue P1487 -->
+		{if isset($grandstream_headset_ringtone)}
+		<item name="audio.headset.ehs.ringtone">{$grandstream_headset_ringtone}</item>
+		{else}
 		<item name="audio.headset.ehs.ringtone">Normal</item>
+		{/if}
 
 		<!-- # EHS Headset Ringtone. Normal, PlantronicsEHS. -->
 		<!-- Pvalue P6779 -->
+		{if isset($grandstream_headset_type)}
+		<item name="audio.headset.type">{$grandstream_headset_type}</item>
+		{else}
 		<item name="audio.headset.type">Normal</item>
+		{/if}
 
 		<!-- # Always Ring Speaker. -->
 		<!-- No - 0, Yes,both - 1, Yes,speaker only - 2 -->
@@ -3703,11 +3727,19 @@
 
 		<!-- # Headset TX gain(dB). 1 - -6, 0 - 0, 2 - +6. Default is 0 -->
 		<!-- Pvalue P1301 -->
-		<item name="audio.headset.txGain">0</item>
+		{if isset($grandstream_headset_tx_gain)}
+		<item name="audio.handset.txGain">{$grandstream_headset_tx_gain}</item>
+		{else}
+		<item name="audio.handset.txGain">0</item>
+		{/if}
 
 		<!-- # Headset RX gain(dB). 1 - -6, 0 - 0, 2 - +6. Default is 0 -->
 		<!-- Pvalue P1302 -->
+		{if isset($grandstream_headset_rx_gain)}
+		<item name="audio.headset.rxGain">{$grandstream_headset_rx_gain}</item>
+		{else}
 		<item name="audio.headset.rxGain">0</item>
+		{/if}
 
 		<!-- # Handset Noise Shield 2.0. -->
 		<!-- No - Disable, HighShielding - 1, SoftShielding - 2 -->
@@ -3724,19 +3756,12 @@
 		<!-- # System Settings -->
 		<!-- # NTP Server -->
 		<!-- Pvalue P30 -->
-		{if isset($ntp_server_primary)}
-		<item name="dateTime.ntp.server.1">{$ntp_server_primary}</item>
-		{else}
 		<item name="dateTime.ntp.server.1">pool.ntp.org</item>
-		{/if}
 
 		<!-- # Secondary NTP Server -->
 		<!-- # String -->
-		{if isset($ntp_server_secondary)}
-		<item name="dateTime.ntp.server.2">{$ntp_server_secondary}</item>
-		{else}
-		<item name="dateTime.ntp.server.2">2.us.pool.ntp.org</item>
-		{/if}
+		<!-- Pvalue P8333 -->
+		<item name="dateTime.ntp.server.2"></item>
 
 		<!-- # NTP Update Interval -->
 		<!-- # String -->
@@ -4002,7 +4027,11 @@
 		<!-- # Screensaver Settings -->
 		<!-- # Screensaver. No, Yes,  OnIfNoVPKIsActive. -->
 		<!-- Pvalue P2918 -->
+		{if isset($grandstream_screensaver_enable)}
+		<item name="lcd.screensaver.enable">{$grandstream_screensaver_enable}</item>
+		{else}
 		<item name="lcd.screensaver.enable">OnIfNoVPKIsActive</item>
+		{/if}
 
 		<!-- # Use Programmable Keys in Screensaver. 0 - No, 1 - Yes, 2 - LED only -->
 		<!-- Pvalue P22363 -->
@@ -4010,7 +4039,7 @@
 
 		<!-- # Screensaver Source.  Default, USB, Download.  -->
 		<!-- Pvalue P6759 -->
-		<item name="lcd.screensaver.source"></item>
+		<item name="lcd.screensaver.source">{$grandstream_screensaver_source}</item>
 
 		<!-- # Show Date and Time. Yes or No -->
 		<!-- Pvalue P8441 -->
diff --git a/resources/templates/provision/grandstream/grp2613/{$mac}.xml b/resources/templates/provision/grandstream/grp2613/{$mac}.xml
index d6d6634ac2..8fe7f212a0 100644
--- a/resources/templates/provision/grandstream/grp2613/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2613/{$mac}.xml
@@ -37,9 +37,9 @@
 		<!-- SIP Server -->
 		<!-- Pvalue P47 -->
 		{if isset($row.server_address_primary)}
-		<item name="account.{$row.line_number}.sip.server.1.address">{$row.server_address_primary}</item>
+		<item name="account.{$row.line_number}.sip.server.1.address">{$row.server_address_primary}:{$row.sip_port}</item>
 		{else}
-		<item name="account.{$row.line_number}.sip.server.1.address">{$row.server_address}</item>
+		<item name="account.{$row.line_number}.sip.server.1.address">{$row.server_address}:{$row.sip_port}</item>
 		{/if}
 
 		<!-- Secondary SIP Server -->
@@ -65,9 +65,9 @@
 		<!-- BLF Server -->
 		<!-- Pvalue P2375 -->
 		{if isset($row.server_address_primary)}
-		<item name="account.{$row.line_number}.sip.blf.server">{$row.server_address_primary}</item>
+		<item name="account.{$row.line_number}.sip.blf.server">{$row.server_address_primary}:{$row.sip_port}</item>
 		{else}
-		<item name="account.{$row.line_number}.sip.blf.server">{$row.server_address}</item>
+		<item name="account.{$row.line_number}.sip.blf.server">{$row.server_address}:{$row.sip_port}</item>
 		{/if}
 
 		<!-- SIP User ID -->
@@ -142,7 +142,7 @@
 		<item name="account.{$row.line_number}.network.natTraversal">{$grandstream_nat_traversal}</item>
 		{else}
 		<item name="account.{$row.line_number}.network.natTraversal">Auto</item>
-		{/if}		
+		{/if}
 
 		<!-- Support Rport (RFC 3581) -->
 		<!-- Yes, No -->
@@ -3762,6 +3762,7 @@
 
 		<!-- # Secondary NTP Server -->
 		<!-- # String -->
+		<!-- Pvalue P8333 -->
 		{if isset($ntp_server_secondary)}
 		<item name="dateTime.ntp.server.2">{$ntp_server_secondary}</item>
 		{else}
@@ -4470,14 +4471,14 @@
 		<!-- # Virtual Multi-Purpose Keys (VPKs) -->
 		<!-- # Note: 1. Fixed VPKs can only be edited. Adding or deleting Fixed VPK is not allowed. -->
 		<!-- #       2. Even if a Dynamic VPK has mode set to None, it should be added in sequence. Skipping one will remove everything after that VPK.  -->
-		<!-- #       3. For GRP2650 --> 
-		<!-- #       4. For GRP2670/GRP2636 --> 
-		<!-- #       5. For GRP2624/34 --> 
-		<!-- #       6. For GRP2616  --> 
-		<!-- #       7. For GRP2615 --> 
-		<!-- #       8. For GRP2614 --> 
-		<!-- #       9. For GRP2613 --> 
-		<!-- #       10. For GRP2612 --> 
+		<!-- #       3. For GRP2650 -->
+		<!-- #       4. For GRP2670/GRP2636 -->
+		<!-- #       5. For GRP2624/34 -->
+		<!-- #       6. For GRP2616  -->
+		<!-- #       7. For GRP2615 -->
+		<!-- #       8. For GRP2614 -->
+		<!-- #       9. For GRP2613 -->
+		<!-- #       10. For GRP2612 -->
 		<!-- ###################################################################################### -->
 
 		<!-- # Key Mode for line VPK. -->
@@ -4535,8 +4536,8 @@
 
 		<!-- ###################################################################################### -->
 		<!-- ## Programmable Keys/Physical Multi-Purpose Keys
-		<!-- # Note: 1. For GRP2634 --> 
-		<!-- #       2. For GRP2614/GRP2616/GRP2636 --> 
+		<!-- # Note: 1. For GRP2634 -->
+		<!-- #       2. For GRP2614/GRP2616/GRP2636 -->
 		<!-- ###################################################################################### -->
 
 {foreach $keys['memory'] as $row}
@@ -4760,4 +4761,4 @@
 
 
 	</config>
-</gs_provision>
\ No newline at end of file
+</gs_provision>
diff --git a/resources/templates/provision/grandstream/grp2615/{$mac}.xml b/resources/templates/provision/grandstream/grp2615/{$mac}.xml
index d6d6634ac2..01b07777d0 100644
--- a/resources/templates/provision/grandstream/grp2615/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2615/{$mac}.xml
@@ -142,7 +142,7 @@
 		<item name="account.{$row.line_number}.network.natTraversal">{$grandstream_nat_traversal}</item>
 		{else}
 		<item name="account.{$row.line_number}.network.natTraversal">Auto</item>
-		{/if}		
+		{/if}
 
 		<!-- Support Rport (RFC 3581) -->
 		<!-- Yes, No -->
@@ -1480,7 +1480,7 @@
 		<!-- ########################################################################################## -->
 		<!-- # Enable/Disable WiFi -->
 		<!-- # No - Off, OffAndHideMenuFromLCD, Yes - On. -->
-		<!-- Pvalue P7800 -->
+<?comment		<!-- Pvalue P7800 -->
 		<item name="network.wifi.enable">Off</item>
 
 		<!-- # Access Point 1 -->
@@ -3754,19 +3754,12 @@
 		<!-- # System Settings -->
 		<!-- # NTP Server -->
 		<!-- Pvalue P30 -->
-		{if isset($ntp_server_primary)}
-		<item name="dateTime.ntp.server.1">{$ntp_server_primary}</item>
-		{else}
 		<item name="dateTime.ntp.server.1">pool.ntp.org</item>
-		{/if}
 
 		<!-- # Secondary NTP Server -->
 		<!-- # String -->
-		{if isset($ntp_server_secondary)}
-		<item name="dateTime.ntp.server.2">{$ntp_server_secondary}</item>
-		{else}
-		<item name="dateTime.ntp.server.2">2.us.pool.ntp.org</item>
-		{/if}
+		<!-- Pvalue P8333 -->
+		<item name="dateTime.ntp.server.2"></item>
 
 		<!-- # NTP Update Interval -->
 		<!-- # String -->
@@ -4470,14 +4463,14 @@
 		<!-- # Virtual Multi-Purpose Keys (VPKs) -->
 		<!-- # Note: 1. Fixed VPKs can only be edited. Adding or deleting Fixed VPK is not allowed. -->
 		<!-- #       2. Even if a Dynamic VPK has mode set to None, it should be added in sequence. Skipping one will remove everything after that VPK.  -->
-		<!-- #       3. For GRP2650 --> 
-		<!-- #       4. For GRP2670/GRP2636 --> 
-		<!-- #       5. For GRP2624/34 --> 
-		<!-- #       6. For GRP2616  --> 
-		<!-- #       7. For GRP2615 --> 
-		<!-- #       8. For GRP2614 --> 
-		<!-- #       9. For GRP2613 --> 
-		<!-- #       10. For GRP2612 --> 
+		<!-- #       3. For GRP2650 -->
+		<!-- #       4. For GRP2670/GRP2636 -->
+		<!-- #       5. For GRP2624/34 -->
+		<!-- #       6. For GRP2616  -->
+		<!-- #       7. For GRP2615 -->
+		<!-- #       8. For GRP2614 -->
+		<!-- #       9. For GRP2613 -->
+		<!-- #       10. For GRP2612 -->
 		<!-- ###################################################################################### -->
 
 		<!-- # Key Mode for line VPK. -->
@@ -4535,8 +4528,8 @@
 
 		<!-- ###################################################################################### -->
 		<!-- ## Programmable Keys/Physical Multi-Purpose Keys
-		<!-- # Note: 1. For GRP2634 --> 
-		<!-- #       2. For GRP2614/GRP2616/GRP2636 --> 
+		<!-- # Note: 1. For GRP2634 -->
+		<!-- #       2. For GRP2614/GRP2616/GRP2636 -->
 		<!-- ###################################################################################### -->
 
 {foreach $keys['memory'] as $row}
@@ -4760,4 +4753,4 @@
 
 
 	</config>
-</gs_provision>
\ No newline at end of file
+</gs_provision>
diff --git a/resources/templates/provision/grandstream/grp261x/{$mac}.xml b/resources/templates/provision/grandstream/grp261x/{$mac}.xml
index 901218655e..074a634405 100644
--- a/resources/templates/provision/grandstream/grp261x/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp261x/{$mac}.xml
@@ -2514,8 +2514,8 @@
 
 		<!-- # String -->
 		<!-- # Mandatory -->
-		{if isset($grandstream_timezone)}
-		<item name="dateTime.timezone">{$grandstream_timezone}</item>
+		{if isset($grandstream_time_zone)}
+		<item name="dateTime.timezone">{$grandstream_time_zone}</item>
 		{elseif isset($grandstream_gxp_time_zone)}
 		<item name="dateTime.timezone">{$grandstream_gxp_time_zone}</item>
 		{else}
diff --git a/resources/templates/provision/grandstream/grp26xx/{$mac}.xml b/resources/templates/provision/grandstream/grp26xx/{$mac}.xml
index 330a070022..26fd487b20 100644
--- a/resources/templates/provision/grandstream/grp26xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp26xx/{$mac}.xml
@@ -7454,8 +7454,8 @@
 
     <!-- # String -->
     <!-- # Mandatory -->
-{if isset($grandstream_timezone) }
-    <P64>{$grandstream_timezone}</P64>
+{if isset($grandstream_time_zone) }
+    <P64>{$grandstream_time_zone}</P64>
 {elseif isset($grandstream_gxp_time_zone) }
     <P64>{$grandstream_gxp_time_zone}</P64>
 {else}
diff --git a/resources/templates/provision/grandstream/gxp2130/{$mac}.xml b/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
index 2a0228b5d8..9162c1b7e3 100644
--- a/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
@@ -38,7 +38,11 @@
 		<item name="account.{$row.line_number}.sip.server.1.address">{$row.server_address}:{$row.sip_port}</item>
 		{/if}
 		<!-- Secondary SIP Server -->
+		{if isset($row.server_address_secondary)}
 		<item name="account.{$row.line_number}.sip.server.2.address">{$row.server_address_secondary}:{$row.sip_port}</item>
+		{else}
+		<item name="account.{$row.line_number}.sip.server.2.address"/>
+		{/if}
 
 		<!-- Outbound Proxy -->
 		{if $row.sip_transport != 'dns srv' && isset($row.outbound_proxy_primary)}
@@ -176,10 +180,10 @@
 
 		<!-- SIP Transport -->
 		<!-- UDP, TCP, Tls Or Tcp -->
-		{if $row.sip_transport == ''}<item name="account.{$row.line_number}.sip.transport">TCP</item>{/if}
-		{if $row.sip_transport == 'udp'}<item name="account.{$row.line_number}.sip.transport">UDP</item>{/if}
-		{if $row.sip_transport == 'tcp'}<item name="account.{$row.line_number}.sip.transport">TCP</item>{/if}
-		{if $row.sip_transport == 'tls'}<item name="account.{$row.line_number}.sip.transport">Tls</item>{/if}
+		{if $row.sip_transport == ''}<item name="account.{$row.line_number}.sip.transport">1</item>{/if}
+		{if $row.sip_transport == 'udp'}<item name="account.{$row.line_number}.sip.transport">0</item>{/if}
+		{if $row.sip_transport == 'tcp'}<item name="account.{$row.line_number}.sip.transport">1</item>{/if}
+		{if $row.sip_transport == 'tls'}<item name="account.{$row.line_number}.sip.transport">2</item>{/if}
 
 		<!-- SIP Listening Mode -->
 		<!-- Transport_Only, Dual, Dual_BLF_Enforced, Dual_Secured -->
diff --git a/resources/templates/provision/grandstream/gxp2135/{$mac}.xml b/resources/templates/provision/grandstream/gxp2135/{$mac}.xml
index a622cfc585..c17ee0a6e9 100644
--- a/resources/templates/provision/grandstream/gxp2135/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2135/{$mac}.xml
@@ -176,10 +176,10 @@
 
 		<!-- SIP Transport -->
 		<!-- UDP, TCP, Tls Or Tcp -->
-		{if $row.sip_transport == ''}<item name="account.{$row.line_number}.sip.transport">TCP</item>{/if}
-		{if $row.sip_transport == 'udp'}<item name="account.{$row.line_number}.sip.transport">UDP</item>{/if}
-		{if $row.sip_transport == 'tcp'}<item name="account.{$row.line_number}.sip.transport">TCP</item>{/if}
-		{if $row.sip_transport == 'tls'}<item name="account.{$row.line_number}.sip.transport">Tls</item>{/if}
+		{if $row.sip_transport == ''}<item name="account.{$row.line_number}.sip.transport">1</item>{/if}
+		{if $row.sip_transport == 'udp'}<item name="account.{$row.line_number}.sip.transport">0</item>{/if}
+		{if $row.sip_transport == 'tcp'}<item name="account.{$row.line_number}.sip.transport">1</item>{/if}
+		{if $row.sip_transport == 'tls'}<item name="account.{$row.line_number}.sip.transport">2</item>{/if}
 
 		<!-- SIP Listening Mode -->
 		<!-- Transport_Only, Dual, Dual_BLF_Enforced, Dual_Secured -->
diff --git a/resources/templates/provision/grandstream/gxp2170/{$mac}.xml b/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
index 37c88af6e1..282c33c4d4 100644
--- a/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
@@ -38,7 +38,11 @@
 		<item name="account.{$row.line_number}.sip.server.1.address">{$row.server_address}:{$row.sip_port}</item>
 		{/if}
 		<!-- Secondary SIP Server -->
+		{if isset($row.server_address_secondary)}
 		<item name="account.{$row.line_number}.sip.server.2.address">{$row.server_address_secondary}:{$row.sip_port}</item>
+		{else}
+		<item name="account.{$row.line_number}.sip.server.2.address"/>
+		{/if}
 
 		<!-- Outbound Proxy -->
 		{if $row.sip_transport != 'dns srv' && isset($row.outbound_proxy_primary)}
@@ -176,10 +180,11 @@
 
 		<!-- SIP Transport -->
 		<!-- UDP, TCP, Tls Or Tcp -->
-		{if $row.sip_transport == ''}<item name="account.{$row.line_number}.sip.transport">TCP</item>{/if}
-		{if $row.sip_transport == 'udp'}<item name="account.{$row.line_number}.sip.transport">UDP</item>{/if}
-		{if $row.sip_transport == 'tcp'}<item name="account.{$row.line_number}.sip.transport">TCP</item>{/if}
-		{if $row.sip_transport == 'tls'}<item name="account.{$row.line_number}.sip.transport">Tls</item>{/if}
+		<!-- Variable Value: {$row.sip_transport} -->
+		{if $row.sip_transport == ''}<item name="account.{$row.line_number}.sip.transport">1</item>{/if}
+		{if $row.sip_transport == 'udp'}<item name="account.{$row.line_number}.sip.transport">0</item>{/if}
+		{if $row.sip_transport == 'tcp'}<item name="account.{$row.line_number}.sip.transport">1</item>{/if}
+		{if $row.sip_transport == 'tls'}<item name="account.{$row.line_number}.sip.transport">2</item>{/if}
 
 		<!-- SIP Listening Mode -->
 		<!-- Transport_Only, Dual, Dual_BLF_Enforced, Dual_Secured -->
diff --git a/resources/templates/provision/grandstream/gxv3480/{$mac}.xml b/resources/templates/provision/grandstream/gxv3480/{$mac}.xml
index c78194a4ae..ee779f3e98 100644
--- a/resources/templates/provision/grandstream/gxv3480/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxv3480/{$mac}.xml
@@ -958,8 +958,8 @@
 		Wellington, New Zealand - NZST-12NZDT-13,M9.5.0/02:00:00,M3.5.0/03:00:00
 		Fiji - TZd-12
 		Nukualofa, Tonga - TZe-13 -->
-{if isset($grandstream_timezone) }
-		<item name="dateTime.timezone">{$grandstream_timezone}</item>
+{if isset($grandstream_time_zone) }
+		<item name="dateTime.timezone">{$grandstream_time_zone}</item>
 {elseif isset($grandstream_gxp_time_zone) }
 		<item name="dateTime.timezone">{$grandstream_gxp_time_zone}</item>
 {/if}
diff --git a/resources/templates/provision/grandstream/ht814/{$mac}.xml b/resources/templates/provision/grandstream/ht814/{$mac}.xml
index e6f1ba25d0..de65a5a40d 100644
--- a/resources/templates/provision/grandstream/ht814/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht814/{$mac}.xml
@@ -1875,8 +1875,8 @@
     <!-- # <value=TZe-13> GMT+13:00 (Nuku'alofa) -->
     <!-- # <value=customize> Using self-defined Time Zone -->
     <!-- # Mandatory -->
-    {if isset($grandstream_timezone) }
-    <P64>{$grandstream_timezone}</P64>
+    {if isset($grandstream_time_zone) }
+    <P64>{$grandstream_time_zone}</P64>
     {elseif isset($grandstream_gxp_time_zone) }
     <P64>{$grandstream_gxp_time_zone}</P64>
     {else}
diff --git a/resources/templates/provision/grandstream/ht818/{$mac}.xml b/resources/templates/provision/grandstream/ht818/{$mac}.xml
index e7d20162d3..f570a8ed97 100644
--- a/resources/templates/provision/grandstream/ht818/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht818/{$mac}.xml
@@ -2031,8 +2031,8 @@
     <!-- # <value=TZe-13> GMT+13:00 (Nuku'alofa) -->
     <!-- # <value=customize> Using self-defined Time Zone -->
     <!-- # Mandatory -->
-    {if isset($grandstream_timezone) }
-    <P64>{$grandstream_timezone}</P64>
+    {if isset($grandstream_time_zone) }
+    <P64>{$grandstream_time_zone}</P64>
     {elseif isset($grandstream_gxp_time_zone) }
     <P64>{$grandstream_gxp_time_zone}</P64>
     {else}
diff --git a/resources/templates/provision/grandstream/wp810/{$mac}.xml b/resources/templates/provision/grandstream/wp810/{$mac}.xml
index dbbfce801d..ac4c683ad1 100644
--- a/resources/templates/provision/grandstream/wp810/{$mac}.xml
+++ b/resources/templates/provision/grandstream/wp810/{$mac}.xml
@@ -1748,8 +1748,8 @@
 
     <!-- String -->
     <!-- Mandatory -->
-{if isset($grandstream_timezone) }
-    <P64>{$grandstream_timezone}</P64>
+{if isset($grandstream_time_zone) }
+    <P64>{$grandstream_time_zone}</P64>
 {elseif isset($grandstream_gxp_time_zone) }
     <P64>{$grandstream_gxp_time_zone}</P64>
 {else}
diff --git a/resources/templates/provision/grandstream/wp820/{$mac}.xml b/resources/templates/provision/grandstream/wp820/{$mac}.xml
index 19b1791553..9851aee1a7 100644
--- a/resources/templates/provision/grandstream/wp820/{$mac}.xml
+++ b/resources/templates/provision/grandstream/wp820/{$mac}.xml
@@ -2078,8 +2078,8 @@
 <!-- # GMT+13:00(Tonga)                                              TZe-13 -->
 
 <!-- # Time Zone -->
-{if isset($grandstream_timezone) }
-    <P64>{$grandstream_timezone}</P64>
+{if isset($grandstream_time_zone) }
+    <P64>{$grandstream_time_zone}</P64>
 {elseif isset($grandstream_gxp_time_zone) }
     <P64>{$grandstream_gxp_time_zone}</P64>
 {else}