re-enabled tokens in the context of the overhauled auth system