--- root_commands.c.orig	2010-03-04 12:03:14.000000000 +0100
+++ root_commands.c	2010-03-04 12:06:37.000000000 +0100
@@ -911,16 +911,16 @@
 	if( strchr( irc->umode, 'b' ) != NULL )
 		format = "%s\t%s\t%s";
 	else
-		format = "%-16.16s  %-40.40s  %s";
+		format = "%-16.16s  %-40.40s  %-10.10s  %s";
 	
-	irc_usermsg( irc, format, "Nick", "User/Host/Network", "Status" );
+	irc_usermsg( irc, format, "Nick", "User", "Network", "Status" );
 	
 	for( u = irc->users; u; u = u->next ) if( u->ic && u->online && !u->away )
 	{
 		if( online == 1 )
 		{
-			g_snprintf( s, sizeof( s ) - 1, "%s@%s %s(%s)", u->user, u->host, u->ic->acc->prpl->name, u->ic->acc->user );
-			irc_usermsg( irc, format, u->nick, s, "Online" );
+			g_snprintf( s, sizeof( s ) - 1, "%s@%s", u->user, u->host);
+			irc_usermsg( irc, format, u->nick, s, u->ic->acc->prpl->name, "Online" );
 		}
 		
 		n_online ++;
@@ -930,8 +930,8 @@
 	{
 		if( away == 1 )
 		{
-			g_snprintf( s, sizeof( s ) - 1, "%s@%s %s(%s)", u->user, u->host, u->ic->acc->prpl->name, u->ic->acc->user );
-			irc_usermsg( irc, format, u->nick, s, u->away );
+			g_snprintf( s, sizeof( s ) - 1, "%s@%s", u->user, u->host);
+			irc_usermsg( irc, format, u->nick, s, u->ic->acc->prpl->name, u->away );
 		}
 		n_away ++;
 	}
@@ -940,8 +940,8 @@
 	{
 		if( offline == 1 )
 		{
-			g_snprintf( s, sizeof( s ) - 1, "%s@%s %s(%s)", u->user, u->host, u->ic->acc->prpl->name, u->ic->acc->user );
-			irc_usermsg( irc, format, u->nick, s, "Offline" );
+			g_snprintf( s, sizeof( s ) - 1, "%s@%s", u->user, u->host);
+			irc_usermsg( irc, format, u->nick, s, u->ic->acc->prpl->name, "Offline" );
 		}
 		n_offline ++;
 	}