diff --git a/Roll.lua b/Roll.lua
index e632497..71b4438 100644
--- a/Roll.lua
+++ b/Roll.lua
@@ -41,14 +41,23 @@ local function AnnounceRoll(rollValue, modifiers, total)
     local channelDef = AltSystem.AnnounceChannels[AltSystem.State.announceChannelIndex]
     if not channelDef then return end
 
-    local name = GetCharacterName()
+    local isEmote = channelDef.channel == "EMOTE"
     local modStr = BuildModifierString(modifiers)
 
     local msg
-    if modStr ~= "" then
-        msg = name .. " rolled " .. rollValue .. " " .. modStr .. " = " .. total
+    if isEmote then
+        if modStr ~= "" then
+            msg = "rolled " .. rollValue .. " " .. modStr .. " = " .. total
+        else
+            msg = "rolled " .. rollValue .. " = " .. total
+        end
     else
-        msg = name .. " rolled " .. rollValue .. " = " .. total
+        local name = GetCharacterName()
+        if modStr ~= "" then
+            msg = name .. " rolled " .. rollValue .. " " .. modStr .. " = " .. total
+        else
+            msg = name .. " rolled " .. rollValue .. " = " .. total
+        end
     end
 
     SendToChannel(msg, channelDef.channel)
@@ -88,7 +97,10 @@ function AltSystem:CalculateAndDisplayResult(rollType, rollValue)
         if AltSystem.State.announceEnabled then
             local channelDef = AltSystem.AnnounceChannels[AltSystem.State.announceChannelIndex]
             if channelDef then
-                SendToChannel(GetCharacterName() .. " rolled a Critical Failure!", channelDef.channel)
+                local critMsg = channelDef.channel == "EMOTE"
+                    and "rolled a Critical Failure!"
+                    or (GetCharacterName() .. " rolled a Critical Failure!")
+                SendToChannel(critMsg, channelDef.channel)
             end
         end
         return
@@ -99,7 +111,10 @@ function AltSystem:CalculateAndDisplayResult(rollType, rollValue)
         if AltSystem.State.announceEnabled then
             local channelDef = AltSystem.AnnounceChannels[AltSystem.State.announceChannelIndex]
             if channelDef then
-                SendToChannel(GetCharacterName() .. " rolled a Critical Success!", channelDef.channel)
+                local critMsg = channelDef.channel == "EMOTE"
+                    and "rolled a Critical Success!"
+                    or (GetCharacterName() .. " rolled a Critical Success!")
+                SendToChannel(critMsg, channelDef.channel)
             end
         end
         return