Gaurav Gupta
--- a/core/modules/user/tests/src/Functional/UserPasswordResetTest.php
+++ b/core/modules/user/tests/src/Functional/UserPasswordResetTest.php
  /**
   * {@inheritdoc}
   */
-  protected static $modules = ['block', 'language'];
+  protected static $modules = ['block', 'language', 'user'];
--- a/core/modules/user/src/Form/UserPasswordForm.php
+++ b/core/modules/user/src/Form/UserPasswordForm.php
+              '%email' => $account->getEmail(),
+            ]);
+        }
+      }
+      else {
+        // Account exists and is active but has no email address
        $this->logger('user')
-          ->info('Password reset instructions mailed to %name at %email.', [
+          ->notice('Password reset form was submitted for account without email address: %name.', [
            '%name' => $account->getAccountName(),
-            '%email' => $account->getEmail(),
          ]);
      }
    }
    else {
+      // Account doesn't exist or is blocked
-      // Account doesn't exist or is blocked
+      // Account doesn't exist or is blocked.
--- a/core/modules/user/src/Form/UserPasswordForm.php
+++ b/core/modules/user/src/Form/UserPasswordForm.php
+      }
+      else {
+        // Account exists and is active but has no email address
        $this->logger('user')
-          ->info('Password reset instructions mailed to %name at %email.', [
+          ->notice('Password reset form was submitted for account without email address: %name.', [
            '%name' => $account->getAccountName(),
-            '%email' => $account->getEmail(),
          ]);
      }
    }
    else {
+      // Account doesn't exist or is blocked
      $this->logger('user')
-        ->info('Password reset form was submitted with an unknown or inactive account: %name.', [
+        ->notice('Password reset form was submitted with an unknown or inactive account: %name.', [
--- a/core/modules/user/src/Form/UserPasswordForm.php
+++ b/core/modules/user/src/Form/UserPasswordForm.php
   */
  public function submitForm(array &$form, FormStateInterface $form_state) {
    $account = $form_state->getValue('account');
-    if ($account) {
-      // Mail one time login URL and instructions using current language.
-      $mail = _user_mail_notify('password_reset', $account);
-      if (!empty($mail)) {
+    if ($account && $account->isActive()) {
--- a/core/modules/user/src/Form/UserPasswordForm.php
+++ b/core/modules/user/src/Form/UserPasswordForm.php
+      if (!empty($account->get('mail')->value)) {
+        // Mail one time login URL and instructions using current language.
+        $mail = _user_mail_notify('password_reset', $account);
+        if (!empty($mail)) {
+          $this->logger('user')
+            ->info('Password reset instructions mailed to %name at %email.', [
+              '%name' => $account->getAccountName(),
+              '%email' => $account->getEmail(),
+            ]);
+        }
+      }
+      else {
+        // Account exists and is active but has no email address
        $this->logger('user')
-          ->info('Password reset instructions mailed to %name at %email.', [
+          ->notice('Password reset form was submitted for account without email address: %name.', [