2 files changed, 17 insertions, 9 deletions

diff --git a/components/accounts/CreateKolabNow.qml b/components/accounts/CreateKolabNow.qml
index c362bef6..fbcb5fd7 100644
--- a/components/accounts/CreateKolabNow.qml
+++ b/components/accounts/CreateKolabNow.qml
@@ -93,6 +93,12 @@ Item {
                 Layout.fillWidth: true
 
                 placeholderText: "E.g. \"Work\", \"Home\" that will be displayed in Kube as name"
+
+                text: account.name
+
+                onTextChanged: {
+                    account.name = text
+                }
             }
 
             Controls.Label {
diff --git a/components/package/contents/ui/AccountSwitcher.qml b/components/package/contents/ui/AccountSwitcher.qml
index 41b3478c..d5f7610c 100644
--- a/components/package/contents/ui/AccountSwitcher.qml
+++ b/components/package/contents/ui/AccountSwitcher.qml
@@ -19,6 +19,8 @@
 import QtQuick 2.4
 import QtQuick.Layouts 1.1
 import QtQuick.Controls 2.0 as Controls2
+import QtQuick.Controls 1.4 as Controls
+
 import QtQml 2.2 as QtQml
 
 import org.kde.kirigami 1.0 as Kirigami
@@ -156,18 +158,18 @@ Controls2.Button {
                             accountId: model.accountId
                         }
 
-                        Kirigami.Icon {
-                            source: accountFactory.icon
-                        }
+//                         Kirigami.Icon {
+//                             source: model.icon
+//                         }
 
                         Controls2.Label {
-                            text: model.name === "" ? accountFactory.name : model.name
+                            text: model.name
+                        }
+
+                        Controls.ToolButton {
+                            visible: model.showStatus
+                            source: model.statusIcon
                         }
-                        //FIXME port to qqc2
-//                         Button {
-//                             visible: model.showStatus
-//                             source: model.statusIcon
-//                         }
                     }
                     Controls2.Button {