Fixed issue with empty email