Make admins a bit more useful
Merge pull request #940 from learning-unlimited/adehnert-admins

Make admins a bit more useful