diff --git a/app/assets/javascripts/admin/controllers/admin_badges_controller.js b/app/assets/javascripts/admin/controllers/admin_badges_controller.js
index 6edc4c712a..6c6d46b0bd 100644
--- a/app/assets/javascripts/admin/controllers/admin_badges_controller.js
+++ b/app/assets/javascripts/admin/controllers/admin_badges_controller.js
@@ -127,7 +127,7 @@ Discourse.AdminBadgesController = Ember.ArrayController.extend({
                      'enabled', 'show_posts',
                      'target_posts', 'name', 'description',
                      'icon', 'query', 'badge_grouping_id',
-                     'trigger'];
+                     'trigger', 'badge_type_id'];
 
         if(this.get('selectedItem.system')){
           var protectedFields = this.get('protectedSystemFields');
diff --git a/app/assets/javascripts/discourse/models/badge.js b/app/assets/javascripts/discourse/models/badge.js
index 64fd1ec887..7d87a31e4f 100644
--- a/app/assets/javascripts/discourse/models/badge.js
+++ b/app/assets/javascripts/discourse/models/badge.js
@@ -141,6 +141,10 @@ Discourse.Badge = Discourse.Model.extend({
       self.set('savingStatus', I18n.t('saved'));
       self.set('saving', false);
       return self;
+    }, function(error){
+      self.set('savingStatus', '');
+      self.set('saving', false);
+      bootbox.alert(error.responseText);
     });
   },