diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php
index 7399a5b5b..b96cc2761 100644
--- a/src/pocketmine/Player.php
+++ b/src/pocketmine/Player.php
@@ -1318,11 +1318,11 @@ class Player extends Human implements CommandSender, IPlayer{
 
 				foreach($this->server->getOnlinePlayers() as $p){
 					if($p !== $this and strtolower($p->getName()) === strtolower($this->getName())){
-						if($this->server->getConfigBoolean("kick-duplicate-names",true)) {
-							$p->close($p->getName() . " has left the game", "logged in from another location");
-						} else {
-							$this->close($this->username . " has left the game", "You are already logged on!");
+						if($p->kick("logged in from another location") === false){
+							$this->close($p->getName() . " has left the game", "already logged in");
 							return;
+						}else{
+							break;
 						}
 					}
 				}