diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java
index 45a6052e..4937fcb1 100644
--- a/src/main/java/fr/xephi/authme/AuthMe.java
+++ b/src/main/java/fr/xephi/authme/AuthMe.java
@@ -251,6 +251,10 @@ public class AuthMe extends JavaPlugin {
         if (!Settings.isForceSingleSessionEnabled) {
             ConsoleLogger.showError("WARNING!!! By disabling ForceSingleSession, your server protection is inadequate!");
         }
+        
+        if (Settings.getSessionTimeout == 0 && Settings.isSessionsEnabled){
+        	ConsoleLogger.showError("WARNING!!! You set session timeout to 0, this may cause security issues!");
+        }
 
         if (Settings.reloadSupport)
             try {
diff --git a/src/main/java/fr/xephi/authme/process/quit/AsyncronousQuit.java b/src/main/java/fr/xephi/authme/process/quit/AsyncronousQuit.java
index 4c833d66..e60d9719 100644
--- a/src/main/java/fr/xephi/authme/process/quit/AsyncronousQuit.java
+++ b/src/main/java/fr/xephi/authme/process/quit/AsyncronousQuit.java
@@ -78,18 +78,20 @@ public class AsyncronousQuit {
             LimboCache.getInstance().deleteLimboPlayer(name);
         }
         if (Settings.isSessionsEnabled && !isKick) {
-            BukkitTask task = plugin.getServer().getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
-
-                @Override
-                public void run() {
-                    PlayerCache.getInstance().removePlayer(name);
-                    if (database.isLogged(name))
-                        database.setUnlogged(name);
-                    plugin.sessions.remove(name);
-                }
-
-            }, Settings.getSessionTimeout * 20 * 60);
-            plugin.sessions.put(name, task);
+            if (Settings.getSessionTimeout != 0){
+	            BukkitTask task = plugin.getServer().getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
+	
+	                @Override
+	                public void run() {
+	                    PlayerCache.getInstance().removePlayer(name);
+	                    if (database.isLogged(name))
+	                        database.setUnlogged(name);
+	                    plugin.sessions.remove(name);
+	                }
+	
+	            }, Settings.getSessionTimeout * 20 * 60);
+	            plugin.sessions.put(name, task);
+            }
         } else {
             PlayerCache.getInstance().removePlayer(name);
             database.setUnlogged(name);