diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 90348b06ab..64c729717e 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,10 @@ 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/05/29
+	* Made the map server send list of characters online to the char-server on
+	  reconnection regardless of "kick_on_disconnect" setting, as otherwise, a
+	  temporary disconnection would make the char-server tag all characters
+	  offline and refuse to save them afterwards. [Skotlex]
 	* Fixed guild storage being "eternally in use" if you quit/logout before
 	  closing it. [Skotlex]
 	* Ending SC_CLOAK/SC_HIDE/SC_CHASEWALK will now trigger ontouch npcs.
diff --git a/src/map/chrif.c b/src/map/chrif.c
index c5b71db03c..211dcb6f43 100644
--- a/src/map/chrif.c
+++ b/src/map/chrif.c
@@ -413,8 +413,7 @@ int chrif_sendmapack(int fd)
 	chrif_state = 2;
 
 	//If there are players online, send them to the char-server. [Skotlex]
-	if (!kick_on_disconnect)
-		send_users_tochar(-1, gettick(), 0, 0);
+	send_users_tochar(-1, gettick(), 0, 0);
 	
 	//Re-save any storages that were modified in the disconnection time. [Skotlex]
 	do_reconnect_storage();
diff --git a/src/map/trade.c b/src/map/trade.c
index 4075606973..b9c142332c 100644
--- a/src/map/trade.c
+++ b/src/map/trade.c
@@ -33,7 +33,7 @@ void trade_traderequest(struct map_session_data *sd, struct map_session_data *ta
 		return; //Can't trade in notrade mapflag maps.
 	}
 
-	if (target_sd  == NULL || sd == target_sd) {
+	if (target_sd == NULL || sd == target_sd) {
 		clif_tradestart(sd, 1); // character does not exist
 		return;
 	}