diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index ca685e8fe..436537360 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -9,7 +9,8 @@
    method instead of finding the path manually.
  - fix: Avatar in Thread & Posts of CS
  - fix: CS Phishing Exploit.
- - fix: Groups admin gui
+ - fix: Groups admin gui (1) Default should be contains
+ - fix: Groups admin gui (2,3) Make group form sticky
  - fix: Wiki does not show history correctly
  - fix: SQLForm - Field Constraint (Martin Kamerbeek / Oqapi)
  - fix: SQLForm - Default search template uses downloadUrl in stead of 
diff --git a/lib/WebGUI/Operation/Group.pm b/lib/WebGUI/Operation/Group.pm
index 7f4937f8f..963a3808f 100644
--- a/lib/WebGUI/Operation/Group.pm
+++ b/lib/WebGUI/Operation/Group.pm
@@ -71,6 +71,7 @@ sub doGroupSearch {
         my $groupFilter = shift;
         push(@{$groupFilter},0);
         my $keyword = $session->scratch->get("groupSearchKeyword");
+	$session->errorHandler->warn("keyword: $keyword");
         if ($session->scratch->get("groupSearchModifier") eq "startsWith") {
                 $keyword .= "%";
         } elsif ($session->scratch->get("groupSearchModifier") eq "contains") {
@@ -97,8 +98,14 @@ sub getGroupSearchForm {
 	my $session = shift;
 	my $op = shift;
 	my $params = shift;
-	$session->scratch->set("groupSearchKeyword",$session->form->process("keyword"));
-        $session->scratch->set("groupSearchModifier",$session->form->process("modifier"));
+	my $keyword = $session->form->process("keyword");
+	if (defined $keyword) {
+		$session->scratch->set("groupSearchKeyword", $keyword);
+	}
+	my $modifier = $session->form->process("modifier");
+	if (defined $modifier) {
+		$session->scratch->set("groupSearchModifier", $modifier);
+	}
 	my $output = '<div align="center">';
 	my $i18n = WebGUI::International->new($session);
 	my $f = WebGUI::HTMLForm->new($session,1);