updated user model (beautify - fixed this time)