Add condition in valid organization check