Unique email fix