fix #770 preserve temp token across validation failures
Merge pull request #787 from concerto/temp_token_preservation

fix #770 (preserve temp token across validation failures)
Looks good!