diff --git a/ChangeLog b/ChangeLog
index 3b9e687c..945d9e24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-02-15  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* libmisc/user_busy.c, src/userdel.c, src/usermod.c: Warn in
+	user_busy() rather than in src/userdel.c or src/usermod.c to
+	provide more accurate failure cause (user is logged in or user
+	still executes processes).
+
 2010-02-15  Nicolas François  <nicolas.francois@centraliens.net>
 
 	* lib/groupio.c, lib/sgroupio.c, lib/shadowio.c, lib/pwio.c: Check
diff --git a/src/userdel.c b/src/userdel.c
index 8f2ac0fe..49edac70 100644
--- a/src/userdel.c
+++ b/src/userdel.c
@@ -936,9 +936,6 @@ int main (int argc, char **argv)
 	 * a cron job may be started on her behalf, etc.
 	 */
 	if (user_busy (user_name, user_id) != 0) {
-		fprintf (stderr,
-		         _("%s: user %s is currently logged in\n"),
-		         Prog, user_name);
 		if (!fflg) {
 #ifdef WITH_AUDIT
 			audit_logger (AUDIT_DEL_USER, Prog,
diff --git a/src/usermod.c b/src/usermod.c
index 9cdb9bb1..11c925be 100644
--- a/src/usermod.c
+++ b/src/usermod.c
@@ -1735,9 +1735,6 @@ int main (int argc, char **argv)
 	 */
 	if (   (uflg || lflg || dflg)
 	    && (user_busy (user_name, user_id) != 0)) {
-		fprintf (stderr,
-		         _("%s: user %s is currently logged in\n"),
-		         Prog, user_name);
 		exit (E_USER_BUSY);
 	}