diff --git a/helpdesk/views/public.py b/helpdesk/views/public.py
index fcac8ded..e57a6769 100644
--- a/helpdesk/views/public.py
+++ b/helpdesk/views/public.py
@@ -63,8 +63,8 @@ def homepage(request):
 
     knowledgebase_categories = KBCategory.objects.all()
 
-    return render(request, template_name='helpdesk/public_homepage.html',
-        context = {
+    return render(request, 'helpdesk/public_homepage.html',
+        {
             'form': form,
             'helpdesk_settings': helpdesk_settings,
             'kb_categories': knowledgebase_categories
@@ -117,8 +117,8 @@ def view_ticket(request):
             if helpdesk_settings.HELPDESK_NAVIGATION_ENABLED:
                 redirect_url = reverse('helpdesk_view', args=[ticket_id])
 
-            return render(request, template_name='helpdesk/public_view_ticket.html',
-                context = {
+            return render(request, 'helpdesk/public_view_ticket.html',
+                {
                     'ticket': ticket,
                     'helpdesk_settings': helpdesk_settings,
                     'next': redirect_url,
diff --git a/helpdesk/views/staff.py b/helpdesk/views/staff.py
index 99552458..a9eb70a2 100644
--- a/helpdesk/views/staff.py
+++ b/helpdesk/views/staff.py
@@ -153,8 +153,8 @@ def dashboard(request):
 
     dash_tickets = query_to_dict(cursor.fetchall(), cursor.description)
 
-    return render(request, template_name='helpdesk/dashboard.html',
-        context = {
+    return render(request, 'helpdesk/dashboard.html',
+        {
             'user_tickets': tickets,
             'user_tickets_closed_resolved': tickets_closed_resolved,
             'unassigned_tickets': unassigned_tickets,
@@ -892,8 +892,8 @@ def ticket_list(request):
     querydict.pop('page', 1)
 
 
-    return render(request, template_name='helpdesk/ticket_list.html',
-        context = dict(
+    return render(request, 'helpdesk/ticket_list.html',
+        dict(
             context,
             query_string=querydict.urlencode(),
             tickets=tickets,
@@ -1198,8 +1198,8 @@ def run_report(request, report):
             data.append(summarytable[item, hdr])
         table.append([item] + data)
 
-    return render(request, template_name='helpdesk/report_output.html',
-        context = {
+    return render(request, 'helpdesk/report_output.html',
+        {
             'title': title,
             'charttype': charttype,
             'data': table,