diff --git a/Server/src/org/crandor/net/event/LoginWriteEvent.java b/Server/src/org/crandor/net/event/LoginWriteEvent.java
index 3f22afe0f..05ef54a5b 100644
--- a/Server/src/org/crandor/net/event/LoginWriteEvent.java
+++ b/Server/src/org/crandor/net/event/LoginWriteEvent.java
@@ -35,13 +35,16 @@ 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;
+			case 8: //if the login server is offline?
+				//TODO: auto restart code?
+				break;
+			case 21: //Moving world
+				buffer.put((byte) session.getServerKey());
+				break;
 		}
 		buffer.flip();
 		session.queue(buffer);
@@ -63,7 +66,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;