diff --git a/src/freedombone-app-mailpile b/src/freedombone-app-mailpile
index df0ecb71..e2c04f84 100755
--- a/src/freedombone-app-mailpile
+++ b/src/freedombone-app-mailpile
@@ -285,7 +285,7 @@ function install_mailpile {
     echo '' >> /etc/systemd/system/mailpile.service
     echo '[Service]' >> /etc/systemd/system/mailpile.service
     echo 'User=mailpile' >> /etc/systemd/system/mailpile.service
-    echo 'Group=debian-tor' >> /etc/systemd/system/mailpile.service
+    echo 'Group=mailpile' >> /etc/systemd/system/mailpile.service
     echo "WorkingDirectory=/var/www/$MAILPILE_DOMAIN_NAME/mail" >> /etc/systemd/system/mailpile.service
     echo "ExecStart=/var/www/$MAILPILE_DOMAIN_NAME/mail/mp --www=0.0.0.0:${MAILPILE_PORT} --wait" >> /etc/systemd/system/mailpile.service
     echo 'Restart=always' >> /etc/systemd/system/mailpile.service
diff --git a/src/freedombone-utils-setup b/src/freedombone-utils-setup
index d368f6e1..30526278 100755
--- a/src/freedombone-utils-setup
+++ b/src/freedombone-utils-setup
@@ -493,9 +493,6 @@ function lockdown_permissions {
     if [ -f /usr/sbin/exim4 ]; then
         chmod u+s /usr/sbin/exim4
     fi
-    if [ -f /usr/sbin/dovecot ]; then
-        chmod u+s /usr/sbin/dovecot
-    fi
 
     set_sticky_bits