Changes to reflect updates to popup auth.