account selection bug fix