Fixes #5795: Account drop down more reliable