diff --git a/app/views/enterprise_mailer/welcome.html.haml b/app/views/enterprise_mailer/welcome.html.haml
index 97b350de45..a5d6f20823 100644
--- a/app/views/enterprise_mailer/welcome.html.haml
+++ b/app/views/enterprise_mailer/welcome.html.haml
@@ -13,7 +13,7 @@
   = t :email_admin_html, link: link_to('Admin Panel', spree.admin_url)
 
 %p
-  = t :email_community_html, link: link_to('Join the community.', 'http://community.openfoodnetwork.org/')
+  = t :email_community_html, link: link_to(t(:join_the_community), #{ ContentConfig.community_forum_url })
 
 %p
   = t :email_help
diff --git a/app/views/spree/user_mailer/signup_confirmation.html.haml b/app/views/spree/user_mailer/signup_confirmation.html.haml
index e45b99a000..fe55de9a40 100644
--- a/app/views/spree/user_mailer/signup_confirmation.html.haml
+++ b/app/views/spree/user_mailer/signup_confirmation.html.haml
@@ -21,9 +21,7 @@
 %p.lead
   = t :email_signup_text
 %p
-  = t :email_signup_help_html
-  %a{:href => "mailto:hello@openfoodnetwork.org", :target => "_blank"}
-    hello@openfoodnetwork.org
+  = t :email_signup_help_html, email: mail_to(ContentConfig.footer_email, ContentConfig.footer_email)
 
 = render 'shared/mailers/signoff'
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7fd49fc2fe..71e2a5df2a 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -237,7 +237,7 @@ en:
   address: Address
   address2: Address (contd.)
   city: City
-  state: State
+  state: County
   postcode: Postcode
   country: Country
   unauthorized: Unauthorized
@@ -400,6 +400,7 @@ en:
   email_admin_html: "You can manage your account by logging into the %{link} or by clicking on the cog in the top right hand side of the homepage, and selecting Administration."
   email_community_html: "We also have an online forum for community discussion related to OFN software and the unique challenges of running a food enterprise. You are encouraged to join in. We are constantly evolving and your input into this forum will shape what happens next.
 %{link}"
+  join_community: "Join the community"
   email_help: "If you have any difficulties, check out our FAQs, browse the forum or post a 'Support' topic and someone will help you out!"
   email_confirmation_greeting: "Hi, %{contact}!"
   email_confirmation_profile_created: "A profile for %{name} has been successfully created!
@@ -447,7 +448,7 @@ See the %{link} to find out more about %{sitename}'s features and to start using
   email_signup_text: "Thanks for joining the network.
   If you are a customer, we look forward to introducing you to many fantastic farmers, wonderful food hubs and delicious food!
   If you are a producer or food enterprise, we are excited to have you as a part of the network."
-  email_signup_help_html: "We welcome all your questions and feedback; you can use the <em>Send Feedback</em> button on the site or email us at"
+  email_signup_help_html: "We welcome all your questions and feedback; you can use the <em>Send Feedback</em> button on the site or email us at %{email}"
 
   producer_mail_greeting: "Dear"
   producer_mail_text_before: "We now have all the consumer orders for the next food drop."
@@ -820,8 +821,8 @@ Please follow the instructions there to make your enterprise visible on the Open
   registration_detail_postcode: "Postcode:"
   registration_detail_postcode_placeholder: "e.g. 3070"
   registration_detail_postcode_error: "Postcode required"
-  registration_detail_state: "State:"
-  registration_detail_state_error: "State required"
+  registration_detail_state: "County:"
+  registration_detail_state_error: "County required"
   registration_detail_country: "Country:"
   registration_detail_country_error: "Please select a country"
   fees: "Fees"