diff --git a/config/demo.cnf b/config/demo.cnf
index 7f076769..4b8868a0 100644
--- a/config/demo.cnf
+++ b/config/demo.cnf
@@ -47,7 +47,8 @@ EJBCA_CDP3 =
 EJBCA_CDPS =
 EJBCA_CDP_URL_POSTFIX =
 EJBCA_CMP_ISSUER =
-EJBCA_CMP_CLIENT =
+EJBCA_CMP_CLIENT_CERT =
+EJBCA_CMP_CLIENT_KEY =
 EJBCA_TLS_CLIENT =
 EJBCA_CMP_TRUSTED =
 EJBCA_TLS_TRUSTED =