diff --git a/management/commands/get_email.py b/management/commands/get_email.py
index 3658c91b..185758ae 100644
--- a/management/commands/get_email.py
+++ b/management/commands/get_email.py
@@ -263,7 +263,7 @@ def ticket_from_message(message, queue):
             a.save()
             print "    - %s" % file['filename']
 
-    return ticket
+    return t
 
 
 if __name__ == '__main__':
diff --git a/templates/helpdesk/dashboard.html b/templates/helpdesk/dashboard.html
index 28f9e948..278f00ba 100644
--- a/templates/helpdesk/dashboard.html
+++ b/templates/helpdesk/dashboard.html
@@ -49,7 +49,7 @@
 <th><a href='{{ ticket.get_absolute_url }}'>{{ ticket.title }}</a></th>
 <td>{{ ticket.queue }}</td>
 <td><span title='{{ ticket.created|date:"r" }}'>{{ ticket.created|timesince }} ago</span></td>
-<th><a href='{{ ticket.get_absolute_url }}?take'><span class='button button_take'>{% trans "Take" %}</span></a></th>
+<th><a href='{{ ticket.get_absolute_url }}?take'><span class='button button_take'>{% trans "Take" %}</span></a> | <a href='{% url helpdesk_delete ticket.id %}'><span class='button button_delete'>{% trans "Delete" %}</span></a></th>
 </tr>
 {% endfor %}
 {% if not unassigned_tickets %}
diff --git a/views/staff.py b/views/staff.py
index 447981c8..a7d619ff 100644
--- a/views/staff.py
+++ b/views/staff.py
@@ -153,7 +153,7 @@ def update_ticket(request, ticket_id):
     reassigned = False
 
     if owner:
-        if owner != 0 and (ticket.assigned_to and owner != ticket.assigned_to.id) or not ticket.assigned_to:
+        if owner != 0 and ((ticket.assigned_to and owner != ticket.assigned_to.id) or not ticket.assigned_to):
             new_user = User.objects.get(id=owner)
             f.title = _('Assigned to %(username)s') % {
                 'username': new_user.username,