diff --git a/workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php b/workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php
index efe509912..ee7a04150 100644
--- a/workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php
+++ b/workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php
@@ -160,7 +160,7 @@ class Server implements iAuthenticate
         $request = \OAuth2\Request::createFromGlobals();
         $response = $this->server->handleTokenRequest($request);
 
-        /* DEPREACATED
+
         $token = $response->getParameters();
         if (array_key_exists('access_token', $token)) {
             $data = $this->storage->getAccessToken($token['access_token']);
@@ -168,7 +168,7 @@ class Server implements iAuthenticate
             // verify if the client is our local PM Designer client
             if ($data['client_id'] == self::getPmClientId()) {
                 error_log('do stuff - is a request from local pm client');
-                require_once "classes/model/PmoauthUserAccessTokens.php";
+                //require_once "classes/model/PmoauthUserAccessTokens.php";
 
                 $userToken = new \PmoauthUserAccessTokens();
                 $userToken->setAccessToken($token['access_token']);
@@ -178,7 +178,7 @@ class Server implements iAuthenticate
 
                 $userToken->save();
             }
-        }*/
+        }
 
         $response->send();
     }
diff --git a/workflow/public_html/sysGeneric.php b/workflow/public_html/sysGeneric.php
index 106f11638..8e343fd34 100755
--- a/workflow/public_html/sysGeneric.php
+++ b/workflow/public_html/sysGeneric.php
@@ -296,7 +296,7 @@ if ((preg_match("/msie/i", $_SERVER ['HTTP_USER_AGENT']) != 1 ||
    $config['safari_cookie_lifetime'] == 1)) {
     ini_set('session.cookie_lifetime', $timelife);
 }
-//session_start();
+session_start();
 
 //$e_all = defined( 'E_DEPRECATED' ) ? E_ALL & ~ E_DEPRECATED : E_ALL;
 //$e_all = defined( 'E_STRICT' ) ? $e_all & ~ E_STRICT : $e_all;
@@ -630,12 +630,6 @@ if (file_exists( $sSerializedFile )) {
 //require_once ("propel/Propel.php");
 //require_once ("creole/Creole.php");
 
-list($host, $port) = strpos(DB_HOST, ':') !== false ? explode(':', DB_HOST) : array(DB_HOST, '');
-$port = empty($port) ? '' : ";port=$port";
-$handler = new PmSessionHandler(DB_USER, DB_PASS, DB_ADAPTER.":host=$host;dbname=".DB_NAME.$port);
-
-session_start();
-
 if (defined( 'DEBUG_SQL_LOG' ) && DEBUG_SQL_LOG) {
     define( 'PM_PID', mt_rand( 1, 999999 ) );
     require_once 'Log.php';