Add username and make it choose either username or e-mail address when you login.