Correctly separate username and email on login