Bug 867748 - Error recovery from account settings (mostly for oauth2)