diff --git a/resources/templates/provision/grandstream/gxp2170/phonebook.xml b/resources/templates/provision/grandstream/gxp2170/phonebook.xml
index a231fc3561..eb279cdf6e 100644
--- a/resources/templates/provision/grandstream/gxp2170/phonebook.xml
+++ b/resources/templates/provision/grandstream/gxp2170/phonebook.xml
@@ -14,38 +14,104 @@
 	</pbgroup>
 	
 	{foreach $contacts as $row}
-	{if $row.category == "users"}	
-	{$start_id=1}	
-	<Contact>
-		<id>{$start_id}</id>
-		{if $row.contact_name_given != ""}
-		<FirstName>{$row.contact_name_given}</FirstName>
-		
-		<LastName>{$row.contact_name_family}</LastName>
-		
-		<JobTitle></JobTitle>
-		
-		{foreach $row.numbers as $number}
-		{if $number.phone_number != ""}
-		
-		<Frequent>0</Frequent>
-		<Phone type="Work">
-			<phonenumber>{$number.phone_number}</phonenumber>
-			<accountindex>0</accountindex>
-		</Phone>
-		<Phone type="Home">
-			<phonenumber>{$number.phone_extension}</phonenumber>
-			<accountindex>0</accountindex>
-		</Phone>
-		<Phone type="Cell">
-			<phonenumber>{$number.phone_mobile}</phonenumber>
-			<accountindex>0</accountindex>
-		</Phone>
-		<Group>6</Group>
-		<Primary>0</Primary>
-		<Department></Department>
-		<Job></Job>
-		<Company></Company>
+		{if $row.category == "users"}	
+		{$start_id=1}	
+		<Contact>
+			<id>{$start_id}</id>
+			{if $row.contact_name_given != ""}
+			<FirstName>{$row.contact_name_given}</FirstName>
+
+			<LastName>{$row.contact_name_family}</LastName>
+
+			<JobTitle></JobTitle>
+
+			{foreach $row.numbers as $number}
+			{if $number.phone_number != ""}
+
+			<Frequent>0</Frequent>
+			<Phone type="Work">
+				<phonenumber>{$number.phone_number}</phonenumber>
+				<accountindex>0</accountindex>
+			</Phone>
+			<Phone type="Home">
+				<phonenumber>{$number.phone_extension}</phonenumber>
+				<accountindex>0</accountindex>
+			</Phone>
+			<Phone type="Cell">
+				<phonenumber>{$number.phone_mobile}</phonenumber>
+				<accountindex>0</accountindex>
+			</Phone>
+			<Group>6</Group>
+			<Primary>0</Primary>
+			<Department></Department>
+			<Job></Job>
+			<Company></Company>
+		{/if}
+		{if $row.category == "groups"}	
+		{$start_id=1}	
+		<Contact>
+			<id>{$start_id}</id>
+			{if $row.contact_name_given != ""}
+			<FirstName>{$row.contact_name_given}</FirstName>
+
+			<LastName>{$row.contact_name_family}</LastName>
+
+			<JobTitle></JobTitle>
+
+			{foreach $row.numbers as $number}
+			{if $number.phone_number != ""}
+
+			<Frequent>0</Frequent>
+			<Phone type="Work">
+				<phonenumber>{$number.phone_number}</phonenumber>
+				<accountindex>0</accountindex>
+			</Phone>
+			<Phone type="Home">
+				<phonenumber>{$number.phone_extension}</phonenumber>
+				<accountindex>0</accountindex>
+			</Phone>
+			<Phone type="Cell">
+				<phonenumber>{$number.phone_mobile}</phonenumber>
+				<accountindex>0</accountindex>
+			</Phone>
+			<Group>6</Group>
+			<Primary>0</Primary>
+			<Department></Department>
+			<Job></Job>
+			<Company></Company>
+		{/if}
+		{if $row.category == "extensions"}	
+		{$start_id=1}	
+		<Contact>
+			<id>{$start_id}</id>
+			{if $row.contact_name_given != ""}
+			<FirstName>{$row.contact_name_given}</FirstName>
+
+			<LastName>{$row.contact_name_family}</LastName>
+
+			<JobTitle></JobTitle>
+
+			{foreach $row.numbers as $number}
+			{if $number.phone_number != ""}
+
+			<Frequent>0</Frequent>
+			<Phone type="Work">
+				<phonenumber>{$number.phone_number}</phonenumber>
+				<accountindex>0</accountindex>
+			</Phone>
+			<Phone type="Home">
+				<phonenumber>{$number.phone_extension}</phonenumber>
+				<accountindex>0</accountindex>
+			</Phone>
+			<Phone type="Cell">
+				<phonenumber>{$number.phone_mobile}</phonenumber>
+				<accountindex>0</accountindex>
+			</Phone>
+			<Group>6</Group>
+			<Primary>0</Primary>
+			<Department></Department>
+			<Job></Job>
+			<Company></Company>
 		{/if}
 	{/foreach}
 	</Contact>