diff --git a/samba/conf_smb.cgi b/samba/conf_smb.cgi
index f7102cdb2..2b112e6cd 100755
--- a/samba/conf_smb.cgi
+++ b/samba/conf_smb.cgi
@@ -85,7 +85,7 @@ print &ui_table_row($text{'smb_security'},
 		   [ [ "", $text{'default'} ],
 		     map { [ $_, $text{'smb_'.$_.'level'} ||
 				 $text{'smb_'.$_} ] }
-			 ( "share", "user", "passwd", "domain", "ads" ) ],
+			 ( "share", "user", "server", "domain", "ads" ) ],
 		   1, 0, 1));
 
 print &ui_table_row($text{'smb_passwdserver'},
diff --git a/samba/lang/en b/samba/lang/en
index 4714ccdc7..fd811f460 100644
--- a/samba/lang/en
+++ b/samba/lang/en
@@ -161,6 +161,7 @@ smb_security=Security
 smb_sharelevel=Share level
 smb_userlevel=User level
 smb_passwdserver=Password server
+smb_server=Password server
 smb_domain=Domain
 smb_ads=Active directory
 smb_announce=Remote announce to