diff --git a/app/provision/resources/classes/provision.php b/app/provision/resources/classes/provision.php
index 3f5d5ef57e..4c06d4ca71 100644
--- a/app/provision/resources/classes/provision.php
+++ b/app/provision/resources/classes/provision.php
@@ -522,11 +522,12 @@ include "root.php";
 					if (strlen($device_uuid) > 0 and strlen($domain_uuid) > 0 and $_SESSION['provision']['directory_extensions']['boolean'] == "true") {
 						//get contacts from the database
 							$sql = "select directory_full_name, description ";
-							$sql .= "effective_caller_id_name, effective_caller_id_number ";
+							$sql .= "effective_caller_id_name, effective_caller_id_number, ";
+							$sql .= "number_alias, extension ";
 							$sql .= "from v_extensions ";
-							$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
+							$sql .= "where domain_uuid = '".$domain_uuid."' ";
 							$sql .= "and enabled = 'true' ";
-							$prep_statement = $db->prepare($sql);
+							$prep_statement = $this->db->prepare($sql);
 							if ($prep_statement) {
 								$prep_statement->execute();
 								$extensions = $prep_statement->fetchAll(PDO::FETCH_NAMED);
diff --git a/resources/templates/provision/yealink/t42g/local_extensions.xml b/resources/templates/provision/yealink/t42g/local_extensions.xml
new file mode 100644
index 0000000000..a28f60ccf4
--- /dev/null
+++ b/resources/templates/provision/yealink/t42g/local_extensions.xml
@@ -0,0 +1,18 @@
+<YealinkIPPhoneDirectory>
+{assign var=x value=1}
+{foreach $extensions as $row}
+	<DirectoryEntry>
+{if $row.directory_full_name != ""}
+		<Name>{$row.directory_full_name}</Name>
+{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+{/if}
+{if $row.number_alias != ""}
+		<Telephone>{$row.number_alias}</Telephone>
+{else}
+		<Telephone>{$row.extension}</Telephone>
+{/if}
+	</DirectoryEntry>
+{assign var=x value=$x+1}
+{/foreach}
+</YealinkIPPhoneDirectory>
\ No newline at end of file
diff --git a/resources/templates/provision/yealink/t42g/y000000000029.cfg b/resources/templates/provision/yealink/t42g/y000000000029.cfg
index 0054cc8ebb..cbb22068a8 100644
--- a/resources/templates/provision/yealink/t42g/y000000000029.cfg
+++ b/resources/templates/provision/yealink/t42g/y000000000029.cfg
@@ -548,8 +548,8 @@ dialplan.item.1 =
 #remote_phonebook.data.X.url =   
 #remote_phonebook.data.X.name =
 
-remote_phonebook.data.1.url =   
-remote_phonebook.data.1.name = 
+remote_phonebook.data.1.url =  {$yealink_remote_phone_book_url}
+remote_phonebook.data.1.name = Local Extensions
 
 #######################################################################################
 ##                                   Network Directory                               ##          
diff --git a/resources/templates/provision/yealink/t46g/local_extensions.xml b/resources/templates/provision/yealink/t46g/local_extensions.xml
new file mode 100644
index 0000000000..a28f60ccf4
--- /dev/null
+++ b/resources/templates/provision/yealink/t46g/local_extensions.xml
@@ -0,0 +1,18 @@
+<YealinkIPPhoneDirectory>
+{assign var=x value=1}
+{foreach $extensions as $row}
+	<DirectoryEntry>
+{if $row.directory_full_name != ""}
+		<Name>{$row.directory_full_name}</Name>
+{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+{/if}
+{if $row.number_alias != ""}
+		<Telephone>{$row.number_alias}</Telephone>
+{else}
+		<Telephone>{$row.extension}</Telephone>
+{/if}
+	</DirectoryEntry>
+{assign var=x value=$x+1}
+{/foreach}
+</YealinkIPPhoneDirectory>
\ No newline at end of file
diff --git a/resources/templates/provision/yealink/t46g/y000000000028.cfg b/resources/templates/provision/yealink/t46g/y000000000028.cfg
index 5fcc953691..cfcdcf1810 100644
--- a/resources/templates/provision/yealink/t46g/y000000000028.cfg
+++ b/resources/templates/provision/yealink/t46g/y000000000028.cfg
@@ -547,8 +547,8 @@ dialplan.item.1 =
 #remote_phonebook.data.X.url =   
 #remote_phonebook.data.X.name =
 
-remote_phonebook.data.1.url =   
-remote_phonebook.data.1.name = 
+remote_phonebook.data.1.url =  {$yealink_remote_phone_book_url}
+remote_phonebook.data.1.name = Local Extensions
 
 #######################################################################################
 ##                                   Network Directory                               ##          
diff --git a/resources/templates/provision/yealink/t48g/local_extensions.xml b/resources/templates/provision/yealink/t48g/local_extensions.xml
new file mode 100644
index 0000000000..a28f60ccf4
--- /dev/null
+++ b/resources/templates/provision/yealink/t48g/local_extensions.xml
@@ -0,0 +1,18 @@
+<YealinkIPPhoneDirectory>
+{assign var=x value=1}
+{foreach $extensions as $row}
+	<DirectoryEntry>
+{if $row.directory_full_name != ""}
+		<Name>{$row.directory_full_name}</Name>
+{else}
+		<Name>{$row.effective_caller_id_name}</Name>
+{/if}
+{if $row.number_alias != ""}
+		<Telephone>{$row.number_alias}</Telephone>
+{else}
+		<Telephone>{$row.extension}</Telephone>
+{/if}
+	</DirectoryEntry>
+{assign var=x value=$x+1}
+{/foreach}
+</YealinkIPPhoneDirectory>
\ No newline at end of file
diff --git a/resources/templates/provision/yealink/t48g/y000000000035.cfg b/resources/templates/provision/yealink/t48g/y000000000035.cfg
index 95889ff196..8a462df4b6 100644
--- a/resources/templates/provision/yealink/t48g/y000000000035.cfg
+++ b/resources/templates/provision/yealink/t48g/y000000000035.cfg
@@ -548,8 +548,8 @@ dialplan.item.1 =
 #remote_phonebook.data.X.url =   
 #remote_phonebook.data.X.name =
 
-remote_phonebook.data.1.url =   
-remote_phonebook.data.1.name = 
+remote_phonebook.data.1.url =  {$yealink_remote_phone_book_url}
+remote_phonebook.data.1.name = Local Extensions
 
 #######################################################################################
 ##                                   Network Directory                               ##