diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
index 96cac2d1e3..634092fbef 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
@@ -67,24 +67,41 @@
 								<label for="user">Librarian:</label>
 								<input type="text" name="user" id="user" value="[% user %]" />
 							</li>
-							<li>
-								<label for="modules">Module:</label>
-								<select name="modules" id="modules" multiple="multiple">
-									<option value="" selected="selected">All</option>
-                                                                        [% FOREACH modx IN [ 'CATALOGUING' 'AUTHORITIES' 'MEMBERS' 'ACQUISITIONS' 'SERIAL' 'CIRCULATION' 'LETTER' 'FINES' 'SYSTEMPREFERENCE' ] %]
-                                                                        <option value="[% modx %]">[% PROCESS translate_log_module module=modx %]</option>
-                                                                        [% END %]
-								</select>
-							</li>
-							<li>
-								<label for="action">Action:</label>
-								<select name="action" id="action">
-									<option value ="">All</option>
-                                                                        [% FOREACH actx IN [ 'ADD' 'DELETE' 'MODIFY' 'ISSUE' 'RETURN' 'CREATE' ] %]
-                                                                        <option value="[% actx %]">[% PROCESS translate_log_action action=actx %]</option>
-                                                                        [% END %]
-								</select>
-							</li>
+                        <li>
+                                <label for="modules">Modules:</label>
+                                <select name="modules" id="modules" multiple="multiple">
+                                    [% UNLESS modules %]
+                                        <option value="" selected="selected">All</option>
+                                    [% ELSE %]
+                                        <option value="">All</option>
+                                    [% END %]
+                                    [% FOREACH modx IN [ 'CATALOGUING' 'AUTHORITIES' 'MEMBERS' 'ACQUISITIONS' 'SERIAL' 'CIRCULATION' 'LETTER' 'FINES' 'SYSTEMPREFERENCE' ] %]
+                                        [% IF modules.grep(modx).size %]
+                                            <option value="[% modx %]" selected="selected">[% PROCESS translate_log_module module=modx %]</option>
+                                        [% ELSE %]
+                                            <option value="[% modx %]">[% PROCESS translate_log_module module=modx %]</option>
+                                        [% END %]
+                                    [% END %]
+                                </select>
+                            </li>
+                            <li>
+                                <label for="actions">Actions:</label>
+                                <select name="actions" id="actions" multiple="multiple">
+                                    [% UNLESS actions %]
+                                        <option value="" selected="selected">All</option>
+                                    [% ELSE %]
+                                        <option value="">All</option>
+                                    [% END %]
+
+                                    [% FOREACH actx IN [ 'ADD' 'DELETE' 'MODIFY' 'ISSUE' 'RETURN' 'CREATE' ] %]
+                                        [% IF actions.grep(actx).size %]
+                                            <option value="[% actx %]" selected="selected">[% PROCESS translate_log_action action=actx %]</option>
+                                        [% ELSE %]
+                                                <option value="[% actx %]">[% PROCESS translate_log_action action=actx %]</option>
+                                        [% END %]
+                                    [% END %]
+                                </select>
+                            </li>
 							<li>
 								<label for="object">Object: </label>
 								<input type="text" id="object" name="object" value="[% object %]" />
diff --git a/tools/viewlog.pl b/tools/viewlog.pl
index 3555612fbf..23eddc7ce2 100755
--- a/tools/viewlog.pl
+++ b/tools/viewlog.pl
@@ -191,13 +191,9 @@ if ($do_it) {
             action   => \@actions,
             info     => $info,
             src      => $src,
+            modules  => \@modules,
         );
 
-        # Used modules
-        foreach my $module (@modules) {
-            $template->param( $module => 1 );
-        }
-
         output_html_with_http_headers $input, $cookie, $template->output;
     }
     else {