diff --git a/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
index 3f2e0198f7..afaa290190 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeActivityViewModel.kt
@@ -215,14 +215,14 @@ class HomeActivityViewModel @AssistedInject constructor(
                     try {
                         session.cryptoService().crossSigningService().initializeCrossSigning(
                                 object : UserInteractiveAuthInterceptor {
-                                    override fun performStage(flow: RegistrationFlowResponse, errorCode: String?, promise: Continuation<UIABaseAuth>) {
+                                    override fun performStage(flowResponse: RegistrationFlowResponse, errCode: String?, promise: Continuation<UIABaseAuth>) {
                                         // We missed server grace period or it's not setup, see if we remember locally password
-                                        if (flow.nextUncompletedStage() == LoginFlowTypes.PASSWORD
-                                                && errorCode == null
+                                        if (flowResponse.nextUncompletedStage() == LoginFlowTypes.PASSWORD
+                                                && errCode == null
                                                 && reAuthHelper.data != null) {
                                             promise.resume(
                                                     UserPasswordAuth(
-                                                            session = flow.session,
+                                                            session = flowResponse.session,
                                                             user = session.myUserId,
                                                             password = reAuthHelper.data
                                                     )
diff --git a/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsViewModel.kt
index b611c7bfbf..836e4a36f9 100644
--- a/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/crosssigning/CrossSigningSettingsViewModel.kt
@@ -98,9 +98,9 @@ class CrossSigningSettingsViewModel @AssistedInject constructor(
                         awaitCallback<Unit> {
                             session.cryptoService().crossSigningService().initializeCrossSigning(
                                     object : UserInteractiveAuthInterceptor {
-                                        override fun performStage(flow: RegistrationFlowResponse, errorCode: String?, promise: Continuation<UIABaseAuth>) {
+                                        override fun performStage(flowResponse: RegistrationFlowResponse, errCode: String?, promise: Continuation<UIABaseAuth>) {
                                             Timber.d("## UIA : initializeCrossSigning UIA")
-                                            if (flow.nextUncompletedStage() == LoginFlowTypes.PASSWORD && reAuthHelper.data != null && errorCode == null) {
+                                            if (flowResponse.nextUncompletedStage() == LoginFlowTypes.PASSWORD && reAuthHelper.data != null && errCode == null) {
                                                 UserPasswordAuth(
                                                         session = null,
                                                         user = session.myUserId,
@@ -108,8 +108,8 @@ class CrossSigningSettingsViewModel @AssistedInject constructor(
                                                 ).let { promise.resume(it) }
                                             } else {
                                                 Timber.d("## UIA : initializeCrossSigning UIA > start reauth activity")
-                                                _viewEvents.post(CrossSigningSettingsViewEvents.RequestReAuth(flow, errorCode))
-                                                pendingAuth = DefaultBaseAuth(session = flow.session)
+                                                _viewEvents.post(CrossSigningSettingsViewEvents.RequestReAuth(flowResponse, errCode))
+                                                pendingAuth = DefaultBaseAuth(session = flowResponse.session)
                                                 uiaContinuation = promise
                                             }
                                         }
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt
index 08547f4c50..b91b5255b6 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/DevicesViewModel.kt
@@ -334,9 +334,9 @@ class DevicesViewModel @AssistedInject constructor(
             try {
                 awaitCallback<Unit> {
                     session.cryptoService().deleteDevice(deviceId, object : UserInteractiveAuthInterceptor {
-                        override fun performStage(flow: RegistrationFlowResponse, errorCode: String?, promise: Continuation<UIABaseAuth>) {
+                        override fun performStage(flowResponse: RegistrationFlowResponse, errCode: String?, promise: Continuation<UIABaseAuth>) {
                             Timber.d("## UIA : deleteDevice UIA")
-                            if (flow.nextUncompletedStage() == LoginFlowTypes.PASSWORD && reAuthHelper.data != null && errorCode == null) {
+                            if (flowResponse.nextUncompletedStage() == LoginFlowTypes.PASSWORD && reAuthHelper.data != null && errCode == null) {
                                 UserPasswordAuth(
                                         session = null,
                                         user = session.myUserId,
@@ -344,8 +344,8 @@ class DevicesViewModel @AssistedInject constructor(
                                 ).let { promise.resume(it) }
                             } else {
                                 Timber.d("## UIA : deleteDevice UIA > start reauth activity")
-                                _viewEvents.post(DevicesViewEvents.RequestReAuth(flow, errorCode))
-                                pendingAuth = DefaultBaseAuth(session = flow.session)
+                                _viewEvents.post(DevicesViewEvents.RequestReAuth(flowResponse, errCode))
+                                pendingAuth = DefaultBaseAuth(session = flowResponse.session)
                                 uiaContinuation = promise
                             }
                         }