diff --git a/vector/src/main/java/im/vector/app/features/login2/LoginActivity2.kt b/vector/src/main/java/im/vector/app/features/login2/LoginActivity2.kt
index b7e726b9e8..43dfb5cec6 100644
--- a/vector/src/main/java/im/vector/app/features/login2/LoginActivity2.kt
+++ b/vector/src/main/java/im/vector/app/features/login2/LoginActivity2.kt
@@ -208,19 +208,19 @@ open class LoginActivity2 : VectorBaseActivity<ActivityLoginBinding>(), ToolbarC
                 // Go back to the login fragment
                 supportFragmentManager.popBackStack(FRAGMENT_LOGIN_TAG, POP_BACK_STACK_EXCLUSIVE)
             }
-            is LoginViewEvents2.OnSendEmailSuccess                         ->
+            is LoginViewEvents2.OnSendEmailSuccess       ->
                 addFragmentToBackstack(R.id.loginFragmentContainer,
                         LoginWaitForEmailFragment2::class.java,
                         LoginWaitForEmailFragmentArgument(event.email),
                         tag = FRAGMENT_REGISTRATION_STAGE_TAG,
                         option = commonOption)
-            is LoginViewEvents2.OpenPasswordScreen                         -> {
+            is LoginViewEvents2.OpenSigninPasswordScreen -> {
                 addFragmentToBackstack(R.id.loginFragmentContainer,
                         LoginFragment2SigninPassword::class.java,
                         tag = FRAGMENT_LOGIN_TAG,
                         option = commonOption)
             }
-            is LoginViewEvents2.OpenSignupPasswordScreen                   -> {
+            is LoginViewEvents2.OpenSignupPasswordScreen -> {
                 addFragmentToBackstack(R.id.loginFragmentContainer,
                         LoginFragment2SignupPassword::class.java,
                         tag = FRAGMENT_REGISTRATION_STAGE_TAG,
diff --git a/vector/src/main/java/im/vector/app/features/login2/LoginViewEvents2.kt b/vector/src/main/java/im/vector/app/features/login2/LoginViewEvents2.kt
index fd4cc76450..54cf507a7e 100644
--- a/vector/src/main/java/im/vector/app/features/login2/LoginViewEvents2.kt
+++ b/vector/src/main/java/im/vector/app/features/login2/LoginViewEvents2.kt
@@ -30,7 +30,7 @@ sealed class LoginViewEvents2 : VectorViewEvents {
     object OutdatedHomeserver : LoginViewEvents2()
 
     // Navigation event
-    object OpenPasswordScreen : LoginViewEvents2()
+    object OpenSigninPasswordScreen : LoginViewEvents2()
     object OpenSignupPasswordScreen : LoginViewEvents2()
 
     object OpenSignInEnterIdentifierScreen : LoginViewEvents2()
diff --git a/vector/src/main/java/im/vector/app/features/login2/LoginViewModel2.kt b/vector/src/main/java/im/vector/app/features/login2/LoginViewModel2.kt
index 2e464043e4..1968abc1f1 100644
--- a/vector/src/main/java/im/vector/app/features/login2/LoginViewModel2.kt
+++ b/vector/src/main/java/im/vector/app/features/login2/LoginViewModel2.kt
@@ -646,7 +646,7 @@ class LoginViewModel2 @AssistedInject constructor(
             is LoginMode.SsoAndPassword -> {
                 retrieveProfileInfo(action.username)
                 // We can navigate to the password screen
-                LoginViewEvents2.OpenPasswordScreen
+                LoginViewEvents2.OpenSigninPasswordScreen
             }
             is LoginMode.Sso            -> {
                 LoginViewEvents2.OpenSsoOnlyScreen