diff --git a/bacula-backup/list_schedules.cgi b/bacula-backup/list_schedules.cgi
index cf371ee0f..e62e53cbf 100755
--- a/bacula-backup/list_schedules.cgi
+++ b/bacula-backup/list_schedules.cgi
@@ -11,8 +11,7 @@ if (@schedules) {
 	print &ui_form_start("delete_schedules.cgi", "post");
 	@links = ( &select_all_link("d"),
 		   &select_invert_link("d"),
-		   "<a href='edit_schedule.cgi?new=1'>".
-		   "$text{'schedules_add'}</a>" );
+		   &ui_link("edit_schedule.cgi?new=1",$text{'schedules_add'}) );
 	print &ui_links_row(\@links);
 	@tds = ( "width=5", "width=30%", "width=70%" );
 	print &ui_columns_start([ "", $text{'schedules_name'},
diff --git a/grub/index.cgi b/grub/index.cgi
index 5cc93282f..c2afa312e 100755
--- a/grub/index.cgi
+++ b/grub/index.cgi
@@ -33,8 +33,7 @@ foreach $t (@t) {
 	push(@titles, $def == $i ? "<b>$tt</b>" : $tt);
 	push(@links, "edit_title.cgi?idx=$t->{'index'}");
 	push(@befores, $i == 0 ? "&lt;&lt;&nbsp;|&nbsp;" :
-		"<a href='up.cgi?idx=$i'>".
-		"&lt;&lt;</a>&nbsp;|&nbsp;");
+		&ui_link("up.cgi?idx=$i","&lt;&lt;")&nbsp;|&nbsp;");
 	push(@afters, $i == @t-1 ? "&nbsp;|&nbsp;&gt;&gt;" :
 		"&nbsp;|&nbsp;<a href='down.cgi?idx=$i'>".
 		"&gt;&gt;</a>");
diff --git a/lpadmin/index.cgi b/lpadmin/index.cgi
index d840ef28e..a0865d7b2 100755
--- a/lpadmin/index.cgi
+++ b/lpadmin/index.cgi
@@ -46,8 +46,7 @@ if (@plist) {
 			next if (!$ed && !$jb && !$access{'view'});
 			local $l;
 			if ($ed) {
-				$l = "<a href='edit_printer.cgi?name=$p'>".
-				     "$p</a>\n";
+				$l = &ui_link("edit_printer.cgi?name=$p",$p)\n";
 				}
 			else {
 				$l = $p."\n";