fix #770 preserve temp token across validation failures

@mikldt please make sure you're ok with lines 183 and 204 in the model.