diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 0346523a2..abf269c91 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -4,6 +4,8 @@
    searchable and add metatags for all assets.
  - fix: template variable isUncommitted is not documented in the help
  - Cleaned the pollution from the forms system.
+ - rfe:  subscribe entire user group to a collaboration message  board
+ - Added show in forms and is editable properties to group manager.
  - fix: Event is no longer editable by anyone who can add events
  - fix: Event now sets ownerUserId correctly
  - add: Calendar can now select which workflow to use for committing Events
diff --git a/lib/WebGUI/Operation/Group.pm b/lib/WebGUI/Operation/Group.pm
index 6573922db..11b51651a 100644
--- a/lib/WebGUI/Operation/Group.pm
+++ b/lib/WebGUI/Operation/Group.pm
@@ -339,6 +339,18 @@ sub www_editGroup {
 		-hoverHelp => $i18n->get('85 description'),
 		-value => $g->description,
         );
+        $f->yesNo(
+		-name=>"isEditable",
+		-label=>$i18n->get('is editable'), 
+		-hoverHelp=>$i18n->get('is editable help'), 
+		-value=>$g->isEditable,
+		);
+        $f->yesNo(
+		-name=>"showInForms",
+		-label=>$i18n->get('show in forms'), 
+		-hoverHelp=>$i18n->get('show in forms help'), 
+		-value=>$g->showInForms,
+		);
         $f->interval(
 		-name=>"expireOffset",
 		-label=>$i18n->get(367), 
@@ -489,6 +501,8 @@ sub www_editGroupSave {
     $g->description($session->form->process("description"));
     $g->expireOffset($session->form->interval("expireOffset"));
 	$g->karmaThreshold($session->form->process("karmaThreshold"));
+	$g->isEditable($session->form->process("isEditable"));
+	$g->showInForms($session->form->process("showInForms"));
 	$g->ipFilter($session->form->process("ipFilter"));
 	$g->scratchFilter($session->form->process("scratchFilter"));
 	$g->expireNotify($session->form->yesNo("expireNotify"));
diff --git a/lib/WebGUI/i18n/English/WebGUI.pm b/lib/WebGUI/i18n/English/WebGUI.pm
index 4b377b6cb..b1dedd149 100644
--- a/lib/WebGUI/i18n/English/WebGUI.pm
+++ b/lib/WebGUI/i18n/English/WebGUI.pm
@@ -2,6 +2,30 @@ package WebGUI::i18n::English::WebGUI;
 use strict;
 
 our $I18N = {
+	'is editable' => {
+		message => q|Is Editable?|,
+		context => q|group property|,
+		lastUpdated => 0,
+	},
+
+	'show in forms' => {
+		message => q|Show In Forms?|,
+		context => q|group property|,
+		lastUpdated => 0,
+	},
+
+	'is editable help' => {
+		message => q|Should this group show up in the list of managable groups? Note, if you set this to 'No' then you will no longer be able to manage this group.|,
+		context => q|group property|,
+		lastUpdated => 0,
+	},
+
+	'show in forms help' => {
+		message => q|Should this group show up in places where you can choose a group, such as privilege fields?|,
+		context => q|group property|,
+		lastUpdated => 0,
+	},
+
 	'run on admin create user' => {
 		message => q|On Create User (Admin)|,
 		context => q|field in trigger manager|,