diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index 6dd4775e5a..82e6c3c82f 100644
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.php
@@ -83,7 +83,7 @@ class ProfilesettingsAction extends AccountSettingsAction
         $user = common_current_user();
         $profile = $user->getProfile();
 
-        $this->elementStart('form', array('method' => 'POST',
+        $this->elementStart('form', array('method' => 'post',
                                            'id' => 'form_settings_profile',
                                            'class' => 'form_settings',
                                            'action' => common_local_url('profilesettings')));
diff --git a/actions/showgroup.php b/actions/showgroup.php
index 99367a97cb..c29b7d4263 100644
--- a/actions/showgroup.php
+++ b/actions/showgroup.php
@@ -269,7 +269,7 @@ class ShowgroupAction extends Action
         $this->elementStart('div', 'entity_actions');
         $this->element('h2', null, _('Group actions'));
         $this->elementStart('ul');
-        $this->elementStart('li', array('id' => 'entity_subscribe'));
+        $this->elementStart('li', 'entity_subscribe');
         $cur = common_current_user();
         if ($cur) {
             if ($cur->isMember($this->group)) {
diff --git a/lib/grouplist.php b/lib/grouplist.php
index 629bdd05df..4c448e250d 100644
--- a/lib/grouplist.php
+++ b/lib/grouplist.php
@@ -158,6 +158,9 @@ class GroupList extends Widget
         $this->out->elementEnd('div');
 
         if ($user) {
+            $this->out->elementStart('div', 'entity_actions');
+            $this->out->elementStart('ul');
+            $this->out->elementStart('li', 'entity_subscribe');
             # XXX: special-case for user looking at own
             # subscriptions page
             if ($user->isMember($this->group)) {
@@ -167,6 +170,9 @@ class GroupList extends Widget
                 $jf = new JoinForm($this->out, $this->group);
                 $jf->show();
             }
+            $this->out->elementEnd('li');
+            $this->out->elementEnd('ul');
+            $this->out->elementEnd('div');
         }
 
         $this->out->elementEnd('li');