diff --git a/app/grandstream/app_config.php b/app/grandstream/app_config.php
index cd098d104b..b8d084b130 100644
--- a/app/grandstream/app_config.php
+++ b/app/grandstream/app_config.php
@@ -302,6 +302,22 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Bluetooth Handsfree - 0 - Off, 1 - On";
 		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "5bc527d0-6f83-403b-a6c0-574540cfa9a6";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_headset_type";
+		$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'] = "Headset Type. 0 - Normal, 1 - Plantronics EHS. Default is 0";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "522ee640-5e24-4058-95ed-605bd982ec33";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_headset_key_mode";
+		$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'] = "HEADSET Key Mode. 0 - Default Mode, 1 - Toggle Headset/Speaker. Default is 0";
+		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "453ec939-ef61-4ecd-ad0a-31905153efd8";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_auto_attended_transfer";
diff --git a/resources/templates/provision/grandstream/grp2612/{$mac}.xml b/resources/templates/provision/grandstream/grp2612/{$mac}.xml
index a1c853a549..e3a25cc9ab 100644
--- a/resources/templates/provision/grandstream/grp2612/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2612/{$mac}.xml
@@ -3917,17 +3917,21 @@
     <!-- # HEADSET Key Mode. 0 - Default Mode, 1 - Toggle Headset/Speaker. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1312>0</P1312>
+{if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
 
     <!-- # Headset Type. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P6779>0</P6779>
+{if isset($grandstream_headset_type)}
+    <P6779>{$grandstream_headset_type}</P6779>
 
     <!-- # EHS Headset Ring Tone. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1487>0</P1487>
+    <P1487>{$grandstream_headset_type}</P1487>
+{/if}
 
     <!-- # Always Ring Speaker. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
@@ -4156,9 +4160,7 @@
 {if isset($grandstream_wallpaper_url)}
     <P2916>1</P2916>
     <P2917>{$grandstream_wallpaper_url}</P2917>
-{else}
-    <P2916>0</P2916>
-    <P2917></P2917>
+
 {/if}
 
     <!-- # Color Background. Default is #000000. -->
@@ -4170,8 +4172,6 @@
     <!-- # Mandatory -->
 {if isset($grandstream_screensaver)}
     <P2918>{$grandstream_screensaver}</P2918>
-{else}
-    <P2918>2</P2918>
 {/if}
 
     <!-- # Screensaver Source.  0 - Default, 1 - USB, 2 - Download. Default is 0. -->
@@ -4179,8 +4179,6 @@
     <!-- # Mandatory -->
 {if isset($grandstream_screensaver_source)}
     <P6759>{$grandstream_screensaver_source}</P6759>
-{else}
-    <P6759>0</P6759>
 {/if}
 
     <!-- # Show Date and Time. 0 - No, 1 - Yes. Default is 1 -->
diff --git a/resources/templates/provision/grandstream/grp2612w/{$mac}.xml b/resources/templates/provision/grandstream/grp2612w/{$mac}.xml
index 1a1cd241e1..1fab21ee29 100644
--- a/resources/templates/provision/grandstream/grp2612w/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2612w/{$mac}.xml
@@ -4012,17 +4012,21 @@
     <!-- # HEADSET Key Mode. 0 - Default Mode, 1 - Toggle Headset/Speaker. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1312>0</P1312>
+{if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
 
     <!-- # Headset Type. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P6779>0</P6779>
+{if isset($grandstream_headset_type)}
+    <P6779>{$grandstream_headset_type}</P6779>
 
     <!-- # EHS Headset Ring Tone. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1487>0</P1487>
+    <P1487>{$grandstream_headset_type}</P1487>
+{/if}
 
     <!-- # Always Ring Speaker. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
@@ -4251,9 +4255,7 @@
 {if isset($grandstream_wallpaper_url)}
     <P2916>1</P2916>
     <P2917>{$grandstream_wallpaper_url}</P2917>
-{else}
-    <P2916>0</P2916>
-    <P2917></P2917>
+
 {/if}
 
     <!-- # Color Background. Default is #000000. -->
@@ -4265,8 +4267,6 @@
     <!-- # Mandatory -->
 {if isset($grandstream_screensaver)}
     <P2918>{$grandstream_screensaver}</P2918>
-{else}
-    <P2918>2</P2918>
 {/if}
 
     <!-- # Screensaver Source.  0 - Default, 1 - USB, 2 - Download. Default is 0. -->
@@ -4274,8 +4274,6 @@
     <!-- # Mandatory -->
 {if isset($grandstream_screensaver_source)}
     <P6759>{$grandstream_screensaver_source}</P6759>
-{else}
-    <P6759>0</P6759>
 {/if}
 
     <!-- # Show Date and Time. 0 - No, 1 - Yes. Default is 1 -->
diff --git a/resources/templates/provision/grandstream/grp2613/{$mac}.xml b/resources/templates/provision/grandstream/grp2613/{$mac}.xml
index 4cab49735a..0be4033b13 100644
--- a/resources/templates/provision/grandstream/grp2613/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2613/{$mac}.xml
@@ -4753,22 +4753,22 @@
     <!-- # HEADSET Key Mode. 0 - Default Mode, 1 - Toggle Headset/Speaker. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1312>0</P1312>
+{if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
 
-   {if isset ($grandstream_EHS)}
-    <P6779>{$grandstream_EHS}</P6779>
-    <P1487>{$grandstream_EHS}</P1487>
-    {else}
     <!-- # Headset Type. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P6779>0</P6779>
+{if isset($grandstream_headset_type)}
+    <P6779>{$grandstream_headset_type}</P6779>
 
     <!-- # EHS Headset Ring Tone. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1487>0</P1487>
-	{/if}
+    <P1487>{$grandstream_headset_type}</P1487>
+{/if}
+
     <!-- # Always Ring Speaker. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
@@ -4971,9 +4971,7 @@
 {if isset($grandstream2135_wallpaper_url)}
     <P2916>1</P2916>
     <P2917>{$grandstream2135_wallpaper_url}</P2917>
-{else}
-    <P2916>0</P2916>
-    <P2917></P2917>
+
 {/if}
 
     <!-- # Color Background. Default is #000000. -->
@@ -4985,8 +4983,6 @@
     <!-- # Mandatory -->
 {if isset($grandstream_screensaver)}
     <P2918>{$grandstream_screensaver}</P2918>
-{else}
-    <P2918>1</P2918>
 {/if}
 
     <!-- # Screensaver Source.  0 - Default, 1 - USB, 2 - Download. Default is 0.  -->
@@ -4994,8 +4990,6 @@
     <!-- # Mandatory -->
 {if isset($grandstream_screensaver_source)}
     <P6759>{$grandstream_screensaver_source}</P6759>
-{else}
-    <P6759>0</P6759>
 {/if}
 
     <!-- # Show Date and Time. 0 - No, 1 - Yes. Default is 1 -->
diff --git a/resources/templates/provision/grandstream/grp2614/{$mac}.xml b/resources/templates/provision/grandstream/grp2614/{$mac}.xml
index 0928140e6d..1f546b570d 100644
--- a/resources/templates/provision/grandstream/grp2614/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2614/{$mac}.xml
@@ -6072,17 +6072,21 @@
     <!-- # HEADSET Key Mode. 0 - Default Mode, 1 - Toggle Headset/Speaker. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1312>0</P1312>
+{if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
 
     <!-- # Headset Type. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P6779>0</P6779>
+{if isset($grandstream_headset_type)}
+    <P6779>{$grandstream_headset_type}</P6779>
 
     <!-- # EHS Headset Ring Tone. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1487>0</P1487>
+    <P1487>{$grandstream_headset_type}</P1487>
+{/if}
 
     <!-- # Always Ring Speaker. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
@@ -6286,9 +6290,7 @@
 {if isset($grandstream_wallpaper_url)}
     <P2916>1</P2916>
     <P2917>{$grandstream_wallpaper_url}</P2917>
-{else}
-    <P2916>0</P2916>
-    <P2917></P2917>
+
 {/if}
 
     <!-- # Color Background. Default is #000000. -->
@@ -6300,8 +6302,6 @@
     <!-- # Mandatory -->
 {if isset($grandstream_screensaver)}
     <P2918>{$grandstream_screensaver}</P2918>
-{else}
-    <P2918>2</P2918>
 {/if}
 
     <!-- # Screensaver Source.  0 - Default, 1 - USB, 2 - Download. Default is 0. -->
@@ -6309,8 +6309,6 @@
     <!-- # Mandatory -->
 {if isset($grandstream_screensaver_source)}
     <P6759>{$grandstream_screensaver_source}</P6759>
-{else}
-    <P6759>0</P6759>
 {/if}
 
     <!-- # Show Date and Time. 0 - No, 1 - Yes. Default is 1 -->
diff --git a/resources/templates/provision/grandstream/grp2615/{$mac}.xml b/resources/templates/provision/grandstream/grp2615/{$mac}.xml
index e3d2626e5f..ecc6d98ebf 100644
--- a/resources/templates/provision/grandstream/grp2615/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2615/{$mac}.xml
@@ -7007,17 +7007,21 @@
     <!-- # HEADSET Key Mode. 0 - Default Mode, 1 - Toggle Headset/Speaker. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1312>0</P1312>
+{if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
 
     <!-- # Headset Type. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P6779>0</P6779>
+{if isset($grandstream_headset_type)}
+    <P6779>{$grandstream_headset_type}</P6779>
 
     <!-- # EHS Headset Ring Tone. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1487>0</P1487>
+    <P1487>{$grandstream_headset_type}</P1487>
+{/if}
 
     <!-- # Always Ring Speaker. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
@@ -7220,9 +7224,7 @@
 {if isset($grandstream_wallpaper_url)}
     <P2916>1</P2916>
     <P2917>{$grandstream_wallpaper_url}</P2917>
-{else}
-    <P2916>0</P2916>
-    <P2917></P2917>
+
 {/if}
 
     <!-- # Color Background. Default is #000000. -->
@@ -7234,8 +7236,6 @@
     <!-- # Mandatory -->
 {if isset($grandstream_screensaver)}
     <P2918>{$grandstream_screensaver}</P2918>
-{else}
-    <P2918>2</P2918>
 {/if}
 
     <!-- # Screensaver Source.  0 - Default, 1 - USB, 2 - Download. Default is 0.  -->
@@ -7243,8 +7243,6 @@
     <!-- # Mandatory -->
 {if isset($grandstream_screensaver_source)}
     <P6759>{$grandstream_screensaver_source}</P6759>
-{else}
-    <P6759>0</P6759>
 {/if}
 
     <!-- # Show Date and Time. 0 - No, 1 - Yes. Default is 1 -->
diff --git a/resources/templates/provision/grandstream/grp2616/{$mac}.xml b/resources/templates/provision/grandstream/grp2616/{$mac}.xml
index c5857ad26f..75521e1ab0 100644
--- a/resources/templates/provision/grandstream/grp2616/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp2616/{$mac}.xml
@@ -7971,17 +7971,21 @@
     <!-- # HEADSET Key Mode. 0 - Default Mode, 1 - Toggle Headset/Speaker. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1312>0</P1312>
+{if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
 
     <!-- # Headset Type. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P6779>0</P6779>
+{if isset($grandstream_headset_type)}
+    <P6779>{$grandstream_headset_type}</P6779>
 
     <!-- # EHS Headset Ring Tone. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1487>0</P1487>
+    <P1487>{$grandstream_headset_type}</P1487>
+{/if}
 
     <!-- # Always Ring Speaker. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
@@ -8185,9 +8189,7 @@
 {if isset($grandstream_wallpaper_url)}
     <P2916>1</P2916>
     <P2917>{$grandstream_wallpaper_url}</P2917>
-{else}
-    <P2916>0</P2916>
-    <P2917></P2917>
+
 {/if}
 
     <!-- # Color Background. Default is #000000. -->
@@ -8199,8 +8201,6 @@
     <!-- # Mandatory -->
 {if isset($grandstream_screensaver)}
     <P2918>{$grandstream_screensaver}</P2918>
-{else}
-    <P2918>2</P2918>
 {/if}
 
     <!-- # Screensaver Source.  0 - Default, 1 - USB, 2 - Download. Default is 0. -->
@@ -8208,8 +8208,6 @@
     <!-- # Mandatory -->
 {if isset($grandstream_screensaver_source)}
     <P6759>{$grandstream_screensaver_source}</P6759>
-{else}
-    <P6759>0</P6759>
 {/if}
 
     <!-- # Show Date and Time. 0 - No, 1 - Yes. Default is 1 -->
diff --git a/resources/templates/provision/grandstream/grp26xx/{$mac}.xml b/resources/templates/provision/grandstream/grp26xx/{$mac}.xml
index 3bea13d1bb..afa5d9fd13 100644
--- a/resources/templates/provision/grandstream/grp26xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/grp26xx/{$mac}.xml
@@ -7249,17 +7249,21 @@
     <!-- # HEADSET Key Mode. 0 - Default Mode, 1 - Toggle Headset/Speaker. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1312>0</P1312>
+{if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
 
     <!-- # Headset Type. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1487>0</P1487>
+{if isset($grandstream_headset_type)}
+    <P6779>{$grandstream_headset_type}</P6779>
 
-    <!-- # EHS Headset Ringtone. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
+    <!-- # EHS Headset Ring Tone. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P6779>0</P6779>
+    <P1487>{$grandstream_headset_type}</P1487>
+{/if}
 
     <!-- # Always Ring Speaker. 0 - No, 1 - Yes, both, 2 - Yes, speaker only. Default is 0 -->
     <!-- # Number: 0, 1, 2 -->
@@ -7473,16 +7477,14 @@
     <!-- # Wallpaper Source. 0 - Default, 1 - Download, 2-USB(for GXP2140/2160/2170 only), 3 - Uploaded, 4 - Color Background -->
     <!-- # Number: 0-4 -->
     <!-- # Mandatory -->
-    <P2916>0</P2916>
+    <!-- <P2916>0</P2916> -->
 
     <!-- # Wallpaper Server Path -->
     <!-- # String  -->
 {if isset($grandstream_wallpaper_url)}
     <P2916>1</P2916>
     <P2917>{$grandstream_wallpaper_url}</P2917>
-{else}
-    <P2916>0</P2916>
-    <P2917></P2917>
+
 {/if}
 
     <!-- # Color Background. Default is #000000. -->
@@ -7494,8 +7496,6 @@
     <!-- # Mandatory -->
 {if isset($grandstream_screensaver)}
     <P2918>{$grandstream_screensaver}</P2918>
-{else}
-    <P2918>1</P2918>
 {/if}
 
     <!-- # Screensaver Source.  0 - Default, 1 - USB, 2 - Download. Default is 0.  -->
@@ -7503,8 +7503,6 @@
     <!-- # Mandatory -->
 {if isset($grandstream_screensaver_source)}
     <P6759>{$grandstream_screensaver_source}</P6759>
-{else}
-    <P6759>0</P6759>
 {/if}
 
     <!-- # Show Date and Time. 0 - No, 1 - Yes. Default is 1 -->
diff --git a/resources/templates/provision/grandstream/gxp116x/{$mac}.xml b/resources/templates/provision/grandstream/gxp116x/{$mac}.xml
index 52b8eccfd1..b3d70e6fd7 100644
--- a/resources/templates/provision/grandstream/gxp116x/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp116x/{$mac}.xml
@@ -1279,12 +1279,21 @@
 <!--  HEADSET Key Mode. 0 - Default Mode, 1 - Toggle Headset/Speaker. Default is 0 -->
 <!--  Number: 0, 1 -->
 <!--  Mandatory -->
-<P1312>0</P1312>
+{if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
 
-<!--  Headset Type. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
-<!--  Number: 0, 1 -->
-<!--  Mandatory -->
-<P1487>0</P1487>
+    <!-- # Headset Type. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
+    <!-- # Number: 0, 1 -->
+    <!-- # Mandatory -->
+{if isset($grandstream_headset_type)}
+    <P6779>{$grandstream_headset_type}</P6779>
+
+    <!-- # EHS Headset Ring Tone. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
+    <!-- # Number: 0, 1 -->
+    <!-- # Mandatory -->
+    <P1487>{$grandstream_headset_type}</P1487>
+{/if}
 
 <!--  Always Ring Speaker. 0 - No, 1 - Yes. Default is 0 -->
 <!--  Number: 0, 1 -->
diff --git a/resources/templates/provision/grandstream/gxp140x/{$mac}.xml b/resources/templates/provision/grandstream/gxp140x/{$mac}.xml
index 654bf96fe5..8823f57be4 100644
--- a/resources/templates/provision/grandstream/gxp140x/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp140x/{$mac}.xml
@@ -1550,7 +1550,9 @@
     <!--  HEADSET Key Mode. 0 = Default Mode, 1 = Toggle Headset/Speaker. Default is 0 -->
     <!--  Number: 0, 1 -->
     <!--  Mandatory -->
-    <P1312>0</P1312>
+    {if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
     <!--  Always Ring Speaker. 0 - No, 1 - Yes. Default is 0 -->
     <!--  Number: 0, 1 -->
     <!--  Mandatory -->
diff --git a/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml b/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml
index db3979a52d..3b6ccf59bf 100644
--- a/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml
@@ -1550,7 +1550,9 @@
     <!--  HEADSET Key Mode. 0 = Default Mode, 1 = Toggle Headset/Speaker. Default is 0 -->
     <!--  Number: 0, 1 -->
     <!--  Mandatory -->
-    <P1312>0</P1312>
+    {if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
     <!--  Always Ring Speaker. 0 - No, 1 - Yes. Default is 0 -->
     <!--  Number: 0, 1 -->
     <!--  Mandatory -->
diff --git a/resources/templates/provision/grandstream/gxp1450/{$mac}.xml b/resources/templates/provision/grandstream/gxp1450/{$mac}.xml
index f6346b76cf..0c902de63e 100644
--- a/resources/templates/provision/grandstream/gxp1450/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp1450/{$mac}.xml
@@ -2055,7 +2055,9 @@
 <!-- HEADSET Key Mode. 0 = Default Mode, 1 = Toggle Headset/Speaker. Default is 0 -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P1312>0</P1312>
+{if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
 
 <!-- Always Ring Speaker. 0 - No, 1 - Yes. Default is 0 -->
 <!-- Number: 0, 1 -->
diff --git a/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml b/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml
index 101ab84d48..77eb10c93c 100644
--- a/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml
@@ -1862,7 +1862,9 @@
 <!-- HEADSET Key Mode. 0 = Default Mode, 1 = Toggle Headset/Speaker. Default is 0 -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P1312>0</P1312>
+{if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
 
 <!-- Always Ring Speaker. 0 - No, 1 - Yes. Default is 0 -->
 <!-- Number: 0, 1 -->
diff --git a/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml
index 656d33b3be..51c3994d7d 100644
--- a/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml
@@ -2694,11 +2694,21 @@
 <!--  HEADSET Key Mode. 0=Default Mode, 1=Toggle Headset/Speaker. Default is 0 -->
 <!--  Number: 0, 1 -->
 <!--  Mandatory -->
-<P1312>0</P1312>
-<!--  Headset Type. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
-<!--  Number: 0, 1 -->
-<!--  Mandatory -->
-<P1487>0</P1487>
+{if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
+
+    <!-- # Headset Type. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
+    <!-- # Number: 0, 1 -->
+    <!-- # Mandatory -->
+{if isset($grandstream_headset_type)}
+    <P6779>{$grandstream_headset_type}</P6779>
+
+    <!-- # EHS Headset Ring Tone. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
+    <!-- # Number: 0, 1 -->
+    <!-- # Mandatory -->
+    <P1487>{$grandstream_headset_type}</P1487>
+{/if}
 <!--  Always Ring Speaker. 0 - No, 1 - Yes. Default is 0 -->
 <!--  Number: 0, 1 -->
 <!--  Mandatory -->
diff --git a/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml
index e2acafe9ba..8dd253cbf9 100644
--- a/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml
@@ -3859,12 +3859,21 @@
 <!-- # HEADSET Key Mode. 0 - Default Mode, 1 - Toggle Headset/Speaker. Default is 0 -->
 <!-- # Number: 0, 1 -->
 <!-- # Mandatory -->
-<P1312>0</P1312>
+{if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
 
-<!-- # Headset Type. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
-<!-- # Number: 0, 1 -->
-<!-- # Mandatory -->
-<P1487>0</P1487>
+    <!-- # Headset Type. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
+    <!-- # Number: 0, 1 -->
+    <!-- # Mandatory -->
+{if isset($grandstream_headset_type)}
+    <P6779>{$grandstream_headset_type}</P6779>
+
+    <!-- # EHS Headset Ring Tone. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
+    <!-- # Number: 0, 1 -->
+    <!-- # Mandatory -->
+    <P1487>{$grandstream_headset_type}</P1487>
+{/if}
 
 <!-- # Always Ring Speaker. 0 - No, 1 - Yes. Default is 0 -->
 <!-- # Number: 0, 1 -->
diff --git a/resources/templates/provision/grandstream/gxp20xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp20xx/{$mac}.xml
index 40f841561c..16c3c84a6d 100644
--- a/resources/templates/provision/grandstream/gxp20xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp20xx/{$mac}.xml
@@ -1991,7 +1991,9 @@
 
 <!--  Headset keymode. 0 - Default Mode, 1 - Toggle Speaker(default)/Headset, 2 - Toggle Speaker/Headset(default)   -->
 <!--  Not avaliable for GXP2000 -->
-<P1312>0</P1312>
+{if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
 
 <!--  For GXP1200 and GXP280 Only; 0 = Switch, 1 = Hub -->
 <P1348>0</P1348>
diff --git a/resources/templates/provision/grandstream/gxp2100/{$mac}.xml b/resources/templates/provision/grandstream/gxp2100/{$mac}.xml
index f3457360c9..c6b5a23967 100644
--- a/resources/templates/provision/grandstream/gxp2100/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2100/{$mac}.xml
@@ -3472,7 +3472,9 @@
 <!--# HEADSET Key Mode. 0 = Default Mode, 1 = Toggle Headset/Speaker. Default is 0-->
 <!--# Number: 0, 1-->
 <!--# Mandatory-->
-    <P1312>0</P1312>
+    {if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
 
 <!--# Always Ring Speaker. 0 - No, 1 - Yes. Default is 0-->
 <!--# Number: 0, 1-->
diff --git a/resources/templates/provision/grandstream/gxp2124/{$mac}.xml b/resources/templates/provision/grandstream/gxp2124/{$mac}.xml
index 4bcf7a47f3..c13c9867e4 100644
--- a/resources/templates/provision/grandstream/gxp2124/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2124/{$mac}.xml
@@ -2285,11 +2285,21 @@
     <!-- HEADSET Key Mode. 0 - Default Mode, 1 - Toggle Headset/Speaker. Default is 0 -->
     <!-- Number: 0, 1 -->
     <!-- Mandatory -->
-    <P1312>0</P1312>
-    <!-- Headset Type. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
-    <!-- Number: 0, 1 -->
-    <!-- Mandatory -->
-    <P1487>0</P1487>
+{if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
+
+    <!-- # Headset Type. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
+    <!-- # Number: 0, 1 -->
+    <!-- # Mandatory -->
+{if isset($grandstream_headset_type)}
+    <P6779>{$grandstream_headset_type}</P6779>
+
+    <!-- # EHS Headset Ring Tone. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
+    <!-- # Number: 0, 1 -->
+    <!-- # Mandatory -->
+    <P1487>{$grandstream_headset_type}</P1487>
+{/if}
     <!-- Always Ring Speaker. 0 - No, 1 - Yes. Default is 0 -->
     <!-- Number: 0, 1 -->
     <!-- Mandatory -->
diff --git a/resources/templates/provision/grandstream/gxp2130/{$mac}.xml b/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
index f8c77500dd..e6871eba1d 100644
--- a/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
@@ -7934,17 +7934,21 @@
     <!-- # HEADSET Key Mode. 0 - Default Mode, 1 - Toggle Headset/Speaker. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1312>0</P1312>
+{if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
 
     <!-- # Headset Type. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P6779>0</P6779>
+{if isset($grandstream_headset_type)}
+    <P6779>{$grandstream_headset_type}</P6779>
 
     <!-- # EHS Headset Ring Tone. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1487>0</P1487>
+    <P1487>{$grandstream_headset_type}</P1487>
+{/if}
 
     <!-- # Always Ring Speaker. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
@@ -8148,9 +8152,7 @@
 {if isset($grandstream_wallpaper_url)}
     <P2916>1</P2916>
     <P2917>{$grandstream_wallpaper_url}</P2917>
-{else}
-    <P2916>0</P2916>
-    <P2917></P2917>
+
 {/if}
 
     <!-- # Color Background. Default is #000000. -->
@@ -8162,8 +8164,6 @@
     <!-- # Mandatory -->
 {if isset($grandstream_screensaver)}
     <P2918>{$grandstream_screensaver}</P2918>
-{else}
-    <P2918>1</P2918>
 {/if}
 
     <!-- # Screensaver Source.  0 - Default, 1 - USB, 2 - Download. Default is 0. ~~for GXP2140/2160/2170 only -->
@@ -8171,8 +8171,6 @@
     <!-- # Mandatory -->
 {if isset($grandstream_screensaver_source)}
     <P6759>{$grandstream_screensaver_source}</P6759>
-{else}
-    <P6759>0</P6759>
 {/if}
 
     <!-- # Show Date and Time. 0 - No, 1 - Yes. Default is 1 -->
diff --git a/resources/templates/provision/grandstream/gxp2135/{$mac}.xml b/resources/templates/provision/grandstream/gxp2135/{$mac}.xml
index 54e4f726e0..f18d5e2177 100644
--- a/resources/templates/provision/grandstream/gxp2135/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2135/{$mac}.xml
@@ -7926,17 +7926,21 @@
     <!-- # HEADSET Key Mode. 0 - Default Mode, 1 - Toggle Headset/Speaker. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1312>0</P1312>
+{if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
 
     <!-- # Headset Type. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P6779>0</P6779>
+{if isset($grandstream_headset_type)}
+    <P6779>{$grandstream_headset_type}</P6779>
 
     <!-- # EHS Headset Ring Tone. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1487>0</P1487>
+    <P1487>{$grandstream_headset_type}</P1487>
+{/if}
 
     <!-- # Always Ring Speaker. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
@@ -8141,9 +8145,7 @@
 {if isset($grandstream_wallpaper_url)}
     <P2916>1</P2916>
     <P2917>{$grandstream_wallpaper_url}</P2917>
-{else}
-    <P2916>0</P2916>
-    <P2917></P2917>
+
 {/if}
 
     <!-- # Color Background. Default is #000000. -->
@@ -8155,8 +8157,6 @@
     <!-- # Mandatory -->
 {if isset($grandstream_screensaver)}
     <P2918>{$grandstream_screensaver}</P2918>
-{else}
-    <P2918>1</P2918>
 {/if}
 
     <!-- # Screensaver Source.  0 - Default, 1 - USB, 2 - Download. Default is 0. ~~for GXP2140/2160/2170 only -->
@@ -8164,8 +8164,6 @@
     <!-- # Mandatory -->
 {if isset($grandstream_screensaver_source)}
     <P6759>{$grandstream_screensaver_source}</P6759>
-{else}
-    <P6759>0</P6759>
 {/if}
 
     <!-- # Show Date and Time. 0 - No, 1 - Yes. Default is 1 -->
diff --git a/resources/templates/provision/grandstream/gxp2140/{$mac}.xml b/resources/templates/provision/grandstream/gxp2140/{$mac}.xml
index 0c56f45796..9aa63bc70d 100644
--- a/resources/templates/provision/grandstream/gxp2140/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2140/{$mac}.xml
@@ -7926,17 +7926,21 @@
     <!-- # HEADSET Key Mode. 0 - Default Mode, 1 - Toggle Headset/Speaker. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1312>0</P1312>
+{if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
 
     <!-- # Headset Type. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P6779>0</P6779>
+{if isset($grandstream_headset_type)}
+    <P6779>{$grandstream_headset_type}</P6779>
 
     <!-- # EHS Headset Ring Tone. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1487>0</P1487>
+    <P1487>{$grandstream_headset_type}</P1487>
+{/if}
 
     <!-- # Always Ring Speaker. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
@@ -8141,9 +8145,7 @@
 {if isset($grandstream_wallpaper_url)}
     <P2916>1</P2916>
     <P2917>{$grandstream_wallpaper_url}</P2917>
-{else}
-    <P2916>0</P2916>
-    <P2917></P2917>
+
 {/if}
 
     <!-- # Color Background. Default is #000000. -->
@@ -8155,8 +8157,6 @@
     <!-- # Mandatory -->
 {if isset($grandstream_screensaver)}
     <P2918>{$grandstream_screensaver}</P2918>
-{else}
-    <P2918>1</P2918>
 {/if}
 
     <!-- # Screensaver Source.  0 - Default, 1 - USB, 2 - Download. Default is 0. ~~for GXP2140/2160/2170 only -->
@@ -8164,8 +8164,6 @@
     <!-- # Mandatory -->
 {if isset($grandstream_screensaver_source)}
     <P6759>{$grandstream_screensaver_source}</P6759>
-{else}
-    <P6759>0</P6759>
 {/if}
 
     <!-- # Show Date and Time. 0 - No, 1 - Yes. Default is 1 -->
diff --git a/resources/templates/provision/grandstream/gxp2160/{$mac}.xml b/resources/templates/provision/grandstream/gxp2160/{$mac}.xml
index 14113e9cc5..bd8f503f5a 100644
--- a/resources/templates/provision/grandstream/gxp2160/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2160/{$mac}.xml
@@ -7938,17 +7938,21 @@
     <!-- # HEADSET Key Mode. 0 - Default Mode, 1 - Toggle Headset/Speaker. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1312>0</P1312>
+{if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
 
     <!-- # Headset Type. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P6779>0</P6779>
+{if isset($grandstream_headset_type)}
+    <P6779>{$grandstream_headset_type}</P6779>
 
     <!-- # EHS Headset Ring Tone. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1487>0</P1487>
+    <P1487>{$grandstream_headset_type}</P1487>
+{/if}
 
     <!-- # Always Ring Speaker. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
@@ -8153,9 +8157,7 @@
 {if isset($grandstream_wallpaper_url)}
     <P2916>1</P2916>
     <P2917>{$grandstream_wallpaper_url}</P2917>
-{else}
-    <P2916>0</P2916>
-    <P2917></P2917>
+
 {/if}
 
     <!-- # Color Background. Default is #000000. -->
@@ -8167,8 +8169,6 @@
     <!-- # Mandatory -->
 {if isset($grandstream_screensaver)}
     <P2918>{$grandstream_screensaver}</P2918>
-{else}
-    <P2918>1</P2918>
 {/if}
 
     <!-- # Screensaver Source.  0 - Default, 1 - USB, 2 - Download. Default is 0. ~~for GXP2140/2160/2170 only -->
@@ -8176,8 +8176,6 @@
     <!-- # Mandatory -->
 {if isset($grandstream_screensaver_source)}
     <P6759>{$grandstream_screensaver_source}</P6759>
-{else}
-    <P6759>0</P6759>
 {/if}
 
     <!-- # Show Date and Time. 0 - No, 1 - Yes. Default is 1 -->
diff --git a/resources/templates/provision/grandstream/gxp2170/{$mac}.xml b/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
index 617bfb0179..c014a49fbe 100644
--- a/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
@@ -7926,17 +7926,21 @@
     <!-- # HEADSET Key Mode. 0 - Default Mode, 1 - Toggle Headset/Speaker. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1312>0</P1312>
+{if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
 
     <!-- # Headset Type. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P6779>0</P6779>
+{if isset($grandstream_headset_type)}
+    <P6779>{$grandstream_headset_type}</P6779>
 
     <!-- # EHS Headset Ring Tone. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1487>0</P1487>
+    <P1487>{$grandstream_headset_type}</P1487>
+{/if}
 
     <!-- # Always Ring Speaker. 0 - No, 1 - Yes. Default is 0 -->
     <!-- # Number: 0, 1 -->
@@ -8141,9 +8145,7 @@
 {if isset($grandstream_wallpaper_url)}
     <P2916>1</P2916>
     <P2917>{$grandstream_wallpaper_url}</P2917>
-{else}
-    <P2916>0</P2916>
-    <P2917></P2917>
+
 {/if}
 
     <!-- # Color Background. Default is #000000. -->
@@ -8155,8 +8157,6 @@
     <!-- # Mandatory -->
 {if isset($grandstream_screensaver)}
     <P2918>{$grandstream_screensaver}</P2918>
-{else}
-    <P2918>1</P2918>
 {/if}
 
     <!-- # Screensaver Source.  0 - Default, 1 - USB, 2 - Download. Default is 0. ~~for GXP2140/2160/2170 only -->
@@ -8164,8 +8164,6 @@
     <!-- # Mandatory -->
 {if isset($grandstream_screensaver_source)}
     <P6759>{$grandstream_screensaver_source}</P6759>
-{else}
-    <P6759>0</P6759>
 {/if}
 
     <!-- # Show Date and Time. 0 - No, 1 - Yes. Default is 1 -->
diff --git a/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml
index 06291563af..8fc194f888 100644
--- a/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml
@@ -3062,7 +3062,21 @@ Outgoing calls. 0 - No, 1 - Yes. Default is 0 -->
     <!-- HEADSET Key Mode. 0 = Default Mode, 1 = Toggle Headset/Speaker. Default is 0 -->
     <!-- Number: 0, 1 -->
     <!-- Mandatory -->
-    <P1312>0</P1312>
+{if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
+
+    <!-- # Headset Type. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
+    <!-- # Number: 0, 1 -->
+    <!-- # Mandatory -->
+{if isset($grandstream_headset_type)}
+    <P6779>{$grandstream_headset_type}</P6779>
+
+    <!-- # EHS Headset Ring Tone. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
+    <!-- # Number: 0, 1 -->
+    <!-- # Mandatory -->
+    <P1487>{$grandstream_headset_type}</P1487>
+{/if}
     <!-- Always Ring Speaker. 0 - No, 1 - Yes. Default is 0 -->
     <!-- Number: 0, 1 -->
     <!-- Mandatory -->
diff --git a/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml b/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml
index 66bde7e9f3..1622d63c00 100644
--- a/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml
@@ -3772,7 +3772,21 @@ Outgoing calls. 0 - No, 1 - Yes. Default is 0 -->
 <!-- HEADSET Key Mode. 0 = Default Mode, 1 = Toggle Headset/Speaker. Default is 0 -->
 <!-- Number: 0, 1 -->
 <!-- Mandatory -->
-<P1312>0</P1312>
+{if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
+
+    <!-- # Headset Type. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
+    <!-- # Number: 0, 1 -->
+    <!-- # Mandatory -->
+{if isset($grandstream_headset_type)}
+    <P6779>{$grandstream_headset_type}</P6779>
+
+    <!-- # EHS Headset Ring Tone. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
+    <!-- # Number: 0, 1 -->
+    <!-- # Mandatory -->
+    <P1487>{$grandstream_headset_type}</P1487>
+{/if}
 
 <!-- Always Ring Speaker. 0 - No, 1 - Yes. Default is 0 -->
 <!-- Number: 0, 1 -->
diff --git a/resources/templates/provision/grandstream/gxp2200/{$mac}.xml b/resources/templates/provision/grandstream/gxp2200/{$mac}.xml
index 9b1cf9c7ef..e09076e43a 100644
--- a/resources/templates/provision/grandstream/gxp2200/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2200/{$mac}.xml
@@ -3337,13 +3337,23 @@ Account 5 Codec Settings
 <P1302>0</P1302>
 {/if}
 
-<!-- Headset Type. 0 - Normal Headset, 1 - Plantronics EHS. Default value is 0 -->
-<!-- Number: 0, 1 -->
-<P1487>0</P1487>
-
 <!-- Headset Key Mode. 0 - Default Mode, 1 - Toggle Headset/Speaker. Default value is 0 -->
 <!-- Number: 0, 1 -->
-<P1312>0</P1312>
+{if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
+
+    <!-- # Headset Type. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
+    <!-- # Number: 0, 1 -->
+    <!-- # Mandatory -->
+{if isset($grandstream_headset_type)}
+    <P6779>{$grandstream_headset_type}</P6779>
+
+    <!-- # EHS Headset Ring Tone. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
+    <!-- # Number: 0, 1 -->
+    <!-- # Mandatory -->
+    <P1487>{$grandstream_headset_type}</P1487>
+{/if}
 
 <!-- Advanced Settings - MPK LCD Settings -->
 
diff --git a/resources/templates/provision/grandstream/gxp3240/{$mac}.xml b/resources/templates/provision/grandstream/gxp3240/{$mac}.xml
index ad6099c077..c6af0e689f 100644
--- a/resources/templates/provision/grandstream/gxp3240/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp3240/{$mac}.xml
@@ -3547,13 +3547,23 @@ Account 5 Codec Settings
 <P1302>0</P1302>
 {/if}
 
-<!-- Headset Type. 0 - Normal Headset, 1 - Plantronics EHS. Default value is 0 -->
-<!-- Number: 0, 1 -->
-<P1487>0</P1487>
-
 <!-- Headset Key Mode. 0 - Default Mode, 1 - Toggle Headset/Speaker. Default value is 0 -->
 <!-- Number: 0, 1 -->
-<P1312>0</P1312>
+{if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
+
+    <!-- # Headset Type. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
+    <!-- # Number: 0, 1 -->
+    <!-- # Mandatory -->
+{if isset($grandstream_headset_type)}
+    <P6779>{$grandstream_headset_type}</P6779>
+
+    <!-- # EHS Headset Ring Tone. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
+    <!-- # Number: 0, 1 -->
+    <!-- # Mandatory -->
+    <P1487>{$grandstream_headset_type}</P1487>
+{/if}
 
 <!-- Advanced Settings - MPK LCD Settings -->
 
diff --git a/resources/templates/provision/grandstream/gxv3240/{$mac}.xml b/resources/templates/provision/grandstream/gxv3240/{$mac}.xml
index e20791bf76..75edde9d94 100644
--- a/resources/templates/provision/grandstream/gxv3240/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxv3240/{$mac}.xml
@@ -5408,14 +5408,18 @@
 <!-- Headset Type. 0 - Normal Headset, 1 - Plantronics EHS, 2 - Jabra EHS. Default value is 0 -->
 <!-- Number: 0, 1 -->
 {if isset($grandstream_headset_type)}
+<P6779>{$grandstream_headset_type}</P6779>
+<!-- # EHS Headset Ring Tone. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
+<!-- # Number: 0, 1 -->
+<!-- # Mandatory -->
 <P1487>{$grandstream_headset_type}</P1487>
-{else}
-<P1487>0</P1487>
 {/if}
 
 <!-- Headset Key Mode. 0 - Default Mode, 1 - Toggle Headset/Speaker. Default value is 0 -->
 <!-- Number: 0, 1 -->
-<P1312>0</P1312>
+{if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
 
 <!-- Handset TX Gain (dB). 0 - 0, 1 - -6, 2 - +6. Default value is 0 -->
 <!-- Number: 0, 1, 2 -->
diff --git a/resources/templates/provision/grandstream/gxv3275/{$mac}.xml b/resources/templates/provision/grandstream/gxv3275/{$mac}.xml
index d3c41f54f2..66d19ed1f4 100644
--- a/resources/templates/provision/grandstream/gxv3275/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxv3275/{$mac}.xml
@@ -3551,13 +3551,23 @@ Account 5 Codec Settings
 <P1302>0</P1302>
 {/if}
 
-<!-- Headset Type. 0 - Normal Headset, 1 - Plantronics EHS. Default value is 0 -->
-<!-- Number: 0, 1 -->
-<P1487>0</P1487>
-
 <!-- Headset Key Mode. 0 - Default Mode, 1 - Toggle Headset/Speaker. Default value is 0 -->
 <!-- Number: 0, 1 -->
-<P1312>0</P1312>
+{if isset($grandstream_headset_key_mode)}
+    <P1312>{$grandstream_headset_key_mode}</P1312>
+{/if}
+
+    <!-- # Headset Type. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
+    <!-- # Number: 0, 1 -->
+    <!-- # Mandatory -->
+{if isset($grandstream_headset_type)}
+    <P6779>{$grandstream_headset_type}</P6779>
+
+    <!-- # EHS Headset Ring Tone. 0 - Normal, 1 - Plantronics EHS. Default is 0 -->
+    <!-- # Number: 0, 1 -->
+    <!-- # Mandatory -->
+    <P1487>{$grandstream_headset_type}</P1487>
+{/if}
 
 <!-- Advanced Settings - MPK LCD Settings -->