diff --git a/ChangeLog b/ChangeLog
index 92056c4f1..93f703e13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@ ChangeLog - 2007-05-09
 
 
 Version 0.2.5 (under dev!):
+   * forget current nick when user manually disconnects from server
    * fixed nick display in input window
    * fixed bug with erroneous nickname when connecting to server (bug #19812)
    * fixed display bugs in IRC error messages
diff --git a/src/irc/irc-server.c b/src/irc/irc-server.c
index 5a4c25f2e..60b3e3c56 100644
--- a/src/irc/irc-server.c
+++ b/src/irc/irc-server.c
@@ -1958,6 +1958,13 @@ server_disconnect (t_irc_server *server, int reconnect)
     else
         server->reconnect_start = 0;
     
+    /* discard current nick if no reconnection asked */
+    if (!reconnect && server->nick)
+    {
+        free (server->nick);
+        server->nick = NULL;
+    }
+    
     gui_window_redraw_buffer (gui_current_window->buffer);
 }
 
diff --git a/weechat/ChangeLog b/weechat/ChangeLog
index 92056c4f1..93f703e13 100644
--- a/weechat/ChangeLog
+++ b/weechat/ChangeLog
@@ -5,6 +5,7 @@ ChangeLog - 2007-05-09
 
 
 Version 0.2.5 (under dev!):
+   * forget current nick when user manually disconnects from server
    * fixed nick display in input window
    * fixed bug with erroneous nickname when connecting to server (bug #19812)
    * fixed display bugs in IRC error messages
diff --git a/weechat/src/irc/irc-server.c b/weechat/src/irc/irc-server.c
index 5a4c25f2e..60b3e3c56 100644
--- a/weechat/src/irc/irc-server.c
+++ b/weechat/src/irc/irc-server.c
@@ -1958,6 +1958,13 @@ server_disconnect (t_irc_server *server, int reconnect)
     else
         server->reconnect_start = 0;
     
+    /* discard current nick if no reconnection asked */
+    if (!reconnect && server->nick)
+    {
+        free (server->nick);
+        server->nick = NULL;
+    }
+    
     gui_window_redraw_buffer (gui_current_window->buffer);
 }