diff --git a/src/modules/app.provider.ts b/src/modules/app.provider.ts
index d36a9f8..18a03af 100644
--- a/src/modules/app.provider.ts
+++ b/src/modules/app.provider.ts
@@ -16,7 +16,7 @@ BI.provider('dec.connection.provider.datebase', function() {
             };
         }
 
-        const greenplumUrl = url.match(/^jdbc:(pivotal:greenplum):(thin:([0-9a-zA-Z/]*)?@\/\/|\/\/|)([0-9a-zA-Z_\\.-]+)(:([0-9|port]+))?(\/|;)([^]+)(.*)/i);
+        const greenplumUrl = url.match(/^jdbc:(pivotal:greenplum):(thin:([0-9a-zA-Z/]*)?@\/\/|\/\/|)([0-9a-zA-Z_\\.-]+)(:([0-9|port]+))?(\/|;DatabaseName=)?([^]+)(.*)/i);
         if (greenplumUrl) {
             return {
                 host: greenplumUrl[4],
diff --git a/src/modules/constants/constant.ts b/src/modules/constants/constant.ts
index 1615dc6..064d448 100644
--- a/src/modules/constants/constant.ts
+++ b/src/modules/constants/constant.ts
@@ -537,7 +537,7 @@ export const DATA_BASE_TYPES = [
         kerberos: false,
         urls: {
             'org.postgresql.Driver': 'jdbc:postgresql://hostname:port/dbname',
-            'com.pivotal.jdbc.GreenplumDriver': 'jdbc:pivotal:greenplum://hostname:port;dbname',
+            'com.pivotal.jdbc.GreenplumDriver': 'jdbc:pivotal:greenplum://hostname:port;DatabaseName=dbname',
         },
     }, {
         text: 'Postgresql',