registercontroller to usercontroller and some minor changes