diff --git a/lib/Virtualmin/Config/Plugin/SASL.pm b/lib/Virtualmin/Config/Plugin/SASL.pm
index 505e5c7..cb994af 100644
--- a/lib/Virtualmin/Config/Plugin/SASL.pm
+++ b/lib/Virtualmin/Config/Plugin/SASL.pm
@@ -116,7 +116,7 @@ sub actions {
         $self->logsystem("touch $cf");
       }
       my $smtpdconf = read_file_lines($cf) or die "Failed to open $cf!";
-      my $idx       = indexof("", @$smtpdconf);
+      my $idx = indexof("", @$smtpdconf);
       if ($idx < 0) {
         push(@$smtpdconf, "pwcheck_method: saslauthd");
         push(@$smtpdconf, "mech_list: plain login");
@@ -136,7 +136,7 @@ sub actions {
         if ($l =~ /^\s*FLAGS=\s*$/) {
           $l = "FLAGS=\"-r\"";
         }
-        elsif ($l =~ /^\s*FLAGS="(.*)"$/) {
+        elsif ($l =~ /^\s*FLAGS="(.*)"$/ && $l !~ /-r/) {
           $l = "FLAGS=\"$1 -r\"";
         }
       }