Improved RestrictedPageHandler