Fix #2673 email templates generated with the good @token
Merge pull request #2674 from jessy/master

Fix #2673 email templates generated with the good @token