diff --git a/hosts/kitty/users/corn/default.nix b/hosts/kitty/users/corn/default.nix
index 55cf01e1..ea829026 100644
--- a/hosts/kitty/users/corn/default.nix
+++ b/hosts/kitty/users/corn/default.nix
@@ -4,8 +4,8 @@
     isNormalUser = true;
     createHome = true;
     openssh.authorizedKeys.keys = [
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBCADciME1/rtWOlR2BxaAkRSgIZt61SYOgjTi6hw+yS Chinook"
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICtoHVAmq8Ps7EguBsV3VY4snagzkhH6aXqwbKzuGs2H Radiant"
+      "AAAAC3NzaC1lZDI1NTE5AAAAIBCADciME1/rtWOlR2BxaAkRSgIZt61SYOgjTi6hw+yS Chinook"
+      "AAAAC3NzaC1lZDI1NTE5AAAAICtoHVAmq8Ps7EguBsV3VY4snagzkhH6aXqwbKzuGs2H Radiant"
     ];
     uid = 1001;
     shell = pkgs.zsh;
diff --git a/modules/system/services/general/ssh/default.nix b/modules/system/services/general/ssh/default.nix
index b7fa7ca8..ec13d9c9 100644
--- a/modules/system/services/general/ssh/default.nix
+++ b/modules/system/services/general/ssh/default.nix
@@ -8,12 +8,11 @@
       PermitRootLogin = lib.mkForce "no";
       PrintLastLog = "no";
       PasswordAuthentication = false;
-      PermitEmptyPasswords = true;
+      UsePAM = false;
+      X11Forwarding = false;
     };
   };
 
-  security.pam.services.sshd.allowNullPassword = true;
-
   environment.persistence."/persist".files = [
     "/etc/ssh/ssh_host_ed25519_key"
     "/etc/ssh/ssh_host_ed25519_key.pub"