diff --git a/cluster-passwd/edit_passwd.cgi b/cluster-passwd/edit_passwd.cgi
index a172a38e8..29370973e 100755
--- a/cluster-passwd/edit_passwd.cgi
+++ b/cluster-passwd/edit_passwd.cgi
@@ -39,8 +39,8 @@ if ($access{'repeat'}) {
 	}
 
 if ($access{'others'} == 2) {
-	print &ui_table_row(undef,
-	    &ui_checkbox("others", 1, $passwd::text{'passwd_others'}, 1), 2);
+	print &ui_table_row(" ",
+	    &ui_checkbox("others", 1, $passwd::text{'passwd_others'}, 1));
 	}
 
 print &ui_table_end();
diff --git a/cluster-passwd/index.cgi b/cluster-passwd/index.cgi
index 9119e23bc..e6687aaa1 100755
--- a/cluster-passwd/index.cgi
+++ b/cluster-passwd/index.cgi
@@ -41,7 +41,7 @@ else {
 	# Show as table of users
 	my @grid;
 	for($i=0; $i<@ulist; $i++) {
-		push(@grid, &ui_link("edit_passwd.cgiuser=$ulist[$i]->{'user'}",
+		push(@grid, &ui_link("edit_passwd.cgi?user=$ulist[$i]->{'user'}",
 				     &html_escape($ulist[$i]->{'user'})));
 		}
 	print &ui_grid_table(\@grid, 4, 100, undef, undef,