2 2 stable

This PR adds a Base64 token to as the user reference, using id only seemed too simple.