diff --git a/backupninja/files/backupninja.conf b/backupninja/files/backupninja.conf
index 0a8b72b..634cb37 100644
--- a/backupninja/files/backupninja.conf
+++ b/backupninja/files/backupninja.conf
@@ -15,15 +15,15 @@
 
 # send a summary of the backup status to
 # this email address:
-reportemail = {{ client.report_email }}
+reportemail = {{ client.report.email }}
 
 # if set to 'yes', a report email will be generated
 # even if all modules reported success. (default = yes)
-reportsuccess = no
+reportsuccess = {{ 'yes' if client.report.get('success', False) else 'no' }}
 
 # if set to 'yes', a report email will be generated
 # even if there was no error. (default = yes)
-reportwarning = yes
+reportwarning = {{ 'yes' if client.report.get('warning', True) else 'no' }}
 
 #######################################################
 # for most installations, the defaults below are good #
@@ -39,4 +39,4 @@
 scriptdirectory = /usr/share/backupninja
 
 # use colors in the log file
-usecolors = yes
\ No newline at end of file
+usecolors = yes
diff --git a/backupninja/map.jinja b/backupninja/map.jinja
index d63dbe6..5e0c1a3 100644
--- a/backupninja/map.jinja
+++ b/backupninja/map.jinja
@@ -3,14 +3,14 @@
   'Debian': {
     'pkgs': ['backupninja', 'debconf-utils'],
     'service': 'backupninja',
-    'report_email': 'root',
+    'report': {'email': 'root'},
     'config': '/etc/default/backupninja',
     'cacert_file': '/etc/ssl/certs/ca-certificates.crt',
   },
   'RedHat': {
     'pkgs': ['backupninja'],
     'service': 'backupninja',
-    'report_email': 'root',
+    'report': {'email': 'root'},
     'config': '/etc/sysconfig/backupninja',
     'cacert_file': '/etc/pki/tls/certs/ca-bundle.crt',
   },