diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index f9a8e6be318..92f7e79db7b 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1077,20 +1077,23 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
 
 	// Link to login card
 	$loginhtmltext=''; $logintext='';
-	$logintext='<a class="login" href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$user->id.'"';
-	$logintext.=$menutop->atarget?(' target="'.$menutop->atarget.'"'):'';
-	$logintext.='>'.$user->login.'</a>';
-	$loginhtmltext.='<u>'.$langs->trans("User").'</u>';
-	$loginhtmltext.='<br><b>'.$langs->trans("Name").'</b>: '.$user->getFullName($langs);
-	$loginhtmltext.='<br><b>'.$langs->trans("Login").'</b>: '.$user->login;
-	$loginhtmltext.='<br><b>'.$langs->trans("Administrator").'</b>: '.yn($user->admin);
-	$type=($user->societe_id?$langs->trans("External"):$langs->trans("Internal"));
 	if ($user->societe_id)
 	{
 		$thirdpartystatic=new Societe($db);
 		$thirdpartystatic->fetch($user->societe_id);
-		$type.=' ('.$langs->trans("Company").': '.$thirdpartystatic->name.')';
+		$companylink=' ('.$thirdpartystatic->getNomUrl('','').')';
+		$company=' ('.$langs->trans("Company").': '.$thirdpartystatic->name.')';
 	}
+	$logintext='<div class="login"><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$user->id.'"';
+	$logintext.=$menutop->atarget?(' target="'.$menutop->atarget.'"'):'';
+	$logintext.='>'.$user->login.'</a>';
+	if ($user->societe_id) $logintext.=$companylink;
+	$logintext.='</div>';
+	$loginhtmltext.='<u>'.$langs->trans("User").'</u>';
+	$loginhtmltext.='<br><b>'.$langs->trans("Name").'</b>: '.$user->getFullName($langs);
+	$loginhtmltext.='<br><b>'.$langs->trans("Login").'</b>: '.$user->login;
+	$loginhtmltext.='<br><b>'.$langs->trans("Administrator").'</b>: '.yn($user->admin);
+	$type=($user->societe_id?$langs->trans("External").$company:$langs->trans("Internal"));
 	$loginhtmltext.='<br><b>'.$langs->trans("Type").'</b>: '.$type;
 	$loginhtmltext.='<br>';
 	$loginhtmltext.='<br><u>'.$langs->trans("Connection").'</u>';
diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php
index 34d6e0cdfb5..ee3ff0ae86e 100644
--- a/htdocs/theme/auguria/style.css.php
+++ b/htdocs/theme/auguria/style.css.php
@@ -430,19 +430,19 @@ foreach($mainmenuusedarray as $key => $val)
 
 /* Login */
 
-a.login
-{
+div.login {
   position: absolute;
   <?php print $right; ?>: 30px;
-
-  color: #234046;
   padding: 12px 8px;
   margin: 0px 0px 1px 0px;
   font-weight: bold;
 }
-a.login:hover
-{
-  color: black;
+div.login a {
+	color: #234046;
+}
+div.login a:hover {
+	color: black;
+	text-decoration:underline;
 }
 
 img.login, img.printer {
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 9b260f0f004..98708a4fddb 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -448,20 +448,20 @@ foreach($mainmenuusedarray as $key => $val)
 
 /* Login */
 
-a.login
-{
+div.login {
   position: absolute;
   <?php print $right; ?>: 30px;
   top: 3px;
-
-  color: #234046;
   padding: 0px 8px;
   margin: 0px 0px 1px 0px;
   font-weight: bold;
 }
-a.login:hover
-{
-  color: black;
+div.login a {
+	color: #234046;
+}
+div.login a:hover {
+	color: black;
+	text-decoration:underline;
 }
 
 img.login, img.printer {
diff --git a/htdocs/theme/freelug/style.css.php b/htdocs/theme/freelug/style.css.php
index 392e64f0022..e22c2034ba9 100644
--- a/htdocs/theme/freelug/style.css.php
+++ b/htdocs/theme/freelug/style.css.php
@@ -350,21 +350,20 @@ li.tmenu a:link
 
 /* Login */
 
-a.login
-{
+div.login {
   position: absolute;
   <?php print $right; ?>: 30px;
   top: 3px;
-
-  color: #234046;
   padding: 0px 8px;
-  margin: 0px 0px 6px 0px;
-  border: 1px solid #dcdcd0;
-  font-weight:bold;
+  margin: 0px 0px 1px 0px;
+  font-weight: bold;
 }
-a.login:hover
-{
-  color:black;
+div.login a {
+	color: #234046;
+}
+div.login a:hover {
+	color: black;
+	text-decoration:underline;
 }
 
 img.login
diff --git a/htdocs/theme/yellow/style.css.php b/htdocs/theme/yellow/style.css.php
index 58bbabb74a5..992bb874400 100644
--- a/htdocs/theme/yellow/style.css.php
+++ b/htdocs/theme/yellow/style.css.php
@@ -329,22 +329,22 @@ li.tmenu a:link
 
 /* Login */
 
-a.login
-{
+div.login {
   position: absolute;
   <?php print $right; ?>: 30px;
   top: 2px;
-
-  color: #234046;
   padding: 0px 8px;
   margin: 0px 0px 1px 0px;
   border: 1px solid #dcdcb3;
   font-weight:bold;
   font-size:12px;
 }
-a.login:hover
-{
-  color:black;
+div.login a {
+	color: #234046;
+}
+div.login a:hover {
+	color: black;
+	text-decoration:underline;
 }
 
 img.login