--- a/java/sql-dk/src/info/globalcode/sql/dk/DatabaseConnection.java	Wed Jan 01 01:06:38 2014 +0100
+++ b/java/sql-dk/src/info/globalcode/sql/dk/DatabaseConnection.java	Wed Jan 01 02:44:29 2014 +0100
@@ -20,6 +20,7 @@
 import info.globalcode.sql.dk.batch.Batch;
 import info.globalcode.sql.dk.configuration.DatabaseDefinition;
 import info.globalcode.sql.dk.configuration.Properties;
+import info.globalcode.sql.dk.configuration.Property;
 import info.globalcode.sql.dk.formatting.ColumnsHeader;
 import info.globalcode.sql.dk.formatting.Formatter;
 import java.sql.Connection;
@@ -46,10 +47,12 @@
 		this.databaseDefinition = databaseDefinition;
 		this.properties = properties;
 
-		properties.setDefaults(databaseDefinition.getProperties());
+		Properties credentials = new Properties();
+		credentials.add(new Property("user", databaseDefinition.getUserName()));
+		credentials.add(new Property("password", databaseDefinition.getPassword()));
+		credentials.setDefaults(databaseDefinition.getProperties());
+		properties.setDefaults(credentials);
 		java.util.Properties javaProperties = properties.getJavaProperties();
-		javaProperties.setProperty("user", databaseDefinition.getUserName());
-		javaProperties.setProperty("password", databaseDefinition.getPassword());
 
 		connection = DriverManager.getConnection(databaseDefinition.getUrl(), javaProperties);
 	}