diff --git a/htdocs/admin/index.php b/htdocs/admin/index.php
index 2a02feb9b90..a97e70d7bd4 100644
--- a/htdocs/admin/index.php
+++ b/htdocs/admin/index.php
@@ -46,12 +46,11 @@ $form = new Form($db);
 
 print_fiche_titre($langs->trans("SetupArea"),'','setup');
 
-print "<br>";
-print '<center><img src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.png" alt="Dolibarr logo"></center><br>';
+//print '<a href="'.$dolibarr_main_url_root .'/admin/index.php?mainmenu=home&leftmenu=setup'.(isset($_POST["login"])?'&username='.urlencode($_POST["login"]):'').'">';
+//print '<center><img src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.png" alt="Dolibarr logo"></center><br>';
 
 if ($mesg) print $mesg.'<br>';
 
-print "<br>";
 print $langs->trans("SetupDescription1").'<br>';
 print $langs->trans("AreaForAdminOnly").'<br>';
 
diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php
index 3b409b7820b..9c9e08ff27c 100644
--- a/htdocs/install/etape5.php
+++ b/htdocs/install/etape5.php
@@ -240,9 +240,18 @@ if ($_POST["action"] == "upgrade")
 }
 
 
-print '<a href="'.$dolibarr_main_url_root .'/admin/index.php?mainmenu=home&leftmenu=setup'.(isset($_POST["login"])?'&username='.urlencode($_POST["login"]):'').'">';
-print $langs->trans("GoToSetupArea");
-print '</a>';
+if ($_POST["action"] == "upgrade")
+{
+	print '<a href="'.$dolibarr_main_url_root .'/index.php?mainmenu=home'.(isset($_POST["login"])?'&username='.urlencode($_POST["login"]):'').'">';
+	print $langs->trans("GoToSetupArea");
+	print '</a>';
+}
+else
+{
+	print '<a href="'.$dolibarr_main_url_root .'/admin/index.php?mainmenu=home&leftmenu=setup'.(isset($_POST["login"])?'&username='.urlencode($_POST["login"]):'').'">';
+	print $langs->trans("GoToDolSetupArea");
+	print '</a>';
+}
 
 
 // Clear cache files
diff --git a/htdocs/langs/en_US/install.lang b/htdocs/langs/en_US/install.lang
index f0ed7c87c74..ce5f3a1c366 100644
--- a/htdocs/langs/en_US/install.lang
+++ b/htdocs/langs/en_US/install.lang
@@ -82,6 +82,7 @@ SystemIsInstalled=This installation is complete.
 SystemIsUpgraded=Dolibarr has been upgraded successfully.
 YouNeedToPersonalizeSetup=You need to configure Dolibarr to match your needs (appearance, features, ...). To do this, please follow the link below:
 AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfuly.
+GoToDolibarr=Go to Dolibarr
 GoToSetupArea=Go to Dolibarr (setup area)
 Examples=Examples
 WithNoSlashAtTheEnd=Without the slash "/" at the end
diff --git a/htdocs/langs/fr_FR/install.lang b/htdocs/langs/fr_FR/install.lang
index 4038d539701..7c1391596fc 100644
--- a/htdocs/langs/fr_FR/install.lang
+++ b/htdocs/langs/fr_FR/install.lang
@@ -82,6 +82,7 @@ SystemIsInstalled=Votre système est maintenant installé.
 SystemIsUpgraded=Dolibarr a été mis à jour avec succès.
 YouNeedToPersonalizeSetup=Vous devez maintenant configurer Dolibarr selon vos besoins (Choix de l'apparence, des fonctionnalités, etc.). Pour cela, cliquez sur le lien ci-dessous:
 AdminLoginCreatedSuccessfuly=Création du compte administrateur Dolibarr '<b>%s</b>' réussie.
+GoToDolibarr=Accéder à Dolibarr
 GoToSetupArea=Accéder à Dolibarr (espace configuration)
 Examples=Exemples
 WithNoSlashAtTheEnd=Sans le slash "/" à la fin