meh
merge
username or email
login now works, but no error message when wrong password