next fix User model