diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index b91ea4b..a1400f3 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -64,14 +64,16 @@ services.iperf3.enable = true;
   # Enable the OpenSSH daemon.
   services.openssh = {
     enable = true;
-    passwordAuthentication = false;
-    permitRootLogin = "prohibit-password";
+    settings = {
+      PasswordAuthentication = false;
+      PermitRootLogin = "prohibit-password";
+      X11Forwarding = true;
+    };
     extraConfig = "TCPKeepAlive yes\nClientAliveInterval 30\nClientAliveCountMax 99999\nX11UseLocalhost no\nX11DisplayOffset 10\nMatch address 192.168.122.1\n\tPasswordAuthentication yes";
-    forwardX11 = true;
   };
   services.acpid.enable = true;
 
-  environment.extraInit = "if echo \"$-\" | grep i > /dev/null; then bash /etc/motd.script; if [ -r ~/README ]; then printf '\nHello %s, there is a README file in your home directory. See the contents below:\n\n%s\n' $USER \"$(<~/README)\"; fi; if [ -r /var/tmp/poll ]; then printf '\nTHERE IS AN ONGOING POLL.\n%s\nPoll ends on %s\nPlace your vote in ~/.vote\n' \"$(</var/tmp/poll)\" \"$(date -d @$(($(stat -c %Y /var/tmp/poll)+1159300)))\"; fi; fi";
+  environment.extraInit = "if echo \"$-\" | grep i > /dev/null; then bash /etc/motd.script; if [ -r ~/README ]; then printf '\nHello %s, there is a README file in your home directory. See the contents below:\n\n%s\n' $USER \"$(<~/README)\"; fi; if [ -r /var/tmp/poll ]; then printf '\nTHERE IS AN ONGOING POLL.\nTo vote, run the vote command from the pubnix.\n'; fi; fi";
   security.auditd.enable = true;
   services.postgresql = {
     enable = true;
diff --git a/skel/README b/skel/README
new file mode 100644
index 0000000..ee94cd9
--- /dev/null
+++ b/skel/README
@@ -0,0 +1,5 @@
+Welcome to ~vern!
+
+We strongly recommend you putting a pgp public key in ~/.pgp.asc for account recovery purposes.
+
+Once you have done that, you can safely delete this file with rm ~/README.