diff --git a/ChangeLog b/ChangeLog
index addde71f..ce670261 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@ v0.83.20	27-May-2006
 		Changed welcome message.
 		Registration info for the clients was send double coded.
 		Delete users from channel when a server disconnects.
+		Delete users from a server when server disconnects.
 
 
 v0.83.19	23-May-2006 - 27-May-2006
diff --git a/mbtask/taskibc.c b/mbtask/taskibc.c
index 0847a217..19c3b476 100644
--- a/mbtask/taskibc.c
+++ b/mbtask/taskibc.c
@@ -461,6 +461,7 @@ void del_server(char *name)
     for (i = 0; i < MAXIBC_SRV; i++) {
 	if (strcmp(srv_list[i].server, name) == 0) {
 	    Syslog('r', "IBC: del_server(%s), slot %d", name, i);
+	    del_user(srv_list[i].server, NULL);
 	    memset(&srv_list[i], 0, sizeof(_srv_list));
 	    srvchg = TRUE;
 	}