Changes to fix the selected account problem.
Merge pull request #69 from n3phele/AccountSelectionBug

Changes to fix the selected account problem.