diff --git a/ietf/templates/wgcharter/change_state.html b/ietf/templates/wgcharter/change_state.html
index 87627c7c9..00ba730af 100644
--- a/ietf/templates/wgcharter/change_state.html
+++ b/ietf/templates/wgcharter/change_state.html
@@ -20,7 +20,9 @@ form.change-state .actions {
 {% block content %}
 <h1>{{ title }}</h1>
 
-{% if "Change state" in title %}<p class="helptext">For help on the states, see the <a href="{% url help_charter_states %}">state table</a>.</p>{% endif %}
+{% if not option %}
+<p class="helptext">For help on the states, see the <a href="{% url help_charter_states %}">state table</a>.</p>
+{% endif %}
 
 <form class="change-state" action="" method="post">
   <table>
@@ -60,9 +62,10 @@ form.change-state .actions {
     {% endif %}
     <tr>
       <td colspan="2" class="actions">
-        {% if option %}
-        <input type="submit" value="Submit"/>
-        {% else %}
+        {% if option == "initcharter" or option == "recharter" %}
+        <input type="submit" value="Save and continue to submission of charter text"/>
+        {% endif %}
+        {% if not option or option == "abandon" %}
         <a href="{% url doc_view name=doc.name %}">Back</a>
         <input type="submit" value="Save and (possibly) notify Secretariat"/>
         {% endif %}
diff --git a/ietf/wgcharter/views.py b/ietf/wgcharter/views.py
index c44bbc8be..3196b0f68 100644
--- a/ietf/wgcharter/views.py
+++ b/ietf/wgcharter/views.py
@@ -141,10 +141,10 @@ def change_state(request, name, option=None):
             init = dict()
         elif option == "initcharter":
             hide = ['charter_state']
-            init = dict(initial_time=1, message="%s has initiated chartering of the proposed WG %s (%s)" % (login.plain_name(), wg.name, wg.acronym))
+            init = dict(initial_time=1, message="%s has initiated chartering of the proposed WG %s (%s)." % (login.plain_name(), wg.name, wg.acronym))
         elif option == "abandon":
             hide = ['initial_time', 'charter_state']
-            init = dict(message="%s has abandoned the chartering effort on the WG %s (%s)" % (login.plain_name(), wg.name, wg.acronym))
+            init = dict(message="%s has abandoned the chartering effort on the WG %s (%s)." % (login.plain_name(), wg.name, wg.acronym))
         else:
             hide = ['initial_time']
             s = charter.get_state()