diff --git a/units/systemd-ask-password-plymouth.path b/units/systemd-ask-password-plymouth.path
index 827f1385e8..8e5e51290d 100644
--- a/units/systemd-ask-password-plymouth.path
+++ b/units/systemd-ask-password-plymouth.path
@@ -8,6 +8,8 @@
 [Unit]
 Description=Forward Password Requests to Plymouth Directory Watch
 DefaultDependencies=no
+Conflicts=shutdown.target
+Before=basic.target shutdown.target
 
 [Path]
 DirectoryNotEmpty=/dev/.systemd/ask-password
diff --git a/units/systemd-ask-password-plymouth.service.in b/units/systemd-ask-password-plymouth.service.in
index 3cd9b7fe77..8ed22ac651 100644
--- a/units/systemd-ask-password-plymouth.service.in
+++ b/units/systemd-ask-password-plymouth.service.in
@@ -7,6 +7,9 @@
 
 [Unit]
 Description=Forward Password Requests to Plymouth
+DefaultDependencies=no
+Conflicts=shutdown.target
+Before=shutdown.target
 
 [Service]
 ExecStart=@rootbindir@/systemd-tty-ask-password-agent --watch --plymouth
diff --git a/units/systemd-ask-password-wall.path b/units/systemd-ask-password-wall.path
index d7a9e3c4bc..9c4b1d3d24 100644
--- a/units/systemd-ask-password-wall.path
+++ b/units/systemd-ask-password-wall.path
@@ -8,6 +8,8 @@
 [Unit]
 Description=Forward Password Requests to Wall Directory Watch
 DefaultDependencies=no
+Conflicts=shutdown.target
+Before=basic.target shutdown.target
 
 [Path]
 DirectoryNotEmpty=/dev/.systemd/ask-password