diff --git a/app/yealink/app_config.php b/app/yealink/app_config.php
index 3abd0d7140..de5e85a0a6 100644
--- a/app/yealink/app_config.php
+++ b/app/yealink/app_config.php
@@ -567,6 +567,14 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Enable phone to query the contact names from the remote phonebook when receiving incoming calls. 0-Disabled (default), 1-Enabled;";
 		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "1a703585-bee8-4b77-8e5b-7f1fb29958ff";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_local_directory_enable";
+		$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'] = "Enable the Local Directory.";
+		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "765e18d9-9440-42be-a858-2c0ef90ee50f";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "yealink_ring_text_1";
diff --git a/resources/templates/provision/yealink/t41s/y000000000068.cfg b/resources/templates/provision/yealink/t41s/y000000000068.cfg
index d25710239b..c67ee1c820 100644
--- a/resources/templates/provision/yealink/t41s/y000000000068.cfg
+++ b/resources/templates/provision/yealink/t41s/y000000000068.cfg
@@ -806,7 +806,11 @@ static.auto_provision.local_contact.backup.enable=
 ##                          Contact Other                                            ##
 #######################################################################################
 directory.search_type=
+{if isset($yealink_local_directory_enable)}
+directory_setting.local_directory.enable = {$yealink_local_directory_enable}
+{else}
 directory_setting.local_directory.enable =
+{/if}
 directory_setting.local_directory.priority =
 
 
diff --git a/resources/templates/provision/yealink/t42s/y000000000067.cfg b/resources/templates/provision/yealink/t42s/y000000000067.cfg
index d708d44d73..d91c694443 100644
--- a/resources/templates/provision/yealink/t42s/y000000000067.cfg
+++ b/resources/templates/provision/yealink/t42s/y000000000067.cfg
@@ -806,7 +806,11 @@ static.auto_provision.local_contact.backup.enable=
 ##                          Contact Other                                            ##
 #######################################################################################
 directory.search_type=
+{if isset($yealink_local_directory_enable)}
+directory_setting.local_directory.enable = {$yealink_local_directory_enable}
+{else}
 directory_setting.local_directory.enable =
+{/if}
 directory_setting.local_directory.priority =
 
 
diff --git a/resources/templates/provision/yealink/t43u/y000000000107.cfg b/resources/templates/provision/yealink/t43u/y000000000107.cfg
index 6806c79eb2..f26dd65cfc 100644
--- a/resources/templates/provision/yealink/t43u/y000000000107.cfg
+++ b/resources/templates/provision/yealink/t43u/y000000000107.cfg
@@ -921,7 +921,11 @@ static.auto_provision.local_contact.backup.enable=
 ##                          Contact Other                                            ##
 #######################################################################################
 directory.search_type=
+{if isset($yealink_local_directory_enable)}
+directory_setting.local_directory.enable = {$yealink_local_directory_enable}
+{else}
 directory_setting.local_directory.enable =
+{/if}
 directory_setting.local_directory.priority =
 
 ##V83 Add
diff --git a/resources/templates/provision/yealink/t46s/y000000000066.cfg b/resources/templates/provision/yealink/t46s/y000000000066.cfg
index d1652f69b1..d8f09da91b 100644
--- a/resources/templates/provision/yealink/t46s/y000000000066.cfg
+++ b/resources/templates/provision/yealink/t46s/y000000000066.cfg
@@ -806,7 +806,11 @@ static.auto_provision.local_contact.backup.enable=
 ##                          Contact Other                                            ##
 #######################################################################################
 directory.search_type=
+{if isset($yealink_local_directory_enable)}
+directory_setting.local_directory.enable = {$yealink_local_directory_enable}
+{else}
 directory_setting.local_directory.enable =
+{/if}
 directory_setting.local_directory.priority =
 
 
diff --git a/resources/templates/provision/yealink/t48s/y000000000065.cfg b/resources/templates/provision/yealink/t48s/y000000000065.cfg
index 30a55e4775..461ae1eb5c 100644
--- a/resources/templates/provision/yealink/t48s/y000000000065.cfg
+++ b/resources/templates/provision/yealink/t48s/y000000000065.cfg
@@ -847,7 +847,11 @@ static.auto_provision.local_contact.backup.enable=
 ##                          Contact Other                                            ##
 #######################################################################################
 directory.search_type=
+{if isset($yealink_local_directory_enable)}
+directory_setting.local_directory.enable = {$yealink_local_directory_enable}
+{else}
 directory_setting.local_directory.enable =
+{/if}
 directory_setting.local_directory.priority =
 
 
diff --git a/resources/templates/provision/yealink/t4x/y000000000065.cfg b/resources/templates/provision/yealink/t4x/y000000000065.cfg
index 1f4bb7a0e5..7876a1e18a 100644
--- a/resources/templates/provision/yealink/t4x/y000000000065.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000065.cfg
@@ -846,7 +846,11 @@ static.auto_provision.local_contact.backup.enable=
 ##                          Contact Other                                            ##
 #######################################################################################
 directory.search_type=
+{if isset($yealink_local_directory_enable)}
+directory_setting.local_directory.enable = {$yealink_local_directory_enable}
+{else}
 directory_setting.local_directory.enable =
+{/if}
 directory_setting.local_directory.priority =
 
 
diff --git a/resources/templates/provision/yealink/t4x/y000000000066.cfg b/resources/templates/provision/yealink/t4x/y000000000066.cfg
index c6edb16fbc..52428bdc07 100644
--- a/resources/templates/provision/yealink/t4x/y000000000066.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000066.cfg
@@ -804,7 +804,11 @@ static.auto_provision.local_contact.backup.enable=
 ##                          Contact Other                                            ##
 #######################################################################################
 directory.search_type=
+{if isset($yealink_local_directory_enable)}
+directory_setting.local_directory.enable = {$yealink_local_directory_enable}
+{else}
 directory_setting.local_directory.enable =
+{/if}
 directory_setting.local_directory.priority =
 
 
diff --git a/resources/templates/provision/yealink/t4x/y000000000067.cfg b/resources/templates/provision/yealink/t4x/y000000000067.cfg
index 7a4b7da648..552c0a2f89 100644
--- a/resources/templates/provision/yealink/t4x/y000000000067.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000067.cfg
@@ -804,7 +804,11 @@ static.auto_provision.local_contact.backup.enable=
 ##                          Contact Other                                            ##
 #######################################################################################
 directory.search_type=
+{if isset($yealink_local_directory_enable)}
+directory_setting.local_directory.enable = {$yealink_local_directory_enable}
+{else}
 directory_setting.local_directory.enable =
+{/if}
 directory_setting.local_directory.priority =
 
 
diff --git a/resources/templates/provision/yealink/t4x/y000000000068.cfg b/resources/templates/provision/yealink/t4x/y000000000068.cfg
index 5a91a12b24..c4da933b88 100644
--- a/resources/templates/provision/yealink/t4x/y000000000068.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000068.cfg
@@ -805,7 +805,11 @@ static.auto_provision.local_contact.backup.enable=
 ##                          Contact Other                                            ##
 #######################################################################################
 directory.search_type=
+{if isset($yealink_local_directory_enable)}
+directory_setting.local_directory.enable = {$yealink_local_directory_enable}
+{else}
 directory_setting.local_directory.enable =
+{/if}
 directory_setting.local_directory.priority =
 
 
diff --git a/resources/templates/provision/yealink/t4x/y000000000107.cfg b/resources/templates/provision/yealink/t4x/y000000000107.cfg
index 1f4bb7a0e5..7876a1e18a 100644
--- a/resources/templates/provision/yealink/t4x/y000000000107.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000107.cfg
@@ -846,7 +846,11 @@ static.auto_provision.local_contact.backup.enable=
 ##                          Contact Other                                            ##
 #######################################################################################
 directory.search_type=
+{if isset($yealink_local_directory_enable)}
+directory_setting.local_directory.enable = {$yealink_local_directory_enable}
+{else}
 directory_setting.local_directory.enable =
+{/if}
 directory_setting.local_directory.priority =
 
 
diff --git a/resources/templates/provision/yealink/t4x/y000000000108.cfg b/resources/templates/provision/yealink/t4x/y000000000108.cfg
index a004af0251..2b4065fe81 100644
--- a/resources/templates/provision/yealink/t4x/y000000000108.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000108.cfg
@@ -804,7 +804,11 @@ static.auto_provision.local_contact.backup.enable=
 ##                          Contact Other                                            ##
 #######################################################################################
 directory.search_type=
+{if isset($yealink_local_directory_enable)}
+directory_setting.local_directory.enable = {$yealink_local_directory_enable}
+{else}
 directory_setting.local_directory.enable =
+{/if}
 directory_setting.local_directory.priority =
 
 
diff --git a/resources/templates/provision/yealink/t4x/y000000000109.cfg b/resources/templates/provision/yealink/t4x/y000000000109.cfg
index 1f4bb7a0e5..7876a1e18a 100644
--- a/resources/templates/provision/yealink/t4x/y000000000109.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000109.cfg
@@ -846,7 +846,11 @@ static.auto_provision.local_contact.backup.enable=
 ##                          Contact Other                                            ##
 #######################################################################################
 directory.search_type=
+{if isset($yealink_local_directory_enable)}
+directory_setting.local_directory.enable = {$yealink_local_directory_enable}
+{else}
 directory_setting.local_directory.enable =
+{/if}
 directory_setting.local_directory.priority =
 
 
diff --git a/resources/templates/provision/yealink/t4x/y000000000116.cfg b/resources/templates/provision/yealink/t4x/y000000000116.cfg
index 7a4b7da648..552c0a2f89 100644
--- a/resources/templates/provision/yealink/t4x/y000000000116.cfg
+++ b/resources/templates/provision/yealink/t4x/y000000000116.cfg
@@ -804,7 +804,11 @@ static.auto_provision.local_contact.backup.enable=
 ##                          Contact Other                                            ##
 #######################################################################################
 directory.search_type=
+{if isset($yealink_local_directory_enable)}
+directory_setting.local_directory.enable = {$yealink_local_directory_enable}
+{else}
 directory_setting.local_directory.enable =
+{/if}
 directory_setting.local_directory.priority =
 
 
diff --git a/resources/templates/provision/yealink/t52s/y000000000074.cfg b/resources/templates/provision/yealink/t52s/y000000000074.cfg
index f8bceed792..b824f29243 100644
--- a/resources/templates/provision/yealink/t52s/y000000000074.cfg
+++ b/resources/templates/provision/yealink/t52s/y000000000074.cfg
@@ -804,7 +804,11 @@ static.auto_provision.local_contact.backup.enable=
 ##                          Contact Other                                            ##
 #######################################################################################
 directory.search_type=
+{if isset($yealink_local_directory_enable)}
+directory_setting.local_directory.enable = {$yealink_local_directory_enable}
+{else}
 directory_setting.local_directory.enable =
+{/if}
 directory_setting.local_directory.priority =
 
 
diff --git a/resources/templates/provision/yealink/t53w/y000000000095.cfg b/resources/templates/provision/yealink/t53w/y000000000095.cfg
index a576003307..917aee63d1 100644
--- a/resources/templates/provision/yealink/t53w/y000000000095.cfg
+++ b/resources/templates/provision/yealink/t53w/y000000000095.cfg
@@ -902,7 +902,11 @@ static.auto_provision.local_contact.backup.enable=
 ##                          Contact Other                                            ##       
 #######################################################################################
 directory.search_type=
+{if isset($yealink_local_directory_enable)}
+directory_setting.local_directory.enable = {$yealink_local_directory_enable}
+{else}
 directory_setting.local_directory.enable =
+{/if}
 directory_setting.local_directory.priority =
 
 ##V83 Add
diff --git a/resources/templates/provision/yealink/t54s/y000000000070.cfg b/resources/templates/provision/yealink/t54s/y000000000070.cfg
index 56bd5517dc..bb603c9f56 100644
--- a/resources/templates/provision/yealink/t54s/y000000000070.cfg
+++ b/resources/templates/provision/yealink/t54s/y000000000070.cfg
@@ -803,7 +803,11 @@ static.auto_provision.local_contact.backup.enable=
 ##                          Contact Other                                            ##
 #######################################################################################
 directory.search_type=
+{if isset($yealink_local_directory_enable)}
+directory_setting.local_directory.enable = {$yealink_local_directory_enable}
+{else}
 directory_setting.local_directory.enable =
+{/if}
 directory_setting.local_directory.priority =
 
 
diff --git a/resources/templates/provision/yealink/t54w/y000000000096.cfg b/resources/templates/provision/yealink/t54w/y000000000096.cfg
index 4652f61806..3f85761db2 100644
--- a/resources/templates/provision/yealink/t54w/y000000000096.cfg
+++ b/resources/templates/provision/yealink/t54w/y000000000096.cfg
@@ -902,7 +902,11 @@ static.auto_provision.local_contact.backup.enable=
 ##                          Contact Other                                            ##       
 #######################################################################################
 directory.search_type=
+{if isset($yealink_local_directory_enable)}
+directory_setting.local_directory.enable = {$yealink_local_directory_enable}
+{else}
 directory_setting.local_directory.enable =
+{/if}
 directory_setting.local_directory.priority =
 
 ##V83 Add
diff --git a/resources/templates/provision/yealink/t57w/y000000000097.cfg b/resources/templates/provision/yealink/t57w/y000000000097.cfg
index ee5eb1e18c..0b551bfacf 100644
--- a/resources/templates/provision/yealink/t57w/y000000000097.cfg
+++ b/resources/templates/provision/yealink/t57w/y000000000097.cfg
@@ -902,7 +902,11 @@ static.auto_provision.local_contact.backup.enable=
 ##                          Contact Other                                            ##       
 #######################################################################################
 directory.search_type=
+{if isset($yealink_local_directory_enable)}
+directory_setting.local_directory.enable = {$yealink_local_directory_enable}
+{else}
 directory_setting.local_directory.enable =
+{/if}
 directory_setting.local_directory.priority =
 
 ##V83 Add
diff --git a/resources/templates/provision/yealink/t5x/y000000000070.cfg b/resources/templates/provision/yealink/t5x/y000000000070.cfg
index ffe89132e8..025dfc9d04 100644
--- a/resources/templates/provision/yealink/t5x/y000000000070.cfg
+++ b/resources/templates/provision/yealink/t5x/y000000000070.cfg
@@ -802,7 +802,11 @@ static.auto_provision.local_contact.backup.enable=
 ##                          Contact Other                                            ##
 #######################################################################################
 directory.search_type=
+{if isset($yealink_local_directory_enable)}
+directory_setting.local_directory.enable = {$yealink_local_directory_enable}
+{else}
 directory_setting.local_directory.enable =
+{/if}
 directory_setting.local_directory.priority =
 
 
diff --git a/resources/templates/provision/yealink/t5x/y000000000095.cfg b/resources/templates/provision/yealink/t5x/y000000000095.cfg
index 9edad20edf..79478f5268 100644
--- a/resources/templates/provision/yealink/t5x/y000000000095.cfg
+++ b/resources/templates/provision/yealink/t5x/y000000000095.cfg
@@ -896,7 +896,11 @@ static.auto_provision.local_contact.backup.enable=
 ##                          Contact Other                                            ##       
 #######################################################################################
 directory.search_type=
+{if isset($yealink_local_directory_enable)}
+directory_setting.local_directory.enable = {$yealink_local_directory_enable}
+{else}
 directory_setting.local_directory.enable =
+{/if}
 directory_setting.local_directory.priority =
 
 ##V83 Add
diff --git a/resources/templates/provision/yealink/t5x/y000000000096.cfg b/resources/templates/provision/yealink/t5x/y000000000096.cfg
index bb800ccb68..dfa58764a0 100644
--- a/resources/templates/provision/yealink/t5x/y000000000096.cfg
+++ b/resources/templates/provision/yealink/t5x/y000000000096.cfg
@@ -897,7 +897,11 @@ static.auto_provision.local_contact.backup.enable=
 ##                          Contact Other                                            ##       
 #######################################################################################
 directory.search_type=
+{if isset($yealink_local_directory_enable)}
+directory_setting.local_directory.enable = {$yealink_local_directory_enable}
+{else}
 directory_setting.local_directory.enable =
+{/if}
 directory_setting.local_directory.priority =
 
 ##V83 Add
diff --git a/resources/templates/provision/yealink/t5x/y000000000097.cfg b/resources/templates/provision/yealink/t5x/y000000000097.cfg
index 0fad04f289..b66d976ca1 100644
--- a/resources/templates/provision/yealink/t5x/y000000000097.cfg
+++ b/resources/templates/provision/yealink/t5x/y000000000097.cfg
@@ -897,7 +897,11 @@ static.auto_provision.local_contact.backup.enable=
 ##                          Contact Other                                            ##       
 #######################################################################################
 directory.search_type=
+{if isset($yealink_local_directory_enable)}
+directory_setting.local_directory.enable = {$yealink_local_directory_enable}
+{else}
 directory_setting.local_directory.enable =
+{/if}
 directory_setting.local_directory.priority =
 
 ##V83 Add