It should be possible to store the organization and the organizational unit of a principal in the internal (integrated) Crowd repository. The administrative console needs to allow to enter and edit these attributes.

Both, the organization and the organizational unit should be part of a controlled vocabulary that can be maintained within Crowd itself. This way, it can be avoided that the same organization is spelled differently for different principals.

I should note that for us already a single level (i.e. only the organization) would be a big improvement.