diff --git a/app/assets/javascripts/discourse/app/controllers/composer.js b/app/assets/javascripts/discourse/app/controllers/composer.js
index b7855d54b91..9d04586c11f 100644
--- a/app/assets/javascripts/discourse/app/controllers/composer.js
+++ b/app/assets/javascripts/discourse/app/controllers/composer.js
@@ -70,7 +70,7 @@ function loadDraft(store, opts) {
 
 const _popupMenuOptionsCallbacks = [];
 
-let _checkDraftPopup = !ENV.environment === "test";
+let _checkDraftPopup = ENV.environment !== "test";
 
 export function toggleCheckDraftPopup(enabled) {
   _checkDraftPopup = enabled;
diff --git a/app/assets/javascripts/discourse/app/routes/application.js b/app/assets/javascripts/discourse/app/routes/application.js
index 856c203058e..a16f97ffd9d 100644
--- a/app/assets/javascripts/discourse/app/routes/application.js
+++ b/app/assets/javascripts/discourse/app/routes/application.js
@@ -85,6 +85,7 @@ const ApplicationRoute = DiscourseRoute.extend(OpenComposer, {
         recipients,
         archetypeId: "private_message",
         draftKey: Composer.NEW_PRIVATE_MESSAGE_KEY,
+        draftSequence: 0,
         reply,
         title
       });
diff --git a/app/assets/javascripts/discourse/app/templates/components/composer-user-selector.hbs b/app/assets/javascripts/discourse/app/templates/components/composer-user-selector.hbs
index 34e72ab50e7..8b4170f9f21 100644
--- a/app/assets/javascripts/discourse/app/templates/components/composer-user-selector.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/composer-user-selector.hbs
@@ -10,6 +10,7 @@
     hasGroups=hasGroups
     allowEmails="true"
     autocomplete="discourse"
+    canReceiveUpdates=true
   }}
 {{else}}
   <a href {{action "toggleSelector"}}>