diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c
index 681fdc342881..119c57543105 100644
--- a/libexec/ftpd/ftpd.c
+++ b/libexec/ftpd/ftpd.c
@@ -1178,8 +1178,8 @@ end_login(void)
 #endif
 
 	(void) seteuid(0);
-	if (logged_in && dowtmp && !dochroot)
-		ftpd_logwtmp(wtmpid, "", NULL);
+	if (logged_in && dowtmp)
+		ftpd_logwtmp(wtmpid, NULL, NULL);
 	pw = NULL;
 #ifdef	LOGIN_CAP
 	setusercontext(NULL, getpwuid(0), 0,
@@ -1482,7 +1482,10 @@ skip:
 	;
 	chrootdir = NULL;
 
-	if (dowtmp && !dochroot)
+	/* Disable wtmp logging when chrooting. */
+	if (dochroot || guest)
+		dowtmp = 0;
+	if (dowtmp)
 		ftpd_logwtmp(wtmpid, pw->pw_name,
 		    (struct sockaddr *)&his_addr);
 	logged_in = 1;
@@ -2730,9 +2733,9 @@ void
 dologout(int status)
 {
 
-	if (logged_in && dowtmp && !dochroot) {
+	if (logged_in && dowtmp) {
 		(void) seteuid(0);
-		ftpd_logwtmp(wtmpid, "", NULL);
+		ftpd_logwtmp(wtmpid, NULL, NULL);
 	}
 	/* beware of flushing buffers after a SIGPIPE */
 	_exit(status);
diff --git a/libexec/ftpd/logwtmp.c b/libexec/ftpd/logwtmp.c
index 3d810dd4b649..82683f53530b 100644
--- a/libexec/ftpd/logwtmp.c
+++ b/libexec/ftpd/logwtmp.c
@@ -60,7 +60,7 @@ ftpd_logwtmp(char *id, char *user, struct sockaddr *addr)
 
 	memset(&ut, 0, sizeof(ut));
 
-	if (*user != '\0') {
+	if (user != NULL) {
 		/* Log in. */
 		ut.ut_type = USER_PROCESS;
 		(void)strncpy(ut.ut_user, user, sizeof(ut.ut_user));