diff --git a/base/ca/src/main/java/com/netscape/ca/CertificateAuthority.java b/base/ca/src/main/java/com/netscape/ca/CertificateAuthority.java
index 6033db3ebfe..d88707fc6e7 100644
--- a/base/ca/src/main/java/com/netscape/ca/CertificateAuthority.java
+++ b/base/ca/src/main/java/com/netscape/ca/CertificateAuthority.java
@@ -480,6 +480,10 @@ public CAConfig getConfigStore() {
         return mConfig;
     }
 
+    public CAConfig getConfig() {
+        return mConfig;
+    }
+
     public void setConfig(CAConfig config) {
         mConfig = config;
     }
diff --git a/base/ca/src/main/java/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java b/base/ca/src/main/java/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java
index 8d66a650220..7eb28f4419d 100644
--- a/base/ca/src/main/java/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java
+++ b/base/ca/src/main/java/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java
@@ -46,6 +46,7 @@
 
 import org.dogtagpki.server.authentication.AuthManager;
 import org.dogtagpki.server.authentication.AuthToken;
+import org.dogtagpki.server.ca.CAConfig;
 import org.dogtagpki.server.ca.CAEngine;
 import org.mozilla.jss.CryptoManager;
 import org.mozilla.jss.NoSuchTokenException;
@@ -110,7 +111,6 @@
 import com.netscape.certsrv.authentication.EMissingCredential;
 import com.netscape.certsrv.base.EBaseException;
 import com.netscape.certsrv.base.SessionContext;
-import com.netscape.certsrv.base.Subsystem;
 import com.netscape.certsrv.ldap.LdapConnFactory;
 import com.netscape.certsrv.logging.AuditEvent;
 import com.netscape.certsrv.logging.AuditFormat;
@@ -270,7 +270,7 @@ public void init(ServletConfig sc) {
         }
 
         try {
-            ConfigStore authorityConfig = ((Subsystem) mAuthority).getConfigStore();
+            CAConfig authorityConfig = mAuthority.getConfig();
             ConfigStore scepConfig = authorityConfig.getSubStore("scep", ConfigStore.class);
             mEnabled = scepConfig.getBoolean("enable", false);
             mUseOAEPKeyWrap = authorityConfig.getBoolean("keyWrap.useOAEP",false);