diff --git a/internal/frontend/bridge-gui/bridge-gui/Resources.qrc b/internal/frontend/bridge-gui/bridge-gui/Resources.qrc
index 9d2dcaf0..675d2f54 100644
--- a/internal/frontend/bridge-gui/bridge-gui/Resources.qrc
+++ b/internal/frontend/bridge-gui/bridge-gui/Resources.qrc
@@ -109,10 +109,8 @@
         <file>qml/SetupWizard/ClientListItem.qml</file>
         <file>qml/SetupWizard/LeftPane.qml</file>
         <file>qml/SetupWizard/ClientConfigAppleMail.qml</file>
-        <file>qml/SetupWizard/ClientConfigOutlookSelector.qml</file>
         <file>qml/SetupWizard/ClientConfigParameters.qml</file>
         <file>qml/SetupWizard/ClientConfigSelector.qml</file>
-        <file>qml/SetupWizard/ClientConfigWarning.qml</file>
         <file>qml/SetupWizard/SetupWizard.qml</file>
         <file>qml/SetupWizard/Login.qml</file>
         <file>qml/SetupWizard/Onboarding.qml</file>
diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/ClientConfigAppleMail.qml b/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/ClientConfigAppleMail.qml
index 098bf705..1cd093c5 100644
--- a/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/ClientConfigAppleMail.qml
+++ b/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/ClientConfigAppleMail.qml
@@ -58,7 +58,7 @@ Item {
                 }
                 function onCertificateInstallSuccess() {
                     certInstallButton.loading = false;
-                    console.error("Certification installed successfully");
+                    console.error("Certificate installed successfully");
                     stack.currentIndex = ClientConfigAppleMail.Screen.ProfileInstall;
                 }
 
diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/ClientConfigOutlookSelector.qml b/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/ClientConfigOutlookSelector.qml
deleted file mode 100644
index 180532eb..00000000
--- a/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/ClientConfigOutlookSelector.qml
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright (c) 2023 Proton AG
-// This file is part of Proton Mail Bridge.
-// Proton Mail Bridge is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// Proton Mail Bridge is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// You should have received a copy of the GNU General Public License
-// along with Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
-import QtQml
-import QtQuick
-import QtQuick.Layouts
-import QtQuick.Controls
-import QtQuick.Controls.impl
-import Proton
-
-Item {
-    id: root
-
-    readonly property bool onMacOS: (Backend.goos === "darwin")
-    readonly property bool onWindows: (Backend.goos === "windows")
-    property var wizard
-
-    ColumnLayout {
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.top: parent.top
-        spacing: 0
-
-        Label {
-            Layout.alignment: Qt.AlignHCenter
-            Layout.fillWidth: true
-            colorScheme: wizard.colorScheme
-            text: qsTr("Pick your version of Outlook")
-            type: Label.LabelType.Heading
-        }
-        Item {
-            Layout.preferredHeight: 72
-        }
-        ClientListItem {
-            Layout.fillWidth: true
-            colorScheme: wizard.colorScheme
-            iconSource: "/qml/icons/ic-microsoft-outlook.svg"
-            text: "Outlook from Microsoft 365"
-
-            onClicked: {
-                wizard.clientVersion = "365";
-                wizard.showClientWarning();
-            }
-        }
-        ClientListItem {
-            Layout.fillWidth: true
-            colorScheme: wizard.colorScheme
-            iconSource: "/qml/icons/ic-microsoft-outlook.svg"
-            text: "Outlook 2019"
-
-            onClicked: {
-                wizard.clientVersion = "2019";
-                wizard.showClientWarning();
-            }
-        }
-        ClientListItem {
-            Layout.fillWidth: true
-            colorScheme: wizard.colorScheme
-            iconSource: "/qml/icons/ic-microsoft-outlook.svg"
-            text: "Outlook 2016"
-
-            onClicked: {
-                wizard.clientVersion = "2016";
-                wizard.showClientWarning();
-            }
-        }
-        Item {
-            Layout.preferredHeight: 72
-        }
-        Button {
-            Layout.fillWidth: true
-            colorScheme: wizard.colorScheme
-            secondary: true
-            text: qsTr("Cancel")
-
-            onClicked: {
-                root.wizard.closeWizard();
-            }
-        }
-    }
-}
-
diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/ClientConfigSelector.qml b/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/ClientConfigSelector.qml
index 1d1fd0ef..28db59c9 100644
--- a/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/ClientConfigSelector.qml
+++ b/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/ClientConfigSelector.qml
@@ -61,7 +61,7 @@ Item {
 
             onClicked: {
                 wizard.client = SetupWizard.Client.MicrosoftOutlook;
-                wizard.showOutlookSelector();
+                wizard.showClientParams();
             }
         }
         ClientListItem {
@@ -72,7 +72,7 @@ Item {
 
             onClicked: {
                 wizard.client = SetupWizard.Client.MozillaThunderbird;
-                wizard.showClientWarning();
+                wizard.showClientParams();
             }
         }
         ClientListItem {
@@ -83,7 +83,7 @@ Item {
 
             onClicked: {
                 wizard.client = SetupWizard.Client.Generic;
-                wizard.showClientWarning();
+                wizard.showClientParams();
             }
         }
         Item {
diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/ClientConfigWarning.qml b/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/ClientConfigWarning.qml
deleted file mode 100644
index b4db56ba..00000000
--- a/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/ClientConfigWarning.qml
+++ /dev/null
@@ -1,109 +0,0 @@
-// Copyright (c) 2023 Proton AG
-// This file is part of Proton Mail Bridge.
-// Proton Mail Bridge is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// Proton Mail Bridge is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// You should have received a copy of the GNU General Public License
-// along with Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
-import QtQml
-import QtQuick
-import QtQuick.Layouts
-import QtQuick.Controls
-import QtQuick.Controls.impl
-import Proton
-
-// Copyright (c) 2023 Proton AG
-// This file is part of Proton Mail Bridge.
-// Proton Mail Bridge is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// Proton Mail Bridge is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// You should have received a copy of the GNU General Public License
-// along with Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
-import QtQml
-import QtQuick
-import QtQuick.Layouts
-import QtQuick.Controls
-import QtQuick.Controls.impl
-import Proton
-
-Item {
-    id: root
-
-    property var wizard
-
-    ColumnLayout {
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.top: parent.top
-        spacing: 0
-
-        Label {
-            Layout.fillWidth: true
-            colorScheme: wizard.colorScheme
-            horizontalAlignment: Text.AlignHCenter
-            text: qsTr("A word of warning")
-            type: Label.LabelType.Heading
-            wrapMode: Text.WordWrap
-        }
-        Item {
-            Layout.preferredHeight: 96
-        }
-        Label {
-            Layout.alignment: Qt.AlignHCenter
-            Layout.fillWidth: true
-            colorScheme: wizard.colorScheme
-            horizontalAlignment: Text.AlignHCenter
-            text: qsTr("Do not enter your Proton account password in you email application.")
-            type: Label.LabelType.Body
-            wrapMode: Text.WordWrap
-        }
-        Item {
-            Layout.preferredHeight: 96
-        }
-        Label {
-            Layout.alignment: Qt.AlignHCenter
-            Layout.fillWidth: true
-            colorScheme: wizard.colorScheme
-            horizontalAlignment: Text.AlignHCenter
-            text: qsTr("We have generated a new password for you. It will work only on this computer, and can safely be entered in your email client.")
-            type: Label.LabelType.Body
-            wrapMode: Text.WordWrap
-        }
-        Item {
-            Layout.preferredHeight: 96
-        }
-        Button {
-            Layout.fillWidth: true
-            colorScheme: wizard.colorScheme
-            text: qsTr("I understand")
-
-            onClicked: {
-                root.wizard.showClientParams();
-            }
-        }
-        Item {
-            Layout.preferredHeight: 32
-        }
-        Button {
-            Layout.fillWidth: true
-            colorScheme: wizard.colorScheme
-            secondary: true
-            text: qsTr("Cancel")
-
-            onClicked: {
-                root.wizard.closeWizard();
-            }
-        }
-    }
-}
-
diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/SetupWizard.qml b/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/SetupWizard.qml
index 38083975..1c5117a6 100644
--- a/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/SetupWizard.qml
+++ b/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/SetupWizard.qml
@@ -30,8 +30,6 @@ Item {
         Onboarding,
         Login,
         ClientConfigSelector,
-        ClientConfigOutlookSelector,
-        ClientConfigWarning,
         ClientConfigAppleMail
     }
     enum RootStack {
@@ -97,11 +95,6 @@ Item {
     function showClientParams() {
         rootStackLayout.currentIndex = SetupWizard.RootStack.ClientConfigParameters;
     }
-    function showClientWarning() {
-        rootStackLayout.currentIndex = SetupWizard.RootStack.TwoPanesView;
-        leftContent.showClientConfigWarning();
-        rightContent.currentIndex = SetupWizard.ContentStack.ClientConfigWarning;
-    }
     function showLogin(username = "") {
         rootStackLayout.currentIndex = SetupWizard.RootStack.TwoPanesView;
         root.address = "";
@@ -216,20 +209,6 @@ Item {
                         wizard: root
                     }
                     // rightContent stack index 3
-                    ClientConfigOutlookSelector {
-                        id: clientConfigOutlookSelector
-                        Layout.fillHeight: true
-                        Layout.fillWidth: true
-                        wizard: root
-                    }
-                    // rightContent stack index 4
-                    ClientConfigWarning {
-                        id: clientConfigWarning
-                        Layout.fillHeight: true
-                        Layout.fillWidth: true
-                        wizard: root
-                    }
-                    // rightContent stack index 5
                     ClientConfigAppleMail {
                         id: clientConfigAppleMail
                         Layout.fillHeight: true