diff --git a/app/grandstream/app_config.php b/app/grandstream/app_config.php
index 72fac4077b..6a1712634a 100644
--- a/app/grandstream/app_config.php
+++ b/app/grandstream/app_config.php
@@ -102,6 +102,14 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Default VLAN for phone LAN port. Default 0 is disabled.";
 		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "8d424a07-921c-4549-a938-5457d51d47d2";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_pc_mode";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "Enabled";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Options: Enabled, Disabled, Mirrored. Default: Enabled";
+		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "5200174e-b644-438f-a2f8-b721ee052cea";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_pc_port_vlan";
@@ -310,6 +318,14 @@
 		$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'] = "e65ff82a-6ded-4cdd-8ba5-b45cb174c8fa";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_headset_ringtone";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "Default";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Options: Normal, PlantronicsEHS. Default: Normal";
+		$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";
@@ -334,6 +350,23 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Always Ring Speaker. 0 - No, 1 - Yes both, 2 - Yes Speaker Only. Default is 0";
 		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "a3ce83cb-609f-4189-a4cf-569ed36fb76d";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_headset_rx_gain";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Headset RX gain(dB). 1 - -6, 0 - 0, 2 - +6. Default is 0";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "a3ce83cb-609f-4189-a4cf-569ed36fb76d";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_headset_tx_gain";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Handset TX gain(dB). 1 - -6, 0 - 0, 2 - +6. 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";
@@ -378,9 +411,17 @@
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_screensaver";
 		$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_value'] = "0";
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
-		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Screensaver. 0 - No, 1 - Yes, 2 - On if no VPK is active. Default is 1";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Screensaver. 0 - No, 1 - Yes, 2 - On if no VPK is active. Default is 0";
+		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "730eae5c-a413-45a4-ad64-725e21dd6ab5";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_screensaver_enable";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Screensaver. 0 - No, 1 - Yes, 2 - On if no VPK is active. Default is 0";
 		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "eb96abe3-0225-4c75-adcf-982e7121d905";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
@@ -774,6 +815,14 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Internet Protocol. 0 - Both, prefer IPv4, 1 - Both, prefer IPv6, 2 - IPv4 Only, 3 - IPv6 Only. Default is 0";
 		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "c2d071eb-1381-4acb-b094-857cd222fce0";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_internet_protocol";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Internet Protocol. BothAndPreferIPv4, BothAndPreferIPv6, IPv4Only, IPv6Only. Default: IPv4Only";
+		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "3dd34197-e1e8-40bc-baf2-2e07c39d59b5";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "grandstream_accept_sip_from_proxy_only";
diff --git a/resources/templates/provision/grandstream/gxp2130/{$mac}.xml b/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
index d4182edba3..486c471b1d 100644
--- a/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2130/{$mac}.xml
@@ -33,12 +33,12 @@
 
 		<!-- SIP Server -->
 		{if isset($row.server_address_primary)}
-		<item name="account.{$row.line_number}.sip.server.1.address">{$row.server_address_primary}</item>
+		<item name="account.{$row.line_number}.sip.server.1.address">{$row.server_address_primary}:{$row.sip_port}</item>
 		{else}
-		<item name="account.{$row.line_number}.sip.server.1.address">{$row.server_address}</item>
+		<item name="account.{$row.line_number}.sip.server.1.address">{$row.server_address}:{$row.sip_port}</item>
 		{/if}
 		<!-- Secondary SIP Server -->
-		<item name="account.{$row.line_number}.sip.server.2.address">{$row.server_address_secondary}</item>
+		<item name="account.{$row.line_number}.sip.server.2.address">{$row.server_address_secondary}:{$row.sip_port}</item>
 
 		<!-- Outbound Proxy -->
 		{if $row.sip_transport != 'dns srv' && isset($row.outbound_proxy_primary)}
@@ -56,9 +56,9 @@
 
 		<!-- BLF Server -->
 		{if isset($row.server_address_primary)}
-		<item name="account.{$row.line_number}.sip.blf.server">{$row.server_address_primary}</item>
+		<item name="account.{$row.line_number}.sip.blf.server">{$row.server_address_primary}:{$row.sip_port}</item>
 		{else}
-		<item name="account.{$row.line_number}.sip.blf.server">{$row.server_address}</item>
+		<item name="account.{$row.line_number}.sip.blf.server">{$row.server_address}:{$row.sip_port}</item>
 		{/if}
 
 		<!-- SIP User ID -->
@@ -576,61 +576,61 @@
 		<item name="account.{$row.line_number}.ring.ringtone">5</item>
 
 		<!-- Matching Incoming Caller ID. Matching Rule 1 -->
-		<item name="account.{$row.line_number}.ring.match.1.callerId"/>
+		<item name="account.{$row.line_number}.ring.match.1.callerId">{$grandstream_distinctive_ringtone_name_1}</item>
 
 		<!-- Distinctive Ring Tone -->
 		<item name="account.{$row.line_number}.ring.match.1.ringtone">{$grandstream_distinctive_ringtone_1}</item>
 
 		<!-- Match Incoming Caller ID. Matching Rule 2 -->
-		<item name="account.{$row.line_number}.ring.match.2.callerId"/>
+		<item name="account.{$row.line_number}.ring.match.2.callerId">{$grandstream_distinctive_ringtone_name_2}</item>
 
 		<!-- Distinctive Ring Tone -->
 		<item name="account.{$row.line_number}.ring.match.2.ringtone">{$grandstream_distinctive_ringtone_2}</item>
 
 		<!-- Match Incoming Caller ID. Matching Rule 3 -->
-		<item name="account.{$row.line_number}.ring.match.3.callerId"/>
+		<item name="account.{$row.line_number}.ring.match.3.callerId">{$grandstream_distinctive_ringtone_name_3}</item>
 
 		<!-- Distinctive Ring Tone -->
 		<item name="account.{$row.line_number}.ring.match.3.ringtone">{$grandstream_distinctive_ringtone_3}</item>
 
 		<!-- Match Incoming Caller ID. Matching Rule 4 -->
-		<item name="account.{$row.line_number}.ring.match.4.callerId"/>
+		<item name="account.{$row.line_number}.ring.match.4.callerId">{$grandstream_distinctive_ringtone_name_4}</item>
 
 		<!-- Distinctive Ring Tone -->
 		<item name="account.{$row.line_number}.ring.match.4.ringtone">{$grandstream_distinctive_ringtone_4}</item>
 
 		<!-- Match Incoming Caller ID. Matching Rule 5 -->
-		<item name="account.{$row.line_number}.ring.match.5.callerId"/>
+		<item name="account.{$row.line_number}.ring.match.5.callerId">{$grandstream_distinctive_ringtone_name_5}</item>
 
 		<!-- Distinctive Ring Tone -->
 		<item name="account.{$row.line_number}.ring.match.5.ringtone">{$grandstream_distinctive_ringtone_5}</item>
 
 		<!-- Match Incoming Caller ID. Matching Rule 6 -->
-		<item name="account.{$row.line_number}.ring.match.6.callerId"/>
+		<item name="account.{$row.line_number}.ring.match.6.callerId">{$grandstream_distinctive_ringtone_name_6}</item>
 
 		<!-- Distinctive Ring Tone -->
 		<item name="account.{$row.line_number}.ring.match.6.ringtone">{$grandstream_distinctive_ringtone_6}</item>
 
 		<!-- Match Incoming Caller ID. Matching Rule 7 -->
-		<item name="account.{$row.line_number}.ring.match.7.callerId"/>
+		<item name="account.{$row.line_number}.ring.match.7.callerId">{$grandstream_distinctive_ringtone_name_7}</item>
 
 		<!-- Distinctive Ring Tone -->
 		<item name="account.{$row.line_number}.ring.match.7.ringtone">{$grandstream_distinctive_ringtone_7}</item>
 
 		<!-- Match Incoming Caller ID. Matching Rule 8 -->
-		<item name="account.{$row.line_number}.ring.match.8.callerId"/>
+		<item name="account.{$row.line_number}.ring.match.8.callerId">{$grandstream_distinctive_ringtone_name_8}</item>
 
 		<!-- Distinctive Ring Tone -->
 		<item name="account.{$row.line_number}.ring.match.8.ringtone">{$grandstream_distinctive_ringtone_8}</item>
 
 		<!-- Match Incoming Caller ID. Matching Rule 9 -->
-		<item name="account.{$row.line_number}.ring.match.9.callerId"/>
+		<item name="account.{$row.line_number}.ring.match.9.callerId">{$grandstream_distinctive_ringtone_name_9}</item>
 
 		<!-- Distinctive Ring Tone -->
 		<item name="account.{$row.line_number}.ring.match.9.ringtone">{$grandstream_distinctive_ringtone_9}</item>
 
 		<!-- Match Incoming Caller ID. Matching Rule 10 -->
-		<item name="account.{$row.line_number}.ring.match.10.callerId"/>
+		<item name="account.{$row.line_number}.ring.match.10.callerId">{$grandstream_distinctive_ringtone_name_10}</item>
 
 		<!-- Distinctive Ring Tone -->
 		<item name="account.{$row.line_number}.ring.match.10.ringtone">{$grandstream_distinctive_ringtone_10}</item>
@@ -669,7 +669,7 @@
 		<!-- #Enable Local Call Features. Default is Yes -->
 		<!-- #Mandatory -->
 		<!-- No, Yes -->
-		<item name="account.{$row.line_number}.featureCodes.callFeatures">Yes</item>
+		<item name="account.{$row.line_number}.featureCodes.callFeatures">No</item>
 
 		<!-- DND Call Feature On -->
 		<item name="account.{$row.line_number}.featureCodes.dndOn">*78</item>
@@ -907,7 +907,7 @@
 
 		<!-- # Enable Manual VLAN Configuration. Yes or No. -->
 		<!-- # Mandatory -->
-		<item name="network.port.eth.1.vlan.enable">{if isset($grandstream_lan_port_vlan)}Yes{else}No{/if}</item>
+		<item name="network.port.eth.1.vlan.enable">{if $grandstream_lan_port_vlan == '0'}No{else}Yes{/if}</item>
 
 		<!-- # Layer 2 QoS. 802.1Q/VLAN Tag (VLAN classification for RTP). Default is 0 -->
 		<!-- Layer 2 QoS 802.1Q/VLAN Tag (Ethernet) -->
@@ -921,7 +921,7 @@
 		<!-- PC Port Mode -->
 		<!-- Enabled, Disabled, Mirrored -->
 		{if isset($grandstream_pc_mode)}
-		<item name="network.port.pc.mode">{if isset($grandstream_pc_mode)}{$grandstream_pc_mode}{/if}</item>
+		<item name="network.port.pc.mode">{if isset($grandstream_pc_mode)}{$grandstream_pc_mode}{else}Enabled{/if}</item>
 		{else}
 		<item name="network.port.pc.mode">{if isset($grandstream_pc_port_vlan)}Enabled{else}Disabled{/if}</item>
 		{/if}
@@ -2204,7 +2204,7 @@
 		<item name="sip.showError">Yes</item>
 
 		<!-- # Enable Missed Call Notification. Yes or No -->
-		<item name="features.history.missedCallNotification">Yes</item>
+		<item name="features.history.missedCallNotification">{$grandstream_missed_call_notification}</item>
 
 		<!-- # Enable Call Completion Service. Yes or No -->
 		<item name="call.dial.callComplete.enable"/>
diff --git a/resources/templates/provision/grandstream/gxp2135/{$mac}.xml b/resources/templates/provision/grandstream/gxp2135/{$mac}.xml
index 8d81d28b14..4646e7d919 100644
--- a/resources/templates/provision/grandstream/gxp2135/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2135/{$mac}.xml
@@ -33,12 +33,12 @@
 
 		<!-- SIP Server -->
 		{if isset($row.server_address_primary)}
-		<item name="account.{$row.line_number}.sip.server.1.address">{$row.server_address_primary}</item>
+		<item name="account.{$row.line_number}.sip.server.1.address">{$row.server_address_primary}:{$row.sip_port}</item>
 		{else}
-		<item name="account.{$row.line_number}.sip.server.1.address">{$row.server_address}</item>
+		<item name="account.{$row.line_number}.sip.server.1.address">{$row.server_address}:{$row.sip_port}</item>
 		{/if}
 		<!-- Secondary SIP Server -->
-		<item name="account.{$row.line_number}.sip.server.2.address">{$row.server_address_secondary}</item>
+		<item name="account.{$row.line_number}.sip.server.2.address">{$row.server_address_secondary}:{$row.sip_port}</item>
 
 		<!-- Outbound Proxy -->
 		{if $row.sip_transport != 'dns srv' && isset($row.outbound_proxy_primary)}
@@ -56,9 +56,9 @@
 
 		<!-- BLF Server -->
 		{if isset($row.server_address_primary)}
-		<item name="account.{$row.line_number}.sip.blf.server">{$row.server_address_primary}</item>
+		<item name="account.{$row.line_number}.sip.blf.server">{$row.server_address_primary}:{$row.sip_port}</item>
 		{else}
-		<item name="account.{$row.line_number}.sip.blf.server">{$row.server_address}</item>
+		<item name="account.{$row.line_number}.sip.blf.server">{$row.server_address}:{$row.sip_port}</item>
 		{/if}
 
 		<!-- SIP User ID -->
@@ -576,61 +576,61 @@
 		<item name="account.{$row.line_number}.ring.ringtone">5</item>
 
 		<!-- Matching Incoming Caller ID. Matching Rule 1 -->
-		<item name="account.{$row.line_number}.ring.match.1.callerId"/>
+		<item name="account.{$row.line_number}.ring.match.1.callerId">{$grandstream_distinctive_ringtone_name_1}</item>
 
 		<!-- Distinctive Ring Tone -->
 		<item name="account.{$row.line_number}.ring.match.1.ringtone">{$grandstream_distinctive_ringtone_1}</item>
 
 		<!-- Match Incoming Caller ID. Matching Rule 2 -->
-		<item name="account.{$row.line_number}.ring.match.2.callerId"/>
+		<item name="account.{$row.line_number}.ring.match.2.callerId">{$grandstream_distinctive_ringtone_name_2}</item>
 
 		<!-- Distinctive Ring Tone -->
 		<item name="account.{$row.line_number}.ring.match.2.ringtone">{$grandstream_distinctive_ringtone_2}</item>
 
 		<!-- Match Incoming Caller ID. Matching Rule 3 -->
-		<item name="account.{$row.line_number}.ring.match.3.callerId"/>
+		<item name="account.{$row.line_number}.ring.match.3.callerId">{$grandstream_distinctive_ringtone_name_3}</item>
 
 		<!-- Distinctive Ring Tone -->
 		<item name="account.{$row.line_number}.ring.match.3.ringtone">{$grandstream_distinctive_ringtone_3}</item>
 
 		<!-- Match Incoming Caller ID. Matching Rule 4 -->
-		<item name="account.{$row.line_number}.ring.match.4.callerId"/>
+		<item name="account.{$row.line_number}.ring.match.4.callerId">{$grandstream_distinctive_ringtone_name_4}</item>
 
 		<!-- Distinctive Ring Tone -->
 		<item name="account.{$row.line_number}.ring.match.4.ringtone">{$grandstream_distinctive_ringtone_4}</item>
 
 		<!-- Match Incoming Caller ID. Matching Rule 5 -->
-		<item name="account.{$row.line_number}.ring.match.5.callerId"/>
+		<item name="account.{$row.line_number}.ring.match.5.callerId">{$grandstream_distinctive_ringtone_name_5}</item>
 
 		<!-- Distinctive Ring Tone -->
 		<item name="account.{$row.line_number}.ring.match.5.ringtone">{$grandstream_distinctive_ringtone_5}</item>
 
 		<!-- Match Incoming Caller ID. Matching Rule 6 -->
-		<item name="account.{$row.line_number}.ring.match.6.callerId"/>
+		<item name="account.{$row.line_number}.ring.match.6.callerId">{$grandstream_distinctive_ringtone_name_6}</item>
 
 		<!-- Distinctive Ring Tone -->
 		<item name="account.{$row.line_number}.ring.match.6.ringtone">{$grandstream_distinctive_ringtone_6}</item>
 
 		<!-- Match Incoming Caller ID. Matching Rule 7 -->
-		<item name="account.{$row.line_number}.ring.match.7.callerId"/>
+		<item name="account.{$row.line_number}.ring.match.7.callerId">{$grandstream_distinctive_ringtone_name_7}</item>
 
 		<!-- Distinctive Ring Tone -->
 		<item name="account.{$row.line_number}.ring.match.7.ringtone">{$grandstream_distinctive_ringtone_7}</item>
 
 		<!-- Match Incoming Caller ID. Matching Rule 8 -->
-		<item name="account.{$row.line_number}.ring.match.8.callerId"/>
+		<item name="account.{$row.line_number}.ring.match.8.callerId">{$grandstream_distinctive_ringtone_name_8}</item>
 
 		<!-- Distinctive Ring Tone -->
 		<item name="account.{$row.line_number}.ring.match.8.ringtone">{$grandstream_distinctive_ringtone_8}</item>
 
 		<!-- Match Incoming Caller ID. Matching Rule 9 -->
-		<item name="account.{$row.line_number}.ring.match.9.callerId"/>
+		<item name="account.{$row.line_number}.ring.match.9.callerId">{$grandstream_distinctive_ringtone_name_9}</item>
 
 		<!-- Distinctive Ring Tone -->
 		<item name="account.{$row.line_number}.ring.match.9.ringtone">{$grandstream_distinctive_ringtone_9}</item>
 
 		<!-- Match Incoming Caller ID. Matching Rule 10 -->
-		<item name="account.{$row.line_number}.ring.match.10.callerId"/>
+		<item name="account.{$row.line_number}.ring.match.10.callerId">{$grandstream_distinctive_ringtone_name_10}</item>
 
 		<!-- Distinctive Ring Tone -->
 		<item name="account.{$row.line_number}.ring.match.10.ringtone">{$grandstream_distinctive_ringtone_10}</item>
@@ -669,7 +669,7 @@
 		<!-- #Enable Local Call Features. Default is Yes -->
 		<!-- #Mandatory -->
 		<!-- No, Yes -->
-		<item name="account.{$row.line_number}.featureCodes.callFeatures">Yes</item>
+		<item name="account.{$row.line_number}.featureCodes.callFeatures">No</item>
 
 		<!-- DND Call Feature On -->
 		<item name="account.{$row.line_number}.featureCodes.dndOn">*78</item>
@@ -907,7 +907,7 @@
 
 		<!-- # Enable Manual VLAN Configuration. Yes or No. -->
 		<!-- # Mandatory -->
-		<item name="network.port.eth.1.vlan.enable">{if isset($grandstream_lan_port_vlan)}Yes{else}No{/if}</item>
+		<item name="network.port.eth.1.vlan.enable">{if $grandstream_lan_port_vlan == '0'}No{else}Yes{/if}</item>
 
 		<!-- # Layer 2 QoS. 802.1Q/VLAN Tag (VLAN classification for RTP). Default is 0 -->
 		<!-- Layer 2 QoS 802.1Q/VLAN Tag (Ethernet) -->
@@ -921,7 +921,7 @@
 		<!-- PC Port Mode -->
 		<!-- Enabled, Disabled, Mirrored -->
 		{if isset($grandstream_pc_mode)}
-		<item name="network.port.pc.mode">{if isset($grandstream_pc_mode)}{$grandstream_pc_mode}{/if}</item>
+		<item name="network.port.pc.mode">{if isset($grandstream_pc_mode)}{$grandstream_pc_mode}{else}Enabled{/if}</item>
 		{else}
 		<item name="network.port.pc.mode">{if isset($grandstream_pc_port_vlan)}Enabled{else}Disabled{/if}</item>
 		{/if}
@@ -2204,7 +2204,7 @@
 		<item name="sip.showError">Yes</item>
 
 		<!-- # Enable Missed Call Notification. Yes or No -->
-		<item name="features.history.missedCallNotification">Yes</item>
+		<item name="features.history.missedCallNotification">{$grandstream_missed_call_notification}</item>
 
 		<!-- # Enable Call Completion Service. Yes or No -->
 		<item name="call.dial.callComplete.enable"/>
diff --git a/resources/templates/provision/grandstream/gxp2140/{$mac}.xml b/resources/templates/provision/grandstream/gxp2140/{$mac}.xml
index a2f9063b13..b7d587a84e 100644
--- a/resources/templates/provision/grandstream/gxp2140/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2140/{$mac}.xml
@@ -33,12 +33,12 @@
 
 		<!-- SIP Server -->
 		{if isset($row.server_address_primary)}
-		<item name="account.{$row.line_number}.sip.server.1.address">{$row.server_address_primary}</item>
+		<item name="account.{$row.line_number}.sip.server.1.address">{$row.server_address_primary}:{$row.sip_port}</item>
 		{else}
-		<item name="account.{$row.line_number}.sip.server.1.address">{$row.server_address}</item>
+		<item name="account.{$row.line_number}.sip.server.1.address">{$row.server_address}:{$row.sip_port}</item>
 		{/if}
 		<!-- Secondary SIP Server -->
-		<item name="account.{$row.line_number}.sip.server.2.address">{$row.server_address_secondary}</item>
+		<item name="account.{$row.line_number}.sip.server.2.address">{$row.server_address_secondary}:{$row.sip_port}</item>
 
 		<!-- Outbound Proxy -->
 		{if $row.sip_transport != 'dns srv' && isset($row.outbound_proxy_primary)}
@@ -56,9 +56,9 @@
 
 		<!-- BLF Server -->
 		{if isset($row.server_address_primary)}
-		<item name="account.{$row.line_number}.sip.blf.server">{$row.server_address_primary}</item>
+		<item name="account.{$row.line_number}.sip.blf.server">{$row.server_address_primary}:{$row.sip_port}</item>
 		{else}
-		<item name="account.{$row.line_number}.sip.blf.server">{$row.server_address}</item>
+		<item name="account.{$row.line_number}.sip.blf.server">{$row.server_address}:{$row.sip_port}</item>
 		{/if}
 
 		<!-- SIP User ID -->
@@ -576,61 +576,61 @@
 		<item name="account.{$row.line_number}.ring.ringtone">5</item>
 
 		<!-- Matching Incoming Caller ID. Matching Rule 1 -->
-		<item name="account.{$row.line_number}.ring.match.1.callerId"/>
+		<item name="account.{$row.line_number}.ring.match.1.callerId">{$grandstream_distinctive_ringtone_name_1}</item>
 
 		<!-- Distinctive Ring Tone -->
 		<item name="account.{$row.line_number}.ring.match.1.ringtone">{$grandstream_distinctive_ringtone_1}</item>
 
 		<!-- Match Incoming Caller ID. Matching Rule 2 -->
-		<item name="account.{$row.line_number}.ring.match.2.callerId"/>
+		<item name="account.{$row.line_number}.ring.match.2.callerId">{$grandstream_distinctive_ringtone_name_2}</item>
 
 		<!-- Distinctive Ring Tone -->
 		<item name="account.{$row.line_number}.ring.match.2.ringtone">{$grandstream_distinctive_ringtone_2}</item>
 
 		<!-- Match Incoming Caller ID. Matching Rule 3 -->
-		<item name="account.{$row.line_number}.ring.match.3.callerId"/>
+		<item name="account.{$row.line_number}.ring.match.3.callerId">{$grandstream_distinctive_ringtone_name_3}</item>
 
 		<!-- Distinctive Ring Tone -->
 		<item name="account.{$row.line_number}.ring.match.3.ringtone">{$grandstream_distinctive_ringtone_3}</item>
 
 		<!-- Match Incoming Caller ID. Matching Rule 4 -->
-		<item name="account.{$row.line_number}.ring.match.4.callerId"/>
+		<item name="account.{$row.line_number}.ring.match.4.callerId">{$grandstream_distinctive_ringtone_name_4}</item>
 
 		<!-- Distinctive Ring Tone -->
 		<item name="account.{$row.line_number}.ring.match.4.ringtone">{$grandstream_distinctive_ringtone_4}</item>
 
 		<!-- Match Incoming Caller ID. Matching Rule 5 -->
-		<item name="account.{$row.line_number}.ring.match.5.callerId"/>
+		<item name="account.{$row.line_number}.ring.match.5.callerId">{$grandstream_distinctive_ringtone_name_5}</item>
 
 		<!-- Distinctive Ring Tone -->
 		<item name="account.{$row.line_number}.ring.match.5.ringtone">{$grandstream_distinctive_ringtone_5}</item>
 
 		<!-- Match Incoming Caller ID. Matching Rule 6 -->
-		<item name="account.{$row.line_number}.ring.match.6.callerId"/>
+		<item name="account.{$row.line_number}.ring.match.6.callerId">{$grandstream_distinctive_ringtone_name_6}</item>
 
 		<!-- Distinctive Ring Tone -->
 		<item name="account.{$row.line_number}.ring.match.6.ringtone">{$grandstream_distinctive_ringtone_6}</item>
 
 		<!-- Match Incoming Caller ID. Matching Rule 7 -->
-		<item name="account.{$row.line_number}.ring.match.7.callerId"/>
+		<item name="account.{$row.line_number}.ring.match.7.callerId">{$grandstream_distinctive_ringtone_name_7}</item>
 
 		<!-- Distinctive Ring Tone -->
 		<item name="account.{$row.line_number}.ring.match.7.ringtone">{$grandstream_distinctive_ringtone_7}</item>
 
 		<!-- Match Incoming Caller ID. Matching Rule 8 -->
-		<item name="account.{$row.line_number}.ring.match.8.callerId"/>
+		<item name="account.{$row.line_number}.ring.match.8.callerId">{$grandstream_distinctive_ringtone_name_8}</item>
 
 		<!-- Distinctive Ring Tone -->
 		<item name="account.{$row.line_number}.ring.match.8.ringtone">{$grandstream_distinctive_ringtone_8}</item>
 
 		<!-- Match Incoming Caller ID. Matching Rule 9 -->
-		<item name="account.{$row.line_number}.ring.match.9.callerId"/>
+		<item name="account.{$row.line_number}.ring.match.9.callerId">{$grandstream_distinctive_ringtone_name_9}</item>
 
 		<!-- Distinctive Ring Tone -->
 		<item name="account.{$row.line_number}.ring.match.9.ringtone">{$grandstream_distinctive_ringtone_9}</item>
 
 		<!-- Match Incoming Caller ID. Matching Rule 10 -->
-		<item name="account.{$row.line_number}.ring.match.10.callerId"/>
+		<item name="account.{$row.line_number}.ring.match.10.callerId">{$grandstream_distinctive_ringtone_name_10}</item>
 
 		<!-- Distinctive Ring Tone -->
 		<item name="account.{$row.line_number}.ring.match.10.ringtone">{$grandstream_distinctive_ringtone_10}</item>
@@ -669,7 +669,7 @@
 		<!-- #Enable Local Call Features. Default is Yes -->
 		<!-- #Mandatory -->
 		<!-- No, Yes -->
-		<item name="account.{$row.line_number}.featureCodes.callFeatures">Yes</item>
+		<item name="account.{$row.line_number}.featureCodes.callFeatures">No</item>
 
 		<!-- DND Call Feature On -->
 		<item name="account.{$row.line_number}.featureCodes.dndOn">*78</item>
@@ -907,7 +907,7 @@
 
 		<!-- # Enable Manual VLAN Configuration. Yes or No. -->
 		<!-- # Mandatory -->
-		<item name="network.port.eth.1.vlan.enable">{if isset($grandstream_lan_port_vlan)}Yes{else}No{/if}</item>
+		<item name="network.port.eth.1.vlan.enable">{if $grandstream_lan_port_vlan == '0'}No{else}Yes{/if}</item>
 
 
 		<!-- # Layer 2 QoS. 802.1Q/VLAN Tag (VLAN classification for RTP). Default is 0 -->
@@ -922,7 +922,7 @@
 		<!-- PC Port Mode -->
 		<!-- Enabled, Disabled, Mirrored -->
 		{if isset($grandstream_pc_mode)}
-		<item name="network.port.pc.mode">{if isset($grandstream_pc_mode)}{$grandstream_pc_mode}{/if}</item>
+		<item name="network.port.pc.mode">{if isset($grandstream_pc_mode)}{$grandstream_pc_mode}{else}Enabled{/if}</item>
 		{else}
 		<item name="network.port.pc.mode">{if isset($grandstream_pc_port_vlan)}Enabled{else}Disabled{/if}</item>
 		{/if}
@@ -2205,7 +2205,7 @@
 		<item name="sip.showError">Yes</item>
 
 		<!-- # Enable Missed Call Notification. Yes or No -->
-		<item name="features.history.missedCallNotification">Yes</item>
+		<item name="features.history.missedCallNotification">{$grandstream_missed_call_notification}</item>
 
 		<!-- # Enable Call Completion Service. Yes or No -->
 		<item name="call.dial.callComplete.enable"/>
@@ -3310,4 +3310,4 @@
 {/foreach}
 
 	</config>
-</gs_provision>
+</gs_provision>
\ No newline at end of file
diff --git a/resources/templates/provision/grandstream/gxp2160/{$mac}.xml b/resources/templates/provision/grandstream/gxp2160/{$mac}.xml
index 052b3f4a87..5f2b5d76eb 100644
--- a/resources/templates/provision/grandstream/gxp2160/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2160/{$mac}.xml
@@ -33,12 +33,12 @@
 
 		<!-- SIP Server -->
 		{if isset($row.server_address_primary)}
-		<item name="account.{$row.line_number}.sip.server.1.address">{$row.server_address_primary}</item>
+		<item name="account.{$row.line_number}.sip.server.1.address">{$row.server_address_primary}:{$row.sip_port}</item>
 		{else}
-		<item name="account.{$row.line_number}.sip.server.1.address">{$row.server_address}</item>
+		<item name="account.{$row.line_number}.sip.server.1.address">{$row.server_address}:{$row.sip_port}</item>
 		{/if}
 		<!-- Secondary SIP Server -->
-		<item name="account.{$row.line_number}.sip.server.2.address">{$row.server_address_secondary}</item>
+		<item name="account.{$row.line_number}.sip.server.2.address">{$row.server_address_secondary}:{$row.sip_port}</item>
 
 		<!-- Outbound Proxy -->
 		{if $row.sip_transport != 'dns srv' && isset($row.outbound_proxy_primary)}
@@ -56,9 +56,9 @@
 
 		<!-- BLF Server -->
 		{if isset($row.server_address_primary)}
-		<item name="account.{$row.line_number}.sip.blf.server">{$row.server_address_primary}</item>
+		<item name="account.{$row.line_number}.sip.blf.server">{$row.server_address_primary}:{$row.sip_port}</item>
 		{else}
-		<item name="account.{$row.line_number}.sip.blf.server">{$row.server_address}</item>
+		<item name="account.{$row.line_number}.sip.blf.server">{$row.server_address}:{$row.sip_port}</item>
 		{/if}
 
 		<!-- SIP User ID -->
@@ -576,61 +576,61 @@
 		<item name="account.{$row.line_number}.ring.ringtone">5</item>
 
 		<!-- Matching Incoming Caller ID. Matching Rule 1 -->
-		<item name="account.{$row.line_number}.ring.match.1.callerId"/>
+		<item name="account.{$row.line_number}.ring.match.1.callerId">{$grandstream_distinctive_ringtone_name_1}</item>
 
 		<!-- Distinctive Ring Tone -->
 		<item name="account.{$row.line_number}.ring.match.1.ringtone">{$grandstream_distinctive_ringtone_1}</item>
 
 		<!-- Match Incoming Caller ID. Matching Rule 2 -->
-		<item name="account.{$row.line_number}.ring.match.2.callerId"/>
+		<item name="account.{$row.line_number}.ring.match.2.callerId">{$grandstream_distinctive_ringtone_name_2}</item>
 
 		<!-- Distinctive Ring Tone -->
 		<item name="account.{$row.line_number}.ring.match.2.ringtone">{$grandstream_distinctive_ringtone_2}</item>
 
 		<!-- Match Incoming Caller ID. Matching Rule 3 -->
-		<item name="account.{$row.line_number}.ring.match.3.callerId"/>
+		<item name="account.{$row.line_number}.ring.match.3.callerId">{$grandstream_distinctive_ringtone_name_3}</item>
 
 		<!-- Distinctive Ring Tone -->
 		<item name="account.{$row.line_number}.ring.match.3.ringtone">{$grandstream_distinctive_ringtone_3}</item>
 
 		<!-- Match Incoming Caller ID. Matching Rule 4 -->
-		<item name="account.{$row.line_number}.ring.match.4.callerId"/>
+		<item name="account.{$row.line_number}.ring.match.4.callerId">{$grandstream_distinctive_ringtone_name_4}</item>
 
 		<!-- Distinctive Ring Tone -->
 		<item name="account.{$row.line_number}.ring.match.4.ringtone">{$grandstream_distinctive_ringtone_4}</item>
 
 		<!-- Match Incoming Caller ID. Matching Rule 5 -->
-		<item name="account.{$row.line_number}.ring.match.5.callerId"/>
+		<item name="account.{$row.line_number}.ring.match.5.callerId">{$grandstream_distinctive_ringtone_name_5}</item>
 
 		<!-- Distinctive Ring Tone -->
 		<item name="account.{$row.line_number}.ring.match.5.ringtone">{$grandstream_distinctive_ringtone_5}</item>
 
 		<!-- Match Incoming Caller ID. Matching Rule 6 -->
-		<item name="account.{$row.line_number}.ring.match.6.callerId"/>
+		<item name="account.{$row.line_number}.ring.match.6.callerId">{$grandstream_distinctive_ringtone_name_6}</item>
 
 		<!-- Distinctive Ring Tone -->
 		<item name="account.{$row.line_number}.ring.match.6.ringtone">{$grandstream_distinctive_ringtone_6}</item>
 
 		<!-- Match Incoming Caller ID. Matching Rule 7 -->
-		<item name="account.{$row.line_number}.ring.match.7.callerId"/>
+		<item name="account.{$row.line_number}.ring.match.7.callerId">{$grandstream_distinctive_ringtone_name_7}</item>
 
 		<!-- Distinctive Ring Tone -->
 		<item name="account.{$row.line_number}.ring.match.7.ringtone">{$grandstream_distinctive_ringtone_7}</item>
 
 		<!-- Match Incoming Caller ID. Matching Rule 8 -->
-		<item name="account.{$row.line_number}.ring.match.8.callerId"/>
+		<item name="account.{$row.line_number}.ring.match.8.callerId">{$grandstream_distinctive_ringtone_name_8}</item>
 
 		<!-- Distinctive Ring Tone -->
 		<item name="account.{$row.line_number}.ring.match.8.ringtone">{$grandstream_distinctive_ringtone_8}</item>
 
 		<!-- Match Incoming Caller ID. Matching Rule 9 -->
-		<item name="account.{$row.line_number}.ring.match.9.callerId"/>
+		<item name="account.{$row.line_number}.ring.match.9.callerId">{$grandstream_distinctive_ringtone_name_9}</item>
 
 		<!-- Distinctive Ring Tone -->
 		<item name="account.{$row.line_number}.ring.match.9.ringtone">{$grandstream_distinctive_ringtone_9}</item>
 
 		<!-- Match Incoming Caller ID. Matching Rule 10 -->
-		<item name="account.{$row.line_number}.ring.match.10.callerId"/>
+		<item name="account.{$row.line_number}.ring.match.10.callerId">{$grandstream_distinctive_ringtone_name_10}</item>
 
 		<!-- Distinctive Ring Tone -->
 		<item name="account.{$row.line_number}.ring.match.10.ringtone">{$grandstream_distinctive_ringtone_10}</item>
@@ -669,7 +669,7 @@
 		<!-- #Enable Local Call Features. Default is Yes -->
 		<!-- #Mandatory -->
 		<!-- No, Yes -->
-		<item name="account.{$row.line_number}.featureCodes.callFeatures">Yes</item>
+		<item name="account.{$row.line_number}.featureCodes.callFeatures">No</item>
 
 		<!-- DND Call Feature On -->
 		<item name="account.{$row.line_number}.featureCodes.dndOn">*78</item>
@@ -907,7 +907,7 @@
 
 		<!-- # Enable Manual VLAN Configuration. Yes or No. -->
 		<!-- # Mandatory -->
-		<item name="network.port.eth.1.vlan.enable">{if isset($grandstream_lan_port_vlan)}Yes{else}No{/if}</item>
+		<item name="network.port.eth.1.vlan.enable">{if $grandstream_lan_port_vlan == '0'}No{else}Yes{/if}</item>
 
 
 		<!-- # Layer 2 QoS. 802.1Q/VLAN Tag (VLAN classification for RTP). Default is 0 -->
@@ -922,7 +922,7 @@
 		<!-- PC Port Mode -->
 		<!-- Enabled, Disabled, Mirrored -->
 		{if isset($grandstream_pc_mode)}
-		<item name="network.port.pc.mode">{if isset($grandstream_pc_mode)}{$grandstream_pc_mode}{/if}</item>
+		<item name="network.port.pc.mode">{if isset($grandstream_pc_mode)}{$grandstream_pc_mode}{else}Enabled{/if}</item>
 		{else}
 		<item name="network.port.pc.mode">{if isset($grandstream_pc_port_vlan)}Enabled{else}Disabled{/if}</item>
 		{/if}
@@ -2205,7 +2205,7 @@
 		<item name="sip.showError">Yes</item>
 
 		<!-- # Enable Missed Call Notification. Yes or No -->
-		<item name="features.history.missedCallNotification">Yes</item>
+		<item name="features.history.missedCallNotification">{$grandstream_missed_call_notification}</item>
 
 		<!-- # Enable Call Completion Service. Yes or No -->
 		<item name="call.dial.callComplete.enable"/>
@@ -3310,4 +3310,4 @@
 {/foreach}
 
 	</config>
-</gs_provision>
+</gs_provision>
\ No newline at end of file
diff --git a/resources/templates/provision/grandstream/gxp2170/{$mac}.xml b/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
index 711b03a229..b0ae9fc40b 100644
--- a/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
+++ b/resources/templates/provision/grandstream/gxp2170/{$mac}.xml
@@ -33,12 +33,12 @@
 
 		<!-- SIP Server -->
 		{if isset($row.server_address_primary)}
-		<item name="account.{$row.line_number}.sip.server.1.address">{$row.server_address_primary}</item>
+		<item name="account.{$row.line_number}.sip.server.1.address">{$row.server_address_primary}:{$row.sip_port}</item>
 		{else}
-		<item name="account.{$row.line_number}.sip.server.1.address">{$row.server_address}</item>
+		<item name="account.{$row.line_number}.sip.server.1.address">{$row.server_address}:{$row.sip_port}</item>
 		{/if}
 		<!-- Secondary SIP Server -->
-		<item name="account.{$row.line_number}.sip.server.2.address">{$row.server_address_secondary}</item>
+		<item name="account.{$row.line_number}.sip.server.2.address">{$row.server_address_secondary}:{$row.sip_port}</item>
 
 		<!-- Outbound Proxy -->
 		{if $row.sip_transport != 'dns srv' && isset($row.outbound_proxy_primary)}
@@ -56,9 +56,9 @@
 
 		<!-- BLF Server -->
 		{if isset($row.server_address_primary)}
-		<item name="account.{$row.line_number}.sip.blf.server">{$row.server_address_primary}</item>
+		<item name="account.{$row.line_number}.sip.blf.server">{$row.server_address_primary}:{$row.sip_port}</item>
 		{else}
-		<item name="account.{$row.line_number}.sip.blf.server">{$row.server_address}</item>
+		<item name="account.{$row.line_number}.sip.blf.server">{$row.server_address}:{$row.sip_port}</item>
 		{/if}
 
 		<!-- SIP User ID -->
@@ -576,61 +576,61 @@
 		<item name="account.{$row.line_number}.ring.ringtone">5</item>
 
 		<!-- Matching Incoming Caller ID. Matching Rule 1 -->
-		<item name="account.{$row.line_number}.ring.match.1.callerId"/>
+		<item name="account.{$row.line_number}.ring.match.1.callerId">{$grandstream_distinctive_ringtone_name_1}</item>
 
 		<!-- Distinctive Ring Tone -->
 		<item name="account.{$row.line_number}.ring.match.1.ringtone">{$grandstream_distinctive_ringtone_1}</item>
 
 		<!-- Match Incoming Caller ID. Matching Rule 2 -->
-		<item name="account.{$row.line_number}.ring.match.2.callerId"/>
+		<item name="account.{$row.line_number}.ring.match.2.callerId">{$grandstream_distinctive_ringtone_name_2}</item>
 
 		<!-- Distinctive Ring Tone -->
 		<item name="account.{$row.line_number}.ring.match.2.ringtone">{$grandstream_distinctive_ringtone_2}</item>
 
 		<!-- Match Incoming Caller ID. Matching Rule 3 -->
-		<item name="account.{$row.line_number}.ring.match.3.callerId"/>
+		<item name="account.{$row.line_number}.ring.match.3.callerId">{$grandstream_distinctive_ringtone_name_3}</item>
 
 		<!-- Distinctive Ring Tone -->
 		<item name="account.{$row.line_number}.ring.match.3.ringtone">{$grandstream_distinctive_ringtone_3}</item>
 
 		<!-- Match Incoming Caller ID. Matching Rule 4 -->
-		<item name="account.{$row.line_number}.ring.match.4.callerId"/>
+		<item name="account.{$row.line_number}.ring.match.4.callerId">{$grandstream_distinctive_ringtone_name_4}</item>
 
 		<!-- Distinctive Ring Tone -->
 		<item name="account.{$row.line_number}.ring.match.4.ringtone">{$grandstream_distinctive_ringtone_4}</item>
 
 		<!-- Match Incoming Caller ID. Matching Rule 5 -->
-		<item name="account.{$row.line_number}.ring.match.5.callerId"/>
+		<item name="account.{$row.line_number}.ring.match.5.callerId">{$grandstream_distinctive_ringtone_name_5}</item>
 
 		<!-- Distinctive Ring Tone -->
 		<item name="account.{$row.line_number}.ring.match.5.ringtone">{$grandstream_distinctive_ringtone_5}</item>
 
 		<!-- Match Incoming Caller ID. Matching Rule 6 -->
-		<item name="account.{$row.line_number}.ring.match.6.callerId"/>
+		<item name="account.{$row.line_number}.ring.match.6.callerId">{$grandstream_distinctive_ringtone_name_6}</item>
 
 		<!-- Distinctive Ring Tone -->
 		<item name="account.{$row.line_number}.ring.match.6.ringtone">{$grandstream_distinctive_ringtone_6}</item>
 
 		<!-- Match Incoming Caller ID. Matching Rule 7 -->
-		<item name="account.{$row.line_number}.ring.match.7.callerId"/>
+		<item name="account.{$row.line_number}.ring.match.7.callerId">{$grandstream_distinctive_ringtone_name_7}</item>
 
 		<!-- Distinctive Ring Tone -->
 		<item name="account.{$row.line_number}.ring.match.7.ringtone">{$grandstream_distinctive_ringtone_7}</item>
 
 		<!-- Match Incoming Caller ID. Matching Rule 8 -->
-		<item name="account.{$row.line_number}.ring.match.8.callerId"/>
+		<item name="account.{$row.line_number}.ring.match.8.callerId">{$grandstream_distinctive_ringtone_name_8}</item>
 
 		<!-- Distinctive Ring Tone -->
 		<item name="account.{$row.line_number}.ring.match.8.ringtone">{$grandstream_distinctive_ringtone_8}</item>
 
 		<!-- Match Incoming Caller ID. Matching Rule 9 -->
-		<item name="account.{$row.line_number}.ring.match.9.callerId"/>
+		<item name="account.{$row.line_number}.ring.match.9.callerId">{$grandstream_distinctive_ringtone_name_9}</item>
 
 		<!-- Distinctive Ring Tone -->
 		<item name="account.{$row.line_number}.ring.match.9.ringtone">{$grandstream_distinctive_ringtone_9}</item>
 
 		<!-- Match Incoming Caller ID. Matching Rule 10 -->
-		<item name="account.{$row.line_number}.ring.match.10.callerId"/>
+		<item name="account.{$row.line_number}.ring.match.10.callerId">{$grandstream_distinctive_ringtone_name_10}</item>
 
 		<!-- Distinctive Ring Tone -->
 		<item name="account.{$row.line_number}.ring.match.10.ringtone">{$grandstream_distinctive_ringtone_10}</item>
@@ -669,7 +669,7 @@
 		<!-- #Enable Local Call Features. Default is Yes -->
 		<!-- #Mandatory -->
 		<!-- No, Yes -->
-		<item name="account.{$row.line_number}.featureCodes.callFeatures">Yes</item>
+		<item name="account.{$row.line_number}.featureCodes.callFeatures">No</item>
 
 		<!-- DND Call Feature On -->
 		<item name="account.{$row.line_number}.featureCodes.dndOn">*78</item>
@@ -907,7 +907,7 @@
 
 		<!-- # Enable Manual VLAN Configuration. Yes or No. -->
 		<!-- # Mandatory -->
-		<item name="network.port.eth.1.vlan.enable">{if isset($grandstream_lan_port_vlan)}Yes{else}No{/if}</item>
+		<item name="network.port.eth.1.vlan.enable">{if $grandstream_lan_port_vlan == '0'}No{else}Yes{/if}</item>
 
 
 		<!-- # Layer 2 QoS. 802.1Q/VLAN Tag (VLAN classification for RTP). Default is 0 -->
@@ -922,7 +922,7 @@
 		<!-- PC Port Mode -->
 		<!-- Enabled, Disabled, Mirrored -->
 		{if isset($grandstream_pc_mode)}
-		<item name="network.port.pc.mode">{if isset($grandstream_pc_mode)}{$grandstream_pc_mode}{/if}</item>
+		<item name="network.port.pc.mode">{if isset($grandstream_pc_mode)}{$grandstream_pc_mode}{else}Enabled{/if}</item>
 		{else}
 		<item name="network.port.pc.mode">{if isset($grandstream_pc_port_vlan)}Enabled{else}Disabled{/if}</item>
 		{/if}
@@ -2205,7 +2205,7 @@
 		<item name="sip.showError">Yes</item>
 
 		<!-- # Enable Missed Call Notification. Yes or No -->
-		<item name="features.history.missedCallNotification">Yes</item>
+		<item name="features.history.missedCallNotification">{$grandstream_missed_call_notification}</item>
 
 		<!-- # Enable Call Completion Service. Yes or No -->
 		<item name="call.dial.callComplete.enable"/>