diff --git a/CompiledServer/production/RS-2009/org/keldagrim/system/mysql/WorldListSQLHandler.class b/CompiledServer/production/RS-2009/org/keldagrim/system/mysql/WorldListSQLHandler.class
index 5c18b89fa..f1265d22c 100644
Binary files a/CompiledServer/production/RS-2009/org/keldagrim/system/mysql/WorldListSQLHandler.class and b/CompiledServer/production/RS-2009/org/keldagrim/system/mysql/WorldListSQLHandler.class differ
diff --git a/Management-Server/src/org/keldagrim/system/mysql/WorldListSQLHandler.java b/Management-Server/src/org/keldagrim/system/mysql/WorldListSQLHandler.java
index 2440c1251..6557c655b 100644
--- a/Management-Server/src/org/keldagrim/system/mysql/WorldListSQLHandler.java
+++ b/Management-Server/src/org/keldagrim/system/mysql/WorldListSQLHandler.java
@@ -60,10 +60,14 @@ public final class WorldListSQLHandler extends SQLEntryHandler<GameServer> {
 			return;
 		}
 		int players = entry.getPlayerAmount();
+		WorldInfo info = entry.getInfo();
 		if (!entry.isActive()) {
 			players = -1;
 		}
-		WorldInfo info = entry.getInfo();
+		if (players <= 0) {
+			PreparedStatement statement = connection.prepareStatement("UPDATE members SET online='0' WHERE lastWorld='" + value + "'");
+			statement.executeUpdate();
+		}
 		PreparedStatement statement = connection.prepareStatement("UPDATE " + table + " SET players='" + players + "', ip='" + info.getAddress() + "', country='" + info.getCountry().getId() + "', member='" + (info.isMembers() ? 1 : 0) + "', revision='" + info.getRevision() + "' WHERE world='" + value + "'");
 		statement.executeUpdate();
 		SQLManager.close(statement.getConnection());
diff --git a/Server/src/org/crandor/game/node/entity/player/Player.java b/Server/src/org/crandor/game/node/entity/player/Player.java
index db5f91106..05ae4f19c 100644
--- a/Server/src/org/crandor/game/node/entity/player/Player.java
+++ b/Server/src/org/crandor/game/node/entity/player/Player.java
@@ -550,7 +550,7 @@ public class Player extends Entity {
 			inventory.addAll(c[0]);
 			if (gravestone) {
 				graveManager.create(ticks, items);
-				sendMessages("<col=990000>Because of your current gavestone, you have "+graveManager.getType().getDecay()+" minutes to get your items and", "<col=990000>equipment back after dying in combat.");
+				sendMessages("<col=990000>Because of your current gravestone, you have "+graveManager.getType().getDecay()+" minutes to get your items and", "<col=990000>equipment back after dying in combat.");
 			}
 			familiarManager.dismiss();