Fix form and controller for user model