2 files changed, 6 insertions, 3 deletions

diff --git a/components/package/contents/ui/AccountSwitcher.qml b/components/package/contents/ui/AccountSwitcher.qml
index a29a290d..e9e9b549 100644
--- a/components/package/contents/ui/AccountSwitcher.qml
+++ b/components/package/contents/ui/AccountSwitcher.qml
@@ -79,6 +79,7 @@ Controls2.Button {
 
                 onClicked: {
                     newAccountComponent.createObject(app)
+                    popup.close()
                 }
 
                 Component {
@@ -174,7 +175,7 @@ Controls2.Button {
 
                         onClicked: {
                             editAccountComponent.createObject(app)
-                            dialog.visible = false
+                            popup.close()
                         }
 
                         Component {
diff --git a/components/package/contents/ui/NewAccountDialog.qml b/components/package/contents/ui/NewAccountDialog.qml
index e565cb6a..de168de7 100644
--- a/components/package/contents/ui/NewAccountDialog.qml
+++ b/components/package/contents/ui/NewAccountDialog.qml
@@ -97,13 +97,15 @@ KubeComponents.OverlayDialog {
                             text: "kolabnow"
 
                             onClicked: {
-                                stack.push(kolabnow)
+                                accountsController.createAccount("kolabnow");
+                                root.closeDialog()
+                                //stack.push(imap)
                             }
                         }
 
                         Button {
                             anchors.horizontalCenter: parent.horizontalCenter
-                             width: pageRoot.width * 0.4
+                            width: pageRoot.width * 0.4
 
                             text: "imap"