More compatibility with admin side of helpdesk
Revert "More compatibility with admin side of helpdesk"

This reverts commit f506751853f93700cb95e38e57f870b78de04fb8.
Merge remote-tracking branch 'origin/master'