diff --git a/auth-pam.c b/auth-pam.c
index fd9c0f2..ce49845 100644
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -33,7 +33,7 @@
 #include "canohost.h"
 #include "readpass.h"
 
-RCSID("$Id: auth-pam.c,v 1.30 2001/02/26 22:20:48 djm Exp $");
+RCSID("$Id: auth-pam.c,v 1.31 2001/02/28 22:18:58 djm Exp $");
 
 #define NEW_AUTHTOK_MSG \
 	"Warning: Your password has expired, please change it now"
@@ -268,6 +268,8 @@
 {
 	int pam_retval;
 
+	do_pam_set_conv(&conv);
+
 	if (ttyname != NULL) {
 		debug("PAM setting tty to \"%.200s\"", ttyname);
 		pam_retval = pam_set_item(__pamh, PAM_TTY, ttyname);
@@ -289,6 +291,8 @@
 {
 	int pam_retval;
 
+	do_pam_set_conv(&conv);
+
 	debug("PAM establishing creds");
 	pam_retval = pam_setcred(__pamh, PAM_ESTABLISH_CRED);
 	if (pam_retval != PAM_SUCCESS) {
@@ -318,6 +322,8 @@
 {
 	int pam_retval;
 
+	do_pam_set_conv(&conv);
+
 	if (password_change_required) {
 		pamstate = OTHER;
 		/* XXX: should we really loop forever? */