Token Input Fixes

Fixed the token input in the forms.