diff --git a/buildnumber.properties b/buildnumber.properties
index c00a1808..487e0213 100644
--- a/buildnumber.properties
+++ b/buildnumber.properties
@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Sun Dec 15 23:11:53 CET 2013
-build.number=674
+#Tue Dec 17 15:15:51 CET 2013
+build.number=680
diff --git a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_CustomListener.java b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_CustomListener.java
index 996c27ef..4a0028dd 100644
--- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_CustomListener.java
+++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_CustomListener.java
@@ -1,7 +1,10 @@
 package me.StevenLawson.TotalFreedomMod.Listener;
 
+import me.StevenLawson.TotalFreedomMod.TFM_Log;
 import me.StevenLawson.TotalFreedomMod.TFM_Superadmin;
 import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
@@ -10,16 +13,30 @@ public class TFM_CustomListener implements Listener
 {
     @EventHandler(priority = EventPriority.NORMAL)
     public void onTelnetPreLogin(me.StevenLawson.BukkitTelnet.TelnetPreLoginEvent event)
-    {
-        String ip = event.getIp();
-        if (ip != null && !ip.isEmpty())
+    {  
+        
+        final String ip = event.getIp();
+        if (ip == null || ip.isEmpty())
         {
-            TFM_Superadmin admin = TFM_SuperadminList.getAdminEntryByIP(ip, true);
-            if (admin != null && (admin.isTelnetAdmin() || admin.isSeniorAdmin()))
-            {
-                event.setBypassPassword(true);
-                event.setName(admin.getName());
-            }
+            return;
         }
+
+        final TFM_Superadmin admin = TFM_SuperadminList.getAdminEntryByIP(ip, true);
+
+        if (admin == null || !(admin.isTelnetAdmin() || admin.isSeniorAdmin()))
+        {
+            return;
+        }
+
+        event.setBypassPassword(true);
+        event.setName(admin.getName());
+
+        final OfflinePlayer player = Bukkit.getOfflinePlayer(admin.getName());
+        if (player == null)
+        {
+            return;
+        }
+        
+        event.setName(player.getName());
     }
 }