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 e39cfeb9..f820067e 100644
--- a/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/ClientConfigAppleMail.qml
+++ b/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/ClientConfigAppleMail.qml
@@ -14,8 +14,6 @@ import QtQml
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.Controls
-import QtQuick.Controls.impl
-import Proton
 
 Item {
     id: root
diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/ClientConfigEnd.qml b/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/ClientConfigEnd.qml
index 02b80f6c..3893f7e4 100644
--- a/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/ClientConfigEnd.qml
+++ b/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/ClientConfigEnd.qml
@@ -14,8 +14,6 @@ import QtQml
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.Controls
-import QtQuick.Controls.impl
-import Proton
 
 Rectangle {
     id: root
diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/ClientConfigParameters.qml b/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/ClientConfigParameters.qml
index e5dd988e..366a55d3 100644
--- a/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/ClientConfigParameters.qml
+++ b/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/ClientConfigParameters.qml
@@ -14,8 +14,6 @@ import QtQml
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.Controls
-import QtQuick.Controls.impl
-import Proton
 import ".."
 
 Rectangle {
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 2de2c47a..51aaf5ea 100644
--- a/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/ClientConfigSelector.qml
+++ b/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/ClientConfigSelector.qml
@@ -14,8 +14,6 @@ import QtQml
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.Controls
-import QtQuick.Controls.impl
-import Proton
 
 Item {
     id: root
diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/ClientListItem.qml b/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/ClientListItem.qml
index 5422cdfe..8a133605 100644
--- a/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/ClientListItem.qml
+++ b/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/ClientListItem.qml
@@ -14,8 +14,6 @@ import QtQml
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.Controls
-import QtQuick.Controls.impl
-import Proton
 
 Rectangle {
     id: root
@@ -33,7 +31,7 @@ Rectangle {
             return colorScheme.interaction_default_active;
         }
         if (mouseArea.containsMouse) {
-            return colorScheme.interaction_default_hover
+            return colorScheme.interaction_default_hover;
         }
         return colorScheme.background_norm;
     }
diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/HelpButton.qml b/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/HelpButton.qml
index 47d4d357..e897b11a 100644
--- a/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/HelpButton.qml
+++ b/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/HelpButton.qml
@@ -14,8 +14,6 @@ import QtQml
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.Controls
-import QtQuick.Controls.impl
-import Proton
 
 Button {
     id: root
@@ -28,10 +26,10 @@ Button {
     anchors.rightMargin: 32
     colorScheme: wizard.colorScheme
     horizontalPadding: 0
-    icon.source: "/qml/icons/ic-question-circle.svg"
-    icon.height: 24
-    icon.width: 24
     icon.color: wizard.colorScheme.text_weak
+    icon.height: 24
+    icon.source: "/qml/icons/ic-question-circle.svg"
+    icon.width: 24
     verticalPadding: 0
 
     onClicked: {
diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/LeftPane.qml b/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/LeftPane.qml
index 64d11203..a8bfe9a4 100644
--- a/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/LeftPane.qml
+++ b/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/LeftPane.qml
@@ -14,9 +14,6 @@ import QtQml
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.Controls
-import QtQuick.Controls.impl
-import "." as Proton
-import ".."
 
 Item {
     id: root
diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/Login.qml b/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/Login.qml
index 35fd9a1e..43146d25 100644
--- a/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/Login.qml
+++ b/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/Login.qml
@@ -14,8 +14,6 @@ import QtQml
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.Controls
-import QtQuick.Controls.impl
-import Proton
 
 FocusScope {
     id: root
@@ -41,6 +39,11 @@ FocusScope {
         loginLayout.reset(clearUsername);
         totpLayout.reset();
         mailboxPasswordLayout.reset();
+        if (username.length === 0) {
+            usernameTextField.forceActiveFocus();
+        } else {
+            passwordTextField.forceActiveFocus();
+        }
     }
 
     StackLayout {
diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/Onboarding.qml b/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/Onboarding.qml
index bebe474c..22bf5008 100644
--- a/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/Onboarding.qml
+++ b/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/Onboarding.qml
@@ -14,11 +14,10 @@ import QtQml
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.Controls
-import QtQuick.Controls.impl
-import "." as Proton
 
 Item {
     id: root
+
     property var wizard
 
     ColumnLayout {
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 2bc5e9d4..50ae4230 100644
--- a/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/SetupWizard.qml
+++ b/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/SetupWizard.qml
@@ -14,9 +14,6 @@ import QtQml
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.Controls
-import QtQuick.Controls.impl
-import "." as Proton
-import ".."
 
 Item {
     id: root
@@ -102,8 +99,8 @@ Item {
         root.address = "";
         leftContent.showLogin();
         rightContent.currentIndex = SetupWizard.ContentStack.Login;
-        login.reset(true);
         login.username = username;
+        login.reset(false);
     }
     function showOnboarding() {
         rootStackLayout.currentIndex = SetupWizard.RootStack.TwoPanesView;
@@ -152,6 +149,7 @@ Item {
                     clip: true
                     width: 364
                     wizard: root
+
                     Connections {
                         function onAppleMailAutoconfigCertificateInstallPageShown() {
                             leftContent.showAppleMailAutoconfigCertificateInstall();
diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/StepDescriptionBox.qml b/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/StepDescriptionBox.qml
index ff4bf37f..74e8c02d 100644
--- a/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/StepDescriptionBox.qml
+++ b/internal/frontend/bridge-gui/bridge-gui/qml/SetupWizard/StepDescriptionBox.qml
@@ -14,8 +14,6 @@ import QtQml
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.Controls
-import QtQuick.Controls.impl
-import "." as Proton
 
 Item {
     id: root
@@ -57,9 +55,9 @@ Item {
                 Layout.alignment: Qt.AlignLeft | Qt.AlignTop
                 Layout.fillHeight: true
                 Layout.fillWidth: true
+                color: root.colorScheme.text_weak
                 colorScheme: root.colorScheme
                 text: root.description
-                color: root.colorScheme.text_weak
                 type: Label.LabelType.Body
                 verticalAlignment: Text.AlignTop
             }