Double subscriber email fix