diff --git a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml
index a253cc9a7f3..b4c1513c044 100644
--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml
+++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml
@@ -58,7 +58,7 @@
                             org.apache.commons.logging,
                             javax.security.auth.x500,
                             javax.xml.parsers,
-                            org.apache.commons.codec.binary,
+                            org.apache.commons.codec.binary;version="${version.commons.codec}",
                             org.bouncycastle.asn1,
                             org.bouncycastle.asn1.x500,
                             org.bouncycastle.asn1.x509,
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 c97d84472d1..a9c79553dba 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
@@ -348,19 +348,19 @@ public class CertificateGenerator {
         Date validityBeginDate = commonUtil.getValidityStartDate();
         Date validityEndDate = commonUtil.getValidityEndDate();
 
-        X500Name certSubject = request.getSubject();
+        X500Name certSubject = new X500Name(ConfigurationUtil.DEFAULT_PRINCIPAL);
         Attribute attributes[] = request.getAttributes();
 
-        if (certSubject == null) {
-            certSubject = new X500Name(ConfigurationUtil.DEFAULT_PRINCIPAL);
-        } else {
-            org.bouncycastle.asn1.x500.RDN[] rdn = certSubject.getRDNs();
-
-            if (rdn == null || rdn.length == 0) {
-                certSubject = new X500Name(ConfigurationUtil.DEFAULT_PRINCIPAL);
-            }
-        }
-
+//        if (certSubject == null) {
+//            certSubject = new X500Name(ConfigurationUtil.DEFAULT_PRINCIPAL);
+//        } else {
+//            org.bouncycastle.asn1.x500.RDN[] rdn = certSubject.getRDNs();
+//
+//            if (rdn == null || rdn.length == 0) {
+//                certSubject = new X500Name(ConfigurationUtil.DEFAULT_PRINCIPAL);
+//            }
+//        }
+        
         X509v3CertificateBuilder certificateBuilder = new X509v3CertificateBuilder(
                 new X500Name(issueSubject), CommonUtil.generateSerialNumber(),
                 validityBeginDate, validityEndDate, certSubject, request.getSubjectPublicKeyInfo());