diff --git a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
index 3de34e4c66..9f76b2033e 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
@@ -243,7 +243,8 @@ abstract class BaseBrowserFragment : Fragment(), BackHandler, SessionManager.Obs
                         )
                     ),
                     engineView = view.engineView,
-                    useCases = context.components.useCases.contextMenuUseCases
+                    useCases = context.components.useCases.contextMenuUseCases,
+                    customTabId = customTabSessionId
                 ),
                 owner = this,
                 view = view
diff --git a/app/src/main/java/org/mozilla/fenix/components/BackgroundServices.kt b/app/src/main/java/org/mozilla/fenix/components/BackgroundServices.kt
index 4106faef0d..b3d6101965 100644
--- a/app/src/main/java/org/mozilla/fenix/components/BackgroundServices.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/BackgroundServices.kt
@@ -30,7 +30,6 @@ import mozilla.components.service.fxa.ServerConfig
 import mozilla.components.service.fxa.SyncConfig
 import mozilla.components.service.fxa.SyncEngine
 import mozilla.components.service.fxa.manager.FxaAccountManager
-import mozilla.components.service.fxa.manager.SCOPE_SESSION
 import mozilla.components.service.fxa.manager.SCOPE_SYNC
 import mozilla.components.service.fxa.sync.GlobalSyncableStoreProvider
 import mozilla.components.support.base.log.logger.Logger
@@ -159,9 +158,7 @@ class BackgroundServices(
             // during authentication unless we explicitly specify it below.
             // This is a good example of an information leak at the API level.
             // See https://github.com/mozilla-mobile/android-components/issues/3732
-            SCOPE_SYNC,
-            // Necessary to enable "Manage Account" functionality.
-            SCOPE_SESSION
+            SCOPE_SYNC
         )
     ).also { accountManager ->
         // TODO this needs to change once we have a SyncManager