diff --git a/packages/network/nss-mdns/config/nsswitch.conf b/packages/network/nss-mdns/config/nsswitch.conf
index 2c405773c7..d399c0ff42 100644
--- a/packages/network/nss-mdns/config/nsswitch.conf
+++ b/packages/network/nss-mdns/config/nsswitch.conf
@@ -3,10 +3,10 @@
 # Example configuration of GNU Name Service Switch functionality.
 #
 
-passwd:		files
-group:		files
-shadow:		files
-gshadow:	files
+passwd:		files systemd
+group:		files [SUCCESS=merge] systemd
+shadow:		files systemd
+gshadow:	files systemd
 
 hosts:		files mdns_minimal [NOTFOUND=return] dns
 networks:	files dns
diff --git a/packages/sysutils/systemd/package.mk b/packages/sysutils/systemd/package.mk
index 702ef3cd16..5ae7255176 100644
--- a/packages/sysutils/systemd/package.mk
+++ b/packages/sysutils/systemd/package.mk
@@ -65,7 +65,8 @@ PKG_MESON_OPTS_TARGET="--libdir=/usr/lib \
                        -Dlocaled=false \
                        -Dmachined=false \
                        -Dportabled=false \
-                       -Duserdb=false \
+                       -Duserdb=true \
+                       -Dnologin-path=/usr/sbin/nologin \
                        -Dhomed=disabled \
                        -Dnetworkd=false \
                        -Dtimedated=false \
@@ -88,7 +89,7 @@ PKG_MESON_OPTS_TARGET="--libdir=/usr/lib \
                        -Dnss-myhostname=false \
                        -Dnss-mymachines=disabled \
                        -Dnss-resolve=disabled \
-                       -Dnss-systemd=false \
+                       -Dnss-systemd=true \
                        -Dman=disabled \
                        -Dhtml=disabled \
                        -Dlink-udev-shared=true \
@@ -306,4 +307,5 @@ post_install() {
   enable_service network-base.service
   enable_service systemd-timesyncd.service
   enable_service systemd-timesyncd-setup.service
+  enable_service systemd-userdbd.socket
 }
diff --git a/packages/sysutils/util-linux/package.mk b/packages/sysutils/util-linux/package.mk
index 7c14909b3c..5208cd1a92 100644
--- a/packages/sysutils/util-linux/package.mk
+++ b/packages/sysutils/util-linux/package.mk
@@ -56,7 +56,8 @@ PKG_CONFIGURE_OPTS_TARGET="${UTILLINUX_CONFIG_DEFAULT} \
                            --enable-blkid \
                            --enable-lscpu \
                            --enable-lsfd \
-                           --enable-mount"
+                           --enable-mount \
+                           --enable-nologin"
 
 if [ "${SWAP_SUPPORT}" = "yes" ]; then
   PKG_CONFIGURE_OPTS_TARGET+=" --enable-swapon"