diff --git a/roles/kolibri/defaults/main.yml b/roles/kolibri/defaults/main.yml
index 28b9916a2..10c9083b7 100644
--- a/roles/kolibri/defaults/main.yml
+++ b/roles/kolibri/defaults/main.yml
@@ -1,6 +1,9 @@
 # kolibri_install: False
 # kolibri_enabled: False
 
+# Kolibri language (ar,bn-bd,en,es-es,fa,fr-fr,hi-in,mr,nyn,pt-br,sw-tz,ta,te,ur-pk,yo,zu)
+# kolibri_language: en
+
 # kolibri_http_port: 8009
 
 # All above are set in: github.com/iiab/iiab/blob/master/vars/default_vars.yml
@@ -23,27 +26,21 @@ kolibri_url_without_slash: /kolibri
 kolibri_url: "{{ kolibri_url_without_slash }}/"    # /kolibri/
 
 kolibri_exec_path: /usr/bin/kolibri
-#kolibri_venv_path: /usr/local/kolibri    # For /usr/local/kolibri/bin/kolibri
-# 2018-07-16: IIAB recommends /usr/bin but @arky says this isn't yet possible, due to pip
-#kolibri_exec_path: "{{ kolibri_venv_path }}/bin/kolibri"
 
-# Kolibri system user
-kolibri_user: kolibri    # CONSIDER OVERRIDING THIS TO 'pi' ON THE 'RASPBIAN WITH DESKTOP' OS, PER:
+kolibri_user: kolibri    # Whereas a vanilla install of Kolibri auto-identifies
+# and saves a 'desktop' user like {iiab-admin, pi} to /etc/kolibri/username,
+# towards guaranteeing access to USB devices, per:
 # https://kolibri.readthedocs.io/en/latest/install.html#changing-the-owner-of-kolibri-system-service
 
-# Kolibri setup will be provisioned with default administration account, preset and
-# language. You could turn this to 'False' while reinstalling kolibri.
+# To populate /library/kolibri with essential/minimum files and dirs.  This
+# provisions Kolibri with facility name, admin acnt / password, preset type,
+# and language.  You can set this to 'False' when reinstalling Kolibri:
 kolibri_provision: True
 
-# Kolibri Facility name
 kolibri_facility: Kolibri-in-a-Box
 
+kolibri_admin_user: Admin
+kolibri_admin_password: changeme
+
 # Kolibri Preset type: formal, nonformal, informal
 kolibri_preset: formal
-
-# Kolibri default language (ar,bn-bd,en,es-es,fa,fr-fr,hi-in,mr,nyn,pt-br,sw-tz,ta,te,ur-pk,yo,zu)
-kolibri_language: en
-
-# Kolibri admin account
-kolibri_admin_user: Admin
-kolibri_admin_password: changeme