diff --git a/roles/kalite/tasks/enable.yml b/roles/kalite/tasks/enable.yml
index f749bf6c6..d0416aa24 100644
--- a/roles/kalite/tasks/enable.yml
+++ b/roles/kalite/tasks/enable.yml
@@ -37,3 +37,28 @@
     enabled: no
     state: stopped
   when: not kalite_cron_enabled and is_F18
+
+- name: Add 'kalite_installed' variable values to {{ iiab_installed }}
+  ini_file:
+    path: "{{ iiab_installed }}"
+    value: kalite_installed
+
+- name: Add 'kalite' variable values to {{ iiab_ini_file }}
+  ini_file:
+    path: "{{ iiab_ini_file }}"
+    section: kalite
+    option: "{{ item.option }}"
+    value: "{{ item.value }}"
+  with_items:
+  - option: name
+    value: "KA Lite"
+  - option: description
+    value: '"KA Lite downloads Khan Academy videos for offline use, with exercises and accounts if students want to track their own progress."'
+  - option: path
+    value: "{{ kalite_root }}"
+  - option: port
+    value: "{{ kalite_server_port }}"
+  - option: kalite_enabled
+    value: "{{ kalite_enabled }}"
+  - option: cron_enabled
+    value: "{{ kalite_cron_enabled }}"
diff --git a/roles/kalite/tasks/main.yml b/roles/kalite/tasks/main.yml
index 2656d3790..a8332c117 100644
--- a/roles/kalite/tasks/main.yml
+++ b/roles/kalite/tasks/main.yml
@@ -15,43 +15,24 @@
 - name: Does KA Lite database {{ kalite_db_name }} exist?    # See if KA Lite is already configured
   stat:
     path: "{{ kalite_db_name }}"
-  register: kalite_installed
+  register: test_kalite_installed
 
 - include_tasks: install-f18.yml
-  when: not kalite_installed.stat.exists and is_F18
+  when: not test_kalite_installed.stat.exists and is_F18 and kalite_install
 
 - include_tasks: install.yml
-  when: kalite_installed is defined and not kalite_installed.stat.exists and not is_F18
+  when: test_kalite_installed is defined and not test_kalite_installed.stat.exists and not is_F18 and kalite_install
 
 - name: Ask systemd to reread unit files (daemon-reload)
   systemd:
     daemon_reload: yes
-  when: not kalite_installed.stat.exists
+  when: not test_kalite_installed.stat.exists
 
 - include_tasks: setup-f18.yml
-  when: not kalite_installed.stat.exists and is_F18
+  when: not test_kalite_installed.stat.exists and is_F18
 
 - include_tasks: setup.yml
-  when: not kalite_installed.stat.exists and not is_F18
+  when: not test_kalite_installed.stat.exists and not is_F18
 
 - include_tasks: enable.yml
-
-- name: Add 'kalite' variable values to {{ iiab_ini_file }}
-  ini_file:
-    path: "{{ iiab_ini_file }}"
-    section: kalite
-    option: "{{ item.option }}"
-    value: "{{ item.value }}"
-  with_items:
-    - option: name
-      value: "KA Lite"
-    - option: description
-      value: '"KA Lite downloads Khan Academy videos for offline use, with exercises and accounts if students want to track their own progress."'
-    - option: kalite_root
-      value: "{{ kalite_root }}"
-    - option: kalite_server_port
-      value: "{{ kalite_server_port }}"
-    - option: kalite_enabled
-      value: "{{ kalite_enabled }}"
-    - option: kalite_cron_enabled
-      value: "{{ kalite_cron_enabled }}"
+  when: kalite_install or kalite_installed is defined
diff --git a/roles/kalite/tasks/setup.yml b/roles/kalite/tasks/setup.yml
index d0f6404e1..e1bb54af3 100644
--- a/roles/kalite/tasks/setup.yml
+++ b/roles/kalite/tasks/setup.yml
@@ -14,3 +14,8 @@
     KALITE_HOME: "{{ kalite_root }}"    # /library/ka-lite
   async: 1800
   poll: 10
+
+- name: Add 'kalite_installed' variable values to {{ iiab_installed }}
+  ini_file:
+    path: "{{ iiab_installed }}"
+    value: kalite_installed