diff --git a/resources/templates/provision/yealink/t32g/y000000000032.cfg b/resources/templates/provision/yealink/t32g/y000000000032.cfg
index ed8456b163..58d96b0eca 100644
--- a/resources/templates/provision/yealink/t32g/y000000000032.cfg
+++ b/resources/templates/provision/yealink/t32g/y000000000032.cfg
@@ -1059,9 +1059,6 @@ features.pickup.blf_audio_enable =
 #0-Disabled (default), 1-Enabled;
 features.blf_and_callpark_idle_led_enable =
 
-#Enable or disable to enter the password when long pressing the OK key to reset to factory; 0-Disabled (default), 1-Enabled;
-#features.factory_pwd_enable = 1
-
 #Configure the time (in seconds) the phone automatically dial out the dialed digits. It ranges from 1 to 14, the default value is 4.
 phone_setting.inter_digit_time = 
 
diff --git a/resources/templates/provision/yealink/t32g/{$mac}.cfg b/resources/templates/provision/yealink/t32g/{$mac}.cfg
index 93ffca75b3..3993a30732 100644
--- a/resources/templates/provision/yealink/t32g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t32g/{$mac}.cfg
@@ -237,7 +237,7 @@ account.1.advanced.timer_t1 =
 account.1.advanced.timer_t2 = 
 account.1.advanced.timer_t4 = 
 
-#Assign a ringtone for account 1. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav,¡­¡­Ring8.wav.
+#Assign a ringtone for account 1. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav - ­Ring8.wav.
 #If you configure the custom ring tone (Family.wav) for the account, the value format is: Family.wav
 #If you configure the system ring tone (Ring2.wav) for the account, the value format is: Ring2.wav
 account.1.ringtone.ring_type = 
@@ -863,7 +863,7 @@ account.3.advanced.timer_t1 =
 account.3.advanced.timer_t2 = 
 account.3.advanced.timer_t4 = 
 
-#Assign a ringtone for account 3. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav,¡­¡­Ring8.wav.
+#Assign a ringtone for account 3. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav - ­Ring8.wav.
 #If you configure the custom ring tone (Family.wav) for the account, the value format is: Family.wav
 #If you configure the system ring tone (Ring2.wav) for the account, the value format is: Ring2.wav
 account.3.ringtone.ring_type =  
@@ -1176,7 +1176,7 @@ account.4.advanced.timer_t1 =
 account.4.advanced.timer_t2 = 
 account.4.advanced.timer_t4 = 
 
-#Assign a ringtone for account 4. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav,¡­¡­Ring8.wav.
+#Assign a ringtone for account 4. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav - Ring8.wav.
 #If you configure the custom ring tone (Family.wav) for the account, the value format is: Family.wav
 #If you configure the system ring tone (Ring2.wav) for the account, the value format is: Ring2.wav
 account.4.ringtone.ring_type = 
@@ -1490,7 +1490,7 @@ account.5.advanced.timer_t1 =
 account.5.advanced.timer_t2 = 
 account.5.advanced.timer_t4 = 
 
-#Assign a ringtone for account 5. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav,¡­¡­Ring8.wav.
+#Assign a ringtone for account 5. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav - Ring8.wav.
 #If you configure the custom ring tone (Family.wav) for the account, the value format is: Family.wav
 #If you configure the system ring tone (Ring2.wav) for the account, the value format is: Ring2.wav
 account.5.ringtone.ring_type = 
@@ -1801,7 +1801,7 @@ account.6.advanced.timer_t1 =
 account.6.advanced.timer_t2 = 
 account.6.advanced.timer_t4 = 
 
-#Assign a ringtone for account 6. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav,¡­¡­Ring8.wav.
+#Assign a ringtone for account 6. The system ring tones are: common.wav (default), Ring1.wav, Ring2.wav - ­Ring8.wav.
 #If you configure the custom ring tone (Family.wav) for the account, the value format is: Family.wav
 #If you configure the system ring tone (Ring2.wav) for the account, the value format is: Ring2.wav
 account.6.ringtone.ring_type = 
@@ -1924,9 +1924,11 @@ forward.international.enable =
 #Configure Line Key {$row.device_key_id}
 linekey.{$row.device_key_id}.line = {$row.device_key_line}
 linekey.{$row.device_key_id}.value = {$row.device_key_value}
+{if $row.device_key_category == "blf"}
 linekey.{$row.device_key_id}.pickup_value = {$row.device_key_extension}
+{/if}
 linekey.{$row.device_key_id}.type = {$row.device_key_type}
-linekey.{$row.device_key_id}.xml_phonebook = 
+#linekey.{$row.device_key_id}.xml_phonebook = 
 linekey.{$row.device_key_id}.label = {$row.device_key_label}
 
 {/if}
@@ -1956,10 +1958,12 @@ linekey.{$row.device_key_id}.label = {$row.device_key_label}
 memorykey.{$row.device_key_id}.type = {$row.device_key_type}
 memorykey.{$row.device_key_id}.line = {$row.device_key_line}
 memorykey.{$row.device_key_id}.value = {$row.device_key_value}
+{if $row.device_key_category == "blf"}
 memorykey.{$row.device_key_id}.pickup_value = {$row.device_key_extension}
+{/if}
 memorykey.{$row.device_key_id}.label = {$row.device_key_label}
-memorykey.{$row.device_key_id}.xml_phonebook = 
-memorykey.{$row.device_key_id}.sub_type = 
+#memorykey.{$row.device_key_id}.xml_phonebook = 
+#memorykey.{$row.device_key_id}.sub_type = 
 
 {/if}
 {/foreach}
@@ -2009,7 +2013,9 @@ programablekey.1.label =
 expansion_module.1.key.{$row.device_key_id}.type = {$row.device_key_type}
 expansion_module.1.key.{$row.device_key_id}.line = {$row.device_key_line}
 expansion_module.1.key.{$row.device_key_id}.value = {$row.device_key_value}
+{if $row.device_key_category == "blf"}
 expansion_module.1.key.{$row.device_key_id}.pickup_value = {$row.device_key_extension}
+{/if}
 expansion_module.1.key.{$row.device_key_id}.label = {$row.device_key_label}
 expansion_module.1.key.{$row.device_key_id}.xml_phonebook = 
 
@@ -2024,7 +2030,9 @@ expansion_module.1.key.{$row.device_key_id}.xml_phonebook =
 #expansion_module.2.key.1.type = {$key_type_1}
 #expansion_module.2.key.1.line = {$key_id_1}
 #expansion_module.2.key.1.value = {$key_value_1}
+{if $row.device_key_category == "blf"}
 #expansion_module.2.key.1.pickup_value = 
+{/if}
 #expansion_module.2.key.1.label = {$key_label_1}
 #expansion_module.2.key.1.xml_phonebook = 
 #expansion_module.2.key.1.type = 37