diff --git a/lib/ConnectionConfig.js b/lib/ConnectionConfig.js
index cfab9237..0e7a4480 100644
--- a/lib/ConnectionConfig.js
+++ b/lib/ConnectionConfig.js
@@ -187,7 +187,11 @@ ConnectionConfig.parseUrl = function(url) {
 
   if (typeof url.username == 'string') {
     options.user     = url.username;
-    options.password = url.password;
+    try {
+      options.password = decodeURIComponent(url.password);
+    } catch (e) {
+      options.password = url.password;
+    }
   } else if (url.auth) {
     var auth = url.auth.split(':');
     options.user     = auth.shift();