diff --git a/CHANGELOG.md b/CHANGELOG.md
index f39a3710..d9a39781 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+######1.6.1
+
+* Fix message typo in BungeeCord which created a NPE if premium-warning is activated
+
 ######1.6
 
 * Add a warning message if the user tries to invoke the premium command
diff --git a/bukkit/pom.xml b/bukkit/pom.xml
index fe9e1afc..42cdb7f1 100644
--- a/bukkit/pom.xml
+++ b/bukkit/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.games647</groupId>
         <artifactId>fastlogin</artifactId>
-        <version>1.6</version>
+        <version>1.6.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/commands/CrackedCommand.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/commands/CrackedCommand.java
index bd693687..c3a71212 100644
--- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/commands/CrackedCommand.java
+++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/commands/CrackedCommand.java
@@ -83,7 +83,6 @@ public class CrackedCommand implements CommandExecutor {
             if (profile.isPremium()) {
                 sender.sendMessage(plugin.getCore().getMessage("remove-premium"));
                 profile.setPremium(false);
-                profile.setUuid(null);
                 Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
                     @Override
                     public void run() {
diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/tasks/ForceLoginTask.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/tasks/ForceLoginTask.java
index d451e9ea..36ecabb4 100644
--- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/tasks/ForceLoginTask.java
+++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/tasks/ForceLoginTask.java
@@ -64,7 +64,7 @@ public class ForceLoginTask implements Runnable {
                     if (playerProfile != null) {
                         playerProfile.setUuid(session.getUuid());
                         //save cracked players too
-                        playerProfile.setPremium(session.isVerified());
+                        playerProfile.setPremium(true);
                         storage.save(playerProfile);
                     }
 
@@ -87,7 +87,7 @@ public class ForceLoginTask implements Runnable {
         String generatedPassword = plugin.generateStringPassword(player);
         boolean success = authPlugin.forceRegister(player, generatedPassword);
         String message = plugin.getCore().getMessage("auto-register");
-        if (message != null) {
+        if (success && message != null) {
             message = message.replace("%password", generatedPassword);
             player.sendMessage(message);
         }
@@ -100,7 +100,7 @@ public class ForceLoginTask implements Runnable {
         boolean success = authPlugin.forceLogin(player);
 
         String message = plugin.getCore().getMessage("auto-login");
-        if (message != null) {
+        if (success && message != null) {
             player.sendMessage(message);
         }
 
diff --git a/bungee/pom.xml b/bungee/pom.xml
index 5a626267..46cb30c9 100644
--- a/bungee/pom.xml
+++ b/bungee/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.games647</groupId>
         <artifactId>fastlogin</artifactId>
-        <version>1.6</version>
+        <version>1.6.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/PluginMessageListener.java b/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/PluginMessageListener.java
index 72f18a8a..04b95f1e 100644
--- a/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/PluginMessageListener.java
+++ b/bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/PluginMessageListener.java
@@ -51,7 +51,7 @@ public class PluginMessageListener implements Listener {
 
             if (playerName.equals(fromPlayer.getName()) && plugin.getConfig().getBoolean("premium-warning")
                     && !plugin.getPendingConfirms().contains(fromPlayer.getUniqueId())) {
-                fromPlayer.sendMessage(TextComponent.fromLegacyText(plugin.getCore().getMessage("premium-warming")));
+                fromPlayer.sendMessage(TextComponent.fromLegacyText(plugin.getCore().getMessage("premium-warning")));
                 plugin.getPendingConfirms().add(fromPlayer.getUniqueId());
                 return;
             }
diff --git a/core/pom.xml b/core/pom.xml
index 2a982962..e4621c1b 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.games647</groupId>
         <artifactId>fastlogin</artifactId>
-        <version>1.6</version>
+        <version>1.6.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/core/src/main/java/com/github/games647/fastlogin/core/Storage.java b/core/src/main/java/com/github/games647/fastlogin/core/Storage.java
index e44204f5..f5892e2d 100644
--- a/core/src/main/java/com/github/games647/fastlogin/core/Storage.java
+++ b/core/src/main/java/com/github/games647/fastlogin/core/Storage.java
@@ -79,7 +79,7 @@ public class Storage {
         ResultSet resultSet = null;
         try {
             con = dataSource.getConnection();
-            loadStmt = con.prepareStatement("SELECT * FROM " + PREMIUM_TABLE + " WHERE Name=?");
+            loadStmt = con.prepareStatement("SELECT * FROM " + PREMIUM_TABLE + " WHERE Name=? LIMIT 1");
             loadStmt.setString(1, name);
 
             resultSet = loadStmt.executeQuery();
@@ -120,7 +120,7 @@ public class Storage {
         ResultSet resultSet = null;
         try {
             con = dataSource.getConnection();
-            loadStmt = con.prepareStatement("SELECT * FROM " + PREMIUM_TABLE + " WHERE UUID=?");
+            loadStmt = con.prepareStatement("SELECT * FROM " + PREMIUM_TABLE + " WHERE UUID=? LIMIT 1");
             loadStmt.setString(1, uuid.toString().replace("-", ""));
 
             resultSet = loadStmt.executeQuery();
diff --git a/pom.xml b/pom.xml
index 783f1715..12bdba06 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
     <packaging>pom</packaging>
 
     <name>FastLogin</name>
-    <version>1.6</version>
+    <version>1.6.1</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 e9e50fdf..131a8d25 100644
--- a/universal/pom.xml
+++ b/universal/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.games647</groupId>
         <artifactId>fastlogin</artifactId>
-        <version>1.6</version>
+        <version>1.6.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>