move the token because it was generating a new token before validate - refs BT#7890