LPS-37240 Validation for Organizations (and several bug fixes)