diff --git a/src/freedombone b/src/freedombone
index 98400fed..42dfc572 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -4783,14 +4783,11 @@ function configure_email {
   chown root:Debian-exim /etc/exim4/exim.key /etc/exim4/exim.crt /etc/exim4/exim.dhparam
   chmod 640 /etc/exim4/exim.key /etc/exim4/exim.crt /etc/exim4/exim.dhparam
 
-  # create a configuration
-  cp /etc/exim4/exim4.conf.template /etc/exim4/exim4.conf
-
-  sed -i '/login_saslauthd_server/,/.endif/ s/# *//' /etc/exim4/exim4.conf
-  sed -i "/.ifdef MAIN_HARDCODE_PRIMARY_HOSTNAME/i\MAIN_HARDCODE_PRIMARY_HOSTNAME = $DEFAULT_DOMAIN_NAME\nMAIN_TLS_ENABLE = true" /etc/exim4/exim4.conf
+  sed -i '/login_saslauthd_server/,/.endif/ s/# *//' /etc/exim4/exim4.conf.template
+  sed -i "/.ifdef MAIN_HARDCODE_PRIMARY_HOSTNAME/i\MAIN_HARDCODE_PRIMARY_HOSTNAME = $DEFAULT_DOMAIN_NAME\nMAIN_TLS_ENABLE = true" /etc/exim4/exim4.conf.template
   sed -i "s|SMTPLISTENEROPTIONS=''|SMTPLISTENEROPTIONS='-oX 465:25:587 -oP /var/run/exim4/exim.pid'|g" /etc/default/exim4
-  if ! grep -q "tls_on_connect_ports=465" /etc/exim4/exim4.conf; then
-    sed -i '/SSL configuration for exim/i\tls_on_connect_ports=465' /etc/exim4/exim4.conf
+  if ! grep -q "tls_on_connect_ports=465" /etc/exim4/exim4.conf.template; then
+    sed -i '/SSL configuration for exim/i\tls_on_connect_ports=465' /etc/exim4/exim4.conf.template
   fi
 
   adduser $MY_USERNAME sasl
@@ -4866,7 +4863,7 @@ function spam_filtering {
   apt-get -y install spamassassin
   sa-update -v
   sed -i 's/ENABLED=0/ENABLED=1/g' /etc/default/spamassassin
-  sed -i 's/# spamd_address = 127.0.0.1 783/spamd_address = 127.0.0.1 783/g' /etc/exim4/exim4.conf
+  sed -i 's/# spamd_address = 127.0.0.1 783/spamd_address = 127.0.0.1 783/g' /etc/exim4/exim4.conf.template
   # This configuration is based on https://wiki.debian.org/DebianSpamAssassin
   sed -i 's/local_parts = postmaster/local_parts = postmaster:abuse/g' /etc/exim4/conf.d/acl/30_exim4-config_check_rcpt
   sed -i '/domains = +local_domains : +relay_to_domains/a\    set acl_m0 = rfcnames' /etc/exim4/conf.d/acl/30_exim4-config_check_rcpt