diff --git a/Exchange/ExchangeAPI.js b/Exchange/ExchangeAPI.js
index 87a951530..3129473d6 100644
--- a/Exchange/ExchangeAPI.js
+++ b/Exchange/ExchangeAPI.js
@@ -1,4 +1,4 @@
-exports.newExchangeAPI = function newExchangeAPI(bot, logger) {
+exports.newExchangeAPI = function newExchangeAPI(logger, authToken) {
 
     /*
 
@@ -35,7 +35,21 @@
             let exchange = botExchange.toLowerCase() + 'Client.js';
             let api = require('./wrappers/' + exchange);
 
-            let keyVaultAPI = createKeyVaultAPIClient()
+            let accessToken
+            let keyId
+            let cloneId
+            if (global.CURRENT_EXECUTION_AT === "Cloud") {
+                keyId = process.env.KEY_ID
+                cloneId = process.env.CLONE_ID
+
+                let auth = require('../utils/auth')
+                let authTokenCloud = await auth.authenticate()
+                accessToken = 'Bearer ' + authTokenCloud
+            } else if (global.CURRENT_EXECUTION_AT === "Browser") {
+                accessToken = 'Bearer ' + authToken
+            }
+
+            let keyVaultAPI = createKeyVaultAPIClient(accessToken, keyId, cloneId)
             apiClient = api.newAPIClient(keyVaultAPI, logger);
 
             callBackFunction(global.DEFAULT_OK_RESPONSE);
@@ -46,23 +60,9 @@
         }
     }
 
-    function createKeyVaultAPIClient() {
+    function createKeyVaultAPIClient(accessToken, keyId, cloneId) {
         if (global.LOG_CONTROL[MODULE_NAME].logInfo === true) { logger.write(MODULE_NAME, "[INFO] createKeyVaultAPIClient -> Entering function."); }
-
-        let accessToken
-        let keyId
-        let cloneId
-        if (global.CURRENT_EXECUTION_AT === "Cloud") {
-            keyId = process.env.KEY_ID
-            cloneId = process.env.CLONE_ID
-
-            let auth = require('../utils/auth')
-            let authToken = await auth.authenticate()
-            accessToken = 'Bearer ' + authToken
-        } else if (global.CURRENT_EXECUTION_AT === "Browser") {
-            accessToken = window.localStorage.getItem('access_token')
-        }
-
+        
         const keyVaultAPI = {}
         keyVaultAPI.signTransaction = function (transaction, next) {
             axios({
diff --git a/ExtractionBotProcessMainLoop.js b/ExtractionBotProcessMainLoop.js
index e3caf7318..81b4b90a5 100644
--- a/ExtractionBotProcessMainLoop.js
+++ b/ExtractionBotProcessMainLoop.js
@@ -275,7 +275,7 @@
 
                             if (FULL_LOG === true) { logger.write(MODULE_NAME, "[INFO] run -> loop -> initializeExchangeAPI ->  Entering function."); }
 
-                            exchangeAPI = EXCHANGE_API.newExchangeAPI(bot, logger);
+                            exchangeAPI = EXCHANGE_API.newExchangeAPI(logger);
 
                             exchangeAPI.initialize(onInizialized);
 
diff --git a/Root.js b/Root.js
index 54f0992c0..e70a63ece 100644
--- a/Root.js
+++ b/Root.js
@@ -350,7 +350,7 @@
                                 case "Browser": {
                                     let startMode = {
                                         live: { run: "false" },
-                                        backtest: { run: "false" },
+                                        backtest: { run: "false", waitTime: 5000 },
                                         competition: { run: "false" }
                                     }
                                     let browserStartMode = global.CURRENT_START_MODE.toLowerCase()
diff --git a/TradingBotProcessMainLoop.js b/TradingBotProcessMainLoop.js
index 634c1aeff..4e90cc9de 100644
--- a/TradingBotProcessMainLoop.js
+++ b/TradingBotProcessMainLoop.js
@@ -617,7 +617,7 @@
 
                             if (FULL_LOG === true) { logger.write(MODULE_NAME, "[INFO] run -> loop -> initializeExchangeAPI ->  Entering function."); }
 
-                            exchangeAPI = EXCHANGE_API.newExchangeAPI(bot, logger);
+                            exchangeAPI = EXCHANGE_API.newExchangeAPI(logger);
 
                             exchangeAPI.initialize(onInizialized);