diff --git a/mozilla/security/nss/cmd/signtool/util.c b/mozilla/security/nss/cmd/signtool/util.c
index 32d4e872411..7a2166f9e45 100644
--- a/mozilla/security/nss/cmd/signtool/util.c
+++ b/mozilla/security/nss/cmd/signtool/util.c
@@ -823,7 +823,10 @@ InitCrypto(char *cert_dir, PRBool readOnly)
 
 	if (password) {
 	    PK11_SetPasswordFunc(pk11_password_hardcode);
+	} else {
+	    PK11_SetPasswordFunc(SECU_GetModulePassword);
 	}
+	
 
 	/* Must login to FIPS before you do anything else */
 	if (PK11_IsFIPS()) {