diff --git a/tasks/main.yml b/tasks/main.yml
index 31521e6..f45af00 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -6,3 +6,4 @@
 - include_tasks: nginx.yml
 - include_tasks: samba.yml
 - include_tasks: vpn.yml
+  when: torrent_server.openvpn is defined
diff --git a/tasks/vpn.yml b/tasks/vpn.yml
index fa1dec7..37ba9f1 100644
--- a/tasks/vpn.yml
+++ b/tasks/vpn.yml
@@ -8,7 +8,7 @@
   copy:
     src: vpn/
     dest: /etc/openvpn/client/
-    mode: 0644
+    mode: 0600
     owner: root
     group: root
   notify: Restart openvpn
@@ -16,7 +16,7 @@
 - name: Ensure the passfile is present
   template:
     src: passfile.j2
-    dest: /etc/openvpn/client/passfile
+    dest: /etc/openvpn/client/login.txt
     mode: 0600
     owner: root
     group: root