Form: Individual/Organization not toggling correctly