Usermanagement PR for https://www.pivotaltracker.com/story/show/72591656