Allow Department and Location as email masks

It would be great for on premises helpdesk installs if we could use Department and Location as email substitution masks. This would help users using Jitbit for internal helpdesks.