diff --git a/htdocs/admin/index.php b/htdocs/admin/index.php
index b39273d12e3..a80f16f42d7 100644
--- a/htdocs/admin/index.php
+++ b/htdocs/admin/index.php
@@ -55,12 +55,13 @@ print $langs->trans("SetupDescription2")."<br><br>";
 
 print '<br>';
 //print '<hr style="color: #DDDDDD;">';
-print img_picto('','puce').' '.$langs->trans("SetupDescription3",DOL_URL_ROOT.'/admin/company.php?mainmenu=home');
-if (empty($conf->global->MAIN_INFO_SOCIETE_NOM) || empty($conf->global->MAIN_INFO_SOCIETE_PAYS))
+if (empty($conf->global->MAIN_INFO_SOCIETE_NOM) || empty($conf->global->MAIN_INFO_SOCIETE_PAYS)) $setupcompanynotcomplete=1;
+print img_picto('','puce').' '.$langs->trans("SetupDescription3",DOL_URL_ROOT.'/admin/company.php?mainmenu=home'.(empty($setupcompanynotcomplete)?'':'&action=edit'));
+if (! empty($setupcompanynotcomplete))
 {
 	$langs->load("errors");
 	$warnpicto=img_warning($langs->trans("WarningMandatorySetupNotComplete"));
-	print '<br><a href="'.DOL_URL_ROOT.'/admin/company.php?mainmenu=home">'.$warnpicto.' '.$langs->trans("WarningMandatorySetupNotComplete").'</a>';
+	print '<br><a href="'.DOL_URL_ROOT.'/admin/company.php?mainmenu=home'.(empty($setupcompanynotcomplete)?'':'&action=edit').'">'.$warnpicto.' '.$langs->trans("WarningMandatorySetupNotComplete").'</a>';
 }
 print '<br>';
 print '<br>';
diff --git a/htdocs/admin/tools/index.php b/htdocs/admin/tools/index.php
index e3a9d45c6c1..e8a0205252d 100644
--- a/htdocs/admin/tools/index.php
+++ b/htdocs/admin/tools/index.php
@@ -49,6 +49,11 @@ print "<br>";
 
 print info_admin($langs->trans("SystemAreaForAdminOnly")).'<br>';
 
+print '<br><br>';
+
+
+// Show logo
+print '<center><div class="logo_setup"></div></center>';
 
 llxFooter();
 $db->close();