diff --git a/src/controller.cpp b/src/controller.cpp
index 68c202140..c1f8fda6a 100644
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -68,7 +68,6 @@ Controller::Controller(QObject *parent)
         connect(c, &Connection::connected, this, [c, this]() {
             m_accountRegistry.add(c);
             c->syncLoop();
-            Q_EMIT initiated();
         });
     }
 
@@ -220,7 +219,6 @@ void Controller::invokeLogin()
                     Q_EMIT accountsLoadingChanged();
                     if (connection->userId() == id) {
                         setActiveConnection(connection);
-                        connectSingleShot(connection, &NeoChatConnection::syncDone, this, &Controller::initiated);
                     }
                 });
                 connect(connection, &NeoChatConnection::loginError, this, [this, connection](const QString &error, const QString &) {
@@ -236,7 +234,6 @@ void Controller::invokeLogin()
                         Q_EMIT errorOccured(i18n("Login Failed: %1", error), {});
                         connection->logout(true);
                     }
-                    Q_EMIT initiated();
                 });
                 connect(connection, &NeoChatConnection::networkError, this, [this](const QString &error, const QString &, int, int) {
                     Q_EMIT errorOccured(i18n("Network Error: %1", error), {});
@@ -245,9 +242,6 @@ void Controller::invokeLogin()
             });
         }
     }
-    if (accounts.isEmpty()) {
-        Q_EMIT initiated();
-    }
 }
 
 QKeychain::ReadPasswordJob *Controller::loadAccessTokenFromKeyChain(const AccountSettings &account)
diff --git a/src/controller.h b/src/controller.h
index 8d7c371ac..9960b54ea 100644
--- a/src/controller.h
+++ b/src/controller.h
@@ -142,7 +142,6 @@ Q_SIGNALS:
     void errorOccured(const QString &error, const QString &detail);
     void connectionAdded(NeoChatConnection *connection);
     void connectionDropped(NeoChatConnection *connection);
-    void initiated();
     void activeConnectionChanged();
     void userConsentRequired(QUrl url);
     void accountsLoadingChanged();
diff --git a/src/login.cpp b/src/login.cpp
index c13d01e51..cfe37d3d2 100644
--- a/src/login.cpp
+++ b/src/login.cpp
@@ -102,7 +102,6 @@ void LoginHelper::init()
 
     connectSingleShot(m_connection, &Connection::syncDone, this, [this]() {
         Q_EMIT loaded();
-        Q_EMIT Controller::instance().initiated();
     });
 }
 
diff --git a/src/qml/Loading.qml b/src/qml/Loading.qml
index 64f55ed8e..948615f90 100644
--- a/src/qml/Loading.qml
+++ b/src/qml/Loading.qml
@@ -22,8 +22,8 @@ LoginStep {
 
     Connections {
         target: Controller
-        function onInitiated() {
-            root.closeDialog()
+        function onConnectionAdded(connection) {
+            connection.syncDone.connect(() => root.closeDialog())
         }
     }
 }
diff --git a/src/registration.cpp b/src/registration.cpp
index 4fba1a86b..38dadd9f0 100644
--- a/src/registration.cpp
+++ b/src/registration.cpp
@@ -113,7 +113,6 @@ void Registration::registerAccount()
                 Controller::instance().addConnection(connection);
                 Controller::instance().setActiveConnection(connection);
                 connectSingleShot(connection, &Connection::syncDone, this, []() {
-                    Q_EMIT Controller::instance().initiated();
                     Q_EMIT LoginHelper::instance().loaded();
                 });
                 m_connection = nullptr;