Add proper validation to enable opting out of signatory