diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php
index 0e0d4a37946..82110197a40 100644
--- a/htdocs/core/lib/security2.lib.php
+++ b/htdocs/core/lib/security2.lib.php
@@ -131,8 +131,8 @@ if (! function_exists('dol_loginfunction'))
      */
     function dol_loginfunction($langs, $conf, $mysoc)
 	{
-		global $dolibarr_main_demo, $db;
-		global $hookmanager;
+		global $dolibarr_main_demo, $dolibarr_main_force_https;
+		global $db, $hookmanager;
 
 		$langs->loadLangs(array("main","other","help","admin"));
 
@@ -187,7 +187,7 @@ if (! function_exists('dol_loginfunction'))
 		// Set cookie for timeout management
 		$prefix=dol_getprefix('');
 		$sessiontimeout='DOLSESSTIMEOUT_'.$prefix;
-		if (! empty($conf->global->MAIN_SESSION_TIMEOUT)) setcookie($sessiontimeout, $conf->global->MAIN_SESSION_TIMEOUT, 0, "/", null, false, true);
+		if (! empty($conf->global->MAIN_SESSION_TIMEOUT)) setcookie($sessiontimeout, $conf->global->MAIN_SESSION_TIMEOUT, 0, "/", null, (empty($dolibarr_main_force_https) ? false : true), true);
 
 		if (GETPOST('urlfrom', 'alpha')) $_SESSION["urlfrom"]=GETPOST('urlfrom', 'alpha');
 		else unset($_SESSION["urlfrom"]);