diff --git a/samba/conf_smb.cgi b/samba/conf_smb.cgi
index 4f76b1a99..6fcaada88 100755
--- a/samba/conf_smb.cgi
+++ b/samba/conf_smb.cgi
@@ -106,10 +106,15 @@ foreach $p (@protocols) {
 print "</select></td>\n";
 
 print "<td><b>$text{'smb_master'}</b></td>\n";
-printf "<td><input type=radio name=preferred_master value=yes %s> $text{'yes'}\n",
-	&isfalse("preferred master") ? "" : "checked";
-printf "$gap <input type=radio name=preferred_master value=no %s> $text{'no'}</td> </tr>\n",
+print "<td>";
+printf "<input type=radio name=preferred_master value=yes %s> $text{'yes'}\n",
+	&istrue("preferred master") ? "checked" : "";
+printf "$gap <input type=radio name=preferred_master value=no %s> $text{'no'}\n",
 	&isfalse("preferred master") ? "checked" : "";
+printf "<input type=radio name=preferred_master value=auto %s> $text{'smb_master_auto'}\n",
+	&getval("preferred master") =~ /auto/ ||
+	!&getval("preferred master") ? "checked" : "";
+print "</td> </tr>\n";
 
 print "<tr> <td><b>$text{'smb_security'}</b></td>\n";
 print "<td><select name=security>\n";
diff --git a/samba/lang/en b/samba/lang/en
index 3e9e51ebd..ccadaae54 100644
--- a/samba/lang/en
+++ b/samba/lang/en
@@ -159,6 +159,7 @@ smb_winpopup=Winpopup command
 smb_priority=Master browser priority
 smb_protocol=Highest protocol
 smb_master=Master browser?
+smb_master_auto=Automatic
 smb_security=Security
 smb_sharelevel=Share level
 smb_userlevel=User level
diff --git a/samba/save_smb.cgi b/samba/save_smb.cgi
index fbd6b164c..fde2e1bc4 100755
--- a/samba/save_smb.cgi
+++ b/samba/save_smb.cgi
@@ -57,7 +57,7 @@ $in{os_level} =~ /^\d+$/ ||
 
 &setval("protocol", $in{protocol}, "");
 
-&setval("preferred master", $in{preferred_master}, "yes");
+&setval("preferred master", $in{preferred_master}, "auto");
 
 &setval("security", $in{security}, "");