diff --git a/ChangeLog.txt b/ChangeLog.txt
index 818d5d2138..e64204ad2f 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -10,6 +10,11 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2014-04-02 22:52 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
+  * contrib/hbnetio/netiosrv.c
+    ! fixed very bad bug in one of recent modifications which completely
+      broke all servers using early authentication by netio_VerifyClient()
+
 2014-04-02 12:46 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * src/rtl/filebufd.c
   * src/rtl/iousr.c
diff --git a/contrib/hbnetio/netiosrv.c b/contrib/hbnetio/netiosrv.c
index 9003e233b9..75d1ccbf56 100644
--- a/contrib/hbnetio/netiosrv.c
+++ b/contrib/hbnetio/netiosrv.c
@@ -746,11 +746,9 @@ static HB_BOOL s_netio_login_accept( PHB_CONSRV conn )
       }
       if( ! conn->login )
          s_consrv_disconnect( conn );
-
-      return conn->login;
    }
 
-   return HB_FALSE;
+   return conn && conn->login;
 }
 
 /* netio_VerifyClient( <pConnectionSocket> ) -> <lAccepted>