diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php
index 84893a10b4b..6e4f513694e 100644
--- a/htdocs/comm/fiche.php
+++ b/htdocs/comm/fiche.php
@@ -194,7 +194,11 @@ if ($socid > 0)
     // Fax
 	print '<td>'.$langs->trans('Fax').'</td><td>'.dol_print_phone($objsoc->fax,$objsoc->pays_code,0,$objsoc->id,'AC_FAX').'</td></tr>';
 
-    print '<tr><td>'.$langs->trans("Web")."</td><td colspan=\"3\"><a href=\"http://$objsoc->url\" target=\"_blank\">".$objsoc->url."</a>&nbsp;</td></tr>";
+    // EMail
+	print '<td>'.$langs->trans('EMail').'</td><td colspan="3">'.dol_print_email($objsoc->email,0,$objsoc->id,'AC_EMAIL').'</td></tr>';
+
+	// Web
+    print '<tr><td>'.$langs->trans("Web").'</td><td colspan="3">'.dol_print_url($objsoc->url,'_blank').'</td></tr>';
 
 	// Assujeti TVA ou pas
 	print '<tr>';
diff --git a/htdocs/compta/fiche.php b/htdocs/compta/fiche.php
index 20aeafba36a..aa875d13d04 100644
--- a/htdocs/compta/fiche.php
+++ b/htdocs/compta/fiche.php
@@ -140,9 +140,17 @@ if ($socid > 0)
 	else print $societe->pays;
 	print '</td></tr>';
 
+	// Phone
     print '<tr><td>'.$langs->trans("Phone").'</td><td>'.dol_print_phone($societe->tel,$societe->pays_code,0,$societe->id,'AC_TEL').'</td>';
+
+    // Fax
     print '<td>'.$langs->trans("Fax").'</td><td>'.dol_print_phone($societe->fax,$societe->pays_code,0,$societe->id,'AC_FAX').'</td></tr>';
-    print '<tr><td>'.$langs->trans("Web")."</td><td colspan=\"3\"><a href=\"http://$societe->url\" target=\"_blank\">$societe->url</a>&nbsp;</td></tr>";
+
+    // EMail
+	print '<td>'.$langs->trans('EMail').'</td><td colspan="3">'.dol_print_email($societe->email,0,$societe->id,'AC_EMAIL').'</td></tr>';
+
+    // Web
+    print '<tr><td>'.$langs->trans("Web").'</td><td colspan="3">'.dol_print_url($societe->url,'_blank').'</td></tr>';
 
 	// Assujeti a TVA ou pas
 	print '<tr>';
diff --git a/htdocs/soc.php b/htdocs/soc.php
index cfd5dde3e00..9bd030a2f9a 100644
--- a/htdocs/soc.php
+++ b/htdocs/soc.php
@@ -373,7 +373,7 @@ $_GET["action"] == 'create' || $_POST["action"] == 'create')
 		if ($modCodeClient->code_auto || $modCodeFournisseur->code_auto) print '<input type="hidden" name="code_auto" value="1">';
 
 		print '<table class="border" width="100%">';
-		
+
 		if ($soc->particulier)
 		{
 			print '<tr><td>'.$langs->trans('LastName').'</td><td><input type="text" size="30" name="nom" value="'.$soc->nom.'"></td>';
@@ -387,7 +387,7 @@ $_GET["action"] == 'create' || $_POST["action"] == 'create')
 		else
 		{
 			print '<tr><td>'.$langs->trans('Name').'</td><td><input type="text" size="30" name="nom" value="'.$soc->nom.'"></td>';
-			print '<td>'.$langs->trans('Prefix').'</td><td><input type="text" size="5" name="prefix_comm" value="'.$soc->prefix_comm.'"></td></tr>';		
+			print '<td>'.$langs->trans('Prefix').'</td><td><input type="text" size="5" name="prefix_comm" value="'.$soc->prefix_comm.'"></td></tr>';
 		}
 
 		// Client / Prospect
@@ -1010,10 +1010,12 @@ else
 	print '<tr><td>'.$langs->trans('Phone').'</td><td>'.dol_print_phone($soc->tel,$soc->pays_code,0,$soc->id,'AC_TEL').'</td>';
 	print '<td>'.$langs->trans('Fax').'</td><td>'.dol_print_phone($soc->fax,$soc->pays_code,0,$soc->id,'AC_FAX').'</td></tr>';
 
+	// EMail
 	print '<tr><td>'.$langs->trans('EMail').'</td><td>';
-	if ($soc->email) { print '<a href="mailto:'.$soc->email.'" target="_blank">'.$soc->email.'</a>'; }
-	else print '&nbsp;';
+	print dol_print_email($soc->email,0,$soc->id,'AC_EMAIL');
 	print '</td>';
+
+	// Web
 	print '<td>'.$langs->trans('Web').'</td><td>';
 	print dol_print_url($soc->url);
 	print '</td></tr>';