Add Username to Users, and Users can now login via username or email