diff --git a/files/usr/lib/systemd/user/firstboot-setup.service b/files/usr/lib/systemd/user/firstboot-setup.service
index c3371ca..3be7c03 100644
--- a/files/usr/lib/systemd/user/firstboot-setup.service
+++ b/files/usr/lib/systemd/user/firstboot-setup.service
@@ -1,8 +1,5 @@
 [Unit]
 Description=First Boot Wizard
-After=graphical-session.target cosmic-session.target
-Wants=graphical-session.target cosmic-session.target
-ConditionPathExists=%h/.config/cosmic-initial-setup-done
 ConditionPathExists=%h/.config/firstboot/run
 
 [Service]
@@ -10,5 +7,4 @@ Type=simple
 ExecStart=%h/.config/firstboot/firstboot-setup.sh
 
 [Install]
-WantedBy=graphical-session.target
-
+WantedBy=default.target