diff --git a/app/grandstream/app_config.php b/app/grandstream/app_config.php
index 04ed271cf0..e7a9fa208c 100644
--- a/app/grandstream/app_config.php
+++ b/app/grandstream/app_config.php
@@ -654,5 +654,45 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Number: 0-7. Default is 5.";
 		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "6f3f3390-2b69-4898-a4d9-e62249d58d58";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_feature_key_sync";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "boolean";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Configure Broadsoft feature key synchronization on supported phones";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "a6c84c0b-a7f1-4457-8afb-b64af601597d";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_wifi_enable";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "boolean";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Configure the WiFi radio on supported phones. If disabled allow the device to manage itself";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "f7fdbe09-0d4a-4d06-b70b-e25cdf1b3376";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_wifi_essid";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Configure the WiFi ESSID on supported phones";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "2edaa516-d87e-410f-8ddc-1cc468dabd2e";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_wifi_password";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Configure the WiFi password on supported phones";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "7b525ca5-96ae-4104-ad6c-c929f85c30dc";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_wifi_hidden_security";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "None";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Configure the security to use when connecting to a hidden SSID. Valid values: None, WEP, WPA/WPA2_PSK, 802.1X_EAP";
+		$y++;
 
 ?>
diff --git a/resources/templates/provision/grandstream/gxv3370/{$mac}.xml b/resources/templates/provision/grandstream/gxv3370/{$mac}.xml
index ba91904f09..085bd7a811 100644
--- a/resources/templates/provision/grandstream/gxv3370/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxv3370/{$mac}.xml
@@ -457,7 +457,7 @@
 		<!-- Value-added Service - Broadsoft Settings - Braodsoft Call Features -->
 		<!-- Feature Key Synchronization -->
 		<!-- No - Disable, Yes - Broadsoft -->
-		<item name="account.{$row.line_number}.broadsoft.syncFeatureKey">{if isset($grandstream_feature_key_sync)}Yes{else}No{/if}</item>
+		<item name="account.{$row.line_number}.broadsoft.syncFeatureKey">{if filter_var($grandstream_feature_key_sync, FILTER_VALIDATE_BOOLEAN)}Yes{else}No{/if}</item>
 		<!-- Enable BroadSoft Call Park -->
 		<!-- Yes, No -->
 		<item name="account.{$row.line_number}.broadsoft.callPark">No</item>
@@ -733,17 +733,21 @@
 		<item name="network.md5Password"></item>
 		<!-- Wi-Fi Settings -->
 		<!-- Wi-Fi Function -->
+		{if isset($grandstream_wifi_enable)}
 		<!-- No, Yes -->
-		<item name="wifi.enable">No</item>
+		<item name="wifi.enable">{if filter_var($grandstream_wifi_enable, FILTER_VALIDATE_BOOLEAN)}Yes{else}No{/if}</item>
 		<!-- ESSID -->
-		<item name="wifi.essidname"></item>
+		{if isset($grandstream_wifi_essid)}
+		<item name="wifi.essidname">{$grandstream_wifi_essid}</item>
 		<!-- Password -->
-		<item name="wifi.essidpassword"></item>
+		<item name="wifi.essidpassword">{$grandstream_wifi_password}</item>
 		<!-- Security Mode for Hidden SSID -->
 		<!-- None, WEP, WPA/WPA2_PSK, 802.1X_EAP -->
-		<item name="wifi.hiddenessid.securitymode">None</item>
+		<item name="wifi.hiddenessid.securitymode">{$grandstream_wifi_hidden_security}</item>
+		{/if}
 		<!-- Layer 2 QoS 802.1p Priority Value (Wi-Fi) -->
 		<item name="wifi.layer2qos.priority">0</item>
+		{/if}
 		<!-- OpenVPN Settings -->
 		<!-- Enable OpenVPN -->
 		<!-- Yes, No -->