diff --git a/htdocs/install/index.php b/htdocs/install/index.php
index ce90baf8fe6..4644504aa1c 100644
--- a/htdocs/install/index.php
+++ b/htdocs/install/index.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2004-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2007 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@
  */
 include_once("./inc.php");
 include_once("../core/class/html.form.class.php");
-include_once("../html.formadmin.class.php");
+include_once("../core/class/html.formadmin.class.php");
 
 
 $err = 0;
diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php
index 86ec495a13a..684748429e4 100644
--- a/htdocs/install/upgrade.php
+++ b/htdocs/install/upgrade.php
@@ -67,7 +67,7 @@ if (! is_object($conf)) dolibarr_install_syslog("upgrade2: conf file not initial
  * View
  */
 
-pHeader('',"upgrade2",$_REQUEST['action'],'versionfrom='.$versionfrom.'&versionto='.$versionto);
+pHeader('',"upgrade2",isset($_REQUEST['action'])?$_REQUEST['action']:'','versionfrom='.$versionfrom.'&versionto='.$versionto);
 
 $actiondone=0;
 
@@ -80,7 +80,7 @@ if (! isset($_GET["action"]) || preg_match('/upgrade/i',$_GET["action"]))
 
 	if (! $versionfrom && ! $versionto)
 	{
-		print '<div class="error">Parameter versionfrom or version to missing.</div>';
+		print '<div class="error">Parameter versionfrom or version to missing. Upgrade is launched from page install/install.php (like a first install) instead of install/upgrade.php</div>';
 		exit;
 	}
 
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 429c530fde6..82f4b863af8 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -25,7 +25,7 @@ DBStoringCharset=Database charset to store data
 DBSortingCharset=Database charset to sort data
 WarningModuleNotActive=Module <b>%s</b> must be enabled
 WarningOnlyPermissionOfActivatedModules=Only permissions related to activated modules are shown here. You can activate other modules in the Home->Setup->Modules page.
-DolibarrSetup=Dolibarr setup
+DolibarrSetup=Dolibarr install or upgrade
 DolibarrUser=Dolibarr user
 InternalUser=Internal user
 ExternalUser=External user
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 87dd6a1978e..61a2ab85c21 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -25,7 +25,7 @@ DBStoringCharset= Charset base pour stockage données
 DBSortingCharset= Charset base pour tri données
 WarningModuleNotActive= Module <b>%s</b> non actif
 WarningOnlyPermissionOfActivatedModules= Attention, seules les permissions en rapport avec les modules activés sont affichées ici. Vous pouvez activer les autres modules sur la page Accueil->Configuration->Modules
-DolibarrSetup= Installation de Dolibarr
+DolibarrSetup= Installation ou mise à jour de Dolibarr
 DolibarrUser= Utilisateur Dolibarr
 InternalUser= Utilisateur interne
 ExternalUser= Utilisateur externe