I fixed up the users controller.

I'm not sure why there is so much stuff here in the pull request.  I meant to only have updated the users controller.