Changed login from email, to username