diff --git a/ChangeLog b/ChangeLog
index 7a51b9b4e..476310bc3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+20050421
+ - (dtucker) [session.c] Bug #1024: Don't check pam_session_is_open if
+   UseLogin is set as PAM is not used to establish credentials in that
+   case.  Found by Michael Selvesteen, ok djm@
+
 20050419
  - (dtucker) [INSTALL] Reference README.privsep for the privilege separation
    requirements.  Pointed out by Bengt Svensson.
@@ -2436,4 +2441,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3744 2005/04/19 05:40:51 dtucker Exp $
+$Id: ChangeLog,v 1.3745 2005/04/21 09:50:55 dtucker Exp $
diff --git a/session.c b/session.c
index b32c9e2ca..8ac476c69 100644
--- a/session.c
+++ b/session.c
@@ -1477,7 +1477,8 @@ do_child(Session *s, const char *command)
 	}
 
 #ifdef USE_PAM
-	if (options.use_pam && !is_pam_session_open()) {
+	if (options.use_pam && !options.use_login && !is_pam_session_open()) {
+		debug3("PAM session not opened, exiting");
 		display_loginmsg();
 		exit(254);
 	}