diff --git a/npa/src/npa-tool.c b/npa/src/npa-tool.c
index 9c0e756..186a4fc 100644
--- a/npa/src/npa-tool.c
+++ b/npa/src/npa-tool.c
@@ -313,10 +313,6 @@ main (int argc, char **argv)
         npa_default_flags |= NPA_FLAG_DISABLE_CHECK_TA;
     if (cmdline.disable_ca_checks_flag)
         npa_default_flags |= NPA_FLAG_DISABLE_CHECK_CA;
-    if (cmdline.cvc_dir_given)
-        cvc_default_dir = cmdline.cvc_dir_arg;
-    if (cmdline.x509_dir_given)
-        x509_default_dir = cmdline.cvc_dir_arg;
 
 
     if (cmdline.info_flag)
@@ -342,6 +338,10 @@ main (int argc, char **argv)
 #endif
 
     EAC_init();
+    if (cmdline.cvc_dir_given)
+        EAC_set_cvc_default_dir(cmdline.cvc_dir_arg);
+    if (cmdline.x509_dir_given)
+        EAC_set_x509_default_dir(cmdline.cvc_dir_arg);
 
     if (cmdline.break_flag) {
         /* The biggest buffer sprintf could write with "%llu" */