diff --git a/framework/src/Maveriks/WebApplication.php b/framework/src/Maveriks/WebApplication.php
index 7fcd99d6f..e36fda227 100644
--- a/framework/src/Maveriks/WebApplication.php
+++ b/framework/src/Maveriks/WebApplication.php
@@ -378,7 +378,6 @@ class WebApplication
         }
 
         Services\OAuth2\Server::setWorkspace(SYS_SYS);
-        Services\OAuth2\Server::loadPostEnvironment();
         $this->rest->addAPIClass('\ProcessMaker\\Services\\OAuth2\\Server', 'oauth2');
 
         return $uri;
@@ -495,6 +494,8 @@ class WebApplication
         define("PATH_TEMPORAL", PATH_C . "dynEditor/");
         define("PATH_DB", PATH_DATA . "sites" . PATH_SEP);
 
+        \Bootstrap::setLanguage();
+
         \Bootstrap::LoadTranslationObject((defined("SYS_LANG"))? SYS_LANG : "en");
 
         if (empty($workspace)) {
diff --git a/gulliver/system/class.bootstrap.php b/gulliver/system/class.bootstrap.php
index 65d6ba029..1957b3105 100644
--- a/gulliver/system/class.bootstrap.php
+++ b/gulliver/system/class.bootstrap.php
@@ -2952,5 +2952,28 @@ class Bootstrap
     {
         return md5($string);
     }
+
+    /**
+     * Set Language
+     */
+    public static function setLanguage()
+    {
+        $acceptLanguage = $_SERVER['HTTP_ACCEPT_LANGUAGE'];
+        if (!defined('SYS_LANG')) {
+            $Translations = new \Translation;
+            $translationsTable = $Translations->getTranslationEnvironments();
+            $inLang = false;
+            foreach ($translationsTable as $locale) {
+                if ($locale['LOCALE'] == $acceptLanguage){
+                    $inLang = true;
+                    break;
+                }
+            }
+            $lang = $inLang?$acceptLanguage:'en';
+            define("SYS_LANG", $lang);
+        }
+
+    }
+
 }
 
diff --git a/workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php b/workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php
index ec1f21064..ea918b3e6 100644
--- a/workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php
+++ b/workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php
@@ -392,23 +392,5 @@ class Server implements iAuthenticate
         return "";
     }
 
-    public static function loadPostEnvironment()
-    {
-        $acceptLanguage = $_SERVER['HTTP_ACCEPT_LANGUAGE'];
-        if (!defined('SYS_LANG')) {
-            $Translations = new \Translation;
-            $translationsTable = $Translations->getTranslationEnvironments();
-            $inLang = false;
-            foreach ($translationsTable as $locale) {
-                if ($locale['LOCALE'] == $acceptLanguage){
-                    $inLang = true;
-                    break;
-                }
-            }
-            $lang = $inLang?$acceptLanguage:'en';
-            define("SYS_LANG", $lang);
-        }
-
-    }
 }