Fixing user model too