diff --git a/Riot/Modules/Room/Members/RoomParticipantsViewController.m b/Riot/Modules/Room/Members/RoomParticipantsViewController.m
index 2fc6c118a..45df17607 100644
--- a/Riot/Modules/Room/Members/RoomParticipantsViewController.m
+++ b/Riot/Modules/Room/Members/RoomParticipantsViewController.m
@@ -155,13 +155,15 @@
     [self.tableView registerClass:ContactTableViewCell.class forCellReuseIdentifier:@"ParticipantTableViewCellId"];
     
     
-    if (_showInviteUserFab)
-    {
-        // Add invite members button programmatically
-        [self vc_addFABWithImage:AssetImages.addMemberFloatingAction.image
-                          target:self
-                          action:@selector(onAddParticipantButtonPressed)];
-    }
+    // bwi: too early to tell if button should be added -> we need mxRoom
+//    if (_showInviteUserFab)
+//    {
+//        // Add invite members button programmatically
+//        [self vc_addFABWithImage:AssetImages.addMemberFloatingAction.image
+//                          target:self
+//                          action:@selector(onAddParticipantButtonPressed)];
+//    }
+
     
     // Observe user interface theme change.
     kThemeServiceDidChangeThemeNotificationObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kThemeServiceDidChangeThemeNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
diff --git a/Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroViewController.swift b/Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroViewController.swift
index 6eac31425..09a1eae4d 100644
--- a/Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroViewController.swift
+++ b/Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroViewController.swift
@@ -102,18 +102,6 @@ final class SecureBackupSetupIntroViewController: UIViewController {
         self.title = BWIL10n.secureKeyBackupSetupIntroTitle
         self.informationLabel.text = BWIL10n.secureKeyBackupSetupIntroInfo
         
-        if let session = AppDelegate.theDelegate().mxSessions.first as? MXSession, let wellknown = session.homeserverWellknown {
-            if wellknown.backupRequired() {
-                let cancelBarButtonItem = MXKBarButtonItem(title: VectorL10n.cancel, style: .plain) { [weak self] in
-                    guard let self = self else {
-                        return
-                    }
-                    self.delegate?.secureBackupSetupIntroViewControllerDidCancel(self, showSkipAlert: true)
-                }
-                self.navigationItem.rightBarButtonItem = cancelBarButtonItem
-            }
-        }
-        
         self.secureKeyCell.fill(title: VectorL10n.secureKeyBackupSetupIntroUseSecurityKeyTitle,
                                 information: VectorL10n.secureKeyBackupSetupIntroUseSecurityKeyInfo,
                                 image: Asset.Images.secretsSetupKey.image)