Duplicate email fix