diff --git a/roles/rabbit/queue/tasks/main.yml b/roles/rabbit/queue/tasks/main.yml
index 5ba2e05c43..b20b63ec30 100644
--- a/roles/rabbit/queue/tasks/main.yml
+++ b/roles/rabbit/queue/tasks/main.yml
@@ -21,7 +21,7 @@
 #                        The values are numbers. Generate an alert in Nagios if
 #                        the number of messages go above these values.
 
-- name: Validate parameters
+- name: Validate queue name {{ queue_name }}
   assert:
     that:
     - "queue_name.startswith(username)"
diff --git a/roles/rabbit/user/tasks/main.yml b/roles/rabbit/user/tasks/main.yml
index dd9059368e..22a234862a 100644
--- a/roles/rabbit/user/tasks/main.yml
+++ b/roles/rabbit/user/tasks/main.yml
@@ -12,7 +12,7 @@
 # See https://www.rabbitmq.com/access-control.html#permissions for details on
 # the RabbitMQ permissions configuration.
 
-- name: Validate parameters
+- name: Validate username {{ username }}
   assert:
     that:
     - username != "admin"
@@ -25,7 +25,7 @@
     - rabbitmq_cluster
 
 - debug:
-    msg: "Topic permissions: {{ topic_permissions|default([]) }}"
+    msg: "Topic permissions: {{ topic_permissions }}"
   tags:
     - config
     - fedora-messaging
@@ -33,7 +33,7 @@
 
 # See https://www.rabbitmq.com/access-control.html#permissions for details on
 # the RabbitMQ permissions configuration.
-- name: Create the user in RabbitMQ
+- name: Create the {{ username }} user in RabbitMQ
   delegate_to: "{{ rabbitmq_server }}"
   community.rabbitmq.rabbitmq_user:
     user: "{{ username }}"