diff --git a/src/MainApplicationWindow.qml b/src/MainApplicationWindow.qml
index ebfcbbfa82c6cb0efcabd95c2330747c5a9014da..784b13ef838efeb524bd12dc86d199d5ec70f5d4 100644
--- a/src/MainApplicationWindow.qml
+++ b/src/MainApplicationWindow.qml
@@ -65,6 +65,7 @@ ApplicationWindow {
 
             function onNoAccountIsAvailable() {
                 mainViewLoader.setSource("")
+                wizardViewForApplicationStart.changePageQML(0)
                 wizardView.show()
             }
         }
@@ -79,6 +80,8 @@ ApplicationWindow {
         minimumHeight: 600
 
         WizardView {
+            id: wizardViewForApplicationStart
+
             anchors.fill: parent
             onNeedToShowMainViewWindow: {
                 mainViewLoader.newAddedAccountIndex = accountIndex
diff --git a/src/mainview/MainView.qml b/src/mainview/MainView.qml
index 5f50ed262442b8558703da47fb7b8678621b1ae2..5b98007bcd040d4a9c17cdf9ebcba0598bc0e506 100644
--- a/src/mainview/MainView.qml
+++ b/src/mainview/MainView.qml
@@ -227,26 +227,26 @@ Window {
     }
 
     WizardView {
-            id: wizardView
+        id: wizardView
 
-            anchors.fill: parent
+        anchors.fill: parent
 
-            onNeedToShowMainViewWindow: {
-                mainViewLoader.newAddedAccountIndex = accountIndex
-                if (mainViewLoader.source.toString() !== "qrc:/src/mainview/MainView.qml") {
-                    mainViewLoader.loaded.disconnect(slotNewAccountAdded)
-                    mainViewLoader.loaded.connect(slotNewAccountAdded)
-                    mainViewLoader.setSource("qrc:/src/mainview/MainView.qml")
-                } else {
-                    slotNewAccountAdded()
-                }
-                mainViewStackLayout.currentIndex = 0
+        onNeedToShowMainViewWindow: {
+            mainViewLoader.newAddedAccountIndex = accountIndex
+            if (mainViewLoader.source.toString() !== "qrc:/src/mainview/MainView.qml") {
+                mainViewLoader.loaded.disconnect(slotNewAccountAdded)
+                mainViewLoader.loaded.connect(slotNewAccountAdded)
+                mainViewLoader.setSource("qrc:/src/mainview/MainView.qml")
+            } else {
+                slotNewAccountAdded()
             }
+            mainViewStackLayout.currentIndex = 0
+        }
 
-            onWizardViewIsClosed: {
-                mainViewStackLayout.currentIndex = 0
-            }
+        onWizardViewIsClosed: {
+            mainViewStackLayout.currentIndex = 0
         }
+    }
 
     StackLayout {
         id: mainViewStackLayout