extended OrganisationManage viewlet, refs #8949