diff --git a/application/Espo/Classes/Cleanup/PasswordChangeRequests.php b/application/Espo/Classes/Cleanup/PasswordChangeRequests.php
new file mode 100644
index 0000000000..8ac64d03c2
--- /dev/null
+++ b/application/Espo/Classes/Cleanup/PasswordChangeRequests.php
@@ -0,0 +1,73 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Classes\Cleanup;
+
+use Espo\Core\Cleanup\Cleanup;
+use Espo\Core\Utils\Config;
+use Espo\Core\Field\DateTime;
+
+use Espo\ORM\EntityManager;
+
+use Espo\Entities\PasswordChangeRequest;
+
+class PasswordChangeRequests implements Cleanup
+{
+    private Config $config;
+
+    private EntityManager $entityManager;
+
+    private string $cleanupPeriod = '30 days';
+
+    public function __construct(Config $config, EntityManager $entityManager)
+    {
+        $this->config = $config;
+        $this->entityManager = $entityManager;
+    }
+
+    public function process(): void
+    {
+        $period = '-' . $this->config->get('cleanupPasswordChangeRequestsPeriod', $this->cleanupPeriod);
+
+        $before = DateTime::createNow()
+            ->modify($period)
+            ->getString();
+
+        $delete = $this->entityManager
+            ->getQueryBuilder()
+            ->delete()
+            ->from(PasswordChangeRequest::ENTITY_TYPE)
+            ->where([
+                'createdAt<' => $before,
+            ])
+            ->build();
+
+        $this->entityManager->getQueryExecutor()->execute($delete);
+    }
+}
diff --git a/application/Espo/Resources/metadata/app/cleanup.json b/application/Espo/Resources/metadata/app/cleanup.json
index ca9254626a..26223cbd8b 100644
--- a/application/Espo/Resources/metadata/app/cleanup.json
+++ b/application/Espo/Resources/metadata/app/cleanup.json
@@ -15,5 +15,8 @@
     },
     "exports": {
         "className": "Espo\\Classes\\Cleanup\\Exports"
+    },
+    "passwordChangeRequests": {
+        "className": "Espo\\Classes\\Cleanup\\PasswordChangeRequests"
     }
 }