diff --git a/nslcd/init.sls b/nslcd/init.sls
index be24fdc..f59049d 100644
--- a/nslcd/init.sls
+++ b/nslcd/init.sls
@@ -18,6 +18,7 @@ nslcd_conf:
 nslcd_service:
   service.running:
     - name: {{ nslcd.service_name }}
+    - enable: {{ nslcd.service_enable }}
     - watch:
       - pkg: nslcd_package
       - file: nslcd_conf
diff --git a/nslcd/map.jinja b/nslcd/map.jinja
index 866e051..610ba00 100644
--- a/nslcd/map.jinja
+++ b/nslcd/map.jinja
@@ -10,6 +10,8 @@ that differ from whats in defaults.yaml
 ##}
 {% set flavor_map = salt['grains.filter_by'](
   {
+    'Debian': {},
+    'FreeBSD': {},
     'RedHat': {
       'package_name': 'nss-pam-ldapd'
     }