diff --git a/htdocs/conf/conf.php.example b/htdocs/conf/conf.php.example
index 67147a6d06b..9982e91095e 100644
--- a/htdocs/conf/conf.php.example
+++ b/htdocs/conf/conf.php.example
@@ -313,10 +313,8 @@ $dolibarr_main_db_prefix='';
 
 // multicompany_transverse_mode
 // Prerequisite: Need external module "multicompany"
-// Pyramidal (0): The rights and groups are managed in each entity,
-// users belong to the entity for their rights.
-// Transversal (1): The groups can belong only to the master entity
-// and that the user belongs to a particular entity
+// Pyramidal (0): The rights and groups are managed in each entity. Each user belongs to the entity he was created into.
+// Transversal (1): The user is managed only into master entity and belongs to all entities or only one dedicated entity.
 // Default value: 0 (pyramidal)
 // Examples:
 // $multicompany_transverse_mode='1';
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 0bcba1caca8..67fe45d4c5c 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -984,7 +984,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
     print '<input size="8" type="text" name="weeklyhours" value="'.GETPOST('weeklyhours').'">';
     print '</td>';
     print "</tr>\n";
-	
+
 	// Accountancy code
 	if ($conf->salaries->enabled)
 	{
@@ -1337,7 +1337,7 @@ else
 				print '<tr><td valign="top">'.$langs->trans("AccountancyCode").'</td>';
 				print '<td colspan="2">'.$object->accountancy_code.'</td>';
 			}
-				
+
 			// Color user
 			if (! empty($conf->agenda->enabled))
             {
@@ -1425,7 +1425,7 @@ else
 	            if (! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
 	            {
 	            	print '<tr><td valign="top">'.$langs->trans("Entity").'</td><td width="75%" class="valeur">';
-	            	if ($object->admin && ! $object->entity)
+	            	if (empty($object->entity))
 	            	{
 	            		print $langs->trans("AllEntities");
 	            	}
@@ -2049,7 +2049,7 @@ else
 				}
 				print '</td>';
 				print "</tr>";
-			}	
+			}
 
 			// User color
 			if (! empty($conf->agenda->enabled))
@@ -2119,7 +2119,7 @@ else
             	if (empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity)
             	{
             		print "<tr>".'<td valign="top">'.$langs->trans("Entity").'</td>';
-            		print "<td>".$mc->select_entities($object->entity);
+            		print "<td>".$mc->select_entities($object->entity, 'entity', '', 0, 1);		// last parameter 1 means, show also a choice 0=>'all entities'
             		print "</td></tr>\n";
             	}
             	else