diff --git a/Source/Game/Entities/TemporarySummon.cs b/Source/Game/Entities/TemporarySummon.cs
index 9bdd6af97..8cdc27c37 100644
--- a/Source/Game/Entities/TemporarySummon.cs
+++ b/Source/Game/Entities/TemporarySummon.cs
@@ -484,7 +484,10 @@ namespace Game.Entities
             if (petType == PetType.Hunter) // Hunter pets have focus
                 SetPowerType(PowerType.Focus);
             else if (IsPetGhoul() || IsPetAbomination()) // DK pets have energy
+            {
                 SetPowerType(PowerType.Energy);
+                SetFullPower(PowerType.Energy);
+            }
             else if (IsPetImp() || IsPetFelhunter() || IsPetVoidwalker() || IsPetSuccubus() || IsPetDoomguard() || IsPetFelguard()) // Warlock pets have energy (since 5.x)
                 SetPowerType(PowerType.Energy);
             else
diff --git a/Source/Game/Entities/Vehicle.cs b/Source/Game/Entities/Vehicle.cs
index 0c9086420..e2e82f03e 100644
--- a/Source/Game/Entities/Vehicle.cs
+++ b/Source/Game/Entities/Vehicle.cs
@@ -70,14 +70,7 @@ namespace Game.Entities
 
         public void Install()
         {
-            if (_me.IsTypeId(TypeId.Unit))
-            {
-                PowerDisplayRecord powerDisplay = CliDB.PowerDisplayStorage.LookupByKey(_vehicleInfo.PowerDisplayID[0]);
-                if (powerDisplay != null)
-                    _me.SetPowerType((PowerType)powerDisplay.ActualType);
-                else if (_me.GetClass() == Class.Rogue)
-                    _me.SetPowerType(PowerType.Energy);
-            }
+            _me.UpdateDisplayPower();
 
             _status = Status.Installed;
             if (GetBase().IsTypeId(TypeId.Unit))