diff --git a/resources/templates/provision/grandstream/grp2612w/{$mac}.xml b/resources/templates/provision/grandstream/grp2612w/{$mac}.xml
index a7a50b2d21..294b7e256f 100644
--- a/resources/templates/provision/grandstream/grp2612w/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2612w/{$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 -->
@@ -3760,12 +3760,20 @@
 		<!-- # 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 -->
 		<!-- Pvalue P8333 -->
-		<item name="dateTime.ntp.server.2"></item>
+		{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}
 
 		<!-- # NTP Update Interval -->
 		<!-- # String -->
@@ -4469,14 +4477,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. -->
@@ -4534,8 +4542,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}
diff --git a/resources/templates/provision/grandstream/grp2613/{$mac}.xml b/resources/templates/provision/grandstream/grp2613/{$mac}.xml
index 498035f90d..294b7e256f 100644
--- a/resources/templates/provision/grandstream/grp2613/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2613/{$mac}.xml
@@ -907,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 -->
@@ -1482,7 +1482,7 @@
 		<!-- # Enable/Disable WiFi -->
 		<!-- # No - Off, OffAndHideMenuFromLCD, Yes - On. -->
 		<!-- Pvalue P7800 -->
-		<item name="network.wifi.enable">Off</item>
+		<item name="network.wifi.enable">Yes</item>
 
 		<!-- # Access Point 1 -->
 		<!-- # SSID -->
diff --git a/resources/templates/provision/grandstream/grp2614/{$mac}.xml b/resources/templates/provision/grandstream/grp2614/{$mac}.xml
index 9126e7f867..294b7e256f 100644
--- a/resources/templates/provision/grandstream/grp2614/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2614/{$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 -->
@@ -907,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 -->
@@ -1482,7 +1482,7 @@
 		<!-- # Enable/Disable WiFi -->
 		<!-- # No - Off, OffAndHideMenuFromLCD, Yes - On. -->
 		<!-- Pvalue P7800 -->
-		<item name="network.wifi.enable">Off</item>
+		<item name="network.wifi.enable">Yes</item>
 
 		<!-- # Access Point 1 -->
 		<!-- # SSID -->
@@ -3768,6 +3768,7 @@
 
 		<!-- # Secondary NTP Server -->
 		<!-- # String -->
+		<!-- Pvalue P8333 -->
 		{if isset($ntp_server_secondary)}
 		<item name="dateTime.ntp.server.2">{$ntp_server_secondary}</item>
 		{else}
@@ -4476,14 +4477,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. -->
@@ -4541,8 +4542,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}
diff --git a/resources/templates/provision/grandstream/grp2615/{$mac}.xml b/resources/templates/provision/grandstream/grp2615/{$mac}.xml
index 9126e7f867..294b7e256f 100644
--- a/resources/templates/provision/grandstream/grp2615/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2615/{$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 -->
@@ -907,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 -->
@@ -1482,7 +1482,7 @@
 		<!-- # Enable/Disable WiFi -->
 		<!-- # No - Off, OffAndHideMenuFromLCD, Yes - On. -->
 		<!-- Pvalue P7800 -->
-		<item name="network.wifi.enable">Off</item>
+		<item name="network.wifi.enable">Yes</item>
 
 		<!-- # Access Point 1 -->
 		<!-- # SSID -->
@@ -3768,6 +3768,7 @@
 
 		<!-- # Secondary NTP Server -->
 		<!-- # String -->
+		<!-- Pvalue P8333 -->
 		{if isset($ntp_server_secondary)}
 		<item name="dateTime.ntp.server.2">{$ntp_server_secondary}</item>
 		{else}
@@ -4476,14 +4477,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. -->
@@ -4541,8 +4542,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}
diff --git a/resources/templates/provision/grandstream/grp2616/{$mac}.xml b/resources/templates/provision/grandstream/grp2616/{$mac}.xml
index 9126e7f867..294b7e256f 100644
--- a/resources/templates/provision/grandstream/grp2616/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2616/{$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 -->
@@ -907,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 -->
@@ -1482,7 +1482,7 @@
 		<!-- # Enable/Disable WiFi -->
 		<!-- # No - Off, OffAndHideMenuFromLCD, Yes - On. -->
 		<!-- Pvalue P7800 -->
-		<item name="network.wifi.enable">Off</item>
+		<item name="network.wifi.enable">Yes</item>
 
 		<!-- # Access Point 1 -->
 		<!-- # SSID -->
@@ -3768,6 +3768,7 @@
 
 		<!-- # Secondary NTP Server -->
 		<!-- # String -->
+		<!-- Pvalue P8333 -->
 		{if isset($ntp_server_secondary)}
 		<item name="dateTime.ntp.server.2">{$ntp_server_secondary}</item>
 		{else}
@@ -4476,14 +4477,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. -->
@@ -4541,8 +4542,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}