diff --git a/mails/en/account.html b/mails/en/account.html
index ae0339eabdffd..170c68d18ccd5 100644
--- a/mails/en/account.html
+++ b/mails/en/account.html
@@ -88,9 +88,8 @@
 						<p data-html-only="1" style="border-bottom:1px solid #D6D4D4;margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;padding-bottom:10px">
 							Your {shop_name} login details						</p>
 						<span style="color:#777">
-							Here are your login details:<br /> 
-							<span style="color:#333"><strong>E-mail address: <a href="mailto:{email}" style="color:#337ff1">{email}</a></strong></span><br />
-							<span style="color:#333"><strong>Password:</strong></span> {passwd}
+							Here are your login details:<br />
+							<span style="color:#333"><strong>E-mail address: <a href="mailto:{email}" style="color:#337ff1">{email}</a></strong></span>
 						</span>
 					</font>
 				</td>
diff --git a/mails/en/account.txt b/mails/en/account.txt
index c8c84d8cd2cba..03bc6f9876423 100644
--- a/mails/en/account.txt
+++ b/mails/en/account.txt
@@ -7,9 +7,7 @@ Thank you for creating a customer account at {shop_name}.
 
 Here are your login details:
 
-E-MAIL ADDRESS: {email}
-
-PASSWORD: {passwd} 		 
+E-MAIL ADDRESS: {email} 		 
 
 Important Security Tips:
 
diff --git a/mails/en/employee_password.html b/mails/en/employee_password.html
index 56cc7b178fe49..805267f6de4df 100644
--- a/mails/en/employee_password.html
+++ b/mails/en/employee_password.html
@@ -90,7 +90,6 @@
 							Here is your personal login information for <span style="color:#333"><strong>{shop_name}</strong></span>:<br/><br/>
 							<span style="color:#333"><strong>First name:</strong></span> {firstname}<br />
 							<span style="color:#333"><strong>Last name:</strong></span> {lastname}<br />
-							<span style="color:#333"><strong>Password:</strong></span> {passwd}<br />
 							<span style="color:#333"><strong>E-mail address:</strong></span> {email}
 						</span>
 					</font>
diff --git a/mails/en/employee_password.txt b/mails/en/employee_password.txt
index 5871c12430845..e40a003c45c22 100644
--- a/mails/en/employee_password.txt
+++ b/mails/en/employee_password.txt
@@ -9,8 +9,6 @@ FIRST NAME: {firstname}
 
 LAST NAME: {lastname}
 
-PASSWORD: {passwd}
-
 E-MAIL ADDRESS: {email} 		 
 
 {shop_name} [{shop_url}] powered by
diff --git a/mails/en/guest_to_customer.html b/mails/en/guest_to_customer.html
index 80ac4e58648aa..b3a635e9a8820 100644
--- a/mails/en/guest_to_customer.html
+++ b/mails/en/guest_to_customer.html
@@ -87,9 +87,8 @@
 						<p data-html-only="1" style="border-bottom:1px solid #D6D4D4;margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;padding-bottom:10px">
 							Your customer account creation						</p>
 						<span style="color:#777">
-							Your guest account for <span style="color:#333"><strong>{shop_name}</strong></span> was converted to a customer account. <br /><br />
-							<span style="color:#333"><strong>E-mail address:</strong></span> {email}<br /><br />
-							<span style="color:#333"><strong>Password:</strong></span> {passwd}
+							Your guest account for <span style="color:#333"><strong>{shop_name}</strong></span> has been transformed into a customer account. <br /><br />
+							<span style="color:#333"><strong>E-mail address:</strong></span> {email}
 						</span>
 					</font>
 				</td>
diff --git a/mails/en/guest_to_customer.txt b/mails/en/guest_to_customer.txt
index ecd0fffb36aa9..23efe38f54a47 100644
--- a/mails/en/guest_to_customer.txt
+++ b/mails/en/guest_to_customer.txt
@@ -3,12 +3,10 @@
 
 Hi {firstname} {lastname}, 
 
-Your guest account for {shop_name} was converted to a customer
-account. 
+Your guest account for {shop_name} has been transformed into a
+customer account. 
 
-E-MAIL ADDRESS: {email}
-
-PASSWORD: {passwd} 		 
+E-MAIL ADDRESS: {email} 		 
 
 Please be careful when sharing these login details with others. 
 
diff --git a/mails/en/password.html b/mails/en/password.html
index 5bad06899493d..1081f9055c34d 100644
--- a/mails/en/password.html
+++ b/mails/en/password.html
@@ -87,8 +87,7 @@
 						<p data-html-only="1" style="border-bottom:1px solid #D6D4D4;margin:3px 0 7px;text-transform:uppercase;font-weight:500;font-size:18px;padding-bottom:10px">
 							Your new {shop_name} login details						</p>
 						<span style="color:#777">
-							<span style="color:#333"><strong>E-mail address:</strong></span> {email}<br/>
-							<span style="color:#333"><strong>Password:</strong></span> {passwd}
+							<span style="color:#333"><strong>E-mail address:</strong></span> {email}
 						</span>
 					</font>
 				</td>
diff --git a/mails/en/password.txt b/mails/en/password.txt
index 51994c8490214..0f31e80ef1e2c 100644
--- a/mails/en/password.txt
+++ b/mails/en/password.txt
@@ -3,19 +3,17 @@
 
 Hi {firstname} {lastname}, 
 
-E-MAIL ADDRESS: {email}
-
-PASSWORD: {passwd} 		 
+E-MAIL ADDRESS: {email} 
 
 You can review your order and download your invoice from the
-"Order history" [{history_url}] section of your
-customer account by clicking "My account"
+"Order history" [{history_url}] section
+of your customer account by clicking "My account"
 [{my_account_url}] on our shop. 
 
 If you have a guest account, you can follow your order via the
 "Guest Tracking"
-[{guest_tracking_url}?id_order={order_name}] section
-on our shop. 
+[{guest_tracking_url}?id_order={order_name}]
+section on our shop. 
 
 {shop_name} [{shop_url}] powered by
 PrestaShop(tm) [http://www.prestashop.com/]