diff --git a/ksetup/tasks_end.yaml b/ksetup/tasks_end.yaml
index 6226fdc..dd37c5a 100755
--- a/ksetup/tasks_end.yaml
+++ b/ksetup/tasks_end.yaml
@@ -1,6 +1,6 @@
 # https://stackoverflow.com/questions/46515704/how-to-kill-a-running-process-using-ansible
 - name: Get running processes
-  shell: "ps -ef | grep -v grep | grep -w ^{{ orangepi }} | awk '{print $2}'"
+  shell: "ps -ef | grep -v grep | grep -w ^{{ delete_user_name }} | awk '{print $2}'"
   register: running_processes
   when: delete_user_name is defined and delete_user_name | length > 0
 
@@ -10,7 +10,7 @@
 - name: Kill running processes
   shell: "kill {{ item }}"
   with_items: "{{ running_processes.stdout_lines }}"
-  when: delete_user_name is defined and delete_user_name | length > 0
+  when: (delete_user_name is defined) and (delete_user_name | length > 0) and (running_processes | length > 0)
 
 - wait_for:
     path: "/proc/{{ item }}/status"
@@ -18,12 +18,12 @@
   with_items: "{{ running_processes.stdout_lines }}"
   ignore_errors: yes
   register: killed_processes
-  when: delete_user_name is defined and delete_user_name | length > 0
+  when: (delete_user_name is defined) and (delete_user_name | length > 0) and (running_processes | length > 0)
 
 - name: Force kill stuck processes
   shell: "kill -9 {{ item }}"
   with_items: "{{ killed_processes.results | select('failed') | map(attribute='item') | list }}"
-  when: delete_user_name is defined and delete_user_name | length > 0
+  when: (delete_user_name is defined) and (delete_user_name | length > 0) and (running_processes | length > 0)
 
 
 - name: Delete user
@@ -33,7 +33,6 @@
     state: absent
   when: delete_user_name is defined and delete_user_name | length > 0
 
-
 #reboot
 - name: reboot
   reboot: