diff --git a/source/cAuthenticator.cpp b/source/cAuthenticator.cpp
index 268514940..d34758c34 100644
--- a/source/cAuthenticator.cpp
+++ b/source/cAuthenticator.cpp
@@ -163,10 +163,10 @@ bool cAuthenticator::AuthFromAddress(const AString & a_Server, const AString & a
 	
 	Link.SendMessage( AString( "GET " + a_Address + " HTTP/1.1\r\n" ).c_str());
 	Link.SendMessage( AString( "User-Agent: MCServer\r\n" ).c_str());
-	// FIXME: AString( "Host: %s\r\n", a_Server.c_str() ).c_str() doesn't work. Causes segfault.
-	Link.SendMessage( AString( "Host: session.minecraft.net\r\n" ).c_str());
+	Link.SendMessage( AString( "Host: " + a_Server + "\r\n" ).c_str());
+	//Link.SendMessage( AString( "Host: session.minecraft.net\r\n" ).c_str());
 	Link.SendMessage( AString( "Accept: */*\r\n" ).c_str());
-	Link.SendMessage( AString( "Connection: keep-alive\r\n" ).c_str());
+	Link.SendMessage( AString( "Connection: close\r\n" ).c_str());	//Close so we donīt have to mess with the Content-Length :)
 	Link.SendMessage( AString( "\r\n" ).c_str());
 	AString DataRecvd;
 	Link.ReceiveData(DataRecvd);
@@ -266,14 +266,15 @@ bool cAuthenticator::AuthFromAddress(const AString & a_Server, const AString & a
 	std::string Result;
 	ss >> Result;
 	LOGINFO("Got result: %s", Result.c_str());
-	// if (Result.compare("YES") == 0)
-	// TODO: I'm assuming the only response containing 3 letters is "YES", but proper reading of the return code
-	//       would be preferred.
-	if (Result.compare("3") == 0) // FIXME: Quick and dirty hack to support auth
+	//if (Result.compare("3") == 0) // FIXME: Quick and dirty hack to support auth
+	//Lapayo: Wtf 3? 
+	if (Result.compare("YES") == 0)	//Works well
 	{
 		LOGINFO("Result was \"YES\", so player is authenticated!");
 		return true;
 	}
+
+
 	LOGINFO("Result was \"%s\", so player is NOT authenticated!", Result.c_str());
 	return false;
 }