diff --git a/defaults/main.yml b/defaults/main.yml
index 3ecbf92..69f6705 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -81,7 +81,7 @@ guacamole_server_package: "{{ 'guacamole-server-' + guacamole_version + '.tar.gz
 
 guacamole_server_port: 4822
 
-#guacamole_basic_user_mapping: /etc/guacamole/user-mapping.xml
+guacamole_basic_user_mapping: /etc/guacamole/user-mapping.xml
 
 guacamole_src_dir: /usr/local/src
 
diff --git a/tasks/config.yml b/tasks/config.yml
index a3197e9..402f43d 100644
--- a/tasks/config.yml
+++ b/tasks/config.yml
@@ -37,7 +37,7 @@
     - "restart {{ guacamole_tomcat_service }}"
     - kill guacd
     - restart guacd
-  when: not guacamole_mysql_auth and not guacamole_postgresql_auth
+  when: guacamole_users is defined and guacamole_users | list | length >= 1
 
 - name: config | Downloading Auth JDBC Library
   ansible.builtin.unarchive: