diff --git a/roles/wordpress/tasks/main.yml b/roles/wordpress/tasks/main.yml
index c36d6848b..89029c7a7 100644
--- a/roles/wordpress/tasks/main.yml
+++ b/roles/wordpress/tasks/main.yml
@@ -1,14 +1,38 @@
 # SEE "emergency" REINSTALL INSTRUCTIONS IN roles/wordpress/tasks/install.yml
 
-- name: Provision MySQL DB for WordPress
+- name: Provision MySQL DB for WordPress, if 'wordpress_installed' is not defined in {{ iiab_state_file }}    # /etc/iiab/iiab_state.yml
   include_tasks: setup.yml
-  when: wordpress_install and not installing
+  when: wordpress_installed is undefined    # and not installing
 
-- name: Install WordPress if wordpress_installed is absent
+- name: Install WordPress if 'wordpress_installed' is not defined in {{ iiab_state_file }}    # /etc/iiab/iiab_state.yml
   include_tasks: install.yml
-  when: wordpress_install and not wordpress_installed is defined
+  when: wordpress_installed is undefined
 
-- name: Enable WordPress
-  include_tasks: enable.yml
-  when: wordpress_install or wordpress_installed is defined
-  # when: wordpress_enabled | bool
+- name: Enable or Disable WordPress
+  include_tasks: enable-or-disable.yml
+
+- name: Add 'wordpress' variable values to {{ iiab_ini_file }}
+  ini_file:
+    path: "{{ iiab_ini_file }}"
+    section: wordpress
+    option: "{{ item.option }}"
+    value: "{{ item.value | string }}"
+  with_items:
+    - option: name
+      value: WordPress
+    - option: description
+      value: '"WordPress is a blog and web site management application."'
+    - option: wordpress_src
+      value: "{{ wordpress_src }}"
+    - option: wp_abs_path
+      value: "{{ wp_abs_path }}"
+    - option: wp_db_name
+      value: "{{ wp_db_name }}"
+    - option: wp_db_user
+      value: "{{ wp_db_user }}"
+    - option: wp_url
+      value: "{{ wp_url }}"
+    - option: wp_full_url
+      value: "{{ wp_full_url }}"
+    - option: wordpress_enabled
+      value: "{{ wordpress_enabled }}"