fixed user model and user controller2