diff --git a/Modules/Healthbar.lua b/Modules/Healthbar.lua
index 73ab9df..690506d 100644
--- a/Modules/Healthbar.lua
+++ b/Modules/Healthbar.lua
@@ -98,8 +98,9 @@ function Healthbar.OnEvent(self, event, unit)
     if event == "UNIT_HEALTH" then
         local health = UnitHealth(unit)
         local healthMax = UnitHealthMax(unit)
-        Healthbar:SetHealthText(self, health, healthMax)
+        self.hp:SetMinMaxValues(0, healthMax)
         self.hp:SetValue(UnitHealth(unit))
+        Healthbar:SetHealthText(self, health, healthMax)
     elseif event == "UNIT_MAXHEALTH" then
         local health = UnitHealth(unit)
         local healthMax = UnitHealthMax(unit)
@@ -109,7 +110,9 @@ function Healthbar.OnEvent(self, event, unit)
     elseif event == "UNIT_NAME_UPDATE" then
         local name = UnitName(unit)
         Gladdy.buttons[unit].name = name
-        self.nameText:SetText(name)
+        if Gladdy.db.healthName and not Gladdy.db.healthNameToArenaId then
+            self.nameText:SetText(name)
+        end
     end
     if not Gladdy.buttons[unit].class then
         Gladdy:SpotEnemy(unit, true)