Organization support revisited

Various enhancements to organization & user directory support.