diff --git a/core/trunk/core/class/class_core_tools.php b/core/trunk/core/class/class_core_tools.php
index f65a5a205ff5c56c048864f42c94f7214e38cf7e..cd2cfb7b5dfe0355cfa2c27728db072542859cc8 100644
--- a/core/trunk/core/class/class_core_tools.php
+++ b/core/trunk/core/class/class_core_tools.php
@@ -891,7 +891,7 @@ class core_tools extends functions
             <title><?php  echo $title;?></title>
             <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
             <meta http-equiv="Content-Language" content="<?php  echo $_SESSION['config']['lang'];?>" />
-			<link rel="icon" type="image/png" href="<?php echo $_SESSION['config']['businessappurl'];?>img/favicon.png"/>
+			<link rel="icon" type="image/png" href="<?php echo $_SESSION['config']['businessappurl'];?>static.php?filename=favicon.png"/>
             <?php
             if($load_css)
             {
diff --git a/core/trunk/core/class/class_security.php b/core/trunk/core/class/class_security.php
index 1e2a78b17ac6063d581757c919abd64df26b7711..c7dcb9a3d430b71ee2dbe65617ad03b6fdacec8c 100644
--- a/core/trunk/core/class/class_security.php
+++ b/core/trunk/core/class/class_security.php
@@ -452,7 +452,7 @@ class security extends dbquery
 			$query = "select * from ".$_SESSION['tablename']['users']." where user_id like '".$this->protect_string_db($s_login)."' and password = '".$pass."' and STATUS <> 'DEL'";
 
 		$this->query($query);
-
+		
 		if($this->nb_result() > 0)
 		{
 			$line = $this->fetch_object();
@@ -500,14 +500,14 @@ class security extends dbquery
 
 					$hist->add($_SESSION['tablename']['users'],$_SESSION['user']['UserId'],"LOGIN","IP : ".$ip.", BROWSER : ".$navigateur , $_SESSION['config']['databasetype']);
 				}
-
+				
 				if($_SESSION['user']['change_pass'] == 'Y')
 				{
 					header("location: ".$_SESSION['config']['businessappurl']."index.php?display=true&page=change_pass");
 					exit();
 				}
 
-				elseif(trim($_SESSION['requestUri']) <> "")
+				elseif(isset($_SESSION['requestUri']) && trim($_SESSION['requestUri']) <> ""&& !preg_match('/page=login/', $_SESSION['requestUri']))
 				{
 					header("location: ".$_SESSION['config']['businessappurl']."index.php?".$_SESSION['requestUri']);
 					exit();
@@ -527,8 +527,9 @@ class security extends dbquery
 		}
 		else
 		{
+			
 			$_SESSION['error'] = _BAD_LOGIN_OR_PSW."&hellip;";
-			header("location: ".$_SESSION['config']['businessappurl']."login.php?coreurl=".$_SESSION['config']['coreurl']);
+			header("location: ".$_SESSION['config']['businessappurl']."index.php?display=true&page=login&coreurl=".$_SESSION['config']['coreurl']);
 			exit();
 		}
 	}
@@ -626,7 +627,7 @@ class security extends dbquery
 		else
 		{
 			$_SESSION['error'] = _ERROR;
-			header("location: ".$_SESSION['config']['businessappurl']."login.php?coreurl=".$_SESSION['config']['coreurl']);
+			header("location: ".$_SESSION['config']['businessappurl']."index.php?display=true&page=login&coreurl=".$_SESSION['config']['coreurl']);
 			exit();
 		}
 	}