Fixing issue where server tokens were never tied to the user. Thanks also to @pablodip