diff --git a/Server/src/org/crandor/game/content/eco/ge/GrandExchange.java b/Server/src/org/crandor/game/content/eco/ge/GrandExchange.java
index 83532e3de..c182256c9 100644
--- a/Server/src/org/crandor/game/content/eco/ge/GrandExchange.java
+++ b/Server/src/org/crandor/game/content/eco/ge/GrandExchange.java
@@ -63,6 +63,7 @@ public final class GrandExchange implements SavingModule {
 
 	/**
 	 * Opens the Grand Exchange menu.
+	 * @NOTICE: The amount of GE boxes is limited at LoginWriteEvent.java (2 or 6 GE boxes, set it 0 for 2, 1 for 6)
 	 */
 	public void open() {
 		if (player.getIronmanManager().checkRestriction()) {
diff --git a/Server/src/org/crandor/net/event/LoginWriteEvent.java b/Server/src/org/crandor/net/event/LoginWriteEvent.java
index 3f22afe0f..c632cd4cd 100644
--- a/Server/src/org/crandor/net/event/LoginWriteEvent.java
+++ b/Server/src/org/crandor/net/event/LoginWriteEvent.java
@@ -35,13 +35,15 @@ public final class LoginWriteEvent extends IoWriteEvent {
 		ByteBuffer buffer = ByteBuffer.allocate(500);
 		buffer.put((byte) response.opcode());
 		switch (response.opcode()) {
-		case 2:
-			buffer.put(getWorldResponse(session));
-			session.setProducer(GAME_PRODUCER);
-			break;
-		case 21:
-			buffer.put((byte) session.getServerKey());
-			break;
+			case 2: //successful login
+				buffer.put(getWorldResponse(session));
+				session.setProducer(GAME_PRODUCER);
+				break;
+			//Could add a case here to auto-restart the server in case the login server goes offline (case 8)
+			//Possibly a risk for malicious attacks though
+			case 21: //Moving world
+				buffer.put((byte) session.getServerKey());
+				break;
 		}
 		buffer.flip();
 		session.queue(buffer);
@@ -63,7 +65,7 @@ public final class LoginWriteEvent extends IoWriteEvent {
 		buffer.put((byte) 0);
 		buffer.put((byte) 0);
 		buffer.putShort((short) player.getIndex());
-		buffer.put((byte) (player.isDonator() ? 1 : 0)); // Enable all G.E boxes
+		buffer.put((byte) (1)); // Enable all G.E boxes
 		buffer.put((byte) 1);
 		buffer.flip();
 		return buffer;