diff --git a/samba/index.cgi b/samba/index.cgi
index 3f08efa3a..5911d1eb0 100755
--- a/samba/index.cgi
+++ b/samba/index.cgi
@@ -219,33 +219,33 @@ if ($disp) {
 
 # Generate table of accessible user and group editing icons
 if ($access{'view_users'}) {
-	push(@utitles, $text{'global_edit'});
+	push(@utitles, $text{'smbuser_title'});
 	push(@ulinks, "edit_epass.cgi");
 	push(@uicons, "images/editepass.gif");
 	}
 if ($access{'maint_makepass'}) {
-	push(@utitles, $text{'global_convert'});
+	push(@utitles, $text{'convert_title'});
 	push(@ulinks, "ask_epass.cgi");
 	push(@uicons, "images/askepass.gif");
 	}
 if ($access{'maint_sync'}) {
-	push(@utitles, $text{'global_sync'});
+	push(@utitles, $text{'esync_title'});
 	push(@ulinks, "edit_sync.cgi");
 	push(@uicons, "images/editsync.gif");
 	}
 if ($samba_version >= 3) {
 	if ($access{'maint_groups'}) {
-		push(@utitles, $text{'global_gedit'});
+		push(@utitles, $text{'groups_title'});
 		push(@ulinks, "list_groups.cgi");
 		push(@uicons, "images/listgroups.gif");
 		}
 	if ($access{'maint_gsync'}) {
-		push(@utitles, $text{'global_gsync'});
+		push(@utitles, $text{'gsync_title'});
 		push(@ulinks, "edit_gsync.cgi");
 		push(@uicons, "images/editgsync.gif");
 		}
 	if ($access{'winbind'} && $has_net) {
-		push(@utitles, $text{'global_winbind'});
+		push(@utitles, $text{'winbind_title'});
 		push(@ulinks, "edit_winbind.cgi");
 		push(@uicons, "images/winbind.gif");
 		}
@@ -255,7 +255,7 @@ if (@utitles) {
 	# We have some icons to show
 	print &ui_hr();
 	print &ui_subheading($text{'global_users'});
-	&icons_table(\@ulinks, \@utitles, \@uicons, 3);
+	&icons_table(\@ulinks, \@utitles, \@uicons, 4);
 	}
 
 if ($access{'apply'}) {
diff --git a/samba/lang/en b/samba/lang/en
index 730d70ef5..8d2ba2cc0 100644
--- a/samba/lang/en
+++ b/samba/lang/en
@@ -61,14 +61,7 @@ global_filedefault=File Share Defaults
 global_prndefault=Printer Share Defaults
 global_password=Encrypted Passwords
 global_users=Samba Users
-global_edit=Edit Samba users and passwords
-global_convert=Convert Unix users to Samba users
-global_sync=Configure automatic Unix and Samba user synchronisation
 global_group=Samba Groups
-global_gedit=Add and edit Samba groups
-global_gconvert=Convert Unix groups to Samba groups
-global_gsync=Configure automatic Unix and Samba group synchronisation
-global_winbind=Bind to Domain
 global_bind=Winbind Options
 
 error_nosamba=The Samba server executable <tt>$1</tt> was not found. Either Samba is not installed on your system or your <a href="$2">module configuration</a> is incorrect.