diff --git a/resources/templates/provision/cisco/7940/directory_enterprise.xml b/resources/templates/provision/cisco/7940/directory_enterprise.xml
index 5c977112b0..98ad005a9e 100644
--- a/resources/templates/provision/cisco/7940/directory_enterprise.xml
+++ b/resources/templates/provision/cisco/7940/directory_enterprise.xml
@@ -1,7 +1,6 @@
 <CiscoIPPhoneDirectory>
 	<Title>Enterprise</Title>
 	<Prompt>Please choose...</Prompt>
-{assign var=x value=1}
 {foreach $contacts as $row}{if $row.contact_category == "enterprise"}
 <DirectoryEntry>
 {if $row.contact_name_given != ""}
@@ -16,10 +15,6 @@
 {/if}
 </DirectoryEntry>
 {/if}
-{assign var=x value=$x+1}
 {/foreach}
 </CiscoIPPhoneDirectory>
 
-
-
-
diff --git a/resources/templates/provision/cisco/7940/directory_extensions.xml b/resources/templates/provision/cisco/7940/directory_extensions.xml
index 66d2fc2830..49addb09fc 100644
--- a/resources/templates/provision/cisco/7940/directory_extensions.xml
+++ b/resources/templates/provision/cisco/7940/directory_extensions.xml
@@ -1,24 +1,20 @@
 <CiscoIPPhoneDirectory>
 	<Title>Our Phones</Title>
 	<Prompt>Please choose...</Prompt>
-{assign var=x value=1}
-{foreach $extensions as $row}{
-	<DirectoryEntry>
-{if $row.directory_full_name != ""}
-		<Name>{$row.directory_full_name}</Name>
+{foreach $contacts as $row}{if $row.category == "extensions"}
+<DirectoryEntry>
+{if $row.contact_name_given != ""}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
 {else}
-		<Name>{$row.effective_caller_id_name}</Name>
+	<Name>{$row.contact_organization}</Name>
 {/if}
-{if $row.number_alias != ""}
-		<Telephone>{$row.number_alias}</Telephone>
+{if $row.phone_number != ""}
+	<Telephone>{$row.phone_number}</Telephone>
 {else}
-		<Telephone>{$row.extension}</Telephone>
+	<Telephone>{$row.phone_extension}</Telephone>
+{/if}
+</DirectoryEntry>
 {/if}
-	</DirectoryEntry>
-{assign var=x value=$x+1}
 {/foreach}
 </CiscoIPPhoneDirectory>
 
-
-
-
diff --git a/resources/templates/provision/cisco/7940/directory_personal.xml b/resources/templates/provision/cisco/7940/directory_personal.xml
index 08724998ae..66aecb4b30 100644
--- a/resources/templates/provision/cisco/7940/directory_personal.xml
+++ b/resources/templates/provision/cisco/7940/directory_personal.xml
@@ -1,8 +1,7 @@
 <CiscoIPPhoneDirectory>
 	<Title>Personal</Title>
 	<Prompt>Please choose...</Prompt>
-{assign var=x value=1}
-{foreach $user_contacts as $row}
+{foreach $contacts as $row}{if $row.category == "users"}
 <DirectoryEntry>
 {if $row.contact_name_given != ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
@@ -15,6 +14,6 @@
 	<Telephone>{$row.phone_extension}</Telephone>
 {/if}
 </DirectoryEntry>
-{assign var=x value=$x+1}
+{/if}
 {/foreach}
 </CiscoIPPhoneDirectory>
diff --git a/resources/templates/provision/cisco/7940/directory_speed_dial.xml b/resources/templates/provision/cisco/7940/directory_speed_dial.xml
index 16138ed111..86fe5e951b 100644
--- a/resources/templates/provision/cisco/7940/directory_speed_dial.xml
+++ b/resources/templates/provision/cisco/7940/directory_speed_dial.xml
@@ -1,7 +1,6 @@
 <CiscoIPPhoneDirectory>
 	<Title>Speed Dial</Title>
 	<Prompt>Please choose...</Prompt>
-{assign var=x value=1}
 {foreach $contacts as $row}{if $row.contact_category == "speed dial"}
 <DirectoryEntry>
 {if $row.contact_name_given != ""}
@@ -16,6 +15,5 @@
 {/if}
 </DirectoryEntry>
 {/if}
-{assign var=x value=$x+1}
 {/foreach}
 </CiscoIPPhoneDirectory>
diff --git a/resources/templates/provision/cisco/7960/directory_enterprise.xml b/resources/templates/provision/cisco/7960/directory_enterprise.xml
index 5c977112b0..98ad005a9e 100644
--- a/resources/templates/provision/cisco/7960/directory_enterprise.xml
+++ b/resources/templates/provision/cisco/7960/directory_enterprise.xml
@@ -1,7 +1,6 @@
 <CiscoIPPhoneDirectory>
 	<Title>Enterprise</Title>
 	<Prompt>Please choose...</Prompt>
-{assign var=x value=1}
 {foreach $contacts as $row}{if $row.contact_category == "enterprise"}
 <DirectoryEntry>
 {if $row.contact_name_given != ""}
@@ -16,10 +15,6 @@
 {/if}
 </DirectoryEntry>
 {/if}
-{assign var=x value=$x+1}
 {/foreach}
 </CiscoIPPhoneDirectory>
 
-
-
-
diff --git a/resources/templates/provision/cisco/7960/directory_extensions.xml b/resources/templates/provision/cisco/7960/directory_extensions.xml
index 66d2fc2830..49addb09fc 100644
--- a/resources/templates/provision/cisco/7960/directory_extensions.xml
+++ b/resources/templates/provision/cisco/7960/directory_extensions.xml
@@ -1,24 +1,20 @@
 <CiscoIPPhoneDirectory>
 	<Title>Our Phones</Title>
 	<Prompt>Please choose...</Prompt>
-{assign var=x value=1}
-{foreach $extensions as $row}{
-	<DirectoryEntry>
-{if $row.directory_full_name != ""}
-		<Name>{$row.directory_full_name}</Name>
+{foreach $contacts as $row}{if $row.category == "extensions"}
+<DirectoryEntry>
+{if $row.contact_name_given != ""}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
 {else}
-		<Name>{$row.effective_caller_id_name}</Name>
+	<Name>{$row.contact_organization}</Name>
 {/if}
-{if $row.number_alias != ""}
-		<Telephone>{$row.number_alias}</Telephone>
+{if $row.phone_number != ""}
+	<Telephone>{$row.phone_number}</Telephone>
 {else}
-		<Telephone>{$row.extension}</Telephone>
+	<Telephone>{$row.phone_extension}</Telephone>
+{/if}
+</DirectoryEntry>
 {/if}
-	</DirectoryEntry>
-{assign var=x value=$x+1}
 {/foreach}
 </CiscoIPPhoneDirectory>
 
-
-
-
diff --git a/resources/templates/provision/cisco/7960/directory_personal.xml b/resources/templates/provision/cisco/7960/directory_personal.xml
index 08724998ae..66aecb4b30 100644
--- a/resources/templates/provision/cisco/7960/directory_personal.xml
+++ b/resources/templates/provision/cisco/7960/directory_personal.xml
@@ -1,8 +1,7 @@
 <CiscoIPPhoneDirectory>
 	<Title>Personal</Title>
 	<Prompt>Please choose...</Prompt>
-{assign var=x value=1}
-{foreach $user_contacts as $row}
+{foreach $contacts as $row}{if $row.category == "users"}
 <DirectoryEntry>
 {if $row.contact_name_given != ""}
 	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
@@ -15,6 +14,6 @@
 	<Telephone>{$row.phone_extension}</Telephone>
 {/if}
 </DirectoryEntry>
-{assign var=x value=$x+1}
+{/if}
 {/foreach}
 </CiscoIPPhoneDirectory>
diff --git a/resources/templates/provision/cisco/7960/directory_speed_dial.xml b/resources/templates/provision/cisco/7960/directory_speed_dial.xml
index 16138ed111..86fe5e951b 100644
--- a/resources/templates/provision/cisco/7960/directory_speed_dial.xml
+++ b/resources/templates/provision/cisco/7960/directory_speed_dial.xml
@@ -1,7 +1,6 @@
 <CiscoIPPhoneDirectory>
 	<Title>Speed Dial</Title>
 	<Prompt>Please choose...</Prompt>
-{assign var=x value=1}
 {foreach $contacts as $row}{if $row.contact_category == "speed dial"}
 <DirectoryEntry>
 {if $row.contact_name_given != ""}
@@ -16,6 +15,5 @@
 {/if}
 </DirectoryEntry>
 {/if}
-{assign var=x value=$x+1}
 {/foreach}
 </CiscoIPPhoneDirectory>