Add code to validate membership in organization if organization options are specified