diff --git a/app/assets/javascripts/discourse/components/group-manage-save-button.js.es6 b/app/assets/javascripts/discourse/components/group-manage-save-button.js.es6
index a5163d92a6..1055dc8913 100644
--- a/app/assets/javascripts/discourse/components/group-manage-save-button.js.es6
+++ b/app/assets/javascripts/discourse/components/group-manage-save-button.js.es6
@@ -6,9 +6,8 @@ export default Ember.Component.extend({
 
   @computed('saving')
   savingText(saving) {
-    if (saving !== undefined) {
-      return saving ? I18n.t('saving') : I18n.t('saved');
-    }
+    if (saving) return I18n.t("saving");
+    return saving ? I18n.t("saving") : I18n.t("save");
   },
 
   actions: {
@@ -16,6 +15,9 @@ export default Ember.Component.extend({
       this.set('saving', true);
 
       return this.get('model').save()
+        .then(() => {
+          this.set("saved", true);
+        })
         .catch(popupAjaxError)
         .finally(() => this.set('saving', false));
     }
diff --git a/app/assets/javascripts/discourse/templates/components/group-manage-save-button.hbs b/app/assets/javascripts/discourse/templates/components/group-manage-save-button.hbs
index e6afe04c22..0276ac16e5 100644
--- a/app/assets/javascripts/discourse/templates/components/group-manage-save-button.hbs
+++ b/app/assets/javascripts/discourse/templates/components/group-manage-save-button.hbs
@@ -1,6 +1,12 @@
 <div class='control-group buttons'>
-  {{d-button action="save"
+  {{#d-button action="save"
       disabled=saving
-      class='btn btn-primary group-form-save'
-      label="save"}}
+      class='btn btn-primary group-manage-save'}}
+
+      {{savingText}}
+  {{/d-button}}
+
+  {{#if saved}}
+    <span>{{i18n 'saved'}}</span>
+  {{/if}}
 </div>