diff --git a/htdocs/core/templates/login.tpl b/htdocs/core/templates/login.tpl
index 5ddf137f875..877bc4baf66 100644
--- a/htdocs/core/templates/login.tpl
+++ b/htdocs/core/templates/login.tpl
@@ -122,6 +122,7 @@ function donnefocus(element) {
 
 	{if $forgetpasslink || $helpcenterlink}
 		<tr><td colspan="3" align="center">
+		{strip}
 		{if $forgetpasslink}
 			<a style="color: #888888; font-size: 10px" href="{$dol_url_root}/user/passwordforgotten.php">(
 			{$langs->trans('PasswordForgotten')}
@@ -137,6 +138,7 @@ function donnefocus(element) {
 			{$langs->trans('NeedHelpCenter')}
 		{/if}
 		)</a>
+		{/strip}
 		</td></tr>
 	{/if}
 
@@ -146,9 +148,9 @@ function donnefocus(element) {
 
 </form>
 
-	{if $dol_loginmesg}
+	{if $smarty.session.dol_loginmesg}
 		<center><table width="60%"><tr><td align="center"><div class="error">
-		{$dol_loginmesg}
+		{$smarty.session.dol_loginmesg}
 		</div></td></tr></table></center>
 	{/if}
 	
diff --git a/htdocs/lib/security.lib.php b/htdocs/lib/security.lib.php
index 91aef4cba5c..e4e94dd2334 100644
--- a/htdocs/lib/security.lib.php
+++ b/htdocs/lib/security.lib.php
@@ -361,8 +361,6 @@ function dol_loginfunction2($langs,$conf,$mysoc)
 		{
 			$smarty->template_dir = DOL_DOCUMENT_ROOT."/theme/phones/other/default/templates/";
 		}
-		// Differencier les pages dans le cache
-		$cache_id = $conf->browser->phone;
 	}
 	else
 	{
@@ -380,9 +378,6 @@ function dol_loginfunction2($langs,$conf,$mysoc)
 		// Si feuille de style en php existe
 		if (file_exists(DOL_DOCUMENT_ROOT.'/'.$conf->css.".php")) $conf->css.=".php?lang=".$langs->defaultlang;
 		$smarty->assign('conf_css', DOL_URL_ROOT.'/'.$conf->css);
-		
-		// Differencier les pages dans le cache
-		$cache_id = $conf->theme;
 	}
 
 	$smarty->assign('dol_url_root', DOL_URL_ROOT);
@@ -508,13 +503,6 @@ function dol_loginfunction2($langs,$conf,$mysoc)
 		}
 	}
 
-	// Error message
-	if (! empty($_SESSION["dol_loginmesg"]))
-	{
-		$smarty->assign('dol_loginmesg', $_SESSION["dol_loginmesg"]);
-		$_SESSION["dol_loginmesg"]="";
-	}
-
 	// Home message
 	if (! empty($conf->global->MAIN_HOME))
 	{
@@ -545,14 +533,14 @@ function dol_loginfunction2($langs,$conf,$mysoc)
 	$smarty->assign('main_authentication', $conf->file->main_authentication);
 	$smarty->assign('session_name', session_name());
 	
-	// Activation du cache
-	$smarty->caching = 1;
-	
-	// Creation et mise en cache du template avec un id
-	$smarty->display('login.tpl', $cache_id);
+	// Creation du template
+	$smarty->display('login.tpl');
 	
 	// Suppression de la version compilee
 	$smarty->clear_compiled_tpl('login.tpl');
+	
+	// Reset error message
+	$_SESSION["dol_loginmesg"] = '';
 
 }
 
diff --git a/htdocs/theme/phones/iphone/default/templates/login.tpl b/htdocs/theme/phones/iphone/default/templates/login.tpl
index 7023350c4d3..f337ae00592 100644
--- a/htdocs/theme/phones/iphone/default/templates/login.tpl
+++ b/htdocs/theme/phones/iphone/default/templates/login.tpl
@@ -81,9 +81,9 @@
 
 	</fieldset>
 	
-	{if $dol_loginmesg}
+	{if $smarty.session.dol_loginmesg}
 	<div align="center">
-		{$dol_loginmesg}
+		{$smarty.session.dol_loginmesg}
 	</div>
 	{/if}