Fixes https://github.com/osTicket/osTicket-1.8/issues/1277 and https://github.com/osTicket/osTicket-1.8/issues/1373
