diff --git a/htdocs/lib/security.lib.php b/htdocs/lib/security.lib.php
index ba44bb4c54f..c066c1c779e 100644
--- a/htdocs/lib/security.lib.php
+++ b/htdocs/lib/security.lib.php
@@ -204,7 +204,7 @@ function dol_loginfunction($langs,$conf,$mysoc)
 
 	// Entity field
 	$select_entity='';
-	if (! empty($conf->global->MAIN_MODULE_MULTICOMPANY))
+	if (! empty($conf->global->MAIN_MODULE_MULTICOMPANY) && empty($conf->global->MULTICOMPANY_HIDE_LOGIN_COMBOBOX))
 	{
 		$rowspan++;
 
diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
index b4f4d579dd0..cc07b380144 100644
--- a/htdocs/user/passwordforgotten.php
+++ b/htdocs/user/passwordforgotten.php
@@ -209,7 +209,7 @@ elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.png'))
 
 // Entity combobox
 $select_entity='';
-if (! empty($conf->global->MAIN_MODULE_MULTICOMPANY)  && ! $disabled)
+if (! empty($conf->global->MAIN_MODULE_MULTICOMPANY)  && empty($conf->global->MULTICOMPANY_HIDE_LOGIN_COMBOBOX) && ! $disabled)
 {
 	$rowspan++;
 	$lastuser='';