diff --git a/login.php b/login.php
index 73ee7ac7..537ae1f2 100644
--- a/login.php
+++ b/login.php
@@ -591,8 +591,11 @@ if ($ui->st('w', 'get') == 'lo') {
 
         if (isset($active, $id, $resellerid) and $active == 'Y' and isset($passwordCorrect) and $passwordCorrect) {
 
+            $sessionCookieParameter = session_get_cookie_params();
+
             session_unset();
             session_destroy();
+            session_set_cookie_params($sessionCookieParameter['lifetime'], $sessionCookieParameter['path'], $sessionCookieParameter['domain'], true, ($ui->escaped('HTTPS', 'server') == 'on'));
             session_start();
 
             # https://github.com/easy-wi/developer/issues/2
diff --git a/stuff/settings.php b/stuff/settings.php
index 2fb70c2b..22316d09 100644
--- a/stuff/settings.php
+++ b/stuff/settings.php
@@ -127,6 +127,8 @@ $page_url = ($ui->escaped ('HTTPS', 'server')) ? 'https://' . $ui->domain('HTTP_
 
 if ($loguserip != 'localhost') {
 
+    $sessionCookieParameter = session_get_cookie_params();
+    session_set_cookie_params($sessionCookieParameter['lifetime'], $sessionCookieParameter['path'], $sessionCookieParameter['domain'], true, ($ui->escaped('HTTPS', 'server') == 'on'));
     session_start();
 
     if (isset($_SESSION['userid']) and is_numeric($_SESSION['userid']) and isset($_SESSION['adminid']) and is_numeric($_SESSION['adminid'])) {