1.1: fix token issues

 by having custom tokens generated on fail