--- a/web/views/autoform.py	Wed Jan 20 14:39:10 2010 +0100
+++ b/web/views/autoform.py	Wed Jan 20 14:39:44 2010 +0100
@@ -89,7 +89,9 @@
                 except form.FieldNotFound:
                     # meta attribute such as <attr>_format
                     continue
-        if self.formtype == 'main' and entity.has_eid():
+        if self.formtype == 'main' and entity.has_eid() and (
+            self.display_fields is None or
+            '_cw_generic_field' in self.display_fields):
             try:
                 self.fields.append(self.field_by_name('_cw_generic_field'))
             except form.FieldNotFound: