diff --git a/webminlog/index.cgi b/webminlog/index.cgi
index 2a071cbe3..61ffffb62 100755
--- a/webminlog/index.cgi
+++ b/webminlog/index.cgi
@@ -5,16 +5,28 @@
 use strict;
 use warnings;
 require './webminlog-lib.pl';
-our (%text, %gconfig, %access_users, %in, %config, %access);
+our (%text, %gconfig, %access_users, %in, %config, %access, %in);
+&ReadParse();
 &foreign_require("acl", "acl-lib.pl");
 &ui_print_header(undef, $text{'index_title'}, "", undef, 1, 1);
 
+my @tabs = ( [ 'search', $text{'index_search'} ] );
+if ($access{'notify'}) {
+	push(@tabs, [ 'notify', $text{'index_notify'} ]);
+	}
+print &ui_tabs_start(\@tabs, 'mode', $in{'mode'} || 'search', 1);
+
+print &ui_tabs_start_tab('mode', 'search');
+
 if (!$gconfig{'log'}) {
 	print &text('index_nolog', '/webmin/edit_log.cgi'),"<p>\n";
 	}
 elsif (!$gconfig{'logfiles'}) {
 	print &text('index_nologfiles', '/webmin/edit_log.cgi'),"<p>\n";
 	}
+else {
+	print $text{'index_searchdesc'},"<p>\n";
+	}
 
 print &ui_form_start("search.cgi");
 print &ui_table_start($text{'index_header'}, undef, 2);
@@ -104,12 +116,15 @@ print &ui_table_row($text{'index_long'},
 
 print &ui_table_end();
 print &ui_form_end([ [ undef, $text{'index_search'} ] ]);
+print &ui_tabs_end_tab('mode', 'search');
 
 if ($access{'notify'}) {
-	print &ui_hr();
+	print &ui_tabs_start_tab('mode', 'notify');
+
+	print $text{'index_notifydesc'},"<p>\n";
 
 	print &ui_form_start("save_notify.cgi", "post");
-	print &ui_table_start($text{'index_header'}, undef, 2);
+	print &ui_table_start($text{'index_header2'}, undef, 2);
 
 	# Notifications enabled?
 	print &ui_table_row($text{'index_notify'},
@@ -143,8 +158,12 @@ if ($access{'notify'}) {
 
 	print &ui_table_end();
 	print &ui_form_end([ [ undef, $text{'save'} ] ]);
+
+	print &ui_tabs_end_tab('mode', 'notify');
 	}
 
+print &ui_tabs_end(1);
+
 &ui_print_footer("/", $text{'index'});
 
 sub time_input
diff --git a/webminlog/lang/en b/webminlog/lang/en
index dd4d35db5..c7c9d2e11 100644
--- a/webminlog/lang/en
+++ b/webminlog/lang/en
@@ -32,13 +32,17 @@ index_sdesc=Action description contains
 index_shost=Source Webmin server
 index_long=Show full action descriptions?
 index_global=&lt;Not in any module&gt;
-index_header=Notification email options
+index_header2=Notification email options
 index_notify=Send email for Webmin actions?
 index_notify_mods=For actions in modules
 index_notify_users=For actions by users
 index_notify_email=Send email to
 index_notify_usub=Include username in email subject?
 index_notify_msub=Include action in email subject?
+index_search=Search logs
+index_notify=Email notification
+index_searchdesc=This form can be used to search for Webmin actions by user, module, date range and files effected.
+index_notifydesc=Use this form to configure email notifications when Webmin actions are peformed by selected users or in chosen modules.
 
 search_title=Search Results
 search_date=Date