diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 3d6e74c75f..7be3420c63 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
 2006/07/10
+	* Fixed check_connect_login_server check in char-sql server. Fixes
+	  char-server not reconnecting to the login server. [Skotlex]
 	* Login-sql server will no longer change an account's state to "7" when
 	  banning a player. This should fix being able to use @ban to clear out a
 	  @blocked player. Players will now be identified as banned only through the
diff --git a/src/char_sql/char.c b/src/char_sql/char.c
index c5d248f713..15da747e58 100644
--- a/src/char_sql/char.c
+++ b/src/char_sql/char.c
@@ -3768,7 +3768,7 @@ int send_accounts_tologin(int tid, unsigned int tick, int id, int data) {
 }
 
 int check_connect_login_server(int tid, unsigned int tick, int id, int data) {
-	if (login_fd > 0 || session[login_fd] != NULL) 
+	if (login_fd > 0 && session[login_fd] != NULL) 
 		return 0;
 
 	ShowInfo("Attempt to connect to login-server...\n");