diff --git a/CHANGES.md b/CHANGES.md
index 323eb53485..74b008bfc4 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -6,7 +6,6 @@ Features ✨:
 
 Improvements 🙌:
  - Add ability to install APK from directly from Element (#2381)
- - Improve login/register flow (#1410, #2585, #3172)
 
 Bugfix 🐛:
  - Message states cosmetic changes (#3007)
diff --git a/vector/build.gradle b/vector/build.gradle
index 7b4abeb385..bc9cd8c1ca 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -138,8 +138,9 @@ android {
         resValue "string", "build_number", "\"${buildNumber}\""
 
         // The two booleans must not have the same value. We need two values for the manifest
-        resValue "bool", "useLoginV1", "false"
-        resValue "bool", "useLoginV2", "true"
+        // LoginFlowV2 is disabled to be merged on develop (changelog: Improve login/register flow (#1410, #2585, #3172))
+        resValue "bool", "useLoginV1", "true"
+        resValue "bool", "useLoginV2", "false"
 
         buildConfigField "im.vector.app.features.crypto.keysrequest.OutboundSessionKeySharingStrategy", "outboundSessionKeySharingStrategy", "im.vector.app.features.crypto.keysrequest.OutboundSessionKeySharingStrategy.WhenTyping"