diff --git a/core/src/main/java/lucee/runtime/config/ConfigWebFactory.java b/core/src/main/java/lucee/runtime/config/ConfigWebFactory.java
index 82f451e1ee..398b349cdf 100644
--- a/core/src/main/java/lucee/runtime/config/ConfigWebFactory.java
+++ b/core/src/main/java/lucee/runtime/config/ConfigWebFactory.java
@@ -2294,7 +2294,7 @@ else if (access >= SecurityManager.VALUE_1 && access <= SecurityManager.VALUE_10
 			else if (hasCS) config.setPSQL(configServer.getPSQL());
 
 			// Data Sources
-			Struct dataSources = ConfigWebUtil.getAsStruct("dataSources", root);
+			Struct dataSources = ConfigWebUtil.getAsStruct(root, false, "dataSources");
 			if (accessCount == -1) accessCount = dataSources.size();
 			if (dataSources.size() < accessCount) accessCount = dataSources.size();
 
@@ -2310,7 +2310,7 @@ else if (access >= SecurityManager.VALUE_1 && access <= SecurityManager.VALUE_10
 				dataSource = Caster.toStruct(e.getValue(), null);
 				if (dataSource == null) continue;
 
-				if (dataSource.containsKey("database")) {
+				if (dataSource.containsKey(KeyConstants._database)) {
 					try {
 						// do we have an id?
 						jdbc = config.getJDBCDriverById(getAttr(dataSource, "id"), null);