diff --git a/appl/popper/pop_pass.c b/appl/popper/pop_pass.c
index d43e0e1cb..d7a9ef156 100644
--- a/appl/popper/pop_pass.c
+++ b/appl/popper/pop_pass.c
@@ -53,7 +53,7 @@ pop_pass (POP *p)
 	 krb_set_tkt_string (tkt);
 	 if (otp_verify_user (&p->otp_ctx, p->pop_parm[1]) == 0)
 	     ;
-	 else if(p->no_passwd)
+	 else if(p->auth_level != AUTH_NONE)
 	     return pop_msg(p, POP_FAILURE,
 			    "Password supplied for \"%s\" is incorrect.",
 			    p->user);
diff --git a/appl/popper/pop_user.c b/appl/popper/pop_user.c
index eaf149f67..3cdbcbcae 100644
--- a/appl/popper/pop_user.c
+++ b/appl/popper/pop_user.c
@@ -21,7 +21,7 @@ pop_user (POP *p)
     if (otp_challenge (&p->otp_ctx, p->user, ss, sizeof(ss)) == 0) {
 	return pop_msg(p, POP_SUCCESS, "Password %s required for %s.",
 		       ss, p->user);
-    } else if (p->no_passwd) {
+    } else if (p->auth_level != AUTH_NONE) {
 	char *s = otp_error(&p->otp_ctx);
 	return pop_msg(p, POP_FAILURE, "Permission denied%s%s",
 		       s ? ":" : "", s);