diff --git a/ccp/mtba-compose.yml b/ccp/mtba-compose.yml
index 53fd327..d492ae0 100644
--- a/ccp/mtba-compose.yml
+++ b/ccp/mtba-compose.yml
@@ -7,8 +7,8 @@ services:
     environment:
       BLAZE_STORE_URL: http://bridgehead-ccp-blaze:8080/fhir
       # NOTE: Aktuell Berechtigungen wie MagicPL!!!
-      # TODO: Add separate ApiKey to Patientlist only for MTBA!
-      ID_MANAGER_API_KEY: ${IDMANAGER_LOCAL_PATIENTLIST_APIKEY}
+      # TODO: Add separate ApiKey to MagicPL only for MTBA!
+      ID_MANAGER_API_KEY: ${IDMANAGER_UPLOAD_APIKEY}
       ID_MANAGER_PSEUDONYM_ID_TYPE: BK_${IDMANAGEMENT_FRIENDLY_ID}_L-ID
       ID_MANAGER_URL: http://bridgehead-id-manager:8080
       PATIENT_CSV_FIRST_NAME_HEADER: ${PATIENT_CSV_FIRST_NAME_HEADER:-"FIRST_NAME"}
diff --git a/ccp/nngm-setup.sh b/ccp/nngm-setup.sh
index b55d48e..ba2e77f 100644
--- a/ccp/nngm-setup.sh
+++ b/ccp/nngm-setup.sh
@@ -12,7 +12,7 @@ function mtbaSetup() {
 	# TODO: Check if ID-Management Module is activated!
 	if [ -n "$ENABLE_MTBA" ];then
 		log INFO "MTBA setup detected -- will start MTBA Service and CBioPortal."
-		if [ -n "$IDMANAGER_UPLOAD_APIKEY" ]; then
+		if [ ! -n "$IDMANAGER_UPLOAD_APIKEY" ]; then
 			log ERROR "Detected MTBA Module configuration but ID-Management Module seems not to be configured!"
 			exit 1;
 		fi