This makes it clearer which account is which, and it matches with the user switcher behavior. (cherry picked from commit ec34a125)