diff --git a/ipaserver/plugins/dogtag.py b/ipaserver/plugins/dogtag.py
index 594f32fab..d56f82af5 100644
--- a/ipaserver/plugins/dogtag.py
+++ b/ipaserver/plugins/dogtag.py
@@ -256,11 +256,10 @@ import ipapython.cookie
 from ipapython import dogtag, ipautil, certdb
 from ipaserver.masters import find_providing_server
 
-if api.env.in_server:
-    import pki
-    from pki.client import PKIConnection
-    import pki.crypto as cryptoutil
-    from pki.kra import KRAClient
+import pki
+from pki.client import PKIConnection
+import pki.crypto as cryptoutil
+from pki.kra import KRAClient
 
 if six.PY3:
     unicode = str
@@ -1101,7 +1100,7 @@ def parse_updateCRL_xml(doc):
 #-------------------------------------------------------------------------------
 
 from ipalib import Registry, errors, SkipPluginModule
-if api.env.ra_plugin != 'dogtag':
+if api.isdone('finalize') and api.env.ra_plugin != 'dogtag':
     # In this case, abort loading this plugin module...
     raise SkipPluginModule(reason='dogtag not selected as RA plugin')
 import os