re-adding usertoken as it's needed backwards compatible