diff --git a/web-lib-funcs.pl b/web-lib-funcs.pl
index 1790690fd..14f9a36ab 100755
--- a/web-lib-funcs.pl
+++ b/web-lib-funcs.pl
@@ -7193,6 +7193,7 @@ my @tm = localtime($now);
 my $id = sprintf "%d.%d.%d", $now, $$, $main::action_id_count;
 my $idprefix = substr($now, 0, 5);
 $main::action_id_count++;
+my $scriptpath = (&get_module_name() ? &get_module_name().'/' : '').$scriptname;
 my $line = sprintf "%s [%2.2d/%s/%4.4d %2.2d:%2.2d:%2.2d] %s %s %s %s %s \"%s\" \"%s\" \"%s\"",
     $id, $tm[3], ucfirst($number_to_month_map{$tm[4]}), $tm[5]+1900,
     $tm[2], $tm[1], $tm[0],
@@ -7201,7 +7202,7 @@ my $line = sprintf "%s [%2.2d/%s/%4.4d %2.2d:%2.2d:%2.2d] %s %s %s %s %s \"%s\"
     $param_client_ip || $ENV{'REMOTE_HOST'} || '-',
     $m,
     $param_host ? $param_host.':'.$param_script_on_host :
-	$scriptname ? $scriptname : '-',
+	$scriptname ? $scriptpath : '-',
     $param_action, $param_type ne '' ? $param_type : '-', $param_object ne '' ? $param_object : '-';
 my %param;
 $params_hash ||= {};
diff --git a/webminlog/view.cgi b/webminlog/view.cgi
index 27e01c283..26377a9c1 100755
--- a/webminlog/view.cgi
+++ b/webminlog/view.cgi
@@ -38,7 +38,9 @@ print &ui_table_row($text{'view_module'},
 
 if ($act->{'module'} ne 'global') {
 	print &ui_table_row($text{'view_script'},
-			    "<tt>$act->{'module'}/$act->{'script'}</tt>");
+			    $act->{'script'} =~ /\// ?
+				"<tt>$act->{'script'}</tt>" :
+				"<tt>$act->{'module'}/$act->{'script'}</tt>");
 	}
 else {
 	print &ui_table_row($text{'view_script'}, "<tt>$act->{'script'}</tt>");