diff --git a/app/assets/javascripts/admin/controllers/admin_groups_controller.js b/app/assets/javascripts/admin/controllers/admin_groups_controller.js
index 6940ba93195..bb4ef32d908 100644
--- a/app/assets/javascripts/admin/controllers/admin_groups_controller.js
+++ b/app/assets/javascripts/admin/controllers/admin_groups_controller.js
@@ -4,7 +4,7 @@ Discourse.AdminGroupsController = Ember.Controller.extend({
   actions: {
     edit: function(group){
       this.get('model').select(group);
-      group.load();
+      group.loadUsers();
     },
 
     refreshAutoGroups: function(){
@@ -20,9 +20,8 @@ Discourse.AdminGroupsController = Ember.Controller.extend({
     },
 
     newGroup: function(){
-      var group = Discourse.Group.create();
-      group.set("loaded", true);
-      var model = this.get("model");
+      var group = Discourse.Group.create({ loadedUsers: true }),
+          model = this.get("model");
       model.addObject(group);
       model.select(group);
     },
diff --git a/app/assets/javascripts/admin/templates/groups.js.handlebars b/app/assets/javascripts/admin/templates/groups.js.handlebars
index ce763e99bac..91484cc6368 100644
--- a/app/assets/javascripts/admin/templates/groups.js.handlebars
+++ b/app/assets/javascripts/admin/templates/groups.js.handlebars
@@ -16,7 +16,7 @@
 
   <div class='content-editor'>
     {{#if model.active}}
-      {{#if model.active.loaded}}
+      {{#if model.active.loadedUsers}}
         {{#with model.active}}
           {{#if automatic}}
             <h3>{{name}}</h3>
diff --git a/app/assets/javascripts/discourse/models/group.js b/app/assets/javascripts/discourse/models/group.js
index 105a30117d3..0dbf9bde9e1 100644
--- a/app/assets/javascripts/discourse/models/group.js
+++ b/app/assets/javascripts/discourse/models/group.js
@@ -21,7 +21,7 @@ var ALIAS_LEVELS = {
   ];
 
 Discourse.Group = Discourse.Model.extend({
-  loaded: false,
+  loadedUsers: false,
 
   userCountDisplay: function(){
     var c = this.get('user_count');
@@ -31,19 +31,21 @@ Discourse.Group = Discourse.Model.extend({
     }
   }.property('user_count'),
 
-  load: function() {
+  loadUsers: function() {
     var id = this.get('id');
-    if(id && !this.get('loaded')) {
+    if(id && !this.get('loadedUsers')) {
       var self = this;
-      Discourse.ajax('/admin/groups/' + this.get('id') + '/users').then(function(payload){
+      return Discourse.ajax('/admin/groups/' + this.get('id') + '/users').then(function(payload){
         var users = Em.A();
         _.each(payload,function(user){
           users.addObject(Discourse.User.create(user));
         });
         self.set('users', users);
-        self.set('loaded', true);
+        self.set('loadedUsers', true);
+        return self;
       });
     }
+    return Ember.RSVP.resolve(this);
   },
 
   usernames: function() {