diff --git a/machines/boxy/configuration.nix b/machines/boxy/configuration.nix
index a02fdf9..fab4297 100644
--- a/machines/boxy/configuration.nix
+++ b/machines/boxy/configuration.nix
@@ -24,7 +24,7 @@ with lib;
     };
     kodi = {
       enable = true;
-      autologin = false;
+      autologin = true;
       wayland = true;
     };
     users.enable = true;
diff --git a/roles/kodi/default.nix b/roles/kodi/default.nix
index c40bff8..aed1e2e 100644
--- a/roles/kodi/default.nix
+++ b/roles/kodi/default.nix
@@ -75,13 +75,10 @@ in
         };
       };
 
-      services = if cfg.autologin then {
-          displayManager = {
-            autoLogin.enable = true;
-            autoLogin.user = "kodi";
-            defaultSession = "kodi";
-            sessionData.autologinSession = "plasma";
-          };
-      } else {};
+      services.displayManager = mkIf cfg.autologin {
+        autoLogin.enable = true;
+        autoLogin.user = "kodi";
+        defaultSession = "plasma";
+      };
     };
 }