diff --git a/playbooks/roles/add_clients/defaults b/playbooks/roles/add_clients/defaults
new file mode 120000
index 0000000..e1ca9a6
--- /dev/null
+++ b/playbooks/roles/add_clients/defaults
@@ -0,0 +1 @@
+../openvpn/defaults
\ No newline at end of file
diff --git a/playbooks/roles/add_clients/tasks/main.yml b/playbooks/roles/add_clients/tasks/main.yml
index 8914c33..465b6d0 100644
--- a/playbooks/roles/add_clients/tasks/main.yml
+++ b/playbooks/roles/add_clients/tasks/main.yml
@@ -1,7 +1,4 @@
 ---
-- name: OpenVPN | Add Clients | Set variables
-  include_vars: ../../openvpn/defaults/main.yml
-
 - name: OpenVPN | Add Clients | Register the OpenVPN server common name
   command: cat {{ openvpn_server_common_name_file }}
   no_log: true
diff --git a/playbooks/roles/openvpn/tasks/harden_sshd.yml b/playbooks/roles/openvpn/tasks/harden_sshd.yml
index 05ccb7c..a54e42e 100644
--- a/playbooks/roles/openvpn/tasks/harden_sshd.yml
+++ b/playbooks/roles/openvpn/tasks/harden_sshd.yml
@@ -6,7 +6,7 @@
 
 - name: OpenVPN | Harden | Set allowed SSH users for test
   set_fact:
-    allowed_ssh_users: "{{ sudo_username }} {{ ansible_env.SUDO_USER }}"
+    allowed_ssh_users: "{{ sudo_username }} {{ ansible_env.SUDO_USER | default('') }}"
   when: ssh_on_vpn_only != true
   tags:
     - ci_test