diff --git a/ChangeLog b/ChangeLog
index f889d206469..ecd5a6b7160 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -73,6 +73,7 @@ For developers:
 - New: External modules can show export list with an "enabled" condition.
 - New: Support a backtopage parameter on contact creation page
 - New: Add id on div to show logo
+- New: Install wizard can activate a module during install.
 - New: Dictionnary setup works with very large external dictionnaries (Add 
        page navigation).
 
diff --git a/htdocs/lib/admin.lib.php b/htdocs/lib/admin.lib.php
index e7da6c7ecba..2c80bb5cf73 100644
--- a/htdocs/lib/admin.lib.php
+++ b/htdocs/lib/admin.lib.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2008-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2008-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -618,6 +618,7 @@ function Activate($value,$withdeps=1)
         $file = $modName . ".class.php";
 
         // Loop on each directory
+        $found=false;
         foreach ($conf->file->dol_document_root as $dol_document_root)
         {
             $dir = $dol_document_root."/includes/modules/";
@@ -706,6 +707,7 @@ function UnActivate($value,$requiredby=1)
         $file = $modName . ".class.php";
 
         // Loop on each directory
+		$found=false;
         foreach ($conf->file->dol_document_root as $dol_document_root)
         {
             $dir = $dol_document_root."/includes/modules/";