1 files changed, 14 insertions, 5 deletions

diff --git a/framework/domain/accountfactory.cpp b/framework/domain/accountfactory.cpp
index ab1a09e5..10f01f65 100644
--- a/framework/domain/accountfactory.cpp
+++ b/framework/domain/accountfactory.cpp
@@ -25,20 +25,29 @@
 #include <KPluginMetaData>
 
 #include "settings/settings.h"
+#include <sink/store.h>
 
 AccountFactory::AccountFactory(QObject *parent)
     : QObject(parent)
 {
 }
 
+QString AccountFactory::name() const
+{
+    if (mName.isEmpty()) {
+        return tr("Account");
+    }
+    return mName;
+}
+
 void AccountFactory::setAccountId(const QString &accountId)
 {
     mAccountId = accountId;
-
-    Kube::Account account(mAccountId.toUtf8());
-    mAccountType = account.type();
-
-    loadPackage();
+    Sink::Store::fetchOne<Sink::ApplicationDomain::SinkAccount>(Sink::Query::IdentityFilter(accountId.toUtf8()))
+        .then<void, Sink::ApplicationDomain::SinkAccount>([this](const Sink::ApplicationDomain::SinkAccount &account) {
+            mAccountType = account.getProperty("type").toByteArray();
+            loadPackage();
+        }).exec();
 }
 
 void AccountFactory::loadPackage()