diff --git a/Source/Framework/Constants/Language.cs b/Source/Framework/Constants/Language.cs
index 026ad85e0..288ec4546 100644
--- a/Source/Framework/Constants/Language.cs
+++ b/Source/Framework/Constants/Language.cs
@@ -105,7 +105,7 @@ namespace Framework.Constants
         Unknown = 45,
         Error = 46,
         NonExistCharacter = 47,
-        // Unused                           = 48,
+        Online = 48,
         LevelMinrequired = 49,
         LevelMinrequiredAndItem = 50,
         NpcTainerHello = 51,
diff --git a/Source/Framework/Database/Databases/CharacterDatabase.cs b/Source/Framework/Database/Databases/CharacterDatabase.cs
index 622be9575..f2301065d 100644
--- a/Source/Framework/Database/Databases/CharacterDatabase.cs
+++ b/Source/Framework/Database/Databases/CharacterDatabase.cs
@@ -541,7 +541,7 @@ namespace Framework.Database
             //0: lowGUID
             PrepareStatement(CharStatements.SEL_PINFO_XP, "SELECT a.xp, b.guid FROM characters a LEFT JOIN guild_member b ON a.guid = b.guid WHERE a.guid = ?");
             PrepareStatement(CharStatements.SEL_CHAR_HOMEBIND, "SELECT mapId, zoneId, posX, posY, posZ, orientation FROM character_homebind WHERE guid = ?");
-            PrepareStatement(CharStatements.SEL_CHAR_GUID_NAME_BY_ACC, "SELECT guid, name FROM characters WHERE account = ?");
+            PrepareStatement(CharStatements.SEL_CHAR_GUID_NAME_BY_ACC, "SELECT guid, name, online FROM characters WHERE account = ?");
             PrepareStatement(CharStatements.SEL_POOL_QUEST_SAVE, "SELECT quest_id FROM pool_quest_save WHERE pool_id = ?");
             PrepareStatement(CharStatements.SEL_CHAR_CUSTOMIZE_INFO, "SELECT name, race, class, gender, at_login FROM characters WHERE guid = ?");
             PrepareStatement(CharStatements.SEL_CHAR_RACE_OR_FACTION_CHANGE_INFOS, "SELECT at_login, knownTitles FROM characters WHERE guid = ?");
diff --git a/Source/Game/Chat/Commands/GoCommands.cs b/Source/Game/Chat/Commands/GoCommands.cs
index 0cee53d05..bdf5dad3a 100644
--- a/Source/Game/Chat/Commands/GoCommands.cs
+++ b/Source/Game/Chat/Commands/GoCommands.cs
@@ -192,7 +192,7 @@ namespace Game.Chat.Commands
                 return true;
             }
 
-            handler.SendSysMessage(CypherStrings.CommandGoInstanceFailed, mapId, scriptname, exit.target_mapId);
+            handler.SendSysMessage(CypherStrings.CommandGoInstanceFailed, mapId, scriptname, exit != null ? exit.target_mapId : -1);
             return false;
         }
 
diff --git a/Source/Game/Spells/Auras/AuraEffect.cs b/Source/Game/Spells/Auras/AuraEffect.cs
index 8429a0703..02a6764ec 100644
--- a/Source/Game/Spells/Auras/AuraEffect.cs
+++ b/Source/Game/Spells/Auras/AuraEffect.cs
@@ -4240,20 +4240,8 @@ namespace Game.Spells
                                     }
                                     break;
                                 case 36730:                                     // Flame Strike
-                                {
                                     target.CastSpell(target, 36731, new CastSpellExtraArgs(this));
                                     break;
-                                }
-                                case 44191:                                     // Flame Strike
-                                {
-                                    if (target.GetMap().IsDungeon())
-                                    {
-                                        uint spellId = (uint)(target.GetMap().IsHeroic() ? 46163 : 44190);
-
-                                        target.CastSpell(target, spellId, new CastSpellExtraArgs(this));
-                                    }
-                                    break;
-                                }
                                 case 43681: // Inactive
                                 {
                                     if (!target.IsTypeId(TypeId.Player) || aurApp.GetRemoveMode() != AuraRemoveMode.Expire)