diff --git a/include/staff/directory.inc.php b/include/staff/directory.inc.php
index d57967fc033f8fabbb87f1657f598515f5acfe27..74269f6ce83cc97aa921b83245400f0ac15f5d66 100644
--- a/include/staff/directory.inc.php
+++ b/include/staff/directory.inc.php
@@ -3,7 +3,7 @@ if(!defined('OSTSTAFFINC') || !$thisstaff || !$thisstaff->isStaff()) die('Access
 $qstr='';
 $select='SELECT staff.*,CONCAT_WS(" ",firstname,lastname) as name,dept.name as dept ';
 $from='FROM '.STAFF_TABLE.' staff '.
-      'LEFT JOIN '.DEPT_TABLE.' dept ON(staff.dept_id=dept.dept_id) ';
+      'LEFT JOIN '.DEPT_TABLE.' dept ON(staff.dept_id=dept.id) ';
 $where='WHERE staff.isvisible=1 ';
 
 $agents = Staff::objects()
diff --git a/include/staff/templates/tickets.tmpl.php b/include/staff/templates/tickets.tmpl.php
index 31872def97e03e8c9b94616ce57587d964bf4a6e..d85b1e4c57d4807c4be14204f5b93f8a41f89fff 100644
--- a/include/staff/templates/tickets.tmpl.php
+++ b/include/staff/templates/tickets.tmpl.php
@@ -14,7 +14,7 @@ $from =' FROM '.TICKET_TABLE.' ticket '
       .' LEFT JOIN '.USER_TABLE.' user ON user.id = ticket.user_id '
       .' LEFT JOIN '.USER_EMAIL_TABLE.' email ON user.id = email.user_id '
       .' LEFT JOIN '.USER_ACCOUNT_TABLE.' account ON (ticket.user_id=account.user_id) '
-      .' LEFT JOIN '.DEPT_TABLE.' dept ON ticket.dept_id=dept.dept_id '
+      .' LEFT JOIN '.DEPT_TABLE.' dept ON ticket.dept_id=dept.id '
       .' LEFT JOIN '.STAFF_TABLE.' staff ON (ticket.staff_id=staff.staff_id) '
       .' LEFT JOIN '.TEAM_TABLE.' team ON (ticket.team_id=team.team_id) '
       .' LEFT JOIN '.TOPIC_TABLE.' topic ON (ticket.topic_id=topic.topic_id) '