diff --git a/ietf/liaisons/forms.py b/ietf/liaisons/forms.py
index 01aa935dc..2c2811375 100644
--- a/ietf/liaisons/forms.py
+++ b/ietf/liaisons/forms.py
@@ -468,14 +468,6 @@ class OutgoingLiaisonForm(LiaisonModelForm):
     class Meta:
         model = LiaisonStatement
         exclude = ('attachments','state','from_name','to_name','action_holder_contacts')
-        # add approved field, no action_holder_contacts
-        fieldsets = [('From', {'fields': ['from_groups','from_contact','response_contacts','approved'], 'legend': ''}),
-                     ('To', {'fields': ['to_groups','to_contacts'], 'legend': ''}),
-                     ('Other email addresses', {'fields': ['technical_contacts','cc_contacts'], 'legend': ''}),
-                     ('Purpose', {'fields':['purpose', 'deadline'], 'legend': ''}),
-                     ('Reference', {'fields': ['other_identifiers','related_to'], 'legend': ''}),
-                     ('Liaison Statement', {'fields': ['title', 'submitted_date', 'body', 'attachments'], 'legend': ''}),
-                     ('Add attachment', {'fields': ['attach_title', 'attach_file', 'attach_button'], 'legend': ''})]
 
     def is_approved(self):
         return self.cleaned_data['approved']
diff --git a/ietf/templates/liaisons/edit.html b/ietf/templates/liaisons/edit.html
index 30cc4b00e..c8023e50c 100644
--- a/ietf/templates/liaisons/edit.html
+++ b/ietf/templates/liaisons/edit.html
@@ -53,12 +53,17 @@
             {% bootstrap_field form.from_groups layout="horizontal" %}
             {% bootstrap_field form.from_contact layout="horizontal" %}
             {% bootstrap_field form.response_contacts layout="horizontal" %}
+            {% if form.approved %}
+                {% bootstrap_field form.approved layout="horizontal" %}
+            {% endif %}
         <h2>To</h2>
             {% bootstrap_field form.to_groups layout="horizontal" %}
             {% bootstrap_field form.to_contacts layout="horizontal" %}
         <h2>Other email addresses</h2>
             {% bootstrap_field form.technical_contacts layout="horizontal" %}
-            {% bootstrap_field form.action_holder_contacts layout="horizontal" %}
+            {% if form.action_holder_contacts %}
+                {% bootstrap_field form.action_holder_contacts layout="horizontal" %}
+            {% endif %}
             {% bootstrap_field form.cc_contacts layout="horizontal" %}
         <h2>Purpose</h2>
             {% bootstrap_field form.purpose layout="horizontal" %}