Changes ids on the users page to be more QA-friendly
Merge branch '2.1' into qa