diff --git a/org.adempiere.install/src/org/compiere/install/ConfigurationData.java b/org.adempiere.install/src/org/compiere/install/ConfigurationData.java
index 0c9d98f2b1..1907c6601c 100644
--- a/org.adempiere.install/src/org/compiere/install/ConfigurationData.java
+++ b/org.adempiere.install/src/org/compiere/install/ConfigurationData.java
@@ -863,8 +863,8 @@ public class ConfigurationData
 
 		//	Create Connection
 		String ccType = Database.DB_ORACLE;
-		if (getDatabaseType().equals(DBTYPE_POSTGRESQL))
-			ccType = Database.DB_POSTGRESQL;
+		if (getDatabaseType() != null && !getDatabaseType().equals(Database.DB_ORACLE))
+			ccType = getDatabaseType();
 		CConnection cc = null;
 		try
 		{
@@ -1123,12 +1123,6 @@ public class ConfigurationData
 	 * 	Database Settings
 	 *************************************************************************/
 
-	/** Oracle directory	*/
-	//private static String	DBTYPE_ORACLE = "Oracle";
-
-	/** PostgreSQL          */
-	private static String	DBTYPE_POSTGRESQL = "PostgreSQL";
-
 	/** Database Types		*/
 	public static String[]	DBTYPE = null;
 	    //end e-evolution vpj-cd 02/07/2005 PostgreSQL