Re-fixed user model loading