account chooser fixes
Merge pull request #86 from vomikan/master

account chooser fixes