Fixes #658 Super Admins doesn't work as expected

For 1.6