Fix user switcher when username is different from email