Fixed client email bug