diff --git a/controllers/front/AuthController.php b/controllers/front/AuthController.php
index 123f1f23f..8731bb44a 100644
--- a/controllers/front/AuthController.php
+++ b/controllers/front/AuthController.php
@@ -328,6 +328,8 @@ class AuthControllerCore extends FrontController
 			);
 			die(Tools::jsonEncode($return));
 		}
+		else
+			$this->context->smarty->assign('authentification_error', $this->errors);
 	}
 
 	/**
@@ -349,7 +351,7 @@ class AuthControllerCore extends FrontController
 		if (!Validate::isEmail($email = Tools::getValue('email')) || empty($email))
 			$this->errors[] = Tools::displayError('Invalid e-mail address');
 		elseif (Customer::customerExists($email))
-			$this->errors[] = Tools::displayError('An account is already registered with this e-mail, please fill in the password or request a new one.');
+			$this->errors[] = Tools::displayError('An account is already registered with this e-mail.');
 		// Preparing customer
 		$customer = new Customer();
 		$_POST['lastname'] = Tools::getValue('customer_lastname');
@@ -580,6 +582,7 @@ class AuthControllerCore extends FrontController
 				);
 				die(Tools::jsonEncode($return));
 			}
+			$this->context->smarty->assign('account_error', $this->errors);
 		}
 	}
 
diff --git a/themes/default/authentication.tpl b/themes/default/authentication.tpl
index 2165a20fd..02eb41420 100644
--- a/themes/default/authentication.tpl
+++ b/themes/default/authentication.tpl
@@ -151,6 +151,20 @@ $(function(){ldelim}
 	}
 	{/literal}
 	</script>
+	{if isset($authentification_error)}
+	<div class="error">
+		{if {$authentification_error|@count} == 1}
+			<p>{l s='There is one error'} :</p>
+			{else}
+			<p>{l s='There are '}{$account_error|@count} {l s='errors'} :</p>
+		{/if}
+		<ol>
+			{foreach from=$authentification_error item=v}
+				<li>{$v}</li>
+			{/foreach}
+		</ol>
+	</div>
+	{/if}
 	<form action="{$link->getPageLink('authentication', true)}" method="post" id="create-account_form" class="std">
 		<fieldset>
 			<h3>{l s='Create your account'}</h3>
@@ -348,6 +362,20 @@ $(function(){ldelim}
 		</form>
 	{/if}
 {else}
+	{if isset($account_error)}
+	<div class="error">
+		{if {$account_error|@count} == 1}
+			<p>{l s='There is one error'} :</p>
+			{else}
+			<p>{l s='There are '}{$account_error|@count} {l s='errors'} :</p>
+		{/if}
+		<ol>
+			{foreach from=$account_error item=v}
+				<li>{$v}</li>
+			{/foreach}
+		</ol>
+	</div>
+	{/if}
 <form action="{$link->getPageLink('authentication', true)}" method="post" id="account-creation_form" class="std">
 	{$HOOK_CREATE_ACCOUNT_TOP}
 	<fieldset class="account_creation">