1 files changed, 16 insertions, 0 deletions
diff --git a/pki/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java b/pki/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java
index c34adc408..2ec81f7b7 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/csadmin/WizardPanelBase.java
@@ -1388,6 +1388,22 @@ public class WizardPanelBase implements IWizardPanel {
                             config.putString(name, v);
                         }
                     }
+
+                    // reset nicknames for system cert verification
+                    String token = config.getString("preop.module.token", 
+                                                    "Internal Key Storage Token");
+                    if (! token.equals("Internal Key Storage Token")) {
+                        String certlist = config.getString("preop.cert.list");
+
+                        StringTokenizer t1 = new StringTokenizer(certlist, ",");
+                        while (t1.hasMoreTokens()) {
+                            String tag = t1.nextToken();
+                            if (tag.equals("sslserver")) continue;
+                            config.putString(type + ".cert." + tag + ".nickname", 
+                                token + ":" + 
+                                config.getString(type + ".cert." + tag + ".nickname", ""));
+                        } 
+                    }
                 } else {
                     String error = parser.getValue("Error");
                     throw new IOException(error);