diff --git a/library/Class/AdminVar.php b/library/Class/AdminVar.php
index 4c4e2191d90678cab763335db489ff4d21b0272a..cd3cb981b6cabf46a6d58780c1470a351583d23c 100644
--- a/library/Class/AdminVar.php
+++ b/library/Class/AdminVar.php
@@ -753,8 +753,8 @@ class Class_AdminVarLoader extends Storm_Model_Loader {
 
   /** @return string */
   public function getNomDomaine() {
-    return
-      ($domaine = preg_replace('|^.+://|', '' , trim(Class_AdminVar::get('NOM_DOMAINE'))))
+    $domaine = preg_replace('|^.+://|', '' , trim(Class_AdminVar::get('NOM_DOMAINE')));
+    return $domaine
       ?  $domaine
       :  $_SERVER['SERVER_NAME'];
   }
diff --git a/library/Class/Url.php b/library/Class/Url.php
index b5eebd23332e75aa8220a5fc258383176a613d61..7b14ed12dfda0b526a42353c3b15df48be426767 100644
--- a/library/Class/Url.php
+++ b/library/Class/Url.php
@@ -44,7 +44,7 @@ class Class_Url {
 
 
   public static function siteUrl() {
-    if (!$url = Class_AdminVar::getNomDomaine())
+    if (!$url = Class_AdminVar::get('NOM_DOMAINE'))
       $url = self::rootUrl() . self::baseUrl();
 
     return false === strpos($url, '://')
diff --git a/library/ZendAfi/Controller/Plugin/SetupDomain.php b/library/ZendAfi/Controller/Plugin/SetupDomain.php
index 9ff44b089abd6131e5b7b42b50eca72cc9b36eff..8c51584c1d8e8ba62a88a3ccd1a069cbb1352799 100644
--- a/library/ZendAfi/Controller/Plugin/SetupDomain.php
+++ b/library/ZendAfi/Controller/Plugin/SetupDomain.php
@@ -21,14 +21,14 @@
 
 class ZendAfi_Controller_Plugin_SetupDomain extends Zend_Controller_Plugin_Abstract {
   public function preDispatch(Zend_Controller_Request_Abstract $request) {
-    if (Class_Adminvar::getNomDomaine())
+    if (Class_Adminvar::get('NOM_DOMAINE'))
       return;
 
     $site_url = Class_Url::siteUrl();
     if(!self::isAllowedDomain(Class_Url::getForbidenUrls(), $site_url))
       return;
 
-    Class_Adminvar::set('NOM_DOMAINE', $site_url);
+    Class_Adminvar::set('NOM_DOMAINE', preg_replace('|^.+://|', '' , trim($site_url)));
   }
 
 
diff --git a/tests/application/modules/opac/controllers/IndexControllerTest.php b/tests/application/modules/opac/controllers/IndexControllerTest.php
index 1a99fff76b0ce40d699de36ea7454021416fc689..9fe6d088f68c2659552161cbbba1fa407ab5d157 100644
--- a/tests/application/modules/opac/controllers/IndexControllerTest.php
+++ b/tests/application/modules/opac/controllers/IndexControllerTest.php
@@ -26,7 +26,7 @@ class IndexControllerSetupDomainTest extends AbstractControllerTestCase {
   /** @test */
   public function accessingIndexShouldSetupNomDomain() {
     $this->dispatch('/');
-    $this->assertEquals('http://localhost' . Class_Url::baseUrl(),
+    $this->assertEquals('localhost' . Class_Url::baseUrl(),
                         Class_AdminVar::get('NOM_DOMAINE'));
   }
 
@@ -36,7 +36,7 @@ class IndexControllerSetupDomainTest extends AbstractControllerTestCase {
     $this->fixture('Class_AdminVar',
                    ['id' => 'NOM_DOMAINE',
                     'clef' => 'NOM_DOMAINE',
-                    'valeur' => 'http://bokeh-library-protal.org']);
+                    'valeur' => 'bokeh-library-protal.org']);
     $this->dispatch('/');
     $this->assertEquals('http://bokeh-library-protal.org', Class_Url::siteUrl());
   }