diff --git a/app/models/organisation.py b/app/models/organisation.py
index d852768f4..f789dff23 100644
--- a/app/models/organisation.py
+++ b/app/models/organisation.py
@@ -102,8 +102,6 @@ class Organisation(JSONModel):
             self.email_branding_id = None
 
     def as_agreement_statement_for_go_live_request(self, fallback_domain):
-        if self.agreement_signed:
-            return 'Yes, on behalf of {}.'.format(self.name)
         if self.name:
             return '{} (organisation is {}, {}).'.format(
                 {
diff --git a/app/templates/go-live-request.txt b/app/templates/go-live-request.txt
index 953d268b8..124a397b1 100644
--- a/app/templates/go-live-request.txt
+++ b/app/templates/go-live-request.txt
@@ -3,7 +3,11 @@ Service: {{ current_service.name }}
 
 ---
 Organisation type: {{ current_service.organisation_type_label }}
+{% if current_service.organisation.agreement_signed -%}
+Agreement signed: Yes, on behalf of {{ current_service.organisation.name }}.
+{%- else -%}
 Agreement signed: {{ current_service.organisation.as_agreement_statement_for_go_live_request(current_user.email_domain) }}
+{%- endif %}
 {%- if current_service.organisation.request_to_go_live_notes %} {{ current_service.organisation.request_to_go_live_notes }}{% endif %}
 {%- if current_service.organisation.agreement_signed_by %}
 Agreement signed by: {{ current_service.organisation.agreement_signed_by.email_address }}