Index: src/game/Player.cpp
===================================================================
--- src/game/Player.cpp	(revision 107)
+++ src/game/Player.cpp	(working copy)
@@ -6814,16 +6814,13 @@
 		WorldPacket data(4);
 		if(pMapinfo->HasFlag(WMI_INSTANCE_WELCOME))
 		{
-			std::string welcome_msg;
-			welcome_msg = "Welcome to ";
-			welcome_msg += pMapinfo->name;
-			welcome_msg += ".";
             if(pMapinfo->type == INSTANCE_RAID || pMapinfo->type == INSTANCE_MULTIMODE && iInstanceType == MODE_HEROIC)
 			{
+				std::string welcome_msg;
 				welcome_msg += "This instance is scheduled to reset on ";
 				welcome_msg += asctime(localtime(&GetMapMgr()->RaidExpireTime));
+				sChatHandler.SystemMessage(m_session, welcome_msg.c_str());
 			}
-			sChatHandler.SystemMessage(m_session, welcome_msg.c_str());
 		}
 		if(pMapinfo->type == INSTANCE_NONRAID || pMapinfo->type == INSTANCE_MULTIMODE && iInstanceType == MODE_NORMAL)
 		{