URGENT Fix Free Trial login for users with @'s