diff --git a/wp-admin/includes/user.php b/wp-admin/includes/user.php
index 1ccf341af3..a64ce07fa4 100644
--- a/wp-admin/includes/user.php
+++ b/wp-admin/includes/user.php
@@ -855,9 +855,9 @@ function default_password_nag() {
 	echo '<p>';
 	echo '<strong>' . __('Notice:') . '</strong> ';
 	_e('You&rsquo;re using the auto-generated password for your account. Would you like to change it to something you&rsquo;ll remember easier?');
-	echo '<br /><br />';
-	printf( '<a href="%s">'.__('Yes, take me to my profile page').'</a> | ', admin_url('profile.php') . '#password' );
-	printf( '<a href="%s" id="default-password-nag-no">'.__('No thanks, do not remind me again').'</a>', '?default_password_nag=0' );
+	echo '</p><p>';
+	printf( '<a href="%s">' . __('Yes, take me to my profile page') . '</a> | ', admin_url('profile.php') . '#password' );
+	printf( '<a href="%s" id="default-password-nag-no">' . __('No thanks, do not remind me again') . '</a>', '?default_password_nag=0' );
 	echo '</p></div>';
 }
 
diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php
index f30ae45609..8687799227 100644
--- a/wp-admin/user-edit.php
+++ b/wp-admin/user-edit.php
@@ -153,14 +153,7 @@ include ('admin-header.php');
 </div>
 <?php endif; ?>
 <?php if ( isset( $errors ) && is_wp_error( $errors ) ) : ?>
-<div class="error">
-	<ul>
-	<?php
-	foreach( $errors->get_error_messages() as $message )
-		echo "<li>$message</li>";
-	?>
-	</ul>
-</div>
+<div class="error"><p><?php echo implode( "</p>\n<p>", $errors->get_error_messages() ); ?></p></div>
 <?php endif; ?>
 
 <div class="wrap" id="profile-page">