diff --git a/views/public.py b/views/public.py
index d96ee9c4..002ac95f 100644
--- a/views/public.py
+++ b/views/public.py
@@ -21,7 +21,7 @@ from helpdesk.models import Ticket, Queue
 
 
 def homepage(request):
-    if request.user.is_authenticated():
+    if request.user.is_staff:
         if getattr(request.user.usersettings.settings, 'login_view_ticketlist', False):
             return HttpResponseRedirect(reverse('helpdesk_list'))
         else:
diff --git a/views/staff.py b/views/staff.py
index 3d4512ea..f8adfb7d 100644
--- a/views/staff.py
+++ b/views/staff.py
@@ -121,7 +121,7 @@ def view_ticket(request, ticket_id):
     return render_to_response('helpdesk/ticket.html',
         RequestContext(request, {
             'ticket': ticket,
-            'active_users': User.objects.filter(is_active=True, is_staff=True),
+            'active_users': User.objects.filter(is_active=True).filter(is_staff=True),
             'priorities': Ticket.PRIORITY_CHOICES,
             'preset_replies': PreSetReply.objects.filter(Q(queues=ticket.queue) | Q(queues__isnull=True)),
         }))