diff --git a/roles/wordpress/tasks/main.yml b/roles/wordpress/tasks/main.yml
index 0e1555e01..54dc356cc 100644
--- a/roles/wordpress/tasks/main.yml
+++ b/roles/wordpress/tasks/main.yml
@@ -1,8 +1,8 @@
 # SEE "emergency" REINSTALL INSTRUCTIONS IN roles/wordpress/tasks/install.yml
 
-- name: Provision MySql DB for WordPress
+- name: Provision MySQL DB for WordPress
   include_tasks: setup.yml
-  when: wordpress_install | bool and not installing | bool
+  when: wordpress_install and not installing
 
 - name: Install WordPress if wordpress_installed is absent
   include_tasks: install.yml
diff --git a/roles/wordpress/tasks/setup.yml b/roles/wordpress/tasks/setup.yml
index 1f0c8a5a9..e9dd88e00 100644
--- a/roles/wordpress/tasks/setup.yml
+++ b/roles/wordpress/tasks/setup.yml
@@ -3,12 +3,12 @@
     state: started
     name: "{{ mysql_service }}"
 
-- name: 'Create MySQL wordpress database: {{ wp_db_name }}'
+- name: 'Create MySQL database for WordPress: {{ wp_db_name }}'
   mysql_db:
     name: "{{ wp_db_name }}"
     state: present
 
-- name: Create MySQL wordpress database user
+- name: Create MySQL username ({{ wp_db_user }}) with password, for WordPress database
   mysql_user:
     name: "{{ wp_db_user }}"
     password: "{{ wp_db_user_password }}"