CS-4994: Adds switch to user profile
Merge pull request #550 from m038/CS-4921-1

CS-4994: Adds switch to user profile