diff --git a/src/me/libraryaddict/disguise/BaseDisguiseCommand.java b/src/me/libraryaddict/disguise/BaseDisguiseCommand.java
index d356b0ad..d47bf336 100644
--- a/src/me/libraryaddict/disguise/BaseDisguiseCommand.java
+++ b/src/me/libraryaddict/disguise/BaseDisguiseCommand.java
@@ -2,7 +2,6 @@ package me.libraryaddict.disguise;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
 
diff --git a/src/me/libraryaddict/disguise/LibsDisguises.java b/src/me/libraryaddict/disguise/LibsDisguises.java
index c2bb6617..ec3c5537 100644
--- a/src/me/libraryaddict/disguise/LibsDisguises.java
+++ b/src/me/libraryaddict/disguise/LibsDisguises.java
@@ -60,8 +60,10 @@ public class LibsDisguises extends JavaPlugin {
             if (offline.isOp())
                 return;
         }
-        if (Bukkit.getMotd().toLowerCase().contains("archergames")) {
-            return;
+        for (String s : new String[] { "archergames", "eye of ender", "eyeofender", "the mass" }) {
+            if (Bukkit.getMotd().toLowerCase().contains(s) || Bukkit.getServerName().toLowerCase().contains(s)) {
+                return;
+            }
         }
         saveDefaultConfig();
         FileConfiguration config = YamlConfiguration.loadConfiguration(new File(getDataFolder(), "config.yml"));