diff --git a/app/views/spree/user_mailer/reset_password_instructions.html.haml b/app/views/spree/user_mailer/reset_password_instructions.html.haml
index 814a200f77..7e162e4cd6 100644
--- a/app/views/spree/user_mailer/reset_password_instructions.html.haml
+++ b/app/views/spree/user_mailer/reset_password_instructions.html.haml
@@ -6,10 +6,10 @@
                    intro: t(intro_key) }
 
 %p.callout
-  = t('.link_text')
+  = t('.click_link')
   %br
   %strong
-    = link_to @edit_password_reset_url, @edit_password_reset_url
+    = link_to t('.link_label'), @edit_password_reset_url
 
 %p
   = t('.issue_text')
diff --git a/app/views/spree/user_mailer/signup_confirmation.html.haml b/app/views/spree/user_mailer/signup_confirmation.html.haml
index 45d9e3bd95..08eac32a58 100644
--- a/app/views/spree/user_mailer/signup_confirmation.html.haml
+++ b/app/views/spree/user_mailer/signup_confirmation.html.haml
@@ -7,13 +7,10 @@
 
 %p
   = t('.confirmed_email')
-%p
+%p.callout
   -# Remove http:// and trailing slashes from root url if they exist
   = t('.shop_html', link: link_to(main_app.root_url.sub(/http:\/\//,"").sub(/\/$/,""), main_app.root_url, target: '_blank'))
-%p  
-%hr/
-%p  
-%p.lead
+%p
   = t('.signup_text')
 %p
   = t('.help_html', email: mail_to(ContentConfig.footer_email))
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0456bf6eac..9462fc1122 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -3973,19 +3973,16 @@ See the %{link} to find out more about %{sitename}'s features and to start using
         confirmed_email: "Thanks for confirming your email."
         shop_html: "You can now log in at %{link}."
         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."
-        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}"
+          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."
+        help_html: "We welcome all your questions and feedback; you can email us at %{email}."
       reset_password_instructions:
         subject: "Reset password instructions for %{sitename}"
-        request_sent_text: |
-          A request to reset your password has been made.
-          If you did not make this request, simply ignore this email.
-        link_text: >
-          If you did make this request just click the link below:
-        issue_text: |
-          If the above URL does not work try copying and pasting it into your browser.
-          If you continue to have problems please feel free to contact us.
+        request_sent_text: "A request to reset your password has been made.
+          If you did not make this request, simply ignore this email."
+        click_link: "If you did make this request just click the link below."
+        link_label: "Reset password »"
+        issue_text: "If you continue to have problems please feel free to contact us."
 
     order_updated: "Order Updated"
     add_country: "Add country"