diff --git a/app/templates/go-live-request.txt b/app/templates/go-live-request.txt
index 7f6296d30..265986df6 100644
--- a/app/templates/go-live-request.txt
+++ b/app/templates/go-live-request.txt
@@ -3,11 +3,11 @@ Service: {{ current_service.name }}
 
 ---
 Organisation type: {{ current_service.organisation_type_label }}
-Agreement signed:
-{%- if current_service.organisation.agreement_signed %} Yes, on behalf of {{ current_service.organisation.name }}.
-{%- elif current_service.organisation.name %} {{ current_service.organisation.agreement_signed|format_yes_no(none='Can’t tell') }} (organisation is {{ current_service.organisation.name }}, {{ current_service.organisation.crown|format_yes_no(yes='a crown body', no='a non-crown body', none='crown status unknown') }}).
-{%- else %} Can’t tell (domain is {{ current_user.email_domain }}).
-{%- endif %}
+Agreement signed: {{ current_service.organisation.agreement_signed|format_yes_no(none='Can’t tell') }}
+{%- if current_service.organisation.agreement_signed %}, on behalf of {{ current_service.organisation.name }}
+{%- elif current_service.organisation.name %} (organisation is {{ current_service.organisation.name }}, {{ current_service.organisation.crown|format_yes_no(yes='a crown body', no='a non-crown body', none='crown status unknown') }})
+{%- else %} (domain is {{ 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 }}