diff --git a/TGInstallerWrapper/Main.cs b/TGInstallerWrapper/Main.cs
index c4ff509e59..62b52e94a7 100644
--- a/TGInstallerWrapper/Main.cs
+++ b/TGInstallerWrapper/Main.cs
@@ -114,6 +114,7 @@ namespace TGInstallerWrapper
 					try
 					{
 						Server.GetComponent<ITGSService>().PrepareForUpdate();
+						Thread.Sleep(3000); //chat messages
 					}
 					catch
 					{
diff --git a/TGServerService/DreamDaemon.cs b/TGServerService/DreamDaemon.cs
index 91db552c39..5bb4037634 100644
--- a/TGServerService/DreamDaemon.cs
+++ b/TGServerService/DreamDaemon.cs
@@ -46,7 +46,11 @@ namespace TGServerService
 					if (Proc == null)
 						throw new Exception("GetProcessById returned null!");
 					TGServerService.WriteInfo("Reattached to running DD process!", TGServerService.EventID.DDReattachSuccess);
-					SendMessage("DD: Update complete. Watch dog reactivated...", ChatMessageType.WatchdogInfo);
+					ThreadPool.QueueUserWorkItem(_ =>
+					{
+						Thread.Sleep(5000);
+						SendMessage("DD: Update complete. Watch dog reactivated...", ChatMessageType.WatchdogInfo);
+					});
 
 					//start wd 
 					RestartInProgress = true;
@@ -299,7 +303,8 @@ namespace TGServerService
 					AwaitingShutdown = ShutdownRequestPhase.None;
 					if (!RestartInProgress)
 					{
-						SendMessage("DD: Server stopped, watchdog exiting...", ChatMessageType.WatchdogInfo);
+						if(!Properties.Settings.Default.ReattachToDD)
+							SendMessage("DD: Server stopped, watchdog exiting...", ChatMessageType.WatchdogInfo);
 						TGServerService.WriteInfo("Watch dog exited", TGServerService.EventID.DDWatchdogExit);
 					}
 					else