Merge "Change a few UserController calls to use isProfile"