diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index 67b991cdc8..761aaa8f31 100644
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -95,7 +95,7 @@ class EmailsettingsAction extends AccountSettingsAction
                                           'class' => 'form_settings',
                                           'action' =>
                                           common_local_url('emailsettings')));
-
+        $this->elementStart('fieldset');
         $this->elementStart('fieldset', array('id' => 'settings_email_address'));
         $this->element('legend', null, _('Address'));
         $this->hidden('token', common_session_token());
@@ -194,6 +194,7 @@ class EmailsettingsAction extends AccountSettingsAction
         $this->elementEnd('ul');
         $this->submit('save', _('Save'));
         $this->elementEnd('fieldset');
+        $this->elementEnd('fieldset');
         $this->elementEnd('form');
     }