added username and login with username or email

as title