diff --git a/app/call_broadcast/call_broadcast.php b/app/call_broadcast/call_broadcast.php
index aff7712126..570e532c24 100644
--- a/app/call_broadcast/call_broadcast.php
+++ b/app/call_broadcast/call_broadcast.php
@@ -118,7 +118,7 @@
 
 //get the call broadcasts
 	$sql = str_replace('count(*)','*', $sql);
-	$sql .= order_by($order_by, $order);
+	$sql .= order_by($order_by, $order, 'broadcast_name', 'asc');
 	$sql .= limit_offset($rows_per_page, $offset);
 	$database = new database;
 	$result = $database->select($sql, $parameters, 'all');
diff --git a/app/grandstream/app_config.php b/app/grandstream/app_config.php
index 7dea4ab8e0..78add06ae4 100644
--- a/app/grandstream/app_config.php
+++ b/app/grandstream/app_config.php
@@ -1077,4 +1077,44 @@
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = "XMLApp";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "label to display for XML application softkey";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "4ec80f34-4edc-476f-a04d-b157b85b69d3";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_intercom_playwarningtoneforautoanswer";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "1";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Play warning tone for Auto Answer Intercom. 0 - No, 1 - Yes. Default is 0";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "153481e8-7a49-4d01-80f6-e7caa37a7ce2";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_multicast_paging_codec";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "9";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Multicast Paging Codec. 18 - G.729A/B, 0 - PCMU, 8 - PCMA, 2 - G.726-32, 9 - G.722, 98 - iLBC, 4- G.723.1 \r\nDefault is 0.";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "c1039b72-fd3a-4de7-8a74-e5e967f03b2a";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_multicast_channel_number";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "1";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Multicast Channel Number \r\n\r\nNumber: 0 - 50 (0 for normal RTP packets, 1-50 for Polycom multicast format packets.) Default is 0 - WP8xx defaults to 1-cannot use 0";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "a3da99f4-c970-439b-a42f-b632291ec97c";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_multicast_listening_address_1";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "224.0.1.116:5001";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Multicast Listening\r\n\r\nPriority 1 Listening Address \r\n\r\n(224.0.1.116:5001 is default address for WP8xx PTT)";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "7bcd0340-72bb-4043-8ec1-d58ffed0d518";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_multicast_listening_label_1";
+		$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'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Listening group name, for example: \"Cordless\", \"PTT\", or \"WalkieTalkie\"";
 ?>
diff --git a/resources/templates/provision/grandstream/grp2612/{$mac}.xml b/resources/templates/provision/grandstream/grp2612/{$mac}.xml
index 08b6ca41e4..8e0e5f6fb2 100644
--- a/resources/templates/provision/grandstream/grp2612/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2612/{$mac}.xml
@@ -933,7 +933,11 @@
     <!-- # Play warning tone for Auto Answer Intercom. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P26072>1</P26072>
+    {if isset($grandstream_intercom_playwarningtoneforautoanswer) }	
+    <P26072>{$grandstream_intercom_playwarningtoneforautoanswer}</P26072>	
+    {else}	
+    <P26072>0</P26072>	
+    {/if}
 
     <!-- # Custom Call-Info for Auto Answer. -->
     <!-- # String -->
@@ -3765,12 +3769,20 @@
     <!-- # Multicast Paging Codec. 18 - G.729A/B, 0 - PCMU, 8 - PCMA, 2 - G.726-32, 9 - G.722, 98 - iLBC, 4- G.723.1 -->
     <!-- # Number: 18, 0, 8, 2, 9, 98, 4. Default is 0. -->
     <!-- # Mandatory -->
-    <P1568>0</P1568>
-
+    {if isset($grandstream_multicast_paging_codec) }	
+    <P1568>{$grandstream_multicast_paging_codec}</P1568>	
+    {else}	
+    <P1568>0</P1568>	
+    {/if}
+    
     <!-- # Multicase Channel Number -->
     <!-- # Number: 0 - 50 (0 for normal RTP packets, 1-50 for Polycom multicast format packets). Default is 0 -->
-    <P8454>0</P8454>
-
+    {if isset($grandstream_multicast_channel_number) }	
+    <P8454>{$grandstream_multicast_channel_number}</P8454>	
+    {else}	
+    <P8454>0</P8454>	
+    {/if}
+    
     <!-- # Multicast Sender ID -->
     <!-- # Strings -->
     <P8455>{$account.1.display_name}</P8455>
@@ -3779,12 +3791,20 @@
     <!-- # Priority 1 -->
     <!-- # Listening Address -->
     <!-- # String -->
-    <P1569>224.0.1.117:5003</P1569>
+    {if isset($grandstream_multicast_listening_address_1) }	
+    <P1569>{$grandstream_multicast_listening_address_1}</P1569>	
+    {else}	
+    <P1569></P1569>	
+    {/if}	
 
     <!-- # Label -->
     <!-- # String -->
-    <P1570>Page</P1570>
-
+    {if isset($grandstream_multicast_listening_label_1) }	
+    <P1570>{$grandstream_multicast_listening_label_1}</P1570>	
+    {else}	
+    <P1570></P1570>	
+    {/if}
+    
     <!-- # Priority 2 -->
     <!-- # Listening Address -->
     <!-- # String -->
diff --git a/resources/templates/provision/grandstream/grp2613/{$mac}.xml b/resources/templates/provision/grandstream/grp2613/{$mac}.xml
index 2d8d36f968..8201c5ab11 100644
--- a/resources/templates/provision/grandstream/grp2613/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2613/{$mac}.xml
@@ -933,7 +933,11 @@
     <!-- # Play warning tone for Auto Answer Intercom. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P26072>1</P26072>
+    {if isset($grandstream_intercom_playwarningtoneforautoanswer) }	
+    <P26072>{$grandstream_intercom_playwarningtoneforautoanswer}</P26072>	
+    {else}	
+    <P26072>0</P26072>	
+    {/if}
 
     <!-- # Custom Call-Info for Auto Answer. -->
     <!-- # String -->
@@ -4617,12 +4621,20 @@
     <!-- # Multicast Paging Codec. 18 - G.729A/B, 0 - PCMU, 8 - PCMA, 2 - G.726-32, 9 - G.722, 98 - iLBC, 4- G.723.1 -->
     <!-- # Number: 18, 0, 8, 2, 9, 98, 4. Default is 0. -->
     <!-- # Mandatory -->
-    <P1568>0</P1568>
-
+    {if isset($grandstream_multicast_paging_codec) }	
+    <P1568>{$grandstream_multicast_paging_codec}</P1568>	
+    {else}	
+    <P1568>0</P1568>	
+    {/if}
+    
     <!-- # Multicase Channel Number -->
     <!-- # Number: 0 - 50 (0 for normal RTP packets, 1-50 for Polycom multicast format packets). Default is 0 -->
-    <P8454>0</P8454>
-
+    {if isset($grandstream_multicast_channel_number) }	
+    <P8454>{$grandstream_multicast_channel_number}</P8454>	
+    {else}	
+    <P8454>0</P8454>	
+    {/if}
+    
     <!-- # Multicast Sender ID -->
     <!-- # Strings -->
     <P8455>{$account.1.display_name}</P8455>
@@ -4631,12 +4643,20 @@
     <!-- # Priority 1 -->
     <!-- # Listening Address -->
     <!-- # String -->
-    <P1569></P1569>
-
+    {if isset($grandstream_multicast_listening_address_1) }	
+    <P1569>{$grandstream_multicast_listening_address_1}</P1569>	
+    {else}	
+    <P1569></P1569>	
+    {/if}
+    
     <!-- # Label -->
     <!-- # String -->
-    <P1570></P1570>
-
+    {if isset($grandstream_multicast_listening_label_1) }	
+    <P1570>{$grandstream_multicast_listening_label_1}</P1570>	
+    {else}	
+    <P1570></P1570>	
+    {/if}
+    
     <!-- # Priority 2 -->
     <!-- # Listening Address -->
     <!-- # String -->
@@ -5259,7 +5279,9 @@
     <!-- # Number: 1, 2 -->
     <!-- # Mandatory -->
     {if isset($grandstream_key_mode)}
-    <P8369>{$grandstream_key_mode}</P8369> <!-- Call Screen Settings # Key Mode. 1 - Line Mode, 2 - Account Mode. Default is 1 -->
+    <P8369>{$grandstream_key_mode}</P8369>
+    {else}
+    <P8369>1</P8369>
     {/if}
 
     <!-- # Transfer Mode via VPK. 0 - Blind Transfer, 1 - Attended Transfer, 2 - New Call. Default is 0 -->
diff --git a/resources/templates/provision/grandstream/grp2614/{$mac}.xml b/resources/templates/provision/grandstream/grp2614/{$mac}.xml
index 7fb0b60617..34fe1ed1cd 100644
--- a/resources/templates/provision/grandstream/grp2614/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2614/{$mac}.xml
@@ -937,7 +937,11 @@
     <!-- # Play warning tone for Auto Answer Intercom. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P26072>1</P26072>
+    {if isset($grandstream_intercom_playwarningtoneforautoanswer) }	
+    <P26072>{$grandstream_intercom_playwarningtoneforautoanswer}</P26072>	
+    {else}	
+    <P26072>0</P26072>	
+    {/if}
 
     <!-- # Custom Call-Info for Auto Answer. -->
     <!-- # String -->
@@ -5891,11 +5895,19 @@
     <!-- # Multicast Paging Codec. 18 - G.729A/B, 0 - PCMU, 8 - PCMA, 2 - G.726-32, 9 - G.722, 98 - iLBC, 4- G.723.1 -->
     <!-- # Number: 18, 0, 8, 2, 9, 98, 4. Default is 0. -->
     <!-- # Mandatory -->
-    <P1568>0</P1568>
+    {if isset($grandstream_multicast_paging_codec) }	
+    <P1568>{$grandstream_multicast_paging_codec}</P1568>	
+    {else}	
+    <P1568>0</P1568>	
+    {/if}
 
     <!-- # Multicase Channel Number -->
     <!-- # Number: 0 - 50 (0 for normal RTP packets, 1-50 for Polycom multicast format packets). Default is 0 -->
-    <P8454>0</P8454>
+    {if isset($grandstream_multicast_channel_number) }	
+    <P8454>{$grandstream_multicast_channel_number}</P8454>	
+    {else}	
+    <P8454>0</P8454>	
+    {/if}
 
     <!-- # Multicast Sender ID -->
     <!-- # Strings -->
@@ -5905,11 +5917,19 @@
     <!-- # Priority 1 -->
     <!-- # Listening Address -->
     <!-- # String -->
-    <P1569>224.0.1.117:5003</P1569>
+    {if isset($grandstream_multicast_listening_address_1) }	
+    <P1569>{$grandstream_multicast_listening_address_1}</P1569>	
+    {else}	
+    <P1569></P1569>	
+    {/if}
 
     <!-- # Label -->
     <!-- # String -->
-    <P1570>Page</P1570>
+    {if isset($grandstream_multicast_listening_label_1) }	
+    <P1570>{$grandstream_multicast_listening_label_1}</P1570>	
+    {else}	
+    <P1570></P1570>	
+    {/if}
 
     <!-- # Priority 2 -->
     <!-- # Listening Address -->
diff --git a/resources/templates/provision/grandstream/grp2615/{$mac}.xml b/resources/templates/provision/grandstream/grp2615/{$mac}.xml
index fbc63c2488..641b3dad07 100644
--- a/resources/templates/provision/grandstream/grp2615/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2615/{$mac}.xml
@@ -938,7 +938,11 @@
     <!-- # Play warning tone for Auto Answer Intercom. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P26072>1</P26072>
+    {if isset($grandstream_intercom_playwarningtoneforautoanswer) }	
+    <P26072>{$grandstream_intercom_playwarningtoneforautoanswer}</P26072>	
+    {else}	
+    <P26072>0</P26072>	
+    {/if}
 
     <!-- # Custom Call-Info for Auto Answer. -->
     <!-- # String -->
@@ -6928,11 +6932,19 @@
     <!-- # Multicast Paging Codec. 18 - G.729A/B, 0 - PCMU, 8 - PCMA, 2 - G.726-32, 9 - G.722, 98 - iLBC, 4- G.723.1 -->
     <!-- # Number: 18, 0, 8, 2, 9, 98, 4. Default is 0. -->
     <!-- # Mandatory -->
-    <P1568>0</P1568>
+    {if isset($grandstream_multicast_paging_codec) }	
+    <P1568>{$grandstream_multicast_paging_codec}</P1568>	
+    {else}	
+    <P1568>0</P1568>	
+    {/if}
 
     <!-- # Multicase Channel Number -->
     <!-- # Number: 0 - 50 (0 for normal RTP packets, 1-50 for Polycom multicast format packets). Default is 0 -->
-    <P8454>0</P8454>
+    {if isset($grandstream_multicast_channel_number) }	
+    <P8454>{$grandstream_multicast_channel_number}</P8454>	
+    {else}	
+    <P8454>0</P8454>	
+    {/if}
 
     <!-- # Multicast Sender ID -->
     <!-- # Strings -->
@@ -6942,11 +6954,19 @@
     <!-- # Priority 1 -->
     <!-- # Listening Address -->
     <!-- # String -->
-    <P1569>224.0.1.117:5003</P1569>
+    {if isset($grandstream_multicast_listening_address_1) }	
+    <P1569>{$grandstream_multicast_listening_address_1}</P1569>	
+    {else}	
+    <P1569></P1569>	
+    {/if}
 
     <!-- # Label -->
     <!-- # String -->
-    <P1570>Page</P1570>
+    {if isset($grandstream_multicast_listening_label_1) }	
+    <P1570>{$grandstream_multicast_listening_label_1}</P1570>	
+    {else}	
+    <P1570></P1570>	
+    {/if}
 
     <!-- # Priority 2 -->
     <!-- # Listening Address -->
diff --git a/resources/templates/provision/grandstream/grp2616/{$mac}.xml b/resources/templates/provision/grandstream/grp2616/{$mac}.xml
index 7640213c86..79b7e4d208 100644
--- a/resources/templates/provision/grandstream/grp2616/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2616/{$mac}.xml
@@ -933,7 +933,11 @@
     <!-- # Play warning tone for Auto Answer Intercom. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P26072>1</P26072>
+    {if isset($grandstream_intercom_playwarningtoneforautoanswer) }	
+    <P26072>{$grandstream_intercom_playwarningtoneforautoanswer}</P26072>	
+    {else}	
+    <P26072>0</P26072>	
+    {/if}
 
     <!-- # Custom Call-Info for Auto Answer. -->
     <!-- # String -->
@@ -7807,11 +7811,19 @@
     <!-- # Multicast Paging Codec. 18 - G.729A/B, 0 - PCMU, 8 - PCMA, 2 - G.726-32, 9 - G.722, 98 - iLBC, 4- G.723.1 -->
     <!-- # Number: 18, 0, 8, 2, 9, 98, 4. Default is 0. -->
     <!-- # Mandatory -->
-    <P1568>0</P1568>
+    {if isset($grandstream_multicast_paging_codec) }	
+    <P1568>{$grandstream_multicast_paging_codec}</P1568>	
+    {else}	
+    <P1568>0</P1568>	
+    {/if}
 
     <!-- # Multicase Channel Number -->
     <!-- # Number: 0 - 50 (0 for normal RTP packets, 1-50 for Polycom multicast format packets). Default is 0 -->
-    <P8454>0</P8454>
+    {if isset($grandstream_multicast_channel_number) }	
+    <P8454>{$grandstream_multicast_channel_number}</P8454>	
+    {else}	
+    <P8454>0</P8454>	
+    {/if}
 
     <!-- # Multicast Sender ID -->
     <!-- # Strings -->
@@ -7821,11 +7833,19 @@
     <!-- # Priority 1 -->
     <!-- # Listening Address -->
     <!-- # String -->
-    <P1569>224.0.1.117:5003</P1569>
+    {if isset($grandstream_multicast_listening_address_1) }	
+    <P1569>{$grandstream_multicast_listening_address_1}</P1569>	
+    {else}	
+    <P1569></P1569>	
+    {/if}
 
     <!-- # Label -->
     <!-- # String -->
-    <P1570>Page</P1570>
+    {if isset($grandstream_multicast_listening_label_1) }	
+    <P1570>{$grandstream_multicast_listening_label_1}</P1570>	
+    {else}	
+    <P1570></P1570>	
+    {/if}
 
     <!-- # Priority 2 -->
     <!-- # Listening Address -->
diff --git a/resources/templates/provision/grandstream/gxp2130/{$mac}.xml b/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
index 353d8c30c5..71d989f82b 100644
--- a/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
@@ -941,7 +941,11 @@
     <!-- # Play warning tone for Auto Answer Intercom. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P26072>0</P26072>
+    {if isset($grandstream_intercom_playwarningtoneforautoanswer) }	
+    <P26072>{$grandstream_intercom_playwarningtoneforautoanswer}</P26072>	
+    {else}	
+    <P26072>0</P26072>	
+    {/if}
 
     <!-- # Custom Call-Info for Auto Answer. -->
     <!-- # String -->
@@ -7779,25 +7783,41 @@
     <!-- # Multicast Paging Codec. 18 - G.729A/B, 0 - PCMU, 8 - PCMA, 2 - G.726-32, 9 - G.722, 98 - iLBC, 4- G.723.1 -->
     <!-- # Number: 18, 0, 8, 2, 9, 98, 4. Default is 0. -->
     <!-- # Mandatory -->
-    <P1568>0</P1568>
+    {if isset($grandstream_multicast_paging_codec) }	
+    <P1568>{$grandstream_multicast_paging_codec}</P1568>	
+    {else}	
+    <P1568>0</P1568>	
+    {/if}
 
     <!-- # Multicase Channel Number -->
     <!-- # Number: 0 - 50 (0 for normal RTP packets, 1-50 for Polycom multicast format packets). Default is 0 -->
-    <P8454>0</P8454>
+    {if isset($grandstream_multicast_channel_number) }	
+    <P8454>{$grandstream_multicast_channel_number}</P8454>	
+    {else}	
+    <P8454>0</P8454>	
+    {/if}
 
     <!-- # Multicast Sender ID -->
     <!-- # Strings -->
-    <P8455></P8455>
+    <P8455>{$account.1.display_name}</P8455>
 
     <!-- ### Multicast Listening ###  -->
     <!-- # Priority 1 -->
     <!-- # Listening Address -->
     <!-- # String -->
-    <P1569></P1569>
+    {if isset($grandstream_multicast_listening_address_1) }	
+    <P1569>{$grandstream_multicast_listening_address_1}</P1569>	
+    {else}	
+    <P1569></P1569>	
+    {/if}
 
     <!-- # Label -->
     <!-- # String -->
-    <P1570></P1570>
+    {if isset($grandstream_multicast_listening_label_1) }	
+    <P1570>{$grandstream_multicast_listening_label_1}</P1570>	
+    {else}	
+    <P1570></P1570>	
+    {/if}
 
     <!-- # Priority 2 -->
     <!-- # Listening Address -->
diff --git a/resources/templates/provision/grandstream/gxp2135/{$mac}.xml b/resources/templates/provision/grandstream/gxp2135/{$mac}.xml
index 822ac1ae37..6a4a62c74d 100644
--- a/resources/templates/provision/grandstream/gxp2135/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2135/{$mac}.xml
@@ -940,7 +940,11 @@
     <!-- # Play warning tone for Auto Answer Intercom. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P26072>0</P26072>
+    {if isset($grandstream_intercom_playwarningtoneforautoanswer) }	
+    <P26072>{$grandstream_intercom_playwarningtoneforautoanswer}</P26072>	
+    {else}	
+    <P26072>0</P26072>	
+    {/if}
 
     <!-- # Custom Call-Info for Auto Answer. -->
     <!-- # String -->
@@ -6639,7 +6643,11 @@
     <!-- # Web Access Mode. 0 - HTTPS, 1 - HTTP, 2 - Disabled, 3 - Both HTTP and HTTPS. Default is 1 -->
     <!-- # Number: 0, 1, 2, 3 -->
     <!-- # Mandatory -->
+    {if isset($grandstream_web_access_mode)}
+    <P1650>{$grandstream_web_access_mode}</P1650>
+    {else}
     <P1650>0</P1650>
+    {/if}
 
     <!-- # Enable User Web Access. 0 - Disabled, 1 - Enabled. Default is 0 -->
     <!-- # Number: 0, 1 -->
@@ -7778,25 +7786,41 @@
     <!-- # Multicast Paging Codec. 18 - G.729A/B, 0 - PCMU, 8 - PCMA, 2 - G.726-32, 9 - G.722, 98 - iLBC, 4- G.723.1 -->
     <!-- # Number: 18, 0, 8, 2, 9, 98, 4. Default is 0. -->
     <!-- # Mandatory -->
-    <P1568>0</P1568>
+    {if isset($grandstream_multicast_paging_codec) }	
+    <P1568>{$grandstream_multicast_paging_codec}</P1568>	
+    {else}	
+    <P1568>0</P1568>	
+    {/if}
 
     <!-- # Multicase Channel Number -->
     <!-- # Number: 0 - 50 (0 for normal RTP packets, 1-50 for Polycom multicast format packets). Default is 0 -->
-    <P8454>0</P8454>
+    {if isset($grandstream_multicast_channel_number) }	
+    <P8454>{$grandstream_multicast_channel_number}</P8454>	
+    {else}	
+    <P8454>0</P8454>	
+    {/if}
 
     <!-- # Multicast Sender ID -->
     <!-- # Strings -->
-    <P8455></P8455>
+    <P8455>{$account.1.display_name}</P8455>
 
     <!-- ### Multicast Listening ###  -->
     <!-- # Priority 1 -->
     <!-- # Listening Address -->
     <!-- # String -->
-    <P1569></P1569>
+    {if isset($grandstream_multicast_listening_address_1) }	
+    <P1569>{$grandstream_multicast_listening_address_1}</P1569>	
+    {else}	
+    <P1569></P1569>	
+    {/if}
 
     <!-- # Label -->
     <!-- # String -->
-    <P1570></P1570>
+    {if isset($grandstream_multicast_listening_label_1) }	
+    <P1570>{$grandstream_multicast_listening_label_1}</P1570>	
+    {else}	
+    <P1570></P1570>	
+    {/if}
 
     <!-- # Priority 2 -->
     <!-- # Listening Address -->
diff --git a/resources/templates/provision/grandstream/gxp2140/{$mac}.xml b/resources/templates/provision/grandstream/gxp2140/{$mac}.xml
index fd516c57d5..41069c6ff1 100644
--- a/resources/templates/provision/grandstream/gxp2140/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2140/{$mac}.xml
@@ -941,7 +941,11 @@
     <!-- # Play warning tone for Auto Answer Intercom. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P26072>0</P26072>
+    {if isset($grandstream_intercom_playwarningtoneforautoanswer) }	
+    <P26072>{$grandstream_intercom_playwarningtoneforautoanswer}</P26072>	
+    {else}	
+    <P26072>0</P26072>	
+    {/if}
 
     <!-- # Custom Call-Info for Auto Answer. -->
     <!-- # String -->
@@ -7779,25 +7783,41 @@
     <!-- # Multicast Paging Codec. 18 - G.729A/B, 0 - PCMU, 8 - PCMA, 2 - G.726-32, 9 - G.722, 98 - iLBC, 4- G.723.1 -->
     <!-- # Number: 18, 0, 8, 2, 9, 98, 4. Default is 0. -->
     <!-- # Mandatory -->
-    <P1568>0</P1568>
+    {if isset($grandstream_multicast_paging_codec) }	
+    <P1568>{$grandstream_multicast_paging_codec}</P1568>	
+    {else}	
+    <P1568>0</P1568>	
+    {/if}
 
     <!-- # Multicase Channel Number -->
     <!-- # Number: 0 - 50 (0 for normal RTP packets, 1-50 for Polycom multicast format packets). Default is 0 -->
-    <P8454>0</P8454>
+    {if isset($grandstream_multicast_channel_number) }	
+    <P8454>{$grandstream_multicast_channel_number}</P8454>	
+    {else}	
+    <P8454>0</P8454>	
+    {/if}
 
     <!-- # Multicast Sender ID -->
     <!-- # Strings -->
-    <P8455></P8455>
+    <P8455>{$account.1.display_name}</P8455>
 
     <!-- ### Multicast Listening ###  -->
     <!-- # Priority 1 -->
     <!-- # Listening Address -->
     <!-- # String -->
-    <P1569></P1569>
+    {if isset($grandstream_multicast_listening_address_1) }	
+    <P1569>{$grandstream_multicast_listening_address_1}</P1569>	
+    {else}	
+    <P1569></P1569>	
+    {/if}
 
     <!-- # Label -->
     <!-- # String -->
-    <P1570></P1570>
+    {if isset($grandstream_multicast_listening_label_1) }	
+    <P1570>{$grandstream_multicast_listening_label_1}</P1570>	
+    {else}	
+    <P1570></P1570>	
+    {/if}
 
     <!-- # Priority 2 -->
     <!-- # Listening Address -->
diff --git a/resources/templates/provision/grandstream/gxp2160/{$mac}.xml b/resources/templates/provision/grandstream/gxp2160/{$mac}.xml
index f3adaa988c..82cd135362 100644
--- a/resources/templates/provision/grandstream/gxp2160/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2160/{$mac}.xml
@@ -941,7 +941,11 @@
     <!-- # Play warning tone for Auto Answer Intercom. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P26072>0</P26072>
+    {if isset($grandstream_intercom_playwarningtoneforautoanswer) }	
+    <P26072>{$grandstream_intercom_playwarningtoneforautoanswer}</P26072>	
+    {else}	
+    <P26072>0</P26072>	
+    {/if}
 
     <!-- # Custom Call-Info for Auto Answer. -->
     <!-- # String -->
@@ -7777,29 +7781,41 @@
     <!-- # Multicast Paging Codec. 18 - G.729A/B, 0 - PCMU, 8 - PCMA, 2 - G.726-32, 9 - G.722, 98 - iLBC, 4- G.723.1 -->
     <!-- # Number: 18, 0, 8, 2, 9, 98, 4. Default is 0. -->
     <!-- # Mandatory -->
-    <P1568>0</P1568>
+    {if isset($grandstream_multicast_paging_codec) }	
+    <P1568>{$grandstream_multicast_paging_codec}</P1568>	
+    {else}	
+    <P1568>0</P1568>	
+    {/if}
 
     <!-- # Multicase Channel Number -->
     <!-- # Number: 0 - 50 (0 for normal RTP packets, 1-50 for Polycom multicast format packets). Default is 0 -->
-    <P8454>0</P8454>
+    {if isset($grandstream_multicast_channel_number) }	
+    <P8454>{$grandstream_multicast_channel_number}</P8454>	
+    {else}	
+    <P8454>0</P8454>	
+    {/if}
 
     <!-- # Multicast Sender ID -->
     <!-- # Strings -->
-    <P8455></P8455>
+    <P8455>{$account.1.display_name}</P8455>
 
     <!-- ### Multicast Listening ###  -->
     <!-- # Priority 1 -->
     <!-- # Listening Address -->
     <!-- # String -->
-    {if isset($multicast_listen_address_1)}
-    <P1569>{$multicast_listen_address_1}</P1569>
-{else}
-    <P1569></P1569>
-{/if}
-
+    {if isset($grandstream_multicast_listening_address_1) }	
+    <P1569>{$grandstream_multicast_listening_address_1}</P1569>	
+    {else}	
+    <P1569></P1569>	
+    {/if}
+    
     <!-- # Label -->
     <!-- # String -->
-    <P1570></P1570>
+    {if isset($grandstream_multicast_listening_label_1) }	
+    <P1570>{$grandstream_multicast_listening_label_1}</P1570>	
+    {else}	
+    <P1570></P1570>	
+    {/if}
 
     <!-- # Priority 2 -->
     <!-- # Listening Address -->
diff --git a/resources/templates/provision/grandstream/gxp2170/{$mac}.xml b/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
index 875616b0af..08c14d0507 100644
--- a/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
@@ -945,7 +945,11 @@
     <!-- # Play warning tone for Auto Answer Intercom. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P26072>0</P26072>
+    {if isset($grandstream_intercom_playwarningtoneforautoanswer) }	
+    <P26072>{$grandstream_intercom_playwarningtoneforautoanswer}</P26072>	
+    {else}	
+    <P26072>0</P26072>	
+    {/if}
 
     <!-- # Custom Call-Info for Auto Answer. -->
     <!-- # String -->
@@ -7790,29 +7794,41 @@
     <!-- # Multicast Paging Codec. 18 - G.729A/B, 0 - PCMU, 8 - PCMA, 2 - G.726-32, 9 - G.722, 98 - iLBC, 4- G.723.1 -->
     <!-- # Number: 18, 0, 8, 2, 9, 98, 4. Default is 0. -->
     <!-- # Mandatory -->
-    <P1568>0</P1568>
+    {if isset($grandstream_multicast_paging_codec) }	
+    <P1568>{$grandstream_multicast_paging_codec}</P1568>	
+    {else}	
+    <P1568>0</P1568>	
+    {/if}
 
     <!-- # Multicase Channel Number -->
     <!-- # Number: 0 - 50 (0 for normal RTP packets, 1-50 for Polycom multicast format packets). Default is 0 -->
-    <P8454>0</P8454>
+    {if isset($grandstream_multicast_channel_number) }	
+    <P8454>{$grandstream_multicast_channel_number}</P8454>	
+    {else}	
+    <P8454>0</P8454>	
+    {/if}
 
     <!-- # Multicast Sender ID -->
     <!-- # Strings -->
-    <P8455></P8455>
+    <P8455>{$account.1.display_name}</P8455>
 
     <!-- ### Multicast Listening ###  -->
     <!-- # Priority 1 -->
     <!-- # Listening Address -->
     <!-- # String -->
-    {if isset($multicast_listen_address_1)}
-    <P1569>{$multicast_listen_address_1}</P1569>
-{else}
-    <P1569></P1569>
-{/if}
+    {if isset($grandstream_multicast_listening_address_1) }	
+    <P1569>{$grandstream_multicast_listening_address_1}</P1569>	
+    {else}	
+    <P1569></P1569>	
+    {/if}
 
     <!-- # Label -->
     <!-- # String -->
-    <P1570></P1570>
+    {if isset($grandstream_multicast_listening_label_1) }	
+    <P1570>{$grandstream_multicast_listening_label_1}</P1570>	
+    {else}	
+    <P1570></P1570>	
+    {/if}
 
     <!-- # Priority 2 -->
     <!-- # Listening Address -->
diff --git a/resources/templates/provision/grandstream/gxv3480/{$mac}.xml b/resources/templates/provision/grandstream/gxv3480/{$mac}.xml
new file mode 100644
index 0000000000..623c4f7dc3
--- /dev/null
+++ b/resources/templates/provision/grandstream/gxv3480/{$mac}.xml
@@ -0,0 +1,1308 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gs_provision version="1">
+	<config version="2">
+		<!-- Configuration Template for GXV3480 fw1.0.1.09  -->
+		<!-- Instruction -->
+		<!-- The new type of config template gives better understanding than P-value numbers to match the setting name from web UI or device, by using names that are similar from web UI. -->
+		<!-- 1. This config template includes settings for account 1 only. To update item name to "account.i...", where i is the account index. For example, to update Account 12 SIP server address, include the following in config template: -->
+		<!-- GXV3370 can support up to 16 SIP accounts and 160 MPKs -->
+		<!-- Example, <item name="account.12.sip.server.1.address">sipserver.net</item> -->
+		<!-- 2. The template uses alias name to represent drop-down options. For example, Tel URI uses "Disabled, UserIsPhone, Enabled". To update this setting to "User=Phone", include the following in config template: -->
+		<!-- Example, <item name="account.1.sip.telUri">UserIsPhone</item> -->
+		<!-- 3. For those settings without alias, numbers are informed to match drop-down options.  -->
+		<!-- End of Instruction -->		
+
+		<!-- Known issue / Notes:  -->
+		<!-- MPK provision needs reboot to take effect -->
+
+		<!-- Account General Settings -->
+		{for $line=1 to 16}
+		{$row=$lines.$line}
+		<!-- Account Active -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.enable">{if filter_var($row.enabled, FILTER_VALIDATE_BOOLEAN)}Yes{else}No{/if}</item>
+
+		<!-- Account Name -->
+		<item name="account.{$line}.name">{$row.display_name}</item>
+
+		<!-- SIP Server -->
+		<item name="account.{$line}.sip.server.1.address">{$row.server_address}</item>
+
+		<!-- SIP User ID -->
+		<item name="account.{$line}.sip.userid">{$row.user_id}</item>
+
+		<!-- SIP Authentication ID -->
+		<item name="account.{$line}.sip.subscriber.userId">{$row.auth_id}</item>
+
+		<!-- SIP Authentication Password -->
+		<item name="account.{$line}.sip.subscriber.password">{$row.password}</item>
+		<!-- Voice Mail Access Number -->
+		<item name="account.{$line}.sip.voicemail.number">{$voicemail_number}</item>
+		<!-- Display Name -->
+		<item name="account.{$line}.sip.subscriber.name">{$row.display_name}</item>
+		<!-- Tel URI -->
+		<!-- Disabled, UserIsPhone, Enabled -->
+		<item name="account.{$line}.sip.telUri">Disabled</item>
+		<!-- Account 1 Network Settings -->
+		<!-- Outbound Proxy -->
+		<item name="account.{$line}.sip.outboundProxy.1.address">{$row.outbound_proxy_primary}</item>
+		<!-- Secondary Outbound Proxy -->
+		<item name="account.{$line}.sip.outboundProxy.2.address">{$row.outbound_proxy_secondary}</item>
+		<!-- DNS Mode -->
+		<!-- ARecord, SRV, NaptrOrSrv -->
+{$dns=ARecord}
+{if isset($grandstream_dns_mode)}
+	{if $grandstream_dns_mode == 0}{$dns=ARecord}{/if}
+	{if $grandstream_dns_mode == 1}{$dns=SRV}{/if}
+	{if $grandstream_dns_mode == 2}{$dns=NaprtOrSrv}{/if}
+{/if}
+		<item name="account.{$line}.network.dnsMode">{$dns}</item>
+		<!-- DNS SRV Fail-over Mode -->
+		<!-- Default, SavedOneUntilDNSTTL, SavedOneUntilNoResponse -->
+		<item name="account.{$line}.network.dnsSRVFailoverMode">Default</item>
+		<!-- NAT Traversal -->
+		<!-- No, STUN, KeepAlive, UPnP, Auto, VPN -->
+		<item name="account.{$line}.network.natTraversal">KeepAlive</item>
+		<!-- Proxy-Require -->
+		<item name="account.{$line}.network.proxyRequire"></item>
+		<!-- SIP Registration -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.sip.registration">Yes</item>
+		<!-- Unregister Before New Registration -->
+		<!-- No, Yes - All, Instance -->
+		<item name="account.{$line}.sip.unregisterOnReboot">Instance</item>
+		<!-- Register Expiration (m) -->
+		<item name="account.{$line}.sip.registerExpiration">{$row.register_expires}</item>
+		<!-- Re-register before Expiration (s)  -->
+		<item name="account.{$line}.sip.registerBeforeExpiration">0</item>
+		<!-- Registration Retry Wait Time (s) -->
+		<item name="account.{$line}.sip.registrationFailureRetryWaitTime">20</item>
+		<!-- Add Auth Header On RE-REGISTER tobetested -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.sip.header.authOnInitialRegister">Yes</item>
+		<!-- Enable SIP OPTIONS Keep Alive -->
+		<item name="account.{$line}.sip.keepAlive.enable">Yes</item>
+		<!-- SIP OPTIONS Keep Alive Interval (s)  -->
+		<item name="account.{$line}.sip.keepAlive.interval">30</item>
+		<!-- SIP OPTIONS Keep Alive Maximum Tries -->
+		<item name="account.{$line}.sip.keepAlive.maxLost">3</item>
+		<!-- Subscribe for MWI -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.sip.subscribe.forMwi">No</item>
+		<!-- Use Privacy Header -->
+		<!-- Default, No, Yes -->
+		<item name="account.{$line}.sip.header.privacy">Default</item>
+		<!-- Use P-Preferred-Identity Header  -->
+		<!-- Default, No, Yes -->
+		<item name="account.{$line}.sip.header.ppi">Default</item>
+		<!-- SIP Transport -->
+		<!-- UDP, TCP, TlsOrTcp -->
+{$tp=UDP}
+{if $row.sip_transport == 'udp'}{$tp=UDP}{/if}
+{if $row.sip_transport == 'tcp'}{$tp=TCP}{/if}
+{if $row.sip_transport == 'tls'}{$tp=TlsOrTcp}{/if}
+{if $row.sip_transport == 'dns srv'}	
+    {if isset($grandstream_dnssrv_transport)}	
+        {if $grandstream_dnssrv_transport == 'udp'}{$tp=UDP}	
+        {elseif $grandstream_dnssrv_transport == 'tls'}{$tp=TlsOrTcp}	
+        {else}{$tp=TCP}	
+        {/if}	
+	{else}{$tp=TCP}	
+	{/if}	
+{/if}
+		<item name="account.{$line}.sip.transport">{$tp}</item>
+		<!-- Local SIP Port -->
+		<item name="account.{$line}.sip.localPort">{$row.sip_port}</item>
+		<!-- SIP URI Scheme When Using TLS -->
+		<!-- sip, sips -->
+		<item name="account.{$line}.sip.uriSchemeWhenUsingTls">sip</item>
+		<!-- Use Actual Ephemeral Port in Contact with TCP/TLS -->
+		<!-- No, Yes -->
+		<item name="account.{$line}.sip.useActualEphemeralPortInContactWithTcpTls">No</item>
+		<!-- Support SIP Instance ID -->
+		<!-- No, Yes -->
+		<item name="account.{$line}.sip.supportInstanceId">Yes</item>
+		<!-- SIP T1 Timeout -->
+		<!-- 0.5 sec - 0_5sec, 1 sec - 1sec, 2 sec - 2sec -->
+		<item name="account.{$line}.sip.timer.t1">0_5sec</item>
+		<!-- SIP T2 Interval -->
+		<!-- 2 sec - 2sec, 4 sec - 4sec, 8 sec - 8sec -->
+		<item name="account.{$line}.sip.timer.t2">4sec</item>
+		<!-- SIP Timer D Interval (Seconds) -->
+		<item name="account.{$line}.sip.timerd.interval">0</item>
+		<!-- Remove OBP from Route -->
+		<!-- Disable - InRoute, Enable - NotInRoute, Always - AlwaysSentTo -->
+		<item name="account.{$line}.sip.outboundProxy.mode">InRoute</item>
+		<!-- Enable 100rel -->
+		<!-- No, Yes -->
+		<item name="account.{$line}.sip.header.100rel">No</item>
+		<!-- Enable Session Timer/Session Expiration (s) -->
+		<!-- Session Timer is disabled if the value is 0 -->
+		<item name="account.{$line}.sip.sessionTimer.expiration">180</item>
+		<!-- Min-SE(s) -->
+		<item name="account.{$line}.sip.minimumSE">90</item>
+		<!-- UAC Specify Refresher -->
+		<!-- Omit, UAC, UAS -->
+		<item name="account.{$line}.sip.sessionTimer.refresher.uacSpecify">Omit</item>
+		<!-- UAS Specify Refresher -->
+		<!--UAC, UAS -->
+		<item name="account.{$line}.sip.sessionTimer.refresher.uasSpecify">UAC</item>
+		<!-- Caller Request Timer -->
+		<!-- No, Yes -->
+		<item name="account.{$line}.sip.sessionTimer.requestTimer.caller">No</item>
+		<!-- Callee Request Timer -->
+		<!-- No, Yes -->
+		<item name="account.{$line}.sip.sessionTimer.requestTimer.callee">No</item>
+		<!-- Force Timer -->
+		<!-- No, Yes -->
+		<item name="account.{$line}.sip.sessionTimer.force">No</item>
+		<!-- Force INVITE -->
+		<!-- No, Yes -->
+		<item name="account.{$line}.sip.sessionTimer.forceInvite">No</item>
+		<!-- Codec Settings -->
+		<!-- Preferred Vocoder -->
+		<!-- PCMU, PCMA, G_726_32, G_722, G_729AOrB, iLBC, OPUS -->
+		<item name="account.{$line}.codec.choice.1">G_722</item>
+		<item name="account.{$line}.codec.choice.2">PCMU</item>
+		<item name="account.{$line}.codec.choice.3">PCMA</item>
+		<item name="account.{$line}.codec.choice.4">iLBC</item>
+		<item name="account.{$line}.codec.choice.5">OPUS</item>
+		<item name="account.{$line}.codec.choice.6">G_726_32</item>
+		<item name="account.{$line}.codec.choice.7">G_729AOrB</item>
+		<!-- Codec Negotiation Priority -->
+		<!-- Caller, Callee -->
+		<item name="account.{$line}.codec.negotiatePriority">Caller</item>
+		<!-- Use First Matching Vocoder in 200OK SDP -->
+		<!-- No, Yes -->
+		<item name="account.{$line}.codec.useFirstMatch">No</item>
+		<!-- iLBC Frame Size -->
+		<!-- 20ms, 30ms -->
+		<item name="account.{$line}.codec.iLBC.frameSize">30ms</item>
+		<!-- G726-32 ITU Payload -->
+		<!-- 2 - 0, Dynamic - 1 -->
+		<item name="account.{$line}.codec.payloadType.g72632.ITU">1</item>
+		<!-- G726-32 Dynamic PT -->
+		<!-- Range: 96-126, default: 126 -->
+		<item name="account.{$line}.codec.payloadType.g72632">126</item>
+		<!-- Opus Payload Type -->
+		<item name="account.{$line}.codec.payloadType.opus">123</item>
+		<!-- DTMF -->
+		<!-- No, Yes -->
+		<item name="account.{$line}.dtmf.sendInAudio">No</item>
+		<item name="account.{$line}.dtmf.sendInRtp">Yes</item>
+		<item name="account.{$line}.dtmf.sendInSip">No</item>
+		<!-- DTMF Payload Type -->
+		<item name="account.{$line}.codec.payoadType.dtmf">101</item>
+		<!-- Jitter Buffer Type -->
+		<!-- Fixed, Adaptive -->
+		<item name="account.{$line}.audio.jitterBufferType">Adaptive</item>
+		<!-- Enable Audio RED with FEC -->
+		<!-- No, Yes -->
+		<item name="account.{$line}.audio.fec.enable">No</item>
+		<!-- Audio FEC Payload Type -->
+		<!-- Range: 96-126, default: 121 -->
+		<item name="account.{$line}.codec.payloadType.fec.audio">121</item>
+		<!-- Audio RED Payload Type -->
+		<!-- Range: 96-126, default: 124 -->
+		<item name="account.{$line}.codec.payloadType.red">124</item>
+		<!-- Silence Suppression -->
+		<!-- No, Yes -->
+		<item name="account.{$line}.audio.silenceSuppression">No</item>
+		<!-- Voice Frames Per TX -->
+		<item name="account.{$line}.audio.voiceFramePerTX">2</item>
+		<!-- Enable Video FEC -->
+		<!-- No, Yes -->
+		<item name="account.{$line}.video.fec.enable">Yes</item>
+		<!-- Enable RFC5168 Support -->
+		<!-- No, Yes -->
+		<item name="account.{$line}.codec.rfc5168.enable">Yes</item>
+		<!-- Video FEC Mode  -->
+		<!-- 0 , 1 -->
+		<item name="account.{$line}.video.fec.mode">0</item>
+		<!-- FEC Payload Type -->
+		<!-- Range: 96-126, default: 120 -->
+		<item name="account.{$line}.codec.payloadType.fec.video">120</item>
+		<!-- Packetization mode -->
+		<!-- SingleNALUnit, Non-Interleaved -->
+		<!-- [Note] Prefer Non-Interleaved Mode is not supported yet -->
+		<item name="account.{$line}.codec.packetizationMode">Non-Interleaved</item>
+		<!-- H.264 Image Size -->
+		<!-- 720P, 4CIF, VGA, CIF, QVGA, QCIF -->
+		<item name="account.{$line}.video.h264.imagesize">720P</item>
+		<!-- Use H.264 Constrained Profiles -->
+		<!-- No, Yes -->
+		<item name="account.{$line}.codec.h264.CBP.enable">No</item>
+		<!-- H.264 Profile Type -->
+		<!-- Baseline, Main, High, BP&amp;MP&amp;HP -->
+		<item name="account.{$line}.codec.H264ProfileType">BP&amp;MP&amp;HP</item>
+		<!-- Video Bit Rate -->
+		<!-- 32 - 32 kbps, 64 - 64 kbps, 96 - 96 kbps, 128 - 128 kbps, 160 - 160 kbps, 192 - 192 kbps -->
+		<!-- # 210 - 210 kbps, 256 - 256 kbps, 384 - 384 kbps, 512 - 512 kbps, 640 - 640 kbps, 768 - 768 kbps -->
+		<!-- # 1024 - 1024 kbps, 1280 - 1280 kbps, 1536 - 1536 kbps, 2048 - 2048 kbps. -->
+		<item name="account.{$line}.video.bitRate">2048</item>
+		<!-- SDP Bandwidth Attribute -->
+		<!-- Standard, MediaLevel, SessionLevel, None -->
+		<item name="account.{$line}.codec.SDPBandwidthAttr">MediaLevel</item>
+		<!-- H.264 Payload Type -->
+		<!-- Range: 96-126, default: 99 -->
+		<item name="account.{$line}.codec.payloadType.h264">99</item>
+		<!-- Disable BFCP -->
+		<!-- No, Yes -->
+		<item name="account.{$line}.presentation.BFCP.enable">Yes</item>
+		<!-- Presentation H.264 Image Size -->
+		<!-- 1080P, 720P -->
+		<item name="account.{$line}.presentation.h264.imagesize">1080P</item>
+		<!-- Presentation H.264 Profile Type -->
+		<!-- Baseline, Main, High, BP&amp;MP&amp;HP -->
+		<item name="account.{$line}.presentation.H264ProfileType">BP&amp;MP&amp;HP</item>
+		<!-- Presentation Video Bit Rate -->
+		<!-- 32 - 32 kbps, 64 - 64 kbps, 96 - 96 kbps, 128 - 128 kbps, 160 - 160 kbps, 192 - 192 kbps -->
+		<!-- # 210 - 210 kbps, 256 - 256 kbps, 384 - 384 kbps, 512 - 512 kbps, 640 - 640 kbps, 768 - 768 kbps -->
+		<!-- # 1024 - 1024 kbps, 1280 - 1280 kbps, 1536 - 1536 kbps, 2048 - 2048 kbps. -->
+		<item name="account.{$line}.presentation.bitRate">1024</item>
+		<!-- Presentation Video Frame Rate -->
+		<!-- 5, 10, 15 -->
+		<item name="account.{$line}.presentation.frameRate">15</item>
+		<!-- BFCP Transport Protocol -->
+		<!-- Automatic, UDP, TCP -->
+		<item name="account.{$line}.presentation.BFCP.transportProtocol">UDP</item>
+		<!-- SRTP Mode -->
+		<!-- Disabled, EnabledButNotForced, EnabledAndForced -->
+		<item name="account.{$line}.audio.srtpMode">Disabled</item>
+		<!-- SRTP Key Length -->
+		<!-- AES128And256Bit, AES128Bit, AES256Bit -->
+		<item name="account.{$line}.audio.srtpKeyLength">AES128And256Bit</item>
+		<!-- Enable SRTP Key Life Time -->
+		<!-- No, Yes -->
+		<item name="account.{$line}.audio.cryptoLifeTime">Yes</item>
+		<!-- RTCP Destination -->
+		<item name="account.{$line}.rtcp.destination"></item>
+		<!-- Symmetric RTP -->
+		<!-- No, Yes -->
+		<item name="account.{$line}.audio.symmetricRTP">No</item>
+		<!-- RTP IP Filter -->
+		<!-- Disable, IPOnly, IPandPort -->
+		<item name="account.{$line}.rtp.filter">Disable</item>
+		<!-- Call Settings -->
+		<!-- Enable Video Call -->
+		<!-- Default, No, Yes -->
+		<item name="account.{$line}.call.video.enable">Yes</item>
+		<!-- Start Video Automatically -->
+		<!-- No, Yes -->
+		<item name="account.{$line}.video.startAuto.enable">Yes</item>
+		<!-- Remote Video Request -->
+		<!-- Prompt, Accept, Deny -->
+		<item name="account.{$line}.video.request">Prompt</item>
+		<!-- Auto Answer -->
+		<!-- No, Yes, EnableIntercom/Paging -->
+		<item name="account.{$line}.call.autoAnswer">EnableIntercom/Paging</item>
+		<!-- Play Warning Tone for Auto Answer Intercom  -->
+		<!-- No, Yes -->
+		<item name="account.{$line}.intercom.playWarningToneForAutoAnswer">Yes</item>
+		<!-- Intercom Barging -->
+		<!-- No, Yes -->
+		<item name="account.{$line}.intercom.allowBargingByCallInfo">No</item>
+		<!-- Auto Preview -->
+		<!-- No, Yes, YeswithRinging -->
+		<item name="account.{$line}.call.autoPreview">No</item>
+		<!-- Send Anonymous -->
+		<!-- No, Yes -->
+		<item name="account.{$line}.call.sendAnonymous">No</item>
+		<!-- Anonymous Call Rejection -->
+		<!-- No, Yes -->
+		<item name="account.{$line}.call.rejectAnonymousCall">No</item>
+		<!-- Call Log -->
+		<!-- All, IncomingAndOutgoing, Disable, DonotPromptMissedCall -->
+		<item name="account.{$line}.call.callLog">All</item>
+		<!-- Enable Call Features -->
+		<!-- No, Yes -->
+		<item name="account.{$line}.featureCodes.callFeatures">No</item>
+		<!-- Transfer on 3 Way Conference Hangup -->
+		<!-- No, Yes -->
+		<item name="account.{$line}.call.transferOnConferenceHangup">No</item>
+		<!-- Use # as Dial Key  -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.call.keyAsSend">Yes</item>
+		<!-- DND Call Feature On -->
+		<item name="account.{$line}.featureCodes.dndOn"></item>
+		<!-- DND Call Feature Off  -->
+		<item name="account.{$line}.featureCodes.dndOff"></item>
+		<!-- No Key Entry Timeout (s) -->
+		<!-- Number: 4 - 15 -->
+		<item name="account.{$line}.call.noKeyEntryTimeout">4</item>
+		<!-- Ring Timeout -->
+		<!-- Number: 10 - 300 -->
+		<item name="account.{$line}.ring.timeout">60</item>
+		<!-- Refer-To Use Target Contact -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.call.referToUseTargetContact">No</item>
+		<!-- RFC2543 Hold -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.sip.rfc2543Hold">Yes</item>
+		<!-- Dial Plan Prefix -->
+		<item name="account.{$line}.call.dialplanPrefix"></item>
+		<!-- Disable DialPlan -->
+		<!-- # Disable DialPlan. 0 - No Selection, 1 - Dial Page, 2 - Contact, 4 - Incoming Call History, 8 -  Outgoing Call History, 16 - MPK & Click2Dial.  -->
+		<!-- # If need to check multiple selections, add the specific values for each selections together. Default value is 0 -->
+		<item name="account.{$line}.call.dialplan.disableMode">0</item>
+		<!-- DialPlan -->
+		<item name="account.{$line}.call.dialplan">{$grandstream_dial_plan}</item>
+		<!-- Caller ID Display -->
+		<!-- Auto, Disabled, Header, PAIHeader -->
+		<!-- [Note] PAI Header is not supported yet -->
+		<item name="account.{$line}.sip.callerIdDisplay">Auto</item>
+		<!-- Account Ring Tone -->
+		<!-- <item name="account.{$line}.ring.ringtone">content://settings/system/ringtone</item> -->
+		<!-- Ignore Alert-Info Header -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.ring.ignoreSipAlertInfo">No</item>
+		<!-- Match Incoming Caller ID -->
+		<!-- <item name="account.{$line}.ring.match.1.callerId"></item> -->
+		<!-- Distinctive Ring Tone -->
+		<!-- <item name="account.{$line}.ring.match.1.ringtone">content://settings/system/ringtone</item> -->
+		<!-- Match Incoming Caller ID -->
+		<!-- <item name="account.{$line}.ring.match.2.callerId"></item> -->
+		<!-- Distinctive Ring Tone -->
+		<!-- <item name="account.{$line}.ring.match.2.ringtone">content://settings/system/ringtone</item> -->
+		<!-- Match Incoming Caller ID -->
+		<!-- <item name="account.{$line}.ring.match.3.callerId"></item> -->
+		<!-- Distinctive Ring Tone -->
+		<!-- <item name="account.{$line}.ring.match.3.ringtone">content://settings/system/ringtone</item> -->
+		<!-- ############Ring Tone Value Table###############
+                # Web GUI Option                            Value
+                # Use System Ring tone                      content://settings/system/ringtone
+                # Silent                                    ringtone_silence
+                # Ring2_OrganDub                            /system/media/audio/ringtones/Ring2_OrganDub.ogg
+                # Big_Easy                                  /system/media/audio/ringtones/Big_Easy.ogg
+                # DonMessWivlt                              /system/media/audio/ringtones/DonMessWivIt.ogg
+                # Club_Cubano                               /system/media/audio/ringtones/Club_Cubano.ogg
+                # Growl                                     /system/media/audio/ringtones/Growl.ogg
+                # CrayonRock                                /system/media/audio/ringtones/CrayonRock.ogg
+                # Ring9_Nairobi                             /system/media/audio/ringtones/Ring9_Nairobi.ogg
+                # Ring10_Nassau                             /system/media/audio/ringtones/Ring10_Nassau.ogg
+                # Third_Eye                                 /system/media/audio/ringtones/Third_Eye.ogg
+                # Ring1_Ding                                /system/media/audio/ringtones/Ring1_Ding.ogg
+                # Road_Trip                                 /system/media/audio/ringtones/Road_Trip.ogg
+                # bellcore-dr2                              /system/media/audio/ringtones/bellcore-dr2.ogg
+                # Ring_Digital_02                           /system/media/audio/ringtones/Ring_Digital_02.ogg
+                # bellcore-dr3                              /system/media/audio/ringtones/bellcore-dr3.ogg
+                # DancinFool                                /system/media/audio/ringtones/DancinFool.ogg
+                # Ring_Classic_02                           /system/media/audio/ringtones/Ring_Classic_02.ogg
+                # Ring5_FreeFlight                          /system/media/audio/ringtones/Ring5_FreeFlight.ogg
+                # Funk_Yall                                 /system/media/audio/ringtones/Funk_Yall.ogg
+                # World                                     /system/media/audio/ringtones/World.ogg
+                # Ring8_MidEvilJaunt                        /system/media/audio/ringtones/Ring8_MidEvilJaunt.ogg
+                # TwirlAway                                 /system/media/audio/ringtones/TwirlAway.ogg
+                # bellcore-dr4                              /system/media/audio/ringtones/bellcore-dr4.ogg
+                # Ring6_Glacial_Groove                      /system/media/audio/ringtones/Ring6_Glacial_Groove.ogg
+                # Shes_All_That                             /system/media/audio/ringtones/Shes_All_That.ogg
+                # Ring4_EtherShake                          /system/media/audio/ringtones/Ring4_EtherShake.ogg
+                # Seville                                   /system/media/audio/ringtones/Seville.ogg
+                # BussaMove                                 /system/media/audio/ringtones/BussaMove.ogg
+                # Default_ringtone                          /system/media/audio/ringtones/Default_ringtone.ogg
+                # BirdLoop                                  /system/media/audio/ringtones/BirdLoop.ogg
+                # MildlyAlarming                            /system/media/audio/ringtones/MildlyAlarming.ogg
+                # Terminated                                /system/media/audio/ringtones/Terminated.ogg
+                # Calypso_Steel                             /system/media/audio/ringtones/Calypso_Steel.ogg
+                # Safari                                    /system/media/audio/ringtones/Safari.ogg
+                # Ring_Synth_04                             /system/media/audio/ringtones/Ring_Synth_04.ogg
+                # Ring_Synth_02                             /system/media/audio/ringtones/Ring_Synth_02.ogg
+                # CurveBall                                 /system/media/audio/ringtones/CurveBall.ogg
+                # Enter_the_Nexus                           /system/media/audio/ringtones/Enter_the_Nexus.ogg
+                # Bollywood                                 /system/media/audio/ringtones/Bollywood.ogg
+                # Champagne_Edition                         /system/media/audio/ringtones/Champagne_Edition.ogg
+                # Steppin_Out                               /system/media/audio/ringtones/Steppin_Out.ogg
+                # Ring3_Paradise_Island                     /system/media/audio/ringtones/Ring3_Paradise_Island.ogg
+                # Playa                                     /system/media/audio/ringtones/Playa.ogg
+                # No_Limits                                 /system/media/audio/ringtones/No_Limits.ogg
+                # LoopyLounge                               /system/media/audio/ringtones/LoopyLounge.ogg
+                # Cairo                                     /system/media/audio/ringtones/Cairo.ogg
+                # Ring7_HalfwayHome                         /system/media/audio/ringtones/Ring7_HalfwayHome.ogg
+                # SilkyWay                                  /system/media/audio/ringtones/SilkyWay.ogg
+                # LoveFlute                                 /system/media/audio/ringtones/LoveFlute.ogg
+                # Eastern_Sky                               /system/media/audio/ringtones/Eastern_Sky.ogg
+                # bellcore-dr5                              /system/media/audio/ringtones/bellcore-dr5.ogg
+                # Gimme_Mo_Town                             /system/media/audio/ringtones/Gimme_Mo_Town.ogg
+                # bellcore-dr1                              /system/media/audio/ringtones/bellcore-dr1.ogg
+                # Backroad                                  /system/media/audio/ringtones/Backroad.ogg -->
+		<!-- Account Advanced Settings -->
+		<!-- Check Domain Certificates		 -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.sip.validate.domainCertificates">No</item>
+		<!-- Validate Certification Chain 	 -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.sip.validate.certificationChain">No</item>
+		<!-- Validate Incoming SIP Messages -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.sip.validate.incomingMessage">No</item>
+		<!-- Allow Unsolicited REFER -->
+		<!-- Disabled, Enabled, EnabledOrForceAuth -->
+		<item name="account.{$line}.sip.allowUnsolicitedRefer">Disabled</item>
+		<!-- Only Accept SIP Requests from Known Servers -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.sip.validate.incomingServer">Yes</item>
+		<!-- Check SIP User ID for Incoming INVITE  -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.sip.validate.userIdforInvite">No</item>
+		<!-- Allow SIP Reset  -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.sip.allowSipReset">No</item>
+		<!-- Authenticate Incoming INVITE -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.sip.authenticateIncomingInvite">No</item>
+		<!-- SIP Realm Used for Challenge INVITE & NOTIFY -->
+		<item name="account.{$line}.sipRealmForChallengeINVITE"></item>
+		<!-- Virtual Account Group -->
+		<!-- -1 - Default, 0 - 15 - Virtual Account Group 1 - 16 -->
+		<item name="account.{$line}.virtualGroup">-1</item>
+		<!-- Special Feature -->
+		<!-- 100 - Standard, 102 - Broadsoft, 113 - China Mobile, 114 - ZTE IMS, 115 - Mobotix, 116 - ZTE NGN, 117 - Huawei IMS, 123 - NEC, 125 - Worldstone -->
+		<item name="account.{$line}.sip.specialFeature">100</item>
+		<!-- BLF Call-pickup Prefix  -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.sip.blf.callPickup.forcePrefix">No</item>
+		<!-- EventList BLF URI -->
+		<item name="account.{$line}.sip.blf.eventlist.uri"></item>
+		<!-- Force BLF Call-pickup by Prefix -->
+		<item name="account.{$line}.sip.blf.callPickup.prefix">**</item>
+		<!-- Value-added Service - Broadsoft Settings - Braodsoft Call Features -->
+		<!-- Feature Key Synchronization -->
+		<!-- No - Disable, Yes - Broadsoft -->
+		<item name="account.{$line}.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.{$line}.broadsoft.callPark">No</item>
+		<!-- Conference URI -->
+		<item name="account.{$line}.sip.conferenceUri"></item>
+		<!-- BroadSoft Call Center -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.broadsoft.callCenter">No</item>
+
+		<!-- Hoteling Event -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.broadsoft.hoteling">No</item>
+
+		<!-- Call Center Status -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.broadsoft.callCenterStatus">No</item>
+
+		<!-- Value-added Service - Broadsoft Settings - SCA -->
+		<!-- Enable SCA (Shared Call Appearance) -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.sca.enable">{if isset($row.shared_line)}1{else}0{/if}</item>
+
+		<!-- Enable BargeIn -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.sca.bargein.enable">{if isset($row.shared_line)}Yes{else}No{/if}</item>
+		<!-- Auto-filling Pickup Feature Code -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.sca.autoPickup.enable">Yes</item>
+		<!-- Pickup Feature Code -->
+		<item name="account.{$line}.sca.pickupFeatureCode"></item>
+		<!-- Line-seize Timeout -->
+		<!-- Range: 15 - 60. Default: 15 -->
+		<item name="account.{$line}.sip.lineSeizeTimeout">15</item>
+		{/for}
+		<!-- Phone Settings - General Settings -->
+		<!-- Local RTP Port -->
+		<!-- Number: 50040 - 65535 -->
+		<item name="network.rtp.local.port">50040</item>
+		<!-- Use Random Port -->
+		<!-- Yes, No -->
+		<item name="network.rtp.useRandomPort">No</item>
+		<!-- Disable In-call DTMF Display -->
+		<!-- Yes, No -->
+		<item name="call.display.dtmfInCall">Yes</item>
+		<!-- Enable Enterprise Contacts Timeout Auto Search -->
+		<!-- Yes, No -->
+		<item name="call.general.enterpriseContactsSearch">Yes</item>
+		<!-- Keep-alive Interval (s) -->
+		<!-- Number: 10 - 160 -->
+		<item name="sip.keepAliveInterval">20</item>
+		<!-- STUN Server -->
+		<item name="network.stunServer">stun.ipvideotalk.com</item>
+		<!-- TURN Server Username -->
+		<item name="network.stunUsername"></item>
+		<!-- TURN Server Password -->
+		<item name="network.stunPassword"></item>
+		<!-- Use NAT IP -->
+		<item name="sip.userNatIp"></item>
+		<!-- Phone Settings - Call Settings -->
+		<!-- Disable Video Call Feature -->
+		<!-- Yes - unchecked, No - checked -->
+		<item name="call.video.enable">Yes</item>
+		<!-- Use Quick IP-call Mode -->
+		<!-- Yes, No -->
+		<item name="call.ipcall.allowQuickDialing">No</item>
+		<!-- Disable Call-Waiting -->
+		<!-- Yes - unchecked, No - checked -->
+		<item name="call.callWaiting.enable">Yes</item>
+		<!-- Disable Call-Waiting Tone -->
+		<!-- Yes - unchecked, No - checked -->
+		<item name="call.callWaiting.enableTone">Yes</item>
+		<!-- Disable DND Reminder Ring -->
+		<!-- Yes - unchecked, No - checked -->
+		<item name="call.dnd.reminder.enable">Yes</item>
+		<!-- Disable Transfer -->
+		<!-- Yes - unchecked, No - checked -->
+		<item name="call.transfer.enable">Yes</item>
+		<!-- Hold Call Before Completing Transfer -->
+		<item name="call.holdBeforeTransfer">Yes</item>
+		<!-- Default Transfer Mode -->
+		<!-- BlindTransfer, AttendedTransfer, AttendedTransferOnly -->
+		<item name="call.transfer.mode">BlindTransfer</item>
+		<!-- Enable transfer via non-Transfer Programmable Key.-->
+		<!-- Yes, No (default) -->
+		<item name="call.transfer.viampk.enable">Yes</item>
+		<!-- Disable Conference -->
+		<!-- Yes - unchecked, No - checked -->
+		<item name="call.conference.enable">Yes</item>
+		<!-- Auto Conference -->
+		<!-- No, Yes -->
+		<item name="call.autoConf.enable">No</item>
+		<!-- Auto Mute on Entry -->
+		<!-- Disable, Incoming, Outgoing, IncomingOutgoing -->
+		<item name="call.automute.mode">Disable</item>
+		<!-- Always Ring Speaker -->
+		<!-- Yes, No -->
+		<item name="audio.alwaysRingSpeaker">No</item>
+		<!-- Offhook Auto Dial -->
+		<item name="call.dial.offhook.autoDial.number"></item>
+		<!-- Offhook Auto Dial Delay (s) -->
+		<item name="call.dial.offhook.autoDial.delay"></item>
+		<!-- Offhook/Onhook Timeout (s) -->
+		<item name="call.dial.offhook.timeout">30</item>
+		<!-- Auto Unhold When Press the Line Key -->
+		<!-- No, Yes -->
+		<item name="call.autoUnhold.enable">No</item>
+		<!-- Virtual Account Group Avaya Mode -->
+		<!-- No, Yes -->
+		<item name="call.virtualgroup.avayamode.enable">No</item>
+		<!-- Number Of Accounts The Virtual Account Group Register -->
+		<!-- Range: 1 - 4 -->
+		<item name="call.virtualgroup.mainregister.number">2</item>
+		<!-- Filter Characters -->
+		<item name="call.filter.character">[()- ]</item>
+		<!-- Escape '#' as %23 in SIP URI -->
+		<!-- No, Yes -->
+		<item name="sip.escapeUrl">Yes</item>
+		<!-- Record Mode -->
+		<!-- Local, PortaOne, UCM, BroadSoft -->
+		<item name="call.recording.local.enable">Local</item>
+		<!-- Phone Settings - Ring Tone -->
+		<!-- Auto Config CPT by Region -->
+		<!-- No, Yes -->
+		<item name="audio.tone.autoCPTbyRegion">No</item>
+		<!-- Dial Tone -->
+		<item name="audio.tone.dial">f1=350@-13,f2=440@-13,c=0/0;</item>
+		<!-- Second Dial Tone -->
+		<item name="audio.tone.secondDial"></item>
+		<!-- Ring Back Tone -->
+		<item name="audio.tone.ringBack">f1=440,f2=480,c=2000/4000;</item>
+		<!-- Busy Tone -->
+		<item name="audio.tone.busy">f1=480,f2=620,c=500/500;</item>
+		<!-- Reorder Tone -->
+		<item name="audio.tone.reorder">f1=480,f2=620,c=250/250;</item>
+		<!-- Confirmation Tone -->
+		<item name="audio.tone.confirmation">f1=350,f2=440,c=100/100-100/100-100/100;</item>
+		<!-- Call-Waiting Tone -->
+		<item name="audio.tone.callWaiting">f1=440,c=300/2000-300/2000-0/0;</item>
+		<!-- Call-Waiting Tone Gain -->
+		<!-- Low, Medium, High -->
+		<item name="audio.tone.callWaiting.gain">Low</item>
+		<!-- Default Ring Cadence -->
+		<item name="audio.tone.defaultRingCadence">c=2000/4000;</item>
+		<!-- Phone Settings - Video Settings -->
+		<!-- Video Frame Rate -->
+		<!-- 5, 15, 25, 30 -->
+		<item name="video.frameRate">15</item>
+		<!-- Video Display Mode -->
+		<!-- OriginalProportion, EqualProportionalCutting, ProportionalAddBlackEdge -->
+		<item name="video.displayMode">EqualProportionalCutting</item>
+		<!-- Enable Frame Skipping in Video Decoder -->
+		<!-- Yes, No -->
+		<item name="video.frameSkipping.enable">Yes</item>
+		<!-- Phone Settings - Multicast Paging - Multicast Paging -->
+		<!-- Paging Barge -->
+		<!-- Disable-0, priority1-1, priority2-2, priority3-3, priority4-4, priority5-5, priority6-6, priority7-7, priority8-8, priority9-9, priority10-10 -->
+		<item name="multicast.paginBarge">Disable</item>
+		<!-- Paging Priority Active -->
+		<!-- Yes, No -->
+		<item name="multicast.pagingPriorityActive">No</item>
+		<!-- Multicast Paging Codec -->
+		<!-- PCMU, PCMA, G_726_32, G_722, G_729AOrB, iLBC, OPUS -->
+		<item name="multicast.multicastPagingCodec">PCMU</item>
+		<!-- Enable Multicast Paging Video -->
+		<!-- No, Yes -->
+		<item name="multicast.multicastPagingVideo.enable">No</item>
+		<!-- Multicast Paging Video Codec -->
+		<!-- H.264 - H264 -->
+		<item name="multicast.multicastPagingVideo.codec">H264</item>
+		<!-- Multicast Paging Image Size -->
+		<!-- VGA, QVGA, 4CIF, CIF, QCIF, 720P -->
+		<item name="multicast.multicastPagingImageSize">VGA</item>
+		<!-- Multicast Paging Video Bit Rate -->
+		<!-- 32 - 32kbps, 64 - 64kbps, 96 - 96kbps, 128 - 128kbps, 160 - 160kbps -->
+		<!--  192 - 192kbps, 210 - 210kbps, 256 - 256kbps, 384 - 384kbps, 512 - 512kbps,  640 - 640kbps, 768 - 768kbps -->
+		<!--  1024 - 1024kbps, 1280 - 1280kbps, 1536 - 1536kbps, 2048 - 2048kbps. Default Value is 256 -->
+		<item name="multicast.multicastPagingVideoBitRate">256</item>
+		<!-- Multicast Paging Video Frame Rate -->
+		<!-- 15, 25, 30, Variable frame rate - 29 -->
+		<item name="multicast.multicastPagingVideoFrameRate">15</item>
+		<!-- Multicast Paging H.264 Profile Type -->
+		<!-- Baseline, Main, High -->
+		<item name="multicast.multicastPagingH264ProfileType">Baseline</item>
+		<!-- Multicast Paging H.264 Payload Type -->
+		<!-- Range: 96-127, Default: 99 -->
+		<item name="multicast.multicastPagingH264PayloadType">99</item>
+		<!-- Phone Settings - Multicast Paging - Multicast Listening -->
+		<item name="multicast.listening.1.address"></item>
+		<item name="multicast.listening.1.label"></item>
+		<item name="multicast.listening.2.address"></item>
+		<item name="multicast.listening.2.label"></item>
+		<item name="multicast.listening.3.address"></item>
+		<item name="multicast.listening.3.label"></item>
+		<item name="multicast.listening.4.address"></item>
+		<item name="multicast.listening.4.label"></item>
+		<item name="multicast.listening.5.address"></item>
+		<item name="multicast.listening.5.label"></item>
+		<item name="multicast.listening.6.address"></item>
+		<item name="multicast.listening.6.label"></item>
+		<item name="multicast.listening.7.address"></item>
+		<item name="multicast.listening.7.label"></item>
+		<item name="multicast.listening.8.address"></item>
+		<item name="multicast.listening.8.label"></item>
+		<item name="multicast.listening.9.address"></item>
+		<item name="multicast.listening.9.label"></item>
+		<item name="multicast.listening.10.address"></item>
+		<item name="multicast.listening.10.label"></item>
+
+		<!-- Ethernet Settings -->
+		<!-- Preferred Internet Protocol -->
+		<!-- BothAndPreferIPv4, BothAndPreferIPv6, IPv4Only, IPv6Only -->
+		{if $grandstream_ipv_mode=='0'}
+			<item name="network.internetProtocol">BothAndPreferIPv4</item>
+			{elseif $grandstream_ipv_mode=='1'}
+			<item name="network.internetProtocol">BothAndPreferIPv6</item>
+			{elseif $grandstream_ipv_mode=='2'}
+			<item name="network.internetProtocol">IPv4Only</item>
+			{elseif $grandstream_ipv_mode=='3'}
+			<item name="network.internetProtocol">IPv6Only</item>
+			{else}
+			<item name="network.internetProtocol">BothAndPreferIPv4</item>
+		{/if} 
+		<!-- IPv4 Address Type -->
+		<!-- DHCP, StaticIP, PPPoE -->
+		<item name="network.port.eth.1.type">DHCP</item>
+		<!-- DHCP VLAN Override -->
+		<!-- Disable, DHCPOption132and133, EncapsulatedinDHCPOption43 -->
+		<item name="network.dhcp.enableVlan">Disable</item>
+		<!-- Host Name(Option 12) -->
+		<item name="network.dhcp.hostName"></item>
+		<!-- Vendor Class ID(Option 60) -->
+		<!-- <item name="network.dhcp.vendorID"></item> -->
+		<!-- IP Address -->
+		<item name="network.port.eth.1.address.1">0</item>
+		<item name="network.port.eth.1.address.2">0</item>
+		<item name="network.port.eth.1.address.3">0</item>
+		<item name="network.port.eth.1.address.4">0</item>
+		<!-- Subnet Mask -->
+		<item name="network.port.eth.1.mask.1">0</item>
+		<item name="network.port.eth.1.mask.2">0</item>
+		<item name="network.port.eth.1.mask.3">0</item>
+		<item name="network.port.eth.1.mask.4">0</item>
+		<!-- Default Gateway -->
+		<item name="network.port.eth.1.gateway.1">0</item>
+		<item name="network.port.eth.1.gateway.2">0</item>
+		<item name="network.port.eth.1.gateway.3">0</item>
+		<item name="network.port.eth.1.gateway.4">0</item>
+		<!-- DNS Server 1 -->
+		<item name="network.dns.1.ip.1">0</item>
+		<item name="network.dns.1.ip.2">0</item>
+		<item name="network.dns.1.ip.3">0</item>
+		<item name="network.dns.1.ip.4">0</item>
+		<!-- DNS Server 2 -->
+		<item name="network.dns.2.ip.1">0</item>
+		<item name="network.dns.2.ip.2">0</item>
+		<item name="network.dns.2.ip.3">0</item>
+		<item name="network.dns.2.ip.4">0</item>
+		<!-- PPPoE Account ID -->
+		<item name="network.port.eth.1.pppoe.account"></item>
+		<!-- PPPoE Password -->
+		<item name="network.port.eth.1.pppoe.password"></item>
+		<!-- Layer 2 QoS 802.1Q/VLAN Tag (Ethernet) -->
+		<!-- Number: 0 - 4095 -->
+		<item name="network.port.eth.1.vlan.tag">0</item>
+		<!-- Layer 2 QoS 802.1p Priority Value (Ethernet) -->
+		<!-- Number: 0 - 7 -->
+		<item name="network.port.eth.1.vlan.priorit">0</item>
+		<!-- IPv6 Address  -->
+		<!-- AutoConfigured, StaticallyConfigured -->
+		<item name="network.port.eth.1.ipv6.type">AutoConfigured</item>
+		<!-- Static IPv6 Address -->
+		<item name="network.port.eth.1.ipv6.static.address"></item>
+		<!-- IPv6 Prefix Length -->
+		<item name="network.port.eth.1.ipv6.static.prefixLength">64</item>
+		<!-- DNS Server 1 -->
+		<item name="network.dns.1.ipv6"></item>
+		<!-- DNS Server 2 -->
+		<item name="network.dns.2.ipv6"></item>
+		<!-- 802.1x Mode -->
+		<!-- Disable, EAP_MD5, EAP_TLS, EAP_PEAPv0OrMSCHAPv2 -->
+		<item name="network.802.1x.mode">Disable</item>
+		<!-- 802.1x Identity -->
+		<item name="network.802.1x.identity"></item>
+		<!-- 802.1x Secret -->
+		<item name="network.md5Password"></item>
+		<!-- Wi-Fi Settings -->
+		<!-- Wi-Fi Function -->
+		{if isset($grandstream_wifi_enable)}
+		<!-- No, Yes -->
+		<item name="wifi.enable">{if filter_var($grandstream_wifi_enable, FILTER_VALIDATE_BOOLEAN)}Yes{else}No{/if}</item>
+		<!-- ESSID -->
+		{if isset($grandstream_wifi_essid)}
+		<item name="wifi.essidname">{$grandstream_wifi_essid}</item>
+		<!-- Password -->
+		<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">{$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 -->
+		<item name="network.openvpn.enable">0</item>
+		<!-- OpenVPN Server Address -->
+		<item name="network.openvpn.server"></item>
+		<!-- OpenVPN Port -->
+		<item name="network.openvpn.port">1194</item>
+		<!-- OpenVPN Transport -->
+		<!-- UDP, TCP -->
+		<item name="network.openvpn.transport">0</item>
+		<!-- OpenVPN® CA -->
+		<item name="network.openvpn.ca"></item>
+		<!-- OpenVPN® Client Certificate -->
+		<item name="network.openvpn.cert"></item>
+		<!-- OpenVPN® Client Key -->
+		<item name="network.openvpn.clientKey"></item>
+		<!-- OpenVPN® Cipher Method -->
+		<!-- Blowfish, AES128, AES256, TripleDES -->
+		<item name="network.openvpn.ciperMethod">Blowfish</item>
+		<!-- OpenVPN® Username -->
+		<item name="network.openvpn.transport"></item>
+		<!-- OpenVPN® Password -->
+		<item name="network.openvpn.password"></item>
+		<!-- Advanced Network Settings -->
+		<!-- Alternate DNS Server -->
+		<item name="network.dns.preferred.ip.1">0</item>
+		<item name="network.dns.preferred.ip.2">0</item>
+		<item name="network.dns.preferred.ip.3">0</item>
+		<item name="network.dns.preferred.ip.4">0</item>
+		<!-- Second Alternate DNS Server -->
+		<item name="network.dns.second.preferred.ip.1"></item>
+		<item name="network.dns.second.preferred.ip.2"></item>
+		<item name="network.dns.second.preferred.ip.3"></item>
+		<item name="network.dns.second.preferred.ip.4"></item>
+		<!-- Enable LLDP -->
+		<!-- Yes, No -->
+		<item name="network.lldp.enable">Yes</item>
+		<!-- LLDP TX Interval (s)  -->
+		<item name="network.lldp.txInterval">30</item>
+		<!-- Enable CDP -->
+		<!-- Yes, No -->
+		<item name="network.cdp">Yes</item>
+		<!-- Layer 3 QoS for SIP -->
+		<item name="network.qos.forSip">26</item>
+		<!-- Layer 3 QoS for Audio -->
+		<item name="network.qos.forRtp">46</item>
+		<!-- Layer 3 QoS for Video -->
+		<item name="network.qos.forVideo">34</item>
+		<!-- HTTP/HTTPS User-Agent -->
+		<!-- <item name="network.useragent.httporhttps"></item> -->
+		<!-- SIP User-Agent -->
+		<!-- <item name="network.useragent.sip">Grandstream GXV3480 $version</item> -->
+		<!-- PC Port Mode -->
+		<!-- Enabled, Disabled, Mirrored -->
+		<item name="network.port.pc.mode">Enabled</item>
+		<!-- PC Port VLAN Tag  -->
+		<item name="network.port.pc.vlan.tag">0</item>
+		<!-- PC Port Priority Value -->
+		<item name="network.port.pc.vlan.priority">0</item>
+		<!-- HTTP/HTTPS Proxy Hostname -->
+		<!-- Must include port number -->
+		<item name="network.proxy.http"></item>
+		<!-- System Settings -->
+		<!-- Assign NTP Server Address -->
+		<item name="dateTime.ntp.server.1">pool.ntp.org</item>
+		<!-- DHCP Option 42 Override NTP Server -->
+		<!-- Yes, No -->
+		<item name="dateTime.override.dhcp.allowOption42">Yes</item>
+		<!-- DHCP Option 2 to Override Time Zone Setting -->
+		<!-- Yes, No -->
+		<item name="dateTime.override.dhcp.allowOption2">Yes</item>
+		<!-- Time Zone -->
+		<!-- International Date Line West - TZA+12
+		Midway, America - TZB+11
+		American Samoa - TZB+11
+		US Hawaiian Time - HAW10
+		US Alaska Time - AKST9AKDT
+		Los Angeles, America - PST8PDT
+		Baja California, Mexico - PST8PDT,M4.1.0,M10.5.0
+		US Mountain Time - MST7MDT
+		Denver, America - MST7MDT
+		Arizona, America (no DST) - MST7
+		Chihuahua, Mexico - MST7MDT,M4.1.0,M10.5.0
+		Mazatlan, Mexico - MST7MDT,M4.1.0,M10.5.0
+		Central Time - CST6CDT
+		Central America - CST+6
+		Guadalajara, Mexico - CST6CDT,M4.1.0,M10.5.0
+		Mexico City, Mexico - CST6CDT,M4.1.0,M10.5.0
+		Monterrey, Mexico - CST6CDT,M4.1.0,M10.5.0
+		Eastern Time - EST5EDT
+		Eastern Time (no DST) - EST5
+		Venezuela, Caracas - TZf+4
+		Atlantic Time - AST4ADT
+		Atlantic Time (New Brunswick) - AST4ADT,M4.1.0/00:01:00,M10.5.0/00:01:00
+		Newfoundland Time - NST+3:30NDT+2:30,M3.2.0/00:01:00,M11.1.0/00:01:00
+		Greenland - TZK+3
+		Sao Paulo, Brazil - BRST+3BRDT+2,M10.3.0,M2.3.0
+		Argentina - UTC+3
+		Mid-Atlantic - TZL+2
+		Azores, Portugal - TZM+1
+		Cape Verdi Is - TZM+1
+		Edinburgh, UK - TZN+0
+		Casablanca, Morocco - TZN+0
+		Monrovia, Liberia - TZN+0
+		London, UK - GMT+0BST-1,M3.5.0/01:00:00,M10.5.0/02:00:00
+		Lisbon, Portugal - WET-0WEST-1,M3.5.0/01:00:00,M10.5.0/02:00:00
+		Dublin, Ireland - GMT+0IST-1,M3.5.0/01:00:00,M10.5.0/02:00:00
+		Paris, France - CET-1CEST-2,M3.5.0/02:00:00,M10.5.0/03:00:00
+		Vienna, Austria - CET-1CEST-2,M3.5.0/02:00:00,M10.5.0/03:00:00
+		Warsaw, Poland - CET-1CEST-2,M3.5.0/02:00:00,M10.5.0/03:00:00
+		Rome, Italy - CET-1CEST-2,M3.5.0/02:00:00,M10.5.0/03:00:00
+		Madrid, Spain - CET-1CEST-2,M3.5.0/02:00:00,M10.5.0/03:00:00
+		Prague, Czech - CET-1CEST-2,M3.5.0/02:00:00,M10.5.0/03:00:00
+		Berlin, Germany - CET-1CEST-2,M3.5.0/02:00:00,M10.5.0/03:00:00
+		Budapest, Hungary - CET-1CEST-2,M3.5.0/02:00:00,M10.5.0/03:00:00
+		Amsterdam, Netherlands - CET-1CEST-2,M3.5.0/02:00:00,M10.5.0/03:00:00
+		Brussels, Belgium - CET-1CEST-2,M3.5.0/02:00:00,M10.5.0/03:00:00
+		Jerusalem, Israel - TZP-2
+		Cairo, Egypt - TZP-2
+		Istanbul, Turkey - TZP-2
+		Bucharest, Romania - TZP-2
+		Helsinki, Finland - EET-2EEST-3,M3.5.0/03:00:00,M10.5.0/04:00:00
+		Athens, Greece - EET-2EEST-3,M3.5.0/03:00:00,M10.5.0/04:00:00
+		Tallinn, Estonia - EET-2EEST-3,M3.5.0/03:00:00,M10.5.0/04:00:00
+		Kyiv, Ukraine - EET-2EEST,M3.5.0/3,M10.5.0/4
+		Kuwait - TZQ-3
+		Baghdad, Iraq - TZQ-3
+		Tehran, Iran - TZQ-3
+		Nairobi, Kenya - TZQ-3
+		Moscow, Russia - MSK-3
+		Abu Dhabi, UAE - TZR-4
+		Baku, Azerbaijan - TZR-4
+		Islamabad, Pakistan - TZS-5
+		Ekaterinburg, Russia - TZS-5
+		Karachi, Pakistan - TZS-5
+		Tashkent, Uzbekistan - TZS-5
+		Chennai, India - TZT-5:30
+		New Delhi, India - TZT-5:30
+		Mumbai, India - TZT-5:30
+		Kathmandu, Nepal - TZU-5:45
+		Almaty, Kazakhstan - TZV-6
+		Astana, Kazakhstan - TZV-6
+		Dhaka, Bangladesh - TZV-6
+		Novosibirsk, Russia - TZV-6
+		Rangoon, Burma - TZW-6:30
+		Bankok, Thailand - TZX-7
+		Hanoi, Vietnam - TZX-7
+		Krasnoyarsk, Russia - TZX-7
+		Jakarta, Indonesia - WIB-7
+		Beijing, Chaina - TZY-8
+		Taipei, Taiwan - TZY-8
+		Kuala Lumpur, Malaysia - TZY-8
+		Irkutsk, Russia - TZY-8
+		Singapore - SGT-8
+		Ulaanbaatar, Mongolia - ULAT-8
+		Perth, Australia - WST-8
+		Tokyo, Japan - TZZ-9
+		Seoul, South Korea - TZZ-9
+		Yakutsk, Russia - TZZ-9
+		Adelaide, Australia - CST-9:30CDT-10:30,M10.5.0/02:00:00,M3.5.0/03:00:00
+		Darwin, Australia - CST-9:30
+		Guam - TZb-10
+		Hobart, Australia - EST-10EDT-11,M10.1.0/02:00:00,M3.5.0/03:00:00
+		Sydney, Australia - EST-10EDT-11,M10.5.0/02:00:00,M3.5.0/03:00:00
+		Melbourne, Australia - EST-10EDT-11,M10.5.0/02:00:00,M3.5.0/03:00:00
+		Canberra, Australia - EST-10EDT-11,M10.5.0/02:00:00,M3.5.0/03:00:00
+		Brisbane, Australia - EST-10
+		Magadan, Russia - TZc-11
+		Solomon Islands - TZc-11
+		New Caledonia - TZc-11
+		Auckland, New Zealand - NZST-12NZDT-13,M9.5.0/02:00:00,M3.5.0/03:00:00
+		Wellington, New Zealand - NZST-12NZDT-13,M9.5.0/02:00:00,M3.5.0/03:00:00
+		Fiji - TZd-12
+		Nukualofa, Tonga - TZe-13 -->
+{if isset($grandstream_timezone) }
+		<item name="dateTime.timezone">{$grandstream_timezone}</item>
+{elseif isset($grandstream_gxp_time_zone) }
+		<item name="dateTime.timezone">{$grandstream_gxp_time_zone}</item>
+{/if}
+		<!-- Time Display Format -->
+		<!-- 12Hour, 24Hour -->
+		<item name="dateTime.format.time">12Hour</item>
+		<!-- Date Display Format -->
+		<!-- yyyy-mm-dd, mm-dd-yyyy, dd-mm-yyyy, Normal -->
+		<item name="dateTime.format.date">Normal</item>
+		<!-- Language -->
+		<!-- Arabic - ar, Czech - cz, Deutsh - de, English - en, Spanish - es, Francais - fr, Hebrew - he, Hrvatski - hr, Magyar - hu, Italiano - it, japanese - ja, korean - ko, latvian - lv, Dutch - nl, Polski - pl, Portugue - pt, Russian - ru, Slovenian - sl, Svenska - sv, Turkish - tr, Ukrainian - uk, traditional_chinese - zh-tw, simplified_chinese - zh -->
+		<item name="language.gui">en_US</item>
+		<!-- System settings - Security Settings -->
+		<!-- Disable SSH -->
+		<!-- No, Yes -->
+		<item name="security.ssh">No</item>
+		<!-- Access Method -->
+		<!-- HTTP, HTTPS -->
+		<item name="security.webAccessMode">HTTP</item>
+		<!-- Port -->
+		<!-- By default, HTTP uses port 80 and HTTPS uses port 443. This field is for customizing the web port -->
+		<item name="security.webAccess.port">80</item>
+		<!-- Configuration via Keypad Menu -->
+		<!-- Unrestricted, BasicSettingsOnly, ConstraintMode -->
+		<item name="security.configurationViaKeypadMenu">No</item>
+		<!-- Permission to Install/Uninstall Apps -->
+		<!-- Allow, RequireAdminPassword, RequireAdminPasswordIfSrcUnknown, NotAllow -->
+		<item name="security.installThirdApp.permission">Allow</item>
+		<!-- Admin Password -->
+		<item name="users.admin.password">{if isset($admin_password)}{$admin_password}{else}admin{/if}</item>
+		<!-- User Password -->
+		<item name="users.user.password">{if isset($device_password)}{$device_password}{else}user{/if}</item>
+		<!-- SIP TLS Certificate -->
+		<!-- <item name="security.certificate"></item> -->
+		<!-- SIP TLS Private Key  -->
+		<!-- <item name="security.key"></item> -->
+		<!-- SIP TLS Private Key Password -->
+		<!-- <item name="security.password">s1pphone</item> -->
+		<!-- Certificate Management - Trusted CA Certificates -->
+		<item name="CACertificates.1"></item>
+		<!-- Custom Certificate -->
+		<item name="security.customcertificate"></item>
+		<!-- Enable Missed Call Backlight -->
+		<item name="lcd.backlight.missedCall">No</item>
+		<!-- Enable Missed Call Indicator -->
+		<!-- Checked - No, Unchecked - Yes -->
+		<item name="ledControl.missedCall">Yes</item>
+		<!-- Enable MWI Indicator -->
+		<!-- Checked - No, Unchecked - Yes -->
+		<item name="ledControl.mwi">Yes</item>
+		<!-- Enable New Message Indicator -->
+		<!-- Checked - No, Unchecked - Yes -->
+		<item name="ledControl.newMessage">Yes</item>
+		<!-- Enable Contact Full Indicator -->
+		<!-- Checked - No, Unchecked - Yes -->
+		<item name="ledControl.contactFull">No</item>
+		<!-- Enable Indicator When LCD is Off -->
+		<!-- Checked - No, Unchecked - Yes -->
+		<item name="ledControl.LCDOff">Yes</item>
+		<!-- Screen Timeout -->
+		<!-- Never, 2Mins, 3Mins, 5Mins, 10Mins, 20Mins, 30Mins, 1Hour -->
+		<item name="lcd.blacklight.activeTimeout.sec">10Mins</item>
+		<!-- Screensaver Timeout -->
+		<!-- Never, 15Secs, 30Secs, 1Min, 2Mins, 5Mins, 10Mins, 20Mins, 30Mins -->
+		<item name="lcd.screensaver.timeout.sec">5Mins</item>
+		<!-- Using Server Wallpaper -->
+		<!-- Default, Download -->
+{if isset($grandstream_wallpaper_url)}
+		<item name="lcd.wallpaper.source">Download</item>
+{else}
+		<item name="lcd.wallpaper.source">Default</item>
+{/if}
+		<!-- Server Wallpaper Path -->
+{if isset($grandstream_wallpaper_url)}
+		<item name="lcd.wallpaper.serverPath">{$grandstream_wallpaper_url}</item>
+{else}
+		<item name="lcd.wallpaper.serverPath"></item>
+{/if}
+		<!-- Camera AE Mode -->
+		<!-- Bright, Dark -->
+		<item name="camera.ae.mode">Bright</item>
+		<!-- RJ9 Headset TX Gain (dB) -->
+		<!-- -24, -18, -12, -6, 0, +6, +12, +18, +24 -->
+		<item name="audio.headset.txGain">0</item>
+		<!-- RJ9 Headset RX Gain (dB) -->
+		<!-- -9, -6, 0, +6, +9 -->
+		<item name="audio.headset.rxGain">0</item>
+		<!-- 3.5mm Earphone TX Gain (dB) -->
+		<!-- -24, -18, -12, -6, 0, +6, +12, +18, +24 -->
+		<item name="audio.3.5mmearphone.txGain">0</item>
+		<!-- 3.5mm Earphone RX Gain (dB) -->
+		<!-- -9, -6, 0, +6, +9 -->
+		<item name="audio.3.5mmearphone.rxGain">0</item>
+		<!-- Headset Type -->
+		<!-- PlantronicsEHS, Normal -->
+		<item name="audio.headset.ehs.ringtone">Normal</item>
+		<!-- Enable 3.5mm Headset Control -->
+		<!-- Yes, No -->
+		<item name="audio.3.5mheadsetControl.enable">No</item>
+		<!-- Handset TX Gain (dB) -->
+		<!-- 0, -6, 6 -->
+		<item name="audio.handset.txGain">-6</item>
+		<!-- Handset RX Gain (dB) -->
+		<!-- 0, -6, 6 -->
+		<item name="audio.handset.rxGain">-6</item>
+		<!-- System Settings - TR069 -->
+		<!-- Enable TR-069 -->
+		<!-- Yes, No -->
+		<item name="tr069.enable">Yes</item>
+		<!-- ACS URL -->
+		<item name="tr069.url">https://acs.gdms.cloud/</item>
+		<!-- ACS Username -->
+		<item name="tr069.username"></item>
+		<!-- ACS Password -->
+		<item name="tr069.password"></item>
+		<!-- Periodic Inform Enable -->
+		<!-- Yes, No -->
+		<item name="tr069.periodicInform">No</item>
+		<!-- Periodic Inform Interval (s) -->
+		<item name="tr069.periodicInformInterval">86400</item>
+		<!-- Connection Request Username -->
+		<item name="tr069.connectionRequestUsername">{$mac|replace:'-':''|upper}</item>
+		<!-- Connection Request Password -->
+		<item name="tr069.connectionRequestPassword">{$mac|replace:'-':''|upper}</item>
+		<!-- Connection Request Port -->
+		<item name="tr069.connectionRequestPort">7547</item>
+		<!-- CPE Cert File -->
+		<item name="tr069.ssl.certificate"></item>
+		<!-- CPE Cert Key -->
+		<item name="tr069.ssl.privateKey"></item>
+		<!-- Maintenance - Upgrade -->
+		<!-- Firmware Upgrade Mode -->
+		<!-- TFTP, HTTP, HTTPS -->
+    	{if isset($grandstream_firmware_upgrade_protocol) }
+    		{if $grandstream_firmware_upgrade_protocol=="0"}<item name="provisioning.firmware.protocol">TFTP</item>{/if}
+    		{if $grandstream_firmware_upgrade_protocol=="1"}<item name="provisioning.firmware.protocol">HTTP</item>{/if}
+    		{if $grandstream_firmware_upgrade_protocol=="2"}<item name="provisioning.firmware.protocol">HTTPS</item>{/if}
+    	{else}
+    	<item name="provisioning.firmware.protocol">HTTP</item>
+    	{/if}
+    	<!-- Firmware Server Path -->
+		{if isset($grandstream_firmware_path) && isset($firmware_version)}
+		<item name="provisioning.firmware.serverPath">{$grandstream_firmware_path}/{$firmware_version}</item>
+		{elseif isset($grandstream_firmware_path)}
+		<item name="provisioning.firmware.serverPath">{$grandstream_firmware_path}</item>
+		{else}
+		<item name="provisioning.firmware.serverPath">{$domain_name}{$project_path}/app/provision/resources/firmware/</item>
+		{/if}
+		<!-- HTTP/HTTPS User Name -->
+		<item name="provisioning.firmware.username">{$http_auth_username}</item>
+		<!-- HTTP/HTTPS Password -->
+		<item name="provisioning.firmware.password">{$http_auth_password}</item>
+		<!-- Firmware File Prefix -->
+		<item name="provisioning.firmware.filePrefix"></item>
+		<!-- Firmware File Postfix -->
+		<item name="provisioning.firmware.filePostfix"></item>
+		<!-- Config Upgrade Via -->
+		<!-- TFTP, HTTP, HTTPS -->
+		<item name="provisioning.config.protocol">HTTP</item>
+		<!-- Config Server Path -->
+		{if $grandstream_config_server_path=="none"}
+		<item name="provisioning.config.serverPath"></item>
+		{elseif isset($grandstream_config_server_path)}
+		<item name="provisioning.config.serverPath">{$grandstream_config_server_path}</item>
+		{else}
+		<item name="provisioning.config.serverPath">{$domain_name}{$project_path}/app/provision</item>
+		{/if}
+		<!-- HTTP/HTTPS User Name -->
+		<item name="provisioning.config.username">{$http_auth_username}</item>
+		<!-- HTTP/HTTPS Password -->
+		<item name="provisioning.config.password">{$http_auth_password}</item>
+		<!-- Config File Prefix -->
+		<item name="provisioning.config.filePrefix"></item>
+		<!-- Config File Postfix -->
+		<item name="provisioning.config.filePostfix"></item>
+		<!-- Authenticate Conf File -->
+		<!-- Yes, No -->
+		<item name="provisioning.config.authenticateFile">No</item>
+		<!-- XML Config File Password -->
+		<item name="provisioning.config.filePassword"></item>
+		<!-- GUI Customization File Download Mode -->
+		<!-- TFTP, HTTP, HTTPS -->
+		<item name="provisioning.cust.protocol">HTTPS</item>
+		<!-- GUI Customization File URL -->
+		{if $grandstream_config_server_path=="none"}
+		<item name="provisioning.cust.serverPath"></item>
+		{elseif isset($grandstream_config_server_path)}
+		<item name="provisioning.cust.serverPath">{$grandstream_config_server_path}</item>
+		{else}
+		<item name="provisioning.cust.serverPath">{$domain_name}{$project_path}/app/provision</item>
+		{/if}
+		<!-- GUI Customization File HTTP/HTTPS Username -->
+		<item name="provisioning.cust.username">{$http_auth_username}</item>
+		<!-- GUI Customization File HTTP/HTTPS Password -->
+		<item name="provisioning.cust.password">{$http_auth_password}</item>
+		<!-- Use Configurations of Config File Server -->
+		<!-- 0 - No, 1 - Yes -->
+		<item name="provisioning.cust.sameasconfig">0</item>
+
+		<!-- Maintenance - Upgrade - Provision -->
+		<!-- Automatic Upgrade -->
+		<!-- No - No (default), Check Every Day - YesUpgradeHourOfDay, Check Every Week - YesUpgradeDayOfWeek, Check at a Period Time - YesUpgradeMin -->
+		<item name="provisioning.auto.mode">No</item>
+		<!-- Starting - Ending Hour of the Day (0-23) -->
+		<item name="provisioning.auto.hour">22</item>
+		<item name="provisioning.auto.endHour">23</item>
+		<!-- Day of the Week -->
+		<!-- 0, 1 (default), 2, 3, 4, 5, 6 -->
+		<!-- Multiple days example: 0/1/2/3/4 -->
+		<item name="provisioning.auto.day">1</item>
+		<!-- Automatic Upgrade Check Interval (m) -->
+		<!-- Number: 60 - 5256000. Default value is 10080 -->
+		<item name="provisioning.auto.minute">10080</item>
+		<!-- Firmware Upgrade and Provisioning -->
+		<!-- AlwaysCheck (default), CheckWhenChange, SkipCheck -->
+		<item name="provisioning.firmware.checkCondition">AlwaysCheck</item>
+		<!-- Upgrade Without Prompt -->
+		<!-- No (default), Yes -->
+		<item name="provisioning.prompt.enable">Yes</item>
+		<!-- Allow DHCP Option 43 and Option 66 to Override Server -->
+		<!-- No (default), Yes -->
+		<item name="provisioning.override.dhcp.allowCommonOptions">No</item>
+		<!-- DHCP Option 120 Override SIP Server -->
+		<!-- No, Yes (default) -->
+		<item name="sip.override.dhcp.allowOption120">Yes</item>
+		<!-- Allow DHCP Option 242 (Avaya IP Phones) -->
+		<!-- No, Yes (default) -->
+		<item name="provisioning.override.dhcp.allowOptions242">Yes</item>
+		<!-- Enable PNP Feature -->
+		<!-- No (default), Yes -->
+		<item name="provisioning.pnp.enable">No</item>
+		<!-- PNP URL -->
+		<item name="provisioning.pnp.url"></item>
+		<!-- PnP(3CX) Auto Provision -->
+		<item name="provisioning.3cxAutoProvision">Yes</item>
+
+		<!-- Maintenance - System Diagnosis -->
+		<!-- Syslog Protocol -->
+		<!-- UDP, SSL_TLS -->
+		<item name="maintain.syslog.protocol">UDP</item>
+		<!-- Syslog Server -->
+		<item name="maintain.syslog.server">log.ipvideotalk.com</item>
+		<!-- Syslog Level -->
+		<!-- None, Debug, Info, Warning, Error -->
+		<item name="maintain.syslog.level">None</item>
+		<!-- Syslog Keyword Filter -->
+		<item name="maintain.syslog.keywrodFiltering"></item>
+		<!-- Applications - MPK Settings -->
+		<!-- Display Format -->
+		<!-- Name, UserID, NameUserID, NameUserIDKeymode -->
+		<item name="pks.mpk.displayFormat">Name</item>
+		<!-- Show Display Name from Server -->
+		<!-- Yes, No -->
+		<item name="pks.mpk.showNamefromServer.enable">No</item>
+		<!-- Applications - Contacts - General settings -->
+		<!-- Sort Phonebook by -->
+		<!-- LastName, FirstName -->
+		<item name="phonebook.sortBy">LastName</item>
+		<!-- Default Contacts Tab -->
+		<!-- Default, LDAPSearch, LocalPhonebook, LocalGroup, BroadsoftPhonebook, 5 - Keep -->
+		<item name="phonebook.keyFunction">Default</item>
+		<!-- Emergency Call Numbers -->
+		<!-- Example for multiple numbers: 911,999,110 -->
+		<item name="phonebook.emergencyCallNumber">911</item>
+		<!-- Applications - Contacts - Download Contacts -->
+		<!-- Clear The Old List -->
+		<!-- No, Yes -->
+		<item name="phonebook.clearOld.enable">No</item>
+		<!-- Replace Duplicate Items -->
+		<!-- No, Yes -->
+		<item name="phonebook.removeDuplicate.enable">Yes</item>
+		<!-- Download Mode -->
+		<!-- Disabled, EnabledUseHTTP, EnabledUseTFTP, EnabledUseHTTPS -->
+		<item name="phonebook.download.mode">Disabled</item>
+		<!-- File Encoding -->
+		<!-- GBK, UTF-8, UTF-16, UTF-32, Big5, Big5-HKSCS,  Shift-JIS, ISO 2022-JP, KOI8-R, ISO8859-1, ISO8859-15, Windows-1251, EUC-KR  -->
+		<item name="phonebook.download.encode">UTF</item>
+		<!-- Download Server -->
+		<item name="phonebook.download.server"></item>
+		<!-- HTTP/HTTPS User Name  -->
+		<item name="phonebook.download.username"></item>
+		<!-- HTTP/HTTPS Password  -->
+		<item name="phonebook.download.password"></item>
+		<!-- Automatic Download Interval  -->
+		<!-- 0, 120, 240, 360, 480, 720 -->
+		<item name="phonebook.download.interval">0</item>
+		<!-- Applications - LDAP Book -->
+		<!-- Connection Mode -->
+		<!-- LDAP, LDAPS -->
+		<item name="ldap.protocol">LDAP</item>
+		<!-- Server Address -->
+		<item name="ldap.server"></item>
+		<!-- Port -->
+		<item name="ldap.port">389</item>
+		<!-- Base DN -->
+		<!-- # Example 1: dc=grandstream,dc=com -->
+		<!-- # Example 2: ou=Boston, dc=grandstream,dc=com -->
+		<item name="ldap.base"></item>
+		<!-- User Name -->
+		<item name="ldap.username"></item>
+		<!-- Password -->
+		<item name="ldap.password"></item>
+		<!-- LDAP Name Attributes  -->
+		<item name="ldap.ldapNameAttributes"></item>
+		<!-- LDAP Number Attributes -->
+		<item name="ldap.ldapNumberAttributes"></item>
+		<!-- LDAP Mail Attributes -->
+		<item name="ldap.ldapMailAttributes"></item>
+		<!-- LDAP Name Filter -->
+		<item name="ldap.ldapNameFilter"></item>
+		<!-- LDAP Number Filter -->
+		<item name="ldap.ldapNumberFilter"></item>
+		<!-- LDAP Mail Filter -->
+		<item name="ldap.ldapMailFilter"></item>
+		<!-- LDAP Displaying Name Attributes -->
+		<item name="ldap.ldapDisplayName"></item>
+		<!-- Max Hits -->
+		<item name="ldap.maxHits">50</item>
+		<!-- Search Timeout (s) -->
+		<item name="ldap.searchTimeout">4</item>
+		<!-- LDAP Lookup For Dial -->
+		<!-- Yes, No -->
+		<item name="ldap.outgoingCalls">No</item>
+		<!-- LDAP Lookup For Incoming Call -->
+		<!-- Yes, No -->
+		<item name="ldap.ldapLookup">No</item>
+		<!-- LDAP Dialing Default Account -->
+		<!-- Default - 0, Account 1 - 1, Account 2 - 2 ... -->
+		<item name="ldap.defalutAccount">0</item>
+		
+		<!--#############################################-->
+		<!--# 160 MPKs can be configured via MPK APP    #-->
+		<!--#############################################-->
+		<!-- [Note] MPK provision needs reboot to take effect -->
+		{$keyIndex=1}
+		<!-- MPK Key Mode -->
+		<!-- SpeedDial, BLF, SpeedDialViaActiveAccount, DialDTMF, Intercom, Transfer, CallPark, MulticastPaging, Conference, DialPrefix -->
+		{$key_types=["none"=>"","speed dial"=>"SpeedDial","blf"=>"BLF","speed dial active"=>"SpeedDialViaActiveAccount","dial dtmf"=>"DialDTMF","intercom"=>"Intercom","transfer"=>"Transfer","call park"=>"CallPark","multicast paging"=>"MulticastPaging","conference"=>"Conference"]}
+		{foreach $keys as $category => $rows}
+		{foreach $rows as $row}
+		{if isset($row.device_key_type)}
+		<item name="pks.mpk.{$keyIndex}.mode">{$key_types[$row.device_key_type]}</item>
+		<!-- MPK Account -->
+		<!-- Account1, Account2, ... , Account16 -->
+		<!--NOTE: As of at least firmware 1.0.1.9, the above instructions are incorrect.  This value must be numeric and zero-based, so Account1 = 0, Account 2 = 1, etc. -->
+		<item name="pks.mpk.{$keyIndex}.account">{$row.device_key_line}-1</item>
+		<!-- MPK Display Name -->
+		<item name="pks.mpk.{$keyIndex}.description">{$row.device_key_label}</item>
+		<!-- MPK User ID -->
+		<!-- extendValue may be used based on MPK mode -->
+		<item name="pks.mpk.{$keyIndex}.value">{$row.device_key_value}</item>
+		<!-- <item name="pks.mpk.{$keyIndex}.extendValue">device_key_extension</item> -->
+		{$keyIndex=$keyIndex+1}
+		{/if}
+		{/foreach}
+		{/foreach}
+	</config>
+</gs_provision>
diff --git a/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml b/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml
index f13ce71d80..c26f2757ae 100644
--- a/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml
@@ -801,12 +801,12 @@
 <!-- Preferred DTMF Method 2 -->
 <!-- Number: 100 to 102 -->
 <!-- Mandatory -->
-<P851>100</P851>
+<P851>101</P851>
 
 <!-- Preferred DTMF Method 3 -->
 <!-- Number: 100 to 102 -->
 <!-- Mandatory -->
-<P852>100</P852>
+<P852>102</P852>
 
 <!-- Disable DTMF Negotiation. 0 - no, 1 - yes -->
 <!-- Number: 0,1 -->
@@ -3276,7 +3276,11 @@
 <P4595>1</P4595>
 {/if}
 
+{if isset($grandstream_offhook_auto_dial_1)}
+<P4210>{$grandstream_offhook_auto_dial_1}</P4210>
+{else}
 <P4210></P4210>
+{/if}
 <P4300>0</P4300>
 
 <P4521>1</P4521>
@@ -3295,7 +3299,11 @@
 <P4596>1</P4596>
 {/if}
 
+{if isset($grandstream_offhook_auto_dial_2)}
+<P4211>{$grandstream_offhook_auto_dial_2}</P4211>
+{else}
 <P4211></P4211>
+{/if}
 <P4301>0</P4301>
 
 <P4522>1</P4522>
@@ -3314,7 +3322,11 @@
 <P4597>1</P4597>
 {/if}
 
+{if isset($grandstream_offhook_auto_dial_3)}
+<P4212>{$grandstream_offhook_auto_dial_3}</P4212>
+{else}
 <P4212></P4212>
+{/if}
 <P4302>0</P4302>
 
 <P4523>1</P4523>
@@ -3333,7 +3345,11 @@
 <P4598>1</P4598>
 {/if}
 
+{if isset($grandstream_offhook_auto_dial_4)}
+<P4213>{$grandstream_offhook_auto_dial_4}</P4213>
+{else}
 <P4213></P4213>
+{/if}
 <P4303>0</P4303>
 
 <P4524>1</P4524>
@@ -3352,7 +3368,11 @@
 <P4599>1</P4599>
 {/if}
 
+{if isset($grandstream_offhook_auto_dial_5)}
+<P4214>{$grandstream_offhook_auto_dial_5}</P4214>
+{else}
 <P4214></P4214>
+{/if}
 <P4304>0</P4304>
 
 <P4525>1</P4525>
@@ -3371,7 +3391,11 @@
 <P4600>1</P4600>
 {/if}
 
+{if isset($grandstream_offhook_auto_dial_6)}
+<P4215>{$grandstream_offhook_auto_dial_6}</P4215>
+{else}
 <P4215></P4215>
+{/if}
 <P4305>0</P4305>
 
 <P4526>1</P4526>
@@ -3390,7 +3414,11 @@
 <P4601>1</P4601>
 {/if}
 
+{if isset($grandstream_offhook_auto_dial_7)}
+<P4216>{$grandstream_offhook_auto_dial_7}</P4216>
+{else}
 <P4216></P4216>
+{/if}
 <P4306>0</P4306>
 
 <P4527>1</P4527>
@@ -3409,7 +3437,11 @@
 <P4602>1</P4602>
 {/if}
 
+{if isset($grandstream_offhook_auto_dial_8)}
+<P4217>{$grandstream_offhook_auto_dial_8}</P4217>
+{else}
 <P4217></P4217>
+{/if}
 <P4307>0</P4307>
 
 <P4528>1</P4528>
@@ -3428,7 +3460,11 @@
 <P4603>1</P4603>
 {/if}
 
+{if isset($grandstream_offhook_auto_dial_9)}
+<P4218>{$grandstream_offhook_auto_dial_9}</P4218>
+{else}
 <P4218></P4218>
+{/if}
 <P4308>0</P4308>
 
 <P4529>1</P4529>
@@ -3447,7 +3483,11 @@
 <P4604>1</P4604>
 {/if}
 
+{if isset($grandstream_offhook_auto_dial_10)}
+<P4219>{$grandstream_offhook_auto_dial_10}</P4219>
+{else}
 <P4219></P4219>
+{/if}
 <P4309>0</P4309>
 
 <P4530>1</P4530>
@@ -3466,7 +3506,11 @@
 <P4605>1</P4605>
 {/if}
 
+{if isset($grandstream_offhook_auto_dial_11)}
+<P4220>{$grandstream_offhook_auto_dial_11}</P4220>
+{else}
 <P4220></P4220>
+{/if}
 <P4310>0</P4310>
 
 <P4531>1</P4531>
@@ -3485,7 +3529,11 @@
 <P4606>1</P4606>
 {/if}
 
+{if isset($grandstream_offhook_auto_dial_12)}
+<P4221>{$grandstream_offhook_auto_dial_12}</P4221>
+{else}
 <P4221></P4221>
+{/if}
 <P4311>0</P4311>
 
 <P4532>1</P4532>
@@ -3504,7 +3552,11 @@
 <P4607>1</P4607>
 {/if}
 
+{if isset($grandstream_offhook_auto_dial_13)}
+<P4222>{$grandstream_offhook_auto_dial_13}</P4222>
+{else}
 <P4222></P4222>
+{/if}
 <P4312>0</P4312>
 
 <P4533>1</P4533>
@@ -3523,7 +3575,11 @@
 <P4608>1</P4608>
 {/if}
 
+{if isset($grandstream_offhook_auto_dial_14)}
+<P4223>{$grandstream_offhook_auto_dial_14}</P4223>
+{else}
 <P4223></P4223>
+{/if}
 <P4313>0</P4313>
 
 <P4534>1</P4534>
@@ -3542,7 +3598,11 @@
 <P4609>1</P4609>
 {/if}
 
+{if isset($grandstream_offhook_auto_dial_15)}
+<P4224>{$grandstream_offhook_auto_dial_15}</P4224>
+{else}
 <P4224></P4224>
+{/if}
 <P4314>0</P4314>
 
 <P4535>1</P4535>
@@ -3561,7 +3621,11 @@
 <P4610>1</P4610>
 {/if}
 
+{if isset($grandstream_offhook_auto_dial_16)}
+<P4225>{$grandstream_offhook_auto_dial_16}</P4225>
+{else}
 <P4225></P4225>
+{/if}
 <P4315>0</P4315>
 
 <P4536>1</P4536>
@@ -3580,7 +3644,11 @@
 <P4611>1</P4611>
 {/if}
 
+{if isset($grandstream_offhook_auto_dial_17)}
+<P4226>{$grandstream_offhook_auto_dial_17}</P4226>
+{else}
 <P4226></P4226>
+{/if}
 <P4316>0</P4316>
 
 <P4537>1</P4537>
@@ -3599,7 +3667,11 @@
 <P4612>1</P4612>
 {/if}
 
+{if isset($grandstream_offhook_auto_dial_18)}
+<P4227>{$grandstream_offhook_auto_dial_18}</P4227>
+{else}
 <P4227></P4227>
+{/if}
 <P4317>0</P4317>
 
 <P4538>1</P4538>
@@ -3618,7 +3690,11 @@
 <P4613>1</P4613>
 {/if}
 
+{if isset($grandstream_offhook_auto_dial_19)}
+<P4228>{$grandstream_offhook_auto_dial_19}</P4228>
+{else}
 <P4228></P4228>
+{/if}
 <P4318>0</P4318>
 
 <P4539>1</P4539>
@@ -3637,7 +3713,11 @@
 <P4614>1</P4614>
 {/if}
 
+{if isset($grandstream_offhook_auto_dial_20)}
+<P4229>{$grandstream_offhook_auto_dial_20}</P4229>
+{else}
 <P4229></P4229>
+{/if}
 <P4319>0</P4319>
 
 <P4540>1</P4540>
@@ -3656,7 +3736,11 @@
 <P4615>1</P4615>
 {/if}
 
+{if isset($grandstream_offhook_auto_dial_21)}
+<P4230>{$grandstream_offhook_auto_dial_21}</P4230>
+{else}
 <P4230></P4230>
+{/if}
 <P4320>0</P4320>
 
 <P4541>1</P4541>
@@ -3675,7 +3759,11 @@
 <P4616>1</P4616>
 {/if}
 
+{if isset($grandstream_offhook_auto_dial_22)}
+<P4231>{$grandstream_offhook_auto_dial_22}</P4231>
+{else}
 <P4231></P4231>
+{/if}
 <P4321>0</P4321>
 
 <P4542>1</P4542>
@@ -3694,7 +3782,11 @@
 <P4617>1</P4617>
 {/if}
 
+{if isset($grandstream_offhook_auto_dial_23)}
+<P4232>{$grandstream_offhook_auto_dial_23}</P4232>
+{else}
 <P4232></P4232>
+{/if}
 <P4322>0</P4322>
 
 <P4543>1</P4543>
@@ -3713,7 +3805,11 @@
 <P4618>1</P4618>
 {/if}
 
+{if isset($grandstream_offhook_auto_dial_24)}
+<P4233>{$grandstream_offhook_auto_dial_24}</P4233>
+{else}
 <P4233></P4233>
+{/if}
 <P4323>0</P4323>
 
 <P4544>1</P4544>
@@ -3732,7 +3828,11 @@
 <P4619>1</P4619>
 {/if}
 
+{if isset($grandstream_offhook_auto_dial_25)}
+<P4800>{$grandstream_offhook_auto_dial_25}</P4800>
+{else}
 <P4800></P4800>
+{/if}
 <P4324>0</P4324>
 
 <P4545>1</P4545>
@@ -3752,7 +3852,11 @@
 <P4620>1</P4620>
 {/if}
 
+{if isset($grandstream_offhook_auto_dial_26)}
+<P4801>{$grandstream_offhook_auto_dial_26}</P4801>
+{else}
 <P4801></P4801>
+{/if}
 <P4325>0</P4325>
 
 <P4546>1</P4546>
@@ -3771,7 +3875,11 @@
 <P4621>1</P4621>
 {/if}
 
+{if isset($grandstream_offhook_auto_dial_27)}
+<P4802>{$grandstream_offhook_auto_dial_27}</P4802>
+{else}
 <P4802></P4802>
+{/if}
 <P4326>0</P4326>
 
 <P4547>1</P4547>
@@ -3790,7 +3898,11 @@
 <P4622>1</P4622>
 {/if}
 
+{if isset($grandstream_offhook_auto_dial_28)}
+<P4803>{$grandstream_offhook_auto_dial_28}</P4803>
+{else}
 <P4803></P4803>
+{/if}
 <P4327>0</P4327>
 
 <P4548>1</P4548>
@@ -3809,7 +3921,11 @@
 <P4623>1</P4623>
 {/if}
 
+{if isset($grandstream_offhook_auto_dial_29)}
+<P4804>{$grandstream_offhook_auto_dial_29}</P4804>
+{else}
 <P4804></P4804>
+{/if}
 <P4328>0</P4328>
 
 <P4549>1</P4549>
@@ -3828,7 +3944,11 @@
 <P4624>1</P4624>
 {/if}
 
+{if isset($grandstream_offhook_auto_dial_30)}
+<P4805>{$grandstream_offhook_auto_dial_30}</P4805>
+{else}
 <P4805></P4805>
+{/if}
 <P4329>0</P4329>
 
 <P4808>1</P4808>
@@ -3847,7 +3967,11 @@
 <P4625>1</P4625>
 {/if}
 
+{if isset($grandstream_offhook_auto_dial_31)}
+<P4806>{$grandstream_offhook_auto_dial_31}</P4806>
+{else}
 <P4806></P4806>
+{/if}
 <P4250>0</P4250>
 
 <P4809>1</P4809>
@@ -3866,7 +3990,11 @@
 <P4626>1</P4626>
 {/if}
 
+{if isset($grandstream_offhook_auto_dial_32)}
+<P4807>{$grandstream_offhook_auto_dial_32}</P4807>
+{else}
 <P4807></P4807>
+{/if}
 <P4251>0</P4251>
 
 <P4810>1</P4810>
@@ -3885,7 +4013,11 @@
 <P21384>1</P21384>
 {/if}
 
+{if isset($grandstream_offhook_auto_dial_33)}
+<P21448>{$grandstream_offhook_auto_dial_33}</P21448>
+{else}
 <P21448></P21448>
+{/if}
 <P21320>0</P21320>
 
 <P21512>1</P21512>
@@ -3904,7 +4036,11 @@
 <P21385>1</P21385>
 {/if}
 
+{if isset($grandstream_offhook_auto_dial_34)}
+<P21449>{$grandstream_offhook_auto_dial_34}</P21449>
+{else}
 <P21449></P21449>
+{/if}
 <P21321>0</P21321>
 
 <P21513>1</P21513>
@@ -3923,7 +4059,11 @@
 <P21386>1</P21386>
 {/if}
 
+{if isset($grandstream_offhook_auto_dial_35)}
+<P21450>{$grandstream_offhook_auto_dial_35}</P21450>
+{else}
 <P21450></P21450>
+{/if}
 <P21322>0</P21322>
 
 <P21514>1</P21514>
@@ -3942,7 +4082,11 @@
 <P21387>1</P21387>
 {/if}
 
+{if isset($grandstream_offhook_auto_dial_36)}
+<P21451>{$grandstream_offhook_auto_dial_36}</P21451>
+{else}
 <P21451></P21451>
+{/if}
 <P21323>0</P21323>
 
 <P21515>1</P21515>
@@ -3961,7 +4105,11 @@
 <P21388>1</P21388>
 {/if}
 
+{if isset($grandstream_offhook_auto_dial_37)}
+<P21452>{$grandstream_offhook_auto_dial_37}</P21452>
+{else}
 <P21452></P21452>
+{/if}
 <P21324>0</P21324>
 
 <P21516>1</P21516>
@@ -3980,7 +4128,11 @@
 <P21389>1</P21389>
 {/if}
 
+{if isset($grandstream_offhook_auto_dial_38)}
+<P21453>{$grandstream_offhook_auto_dial_38}</P21453>
+{else}
 <P21453></P21453>
+{/if}
 <P21325>0</P21325>
 
 <P21517>1</P21517>
@@ -3999,7 +4151,11 @@
 <P21390>1</P21390>
 {/if}
 
+{if isset($grandstream_offhook_auto_dial_39)}
+<P21454>{$grandstream_offhook_auto_dial_39}</P21454>
+{else}
 <P21454></P21454>
+{/if}
 <P21326>0</P21326>
 
 <P21518>1</P21518>
@@ -4018,7 +4174,11 @@
 <P21391>1</P21391>
 {/if}
 
+{if isset($grandstream_offhook_auto_dial_40)}
+<P21455>{$grandstream_offhook_auto_dial_40}</P21455>
+{else}
 <P21455></P21455>
+{/if}
 <P21327>0</P21327>
 
 <P21519>1</P21519>
@@ -4037,7 +4197,11 @@
 <P21392>1</P21392>
 {/if}
 
+{if isset($grandstream_offhook_auto_dial_41)}
+<P21456>{$grandstream_offhook_auto_dial_41}</P21456>
+{else}
 <P21456></P21456>
+{/if}
 <P21328>0</P21328>
 
 <P21520>1</P21520>
@@ -4056,7 +4220,11 @@
 <P21393>1</P21393>
 {/if}
 
+{if isset($grandstream_offhook_auto_dial_42)}
+<P21457>{$grandstream_offhook_auto_dial_42}</P21457>
+{else}
 <P21457></P21457>
+{/if}
 <P21329>0</P21329>
 
 <P21521>1</P21521>
@@ -4075,7 +4243,11 @@
 <P21394>1</P21394>
 {/if}
 
+{if isset($grandstream_offhook_auto_dial_43)}
+<P21458>{$grandstream_offhook_auto_dial_43}</P21458>
+{else}
 <P21458></P21458>
+{/if}
 <P21330>0</P21330>
 
 <P21522>1</P21522>
@@ -4094,7 +4266,11 @@
 <P21395>1</P21395>
 {/if}
 
+{if isset($grandstream_offhook_auto_dial_44)}
+<P21459>{$grandstream_offhook_auto_dial_44}</P21459>
+{else}
 <P21459></P21459>
+{/if}
 <P21331>0</P21331>
 
 <P21523>1</P21523>
@@ -4113,7 +4289,11 @@
 <P21396>1</P21396>
 {/if}
 
+{if isset($grandstream_offhook_auto_dial_45)}
+<P21460>{$grandstream_offhook_auto_dial_45}</P21460>
+{else}
 <P21460></P21460>
+{/if}
 <P21332>0</P21332>
 
 <P21524>1</P21524>
@@ -4132,7 +4312,11 @@
 <P21397>1</P21397>
 {/if}
 
+{if isset($grandstream_offhook_auto_dial_46)}
+<P21461>{$grandstream_offhook_auto_dial_46}</P21461>
+{else}
 <P21461></P21461>
+{/if}
 <P21333>0</P21333>
 
 <P21525>1</P21525>
@@ -4151,7 +4335,11 @@
 <P21398>1</P21398>
 {/if}
 
+{if isset($grandstream_offhook_auto_dial_47)}
+<P21462>{$grandstream_offhook_auto_dial_47}</P21462>
+{else}
 <P21462></P21462>
+{/if}
 <P21334>0</P21334>
 
 <P21526>1</P21526>
@@ -4170,7 +4358,11 @@
 <P21399>1</P21399>
 {/if}
 
+{if isset($grandstream_offhook_auto_dial_48)}
+<P21463>{$grandstream_offhook_auto_dial_48}</P21463>
+{else}
 <P21463></P21463>
+{/if}
 <P21335>0</P21335>
 
 <P21527>1</P21527>
diff --git a/resources/templates/provision/grandstream/wp820/{$mac}.xml b/resources/templates/provision/grandstream/wp820/{$mac}.xml
index 6b3705d877..7868ca3f29 100644
--- a/resources/templates/provision/grandstream/wp820/{$mac}.xml
+++ b/resources/templates/provision/grandstream/wp820/{$mac}.xml
@@ -376,17 +376,29 @@
 <!-- # Send DTMF: In-audio. 0 - No, 1 - Yes. Default is 0 -->
 <!-- # Number: 0, 1 -->
 <!-- # Mandatory -->
-<P2401>0</P2401>
+{if isset($grandstream_senddtmf_inaudio) }    	
+<P2301>{$grandstream_senddtmf_inaudio}</P2301>	
+{else}	
+<P2301>0</P2301>	
+{/if}
 
 <!-- # Send DTMF: Via RTP (RFC2833). 0 - No, 1 - Yes. Default is 1 -->
 <!-- # Number: 0, 1 -->
 <!-- # Mandatory -->
-<P2402>1</P2402>
+{if isset($grandstream_senddtmf_rtp) }    	
+<P2302>{$grandstream_senddtmf_rtp}</P2302>	
+{else}	
+<P2302>1</P2302>	
+{/if}
 
 <!-- # Send DTMF: Via SIP INFO. 0 - No, 1 - Yes. Default is 0 -->
 <!-- # Number: 0, 1 -->
 <!-- # Mandatory -->
-<P2403>0</P2403>
+{if isset($grandstream_senddtmf_sipinfo) }    	
+<P2303>{$grandstream_senddtmf_sipinfo}</P2303>	
+{else}	
+<P2303>0</P2303>	
+{/if}
 
 <!-- # DTMF Payload Type. Default is 101 -->
 <!-- # Number: 96 - 127 -->
@@ -1030,27 +1042,27 @@
 <!-- # Number: 0, 1 -->
 <!-- # Mandatory -->
 {if isset($grandstream_senddtmf_inaudio) }    
-    <P2301>{$grandstream_senddtmf_inaudio}</P2301>
+    <P2401>{$grandstream_senddtmf_inaudio}</P2401>
 {else}
-    <P2301>0</P2301>
+    <P2401>0</P2401>
 {/if}
 
 <!-- # Send DTMF: Via RTP (RFC2833). 0 - No, 1 - Yes. Default is 1 -->
 <!-- # Number: 0, 1 -->
 <!-- # Mandatory -->
 {if isset($grandstream_senddtmf_rtp) }    
-    <P2302>{$grandstream_senddtmf_rtp}</P2302>
+    <P2402>{$grandstream_senddtmf_rtp}</P2402>
 {else}
-    <P2302>1</P2302>
+    <P2402>1</P2402>
 {/if}
 
 <!-- # Send DTMF: Via SIP INFO. 0 - No, 1 - Yes. Default is 0 -->
 <!-- # Number: 0, 1 -->
 <!-- # Mandatory -->
 {if isset($grandstream_senddtmf_sipinfo) }    
-    <P2303>{$grandstream_senddtmf_sipinfo}</P2303>
+    <P2403>{$grandstream_senddtmf_sipinfo}</P2403>
 {else}
-    <P2303>0</P2303>
+    <P2403>0</P2403>
 {/if}
 
 <!-- # DTMF Payload Type. Default is 101 -->
@@ -1339,7 +1351,7 @@
 <!-- # Use Random Port. 0 - No, 1 - Yes. Default is 0 -->
 <!-- # Number: 0, 1 -->
 <!-- # Mandatory -->
-<P78>0</P78>
+<P78>1</P78>
 
 <!-- # Disable in-call DTMF display. 0 - No, 1 - Yes. Default is 0 -->
 <!-- # Number: 0, 1 -->
@@ -1838,20 +1850,25 @@
 
 <!-- # Vendor Class ID (Option 60) -->
 <!-- # String -->
-<P148>Grandstream WP800</P148>
+<!-- <P148>Grandstream WP800</P148> -->
 
 <!-- #################################################################### -->
 <!-- # Network Settings/Wi-Fi Settings/Wi-Fi Roaming                   ## -->
 <!-- #################################################################### -->
-<!-- # Scan interval with good signal -->
-<!-- # P22230 -->
+<!-- # Scan interval with good signal Default is 5 Range 5 - 600 -->	
+{if isset($grandstream_wifi_roam_scan_interval_good)}	
+<P22230>{$grandstream_wifi_roam_scan_interval_good}</P22230>	
+{/if}
 
-<!-- # Scan interval with poor signal -->
-<!-- # P22231 -->
-
-<!-- # Roaming signal threshold -->
-<!-- # Number: -30 - 100 -->
-<!-- # P22232 -->
+<!-- # Scan interval with poor signal Default is 600 (or 5 for aggressive) Range 5 - 600 -->	
+{if isset($grandstream_wifi_roam_scan_interval_poor)}	
+<P22231>{$grandstream_wifi_roam_scan_interval_poor}</P22231>	
+{/if}	
+<!-- # Roaming signal threshold -->	
+<!-- # Number: -100 - -30 Default is -70 -->	
+{if isset($grandstream_wifi_roam_signal_threshold)}	
+<P22232>{$grandstream_wifi_roam_signal_threshold}</P22232>	
+{/if}
 
 <!-- #################################################################### -->
 <!-- # Network Settings/OpenVPN® Settings                              ## -->
@@ -2284,7 +2301,7 @@
 
 <!-- # Connection Request Port.  -->
 <!-- # Number -->
-<P4518></P4518>
+<P4518>7547</P4518>
 
 <!-- # CPE Cert File -->
 <!-- # String -->