PLT 860 & 1116 - Changes test emails to include a '+' and fixes email verification issue with emails that included a '+'