diff --git a/index.js b/index.js
index 981bdcda..66798401 100644
--- a/index.js
+++ b/index.js
@@ -24,6 +24,10 @@ function parse(str) {
     }
   }
 
+  var auth = (result.auth || ':').split(':');
+  config.user = auth[0];
+  config.password = auth.splice(1).join(':');
+
   config.port = result.port;
   if(result.protocol == 'socket:') {
     config.host = decodeURI(result.pathname);
@@ -41,10 +45,6 @@ function parse(str) {
   }
   config.database = pathname && decodeURI(pathname);
 
-  var auth = (result.auth || ':').split(':');
-  config.user = auth[0];
-  config.password = auth.splice(1).join(':');
-
   if (config.ssl === 'true' || config.ssl === '1') {
     config.ssl = true;
   }
diff --git a/test/parse.js b/test/parse.js
index 6632cc71..abf2c4f9 100644
--- a/test/parse.js
+++ b/test/parse.js
@@ -52,6 +52,14 @@ describe('parse', function(){
     subject.client_encoding.should.equal('utf8');
   });
 
+  it('initializing with unix domain socket, username and password', function(){
+    var subject = parse('socket://brian:pw@/var/run/?db=mydb');
+    subject.user.should.equal('brian');
+    subject.password.should.equal('pw');
+    subject.host.should.equal('/var/run/');
+    subject.database.should.equal('mydb');
+  });
+
   it('password contains  < and/or >  characters', function(){
     var sourceConfig = {
       user:'brian',