diff --git a/roles/plasma-bigscreen/default.nix b/roles/plasma-bigscreen/default.nix
index 6263041..e78a7d0 100644
--- a/roles/plasma-bigscreen/default.nix
+++ b/roles/plasma-bigscreen/default.nix
@@ -77,7 +77,13 @@ in
     services.desktopManager.plasma6.enable = true;
 
     # Register the bigscreen session with the display manager
-    services.displayManager.sessionPackages = [ plasma-bigscreen ];
+    services.displayManager = {
+      sessionPackages = [ plasma-bigscreen ];
+    } // optionalAttrs cfg.autologin {
+      autoLogin.enable = true;
+      autoLogin.user = cfg.user;
+      defaultSession = "plasma-bigscreen-wayland";
+    };
     xdg.portal.configPackages = [ plasma-bigscreen ];
 
     # Fix homescreen not being focused after quitting app or on boot
@@ -123,10 +129,5 @@ in
       };
     };
 
-    services.displayManager = mkIf cfg.autologin {
-      autoLogin.enable = true;
-      autoLogin.user = cfg.user;
-      defaultSession = "plasma-bigscreen-wayland";
-    };
   };
 }