diff --git a/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Config.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Config.java
index 4b17529..570c389 100644
--- a/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Config.java
+++ b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Config.java
@@ -128,6 +128,12 @@ public boolean useOnlineUUIDs()
 		{
 			if(isBungeeCordModeEnabled())
 			{
+				Boolean detectedOnlineMode = Utils.getBungeeOrVelocityOnlineMode();
+				if (detectedOnlineMode != null)
+				{
+					logger.info("Detected online mode in paper config: " + detectedOnlineMode);
+					return detectedOnlineMode;
+				}
 				logger.warning("When using BungeeCord please make sure to set the UUID_Type config option explicitly!");
 			}
 			return Bukkit.getServer().getOnlineMode();
@@ -222,13 +228,13 @@ public String getUpdateChannel()
 	public boolean isBungeeCordModeEnabled()
 	{
 		boolean useBungee = getConfigE().getBoolean("Misc.UseBungeeCord", false);
-		boolean spigotUsesBungee = Utils.detectBungeeCord();
+		boolean runsProxy = Utils.detectBungeeCord() || Utils.detectVelocity();
 		boolean shareableDB = getDatabaseType().equals("mysql") || getDatabaseType().equals("global");
-		if(useBungee && !spigotUsesBungee)
+		if(useBungee && !runsProxy)
 		{
 			logger.warning("You have BungeeCord enabled for the plugin, but it looks like you have not enabled it in your spigot.yml! You probably should check your configuration.");
 		}
-		else if(!useBungee && spigotUsesBungee && shareableDB)
+		else if(!useBungee && runsProxy && shareableDB)
 		{
 			logger.warning("Your server is running behind a BungeeCord server. If you are using the plugin on more than one server with a shared database, please make sure to also enable the 'UseBungeeCord' config option.");
 		}
diff --git a/pom.xml b/pom.xml
index 6b09398..c031202 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 	<packaging>pom</packaging>
 
 	<properties>
-		<revision>2.4.18</revision>
+		<revision>2.4.19</revision>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>