diff --git a/app/assets/javascripts/admin/routes/admin-group.js.es6 b/app/assets/javascripts/admin/routes/admin-group.js.es6
index 1555c4200a..298bffaa43 100644
--- a/app/assets/javascripts/admin/routes/admin-group.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-group.js.es6
@@ -2,26 +2,23 @@ import Group from 'discourse/models/group';
 
 export default Discourse.Route.extend({
 
-  model: function(params) {
-    var groups = this.modelFor('adminGroupsType');
+  model(params) {
     if (params.name === 'new') {
-      return Group.create({
-        automatic: false,
-        visible: true
-      });
+      return Group.create({ automatic: false, visible: true });
     }
 
-    var group = groups.findProperty('name', params.name);
+    const group = this.modelFor('adminGroupsType')
+                      .findProperty('name', params.name);
 
     if (!group) { return this.transitionTo('adminGroups.index'); }
 
     return group;
   },
 
-  setupController: function(controller, model) {
+  setupController(controller, model) {
     controller.set("model", model);
     controller.set("model.usernames", null);
-    controller.set("savingStatus", '');
+    controller.set("savingStatus", "");
     model.findMembers();
   }
 
diff --git a/app/assets/javascripts/admin/templates/group.hbs b/app/assets/javascripts/admin/templates/group.hbs
index 49db722d6f..2c2a1929a3 100644
--- a/app/assets/javascripts/admin/templates/group.hbs
+++ b/app/assets/javascripts/admin/templates/group.hbs
@@ -94,10 +94,10 @@
     </div>
 
     {{#if siteSettings.email_in}}
-      <div>
+      {{#plugin-outlet "group-email-in"}}
         <label for="incoming_email">{{i18n 'admin.groups.incoming_email'}}</label>
         {{text-field name="incoming_email" value=model.incoming_email placeholderKey="admin.groups.incoming_email_placeholder"}}
-      </div>
+      {{/plugin-outlet}}
     {{/if}}
   {{/unless}}
 
diff --git a/app/assets/javascripts/discourse/models/group.js.es6 b/app/assets/javascripts/discourse/models/group.js.es6
index 85c8ba5a5b..b6890e8263 100644
--- a/app/assets/javascripts/discourse/models/group.js.es6
+++ b/app/assets/javascripts/discourse/models/group.js.es6
@@ -1,5 +1,5 @@
 import { ajax } from 'discourse/lib/ajax';
-import computed from 'ember-addons/ember-computed-decorators';
+import computed from "ember-addons/ember-computed-decorators";
 
 const Group = Discourse.Model.extend({
   limit: 50,
diff --git a/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs b/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
index 01aeb2d15b..03b2bc4dee 100644
--- a/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
+++ b/app/assets/javascripts/discourse/templates/components/edit-category-settings.hbs
@@ -20,20 +20,22 @@
 </section>
 
 {{#if emailInEnabled}}
-  <section class='field'>
-    <label>
-      {{input type="checkbox" checked=category.email_in_allow_strangers}}
-      {{i18n 'category.email_in_allow_strangers'}}
-    </label>
-  </section>
+  {{#plugin-outlet "category-email-in"}}
+    <section class='field'>
+      <label>
+        {{input type="checkbox" checked=category.email_in_allow_strangers}}
+        {{i18n 'category.email_in_allow_strangers'}}
+      </label>
+    </section>
 
-  <section class='field'>
-    <label>
-      {{fa-icon "envelope-o"}}
-      {{i18n 'category.email_in'}}
-      {{text-field value=category.email_in}}
-    </label>
-  </section>
+    <section class='field'>
+      <label>
+        {{fa-icon "envelope-o"}}
+        {{i18n 'category.email_in'}}
+        {{text-field value=category.email_in}}
+      </label>
+    </section>
+  {{/plugin-outlet}}
 {{/if}}
 
 {{#if showPositionInput}}