diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index eb1fee0205a..e7984a59f68 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -34,8 +34,7 @@ $langs->load("admin");
 $mode=isset($_GET["mode"])?GETPOST("mode"):(isset($_SESSION['mode'])?$_SESSION['mode']:0);
 $mesg=GETPOST("mesg");
 
-if (!$user->admin)
-    accessforbidden();
+if (!$user->admin) accessforbidden();
 
 
 /*
@@ -87,8 +86,6 @@ foreach ($conf->file->dol_document_root as $type => $dirroot)
 {
 	$modulesdir[] = $dirroot . "/core/modules/";
 
-	if ($type == 'alt')
-	{
 		$handle=@opendir($dirroot);
 		if (is_resource($handle))
 		{
@@ -104,7 +101,6 @@ foreach ($conf->file->dol_document_root as $type => $dirroot)
 			}
 			closedir($handle);
 		}
-	}
 }
 //var_dump($modulesdir);
 
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index e66ba264451..cb92f02603e 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -225,7 +225,7 @@ function run_sql($sqlfile,$silent=1,$entity='',$usesavepoint=1,$handler='')
         	{
         		$sql=preg_replace('/llx_/i',MAIN_DB_PREFIX,$sql);
         	}
-        	
+
             if (!empty($handler)) $sql=preg_replace('/__HANDLER__/i',"'".$handler."'",$sql);
 
             $newsql=preg_replace('/__ENTITY__/i',(!empty($entity)?$entity:$conf->entity),$sql);
@@ -636,16 +636,13 @@ function Activate($value,$withdeps=1)
     $ret='';
     $modName = $value;
     $modFile = $modName . ".class.php";
-    $modulesdir = array();
 
-    // Loop on each directory
-    $found=false;
+    // Loop on each directory to fill $modulesdir
+    $modulesdir = array();
     foreach ($conf->file->dol_document_root as $type => $dirroot)
     {
         $modulesdir[] = $dirroot."/core/modules/";
 
-        if ($type == 'alt')
-        {
             $handle=@opendir(dol_osencode($dirroot));
             if (is_resource($handle))
             {
@@ -661,9 +658,10 @@ function Activate($value,$withdeps=1)
                 }
                 closedir($handle);
             }
-        }
     }
 
+    // Loop on each directory
+    $found=false;
     foreach ($modulesdir as $dir)
     {
         if (file_exists($dir.$modFile))
@@ -751,16 +749,13 @@ function UnActivate($value, $requiredby=1)
     $ret='';
     $modName = $value;
     $modFile = $modName . ".class.php";
-    $modulesdir=array();
 
-    // Loop on each directory
-    $found=false;
+    // Loop on each directory to fill $modulesdir
+    $modulesdir = array();
     foreach ($conf->file->dol_document_root as $type => $dirroot)
     {
         $modulesdir[] = $dirroot."/core/modules/";
 
-        if ($type == 'alt')
-        {
             $handle=@opendir(dol_osencode($dirroot));
             if (is_resource($handle))
             {
@@ -776,9 +771,10 @@ function UnActivate($value, $requiredby=1)
                 }
                 closedir($handle);
             }
-        }
     }
 
+    // Loop on each directory
+    $found=false;
     foreach ($modulesdir as $dir)
     {
         if (file_exists($dir.$modFile))