Avoid empty email errors