diff --git a/scripts/deployment/generate-portal-nginx-auth-snippet.sh b/scripts/deployment/generate-portal-nginx-auth-snippet.sh
index efd46ee..ef804a3 100644
--- a/scripts/deployment/generate-portal-nginx-auth-snippet.sh
+++ b/scripts/deployment/generate-portal-nginx-auth-snippet.sh
@@ -15,8 +15,10 @@ if [[ ! -f "$ENV_FILE" ]]; then
 fi
 
 set -a
+set +u
 # shellcheck disable=SC1090
 source "$ENV_FILE"
+set -u
 set +a
 
 ENV_KEY="$(node -e "
diff --git a/services/token-aggregation/src/api/routes/omnl.ts b/services/token-aggregation/src/api/routes/omnl.ts
index 014c2a7..39b4faa 100644
--- a/services/token-aggregation/src/api/routes/omnl.ts
+++ b/services/token-aggregation/src/api/routes/omnl.ts
@@ -388,6 +388,8 @@ router.post('/omnl/settlement/token-load', async (req: Request, res: Response) =
     transferableExternal: true,
   };
 
+  let mintTokenAddress = resolveMintTokenAddress(lineId, symbol, tokenAddress);
+
   if (!execute) {
     res.json({
       status: 'DRY_RUN',
@@ -396,7 +398,7 @@ router.post('/omnl/settlement/token-load', async (req: Request, res: Response) =
       amount,
       recipient,
       symbol: symbol ?? null,
-      tokenAddress: tokenAddress ?? null,
+      tokenAddress: mintTokenAddress ?? null,
       settlementRef: settlementRef ?? null,
       moneyLayer: 'M3',
       loadFromGl: '2200',
@@ -409,10 +411,7 @@ router.post('/omnl/settlement/token-load', async (req: Request, res: Response) =
     return;
   }
 
-  if (!tokenAddress?.startsWith('0x')) {
-    tokenAddress = resolveMintTokenAddress(lineId, symbol, tokenAddress);
-  }
-  if (!tokenAddress?.startsWith('0x')) {
+  if (!mintTokenAddress?.startsWith('0x')) {
     res.status(400).json({
       error: 'tokenAddress required for on-chain mint',
       status: 'QUEUED',
@@ -424,7 +423,7 @@ router.post('/omnl/settlement/token-load', async (req: Request, res: Response) =
 
   try {
     const { txHash } = await executeM2TokenMint({
-      tokenAddress,
+      tokenAddress: mintTokenAddress,
       recipient,
       amount,
     });
@@ -435,7 +434,7 @@ router.post('/omnl/settlement/token-load', async (req: Request, res: Response) =
       amount,
       recipient,
       symbol: symbol ?? null,
-      tokenAddress,
+      tokenAddress: mintTokenAddress,
       settlementRef: settlementRef ?? null,
       moneyLayer: 'M3',
       capabilities,