diff --git a/xtrabackup/client.sls b/xtrabackup/client.sls
index fff7cc8..cc7f492 100644
--- a/xtrabackup/client.sls
+++ b/xtrabackup/client.sls
@@ -28,13 +28,12 @@
   - group: root
   - makedirs: true
 
+{%- if client.cron %}
+
 xtrabackup_client_runner_cron:
   cron.present:
   - name: /usr/local/bin/innobackupex-runner.sh
   - user: root
-{%- if not client.cron %}
-  - commented: True
-{%- endif %}
 {%- if client.backup_times is defined %}
 {%- if client.backup_times.dayOfWeek is defined %}
   - dayweek: {{ client.backup_times.dayOfWeek }}
@@ -63,6 +62,15 @@
   - require:
     - file: xtrabackup_client_runner_script
 
+{%- else %}
+
+xtrabackup_client_runner_cron:
+  cron.absent:
+  - name: /usr/local/bin/innobackupex-runner.sh
+  - user: root
+
+{%- endif %}
+
 {%- if client.restore_full_latest is defined %}
 
 xtrabackup_client_restore_script:
diff --git a/xtrabackup/server.sls b/xtrabackup/server.sls
index 487e5b9..988b2b4 100644
--- a/xtrabackup/server.sls
+++ b/xtrabackup/server.sls
@@ -73,6 +73,13 @@
     - file: {{ server.backup_dir }}/full
     - file: {{ server.backup_dir }}/incr
 
+{%- else %}
+
+xtrabackup_key_{{ key.key }}:
+  ssh_auth.absent:
+  - user: xtrabackup
+  - name: {{ key.key }}
+
 {%- endif %}
 
 {%- endfor %}
@@ -86,18 +93,26 @@
   - require:
     - pkg: xtrabackup_server_packages
 
+{%- if server.cron %}
+
 xtrabackup_server_cron:
   cron.present:
   - name: /usr/local/bin/innobackupex-runner.sh
   - user: xtrabackup
-{%- if not server.cron %}
-  - commented: True
-{%- endif %}
   - minute: 0
   - hour: 2
   - require:
     - file: xtrabackup_server_script
 
+{%- else %}
+
+xtrabackup_server_cron:
+  cron.absent:
+  - name: /usr/local/bin/innobackupex-runner.sh
+  - user: xtrabackup
+
+{%- endif %}
+
 xtrabackup_server_call_restore_script:
   file.managed:
   - name: /usr/local/bin/innobackupex-restore-call.sh