diff --git a/src/wp-login.php b/src/wp-login.php
index b7c14b4c83..1bdd3b660a 100644
--- a/src/wp-login.php
+++ b/src/wp-login.php
@@ -228,14 +228,16 @@ function login_header( $title = 'Log In', $message = '', $wp_error = null ) {
 	}
 
 	if ( $wp_error->has_errors() ) {
-		$errors   = '';
-		$messages = '';
+		$errors    = '';
+		$messages  = '';
+		$aria_code = '';
 
 		foreach ( $wp_error->get_error_codes() as $code ) {
 			$severity = $wp_error->get_error_data( $code );
 			foreach ( $wp_error->get_error_messages( $code ) as $error_message ) {
 				if ( 'message' === $severity ) {
 					$messages .= '	' . $error_message . "<br />\n";
+					$aria_code = ' aria-describedby="' . $code . '"';
 				} else {
 					$errors .= '	' . $error_message . "<br />\n";
 				}
@@ -261,7 +263,7 @@ function login_header( $title = 'Log In', $message = '', $wp_error = null ) {
 			 *
 			 * @param string $messages Login messages.
 			 */
-			echo '<p class="message">' . apply_filters( 'login_messages', $messages ) . "</p>\n";
+			echo '<p class="message" ' . $aria_code . '>' . apply_filters( 'login_messages', $messages ) . "</p>\n";
 		}
 	}
 } // End of login_header().
@@ -1308,7 +1310,11 @@ switch ( $action ) {
 		$rememberme = ! empty( $_POST['rememberme'] );
 
 		if ( $errors->has_errors() ) {
-			$aria_describedby_error = ' aria-describedby="login_error"';
+			if( isset( $_GET['loggedout'] ) ) {
+				$aria_describedby_error = ' aria-describedby="loggedout"';
+			} else {
+				$aria_describedby_error = ' aria-describedby="login_error"';
+			}
 		} else {
 			$aria_describedby_error = '';
 		}