More fixes to the helpdesk integration