Fixed yet another bug for the email usernames