diff --git a/skins/blizzard/friends.lua b/skins/blizzard/friends.lua
index 4b5b5838..36157a25 100644
--- a/skins/blizzard/friends.lua
+++ b/skins/blizzard/friends.lua
@@ -535,13 +535,14 @@ pfUI:RegisterSkin("Friends", function ()
         local name, guild, level, race, class, zone = GetWhoInfo(off + i)
         local displayedText = ""
 
-        if ( max > MAX_WHOS_FROM_SERVER ) then
-          displayedText = format(WHO_FRAME_SHOWN_TEMPLATE, MAX_WHOS_FROM_SERVER);
+        if num + 1 >= MAX_WHOS_FROM_SERVER then
+          displayedText = format(WHO_FRAME_SHOWN_TEMPLATE, MAX_WHOS_FROM_SERVER)
+          WhoFrameTotals:SetText("|cffffffff" .. format(GetText("WHO_FRAME_TOTAL_TEMPLATE", nil, num), max).."  |cffaaaaaa"..displayedText)
+        else
+          displayedText = format(WHO_FRAME_SHOWN_TEMPLATE, num)
+          WhoFrameTotals:SetText("|cffffffff" .. format(GetText("WHO_FRAME_TOTAL_TEMPLATE", nil, num), num).."  |cffaaaaaa"..displayedText)
         end
 
-        WhoFrameTotals:SetText("|cffffffff" .. format(GetText("WHO_FRAME_TOTAL_TEMPLATE", nil, num), num).."  |cffaaaaaa"..displayedText);
-
-
         class = L["class"][class]
 
         _G["WhoFrameButton"..i.."Name"]:SetTextColor(NORMAL_FONT_COLOR.r, NORMAL_FONT_COLOR.g, NORMAL_FONT_COLOR.b)