diff --git a/playbooks/facts/main.yml b/playbooks/facts/main.yml
index a03e7810..c2d67590 100644
--- a/playbooks/facts/main.yml
+++ b/playbooks/facts/main.yml
@@ -24,6 +24,7 @@
     module: shell
       openssl rand -hex 16
   become: no
+  ignore_errors: yes
   register: CA_password
 
 - name: Generate p12 export password
diff --git a/roles/wireguard/templates/client.conf.j2 b/roles/wireguard/templates/client.conf.j2
index f75f0f43..6b412d3f 100644
--- a/roles/wireguard/templates/client.conf.j2
+++ b/roles/wireguard/templates/client.conf.j2
@@ -1,6 +1,6 @@
 [Interface]
-PrivateKey = {{ lookup('file', wireguard_config_path + '/private/' + item.1) }}
 Address = {{ wireguard_network_ipv4['clients_range'] }}.{{ wireguard_network_ipv4['clients_start'] + item.0 + 1 }}/32{% if ipv6_support %},{{ wireguard_network_ipv6['clients_range'] }}{{ wireguard_network_ipv6['clients_start'] + item.0 + 1 }}/{{ wireguard_network_ipv6['prefix'] }}
+PrivateKey = {{ lookup('file', wireguard_config_path + '/private/' + item.1) }}
 {% endif %}
 
 DNS = {{ wireguard_dns_servers }}