User controller, user model fixes