diff --git a/lib/core/common.py b/lib/core/common.py
index c2f490b62..96eb25297 100644
--- a/lib/core/common.py
+++ b/lib/core/common.py
@@ -1128,7 +1128,8 @@ def parseTargetUrl():
         conf.httpHeaders = filter(lambda (key, value): key != HTTPHEADER.HOST, conf.httpHeaders)
         conf.httpHeaders.append((HTTPHEADER.HOST, getHostHeader(conf.url)))
 
-    kb.originalUrls[conf.url] = originalUrl
+    if conf.url != originalUrl:
+        kb.originalUrls[conf.url] = originalUrl
 
 def expandAsteriskForColumns(expression):
     """
diff --git a/lib/core/target.py b/lib/core/target.py
index d3941dfcb..ba3b44918 100644
--- a/lib/core/target.py
+++ b/lib/core/target.py
@@ -457,9 +457,11 @@ def _createTargetDirs():
             conf.outputPath = tempDir
 
     try:
-        with open(os.path.join(conf.outputPath, "target.txt"), "w+") as f:
-            _ = kb.originalUrls.get(conf.url) or conf.url or conf.hostname
-            f.write(_.encode(UNICODE_ENCODING))
+        with codecs.open(os.path.join(conf.outputPath, "target.txt"), "w+", UNICODE_ENCODING) as f:
+            f.write(kb.originalUrls.get(conf.url) or conf.url or conf.hostname)
+            f.write(" (%s)" % (HTTPMETHOD.POST if conf.data else HTTPMETHOD.GET))
+            if conf.data:
+                f.write("\n\n%s" % conf.data)
     except IOError, ex:
         if "denied" in str(ex):
             errMsg = "you don't have enough permissions "