diff --git a/ansible/roles/win_initial/tasks/initial.yml b/ansible/roles/win_initial/tasks/initial.yml
index 9a66b4a..73d88dc 100644
--- a/ansible/roles/win_initial/tasks/initial.yml
+++ b/ansible/roles/win_initial/tasks/initial.yml
@@ -9,22 +9,17 @@
       set_fact:
         ansible_password: "{{ vm_initial_password }}"
       run_once: true
-      when: password_status == 'pending' 
+      when: password_status == 'pending'or
+            password_status == 'change'
 
     - name: Check for finished or change password status
       set_fact:
         ansible_password: "{{ vm_password }}"
       run_once: true
-      when: password_status == 'finished' or
-            password_status == 'change'
+      when: password_status == 'finished' 
     
     - name: Test password
       win_ping:
-      tags: initial_ping
-
-- name: Ping Windows hosts
-  win_ping:
-  tags: initial_ping
 
 - name: Set WinRM to delayed startup
   ansible.windows.win_service: