Add username to user

A user can now login with a username or email.

@houndci 
do you need the if here.. i'm not sure but worth a test