diff --git a/roles/moodle/tasks/main.yml b/roles/moodle/tasks/main.yml
index b0ac4028b..701dc3210 100644
--- a/roles/moodle/tasks/main.yml
+++ b/roles/moodle/tasks/main.yml
@@ -24,14 +24,10 @@
   when: moodle_installed is undefined
 
 
-- name: "Set 'postgresql_install: True'"
+- name: "Set 'postgresql_install: True' and 'postgresql_enabled: True'"
   set_fact:
     postgresql_install: True
-
-- name: "Set 'postgresql_enabled: True' if moodle_enabled"
-  set_fact:
-    postgresql_enabled: True
-  when: moodle_enabled
+    postgresql_enabled: True    # Revert just below if...
 
 - name: "Set 'postgresql_enabled: False' if 'not moodle_enabled and not (pathagar_enabled is defined and pathagar_enabled)'"
   set_fact:
@@ -43,14 +39,11 @@
     name: postgresql
 
 
-#- name: Enable/Disable/Restart Apache if primary
 - name: SHIM FOR NOW SO ALWAYS DO THE...Enable/Disable/Restart Apache
   include_tasks: apache.yml
-  #when: not nginx_enabled
 
-- name: Enable/Disable/Restart NGINX if primary
+- name: Enable/Disable/Restart NGINX
   include_tasks: nginx.yml
-  when: nginx_enabled
 
 
 - name: Add 'moodle' variable values to {{ iiab_ini_file }}
@@ -64,7 +57,7 @@
       value: Moodle
     - option: description
       value: '"Access the Moodle learning management system."'
-    - option: "moodle_base"
+    - option: moodle_base
       value: "{{ moodle_base }}"
     - option: moodle_enabled
       value: "{{ moodle_enabled }}"