Add username to Users and enable to login with username or email.