some cleanup for the user context

stumbled over some doc issues while implementing the feature in our project.