diff --git a/RaidNotifier.lua b/RaidNotifier.lua
index a87ad05..4f477cb 100644
--- a/RaidNotifier.lua
+++ b/RaidNotifier.lua
@@ -232,10 +232,9 @@ do ----------------------
 
 	function RaidNotifier.OnUltimateReceived(unitTag, ultimateCurrent, ultimateCost) --, ultimateGroupId, isSelf)
 		local self     = RaidNotifier
-		local userName = GetUnitDisplayName(unitTag)
-		ultimates[userName] = 
+		ultimates[unitTag] = 
 		{
-			userName = userName,
+			unitTag  = unitTag,
 			name     = GetUnitName(unitTag),
 			roles    = {GetGroupMemberRoles(unitTag)},
 			current  = ultimateCurrent,
diff --git a/UI.lua b/UI.lua
index b8f13e0..b8ee24e 100644
--- a/UI.lua
+++ b/UI.lua
@@ -107,10 +107,12 @@ do --------------------
 
 		local settings = self.Vars.ultimate
 
+		local GetName = settings.useDisplayName and GetUnitDisplayName or GetUnitName 
+
 		if sortedUlti then
 			local text = "Ultimates:" --TODO: grab text from abilityId??
 			for i, data in ipairs(sortedUlti) do
-				local name = data.userName
+				local name = GetName(data.unitTag)
 				local c1,c2 = "",""
 				if settings.useColor then
 					if data.percent >= 100 then
@@ -576,4 +578,4 @@ do -----------------
 		end
 	end
 
-end
\ No newline at end of file
+end