diff --git a/src/wp-login.php b/src/wp-login.php
index 11517dac21..f7505636d5 100644
--- a/src/wp-login.php
+++ b/src/wp-login.php
@@ -841,8 +841,15 @@ switch ( $action ) {
 
 		$errors = new WP_Error();
 
-		if ( isset( $_POST['pass1'] ) && $_POST['pass1'] !== $_POST['pass2'] ) {
-			$errors->add( 'password_reset_mismatch', __( '<strong>Error</strong>: The passwords do not match.' ) );
+		if ( isset( $_POST['pass1'] ) ) {
+			$_POST['pass1'] = trim( $_POST['pass1'] );
+		}
+
+		if ( empty( $_POST['pass1'] ) ) {
+			$errors->add( 'password_reset_space', __( 'The password cannot be a space or all spaces.' ) );
+			$_POST['pass1'] = '';
+		} else if ( $_POST['pass1'] !== $_POST['pass2'] ) {
+			$errors->add( 'password_reset_mismatch', __( 'The passwords do not match.' ) );
 		}
 
 		/**