diff --git a/includes/database.mysql.inc b/includes/database.mysql.inc
index 445a798167c1dbc01e2dcce5b870faf16794c38a..8ee51bbe1699f4d80f1cabe90ecea5c813cbc6f1 100644
--- a/includes/database.mysql.inc
+++ b/includes/database.mysql.inc
@@ -32,6 +32,12 @@ function db_connect($url) {
 
   $url = parse_url($url);
 
+  // Decode url-encoded information in the db connection string
+  $url['user'] = urldecode($url['user']);
+  $url['pass'] = urldecode($url['pass']);
+  $url['host'] = urldecode($url['host']);
+  $url['path'] = urldecode($url['path']);
+
   // Allow for non-standard MySQL port.
   if (isset($url['port'])) {
      $url['host'] = $url['host'] .':'. $url['port'];
diff --git a/includes/database.mysqli.inc b/includes/database.mysqli.inc
index 3fba6092f921457570be8e4e7d7ee0f0814d9126..372dcc558460d8ec350edc292355d055733af80f 100644
--- a/includes/database.mysqli.inc
+++ b/includes/database.mysqli.inc
@@ -32,6 +32,12 @@ function db_connect($url) {
 
   $url = parse_url($url);
 
+  // Decode url-encoded information in the db connection string
+  $url['user'] = urldecode($url['user']);
+  $url['pass'] = urldecode($url['pass']);
+  $url['host'] = urldecode($url['host']);
+  $url['path'] = urldecode($url['path']);
+
   // Allow for non-standard MySQL port.
   if (isset($url['port'])) {
      $url['host'] = $url['host'] .':'. $url['port'];
diff --git a/includes/database.pgsql.inc b/includes/database.pgsql.inc
index 8375c6366232e3c2810f77498e3561515c22192f..1bc2bf27829d49b57ca0d5c724ea1b3fa700fd00 100644
--- a/includes/database.pgsql.inc
+++ b/includes/database.pgsql.inc
@@ -32,6 +32,12 @@ function db_connect($url) {
 
   $url = parse_url($url);
 
+  // Decode url-encoded information in the db connection string
+  $url['user'] = urldecode($url['user']);
+  $url['pass'] = urldecode($url['pass']);
+  $url['host'] = urldecode($url['host']);
+  $url['path'] = urldecode($url['path']);
+
   $conn_string = ' user='. $url['user'] .' dbname='. substr($url['path'], 1) .' password='. $url['pass'] . ' host=' . $url['host'];
   $conn_string .= isset($url['port']) ? ' port=' . $url['port'] : '';