diff --git a/ietf/doc/views_draft.py b/ietf/doc/views_draft.py
index 9f73e3b5c3f..1806720c3d9 100644
--- a/ietf/doc/views_draft.py
+++ b/ietf/doc/views_draft.py
@@ -1596,6 +1596,7 @@ def __init__(self, *args, **kwargs):
             if self.can_set_sub_pub:
                 f.help_text = "Only select 'Submitted to IESG for Publication' to correct errors. Use the document's main page to request publication."
             else:
+                f.queryset = f.queryset.exclude(slug='sub-pub')
                 f.help_text = "You may not set the 'Submitted to IESG for Publication' using this form - Use the document's main page to request publication."
 
         f = self.fields['tags']
diff --git a/ietf/templates/doc/draft/change_stream_state.html b/ietf/templates/doc/draft/change_stream_state.html
index 01aa8605d52..b8dca253f17 100644
--- a/ietf/templates/doc/draft/change_stream_state.html
+++ b/ietf/templates/doc/draft/change_stream_state.html
@@ -17,7 +17,11 @@ <h1>
             <b>Move document to {{ next_states|pluralize:"to one of" }} the recommended next state{{ next_states|pluralize }}:</b>
         </p>
         {% for state in next_states %}
-            <button type="button" class="btn btn-primary next-state" data-state="{{ state.pk }}">{{ state.name }}</button>
+            {% if state.slug == 'sub-pub' %}
+                <a type="button" class="btn btn-primary next-state" href="{% url 'ietf.doc.views_draft.to_iesg' name=doc.name %}">{{ state.name }}</a>
+            {% else %}
+                <button type="button" class="btn btn-primary next-state" data-state="{{ state.pk }}">{{ state.name }}</button>
+            {% endif %}
         {% endfor %}
     {% endif %}
     <form class="mt-5" method="post">