diff --git a/application/service/harbour-batterybuddy.service b/application/service/harbour-batterybuddy.service
index 849c8a3..cdb6f21 100644
--- a/application/service/harbour-batterybuddy.service
+++ b/application/service/harbour-batterybuddy.service
@@ -16,9 +16,10 @@
 
 [Unit]
 Description=Battery Buddy background daemon
+After=pre-user-session.target
 
 [Service]
 ExecStart=/usr/bin/harbour-batterybuddy-daemon
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=user-session.target