diff --git a/hosts/mashu.nix b/hosts/mashu.nix
index e7face0..e62cd68 100644
--- a/hosts/mashu.nix
+++ b/hosts/mashu.nix
@@ -50,6 +50,7 @@ in mkHost config {
     };
 
     services.gnome.gnome-settings-daemon.enable = true;
+    # TODO: phosh 0.10.2 does not grab this. Just set it.
     services.logind.extraConfig = ''
       HandlePowerKey=suspend
     '';
@@ -57,6 +58,12 @@ in mkHost config {
       tapping = true;
       disableWhileTrying = true;
     };
+
+    # TODO: phosh only allows numerical PINs...
+    users.users.alexander.hashedPassword = lib.mkForce "$5$AkihyU/rnc$MrGVtF2d.2CbURQo2oIWdBdDz1ZLAnKum7BOxhUjh88";
+
+    # TODO: It seems like 0.10.2 does not do this by default. So, as a workaround, start some of these
+    #       myself.
     systemd.user.services = {
       gsd-media = {
         description = "GSD media keys handling";