diff --git a/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml
index 4e754f551f..06291563af 100644
--- a/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <gs_provision version="1">
   <config version="1">
     <!-- Configuration Template For GXP21xx Firmware Version 1.0.5.32 -->
@@ -2736,12 +2736,12 @@
     <!-- When set to Yes(1), it will override the configured provision path and method -->
     <!-- Number: 0, 1 -->
     <!-- Mandatory -->
-    <P145>0</P145>
+    {if isset($grandstream_dhcp_option_override)}<P145>{$grandstream_dhcp_option_override}</P145>{else}<P145>1</P145>{/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}
     <!-- Automatic Upgrade. 0 - No, 1 - Yes. Default is No -->
     <!-- Number: 0, 1 -->
     <!-- Mandatory -->