diff --git a/bacula-backup/list_clients.cgi b/bacula-backup/list_clients.cgi
index 52009115b..6449dde03 100755
--- a/bacula-backup/list_clients.cgi
+++ b/bacula-backup/list_clients.cgi
@@ -22,7 +22,7 @@ if (@clients) {
 		$addr = &find_value("Address", $f->{'members'});
 		$cat = &find_value("Catalog", $f->{'members'});
 		print &ui_checked_columns_row([
-			&ui_link("edit_client.cgi?name=".&urlize($name)",$name),
+			&ui_link("edit_client.cgi?name=".&urlize($name), $name),
 			$addr,
 			$cat,
 			], \@tds, "d", $name);
diff --git a/bacula-backup/list_groups.cgi b/bacula-backup/list_groups.cgi
index 182d31ed3..8547523f9 100755
--- a/bacula-backup/list_groups.cgi
+++ b/bacula-backup/list_groups.cgi
@@ -25,7 +25,7 @@ if (@groups) {
 		$cat = &find_value("Catalog", $f->{'members'});
 		$done{$name}++;
 		print &ui_checked_columns_row([
-			&ui_link("edit_group.cgi?name=".&urlize($name)",$name),
+			&ui_link("edit_group.cgi?name=".&urlize($name), $name),
 			$port,
 			$cat,
 			], \@tds, "d", $name);
diff --git a/bacula-backup/list_jobs.cgi b/bacula-backup/list_jobs.cgi
index 96b1358e3..8cff785b9 100755
--- a/bacula-backup/list_jobs.cgi
+++ b/bacula-backup/list_jobs.cgi
@@ -29,7 +29,7 @@ if (@jobs) {
 		$fileset = &find_value("FileSet", $f->{'members'});
 		$schedule = &find_value("Schedule", $f->{'members'});
 		print &ui_checked_columns_row([
-			&ui_link("edit_job.cgi?name=".&urlize($name)",$name),
+			&ui_link("edit_job.cgi?name=".&urlize($name), $name),
 			$f->{'name'} eq 'Job' ? $text{'no'} : $text{'yes'},
 			$type || "<i>$text{'default'}</i>",
 			$client || "<i>$text{'default'}</i>",
@@ -43,7 +43,7 @@ if (@jobs) {
 	}
 else {
 	print "<b>$text{'jobs_none'}</b><p>\n";
-	print &ui_link("edit_job.cgi?new=1",$text{'jobs_add'})<br>\n";
+	print &ui_link("edit_job.cgi?new=1",$text{'jobs_add'}),"<br>\n";
 	}
 
 &ui_print_footer("", $text{'index_return'});