Bugfix for token form