--- index.cgi	2010-08-02 16:25:06.000000000 +0200
+++ index_new.cgi	2010-08-02 16:31:34.000000000 +0200
@@ -76,11 +76,16 @@
 elsif (@ulist) {
 	# Show as table of users
 	@grid = ( );
+        if ($remote_user ne "root") {
+        	@grid = "<a href=\"edit_passwd.cgi?".$remote_user.">".$remote_user."</a>";
+        }
+	else {
 	for($i=0; $i<@ulist; $i++) {
 		push(@grid, "<a href=\"edit_passwd.cgi?".
 			    "user=$ulist[$i]->[0]\">".
 			    &html_escape($ulist[$i]->[0])."</a>");
 		}
+	}
 	print &ui_grid_table(\@grid, 4, 100, undef, undef,
 			     $text{'index_header'});
 	}