URGENT Fix Free Trial login for users with @'s
Merge pull request #474 from bendiy/master

URGENT Fix Free Trial login for users with @'s