diff --git a/app/xml_cdr/app_config.php b/app/xml_cdr/app_config.php
index 46575bc0f8..ccbec8ad8c 100644
--- a/app/xml_cdr/app_config.php
+++ b/app/xml_cdr/app_config.php
@@ -238,6 +238,16 @@
 		$apps[$x]['permissions'][$y]['name'] = "xml_cdr_extension_summary_all";
 		$y++;
 		$apps[$x]['permissions'][$y]['name'] = "xml_cdr_account_code";
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "xml_cdr_cc_side";
+		$apps[$x]['permissions'][$y]['groups'][] = "user";
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
+		$y++;
+		$apps[$x]['permissions'][$y]['name'] = "xml_cdr_call_center_queue_uuid";
+		$apps[$x]['permissions'][$y]['groups'][] = "user";
+		$apps[$x]['permissions'][$y]['groups'][] = "admin";
+		$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
 
 	//default settings
 		$y=0;
diff --git a/app/xml_cdr/app_languages.php b/app/xml_cdr/app_languages.php
index 3ba83ab5e5..5cee02d51c 100644
--- a/app/xml_cdr/app_languages.php
+++ b/app/xml_cdr/app_languages.php
@@ -3048,6 +3048,30 @@ $text['label-format']['zh-cn'] = "格式";
 $text['label-format']['ja-jp'] = "フォーマット";
 $text['label-format']['ko-kr'] = "체재";
 
+$text['label-cc-queue']['en-us'] = "Call Center Queue";
+$text['label-cc-queue']['en-gb'] = "Call Centre Queue";
+$text['label-cc-queue']['ar-eg'] = "قائمة انتظار مركز الاتصال";
+$text['label-cc-queue']['de-at'] = "Callcenter-Warteschlange";
+$text['label-cc-queue']['de-ch'] = "Callcenter-Warteschlange";
+$text['label-cc-queue']['de-de'] = "Callcenter-Warteschlange";
+$text['label-cc-queue']['es-cl'] = "Cola del centro de llamadas";
+$text['label-cc-queue']['es-mx'] = "Cola del centro de llamadas";
+$text['label-cc-queue']['fr-ca'] = "File d'attente du centre d'appels";
+$text['label-cc-queue']['fr-fr'] = "File d'attente du centre d'appels";
+$text['label-cc-queue']['he-il'] = "תור למוקד טלפוני";
+$text['label-cc-queue']['it-it'] = "Coda del call center";
+$text['label-cc-queue']['nl-nl'] = "Callcenter-wachtrij";
+$text['label-cc-queue']['pl-pl'] = "Kolejka do call center";
+$text['label-cc-queue']['pt-br'] = "Fila da central de atendimento";
+$text['label-cc-queue']['pt-pt'] = "Fila da central de atendimento";
+$text['label-cc-queue']['ro-ro'] = "Coada centrului de apeluri";
+$text['label-cc-queue']['ru-ru'] = "Очередь в колл-центр";
+$text['label-cc-queue']['sv-se'] = "Call Center-kö";
+$text['label-cc-queue']['uk-ua'] = "Черга кол-центру";
+$text['label-cc-queue']['zh-cn'] = "呼叫中心队列";
+$text['label-cc-queue']['ja-jp'] = "コールセンターのキュー";
+$text['label-cc-queue']['ko-kr'] = "콜센터 대기열";
+
 $text['description_search']['en-us'] = "<u>Note</u>: Destination and Caller ID (CID) Name fields support the use of an <i>asterisk</i> ('*') as a wildcard character.";
 $text['description_search']['en-gb'] = "<u>Note</u>: Destination and Caller ID (CID) Name fields support the use of an <i>asterisk</i> ('*') as a wildcard character.";
 $text['description_search']['ar-eg'] = "يدعم حقلا الوجهة واسم تعريف المتصل استخدام علامة النجمة كحرف بدل.";
diff --git a/app/xml_cdr/xml_cdr.php b/app/xml_cdr/xml_cdr.php
index a4476ce969..928736e3f3 100644
--- a/app/xml_cdr/xml_cdr.php
+++ b/app/xml_cdr/xml_cdr.php
@@ -23,6 +23,7 @@
 	Contributor(s):
 	Mark J Crane <markjcrane@fusionpbx.com>
 	Luis Daniel Lucio Quiroz <dlucio@okay.com.mx>
+	Tony Fernandez <tfernandez@smartip.ca>
 */
 
 //includes files
@@ -502,6 +503,32 @@
 			echo "			</select>\n";
 			echo "		</div>\n";
 			echo "	</div>\n";
+			
+			if (permission_exists('xml_cdr_call_center_queue_uuid')) {
+				$sql = "select call_center_queue_uuid, queue_name, queue_extension from v_call_center_queues ";
+				$sql .= "where domain_uuid = :domain_uuid ";
+				$sql .= "order by queue_extension asc ";
+				$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+				$database = new database;
+				$result_cc = $database->select($sql, $parameters, 'all');
+				echo "	<div class='form_set'>\n";
+				echo "		<div class='label'>\n";
+				echo "			".$text['label-cc-queue']."\n";
+				echo "		</div>\n";
+				echo "		<div class='field'>\n";
+				echo "			<select class='formfld' name='call_center_queue_uuid' id='call_center_queue_uuid'>\n";
+				echo "				<option value=''></option>";
+				if (is_array($result_cc) && @sizeof($result_cc) != 0) {
+					foreach ($result_cc as &$row) {
+						$selected = ($row['call_center_queue_uuid'] == $call_center_queue_uuid) ? "selected" : null;
+						echo "		<option value='".escape($row['call_center_queue_uuid'])."' ".escape($selected).">".((is_numeric($row['queue_extension'])) ? escape($row['queue_extension']." (".$row['queue_name'].")") : escape($row['queue_extension'])." (".escape($row['queue_extension']).")")."</option>";
+					}
+				}
+				echo "			</select>\n";
+				echo "		</div>\n";
+				echo "	</div>\n";
+				unset($sql, $parameters, $result_cc, $row, $selected);
+			}
 		}
 
 		echo "</div>\n";
diff --git a/app/xml_cdr/xml_cdr_inc.php b/app/xml_cdr/xml_cdr_inc.php
index 1edde7393b..ed5da76a05 100644
--- a/app/xml_cdr/xml_cdr_inc.php
+++ b/app/xml_cdr/xml_cdr_inc.php
@@ -22,6 +22,7 @@
 
 	Contributor(s):
 	Mark J Crane <markjcrane@fusionpbx.com>
+	Tony Fernandez <tfernandez@smartip.ca>
 */
 
 //includes files
@@ -536,12 +537,12 @@
 		$sql .= "and (cc_side is null or cc_side != 'agent') \n";
 	}
 	//call center queue search for member or agent
-	if (!empty($cc_side)) {
+	if (!empty($cc_side) && permission_exists('xml_cdr_cc_side')) {
 		$sql .= "and cc_side = :cc_side \n";
 		$parameters['cc_side'] = $cc_side;
 	}
 	//show specific call center queue
-	if (!empty($call_center_queue_uuid)) {
+	if (!empty($call_center_queue_uuid) && permission_exists('xml_cdr_call_center_queue_uuid')) {
 		$sql .= "and call_center_queue_uuid = :call_center_queue_uuid \n";
 		$parameters['call_center_queue_uuid'] = $call_center_queue_uuid;
 	}
diff --git a/app/xml_cdr/xml_cdr_search.php b/app/xml_cdr/xml_cdr_search.php
index 5af2d70626..05adb4f1b4 100644
--- a/app/xml_cdr/xml_cdr_search.php
+++ b/app/xml_cdr/xml_cdr_search.php
@@ -22,6 +22,7 @@
 
 	Contributor(s):
 	Mark J Crane <markjcrane@fusionpbx.com>
+	Tony Fernandez <tfernandez@smartip.ca>
 */
 
 //includes files
@@ -305,6 +306,30 @@
 		echo "		</td>";
 		echo "	</tr>\n";
 
+		if (permission_exists('xml_cdr_call_center_queue_uuid')) {
+			$sql = "select call_center_queue_uuid, queue_name, queue_extension from v_call_center_queues ";
+			$sql .= "where domain_uuid = :domain_uuid ";
+			$sql .= "order by queue_extension asc ";
+			$parameters['domain_uuid'] = $_SESSION['domain_uuid'];
+			$database = new database;
+			$result_cc = $database->select($sql, $parameters, 'all');
+			echo "	<tr>";
+			echo "		<td class='vncell'>".$text['label-cc-queue']."</td>";
+			echo "		<td class='vtable'>";
+			echo "			<select class='formfld' name='call_center_queue_uuid' id='call_center_queue_uuid'>\n";
+			echo "				<option value=''></option>";
+			if (is_array($result_cc) && @sizeof($result_cc) != 0) {
+				foreach ($result_cc as &$row) {
+					$selected = ($row['call_center_queue_uuid'] == $call_center_queue_uuid) ? "selected" : null;
+					echo "		<option value='".escape($row['call_center_queue_uuid'])."' ".escape($selected).">".((is_numeric($row['queue_extension'])) ? escape($row['queue_extension']." (".$row['queue_name'].")") : escape($row['queue_extension'])." (".escape($row['queue_extension']).")")."</option>";
+				}
+			}
+			echo "			</select>\n";
+			echo "		</td>";
+			echo "	</tr>\n";
+			unset($sql, $parameters, $result_cc, $row, $selected);
+		}
+
 		echo "</table>\n";
 	
 	echo "		</td>";