diff --git a/ChangeLog b/ChangeLog
index 67382603c..5bacbcba8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+20000203
+ - Fixed SEGVs in authloop, fix from vbzoli@hbrt.hu
+
 20000202
  - Fix lastlog code for directory based lastlogs. Fix from Josh Durham 
    <jmd@aoe.vt.edu>
diff --git a/sshd.c b/sshd.c
index f12279786..bffbe59dc 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1524,8 +1524,10 @@ do_authloop(struct passwd * pw)
 			return;
 		}
 
-		if (client_user != NULL)
+		if (client_user != NULL) {
 			xfree(client_user);
+			client_user = NULL;
+		}
 
 		if (attempt > AUTH_FAIL_MAX)
 			packet_disconnect(AUTH_FAIL_MSG, pw->pw_name);