diff --git a/CHANGELOG.md b/CHANGELOG.md
index f8feca3c..e049c687 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,21 @@
+######0.8
+
+* Fix logical error on /premium (Thanks to @NorbiPeti)
+* Fixed issues with host lookup from hosts file (Thanks to @NorbiPeti)
+* Remove handshake listener because it creates errors on some systems
+
 ######0.7
 
+* Added BungeeAuth support
+* Added /premium [player] command with optional player parameter
 * Added a check if the player is already on the premium list
 * Added a forwardSkin config option
 * Added premium UUID support
+* Updated to the newest changes of Spigot
 * Removes the need of an Bukkit auth plugin if you use a bungeecord one
 * Optimize performance and thread-safety
-* Added BungeeAuth support
-* Added /premium [player] command with optional player parameter
 * Fixed BungeeCord support
 * Changed config option autologin to autoregister to clarify the usage
-* Updated to the newest changes of Spigot
 
 ######0.6
 
diff --git a/README.md b/README.md
index 8ecf7dc4..6bc62a80 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,7 @@ Checks if a minecraft player has a paid account (premium). If so, they can skip
 So they don't need to enter passwords. This is also called auto login (auto-login).
 
 ###Features:
+
 * Detect paid accounts from others
 * Automatically login paid accounts (premium)
 * Support various of auth plugins
@@ -35,10 +36,10 @@ So they don't need to enter passwords. This is also called auto login (auto-logi
 * Plugin: [ProtocolLib](http://www.spigotmc.org/resources/protocollib.1997/)
 * Tested Bukkit/[Spigot](https://www.spigotmc.org) 1.9 (could also work with other versions)
 * Java 7+
-* Run Spigot and/or BungeeCord in offline mode (see server.properties or config.yml)
+* Run Spigot and/or BungeeCord/Waterfall in offline mode (see server.properties or config.yml)
 * An auth plugin. Supported Plugins
 
-####Bukkit
+####Bukkit/Spigot/PaperSPigot
 
 * [AuthMe](http://dev.bukkit.org/bukkit-plugins/authme-reloaded/)
 * [xAuth](http://dev.bukkit.org/bukkit-plugins/xauth/)
@@ -47,7 +48,7 @@ So they don't need to enter passwords. This is also called auto login (auto-logi
 * [RoyalAuth](http://dev.bukkit.org/bukkit-plugins/royalauth/)
 * [UltraAuth](http://dev.bukkit.org/bukkit-plugins/ultraauth-aa/)
 
-####BungeeCord
+####BungeeCord/Waterfall
 
 * [BungeeAuth](https://www.spigotmc.org/resources/bungeeauth.493/)
 
diff --git a/bukkit/pom.xml b/bukkit/pom.xml
index 1e20137f..df239e38 100644
--- a/bukkit/pom.xml
+++ b/bukkit/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.games647</groupId>
         <artifactId>fastlogin-parent</artifactId>
-        <version>0.7</version>
+        <version>0.8</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/FastLoginBukkit.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/FastLoginBukkit.java
index 9cb02b33..e936fd44 100644
--- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/FastLoginBukkit.java
+++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/FastLoginBukkit.java
@@ -6,14 +6,13 @@ import com.comphenix.protocol.ProtocolManager;
 import com.comphenix.protocol.utility.SafeCacheBuilder;
 import com.github.games647.fastlogin.bukkit.commands.CrackedCommand;
 import com.github.games647.fastlogin.bukkit.commands.PremiumCommand;
+import com.github.games647.fastlogin.bukkit.hooks.BukkitAuthPlugin;
 import com.github.games647.fastlogin.bukkit.listener.BukkitJoinListener;
 import com.github.games647.fastlogin.bukkit.listener.BungeeCordListener;
 import com.github.games647.fastlogin.bukkit.listener.EncryptionPacketListener;
-import com.github.games647.fastlogin.bukkit.listener.HandshakePacketListener;
-import com.github.games647.fastlogin.bukkit.listener.ProtcolSupportListener;
+import com.github.games647.fastlogin.bukkit.listener.ProtocolSupportListener;
 import com.github.games647.fastlogin.bukkit.listener.StartPacketListener;
 import com.google.common.cache.CacheLoader;
-import com.google.common.collect.MapMaker;
 import com.google.common.collect.Sets;
 import com.google.common.reflect.ClassPath;
 
@@ -25,9 +24,9 @@ import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 
 import org.apache.commons.lang.RandomStringUtils;
+import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
-import com.github.games647.fastlogin.bukkit.hooks.BukkitAuthPlugin;
 
 /**
  * This plugin checks if a player has a paid account and if so tries to skip offline mode authentication.
@@ -40,8 +39,7 @@ public class FastLoginBukkit extends JavaPlugin {
     //we need a thread-safe set because we access it async in the packet listener
     private final Set<String> enabledPremium = Sets.newConcurrentHashSet();
 
-    //player=fake player created by Protocollib | this mapmaker creates a concurrent map with weak keys
-    private final ConcurrentMap<Player, Object> bungeeCordUsers = new MapMaker().weakKeys().makeMap();
+    private final boolean bungeeCord = Bukkit.spigot().getConfig().getBoolean("bungeecord");
 
     //this map is thread-safe for async access (Packet Listener)
     //SafeCacheBuilder is used in order to be version independent
@@ -64,19 +62,20 @@ public class FastLoginBukkit extends JavaPlugin {
     @Override
     public void onEnable() {
         saveDefaultConfig();
-        if (getServer().getOnlineMode() || !registerHooks()) {
+        if (getServer().getOnlineMode()) {
             //we need to require offline to prevent a session request for a offline player
-            getLogger().severe("Server have to be in offline mode and have an auth plugin installed");
+            getLogger().severe("Server have to be in offline mode");
             setEnabled(false);
             return;
         }
 
+        registerHooks();
+
         //register listeners on success
         if (getServer().getPluginManager().isPluginEnabled("ProtocolSupport")) {
-            getServer().getPluginManager().registerEvents(new ProtcolSupportListener(this), this);
+            getServer().getPluginManager().registerEvents(new ProtocolSupportListener(this), this);
         } else {
             ProtocolManager protocolManager = ProtocolLibrary.getProtocolManager();
-            protocolManager.addPacketListener(new HandshakePacketListener(this));
 
             //we are performing HTTP request on these so run it async (seperate from the Netty IO threads)
             AsynchronousManager asynchronousManager = protocolManager.getAsynchronousManager();
@@ -100,7 +99,6 @@ public class FastLoginBukkit extends JavaPlugin {
         //clean up
         session.clear();
         enabledPremium.clear();
-        bungeeCordUsers.clear();
 
         //remove old blacklists
         for (Player player : getServer().getOnlinePlayers()) {
@@ -122,18 +120,6 @@ public class FastLoginBukkit extends JavaPlugin {
         return session;
     }
 
-    /**
-     * Gets a concurrent map with weak keys for all bungeecord users which could be detected. It's mapped by a fake
-     * instance of player created by Protocollib and a non-null raw object.
-     *
-     * Represents a similar set collection
-     *
-     * @return
-     */
-    public ConcurrentMap<Player, Object> getBungeeCordUsers() {
-        return bungeeCordUsers;
-    }
-
     /**
      * Gets the server KeyPair. This is used to encrypt or decrypt traffic between the client and server
      *
@@ -197,13 +183,14 @@ public class FastLoginBukkit extends JavaPlugin {
         if (authPluginHook == null) {
             //run this check for exceptions (errors) and not found plugins
             getLogger().warning("No support offline Auth plugin found. ");
-            getLogger().warning("Disabling this plugin...");
-
-            setEnabled(false);
             return false;
         }
 
         authPlugin = authPluginHook;
         return true;
     }
+
+    public boolean isBungee() {
+        return bungeeCord;
+    }
 }
diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/BukkitJoinListener.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/BukkitJoinListener.java
index 3e1f6648..6b0a4e59 100644
--- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/BukkitJoinListener.java
+++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/BukkitJoinListener.java
@@ -51,7 +51,8 @@ public class BukkitJoinListener implements Listener {
             public void run() {
                 if (player.isOnline()) {
                     //remove the bungeecord identifier
-                    String id = '/' + player.getAddress().getAddress().getHostAddress()  + ':' + player.getAddress().getPort();
+                    String id = '/' + player.getAddress().getAddress().getHostAddress() + ':'
+                            + player.getAddress().getPort();
                     PlayerSession session = plugin.getSessions().get(id);
 
                     //blacklist this target player for BungeeCord Id brute force attacks
diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/BungeeCordListener.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/BungeeCordListener.java
index 33928a05..999fe582 100644
--- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/BungeeCordListener.java
+++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/BungeeCordListener.java
@@ -67,7 +67,6 @@ public class BungeeCordListener implements PluginMessageListener {
 
                     //put it only if the user doesn't has a session open
                     //so that the player have to send the bungeecord packet and cannot skip the verification then
-
                     plugin.getSessions().putIfAbsent(checkedPlayer.getAddress().toString(), playerSession);
                 } else {
                     //blacklist target for the current login
diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/HandshakePacketListener.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/HandshakePacketListener.java
deleted file mode 100644
index ec793942..00000000
--- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/HandshakePacketListener.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.github.games647.fastlogin.bukkit.listener;
-
-import com.comphenix.protocol.PacketType;
-import com.comphenix.protocol.PacketType.Protocol;
-import com.comphenix.protocol.events.PacketAdapter;
-import com.comphenix.protocol.events.PacketContainer;
-import com.comphenix.protocol.events.PacketEvent;
-import com.github.games647.fastlogin.bukkit.FastLoginBukkit;
-
-import java.util.logging.Level;
-
-/**
- * Listens to incoming handshake packets.
- *
- * As BungeeCord sends additional information on the Handshake, we can detect it and check so if the player is coming
- * from a BungeeCord instance. IpForward has to be activated in the BungeeCord config to send these extra information.
- *
- * Packet information: http://wiki.vg/Protocol#Handshake
- *
- * Int=Protocol version String=connecting server address (and additional information from BungeeCord) int=server port
- * int=next state
- */
-public class HandshakePacketListener extends PacketAdapter {
-
-    //hides the inherit Plugin plugin field, but we need a more detailed type than just Plugin
-    private final FastLoginBukkit plugin;
-
-    public HandshakePacketListener(FastLoginBukkit plugin) {
-        //run async in order to not block the server, because we are making api calls to Mojang
-        super(params(plugin, PacketType.Handshake.Client.SET_PROTOCOL).optionAsync());
-
-        this.plugin = plugin;
-    }
-
-    @Override
-    public void onPacketReceiving(PacketEvent packetEvent) {
-        PacketContainer packet = packetEvent.getPacket();
-        Protocol nextProtocol = packet.getProtocols().read(0);
-
-        //we don't want to listen for server ping.
-        if (nextProtocol == Protocol.LOGIN) {
-            //here are the information written separated by a space
-            String hostname = packet.getStrings().read(0);
-            //https://hub.spigotmc.org/stash/projects/SPIGOT/repos/spigot/browse/CraftBukkit-Patches/0055-BungeeCord-Support.patch
-            String[] split = hostname.split("\00");
-            if (split.length == 3 || split.length == 4) {
-                plugin.getLogger().log(Level.FINER, "Detected BungeeCord for {0}", hostname);
-
-                //object = because there are no concurrent sets with weak keys
-                plugin.getBungeeCordUsers().put(packetEvent.getPlayer(), new Object());
-            }
-        }
-    }
-}
diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/ProtcolSupportListener.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/ProtocolSupportListener.java
similarity index 95%
rename from bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/ProtcolSupportListener.java
rename to bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/ProtocolSupportListener.java
index 69bcf7da..66285533 100644
--- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/ProtcolSupportListener.java
+++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/ProtocolSupportListener.java
@@ -12,11 +12,11 @@ import org.bukkit.event.Listener;
 import protocolsupport.api.events.PlayerLoginStartEvent;
 import protocolsupport.api.events.PlayerPropertiesResolveEvent;
 
-public class ProtcolSupportListener implements Listener {
+public class ProtocolSupportListener implements Listener {
 
     protected final FastLoginBukkit plugin;
 
-    public ProtcolSupportListener(FastLoginBukkit plugin) {
+    public ProtocolSupportListener(FastLoginBukkit plugin) {
         this.plugin = plugin;
     }
 
diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/StartPacketListener.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/StartPacketListener.java
index 6ab2555c..a3eb5409 100644
--- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/StartPacketListener.java
+++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/StartPacketListener.java
@@ -72,7 +72,7 @@ public class StartPacketListener extends PacketAdapter {
         String username = packet.getGameProfiles().read(0).getName();
         plugin.getLogger().log(Level.FINER, "Player {0} with {1} connecting to the server"
                 , new Object[]{sessionKey, username});
-        if (!plugin.getBungeeCordUsers().containsKey(player)) {
+        if (!plugin.isBungee()) {
             BukkitAuthPlugin authPlugin = plugin.getAuthPlugin();
             if (plugin.getEnabledPremium().contains(username)) {
                 enablePremiumLogin(username, sessionKey, player, packetEvent, true);
diff --git a/bungee/pom.xml b/bungee/pom.xml
index 69b3e657..5dcfb342 100644
--- a/bungee/pom.xml
+++ b/bungee/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.games647</groupId>
         <artifactId>fastlogin-parent</artifactId>
-        <version>0.7</version>
+        <version>0.8</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -17,6 +17,12 @@
     <name>FastLoginBungee</name>
 
     <repositories>
+        <!--Waterfall-->
+<!--        <repository>
+            <id>ellune-releases</id>
+            <url>https://repo.ellune.net/content/repositories/snapshots/</url>
+        </repository>-->
+
         <!-- BungeeCord -->
         <repository>
             <id>bungeecord-repo</id>
@@ -38,6 +44,13 @@
             <type>jar</type>
             <scope>provided</scope>
         </dependency>
+<!--        <dependency>
+            <groupId>io.github.waterfallmc</groupId>
+            <artifactId>waterfall-api</artifactId>
+            <version>1.9-SNAPSHOT</version>
+            <type>jar</type>
+            <scope>provided</scope>
+        </dependency>-->
 
         <dependency>
             <groupId>com.github.MatteCarra</groupId>
diff --git a/pom.xml b/pom.xml
index e3fb2d69..84e4b279 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
     <packaging>pom</packaging>
 
     <name>FastLogin</name>
-    <version>0.7</version>
+    <version>0.8</version>
     <inceptionYear>2015</inceptionYear>
     <url>https://www.spigotmc.org/resources/fastlogin.14153/</url>
     <description>
diff --git a/universal/pom.xml b/universal/pom.xml
index 349b98d5..39bc1dd5 100644
--- a/universal/pom.xml
+++ b/universal/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.games647</groupId>
         <artifactId>fastlogin-parent</artifactId>
-        <version>0.7</version>
+        <version>0.8</version>
         <relativePath>../pom.xml</relativePath>
     </parent>