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

Fixes #658 Super Admins doesn't work as expected