diff --git a/app/grandstream/app_config.php b/app/grandstream/app_config.php
index 7481ecd53f..97b43b7ffb 100644
--- a/app/grandstream/app_config.php
+++ b/app/grandstream/app_config.php
@@ -784,6 +784,54 @@
 		$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++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "c1d2e3f4-5a6b-7c8d-9e0f-1a2b3c4d5e6f";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_wifi_ap1_ssid";
+		$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'] = "WiFi Access Point 1 SSID (network name).";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "d2e3f4g5-6b7c-8d9e-0f1g-2b3c4d5e6f7g";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_wifi_ap1_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'] = "WiFi Access Point 1 password.";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "e3f4g5h6-7c8d-9e0f-1g2h-3c4d5e6f7g8h";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_wifi_ap1_type";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "WPA_PSK";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "WiFi Access Point 1 security type. Valid values: None, WEP, WPA_PSK, WPA_WPA2_PSK, WPA_WPA2_EAP, Auto.";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "f4g5h6i7-8d9e-0f1g-2h3i-4d5e6f7g8h9i";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_wifi_ap2_ssid";
+		$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'] = "WiFi Access Point 2 SSID (network name).";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "g5h6i7j8-9e0f-1g2h-3i4j-5e6f7g8h9i0j";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_wifi_ap2_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'] = "WiFi Access Point 2 password.";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "h6i7j8k9-0f1g-2h3i-4j5k-6f7g8h9i0j1k";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_wifi_ap2_type";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "WPA_PSK";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "WiFi Access Point 2 security type. Valid values: None, WEP, WPA_PSK, WPA_WPA2_PSK, WPA_WPA2_EAP, Auto.";
+		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "032e7e44-2f61-4d62-ba64-00199a51b4f6";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_dhcp_option_override";
diff --git a/resources/templates/provision/grandstream/grp2612/{$mac}.xml b/resources/templates/provision/grandstream/grp2612/{$mac}.xml
index 9126e7f867..cdc766f6ad 100644
--- a/resources/templates/provision/grandstream/grp2612/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2612/{$mac}.xml
@@ -1488,19 +1488,31 @@
 		<!-- # SSID -->
 		<!-- # String -->
 		<!-- Pvalue P8403 -->
+{if isset($grandstream_wifi_ap1_ssid)}
+		<item name="network.wifi.ap.1.ssid">{$grandstream_wifi_ap1_ssid}</item>
+{else}
 		<item name="network.wifi.ap.1.ssid"></item>
+{/if}
 
 		<!-- # Access Point 1 -->
 		<!-- # Password -->
 		<!-- # String -->
 		<!-- Pvalue P8404 -->
+{if isset($grandstream_wifi_ap1_password)}
+		<item name="network.wifi.ap.1.password">{$grandstream_wifi_ap1_password}</item>
+{else}
 		<item name="network.wifi.ap.1.password"></item>
+{/if}
 
 		<!-- # Access Point 1 -->
 		<!-- # Security Type -->
 		<!-- #  None, WEP, WPA_WPA2 PSK, WPA_WPA2 EAP, Auto.  -->
 		<!-- Pvalue P8405 -->
+{if isset($grandstream_wifi_ap1_type)}
+		<item name="network.wifi.ap.1.type">{$grandstream_wifi_ap1_type}</item>
+{else}
 		<item name="network.wifi.ap.1.type">WPA_PSK</item>
+{/if}
 
 		<!-- # Access Point 1 -->
 		<!-- # EAP Method -->
@@ -1524,19 +1536,31 @@
 		<!-- # SSID -->
 		<!-- # String -->
 		<!-- Pvalue P8406 -->
+{if isset($grandstream_wifi_ap2_ssid)}
+		<item name="network.wifi.ap.2.ssid">{$grandstream_wifi_ap2_ssid}</item>
+{else}
 		<item name="network.wifi.ap.2.ssid"></item>
+{/if}
 
 		<!-- # Access Point 2 -->
 		<!-- # Password -->
 		<!-- # String -->
 		<!-- Pvalue P8407 -->
+{if isset($grandstream_wifi_ap2_password)}
+		<item name="network.wifi.ap.2.password">{$grandstream_wifi_ap2_password}</item>
+{else}
 		<item name="network.wifi.ap.2.password"></item>
+{/if}
 
 		<!-- # Access Point 2 -->
 		<!-- # Security Type -->
 		<!-- #  None, WEP, WPA/WPA2 PSK,  WPA/WPA2 EAP, Auto.  -->
 		<!-- Pvalue P8408 -->
+{if isset($grandstream_wifi_ap2_type)}
+		<item name="network.wifi.ap.2.type">{$grandstream_wifi_ap2_type}</item>
+{else}
 		<item name="network.wifi.ap.2.type">WPA_PSK</item>
+{/if}
 
 		<!-- # Access Point 2 -->
 		<!-- # EAP Method -->
diff --git a/resources/templates/provision/grandstream/grp2613/{$mac}.xml b/resources/templates/provision/grandstream/grp2613/{$mac}.xml
index 294b7e256f..5d02269207 100644
--- a/resources/templates/provision/grandstream/grp2613/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2613/{$mac}.xml
@@ -1488,19 +1488,31 @@
 		<!-- # SSID -->
 		<!-- # String -->
 		<!-- Pvalue P8403 -->
+{if isset($grandstream_wifi_ap1_ssid)}
+		<item name="network.wifi.ap.1.ssid">{$grandstream_wifi_ap1_ssid}</item>
+{else}
 		<item name="network.wifi.ap.1.ssid"></item>
+{/if}
 
 		<!-- # Access Point 1 -->
 		<!-- # Password -->
 		<!-- # String -->
 		<!-- Pvalue P8404 -->
+{if isset($grandstream_wifi_ap1_password)}
+		<item name="network.wifi.ap.1.password">{$grandstream_wifi_ap1_password}</item>
+{else}
 		<item name="network.wifi.ap.1.password"></item>
+{/if}
 
 		<!-- # Access Point 1 -->
 		<!-- # Security Type -->
 		<!-- #  None, WEP, WPA_WPA2 PSK, WPA_WPA2 EAP, Auto.  -->
 		<!-- Pvalue P8405 -->
+{if isset($grandstream_wifi_ap1_type)}
+		<item name="network.wifi.ap.1.type">{$grandstream_wifi_ap1_type}</item>
+{else}
 		<item name="network.wifi.ap.1.type">WPA_PSK</item>
+{/if}
 
 		<!-- # Access Point 1 -->
 		<!-- # EAP Method -->
@@ -1524,19 +1536,31 @@
 		<!-- # SSID -->
 		<!-- # String -->
 		<!-- Pvalue P8406 -->
+{if isset($grandstream_wifi_ap2_ssid)}
+		<item name="network.wifi.ap.2.ssid">{$grandstream_wifi_ap2_ssid}</item>
+{else}
 		<item name="network.wifi.ap.2.ssid"></item>
+{/if}
 
 		<!-- # Access Point 2 -->
 		<!-- # Password -->
 		<!-- # String -->
 		<!-- Pvalue P8407 -->
+{if isset($grandstream_wifi_ap2_password)}
+		<item name="network.wifi.ap.2.password">{$grandstream_wifi_ap2_password}</item>
+{else}
 		<item name="network.wifi.ap.2.password"></item>
+{/if}
 
 		<!-- # Access Point 2 -->
 		<!-- # Security Type -->
 		<!-- #  None, WEP, WPA/WPA2 PSK,  WPA/WPA2 EAP, Auto.  -->
 		<!-- Pvalue P8408 -->
+{if isset($grandstream_wifi_ap2_type)}
+		<item name="network.wifi.ap.2.type">{$grandstream_wifi_ap2_type}</item>
+{else}
 		<item name="network.wifi.ap.2.type">WPA_PSK</item>
+{/if}
 
 		<!-- # Access Point 2 -->
 		<!-- # EAP Method -->
diff --git a/resources/templates/provision/grandstream/grp2614/{$mac}.xml b/resources/templates/provision/grandstream/grp2614/{$mac}.xml
index 294b7e256f..5d02269207 100644
--- a/resources/templates/provision/grandstream/grp2614/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2614/{$mac}.xml
@@ -1488,19 +1488,31 @@
 		<!-- # SSID -->
 		<!-- # String -->
 		<!-- Pvalue P8403 -->
+{if isset($grandstream_wifi_ap1_ssid)}
+		<item name="network.wifi.ap.1.ssid">{$grandstream_wifi_ap1_ssid}</item>
+{else}
 		<item name="network.wifi.ap.1.ssid"></item>
+{/if}
 
 		<!-- # Access Point 1 -->
 		<!-- # Password -->
 		<!-- # String -->
 		<!-- Pvalue P8404 -->
+{if isset($grandstream_wifi_ap1_password)}
+		<item name="network.wifi.ap.1.password">{$grandstream_wifi_ap1_password}</item>
+{else}
 		<item name="network.wifi.ap.1.password"></item>
+{/if}
 
 		<!-- # Access Point 1 -->
 		<!-- # Security Type -->
 		<!-- #  None, WEP, WPA_WPA2 PSK, WPA_WPA2 EAP, Auto.  -->
 		<!-- Pvalue P8405 -->
+{if isset($grandstream_wifi_ap1_type)}
+		<item name="network.wifi.ap.1.type">{$grandstream_wifi_ap1_type}</item>
+{else}
 		<item name="network.wifi.ap.1.type">WPA_PSK</item>
+{/if}
 
 		<!-- # Access Point 1 -->
 		<!-- # EAP Method -->
@@ -1524,19 +1536,31 @@
 		<!-- # SSID -->
 		<!-- # String -->
 		<!-- Pvalue P8406 -->
+{if isset($grandstream_wifi_ap2_ssid)}
+		<item name="network.wifi.ap.2.ssid">{$grandstream_wifi_ap2_ssid}</item>
+{else}
 		<item name="network.wifi.ap.2.ssid"></item>
+{/if}
 
 		<!-- # Access Point 2 -->
 		<!-- # Password -->
 		<!-- # String -->
 		<!-- Pvalue P8407 -->
+{if isset($grandstream_wifi_ap2_password)}
+		<item name="network.wifi.ap.2.password">{$grandstream_wifi_ap2_password}</item>
+{else}
 		<item name="network.wifi.ap.2.password"></item>
+{/if}
 
 		<!-- # Access Point 2 -->
 		<!-- # Security Type -->
 		<!-- #  None, WEP, WPA/WPA2 PSK,  WPA/WPA2 EAP, Auto.  -->
 		<!-- Pvalue P8408 -->
+{if isset($grandstream_wifi_ap2_type)}
+		<item name="network.wifi.ap.2.type">{$grandstream_wifi_ap2_type}</item>
+{else}
 		<item name="network.wifi.ap.2.type">WPA_PSK</item>
+{/if}
 
 		<!-- # Access Point 2 -->
 		<!-- # EAP Method -->
diff --git a/resources/templates/provision/grandstream/grp2615/{$mac}.xml b/resources/templates/provision/grandstream/grp2615/{$mac}.xml
index 294b7e256f..5d02269207 100644
--- a/resources/templates/provision/grandstream/grp2615/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2615/{$mac}.xml
@@ -1488,19 +1488,31 @@
 		<!-- # SSID -->
 		<!-- # String -->
 		<!-- Pvalue P8403 -->
+{if isset($grandstream_wifi_ap1_ssid)}
+		<item name="network.wifi.ap.1.ssid">{$grandstream_wifi_ap1_ssid}</item>
+{else}
 		<item name="network.wifi.ap.1.ssid"></item>
+{/if}
 
 		<!-- # Access Point 1 -->
 		<!-- # Password -->
 		<!-- # String -->
 		<!-- Pvalue P8404 -->
+{if isset($grandstream_wifi_ap1_password)}
+		<item name="network.wifi.ap.1.password">{$grandstream_wifi_ap1_password}</item>
+{else}
 		<item name="network.wifi.ap.1.password"></item>
+{/if}
 
 		<!-- # Access Point 1 -->
 		<!-- # Security Type -->
 		<!-- #  None, WEP, WPA_WPA2 PSK, WPA_WPA2 EAP, Auto.  -->
 		<!-- Pvalue P8405 -->
+{if isset($grandstream_wifi_ap1_type)}
+		<item name="network.wifi.ap.1.type">{$grandstream_wifi_ap1_type}</item>
+{else}
 		<item name="network.wifi.ap.1.type">WPA_PSK</item>
+{/if}
 
 		<!-- # Access Point 1 -->
 		<!-- # EAP Method -->
@@ -1524,19 +1536,31 @@
 		<!-- # SSID -->
 		<!-- # String -->
 		<!-- Pvalue P8406 -->
+{if isset($grandstream_wifi_ap2_ssid)}
+		<item name="network.wifi.ap.2.ssid">{$grandstream_wifi_ap2_ssid}</item>
+{else}
 		<item name="network.wifi.ap.2.ssid"></item>
+{/if}
 
 		<!-- # Access Point 2 -->
 		<!-- # Password -->
 		<!-- # String -->
 		<!-- Pvalue P8407 -->
+{if isset($grandstream_wifi_ap2_password)}
+		<item name="network.wifi.ap.2.password">{$grandstream_wifi_ap2_password}</item>
+{else}
 		<item name="network.wifi.ap.2.password"></item>
+{/if}
 
 		<!-- # Access Point 2 -->
 		<!-- # Security Type -->
 		<!-- #  None, WEP, WPA/WPA2 PSK,  WPA/WPA2 EAP, Auto.  -->
 		<!-- Pvalue P8408 -->
+{if isset($grandstream_wifi_ap2_type)}
+		<item name="network.wifi.ap.2.type">{$grandstream_wifi_ap2_type}</item>
+{else}
 		<item name="network.wifi.ap.2.type">WPA_PSK</item>
+{/if}
 
 		<!-- # Access Point 2 -->
 		<!-- # EAP Method -->
diff --git a/resources/templates/provision/grandstream/grp2616/{$mac}.xml b/resources/templates/provision/grandstream/grp2616/{$mac}.xml
index 294b7e256f..5d02269207 100644
--- a/resources/templates/provision/grandstream/grp2616/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2616/{$mac}.xml
@@ -1488,19 +1488,31 @@
 		<!-- # SSID -->
 		<!-- # String -->
 		<!-- Pvalue P8403 -->
+{if isset($grandstream_wifi_ap1_ssid)}
+		<item name="network.wifi.ap.1.ssid">{$grandstream_wifi_ap1_ssid}</item>
+{else}
 		<item name="network.wifi.ap.1.ssid"></item>
+{/if}
 
 		<!-- # Access Point 1 -->
 		<!-- # Password -->
 		<!-- # String -->
 		<!-- Pvalue P8404 -->
+{if isset($grandstream_wifi_ap1_password)}
+		<item name="network.wifi.ap.1.password">{$grandstream_wifi_ap1_password}</item>
+{else}
 		<item name="network.wifi.ap.1.password"></item>
+{/if}
 
 		<!-- # Access Point 1 -->
 		<!-- # Security Type -->
 		<!-- #  None, WEP, WPA_WPA2 PSK, WPA_WPA2 EAP, Auto.  -->
 		<!-- Pvalue P8405 -->
+{if isset($grandstream_wifi_ap1_type)}
+		<item name="network.wifi.ap.1.type">{$grandstream_wifi_ap1_type}</item>
+{else}
 		<item name="network.wifi.ap.1.type">WPA_PSK</item>
+{/if}
 
 		<!-- # Access Point 1 -->
 		<!-- # EAP Method -->
@@ -1524,19 +1536,31 @@
 		<!-- # SSID -->
 		<!-- # String -->
 		<!-- Pvalue P8406 -->
+{if isset($grandstream_wifi_ap2_ssid)}
+		<item name="network.wifi.ap.2.ssid">{$grandstream_wifi_ap2_ssid}</item>
+{else}
 		<item name="network.wifi.ap.2.ssid"></item>
+{/if}
 
 		<!-- # Access Point 2 -->
 		<!-- # Password -->
 		<!-- # String -->
 		<!-- Pvalue P8407 -->
+{if isset($grandstream_wifi_ap2_password)}
+		<item name="network.wifi.ap.2.password">{$grandstream_wifi_ap2_password}</item>
+{else}
 		<item name="network.wifi.ap.2.password"></item>
+{/if}
 
 		<!-- # Access Point 2 -->
 		<!-- # Security Type -->
 		<!-- #  None, WEP, WPA/WPA2 PSK,  WPA/WPA2 EAP, Auto.  -->
 		<!-- Pvalue P8408 -->
+{if isset($grandstream_wifi_ap2_type)}
+		<item name="network.wifi.ap.2.type">{$grandstream_wifi_ap2_type}</item>
+{else}
 		<item name="network.wifi.ap.2.type">WPA_PSK</item>
+{/if}
 
 		<!-- # Access Point 2 -->
 		<!-- # EAP Method -->