diff --git a/plugins/OpenID/finishopenidlogin.php b/plugins/OpenID/finishopenidlogin.php
index ff0b451d30..e5551b4126 100644
--- a/plugins/OpenID/finishopenidlogin.php
+++ b/plugins/OpenID/finishopenidlogin.php
@@ -89,33 +89,53 @@ class FinishopenidloginAction extends Action
 
         $this->elementStart('form', array('method' => 'post',
                                           'id' => 'account_connect',
+                                          'class' => 'form_settings',
                                           'action' => common_local_url('finishopenidlogin')));
         $this->hidden('token', common_session_token());
-        $this->element('h2', null,
+        $this->elementStart('fieldset', array('id' => 'form_openid_createaccount'));
+        $this->element('legend', null,
                        _('Create new account'));
         $this->element('p', null,
                        _('Create a new user with this nickname.'));
+        $this->elementStart('ul', 'form_data');
+        $this->elementStart('li');
         $this->input('newname', _('New nickname'),
                      ($this->username) ? $this->username : '',
                      _('1-64 lowercase letters or numbers, no punctuation or spaces'));
-        $this->elementStart('p');
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->element('input', array('type' => 'checkbox',
                                       'id' => 'license',
+                                      'class' => 'checkbox',
                                       'name' => 'license',
                                       'value' => 'true'));
+        $this->elementStart('label', array('for' => 'license',
+                                          'class' => 'checkbox'));
         $this->text(_('My text and files are available under '));
         $this->element('a', array('href' => common_config('license', 'url')),
                        common_config('license', 'title'));
         $this->text(_(' except this private data: password, email address, IM address, phone number.'));
-        $this->elementEnd('p');
+        $this->elementEnd('label');
+        $this->elementEnd('li');
+        $this->elementEnd('ul');
         $this->submit('create', _('Create'));
-        $this->element('h2', null,
+        $this->elementEnd('fieldset');
+
+        $this->elementStart('fieldset', array('id' => 'form_openid_createaccount'));
+        $this->element('legend', null,
                        _('Connect existing account'));
         $this->element('p', null,
                        _('If you already have an account, login with your username and password to connect it to your OpenID.'));
+        $this->elementStart('ul', 'form_data');
+        $this->elementStart('li');
         $this->input('nickname', _('Existing nickname'));
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->password('password', _('Password'));
+        $this->elementEnd('li');
+        $this->elementEnd('ul');
         $this->submit('connect', _('Connect'));
+        $this->elementEnd('fieldset');
         $this->elementEnd('form');
     }