diff --git a/roles/wazuh/wazuh-indexer/tasks/main.yml b/roles/wazuh/wazuh-indexer/tasks/main.yml
index 48034ae6..291f606b 100644
--- a/roles/wazuh/wazuh-indexer/tasks/main.yml
+++ b/roles/wazuh/wazuh-indexer/tasks/main.yml
@@ -108,7 +108,7 @@
       delay: 5
       tags: debug
       when:
-        - hostvars[inventory_hostname]['private_ip'] is not defined or not hostvars[inventory_hostname]['private_ip']
+        - hostvars[inventory_hostname]['private_ip'] is not defined or (hostvars[inventory_hostname]['private_ip'] | string | length) == 0
 
     - name: Wait for Wazuh indexer API (Private IP)
       uri:
@@ -127,7 +127,7 @@
       delay: 5
       tags: debug
       when:
-        - hostvars[inventory_hostname]['private_ip'] is defined and hostvars[inventory_hostname]['private_ip']
+        - hostvars[inventory_hostname]['private_ip'] is defined and (hostvars[inventory_hostname]['private_ip'] | string | length) > 0
 
     - import_tasks: "RMRedHat.yml"
       when: ansible_os_family == "RedHat"
diff --git a/roles/wazuh/wazuh-indexer/tasks/security_actions.yml b/roles/wazuh/wazuh-indexer/tasks/security_actions.yml
index 6df4de92..28c88c38 100644
--- a/roles/wazuh/wazuh-indexer/tasks/security_actions.yml
+++ b/roles/wazuh/wazuh-indexer/tasks/security_actions.yml
@@ -114,5 +114,6 @@
   register: result
   until: result.status in [200,201,401]
   when:
-    - indexer_custom_user is defined and indexer_custom_user
+    - indexer_create_custom_user | default(false) | bool
+    - indexer_custom_user | default('') | trim | length > 0
     - inventory_hostname == ansible_play_hosts[0]