diff --git a/.gitignore b/.gitignore
index 23b3b9b..1fb22e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+*.swp
 *.conf
 dovecot*
 log*
diff --git a/install_update_dovecot.sh b/install_update_dovecot.sh
index 9c8fb18..494afc7 100755
--- a/install_update_dovecot.sh
+++ b/install_update_dovecot.sh
@@ -1442,7 +1442,7 @@ perl -i.ORIG -n -p -e "s#^([ ]*)\#?\ ?(protocol imap {)#\1\2\n\n\1  ssl_cert = <
    /usr/local/dovecot-${_version}/etc/dovecot/conf.d/20-imap.conf || _failed=true
 perl -i -n -p -e "s#^([ ]*)\#?\ ?(mail_max_userip_connections\ +=.*)#\1\#\# \2\n\1mail_max_userip_connections = $max_userip_connections#g" \
    /usr/local/dovecot-${_version}/etc/dovecot/conf.d/20-imap.conf || _failed=true
-perl -i -n -p -e "s#^([ ]*)\#?\ ?(mail_plugins\ +=.*)#\1\#\# \2\n\1mail_plugins = \\\$mail_plugins imap_quota autocreate#g" \
+perl -i -n -p -e "s#^([ ]*)\#?\ ?(mail_plugins\ +=.*)#\1\#\# \2\n\1mail_plugins = \\\$mail_plugins imap_quota#g" \
    /usr/local/dovecot-${_version}/etc/dovecot/conf.d/20-imap.conf || _failed=true
 perl -i -n -p -e "s#^([ ]*)\#?\ ?(imap_client_workarounds\ +=.*)#\1\#\# \2\n\1imap_client_workarounds = delay-newmail#g" \
    /usr/local/dovecot-${_version}/etc/dovecot/conf.d/20-imap.conf || _failed=true
@@ -1926,12 +1926,20 @@ if $_new ; then
    ## -
    ## - comment in:
    ## -    #virtual_transport = dovecot
-   ## -    #dovecot_destination_recipient_limit = 1
    ## -
-   ## - add:
+   ## - change:
+   ## -    smtpd_sasl_type = dovecot
+   ## -    smtpd_sasl_path = private/dovecot-auth
    ## -    virtual_transport = lmtp:unix:private/dovecot-lmtp
    _failed=false
    echononl "\tAdjust /etc/postfix/main.cf"
+   perl -i -n -p -e "s#^(\s*)(smtpd_sasl_type\ *=.*)#\1\#\2\n\1smtpd_sasl_type = dovecot#" \
+      /etc/postfix/main.cf || _failed=true
+   perl -i -n -p -e "s#^(\s*)(smtpd_sasl_path\ *=.*)#\1\#\2\n\1smtpd_sasl_path = private/dovecot-auth#" \
+      /etc/postfix/main.cf || _failed=true
+
+
+
    perl -i -n -p -e "s#^(\s*)(virtual_transport\ *=.*)#\1\#\2\n\1virtual_transport = lmtp:unix:private/dovecot-lmtp#" \
       /etc/postfix/main.cf || _failed=true
    perl -i-n -p -e "s#^(\s*)(dovecot_destination_recipient_limit.*)#\1\#\2#" /etc/postfix/main.cf  || _failed=true