diff --git a/xep-0155.xml b/xep-0155.xml
index 9f6243f3..c85fd145 100644
--- a/xep-0155.xml
+++ b/xep-0155.xml
@@ -128,15 +128,27 @@
           <value>true</value>
         </option>
       </field>
-      <field label='Enable XHTML Formatting?'
-             type='boolean'
+      <field label='XHTML Formatting?'
+             type='list-single'
              var='http://jabber.org/protocol/xhtml-im'>
-        <value>1</value>
+        <value>true</value>
+        <option label='Disable'>
+          <value>false</value>
+        </option>
+        <option label='Enable'>
+          <value>true</value>
+        </option>
       </field>
-      <field label='Enable Chat State Notifications?'
-             type='boolean'
+      <field label='Chat State Notifications?'
+             type='list-single'
              var='http://jabber.org/protocol/chatstates'>
-        <value>1</value>
+        <value>true</value>
+        <option label='Disable'>
+          <value>false</value>
+        </option>
+        <option label='Enable'>
+          <value>true</value>
+        </option>
       </field>
       <field label='Minimum security level'
              type='list-single'
@@ -188,10 +200,10 @@
         <value>false</value>
       </field>
       <field var='http://jabber.org/protocol/xhtml-im'>
-        <value>0</value>
+        <value>false</value>
       </field>
       <field var='http://jabber.org/protocol/chatstates'>
-        <value>0</value>
+        <value>false</value>
       </field>
       <field var='security'>
         <value>c2s</value>
@@ -471,12 +483,26 @@ However, if the receiving party assumes that the other client will <em>not</em>
       label='Another resource with which to continue the session'/>
   <field
       var='http://jabber.org/protocol/chatstates'
-      type='boolean'
-      label='Whether to enable Chat State Notifications per XEP-0085'/>
+      type='list-single'
+      label='Whether to enable Chat State Notifications per XEP-0085'>
+    <option label='Disable'>
+      <value>false</value>
+    </option>
+    <option label='Enable'>
+      <value>true</value>
+    </option>
+  </field>
   <field
       var='http://jabber.org/protocol/xhtml-im'
-      type='boolean'
+      type='list-single'
       label='Whether to enable XHTML-IM formatting per XEP-0071'/>
+    <option label='Disable'>
+      <value>false</value>
+    </option>
+    <option label='Enable'>
+      <value>true</value>
+    </option>
+  </field>
   <field
       var='language'
       type='list-single'