diff --git a/examples/js/ada/create-wallet.js b/examples/js/ada/create-wallet.js
index 72598370a9..371b7a15cb 100644
--- a/examples/js/ada/create-wallet.js
+++ b/examples/js/ada/create-wallet.js
@@ -30,7 +30,7 @@ const coin = 'tada';
 
 // Create the wallet
 async function main() {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
   const passcodeEncryptionCode = bitgo.generateRandomPassword();
 
   const walletOptions = {
diff --git a/examples/js/ada/get-pledge-vkeys.js b/examples/js/ada/get-pledge-vkeys.js
index 0a1a89a4c0..5782599942 100644
--- a/examples/js/ada/get-pledge-vkeys.js
+++ b/examples/js/ada/get-pledge-vkeys.js
@@ -12,7 +12,7 @@ const accessToken = '';
 const walletId = '';
 
 Promise.coroutine(function *() {
-  bitgo.authenticateWithAccessToken({ accessToken: accessToken });
+  yield bitgo.authenticateWithAccessToken({ accessToken: accessToken });
   yield bitgo.unlock({ otp: '000000', duration: 3600 });
   const walletInstance = yield basecoin.wallets().get({ id: walletId });
 
diff --git a/examples/js/ada/send-pledge-transaction.js b/examples/js/ada/send-pledge-transaction.js
index 873920c968..81d5197498 100644
--- a/examples/js/ada/send-pledge-transaction.js
+++ b/examples/js/ada/send-pledge-transaction.js
@@ -17,7 +17,7 @@ const pledgingNodeWitnessCborHex = '';
 
 Promise.coroutine(function* () {
   // generating address w/ same staking key and same payment key
-  bitgo.authenticateWithAccessToken({ accessToken: accessToken });
+  yield bitgo.authenticateWithAccessToken({ accessToken: accessToken });
   yield bitgo.unlock({ otp: '000000', duration: 3600 });
   const walletInstance = yield basecoin.wallets().get({ id: walletId });
 
diff --git a/examples/js/ada/send-staking-transaction.js b/examples/js/ada/send-staking-transaction.js
index f6ecfa1d84..9d05cb4b00 100644
--- a/examples/js/ada/send-staking-transaction.js
+++ b/examples/js/ada/send-staking-transaction.js
@@ -18,7 +18,7 @@ const walletPassphrase = null;
 
 Promise.coroutine(function* () {
   // generating address w/ same staking key and same payment key
-  bitgo.authenticateWithAccessToken({ accessToken: accessToken });
+  yield bitgo.authenticateWithAccessToken({ accessToken: accessToken });
   yield bitgo.unlock({ otp: '000000', duration: 3600 });
   const walletInstance = yield basecoin.wallets().get({ id: walletId });
 
diff --git a/examples/js/ada/send-unstaking-transaction.js b/examples/js/ada/send-unstaking-transaction.js
index 51b72fcadf..b6fbe29a50 100644
--- a/examples/js/ada/send-unstaking-transaction.js
+++ b/examples/js/ada/send-unstaking-transaction.js
@@ -18,7 +18,7 @@ const walletPassphrase = null;
 
 Promise.coroutine(function* () {
   // generating address w/ same staking key and same payment key
-  bitgo.authenticateWithAccessToken({ accessToken: accessToken });
+  yield bitgo.authenticateWithAccessToken({ accessToken: accessToken });
   yield bitgo.unlock({ otp: '000000', duration: 3600 });
   const walletInstance = yield basecoin.wallets().get({ id: walletId });
 
diff --git a/examples/js/algo/account-consolidation-build.js b/examples/js/algo/account-consolidation-build.js
index de941719ab..416b24a776 100644
--- a/examples/js/algo/account-consolidation-build.js
+++ b/examples/js/algo/account-consolidation-build.js
@@ -31,7 +31,7 @@ const otp = '000000';
 const accessToken = 'insert access token string here';
 
 Promise.coroutine(function* () {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  yield bitgo.authenticateWithAccessToken({ accessToken });
 
   const wallet = yield bitgo.coin(coin).wallets().get({ id: walletId });
 
diff --git a/examples/js/algo/account-consolidation-send.js b/examples/js/algo/account-consolidation-send.js
index e12562e2df..bed9226f1f 100644
--- a/examples/js/algo/account-consolidation-send.js
+++ b/examples/js/algo/account-consolidation-send.js
@@ -28,7 +28,7 @@ const otp = '000000';
 const accessToken = 'insert access token string here';
 
 Promise.coroutine(function* () {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  yield bitgo.authenticateWithAccessToken({ accessToken });
 
   const wallet = yield bitgo.coin(coin).wallets().get({ id: walletId });
 
diff --git a/examples/js/algo/disable-token.js b/examples/js/algo/disable-token.js
index 62f5dc81b6..4cbe5f16d7 100644
--- a/examples/js/algo/disable-token.js
+++ b/examples/js/algo/disable-token.js
@@ -36,7 +36,7 @@ const address = 'your root address or address of same wallet';
 const closeRemainderTo = 'your address where send token balance once you disable it';
 
 Promise.coroutine(function* () {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  yield bitgo.authenticateWithAccessToken({ accessToken });
 
   const wallet = yield bitgo.coin(coin).wallets().get({ id: walletId });
 
diff --git a/examples/js/algo/enable-token.js b/examples/js/algo/enable-token.js
index 9799257363..9d2019e089 100644
--- a/examples/js/algo/enable-token.js
+++ b/examples/js/algo/enable-token.js
@@ -34,7 +34,7 @@ const accessToken = 'insert access token string here';
 const address = 'your root address or address of same wallet';
 
 Promise.coroutine(function* () {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  yield bitgo.authenticateWithAccessToken({ accessToken });
 
   const wallet = yield bitgo.coin(coin).wallets().get({ id: walletId });
 
diff --git a/examples/js/atom/create-wallet.js b/examples/js/atom/create-wallet.js
index cb5ace250d..2cacc0bf2f 100644
--- a/examples/js/atom/create-wallet.js
+++ b/examples/js/atom/create-wallet.js
@@ -30,7 +30,7 @@ const coin = 'tatom';
 
 // Create the wallet
 async function main() {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
   const passcodeEncryptionCode = bitgo.generateRandomPassword();
 
   const walletOptions = {
diff --git a/examples/js/atom/send-wallet-transaction.js b/examples/js/atom/send-wallet-transaction.js
index 4a3b9b6baf..cb63cdabc6 100644
--- a/examples/js/atom/send-wallet-transaction.js
+++ b/examples/js/atom/send-wallet-transaction.js
@@ -26,7 +26,7 @@ const otp = '';
 
 // Create the wallet
 async function main() {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
 
   await bitgo.unlock({ otp: otp, duration: 3600 });
   const wallet = await bitgo.coin(coin).wallets().get({ id });
diff --git a/examples/js/build-transaction.js b/examples/js/build-transaction.js
index 60f4c62675..0fd3ebf41d 100644
--- a/examples/js/build-transaction.js
+++ b/examples/js/build-transaction.js
@@ -24,7 +24,7 @@ const amount = '';
 const toAddress = '';
 
 Promise.coroutine(function* () {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  yield bitgo.authenticateWithAccessToken({ accessToken });
 
   const wallet = yield bitgo.coin(coin).wallets().get({ id });
 
diff --git a/examples/js/create-policy.js b/examples/js/create-policy.js
index d9cda641da..0fc48b75cf 100644
--- a/examples/js/create-policy.js
+++ b/examples/js/create-policy.js
@@ -20,7 +20,7 @@ const id = null;
 const coin = 'tltc';
 
 Promise.coroutine(function* () {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  yield bitgo.authenticateWithAccessToken({ accessToken });
 
   const wallet = yield bitgo.coin(coin).wallets().get({ id });
 
diff --git a/examples/js/create-tss-wallet.js b/examples/js/create-tss-wallet.js
index d472b2774a..6725980710 100644
--- a/examples/js/create-tss-wallet.js
+++ b/examples/js/create-tss-wallet.js
@@ -27,7 +27,7 @@ const coin = 'tsol';
 
 // Create the wallet
 async function main() {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
 
   const walletOptions = {
     label,
diff --git a/examples/js/create-wallet-address.js b/examples/js/create-wallet-address.js
index acccfbf2d8..a4b4882119 100644
--- a/examples/js/create-wallet-address.js
+++ b/examples/js/create-wallet-address.js
@@ -18,7 +18,7 @@ const accessToken = '';
 const walletId = '';
 
 Promise.coroutine(function* () {
-  bitgo.authenticateWithAccessToken({ accessToken: accessToken });
+  yield bitgo.authenticateWithAccessToken({ accessToken: accessToken });
 
   const wallet = yield bitgo.coin(coin).wallets().get({ id: walletId });
 
diff --git a/examples/js/create-wallet-addresses.js b/examples/js/create-wallet-addresses.js
index 394cff3d92..68b6758366 100644
--- a/examples/js/create-wallet-addresses.js
+++ b/examples/js/create-wallet-addresses.js
@@ -15,7 +15,7 @@ const accessToken = null;
 const walletPassphrase = null;
 
 Promise.coroutine(function* () {
-  bitgo.authenticateWithAccessToken({ accessToken: accessToken });
+  yield bitgo.authenticateWithAccessToken({ accessToken: accessToken });
 
   const wallet = yield basecoin.wallets().generateWallet({
     label: `Test Wallet Example`,
diff --git a/examples/js/create-wallet.js b/examples/js/create-wallet.js
index 275fbd9793..10cff620aa 100644
--- a/examples/js/create-wallet.js
+++ b/examples/js/create-wallet.js
@@ -31,7 +31,7 @@ const coin = 'tltc';
 
 // Create the wallet
 Promise.coroutine(function* () {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  yield bitgo.authenticateWithAccessToken({ accessToken });
 
   const walletOptions = {
     label,
diff --git a/examples/js/cross-chain-recovery.js b/examples/js/cross-chain-recovery.js
index d14fddbbe3..b694522262 100644
--- a/examples/js/cross-chain-recovery.js
+++ b/examples/js/cross-chain-recovery.js
@@ -32,7 +32,7 @@ const walletPassphrase = null;
 const xprv = null;
 
 async function main() {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
 
   const recoveryTx = await sourceCoin.recoverFromWrongChain({
     txid,
diff --git a/examples/js/eth/create-wallet-address.js b/examples/js/eth/create-wallet-address.js
index 314dc6ad3f..8be9c5e254 100644
--- a/examples/js/eth/create-wallet-address.js
+++ b/examples/js/eth/create-wallet-address.js
@@ -26,7 +26,7 @@ const walletId = '';
 const forwarderVersion = 1;
 
 async function createAddress() {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
 
   const wallet = await bitgo.coin(coin).wallets().get({ id: walletId });
 
diff --git a/examples/js/eth/create-wallet.js b/examples/js/eth/create-wallet.js
index 99ede79877..63ae55e5b4 100644
--- a/examples/js/eth/create-wallet.js
+++ b/examples/js/eth/create-wallet.js
@@ -29,7 +29,7 @@ const coin = 'teth';
 
 // Create the wallet
 async function createWallet() {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
 
   const walletOptions = {
     label,
diff --git a/examples/js/eth/list-wallet-addresses.js b/examples/js/eth/list-wallet-addresses.js
index 6949caaa1d..53a9518c77 100644
--- a/examples/js/eth/list-wallet-addresses.js
+++ b/examples/js/eth/list-wallet-addresses.js
@@ -13,7 +13,7 @@ const accessToken = '';
 const walletId = '';
 
 async function main() {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
 
   const walletInstance = await basecoin.wallets().get({ id: walletId });
   const addresses = await walletInstance.addresses({
diff --git a/examples/js/eth/set-flush-threshold.js b/examples/js/eth/set-flush-threshold.js
index 9c6c694c00..26529d8edb 100644
--- a/examples/js/eth/set-flush-threshold.js
+++ b/examples/js/eth/set-flush-threshold.js
@@ -23,7 +23,7 @@ const walletId = '';
 const threshold = 10;
 
 async function setTokenFlushThreshold() {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
   const wallet = await bitgo.coin(coin).wallets().get({ id: walletId });
   console.log('Initial Token Flush Threshold:', wallet.tokenFlushThresholds());
   await wallet.updateTokenFlushThresholds({ terc: threshold });
diff --git a/examples/js/get-maximum-spendable.js b/examples/js/get-maximum-spendable.js
index 1a0dfd64ec..09b15a7c47 100644
--- a/examples/js/get-maximum-spendable.js
+++ b/examples/js/get-maximum-spendable.js
@@ -26,7 +26,7 @@ const coin = 'tbtc';
 const basecoin = bitgo.coin(coin);
 
 Promise.coroutine(function* () {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  yield bitgo.authenticateWithAccessToken({ accessToken });
 
   const walletInstance = yield basecoin.wallets().get({ id: id });
 
diff --git a/examples/js/get-wallet-balance.js b/examples/js/get-wallet-balance.js
index 66ed177f89..6bc26663d8 100644
--- a/examples/js/get-wallet-balance.js
+++ b/examples/js/get-wallet-balance.js
@@ -18,7 +18,7 @@ const accessToken = null;
 const walletId = '5941ce2db42fcbc70717e5a898fd1595';
 
 Promise.coroutine(function* () {
-  bitgo.authenticateWithAccessToken({ accessToken: accessToken });
+  yield bitgo.authenticateWithAccessToken({ accessToken: accessToken });
 
   const walletInstance = yield basecoin.wallets().get({ id: walletId });
 
diff --git a/examples/js/get-wallet-token-balance.js b/examples/js/get-wallet-token-balance.js
index 01766a210b..12d124dbca 100644
--- a/examples/js/get-wallet-token-balance.js
+++ b/examples/js/get-wallet-token-balance.js
@@ -19,7 +19,7 @@ const accessToken = '';
 const walletId = '624ef521e876e800073b865e31b6d7e9';
 
 Promise.coroutine(function* () {
-  bitgo.authenticateWithAccessToken({ accessToken: accessToken });
+  yield bitgo.authenticateWithAccessToken({ accessToken: accessToken });
 
   const walletInstance = yield basecoin.wallets().get({ id: walletId, allTokens: true });
 
diff --git a/examples/js/get-wallet.js b/examples/js/get-wallet.js
index a952b4b2bc..a4f46428db 100644
--- a/examples/js/get-wallet.js
+++ b/examples/js/get-wallet.js
@@ -23,7 +23,7 @@ const coin = 'tltc';
 
 // Create the wallet with Bluebird coroutines
 Promise.coroutine(function* () {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  yield bitgo.authenticateWithAccessToken({ accessToken });
 
   const wallet = yield bitgo.coin(coin).wallets().get({ id });
 
diff --git a/examples/js/list-wallet-addresses.js b/examples/js/list-wallet-addresses.js
index 7f81e72f13..0a501fa559 100644
--- a/examples/js/list-wallet-addresses.js
+++ b/examples/js/list-wallet-addresses.js
@@ -13,7 +13,7 @@ const accessToken = '';
 const walletId = '';
 
 async function main() {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
 
   const walletInstance = await basecoin.wallets().get({ id: walletId });
   const addresses = await walletInstance.addresses();
diff --git a/examples/js/list-wallet-shares.js b/examples/js/list-wallet-shares.js
index 736327ce5b..4ae21bf625 100644
--- a/examples/js/list-wallet-shares.js
+++ b/examples/js/list-wallet-shares.js
@@ -18,7 +18,7 @@ const accessToken = null;
 const coin = 'tltc';
 
 Promise.coroutine(function* () {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  yield bitgo.authenticateWithAccessToken({ accessToken });
 
   const shares = yield bitgo.coin(coin).wallets().listShares({});
 
diff --git a/examples/js/list-wallet-transfers.js b/examples/js/list-wallet-transfers.js
index f8bcbbc386..3ed8b757c0 100644
--- a/examples/js/list-wallet-transfers.js
+++ b/examples/js/list-wallet-transfers.js
@@ -17,7 +17,7 @@ const accessToken = null;
 const walletId = '5941ce2db42fcbc70717e5a898fd1595';
 
 Promise.coroutine(function* () {
-  bitgo.authenticateWithAccessToken({ accessToken: accessToken });
+  yield bitgo.authenticateWithAccessToken({ accessToken: accessToken });
 
   const walletInstance = yield basecoin.wallets().get({ id: walletId });
   const transfers = yield walletInstance.transfers();
diff --git a/examples/js/list-wallets.js b/examples/js/list-wallets.js
index da720a2038..d1ab7d3ffc 100644
--- a/examples/js/list-wallets.js
+++ b/examples/js/list-wallets.js
@@ -18,7 +18,7 @@ const accessToken = null;
 const coin = 'tltc';
 
 Promise.coroutine(function* () {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  yield bitgo.authenticateWithAccessToken({ accessToken });
 
   const wallets = yield bitgo.coin(coin).wallets().list({});
 
diff --git a/examples/js/resend-wallet-share-invite.js b/examples/js/resend-wallet-share-invite.js
index a4af92cd1f..752fde4ae1 100644
--- a/examples/js/resend-wallet-share-invite.js
+++ b/examples/js/resend-wallet-share-invite.js
@@ -18,7 +18,7 @@ const walletShareId = null;
 const coin = 'tltc';
 
 Promise.coroutine(function* () {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  yield bitgo.authenticateWithAccessToken({ accessToken });
 
   const shareResult = yield bitgo.coin(coin).wallets().resendShareInvite({ walletShareId });
 
diff --git a/examples/js/send-message.js b/examples/js/send-message.js
index 301e822c91..b811084712 100644
--- a/examples/js/send-message.js
+++ b/examples/js/send-message.js
@@ -16,7 +16,7 @@ const walletId = null;
 const walletPassphrase = '';
 
 Promise.coroutine(function* () {
-  bitgo.authenticateWithAccessToken({ accessToken: accessToken });
+  yield bitgo.authenticateWithAccessToken({ accessToken: accessToken });
 
   const walletInstance = yield basecoin.wallets().get({ id: walletId });
 
diff --git a/examples/js/send-wallet-transaction.js b/examples/js/send-wallet-transaction.js
index d12ae6bd94..54f7eb5a03 100644
--- a/examples/js/send-wallet-transaction.js
+++ b/examples/js/send-wallet-transaction.js
@@ -16,7 +16,7 @@ const walletId = '5941ce2db42fcbc70717e5a898fd1595';
 const walletPassphrase = null;
 
 Promise.coroutine(function* () {
-  bitgo.authenticateWithAccessToken({ accessToken: accessToken });
+  yield bitgo.authenticateWithAccessToken({ accessToken: accessToken });
 
   const walletInstance = yield basecoin.wallets().get({ id: walletId });
 
diff --git a/examples/js/share-wallet.js b/examples/js/share-wallet.js
index 17d2e41cf5..431d03b0d6 100644
--- a/examples/js/share-wallet.js
+++ b/examples/js/share-wallet.js
@@ -30,7 +30,7 @@ const passphrase = null;
 const coin = 'tltc';
 
 Promise.coroutine(function* () {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  yield bitgo.authenticateWithAccessToken({ accessToken });
 
   const wallet = yield bitgo.coin(coin).wallets().get({ id: walletId });
 
diff --git a/examples/js/sol/enableTokens.js b/examples/js/sol/enableTokens.js
index 5bc4ed9265..b2d244f825 100644
--- a/examples/js/sol/enableTokens.js
+++ b/examples/js/sol/enableTokens.js
@@ -25,7 +25,7 @@ const coin = 'tsol';
 
 // Enable tokens for your root wallet
 async function main() {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
   const wallet = await bitgo.coin(coin).wallets().get({ id: walletId });
 
   const enableTokens = await wallet.sendTokenEnablements({
diff --git a/examples/js/sol/enableTokensForAddress.js b/examples/js/sol/enableTokensForAddress.js
index 1478ae8ce8..500f42b076 100644
--- a/examples/js/sol/enableTokensForAddress.js
+++ b/examples/js/sol/enableTokensForAddress.js
@@ -28,7 +28,7 @@ const coin = 'tsol';
 
 // Enable tokens for a receive address
 async function main() {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
   const wallet = await bitgo.coin(coin).wallets().get({ id: walletId });
 
   const enableTokens = await wallet.sendTokenEnablements({
diff --git a/examples/js/sui/custom-tx/custom-tx.js b/examples/js/sui/custom-tx/custom-tx.js
index cf0546b698..710077697d 100644
--- a/examples/js/sui/custom-tx/custom-tx.js
+++ b/examples/js/sui/custom-tx/custom-tx.js
@@ -15,7 +15,7 @@ const base64TxHex = '<base64-tx-hex>';
 
 async function submitCustomTx() {
   // (Optional) unlock if needed
-  bitgo.authenticateWithAccessToken({ accessToken: accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken: accessToken });
   await bitgo.unlock({ otp: '000000', duration: 3600 });
   const walletInstance = await basecoin.wallets().get({ id: walletId });
 
diff --git a/examples/js/trx/consolidate-account-balances.js b/examples/js/trx/consolidate-account-balances.js
index 06d61fbeff..59aa0226ba 100644
--- a/examples/js/trx/consolidate-account-balances.js
+++ b/examples/js/trx/consolidate-account-balances.js
@@ -26,7 +26,7 @@ const otp = '000000';
 const accessToken = '';
 
 async function main() {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
 
   const wallet = await bitgo.coin(coin).wallets().get({ id: walletId });
   // Wallet's base address - only address in the wallet that can send funds to other accounts
diff --git a/examples/js/trx/create-address.js b/examples/js/trx/create-address.js
index d5409a9fba..ab3eb638ae 100644
--- a/examples/js/trx/create-address.js
+++ b/examples/js/trx/create-address.js
@@ -15,7 +15,7 @@ const walletId = '';
 const accessToken = '';
 
 async function main() {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
 
   const wallet = await bitgo.coin(coin).wallets().getWallet({ id: walletId });
   const address = await wallet.createAddress({ label: 'My address' });
diff --git a/examples/js/update-wallet-forwarders.js b/examples/js/update-wallet-forwarders.js
index 2655fa3ed6..19d2f31471 100644
--- a/examples/js/update-wallet-forwarders.js
+++ b/examples/js/update-wallet-forwarders.js
@@ -21,7 +21,7 @@ const walletId = '';
 // toggles boolean flags for deployForwardersManually and flushForwardersManually
 
 async function setForwarderFlags() {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
   const wallet = await bitgo.coin(coin).wallets().get({ id: walletId });
 
   const deployForwardersManually = wallet._wallet.coinSpecific.deployForwardersManually;
diff --git a/examples/js/webhooks-add.js b/examples/js/webhooks-add.js
index 38adc6b955..c7005e2552 100644
--- a/examples/js/webhooks-add.js
+++ b/examples/js/webhooks-add.js
@@ -32,7 +32,7 @@ const label = '';
 const numConfirmations = 0;
 
 async function main() {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
 
   const coin = bitgo.coin(network);
 
diff --git a/examples/js/webhooks-list-notifications.js b/examples/js/webhooks-list-notifications.js
index 7fc31725c9..d27ef1a47f 100644
--- a/examples/js/webhooks-list-notifications.js
+++ b/examples/js/webhooks-list-notifications.js
@@ -17,7 +17,7 @@ const accessToken = '';
 const network = '';
 
 async function main() {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
 
   const coin = bitgo.coin(network);
 
diff --git a/examples/js/webhooks-list.js b/examples/js/webhooks-list.js
index b6a6114961..db65424bae 100644
--- a/examples/js/webhooks-list.js
+++ b/examples/js/webhooks-list.js
@@ -17,7 +17,7 @@ const accessToken = '';
 const network = '';
 
 async function main() {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
 
   const coin = bitgo.coin(network);
 
diff --git a/examples/js/webhooks-remove.js b/examples/js/webhooks-remove.js
index fce4e88440..2f8a0fce28 100644
--- a/examples/js/webhooks-remove.js
+++ b/examples/js/webhooks-remove.js
@@ -25,7 +25,7 @@ const callbackUrl = '';
 const type = '';
 
 async function main() {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
 
   const coin = bitgo.coin(network);
 
diff --git a/examples/js/webhooks-simulate.js b/examples/js/webhooks-simulate.js
index 6c731b2941..21f868364a 100644
--- a/examples/js/webhooks-simulate.js
+++ b/examples/js/webhooks-simulate.js
@@ -25,7 +25,7 @@ const webhookId = '';
 const blockId = '';
 
 async function main() {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
 
   const coin = bitgo.coin(network);
 
diff --git a/examples/js/xtz/consolidate-account-balances.js b/examples/js/xtz/consolidate-account-balances.js
index bbcef10c7d..84552e0abd 100644
--- a/examples/js/xtz/consolidate-account-balances.js
+++ b/examples/js/xtz/consolidate-account-balances.js
@@ -27,7 +27,7 @@ const otp = '000000';
 const accessToken = '';
 
 Promise.coroutine(function* () {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  yield bitgo.authenticateWithAccessToken({ accessToken });
 
   const wallet = yield bitgo.coin(coin).wallets().get({ id: walletId });
   // Wallet's base address - only address in the wallet that can send funds to other accounts
diff --git a/examples/js/xtz/create-address.js b/examples/js/xtz/create-address.js
index a348724ec3..e5540792f2 100644
--- a/examples/js/xtz/create-address.js
+++ b/examples/js/xtz/create-address.js
@@ -16,7 +16,7 @@ const walletId = '';
 const accessToken = '';
 
 Promise.coroutine(function* () {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  yield bitgo.authenticateWithAccessToken({ accessToken });
 
   const wallet = yield bitgo.coin(coin).wallets().getWallet({ id: walletId });
   const address = yield wallet.createAddress({ label: 'My address' });
diff --git a/examples/ts/algo/account-consolidation-build.ts b/examples/ts/algo/account-consolidation-build.ts
index 89955480a2..a312e39f6f 100644
--- a/examples/ts/algo/account-consolidation-build.ts
+++ b/examples/ts/algo/account-consolidation-build.ts
@@ -31,7 +31,7 @@ const walletPassphrase = 'set your wallet passphrase here';
 const otp = '000000';
 
 async function main() {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
 
   const wallet: Wallet = await bitgo.coin(coin).wallets().get({ id: walletId });
 
diff --git a/examples/ts/algo/account-consolidation-send.ts b/examples/ts/algo/account-consolidation-send.ts
index 66e8d75c0a..8d3757d702 100644
--- a/examples/ts/algo/account-consolidation-send.ts
+++ b/examples/ts/algo/account-consolidation-send.ts
@@ -28,7 +28,7 @@ const walletPassphrase = 'set your wallet passphrase here';
 const otp = '000000';
 
 async function main() {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
 
   const wallet: Wallet = await bitgo.coin(coin).wallets().get({ id: walletId });
 
diff --git a/examples/ts/algo/disable-token.ts b/examples/ts/algo/disable-token.ts
index 4cbabab0b9..833a5c4588 100644
--- a/examples/ts/algo/disable-token.ts
+++ b/examples/ts/algo/disable-token.ts
@@ -36,7 +36,7 @@ const address = 'your root address or address of same wallet';
 const closeRemainderTo = 'your address where send token balance once you disable it';
 
 async function main(): Promise<void> {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
 
   const wallet: Wallet = await bitgo.coin(coin).wallets().get({ id: walletId });
 
diff --git a/examples/ts/algo/enable-token.ts b/examples/ts/algo/enable-token.ts
index b05289b6e6..74ba998d36 100644
--- a/examples/ts/algo/enable-token.ts
+++ b/examples/ts/algo/enable-token.ts
@@ -34,7 +34,7 @@ const accessToken = 'insert access token string here';
 const address = 'your root address or address of same wallet';
 
 async function main(): Promise<void> {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
 
   const wallet: Wallet = await bitgo.coin(coin).wallets().get({ id: walletId });
 
diff --git a/examples/ts/algo/transaction-with-emergency-param.ts b/examples/ts/algo/transaction-with-emergency-param.ts
index e7144361d9..5e55b0d877 100644
--- a/examples/ts/algo/transaction-with-emergency-param.ts
+++ b/examples/ts/algo/transaction-with-emergency-param.ts
@@ -35,7 +35,7 @@ const accessToken = 'insert access token string here';
 const address = 'your root address or address of same wallet';
 
 async function main(): Promise<void> {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
 
   const wallet: Wallet = await bitgo.coin(coin).wallets().get({ id: walletId });
 
diff --git a/examples/ts/atom/create-wallet.ts b/examples/ts/atom/create-wallet.ts
index e6624dd640..8fef9a2157 100644
--- a/examples/ts/atom/create-wallet.ts
+++ b/examples/ts/atom/create-wallet.ts
@@ -26,7 +26,7 @@ const enterprise = '';
 
 // Create the wallet
 async function createWallet() {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
 
   const walletOptions: GenerateWalletOptions = {
     label,
diff --git a/examples/ts/atom/send-transfer.ts b/examples/ts/atom/send-transfer.ts
index cfc1a94fdc..214b815936 100644
--- a/examples/ts/atom/send-transfer.ts
+++ b/examples/ts/atom/send-transfer.ts
@@ -33,7 +33,7 @@ async function sendTx() {
   });
 
   const basecoin = bitgo.coin(coin);
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
   await bitgo.unlock({ otp: otp, duration: 3600 });
 
   const walletInstance = await basecoin.wallets().get({ id: walletId });
diff --git a/examples/ts/btc/bip322/verifyProof.ts b/examples/ts/btc/bip322/verifyProof.ts
index de3bd79208..02ec4b94ad 100644
--- a/examples/ts/btc/bip322/verifyProof.ts
+++ b/examples/ts/btc/bip322/verifyProof.ts
@@ -71,7 +71,7 @@ async function main(): Promise<void> {
 
   // Initialize BitGo SDK
   const bitgo = new BitGo({ env: environment });
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
   if (otp) {
     const unlock = await bitgo.unlock({ otp, duration: 3600 });
     if (!unlock) {
diff --git a/examples/ts/btc/changeAddress/config.ts b/examples/ts/btc/changeAddress/config.ts
index 06cccc1699..5c5bf8e2fb 100644
--- a/examples/ts/btc/changeAddress/config.ts
+++ b/examples/ts/btc/changeAddress/config.ts
@@ -10,10 +10,9 @@ const otp = '';
 
 const sdk = new BitGoAPI({ env });
 sdk.register('tbtc', Tbtc.createInstance);
-sdk.authenticateWithAccessToken({ accessToken });
-
 export const changeAddressConfig = {
   env,
+  accessToken,
   coin: env === 'test' ? 'tbtc' : 'btc',
   sdk,
   walletPassphrase,
diff --git a/examples/ts/btc/changeAddress/index.ts b/examples/ts/btc/changeAddress/index.ts
index 504c39a717..79ad10982d 100644
--- a/examples/ts/btc/changeAddress/index.ts
+++ b/examples/ts/btc/changeAddress/index.ts
@@ -9,6 +9,7 @@ const RECEIVE_ADDRESS = '';
 const CHANGE_ADDRESS = '';
 
 async function getWallet() {
+  await changeAddressConfig.sdk.authenticateWithAccessToken({ accessToken: changeAddressConfig.accessToken });
   return await changeAddressConfig.sdk
     .coin(changeAddressConfig.coin)
     .wallets()
diff --git a/examples/ts/btc/legacySafe/config.ts b/examples/ts/btc/legacySafe/config.ts
index c137aeb9d5..46f3e09617 100644
--- a/examples/ts/btc/legacySafe/config.ts
+++ b/examples/ts/btc/legacySafe/config.ts
@@ -13,10 +13,9 @@ const otp = '';
 
 const sdk = new BitGoAPI({ env });
 sdk.register('tbtc', Tbtc.createInstance);
-sdk.authenticateWithAccessToken({ accessToken });
-
 export const legacySafeConfig = {
   env,
+  accessToken,
   coin: env === 'test' ? 'tbtc' : 'btc',
   bitgo,
   sdk,
diff --git a/examples/ts/btc/legacySafe/create-wallet.ts b/examples/ts/btc/legacySafe/create-wallet.ts
index 7455e06737..2babb5ec4d 100644
--- a/examples/ts/btc/legacySafe/create-wallet.ts
+++ b/examples/ts/btc/legacySafe/create-wallet.ts
@@ -25,6 +25,7 @@ const createWallet = async () => {
 };
 
 export const getV1SafeWallet = async () => {
+  await legacySafeConfig.bitgo.authenticateWithAccessToken({ accessToken: legacySafeConfig.accessToken });
   await legacySafeConfig.bitgo.unlock({ otp: '000000' });
   const v1SafeWallet = await legacySafeConfig.bitgo
     .wallets()
diff --git a/examples/ts/btc/legacySafe/recover.ts b/examples/ts/btc/legacySafe/recover.ts
index f25cc62917..ee207c49bc 100644
--- a/examples/ts/btc/legacySafe/recover.ts
+++ b/examples/ts/btc/legacySafe/recover.ts
@@ -8,6 +8,7 @@ const destination = '2MyGxrhLC4kRfuVjLqCVYFtC7DchhgMCiNz';
  * Usage: npx tsx btc/legacySafe/recover.ts
  * */
 const recoveryTransaction = async () => {
+  await legacySafeConfig.sdk.authenticateWithAccessToken({ accessToken: legacySafeConfig.accessToken });
   const coin = legacySafeConfig.sdk.coin(legacySafeConfig.coin) as AbstractUtxoCoin;
   return await coin.recoverV1({
     walletId: legacySafeConfig.walletId,
diff --git a/examples/ts/btc/legacySafe/sweep.ts b/examples/ts/btc/legacySafe/sweep.ts
index 2e7e71f5c0..35d2770c9c 100644
--- a/examples/ts/btc/legacySafe/sweep.ts
+++ b/examples/ts/btc/legacySafe/sweep.ts
@@ -8,6 +8,7 @@ const destination = '2MyGxrhLC4kRfuVjLqCVYFtC7DchhgMCiNz';
  * Usage: npx tsx btc/legacySafe/sweep.ts
  * */
 const sweepTransaction = async () => {
+  await legacySafeConfig.sdk.authenticateWithAccessToken({ accessToken: legacySafeConfig.accessToken });
   const coin = legacySafeConfig.sdk.coin(legacySafeConfig.coin) as AbstractUtxoCoin;
   return await coin.sweepV1({
     walletId: legacySafeConfig.walletId,
diff --git a/examples/ts/btc/omni/config.ts b/examples/ts/btc/omni/config.ts
index 54d76057e1..d20296c1ec 100644
--- a/examples/ts/btc/omni/config.ts
+++ b/examples/ts/btc/omni/config.ts
@@ -13,10 +13,9 @@ const otp = '';
 const sdk = new BitGoAPI({ env });
 sdk.register('tbtc4', Tbtc4.createInstance);
 sdk.register('btc', Btc.createInstance);
-sdk.authenticateWithAccessToken({ accessToken });
-
 export const omniConfig = {
   env,
+  accessToken,
   coin: env === 'test' ? 'tbtc4' : 'btc',
   network: env === 'test' ? utxolib.networks.bitcoinTestnet4 : utxolib.networks.bitcoin,
   sdk,
diff --git a/examples/ts/btc/omni/index.ts b/examples/ts/btc/omni/index.ts
index 56c4f5d17a..49f38f7c24 100644
--- a/examples/ts/btc/omni/index.ts
+++ b/examples/ts/btc/omni/index.ts
@@ -14,6 +14,7 @@ const ASSET_ID = 31;
 const BASE_AMOUNT = 729100000n; // this is currently 7.291 USDT
 
 async function getWallet() {
+  await omniConfig.sdk.authenticateWithAccessToken({ accessToken: omniConfig.accessToken });
   return await omniConfig.sdk.coin(omniConfig.coin).wallets().get({ id: omniConfig.walletId });
 }
 
diff --git a/examples/ts/btc/rbf/custodial/original-tx.ts b/examples/ts/btc/rbf/custodial/original-tx.ts
index 136b81c739..432829f4ee 100644
--- a/examples/ts/btc/rbf/custodial/original-tx.ts
+++ b/examples/ts/btc/rbf/custodial/original-tx.ts
@@ -7,11 +7,11 @@ import { BitGo, EnvironmentName } from '../../../../../modules/bitgo';
 import { rbfConfig } from './config';
 
 const bitgo = new BitGo({ env: rbfConfig.env as EnvironmentName });
-bitgo.authenticateWithAccessToken({ accessToken: rbfConfig.accessToken });
 
 const RECEIVE_ADDRESS = '';
 
 async function getWallet() {
+  await bitgo.authenticateWithAccessToken({ accessToken: rbfConfig.accessToken });
   return await bitgo.coin(rbfConfig.coin).wallets().get({ id: rbfConfig.walletId });
 }
 
diff --git a/examples/ts/btc/rbf/custodial/replacement-tx.ts b/examples/ts/btc/rbf/custodial/replacement-tx.ts
index 40f80ab7aa..f51b0e0a93 100644
--- a/examples/ts/btc/rbf/custodial/replacement-tx.ts
+++ b/examples/ts/btc/rbf/custodial/replacement-tx.ts
@@ -7,9 +7,9 @@ import { BitGo, EnvironmentName } from '../../../../../modules/bitgo';
 import { rbfConfig } from './config';
 
 const bitgo = new BitGo({ env: rbfConfig.env as EnvironmentName });
-bitgo.authenticateWithAccessToken({ accessToken: rbfConfig.accessToken });
 
 async function getWallet() {
+  await bitgo.authenticateWithAccessToken({ accessToken: rbfConfig.accessToken });
   return await bitgo.coin(rbfConfig.coin).wallets().get({ id: rbfConfig.walletId });
 }
 
diff --git a/examples/ts/btc/rbf/index.ts b/examples/ts/btc/rbf/index.ts
index 4a73ee9b63..ede65f07d5 100644
--- a/examples/ts/btc/rbf/index.ts
+++ b/examples/ts/btc/rbf/index.ts
@@ -8,11 +8,11 @@ import { BitGo, EnvironmentName } from '../../../../modules/bitgo';
 import { rbfConfig } from './config';
 
 const bitgo = new BitGo({ env: rbfConfig.env as EnvironmentName });
-bitgo.authenticateWithAccessToken({ accessToken: rbfConfig.accessToken });
 
 const RECEIVE_ADDRESS = '';
 
 async function getWallet() {
+  await bitgo.authenticateWithAccessToken({ accessToken: rbfConfig.accessToken });
   return await bitgo.coin(rbfConfig.coin).wallets().get({ id: rbfConfig.walletId });
 }
 
diff --git a/examples/ts/btc/v1/wallet-passphrase-recovery.ts b/examples/ts/btc/v1/wallet-passphrase-recovery.ts
index 5fa07c8844..e649a84b4d 100644
--- a/examples/ts/btc/v1/wallet-passphrase-recovery.ts
+++ b/examples/ts/btc/v1/wallet-passphrase-recovery.ts
@@ -91,7 +91,7 @@ async function main(): Promise<void> {
       throw new Error('Login did not return a usable token (no access_token or encryptedToken).');
     }
 
-    bitgo.authenticateWithAccessToken({ accessToken });
+    await bitgo.authenticateWithAccessToken({ accessToken });
 
     console.log('Authentication successful.');
 
diff --git a/examples/ts/btc/v1/wallet-recovery-validation.ts b/examples/ts/btc/v1/wallet-recovery-validation.ts
index 01ca2c464d..3e212fcf10 100755
--- a/examples/ts/btc/v1/wallet-recovery-validation.ts
+++ b/examples/ts/btc/v1/wallet-recovery-validation.ts
@@ -81,7 +81,7 @@ async function main(): Promise<void> {
       throw new Error('Login did not return a usable token (no access_token or encryptedToken).');
     }
 
-    bitgo.authenticateWithAccessToken({ accessToken });
+    await bitgo.authenticateWithAccessToken({ accessToken });
 
     console.log('Authentication successful.');
 
diff --git a/examples/ts/create-tss-custodial-wallet.ts b/examples/ts/create-tss-custodial-wallet.ts
index 575b941d4a..e8869876c7 100644
--- a/examples/ts/create-tss-custodial-wallet.ts
+++ b/examples/ts/create-tss-custodial-wallet.ts
@@ -22,7 +22,7 @@ const coin = 'tsol';
 
 // Create the wallet
 async function main() {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
 
   const walletOptions = {
     label,
diff --git a/examples/ts/create-tss-smc-wallet.ts b/examples/ts/create-tss-smc-wallet.ts
index 1992876c1f..abdfbbb449 100644
--- a/examples/ts/create-tss-smc-wallet.ts
+++ b/examples/ts/create-tss-smc-wallet.ts
@@ -32,7 +32,7 @@ const coin = 'tsol';
 
 // Create the wallet
 async function main() {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
 
   const walletOptions = {
     label,
diff --git a/examples/ts/create-tss-wallet.ts b/examples/ts/create-tss-wallet.ts
index a0c71de263..af42c7ff74 100644
--- a/examples/ts/create-tss-wallet.ts
+++ b/examples/ts/create-tss-wallet.ts
@@ -27,7 +27,7 @@ const coin = 'tsol';
 
 // Create the wallet
 async function main() {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
 
   const walletOptions = {
     label,
diff --git a/examples/ts/create-wallet-address.ts b/examples/ts/create-wallet-address.ts
index d48e7f9d30..76aa53191b 100644
--- a/examples/ts/create-wallet-address.ts
+++ b/examples/ts/create-wallet-address.ts
@@ -17,7 +17,7 @@ const accessToken = '';
 const walletId = '';
 
 async function main() {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
 
   const wallet = await basecoin.wallets().get({ id: walletId });
 
diff --git a/examples/ts/defi-vault-deposit.ts b/examples/ts/defi-vault-deposit.ts
index a5382ad538..ef740d841f 100644
--- a/examples/ts/defi-vault-deposit.ts
+++ b/examples/ts/defi-vault-deposit.ts
@@ -34,7 +34,7 @@ const bitgoTest = new BitGo({
 
 async function main() {
   console.log('Connecting to staging...');
-  bitgoTest.authenticateWithAccessToken({ accessToken: config.accessToken });
+  await bitgoTest.authenticateWithAccessToken({ accessToken: config.accessToken });
   //await bitgoTest.unlock({ otp: config.otp, duration: 3600 });
   const wallet = await bitgoTest.coin('tbaseeth').wallets().get({ id: config.walletId });
   console.log('Wallet ID   :', wallet.id());
diff --git a/examples/ts/defi-vault-withdraw.ts b/examples/ts/defi-vault-withdraw.ts
index 2e208fae50..2b035333ba 100644
--- a/examples/ts/defi-vault-withdraw.ts
+++ b/examples/ts/defi-vault-withdraw.ts
@@ -36,7 +36,7 @@ const bitgoTest = new BitGo({
 
 async function main() {
   console.log('Connecting to staging...');
-  bitgoTest.authenticateWithAccessToken({ accessToken: config.accessToken });
+  await bitgoTest.authenticateWithAccessToken({ accessToken: config.accessToken });
   //await bitgoTest.unlock({ otp: config.otp, duration: 3600 });
   const wallet = await bitgoTest.coin('tbaseeth').wallets().get({ id: config.walletId });
   console.log('Wallet ID   :', wallet.id());
diff --git a/examples/ts/defi-vault-wrap.ts b/examples/ts/defi-vault-wrap.ts
index b926794a60..ed3869da26 100644
--- a/examples/ts/defi-vault-wrap.ts
+++ b/examples/ts/defi-vault-wrap.ts
@@ -43,7 +43,7 @@ const bitgoTest = new BitGo({
 
 async function main() {
   console.log('Connecting to staging...');
-  bitgoTest.authenticateWithAccessToken({ accessToken: config.accessToken });
+  await bitgoTest.authenticateWithAccessToken({ accessToken: config.accessToken });
   //await bitgoTest.unlock({ otp: config.otp, duration: 3600 });
   const wallet = await bitgoTest.coin(config.coin).wallets().get({ id: config.walletId });
   console.log('Wallet ID   :', wallet.id());
diff --git a/examples/ts/eth/create-wallet-address.ts b/examples/ts/eth/create-wallet-address.ts
index e39721e4e1..970923ba53 100644
--- a/examples/ts/eth/create-wallet-address.ts
+++ b/examples/ts/eth/create-wallet-address.ts
@@ -25,7 +25,7 @@ const walletId = '';
 const forwarderVersion = 1;
 
 async function createAddress() {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
 
   const wallet = await bitgo.coin(coin).wallets().get({ id: walletId });
 
diff --git a/examples/ts/eth/create-wallet.ts b/examples/ts/eth/create-wallet.ts
index eada42ee85..73fe8c1109 100644
--- a/examples/ts/eth/create-wallet.ts
+++ b/examples/ts/eth/create-wallet.ts
@@ -29,7 +29,7 @@ const coin = 'teth';
 
 // Create the wallet
 async function createWallet() {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
 
   const walletOptions = {
     label,
diff --git a/examples/ts/eth/deployForwarder.ts b/examples/ts/eth/deployForwarder.ts
index 01c198a615..95aaf88271 100644
--- a/examples/ts/eth/deployForwarder.ts
+++ b/examples/ts/eth/deployForwarder.ts
@@ -21,7 +21,7 @@ const walletId = '';
 const addressId = '';
 
 async function deployForwarders() {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
   const wallet = await bitgo.coin(coin).wallets().get({ id: walletId });
 
   const deployForwarderOptions = {
diff --git a/examples/ts/eth/flushForwarderToken.ts b/examples/ts/eth/flushForwarderToken.ts
index cf7f4e3419..802b444f7b 100644
--- a/examples/ts/eth/flushForwarderToken.ts
+++ b/examples/ts/eth/flushForwarderToken.ts
@@ -21,7 +21,7 @@ const walletId = '';
 const addressId = '';
 
 async function flushForwarderTokenManually() {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
   const wallet = await bitgo.coin(coin).wallets().get({ id: walletId });
 
   const flushForwarderOptions = {
diff --git a/examples/ts/eth/fund-forwarder.ts b/examples/ts/eth/fund-forwarder.ts
index 7a86b1abd7..43ae13a397 100644
--- a/examples/ts/eth/fund-forwarder.ts
+++ b/examples/ts/eth/fund-forwarder.ts
@@ -27,7 +27,7 @@ const forwarderAddress = '';
 const amount = '1';
 
 async function fundForwarder() {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
   const wallet = await bitgo.coin(coin).wallets().get({ id: walletId });
 
   const fundForwarderParams: FundForwarderParams = {
diff --git a/examples/ts/eth/list-wallet-addresses.ts b/examples/ts/eth/list-wallet-addresses.ts
index 6949caaa1d..53a9518c77 100644
--- a/examples/ts/eth/list-wallet-addresses.ts
+++ b/examples/ts/eth/list-wallet-addresses.ts
@@ -13,7 +13,7 @@ const accessToken = '';
 const walletId = '';
 
 async function main() {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
 
   const walletInstance = await basecoin.wallets().get({ id: walletId });
   const addresses = await walletInstance.addresses({
diff --git a/examples/ts/eth/set-flush-threshold.ts b/examples/ts/eth/set-flush-threshold.ts
index 9c6c694c00..26529d8edb 100644
--- a/examples/ts/eth/set-flush-threshold.ts
+++ b/examples/ts/eth/set-flush-threshold.ts
@@ -23,7 +23,7 @@ const walletId = '';
 const threshold = 10;
 
 async function setTokenFlushThreshold() {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
   const wallet = await bitgo.coin(coin).wallets().get({ id: walletId });
   console.log('Initial Token Flush Threshold:', wallet.tokenFlushThresholds());
   await wallet.updateTokenFlushThresholds({ terc: threshold });
diff --git a/examples/ts/nft/nft-consolidation-send.ts b/examples/ts/nft/nft-consolidation-send.ts
index ed3d607636..000d6cb120 100644
--- a/examples/ts/nft/nft-consolidation-send.ts
+++ b/examples/ts/nft/nft-consolidation-send.ts
@@ -17,7 +17,7 @@ const walletPassphrase = '';
 const otp = '000000';
 
 async function main() {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
 
   const wallet: Wallet = await bitgo.coin(coin).wallets().get({ id: walletId });
   if (!wallet) {
diff --git a/examples/ts/reserve-unspents.ts b/examples/ts/reserve-unspents.ts
index 02a82d38dc..ddfa3a9916 100644
--- a/examples/ts/reserve-unspents.ts
+++ b/examples/ts/reserve-unspents.ts
@@ -23,7 +23,7 @@ const unspentIds = ['', ''];
 const expireTime = '';
 
 async function createUnspentReservation() {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
   const wallet = await bitgo.coin(coin).wallets().get({ id: walletId });
 
   const reserveResult = await wallet.manageUnspentReservations({
@@ -33,7 +33,7 @@ async function createUnspentReservation() {
 }
 
 async function modifyUnspentReservation() {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
   const wallet = await bitgo.coin(coin).wallets().get({ id: walletId });
 
   const reserveResult = await wallet.manageUnspentReservations({
@@ -43,7 +43,7 @@ async function modifyUnspentReservation() {
 }
 
 async function releaseUnspentReservation() {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
   const wallet = await bitgo.coin(coin).wallets().get({ id: walletId });
 
   const reserveResult = await wallet.manageUnspentReservations({
diff --git a/examples/ts/sol/account-consolidation-build.ts b/examples/ts/sol/account-consolidation-build.ts
index c22e662f94..0013a04c88 100644
--- a/examples/ts/sol/account-consolidation-build.ts
+++ b/examples/ts/sol/account-consolidation-build.ts
@@ -30,7 +30,7 @@ const walletPassphrase = '';
 const otp = '000000';
 
 async function main() {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
 
   const wallet: Wallet = await bitgo.coin(coin).wallets().get({ id: walletId });
 
diff --git a/examples/ts/stablecoin/initiate-burn-order.ts b/examples/ts/stablecoin/initiate-burn-order.ts
index 6d18828c08..c733f32329 100644
--- a/examples/ts/stablecoin/initiate-burn-order.ts
+++ b/examples/ts/stablecoin/initiate-burn-order.ts
@@ -36,7 +36,6 @@ const fromAmountInFullUnits = '100'; // Amount in full units of the stablecoin (
 
 // Initialize BitGo SDK
 const bitgo = new BitGoJS.BitGo({ env: environment });
-bitgo.authenticateWithAccessToken({ accessToken: accessToken });
 const basecoin = bitgo.coin(ofcStablecoin);
 
 function createStablecoinUrl(path: string): string {
@@ -48,6 +47,7 @@ function createStablecoinUrl(path: string): string {
  */
 async function main() {
   try {
+    await bitgo.authenticateWithAccessToken({ accessToken: accessToken });
     console.log('🚀 Starting Stablecoin Burn Order Process...');
     console.log('='.repeat(50));
     console.log(`Environment: ${environment}`);
diff --git a/examples/ts/stablecoin/initiate-mint-order.ts b/examples/ts/stablecoin/initiate-mint-order.ts
index e3cb7c2357..d0bafc6f82 100644
--- a/examples/ts/stablecoin/initiate-mint-order.ts
+++ b/examples/ts/stablecoin/initiate-mint-order.ts
@@ -36,7 +36,6 @@ const fromAmountInFullUnits = '100'; // Amount in full units of USD (100 USD) -
 
 // Initialize BitGo SDK
 const bitgo = new BitGoJS.BitGo({ env: environment });
-bitgo.authenticateWithAccessToken({ accessToken: accessToken });
 const basecoin = bitgo.coin(ofcUsdCoin);
 
 function createStablecoinUrl(path: string): string {
@@ -48,6 +47,7 @@ function createStablecoinUrl(path: string): string {
  */
 async function main() {
   try {
+    await bitgo.authenticateWithAccessToken({ accessToken: accessToken });
     console.log('🚀 Starting Stablecoin Mint Order Process...');
     console.log('='.repeat(50));
     console.log(`Environment: ${environment}`);
diff --git a/examples/ts/sui/build-pay-transaction.ts b/examples/ts/sui/build-pay-transaction.ts
index f65b34d01a..3babce994a 100644
--- a/examples/ts/sui/build-pay-transaction.ts
+++ b/examples/ts/sui/build-pay-transaction.ts
@@ -26,7 +26,7 @@ const enterprise = '';
 
 // build pay transaction
 async function buildPayTx() {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
 
   const walletOptions: GenerateWalletOptions = {
     label,
diff --git a/examples/ts/sui/create-wallet.ts b/examples/ts/sui/create-wallet.ts
index b692b02e60..4f698b9c0e 100644
--- a/examples/ts/sui/create-wallet.ts
+++ b/examples/ts/sui/create-wallet.ts
@@ -26,7 +26,7 @@ const enterprise = '';
 
 // Create the wallet
 async function createWallet() {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
 
   const walletOptions: GenerateWalletOptions = {
     label,
diff --git a/examples/ts/sui/get-transaction-hex.ts b/examples/ts/sui/get-transaction-hex.ts
index dd868b7aa5..ce281cbf9c 100644
--- a/examples/ts/sui/get-transaction-hex.ts
+++ b/examples/ts/sui/get-transaction-hex.ts
@@ -26,7 +26,7 @@ const walletId = '';
 
 async function buildPayTx() {
   try {
-    bitgo.authenticateWithAccessToken({ accessToken });
+    await bitgo.authenticateWithAccessToken({ accessToken });
     const wallet = await bitgo.coin(coin).wallets().getWallet({ id: walletId });
     const recipients = [
       {
diff --git a/examples/ts/sui/multi-recipient-pay-transaction.ts b/examples/ts/sui/multi-recipient-pay-transaction.ts
index 9a82b20681..f733eea10e 100644
--- a/examples/ts/sui/multi-recipient-pay-transaction.ts
+++ b/examples/ts/sui/multi-recipient-pay-transaction.ts
@@ -38,7 +38,7 @@ const recipients = [
 
 // build pay transaction
 async function buildPayTx() {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
   bitgo.unlock({ otp: '000000' });
   const wallet = await bitgo.coin(coin).wallets().getWallet({ id: walletId });
 
diff --git a/examples/ts/trx/consolidate-hot-account-balances.ts b/examples/ts/trx/consolidate-hot-account-balances.ts
index 874086828c..f115271da6 100644
--- a/examples/ts/trx/consolidate-hot-account-balances.ts
+++ b/examples/ts/trx/consolidate-hot-account-balances.ts
@@ -27,7 +27,7 @@ const otp = '000000';
 const accessToken = '';
 
 async function main() {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
 
   const wallet = await bitgo.coin(coin).wallets().getWallet({ id: walletId });
   const coinSpecific = wallet.coinSpecific() as WalletCoinSpecific;
diff --git a/examples/ts/trx/create-address.ts b/examples/ts/trx/create-address.ts
index 7808358d1e..c9c57eb198 100644
--- a/examples/ts/trx/create-address.ts
+++ b/examples/ts/trx/create-address.ts
@@ -15,7 +15,7 @@ const walletId = '';
 const accessToken = '';
 
 async function main() {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
 
   const wallet = await bitgo.coin(coin).wallets().getWallet({ id: walletId });
   const address = await wallet.createAddress({ label: 'My address' });
diff --git a/examples/ts/tss-smc/create-smc-wallet-reusing-keys.ts b/examples/ts/tss-smc/create-smc-wallet-reusing-keys.ts
index 3fd1b6a237..34fde66af1 100644
--- a/examples/ts/tss-smc/create-smc-wallet-reusing-keys.ts
+++ b/examples/ts/tss-smc/create-smc-wallet-reusing-keys.ts
@@ -22,7 +22,7 @@ const userCommonKeyChain = "6e1bf...9c967"
 const bitgoKeyId = "649b69a0d2521600089f16044cd5e5cb";
 
 async function createSMCWalletStep2() {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
   const bitgoCoin = bitgo.coin(coinName);
 
   const bitgoKeyChain = await bitgoCoin.keychains().get({ id: bitgoKeyId })
@@ -74,4 +74,4 @@ async function createSMCWalletStep2() {
   writeFileSync(`./json/wallet-${walletName}.json`, stringifiedWallet)
 }
 
-createSMCWalletStep2().catch((e) => console.error(e));
\ No newline at end of file
+createSMCWalletStep2().catch((e) => console.error(e));
diff --git a/examples/ts/tss-smc/create-smc-wallet-step-1.ts b/examples/ts/tss-smc/create-smc-wallet-step-1.ts
index 86db7e281b..51374fc0c4 100644
--- a/examples/ts/tss-smc/create-smc-wallet-step-1.ts
+++ b/examples/ts/tss-smc/create-smc-wallet-step-1.ts
@@ -15,7 +15,7 @@ async function createSMCWalletStep1() {
   const rawdata = readFileSync("./json/fromOVC2-step-1.json").toString();
   const parsedData = JSON.parse(rawdata);
 
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
   const bitgoCoin = bitgo.coin(coinName);
 
   const { bitGoOutputJsonForOvc, bitGoKeyId } = await bitgoCoin
diff --git a/examples/ts/tss-smc/create-smc-wallet-step-2.ts b/examples/ts/tss-smc/create-smc-wallet-step-2.ts
index 7d276427db..2da348abc1 100644
--- a/examples/ts/tss-smc/create-smc-wallet-step-2.ts
+++ b/examples/ts/tss-smc/create-smc-wallet-step-2.ts
@@ -32,7 +32,7 @@ async function createSMCWalletStep2() {
     throw new Error("Common keychain mismatch between the two OVCs");
   }
 
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
   const bitgoCoin = bitgo.coin(coinName);
 
   const bitgoKeyChain = await bitgoCoin.keychains().get({ id: bitgoKeyId })
@@ -84,4 +84,4 @@ async function createSMCWalletStep2() {
   writeFileSync(`./json/wallet-${walletName}.json`, stringifiedWallet)
 }
 
-createSMCWalletStep2().catch((e) => console.error(e));
\ No newline at end of file
+createSMCWalletStep2().catch((e) => console.error(e));
diff --git a/examples/ts/update-wallet-forwarders.ts b/examples/ts/update-wallet-forwarders.ts
index 2655fa3ed6..19d2f31471 100644
--- a/examples/ts/update-wallet-forwarders.ts
+++ b/examples/ts/update-wallet-forwarders.ts
@@ -21,7 +21,7 @@ const walletId = '';
 // toggles boolean flags for deployForwardersManually and flushForwardersManually
 
 async function setForwarderFlags() {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
   const wallet = await bitgo.coin(coin).wallets().get({ id: walletId });
 
   const deployForwardersManually = wallet._wallet.coinSpecific.deployForwardersManually;
diff --git a/examples/ts/xrp/send-payment.ts b/examples/ts/xrp/send-payment.ts
index 0991756a2c..889b3f21ad 100644
--- a/examples/ts/xrp/send-payment.ts
+++ b/examples/ts/xrp/send-payment.ts
@@ -30,7 +30,7 @@ async function sendTx() {
   });
 
   const basecoin = bitgo.coin(coin);
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
   // await bitgo.unlock({ otp: otp, duration: 3600 });
 
   const walletInstance = await basecoin.wallets().get({ id: walletId });
diff --git a/examples/ts/xtz/consolidate-account-balances.ts b/examples/ts/xtz/consolidate-account-balances.ts
index ddb1e36ede..9790e635eb 100644
--- a/examples/ts/xtz/consolidate-account-balances.ts
+++ b/examples/ts/xtz/consolidate-account-balances.ts
@@ -27,7 +27,7 @@ const otp = '000000';
 const accessToken = '';
 
 async function main() {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
 
   const wallet = await bitgo.coin(coin).wallets().getWallet({ id: walletId });
   const coinSpecific = wallet.coinSpecific() as WalletCoinSpecific;
diff --git a/examples/ts/xtz/create-address.ts b/examples/ts/xtz/create-address.ts
index 9b05235218..11ac3b1c87 100644
--- a/examples/ts/xtz/create-address.ts
+++ b/examples/ts/xtz/create-address.ts
@@ -15,7 +15,7 @@ const walletId = '';
 const accessToken = '';
 
 async function main() {
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
 
   const wallet = await bitgo.coin(coin).wallets().getWallet({ id: walletId });
   const address = await wallet.createAddress({ label: 'My address' });
diff --git a/modules/bitgo/test/unit/bitgo.ts b/modules/bitgo/test/unit/bitgo.ts
index c668521987..89f6dad384 100644
--- a/modules/bitgo/test/unit/bitgo.ts
+++ b/modules/bitgo/test/unit/bitgo.ts
@@ -114,7 +114,7 @@ describe('BitGo Prototype Methods', function () {
     });
   });
 
-  describe('Authenticate in Microservices', () => {
+  describe('Authenticate via v2 login', () => {
     let bitgo;
     const authenticateRequest = {
       username: 'test@bitgo.com',
@@ -125,10 +125,10 @@ describe('BitGo Prototype Methods', function () {
       forceSMS: false,
     };
 
-    it('goes to microservices', async function () {
+    it('goes to the v2 user login endpoint', async function () {
       bitgo = TestBitGo.decorate(BitGo, { env: 'mock', microservicesUri: 'https://microservices.uri' } as any);
       const scope = nock(BitGoJS.Environments[bitgo.getEnv()].uri)
-        .post('/api/auth/v1/session')
+        .post('/api/v2/user/login')
         .reply(200, {
           user: {
             username: 'test@bitgo.com',
@@ -140,10 +140,10 @@ describe('BitGo Prototype Methods', function () {
       scope.isDone().should.be.true();
     });
 
-    it('goes to microservices even when microservicesUri is not specified', async function () {
+    it('goes to the v2 user login endpoint when microservicesUri is not specified', async function () {
       bitgo = TestBitGo.decorate(BitGo, { env: 'mock' });
       const scope = nock(BitGoJS.Environments[bitgo.getEnv()].uri)
-        .post('/api/auth/v1/session')
+        .post('/api/v2/user/login')
         .reply(200, {
           user: {
             username: 'test@bitgo.com',
@@ -379,7 +379,7 @@ describe('BitGo Prototype Methods', function () {
 
     before(async function () {
       nock('https://bitgo.fakeurl')
-        .post('/api/auth/v1/session')
+        .post('/api/v2/user/login')
         .reply(200, {
           access_token: 'access_token',
           user: { username: 'update_pw_tester@bitgo.com' },
@@ -685,7 +685,7 @@ describe('BitGo Prototype Methods', function () {
 
     it('should get the ecdhKeychain if ensureEcdhKeychain is set and user already has ecdhKeychain', async function () {
       nock('https://bitgo.fakeurl')
-        .post('/api/auth/v1/session')
+        .post('/api/v2/user/login')
         .reply(200, {
           access_token: 'access_token',
           user: { username: 'auth-test@bitgo.com' },
@@ -709,9 +709,10 @@ describe('BitGo Prototype Methods', function () {
       should.exist(response.user.ecdhKeychain);
       response.user.ecdhKeychain.should.equal('some-existing-xpub');
     });
+
     it('should create the ecdhKeychain if ensureEcdhKeychain is set and the user does not already have ecdhKeychain', async function () {
       nock('https://bitgo.fakeurl')
-        .post('/api/auth/v1/session')
+        .post('/api/v2/user/login')
         .reply(200, {
           access_token: 'access_token',
           user: { username: 'auth-test@bitgo.com' },
diff --git a/modules/express/src/fetchEncryptedPrivKeys.ts b/modules/express/src/fetchEncryptedPrivKeys.ts
index f3760a9f8f..e838760526 100644
--- a/modules/express/src/fetchEncryptedPrivKeys.ts
+++ b/modules/express/src/fetchEncryptedPrivKeys.ts
@@ -64,7 +64,7 @@ const walletWithPrv: WalletWithPrv = esWalletWithPrv ? JSON.parse(esWalletWithPr
 // ];
 
 export async function fetchKeys(ids: WalletIds, token: string, accessToken?: string): Promise<Record<string, string>> {
-  bg.authenticateWithAccessToken({ accessToken: token });
+  await bg.authenticateWithAccessToken({ accessToken: token });
 
   // get the encrypted user privKey for each walletId and store in the JSON output
   const output: Output = {};
diff --git a/modules/sdk-api/src/bitgoAPI.ts b/modules/sdk-api/src/bitgoAPI.ts
index 1c065ecc2d..6a8d0c31b8 100644
--- a/modules/sdk-api/src/bitgoAPI.ts
+++ b/modules/sdk-api/src/bitgoAPI.ts
@@ -1053,11 +1053,14 @@ export class BitGoAPI implements BitGoBase {
   }
 
   /**
-   * Synchronous method for activating an access token.
+   * Activate an access token and sync it to the HMAC auth strategy.
+   * Resolves once the token has been registered with the strategy, so callers
+   * can safely issue signed requests immediately after.
    */
-  authenticateWithAccessToken({ accessToken }: AccessTokenOptions): void {
+  async authenticateWithAccessToken({ accessToken }: AccessTokenOptions): Promise<void> {
     debug('now authenticating with access token %s', accessToken.substring(0, 8));
     this._token = accessToken;
+    await this._hmacAuthStrategy.setToken?.(this._token);
   }
 
   /**
@@ -1152,14 +1155,14 @@ export class BitGoAPI implements BitGoBase {
         return new Error('already logged in');
       }
 
-      const authUrl = this.microservicesUrl('/api/auth/v1/session');
+      const authUrl = this.url('/user/login', 2);
       const request = this.post(authUrl);
 
       if (forceV1Auth) {
         request.forceV1Auth = true;
         // tell the server that the client was forced to downgrade the authentication protocol
         authParams.forceV1Auth = true;
-        debug('forcing v1 auth for call to authenticate');
+        debug('forcing v1 auth on request');
       }
       const response: superagent.Response = await request.send(authParams);
       // extract body and user information
diff --git a/modules/sdk-api/test/unit/bitgoAPI.ts b/modules/sdk-api/test/unit/bitgoAPI.ts
index fe4bf9a044..597960f916 100644
--- a/modules/sdk-api/test/unit/bitgoAPI.ts
+++ b/modules/sdk-api/test/unit/bitgoAPI.ts
@@ -485,7 +485,7 @@ describe('Constructor', function () {
         const bitgo = new BitGoAPI({ env: 'custom', customRootURI: ROOT, hmacAuthStrategy: strategy });
 
         nock(ROOT)
-          .post('/api/auth/v1/session')
+          .post('/api/v2/user/login')
           .reply(200, {
             user: { username: 'test@example.com' },
             access_token: 'v2xmyaccesstoken',
@@ -518,7 +518,7 @@ describe('Constructor', function () {
         const bitgo = new BitGoAPI({ env: 'custom', customRootURI: ROOT, hmacAuthStrategy: strategy });
 
         nock(ROOT)
-          .post('/api/auth/v1/session')
+          .post('/api/v2/user/login')
           .reply(200, {
             user: { username: 'test@example.com' },
             access_token: 'v2xmytoken',
@@ -539,6 +539,36 @@ describe('Constructor', function () {
 
         keyReady.should.be.true();
       });
+
+      it('handles an ECDH-encrypted token response (no access_token) through the v2 login flow', async function () {
+        const { strategy, setTokenStub } = makeStrategy();
+        const bitgo = new BitGoAPI({ env: 'custom', customRootURI: ROOT, hmacAuthStrategy: strategy });
+
+        // Stub token issuance so the test does not depend on real crypto. The point is
+        // to assert the v2 login response with encryptedToken reaches handleTokenIssuance
+        // and that the decrypted token is then synced to the strategy.
+        const handleTokenIssuanceStub = sinon
+          .stub(bitgo, 'handleTokenIssuance')
+          .resolves({ token: 'v2xdecryptedtoken' });
+
+        nock(ROOT)
+          .post('/api/v2/user/login')
+          .reply(200, {
+            user: { username: 'test@example.com' },
+            encryptedToken: 'encrypted-token-value',
+            encryptedECDHXprv: 'encrypted-ecdh-xprv',
+            derivationPath: 'm/999999/0/1',
+          });
+
+        await bitgo.authenticate({ username: 'test@example.com', password: 'hunter2' });
+
+        // The SDK must have taken the ECDH path (not the plain access_token path).
+        handleTokenIssuanceStub.calledOnce.should.be.true();
+        handleTokenIssuanceStub.firstCall.args[0].encryptedToken.should.equal('encrypted-token-value');
+        // The decrypted token must be synced to the strategy.
+        setTokenStub.calledOnce.should.be.true();
+        setTokenStub.firstCall.args[0].should.equal('v2xdecryptedtoken');
+      });
     });
 
     describe('authenticateWithPasskey()', function () {
@@ -577,7 +607,7 @@ describe('Constructor', function () {
         const { strategy, clearTokenStub } = makeStrategy();
         const bitgo = new BitGoAPI({ env: 'custom', customRootURI: ROOT, hmacAuthStrategy: strategy });
 
-        bitgo.authenticateWithAccessToken({ accessToken: 'v2xsometoken' });
+        await bitgo.authenticateWithAccessToken({ accessToken: 'v2xsometoken' });
         (bitgo as any)._token.should.equal('v2xsometoken');
 
         await bitgo.clearAsync();
@@ -641,13 +671,14 @@ describe('Constructor', function () {
     });
 
     describe('sync token-setting methods', function () {
-      it('authenticateWithAccessToken does not call setToken (synchronous — caller must invoke setToken on the strategy manually)', function () {
+      it('authenticateWithAccessToken calls setToken (HMAC strategy must be kept in sync for v2/v3 signing)', async function () {
         const { strategy, setTokenStub } = makeStrategy();
         const bitgo = new BitGoAPI({ env: 'custom', customRootURI: ROOT, hmacAuthStrategy: strategy });
 
-        bitgo.authenticateWithAccessToken({ accessToken: 'v2xsynctoken' });
+        await bitgo.authenticateWithAccessToken({ accessToken: 'v2xsynctoken' });
 
-        setTokenStub.called.should.be.false();
+        setTokenStub.calledOnce.should.be.true();
+        setTokenStub.firstCall.args[0].should.equal('v2xsynctoken');
       });
 
       it('fromJSON does not call setToken (synchronous — caller must invoke setToken on the strategy manually)', function () {
@@ -677,7 +708,7 @@ describe('Constructor', function () {
         });
         const bitgo = new BitGoAPI({ env: 'custom', customRootURI: ROOT, hmacAuthStrategy: strategy });
         // Do NOT set _ecdhXprv — simulates SSO/enterprise session (Okta, Entra, etc.)
-        bitgo.authenticateWithAccessToken({ accessToken: 'v2xstrategytoken' });
+        await bitgo.authenticateWithAccessToken({ accessToken: 'v2xstrategytoken' });
 
         const scope = nock(ROOT).post('/api/auth/v1/accesstoken').reply(200, {
           token: 'v2xnewplaintoken',
@@ -725,7 +756,7 @@ describe('Constructor', function () {
           isAuthenticated: sinon.stub().returns(true),
         });
         const bitgo = new BitGoAPI({ env: 'custom', customRootURI: ROOT, hmacAuthStrategy: strategy });
-        bitgo.authenticateWithAccessToken({ accessToken: 'v2xstrategytoken' });
+        await bitgo.authenticateWithAccessToken({ accessToken: 'v2xstrategytoken' });
 
         nock(ROOT).post('/api/auth/v1/accesstoken').reply(200, {
           token: 'v2xplaintoken',
@@ -746,7 +777,7 @@ describe('Constructor', function () {
           isAuthenticated: sinon.stub().returns(false),
         });
         const bitgo = new BitGoAPI({ env: 'custom', customRootURI: ROOT, hmacAuthStrategy: strategy });
-        bitgo.authenticateWithAccessToken({ accessToken: 'v2xlegacytoken' });
+        await bitgo.authenticateWithAccessToken({ accessToken: 'v2xlegacytoken' });
 
         nock(ROOT).post('/api/auth/v1/accesstoken').reply(200, {
           token: 'v2xlegacyresult',
@@ -761,7 +792,7 @@ describe('Constructor', function () {
       it('should force V1 auth when isAuthenticated is not defined on strategy', async function () {
         const { strategy } = makeStrategy();
         const bitgo = new BitGoAPI({ env: 'custom', customRootURI: ROOT, hmacAuthStrategy: strategy });
-        bitgo.authenticateWithAccessToken({ accessToken: 'v2xnoauthmethod' });
+        await bitgo.authenticateWithAccessToken({ accessToken: 'v2xnoauthmethod' });
 
         nock(ROOT).post('/api/auth/v1/accesstoken').reply(200, {
           token: 'v2xresult',
diff --git a/modules/sdk-api/test/unit/hmacStrategy.ts b/modules/sdk-api/test/unit/hmacStrategy.ts
index 7284c9fa46..fdbfaeee56 100644
--- a/modules/sdk-api/test/unit/hmacStrategy.ts
+++ b/modules/sdk-api/test/unit/hmacStrategy.ts
@@ -146,7 +146,7 @@ describe('BitGoAPI HMAC Strategy Injection', function () {
       });
 
       nock(TEST_URI)
-        .post('/api/auth/v1/session')
+        .post('/api/v2/user/login')
         .reply(
           200,
           { access_token: TEST_TOKEN, user: { username: 'test@test.com' } },
diff --git a/scripts/upgrade-wallet-encryption.ts b/scripts/upgrade-wallet-encryption.ts
index 31c6f38608..b7a6ac3ea9 100644
--- a/scripts/upgrade-wallet-encryption.ts
+++ b/scripts/upgrade-wallet-encryption.ts
@@ -76,7 +76,7 @@ async function main() {
     parseArgs();
 
   const bitgo = new BitGo({ env });
-  bitgo.authenticateWithAccessToken({ accessToken });
+  await bitgo.authenticateWithAccessToken({ accessToken });
 
   const wallet = await bitgo.coin(coin).wallets().get({ id: walletId });
   const result = await wallet.upgradeEncryption({