diff --git a/ChangeLog b/ChangeLog
index 0614f0d3..15223d9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-09-20  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* src/login.c: Use failent_user to log to audit. username is the
+	caller, not the user login tries to authenticate.
+	* src/login.c: Use pwd->pw_name instead of pwd->pw_uid. This might
+	be more precise (name must be unique, uid might not be).
+
 2008-09-20  Nicolas François  <nicolas.francois@centraliens.net>
 
 	* man/passwd.1.xml: passwd cannot change the full name of the
diff --git a/src/login.c b/src/login.c
index 73f6e066..e82ead10 100644
--- a/src/login.c
+++ b/src/login.c
@@ -752,8 +752,7 @@ int main (int argc, char **argv)
 			                          AUDIT_USER_LOGIN,
 			                          NULL,    /* Prog. name */
 			                          "login",
-			                          (NULL!=username)?username
-			                                          :"(unknown)",
+			                          failent_user,
 			                          AUDIT_NO_ID,
 			                          hostname,
 			                          NULL,    /* addr */
@@ -1045,8 +1044,8 @@ int main (int argc, char **argv)
 	                        AUDIT_USER_LOGIN,
 	                        NULL,    /* Prog. name */
 	                        "login",
-	                        NULL,    /* user's name => use uid */
-	                        (unsigned int) pwd->pw_uid,
+	                        pwd->pw_name,
+	                        AUDIT_NO_ID,
 	                        hostname,
 	                        NULL,    /* addr */
 	                        tty,