diff --git a/actions/openidsettings.php b/actions/openidsettings.php
index 257aac8d08..126d2c9922 100644
--- a/actions/openidsettings.php
+++ b/actions/openidsettings.php
@@ -124,7 +124,7 @@ class OpenidsettingsAction extends AccountSettingsAction
 
             if ($cnt == 1 && !$user->password) {
 
-                $this->element('p', null,
+                $this->element('p', 'form_guide',
                                _('Removing your only OpenID '.
                                  'would make it impossible to log in! ' .
                                  'If you need to remove it, '.
@@ -162,7 +162,7 @@ class OpenidsettingsAction extends AccountSettingsAction
                     $this->element('input', array('type' => 'submit',
                                                   'id' => 'remove'.$idx,
                                                   'name' => 'remove',
-                                                  'class' => 'submit',
+                                                  'class' => 'submit remove',
                                                   'value' => _('Remove')));
                     $this->elementEnd('fieldset');
                     $this->elementEnd('form');
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 08805c1e0f..76e52ffc9c 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -84,18 +84,11 @@ left:0;
 padding:4px 7px;
 -moz-border-radius:4px;
 }
-
 form label.submit {
 display:none;
 }
-form .error_message {
-display:block;
-}
-.form_response {
-margin-bottom:18px;
-}
-
-form input.submit {
+.form_settings input.remove {
+margin-left:11px;
 }