Fix User.Entities