diff --git a/acl/edit_user.cgi b/acl/edit_user.cgi
index 9ede8dbff..bc01e1afd 100755
--- a/acl/edit_user.cgi
+++ b/acl/edit_user.cgi
@@ -350,11 +350,10 @@ foreach $c (sort { $b cmp $a } @cats) {
 			$label = "";
 			if ($access{'acl'} && $in{'user'}) {
 				# Show link for editing ACL
-				$label = sprintf "<a href='edit_acl.cgi?".
-						 "mod=%s&%s=%s'>%s</a>\n",
-					&urlize($m->{'dir'}),
-					"user", &urlize($in{'user'}),
-					$m->{'desc'};
+                $label = ui_link("edit_acl.cgi?" .
+                     "mod=" . urlize($m->{'dir'}) .
+                     "&group=". urlize($in{'group'}),
+                     $m->{'desc'})  . "\n";
 				}
 			else {
 				# No privileges to edit ACL
diff --git a/acl/list_sessions.cgi b/acl/list_sessions.cgi
old mode 100755
new mode 100644
index 767c29a66..0de017339
--- a/acl/list_sessions.cgi
+++ b/acl/list_sessions.cgi
@@ -34,13 +34,13 @@ foreach $k (sort { @a=split(/\s+/, $sessiondb{$a}); @b=split(/\s+/, $sessiondb{$
 		push(@cols, "<b>$k</b>");
 		}
 	else {
-		push(@cols, "<a href='delete_session.cgi?id=$k'>$k</a>");
+		push(@cols, ui_link("delete_session.cgi?id=$k", $k));
 		}
 	if ($hasuser{$user}) {
-		push(@cols, "<a href='edit_user.cgi?user=$user'>$user</a>");
+		push(@cols, ui_link("edit_user.cgi?user=$user", $user));
 		}
 	elsif ($miniserv{'unixauth'}) {
-		push(@cols, "$user (<a href='edit_user.cgi?user=$miniserv{'unixauth'}'>$miniserv{'unixauth'}</a>)");
+		push(@cols, "$user (" . ui_link("edit_user.cgi?user=$miniserv{'unixauth'}", $miniserv{'unixauth'}) . ")");
 		}
 	else {
 		push(@cols, $user);
@@ -48,7 +48,7 @@ foreach $k (sort { @a=split(/\s+/, $sessiondb{$a}); @b=split(/\s+/, $sessiondb{$
 	push(@cols, $lip);
 	push(@cols, &make_date($ltime));
 	if ($haslog) {
-		push(@cols, "<a href='../webminlog/search.cgi?uall=1&mall=1&tall=1&wall=1&fall=1&sid=$k'>$text{'sessions_lview'}</a>");
+		push(@cols, ui_link("../webminlog/search.cgi?uall=1&mall=1&tall=1&wall=1&fall=1&sid=$k", $text{'sessions_lview'}));
 		}
 	print &ui_columns_row(\@cols);
 	}