diff --git a/include/staff/ticket-view.inc.php b/include/staff/ticket-view.inc.php
index a9b1c8edf41bb9f0169008239dd1b56599d84b05..4829fd6676b8c711a121fb1fb053e99e0ee7c2fa 100644
--- a/include/staff/ticket-view.inc.php
+++ b/include/staff/ticket-view.inc.php
@@ -164,20 +164,20 @@ if($ticket->isOverdue())
                         ?></span></a>
                         <?php
                         if($user) {
-                            echo sprintf('&nbsp;&nbsp;<a href="tickets.php?a=search&ownerId=%d" title="Related Tickets" data-dropdown="#action-dropdown-stats">(<b>%d</b>)</a>',
+                            echo sprintf('&nbsp;&nbsp;<a href="tickets.php?a=search&uid=%d" title="Related Tickets" data-dropdown="#action-dropdown-stats">(<b>%d</b>)</a>',
                                     urlencode($user->getId()), $user->getNumTickets());
                         ?>
                             <div id="action-dropdown-stats" class="action-dropdown anchor-right">
                                 <ul>
                                     <?php
                                     if(($open=$user->getNumOpenTickets()))
-                                        echo sprintf('<li><a href="tickets.php?a=search&status=open&ownerId=%s"><i class="icon-folder-open-alt"></i> %d Open Tickets</a></li>',
+                                        echo sprintf('<li><a href="tickets.php?a=search&status=open&uid=%s"><i class="icon-folder-open-alt"></i> %d Open Tickets</a></li>',
                                                 $user->getId(), $open);
                                     if(($closed=$user->getNumClosedTickets()))
-                                        echo sprintf('<li><a href="tickets.php?a=search&status=closed&ownerId=%d"><i class="icon-folder-close-alt"></i> %d Closed Tickets</a></li>',
+                                        echo sprintf('<li><a href="tickets.php?a=search&status=closed&uid=%d"><i class="icon-folder-close-alt"></i> %d Closed Tickets</a></li>',
                                                 $user->getId(), $closed);
                                     ?>
-                                    <li><a href="tickets.php?a=search&ownerId=<?php echo $ticket->getOwnerId(); ?>"><i class="icon-double-angle-right"></i> All Tickets</a></li>
+                                    <li><a href="tickets.php?a=search&uid=<?php echo $ticket->getOwnerId(); ?>"><i class="icon-double-angle-right"></i> All Tickets</a></li>
                                 </u>
                             </div>
                     <?php
diff --git a/include/staff/tickets.inc.php b/include/staff/tickets.inc.php
index 530d6b2d93ec7262370d81fed89c0a7bab14bdfa..a163f52cdd42fe05e0a7bfd861140fe9a0df94a3 100644
--- a/include/staff/tickets.inc.php
+++ b/include/staff/tickets.inc.php
@@ -76,9 +76,10 @@ if($status) {
     $qwhere.=' AND status='.db_input(strtolower($status));
 }
 
-if (isset($_REQUEST['ownerId'])) {
-    $qwhere .= ' AND ticket.user_id='.db_input($_REQUEST['ownerId']);
-    $qstr .= '&ownerId='.urlencode($_REQUEST['ownerId']);
+if (isset($_REQUEST['uid']) && $_REQUEST['uid']) {
+    $qwhere .= ' AND (ticket.user_id='.db_input($_REQUEST['uid'])
+            .' OR collab.user_id='.db_input($_REQUEST['uid']).') ';
+    $qstr .= '&uid='.urlencode($_REQUEST['uid']);
 }
 
 //Queues: Overloaded sub-statuses  - you've got to just have faith!
@@ -205,9 +206,15 @@ $qfrom=' FROM '.TICKET_TABLE.' ticket '.
        ' LEFT JOIN '.USER_EMAIL_TABLE.' email ON user.id = email.user_id'.
        ' LEFT JOIN '.DEPT_TABLE.' dept ON ticket.dept_id=dept.dept_id ';
 
+if ($_REQUEST['uid'])
+    $qfrom.=' LEFT JOIN '.TICKET_COLLABORATOR_TABLE.' collab
+        ON (ticket.ticket_id = collab.ticket_id )';
+
+
 $sjoin='';
+
 if($search && $deep_search) {
-    $sjoin=' LEFT JOIN '.TICKET_THREAD_TABLE.' thread ON (ticket.ticket_id=thread.ticket_id )';
+    $sjoin.=' LEFT JOIN '.TICKET_THREAD_TABLE.' thread ON (ticket.ticket_id=thread.ticket_id )';
 }
 
 //get ticket count based on the query so far..