1 files changed, 5 insertions, 0 deletions

diff --git a/session.c b/session.c
index a50bfcff7..1896e141f 100644
--- a/session.c
+++ b/session.c
@@ -1346,7 +1346,12 @@ do_pwchange(Session *s)
         if (s->ttyfd != -1) {
                 fprintf(stderr,
                     "You must change your password now and login again!\n");
+#ifdef PASSWD_NEEDS_USERNAME
+                execl(_PATH_PASSWD_PROG, "passwd", s->pw->pw_name,
+                    (char *)NULL);
+#else
                 execl(_PATH_PASSWD_PROG, "passwd", (char *)NULL);
+#endif
                 perror("passwd");
         } else {
                 fprintf(stderr,