diff --git a/Config/BuildSettings.swift b/Config/BuildSettings.swift
index e1ccaab75..5029e11c0 100644
--- a/Config/BuildSettings.swift
+++ b/Config/BuildSettings.swift
@@ -530,7 +530,7 @@ final class BuildSettings: NSObject {
             return false
         }
         
-        return false
+        return true
     }
     
     // MARK: - Location Sharing
diff --git a/Riot/Modules/KeyVerification/Common/KeyVerificationCoordinator.swift b/Riot/Modules/KeyVerification/Common/KeyVerificationCoordinator.swift
index d0f4a293f..207f50874 100644
--- a/Riot/Modules/KeyVerification/Common/KeyVerificationCoordinator.swift
+++ b/Riot/Modules/KeyVerification/Common/KeyVerificationCoordinator.swift
@@ -138,10 +138,14 @@ final class KeyVerificationCoordinator: KeyVerificationCoordinatorType {
         case .incomingSASTransaction(let incomingSASTransaction):
             rootCoordinator = self.createDataLoadingScreenCoordinator(otherUserId: incomingSASTransaction.otherUserId, otherDeviceId: incomingSASTransaction.otherDeviceId)
         case .completeSecurity(let isNewSignIn):
-            // $$$ missing interaction with disableSelfUserVerification
-            let coordinator = self.createCompleteSecurityCoordinator(isNewSignIn: isNewSignIn)
-            self.completeSecurityCoordinator = coordinator
-            rootCoordinator = coordinator
+            if BuildSettings.disableSelfUserVerification {
+                let coordinator = self.createSecretsRecoveryCoordinator(with: .passphraseOrKey)
+                rootCoordinator = coordinator
+            } else {
+                let coordinator = self.createCompleteSecurityCoordinator(isNewSignIn: isNewSignIn)
+                self.completeSecurityCoordinator = coordinator
+                rootCoordinator = coordinator
+            }
         }
 
         rootCoordinator.start()
@@ -191,6 +195,13 @@ final class KeyVerificationCoordinator: KeyVerificationCoordinatorType {
         return coordinator
     }
     
+    private func createSecretsRecoveryCoordinator(with recoveryMode: SecretsRecoveryMode) -> SecretsRecoveryCoordinator {
+        let coordinator = SecretsRecoveryCoordinator(session: self.session, recoveryMode: recoveryMode, recoveryGoal: .verifyDevice, navigationRouter: self.navigationRouter, cancellable: self.cancellable)
+        coordinator.delegate = self
+        
+        return coordinator
+    }
+    
     private func showSecretsRecovery(with recoveryMode: SecretsRecoveryMode) {
         let coordinator = SecretsRecoveryCoordinator(session: self.session, recoveryMode: recoveryMode, recoveryGoal: .verifyDevice, navigationRouter: self.navigationRouter, cancellable: self.cancellable)
         coordinator.delegate = self