Staff and Organization Clients Fixed