diff --git a/helpdesk/views/staff.py b/helpdesk/views/staff.py
index 17af2ad2..0361d5b0 100644
--- a/helpdesk/views/staff.py
+++ b/helpdesk/views/staff.py
@@ -244,11 +244,10 @@ def update_ticket(request, ticket_id, public=False):
                 }
             ticket.assigned_to = new_user
             reassigned = True
-        # This makes no sense to me. Why should we ever remove the 'assigned to' 
-        # value?
-        #elif owner == 0 and ticket.assigned_to is not None:
-        #    f.title = _('Unassigned')
-        #    ticket.assigned_to = None
+        # user changed owner to 'unassign'
+        elif owner == 0 and ticket.assigned_to is not None:
+            f.title = _('Unassigned')
+            ticket.assigned_to = None
 
     if new_status != ticket.status:
         ticket.status = new_status