diff --git a/ChangeLog.adoc b/ChangeLog.adoc
index f8189ae46..dce3b7674 100644
--- a/ChangeLog.adoc
+++ b/ChangeLog.adoc
@@ -22,6 +22,10 @@ Improvements::
 
   * irc: change default value of option irc.network.lag_reconnect to 300 (issue #818)
 
+Bug fixes::
+
+  * relay: set status to "authentication failed" and close immediately connection in case of authentication failure in weechat protocol (issue #825)
+
 [[v1.6]]
 == Version 1.6 (2016-10-02)
 
diff --git a/src/plugins/relay/weechat/relay-weechat-protocol.c b/src/plugins/relay/weechat/relay-weechat-protocol.c
index ab9835b18..e90c69e6f 100644
--- a/src/plugins/relay/weechat/relay-weechat-protocol.c
+++ b/src/plugins/relay/weechat/relay-weechat-protocol.c
@@ -211,6 +211,9 @@ RELAY_WEECHAT_PROTOCOL_CALLBACK(init)
         weechat_string_free_split_command (options);
     }
 
+    if (!RELAY_WEECHAT_DATA(client, password_ok))
+        relay_client_set_status (client, RELAY_STATUS_AUTH_FAILED);
+
     return WEECHAT_RC_OK;
 }
 
@@ -1383,7 +1386,7 @@ relay_weechat_protocol_recv (struct t_relay_client *client, const char *data)
                  * then close connection!
                  */
                 relay_client_set_status (client,
-                                         RELAY_STATUS_DISCONNECTED);
+                                         RELAY_STATUS_AUTH_FAILED);
             }
             else
             {