diff --git a/config.php b/config.php
index f1b3ab6..4c8e903 100644
--- a/config.php
+++ b/config.php
@@ -33,7 +33,9 @@ class config
   /** Select the configuration file */
   public function selectConfFile ()
   {
-    if (defined("CONFIGFILE"))
+    if ($this->confFile !== null)
+      $this->confFile = $this->confFile;
+    elseif (defined("CONFIGFILE"))
       $this->confFile = CONFIGFILE;
     elseif (file_exists ("./datas/configuration.php"))
       $this->confFile = "./datas/configuration.php";
@@ -51,6 +53,7 @@ class config
   /** Return the defined values */
   public function getAll ()
   {
+    $this->selectConfFile ();
     $conf = array ();
     $rc = include ($this->confFile);
     if ($rc !== 1)