diff --git a/cmake/CEPCSWDependencies.cmake b/cmake/CEPCSWDependencies.cmake
index dec2acd8d7eeea35d62c0db95bec42f29ffbc44a..5971d023f795d57b4f207fbada6aef4c33b1c9f3 100644
--- a/cmake/CEPCSWDependencies.cmake
+++ b/cmake/CEPCSWDependencies.cmake
@@ -94,7 +94,7 @@ endif()
 
 if (CEPCSW_USE_SYSTEM_EDM4CEPC)
   message("Try to use an existing installation of EDM4CEPC")
-  find_package(EDM4CEPC)
+  find_package(EDM4CEPC REQUIRED)
 else()
   message("Try to use an internal installation of EDM4CEPC")
   include("${CMAKE_CURRENT_LIST_DIR}/internal_edm4cepc.cmake")
diff --git a/cmake/CEPCSWOptions.cmake b/cmake/CEPCSWOptions.cmake
index 9ec71b8f6c24b9170273514ae7a0d1e28a194a49..5ec3fd5f0cba6a42e57df2d0f06025c81596e3e2 100644
--- a/cmake/CEPCSWOptions.cmake
+++ b/cmake/CEPCSWOptions.cmake
@@ -19,23 +19,23 @@ option(CEPCSW_USE_SYSTEM_CKF_BELLE
        "Use the existing installation of CKF BELLE. Otherwise the internal version will be used."
        FALSE)
 
-option(CEPCSW_USER_SYSTEM_EDM4CEPC
+option(CEPCSW_USE_SYSTEM_EDM4CEPC
        "Use the existing installation of EDM4CEPC. Otherwise the internal version will be used."
-       FALSE)
+       TRUE)
 
-option(CEPCSW_USER_SYSTEM_ILCUTIL
+option(CEPCSW_USE_SYSTEM_ILCUTIL
        "Use the existing installation of ILCUTIL. Otherwise the internal version will be used."
        FALSE)
 
-option(CEPCSW_USER_SYSTEM_AIDATT
+option(CEPCSW_USE_SYSTEM_AIDATT
        "Use the existing installation of aidaTT. Otherwise the internal version will be used."
        FALSE)
 
-option(CEPCSW_USER_SYSTEM_KALTEST
+option(CEPCSW_USE_SYSTEM_KALTEST
        "Use the existing installation of KalTest. Otherwise the internal version will be used."
        FALSE)
 
-option(CEPCSW_USER_SYSTEM_DDKALTEST
+option(CEPCSW_USE_SYSTEM_DDKALTEST
        "Use the existing installation of DDKalTest. Otherwise the internal version will be used."
        FALSE)