diff --git a/Game/Chat/Commands/BNetAccountCommands.cs b/Game/Chat/Commands/BNetAccountCommands.cs
index 3a2406899..490bf5994 100644
--- a/Game/Chat/Commands/BNetAccountCommands.cs
+++ b/Game/Chat/Commands/BNetAccountCommands.cs
@@ -222,12 +222,12 @@ namespace Game.Chat.Commands
             }
 
             // We compare the old, saved password to the entered old password - no chance for the unauthorized.
-            if (!Global.BNetAccountMgr.CheckPassword(handler.GetSession().GetAccountId(), oldPassword))
+            if (!Global.BNetAccountMgr.CheckPassword(handler.GetSession().GetBattlenetAccountId(), oldPassword))
             {
                 handler.SendSysMessage(CypherStrings.CommandWrongoldpassword);
 
                 Log.outInfo(LogFilter.Player, "Battle.net account: {0} (IP: {1}) Character:[{2}] ({3}) Tried to change password, but the provided old password is wrong.",
-                    handler.GetSession().GetAccountId(), handler.GetSession().GetRemoteAddress(), handler.GetSession().GetPlayer().GetName(), handler.GetSession().GetPlayer().GetGUID().ToString());
+                    handler.GetSession().GetBattlenetAccountId(), handler.GetSession().GetRemoteAddress(), handler.GetSession().GetPlayer().GetName(), handler.GetSession().GetPlayer().GetGUID().ToString());
                 return false;
             }
 
diff --git a/Game/Spells/Auras/Aura.cs b/Game/Spells/Auras/Aura.cs
index 16c66f464..e36f22c18 100644
--- a/Game/Spells/Auras/Aura.cs
+++ b/Game/Spells/Auras/Aura.cs
@@ -1834,10 +1834,10 @@ namespace Game.Spells
             }
         }
 
-        public virtual void Remove(AuraRemoveMode removeMode = AuraRemoveMode.Default) { }        
+        public virtual void Remove(AuraRemoveMode removeMode = AuraRemoveMode.Default) { }
         #region CallScripts
 
-    bool CallScriptCheckAreaTargetHandlers(Unit target)
+        bool CallScriptCheckAreaTargetHandlers(Unit target)
         {
             bool result = true;
             foreach (var auraScript in m_loadedScripts)