Fixed issues with empty email