jPeople Integration & fix