diff --git a/app/grandstream/app_config.php b/app/grandstream/app_config.php
index 51ab1a71bb..e95de2877c 100644
--- a/app/grandstream/app_config.php
+++ b/app/grandstream/app_config.php
@@ -736,9 +736,9 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Enable Blind Transfer to BLF Yes=1, No=0. Default=0";
 		$y++;
-		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "82b7076b-e596-49e8-b535-af86e21e0453";
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "85007752-f9da-46ad-ad61-0bca6e736135";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
-		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_ip_address_mode";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_ip_mode";
 		$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";
diff --git a/resources/templates/provision/grandstream/dp750/{$mac}.xml b/resources/templates/provision/grandstream/dp750/{$mac}.xml
index d9dcc91f9b..cb10479184 100644
--- a/resources/templates/provision/grandstream/dp750/{$mac}.xml
+++ b/resources/templates/provision/grandstream/dp750/{$mac}.xml
@@ -2721,7 +2721,7 @@
 <!-- Number: 0,1,2 -->
 <!-- Mandatory  -->
 <!-- Reboot required  -->
-<P8>{$grandstream_ip_address_mode}</P8>
+<P8>{$grandstream_ip_mode}</P8>
 
 <!-- Preferred DNS server -->
 <!-- Mandatory  -->
diff --git a/resources/templates/provision/grandstream/ghp6xx/{$mac}.xml b/resources/templates/provision/grandstream/ghp6xx/{$mac}.xml
index 68d29e4dc5..3a3b2f4900 100644
--- a/resources/templates/provision/grandstream/ghp6xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/ghp6xx/{$mac}.xml
@@ -995,7 +995,7 @@
 		
 		<!-- IPv4 Address Type -->
 		<!-- DHCP, Static IP -->
-		{if isset($grandstream_ip_address_mode) && $grandstream_ip_address_mode == 1}
+		{if isset($grandstream_ip_mode) && $grandstream_ip_mode == 1}
 		<item name="network.port.eth.1.type">Static IP</item>
 		{else}
 		<item name="network.port.eth.1.type">DHCP</item>
diff --git a/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml b/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml
index d4ee4cabe6..00668ce30a 100644
--- a/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml
@@ -18,8 +18,8 @@
 <!-- Number: 0,1,2 -->
 <!-- Mandatory -->
 <!-- Reboot required -->
-{if isset($grandstream_ip_address_mode)}
-<P8>{$grandstream_ip_address_mode}</P8>
+{if isset($grandstream_ip_mode)}
+<P8>{$grandstream_ip_mode}</P8>
 {else}
 <P8>0</P8>
 {/if}