diff --git a/app/snom/app_config.php b/app/snom/app_config.php
index 71bd76c0a6..06e253f5d8 100644
--- a/app/snom/app_config.php
+++ b/app/snom/app_config.php
@@ -342,5 +342,13 @@
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "If a value greater than 0 is set (=number of seconds) the phone configuration will be requested from the setting server after the time has elapsed.";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "32324f5e-e476-48e3-b658-b5d6e08337cb";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "snom_dhcp";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "on";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Force enabling or disabling DHCP. (on=Enabled or off=Disabled)";
 
 ?>
diff --git a/resources/templates/provision/snom/360/{$mac}.xml b/resources/templates/provision/snom/360/{$mac}.xml
index 2d28427bf0..e826e12e12 100644
--- a/resources/templates/provision/snom/360/{$mac}.xml
+++ b/resources/templates/provision/snom/360/{$mac}.xml
@@ -4,7 +4,7 @@
 <language perm="">English</language>
 <update_policy perm="">{if isset($snom_update_policy)}{$snom_update_policy}{else}auto_update{/if}</update_policy>
 <setting_server perm="RW">http://{$domain_name}{$project_path}/app/provision/{literal}{mac}{/literal}.xml</setting_server>
-<dhcp perm="R">on</dhcp>
+{if isset($snom_dhcp)}<dhcp perm="R">{$snom_dhcp}</dhcp>{/if}
 <firmware perm="">http://provisioning.snom.com:80/download/fw/snom360-8.7.3.19-SIP-f.bin</firmware>
 <attended_transfer_on_ringing perm="">on</attended_transfer_on_ringing>
 <was_never_registered perm="">off</was_never_registered>
diff --git a/resources/templates/provision/snom/3xx/{$mac}.xml b/resources/templates/provision/snom/3xx/{$mac}.xml
index b3f6c63e13..854f45788e 100644
--- a/resources/templates/provision/snom/3xx/{$mac}.xml
+++ b/resources/templates/provision/snom/3xx/{$mac}.xml
@@ -4,7 +4,7 @@
 <language perm="">English</language>
 <update_policy perm="">{if isset($snom_update_policy)}{$snom_update_policy}{else}auto_update{/if}</update_policy>
 <setting_server perm="RW">http://{$domain_name}{$project_path}/app/provision/{literal}{mac}{/literal}.xml</setting_server>
-<dhcp perm="R">on</dhcp>
+{if isset($snom_dhcp)}<dhcp perm="R">{$snom_dhcp}</dhcp>{/if}
 <ntp_server perm="">{$ntp_server_primary}</ntp_server>
 <ntp_refresh_timer perm="">3600</ntp_refresh_timer>
 <timezone perm="">{$snom_time_zone}</timezone>
diff --git a/resources/templates/provision/snom/7xx/{$mac}.xml b/resources/templates/provision/snom/7xx/{$mac}.xml
index 1472fe08ce..a96fdd17fb 100644
--- a/resources/templates/provision/snom/7xx/{$mac}.xml
+++ b/resources/templates/provision/snom/7xx/{$mac}.xml
@@ -4,7 +4,7 @@
 <language perm="">English</language>
 <update_policy perm="">{if isset($snom_update_policy)}{$snom_update_policy}{else}auto_update{/if}</update_policy>
 <setting_server perm="RW">https://{$domain_name}{$project_path}/app/provision/{literal}{mac}{/literal}.xml</setting_server>
-<dhcp perm="R">on</dhcp>
+{if isset($snom_dhcp)}<dhcp perm="R">{$snom_dhcp}</dhcp>{/if}
 <ntp_server perm="">{$ntp_server_primary}</ntp_server>
 <ntp_refresh_timer perm="">3600</ntp_refresh_timer>
 <timezone perm="">{$snom_time_zone}</timezone>
diff --git a/resources/templates/provision/snom/8xx/{$mac}.xml b/resources/templates/provision/snom/8xx/{$mac}.xml
index adb0bbff04..c867f1427a 100644
--- a/resources/templates/provision/snom/8xx/{$mac}.xml
+++ b/resources/templates/provision/snom/8xx/{$mac}.xml
@@ -4,7 +4,7 @@
 <language perm="">English</language>
 <update_policy perm="">{if isset($snom_update_policy)}{$snom_update_policy}{else}auto_update{/if}</update_policy>
 <setting_server perm="RW">http://{$domain_name}{$project_path}/app/provision/{literal}{mac}{/literal}.xml</setting_server>
-<dhcp perm="R">on</dhcp>
+{if isset($snom_dhcp)}<dhcp perm="R">{$snom_dhcp}</dhcp>{/if}
 <timezone perm="">{$snom_time_zone}</timezone>
 <firmware_status perm="R">http://{$domain_name}{$project_path}/app/provision/firmware.xml</firmware_status>
 {if isset($admin_password) }
diff --git a/resources/templates/provision/snom/D120/{$mac}.xml b/resources/templates/provision/snom/D120/{$mac}.xml
index 67771a7674..147ef4bca9 100644
--- a/resources/templates/provision/snom/D120/{$mac}.xml
+++ b/resources/templates/provision/snom/D120/{$mac}.xml
@@ -8,7 +8,7 @@
     <ntp_server perm="">{if isset($snom_ntp_server)}{$snom_ntp_server}{else}0.pool.ntp.org{/if}</ntp_server>
     <ntp_refresh_timer perm="">3600</ntp_refresh_timer>
     <timezone perm="">{$snom_time_zone}</timezone>
-    <dhcp perm="R">on</dhcp>
+    {if isset($snom_dhcp)}<dhcp perm="R">{$snom_dhcp}</dhcp>{/if}
     <phone_name perm="R">snomD120-{substr($mac, -6)}</phone_name>
     <dim_timer perm="">20</dim_timer>
     <backlight perm="">15</backlight>
diff --git a/resources/templates/provision/snom/D315/{$mac}.xml b/resources/templates/provision/snom/D315/{$mac}.xml
index de0e843e87..8cf1e5084f 100644
--- a/resources/templates/provision/snom/D315/{$mac}.xml
+++ b/resources/templates/provision/snom/D315/{$mac}.xml
@@ -8,7 +8,7 @@
     <ntp_server perm="">{if isset($snom_ntp_server)}{$snom_ntp_server}{else}0.pool.ntp.org{/if}</ntp_server>
     <ntp_refresh_timer perm="">3600</ntp_refresh_timer>
     <timezone perm="">{$snom_time_zone}</timezone>
-    <dhcp perm="R">on</dhcp>
+    {if isset($snom_dhcp)}<dhcp perm="R">{$snom_dhcp}</dhcp>{/if}
     <phone_name perm="R">snomD345-{substr($mac, -6)}</phone_name>
     <dim_timer perm="">20</dim_timer>
     <backlight perm="">15</backlight>
diff --git a/resources/templates/provision/snom/D345/{$mac}.xml b/resources/templates/provision/snom/D345/{$mac}.xml
index feadd28320..a2a8e135cc 100644
--- a/resources/templates/provision/snom/D345/{$mac}.xml
+++ b/resources/templates/provision/snom/D345/{$mac}.xml
@@ -8,7 +8,7 @@
     <ntp_server perm="">{if isset($snom_ntp_server)}{$snom_ntp_server}{else}0.pool.ntp.org{/if}</ntp_server>
     <ntp_refresh_timer perm="">3600</ntp_refresh_timer>
     <timezone perm="">{$snom_time_zone}</timezone>
-    <dhcp perm="R">on</dhcp>
+    {if isset($snom_dhcp)}<dhcp perm="R">{$snom_dhcp}</dhcp>{/if}
     <phone_name perm="R">snomD345-{substr($mac, -6)}</phone_name>
     <dim_timer perm="">20</dim_timer>
     <backlight perm="">15</backlight>
diff --git a/resources/templates/provision/snom/D375/{$mac}.xml b/resources/templates/provision/snom/D375/{$mac}.xml
index 56b8cb1cfb..59b3d5ddbc 100644
--- a/resources/templates/provision/snom/D375/{$mac}.xml
+++ b/resources/templates/provision/snom/D375/{$mac}.xml
@@ -8,7 +8,7 @@
     <ntp_server perm="">{if isset($snom_ntp_server)}{$snom_ntp_server}{else}0.pool.ntp.org{/if}</ntp_server>
     <ntp_refresh_timer perm="">3600</ntp_refresh_timer>
     <timezone perm="">{$snom_time_zone}</timezone>
-    <dhcp perm="R">on</dhcp>
+    {if isset($snom_dhcp)}<dhcp perm="R">{$snom_dhcp}</dhcp>{/if}
     <phone_name perm="R">snomD375-{substr($mac, -6)}</phone_name>
     <dim_timer perm="">20</dim_timer>
     <backlight perm="">15</backlight>
diff --git a/resources/templates/provision/snom/D385/{$mac}.xml b/resources/templates/provision/snom/D385/{$mac}.xml
index fcf72581ff..ebdcecc4dc 100644
--- a/resources/templates/provision/snom/D385/{$mac}.xml
+++ b/resources/templates/provision/snom/D385/{$mac}.xml
@@ -8,7 +8,7 @@
     <ntp_server perm="">{if isset($snom_ntp_server)}{$snom_ntp_server}{else}0.pool.ntp.org{/if}</ntp_server>
     <ntp_refresh_timer perm="">3600</ntp_refresh_timer>
     <timezone perm="">{$snom_time_zone}</timezone>
-    <dhcp perm="R">on</dhcp>
+    {if isset($snom_dhcp)}<dhcp perm="R">{$snom_dhcp}</dhcp>{/if}
     <phone_name perm="R">snomD385-{substr($mac, -6)}</phone_name>
     <dim_timer perm="">20</dim_timer>
     <backlight perm="">15</backlight>
diff --git a/resources/templates/provision/snom/D712/{$mac}.xml b/resources/templates/provision/snom/D712/{$mac}.xml
index d7fbfa1948..70be7f4e7e 100644
--- a/resources/templates/provision/snom/D712/{$mac}.xml
+++ b/resources/templates/provision/snom/D712/{$mac}.xml
@@ -8,7 +8,7 @@
     <ntp_server perm="">{if isset($snom_ntp_server)}{$snom_ntp_server}{else}0.pool.ntp.org{/if}</ntp_server>
     <ntp_refresh_timer perm="">3600</ntp_refresh_timer>
     <timezone perm="">{$snom_time_zone}</timezone>
-    <dhcp perm="R">on</dhcp>
+    {if isset($snom_dhcp)}<dhcp perm="R">{$snom_dhcp}</dhcp>{/if}
     <phone_name perm="R">snomD712-{substr($mac, -6)}</phone_name>
     <dim_timer perm="">20</dim_timer>
     <backlight perm="">15</backlight>
diff --git a/resources/templates/provision/snom/D715/{$mac}.xml b/resources/templates/provision/snom/D715/{$mac}.xml
index e116f2d193..39aaa2b017 100644
--- a/resources/templates/provision/snom/D715/{$mac}.xml
+++ b/resources/templates/provision/snom/D715/{$mac}.xml
@@ -8,7 +8,7 @@
     <ntp_server perm="">{if isset($snom_ntp_server)}{$snom_ntp_server}{else}0.pool.ntp.org{/if}</ntp_server>
     <ntp_refresh_timer perm="">3600</ntp_refresh_timer>
     <timezone perm="">{$snom_time_zone}</timezone>
-    <dhcp perm="R">on</dhcp>
+    {if isset($snom_dhcp)}<dhcp perm="R">{$snom_dhcp}</dhcp>{/if}
     <phone_name perm="R">snomD715-{substr($mac, -6)}</phone_name>
     <dim_timer perm="">20</dim_timer>
     <backlight perm="">15</backlight>
diff --git a/resources/templates/provision/snom/D717/{$mac}.xml b/resources/templates/provision/snom/D717/{$mac}.xml
index 8985976c51..654f151eba 100644
--- a/resources/templates/provision/snom/D717/{$mac}.xml
+++ b/resources/templates/provision/snom/D717/{$mac}.xml
@@ -8,7 +8,7 @@
     <ntp_server perm="">{if isset($snom_ntp_server)}{$snom_ntp_server}{else}0.pool.ntp.org{/if}</ntp_server>
     <ntp_refresh_timer perm="">3600</ntp_refresh_timer>
     <timezone perm="">{$snom_time_zone}</timezone>
-    <dhcp perm="R">on</dhcp>
+    {if isset($snom_dhcp)}<dhcp perm="R">{$snom_dhcp}</dhcp>{/if}
     <phone_name perm="R">snomD717-{substr($mac, -6)}</phone_name>
     <dim_timer perm="">20</dim_timer>
     <backlight perm="">15</backlight>
diff --git a/resources/templates/provision/snom/D725/{$mac}.xml b/resources/templates/provision/snom/D725/{$mac}.xml
index 581dbfa182..812e84bf7a 100644
--- a/resources/templates/provision/snom/D725/{$mac}.xml
+++ b/resources/templates/provision/snom/D725/{$mac}.xml
@@ -8,7 +8,7 @@
     <ntp_server perm="">{if isset($snom_ntp_server)}{$snom_ntp_server}{else}0.pool.ntp.org{/if}</ntp_server>
     <ntp_refresh_timer perm="">3600</ntp_refresh_timer>
     <timezone perm="">{$snom_time_zone}</timezone>
-    <dhcp perm="R">on</dhcp>
+    {if isset($snom_dhcp)}<dhcp perm="R">{$snom_dhcp}</dhcp>{/if}
     <phone_name perm="R">snomD725-{substr($mac, -6)}</phone_name>
     <dim_timer perm="">20</dim_timer>
     <backlight perm="">15</backlight>
diff --git a/resources/templates/provision/snom/D735/{$mac}.xml b/resources/templates/provision/snom/D735/{$mac}.xml
index f4382406c8..33d1f27b1e 100644
--- a/resources/templates/provision/snom/D735/{$mac}.xml
+++ b/resources/templates/provision/snom/D735/{$mac}.xml
@@ -8,7 +8,7 @@
     <ntp_server perm="">{if isset($snom_ntp_server)}{$snom_ntp_server}{else}0.pool.ntp.org{/if}</ntp_server>
     <ntp_refresh_timer perm="">3600</ntp_refresh_timer>
     <timezone perm="">{$snom_time_zone}</timezone>
-    <dhcp perm="R">on</dhcp>
+    {if isset($snom_dhcp)}<dhcp perm="R">{$snom_dhcp}</dhcp>{/if}
     <phone_name perm="R">snomD735-{substr($mac, -6)}</phone_name>
     <dim_timer perm="">20</dim_timer>
     <backlight perm="">15</backlight>
diff --git a/resources/templates/provision/snom/D745/{$mac}.xml b/resources/templates/provision/snom/D745/{$mac}.xml
index 03eb3e34c3..35b145c5a5 100644
--- a/resources/templates/provision/snom/D745/{$mac}.xml
+++ b/resources/templates/provision/snom/D745/{$mac}.xml
@@ -8,7 +8,7 @@
     <ntp_server perm="">{if isset($snom_ntp_server)}{$snom_ntp_server}{else}0.pool.ntp.org{/if}</ntp_server>
     <ntp_refresh_timer perm="">3600</ntp_refresh_timer>
     <timezone perm="">{$snom_time_zone}</timezone>
-    <dhcp perm="R">on</dhcp>
+    {if isset($snom_dhcp)}<dhcp perm="R">{$snom_dhcp}</dhcp>{/if}
     <phone_name perm="R">snomD745-{substr($mac, -6)}</phone_name>
     <dim_timer perm="">20</dim_timer>
     <backlight perm="">15</backlight>
diff --git a/resources/templates/provision/snom/D765/{$mac}.xml b/resources/templates/provision/snom/D765/{$mac}.xml
index e5ca6a1feb..209b1921ec 100644
--- a/resources/templates/provision/snom/D765/{$mac}.xml
+++ b/resources/templates/provision/snom/D765/{$mac}.xml
@@ -8,7 +8,7 @@
     <ntp_server perm="">{if isset($snom_ntp_server)}{$snom_ntp_server}{else}0.pool.ntp.org{/if}</ntp_server>
     <ntp_refresh_timer perm="">3600</ntp_refresh_timer>
     <timezone perm="">{$snom_time_zone}</timezone>
-    <dhcp perm="R">on</dhcp>
+    {if isset($snom_dhcp)}<dhcp perm="R">{$snom_dhcp}</dhcp>{/if}
     <phone_name perm="R">snomD765-{substr($mac, -6)}</phone_name>
     <dim_timer perm="">20</dim_timer>
     <backlight perm="">15</backlight>
diff --git a/resources/templates/provision/snom/D785/{$mac}.xml b/resources/templates/provision/snom/D785/{$mac}.xml
index ebeb150030..3213f66c0f 100644
--- a/resources/templates/provision/snom/D785/{$mac}.xml
+++ b/resources/templates/provision/snom/D785/{$mac}.xml
@@ -8,7 +8,7 @@
     <ntp_server perm="">{if isset($snom_ntp_server)}{$snom_ntp_server}{else}0.pool.ntp.org{/if}</ntp_server>
     <ntp_refresh_timer perm="">3600</ntp_refresh_timer>
     <timezone perm="">{$snom_time_zone}</timezone>
-    <dhcp perm="R">on</dhcp>
+    {if isset($snom_dhcp)}<dhcp perm="R">{$snom_dhcp}</dhcp>{/if}
     <phone_name perm="R">snomD785-{substr($mac, -6)}</phone_name>
     <dim_timer perm="">20</dim_timer>
     <backlight perm="">15</backlight>