diff --git a/app/assets/javascripts/discourse-common/resolver.js.es6 b/app/assets/javascripts/discourse-common/resolver.js.es6
index a0089ae7d37..a69efc4e30b 100644
--- a/app/assets/javascripts/discourse-common/resolver.js.es6
+++ b/app/assets/javascripts/discourse-common/resolver.js.es6
@@ -135,7 +135,7 @@ export function buildResolver(baseName) {
     },
 
     findPluginTemplate(parsedName) {
-      var pluginParsedName = this.parseName(parsedName.fullName.replace("template:", "template:javascripts/"));
+      const pluginParsedName = this.parseName(parsedName.fullName.replace("template:", "template:javascripts/"));
       return this.findTemplate(pluginParsedName);
     },
 
diff --git a/app/assets/javascripts/discourse/components/d-modal-body.js.es6 b/app/assets/javascripts/discourse/components/d-modal-body.js.es6
index 638db7d8858..42c797ddf96 100644
--- a/app/assets/javascripts/discourse/components/d-modal-body.js.es6
+++ b/app/assets/javascripts/discourse/components/d-modal-body.js.es6
@@ -28,7 +28,7 @@ export default Ember.Component.extend({
       }
     }
 
-    this.appEvents.trigger('modal:body-shown', this.getProperties('title'));
+    this.appEvents.trigger('modal:body-shown', this.getProperties('title', 'rawTitle'));
   },
 
   _flash(msg) {
diff --git a/app/assets/javascripts/discourse/components/d-modal.js.es6 b/app/assets/javascripts/discourse/components/d-modal.js.es6
index a8de2b82eae..475c79d0495 100644
--- a/app/assets/javascripts/discourse/components/d-modal.js.es6
+++ b/app/assets/javascripts/discourse/components/d-modal.js.es6
@@ -19,6 +19,8 @@ export default Ember.Component.extend({
     this.appEvents.on('modal:body-shown', data => {
       if (data.title) {
         this.set('title', I18n.t(data.title));
+      } else if (data.rawTitle) {
+        this.set('title', data.rawTitle);
       }
     });
   },