diff --git a/src/network/ClientSideNetworkHandler.cpp b/src/network/ClientSideNetworkHandler.cpp
index c2eb5a7..df0a02d 100755
--- a/src/network/ClientSideNetworkHandler.cpp
+++ b/src/network/ClientSideNetworkHandler.cpp
@@ -1,6 +1,7 @@
 
 #include "ClientSideNetworkHandler.h"
 #include "client/Options.h"
+#include "network/packet/LoginStatusPacket.h"
 #include "packet/PacketInclude.h"
 #include "RakNetInstance.h"
 #include "../world/level/chunk/ChunkSource.h"
@@ -131,6 +132,12 @@ void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, LoginSta
 		LOGI("Disconnect! Server is outdated!\n");
 #ifndef STANDALONE_SERVER
 		minecraft->setScreen(new DisconnectionScreen("Could not connect: Outdated server!"));
+#endif
+	}
+	if (packet->status == LoginStatus::Failed_TakenNickname) {
+		LOGI("Disconnect! Nickname is taken!\n");
+#ifndef STANDALONE_SERVER
+		minecraft->setScreen(new DisconnectionScreen("Could not connect: Nickname is taken!"));
 #endif
 	}
 }
diff --git a/src/network/ServerSideNetworkHandler.cpp b/src/network/ServerSideNetworkHandler.cpp
index 5ac2ebd..c2ae85c 100755
--- a/src/network/ServerSideNetworkHandler.cpp
+++ b/src/network/ServerSideNetworkHandler.cpp
@@ -6,6 +6,7 @@
 #include "../world/Container.h"
 #include "../world/inventory/BaseContainerMenu.h"
 #include "network/packet/ContainerSetSlotPacket.h"
+#include "network/packet/LoginStatusPacket.h"
 #include "network/packet/RemoveBlockPacket.h"
 #include "network/packet/SendInventoryPacket.h"
 #include "network/packet/UpdateBlockPacket.h"
@@ -206,6 +207,14 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, LoginPac
 	if (oldClient || oldServer)
 		loginStatus = oldClient? LoginStatus::Failed_ClientOld : LoginStatus::Failed_ServerOld;
 
+	for (int i = 0; i < level->players.size(); i++) {
+		ServerPlayer* player = (ServerPlayer*) level->players.at(i);
+		
+		if (player->name == packet->clientName.C_String()) {
+			loginStatus = packet->newProto ? LoginStatus::Failed_TakenNickname : LoginStatus::Failed_ClientOld;
+		}
+	}
+
 	RakNet::BitStream bitStream;
 	LoginStatusPacket(loginStatus).write(&bitStream);
 	rakPeer->Send(&bitStream, HIGH_PRIORITY, RELIABLE_ORDERED, 0, source, false);
diff --git a/src/network/packet/LoginStatusPacket.h b/src/network/packet/LoginStatusPacket.h
index b194f8f..efa10f5 100755
--- a/src/network/packet/LoginStatusPacket.h
+++ b/src/network/packet/LoginStatusPacket.h
@@ -3,10 +3,12 @@
 
 #include "../Packet.h"
 
+// wtf why not enum
 namespace LoginStatus {
 	const int Success = 0;
 	const int Failed_ClientOld = 1;
 	const int Failed_ServerOld = 2;
+	const int Failed_TakenNickname = 3;
 }
 
 class LoginStatusPacket : public Packet {