diff --git a/framework/src/Maveriks/WebApplication.php b/framework/src/Maveriks/WebApplication.php
index 8128618af..71324a893 100644
--- a/framework/src/Maveriks/WebApplication.php
+++ b/framework/src/Maveriks/WebApplication.php
@@ -405,9 +405,6 @@ class WebApplication
 
     public function loadEnvironment($workspace = "")
     {
-        $lang = "en";
-
-        define("SYS_LANG", $lang);
         define("PATH_SEP", DIRECTORY_SEPARATOR);
 
         define("PATH_TRUNK",    $this->rootDir . PATH_SEP);
diff --git a/workflow/engine/src/ProcessMaker/Services/OAuth2/PmPdo.php b/workflow/engine/src/ProcessMaker/Services/OAuth2/PmPdo.php
index 89e7aeed6..9bb70b8fd 100644
--- a/workflow/engine/src/ProcessMaker/Services/OAuth2/PmPdo.php
+++ b/workflow/engine/src/ProcessMaker/Services/OAuth2/PmPdo.php
@@ -295,5 +295,15 @@ class PmPdo implements \OAuth2\Storage\AuthorizationCodeInterface,
 
         return array_merge($a, array_change_key_case($a, $case));
     }
+
+    public function loadPostEnvironment($request = null)
+    {
+        if (!defined('SYS_LANG')) {
+            $acceptLanguage =$request->headers('ACCEPT_LANGUAGE');
+            $lang = (!is_null($acceptLanguage) && strlen($acceptLanguage)<=2)?$acceptLanguage:'en';
+            define("SYS_LANG", $lang);
+        }
+        return true;
+    }
 }
 
diff --git a/workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php b/workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php
index 8276c1d46..5fd8216b4 100644
--- a/workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php
+++ b/workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php
@@ -285,6 +285,8 @@ class Server implements iAuthenticate
             $request = \OAuth2\Request::createFromGlobals();
         }
 
+        $this->storage->loadPostEnvironment($request);
+
         $response = $this->server->handleTokenRequest($request); //Set/Get token //PmPdo->setAccessToken()
 
         $token = $response->getParameters();
@@ -332,6 +334,7 @@ class Server implements iAuthenticate
     public function __isAllowed()
     {
         $request = \OAuth2\Request::createFromGlobals();
+        $this->storage->loadPostEnvironment($request);
         $allowed = $this->server->verifyResourceRequest($request);
         $token = $this->server->getAccessTokenData($request);
         self::$userId = $token['user_id'];