diff --git a/exim4/exim4.conf b/exim4/exim4.conf
index 1b6260e..e520525 100644
--- a/exim4/exim4.conf
+++ b/exim4/exim4.conf
@@ -196,6 +196,11 @@ acl_check_data:
 
   accept authenticated = *
 
+  .ifdef CLAMAV_ENABLE
+  deny malware = *
+    message = This message was detected as possible malware ($malware_name).
+  .endif
+
   .ifdef SPAMD_ENABLE
   warn spam    = debian-spamd
     add_header = X-Spam-Score: $spam_score ($spam_bar)
@@ -204,11 +209,6 @@ acl_check_data:
     control    = fakereject
   .endif
 
-  .ifdef CLAMAV_ENABLE
-  deny malware = *
-    message = This message was detected as possible malware ($malware_name).
-  .endif
-
   deny message = Message headers fail syntax check
     !verify = header_syntax
 
diff --git a/mailserver.sh b/mailserver.sh
index 91b4009..36c6cf7 100755
--- a/mailserver.sh
+++ b/mailserver.sh
@@ -44,11 +44,16 @@ install_spamassassin() {
     aptitude -y install exim4-daemon-heavy sa-exim spamassassin
     cp -fv spamd/sa-learn /etc/cron.daily/sa-learn
     cp -fv spamd/spamassassin /etc/default/spamassassin
+    systemctl enable spamassassin
+    service spamassassin restart
     install_restart
 }
 
 install_clamav() {
     aptitude -y install exim4-daemon-heavy clamav clamav-daemon
+    adduser clamav Debian-exim
+    systemctl enable clamav-daemon
+    service clamav-daemon restart
     install_restart
 }