diff --git a/cluster-useradmin/CHANGELOG b/cluster-useradmin/CHANGELOG
index 399596aa9..a906835fe 100644
--- a/cluster-useradmin/CHANGELOG
+++ b/cluster-useradmin/CHANGELOG
@@ -1,3 +1,5 @@
 ---- Changes since 1.190 ----
 User and group refreshes can now be limited to a single host or members of a group.
 Groups can now be selected when synchronizing users and groups.
+---- Changes since 1.380 ----
+Added a Module Config option to show managed systems in a table.
diff --git a/cluster-useradmin/config b/cluster-useradmin/config
index 9a3ce078b..470eaee86 100644
--- a/cluster-useradmin/config
+++ b/cluster-useradmin/config
@@ -1 +1,2 @@
 sort_mode=0
+table_mode=0
diff --git a/cluster-useradmin/config.info b/cluster-useradmin/config.info
index 6264e71de..b6b7a1e3f 100644
--- a/cluster-useradmin/config.info
+++ b/cluster-useradmin/config.info
@@ -1 +1,2 @@
 sort_mode=Sort hosts by,1,1-Hostname,0-Order added,2-Description
+table_mode=Show hosts as,1,1-Table,0-Icons
diff --git a/cluster-useradmin/index.cgi b/cluster-useradmin/index.cgi
index 4e12a88af..d025b49f7 100755
--- a/cluster-useradmin/index.cgi
+++ b/cluster-useradmin/index.cgi
@@ -31,7 +31,33 @@ foreach $h (@hosts) {
 	$gothost{$h->{'id'}}++;
 	}
 if (@links) {
-	&icons_table(\@links, \@titles, \@icons);
+	if ($config{'table_mode'}) {
+		# Show as table
+		print &ui_columns_start([ $text{'index_thost'},
+					  $text{'index_tdesc'},
+					  $text{'index_tucount'},
+					  $text{'index_tgcount'},
+					  $text{'index_ttype'} ]);
+		foreach $h (@hosts) {
+			local ($s) = grep { $_->{'id'} == $h->{'id'} } @servers;
+			next if (!$s);
+			local ($type) = grep { $_->[0] eq $s->{'type'} }
+					     @servers::server_types;
+			print &ui_columns_row([
+				"<a href='edit_host.cgi?id=$h->{'id'}'>".
+				($s->{'host'} || &get_system_hostname())."</a>",
+				$s->{'desc'},
+				scalar(@{$h->{'users'}}),
+				scalar(@{$h->{'groups'}}),
+				$type->[1],
+				]);
+			}
+		print &ui_columns_end();
+		}
+	else {
+		# Show as icons
+		&icons_table(\@links, \@titles, \@icons);
+		}
 	}
 else {
 	print "<b>$text{'index_nohosts'}</b><p>\n";
diff --git a/cluster-useradmin/lang/en b/cluster-useradmin/lang/en
index 889b05d2b..14801890a 100644
--- a/cluster-useradmin/lang/en
+++ b/cluster-useradmin/lang/en
@@ -12,6 +12,11 @@ index_newuser=Add User
 index_newgroup=Add Group
 index_sync=Synchronize
 this_server=this server
+index_thost=Hostname
+index_tdesc=Description
+index_tucount=Users
+index_tgcount=Groups
+index_ttype=OS type
 
 add_title=Add Servers
 add_msg=Adding $1 ..