Fix empty email addresses, change from empty string to None