diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
index 4a7b6a96d..442f25d60 100644
--- a/app/views/layouts/_footer.html.erb
+++ b/app/views/layouts/_footer.html.erb
@@ -16,7 +16,7 @@
       <h3 class="govuk-heading-s govuk-!-margin-bottom-1">Email</h3>
       <ul class="govuk-list govuk-!-font-size-16 govuk-!-margin-bottom-0">
         <li>
-          <a class="govuk-link govuk-footer__link" href="mailto:mhclg.digital-services@communities.gov.uk?subject=CORE">dluhc.digital-services@communities.gov.uk</a>
+          <%= govuk_mail_to("submitcoredata@communities.gov.uk", class: "govuk-footer__link") %>
         </li>
         <li class="govuk-!-margin-bottom-0">We aim to respond within 2 working days</li>
       </ul>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 9552a4cba..80b1cb6cd 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -54,7 +54,7 @@
     <div class="govuk-width-container">
       <%= govuk_phase_banner(
         tag: { text: 'Beta' },
-        text: "This is a new service – #{govuk_mail_to("test@mhclg.gov.uk", "give feedback or report a problem", subject: "Feedback about Lettings and Sales of Social Housing in England Data Collection")}".html_safe
+        text: "This is a new service – #{govuk_mail_to("submitcoredata@communities.gov.uk", "give feedback or report a problem", subject: "Feedback about #{t('service_name')}")}".html_safe
       ) %>
 
       <%= content_for(:breadcrumbs) %>