diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 15bee891775..48d662774ae 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -66,6 +66,14 @@ $conffiletoshow = "htdocs/conf/conf.php";
 //$conffile = "/etc/dolibarr/conf.php";
 //$conffiletoshow = "/etc/dolibarr/conf.php";
 
+//replace conf filename with "conf" parameter on url by GET
+if (!empty($_GET['conf'])) {
+    setcookie('dolconf', $_GET['conf'],0,'/');
+    $conffile = 'conf/' . $_GET['conf'] . '.php';
+} else {
+    $conffile = 'conf/' . (!empty($_COOKIE['dolconf']) ? $_COOKIE['dolconf'] : 'conf') . '.php';
+}
+
 
 // Include configuration
 $result=@include_once $conffile;	// Keep @ because with some error reporting this break the redirect