Changes to user controller