diff --git a/tests/admin_pages/test_workflow.py b/tests/admin_pages/test_workflow.py
index 0a0407658..d90ebd797 100644
--- a/tests/admin_pages/test_workflow.py
+++ b/tests/admin_pages/test_workflow.py
@@ -203,12 +203,19 @@ def test_workflows_edit_status(pub):
     resp = resp.follow()
     assert Workflow.get(1).possible_status[0].visibility == ['_receiver']
 
-    resp = resp.click('Change Terminal Status')
+    assert 'This status has been automatically evaluated as being terminal.' in resp.text
+    resp = resp.click('Force Terminal Status')
     resp.forms[0]['force_terminal_status'].checked = True
     resp = resp.forms[0].submit()
     assert resp.location == 'http://example.net/backoffice/workflows/1/status/1/'
     resp = resp.follow()
     assert Workflow.get(1).possible_status[0].forced_endpoint is True
+    assert 'This status has been manually set to be considered as terminal.' in resp.text
+    resp = resp.click('Unforce Terminal Status')
+    resp.forms[0]['force_terminal_status'].checked = False
+    resp = resp.forms[0].submit()
+    assert resp.location == 'http://example.net/backoffice/workflows/1/status/1/'
+    resp = resp.follow()
 
     resp = resp.click('Change Display Settings')
     assert resp.forms[0]['colour'].value == 'FFFFFF'
diff --git a/wcs/templates/wcs/backoffice/workflow-status.html b/wcs/templates/wcs/backoffice/workflow-status.html
index 78de3b758..7e4e4b64f 100644
--- a/wcs/templates/wcs/backoffice/workflow-status.html
+++ b/wcs/templates/wcs/backoffice/workflow-status.html
@@ -77,10 +77,26 @@ duplicate it to base your own workflow on it.
 {% elif workflow.is_readonly %}
 <div class="infonotice"><p>{% trans "This workflow is readonly." %}</p></div>
 {% else %}
+
+{% if status.is_endpoint %}
+<div class="infonotice">
+<p>
+{% if status.forced_endpoint %}
+{% trans "This status has been manually set to be considered as terminal." %}
+<br><a href="endpoint" rel="popup">{% trans "Unforce Terminal Status" %}</a>
+{% elif status.is_endpoint %}
+{% trans "This status has been automatically evaluated as being terminal." %}
+{% endif %}
+</p>
+</div>
+{% endif %}
+
 <ul id="sidebar-actions">
 <li><a href="edit" rel="popup">{% trans "Change Status Name" %}</a></li>
 <li><a href="display" rel="popup">{% trans "Change Display Settings" %}</a></li>
-<li><a href="endpoint" rel="popup">{% trans "Change Terminal Status" %}</a></li>
+{% if not status.forced_endpoint %}
+<li><a href="endpoint" rel="popup">{% trans "Force Terminal Status" %}</a></li>
+{% endif %}
 <li><a href="backoffice-info-text" rel="popup">{% trans "Change Backoffice Information Text" %}</a></li>
 <li><a href="delete" rel="popup">{% trans "Delete" %}</a></li>
 </ul>