Merge pull request #6045 from AronNovak/CMSUser