diff --git a/backupninja/server.sls b/backupninja/server.sls
index ed37afe..6a7783a 100644
--- a/backupninja/server.sls
+++ b/backupninja/server.sls
@@ -21,7 +21,9 @@
     - user: backupninja_user
     - pkg: backupninja_server_packages
 
-{%- for key in server.keys %}
+{%- for key_name, key in server.key.iteritems() %}
+
+{%- if key.get('enabled', False) %}
 
 backupninja_key_{{ key.key }}:
   ssh_auth.present:
@@ -30,6 +32,8 @@
   - require:
     - file: /srv/backupninja
 
+{%- endif %}
+
 {%- endfor %}
 
 {%- for node_name, node_grains in salt['mine.get']('*', 'grains.items').iteritems() %}