diff --git a/tasks/main.yml b/tasks/main.yml
index 60dfaa3..142940a 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -10,6 +10,7 @@
      src: 'ssh-agentd.service'
      dest: '{{ ansible_user_dir }}/.config/systemd/user/'
      mode: 0640
+  register: service_file
 
 - name: Copy ssh-agent env file
   ansible.builtin.copy:
@@ -17,13 +18,15 @@
      dest: '{{ ansible_user_dir }}/.config/environment.d/'
      mode: 0640
 
-- name: Activate service
-  ansible.builtin.systemd:
-     name: 'ssh-agentd'
-     scope: user
-     daemon-reload: true
-     state: stopped
-     enabled: true
-  environment:
-    XDG_RUNTIME_DIR: "/run/user/{{ ansible_user_uid }}"
+- block:
+  - name: Reload Systemd user daemon
+    ansible.builtin.systemd:
+       scope: user
+       daemon-reload: true
 
+  - name: Activate SSH agend service
+    ansible.builtin.systemd:
+       name: 'ssh-agentd'
+       scope: user
+       state: started
+  when: service_file is changed