diff --git a/roles/matrix-jitsi/tasks/validate_config.yml b/roles/matrix-jitsi/tasks/validate_config.yml
index 37b10cb4e..5452768a4 100644
--- a/roles/matrix-jitsi/tasks/validate_config.yml
+++ b/roles/matrix-jitsi/tasks/validate_config.yml
@@ -20,25 +20,19 @@
     - "matrix_jitsi_jvb_auth_password"
 
 
-- name: Fail if Jitsi internal authentication settings not defined
+- name: Fail if a Jitsi internal authentication account is not defined
   fail:
     msg: >-
-      You must define the (`{{ item.username }}`) and (`{{ item.password }}`) configuration settings to properly configure an account using Jitsi's internal authentication.
+      Each Jitsi user in `matrix_jitsi_prosody_auth_internal_accounts` needs to have a non-empty `username`/`password`.
 
       Please ensure you have defined at least one user and password when using internal authentication.
       
       If you're setting up Jitsi for the first time, you may have missed a step.
       Refer to our setup instructions (docs/configuring-playbook-jitsi.md).
-
-      If you had previously setup Jitsi successfully and are only now facing this error,
-      it means that your installation is most likely using default passwords previously defined by the playbook.
-      These defaults are insecure. Jitsi should be rebuilt with secure values.
-      Refer to the "Rebuilding your Jitsi installation" section in our setup instructions (docs/configuring-playbook-jitsi.md).
   when:
     - matrix_jitsi_enable_auth|bool
     - matrix_jitsi_auth_type == 'internal'
-    - matrix_jitsi_prosody_auth_internal_accounts|length == '0'
-  with_items: "{{ matrix_jitsi_prosody_auth_internal_accounts }}"
+    - matrix_jitsi_prosody_auth_internal_accounts == ''
 
 
 - name: (Deprecation) Catch and report renamed settings