diff --git a/htdocs/takepos/takepos.php b/htdocs/takepos/takepos.php
index fccaa222fcd..d049e46c63d 100644
--- a/htdocs/takepos/takepos.php
+++ b/htdocs/takepos/takepos.php
@@ -47,6 +47,8 @@ if ($setterminal>0)
 	$_SESSION["takeposterminal"]=$setterminal;
 }
 
+$_SESSION["urlfrom"]='/takepos/takepos.php';
+
 $langs->loadLangs(array("bills","orders","commercial","cashdesk","receiptprinter"));
 
 $categorie = new Categorie($db);
diff --git a/htdocs/user/logout.php b/htdocs/user/logout.php
index ae3fbfcbf8f..7c1a81b594c 100644
--- a/htdocs/user/logout.php
+++ b/htdocs/user/logout.php
@@ -80,6 +80,7 @@ if (session_status() === PHP_SESSION_ACTIVE)
 // Not sure this is required
 unset($_SESSION['dol_login']);
 unset($_SESSION['dol_entity']);
+unset($_SESSION['urlfrom']);
 
 if (GETPOST('noredirect')) return;
 header("Location: ".$url);		// Default behaviour is redirect to index.php page