WIP: Issue 788 check verification tokens

This is for @nchapman and I to discuss.