refs #5028 - organizations aren't a special case anymore
Merge pull request #155 from komidore64/rmi5028

refs #5028 - organizations aren't a special case anymore