From 3b47418a1d062a46dad00ba758bedd7a097ff05e Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Fri, 14 Mar 2014 22:20:20 +0100
Subject: [PATCH] Fix for an Issue #640

---
 lib/controller/checks.py | 2 ++
 lib/core/option.py       | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/controller/checks.py b/lib/controller/checks.py
index ffdcd19ae..da5deb47a 100644
--- a/lib/controller/checks.py
+++ b/lib/controller/checks.py
@@ -1210,6 +1210,8 @@ def checkConnection(suppressOutput=False):
         logger.info(infoMsg)
 
     try:
+        Request.queryPage(content=True, noteResponseTime=False)  # dropping first page because it can be totally different than subsequent (e.g. WebGoat) before the Cookie is set up
+
         page, _ = Request.queryPage(content=True, noteResponseTime=False)
         kb.originalPage = kb.pageTemplate = page
 
diff --git a/lib/core/option.py b/lib/core/option.py
index f3183c5c8..bcd48738e 100644
--- a/lib/core/option.py
+++ b/lib/core/option.py
@@ -1116,7 +1116,7 @@ def _setAuthCred():
     """
 
     if kb.passwordMgr:
-        kb.passwordMgr.add_password(None, "%s://%s" % (conf.scheme, conf.hostname), conf.authUsername, conf.authPassword)
+        kb.passwordMgr.add_password(None, "%s://%s:%d" % (conf.scheme, conf.hostname, conf.port), conf.authUsername, conf.authPassword)
 
 def _setHTTPAuthentication():
     """