diff --git a/Plugin/AccountManagementPlugin.php b/Plugin/AccountManagementPlugin.php
new file mode 100644
index 0000000..3bebd04
--- /dev/null
+++ b/Plugin/AccountManagementPlugin.php
@@ -0,0 +1,100 @@
+<?php
+
+namespace Timpack\PwnedValidator\Plugin;
+
+use Magento\Customer\Api\AccountManagementInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Framework\Event\ManagerInterface;
+
+class AccountManagementPlugin
+{
+    /**
+     * @var ManagerInterface
+     */
+    protected $eventManager;
+
+    /**
+     * AccountManagementPlugin constructor.
+     * @param ManagerInterface $eventManager
+     */
+    public function __construct(
+        ManagerInterface $eventManager
+    ) {
+        $this->eventManager = $eventManager;
+    }
+
+    /**
+     * @param string|null $password
+     */
+    private function dispatchPasswordCheckEvent($password)
+    {
+        if (!is_null($password)) {
+            $this->eventManager->dispatch(
+                'timpack_pwnedvalidator_check_password_strength',
+                [
+                    'password' => $password,
+                ]
+            );
+        }
+    }
+
+    /**
+     * @param AccountManagementInterface $subject
+     * @param string $email
+     * @param string $resetToken
+     * @param string $newPassword
+     */
+    public function beforeResetPassword(
+        AccountManagementInterface $subject,
+        $email,
+        $resetToken,
+        $newPassword
+    ) {
+        $this->dispatchPasswordCheckEvent($newPassword);
+    }
+
+    /**
+     * @param AccountManagementInterface $subject
+     * @param string $email
+     * @param string $currentPassword
+     * @param string $newPassword
+     */
+    public function beforeChangePassword(
+        AccountManagementInterface $subject,
+        $email,
+        $currentPassword,
+        $newPassword
+    ) {
+        $this->dispatchPasswordCheckEvent($newPassword);
+    }
+
+    /**
+     * @param AccountManagementInterface $subject
+     * @param string $customerId
+     * @param string $currentPassword
+     * @param string $newPassword
+     */
+    public function beforeChangePasswordById(
+        AccountManagementInterface $subject,
+        $customerId,
+        $currentPassword,
+        $newPassword
+    ) {
+        $this->dispatchPasswordCheckEvent($newPassword);
+    }
+
+    /**
+     * @param AccountManagementInterface $subject
+     * @param CustomerInterface $customer
+     * @param null $password
+     * @param string $redirectUrl
+     */
+    public function beforeCreateAccount(
+        AccountManagementInterface $subject,
+        CustomerInterface $customer,
+        $password = null,
+        $redirectUrl = ''
+    ) {
+        $this->dispatchPasswordCheckEvent($password);
+    }
+}
diff --git a/Rewrite/Model/AccountManagement.php b/Rewrite/Model/AccountManagement.php
deleted file mode 100644
index 9208817..0000000
--- a/Rewrite/Model/AccountManagement.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-
-namespace Timpack\PwnedValidator\Rewrite\Model;
-
-use Magento\Customer\Api\AddressRepositoryInterface;
-use Magento\Customer\Api\CustomerMetadataInterface;
-use Magento\Customer\Api\CustomerRepositoryInterface;
-use Magento\Customer\Api\Data\ValidationResultsInterfaceFactory;
-use Magento\Customer\Helper\View as CustomerViewHelper;
-use Magento\Customer\Model\Config\Share as ConfigShare;
-use Magento\Customer\Model\Customer as CustomerModel;
-use Magento\Customer\Model\Customer\CredentialsValidator;
-use Magento\Customer\Model\CustomerFactory;
-use Magento\Customer\Model\CustomerRegistry;
-use Magento\Customer\Model\Metadata\Validator;
-use Magento\Customer\Model\ResourceModel\Visitor\CollectionFactory;
-use Magento\Framework\Api\ExtensibleDataObjectConverter;
-use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\DataObjectFactory as ObjectFactory;
-use Magento\Framework\Encryption\EncryptorInterface as Encryptor;
-use Magento\Framework\Event\ManagerInterface;
-use Magento\Framework\Intl\DateTimeFactory;
-use Magento\Framework\Mail\Template\TransportBuilder;
-use Magento\Framework\Math\Random;
-use Magento\Framework\Reflection\DataObjectProcessor;
-use Magento\Framework\Registry;
-use Magento\Framework\Session\SaveHandlerInterface;
-use Magento\Framework\Session\SessionManagerInterface;
-use Magento\Framework\Stdlib\DateTime;
-use Magento\Framework\Stdlib\StringUtils as StringHelper;
-use Magento\Store\Model\StoreManagerInterface;
-use Psr\Log\LoggerInterface as PsrLogger;
-
-class AccountManagement extends \Magento\Customer\Model\AccountManagement
-{
-    /**
-     * @var ManagerInterface
-     */
-    private $eventManager;
-
-    public function __construct(
-        CustomerFactory $customerFactory,
-        ManagerInterface $eventManager,
-        StoreManagerInterface $storeManager,
-        Random $mathRandom,
-        Validator $validator,
-        ValidationResultsInterfaceFactory $validationResultsDataFactory,
-        AddressRepositoryInterface $addressRepository,
-        CustomerMetadataInterface $customerMetadataService,
-        CustomerRegistry $customerRegistry,
-        PsrLogger $logger,
-        Encryptor $encryptor,
-        ConfigShare $configShare,
-        StringHelper $stringHelper,
-        CustomerRepositoryInterface $customerRepository,
-        ScopeConfigInterface $scopeConfig,
-        TransportBuilder $transportBuilder,
-        DataObjectProcessor $dataProcessor,
-        Registry $registry,
-        CustomerViewHelper $customerViewHelper,
-        DateTime $dateTime,
-        CustomerModel $customerModel,
-        ObjectFactory $objectFactory,
-        ExtensibleDataObjectConverter $extensibleDataObjectConverter,
-        CredentialsValidator $credentialsValidator = null,
-        DateTimeFactory $dateTimeFactory = null,
-        SessionManagerInterface $sessionManager = null,
-        SaveHandlerInterface $saveHandler = null,
-        CollectionFactory $visitorCollectionFactory = null
-    )
-    {
-        parent::__construct(
-            $customerFactory,
-            $eventManager,
-            $storeManager,
-            $mathRandom,
-            $validator,
-            $validationResultsDataFactory,
-            $addressRepository,
-            $customerMetadataService,
-            $customerRegistry,
-            $logger,
-            $encryptor,
-            $configShare,
-            $stringHelper,
-            $customerRepository,
-            $scopeConfig,
-            $transportBuilder,
-            $dataProcessor,
-            $registry,
-            $customerViewHelper,
-            $dateTime,
-            $customerModel,
-            $objectFactory,
-            $extensibleDataObjectConverter,
-            $credentialsValidator,
-            $dateTimeFactory,
-            $sessionManager,
-            $saveHandler,
-            $visitorCollectionFactory
-        );
-        $this->eventManager = $eventManager;
-    }
-
-    /**
-     * @param string $password
-     * @throws \Magento\Framework\Exception\InputException
-     * @return void
-     */
-    protected function checkPasswordStrength($password)
-    {
-        parent::checkPasswordStrength($password);
-        $this->eventManager->dispatch('timpack_pwnedvalidator_check_password_strength', ['password' => $password]);
-    }
-}
diff --git a/etc/di.xml b/etc/di.xml
index 17e9517..826aede 100644
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -2,8 +2,9 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
     <preference for="Timpack\PwnedValidator\Api\ValidatorInterface" type="Timpack\PwnedValidator\Model\Validator"/>
-    <preference for="Magento\Customer\Model\AccountManagement"
-                type="Timpack\PwnedValidator\Rewrite\Model\AccountManagement"/>
+    <type name="Magento\Customer\Api\AccountManagementInterface">
+        <plugin name="timpack_pwnedvalidator_magento_customer_api_accountmanagementinterface" type="Timpack\PwnedValidator\Plugin\AccountManagementPlugin"/>
+    </type>
     <type name="Timpack\PwnedValidator\Api\ValidatorInterface">
         <arguments>
             <argument name="httpClient" xsi:type="object">Magento\Framework\HTTP\Client\Curl</argument>