Fixing pages to use user info service.