diff --git a/ouf.lua b/ouf.lua
index d19fdddb9..80d3c26f4 100644
--- a/ouf.lua
+++ b/ouf.lua
@@ -396,12 +396,17 @@ local initObject = function(unit, style, styleFunc, ...)
 
 		-- Attempt to guess what the header is set to spawn.
 		local parent = object:GetParent()
+		local suffix = object:GetAttribute'unitsuffix'
 		if(not unit) then
 			if(parent:GetAttribute'showRaid') then
 				unit = 'raid'
 			elseif(parent:GetAttribute'showParty') then
 				unit = 'party'
 			end
+
+			if(unit and suffix) then
+				unit = unit .. suffix
+			end
 		end
 
 		-- Run it before the style function so they can override it.
@@ -425,7 +430,6 @@ local initObject = function(unit, style, styleFunc, ...)
 		local height = object:GetAttribute'initial-height'
 		local width = object:GetAttribute'initial-width'
 		local scale = object:GetAttribute'initial-scale'
-		local suffix = object:GetAttribute'unitsuffix'
 		local combat = InCombatLockdown()
 
 		if(height) then