diff --git a/templates/frontOffice/default/account.html b/templates/frontOffice/default/account.html
index b5453d673..a6fe50d84 100644
--- a/templates/frontOffice/default/account.html
+++ b/templates/frontOffice/default/account.html
@@ -38,15 +38,15 @@
                             <ul class="list-info">
                                 <li>
                                     <address class="adr">
-                                        <span class="street-address">{$ADDRESS1}</span><br>
+                                        <span class="street-address">{$ADDRESS1 nofilter}</span><br>
                                         {if $ADDRESS2 != ""}
-                                            <span class="extended-address">{$ADDRESS2}</span><br>
+                                            <span class="extended-address">{$ADDRESS2 nofilter}</span><br>
                                         {/if}
                                         {if $ADDRESS3 != ""}
-                                            <span class="extended-address">{$ADDRESS3}</span><br>
+                                            <span class="extended-address">{$ADDRESS3 nofilter}</span><br>
                                         {/if}
                                         <span class="postal-code">{$ZIPCODE}</span>
-                                        <span class="locality">{$CITY}<br><span class="country-name">{loop type="country" name="customer.country.info" id=$COUNTRY}{$TITLE}{/loop}</span></span>
+                                        <span class="locality">{$CITY nofilter}<br><span class="country-name">{loop type="country" name="customer.country.info" id=$COUNTRY}{$TITLE}{/loop}</span></span>
                                     </address>
                                 </li>
                                 <li>
@@ -94,15 +94,15 @@
                                             </li>
                                             <li>
                                                 <address class="adr">
-                                                    <span class="street-address">{$ADDRESS1}</span><br>
+                                                    <span class="street-address">{$ADDRESS1 nofilter}</span><br>
                                                     {if $ADDRESS2 != ""}
-                                                        <span class="street-address">{$ADDRESS2}</span><br>
+                                                        <span class="street-address">{$ADDRESS2 nofilter}</span><br>
                                                     {/if}
                                                     {if $ADDRESS3 != ""}
-                                                        <span class="street-address">{$ADDRESS3}</span><br>
+                                                        <span class="street-address">{$ADDRESS3 nofilter}</span><br>
                                                     {/if}
                                                     <span class="postal-code">{$ZIPCODE}</span>
-                                                    <span class="locality">{$CITY}, <span class="country-name">{loop type="country" name="customer.country.info" id=$COUNTRY}{$TITLE}{/loop}</span></span>
+                                                    <span class="locality">{$CITY nofilter}, <span class="country-name">{loop type="country" name="customer.country.info" id=$COUNTRY}{$TITLE}{/loop}</span></span>
                                                 </address>
                                             </li>
                                             <li>
diff --git a/templates/frontOffice/default/register.html b/templates/frontOffice/default/register.html
index b94cdd2e8..afe5e8a2b 100644
--- a/templates/frontOffice/default/register.html
+++ b/templates/frontOffice/default/register.html
@@ -265,7 +265,7 @@
                     <div class="control-input">
                         <div class="checkbox">
                             <label class="control-label" for="{$label_attr.for}">
-                                <input type="checkbox" name="{$name}" id="{$label_attr.for}" value="{$value}"{if $checked} checked{/if}  {if $required} aria-required="true" required{/if}>I've read and agreed on <a href="#">Terms &amp; Conditions</a>.
+                                <input type="checkbox" name="{$name}" id="{$label_attr.for}" value="{$value}"{if $checked} checked{/if}  {if $required} aria-required="true" required{/if}>{intl l="I've read and agreed on <a href='#'>Terms &amp; Conditions"}</a>.
                             </label>
                             {if $error }
                                 <span class="help-block">{$message}</span>