diff --git a/bind8/system_info.pl b/bind8/system_info.pl
index 33dfbda2e..9c22d8885 100644
--- a/bind8/system_info.pl
+++ b/bind8/system_info.pl
@@ -25,12 +25,12 @@ if (&foreign_available($module_name) && !$access{'noconfig'} &&
 		my $job = &get_dnssec_cron_job();
 		if (!$job) {
 			$msg .= &text('index_eexpired_conf',
-				      &ui_link("/$module_name/conf_dnssec.cgi",
+				      &ui_link(&get_webprefix()."/$module_name/conf_dnssec.cgi",
 					       $text{'dnssec_title'}));
 			}
 		else {
 			$msg .= &text('index_eexpired_mod',
-				      &ui_link("/$module_name/",
+				      &ui_link(&get_webprefix()."/$module_name/",
 					       $text{'index_title'}));
 			}
 		push(@rv, { 'type' => 'warning',
diff --git a/status/system_info.pl b/status/system_info.pl
index 8d9be8806..24beca8e3 100644
--- a/status/system_info.pl
+++ b/status/system_info.pl
@@ -39,7 +39,7 @@ foreach my $s (@serv) {
 	$down += scalar(grep { $_ == 0 } @ups);
 	my $desc = &html_escape($s->{'desc'});
 	if ($can) {
-		$desc = &ui_link("/$module_name/edit_mon.cgi?id=".
+		$desc = &ui_link(&get_webprefix()."/$module_name/edit_mon.cgi?id=".
 				 &urlize($s->{'id'}), $desc);
 		}
 	$table .= &ui_columns_row([
diff --git a/webmin/system_info.pl b/webmin/system_info.pl
index 130ca84d2..19becfc13 100644
--- a/webmin/system_info.pl
+++ b/webmin/system_info.pl
@@ -128,7 +128,7 @@ foreach my $a (@ann) {
 		     'desc' => $a->{'title'},
 		   };
 	my $hide = &ui_link_button(
-		"/$module_name/hide.cgi?id=".&urlize($a->{'file'}),
+		&get_webprefix()."/$module_name/hide.cgi?id=".&urlize($a->{'file'}),
 		$text{'announce_hide'});
 	if ($a->{'type'} eq 'warning') {
 		# A warning message
@@ -136,8 +136,11 @@ foreach my $a (@ann) {
 		$info->{'level'} = $a->{'level'} || 'info';
 		$info->{'warning'} = &html_escape($a->{'message'})."<p>\n";
 		for(my $b=0; defined($a->{'link'.$b}); $b++) {
+			my $link = $a->{'link'.$b};
+			$link = &get_webprefix().$link
+				if (&get_webprefix() && $link =~ /^\//);
 			$info->{'warning'} .= &ui_link_button(
-				$a->{'link'.$b}, $a->{'desc'.$b}, "_new")."\n";
+				$link, $a->{'desc'.$b}, "_new")."\n";
 			}
 		$info->{'warning'} .= $hide;
 		}
@@ -147,8 +150,11 @@ foreach my $a (@ann) {
 		$info->{'level'} = $a->{'level'};
 		$info->{'html'} = &html_escape($a->{'message'})."<p>\n";
 		for(my $b=0; defined($a->{'link'.$b}); $b++) {
+			my $link = $a->{'link'.$b};
+			$link = &get_webprefix().$link
+				if (&get_webprefix() && $link =~ /^\//);
 			$info->{'html'} .= &ui_link_button(
-				$a->{'link'.$b}, $a->{'desc'.$b}, "_new")."\n";
+				$link, $a->{'desc'.$b}, "_new")."\n";
 			}
 		$info->{'html'} .= $hide;
 		}