Fix when email is NULL