diff --git a/PepperDashEssentials/Room/Behaviours/RoomOnToDefaultSourceWhenOccupied.cs b/PepperDashEssentials/Room/Behaviours/RoomOnToDefaultSourceWhenOccupied.cs
index 9c375b3a..8501215e 100644
--- a/PepperDashEssentials/Room/Behaviours/RoomOnToDefaultSourceWhenOccupied.cs
+++ b/PepperDashEssentials/Room/Behaviours/RoomOnToDefaultSourceWhenOccupied.cs
@@ -50,7 +50,7 @@ namespace PepperDash.Essentials.Room.Behaviours
             FeatureEventGroup.RetrieveAllEvents();
 
             // Add to the global class for tracking
-            //Global.Scheduler.AddEventGroup(FeatureEventGroup);
+            Scheduler.AddEventGroup(FeatureEventGroup);
 
             AddPostActivationAction(() =>
             {
diff --git a/PepperDashEssentials/UIDrivers/EssentialsHuddle/EssentialsHuddlePanelAvFunctionsDriver.cs b/PepperDashEssentials/UIDrivers/EssentialsHuddle/EssentialsHuddlePanelAvFunctionsDriver.cs
index abdfeea6..dddcb326 100644
--- a/PepperDashEssentials/UIDrivers/EssentialsHuddle/EssentialsHuddlePanelAvFunctionsDriver.cs
+++ b/PepperDashEssentials/UIDrivers/EssentialsHuddle/EssentialsHuddlePanelAvFunctionsDriver.cs
@@ -590,9 +590,9 @@ namespace PepperDash.Essentials
             // Do we need to check where the UI is? No?
             var timer = CurrentRoom.ShutdownPromptTimer;
             EndMeetingButtonSig.BoolValue = true;
-            ShareButtonSig.BoolValue = false;
-
-            if (CurrentRoom.ShutdownType == eShutdownType.Manual)
+            ShareButtonSig.BoolValue = false;
+
+            if (CurrentRoom.ShutdownType == eShutdownType.Manual || CurrentRoom.ShutdownType == eShutdownType.Vacancy)
             {
                 PowerDownModal = new ModalDialog(TriList);
                 var message = string.Format("Meeting will end in {0} seconds", CurrentRoom.ShutdownPromptSeconds);
diff --git a/PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs b/PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs
index 8644d24d..50fa3601 100644
--- a/PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs
+++ b/PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs
@@ -763,7 +763,7 @@ namespace PepperDash.Essentials
             var timer = CurrentRoom.ShutdownPromptTimer;
             SetActivityFooterFeedbacks();
 
-            if (CurrentRoom.ShutdownType == eShutdownType.Manual)
+            if (CurrentRoom.ShutdownType == eShutdownType.Manual || CurrentRoom.ShutdownType == eShutdownType.Vacancy)
             {
                 PowerDownModal = new ModalDialog(TriList);
                 var message = string.Format("Meeting will end in {0} seconds", CurrentRoom.ShutdownPromptSeconds);
diff --git a/essentials-framework b/essentials-framework
index 03a1cef7..5c220272 160000
--- a/essentials-framework
+++ b/essentials-framework
@@ -1 +1 @@
-Subproject commit 03a1cef777fb8e57ddd88e9ab4bfdbc867a8769d
+Subproject commit 5c2202723fd8d3d5b5a3d17e600c47f0e10b61c2