Fixed empty email bug