diff --git a/lib/features/settings/settings_page_core.dart b/lib/features/settings/settings_page_core.dart
index d7ef35bd..5523686e 100644
--- a/lib/features/settings/settings_page_core.dart
+++ b/lib/features/settings/settings_page_core.dart
@@ -121,8 +121,7 @@ class _SettingsPageState extends State<SettingsPage> {
     );
 
     // Resolve the effective config based on the new sources
-    final nextEffective = resolveAcpBridgeServerEffectiveConfig(
-      widget.controller.settingsController,
+    final nextEffective = widget.controller.settingsController.resolveAcpBridgeServerEffectiveConfig(
       config: nextBridgeConfig,
       accountSyncState: widget.controller.settingsController.accountSyncState,
     );
diff --git a/lib/runtime/runtime_controllers_settings_account.dart b/lib/runtime/runtime_controllers_settings_account.dart
index 32be839f..cd498197 100644
--- a/lib/runtime/runtime_controllers_settings_account.dart
+++ b/lib/runtime/runtime_controllers_settings_account.dart
@@ -118,6 +118,15 @@ extension SettingsControllerAccountExtension on SettingsController {
   Future<void> cancelAccountMfaChallenge() =>
       cancelAccountMfaChallengeSettingsInternal(this);
 
+  AcpBridgeServerEffectiveConfig resolveAcpBridgeServerEffectiveConfig({
+    required AcpBridgeServerModeConfig config,
+    AccountSyncState? accountSyncState,
+  }) => resolveAcpBridgeServerEffectiveConfigInternal(
+    this,
+    config: config,
+    accountSyncState: accountSyncState,
+  );
+
   List<SecretReferenceEntry> buildSecretReferences() {
     final entries = <SecretReferenceEntry>[
       ...secureRefsInternal.entries.map(
diff --git a/lib/runtime/runtime_controllers_settings_account_impl.dart b/lib/runtime/runtime_controllers_settings_account_impl.dart
index c31d86a4..494d8a32 100644
--- a/lib/runtime/runtime_controllers_settings_account_impl.dart
+++ b/lib/runtime/runtime_controllers_settings_account_impl.dart
@@ -322,7 +322,7 @@ Future<AccountSyncResult> syncAccountSettingsInternal(
     final currentSettings = controller.snapshotInternal;
     final currentModeConfig = currentSettings.acpBridgeServerModeConfig;
     
-    final nextEffective = resolveAcpBridgeServerEffectiveConfig(
+    final nextEffective = resolveAcpBridgeServerEffectiveConfigInternal(
       controller,
       config: currentModeConfig,
       accountSyncState: nextState,
@@ -580,7 +580,7 @@ String _resolveBridgeServerUrl(Map<String, dynamic> payload) {
   return '';
 }
 
-AcpBridgeServerEffectiveConfig resolveAcpBridgeServerEffectiveConfig(
+AcpBridgeServerEffectiveConfig resolveAcpBridgeServerEffectiveConfigInternal(
   SettingsController controller, {
   required AcpBridgeServerModeConfig config,
   AccountSyncState? accountSyncState,