Use different id for token only field