2 files changed, 4 insertions, 2 deletions
diff --git a/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java b/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java
index 016adb861..ec152f775 100644
--- a/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java
+++ b/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java
@@ -324,7 +324,7 @@ public class CRMFPopClient {
             CryptoToken token = null;
             if (TOKEN_NAME == null) {
                 token = manager.getInternalKeyStorageToken();
-                TOKEN_NAME = "NSS Certificate DB";
+                TOKEN_NAME = token.getName();
             } else {
                 token = manager.getTokenByName(TOKEN_NAME);
             }
diff --git a/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java b/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java
index b432c7d1a..d1c787efb 100644
--- a/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java
+++ b/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java
@@ -200,11 +200,13 @@ public class PKCS10Client {
             CryptoManager cm = CryptoManager.getInstance();
             if ((tokenName == null) || (tokenName.equals(""))) {
                 token = cm.getInternalKeyStorageToken();
-                tokenName = "NSS Certificate DB";
+                tokenName = token.getName();
             } else {
                 token = cm.getTokenByName(tokenName);
             }
+            System.out.println("PKCS10Client: Debug: got token.");
             cm.setThreadToken(token);
+            System.out.println("PKCS10Client: Debug: thread token set.");
 
             Password pass = new Password(password.toCharArray());