Re-enabled admin pages, minor regression fix