diff --git a/gulliver/methods/errors/block.php b/gulliver/methods/errors/block.php
index 5281ce1a3..19e20213e 100644
--- a/gulliver/methods/errors/block.php
+++ b/gulliver/methods/errors/block.php
@@ -4,7 +4,8 @@ if (function_exists("http_response_code")) {
 }
 
 $http = G::is_https() ? "https" : "http";
-$host = $_SERVER["SERVER_NAME"] . (($_SERVER["SERVER_PORT"] != "80") ? ":" . $_SERVER["SERVER_PORT"] : "");
+
+$host = $_SERVER['HTTP_HOST'] ?? ($_SERVER['SERVER_NAME'] . ':' . $_SERVER['SERVER_PORT']);
 
 $urlLogin = $http . "://" . $host . "/sys/en/lurana/login/login";
 $urlHome = $urlLogin;
diff --git a/gulliver/methods/errors/error403.php b/gulliver/methods/errors/error403.php
index df215336f..a4c25b831 100644
--- a/gulliver/methods/errors/error403.php
+++ b/gulliver/methods/errors/error403.php
@@ -1,7 +1,7 @@
 <?php
 
 $http = G::is_https() ? "https" : "http";
-$host = $_SERVER["SERVER_NAME"] . (($_SERVER["SERVER_PORT"] != "80")? ":" . $_SERVER["SERVER_PORT"] : "");
+$host = $_SERVER['HTTP_HOST'] ?? ($_SERVER['SERVER_NAME'] . ':' . $_SERVER['SERVER_PORT']);
 
 $urlLogin = $http . "://" . $host . "/sys/en/lurana/login/login";
 $urlHome =  $urlLogin;
diff --git a/workflow/engine/classes/class.pmFunctions.php b/workflow/engine/classes/class.pmFunctions.php
index 129a4d5b1..ed4aae3b8 100644
--- a/workflow/engine/classes/class.pmFunctions.php
+++ b/workflow/engine/classes/class.pmFunctions.php
@@ -608,7 +608,7 @@ function WSOpen($force = false)
         );
 
         if (!isset($_SESSION["WS_END_POINT"])) {
-            $defaultEndpoint = $_SERVER["REQUEST_SCHEME"] . "://" . $_SERVER["SERVER_NAME"] . ":" . $_SERVER["SERVER_PORT"] . "/sys" . config("system.workspace") . "/en/classic/services/wsdl2";
+            $defaultEndpoint = $_SERVER["REQUEST_SCHEME"] . "://" . $_SERVER["HTTP_HOST"] . "/sys" . config("system.workspace") . "/en/classic/services/wsdl2";
         }
 
         $endpoint = isset($_SESSION["WS_END_POINT"]) ? $_SESSION["WS_END_POINT"] : $defaultEndpoint;
diff --git a/workflow/engine/classes/model/CaseScheduler.php b/workflow/engine/classes/model/CaseScheduler.php
index aaefd64fc..69d9c066a 100644
--- a/workflow/engine/classes/model/CaseScheduler.php
+++ b/workflow/engine/classes/model/CaseScheduler.php
@@ -324,14 +324,13 @@ class CaseScheduler extends BaseCaseScheduler
             //Set variables
             $port = "";
 
-            if (isset($_SERVER["SERVER_PORT"])) {
-                $port = ($_SERVER["SERVER_PORT"] . "" != "80")? ":" . $_SERVER["SERVER_PORT"] : "";
-            } else {
-                if (defined("SERVER_PORT")) {
-                    $port = (SERVER_PORT . "" != "80")? ":" . SERVER_PORT : "";
-                }
-            }
 
+            if (defined("SERVER_PORT")) {
+                $port = (SERVER_PORT . "" != "80")? ":" . SERVER_PORT : "";
+            }else{
+                $port = (isset($_SERVER['HTTP_HOST']) && strpos($_SERVER['HTTP_HOST'], ':') !== false) ? ':' . explode(':', $_SERVER['HTTP_HOST'])[1] : '';
+            }
+            
             $url = SERVER_NAME . $port . "/sys" . config("system.workspace") . "/" . SYS_LANG . "/classic/services/wsdl2";
             
             $testConnection = true;
diff --git a/workflow/engine/controllers/adminProxy.php b/workflow/engine/controllers/adminProxy.php
index 0995993dd..150ba33b1 100644
--- a/workflow/engine/controllers/adminProxy.php
+++ b/workflow/engine/controllers/adminProxy.php
@@ -1380,7 +1380,7 @@ class adminProxy extends HttpProxyController
 
             $http = G::is_https() ? 'https' : 'http';
             $lang = defined('SYS_LANG') ? SYS_LANG : 'en';
-            $host = $_SERVER['SERVER_NAME'] . ($_SERVER['SERVER_PORT'] != '80' ? ':' . $_SERVER['SERVER_PORT'] : '');
+            $host = $_SERVER['HTTP_HOST'] ?? ($_SERVER['SERVER_NAME'] . ':' . $_SERVER['SERVER_PORT']);
 
             $endpoint = sprintf(
                 '%s://%s/sys%s/%s/%s/oauth2/grant',
diff --git a/workflow/engine/methods/login/authentication.php b/workflow/engine/methods/login/authentication.php
index 6ad48069f..57fa22d7b 100644
--- a/workflow/engine/methods/login/authentication.php
+++ b/workflow/engine/methods/login/authentication.php
@@ -308,6 +308,9 @@ try {
     $_CSERVER = $_SERVER;
     unset($_CSERVER['REQUEST_TIME']);
     unset($_CSERVER['REMOTE_PORT']);
+
+    $host = '';
+    $port = 80;
     if (!empty($_SERVER['HTTP_HOST'])) {
         $hostParts = explode(':', $_SERVER['HTTP_HOST']);
     
diff --git a/workflow/engine/methods/oauth2/grant.php b/workflow/engine/methods/oauth2/grant.php
index 0fa32f861..4abeba262 100644
--- a/workflow/engine/methods/oauth2/grant.php
+++ b/workflow/engine/methods/oauth2/grant.php
@@ -8,7 +8,7 @@ if (! empty($_GET['error'])) {
 }
 
 $http = G::is_https() ? 'https' : 'http';
-$host = $_SERVER['SERVER_NAME'] . ($_SERVER['SERVER_PORT'] != '80' ? ':' . $_SERVER['SERVER_PORT'] : '');
+$host = $_SERVER['HTTP_HOST'] ?? ($_SERVER['SERVER_NAME'] . ':' . $_SERVER['SERVER_PORT']);
 $endpoint = sprintf('%s://%s/%s/oauth2/token', $http, $host, config("system.workspace"));
 $code = empty($_GET['code']) ? 'NN' : $_GET['code'];
 
diff --git a/workflow/engine/methods/services/wsdl2.php b/workflow/engine/methods/services/wsdl2.php
index 86f9e35a8..ebf268a91 100644
--- a/workflow/engine/methods/services/wsdl2.php
+++ b/workflow/engine/methods/services/wsdl2.php
@@ -4,9 +4,8 @@ $filewsdl = PATH_METHODS . 'services' . PATH_SEP . 'pmos2.wsdl';
 $content = file_get_contents($filewsdl);
 
 $http = G::is_https() ? 'https' : 'http';
-$port = $_SERVER['SERVER_PORT'] === '80' ? '' : ':' . $_SERVER['SERVER_PORT'];
 $lang = defined('SYS_LANG') ? SYS_LANG : 'en';
-$endpoint = $http . '://' . $_SERVER['SERVER_NAME'] . $port . '/sys' . config("system.workspace") . '/' . $lang . '/lurana/services/soap2';
+$endpoint = $http . '://' . $_SERVER['HTTP_HOST'] . '/sys' . config("system.workspace") . '/' . $lang . '/lurana/services/soap2';
 
 $content = str_replace("___SOAP_ADDRESS___", $endpoint, $content);
 
diff --git a/workflow/engine/skinEngine/base/error404.php b/workflow/engine/skinEngine/base/error404.php
index 49a4c86f6..ce6f7e602 100644
--- a/workflow/engine/skinEngine/base/error404.php
+++ b/workflow/engine/skinEngine/base/error404.php
@@ -1,7 +1,7 @@
 <?php
 
 $http = G::is_https() ? "https" : "http";
-$host = $_SERVER["SERVER_NAME"] . (($_SERVER["SERVER_PORT"] != "80")? ":" . $_SERVER["SERVER_PORT"] : "");
+$host = $_SERVER['HTTP_HOST'] ?? ($_SERVER['SERVER_NAME'] . ':' . $_SERVER['SERVER_PORT']);
 
 $urlLogin = $http . "://" . $host . "/sys/en/lurana/login/login";
 $urlHome =  $urlLogin;
diff --git a/workflow/engine/skinEngine/lurana/error404.php b/workflow/engine/skinEngine/lurana/error404.php
index 9a7d1c551..1d4dd8f3b 100755
--- a/workflow/engine/skinEngine/lurana/error404.php
+++ b/workflow/engine/skinEngine/lurana/error404.php
@@ -3,7 +3,7 @@
 }
 
 $http = (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == "on")? "https" : "http";
-$host = $_SERVER["SERVER_NAME"] . (($_SERVER["SERVER_PORT"] != "80")? ":" . $_SERVER["SERVER_PORT"] : "");
+$host = $_SERVER['HTTP_HOST'] ?? ($_SERVER['SERVER_NAME'] . ':' . $_SERVER['SERVER_PORT']);
 
 $urlLogin = $http . "://" . $host . "/sys/en/luranasoft/login/login";
 $urlHome =  $urlLogin;
diff --git a/workflow/engine/src/ProcessMaker/Core/Installer.php b/workflow/engine/src/ProcessMaker/Core/Installer.php
index a1485a8b7..3a7cbf48e 100644
--- a/workflow/engine/src/ProcessMaker/Core/Installer.php
+++ b/workflow/engine/src/ProcessMaker/Core/Installer.php
@@ -199,7 +199,7 @@ class Installer
 
             $http = G::is_https() ? 'https' : 'http';
             $lang = defined('SYS_LANG') ? SYS_LANG : 'en';
-            $host = $_SERVER['SERVER_NAME'] . ($_SERVER['SERVER_PORT'] !== '80' ? ':' . $_SERVER['SERVER_PORT'] : '');
+            $host = $_SERVER['HTTP_HOST'] ?? ($_SERVER['SERVER_NAME'] . ':' . $_SERVER['SERVER_PORT']);
             $workspace = $this->options['name'];
 
             $endpoint = sprintf(
diff --git a/workflow/engine/src/ProcessMaker/Core/System.php b/workflow/engine/src/ProcessMaker/Core/System.php
index 26cf93d85..1361ed6a9 100644
--- a/workflow/engine/src/ProcessMaker/Core/System.php
+++ b/workflow/engine/src/ProcessMaker/Core/System.php
@@ -1645,10 +1645,8 @@ class System
      */
     public static function getServerPort()
     {
-        $port = "";
-        if (isset($_SERVER['SERVER_PORT'])) {
-            $port = $_SERVER['SERVER_PORT'];
-        } else if (defined('SERVER_PORT')) {
+        $port = "80";
+        if (defined('SERVER_PORT')) {
             $port = SERVER_PORT;
         }
         return $port;
diff --git a/workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php b/workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php
index 873a80a57..8b1b4e737 100644
--- a/workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php
+++ b/workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php
@@ -148,7 +148,7 @@ class Server implements iAuthenticate
     public function index()
     {
         $http = \G::is_https() ? 'https' : 'http';
-        $host = $_SERVER['SERVER_NAME'] . ($_SERVER['SERVER_PORT'] != '80' ? ':' . $_SERVER['SERVER_PORT'] : '');
+        $host = $_SERVER['HTTP_HOST'] ?? ($_SERVER['SERVER_NAME'] . ':' . $_SERVER['SERVER_PORT']);
         $host = $http .'://'. $host;
 
         $applicationsLink = sprintf('%s/%s/oauth2/apps', $host, config("system.workspace"));
@@ -184,7 +184,7 @@ class Server implements iAuthenticate
 
         if (! isset($_SESSION['USER_LOGGED'])) {
             $http = \G::is_https() ? 'https' : 'http';
-            $host = $http . '://' . $_SERVER['SERVER_NAME'] . ($_SERVER['SERVER_PORT'] != '80' ? ':' . $_SERVER['SERVER_PORT'] : '');
+            $host = $http . '://' . $_SERVER['HTTP_HOST'] ?? ($_SERVER['SERVER_NAME'] . ':' . $_SERVER['SERVER_PORT']);
             $redirect = urlencode('/'.self::$workspace.$_SERVER['REQUEST_URI']);
 
             $loginLink = sprintf('%s/sys%s/%s/%s/login/login?u=%s', $host, config("system.workspace"), SYS_LANG, SYS_SKIN, $redirect);
diff --git a/workflow/engine/templates/setup/webServicesTree.php b/workflow/engine/templates/setup/webServicesTree.php
index 9a02ea909..2dce30374 100644
--- a/workflow/engine/templates/setup/webServicesTree.php
+++ b/workflow/engine/templates/setup/webServicesTree.php
@@ -25,7 +25,7 @@ if (isset ($_GET ['x'])) {
     }
 }
 
-$defaultEndpoint = 'http://' . $_SERVER ['SERVER_NAME'] . ':' . $_SERVER ['SERVER_PORT'] . '/sys' . config("system.workspace") . '/en/classic/services/wsdl2';
+$defaultEndpoint = 'http://' . $_SERVER ['HTTP_HOST'] . '/sys' . config("system.workspace") . '/en/classic/services/wsdl2';
 
 $wsdl = isset ($_SESSION ['END_POINT']) ? $_SESSION ['END_POINT'] : $defaultEndpoint;