Revert r35476, r35479 -- breaks first login with global account when ConfirmEdit...