diff --git a/app/views/enterprise_mailer/confirmation_instructions.html.haml b/app/views/enterprise_mailer/confirmation_instructions.html.haml
index 0014ddd365..54734b8480 100644
--- a/app/views/enterprise_mailer/confirmation_instructions.html.haml
+++ b/app/views/enterprise_mailer/confirmation_instructions.html.haml
@@ -12,7 +12,7 @@
 
 %p  
 %p
-  = t :email_confirmation_help, link: link_to(t(:email_confirmation_userguide), 'http://www.openfoodnetwork.org/platform/user-guide/'), sitename: Spree::Config[:site_name]
+  = t :email_confirmation_help_html, link: link_to(t(:email_confirmation_userguide), 'http://www.openfoodnetwork.org/platform/user-guide/'), sitename: Spree::Config[:site_name]
 
 = render 'shared/mailers/signoff'
 
diff --git a/app/views/shared/components/_enterprise_no_results.html.haml b/app/views/shared/components/_enterprise_no_results.html.haml
index 686366fc0d..97fa20c8d0 100644
--- a/app/views/shared/components/_enterprise_no_results.html.haml
+++ b/app/views/shared/components/_enterprise_no_results.html.haml
@@ -1,4 +1,4 @@
 - enterprises ||= 'filteredEnterprises'
 %producer.row{"ng-show" => "#{enterprises}.length == 0"}
   %p.no-results
-    = t :search_no_results_html, query: "<strong>{{query}}</strong>"
+    = t :search_no_results_html, query: "<strong>{{query}}</strong>".html_safe
diff --git a/app/views/shop/products/_form.html.haml b/app/views/shop/products/_form.html.haml
index e6b0035e4c..18868e5c77 100644
--- a/app/views/shop/products/_form.html.haml
+++ b/app/views/shop/products/_form.html.haml
@@ -48,7 +48,7 @@
         .row.summary
           .small-12.columns
             %p.no-results
-              = t :search_no_results_html, query: "<strong>{{query}}</strong>"
+              = t :search_no_results_html, query: "<strong>{{query}}</strong>".html_safe
     .row
       .small-12.columns
         %form{action: cart_path}
diff --git a/config/locales/en.yml b/config/locales/en.yml
index b7babd27bc..a2aead3a47 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -215,7 +215,7 @@ en:
 To activate your Profile we need to confirm this email address."
   email_confirmation_click_link: "Please click the link below to confirm your email and to continue setting up your profile."
   email_confirmation_link_label: "Confirm this email address »"
-  email_confirmation_help: "After confirming your email you can access your administration account for this enterprise.
+  email_confirmation_help_html: "After confirming your email you can access your administration account for this enterprise.
 See the %{link} to find out more about %{sitename}'s features and to start using your profile or online store."
   email_confirmation_userguide: "User Guide"
   email_social: "Connect with Us:"
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index e4a9709ac5..fdfb48da83 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -187,7 +187,7 @@ fr:
   email_confirmation_profile_created: "Le profil pour %{name} a été créé avec succès! Pour activer votre Profil nous devons vérifier cette adresse email."
   email_confirmation_click_link: "Veuillez cliquer sur le lien ci-dessous pour confirmer votre email et continuer la configuration de votre compte."
   email_confirmation_link_label: "Confirmer cette adresse email »"
-  email_confirmation_help: "Après avoir confirmé votre adresse email vous pouvez accéder au compte d'administration de cette entreprise. Voir le %{link} pour en savoir plus sur les fonctionnalités de %{sitename} et commencer à utiliser votre profil ou votre boutique en ligne."
+  email_confirmation_help_html: "Après avoir confirmé votre adresse email vous pouvez accéder au compte d'administration de cette entreprise. Voir le %{link} pour en savoir plus sur les fonctionnalités de %{sitename} et commencer à utiliser votre profil ou votre boutique en ligne."
   email_confirmation_userguide: "Guide Utilisateur"
   email_social: "Nous suivre:"
   email_contact: "Nous écrire:"
diff --git a/config/locales/nb.yml b/config/locales/nb.yml
index 059c3a5927..7d054e8bad 100644
--- a/config/locales/nb.yml
+++ b/config/locales/nb.yml
@@ -187,7 +187,7 @@ nb:
   email_confirmation_profile_created: "En profil for %{name} har blitt opprettet! For å aktivere din profil må du bekrefte denne epostadressen."
   email_confirmation_click_link: "Trykk på linken under for å bekrefte din epost og for å fortsette oppsettet av din profil."
   email_confirmation_link_label: "Bekreft denne epostadressen »"
-  email_confirmation_help: "Etter du har bekreftet epostadressen får du tilgang til din administrasjonskonto for dette selskapet. Se linken %{link} for å finne ut mer om %{sitename}s funksjoner og for å begynne å bruke din profil eller nettbutikk."
+  email_confirmation_help_html: "Etter du har bekreftet epostadressen får du tilgang til din administrasjonskonto for dette selskapet. Se linken %{link} for å finne ut mer om %{sitename}s funksjoner og for å begynne å bruke din profil eller nettbutikk."
   email_confirmation_userguide: "Brukerhåndbok"
   email_social: "Her finner du oss:"
   email_contact: "Send oss en epost:"