commit - 52f59149adf4dbbb7c917225a7c66ac4aa053700
commit + 71d8c371711f70e2d4b7ef9c908443a018cd6701
blob - bb9350160c337ea27aac70cba2852bd5c6d663f2
blob + 7cfe08f7cc8000df1d3f5ec26c8e498833cd5c48
--- doc/sample-ngircd.conf.tmpl
+++ doc/sample-ngircd.conf.tmpl
@@ -27,6 +27,9 @@
 	# Set this hostname for every client instead of the real one
 	;ClientHost = irc.the.net
 
+	# Set every clients' user name to their nick name
+	;ClientUserNick = yes
+
 	# Info text of the server. This will be shown by WHOIS and
 	# LINKS requests for example.
 	Info = Server Info Text
blob - 11decc8689584e116b6505a3369f20cbcd59f073
blob + 1a6ad931f8b128604296c17c2b3ebbac64bb7bc3
--- src/ngircd/client.c
+++ src/ngircd/client.c
@@ -335,6 +335,9 @@ Client_SetID( CLIENT *Client, const char *ID )
 	
 	strlcpy( Client->id, ID, sizeof( Client->id ));
 
+	if (Conf_ClientUserNick)
+		strlcpy( Client->user, ID, sizeof( Client->user ));
+
 	/* Hash */
 	Client->hash = Hash( Client->id );
 } /* Client_SetID */
@@ -348,6 +351,8 @@ Client_SetUser( CLIENT *Client, const char *User, bool
 	assert( Client != NULL );
 	assert( User != NULL );
 
+	if (Conf_ClientUserNick) return;
+
 	if (Idented) {
 		strlcpy(Client->user, User, sizeof(Client->user));
 	} else {
blob - 622cb9f8f3667a0c7b983a7f982e28312b37c162
blob + 487c1eb50bc1397bc8482abbc69275df676610f0
--- src/ngircd/conf.c
+++ src/ngircd/conf.c
@@ -296,6 +296,7 @@ Conf_Test( void )
 	puts( "[GLOBAL]" );
 	printf("  Name = %s\n", Conf_ServerName);
 	printf("  ClientHost = %s\n", Conf_ClientHost);
+	printf("  ClientUserNick = %s\n", yesno_to_str(Conf_ClientUserNick));
 	printf("  Info = %s\n", Conf_ServerInfo);
 #ifndef PAM
 	printf("  Password = %s\n", Conf_ServerPwd);
@@ -592,6 +593,7 @@ Set_Defaults(bool InitServers)
 
 	strcpy(Conf_ServerName, "");
 	strcpy(Conf_ClientHost, "");
+	Conf_ClientUserNick = false;
 	snprintf(Conf_ServerInfo, sizeof Conf_ServerInfo, "%s %s",
 		 PACKAGE_NAME, PACKAGE_VERSION);
 	strcpy(Conf_ServerPwd, "");
@@ -979,6 +981,11 @@ Handle_GLOBAL( int Line, char *Var, char *Arg )
 			Config_Error_TooLong( Line, Var );
 		return;
 	}
+	if( strcasecmp( Var, "ClientUserNick" ) == 0 ) {
+		/* Use client nick name as user name */
+		Conf_ClientUserNick = Check_ArgIsTrue( Arg );
+		return;
+	}
 	if( strcasecmp( Var, "Info" ) == 0 ) {
 		/* Info text of server */
 		len = strlcpy( Conf_ServerInfo, Arg, sizeof( Conf_ServerInfo ));
blob - 1747139df06055f53a4f5e89407b1adab11a1f6e
blob + 10b64076f638b7760056b661f1ba792d826521c3
--- src/ngircd/conf.h
+++ src/ngircd/conf.h
@@ -99,6 +99,7 @@ GLOBAL char Conf_ServerName[CLIENT_ID_LEN];
 
 /** Hostname of the clients */
 GLOBAL char Conf_ClientHost[CLIENT_ID_LEN];
+GLOBAL bool Conf_ClientUserNick;
 
 /** Server info text */
 GLOBAL char Conf_ServerInfo[CLIENT_INFO_LEN];