diff --git a/ChangeLog b/ChangeLog
index d0b99817..d62d7023 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-20  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* src/login.c: Added parameter to check_nologin. This will help
+	getting rid of the global pwent variable.
+
 2009-04-20  Nicolas François  <nicolas.francois@centraliens.net>
 
 	* src/login.c: Added comments.
diff --git a/src/login.c b/src/login.c
index 152992ce..5bbcce1d 100644
--- a/src/login.c
+++ b/src/login.c
@@ -134,7 +134,7 @@ static void process_flags (int, char *const *);
 static struct faillog faillog;
 
 static void bad_time_notify (void);
-static void check_nologin (void);
+static void check_nologin (bool login_to_root);
 #endif
 
 static void init_env (void);
@@ -205,7 +205,7 @@ static void bad_time_notify (void)
 	(void) fflush (stdout);
 }
 
-static void check_nologin (void)
+static void check_nologin (bool login_to_root)
 {
 	char *fname;
 
@@ -244,7 +244,7 @@ static void check_nologin (void)
 		 * gets to login.
 		 */
 
-		if (pwent.pw_uid != 0) {
+		if (!login_to_root) {
 			closelog ();
 			exit (0);
 		}
@@ -1064,7 +1064,7 @@ int main (int argc, char **argv)
 		exit (1);
 	}
 
-	check_nologin ();
+	check_nologin (pwent.pw_uid == 0);
 #endif
 
 	if (getenv ("IFS")) {	/* don't export user IFS ... */