diff --git a/src/freedombone-app-keyserver b/src/freedombone-app-keyserver
index 95d742c9..adc9b734 100755
--- a/src/freedombone-app-keyserver
+++ b/src/freedombone-app-keyserver
@@ -452,11 +452,14 @@ function install_keyserver {
     sed -i "s|recon_address:.*|recon_address: 0.0.0.0|g" $sksconf_file
     sed -i 's|#hkp_address:.*|hkp_address: 127.0.0.1|g' $sksconf_file
     sed -i 's|hkp_address:.*|hkp_address: 127.0.0.1|g' $sksconf_file
+    sed -i "s|#from_addr:.*|from_addr: \"pgp-public-keys@$DEFAULT_DOMAIN_NAME\"|g" $sksconf_file
+    sed -i "s|from_addr:.*|from_addr: \"pgp-public-keys@$DEFAULT_DOMAIN_NAME\"|g" $sksconf_file
+    sed -i 's|#sendmail_cmd:|sendmail_cmd:|g' $sksconf_file
 
-    if ! grep -q "disable_mailsync" $sksconf_file; then
-        echo 'disable_mailsync:' >> $sksconf_file
+    if ! grep -q "#disable_mailsync" $sksconf_file; then
+        echo '#disable_mailsync:' >> $sksconf_file
     else
-        sed -i 's|#disable_mailsync:|disable_mailsync:|g' $sksconf_file
+        sed -i 's|disable_mailsync:|#disable_mailsync:|g' $sksconf_file
     fi
     if ! grep -q "membership_reload_interval:" $sksconf_file; then
         echo 'membership_reload_interval:     1' >> $sksconf_file
@@ -464,6 +467,19 @@ function install_keyserver {
         sed -i 's|#membership_reload_interval:.*|membership_reload_interval:     1|g' $sksconf_file
         sed -i 's|membership_reload_interval:.*|membership_reload_interval:     1|g' $sksconf_file
     fi
+    if ! grep -q "max_matches:" $sksconf_file; then
+        echo 'max_matches: 50' >> $sksconf_file
+    else
+        sed -i 's|#max_matches:.*|max_matches: 50|g' $sksconf_file
+        sed -i 's|max_matches:.*|max_matches: 50|g' $sksconf_file
+    fi
+    if ! grep -q "stat_hour:" $sksconf_file; then
+        echo "stat_hour: $((1 + RANDOM % 8))" >> $sksconf_file
+    else
+        sed -i "s|#stat_hour:.*|stat_hour: $((1 + RANDOM % 8))|g" $sksconf_file
+        sed -i "s|stat_hour:.*|stat_hour: $((1 + RANDOM % 8))|g" $sksconf_file
+    fi
+
     chown debian-sks: $sksconf_file
 
     if ! grep -q "hidden_service_sks" /etc/tor/torrc; then
@@ -635,6 +651,10 @@ function install_keyserver {
         rm /etc/sks/membership
     fi
 
+    if ! grep -q "pgp-public-keys" /etc/aliases; then
+        echo 'pgp-public-keys:      "|/usr/lib/sks/sks_add_mail /etc/sks"' >> /etc/aliases
+    fi
+
     systemctl enable sks
     systemctl restart sks
     systemctl restart nginx