diff --git a/src/wp-admin/css/common.css b/src/wp-admin/css/common.css
index e062a471d7150..2770b6a43a983 100644
--- a/src/wp-admin/css/common.css
+++ b/src/wp-admin/css/common.css
@@ -4063,7 +4063,7 @@ img {
 
 	#templateside li:not(.howto) a {
 		display: block;
-		padding: 5px;
+		padding: 5px 0 5px 5px;
 	}
 	#templateside li.howto {
 		padding: 12px;
@@ -4114,7 +4114,7 @@ img {
 	}
 	.wrap #templateside span.notice {
 		margin-left: -5px;
-		width: 100%;
+		width: auto;
 	}
 
 	.fileedit-sub .alignright {
diff --git a/src/wp-login.php b/src/wp-login.php
index 60d9c21f3ddf1..3d4cba3719583 100644
--- a/src/wp-login.php
+++ b/src/wp-login.php
@@ -231,7 +231,7 @@ function login_header( $title = null, $message = '', $wp_error = null ) {
 	$message = apply_filters( 'login_message', $message );
 
 	if ( ! empty( $message ) ) {
-		echo $message . "\n";
+		echo wp_kses_post( $message ) . "\n";
 	}
 
 	// In case a plugin uses $error rather than the $wp_errors object.