diff --git a/resources/templates/provision/grandstream/dp750/{$mac}.xml b/resources/templates/provision/grandstream/dp750/{$mac}.xml
index d606da71dd..3467988d94 100644
--- a/resources/templates/provision/grandstream/dp750/{$mac}.xml
+++ b/resources/templates/provision/grandstream/dp750/{$mac}.xml
@@ -2602,18 +2602,18 @@
 <!-- Number: 0,1,2 -->
 <!-- Mandatory  -->
 <!-- Reboot required  -->
-<P8>0</P8>
+<P8>{$grandstream_ip_address_mode}</P8>
 
 <!-- Preferred DNS server -->
 <!-- Mandatory  -->
-<P92>0</P92>
-<P93>0</P93>
-<P94>0</P94>
-<P95>0</P95>
+{if isset($grandstream_ipv4preferdns_1)}<P92>{$grandstream_ipv4preferdns_1}</P92>{else}<P92>0</P92>{/if}
+{if isset($grandstream_ipv4preferdns_2)}<P93>{$grandstream_ipv4preferdns_2}</P93>{else}<P93>0</P93>{/if}
+{if isset($grandstream_ipv4preferdns_3)}<P94>{$grandstream_ipv4preferdns_3}</P94>{else}<P94>0</P94>{/if}
+{if isset($grandstream_ipv4preferdns_4)}<P95>{$grandstream_ipv4preferdns_4}</P95>{else}<P95>0</P95>{/if}
 
 <!-- Host name (Option 12). Max length allowed is 32 bytes. -->
 <!-- String: address  -->
-<P146></P146>
+<P146>phone-{$mac|replace:'-':''}</P146>
 
 <!-- DHCP Domain -->
 <!-- String: address  -->
@@ -2635,34 +2635,34 @@
 <P269></P269>
 
 <!-- IP Address. Ignore if DHCP or PPPoE is used -->
-<!--  <P9>192</P9> -->
-<!--  <P10>168</P10> -->
-<!--  <P11>0</P11> -->
-<!--  <P12>160</P12> -->
+{if isset($grandstream_ipv4octet_1)}<P9>{$grandstream_ipv4octet_1}</P9>{else}<P9>192</P9>{/if}
+{if isset($grandstream_ipv4octet_2)}<P10>{$grandstream_ipv4octet_2}</P10>{else}<P10>168</P10>{/if}
+{if isset($grandstream_ipv4octet_3)}<P11>{$grandstream_ipv4octet_3}</P11>{else}<P11>1</P11>{/if}
+{if isset($grandstream_ipv4octet_4)}<P12>{$grandstream_ipv4octet_4}</P12>{else}<P12>102</P12>{/if}
 
 <!-- Subnet mask. Ignore if DHCP or PPPoE is used -->
-<!--  <P13>255</P13> -->
-<!--  <P14>255</P14> -->
-<!--  <P15>0</P15> -->
-<!--  <P16>0</P16> -->
+{if isset($grandstream_ipv4mask_1)}<P13>{$grandstream_ipv4mask_1}</P13>{else}<P13>255</P13>{/if}
+{if isset($grandstream_ipv4mask_2)}<P14>{$grandstream_ipv4mask_2}</P14>{else}<P14>255</P14>{/if}
+{if isset($grandstream_ipv4mask_3)}<P15>{$grandstream_ipv4mask_3}</P15>{else}<P15>0</P15>{/if}
+{if isset($grandstream_ipv4mask_4)}<P16>{$grandstream_ipv4mask_4}</P16>{else}<P16>0</P16>{/if}
 
 <!-- Gateway. Ignore if DHCP or PPPoE is used -->
-<!--  <P17>0</P17> -->
-<!--  <P18>0</P18> -->
-<!--  <P19>0</P19> -->
-<!--  <P20>0</P20> -->
+{if isset($grandstream_ipv4gw_1)}<P17>{$grandstream_ipv4gw_1}</P17>{else}<P17>192</P17>{/if}
+{if isset($grandstream_ipv4gw_2)}<P18>{$grandstream_ipv4gw_2}</P18>{else}<P18>168</P18>{/if}
+{if isset($grandstream_ipv4gw_3)}<P19>{$grandstream_ipv4gw_3}</P19>{else}<P19>2</P19>{/if}
+{if isset($grandstream_ipv4gw_4)}<P20>{$grandstream_ipv4gw_4}</P20>{else}<P20>1</P20>{/if}
 
 <!-- DNS server 1. Ignore if DHCP or PPPoE is used -->
-<!--  <P21>0</P21> -->
-<!--  <P22>0</P22> -->
-<!--  <P23>0</P23> -->
-<!--  <P24>0</P24> -->
+{if isset($grandstream_ipv4dns1_1)}<P21>{$grandstream_ipv4dns1_1}</P21>{else}<P21>0</P21>{/if}
+{if isset($grandstream_ipv4dns1_2)}<P22>{$grandstream_ipv4dns1_2}</P22>{else}<P22>0</P22>{/if}
+{if isset($grandstream_ipv4dns1_3)}<P23>{$grandstream_ipv4dns1_3}</P23>{else}<P23>0</P23>{/if}
+{if isset($grandstream_ipv4dns1_4)}<P24>{$grandstream_ipv4dns1_4}</P24>{else}<P24>0</P24>{/if}
 
 <!-- DNS server 2. Ignore if DHCP or PPPoE is used -->
-<!--  <P25>0</P25> -->
-<!--  <P26>0</P26> -->
-<!--  <P27>0</P27> -->
-<!--  <P28>0</P28> -->
+{if isset($grandstream_ipv4dns2_1)}<P25>{$grandstream_ipv4dns2_1}</P25>{else}<P25>0</P25>{/if}
+{if isset($grandstream_ipv4dns2_2)}<P26>{$grandstream_ipv4dns2_2}</P26>{else}<P26>0</P26>{/if}
+{if isset($grandstream_ipv4dns2_3)}<P27>{$grandstream_ipv4dns2_3}</P27>{else}<P27>0</P27>{/if}
+{if isset($grandstream_ipv4dns2_4)}<P28>{$grandstream_ipv4dns2_4}</P28>{else}<P28>0</P28>{/if}
 
 <!-- ################################################## -->
 <!-- #  Settings/Network Settings/Advanced Settings  ## -->
diff --git a/resources/templates/provision/grandstream/gxp2100/{$mac}.xml b/resources/templates/provision/grandstream/gxp2100/{$mac}.xml
index 4e4bf25103..d2792d8a3b 100644
--- a/resources/templates/provision/grandstream/gxp2100/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2100/{$mac}.xml
@@ -38,7 +38,7 @@
 
 <!--# SIP User ID-->
 <!--# String-->
-    <P35>{$account.1.display_name}</P35>
+    <P35>{$account.1.user_id}</P35>
 
 <!--# Authenticate ID-->
 <!--# String-->
diff --git a/resources/templates/provision/grandstream/gxp2130/{$mac}.xml b/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
index 386d0e3533..b50f97d067 100644
--- a/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
@@ -5848,81 +5848,81 @@
     <!-- ########################################## -->
     <!-- # IP Address. Ignore if DHCP or PPPoE is used -->
     <!-- # Number: 0 - 255 -->
-    <P9>192</P9>
+    {if isset($grandstream_ipv4octet_1)}<P9>{$grandstream_ipv4octet_1}</P9>{else}<P9>192</P9>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P10>168</P10>
+    {if isset($grandstream_ipv4octet_2)}<P10>{$grandstream_ipv4octet_2}</P10>{else}<P10>168</P10>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P11>1</P11>
+    {if isset($grandstream_ipv4octet_3)}<P11>{$grandstream_ipv4octet_3}</P11>{else}<P11>1</P11>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P12>102</P12>
+    {if isset($grandstream_ipv4octet_4)}<P12>{$grandstream_ipv4octet_4}</P12>{else}<P12>102</P12>{/if}
 
     <!-- # Subnet mask. Ignore if DHCP or PPPoE is used -->
     <!-- # Number: 0 - 255 -->
-    <P13>255</P13>
+    {if isset($grandstream_ipv4mask_1)}<P13>{$grandstream_ipv4mask_1}</P13>{else}<P13>255</P13>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P14>255</P14>
+    {if isset($grandstream_ipv4mask_2)}<P14>{$grandstream_ipv4mask_2}</P14>{else}<P14>255</P14>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P15>0</P15>
+    {if isset($grandstream_ipv4mask_3)}<P15>{$grandstream_ipv4mask_3}</P15>{else}<P15>0</P15>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P16>0</P16>
+    {if isset($grandstream_ipv4mask_4)}<P16>{$grandstream_ipv4mask_4}</P16>{else}<P16>0</P16>{/if}
 
     <!-- # Gateway. Ignore if DHCP or PPPoE is used -->
     <!-- # Number: 0 - 255 -->
-    <P17>192</P17>
+    {if isset($grandstream_ipv4gw_1)}<P17>{$grandstream_ipv4gw_1}</P17>{else}<P17>192</P17>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P18>168</P18>
+    {if isset($grandstream_ipv4gw_2)}<P18>{$grandstream_ipv4gw_2}</P18>{else}<P18>168</P18>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P19>2</P19>
+    {if isset($grandstream_ipv4gw_3)}<P19>{$grandstream_ipv4gw_3}</P19>{else}<P19>2</P19>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P20>1</P20>
+    {if isset($grandstream_ipv4gw_4)}<P20>{$grandstream_ipv4gw_4}</P20>{else}<P20>1</P20>{/if}
 
     <!-- # DNS 1 Server. Ignore if DHCP or PPPoE is used -->
     <!-- # Number: 0 - 255 -->
-    <P21>0</P21>
+    {if isset($grandstream_ipv4dns1_1)}<P21>{$grandstream_ipv4dns1_1}</P21>{else}<P21>0</P21>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P22>0</P22>
+    {if isset($grandstream_ipv4dns1_2)}<P22>{$grandstream_ipv4dns1_2}</P22>{else}<P22>0</P22>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P23>0</P23>
+    {if isset($grandstream_ipv4dns1_3)}<P23>{$grandstream_ipv4dns1_3}</P23>{else}<P23>0</P23>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P24>0</P24>
+    {if isset($grandstream_ipv4dns1_4)}<P24>{$grandstream_ipv4dns1_4}</P24>{else}<P24>0</P24>{/if}
 
     <!-- # DNS 2 Server. Ignore if DHCP or PPPoE is used -->
     <!-- # Number: 0 - 255 -->
-    <P25>0</P25>
+    {if isset($grandstream_ipv4dns2_1)}<P25>{$grandstream_ipv4dns2_1}</P25>{else}<P25>0</P25>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P26>0</P26>
+    {if isset($grandstream_ipv4dns2_2)}<P26>{$grandstream_ipv4dns2_2}</P26>{else}<P26>0</P26>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P27>0</P27>
+    {if isset($grandstream_ipv4dns2_3)}<P27>{$grandstream_ipv4dns2_3}</P27>{else}<P27>0</P27>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P28>0</P28>
+    {if isset($grandstream_ipv4dns2_4)}<P28>{$grandstream_ipv4dns2_4}</P28>{else}<P28>0</P28>{/if}
 
     <!-- # Preferred DNS server.  (if specified). -->
     <!-- # Number: 0 - 255 -->
-    <P92>0</P92>
+    {if isset($grandstream_ipv4preferdns_1)}<P92>{$grandstream_ipv4preferdns_1}</P92>{else}<P92>0</P92>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P93>0</P93>
+    {if isset($grandstream_ipv4preferdns_2)}<P93>{$grandstream_ipv4preferdns_2}</P93>{else}<P93>0</P93>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P94>0</P94>
+    {if isset($grandstream_ipv4preferdns_3)}<P94>{$grandstream_ipv4preferdns_3}</P94>{else}<P94>0</P94>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P95>0</P95>
+    {if isset($grandstream_ipv4preferdns_4)}<P95>{$grandstream_ipv4preferdns_4}</P95>{else}<P95>0</P95>{/if}
 
     <!-- # IPv6 Address type. 0 - Auto Configured, 1 - Statically Configured. Default is 0. -->
     <!-- # Number: 0, 1 -->
diff --git a/resources/templates/provision/grandstream/gxp2135/{$mac}.xml b/resources/templates/provision/grandstream/gxp2135/{$mac}.xml
index 06965dbc9a..35f5bb980a 100644
--- a/resources/templates/provision/grandstream/gxp2135/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2135/{$mac}.xml
@@ -5848,81 +5848,81 @@
     <!-- ########################################## -->
     <!-- # IP Address. Ignore if DHCP or PPPoE is used -->
     <!-- # Number: 0 - 255 -->
-    <P9>192</P9>
+    {if isset($grandstream_ipv4octet_1)}<P9>{$grandstream_ipv4octet_1}</P9>{else}<P9>192</P9>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P10>168</P10>
+    {if isset($grandstream_ipv4octet_2)}<P10>{$grandstream_ipv4octet_2}</P10>{else}<P10>168</P10>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P11>1</P11>
+    {if isset($grandstream_ipv4octet_3)}<P11>{$grandstream_ipv4octet_3}</P11>{else}<P11>1</P11>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P12>102</P12>
+    {if isset($grandstream_ipv4octet_4)}<P12>{$grandstream_ipv4octet_4}</P12>{else}<P12>102</P12>{/if}
 
     <!-- # Subnet mask. Ignore if DHCP or PPPoE is used -->
     <!-- # Number: 0 - 255 -->
-    <P13>255</P13>
+    {if isset($grandstream_ipv4mask_1)}<P13>{$grandstream_ipv4mask_1}</P13>{else}<P13>255</P13>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P14>255</P14>
+    {if isset($grandstream_ipv4mask_2)}<P14>{$grandstream_ipv4mask_2}</P14>{else}<P14>255</P14>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P15>0</P15>
+    {if isset($grandstream_ipv4mask_3)}<P15>{$grandstream_ipv4mask_3}</P15>{else}<P15>0</P15>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P16>0</P16>
+    {if isset($grandstream_ipv4mask_4)}<P16>{$grandstream_ipv4mask_4}</P16>{else}<P16>0</P16>{/if}
 
     <!-- # Gateway. Ignore if DHCP or PPPoE is used -->
     <!-- # Number: 0 - 255 -->
-    <P17>192</P17>
+    {if isset($grandstream_ipv4gw_1)}<P17>{$grandstream_ipv4gw_1}</P17>{else}<P17>192</P17>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P18>168</P18>
+    {if isset($grandstream_ipv4gw_2)}<P18>{$grandstream_ipv4gw_2}</P18>{else}<P18>168</P18>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P19>2</P19>
+    {if isset($grandstream_ipv4gw_3)}<P19>{$grandstream_ipv4gw_3}</P19>{else}<P19>2</P19>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P20>1</P20>
+    {if isset($grandstream_ipv4gw_4)}<P20>{$grandstream_ipv4gw_4}</P20>{else}<P20>1</P20>{/if}
 
     <!-- # DNS 1 Server. Ignore if DHCP or PPPoE is used -->
     <!-- # Number: 0 - 255 -->
-    <P21>0</P21>
+    {if isset($grandstream_ipv4dns1_1)}<P21>{$grandstream_ipv4dns1_1}</P21>{else}<P21>0</P21>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P22>0</P22>
+    {if isset($grandstream_ipv4dns1_2)}<P22>{$grandstream_ipv4dns1_2}</P22>{else}<P22>0</P22>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P23>0</P23>
+    {if isset($grandstream_ipv4dns1_3)}<P23>{$grandstream_ipv4dns1_3}</P23>{else}<P23>0</P23>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P24>0</P24>
+    {if isset($grandstream_ipv4dns1_4)}<P24>{$grandstream_ipv4dns1_4}</P24>{else}<P24>0</P24>{/if}
 
     <!-- # DNS 2 Server. Ignore if DHCP or PPPoE is used -->
     <!-- # Number: 0 - 255 -->
-    <P25>0</P25>
+    {if isset($grandstream_ipv4dns2_1)}<P25>{$grandstream_ipv4dns2_1}</P25>{else}<P25>0</P25>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P26>0</P26>
+    {if isset($grandstream_ipv4dns2_2)}<P26>{$grandstream_ipv4dns2_2}</P26>{else}<P26>0</P26>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P27>0</P27>
+    {if isset($grandstream_ipv4dns2_3)}<P27>{$grandstream_ipv4dns2_3}</P27>{else}<P27>0</P27>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P28>0</P28>
+    {if isset($grandstream_ipv4dns2_4)}<P28>{$grandstream_ipv4dns2_4}</P28>{else}<P28>0</P28>{/if}
 
     <!-- # Preferred DNS server.  (if specified). -->
     <!-- # Number: 0 - 255 -->
-    <P92>0</P92>
+    {if isset($grandstream_ipv4preferdns_1)}<P92>{$grandstream_ipv4preferdns_1}</P92>{else}<P92>0</P92>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P93>0</P93>
+    {if isset($grandstream_ipv4preferdns_2)}<P93>{$grandstream_ipv4preferdns_2}</P93>{else}<P93>0</P93>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P94>0</P94>
+    {if isset($grandstream_ipv4preferdns_3)}<P94>{$grandstream_ipv4preferdns_3}</P94>{else}<P94>0</P94>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P95>0</P95>
+    {if isset($grandstream_ipv4preferdns_4)}<P95>{$grandstream_ipv4preferdns_4}</P95>{else}<P95>0</P95>{/if}
 
     <!-- # IPv6 Address type. 0 - Auto Configured, 1 - Statically Configured. Default is 0. -->
     <!-- # Number: 0, 1 -->
diff --git a/resources/templates/provision/grandstream/gxp2140/{$mac}.xml b/resources/templates/provision/grandstream/gxp2140/{$mac}.xml
index 386d0e3533..b50f97d067 100644
--- a/resources/templates/provision/grandstream/gxp2140/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2140/{$mac}.xml
@@ -5848,81 +5848,81 @@
     <!-- ########################################## -->
     <!-- # IP Address. Ignore if DHCP or PPPoE is used -->
     <!-- # Number: 0 - 255 -->
-    <P9>192</P9>
+    {if isset($grandstream_ipv4octet_1)}<P9>{$grandstream_ipv4octet_1}</P9>{else}<P9>192</P9>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P10>168</P10>
+    {if isset($grandstream_ipv4octet_2)}<P10>{$grandstream_ipv4octet_2}</P10>{else}<P10>168</P10>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P11>1</P11>
+    {if isset($grandstream_ipv4octet_3)}<P11>{$grandstream_ipv4octet_3}</P11>{else}<P11>1</P11>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P12>102</P12>
+    {if isset($grandstream_ipv4octet_4)}<P12>{$grandstream_ipv4octet_4}</P12>{else}<P12>102</P12>{/if}
 
     <!-- # Subnet mask. Ignore if DHCP or PPPoE is used -->
     <!-- # Number: 0 - 255 -->
-    <P13>255</P13>
+    {if isset($grandstream_ipv4mask_1)}<P13>{$grandstream_ipv4mask_1}</P13>{else}<P13>255</P13>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P14>255</P14>
+    {if isset($grandstream_ipv4mask_2)}<P14>{$grandstream_ipv4mask_2}</P14>{else}<P14>255</P14>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P15>0</P15>
+    {if isset($grandstream_ipv4mask_3)}<P15>{$grandstream_ipv4mask_3}</P15>{else}<P15>0</P15>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P16>0</P16>
+    {if isset($grandstream_ipv4mask_4)}<P16>{$grandstream_ipv4mask_4}</P16>{else}<P16>0</P16>{/if}
 
     <!-- # Gateway. Ignore if DHCP or PPPoE is used -->
     <!-- # Number: 0 - 255 -->
-    <P17>192</P17>
+    {if isset($grandstream_ipv4gw_1)}<P17>{$grandstream_ipv4gw_1}</P17>{else}<P17>192</P17>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P18>168</P18>
+    {if isset($grandstream_ipv4gw_2)}<P18>{$grandstream_ipv4gw_2}</P18>{else}<P18>168</P18>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P19>2</P19>
+    {if isset($grandstream_ipv4gw_3)}<P19>{$grandstream_ipv4gw_3}</P19>{else}<P19>2</P19>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P20>1</P20>
+    {if isset($grandstream_ipv4gw_4)}<P20>{$grandstream_ipv4gw_4}</P20>{else}<P20>1</P20>{/if}
 
     <!-- # DNS 1 Server. Ignore if DHCP or PPPoE is used -->
     <!-- # Number: 0 - 255 -->
-    <P21>0</P21>
+    {if isset($grandstream_ipv4dns1_1)}<P21>{$grandstream_ipv4dns1_1}</P21>{else}<P21>0</P21>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P22>0</P22>
+    {if isset($grandstream_ipv4dns1_2)}<P22>{$grandstream_ipv4dns1_2}</P22>{else}<P22>0</P22>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P23>0</P23>
+    {if isset($grandstream_ipv4dns1_3)}<P23>{$grandstream_ipv4dns1_3}</P23>{else}<P23>0</P23>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P24>0</P24>
+    {if isset($grandstream_ipv4dns1_4)}<P24>{$grandstream_ipv4dns1_4}</P24>{else}<P24>0</P24>{/if}
 
     <!-- # DNS 2 Server. Ignore if DHCP or PPPoE is used -->
     <!-- # Number: 0 - 255 -->
-    <P25>0</P25>
+    {if isset($grandstream_ipv4dns2_1)}<P25>{$grandstream_ipv4dns2_1}</P25>{else}<P25>0</P25>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P26>0</P26>
+    {if isset($grandstream_ipv4dns2_2)}<P26>{$grandstream_ipv4dns2_2}</P26>{else}<P26>0</P26>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P27>0</P27>
+    {if isset($grandstream_ipv4dns2_3)}<P27>{$grandstream_ipv4dns2_3}</P27>{else}<P27>0</P27>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P28>0</P28>
+    {if isset($grandstream_ipv4dns2_4)}<P28>{$grandstream_ipv4dns2_4}</P28>{else}<P28>0</P28>{/if}
 
     <!-- # Preferred DNS server.  (if specified). -->
     <!-- # Number: 0 - 255 -->
-    <P92>0</P92>
+    {if isset($grandstream_ipv4preferdns_1)}<P92>{$grandstream_ipv4preferdns_1}</P92>{else}<P92>0</P92>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P93>0</P93>
+    {if isset($grandstream_ipv4preferdns_2)}<P93>{$grandstream_ipv4preferdns_2}</P93>{else}<P93>0</P93>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P94>0</P94>
+    {if isset($grandstream_ipv4preferdns_3)}<P94>{$grandstream_ipv4preferdns_3}</P94>{else}<P94>0</P94>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P95>0</P95>
+    {if isset($grandstream_ipv4preferdns_4)}<P95>{$grandstream_ipv4preferdns_4}</P95>{else}<P95>0</P95>{/if}
 
     <!-- # IPv6 Address type. 0 - Auto Configured, 1 - Statically Configured. Default is 0. -->
     <!-- # Number: 0, 1 -->
diff --git a/resources/templates/provision/grandstream/gxp2160/{$mac}.xml b/resources/templates/provision/grandstream/gxp2160/{$mac}.xml
index f3d569ed36..71514ff3c6 100644
--- a/resources/templates/provision/grandstream/gxp2160/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2160/{$mac}.xml
@@ -5848,81 +5848,81 @@
     <!-- ########################################## -->
     <!-- # IP Address. Ignore if DHCP or PPPoE is used -->
     <!-- # Number: 0 - 255 -->
-    <P9>192</P9>
+    {if isset($grandstream_ipv4octet_1)}<P9>{$grandstream_ipv4octet_1}</P9>{else}<P9>192</P9>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P10>168</P10>
+    {if isset($grandstream_ipv4octet_2)}<P10>{$grandstream_ipv4octet_2}</P10>{else}<P10>168</P10>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P11>1</P11>
+    {if isset($grandstream_ipv4octet_3)}<P11>{$grandstream_ipv4octet_3}</P11>{else}<P11>1</P11>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P12>102</P12>
+    {if isset($grandstream_ipv4octet_4)}<P12>{$grandstream_ipv4octet_4}</P12>{else}<P12>102</P12>{/if}
 
     <!-- # Subnet mask. Ignore if DHCP or PPPoE is used -->
     <!-- # Number: 0 - 255 -->
-    <P13>255</P13>
+    {if isset($grandstream_ipv4mask_1)}<P13>{$grandstream_ipv4mask_1}</P13>{else}<P13>255</P13>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P14>255</P14>
+    {if isset($grandstream_ipv4mask_2)}<P14>{$grandstream_ipv4mask_2}</P14>{else}<P14>255</P14>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P15>0</P15>
+    {if isset($grandstream_ipv4mask_3)}<P15>{$grandstream_ipv4mask_3}</P15>{else}<P15>0</P15>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P16>0</P16>
+    {if isset($grandstream_ipv4mask_4)}<P16>{$grandstream_ipv4mask_4}</P16>{else}<P16>0</P16>{/if}
 
     <!-- # Gateway. Ignore if DHCP or PPPoE is used -->
     <!-- # Number: 0 - 255 -->
-    <P17>192</P17>
+    {if isset($grandstream_ipv4gw_1)}<P17>{$grandstream_ipv4gw_1}</P17>{else}<P17>192</P17>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P18>168</P18>
+    {if isset($grandstream_ipv4gw_2)}<P18>{$grandstream_ipv4gw_2}</P18>{else}<P18>168</P18>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P19>2</P19>
+    {if isset($grandstream_ipv4gw_3)}<P19>{$grandstream_ipv4gw_3}</P19>{else}<P19>2</P19>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P20>1</P20>
+    {if isset($grandstream_ipv4gw_4)}<P20>{$grandstream_ipv4gw_4}</P20>{else}<P20>1</P20>{/if}
 
     <!-- # DNS 1 Server. Ignore if DHCP or PPPoE is used -->
     <!-- # Number: 0 - 255 -->
-    <P21>0</P21>
+    {if isset($grandstream_ipv4dns1_1)}<P21>{$grandstream_ipv4dns1_1}</P21>{else}<P21>0</P21>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P22>0</P22>
+    {if isset($grandstream_ipv4dns1_2)}<P22>{$grandstream_ipv4dns1_2}</P22>{else}<P22>0</P22>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P23>0</P23>
+    {if isset($grandstream_ipv4dns1_3)}<P23>{$grandstream_ipv4dns1_3}</P23>{else}<P23>0</P23>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P24>0</P24>
+    {if isset($grandstream_ipv4dns1_4)}<P24>{$grandstream_ipv4dns1_4}</P24>{else}<P24>0</P24>{/if}
 
     <!-- # DNS 2 Server. Ignore if DHCP or PPPoE is used -->
     <!-- # Number: 0 - 255 -->
-    <P25>0</P25>
+    {if isset($grandstream_ipv4dns2_1)}<P25>{$grandstream_ipv4dns2_1}</P25>{else}<P25>0</P25>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P26>0</P26>
+    {if isset($grandstream_ipv4dns2_2)}<P26>{$grandstream_ipv4dns2_2}</P26>{else}<P26>0</P26>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P27>0</P27>
+    {if isset($grandstream_ipv4dns2_3)}<P27>{$grandstream_ipv4dns2_3}</P27>{else}<P27>0</P27>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P28>0</P28>
+    {if isset($grandstream_ipv4dns2_4)}<P28>{$grandstream_ipv4dns2_4}</P28>{else}<P28>0</P28>{/if}
 
     <!-- # Preferred DNS server.  (if specified). -->
     <!-- # Number: 0 - 255 -->
-    <P92>0</P92>
+    {if isset($grandstream_ipv4preferdns_1)}<P92>{$grandstream_ipv4preferdns_1}</P92>{else}<P92>0</P92>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P93>0</P93>
+    {if isset($grandstream_ipv4preferdns_2)}<P93>{$grandstream_ipv4preferdns_2}</P93>{else}<P93>0</P93>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P94>0</P94>
+    {if isset($grandstream_ipv4preferdns_3)}<P94>{$grandstream_ipv4preferdns_3}</P94>{else}<P94>0</P94>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P95>0</P95>
+    {if isset($grandstream_ipv4preferdns_4)}<P95>{$grandstream_ipv4preferdns_4}</P95>{else}<P95>0</P95>{/if}
 
     <!-- # IPv6 Address type. 0 - Auto Configured, 1 - Statically Configured. Default is 0. -->
     <!-- # Number: 0, 1 -->
diff --git a/resources/templates/provision/grandstream/gxp2170/{$mac}.xml b/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
index 1f30aaa682..6ae0ffde13 100644
--- a/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
@@ -5848,81 +5848,81 @@
     <!-- ########################################## -->
     <!-- # IP Address. Ignore if DHCP or PPPoE is used -->
     <!-- # Number: 0 - 255 -->
-    <P9>192</P9>
+    {if isset($grandstream_ipv4octet_1)}<P9>{$grandstream_ipv4octet_1}</P9>{else}<P9>192</P9>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P10>168</P10>
+    {if isset($grandstream_ipv4octet_2)}<P10>{$grandstream_ipv4octet_2}</P10>{else}<P10>168</P10>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P11>1</P11>
+    {if isset($grandstream_ipv4octet_3)}<P11>{$grandstream_ipv4octet_3}</P11>{else}<P11>1</P11>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P12>102</P12>
+    {if isset($grandstream_ipv4octet_4)}<P12>{$grandstream_ipv4octet_4}</P12>{else}<P12>102</P12>{/if}
 
     <!-- # Subnet mask. Ignore if DHCP or PPPoE is used -->
     <!-- # Number: 0 - 255 -->
-    <P13>255</P13>
+    {if isset($grandstream_ipv4mask_1)}<P13>{$grandstream_ipv4mask_1}</P13>{else}<P13>255</P13>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P14>255</P14>
+    {if isset($grandstream_ipv4mask_2)}<P14>{$grandstream_ipv4mask_2}</P14>{else}<P14>255</P14>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P15>0</P15>
+    {if isset($grandstream_ipv4mask_3)}<P15>{$grandstream_ipv4mask_3}</P15>{else}<P15>0</P15>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P16>0</P16>
+    {if isset($grandstream_ipv4mask_4)}<P16>{$grandstream_ipv4mask_4}</P16>{else}<P16>0</P16>{/if}
 
     <!-- # Gateway. Ignore if DHCP or PPPoE is used -->
     <!-- # Number: 0 - 255 -->
-    <P17>192</P17>
+    {if isset($grandstream_ipv4gw_1)}<P17>{$grandstream_ipv4gw_1}</P17>{else}<P17>192</P17>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P18>168</P18>
+    {if isset($grandstream_ipv4gw_2)}<P18>{$grandstream_ipv4gw_2}</P18>{else}<P18>168</P18>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P19>2</P19>
+    {if isset($grandstream_ipv4gw_3)}<P19>{$grandstream_ipv4gw_3}</P19>{else}<P19>2</P19>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P20>1</P20>
+    {if isset($grandstream_ipv4gw_4)}<P20>{$grandstream_ipv4gw_4}</P20>{else}<P20>1</P20>{/if}
 
     <!-- # DNS 1 Server. Ignore if DHCP or PPPoE is used -->
     <!-- # Number: 0 - 255 -->
-    <P21>0</P21>
+    {if isset($grandstream_ipv4dns1_1)}<P21>{$grandstream_ipv4dns1_1}</P21>{else}<P21>0</P21>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P22>0</P22>
+    {if isset($grandstream_ipv4dns1_2)}<P22>{$grandstream_ipv4dns1_2}</P22>{else}<P22>0</P22>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P23>0</P23>
+    {if isset($grandstream_ipv4dns1_3)}<P23>{$grandstream_ipv4dns1_3}</P23>{else}<P23>0</P23>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P24>0</P24>
+    {if isset($grandstream_ipv4dns1_4)}<P24>{$grandstream_ipv4dns1_4}</P24>{else}<P24>0</P24>{/if}
 
     <!-- # DNS 2 Server. Ignore if DHCP or PPPoE is used -->
     <!-- # Number: 0 - 255 -->
-    <P25>0</P25>
+    {if isset($grandstream_ipv4dns2_1)}<P25>{$grandstream_ipv4dns2_1}</P25>{else}<P25>0</P25>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P26>0</P26>
+    {if isset($grandstream_ipv4dns2_2)}<P26>{$grandstream_ipv4dns2_2}</P26>{else}<P26>0</P26>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P27>0</P27>
+    {if isset($grandstream_ipv4dns2_3)}<P27>{$grandstream_ipv4dns2_3}</P27>{else}<P27>0</P27>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P28>0</P28>
+    {if isset($grandstream_ipv4dns2_4)}<P28>{$grandstream_ipv4dns2_4}</P28>{else}<P28>0</P28>{/if}
 
     <!-- # Preferred DNS server.  (if specified). -->
     <!-- # Number: 0 - 255 -->
-    <P92>0</P92>
+    {if isset($grandstream_ipv4preferdns_1)}<P92>{$grandstream_ipv4preferdns_1}</P92>{else}<P92>0</P92>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P93>0</P93>
+    {if isset($grandstream_ipv4preferdns_2)}<P93>{$grandstream_ipv4preferdns_2}</P93>{else}<P93>0</P93>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P94>0</P94>
+    {if isset($grandstream_ipv4preferdns_3)}<P94>{$grandstream_ipv4preferdns_3}</P94>{else}<P94>0</P94>{/if}
 
     <!-- # Number: 0 - 255 -->
-    <P95>0</P95>
+    {if isset($grandstream_ipv4preferdns_4)}<P95>{$grandstream_ipv4preferdns_4}</P95>{else}<P95>0</P95>{/if}
 
     <!-- # IPv6 Address type. 0 - Auto Configured, 1 - Statically Configured. Default is 0. -->
     <!-- # Number: 0, 1 -->