diff --git a/buildnumber.properties b/buildnumber.properties
index 1b844cc0..3d3c6162 100644
--- a/buildnumber.properties
+++ b/buildnumber.properties
@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Fri Oct 31 17:39:33 GMT 2014
-build.number=959
+#Sat Nov 01 12:07:03 GMT 2014
+build.number=960
diff --git a/src/config.yml b/src/config.yml
index d5152512..08f26aef 100644
--- a/src/config.yml
+++ b/src/config.yml
@@ -6,7 +6,7 @@ server:
   # You should change this to your server's name
   name: TotalFreedom
 
-  # The address your server is located at
+  # The address your server is located at - Please Note: The port MUST be included, even if it is default port (DNS Records included)
   address: 64.34.165.5:28965
 
   # Shown at the server list
@@ -25,12 +25,6 @@ server:
   # URL players should appeal for permanent bans at
   permban_url: http://bit.ly/TF_PermBan
   
-  # Your Servers Host Name - This can be your servers's IP or your servers DNS Record. Please ensure its what you want players to use to connect using. 
-  hostname: play.totalfreedom.me
-  
-  # Server Port - If your using a domain SRV record (eg play.totalfreedom.me) this MUST be 25565 else use the port you need to type at the end of the address.
-  port: 25565
-  
 # ForceIP Configuration
 forceip:
     
diff --git a/src/me/StevenLawson/TotalFreedomMod/Config/TFM_ConfigEntry.java b/src/me/StevenLawson/TotalFreedomMod/Config/TFM_ConfigEntry.java
index 0289e856..7a69ee62 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Config/TFM_ConfigEntry.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Config/TFM_ConfigEntry.java
@@ -34,8 +34,6 @@ public enum TFM_ConfigEntry
     SERVER_OWNERS(List.class, "server.owners"),
     SERVER_BAN_URL(String.class, "server.ban_url"),
     SERVER_PERMBAN_URL(String.class, "server.permban_url"),
-    SERVER_HOSTNAME(String.class, "server.hostname"),
-    SERVER_PORT(Integer.class, "server.port"),
     //
     TWITTERBOT_ENABLED(Boolean.class, "twitterbot.enabled"),
     TWITTERBOT_SECRET(String.class, "twitterbot.secret"),
diff --git a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java
index d1ddf24a..2dba07cd 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java
@@ -858,7 +858,7 @@ public class TFM_PlayerListener implements Listener
         // Force IP Setup
         if(TFM_ConfigEntry.FORCE_IP_ENABLED.getBoolean()) 
         {
-            if(!event.getHostname().equalsIgnoreCase(TFM_ConfigEntry.SERVER_HOSTNAME.getString() + ":" + TFM_ConfigEntry.SERVER_PORT.getInteger()))
+            if(!event.getHostname().equalsIgnoreCase(TFM_ConfigEntry.SERVER_ADDRESS.getString()))
             {
                 event.disallow(PlayerLoginEvent.Result.KICK_OTHER, TFM_ConfigEntry.FORCE_IP_KICKMSG.getString());
             }