diff --git a/install_update_dovecot.sh b/install_update_dovecot.sh
index d39bf32..6035547 100755
--- a/install_update_dovecot.sh
+++ b/install_update_dovecot.sh
@@ -1425,7 +1425,7 @@ fi
 ## -
 _failed=false
 echononl "\tAdjusting file 10-ssl.conf.."
-perl -i.ORIG -n -p -e "s#^([ ]*)(ssl\ ?=.*)#\1\#\# \2\n\1ssl = required#g" \
+perl -i.ORIG -n -p -e "s#^(\s*\#*\s*)(ssl\ ?=.*)#\#\1\2\nssl = required#" \
    /usr/local/dovecot-${_version}/etc/dovecot/conf.d/10-ssl.conf || _failed=true
 perl -i -n -p -e "s#^([ ]*)(ssl_cert\ ?=.*)#\1\#\# \2\n\1ssl_cert = <$server_cert#g" \
    /usr/local/dovecot-${_version}/etc/dovecot/conf.d/10-ssl.conf || _failed=true
@@ -1731,7 +1731,7 @@ fi
 ## -
 _failed=false
 echononl "\tAdjusting file 10-auth.conf"
-perl -i.ORIG -n -p -e "s#^([ ]*)\#?\ ?(disable_plaintext_auth\ +=.*)#\1\#\# \2\n\1disable_plaintext_auth = no#g" \
+perl -i.ORIG -n -p -e "s#^([ ]*)\#?\ ?(disable_plaintext_auth\ +=.*)#\1\#\# \2\n\1disable_plaintext_auth = yes#" \
    /usr/local/dovecot-${_version}/etc/dovecot/conf.d/10-auth.conf || _failed=true
 perl -i -n -p -e "s#^([ ]*)\#?\ ?(auth_mechanisms\ +=.*)#\1\#\# \2\n\1auth_mechanisms = $auth_mechanisms#g" \
    /usr/local/dovecot-${_version}/etc/dovecot/conf.d/10-auth.conf || _failed=true