diff --git a/app/grandstream/app_config.php b/app/grandstream/app_config.php
index f7b9ca3410..3dd98485d3 100644
--- a/app/grandstream/app_config.php
+++ b/app/grandstream/app_config.php
@@ -926,4 +926,108 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Offhook Auto-Dial Delay (0-60 seconds, default is 0)";
 		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "51df9860-8767-43a8-9bf9-857dc50c5f3f";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_dp750_use_standard_firmware_path";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "boolean";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "look for Grandstream DP750 firmware in the same location as other grandstream firmwares (if false /dp750 will be suffixed to the path)";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "51df9860-8767-43a8-9bf9-857dc50c5f3f";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_automatic_provisioning";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "if grandstream devices should automatically upgrade and reprovision themselves. 0 - no, 1 - every interval specified in minutes 2 - every day 3 - every week";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "51df9860-8767-43a8-9bf9-857dc50c5f3f";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_automatic_provisioning_minutes";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$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'] = "when grandstream_automatic_provisioning is set to 1, when do upgrade (specify number of minutes between update checks, 60-86400)";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "51df9860-8767-43a8-9bf9-857dc50c5f3f";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_automatic_provisioning_hour";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "1";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "when grandstream_automatic_provisioning is set to 2, when do upgrade (which hour of the day, 0-23)";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "51df9860-8767-43a8-9bf9-857dc50c5f3f";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_automatic_provisioning_day";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "1";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "when grandstream_automatic_provisioning is set to 3, when do upgrade (which day of the week, 0-6)";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "51df9860-8767-43a8-9bf9-857dc50c5f3f";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_key_mode";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "1";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Grandstream call screening key mode. 1 - line mode 2 - account mode";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "51df9860-8767-43a8-9bf9-857dc50c5f3f";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_auto_answer";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "boolean";
+		$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'] = "auto answer calls";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "51df9860-8767-43a8-9bf9-857dc50c5f3f";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_auto_answer_numbers";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$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'] = "when grandstream_auto_answer is enabled, only automatically answer calls from numbers matching this template (for example, specify XXX to auto-answer calls from 3 digit numbers)";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "51df9860-8767-43a8-9bf9-857dc50c5f3f";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_call_log";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$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'] = "0 - Log All Calls, 1 - Log Incoming/Outgoing only (missed calls NOT recorded), 2 - Disable Call Log. Default is 0";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "51df9860-8767-43a8-9bf9-857dc50c5f3f";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_handset_tx_gain";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$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'] = "handset TX gain";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "51df9860-8767-43a8-9bf9-857dc50c5f3f";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_24hr_time_display";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "boolean";
+		$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'] = "whether or not to use 24 hour time";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "51df9860-8767-43a8-9bf9-857dc50c5f3f";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_system_ring";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$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'] = "the system ringtone";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "51df9860-8767-43a8-9bf9-857dc50c5f3f";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_notification_tone_volume";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "5";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "notification tone volume 0-7";
+		$y++;
 ?>
diff --git a/resources/templates/provision/grandstream/dp750/{$mac}.xml b/resources/templates/provision/grandstream/dp750/{$mac}.xml
index 138c0a81a6..9e646b239e 100644
--- a/resources/templates/provision/grandstream/dp750/{$mac}.xml
+++ b/resources/templates/provision/grandstream/dp750/{$mac}.xml
@@ -12,6 +12,15 @@
 <!-- #  Profile 1  ## -->
 <!-- ################ -->
 
+<!-- # Enable DND Feature. 0 - No, 1 - Yes. Default is 1 -->
+<!-- # Number: 0, 1 -->
+<!-- # Mandatory -->
+{if isset($dnd)}
+<P8446>{$dnd}</P8446>
+{else}
+<P8446>1</P8446>
+{/if}
+
 <!-- ################################# -->
 <!-- #  Profile 1/General Settings  ## -->
 <!-- ################################# -->
@@ -2887,7 +2896,7 @@
 {if isset($grandstream_firmware_path) && isset($firmware_version)}
 <P192>{$grandstream_firmware_path}/dp750/{$firmware_version}</P192>
 {elseif isset($grandstream_firmware_path)}
-<P192>{$grandstream_firmware_path}/dp750</P192>
+{if isset($grandstream_dp750_use_standard_firmware_path)}<P192>{$grandstream_firmware_path}</P192>{else}<P192>{$grandstream_firmware_path}/dp750</P192>{/if}
 {else}
 <P192>{$domain_name}{$project_path}/app/provision</P192>
 {/if}
diff --git a/resources/templates/provision/grandstream/grp2613/{$mac}.xml b/resources/templates/provision/grandstream/grp2613/{$mac}.xml
index a78d29696d..69a52995c6 100644
--- a/resources/templates/provision/grandstream/grp2613/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2613/{$mac}.xml
@@ -3269,37 +3269,49 @@
     <!-- # Mandatory -->
     <P1414>0</P1414>
 
-    <!-- # Automatic Upgrade.  -->
-    <!-- # 0 - No,  -->
-    <!-- # 1 - Yes, check for upgrade based on minute(s) setting, -->
-    <!-- # 2 - Yes, check for upgrade based on Hour of Day setting, -->
-    <!-- # 3 - Yes, check for upgrade based on Day of Week setting, -->
-    <!-- # Default is No -->
-    <!-- # Number: 0, 1, 2, 3 -->
-    <!-- # Mandatory -->
+    <!-- Automatic Provisioning.  -->
+    <!-- 0 - No,  -->
+    <!-- 1 - Yes, check for provisioning based on minute(s) setting, -->
+    <!-- 2 - Yes, check for provisioning based on Hour of Day setting, -->
+    <!-- 3 - Yes, check for provisioning based on Day of Week setting, -->
+    <!-- Default is No. -->
+    <!-- Number: 0, 1, 2, 3 -->
+    <!-- Mandatory -->
+    {if isset($grandstream_automatic_provisioning) }
+    <P194>{$grandstream_automatic_provisioning}</P194>
+    {else}
     <P194>0</P194>
+    {/if}
 
-    <!-- # Check for new firmware every () minutes. Default is 7 days. -->
-    <!-- # Number: 60-86400 -->
-    <!-- # Mandatory -->
+    <!-- Automatic Provisioning. Check for new config file every () minutes. Default is 7 days. -->
+    <!-- Number: 60-86400 -->
+    <!-- Mandatory -->
+    {if isset($grandstream_automatic_provisioning_minutes)}
+    <P193>{$grandstream_automatic_provisioning_minutes}</P193>
+    {else}
     <P193>10080</P193>
+    {/if}
+
+    <!-- Automatic Provisioning. Hour of the Day (0-23). Defines the hour of the day to check the HTTP/TFTP server for configuration file changes. Default is 1.  -->
+    <!-- Number: 0 - 23 -->
+    {if isset($grandstream_automatic_provisioning_hour)}
+    <P285>{$grandstream_automatic_provisioning_hour}</P285>
+    {else}
+    <P285>1</P285>
+    {/if}
+
+    <!-- Automatic Provisioning. Day of the Week (0-6). Defines the day of the week to check HTTP/TFTP server for configuration file changes. Default is 1. -->
+    <!-- Number: 0-6 -->
+    {if isset($grandstream_automatic_provisioning_day)}
+    <P286>{$grandstream_automatic_provisioning_day}</P286>
+    {else}
+    <P286>1</P286>
+    {/if}
 
     <!-- # Radomized Automitic Upgrade. 0 - No, 1 - Yes. Default is No -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P8458>1</P8458>
-
-    <!-- # Hour of the Day ~~ Start (0-23). Default is 1 -->
-    <!-- # Number: 0 - 23 -->
-    <P285>0</P285>
-
-    <!-- # Hour of the Day ~~ End (-1, 0-23). Default is 0 -->
-    <!-- # Number: -1, 0 - 23 -->
-    <P8459>0</P8459>
-
-    <!-- # Day of the Week (0-6). Default is 1 -->
-    <!-- # Number: 0-6 -->
-    <P286>0</P286>
+    <P8458>0</P8458>
 
     <!-- # Disable SIP NOTIFY Authentication. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0,1 -->
@@ -5242,7 +5254,9 @@
     <!-- # Key Mode. 1 - Line Mode, 2 - Account Mode. Default is 1 -->
     <!-- # Number: 1, 2 -->
     <!-- # Mandatory -->
-    <P8369>1</P8369>
+    {if isset($grandstream_key_mode)}
+    <P8369>{$grandstream_key_mode}</P8369> <!-- Call Screen Settings # Key Mode. 1 - Line Mode, 2 - Account Mode. Default is 1 -->
+    {/if}
 
     <!-- # Transfer Mode via VPK. 0 - Blind Transfer, 1 - Attended Transfer, 2 - New Call. Default is 0 -->
     <!-- # Number: 0, 1, 2 -->
diff --git a/resources/templates/provision/grandstream/grp2615/{$mac}.xml b/resources/templates/provision/grandstream/grp2615/{$mac}.xml
index eaf51d3942..c5eff1e521 100644
--- a/resources/templates/provision/grandstream/grp2615/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2615/{$mac}.xml
@@ -719,7 +719,7 @@
     <!-- # Call Log. 0 - Log All Calls, 1 - Log Incoming/Outgoing only (missed calls NOT recorded), 2 - Disable Call Log. Default is 0 -->
     <!-- # Number: 0, 1, 2 -->
     <!-- # Mandatory -->
-    <P182>0</P182>
+    {if isset($grandstream_call_log) }<P182>{$grandstream_call_log}</P182>{else}<P182>0</P182>{/if}
 
     <!-- # Send Anonymous (caller ID will be blocked if set to Yes). 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
@@ -734,7 +734,8 @@
     <!-- # Auto Answer. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P90>0</P90>
+    {if isset($grandstream_auto_answer) }<P90>{$grandstream_auto_answer}</P90>{else}<P90>0</P90>{/if}
+    {if isset($grandstream_auto_answer_numbers) }<P29064>{$grandstream_auto_answer_numbers}</P29064>{/if}
 
     <!-- # Refer-To Use Target Contact. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
@@ -5526,37 +5527,49 @@
     <!-- # Mandatory -->
     <P1414>0</P1414>
 
-    <!-- # Automatic Upgrade.  -->
-    <!-- # 0 - No,  -->
-    <!-- # 1 - Yes, check for upgrade based on minute(s) setting, -->
-    <!-- # 2 - Yes, check for upgrade based on Hour of Day setting, -->
-    <!-- # 3 - Yes, check for upgrade based on Day of Week setting, -->
-    <!-- # Default is No -->
-    <!-- # Number: 0, 1, 2, 3 -->
-    <!-- # Mandatory -->
+    <!-- Automatic Provisioning.  -->
+    <!-- 0 - No,  -->
+    <!-- 1 - Yes, check for provisioning based on minute(s) setting, -->
+    <!-- 2 - Yes, check for provisioning based on Hour of Day setting, -->
+    <!-- 3 - Yes, check for provisioning based on Day of Week setting, -->
+    <!-- Default is No. -->
+    <!-- Number: 0, 1, 2, 3 -->
+    <!-- Mandatory -->
+    {if isset($grandstream_automatic_provisioning) }
+    <P194>{$grandstream_automatic_provisioning}</P194>
+    {else}
     <P194>0</P194>
+    {/if}
 
-    <!-- # Check for new firmware every () minutes. Default is 7 days. -->
-    <!-- # Number: 60-86400 -->
-    <!-- # Mandatory -->
+    <!-- Automatic Provisioning. Check for new config file every () minutes. Default is 7 days. -->
+    <!-- Number: 60-86400 -->
+    <!-- Mandatory -->
+    {if isset($grandstream_automatic_provisioning_minutes)}
+    <P193>{$grandstream_automatic_provisioning_minutes}</P193>
+    {else}
     <P193>10080</P193>
+    {/if}
+
+    <!-- Automatic Provisioning. Hour of the Day (0-23). Defines the hour of the day to check the HTTP/TFTP server for configuration file changes. Default is 1.  -->
+    <!-- Number: 0 - 23 -->
+    {if isset($grandstream_automatic_provisioning_hour)}
+    <P285>{$grandstream_automatic_provisioning_hour}</P285>
+    {else}
+    <P285>1</P285>
+    {/if}
+
+    <!-- Automatic Provisioning. Day of the Week (0-6). Defines the day of the week to check HTTP/TFTP server for configuration file changes. Default is 1. -->
+    <!-- Number: 0-6 -->
+    {if isset($grandstream_automatic_provisioning_day)}
+    <P286>{$grandstream_automatic_provisioning_day}</P286>
+    {else}
+    <P286>1</P286>
+    {/if}
 
     <!-- # Radomized Automitic Upgrade. 0 - No, 1 - Yes. Default is No -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P8458>1</P8458>
-
-    <!-- # Hour of the Day ~~ Start (0-23). Default is 1 -->
-    <!-- # Number: 0 - 23 -->
-    <P285>0</P285>
-
-    <!-- # Hour of the Day ~~ End (-1, 0-23). Default is 0 -->
-    <!-- # Number: -1, 0 - 23 -->
-    <P8459>0</P8459>
-
-    <!-- # Day of the Week (0-6). Default is 1 -->
-    <!-- # Number: 0-6 -->
-    <P286>0</P286>
+    <P8458>0</P8458>
 
     <!-- # Disable SIP NOTIFY Authentication. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0,1 -->
@@ -7227,7 +7240,7 @@
     <!-- # Handset TX gain(db). 1 - -6, 0 - 0, 2 - +6. Default is 0 -->
     <!-- # Number: 0, 1, 2 -->
     <!-- # Mandatory -->
-    <P1464>0</P1464>
+    {if isset($grandstream_handset_tx_gain)}<P1464>{$grandstream_handset_tx_gain}</P1464>{else}<P1464>0</P1464>{/if}
 
     <!-- ############################################################################## -->
     <!-- ##  Settings/Preferences / Date and Time -->
@@ -7360,7 +7373,7 @@
     <!-- # Time Display Format. 0 - 12 Hour, 1 - 24 Hour -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P122>0</P122>
+    {if isset($grandstream_24hr_time_display)}<P122>{$grandstream_24hr_time_display}</P122>{else}<P122>0</P122>{/if}
 
     <!-- # Show Date On Status Bar. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
@@ -7488,7 +7501,7 @@
     <!-- # System Ring Tone -->
     <!-- # String -->
     <!-- # Mandatory -->
-    <P345>f1=500,f2=540,c=20/20-80/400;</P345>
+    {if isset($grandstream_system_ring)}<P345>{$grandstream_system_ring}</P345>{else}<P345>f1=500,f2=540,c=20/20-80/400;</P345>{/if}
 
     <!-- # Dial Tone -->
     <!-- # String -->
@@ -7540,7 +7553,7 @@
     <!-- # Notification Tone Volume -->
     <!-- # Number: 0-7. Default is 5. -->
     <!-- # Mandatory -->
-    <P8399>5</P8399>
+    {if isset($grandstream_notification_tone_volume)}<P8399>{$grandstream_notification_tone_volume}</P8399>{/if}
 
     <!-- # Lock Volumne. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
@@ -7606,7 +7619,7 @@
     <!-- # Key Mode. 1 - Line Mode, 2 - Account Mode. Default is 1 -->
     <!-- # Number: 1, 2 -->
     <!-- # Mandatory -->
-    <P8369>1</P8369>
+    {if isset($grandstream_key_mode)}<P8369>{$grandstream_key_mode}</P8369>{else}<P8369>1</P8369>{/if}
 
     <!-- # Transfer Mode via VPK. 0 - Blind Transfer, 1 - Attended Transfer, 2 - New Call. Default is 0 -->
     <!-- # Number: 0, 1, 2 -->