Patch authtoken

Patching some broken things from the AuthToken merge.