diff --git a/src/main/java/com/syncleus/aethermud/configuration/AetherMudConfiguration.java b/src/main/java/com/syncleus/aethermud/configuration/AetherMudConfiguration.java
index fd5739cf220aedfb92d0cd8a918910289b39b0fe..238461ed6454ccb7fe39deb5bd7493de03e32238 100644
--- a/src/main/java/com/syncleus/aethermud/configuration/AetherMudConfiguration.java
+++ b/src/main/java/com/syncleus/aethermud/configuration/AetherMudConfiguration.java
@@ -44,7 +44,7 @@ public class AetherMudConfiguration {
     public final int graphitePort;
 
     public static final String IRC_SERVER = "irc.server";
-    public static final String IRC_SERVER_DEFAULT = "Chicago.IL.US.Undernet.org";
+    public static final String IRC_SERVER_DEFAULT = "irc.freenode.net";
     public final String ircServer;
 
     public static final String IRC_USERNAME = "irc.username";
@@ -52,7 +52,7 @@ public class AetherMudConfiguration {
     public final String ircUsername;
 
     public static final String IRC_NICKNAME = "irc.nickname";
-    public static final String IRC_NICKNAME_DEFAULT = "AetherMUD1";
+    public static final String IRC_NICKNAME_DEFAULT = "AetherMUD";
     public final String ircNickname;
 
     public static final String IRC_CHANNEL = "irc.channel";