diff --git a/resources/templates/provision/grandstream/gxp2130/{$mac}.xml b/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
index 2aff9e620e..6a84381ab6 100644
--- a/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
@@ -9,7 +9,7 @@
 <!-- ################################################################### -->
 <!--  Account Settings                                                ## -->
 <!-- ################################################################### -->
-<!-- ################################################################### -->
+<!-- ######################a############################################# -->
 <!--  Account 1                                                       ## -->
 <!-- ################################################################### -->
 <!-- ############################################################## -->
@@ -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 -->
@@ -1586,7 +1586,7 @@
 <!--  Name -->
 <!--  String -->
 <P507>{$display_name_3}</P507>
-	
+
 <!--  Voice Mail UserID -->
 <!--  String -->
 <P526>*97</P526>
@@ -4573,7 +4573,7 @@
 <!--  String -->
 <!--  For GXP2130, Default value is Grandstream GXP2130. -->
 <!-- P148>Grandstream GXP2130</P148> -->
- 
+
 <!--  For GXP2140, Default value is Grandstream GXP2140. -->
 <!-- P148>Grandstream GXP2140</P148> -->
 
@@ -5493,7 +5493,7 @@
 <!--  User-Agent Prefix -->
 <!--  String -->
 <P8358></P8358>
- 
+
 <!--  Auto Provision List Starting Point. 0 - Extension Boards, 1 - VPKs, 2 - MPK . Default is 0.  - VPK/MPK is for GXP2130 only. Extension Boards/VPK is for GXP2140/2160/2170. -->
 <!--  Number: 0, 1, 2  -->
 <!--  Mandatory -->
@@ -5503,12 +5503,12 @@
 <!--  Number: 10 - 900 -->
 <!--  Mandatory -->
 <P26055>10</P26055>
- 
+
 <!--  Play Tone On Receiving IM. 0 - Disable, 1 - Enable. Default is 0 -->
 <!--  Number: 0, 1 -->
 <!--  Mandatory -->
 <P26056>0</P26056>
- 
+
 <!--  Allow Incoming Call Before Ringing. 0 - No, 1 - Yes. Default is 0 -->
 <!--  Number: 0, 1 -->
 <!--  Mandatory -->
@@ -5970,11 +5970,17 @@
 <!--  0 - Self-Defined City Code, 1 - Automatic. Default is 1 -->
 <!--  Number: 0, 1 -->
 <!--  Mandatory -->
-<P1405>{$grandstream_city_code_auto}</P1405>
+{if isset($grandstream_city_code)}
+<P1405>0</P1405>
+{else}
+<P1405>1</P1405>
+{/if}
 
-<!--  Self-Defined City Code -->
-<!--  String -->
+
+<!-- # Self-Defined City Code -->
+<!-- # String -->
 <P1377>{$grandstream_city_code}</P1377>
+
 <!--  Update Interval (in minutes). Default is 15 -->
 <!--  Number: 5 - 360 -->
 <!--  Mandatory -->
@@ -5983,7 +5989,11 @@
 <!--  Degree Unit. auto - Automatic, f - Fahrenheit, c - Celsius. Default is auto -->
 <!--  String: auto, f, c -->
 <!--  Mandatory -->
-<P1379>c</P1379>
+{if isset($grandstream_temp_unit)}
+<P1379>{$grandstream_temp_unit}</P1379>
+{else}
+<P1379>auto</P1379>
+{/if}
 
 <!--  Currency Update -->
 <!--  Enable Currency update. 0 - No, 1 - Yes. Default is 1 -->
diff --git a/resources/templates/provision/grandstream/gxp2135/{$mac}.xml b/resources/templates/provision/grandstream/gxp2135/{$mac}.xml
index dd15082533..074a6103fb 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 -->
@@ -1586,7 +1586,7 @@
 <!--  Name -->
 <!--  String -->
 <P507>{$display_name_3}</P507>
-	
+
 <!--  Voice Mail UserID -->
 <!--  String -->
 <P526>*97</P526>
@@ -4573,7 +4573,7 @@
 <!--  String -->
 <!--  For GXP2130, Default value is Grandstream GXP2130. -->
 <!-- P148>Grandstream GXP2130</P148> -->
- 
+
 <!--  For GXP2140, Default value is Grandstream GXP2140. -->
 <!-- P148>Grandstream GXP2140</P148> -->
 
@@ -5493,7 +5493,7 @@
 <!--  User-Agent Prefix -->
 <!--  String -->
 <P8358></P8358>
- 
+
 <!--  Auto Provision List Starting Point. 0 - Extension Boards, 1 - VPKs, 2 - MPK . Default is 0.  - VPK/MPK is for GXP2130 only. Extension Boards/VPK is for GXP2140/2160/2170. -->
 <!--  Number: 0, 1, 2  -->
 <!--  Mandatory -->
@@ -5503,12 +5503,12 @@
 <!--  Number: 10 - 900 -->
 <!--  Mandatory -->
 <P26055>10</P26055>
- 
+
 <!--  Play Tone On Receiving IM. 0 - Disable, 1 - Enable. Default is 0 -->
 <!--  Number: 0, 1 -->
 <!--  Mandatory -->
 <P26056>0</P26056>
- 
+
 <!--  Allow Incoming Call Before Ringing. 0 - No, 1 - Yes. Default is 0 -->
 <!--  Number: 0, 1 -->
 <!--  Mandatory -->
@@ -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 -->
@@ -5984,7 +5989,11 @@
 <!--  Degree Unit. auto - Automatic, f - Fahrenheit, c - Celsius. Default is auto -->
 <!--  String: auto, f, c -->
 <!--  Mandatory -->
-<P1379>c</P1379>
+{if isset($grandstream_temp_unit)}
+<P1379>{$grandstream_temp_unit}</P1379>
+{else}
+<P1379>auto</P1379>
+{/if}
 
 <!--  Currency Update -->
 <!--  Enable Currency update. 0 - No, 1 - Yes. Default is 1 -->
diff --git a/resources/templates/provision/grandstream/gxp2140/{$mac}.xml b/resources/templates/provision/grandstream/gxp2140/{$mac}.xml
index dd15082533..074a6103fb 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 -->
@@ -1586,7 +1586,7 @@
 <!--  Name -->
 <!--  String -->
 <P507>{$display_name_3}</P507>
-	
+
 <!--  Voice Mail UserID -->
 <!--  String -->
 <P526>*97</P526>
@@ -4573,7 +4573,7 @@
 <!--  String -->
 <!--  For GXP2130, Default value is Grandstream GXP2130. -->
 <!-- P148>Grandstream GXP2130</P148> -->
- 
+
 <!--  For GXP2140, Default value is Grandstream GXP2140. -->
 <!-- P148>Grandstream GXP2140</P148> -->
 
@@ -5493,7 +5493,7 @@
 <!--  User-Agent Prefix -->
 <!--  String -->
 <P8358></P8358>
- 
+
 <!--  Auto Provision List Starting Point. 0 - Extension Boards, 1 - VPKs, 2 - MPK . Default is 0.  - VPK/MPK is for GXP2130 only. Extension Boards/VPK is for GXP2140/2160/2170. -->
 <!--  Number: 0, 1, 2  -->
 <!--  Mandatory -->
@@ -5503,12 +5503,12 @@
 <!--  Number: 10 - 900 -->
 <!--  Mandatory -->
 <P26055>10</P26055>
- 
+
 <!--  Play Tone On Receiving IM. 0 - Disable, 1 - Enable. Default is 0 -->
 <!--  Number: 0, 1 -->
 <!--  Mandatory -->
 <P26056>0</P26056>
- 
+
 <!--  Allow Incoming Call Before Ringing. 0 - No, 1 - Yes. Default is 0 -->
 <!--  Number: 0, 1 -->
 <!--  Mandatory -->
@@ -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 -->
@@ -5984,7 +5989,11 @@
 <!--  Degree Unit. auto - Automatic, f - Fahrenheit, c - Celsius. Default is auto -->
 <!--  String: auto, f, c -->
 <!--  Mandatory -->
-<P1379>c</P1379>
+{if isset($grandstream_temp_unit)}
+<P1379>{$grandstream_temp_unit}</P1379>
+{else}
+<P1379>auto</P1379>
+{/if}
 
 <!--  Currency Update -->
 <!--  Enable Currency update. 0 - No, 1 - Yes. Default is 1 -->
diff --git a/resources/templates/provision/grandstream/gxp2160/{$mac}.xml b/resources/templates/provision/grandstream/gxp2160/{$mac}.xml
index 74bc3e0cd0..47657146e0 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 -->
@@ -1586,7 +1586,7 @@
 <!--  Name -->
 <!--  String -->
 <P507>{$display_name_3}</P507>
-	
+
 <!--  Voice Mail UserID -->
 <!--  String -->
 <P526>*97</P526>
@@ -4573,7 +4573,7 @@
 <!--  String -->
 <!--  For GXP2130, Default value is Grandstream GXP2130. -->
 <!-- P148>Grandstream GXP2130</P148> -->
- 
+
 <!--  For GXP2140, Default value is Grandstream GXP2140. -->
 <!-- P148>Grandstream GXP2140</P148> -->
 
@@ -5493,7 +5493,7 @@
 <!--  User-Agent Prefix -->
 <!--  String -->
 <P8358></P8358>
- 
+
 <!--  Auto Provision List Starting Point. 0 - Extension Boards, 1 - VPKs, 2 - MPK . Default is 0.  - VPK/MPK is for GXP2130 only. Extension Boards/VPK is for GXP2140/2160/2170. -->
 <!--  Number: 0, 1, 2  -->
 <!--  Mandatory -->
@@ -5503,12 +5503,12 @@
 <!--  Number: 10 - 900 -->
 <!--  Mandatory -->
 <P26055>10</P26055>
- 
+
 <!--  Play Tone On Receiving IM. 0 - Disable, 1 - Enable. Default is 0 -->
 <!--  Number: 0, 1 -->
 <!--  Mandatory -->
 <P26056>0</P26056>
- 
+
 <!--  Allow Incoming Call Before Ringing. 0 - No, 1 - Yes. Default is 0 -->
 <!--  Number: 0, 1 -->
 <!--  Mandatory -->
@@ -5970,10 +5970,15 @@
 <!--  0 - Self-Defined City Code, 1 - Automatic. Default is 1 -->
 <!--  Number: 0, 1 -->
 <!--  Mandatory -->
-<P1405>{$grandstream_city_code_auto}</P1405>
+{if isset($grandstream_city_code)}
+<P1405>0</P1405>
+{else}
+<P1405>1</P1405>
+{/if}
 
-<!--  Self-Defined City Code -->
-<!--  String -->
+
+<!-- # Self-Defined City Code -->
+<!-- # String -->
 <P1377>{$grandstream_city_code}</P1377>
 
 <!--  Update Interval (in minutes). Default is 15 -->
@@ -5984,7 +5989,11 @@
 <!--  Degree Unit. auto - Automatic, f - Fahrenheit, c - Celsius. Default is auto -->
 <!--  String: auto, f, c -->
 <!--  Mandatory -->
-<P1379>c</P1379>
+<P1379>{if isset ($grandstream_temp_unit)}
+<P1379>{}$grandstream_temp_unit}</P1379>
+{else}
+<P1379>auto</P1379>
+{/if}
 
 <!--  Currency Update -->
 <!--  Enable Currency update. 0 - No, 1 - Yes. Default is 1 -->
diff --git a/resources/templates/provision/grandstream/gxp2170/{$mac}.xml b/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
index 7e1efe30a5..8bd7f5997a 100644
--- a/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
@@ -670,33 +670,33 @@
 
 <!-- # Matching Incoming Caller ID. Matching Rule 1 -->
 <!-- # String -->
-<P1488>ring1</P1488>
+<P1488></P1488>
 
 <!-- # Matching Rule 1 Distinctive Ringtone -->
 <!-- # 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent. Default is 0. -->
 <!-- # Number: 0, 1, 2, 3, 4 -->
 <!-- # Mandatory -->
-<P1489>1</P1489>
+<P1489>0</P1489>
 
 <!-- # Matching Incoming Caller ID. Matching Rule 2 -->
 <!-- # String -->
-<P1490>ring2</P1490>
+<P1490></P1490>
 
 <!-- # Matching Rule 2 Distinctive Ringtone -->
 <!-- # 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent. Default is 0. -->
 <!-- # Number: 0, 1, 2, 3, 4 -->
 <!-- # Mandatory -->
-<P1491>2</P1491>
+<P1491>0</P1491>
 
 <!-- # Matching Incoming Caller ID. Matching Rule 3 -->
 <!-- # String -->
-<P1492>ring</P1492>
+<P1492></P1492>
 
 <!-- # Matching Rule 3 Distinctive Ringtone -->
 <!-- # 0 - system ring tone, 1 - custom ring tone 1, 2 - custom ring tone 2, 3 - custom ring tone 3, 4 - silent. Default is 0. -->
 <!-- # Number: 0, 1, 2, 3, 4 -->
 <!-- # Mandatory -->
-<P1493>3</P1493>
+<P1493>0</P1493>
 
 <!-- # Ring Timeout (in seconds). Default is 60 -->
 <!-- # Number: 30 - 3600 -->
@@ -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 -->
@@ -7257,7 +7262,11 @@
 <!-- # Degree Unit. auto - Automatic, f - Fahrenheit, c - Celsius. Default is auto -->
 <!-- # String: auto, f, c -->
 <!-- # Mandatory -->
+<P1379>{if isset ($grandstream_temp_unit)}
+<P1379>{}$grandstream_temp_unit}</P1379>
+{else}
 <P1379>auto</P1379>
+{/if}
 
 <!-- # Currency Update -->
 <!-- # Enable Currency update. 0 - No, 1 - Yes. Default is 1 -->