diff --git a/lib/connection-parameters.js b/lib/connection-parameters.js
index aa82e4a51..ff6b9d67e 100644
--- a/lib/connection-parameters.js
+++ b/lib/connection-parameters.js
@@ -39,6 +39,7 @@ var parse = function(str) {
     config.fallback_application_name = result.query.fallback_application_name;
   }
 
+  config.port = result.port;
   if(result.protocol == 'socket:') {
     config.host = decodeURI(result.pathname);
     config.database = result.query.db;
@@ -50,7 +51,6 @@ var parse = function(str) {
   var auth = (result.auth || ':').split(':');
   config.user = auth[0];
   config.password = auth[1];
-  config.port = result.port;
 
   var ssl = result.query.ssl;
   if (ssl === 'true' || ssl === '1') {
@@ -66,7 +66,7 @@ var useSsl = function() {
     return false;
   case "prefer":
   case "require":
-  case  "verify-ca":
+  case "verify-ca":
   case "verify-full":
     return true;
   }