Changed how user email is found