Fix for duplicate email bug