diff --git a/lib/core/common.py b/lib/core/common.py
index 4eafecf20..e0762ac0e 100644
--- a/lib/core/common.py
+++ b/lib/core/common.py
@@ -1292,9 +1292,6 @@ def parseTargetUrl():
     else:
         conf.port = 80
 
-    if conf.forceSSL and conf.port == 80:
-        conf.port = 443
-
     if __urlSplit[3]:
         conf.parameters[PLACE.GET] = urldecode(__urlSplit[3]) if __urlSplit[3] and urlencode(DEFAULT_GET_POST_DELIMITER, None) not in __urlSplit[3] else __urlSplit[3]
 
diff --git a/lib/core/option.py b/lib/core/option.py
index 99ac0289d..649d5c16c 100644
--- a/lib/core/option.py
+++ b/lib/core/option.py
@@ -295,6 +295,8 @@ def __feedTargetsDict(reqFile, addedTargetUrls):
                         conf.httpHeaders.append((str(key), str(value)))
 
             if getPostReq and (params or cookie):
+                if conf.forceSSL:
+                    scheme = "https"
                 if not port and isinstance(scheme, basestring) and scheme.lower() == "https":
                     port = "443"
                 elif not scheme and port == "443":