diff --git a/app/grandstream/app_config.php b/app/grandstream/app_config.php
index 0717ef9c3e..77de49d02e 100644
--- a/app/grandstream/app_config.php
+++ b/app/grandstream/app_config.php
@@ -388,4 +388,12 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "SRTP Mode. 0 - Disabled, 1 - Enabled but not forced, 2 - Enabled and forced, 3 - Optional. Default is 0";
 		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "5da62e0c-5eb0-11e8-9c2d-fa7ae01bbebc";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_city_code";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "Boise,ID";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Enter City to configure City for the Weather app on the Phone";
+		$y++;
 ?>
diff --git a/resources/templates/provision/grandstream/gxp2130/{$mac}.xml b/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
index 9f210aada2..97a116690a 100644
--- a/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
@@ -716,7 +716,7 @@
 <!--  Disable Recovery on Blind Transfer. 0 - No, 1 - Yes. Default is 0 -->
 <!--  Number: 0, 1 -->
 <!--  Mandatory -->
-<P2384>0</P2384>
+<P2384>1</P2384>
 
 <!--  No Key Entry Timeout (in seconds). Default is 4 -->
 <!--  Number: 1 - 15 -->
@@ -5970,11 +5970,16 @@
 <!--  0 - Self-Defined City Code, 1 - Automatic. Default is 1 -->
 <!--  Number: 0, 1 -->
 <!--  Mandatory -->
+{if isset($grandstream_city_code)}
+<P1405>0</P1405>
+{else}
 <P1405>1</P1405>
+{/if}
 
-<!--  Self-Defined City Code -->
-<!--  String -->
-<P1377></P1377>
+
+<!-- # Self-Defined City Code -->
+<!-- # String -->
+<P1377>{$grandstream_city_code}</P1377>
 
 <!--  Update Interval (in minutes). Default is 15 -->
 <!--  Number: 5 - 360 -->
diff --git a/resources/templates/provision/grandstream/gxp2135/{$mac}.xml b/resources/templates/provision/grandstream/gxp2135/{$mac}.xml
index dd15082533..247419fdb9 100644
--- a/resources/templates/provision/grandstream/gxp2135/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2135/{$mac}.xml
@@ -716,7 +716,7 @@
 <!--  Disable Recovery on Blind Transfer. 0 - No, 1 - Yes. Default is 0 -->
 <!--  Number: 0, 1 -->
 <!--  Mandatory -->
-<P2384>0</P2384>
+<P2384>1</P2384>
 
 <!--  No Key Entry Timeout (in seconds). Default is 4 -->
 <!--  Number: 1 - 15 -->
@@ -5970,11 +5970,16 @@
 <!--  0 - Self-Defined City Code, 1 - Automatic. Default is 1 -->
 <!--  Number: 0, 1 -->
 <!--  Mandatory -->
+{if isset($grandstream_city_code)}
+<P1405>0</P1405>
+{else}
 <P1405>1</P1405>
+{/if}
 
-<!--  Self-Defined City Code -->
-<!--  String -->
-<P1377></P1377>
+
+<!-- # Self-Defined City Code -->
+<!-- # String -->
+<P1377>{$grandstream_city_code}</P1377>
 
 <!--  Update Interval (in minutes). Default is 15 -->
 <!--  Number: 5 - 360 -->
diff --git a/resources/templates/provision/grandstream/gxp2140/{$mac}.xml b/resources/templates/provision/grandstream/gxp2140/{$mac}.xml
index dd15082533..247419fdb9 100644
--- a/resources/templates/provision/grandstream/gxp2140/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2140/{$mac}.xml
@@ -716,7 +716,7 @@
 <!--  Disable Recovery on Blind Transfer. 0 - No, 1 - Yes. Default is 0 -->
 <!--  Number: 0, 1 -->
 <!--  Mandatory -->
-<P2384>0</P2384>
+<P2384>1</P2384>
 
 <!--  No Key Entry Timeout (in seconds). Default is 4 -->
 <!--  Number: 1 - 15 -->
@@ -5970,11 +5970,16 @@
 <!--  0 - Self-Defined City Code, 1 - Automatic. Default is 1 -->
 <!--  Number: 0, 1 -->
 <!--  Mandatory -->
+{if isset($grandstream_city_code)}
+<P1405>0</P1405>
+{else}
 <P1405>1</P1405>
+{/if}
 
-<!--  Self-Defined City Code -->
-<!--  String -->
-<P1377></P1377>
+
+<!-- # Self-Defined City Code -->
+<!-- # String -->
+<P1377>{$grandstream_city_code}</P1377>
 
 <!--  Update Interval (in minutes). Default is 15 -->
 <!--  Number: 5 - 360 -->
diff --git a/resources/templates/provision/grandstream/gxp2160/{$mac}.xml b/resources/templates/provision/grandstream/gxp2160/{$mac}.xml
index dd15082533..247419fdb9 100644
--- a/resources/templates/provision/grandstream/gxp2160/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2160/{$mac}.xml
@@ -716,7 +716,7 @@
 <!--  Disable Recovery on Blind Transfer. 0 - No, 1 - Yes. Default is 0 -->
 <!--  Number: 0, 1 -->
 <!--  Mandatory -->
-<P2384>0</P2384>
+<P2384>1</P2384>
 
 <!--  No Key Entry Timeout (in seconds). Default is 4 -->
 <!--  Number: 1 - 15 -->
@@ -5970,11 +5970,16 @@
 <!--  0 - Self-Defined City Code, 1 - Automatic. Default is 1 -->
 <!--  Number: 0, 1 -->
 <!--  Mandatory -->
+{if isset($grandstream_city_code)}
+<P1405>0</P1405>
+{else}
 <P1405>1</P1405>
+{/if}
 
-<!--  Self-Defined City Code -->
-<!--  String -->
-<P1377></P1377>
+
+<!-- # Self-Defined City Code -->
+<!-- # String -->
+<P1377>{$grandstream_city_code}</P1377>
 
 <!--  Update Interval (in minutes). Default is 15 -->
 <!--  Number: 5 - 360 -->
diff --git a/resources/templates/provision/grandstream/gxp2170/{$mac}.xml b/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
index c444be71cb..a411419a0b 100644
--- a/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
@@ -731,7 +731,7 @@
 <!-- # Disable Recovery on Blind Transfer. 0 - No, 1 - Yes. Default is 0 -->
 <!-- # Number: 0, 1 -->
 <!-- # Mandatory -->
-<P2384>0</P2384>
+<P2384>1</P2384>
 
 <!-- # Blind Transfer Wait Timeout. Default is 30 -->
 <!-- # Number: 30 - 300 -->
@@ -7243,11 +7243,16 @@
 <!-- # 0 - Self-Defined City Code, 1 - Automatic. Default is 1 -->
 <!-- # Number: 0, 1 -->
 <!-- # Mandatory -->
+{if isset($grandstream_city_code)}
+<P1405>0</P1405>
+{else}
 <P1405>1</P1405>
+{/if}
+
 
 <!-- # Self-Defined City Code -->
 <!-- # String -->
-<P1377></P1377>
+<P1377>{$grandstream_city_code}</P1377>
 
 <!-- # Update Interval (in minutes). Default is 15 -->
 <!-- # Number: 5 - 360 -->