Fix evnt and user factory