diff --git a/lib/core/common.py b/lib/core/common.py
index 91631bc3a..65d268c71 100644
--- a/lib/core/common.py
+++ b/lib/core/common.py
@@ -2331,7 +2331,7 @@ def maskSensitiveData(msg):
 
     retVal = msg
 
-    for item in filter(lambda x: x, [conf.hostname, conf.googleDork]):
+    for item in filter(lambda x: x, [conf.hostname, conf.googleDork, conf.aCred]):
         regex = SENSITIVE_DATA_REGEX % item
         while extractRegexResult(regex, retVal):
             value = extractRegexResult(regex, retVal)
diff --git a/lib/core/settings.py b/lib/core/settings.py
index 7dd7555fd..0f351244b 100644
--- a/lib/core/settings.py
+++ b/lib/core/settings.py
@@ -243,7 +243,7 @@ DEFAULT_TOR_PROXY = "http://127.0.0.1:8118"
 URI_INJECTABLE_REGEX = r".*/([^\.*?]+)\Z"
 
 # Regex used for masking sensitive data
-SENSITIVE_DATA_REGEX = "\s(?P<result>[^\s]*%s[^\s]*)\s"
+SENSITIVE_DATA_REGEX = "(\s|=)(?P<result>[^\s=]*%s[^\s]*)\s"
 
 # Maximum number of threads (avoiding connection issues and/or DoS)
 MAX_NUMBER_OF_THREADS = 10