Added and fixed user model loading