diff --git a/units/user-runtime-dir@.service.in b/units/user-runtime-dir@.service.in
index 5fb5cad36a6..241e9267bb0 100644
--- a/units/user-runtime-dir@.service.in
+++ b/units/user-runtime-dir@.service.in
@@ -10,7 +10,7 @@
 [Unit]
 Description=User Runtime Directory /run/user/%i
 Documentation=man:user@.service(5)
-After=dbus.service
+After=systemd-logind.service dbus.service
 IgnoreOnIsolate=yes
 
 [Service]
diff --git a/units/user@.service.in b/units/user@.service.in
index 5efb12a8601..56954657472 100644
--- a/units/user@.service.in
+++ b/units/user@.service.in
@@ -11,7 +11,7 @@
 Description=User Manager for UID %i
 Documentation=man:user@.service(5)
 BindsTo=user-runtime-dir@%i.service
-After=user-runtime-dir@%i.service dbus.service systemd-oomd.service
+After=systemd-logind.service user-runtime-dir@%i.service dbus.service systemd-oomd.service
 IgnoreOnIsolate=yes
 
 [Service]