Added username field to User model and use this for auth instead of the email address.