Emails to users now use the Token ID as the token value