diff --git a/resources/templates/provision/grandstream/gxp2200/{$mac}.xml b/resources/templates/provision/grandstream/gxp2200/{$mac}.xml
index 9db2cf0a43..9b1cf9c7ef 100644
--- a/resources/templates/provision/grandstream/gxp2200/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2200/{$mac}.xml
@@ -3039,11 +3039,11 @@ Account 5 Codec Settings
 <!-- DHCP Option 66 Override server. 0 - No, 1 - Yes. Default value is 1 -->
 <!-- When set to Yes(1), it will override the configured provision path and method -->
 <!-- Number: 0, 1 -->
-<P145>1</P145>
+{if isset($grandstream_dhcp_option_override)}<P145>{$grandstream_dhcp_option_override}</P145>{else}<P145>1</P145>{/if}
 
 <!-- DHCP Option 120 Override SIP Server.0 - No, 1 - Yes. Default value is 1 -->
 <!-- Number: 0, 1 -->
-<P1411>1</P1411>
+{if isset($grandstream_dhcp_option_override_sip_server)}<P1411>{$grandstream_dhcp_option_override_sip_server}</P1411>{else}{if isset($grandstream_dhcp_option_override_sip_server)}<P1411>{$grandstream_dhcp_option_override_sip_server}</P1411>{else}<P1411>0</P1411>{/if}{/if}
 
 <!-- 3CX Auto Provision. 0 - No, 1 - Yes. Default value is 1 -->
 <!-- Number: 0, 1 -->