diff --git a/ChangeLog b/ChangeLog
index bc5b49eea..55c0ef223 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+20030918
+ - (djm) Bug #652: Fix empty password auth
+
 20030917
  - (djm) Sync with V_3_7 branch
  - (djm) OpenBSD Sync
@@ -1115,4 +1118,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.3000 2003/09/17 20:20:33 tim Exp $
+$Id: ChangeLog,v 1.3001 2003/09/18 08:25:46 djm Exp $
diff --git a/auth-passwd.c b/auth-passwd.c
index 95cc134de..971c7ba19 100644
--- a/auth-passwd.c
+++ b/auth-passwd.c
@@ -143,7 +143,7 @@ auth_password(Authctxt *authctxt, const char *password)
 	char *pw_password = authctxt->valid ? shadow_pw(pw) : pw->pw_passwd;
 
 	/* Check for users with no password. */
-	if (strcmp(pw_password, "") == 0 && strcmp(pw->pw_passwd, "") == 0)
+	if (strcmp(pw_password, "") == 0 && strcmp(password, "") == 0)
 		return ok;
 	else {
 		/* Encrypt the candidate password using the proper salt. */