Small changes to usercontroller