diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateGenerator.java b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateGenerator.java
index a9c79553db..7735922f51 100755
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateGenerator.java
+++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateGenerator.java
@@ -349,6 +349,8 @@ public class CertificateGenerator {
         Date validityEndDate = commonUtil.getValidityEndDate();
 
         X500Name certSubject = new X500Name(ConfigurationUtil.DEFAULT_PRINCIPAL);
+        //X500Name certSubject = request.getSubject();
+
         Attribute attributes[] = request.getAttributes();
 
 //        if (certSubject == null) {
@@ -360,7 +362,7 @@ public class CertificateGenerator {
 //                certSubject = new X500Name(ConfigurationUtil.DEFAULT_PRINCIPAL);
 //            }
 //        }
-        
+
         X509v3CertificateBuilder certificateBuilder = new X509v3CertificateBuilder(
                 new X500Name(issueSubject), CommonUtil.generateSerialNumber(),
                 validityBeginDate, validityEndDate, certSubject, request.getSubjectPublicKeyInfo());