diff --git a/actions/openidlogin.php b/actions/openidlogin.php
index 6ce4bb191a..ecc4e6bff6 100644
--- a/actions/openidlogin.php
+++ b/actions/openidlogin.php
@@ -38,14 +38,17 @@ class OpenidloginAction extends Action {
 		}
 	}
 
-	function show_form($error=NULL) {
-		common_show_header(_t('OpenID Login'));
+	function show_top($error=NULL) {
 		if ($error) {
 			common_element('div', array('class' => 'error'), $error);
 		} else {
 			common_element('div', 'instructions',
 						   _t('Login with an OpenID account.'));
 		}
+	}
+	
+	function show_form($error=NULL) {
+		common_show_header(_t('OpenID Login'), NULL, $error, array($this, 'show_top'));
 		$formaction = common_local_url('openidlogin');
 		common_element_start('form', array('method' => 'POST',
 										   'id' => 'openidlogin',
diff --git a/actions/openidsettings.php b/actions/openidsettings.php
index 742ef2757b..aceb8023b5 100644
--- a/actions/openidsettings.php
+++ b/actions/openidsettings.php
@@ -24,18 +24,25 @@ require_once(INSTALLDIR.'/lib/openid.php');
 
 class OpenidsettingsAction extends SettingsAction {
 
-	function show_form($msg=NULL, $success=false) {
+	function show_top($arr) {
+		$msg = $arr[0];
+		$success = $arr[1];
 		
-		$user = common_current_user();
-		
-		common_show_header(_t('OpenID settings'), NULL, NULL, array($this, 'settings_menu'));
-
 		if ($msg) {
 			$this->message($msg, $success);
 		} else {
 			common_element('div', 'instructions',
 						   _t('Manage your associated OpenIDs from here.'));
 		}
+	}
+	
+	function show_form($msg=NULL, $success=false) {
+		
+		$user = common_current_user();
+		
+		common_show_header(_t('OpenID settings'), NULL, array($msg, $success),
+						   array($this, 'show_top'));
+
 		common_element_start('form', array('method' => 'POST',
 										   'id' => 'openidadd',
 										   'action' =>