Pushing Matt's UserToken implementation