2 files changed, 16 insertions, 1 deletions
diff --git a/base/server/share/webapps/pki/js/pki-ui.js b/base/server/share/webapps/pki/js/pki-ui.js
index d983dfd40..442c6b27d 100644
--- a/base/server/share/webapps/pki/js/pki-ui.js
+++ b/base/server/share/webapps/pki/js/pki-ui.js
@@ -720,6 +720,12 @@ var ModelTable = Table.extend({
     render: function() {
         var self = this;
 
+        // if collection is undefined, don't fetch data, just draw the controls
+        if (!self.collection) {
+            self.renderControls();
+            return;
+        }
+
         // set query based on current page, page size, and filter
         self.collection.query({
             start: (self.page - 1) * self.pageSize,
diff --git a/base/tps-tomcat/shared/webapps/tps/js/group.js b/base/tps-tomcat/shared/webapps/tps/js/group.js
index 874cefa71..50d7d6c67 100644
--- a/base/tps-tomcat/shared/webapps/tps/js/group.js
+++ b/base/tps-tomcat/shared/webapps/tps/js/group.js
@@ -187,12 +187,21 @@ var GroupPage = EntryPage.extend({
             // In page edit mode, the members tables is read-only.
             self.membersTable.mode = "view";
 
+            self.membersTable.collection = new GroupMemberCollection(null, { groupID: self.entry.id });
+
+        } else if (self.mode == "add") {
+            // In page add mode, the members table is read-only.
+            self.membersTable.mode = "view";
+
+            // self.membersTable.collection is undefined for new group
+
         } else { // self.mode == "view"
             // In page view mode, the members table is editable.
             self.membersTable.mode = "edit";
+
+            self.membersTable.collection = new GroupMemberCollection(null, { groupID: self.entry.id });
         }
 
-        self.membersTable.collection = new GroupMemberCollection(null, { groupID: self.entry.id });
         self.membersTable.render();
     }
 });