More admin user plumbing to restrict views from non-admin users