Add validation tokens
Merge pull request #1079 from mkly/fix_validation_tokens

Add validation tokens