diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
index 2680e27bdc65ae239a713a65fc3d3c06b6cb1177..5a6946dabc13f7d77da8ac31f4e252abf13f4685 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
@@ -492,7 +492,7 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
         getMenuInflater().inflate(R.menu.activity_conversations, menu);
         final MenuItem qrCodeScanMenuItem = menu.findItem(R.id.action_scan_qr_code);
         if (qrCodeScanMenuItem != null) {
-            if (isCameraFeatureAvailable()) {
+            if (isCameraFeatureAvailable() && (xmppConnectionService == null || !xmppConnectionService.isOnboarding())) {
                 Fragment fragment = getFragmentManager().findFragmentById(R.id.main_fragment);
                 boolean visible = getResources().getBoolean(R.bool.show_qr_code_scan)
                         && fragment instanceof ConversationsOverviewFragment;
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationsOverviewFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationsOverviewFragment.java
index 239c68c68cc85a56e7ee3b48271d0bd2fbf6da3a..bc3667332ddcf9f7781c937ce001fe609a59b93a 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationsOverviewFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationsOverviewFragment.java
@@ -316,6 +316,13 @@ public class ConversationsOverviewFragment extends XmppFragment {
 		AccountUtils.showHideMenuItems(menu);
 		final MenuItem easyOnboardInvite = menu.findItem(R.id.action_easy_invite);
 		easyOnboardInvite.setVisible(EasyOnboardingInvite.anyHasSupport(activity == null ? null : activity.xmppConnectionService));
+		if (activity.xmppConnectionService != null && activity.xmppConnectionService.isOnboarding()) {
+			final MenuItem manageAccounts = menu.findItem(R.id.action_accounts);
+			if (manageAccounts != null) manageAccounts.setVisible(false);
+
+			final MenuItem settings = menu.findItem(R.id.action_settings);
+			if (settings != null) settings.setVisible(false);
+		}
 	}
 
 	 @Override
@@ -380,6 +387,11 @@ public class ConversationsOverviewFragment extends XmppFragment {
 	@Override
 	public void onBackendConnected() {
 		refresh();
+		if (activity.xmppConnectionService.isOnboarding()) {
+			binding.fab.setVisibility(View.GONE);
+		} else {
+			binding.fab.setVisibility(View.VISIBLE);
+		}
 	}
 
 	@Override