diff --git a/app/src/main/kotlin/com/wire/android/di/accountScoped/UserModule.kt b/app/src/main/kotlin/com/wire/android/di/accountScoped/UserModule.kt
index a44f108d2d..b36e3857ba 100644
--- a/app/src/main/kotlin/com/wire/android/di/accountScoped/UserModule.kt
+++ b/app/src/main/kotlin/com/wire/android/di/accountScoped/UserModule.kt
@@ -26,7 +26,6 @@ import com.wire.kalium.logic.feature.asset.GetAssetSizeLimitUseCase
 import com.wire.kalium.logic.feature.asset.GetAvatarAssetUseCase
 import com.wire.kalium.logic.feature.client.FinalizeMLSClientAfterE2EIEnrollment
 import com.wire.kalium.logic.feature.conversation.GetAllContactsNotInConversationUseCase
-import com.wire.kalium.logic.feature.e2ei.usecase.EnrollE2EIUseCase
 import com.wire.kalium.logic.feature.e2ei.usecase.GetE2eiCertificateUseCase
 import com.wire.kalium.logic.feature.e2ei.usecase.GetMembersE2EICertificateStatusesUseCase
 import com.wire.kalium.logic.feature.e2ei.usecase.GetUserE2eiCertificateStatusUseCase
@@ -113,11 +112,6 @@ class UserModule {
     fun providePersistReadReceiptsStatusConfig(userScope: UserScope): PersistReadReceiptsStatusConfigUseCase =
         userScope.persistReadReceiptsStatusConfig
 
-    @ViewModelScoped
-    @Provides
-    fun provideEnrollE2EIUseCase(userScope: UserScope): EnrollE2EIUseCase =
-        userScope.enrollE2EI
-
     @ViewModelScoped
     @Provides
     fun provideFinalizeMLSClientAfterE2EIEnrollmentUseCase(userScope: UserScope): FinalizeMLSClientAfterE2EIEnrollment =
diff --git a/app/src/main/kotlin/com/wire/android/ui/e2eiEnrollment/GetE2EICertificateViewModel.kt b/app/src/main/kotlin/com/wire/android/ui/e2eiEnrollment/GetE2EICertificateViewModel.kt
index dda01115c8..118c0eb2de 100644
--- a/app/src/main/kotlin/com/wire/android/ui/e2eiEnrollment/GetE2EICertificateViewModel.kt
+++ b/app/src/main/kotlin/com/wire/android/ui/e2eiEnrollment/GetE2EICertificateViewModel.kt
@@ -63,6 +63,7 @@ class GetE2EICertificateViewModel @Inject constructor(
             val currentSessionResult = currentSession()
             if (currentSessionResult is CurrentSessionResult.Success && currentSessionResult.accountInfo.isValid()) {
                 coreLogic.getSessionScope(currentSessionResult.accountInfo.userId)
+                    .users
                     .enrollE2EI
                     .initialEnrollment(isNewClientRegistration = isNewClient)
                     .fold({
@@ -82,6 +83,7 @@ class GetE2EICertificateViewModel @Inject constructor(
 
         if (currentSessionResult is CurrentSessionResult.Success && currentSessionResult.accountInfo.isValid()) {
             val enrollmentResult = coreLogic.getSessionScope(currentSessionResult.accountInfo.userId)
+                .users
                 .enrollE2EI.finalizeEnrollment(
                     oAuthResult.idToken,
                     oAuthResult.authState,
diff --git a/kalium b/kalium
index 5e5668af38..ef09bb699e 160000
--- a/kalium
+++ b/kalium
@@ -1 +1 @@
-Subproject commit 5e5668af387d4113ba72ab5e3437e5948c1c8075
+Subproject commit ef09bb699e3ed918d2f6d2330a756cfa8d0ff644