diff --git a/appl/ftp/ftp/cmds.c b/appl/ftp/ftp/cmds.c
index 131d2593d..bb6f2c718 100644
--- a/appl/ftp/ftp/cmds.c
+++ b/appl/ftp/ftp/cmds.c
@@ -1526,7 +1526,7 @@ globulize(char **cpp)
 void
 account(int argc, char **argv)
 {
-	char acct[50], *ap;
+	char acct[50];
 
 	if (argc > 1) {
 		++argv;
@@ -1538,12 +1538,11 @@ account(int argc, char **argv)
 			++argv;
 			(void) strncat(acct,*argv, 49-strlen(acct));
 		}
-		ap = acct;
 	}
 	else {
-		ap = getpass("Account:");
+	    des_read_pw_string(acct, sizeof(acct), "Account:", 0);
 	}
-	(void) command("ACCT %s", ap);
+	(void) command("ACCT %s", acct);
 }
 
 jmp_buf abortprox;
diff --git a/appl/ftp/ftp/ftp.c b/appl/ftp/ftp/ftp.c
index 4ef4f3b32..42c016ed6 100644
--- a/appl/ftp/ftp/ftp.c
+++ b/appl/ftp/ftp/ftp.c
@@ -224,7 +224,8 @@ login(char *host)
 	}
 	if (n == CONTINUE) {
 		aflag++;
-		acct = getpass("Account:");
+		acct = malloc(128); /* XXX */
+		des_read_pw_string(acct, 128, "Account:", 0);
 		n = command("ACCT %s", acct);
 	}
 	if (n != COMPLETE) {