diff --git a/src/payment/models/exchange/exchange.service.ts b/src/payment/models/exchange/exchange.service.ts
index 00bb1d2111..fcca36ee6b 100644
--- a/src/payment/models/exchange/exchange.service.ts
+++ b/src/payment/models/exchange/exchange.service.ts
@@ -146,12 +146,13 @@ export class ExchangeService {
         true,
       );
 
+      const filledAmount = orderSide === OrderSide.BUY ? order.filled * order.price : order.filled;
       console.log(
-        `${this.name}: order ${order.id} is ${order.status} (filled: ${order.filled})/${amount} at price ${order.price}, total: ${totalAmount})`,
+        `${this.name}: order ${order.id} is ${order.status} (filled: ${filledAmount}/${amount} at price ${order.price}, total: ${totalAmount})`,
       );
 
       // check for partial orders
-      if (order?.status != OrderStatus.CANCELED && order?.filled) {
+      if (order.status != OrderStatus.CANCELED && order.filled) {
         orders[order.id] = {
           id: order.id,
           price: order.price,
@@ -160,7 +161,7 @@ export class ExchangeService {
           fee: order.fee,
         };
 
-        amount -= orderSide == OrderSide.BUY ? order.filled * order.price : order.filled;
+        amount -= filledAmount;
       }
 
       numRetries++;
diff --git a/src/user/models/kyc/kyc.service.ts b/src/user/models/kyc/kyc.service.ts
index 908d6fbaec..328549380a 100644
--- a/src/user/models/kyc/kyc.service.ts
+++ b/src/user/models/kyc/kyc.service.ts
@@ -23,6 +23,7 @@ export interface KycInfo {
   kycState: KycState;
   kycHash: string;
   kycDataComplete: boolean;
+  accountType: AccountType;
   depositLimit: number;
   sessionUrl?: string;
   setupUrl?: string;
@@ -213,6 +214,7 @@ export class KycService {
       kycState: userData.kycState,
       kycHash: userData.kycHash,
       kycDataComplete: this.isDataComplete(userData),
+      accountType: userData.accountType,
       depositLimit: userData.depositLimit,
       blankedPhone: Blank(userData.phone, BlankType.PHONE),
       blankedMail: Blank(userData.mail, BlankType.MAIL),