diff --git a/config.cfg b/config.cfg
index 18654b6..869c53c 100644
--- a/config.cfg
+++ b/config.cfg
@@ -53,7 +53,7 @@ congrats:
     "#        and ensure that all your traffic passes through the VPN.      #"
     "#               Local DNS resolver {{ local_service_ip }}              #"
   p12_pass: |
-    "#                The p12 and SSH keys password is {{ easyrsa_p12_export_password }}             #"
+    "#                The p12 and SSH keys password for new users is {{ easyrsa_p12_export_password }}             #"
   ca_key_pass: |
     "#                  The CA key password is {{ easyrsa_CA_password }}                 #"
   ssh_access: |
diff --git a/roles/vpn/tasks/client_configs.yml b/roles/vpn/tasks/client_configs.yml
index ac92f82..ea1621a 100644
--- a/roles/vpn/tasks/client_configs.yml
+++ b/roles/vpn/tasks/client_configs.yml
@@ -3,7 +3,6 @@
 - name: Register p12 PayloadContent
   shell: cat private/{{ item }}.p12 | base64
   register:  PayloadContent
-  become: no
   args:
     chdir: "configs/{{ IP_subject_alt_name }}/pki/"
   with_items: "{{ users }}"
@@ -18,7 +17,6 @@
     src: mobileconfig.j2
     dest: configs/{{ IP_subject_alt_name }}/{{ item.0 }}.mobileconfig
     mode: 0600
-  become: no
   with_together:
     - "{{ users }}"
     - "{{ PayloadContent.results }}"
@@ -29,7 +27,6 @@
     src: sswan.j2
     dest: configs/{{ IP_subject_alt_name }}/android_{{ item.0 }}.sswan
     mode: 0600
-  become: no
   with_together:
     - "{{ users }}"
     - "{{ PayloadContent.results }}"
@@ -40,7 +37,6 @@
     src: android_html_helper.j2
     dest: configs/{{ IP_subject_alt_name }}/android_{{ item.0 }}_helper.html
     mode: 0600
-  become: no
   with_together:
     - "{{ users }}"
   no_log: True
@@ -50,7 +46,6 @@
     src: client_ipsec.conf.j2
     dest: configs/{{ IP_subject_alt_name }}/ipsec_{{ item }}.conf
     mode: 0600
-  become: no
   with_items:
     - "{{ users }}"
 
@@ -59,17 +54,26 @@
     src: client_ipsec.secrets.j2
     dest: configs/{{ IP_subject_alt_name }}/ipsec_{{ item }}.secrets
     mode: 0600
-  become: no
   with_items:
     - "{{ users }}"
 
+- name: Create the windows check file
+  file:
+    state: touch
+    path: configs/{{ IP_subject_alt_name }}/.supports_windows
+  when: Win10_Enabled is defined and Win10_Enabled == "Y"
+
+- name: Check if the windows check file exists
+  stat:
+    path: configs/{{ IP_subject_alt_name }}/.supports_windows
+  register: supports_windows
+
 - name: Build the windows client powershell script
   template:
     src: client_windows.ps1.j2
     dest: configs/{{ IP_subject_alt_name }}/windows_{{ item }}.ps1
     mode: 0600
-  become: no
-  when: Win10_Enabled is defined and Win10_Enabled == "Y"
+  when: Win10_Enabled is defined and Win10_Enabled == "Y" or supports_windows.stat.exists == true
   with_items: "{{ users }}"
 
 - name: Restrict permissions for the local private directories
@@ -77,6 +81,5 @@
     path: "{{ item }}"
     state: directory
     mode: 0700
-  become: no
   with_items:
     - configs/{{ IP_subject_alt_name }}
diff --git a/roles/vpn/tasks/main.yml b/roles/vpn/tasks/main.yml
index 33b70de..7fab8bb 100644
--- a/roles/vpn/tasks/main.yml
+++ b/roles/vpn/tasks/main.yml
@@ -25,6 +25,7 @@
     - include: distribute_keys.yml
     - include: client_configs.yml
       delegate_to: localhost
+      become: no
       tags: update-users
 
     - meta: flush_handlers
diff --git a/roles/vpn/tasks/openssl.yml b/roles/vpn/tasks/openssl.yml
index 313a133..ed2b999 100644
--- a/roles/vpn/tasks/openssl.yml
+++ b/roles/vpn/tasks/openssl.yml
@@ -122,7 +122,6 @@
       -passout pass:"{{ easyrsa_p12_export_password }}"
     args:
       chdir: "configs/{{ IP_subject_alt_name }}/pki/"
-      creates: private/{{ item }}.p12
     with_items: "{{ users }}"
     register: p12