diff --git a/lib/core/common.py b/lib/core/common.py
index ab3b5310f..62d2bb664 100755
--- a/lib/core/common.py
+++ b/lib/core/common.py
@@ -1302,13 +1302,13 @@ def parseTargetUrl():
     conf.url = getUnicode("%s://%s:%d%s" % (conf.scheme, ("[%s]" % conf.hostname) if conf.ipv6 else conf.hostname, conf.port, conf.path))
     conf.url = conf.url.replace(URI_QUESTION_MARKER, '?')
 
-    if not conf.referer and intersect(REFERER_ALIASES, conf.testParameter, True):
+    if not conf.referer and (intersect(REFERER_ALIASES, conf.testParameter, True) or conf.level >= 3):
         debugMsg = "setting the HTTP Referer header to the target URL"
         logger.debug(debugMsg)
         conf.httpHeaders = filter(lambda (key, value): key != HTTP_HEADER.REFERER, conf.httpHeaders)
         conf.httpHeaders.append((HTTP_HEADER.REFERER, conf.url))
 
-    if not conf.host and intersect(HOST_ALIASES, conf.testParameter, True):
+    if not conf.host and (intersect(HOST_ALIASES, conf.testParameter, True) or conf.level >= 5):
         debugMsg = "setting the HTTP Host header to the target URL"
         logger.debug(debugMsg)
         conf.httpHeaders = filter(lambda (key, value): key != HTTP_HEADER.HOST, conf.httpHeaders)
diff --git a/lib/core/option.py b/lib/core/option.py
index 9c40e7198..0eafd1b20 100644
--- a/lib/core/option.py
+++ b/lib/core/option.py
@@ -1400,6 +1400,17 @@ def _setHTTPReferer():
 
         conf.httpHeaders.append((HTTP_HEADER.REFERER, conf.referer))
 
+def _setHTTPHost():
+    """
+    Set the HTTP Host
+    """
+
+    if conf.host:
+        debugMsg = "setting the HTTP Host header"
+        logger.debug(debugMsg)
+
+        conf.httpHeaders.append((HTTP_HEADER.HOST, conf.host))
+
 def _setHTTPCookies():
     """
     Set the HTTP Cookie header
@@ -2381,6 +2392,7 @@ def init():
         _setHTTPExtraHeaders()
         _setHTTPCookies()
         _setHTTPReferer()
+        _setHTTPHost()
         _setHTTPUserAgent()
         _setHTTPAuthentication()
         _setHTTPProxy()
diff --git a/lib/request/connect.py b/lib/request/connect.py
index 31dba92d2..677decdc5 100644
--- a/lib/request/connect.py
+++ b/lib/request/connect.py
@@ -321,7 +321,7 @@ class Connect(object):
             requestMsg += " %s" % httplib.HTTPConnection._http_vsn_str
 
             # Prepare HTTP headers
-            headers = forgeHeaders({HTTP_HEADER.COOKIE: cookie, HTTP_HEADER.USER_AGENT: ua, HTTP_HEADER.REFERER: referer})
+            headers = forgeHeaders({HTTP_HEADER.COOKIE: cookie, HTTP_HEADER.USER_AGENT: ua, HTTP_HEADER.REFERER: referer, HTTP_HEADER.HOST: host})
 
             if kb.authHeader:
                 headers[HTTP_HEADER.AUTHORIZATION] = kb.authHeader
@@ -332,11 +332,12 @@ class Connect(object):
             if HTTP_HEADER.ACCEPT not in headers:
                 headers[HTTP_HEADER.ACCEPT] = HTTP_ACCEPT_HEADER_VALUE
 
+            if HTTP_HEADER.HOST not in headers:
+                headers[HTTP_HEADER.HOST] = getHostHeader(url)
+
             if HTTP_HEADER.ACCEPT_ENCODING not in headers:
                 headers[HTTP_HEADER.ACCEPT_ENCODING] = HTTP_ACCEPT_ENCODING_HEADER_VALUE if kb.pageCompress else "identity"
 
-            headers[HTTP_HEADER.HOST] = host or getHostHeader(url)
-
             if post is not None and HTTP_HEADER.CONTENT_TYPE not in headers:
                 headers[HTTP_HEADER.CONTENT_TYPE] = POST_HINT_CONTENT_TYPES.get(kb.postHint, DEFAULT_CONTENT_TYPE)