diff --git a/ChangeLog b/ChangeLog
index dca9ab26c..564c513e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 20010109
  - (bal) Resync CVS ID of cli.c
+ - (stevesk) auth1.c: free should be after WITH_AIXAUTHENTICATE
+   code.
 
 20010108
  - (bal) Fixed another typo in cli.c
diff --git a/auth1.c b/auth1.c
index 5e9b3aa5b..51ed8f773 100644
--- a/auth1.c
+++ b/auth1.c
@@ -479,13 +479,12 @@ do_authentication()
 	packet_start(SSH_SMSG_SUCCESS);
 	packet_send();
 	packet_write_wait();
-	xfree(user);
-
 #ifdef WITH_AIXAUTHENTICATE
 	/* We don't have a pty yet, so just label the line as "ssh" */
 	if (loginsuccess(user,get_canonical_hostname(),"ssh",&aixloginmsg) < 0)
 		aixloginmsg = NULL;
 #endif /* WITH_AIXAUTHENTICATE */
+	xfree(user);
 
 	/* Perform session preparation. */
 	do_authenticated(pw);