diff --git a/config/database.go b/config/database.go
index 1102c6fb..47d9bcbb 100644
--- a/config/database.go
+++ b/config/database.go
@@ -857,9 +857,22 @@ func (d *Database) GetTraderConfig(userID, traderID string) (*TraderRecord, *AIM
 	var exchange ExchangeConfig
 
 	err := d.db.QueryRow(`
-		SELECT 
-			t.id, t.user_id, t.name, t.ai_model_id, t.exchange_id, t.initial_balance, t.scan_interval_minutes, t.is_running, t.created_at, t.updated_at,
-			a.id, a.user_id, a.name, a.provider, a.enabled, a.api_key, a.created_at, a.updated_at,
+		SELECT
+			t.id, t.user_id, t.name, t.ai_model_id, t.exchange_id, t.initial_balance, t.scan_interval_minutes, t.is_running,
+			COALESCE(t.btc_eth_leverage, 5) as btc_eth_leverage,
+			COALESCE(t.altcoin_leverage, 5) as altcoin_leverage,
+			COALESCE(t.trading_symbols, '') as trading_symbols,
+			COALESCE(t.use_coin_pool, 0) as use_coin_pool,
+			COALESCE(t.use_oi_top, 0) as use_oi_top,
+			COALESCE(t.custom_prompt, '') as custom_prompt,
+			COALESCE(t.override_base_prompt, 0) as override_base_prompt,
+			COALESCE(t.system_prompt_template, 'default') as system_prompt_template,
+			COALESCE(t.is_cross_margin, 1) as is_cross_margin,
+			t.created_at, t.updated_at,
+			a.id, a.user_id, a.name, a.provider, a.enabled, a.api_key,
+			COALESCE(a.custom_api_url, '') as custom_api_url,
+			COALESCE(a.custom_model_name, '') as custom_model_name,
+			a.created_at, a.updated_at,
 			e.id, e.user_id, e.name, e.type, e.enabled, e.api_key, e.secret_key, e.testnet,
 			COALESCE(e.hyperliquid_wallet_addr, '') as hyperliquid_wallet_addr,
 			COALESCE(e.aster_user, '') as aster_user,
@@ -873,8 +886,13 @@ func (d *Database) GetTraderConfig(userID, traderID string) (*TraderRecord, *AIM
 	`, traderID, userID).Scan(
 		&trader.ID, &trader.UserID, &trader.Name, &trader.AIModelID, &trader.ExchangeID,
 		&trader.InitialBalance, &trader.ScanIntervalMinutes, &trader.IsRunning,
+		&trader.BTCETHLeverage, &trader.AltcoinLeverage, &trader.TradingSymbols,
+		&trader.UseCoinPool, &trader.UseOITop,
+		&trader.CustomPrompt, &trader.OverrideBasePrompt, &trader.SystemPromptTemplate,
+		&trader.IsCrossMargin,
 		&trader.CreatedAt, &trader.UpdatedAt,
 		&aiModel.ID, &aiModel.UserID, &aiModel.Name, &aiModel.Provider, &aiModel.Enabled, &aiModel.APIKey,
+		&aiModel.CustomAPIURL, &aiModel.CustomModelName,
 		&aiModel.CreatedAt, &aiModel.UpdatedAt,
 		&exchange.ID, &exchange.UserID, &exchange.Name, &exchange.Type, &exchange.Enabled,
 		&exchange.APIKey, &exchange.SecretKey, &exchange.Testnet,