diff --git a/lib/core/common.py b/lib/core/common.py
index e0e14a314..d6d4e6678 100644
--- a/lib/core/common.py
+++ b/lib/core/common.py
@@ -616,7 +616,7 @@ def parseTargetDirect():
     remote = False
 
     for dbms in SUPPORTED_DBMS:
-        details = re.search("^(?P<dbms>%s)://(?P<credentials>(?P<user>.+?)\:(?P<pass>.+?)\@)?(?P<remote>(?P<hostname>.+?)\:(?P<port>[\d]+)\/)?(?P<db>[\w\d\.\_\-\/]+?)$" % dbms, conf.direct, re.I)
+        details = re.search("^(?P<dbms>%s)://(?P<credentials>(?P<user>.+?)\:(?P<pass>.*?)\@)?(?P<remote>(?P<hostname>.+?)\:(?P<port>[\d]+)\/)?(?P<db>[\w\d\.\_\-\/]+?)$" % dbms, conf.direct, re.I)
 
         if details:
             conf.dbms = details.group('dbms')
@@ -628,6 +628,9 @@ def parseTargetDirect():
                 conf.dbmsUser = str()
                 conf.dbmsPass = str()
 
+            if not conf.dbmsPass:
+                conf.dbmsPass = None
+
             if details.group('remote'):
                 remote = True
                 conf.hostname = details.group('hostname')