maltes
committed
on 24 Aug 06
Made sure the organization_id is found correctly