diff --git a/ChangeLog b/ChangeLog
index 213f6417c..72a17acdb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,9 @@
  - (djm) Unbreak auth-passwd.c for PAM and SIA
  - (djm) Unbreak PAM auth for protocol 1. Report from Pekka Savola 
    <pekkas@netcore.fi>
-
+ - (djm) Don't reinitialise PAM credentials before we have started PAM.
+   Report from Pekka Savola <pekkas@netcore.fi>
+   
 20020506
  - (bal) Fixed auth-passwd.c to resolve PermitEmptyPassword issue
  
@@ -533,4 +535,4 @@
  - (stevesk) entropy.c: typo in debug message
  - (djm) ssh-keygen -i needs seeded RNG; report from markus@
 
-$Id: ChangeLog,v 1.2094 2002/05/08 02:24:42 djm Exp $
+$Id: ChangeLog,v 1.2095 2002/05/08 02:27:55 djm Exp $
diff --git a/auth-pam.c b/auth-pam.c
index 10a87fa46..490990dec 100644
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -36,7 +36,7 @@
 
 extern char *__progname;
 
-RCSID("$Id: auth-pam.c,v 1.45 2002/04/26 01:27:24 djm Exp $");
+RCSID("$Id: auth-pam.c,v 1.46 2002/05/08 02:27:56 djm Exp $");
 
 #define NEW_AUTHTOK_MSG \
 	"Warning: Your password has expired, please change it now"
@@ -299,6 +299,9 @@ void do_pam_setcred(int init)
 {
 	int pam_retval;
 
+	if (__pamh == NULL)
+		return;
+
 	do_pam_set_conv(&conv);
 
 	debug("PAM establishing creds");