Fixes #658 Super Admins doesn't work as expected
Merge pull request #660 from PaulBender/fix-feature-658

Fixes #658 Super Admins doesn't work as expected