diff --git a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingActivity.kt b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingActivity.kt
index 0db9fb0c76..f0cf9464a6 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingActivity.kt
@@ -34,7 +34,7 @@ import javax.inject.Inject
 class OnboardingActivity : VectorBaseActivity<ActivityLoginBinding>(), ToolbarConfigurable, UnlockedActivity {
 
     private val onboardingVariant by lifecycleAwareLazy {
-        onboardingVariantFactory.create(this, onboardingViewModel = lazyViewModel(), loginViewModel2 = lazyViewModel())
+        onboardingVariantFactory.create(this, views = views, onboardingViewModel = lazyViewModel(), loginViewModel2 = lazyViewModel())
     }
 
     @Inject lateinit var onboardingVariantFactory: OnboardingVariantFactory
diff --git a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingVariantFactory.kt b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingVariantFactory.kt
index 58b5f6265d..5f861d8808 100644
--- a/vector/src/main/java/im/vector/app/features/onboarding/OnboardingVariantFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/onboarding/OnboardingVariantFactory.kt
@@ -16,6 +16,7 @@
 
 package im.vector.app.features.onboarding
 
+import im.vector.app.databinding.ActivityLoginBinding
 import im.vector.app.features.VectorFeatures
 import im.vector.app.features.login2.LoginViewModel2
 import im.vector.app.features.onboarding.ftueauth.FtueAuthVariant
@@ -26,18 +27,19 @@ class OnboardingVariantFactory @Inject constructor(
 ) {
 
     fun create(activity: OnboardingActivity,
+               views: ActivityLoginBinding,
                onboardingViewModel: Lazy<OnboardingViewModel>,
                loginViewModel2: Lazy<LoginViewModel2>
     ) = when (vectorFeatures.onboardingVariant()) {
-        VectorFeatures.OnboardingVariant.LEGACY   -> error("Legacy is not supported by the FTUE")
-        VectorFeatures.OnboardingVariant.FTUE_AUTH     -> FtueAuthVariant(
-                views = activity.getBinding(),
+        VectorFeatures.OnboardingVariant.LEGACY    -> error("Legacy is not supported by the FTUE")
+        VectorFeatures.OnboardingVariant.FTUE_AUTH -> FtueAuthVariant(
+                views = views,
                 onboardingViewModel = onboardingViewModel.value,
                 activity = activity,
                 supportFragmentManager = activity.supportFragmentManager
         )
-        VectorFeatures.OnboardingVariant.LOGIN_2 -> Login2Variant(
-                views = activity.getBinding(),
+        VectorFeatures.OnboardingVariant.LOGIN_2   -> Login2Variant(
+                views = views,
                 loginViewModel = loginViewModel2.value,
                 activity = activity,
                 supportFragmentManager = activity.supportFragmentManager