diff --git a/ietf/templates/wgcharter/action_text.txt b/ietf/templates/wgcharter/action_text.txt
index ae690fd4d..c12f58323 100644
--- a/ietf/templates/wgcharter/action_text.txt
+++ b/ietf/templates/wgcharter/action_text.txt
@@ -2,7 +2,7 @@
 To: IETF-Announce <ietf-announce@ietf.org>
 Subject: WG Action: {{ action_type }} {{ wg.name }} ({{ wg.acronym }})
 
-{% filter wordwrap:73 %}{% ifequal action_type "Formed" %}A new IETF working group has been formed in the {{ wg.parent.name }}.{% endifequal %}{% ifequal action_type "Rechartered" %}The {{ wg.name }} ({{ wg.acronym }}) working group in the {{ wg.parent.name }} of the IETF has been rechartered.{% endifequal %} For additional information please contact the Area Directors or the WG Chair.
+{% filter wordwrap:73 %}{% ifequal action_type "Formed" %}A new IETF working group has been formed in the {{ wg.parent.name }}.{% endifequal %}{% ifequal action_type "Rechartered" %}The {{ wg.name }} ({{ wg.acronym }}) working group in the {{ wg.parent.name }} of the IETF has been rechartered.{% endifequal %} For additional information please contact the Area Directors or the WG Chair{{ chairs|pluralize}}.
 
 {% include "wgcharter/wg_info.txt" %}
 
diff --git a/ietf/templates/wgcharter/wg_info.txt b/ietf/templates/wgcharter/wg_info.txt
index b25f6fdf6..8c0597df3 100644
--- a/ietf/templates/wgcharter/wg_info.txt
+++ b/ietf/templates/wgcharter/wg_info.txt
@@ -2,23 +2,23 @@
 ------------------------------------------------
 Current Status: {{ wg.state.name }} Working Group
 
-Chairs:
+{% if chairs %}Chairs:
 {% for r in chairs %}  {{ r.person.plain_name }} <{{r.email.address}}>
 {% endfor %}
-Secretaries:
+{% endif %}{% if secr %}Secretaries:
 {% for r in secr %}  {{ r.person.plain_name }} <{{r.email.address}}>
 {% endfor %}
-Technical advisors:
+{% endif %}{% if techadv %}Technical advisors:
 {% for r in techadv %}  {{ r.person.plain_name }} <{{r.email.address}}>
 {% endfor %}
-Assigned Area Director:
-{% if wg.ad %}  {{ wg.ad.plain_name }} <{{ ad_email }}>{% endif %}
+{% endif %}{% if wg.ad %}Assigned Area Director:
+  {{ wg.ad.plain_name }} <{{ ad_email }}>
 
-Mailing list:
+{% endif %}{% if wg.list_email %}Mailing list
   Address: {{ wg.list_email }}
   To Subscribe: {{ wg.list_subscribe }}
   Archive: {{ wg.list_archive }}
-  
-Charter:
+{% endif %}
+Charter of Working Group:
 
 {{ charter_text }}