diff --git a/roles/lokole/defaults/main.yml b/roles/lokole/defaults/main.yml
index 8c82c3952..7b5f405cc 100644
--- a/roles/lokole/defaults/main.yml
+++ b/roles/lokole/defaults/main.yml
@@ -1,25 +1,20 @@
+---
+# Information needed to install Lokole
 lokole_version: "0.1.24"
+lokole_install_path: "{{ content_base }}/lokole"
+lokole_venv: "{{ lokole_install_path }}/venv"
+
+# Information needed to run Lokole
+lokole_user: lokole
+lokole_run_directory: /home/{{ lokole_user }}/state
 
 lokole_db_name: iiab_lokole
 lokole_db_user: iiab_lokole_user
 lokole_db_user_password: changeme
 
-lokole_admin_user: Admin
-lokole_admin_user_password: changeme
-
-lokole_site_name: Community Wiki
-
 lokole_install: True
 lokole_enabled: True
 
-lokole_install_path: "{{ content_base }}"
-lokole_abs_path: "{{ lokole_install_path }}/lokole"
-
-lokole_venv: "{{ lokole_abs_path }}/venv"
-
-# TODO decide what directory to make this
-lokole_run_directory: "{{ lokole_abs_path }}"
-
 lokole_url: /lokole
 lokole_full_url: "http://{{ iiab_hostname }}.{{ iiab_domain }}/{{ lokole_url }}"
 
@@ -32,6 +27,6 @@ lokole_full_url: "http://{{ iiab_hostname }}.{{ iiab_domain }}/{{ lokole_url }}"
 #opwen_server_inbox_host: 'api.mailserver.inbox.lokole.ca'
 opwen_server_locale: '{{ default_language }}'
 opwen_server_timezone: '{{ local_tz }}'
-opwen_user: "${USER}"
-opwen_device: "${HOSTNAME}"
+# opwen_user: lokole                                       # superseded by lokole_user
+# opwen_device: "{{ iiab_hostname }}"                      # just use iiab_hostname
 opwen_port: "${LOKOLE_PORT:-80}" # probably unnecessary