[#66] Flag org field mandatory, only select if one org