diff --git a/actions/login.php b/actions/login.php
index 9366197328..5943464f7f 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -96,7 +96,7 @@ class LoginAction extends Action {
 		} else {
 			$instr = $this->get_instructions();
 			$output = common_markup_to_html($instr);
-			common_element_start('p', 'instructions');
+			common_element_start('div', 'instructions');
 			common_raw($output);
 			common_element_end('p');
 		}
diff --git a/actions/register.php b/actions/register.php
index a8b360f730..3d34de2eb5 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -155,7 +155,7 @@ class RegisterAction extends Action {
 		if ($error) {
 			common_element('p', 'error', $error);
 		} else {
-			common_element('p', 'instructions',
+			common_element('div', 'instructions',
 						   _t('You can create a new account to start posting notices.'));
 		}
 	}
diff --git a/actions/remotesubscribe.php b/actions/remotesubscribe.php
index 2bcf4e53b5..ce8b4057b2 100644
--- a/actions/remotesubscribe.php
+++ b/actions/remotesubscribe.php
@@ -53,7 +53,7 @@ class RemotesubscribeAction extends Action {
 		} else {
 			$instructions = $this->get_instructions();
 			$output = common_markup_to_html($instructions);
-			common_element_start('p', 'instructions');
+			common_element_start('div', 'instructions');
 			common_raw($output);
 			common_element_end('p');
 		}
diff --git a/lib/gallery.php b/lib/gallery.php
index c6a4956f88..22488b3fd1 100644
--- a/lib/gallery.php
+++ b/lib/gallery.php
@@ -54,7 +54,7 @@ class GalleryAction extends Action {
 	}
 	
 	function show_top($profile) {
-		common_element('p', 'instructions',
+		common_element('div', 'instructions',
 					   $this->get_instructions($profile));
 	}
 	
diff --git a/lib/openid.php b/lib/openid.php
index 11934138fd..5ad744fa13 100644
--- a/lib/openid.php
+++ b/lib/openid.php
@@ -191,7 +191,7 @@ function oid_authenticate($openid_url, $returnto, $immediate=false) {
 # Half-assed attempt at a module-private function
 
 function _oid_print_instructions() {
-	common_element('p', 'instructions',
+	common_element('div', 'instructions',
 				   _t('This form should automatically submit itself. '.
 					  'If not, click the submit button to go to your '.
 					  'OpenID provider.'));