Index: openacs-4/packages/xowiki/tcl/form-field-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/form-field-procs.tcl,v
diff -u -r1.140 -r1.141
--- openacs-4/packages/xowiki/tcl/form-field-procs.tcl	29 Mar 2009 14:19:19 -0000	1.140
+++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl	29 Mar 2009 14:31:54 -0000	1.141
@@ -1977,6 +1977,10 @@
     } else {
       ::html::t [my value]
     }
+    # Include labels as hidden fields to avoid surprises when
+    # switching field types to labels.
+    my set type hidden
+    next
   }
 
   ###########################################################