diff --git a/lib/pam_pass_non_interactive.c b/lib/pam_pass_non_interactive.c
index 12dad4dd..3d10908b 100644
--- a/lib/pam_pass_non_interactive.c
+++ b/lib/pam_pass_non_interactive.c
@@ -19,6 +19,7 @@
 
 #include "alloc.h"
 #include "attr.h"
+#include "memzero.h"
 #include "prototypes.h"
 #include "shadowlog.h"
 
@@ -97,9 +98,8 @@ static int ni_conv (int num_msg,
 failed_conversation:
 	for (count=0; count < num_msg; count++) {
 		if (NULL != responses[count].resp) {
-			bzero(responses[count].resp,
-			      strlen(responses[count].resp));
-			free (responses[count].resp);
+			strzero(responses[count].resp);
+			free(responses[count].resp);
 			responses[count].resp = NULL;
 		}
 	}