diff --git a/doc/schemas/domain-1.0.xsd b/doc/schemas/domain-1.0.xsd
index c78bdbd45..9ce83db8d 100644
--- a/doc/schemas/domain-1.0.xsd
+++ b/doc/schemas/domain-1.0.xsd
@@ -241,12 +241,28 @@
    Allow the registrant value to be nullified by changing the
    minLength restriction to "0".
    -->
-   <simpleType name="clIDChgType">
+
+   <complexType name="clIDChgType">
+    <simpleContent>
+      <extension base="domain:clIDChgSimpleType">
+        <attribute name="verified" type="domain:verifiedType"/>
+      </extension>
+    </simpleContent>
+   </complexType>
+
+  <simpleType name="clIDChgSimpleType">
     <restriction base="token">
       <minLength value="0"/>
-      <maxLength value="16"/>
     </restriction>
-   </simpleType>
+  </simpleType>
+
+  <simpleType name="verifiedType">
+    <restriction base="token">
+      <enumeration value="yes"/>
+      <enumeration value="no"/>
+    </restriction>
+  </simpleType>
+
 
    <!--
    Allow the authInfo value to be nullified by including an
diff --git a/doc/schemas/eppcom-1.0.xsd b/doc/schemas/eppcom-1.0.xsd
index 9d022b458..3d1c44e44 100644
--- a/doc/schemas/eppcom-1.0.xsd
+++ b/doc/schemas/eppcom-1.0.xsd
@@ -53,7 +53,6 @@ Abstract client and object identifier type.
   <simpleType name="clIDType">
     <restriction base="token">
       <minLength value="3"/>
-      <maxLength value="20"/>
     </restriction>
   </simpleType>
 
diff --git a/spec/epp/domain_spec.rb b/spec/epp/domain_spec.rb
index 441c55ac1..a9f98749f 100644
--- a/spec/epp/domain_spec.rb
+++ b/spec/epp/domain_spec.rb
@@ -407,7 +407,7 @@ describe 'EPP Domain', epp: true do
        ]
      })
 
-      response = epp_plain_request(xml, :xml)
+      response = epp_plain_request(xml, validate_input: false)
 
       response[:results][0][:msg].should ==
         'Valid algorithms are: 3, 5, 6, 7, 8, 252, 253, 254, 255 [alg]'
@@ -641,7 +641,7 @@ describe 'EPP Domain', epp: true do
           }]
         })
 
-      response = epp_plain_request(xml, :xml)
+      response = epp_plain_request(xml, validate_input: false)
       response[:msg].should == 'Mutually exclusive parameters: extension > create > keyData, '\
       'extension > create > dsData'
       response[:result_code].should == '2306'
@@ -1307,7 +1307,7 @@ describe 'EPP Domain', epp: true do
     end
 
     it 'returns an error for incorrect op attribute' do
-      response = epp_plain_request(domain_transfer_xml({}, 'bla'), :xml)
+      response = epp_plain_request(domain_transfer_xml({}, 'bla'), validate_input: false)
       response[:result_code].should == '2306'
       response[:msg].should == 'Attribute is invalid: op'
     end