Change email auth to username
Add messages