diff --git a/htdocs/index.php b/htdocs/index.php
index 7b56062d454..de0d06d0c35 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -56,6 +56,13 @@ if (class_exists('Smartphone'))
 	exit;
 }
 
+// Check if company name is defined (first install)
+if (!isset($conf->global->MAIN_INFO_SOCIETE_NOM) || empty($conf->global->MAIN_INFO_SOCIETE_NOM))
+{
+	header("Location: ".DOL_URL_ROOT."/admin/company.php?mainmenu=home&leftmenu=setup");
+	exit;
+}
+
 llxHeader();
 
 print_fiche_titre($langs->trans("HomeArea"));
diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php
index 065c5b8fa6b..eae0485cd19 100644
--- a/htdocs/install/etape5.php
+++ b/htdocs/install/etape5.php
@@ -312,7 +312,7 @@ if ($_POST["action"] == "set")
 
 		print $langs->trans("YouNeedToPersonalizeSetup")."<br><br>";
 
-		print '<center><a href="../admin/index.php?mainmenu=home&leftmenu=setup'.(isset($_POST["login"])?'&username='.urlencode($_POST["login"]):'').'">';
+		print '<center><a href="../admin/company.php?mainmenu=home&leftmenu=setup'.(isset($_POST["login"])?'&username='.urlencode($_POST["login"]):'').'">';
 		print $langs->trans("GoToSetupArea");
 		print '</a></center>';
 	}
diff --git a/htdocs/install/mysql/tables/llx_entity.sql b/htdocs/install/mysql/tables/llx_entity.sql
deleted file mode 100644
index 3de895478c5..00000000000
--- a/htdocs/install/mysql/tables/llx_entity.sql
+++ /dev/null
@@ -1,31 +0,0 @@
--- ============================================================================
--- Copyright (C) 2010 Regis Houssin  <regis@dolibarr.fr>
---
--- 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
--- the Free Software Foundation; either version 2 of the License, or
--- (at your option) any later version.
---
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
---
--- You should have received a copy of the GNU General Public License
--- along with this program; if not, write to the Free Software
--- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
---
--- $Id$
--- ===========================================================================
-
-create table llx_entity
-(
-  rowid				integer AUTO_INCREMENT PRIMARY KEY,
-  tms				timestamp,
-  label				varchar(255) NOT NULL,
-  description		text,
-  datec				datetime,
-  fk_user_creat		integer,
-  visible			tinyint DEFAULT 1 NOT NULL,
-  active			tinyint DEFAULT 1 NOT NULL
-) type=innodb;