diff --git a/readme.md b/readme.md
index 8c554fd..3b79436 100644
--- a/readme.md
+++ b/readme.md
@@ -162,12 +162,6 @@ Then, similarly to the previous command, you need to enable the Ly service:
 # systemctl disable getty@tty2.service
 ```
 
-On platforms that use systemd-logind to dynamically start `autovt@.service` instances when the switch to a new tty occurs, any ly instances for ttys _except the default tty_ need to be enabled using a different mechanism: To autostart ly on switch to `tty2`, do not enable any `ly` unit directly, instead symlink `autovt@tty2.service` to `ly@tty2.service` within `/usr/lib/systemd/system/` (analogous for every other tty you want to enable ly on).
-
-The target of the symlink, `ly@ttyN.service`, does not actually exist, but systemd nevertheless recognizes that the instanciation of `autovt@.service` with `%I` equal to `ttyN` now points to an instanciation of `ly@.service` with `%I` set to `ttyN`.
-
-Compare to `man 5 logind.conf`, especially regarding the `NAutoVTs=` and `ReserveVT=` parameters.
-
 On non-systemd systems, you can change the TTY Ly will run on by editing the corresponding service file for your platform.
 
 ### OpenRC
diff --git a/res/ly@.service b/res/ly@.service
index 54d8bf6..2db6df4 100644
--- a/res/ly@.service
+++ b/res/ly@.service
@@ -1,16 +1,46 @@
+#  SPDX-License-Identifier: LGPL-2.1-or-later
+#
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+#  Modified for Ly by AnErrupTion <anerruption@disroot.org>
+
 [Unit]
-Description=TUI display manager
-After=systemd-user-sessions.service plymouth-quit-wait.service
-After=getty@%i.service
+Description=TUI display manager on %I
+After=systemd-user-sessions.service plymouth-quit-wait.service getty@%i.service
 Conflicts=getty@%i.service
 
 [Service]
+ExecStart=$PREFIX_DIRECTORY/bin/agetty -nl $PREFIX_DIRECTORY/bin/$EXECUTABLE_NAME %I ${TERM}
 Type=idle
-ExecStart=$PREFIX_DIRECTORY/bin/$EXECUTABLE_NAME
+Restart=always
+RestartSec=0
+UtmpIdentifier=%I
 StandardInput=tty
+StandardOutput=tty
 TTYPath=/dev/%I
 TTYReset=yes
 TTYVHangup=yes
+TTYVTDisallocate=yes
+IgnoreSIGPIPE=no
+SendSIGHUP=yes
+
+ImportCredential=tty.virtual.%I.agetty.*:agetty.
+ImportCredential=tty.virtual.%I.login.*:login.
+ImportCredential=agetty.*
+ImportCredential=login.*
+ImportCredential=shell.*
+
+# Unset locale for the console getty since the console has problems
+# displaying some internationalized messages.
+UnsetEnvironment=LANG LANGUAGE LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION
 
 [Install]
+Alias=autovt@.service
+
 WantedBy=multi-user.target
+DefaultInstance=tty2