diff --git a/ChangeLog b/ChangeLog
index 2c28cc6fa..d8d422d16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,6 +30,11 @@
    - markus@cvs.openbsd.org 2001/06/03 19:38:42
      [scp.c]
      pass -v to ssh; from slade@shore.net
+   - markus@cvs.openbsd.org 2001/06/03 20:06:11
+     [auth2-chall.c]
+     the challenge response device decides how to handle non-existing 
+     users.
+     -> fake challenges for skey and cryptocard
 
 20010606
  - OpenBSD CVS Sync
@@ -5541,4 +5546,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1256 2001/06/09 01:15:11 mouring Exp $
+$Id: ChangeLog,v 1.1257 2001/06/09 01:17:23 mouring Exp $
diff --git a/auth2-chall.c b/auth2-chall.c
index ad4f7ac42..be741010e 100644
--- a/auth2-chall.c
+++ b/auth2-chall.c
@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "includes.h"
-RCSID("$OpenBSD: auth2-chall.c,v 1.5 2001/05/18 14:13:28 markus Exp $");
+RCSID("$OpenBSD: auth2-chall.c,v 1.6 2001/06/03 20:06:11 markus Exp $");
 
 #include "ssh2.h"
 #include "auth.h"
@@ -149,7 +149,7 @@ auth2_challenge(Authctxt *authctxt, char *devs)
 	    authctxt->user ? authctxt->user : "<nouser>",
 	    devs ? devs : "<no devs>");
 
-	if (!authctxt->valid || authctxt->user == NULL || !devs)
+	if (authctxt->user == NULL || !devs)
 		return 0;
 	if (authctxt->kbdintctxt == NULL) 
 		authctxt->kbdintctxt = kbdint_alloc(devs);