diff --git a/modules/common/shell/fish/default.nix b/modules/common/shell/fish/default.nix
index 9c57b77..cb69b6e 100644
--- a/modules/common/shell/fish/default.nix
+++ b/modules/common/shell/fish/default.nix
@@ -1,8 +1,7 @@
 { config, pkgs, lib, ... }: {
 
   users.users.${config.user}.shell = pkgs.fish;
-  programs.fish.enable =
-    true; # Needed for LightDM to remember username (TODO: fix)
+  programs.fish.enable = true; # Needed for LightDM to remember username
 
   home-manager.users.${config.user} = {
 
diff --git a/modules/nixos/graphical/xorg.nix b/modules/nixos/graphical/xorg.nix
index 53f4d0e..91ed745 100644
--- a/modules/nixos/graphical/xorg.nix
+++ b/modules/nixos/graphical/xorg.nix
@@ -40,6 +40,7 @@
           greeters.gtk.theme = gtkTheme;
 
           # Show default user
+          # Also make sure /var/lib/AccountsService/users/<user> has SystemAccount=false
           extraSeatDefaults = ''
             greeter-hide-users = false
           '';