diff --git a/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/SecureTokenUtil.java b/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/SecureTokenUtil.java
index 5fdf4d61..e1743a6f 100644
--- a/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/SecureTokenUtil.java
+++ b/CASA-auth-token/server-java/Svc/src/com/novell/casa/authtoksvc/SecureTokenUtil.java
@@ -37,6 +37,7 @@ import org.apache.xerces.parsers.DOMParser;
 import org.apache.log4j.Logger;
 import org.w3c.dom.*;
 import org.xml.sax.InputSource;
+import org.apache.xml.security.utils.RFC2253Parser;
 
 import java.util.*;
 import java.security.KeyStore;
@@ -215,7 +216,7 @@ public final class SecureTokenUtil
             if (cert != null)
             {
                // Add this certificate to our map
-               x509ISNCertMap.put("IssuerDN=" + cert.getIssuerDN().getName() + " SN=" + cert.getSerialNumber().toString(), cert);
+               x509ISNCertMap.put("IssuerDN=" + RFC2253Parser.normalize(cert.getIssuerDN().getName()) + " SN=" + cert.getSerialNumber().toString(), cert);
             }
          }
       }