A couple more places where restrict_superusers needs to be enforced
Merge pull request #1243 from kennknowles/restrict-superusers-more

A couple more places where restrict_superusers needs to be enforced