updated login with username and email