diff --git a/roles/kalite/tasks/enable.yml b/roles/kalite/tasks/enable.yml
index 7a95aabeb..f749bf6c6 100644
--- a/roles/kalite/tasks/enable.yml
+++ b/roles/kalite/tasks/enable.yml
@@ -1,31 +1,39 @@
 # By the time we get here we should have ka-lite of some version
 # And the systemd unit files should be defined
 
-- name: Enable 'kalite-serve' service
-  service:
+- name: Enable & (re)start 'kalite-serve' service
+  systemd:
+    daemon_reload: yes
     name: kalite-serve
     enabled: yes
-    state: started
+    state: restarted
+  when: kalite_enabled
 
-- name: Disable 'kalite-serve' service
-  service:
+- name: Disable & stop 'kalite-serve' service
+  systemd:
     name: kalite-serve
     enabled: no
     state: stopped
   when: not kalite_enabled
 
-# Since Fedora 18 we don't have a separate unit file for kalite-cron
+# 2019-10-20: Below is for Fedora 18 (XO laptops) only.
+# Since F18 we don't have a separate unit file for kalite-cron.
+#
+# SEE --skip-job-scheduler @ https://ka-lite.readthedocs.io/en/latest/usermanual/cli.html
+# ...as implemented in templates/kalite-serve.service.j2
+# ...if not kalite_cron_enabled
+# ...using {{ job_scheduler_stanza }} from kalite/tasks/install.yml
 
-- name: Disable kalite cron server F18
+- name: Enable & (re)start 'kalite-cron' service (F18)
+  service:
+    name: kalite-cron
+    enabled: yes
+    state: restarted
+  when: kalite_cron_enabled and is_F18
+
+- name: Disable & stop 'kalite-cron' service (F18)
   service:
     name: kalite-cron
     enabled: no
     state: stopped
   when: not kalite_cron_enabled and is_F18
-
-- name: Enable kalite cron server F18
-  service:
-    name: kalite-cron
-    enabled: yes
-    state: started
-  when: kalite_cron_enabled and is_F18