diff --git a/htdocs/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang
index 1408681505a..9acc4d0cb68 100755
--- a/htdocs/langs/en_US/users.lang
+++ b/htdocs/langs/en_US/users.lang
@@ -63,4 +63,6 @@ UsersToAdd=Users to add to this group
 GroupsToAdd=Groups to add to this user
 NoLogin=No login
 CreateDolibarrLogin=Create Dolibarr account
-TasksHistoryForThisContact=Tasks history for this contact
\ No newline at end of file
+TasksHistoryForThisContact=Tasks history for this contact
+LoginAccountDisable=Account disable, put a new login to activate it.
+ErrorFailedToSaveFile=Error - Failed to save file
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/users.lang b/htdocs/langs/fr_FR/users.lang
index f91291f72bd..33d307aa79b 100755
--- a/htdocs/langs/fr_FR/users.lang
+++ b/htdocs/langs/fr_FR/users.lang
@@ -64,3 +64,5 @@ GroupsToAdd=Groupes 
 NoLogin=Pas de login
 CreateDolibarrLogin=Créer un compte Dolibarr
 TasksHistoryForThisContact=Historique des actions pour ce contact
+LoginAccountDisable=Le compte est désactivé, mettre un nouveau login pour l'activer.
+ErrorFailedToSaveFile=Erreur - l'enregistrement du fichier a échoué
diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php
index 6fbb3c3ddfd..f8c9a898834 100644
--- a/htdocs/user/fiche.php
+++ b/htdocs/user/fiche.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2002-2003 Jean-Louis Bergamo   <jlb@j1b.org>
  * Copyright (C) 2004-2005 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
+ * Copyright (C) 2005      Regis Houssin        <regis.houssin@cap-networks.com>
  *
  * 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
@@ -399,7 +400,13 @@ else
             print "</tr>\n";
 
             print '<tr><td width="25%" valign="top">'.$langs->trans("Login").'</td>';
-            print '<td width="50%" class="valeur">'.$fuser->login.'</td></tr>';
+            if ($fuser->login)
+            {
+            	print '<td width="50%" class="valeur">'.$fuser->login.'</td></tr>';
+            }
+            else
+            {
+            	print '<td width="50%" class="error">'.$langs->trans("LoginAccountDisable").'</td></tr>';
 
             print '<tr><td width="25%" valign="top">'.$langs->trans("EMail").'</td>';
             print '<td width="50%" class="valeur"><a href="mailto:'.$fuser->email.'">'.$fuser->email.'</a></td>';
@@ -471,17 +478,17 @@ else
                 print '<a class="butAction" href="fiche.php?id='.$fuser->id.'&amp;action=edit">'.$langs->trans("Edit").'</a>';
             }
 
-            if ($user->id == $_GET["id"] or $user->admin)
+            if ($user->id == $_GET["id"] or $user->admin && $fuser->login)
             {
                 print '<a class="butAction" href="fiche.php?id='.$fuser->id.'&amp;action=password">'.$langs->trans("ReinitPassword").'</a>';
             }
 
-            if (($user->id == $_GET["id"] or $user->admin) && $fuser->email)
+            if (($user->id == $_GET["id"] or $user->admin) && $fuser->email && $fuser->login)
             {
                 print '<a class="butAction" href="fiche.php?id='.$fuser->id.'&amp;action=passwordsend">'.$langs->trans("SendNewPassword").'</a>';
             }
 
-            if ($user->id <> $_GET["id"] && $user->admin)
+            if ($user->id <> $_GET["id"] && $user->admin && $fuser->login)
             {
                 print '<a class="butActionDelete" href="fiche.php?action=disable&amp;id='.$fuser->id.'">'.$langs->trans("DisableUser").'</a>';
             }