Fix None email bug