Sure thingOpen include/class.ticket.phpFind$rv=$this->assignToTeam($id, $note, $alert);Above Add//Unset Agent on Team Assignment$this->setStaffId(0);Find$rv=$this->assignToStaff($id, $note, $alert);Above Add//Unset Team on Agent Assignment$this->setTeamId(0);If I ever have more time, I might look into making it an option that can be toggled via the admin panel, but for now I just changed the behavior overall.