diff --git a/src/mod-double-xp-weekend.cpp b/src/mod-double-xp-weekend.cpp
index d2d3e2d..3863299 100644
--- a/src/mod-double-xp-weekend.cpp
+++ b/src/mod-double-xp-weekend.cpp
@@ -63,9 +63,13 @@ class DoubleXpWeekend : public PlayerScript
     {
         if (sConfigMgr->GetOption<bool>("XPWeekend.Announce", false))
         {
-            if (IsEventActive())
+            if (IsEventActive() && !sConfigMgr->GetOption<bool>("XPWeekend.AlwaysEnabled", false))
             {
-                ChatHandler(player->GetSession()).PSendSysMessage("It's the Weekend! Your XP rate has been set to: %u", GetExperienceRate(player));
+                ChatHandler(player->GetSession()).PSendSysMessage("It's the weekend! Your XP rate has been set to: %u", GetExperienceRate(player));
+            }
+            else if (IsEventActive() && sConfigMgr->GetOption<bool>("XPWeekend.AlwaysEnabled", false))
+            {
+                ChatHandler(player->GetSession()).PSendSysMessage("Your XP rate has been set to: %u", GetExperienceRate(player));
             }
             else
             {