diff --git a/program/lib/MDB2.php b/program/lib/MDB2.php
index 4c0660218..61486a60c 100644
--- a/program/lib/MDB2.php
+++ b/program/lib/MDB2.php
@@ -888,10 +888,10 @@ class MDB2
         if ($dsn) {
             // /database
             if (($pos = strpos($dsn, '?')) === false) {
-                $parsed['database'] = $dsn;
+                $parsed['database'] = rawurldecode($dsn);
             // /database?param1=value1&param2=value2
             } else {
-                $parsed['database'] = substr($dsn, 0, $pos);
+                $parsed['database'] = rawurldecode(substr($dsn, 0, $pos));
                 $dsn = substr($dsn, $pos + 1);
                 if (strpos($dsn, '&') !== false) {
                     $opts = explode('&', $dsn);