account chooser fixes