diff --git a/indra/newview/hippogridmanager.cpp b/indra/newview/hippogridmanager.cpp
index 68891608a..4cbec7a06 100644
--- a/indra/newview/hippogridmanager.cpp
+++ b/indra/newview/hippogridmanager.cpp
@@ -196,7 +196,11 @@ void HippoGridInfo::setPlatform(const std::string& platform)
 	for (unsigned i=0; i<platform.size(); i++)
 		tmp[i] = tolower(tmp[i]);
 
-	if (tmp == "opensim") 
+	if (tmp == "aurora") 
+	{
+		setPlatform(PLATFORM_AURORA);
+	} 
+	else if (tmp == "opensim") 
 	{
 		setPlatform(PLATFORM_OPENSIM);
 	} 
@@ -555,7 +559,7 @@ const char* HippoGridInfo::getPlatformString(Platform platform)
 {
 	static const char* platformStrings[PLATFORM_LAST] = 
 	{
-		"Other", "OpenSim", "SecondLife"
+		"Other", "Aurora", "OpenSim", "SecondLife"
 	};
 
 	if ((platform < PLATFORM_OTHER) || (platform >= PLATFORM_LAST))
diff --git a/indra/newview/hippogridmanager.h b/indra/newview/hippogridmanager.h
index 1301ae1cc..071d16c7a 100644
--- a/indra/newview/hippogridmanager.h
+++ b/indra/newview/hippogridmanager.h
@@ -23,6 +23,7 @@ class HippoGridInfo
 public:
 	enum Platform {
 		PLATFORM_OTHER = 0,
+		PLATFORM_AURORA,
 		PLATFORM_OPENSIM,
 		PLATFORM_SECONDLIFE,
 		PLATFORM_LAST
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index 1920750be..29a73f8cd 100644
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -109,7 +109,12 @@ static bool nameSplit(const std::string& full, std::string& first, std::string&
 		return false;
 	first = fragments[0];
 	if (fragments.size() == 1)
-		last = "resident";
+	{
+		if (gHippoGridManager->getConnectedGrid()->isSecondLife())
+			last = "resident";
+		else
+			last = "";
+	}
 	else
 		last = fragments[1];
 	return (fragments.size() <= 2);
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index b61ad580e..a89b333ed 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -1797,7 +1797,6 @@ bool idle_startup()
 			{
 				gSavedSettings.setString("MapServerURL", map_server_url);
 				LLWorldMap::gotMapServerURL(true);
-				llinfos << "Got Map server URL: " << map_server_url << llendl;
 			}
 			
 			// Override grid info with anything sent in the login response