diff --git a/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml
index 0ab19462ba..656d33b3be 100644
--- a/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml
@@ -2018,17 +2018,17 @@
 <!--  When set to Yes(1), it will override the configured provision path and method -->
 <!--  Number: 0, 1 -->
 <!--  Mandatory -->
-<P145>1</P145>
+{if isset($grandstream_dhcp_option_override)}<P145>{$grandstream_dhcp_option_override}</P145>{else}<P145>1</P145>{/if}
 <!--  Additional Override DHCP option -->
 <!--  0 - None, 1 - Option 150, 2 - Option 160 -->
 <!--  Number: 0, 1, 2 -->
 <!--  Mandatory -->
-<P8337>0</P8337>
+{if isset($grandstream_dhcp_option_additional_override)}<P8337>{$grandstream_dhcp_option_additional_override}</P8337>{else}<P8337>0</P8337>{/if}
 <!--  Allow DHCP Option 120 to Override SIP Server -->
 <!--  0 - No, 1 - Yes. Default is 0 -->
 <!--  Number: 0, 1 -->
 <!--  Mandatory -->
-<P1411>0</P1411>
+{if isset($grandstream_dhcp_option_override_sip_server)}<P1411>{$grandstream_dhcp_option_override_sip_server}</P1411>{else}<P1411>0</P1411>{/if}
 <!--  3CX Auto Provision. 0 - No, 1 - Yes. Default is 1 -->
 <!--  Number: 0, 1 -->
 <!--  Mandatory -->