diff --git a/CHANGELOG.md b/CHANGELOG.md
index ea196600..02294fe7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+######1.3.1
+
+* Prevent thread create violation in BungeeCord
+
 ######1.3
 
 * Added support for AuthMe 3.X
diff --git a/bukkit/pom.xml b/bukkit/pom.xml
index 30a610ea..fb77afb6 100644
--- a/bukkit/pom.xml
+++ b/bukkit/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.games647</groupId>
         <artifactId>fastlogin</artifactId>
-        <version>1.3</version>
+        <version>1.3.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/bungee/pom.xml b/bungee/pom.xml
index ba4f058c..85af835b 100644
--- a/bungee/pom.xml
+++ b/bungee/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.games647</groupId>
         <artifactId>fastlogin</artifactId>
-        <version>1.3</version>
+        <version>1.3.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/bungee/src/main/java/com/github/games647/fastlogin/bungee/Storage.java b/bungee/src/main/java/com/github/games647/fastlogin/bungee/Storage.java
index 4c07507a..7e66700a 100644
--- a/bungee/src/main/java/com/github/games647/fastlogin/bungee/Storage.java
+++ b/bungee/src/main/java/com/github/games647/fastlogin/bungee/Storage.java
@@ -2,6 +2,7 @@ package com.github.games647.fastlogin.bungee;
 
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
 
@@ -14,6 +15,7 @@ import java.util.UUID;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
+import net.md_5.bungee.api.scheduler.GroupedThreadFactory;
 
 public class Storage {
 
@@ -42,6 +44,14 @@ public class Storage {
         databaseConfig.setUsername(user);
         databaseConfig.setPassword(pass);
         databaseConfig.setDriverClassName(driver);
+        String pluginName = plugin.getDescription().getName();
+
+        //set a custom thread factory to remove BungeeCord warning about different threads
+        databaseConfig.setThreadFactory(new ThreadFactoryBuilder()
+                .setNameFormat(pluginName + " Database Pool Thread #%1$d")
+                //Hikari create daemons by default
+                .setDaemon(true)
+                .setThreadFactory(new GroupedThreadFactory(plugin, pluginName)).build());
 
         databasePath = databasePath.replace("{pluginDir}", plugin.getDataFolder().getAbsolutePath());
 
diff --git a/pom.xml b/pom.xml
index 079a33c2..ae394f0f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
     <packaging>pom</packaging>
 
     <name>FastLogin</name>
-    <version>1.3</version>
+    <version>1.3.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 ed4695e6..1d962491 100644
--- a/universal/pom.xml
+++ b/universal/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.github.games647</groupId>
         <artifactId>fastlogin</artifactId>
-        <version>1.3</version>
+        <version>1.3.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>