diff --git a/auth2-none.c b/auth2-none.c
index 692a296..3332f4f 100644
--- a/auth2-none.c
+++ b/auth2-none.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth2-none.c,v 1.4 2002/06/27 10:35:47 deraadt Exp $");
+RCSID("$OpenBSD: auth2-none.c,v 1.5 2003/07/31 09:21:02 markus Exp $");
 
 #include "auth.h"
 #include "xmalloc.h"
@@ -100,7 +100,9 @@
 	if (check_nt_auth(1, authctxt->pw) == 0)
 		return(0);
 #endif
-	return PRIVSEP(auth_password(authctxt, "")) && authctxt->valid;
+	if (options.password_authentication && authctxt->valid)
+		return (PRIVSEP(auth_password(authctxt, "")));
+	return (0);
 }
 
 Authmethod method_none = {