diff --git a/config.yml b/config.yml
index 696cea0..6059594 100644
--- a/config.yml
+++ b/config.yml
@@ -8,7 +8,6 @@ services:
   - elogind
   - nanoklogd
   - NetworkManager
-  - NetworkManager-dispatcher
   - pcscd
   - polkitd
   - socklog-unix
diff --git a/files/etc/pam.d/passwd b/files/etc/pam.d/passwd
index 01b456b..1e0a538 100644
--- a/files/etc/pam.d/passwd
+++ b/files/etc/pam.d/passwd
@@ -1,2 +1,2 @@
 password	required	pam_unix.so	sha512 shadow nullok
-password	optional	pam_gnome_keyring.so
+password	optional	pam_gnome_keyring.so use_authtok
diff --git a/files/etc/sv/NetworkManager-dispatcher/log/run b/files/etc/sv/NetworkManager-dispatcher/log/run
deleted file mode 100755
index 46cb463..0000000
--- a/files/etc/sv/NetworkManager-dispatcher/log/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec vlogger -t NetworkManager-dispatcher -p daemon
diff --git a/files/etc/sv/NetworkManager-dispatcher/log/supervise b/files/etc/sv/NetworkManager-dispatcher/log/supervise
deleted file mode 120000
index 98235a1..0000000
--- a/files/etc/sv/NetworkManager-dispatcher/log/supervise
+++ /dev/null
@@ -1 +0,0 @@
-/run/runit/supervise.NetworkManager-dispatcher-log
\ No newline at end of file
diff --git a/files/etc/sv/NetworkManager-dispatcher/run b/files/etc/sv/NetworkManager-dispatcher/run
deleted file mode 100755
index ed8fbb5..0000000
--- a/files/etc/sv/NetworkManager-dispatcher/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-exec 2>&1
-sv check dbus >/dev/null || exit 1
-exec /usr/libexec/nm-dispatcher
diff --git a/files/etc/sv/NetworkManager-dispatcher/supervise b/files/etc/sv/NetworkManager-dispatcher/supervise
deleted file mode 120000
index 6e68d04..0000000
--- a/files/etc/sv/NetworkManager-dispatcher/supervise
+++ /dev/null
@@ -1 +0,0 @@
-/run/runit/supervise.NetworkManager-dispatcher
\ No newline at end of file