Fix unassigning role when control for role name does not exist