diff --git a/install-dev/langs/en/data/meta.xml b/install-dev/langs/en/data/meta.xml
index bae593782..9fc060f31 100644
--- a/install-dev/langs/en/data/meta.xml
+++ b/install-dev/langs/en/data/meta.xml
@@ -3,61 +3,61 @@
   <meta id="404" id_shop="1">
     <title>404 error</title>
     <description>This page cannot be found</description>
-    <keywords>error, 404, not found</keywords>
+    <keywords/>
     <url_rewrite>page-not-found</url_rewrite>
   </meta>
   <meta id="best-sales" id_shop="1">
     <title>Best sales</title>
     <description>Our best sales</description>
-    <keywords>best sales</keywords>
+    <keywords/>
     <url_rewrite>best-sales</url_rewrite>
   </meta>
   <meta id="contact" id_shop="1">
     <title>Contact us</title>
     <description>Use our form to contact us</description>
-    <keywords>contact, form, e-mail</keywords>
+    <keywords/>
     <url_rewrite>contact-us</url_rewrite>
   </meta>
   <meta id="index" id_shop="1">
     <title/>
     <description>Shop powered by PrestaShop</description>
-    <keywords>shop, prestashop</keywords>
+    <keywords/>
     <url_rewrite/>
   </meta>
   <meta id="manufacturer" id_shop="1">
     <title>Manufacturers</title>
     <description>Manufacturers list</description>
-    <keywords>manufacturer</keywords>
+    <keywords/>
     <url_rewrite>manufacturers</url_rewrite>
   </meta>
   <meta id="new-products" id_shop="1">
     <title>New products</title>
     <description>Our new products</description>
-    <keywords>new, products</keywords>
+    <keywords/>
     <url_rewrite>new-products</url_rewrite>
   </meta>
   <meta id="password" id_shop="1">
     <title>Forgot your password</title>
     <description>Enter your e-mail address used to register in goal to get e-mail with your new password</description>
-    <keywords>forgot, password, e-mail, new, reset</keywords>
+    <keywords/>
     <url_rewrite>password-recovery</url_rewrite>
   </meta>
   <meta id="prices-drop" id_shop="1">
     <title>Prices drop</title>
     <description>Our special products</description>
-    <keywords>special, prices drop</keywords>
+    <keywords/>
     <url_rewrite>prices-drop</url_rewrite>
   </meta>
   <meta id="sitemap" id_shop="1">
     <title>Sitemap</title>
     <description>Lost ? Find what your are looking for</description>
-    <keywords>sitemap</keywords>
+    <keywords/>
     <url_rewrite>sitemap</url_rewrite>
   </meta>
   <meta id="supplier" id_shop="1">
     <title>Suppliers</title>
     <description>Suppliers list</description>
-    <keywords>supplier</keywords>
+    <keywords/>
     <url_rewrite>supplier</url_rewrite>
   </meta>
   <meta id="address" id_shop="1">
@@ -73,10 +73,10 @@
     <url_rewrite>addresses</url_rewrite>
   </meta>
   <meta id="authentication" id_shop="1">
-    <title>Authentication</title>
+    <title>Login</title>
     <description/>
     <keywords/>
-    <url_rewrite>authentication</url_rewrite>
+    <url_rewrite>login</url_rewrite>
   </meta>
   <meta id="cart" id_shop="1">
     <title>Cart</title>
diff --git a/install-dev/langs/fr/data/meta.xml b/install-dev/langs/fr/data/meta.xml
index a197ea60a..9d845be18 100644
--- a/install-dev/langs/fr/data/meta.xml
+++ b/install-dev/langs/fr/data/meta.xml
@@ -3,61 +3,61 @@
   <meta id="404" id_shop="1">
     <title>Erreur 404</title>
     <description>Cette page est introuvable</description>
-    <keywords>erreur, 404, introuvable</keywords>
+    <keywords/>
     <url_rewrite>page-non-trouvee</url_rewrite>
   </meta>
   <meta id="best-sales" id_shop="1">
     <title>Meilleures ventes</title>
     <description>Liste de nos produits les mieux vendus</description>
-    <keywords>meilleures ventes</keywords>
+    <keywords/>
     <url_rewrite>meilleures-ventes</url_rewrite>
   </meta>
   <meta id="contact" id_shop="1">
     <title>Contactez-nous</title>
     <description>Utilisez notre formulaire pour nous contacter</description>
-    <keywords>contact, formulaire, e-mail</keywords>
+    <keywords/>
     <url_rewrite>contactez-nous</url_rewrite>
   </meta>
   <meta id="index" id_shop="1">
     <title/>
     <description>Boutique propuls&#xE9;e par PrestaShop</description>
-    <keywords>boutique, prestashop</keywords>
+    <keywords/>
     <url_rewrite/>
   </meta>
   <meta id="manufacturer" id_shop="1">
     <title>Fabricants</title>
     <description>Liste de nos fabricants</description>
-    <keywords>fabricants</keywords>
+    <keywords/>
     <url_rewrite>fabricants</url_rewrite>
   </meta>
   <meta id="new-products" id_shop="1">
     <title>Nouveaux produits</title>
     <description>Liste de nos nouveaux produits</description>
-    <keywords>nouveau, produit</keywords>
+    <keywords/>
     <url_rewrite>nouveaux-produits</url_rewrite>
   </meta>
   <meta id="password" id_shop="1">
     <title>Mot de passe oubli&#xE9;</title>
     <description>Renseignez votre adresse e-mail afin de recevoir votre nouveau mot de passe.</description>
-    <keywords>mot de passe, oubli&#xE9;, e-mail, nouveau, reg&#xE9;n&#xE9;ration</keywords>
+    <keywords/>
     <url_rewrite>mot-de-passe-oublie</url_rewrite>
   </meta>
   <meta id="prices-drop" id_shop="1">
     <title>Promotions</title>
     <description>Nos produits en promotion</description>
-    <keywords>promotion, r&#xE9;duction</keywords>
+    <keywords/>
     <url_rewrite>promotions</url_rewrite>
   </meta>
   <meta id="sitemap" id_shop="1">
     <title>Plan du site</title>
     <description>Perdu ? Trouvez ce que vous cherchez</description>
-    <keywords>plan, site</keywords>
+    <keywords/>
     <url_rewrite>plan-du-site</url_rewrite>
   </meta>
   <meta id="supplier" id_shop="1">
     <title>Fournisseurs</title>
     <description>Liste de nos fournisseurs</description>
-    <keywords>fournisseurs</keywords>
+    <keywords/>
     <url_rewrite>fournisseurs</url_rewrite>
   </meta>
   <meta id="address" id_shop="1">
diff --git a/mails/en/lang.php b/mails/en/lang.php
index 5a7a5d491..2ddd3600f 100644
--- a/mails/en/lang.php
+++ b/mails/en/lang.php
@@ -26,38 +26,35 @@
 
 global $_LANGMAIL;
 $_LANGMAIL = array();
-$_LANGMAIL['Welcome!'] = 'Welcome!';
-$_LANGMAIL['Message from contact form'] = 'Customer message from contact form';
-$_LANGMAIL['Your message has been correctly sent'] = 'Your message has been sent successfully';
-$_LANGMAIL['New credit slip regarding your order'] = 'New credit slip regarding your order';
+
 $_LANGMAIL['Virtual product to download'] = 'Virtual product(s) available for download';
-$_LANGMAIL['Fwd: Customer message'] = 'Fwd: Customer message';
 $_LANGMAIL['Your guest account has been transformed to customer account'] = 'Your guest account has been transformed to a customer account';
-$_LANGMAIL['Package in transit'] = 'Package in transit';
-$_LANGMAIL['[Log'] = '[Log';
-$_LANGMAIL['Order confirmation'] = 'Order confirmation';
-$_LANGMAIL['Message from a customer'] = 'Message from a customer';
-$_LANGMAIL['New message regarding your order'] = 'New message regarding your order';
 $_LANGMAIL['Your order return state has changed'] = 'Your order return status has changed';
-$_LANGMAIL['Your password'] = 'Your password has been reset';
 $_LANGMAIL['Password query confirmation'] = 'Forgot password';
-$_LANGMAIL['An answer to your message is available'] = 'New response to your inquiry';
 $_LANGMAIL['New voucher regarding your order %s'] = 'New voucher for your order %s';
-$_LANGMAIL['Happy birthday!'] = 'Happy birthday!';
 $_LANGMAIL['Newsletter confirmation'] = 'Newsletter subscription confirmation';
-$_LANGMAIL['Newsletter voucher'] = 'Newsletter voucher';
-$_LANGMAIL['Your wishlist\\\'s link'] = 'Your wishlist\'s link';
-$_LANGMAIL['Message from '] = 'Message from ';
-$_LANGMAIL['$subject'] = '';
 $_LANGMAIL['Your cart and your discount'] = 'Discount offer for items in your cart';
 $_LANGMAIL['Thanks for your order'] = 'Thanks for your order!';
 $_LANGMAIL['You are one of our best customers'] = 'Thank you for being one of our best customers';
-$_LANGMAIL['We miss you'] = 'We miss you';
 $_LANGMAIL['Product available'] = 'Your watched product is now available';
 $_LANGMAIL['Product out of stock'] = 'One or more products are almost out of stock';
-$_LANGMAIL['Error reporting from your PayPal module'] = 'Error reporting from your PayPal module';
+$_LANGMAIL['We miss you'] = 'We miss you';
+$_LANGMAIL['Email verification'] = 'Email verification';
+$_LANGMAIL['Newsletter voucher'] = 'Newsletter voucher';
+$_LANGMAIL['Stock coverage'] = 'Stock coverage';
 $_LANGMAIL['Congratulations!'] = 'Congratulations!';
-$_LANGMAIL['Referral Program'] = 'Referral program';
-$_LANGMAIL['A friend sent you a link to'] = 'A friend sent you a link to';
-
-?>
\ No newline at end of file
+$_LANGMAIL['Your wishlist\\\'s link'] = 'Your wishlist\'s link';
+$_LANGMAIL['Message from %1$s %2$s'] = 'Message from %1$s %2$s';
+$_LANGMAIL['Your order has been changed'] = 'Your order has been changed';
+$_LANGMAIL['Welcome!'] = 'Welcome!';
+$_LANGMAIL['New credit slip regarding your order'] = 'New credit slip regarding your order';
+$_LANGMAIL['Fwd: Customer message'] = 'Fwd: Customer message';
+$_LANGMAIL['Package in transit'] = 'Package in transit';
+$_LANGMAIL['Order confirmation'] = 'Order confirmation';
+$_LANGMAIL['Message from a customer'] = 'Message from a customer';
+$_LANGMAIL['New message regarding your order'] = 'New message regarding your order';
+$_LANGMAIL['Process the payment of your order'] = 'Process the payment of your order';
+$_LANGMAIL['Log: You have a new alert from your shop'] = 'Log: You have a new alert from your shop';
+$_LANGMAIL['Your new password'] = 'Your new password';
+$_LANGMAIL['An answer to your message is available #ct%1$s #tc%2$s'] = 'An answer to your message is available #ct%1$s #tc%2$s';
+$_LANGMAIL['%1$s sent you a link to %2$s'] = '%1$s sent you a link to %2$s';