diff --git a/CompiledServer/production/09Scape/org/crandor/net/amsc/MSPacketRepository.class b/CompiledServer/production/09Scape/org/crandor/net/amsc/MSPacketRepository.class
index b7e714f03..bfabddb6c 100644
Binary files a/CompiledServer/production/09Scape/org/crandor/net/amsc/MSPacketRepository.class and b/CompiledServer/production/09Scape/org/crandor/net/amsc/MSPacketRepository.class differ
diff --git a/CompiledServer/production/09Scape/org/keldagrim/system/communication/CommunicationInfo.class b/CompiledServer/production/09Scape/org/keldagrim/system/communication/CommunicationInfo.class
index b17ae2ea8..ad715ce27 100644
Binary files a/CompiledServer/production/09Scape/org/keldagrim/system/communication/CommunicationInfo.class and b/CompiledServer/production/09Scape/org/keldagrim/system/communication/CommunicationInfo.class differ
diff --git a/Management-Server/src/org/keldagrim/system/communication/CommunicationInfo.java b/Management-Server/src/org/keldagrim/system/communication/CommunicationInfo.java
index f890b5e06..652edb64d 100644
--- a/Management-Server/src/org/keldagrim/system/communication/CommunicationInfo.java
+++ b/Management-Server/src/org/keldagrim/system/communication/CommunicationInfo.java
@@ -152,7 +152,7 @@ public final class CommunicationInfo {
 		statement.setString(3, contacts);
 		statement.setString(4, blocked);
 		statement.setString(5, clanName);
-		statement.setString(6, currentClan == null ? "grim" : currentClan);
+		statement.setString(6, currentClan);
 		statement.setString(7, joinRequirement.ordinal() + "," + messageRequirement.ordinal() + "," + kickRequirement.ordinal() + "," + lootRequirement.ordinal());
 		statement.setString(8, publicChatSetting + "," + privateChatSetting + "," + tradeSetting);
 	}
diff --git a/Server/src/org/crandor/net/amsc/MSPacketRepository.java b/Server/src/org/crandor/net/amsc/MSPacketRepository.java
index 4dd1b7ccf..ea9534c0d 100644
--- a/Server/src/org/crandor/net/amsc/MSPacketRepository.java
+++ b/Server/src/org/crandor/net/amsc/MSPacketRepository.java
@@ -379,8 +379,6 @@ public final class MSPacketRepository {
 		if (buffer.get() == 1) {
 			String name = buffer.getString();
 			sendJoinClan(player, name);
-		} else {
-			sendJoinClan(player, "keldagrim");
 		}
 	}