diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index 02c5cf8dcf7..f97c6efed1c 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -384,12 +384,13 @@ function dolWebsiteSaveContent($content)
 /**
  * Make a redirect to another container.
  *
- * @param 	string	$containerref		Ref of container to redirect to (must be a page from website root. Example: 'mypage.php' means 'mywebsite/mypage.php').
+ * @param 	string	$containerref		Ref of container to redirect to (Example: 'mypage' or 'mypage.php').
  * @param 	string	$containeraliasalt	Ref of alternative aliases to redirect to.
  * @param 	int		$containerid		Id of container.
+ * @param	int		$permanent			0=Use temporary redirect 302, 1=Use permanent redirect 301
  * @return  void
  */
-function redirectToContainer($containerref, $containeraliasalt = '', $containerid = 0)
+function redirectToContainer($containerref, $containeraliasalt = '', $containerid = 0, $permanent = 0)
 {
 	global $db, $website;
 
@@ -436,6 +437,7 @@ function redirectToContainer($containerref, $containeraliasalt = '', $containeri
 		if ($result > 0)
 		{
 			$currenturi = $_SERVER["REQUEST_URI"];
+			$regtmp = array();
 			if (preg_match('/&pageref=([^&]+)/', $currenturi, $regtmp))
 			{
 				if ($regtmp[0] == $containerref)
@@ -461,6 +463,9 @@ function redirectToContainer($containerref, $containeraliasalt = '', $containeri
 
 	if ($newurl)
 	{
+		if ($permanent) {
+			header("Status: 301 Moved Permanently", false, 301);
+		}
 		header("Location: ".$newurl);
 		exit;
 	}
diff --git a/htdocs/core/website.inc.php b/htdocs/core/website.inc.php
index 34c011c34ca..2cc046ac818 100644
--- a/htdocs/core/website.inc.php
+++ b/htdocs/core/website.inc.php
@@ -61,6 +61,10 @@ if ($pageid > 0)
 	}
 }
 
+if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
+	header("X-Content-Type-Options: nosniff");
+}
+
 // A lang was forced, so we change weblangs init
 if (GETPOST('l', 'aZ09')) $weblangs->setDefaultLang(GETPOST('l', 'aZ09'));
 // A lang was forced, so we check to find if we must make a redirect on translation page