diff --git a/defaults/main.yml b/defaults/main.yml
index 11f6895..e90e46c 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -61,7 +61,7 @@ roundcube_dependencies:
 roundcube_carddav_version: 4.4.2
 
 # Installer
-roundcube_installer_delete: true
+roundcube_enable_installer: false
 
 # Apache
 roundcube_apache: true
diff --git a/tasks/main.yml b/tasks/main.yml
index f5d2044..0f2baaf 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -50,7 +50,7 @@
 
 - name: Check if roundcube directory exists
   stat:
-    path: "{{ roundcube_user_home }}/roundcubemail-{{ roundcube_version }}"
+    path: "{{ roundcube_working_dir }}/roundcubemail-{{ roundcube_version }}"
   register: "roundcube_directory"
 
 - name: Get roundcube release
@@ -162,4 +162,4 @@
   file:
     path: "{{ roundcube_working_dir }}/current/installer"
     state: absent
-  when: roundcube_installer_delete | bool
+  when: ( not roundcube_enable_installer | bool )
diff --git a/templates/config/config.inc.php.j2 b/templates/config/config.inc.php.j2
index 7a5710f..900db20 100644
--- a/templates/config/config.inc.php.j2
+++ b/templates/config/config.inc.php.j2
@@ -31,12 +31,20 @@ $config['db_dsnw'] = 'mysql://{{ roundcube_mysql_user }}:{{ roundcube_mysql_pass
 // See defaults.inc.php for the option description.
 $config['imap_host'] = '{{ roundcube_imap_host }}';
 
+// ----------------------------------
+// LOGGING/DEBUGGING
+// ----------------------------------
+
 // log driver:  'syslog', 'stdout' or 'file'.
 $config['log_driver'] = 'syslog';
 
 // Syslog ident string to use, if using the 'syslog' log driver.
 $config['syslog_id'] = 'roundcube';
 
+// ----------------------------------
+// SMTP
+// ----------------------------------
+
 // SMTP server host (and optional port number) for sending mails.
 // See defaults.inc.php for the option description.
 $config['smtp_host'] = '{{ roundcube_smtp_host }}';
@@ -49,6 +57,16 @@ $config['smtp_user'] = '{{ roundcube_smtp_user }}';
 // will use the current user's password for login
 $config['smtp_pass'] = '{{ roundcube_smtp_pass }}';
 
+// ----------------------------------
+// SYSTEM
+// ----------------------------------
+
+{% if roundcube_enable_installer | bool %}
+// THIS OPTION WILL ALLOW THE INSTALLER TO RUN AND CAN EXPOSE SENSITIVE CONFIG DATA.
+// ONLY ENABLE IT IF YOU'RE REALLY SURE WHAT YOU'RE DOING!
+$config['enable_installer'] = {{ (roundcube_enable_installer) | bool | string | lower }};
+{% endif %}
+
 // don't allow these settings to be overridden by the user
 // (disable skin selection)
 $config['dont_override'] = ['skin'];