diff --git a/resources/templates/provision/grandstream/dp715.sm/{$mac}.xml b/resources/templates/provision/grandstream/dp715.sm/{$mac}.xml
index 4fd8b5ca92..dc92b9c8ec 100644
--- a/resources/templates/provision/grandstream/dp715.sm/{$mac}.xml
+++ b/resources/templates/provision/grandstream/dp715.sm/{$mac}.xml
@@ -207,7 +207,11 @@
 <P277>0</P277>
 
 <!-- NTP Server -->
-<P30>us.pool.ntp.org</P30>
+{if isset($ntp_server_primary)}
+<P30>{$ntp_server_primary}</P30>
+{else}
+<P30>pool.ntp.org</P30>
+{/if}
 
 <!-- Allow DHCP Option 42 to override NTP server. 0 - No, 1 - Yes. Default is No. -->
 <!-- When set to Yes(1), it will override the configured NTP server. -->
diff --git a/resources/templates/provision/grandstream/dp715/{$mac}.xml b/resources/templates/provision/grandstream/dp715/{$mac}.xml
index e1a4c36f52..0895567e26 100644
--- a/resources/templates/provision/grandstream/dp715/{$mac}.xml
+++ b/resources/templates/provision/grandstream/dp715/{$mac}.xml
@@ -128,7 +128,11 @@
 		<!-- Disable Direct IP Call. 0 - No, 1 - Yes. -->
 		<P277>0</P277>
 		<!-- NTP Server -->
-		<P30>us.pool.ntp.org</P30>
+		{if isset($ntp_server_primary)}
+		<P30>{$ntp_server_primary}</P30>
+		{else}
+		<P30>pool.ntp.org</P30>
+		{/if}
 		<!-- Allow DHCP Option 42 to override NTP server. 0 - No, 1 - Yes. Default is No. -->
 		<!-- When set to Yes(1), it will override the configured NTP server. -->
 		<P144>0</P144>
diff --git a/resources/templates/provision/grandstream/grp2612/{$mac}.xml b/resources/templates/provision/grandstream/grp2612/{$mac}.xml
index 0e805e9f8c..d6d6634ac2 100644
--- a/resources/templates/provision/grandstream/grp2612/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2612/{$mac}.xml
@@ -3754,12 +3754,19 @@
 		<!-- # 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 -->
diff --git a/resources/templates/provision/grandstream/grp2612w/{$mac}.xml b/resources/templates/provision/grandstream/grp2612w/{$mac}.xml
index 9303651fd5..4dd7bdce42 100644
--- a/resources/templates/provision/grandstream/grp2612w/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2612w/{$mac}.xml
@@ -3722,12 +3722,19 @@
 		<!-- # 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 -->
diff --git a/resources/templates/provision/grandstream/grp2613/{$mac}.xml b/resources/templates/provision/grandstream/grp2613/{$mac}.xml
index 0e805e9f8c..d6d6634ac2 100644
--- a/resources/templates/provision/grandstream/grp2613/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2613/{$mac}.xml
@@ -3754,12 +3754,19 @@
 		<!-- # 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 -->
diff --git a/resources/templates/provision/grandstream/grp2614/{$mac}.xml b/resources/templates/provision/grandstream/grp2614/{$mac}.xml
index 0e805e9f8c..d6d6634ac2 100644
--- a/resources/templates/provision/grandstream/grp2614/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2614/{$mac}.xml
@@ -3754,12 +3754,19 @@
 		<!-- # 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 -->
diff --git a/resources/templates/provision/grandstream/grp2615/{$mac}.xml b/resources/templates/provision/grandstream/grp2615/{$mac}.xml
index 0e805e9f8c..d6d6634ac2 100644
--- a/resources/templates/provision/grandstream/grp2615/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2615/{$mac}.xml
@@ -3754,12 +3754,19 @@
 		<!-- # 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 -->
diff --git a/resources/templates/provision/grandstream/grp2616/{$mac}.xml b/resources/templates/provision/grandstream/grp2616/{$mac}.xml
index 0e805e9f8c..d6d6634ac2 100644
--- a/resources/templates/provision/grandstream/grp2616/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2616/{$mac}.xml
@@ -3754,12 +3754,19 @@
 		<!-- # 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 -->
diff --git a/resources/templates/provision/grandstream/gxp116x/{$mac}.xml b/resources/templates/provision/grandstream/gxp116x/{$mac}.xml
index 99f5aa2293..2c910decf4 100644
--- a/resources/templates/provision/grandstream/gxp116x/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp116x/{$mac}.xml
@@ -1347,7 +1347,11 @@
 
 <!--  NTP Server -->
 <!--  String -->
-<P30>us.pool.ntp.org</P30>
+{if isset($ntp_server_primary)}
+<P30>{$ntp_server_primary}</P30>
+{else}
+<P30>pool.ntp.org</P30>
+{/if}
 
 <!--  Allow DHCP Option 42 to override NTP server. 0 - No, 1 - Yes. Default is 1 -->
 <!--  When set to Yes(1), it will override the configured NTP server -->
diff --git a/resources/templates/provision/grandstream/gxp140x/{$mac}.xml b/resources/templates/provision/grandstream/gxp140x/{$mac}.xml
index d571022235..6577cd67ca 100644
--- a/resources/templates/provision/grandstream/gxp140x/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp140x/{$mac}.xml
@@ -1596,7 +1596,11 @@
     <!--   Settings/Date and Time -->
     <!--  NTP Server -->
     <!--  String -->
-    <P30>us.pool.ntp.org</P30>
+    {if isset($ntp_server_primary)}
+	<P30>{$ntp_server_primary}</P30>
+	{else}
+	<P30>pool.ntp.org</P30>
+	{/if}
     <!--  Allow DHCP Option 42 to override NTP server. 0 - No, 1 - Yes. Default is 1 -->
     <!--  When set to Yes(1), it will override the configured NTP server -->
     <!--  Number: 0, 1 -->
diff --git a/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml b/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml
index 132223450a..b2baea0f7d 100644
--- a/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml
@@ -1596,7 +1596,11 @@
     <!--   Settings/Date and Time -->
     <!--  NTP Server -->
     <!--  String -->
-    <P30>us.pool.ntp.org</P30>
+    {if isset($ntp_server_primary)}
+	<P30>{$ntp_server_primary}</P30>
+	{else}
+	<P30>pool.ntp.org</P30>
+	{/if}
     <!--  Allow DHCP Option 42 to override NTP server. 0 - No, 1 - Yes. Default is 1 -->
     <!--  When set to Yes(1), it will override the configured NTP server -->
     <!--  Number: 0, 1 -->
diff --git a/resources/templates/provision/grandstream/gxp1450/{$mac}.xml b/resources/templates/provision/grandstream/gxp1450/{$mac}.xml
index 2330d502a9..fefeb9b6a6 100644
--- a/resources/templates/provision/grandstream/gxp1450/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp1450/{$mac}.xml
@@ -2129,7 +2129,11 @@
 
 <!-- NTP Server -->
 <!-- String -->
-<P30>us.pool.ntp.org</P30>
+{if isset($ntp_server_primary)}
+<P30>{$ntp_server_primary}</P30>
+{else}
+<P30>pool.ntp.org</P30>
+{/if}
 
 <!-- Allow DHCP Option 42 to override NTP server. 0 - No, 1 - Yes. Default is 1 -->
 <!-- When set to Yes(1), it will override the configured NTP server -->
diff --git a/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml b/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml
index c58fa8758e..b79f3e1b97 100644
--- a/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml
@@ -1936,7 +1936,11 @@
 
 <!-- NTP Server -->
 <!-- String -->
-<P30>us.pool.ntp.org</P30>
+{if isset($ntp_server_primary)}
+<P30>{$ntp_server_primary}</P30>
+{else}
+<P30>pool.ntp.org</P30>
+{/if}
 
 <!-- Allow DHCP Option 42 to override NTP server. 0 - No, 1 - Yes. Default is 1 -->
 <!-- When set to Yes(1), it will override the configured NTP server -->
diff --git a/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml
index 51be279db8..29a6811b0c 100644
--- a/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml
@@ -3958,7 +3958,11 @@
 <!-- ############################################################################## -->
 <!-- # NTP Server -->
 <!-- # String -->
-<P30>us.pool.ntp.org</P30>
+{if isset($ntp_server_primary)}
+<P30>{$ntp_server_primary}</P30>
+{else}
+<P30>pool.ntp.org</P30>
+{/if}
 
 <!-- # NTP Update Interval -->
 <!-- # String -->
diff --git a/resources/templates/provision/grandstream/gxp20xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp20xx/{$mac}.xml
index 6263dc7295..92c1c5b385 100644
--- a/resources/templates/provision/grandstream/gxp20xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp20xx/{$mac}.xml
@@ -210,7 +210,11 @@
 <P208>0</P208>
 
 <!--  NTP Server -->
-<P30>us.pool.ntp.org</P30>
+{if isset($ntp_server_primary)}
+<P30>{$ntp_server_primary}</P30>
+{else}
+<P30>pool.ntp.org</P30>
+{/if}
 
 <!--  Allow DHCP Option 42 to override NTP server. 0 - No, 1 - Yes. Default is No. -->
 <!--  When set to Yes(1), it will override the configured NTP server. -->
diff --git a/resources/templates/provision/grandstream/gxp2124/{$mac}.xml b/resources/templates/provision/grandstream/gxp2124/{$mac}.xml
index 5a43867826..b10f51aa15 100644
--- a/resources/templates/provision/grandstream/gxp2124/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2124/{$mac}.xml
@@ -2356,7 +2356,11 @@
     <!--  Settings/Date and Time -->
     <!-- NTP Server -->
     <!-- String -->
-    <P30>us.pool.ntp.org</P30>
+    {if isset($ntp_server_primary)}
+	<P30>{$ntp_server_primary}</P30>
+	{else}
+	<P30>pool.ntp.org</P30>
+	{/if}
     <!-- Allow DHCP Option 42 to override NTP server. 0 - No, 1 - Yes. Default is 1 -->
     <!-- When set to Yes(1), it will override the configured NTP server -->
     <!-- Number: 0, 1 -->
diff --git a/resources/templates/provision/grandstream/gxp2130/{$mac}.xml b/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
index 486c471b1d..49aaebb15b 100644
--- a/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
@@ -2485,11 +2485,19 @@
 		<!-- ##  Settings/Preferences / Date and Time -->
 		<!-- ############################################################################## -->
 		<!-- # NTP Server -->
+		{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 -->
-		<item name="dateTime.ntp.server.2"/>
+		{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 -->
diff --git a/resources/templates/provision/grandstream/gxp2135/{$mac}.xml b/resources/templates/provision/grandstream/gxp2135/{$mac}.xml
index 4646e7d919..974d39f47d 100644
--- a/resources/templates/provision/grandstream/gxp2135/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2135/{$mac}.xml
@@ -2485,11 +2485,19 @@
 		<!-- ##  Settings/Preferences / Date and Time -->
 		<!-- ############################################################################## -->
 		<!-- # NTP Server -->
+		{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 -->
-		<item name="dateTime.ntp.server.2"/>
+		{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 -->
diff --git a/resources/templates/provision/grandstream/gxp2140/{$mac}.xml b/resources/templates/provision/grandstream/gxp2140/{$mac}.xml
index b7d587a84e..8d0b1b08b9 100644
--- a/resources/templates/provision/grandstream/gxp2140/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2140/{$mac}.xml
@@ -2486,11 +2486,19 @@
 		<!-- ##  Settings/Preferences / Date and Time -->
 		<!-- ############################################################################## -->
 		<!-- # NTP Server -->
+		{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 -->
-		<item name="dateTime.ntp.server.2"/>
+		{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 -->
diff --git a/resources/templates/provision/grandstream/gxp2160/{$mac}.xml b/resources/templates/provision/grandstream/gxp2160/{$mac}.xml
index 5f2b5d76eb..8a8ca3bef4 100644
--- a/resources/templates/provision/grandstream/gxp2160/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2160/{$mac}.xml
@@ -2486,11 +2486,19 @@
 		<!-- ##  Settings/Preferences / Date and Time -->
 		<!-- ############################################################################## -->
 		<!-- # NTP Server -->
+		{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 -->
-		<item name="dateTime.ntp.server.2"/>
+		{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 -->
diff --git a/resources/templates/provision/grandstream/gxp2170/{$mac}.xml b/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
index b0ae9fc40b..83c240c729 100644
--- a/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
@@ -2486,11 +2486,19 @@
 		<!-- ##  Settings/Preferences / Date and Time -->
 		<!-- ############################################################################## -->
 		<!-- # NTP Server -->
+		{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 -->
-		<item name="dateTime.ntp.server.2"/>
+		{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 -->
diff --git a/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml
index 3f1d7c357c..7e8395971f 100644
--- a/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml
@@ -3135,7 +3135,11 @@ Outgoing calls. 0 - No, 1 - Yes. Default is 0 -->
     <!-- Settings/Date and Time -->
     <!-- NTP Server -->
     <!-- String -->
-    <P30>us.pool.ntp.org</P30>
+    {if isset($ntp_server_primary)}
+	<P30>{$ntp_server_primary}</P30>
+	{else}
+	<P30>pool.ntp.org</P30>
+	{/if}
     <!-- Allow DHCP Option 42 to override NTP server. 0 - No, 1 - Yes. Default is 1 -->
     <!-- When set to Yes(1), it will override the configured NTP server -->
     <!-- Number: 0, 1 -->
diff --git a/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml b/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml
index 82b7ba6212..b3d783b538 100644
--- a/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml
@@ -3863,7 +3863,11 @@ Outgoing calls. 0 - No, 1 - Yes. Default is 0 -->
 
 <!-- NTP Server -->
 <!-- String -->
-<P30>us.pool.ntp.org</P30>
+{if isset($ntp_server_primary)}
+<P30>{$ntp_server_primary}</P30>
+{else}
+<P30>pool.ntp.org</P30>
+{/if}
 
 <!-- Allow DHCP Option 42 to override NTP server. 0 - No, 1 - Yes. Default is 1 -->
 <!-- When set to Yes(1), it will override the configured NTP server -->
diff --git a/resources/templates/provision/grandstream/gxp2200/{$mac}.xml b/resources/templates/provision/grandstream/gxp2200/{$mac}.xml
index 39c32d3ee0..0c8b23a85e 100644
--- a/resources/templates/provision/grandstream/gxp2200/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2200/{$mac}.xml
@@ -2836,7 +2836,11 @@ Account 5 Codec Settings
 
 
 <!-- Assign NTP Server Address -->
-<P30>us.pool.ntp.org</P30>
+{if isset($ntp_server_primary)}
+<P30>{$ntp_server_primary}</P30>
+{else}
+<P30>pool.ntp.org</P30>
+{/if}
 
 <!-- DHCP Option 42 override NTP server. 0 - No, 1 - Yes. Default value is 1 -->
 <!-- When set to Yes (1), it will override the configured NTP server -->
diff --git a/resources/templates/provision/grandstream/gxp3240/{$mac}.xml b/resources/templates/provision/grandstream/gxp3240/{$mac}.xml
index 163a7f2ee3..1d9cfa7da0 100644
--- a/resources/templates/provision/grandstream/gxp3240/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp3240/{$mac}.xml
@@ -3047,7 +3047,11 @@ Account 5 Codec Settings
 
 
 <!-- Assign NTP Server Address -->
-<P30>us.pool.ntp.org</P30>
+{if isset($ntp_server_primary)}
+<P30>{$ntp_server_primary}</P30>
+{else}
+<P30>pool.ntp.org</P30>
+{/if}
 
 <!-- DHCP Option 42 override NTP server. 0 - No, 1 - Yes. Default value is 1 -->
 <!-- When set to Yes (1), it will override the configured NTP server -->
diff --git a/resources/templates/provision/grandstream/gxv300x/{$mac}.xml b/resources/templates/provision/grandstream/gxv300x/{$mac}.xml
index 49d7a73c9f..e032e9356c 100644
--- a/resources/templates/provision/grandstream/gxv300x/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxv300x/{$mac}.xml
@@ -149,7 +149,11 @@
     <!-- 0 - NONE, 1 - DEBUG, 2 - INFO, 3 - WARNING, 4 - ERROR -->
     <P208>0</P208>
     <!-- NTP Server -->
-    <P30>us.pool.ntp.org</P30>
+    {if isset($ntp_server_primary)}
+	<P30>{$ntp_server_primary}</P30>
+	{else}
+	<P30>pool.ntp.org</P30>
+	{/if}
     <!-- Allow DHCP Option 42 to override NTP server. 0 - No, 1 - Yes. Default is No. -->
     <!-- When set to Yes(1), it will override the configured NTP server. -->
     <P144>0</P144>
diff --git a/resources/templates/provision/grandstream/gxv3370/{$mac}.xml b/resources/templates/provision/grandstream/gxv3370/{$mac}.xml
index d5b262f843..389422e273 100644
--- a/resources/templates/provision/grandstream/gxv3370/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxv3370/{$mac}.xml
@@ -822,7 +822,18 @@
 		<item name="network.proxy.http"></item>
 		<!-- System Settings -->
 		<!-- Assign NTP Server Address -->
+		{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}
 		<!-- DHCP Option 42 Override NTP Server -->
 		<!-- Yes, No -->
 		<item name="dateTime.override.dhcp.allowOption42">Yes</item>
diff --git a/resources/templates/provision/grandstream/gxv3480/{$mac}.xml b/resources/templates/provision/grandstream/gxv3480/{$mac}.xml
index 623c4f7dc3..c78194a4ae 100644
--- a/resources/templates/provision/grandstream/gxv3480/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxv3480/{$mac}.xml
@@ -836,7 +836,19 @@
 		<item name="network.proxy.http"></item>
 		<!-- System Settings -->
 		<!-- Assign NTP Server Address -->
+		{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}
 		<!-- DHCP Option 42 Override NTP Server -->
 		<!-- Yes, No -->
 		<item name="dateTime.override.dhcp.allowOption42">Yes</item>
diff --git a/resources/templates/provision/grandstream/gxw40xx/{$mac}.xml b/resources/templates/provision/grandstream/gxw40xx/{$mac}.xml
index d3d4303416..ef10179595 100644
--- a/resources/templates/provision/grandstream/gxw40xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxw40xx/{$mac}.xml
@@ -235,7 +235,11 @@
     <P4206></P4206>
     <!-- NTP Server -->
     <!-- String: serveraddress -->
-    <P30>us.pool.ntp.org</P30>
+    {if isset($ntp_server_primary)}
+	<P30>{$ntp_server_primary}</P30>
+	{else}
+	<P30>pool.ntp.org</P30>
+	{/if}
     <!-- NTP Update Interval in minutes(5-1440)(Default is set to 60 minutes) -->
     <!-- Number: 5 to 1440 -->
     <!-- Mandatory -->
diff --git a/resources/templates/provision/grandstream/gxw410x/{$mac}.xml b/resources/templates/provision/grandstream/gxw410x/{$mac}.xml
index 48d9baea25..8ba60b6cec 100644
--- a/resources/templates/provision/grandstream/gxw410x/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxw410x/{$mac}.xml
@@ -75,7 +75,11 @@
     <!--  0 - NONE, 1 - DEBUG, 2 - INFO, 3 - WARNING, 4 - ERROR -->
     <P208>0</P208>
     <!--  NTP Server -->
-    <P30>us.pool.ntp.org</P30>
+    {if isset($ntp_server_primary)}
+	<P30>{$ntp_server_primary}</P30>
+	{else}
+	<P30>pool.ntp.org</P30>
+	{/if}
     <!--  Allow DHCP Option 42 to override NTP server. 0 - No, 1 - Yes. Default is No. -->
     <!--  When set to Yes(1), it will override the configured NTP server. -->
     <P144>0</P144>
diff --git a/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml b/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml
index 5c3c199ffb..d4ee4cabe6 100644
--- a/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml
@@ -366,7 +366,11 @@
 
 <!-- NTP Server -->
 <!-- String: serveraddress -->
-<P30>us.pool.ntp.org</P30>
+{if isset($ntp_server_primary)}
+<P30>{$ntp_server_primary}</P30>
+{else}
+<P30>pool.ntp.org</P30>
+{/if}
 
 <!-- NTP Update Interval in minutes(5-1440)(Default is set to 60 minutes) -->
 <!-- Number: 5 to 1440 -->
diff --git a/resources/templates/provision/grandstream/ht502/{$mac}.xml b/resources/templates/provision/grandstream/ht502/{$mac}.xml
index 693f529ef3..2acf95a17e 100644
--- a/resources/templates/provision/grandstream/ht502/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht502/{$mac}.xml
@@ -174,7 +174,11 @@
 		<!-- Disable Direct IP Call. 0 - No, 1 - Yes. -->
 		<P277>0</P277>
 		<!-- NTP Server. Server address -->
-		<P30>us.pool.ntp.org</P30>
+		{if isset($ntp_server_primary)}
+		<P30>{$ntp_server_primary}</P30>
+		{else}
+		<P30>pool.ntp.org</P30>
+		{/if}
 		<!-- NTP Update Interval in minutes(5-1440)(Default is set to 60 minutes) -->
 		<!-- Number: 5 to 1440 -->
 		<P5005>1440</P5005>
diff --git a/resources/templates/provision/grandstream/ht503/{$mac}.xml b/resources/templates/provision/grandstream/ht503/{$mac}.xml
index 548d7ccb17..1b0df6f328 100644
--- a/resources/templates/provision/grandstream/ht503/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht503/{$mac}.xml
@@ -353,7 +353,11 @@
 
 <!--  NTP Server -->
 <!--  Server address -->
-<P30>us.pool.ntp.org</P30>
+{if isset($ntp_server_primary)}
+<P30>{$ntp_server_primary}</P30>
+{else}
+<P30>pool.ntp.org</P30>
+{/if}
 
 <!--  NTP Update Interval in minutes(5-1440)(Default is set to 60 minutes) -->
 <!--  Number: 5 to 1440 -->
diff --git a/resources/templates/provision/grandstream/ht701/{$mac}.xml b/resources/templates/provision/grandstream/ht701/{$mac}.xml
index 25c5dc457a..9256b037fc 100644
--- a/resources/templates/provision/grandstream/ht701/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht701/{$mac}.xml
@@ -247,7 +247,11 @@
 
 <!-- NTP Server -->
 <!-- Server address -->
-<P30>us.pool.ntp.org</P30>
+{if isset($ntp_server_primary)}
+<P30>{$ntp_server_primary}</P30>
+{else}
+<P30>pool.ntp.org</P30>
+{/if}
 
 <!-- Allow DHCP Option 42 to override NTP server. 0 - No, 1 - Yes. Default is No. -->
 <!-- When set to Yes(1), it will override the configured NTP server. -->
diff --git a/resources/templates/provision/grandstream/ht702/{$mac}.xml b/resources/templates/provision/grandstream/ht702/{$mac}.xml
index cfdac39766..eb7bcf52cd 100644
--- a/resources/templates/provision/grandstream/ht702/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht702/{$mac}.xml
@@ -254,7 +254,11 @@
 
 <!-- NTP Server -->
 <!-- Server address -->
-<P30>us.pool.ntp.org</P30>
+{if isset($ntp_server_primary)}
+<P30>{$ntp_server_primary}</P30>
+{else}
+<P30>pool.ntp.org</P30>
+{/if}
 
 <!-- Allow DHCP Option 42 to override NTP server. 0 - No, 1 - Yes. Default is No. -->
 <!-- When set to Yes(1), it will override the configured NTP server. -->
diff --git a/resources/templates/provision/grandstream/ht704/{$mac}.xml b/resources/templates/provision/grandstream/ht704/{$mac}.xml
index e797147350..4dcd51bb8b 100644
--- a/resources/templates/provision/grandstream/ht704/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht704/{$mac}.xml
@@ -262,7 +262,11 @@
 
 <!-- NTP Server-->
 <!-- Server address-->
-<P30>us.pool.ntp.org</P30>
+{if isset($ntp_server_primary)}
+<P30>{$ntp_server_primary}</P30>
+{else}
+<P30>pool.ntp.org</P30>
+{/if}
 
 <!-- Syslog Server (name of the server, max length is 64 characters)-->
 <!-- Server address-->
diff --git a/resources/templates/provision/grandstream/ht801/{$mac}.xml b/resources/templates/provision/grandstream/ht801/{$mac}.xml
index 0df12d7d2f..dd1d825d2e 100644
--- a/resources/templates/provision/grandstream/ht801/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht801/{$mac}.xml
@@ -480,7 +480,11 @@
 
     <!-- # NTP Server -->
     <!-- # Server address -->
-    <P30>us.pool.ntp.org</P30>
+    {if isset($ntp_server_primary)}
+	<P30>{$ntp_server_primary}</P30>
+	{else}
+	<P30>pool.ntp.org</P30>
+	{/if}
 
     <!-- # Allow DHCP Option 42 to override NTP server. 0 - No, 1 - Yes. Default is No. -->
     <!-- # When set to Yes(1), it will override the configured NTP server. -->
diff --git a/resources/templates/provision/grandstream/ht802/{$mac}.xml b/resources/templates/provision/grandstream/ht802/{$mac}.xml
index db96d69261..5c3cb97597 100644
--- a/resources/templates/provision/grandstream/ht802/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ht802/{$mac}.xml
@@ -480,7 +480,11 @@
 
     <!-- # NTP Server -->
     <!-- # Server address -->
-    <P30>us.pool.ntp.org</P30>
+    {if isset($ntp_server_primary)}
+	<P30>{$ntp_server_primary}</P30>
+	{else}
+	<P30>pool.ntp.org</P30>
+	{/if}
 
     <!-- # Allow DHCP Option 42 to override NTP server. 0 - No, 1 - Yes. Default is No. -->
     <!-- # When set to Yes(1), it will override the configured NTP server. -->