diff --git a/modules/ejbca-common/src/org/ejbca/config/ScepConfiguration.java b/modules/ejbca-common/src/org/ejbca/config/ScepConfiguration.java
index f98e7927fd..8f6eff6297 100644
--- a/modules/ejbca-common/src/org/ejbca/config/ScepConfiguration.java
+++ b/modules/ejbca-common/src/org/ejbca/config/ScepConfiguration.java
@@ -260,7 +260,7 @@ public boolean getClientCertificateRenewal(final String alias) {
         //Lazy initialization for SCEP configurations older than 6.3.1
         if (value == null) {
             data.put(alias + "." + SCEP_CLIENT_CERTIFICATE_RENEWAL, DEFAULT_CLIENT_CERTIFICATE_RENEWAL);
-            return Boolean.getBoolean(DEFAULT_CLIENT_CERTIFICATE_RENEWAL);
+            return Boolean.parseBoolean(DEFAULT_CLIENT_CERTIFICATE_RENEWAL);
         }
         return Boolean.valueOf(value);
     }
@@ -288,7 +288,7 @@ public boolean getAllowClientCertificateRenewalWithOldKey(final String alias) {
         //Lazy initialization for SCEP configurations older than 6.3.1
         if (value == null) {
             data.put(alias + "." + SCEP_CLIENT_CERTIFICATE_RENEWAL_WITH_OLD_KEY, DEFAULT_ALLOW_CLIENT_CERTIFICATE_RENEWAL_WITH_OLD_KEY);
-            return Boolean.getBoolean(DEFAULT_ALLOW_CLIENT_CERTIFICATE_RENEWAL_WITH_OLD_KEY);
+            return Boolean.parseBoolean(DEFAULT_ALLOW_CLIENT_CERTIFICATE_RENEWAL_WITH_OLD_KEY);
         }
         return Boolean.valueOf(value);
     }
@@ -360,7 +360,7 @@ public boolean getAllowLegacyDigestAlgorithm(String alias) {
         // Allow for SCEP configurations older than 7.5.1 to use SHA-1 in responses by default
         if (value == null) {
             data.put(alias + "." + SCEP_ALLOW_LEGACY_DIGEST_ALGORITHM, "true");
-            return Boolean.getBoolean("true");
+            return true;
         }
         return StringUtils.equalsIgnoreCase(value, "true");
     }