diff --git a/etc/etc/systemd/system/emergency.service.d/override.conf b/etc/etc/systemd/system/emergency.service.d/override.conf
new file mode 100644
index 0000000..b24186a
--- /dev/null
+++ b/etc/etc/systemd/system/emergency.service.d/override.conf
@@ -0,0 +1,5 @@
+## https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=802211
+## https://salsa.debian.org/ah/user-setup/commit/bc5ca2de85ec27845d0b46059cb7cc02bae7b44d
+
+[Service]
+Environment=SYSTEMD_SULOGIN_FORCE=1
diff --git a/etc/etc/systemd/system/rescue.service.d/override.conf b/etc/etc/systemd/system/rescue.service.d/override.conf
new file mode 100644
index 0000000..b24186a
--- /dev/null
+++ b/etc/etc/systemd/system/rescue.service.d/override.conf
@@ -0,0 +1,5 @@
+## https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=802211
+## https://salsa.debian.org/ah/user-setup/commit/bc5ca2de85ec27845d0b46059cb7cc02bae7b44d
+
+[Service]
+Environment=SYSTEMD_SULOGIN_FORCE=1