Updated User model, fixed password issue