updated user model and controller (Slava)