diff --git a/roles/vpn/tasks/main.yml b/roles/vpn/tasks/main.yml
index 9aec604..567614c 100644
--- a/roles/vpn/tasks/main.yml
+++ b/roles/vpn/tasks/main.yml
@@ -12,7 +12,7 @@
   register: CA_password
 
 - set_fact:
-    easyrsa_p12_export_password: "{{ (ansible_date_time.iso8601_basic|sha1|to_uuid).split('-')[0] }}"
+    easyrsa_p12_export_password: "{{ p12_export_password|default((ansible_date_time.iso8601_basic|sha1|to_uuid).split('-')[0]) }}"
     easyrsa_CA_password: "{{ CA_password.stdout }}"
     IP_subject_alt_name: "{{ IP_subject_alt_name }}"
 
diff --git a/users.yml b/users.yml
index 48d6d0e..105c9be 100644
--- a/users.yml
+++ b/users.yml
@@ -38,7 +38,7 @@
   pre_tasks:
     - set_fact:
         IP_subject_alt_name: "{{ IP_subject }}"
-        easyrsa_p12_export_password: "{{ (ansible_date_time.iso8601_basic|sha1|to_uuid).split('-')[0] }}"
+        easyrsa_p12_export_password: "{{ p12_export_password|default((ansible_date_time.iso8601_basic|sha1|to_uuid).split('-')[0]) }}"
 
   roles:
     - { role: ssh_tunneling, tags: [ 'ssh_tunneling' ], when: ssh_tunneling_enabled is defined and ssh_tunneling_enabled == "y" }