diff --git a/ServerAuth/plugin.yml b/ServerAuth/plugin.yml
index 26140ef..69a4278 100644
--- a/ServerAuth/plugin.yml
+++ b/ServerAuth/plugin.yml
@@ -1,6 +1,6 @@
 name: ServerAuth
 main: ServerAuth\ServerAuth
-version: "2.10"
+version: "2.11"
 api: [1.11.0]
 load: STARTUP
 author: EvolSoft
diff --git a/ServerAuth/src/ServerAuth/Commands/ChangePassword.php b/ServerAuth/src/ServerAuth/Commands/ChangePassword.php
index 25297e5..7659f90 100644
--- a/ServerAuth/src/ServerAuth/Commands/ChangePassword.php
+++ b/ServerAuth/src/ServerAuth/Commands/ChangePassword.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * ServerAuth (v2.10) by EvolSoft
+ * ServerAuth (v2.11) by EvolSoft
  * Developer: EvolSoft (Flavius12)
  * Website: http://www.evolsoft.tk
  * Date: 31/08/2015 10:27 AM (UTC)
diff --git a/ServerAuth/src/ServerAuth/Commands/Commands.php b/ServerAuth/src/ServerAuth/Commands/Commands.php
index 3a5c8d2..efebbea 100644
--- a/ServerAuth/src/ServerAuth/Commands/Commands.php
+++ b/ServerAuth/src/ServerAuth/Commands/Commands.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * ServerAuth (v2.10) by EvolSoft
+ * ServerAuth (v2.11) by EvolSoft
  * Developer: EvolSoft (Flavius12)
  * Website: http://www.evolsoft.tk
  * Date: 31/08/2015 10:31 AM (UTC)
diff --git a/ServerAuth/src/ServerAuth/Commands/Login.php b/ServerAuth/src/ServerAuth/Commands/Login.php
index 58e4ffc..d73d289 100644
--- a/ServerAuth/src/ServerAuth/Commands/Login.php
+++ b/ServerAuth/src/ServerAuth/Commands/Login.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * ServerAuth (v2.00) by EvolSoft
+ * ServerAuth (v2.11) by EvolSoft
  * Developer: EvolSoft (Flavius12)
  * Website: http://www.evolsoft.tk
  * Date: 31/08/2015 10:48 AM (UTC)
diff --git a/ServerAuth/src/ServerAuth/Commands/Logout.php b/ServerAuth/src/ServerAuth/Commands/Logout.php
index 0413c71..acb14c8 100644
--- a/ServerAuth/src/ServerAuth/Commands/Logout.php
+++ b/ServerAuth/src/ServerAuth/Commands/Logout.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * ServerAuth (v2.10) by EvolSoft
+ * ServerAuth (v2.11) by EvolSoft
  * Developer: EvolSoft (Flavius12)
  * Website: http://www.evolsoft.tk
  * Date: 31/08/2015 10:56 AM (UTC)
diff --git a/ServerAuth/src/ServerAuth/Commands/Register.php b/ServerAuth/src/ServerAuth/Commands/Register.php
index c024829..5e3cf46 100644
--- a/ServerAuth/src/ServerAuth/Commands/Register.php
+++ b/ServerAuth/src/ServerAuth/Commands/Register.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * ServerAuth (v2.10) by EvolSoft
+ * ServerAuth (v2.11) by EvolSoft
  * Developer: EvolSoft (Flavius12)
  * Website: http://www.evolsoft.tk
  * Date: 31/08/2015 11:03 AM (UTC)
diff --git a/ServerAuth/src/ServerAuth/Commands/Unregister.php b/ServerAuth/src/ServerAuth/Commands/Unregister.php
index 3cbf694..5693835 100644
--- a/ServerAuth/src/ServerAuth/Commands/Unregister.php
+++ b/ServerAuth/src/ServerAuth/Commands/Unregister.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * ServerAuth (v2.10) by EvolSoft
+ * ServerAuth (v2.11) by EvolSoft
  * Developer: EvolSoft (Flavius12)
  * Website: http://www.evolsoft.tk
  * Date: 31/08/2015 11:09 AM (UTC)
diff --git a/ServerAuth/src/ServerAuth/EventListener.php b/ServerAuth/src/ServerAuth/EventListener.php
index 529d756..c5792dd 100644
--- a/ServerAuth/src/ServerAuth/EventListener.php
+++ b/ServerAuth/src/ServerAuth/EventListener.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * ServerAuth (v2.10) by EvolSoft
+ * ServerAuth (v2.11) by EvolSoft
  * Developer: EvolSoft (Flavius12)
  * Website: http://www.evolsoft.tk
  * Date: 31/08/2015 05:39 PM (UTC)
diff --git a/ServerAuth/src/ServerAuth/Events/ServerAuthAuthenticateEvent.php b/ServerAuth/src/ServerAuth/Events/ServerAuthAuthenticateEvent.php
index ac6900e..4efeb04 100644
--- a/ServerAuth/src/ServerAuth/Events/ServerAuthAuthenticateEvent.php
+++ b/ServerAuth/src/ServerAuth/Events/ServerAuthAuthenticateEvent.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * ServerAuth (v2.10) by EvolSoft
+ * ServerAuth (v2.11) by EvolSoft
  * Developer: EvolSoft (Flavius12)
  * Website: http://www.evolsoft.tk
  * Date: 10/05/2015 02:17 PM (UTC)
diff --git a/ServerAuth/src/ServerAuth/Events/ServerAuthDeauthenticateEvent.php b/ServerAuth/src/ServerAuth/Events/ServerAuthDeauthenticateEvent.php
index 1c6a0ab..463e613 100644
--- a/ServerAuth/src/ServerAuth/Events/ServerAuthDeauthenticateEvent.php
+++ b/ServerAuth/src/ServerAuth/Events/ServerAuthDeauthenticateEvent.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * ServerAuth (v2.10) by EvolSoft
+ * ServerAuth (v2.11) by EvolSoft
  * Developer: EvolSoft (Flavius12)
  * Website: http://www.evolsoft.tk
  * Date: 10/05/2015 02:19 PM (UTC)
diff --git a/ServerAuth/src/ServerAuth/Events/ServerAuthPasswordChangeEvent.php b/ServerAuth/src/ServerAuth/Events/ServerAuthPasswordChangeEvent.php
index 43ed3b8..4707760 100644
--- a/ServerAuth/src/ServerAuth/Events/ServerAuthPasswordChangeEvent.php
+++ b/ServerAuth/src/ServerAuth/Events/ServerAuthPasswordChangeEvent.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * ServerAuth (v2.10) by EvolSoft
+ * ServerAuth (v2.11) by EvolSoft
  * Developer: EvolSoft (Flavius12)
  * Website: http://www.evolsoft.tk
  * Date: 10/05/2015 02:22 PM (UTC)
diff --git a/ServerAuth/src/ServerAuth/Events/ServerAuthRegisterEvent.php b/ServerAuth/src/ServerAuth/Events/ServerAuthRegisterEvent.php
index 543bb64..f88c9a5 100644
--- a/ServerAuth/src/ServerAuth/Events/ServerAuthRegisterEvent.php
+++ b/ServerAuth/src/ServerAuth/Events/ServerAuthRegisterEvent.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * ServerAuth (v2.10) by EvolSoft
+ * ServerAuth (v2.11) by EvolSoft
  * Developer: EvolSoft (Flavius12)
  * Website: http://www.evolsoft.tk
  * Date: 10/05/2015 02:22 PM (UTC)
diff --git a/ServerAuth/src/ServerAuth/Events/ServerAuthUnregisterEvent.php b/ServerAuth/src/ServerAuth/Events/ServerAuthUnregisterEvent.php
index 189c10b..5a1f1f2 100644
--- a/ServerAuth/src/ServerAuth/Events/ServerAuthUnregisterEvent.php
+++ b/ServerAuth/src/ServerAuth/Events/ServerAuthUnregisterEvent.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * ServerAuth (v2.10) by EvolSoft
+ * ServerAuth (v2.11) by EvolSoft
  * Developer: EvolSoft (Flavius12)
  * Website: http://www.evolsoft.tk
  * Date: 31/08/2015 12:49 AM (UTC)
diff --git a/ServerAuth/src/ServerAuth/ServerAuth.php b/ServerAuth/src/ServerAuth/ServerAuth.php
index 65e50d8..e0e9b87 100644
--- a/ServerAuth/src/ServerAuth/ServerAuth.php
+++ b/ServerAuth/src/ServerAuth/ServerAuth.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * ServerAuth (v2.10) by EvolSoft
+ * ServerAuth (v2.11) by EvolSoft
  * Developer: EvolSoft (Flavius12)
  * Website: http://www.evolsoft.tk
  * Date: 31/08/2015 05:26 PM (UTC)
@@ -28,7 +28,7 @@ class ServerAuth extends PluginBase {
 	const PRODUCER = "EvolSoft";
 	
 	/** @var string VERSION Plugin version */
-	const VERSION = "2.10";
+	const VERSION = "2.11";
 	
 	/** @var string MAIN_WEBSITE Plugin producer website */
 	const MAIN_WEBSITE = "http://www.evolsoft.tk";
@@ -701,8 +701,23 @@ public function authenticatePlayer(Player $player, $password, $hash = true){
     					$data->set("lastlogin", $player->getLastPlayed());
     					$data->save();
     					$this->auth_users[strtolower($player->getName())] = "";
+    					if($cfg['login']['enable-failed-logins-kick'] && isset($this->auth_attempts[strtolower($player->getName())])){
+    						unset($this->auth_attempts[strtolower($player->getName())]);
+    					}
     					return ServerAuth::SUCCESS;
     				}else{
+    					if($cfg['login']['enable-failed-logins-kick']){
+    						if(isset($this->auth_attempts[strtolower($player->getName())])){
+    							$this->auth_attempts[strtolower($player->getName())]++;
+    						}else{
+    							$this->auth_attempts[strtolower($player->getName())] = 1;
+    						}
+    						if($this->auth_attempts[strtolower($player->getName())] >= $cfg['login']['max-login-attempts']){
+    							$player->close("", $this->translateColors("&", ServerAuth::getAPI()->getConfigLanguage()->getAll()["login"]["too-many-attempts"]));
+    							unset($this->auth_attempts[strtolower($player->getName())]);
+    							return ServerAuth::TOO_MANY_ATTEMPTS;
+    						}
+    					}    					
     					return ServerAuth::ERR_WRONG_PASSWORD;
     				}
     			}
diff --git a/ServerAuth/src/ServerAuth/Tasks/MessageTask.php b/ServerAuth/src/ServerAuth/Tasks/MessageTask.php
index 0b708ea..8b5e0d7 100644
--- a/ServerAuth/src/ServerAuth/Tasks/MessageTask.php
+++ b/ServerAuth/src/ServerAuth/Tasks/MessageTask.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * ServerAuth (v2.10) by EvolSoft
+ * ServerAuth (v2.11) by EvolSoft
  * Developer: EvolSoft (Flavius12)
  * Website: http://www.evolsoft.tk
  * Date: 30/08/2015 11:29 AM (UTC)
diff --git a/ServerAuth/src/ServerAuth/Tasks/MySQLTask.php b/ServerAuth/src/ServerAuth/Tasks/MySQLTask.php
index 4b283d5..932d05a 100644
--- a/ServerAuth/src/ServerAuth/Tasks/MySQLTask.php
+++ b/ServerAuth/src/ServerAuth/Tasks/MySQLTask.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * ServerAuth (v2.10) by EvolSoft
+ * ServerAuth (v2.11) by EvolSoft
  * Developer: EvolSoft (Flavius12)
  * Website: http://www.evolsoft.tk
  * Date: 14/05/2015 05:19 PM (UTC)