diff --git a/workflow/engine/classes/class.system.php b/workflow/engine/classes/class.system.php
index 9c8470930..cd7d7da4c 100755
--- a/workflow/engine/classes/class.system.php
+++ b/workflow/engine/classes/class.system.php
@@ -1138,7 +1138,7 @@ class System
         @preg_match( $patt, $content, $match );
 
         if (is_array( $match ) && count( $match ) > 0 && isset( $match[1] )) {
-            $newUrl = "sys/" . (($conf["lang"] != "")? $conf["lang"] : "en") . "/" . $conf["skin"] . "/login/login";
+            $newUrl = "sys/" . (($conf["lang"] != "")? $conf["lang"] : ((defined("SYS_LANG") && SYS_LANG != "")? SYS_LANG : "en")) . "/" . $conf["skin"] . "/login/login";
 
             $newMetaStr = str_replace( $match[1], $newUrl, $match[0] );
             $newContent = str_replace( $match[0], $newMetaStr, $content );
diff --git a/workflow/engine/controllers/adminProxy.php b/workflow/engine/controllers/adminProxy.php
index c5f69d694..d632636f8 100644
--- a/workflow/engine/controllers/adminProxy.php
+++ b/workflow/engine/controllers/adminProxy.php
@@ -119,7 +119,7 @@ class adminProxy extends HttpProxyController
 
         $this->success = true;
         $this->restart = $restart;
-        $this->url     = "/sys" .  SYS_SYS . "/" . (($sysConf["default_lang"] != "")? $sysConf["default_lang"] : "en") . "/" . $sysConf["default_skin"] . $urlPart;
+        $this->url     = "/sys" . SYS_SYS . "/" . (($sysConf["default_lang"] != "")? $sysConf["default_lang"] : ((defined("SYS_LANG") && SYS_LANG != "")? SYS_LANG : "en")) . "/" . $sysConf["default_skin"] . $urlPart;
         $this->message = 'Saved Successfully';
     }
 
diff --git a/workflow/engine/methods/login/login.php b/workflow/engine/methods/login/login.php
index acc19b3e7..378537f7b 100755
--- a/workflow/engine/methods/login/login.php
+++ b/workflow/engine/methods/login/login.php
@@ -155,7 +155,7 @@ $myUrl = explode("/", $_SERVER["REQUEST_URI"]);
 if (isset($myUrl) && $myUrl != "") {
     $aFields["USER_LANG"] = $myUrl[2];
 } else {
-    $aFields["USER_LANG"] = isset($oConf->aConfig["login_defaultLanguage"])? $oConf->aConfig["login_defaultLanguage"] : "en";
+    $aFields["USER_LANG"] = isset($oConf->aConfig["login_defaultLanguage"])? $oConf->aConfig["login_defaultLanguage"] : SYS_LANG;
 }
 
 $G_PUBLISH = new Publisher();
diff --git a/workflow/public_html/bootstrap.php b/workflow/public_html/bootstrap.php
index 998f0897f..4f21f9c7a 100755
--- a/workflow/public_html/bootstrap.php
+++ b/workflow/public_html/bootstrap.php
@@ -226,7 +226,7 @@
   if (!file_exists(PATH_HTML . 'index.html')) { // if not, create it from template
     file_put_contents(
       PATH_HTML . 'index.html',
-      G::parseTemplate(PATH_TPL . "index.html", array("lang" => ((SYS_LANG != "")? SYS_LANG : "en"), "skin" => SYS_SKIN))
+      G::parseTemplate(PATH_TPL . "index.html", array("lang" => ((defined("SYS_LANG") && SYS_LANG != "")? SYS_LANG : "en"), "skin" => SYS_SKIN))
     );
   }
 
diff --git a/workflow/public_html/sysGeneric.php b/workflow/public_html/sysGeneric.php
index 01ca8c78f..9c046b951 100755
--- a/workflow/public_html/sysGeneric.php
+++ b/workflow/public_html/sysGeneric.php
@@ -478,7 +478,7 @@ if (Bootstrap::isPMUnderUpdating()) {
 
 // verify if index.html exists
 if (! file_exists( PATH_HTML . 'index.html' )) { // if not, create it from template
-    file_put_contents( PATH_HTML . "index.html", Bootstrap::parseTemplate( PATH_TPL . "index.html", array ("lang" => ((SYS_LANG != "")? SYS_LANG : "en"), "skin" => SYS_SKIN
+    file_put_contents( PATH_HTML . "index.html", Bootstrap::parseTemplate( PATH_TPL . "index.html", array ("lang" => ((defined("SYS_LANG") && SYS_LANG != "")? SYS_LANG : "en"), "skin" => SYS_SKIN
     ) ) );
 }