diff --git a/ChangeLog b/ChangeLog
index 144c997c..44fb81e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,7 @@ v0.83.9		23-Jan-2006
 		mail processing.
 		Several commands now send the server address from the servers
 		setup to the neighbours.
+		After server connect send the correct usernames already in chat.
 
 
 v0.83.8		22-Jan-2006 - 23-Jan-2006
diff --git a/mbtask/taskibc.c b/mbtask/taskibc.c
index 511e4fce..78295f12 100644
--- a/mbtask/taskibc.c
+++ b/mbtask/taskibc.c
@@ -1198,7 +1198,8 @@ int command_server(char *hostname, char *parameters)
 		if (strlen(tmp->channel)) {
 		    for (tmpc = channels; tmpc; tmpc = tmpc->next) {
 			if (strcasecmp(tmpc->name, tmp->channel) == 0) {
-			    send_msg(tnsl, "JOIN %s@%s %s\r\n", tmpc->owner, tmpc->server, tmpc->name);
+//			    send_msg(tnsl, "JOIN %s@%s %s\r\n", tmpc->owner, tmpc->server, tmpc->name);
+			    send_msg(tnsl, "JOIN %s@%s %s\r\n", tmp->name, tmp->server, tmp->channel);
 			    if (strlen(tmpc->topic) && (strcmp(tmpc->server, CFG.myfqdn) == 0)) {
 				send_msg(tnsl, "TOPIC %s %s\r\n", tmpc->name, tmpc->topic);
 			    }