diff --git a/configuration/boot-environment.nix b/configuration/boot-environment.nix
index 6e14ef2e193..ecc58406948 100644
--- a/configuration/boot-environment.nix
+++ b/configuration/boot-environment.nix
@@ -254,6 +254,7 @@ rec {
       )
       [
         "login"
+        "sshd"
         "passwd"
         "useradd"
         "other"
diff --git a/configuration/etc/sshd_config b/configuration/etc/sshd_config
index 33619c72028..994042bc78f 100644
--- a/configuration/etc/sshd_config
+++ b/configuration/etc/sshd_config
@@ -1 +1,2 @@
 X11Forwarding yes
+UsePAM yes