diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp
index 77fd18d83..458828de5 100644
--- a/ksmserver/server.cpp
+++ b/ksmserver/server.cpp
@@ -582,7 +582,7 @@ KSMServer::KSMServer(InitFlags flags)
         setenv("SESSION_MANAGER", session_manager, true);
 
         auto updateEnvJob = new UpdateLaunchEnvJob(QStringLiteral("SESSION_MANAGER"), QString::fromLatin1(session_manager));
-        updateEnvJob->start();
+        updateEnvJob->exec();
 
         free(session_manager);
     }
diff --git a/shell/plasma-plasmashell.service.in b/shell/plasma-plasmashell.service.in
index f3e7c5e52..c95e89a54 100644
--- a/shell/plasma-plasmashell.service.in
+++ b/shell/plasma-plasmashell.service.in
@@ -1,6 +1,6 @@
 [Unit]
 Description=KDE Plasma Workspace
-Wants=plasma-ksmserver.service plasma-kcminit.service
+After=plasma-ksmserver.service plasma-kcminit.service
 PartOf=graphical-session.target
 
 [Service]