diff --git a/ReCaptcha/Block/Frontend/ReCaptcha.php b/ReCaptcha/Block/Frontend/ReCaptcha.php
index ebb75831..031de316 100644
--- a/ReCaptcha/Block/Frontend/ReCaptcha.php
+++ b/ReCaptcha/Block/Frontend/ReCaptcha.php
@@ -30,16 +30,12 @@ class ReCaptcha extends Template
 
     /**
      * @param Template\Context $context
-     * @param null $decoder @deprecated
-     * @param null $encoder @deprecated
      * @param LayoutSettings $layoutSettings
      * @param array $data
      * @param Config|null $config
      */
     public function __construct(
         Template\Context $context,
-        $decoder,
-        $encoder,
         LayoutSettings $layoutSettings,
         array $data = [],
         Config $config = null
diff --git a/ReCaptcha/Model/Provider/Failure/RedirectUrl/BeforeAuthUrlProvider.php b/ReCaptcha/Model/BeforeAuthUrlProvider.php
similarity index 81%
rename from ReCaptcha/Model/Provider/Failure/RedirectUrl/BeforeAuthUrlProvider.php
rename to ReCaptcha/Model/BeforeAuthUrlProvider.php
index 1026c1a1..29e96b2c 100644
--- a/ReCaptcha/Model/Provider/Failure/RedirectUrl/BeforeAuthUrlProvider.php
+++ b/ReCaptcha/Model/BeforeAuthUrlProvider.php
@@ -5,16 +5,15 @@
  */
 declare(strict_types=1);
 
-namespace Magento\ReCaptcha\Model\Provider\Failure\RedirectUrl;
+namespace Magento\ReCaptcha\Model;
 
 use Magento\Customer\Model\Url;
 use Magento\Framework\Session\SessionManagerInterface;
-use Magento\ReCaptcha\Model\Provider\Failure\RedirectUrlProviderInterface;
 
 /**
  * @inheritDoc
  */
-class BeforeAuthUrlProvider implements RedirectUrlProviderInterface
+class BeforeAuthUrlProvider
 {
     /**
      * @var SessionManagerInterface
diff --git a/ReCaptcha/Model/CaptchaRequestHandler.php b/ReCaptcha/Model/CaptchaRequestHandler.php
new file mode 100644
index 00000000..0dc47bb7
--- /dev/null
+++ b/ReCaptcha/Model/CaptchaRequestHandler.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ReCaptcha\Model;
+
+use Magento\Framework\App\Action\Action;
+use Magento\Framework\App\ActionFlag;
+use Magento\Framework\App\Area;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\App\Response\HttpInterface;
+use Magento\Framework\HTTP\PhpEnvironment\RemoteAddress;
+use Magento\Framework\Message\ManagerInterface as MessageManagerInterface;
+
+/**
+ * Captcha request handler
+ */
+class CaptchaRequestHandler implements CaptchaRequestHandlerInterface
+{
+    /**
+     * @var ValidateInterface
+     */
+    private $validate;
+
+    /**
+     * @var RemoteAddress
+     */
+    private $remoteAddress;
+
+    /**
+     * @var MessageManagerInterface
+     */
+    private $messageManager;
+
+    /**
+     * @var ActionFlag
+     */
+    private $actionFlag;
+
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * @param ValidateInterface $validate
+     * @param RemoteAddress $remoteAddress
+     * @param MessageManagerInterface $messageManager
+     * @param ActionFlag $actionFlag
+     * @param Config $config
+     */
+    public function __construct(
+        ValidateInterface $validate,
+        RemoteAddress $remoteAddress,
+        MessageManagerInterface $messageManager,
+        ActionFlag $actionFlag,
+        Config $config
+    ) {
+        $this->validate = $validate;
+        $this->remoteAddress = $remoteAddress;
+        $this->messageManager = $messageManager;
+        $this->actionFlag = $actionFlag;
+        $this->config = $config;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function execute(
+        string $area,
+        RequestInterface $request,
+        HttpInterface $response,
+        string $redirectOnFailureUrl
+    ): void {
+        $reCaptchaResponse = $request->getParam(ValidateInterface::PARAM_RECAPTCHA_RESPONSE);
+        $remoteIp = $this->remoteAddress->getRemoteAddress();
+        $options['threshold'] = ($area === Area::AREA_ADMINHTML)
+            ? $this->config->getMinBackendScore() : $this->config->getMinFrontendScore();
+
+        if (false === $this->validate->validate($reCaptchaResponse, $remoteIp, $options)) {
+            $this->messageManager->addErrorMessage($this->config->getErrorDescription());
+            $this->actionFlag->set('', Action::FLAG_NO_DISPATCH, true);
+
+            $response->setRedirect($redirectOnFailureUrl);
+        }
+    }
+}
diff --git a/ReCaptcha/Model/CaptchaRequestHandlerInterface.php b/ReCaptcha/Model/CaptchaRequestHandlerInterface.php
new file mode 100644
index 00000000..0b5f4fb2
--- /dev/null
+++ b/ReCaptcha/Model/CaptchaRequestHandlerInterface.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ReCaptcha\Model;
+
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\App\Response\HttpInterface;
+use Magento\Framework\Exception\LocalizedException;
+
+/**
+ * Captcha request handler interface (sugar service for avoiding boilerplate code)
+ *
+ * Validate captcha data in request and set message and redirect if validation was failed
+ *
+ * @api
+ */
+interface CaptchaRequestHandlerInterface
+{
+    /**
+     * @param string $area
+     * @param RequestInterface $request
+     * @param HttpInterface $response
+     * @param string $redirectOnFailureUrl
+     * @return void
+     * @throws LocalizedException
+     */
+    public function execute(
+        string $area,
+        RequestInterface $request,
+        HttpInterface $response,
+        string $redirectOnFailureUrl
+    ): void;
+}
diff --git a/ReCaptcha/Model/Config.php b/ReCaptcha/Model/Config.php
index 13f3289f..6084ebd1 100644
--- a/ReCaptcha/Model/Config.php
+++ b/ReCaptcha/Model/Config.php
@@ -7,6 +7,7 @@
 
 namespace Magento\ReCaptcha\Model;
 
+use Magento\Framework\App\Area;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Phrase;
 use Magento\Store\Model\ScopeInterface;
@@ -14,7 +15,7 @@
 /**
  * Read configuration from store config
  */
-class Config
+class Config implements ConfigInterface
 {
     public const XML_PATH_ENABLED_BACKEND = 'recaptcha/backend/enabled';
     public const XML_PATH_ENABLED_FRONTEND = 'recaptcha/frontend/enabled';
@@ -40,7 +41,6 @@ class Config
     public const XML_PATH_ENABLED_FRONTEND_CREATE = 'recaptcha/frontend/enabled_create';
     public const XML_PATH_ENABLED_FRONTEND_REVIEW = 'recaptcha/frontend/enabled_review';
     public const XML_PATH_ENABLED_FRONTEND_NEWSLETTER = 'recaptcha/frontend/enabled_newsletter';
-    public const XML_PATH_ENABLED_FRONTEND_SENDFRIEND = 'recaptcha/frontend/enabled_sendfriend';
 
     /**
      * @var ScopeConfigInterface
@@ -92,7 +92,7 @@ public function getPrivateKey(): string
      */
     public function isEnabledBackend(): bool
     {
-        if (!$this->getPrivateKey() || !$this->getPublicKey()) {
+        if (!$this->isAreaEnabled(Area::AREA_ADMINHTML) || !$this->getPrivateKey() || !$this->getPublicKey()) {
             return false;
         }
 
@@ -105,7 +105,7 @@ public function isEnabledBackend(): bool
      */
     public function isEnabledFrontend(): bool
     {
-        if (!$this->getPrivateKey() || !$this->getPublicKey()) {
+        if (!$this->isAreaEnabled(Area::AREA_FRONTEND) || !$this->getPrivateKey() || !$this->getPublicKey()) {
             return false;
         }
 
@@ -167,7 +167,7 @@ public function isEnabledFrontendContact(): bool
      * Return true if enabled on frontend create user
      * @return bool
      */
-    public function isEnabledFrontendCreate(): bool
+    public function isEnabledFrontendCreateUser(): bool
     {
         if (!$this->isEnabledFrontend()) {
             return false;
@@ -211,22 +211,6 @@ public function isEnabledFrontendNewsletter(): bool
         );
     }
 
-    /**
-     * Return true if enabled on frontend send to friend
-     * @return bool
-     */
-    public function isEnabledFrontendSendFriend(): bool
-    {
-        if (!$this->isEnabledFrontend()) {
-            return false;
-        }
-
-        return (bool) $this->scopeConfig->getValue(
-            static::XML_PATH_ENABLED_FRONTEND_SENDFRIEND,
-            ScopeInterface::SCOPE_WEBSITE
-        );
-    }
-
     /**
      * @return bool
      */
@@ -359,4 +343,19 @@ public function getMinBackendScore(): float
             static::XML_PATH_SIZE_MIN_SCORE_BACKEND
         )));
     }
+
+    /**
+     * Return true if area is configured to be active
+     * @param string $area
+     * @return bool
+     */
+    public function isAreaEnabled(string $area): bool
+    {
+        if (!in_array($area, [Area::AREA_FRONTEND, Area::AREA_ADMINHTML], true)) {
+            throw new \InvalidArgumentException('Area parameter must be one of frontend or adminhtml');
+        }
+
+        return (($area === Area::AREA_ADMINHTML) && $this->isEnabledBackend())
+            || (($area === Area::AREA_FRONTEND) && $this->isEnabledFrontend());
+    }
 }
diff --git a/ReCaptcha/Model/ConfigEnabledInterface.php b/ReCaptcha/Model/ConfigEnabledInterface.php
new file mode 100644
index 00000000..41eb13ba
--- /dev/null
+++ b/ReCaptcha/Model/ConfigEnabledInterface.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ReCaptcha\Model;
+
+/**
+ * Extension point of the ReCaptcha configuration
+ *
+ * @api
+ */
+interface ConfigEnabledInterface
+{
+    /**
+     * Return true if functionality of corresponding point is enabled in configuration
+     * @return bool
+     */
+    public function isEnabled(): bool;
+}
diff --git a/ReCaptcha/Model/ConfigInterface.php b/ReCaptcha/Model/ConfigInterface.php
new file mode 100644
index 00000000..c7ba0723
--- /dev/null
+++ b/ReCaptcha/Model/ConfigInterface.php
@@ -0,0 +1,107 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ReCaptcha\Model;
+
+use Magento\Framework\Phrase;
+
+/**
+ * Represents general ReCaptcha configuration
+ *
+ * @api
+ */
+interface ConfigInterface
+{
+    /**
+     * Get error
+     * @return Phrase
+     */
+    public function getErrorDescription(): Phrase;
+
+    /**
+     * Get google recaptcha public key
+     * @return string
+     */
+    public function getPublicKey(): string;
+
+    /**
+     * Get google recaptcha private key
+     * @return string
+     */
+    public function getPrivateKey(): string;
+
+    /**
+     * Return true if enabled on backend
+     * @return bool
+     */
+    public function isEnabledBackend(): bool;
+
+    /**
+     * Return true if enabled on frontend
+     * @return bool
+     */
+    public function isEnabledFrontend(): bool;
+
+    /**
+     * @return bool
+     */
+    public function isInvisibleRecaptcha(): bool;
+
+    /**
+     * Get data size
+     * @return string
+     */
+    public function getFrontendSize(): string;
+
+    /**
+     * Get data size
+     * @return string
+     */
+    public function getBackendSize(): string;
+
+    /**
+     * Get data size
+     * @return string
+     */
+    public function getFrontendTheme(): ?string;
+
+    /**
+     * Get data size
+     * @return string
+     */
+    public function getBackendTheme(): string;
+
+    /**
+     * Get data size
+     * @return string
+     */
+    public function getFrontendPosition(): ?string;
+
+    /**
+     * Get reCaptcha type
+     * @return string
+     */
+    public function getType(): string;
+
+    /**
+     * Get language code
+     * @return string
+     */
+    public function getLanguageCode(): string;
+
+    /**
+     * Get minimum frontend score
+     * @return float
+     */
+    public function getMinFrontendScore(): float;
+
+    /**
+     * Get minimum frontend score
+     * @return float
+     */
+    public function getMinBackendScore(): float;
+}
diff --git a/ReCaptcha/Model/IsCheckRequired.php b/ReCaptcha/Model/IsCheckRequired.php
deleted file mode 100644
index 64412481..00000000
--- a/ReCaptcha/Model/IsCheckRequired.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\ReCaptcha\Model;
-
-use Magento\Framework\App\Area;
-use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\App\RequestInterface;
-
-/**
- * @inheritDoc
- */
-class IsCheckRequired implements IsCheckRequiredInterface
-{
-    /**
-     * @var ScopeConfigInterface
-     */
-    private $scopeConfig;
-
-    /**
-     * @var Config
-     */
-    private $config;
-
-    /**
-     * @var string
-     */
-    private $enableConfigFlag;
-
-    /**
-     * @var bool
-     */
-    private $requireRequestParam;
-
-    /**
-     * @var string
-     */
-    private $area;
-
-    /**
-     * @var RequestInterface
-     */
-    private $request;
-
-    /**
-     * @param ScopeConfigInterface $scopeConfig
-     * @param RequestInterface $request
-     * @param Config $config
-     * @param string $area
-     * @param string $enableConfigFlag
-     * @param bool $requireRequestParam
-     */
-    public function __construct(
-        ScopeConfigInterface $scopeConfig,
-        RequestInterface $request,
-        Config $config,
-        $area = null,
-        $enableConfigFlag = null,
-        $requireRequestParam = null
-    ) {
-        $this->scopeConfig = $scopeConfig;
-        $this->config = $config;
-        $this->enableConfigFlag = $enableConfigFlag;
-        $this->requireRequestParam = $requireRequestParam;
-        $this->area = $area;
-        $this->request = $request;
-
-        if (!in_array($this->area, [Area::AREA_FRONTEND, Area::AREA_ADMINHTML], true)) {
-            throw new \InvalidArgumentException('Area parameter must be one of frontend or adminhtml');
-        }
-    }
-
-    /**
-     * Return true if area is configured to be active
-     * @return bool
-     */
-    private function isAreaEnabled(): bool
-    {
-        return
-            (($this->area === Area::AREA_ADMINHTML) && $this->config->isEnabledBackend()) ||
-            (($this->area === Area::AREA_FRONTEND) && $this->config->isEnabledFrontend());
-    }
-
-    /**
-     * Return true if current zone is enabled
-     * @return bool
-     */
-    private function isZoneEnabled(): bool
-    {
-        return !$this->enableConfigFlag || $this->scopeConfig->getValue($this->enableConfigFlag);
-    }
-
-    /**
-     * Return true if request if valid
-     * @return bool
-     */
-    private function isRequestValid(): bool
-    {
-        return !$this->requireRequestParam || $this->request->getParam($this->requireRequestParam);
-    }
-
-    /**
-     * Return true if check is required
-     * @return bool
-     */
-    public function execute(): bool
-    {
-        return
-            $this->isAreaEnabled() &&
-            $this->isZoneEnabled() &&
-            $this->isRequestValid();
-    }
-}
diff --git a/ReCaptcha/Model/IsCheckRequiredInterface.php b/ReCaptcha/Model/IsCheckRequiredInterface.php
deleted file mode 100644
index 267c0fda..00000000
--- a/ReCaptcha/Model/IsCheckRequiredInterface.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\ReCaptcha\Model;
-
-/**
- * Return true if recaptcha is required in the context - SPI
- */
-interface IsCheckRequiredInterface
-{
-    /**
-     * Return true if check is required
-     * @return bool
-     */
-    public function execute(): bool;
-}
diff --git a/ReCaptcha/Model/LayoutSettings.php b/ReCaptcha/Model/LayoutSettings.php
index 24a53768..07a35e86 100644
--- a/ReCaptcha/Model/LayoutSettings.php
+++ b/ReCaptcha/Model/LayoutSettings.php
@@ -7,8 +7,12 @@
 
 namespace Magento\ReCaptcha\Model;
 
+use Magento\ReCaptcha\Model\ConfigEnabledInterface;
+
 /**
- * Return the layout configuration setting for reCaptcha
+ * Extension point of the layout configuration setting for reCaptcha
+ *
+ * @api
  */
 class LayoutSettings
 {
@@ -17,13 +21,21 @@ class LayoutSettings
      */
     private $config;
 
+    /**
+     * @var ConfigEnabledInterface[]
+     */
+    private $configEnabledProviders;
+
     /**
      * @param Config $config
+     * @param ConfigEnabledInterface[] $configEnabledProviders
      */
     public function __construct(
-        Config $config
+        Config $config,
+        array $configEnabledProviders
     ) {
         $this->config = $config;
+        $this->configEnabledProviders = $configEnabledProviders;
     }
 
     /**
@@ -32,7 +44,7 @@ public function __construct(
      */
     public function getCaptchaSettings(): array
     {
-        return [
+        $settings = [
             'siteKey' => $this->config->getPublicKey(),
             'size' => $this->config->getFrontendSize(),
             'badge' => $this->config->getFrontendPosition(),
@@ -40,13 +52,16 @@ public function getCaptchaSettings(): array
             'lang' => $this->config->getLanguageCode(),
             'enabled' => [
                 'login' => $this->config->isEnabledFrontendLogin(),
-                'create' => $this->config->isEnabledFrontendCreate(),
+                'create' => $this->config->isEnabledFrontendCreateUser(),
                 'forgot' => $this->config->isEnabledFrontendForgot(),
                 'contact' => $this->config->isEnabledFrontendContact(),
                 'review' => $this->config->isEnabledFrontendReview(),
                 'newsletter' => $this->config->isEnabledFrontendNewsletter(),
-                'sendfriend' => $this->config->isEnabledFrontendSendFriend(),
             ]
         ];
+        foreach ($this->configEnabledProviders as $key => $configEnabledProvider) {
+            $settings['enabled'][$key] = $configEnabledProvider->isEnabled();
+        }
+        return $settings;
     }
 }
diff --git a/ReCaptcha/Model/Provider/Failure/AjaxResponseFailure.php b/ReCaptcha/Model/Provider/Failure/AjaxResponseFailure.php
deleted file mode 100644
index 3199bc77..00000000
--- a/ReCaptcha/Model/Provider/Failure/AjaxResponseFailure.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\ReCaptcha\Model\Provider\Failure;
-
-use Magento\Framework\App\ActionFlag;
-use Magento\Framework\App\ResponseInterface;
-use Magento\Framework\App\Action\Action;
-use Magento\Framework\Serialize\SerializerInterface;
-use Magento\ReCaptcha\Model\Config;
-use Magento\ReCaptcha\Model\Provider\FailureProviderInterface;
-
-/**
- * @inheritDoc
- */
-class AjaxResponseFailure implements FailureProviderInterface
-{
-    /**
-     * @var ActionFlag
-     */
-    private $actionFlag;
-
-    /**
-     * @var SerializerInterface
-     */
-    private $serializer;
-
-    /**
-     * @var Config
-     */
-    private $config;
-
-    /**
-     * AjaxResponseFailure constructor.
-     * @param ActionFlag $actionFlag
-     * @param SerializerInterface $serializer
-     * @param Config $config
-     */
-    public function __construct(
-        ActionFlag $actionFlag,
-        SerializerInterface $serializer,
-        Config $config
-    ) {
-        $this->actionFlag = $actionFlag;
-        $this->serializer = $serializer;
-        $this->config = $config;
-    }
-
-    /**
-     * Handle reCaptcha failure
-     * @param ResponseInterface $response
-     * @return void
-     */
-    public function execute(ResponseInterface $response = null): void
-    {
-        $this->actionFlag->set('', Action::FLAG_NO_DISPATCH, true);
-
-        $jsonPayload = $this->serializer->encode([
-            'errors' => true,
-            'message' => $this->config->getErrorDescription(),
-        ]);
-        $response->representJson($jsonPayload);
-    }
-}
diff --git a/ReCaptcha/Model/Provider/Failure/AuthenticationExceptionFailure.php b/ReCaptcha/Model/Provider/Failure/AuthenticationExceptionFailure.php
deleted file mode 100644
index a57b1e56..00000000
--- a/ReCaptcha/Model/Provider/Failure/AuthenticationExceptionFailure.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\ReCaptcha\Model\Provider\Failure;
-
-use Magento\Framework\App\ResponseInterface;
-use Magento\Framework\Exception\Plugin\AuthenticationException;
-use Magento\ReCaptcha\Model\Config;
-use Magento\ReCaptcha\Model\Provider\FailureProviderInterface;
-
-/**
- * @inheritDoc
- */
-class AuthenticationExceptionFailure implements FailureProviderInterface
-{
-    /**
-     * @var Config
-     */
-    private $config;
-
-    /**
-     * AuthenticationExceptionFailure constructor.
-     * @param Config $config
-     */
-    public function __construct(
-        Config $config
-    ) {
-        $this->config = $config;
-    }
-
-    /**
-     * Handle reCaptcha failure
-     * @param ResponseInterface $response
-     * @return void
-     * @throws AuthenticationException
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     */
-    public function execute(ResponseInterface $response = null): void
-    {
-        throw new AuthenticationException($this->config->getErrorDescription());
-    }
-}
diff --git a/ReCaptcha/Model/Provider/Failure/ObserverRedirectFailure.php b/ReCaptcha/Model/Provider/Failure/ObserverRedirectFailure.php
deleted file mode 100644
index 477227c1..00000000
--- a/ReCaptcha/Model/Provider/Failure/ObserverRedirectFailure.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\ReCaptcha\Model\Provider\Failure;
-
-use Magento\Framework\App\ActionFlag;
-use Magento\Framework\App\ResponseInterface;
-use Magento\Framework\Event\ObserverInterface;
-use Magento\Framework\Message\ManagerInterface as MessageManagerInterface;
-use Magento\Framework\App\Action\Action;
-use Magento\Framework\UrlInterface;
-use Magento\ReCaptcha\Model\Config;
-use Magento\ReCaptcha\Model\Provider\FailureProviderInterface;
-
-/**
- * @inheritDoc
- */
-class ObserverRedirectFailure implements FailureProviderInterface
-{
-    /**
-     * @var MessageManagerInterface
-     */
-    private $messageManager;
-
-    /**
-     * @var ActionFlag
-     */
-    private $actionFlag;
-
-    /**
-     * @var Config
-     */
-    private $config;
-
-    /**
-     * @var RedirectUrlProviderInterface
-     */
-    private $redirectUrlProvider;
-
-    /**
-     * RedirectFailure constructor.
-     * @param MessageManagerInterface $messageManager
-     * @param ActionFlag $actionFlag
-     * @param Config $config
-     * @param UrlInterface $url
-     * @param RedirectUrlProviderInterface|null $redirectUrlProvider
-     */
-    public function __construct(
-        MessageManagerInterface $messageManager,
-        ActionFlag $actionFlag,
-        Config $config,
-        RedirectUrlProviderInterface $redirectUrlProvider
-    ) {
-        $this->messageManager = $messageManager;
-        $this->actionFlag = $actionFlag;
-        $this->config = $config;
-        $this->redirectUrlProvider = $redirectUrlProvider;
-    }
-
-    /**
-     * Get redirect URL
-     * @return string
-     */
-    private function getUrl()
-    {
-        return $this->redirectUrlProvider->execute();
-    }
-
-    /**
-     * Handle reCaptcha failure
-     * @param ResponseInterface $response
-     * @return void
-     */
-    public function execute(ResponseInterface $response = null): void
-    {
-        $this->messageManager->addErrorMessage($this->config->getErrorDescription());
-        $this->actionFlag->set('', Action::FLAG_NO_DISPATCH, true);
-
-        $response->setRedirect($this->getUrl());
-    }
-}
diff --git a/ReCaptcha/Model/Provider/Failure/RedirectUrl/RefererProvider.php b/ReCaptcha/Model/Provider/Failure/RedirectUrl/RefererProvider.php
deleted file mode 100644
index c13b6cec..00000000
--- a/ReCaptcha/Model/Provider/Failure/RedirectUrl/RefererProvider.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\ReCaptcha\Model\Provider\Failure\RedirectUrl;
-
-use Magento\ReCaptcha\Model\Provider\Failure\RedirectUrlProviderInterface;
-use Magento\Framework\App\Response\RedirectInterface;
-
-/**
- * @inheritDoc
- */
-class RefererProvider implements RedirectUrlProviderInterface
-{
-    /**
-     * @var RedirectInterface
-     */
-    private $redirect;
-
-    /**
-     * @param RedirectInterface $redirect
-     */
-    public function __construct(
-        RedirectInterface $redirect
-    ) {
-        $this->redirect = $redirect;
-    }
-
-    /**
-     * Get redirection URL
-     * @return string
-     */
-    public function execute(): string
-    {
-        return $this->redirect->getRedirectUrl();
-    }
-}
diff --git a/ReCaptcha/Model/Provider/Failure/RedirectUrl/ReferrerUrlProvider.php b/ReCaptcha/Model/Provider/Failure/RedirectUrl/ReferrerUrlProvider.php
deleted file mode 100644
index 57c15a28..00000000
--- a/ReCaptcha/Model/Provider/Failure/RedirectUrl/ReferrerUrlProvider.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\ReCaptcha\Model\Provider\Failure\RedirectUrl;
-
-use Magento\Framework\App\Response\RedirectInterface;
-use Magento\ReCaptcha\Model\Provider\Failure\RedirectUrlProviderInterface;
-
-/**
- * @inheritDoc
- */
-class ReferrerUrlProvider implements RedirectUrlProviderInterface
-{
-    /**
-     * @var RedirectInterface
-     */
-    private $redirect;
-
-    /**
-     * ReferrerUrlProvider constructor.
-     *
-     * @param RedirectInterface $redirect
-     */
-    public function __construct(
-        RedirectInterface $redirect
-    ) {
-        $this->redirect = $redirect;
-    }
-
-    /**
-     * Get redirection URL
-     *
-     * @return string
-     */
-    public function execute(): string
-    {
-        return $this->redirect->getRefererUrl();
-    }
-}
diff --git a/ReCaptcha/Model/Provider/Failure/RedirectUrl/SimpleUrlProvider.php b/ReCaptcha/Model/Provider/Failure/RedirectUrl/SimpleUrlProvider.php
deleted file mode 100644
index 313c7e4d..00000000
--- a/ReCaptcha/Model/Provider/Failure/RedirectUrl/SimpleUrlProvider.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\ReCaptcha\Model\Provider\Failure\RedirectUrl;
-
-use Magento\Framework\UrlInterface;
-use Magento\ReCaptcha\Model\Provider\Failure\RedirectUrlProviderInterface;
-
-/**
- * @inheritDoc
- */
-class SimpleUrlProvider implements RedirectUrlProviderInterface
-{
-    /**
-     * @var string
-     */
-    private $urlPath;
-
-    /**
-     * @var array
-     */
-    private $urlParams;
-
-    /**
-     * @var UrlInterface
-     */
-    private $url;
-
-    /**
-     * SimpleUrlProvider constructor.
-     * @param UrlInterface $url
-     * @param $urlPath
-     * @param null $urlParams
-     */
-    public function __construct(
-        UrlInterface $url,
-        $urlPath,
-        $urlParams = null
-    ) {
-        $this->urlPath = $urlPath;
-        $this->urlParams = $urlParams;
-        $this->url = $url;
-    }
-
-    /**
-     * Get redirection URL
-     * @return string
-     */
-    public function execute(): string
-    {
-        return $this->url->getUrl($this->urlPath, $this->urlParams);
-    }
-}
diff --git a/ReCaptcha/Model/Provider/Failure/RedirectUrlProviderInterface.php b/ReCaptcha/Model/Provider/Failure/RedirectUrlProviderInterface.php
deleted file mode 100644
index 0e66c63e..00000000
--- a/ReCaptcha/Model/Provider/Failure/RedirectUrlProviderInterface.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\ReCaptcha\Model\Provider\Failure;
-
-/**
- * Redirection URL provider in case of failure
- */
-interface RedirectUrlProviderInterface
-{
-    /**
-     * Get redirection URL
-     * @return string
-     */
-    public function execute(): string;
-}
diff --git a/ReCaptcha/Model/Provider/FailureProviderInterface.php b/ReCaptcha/Model/Provider/FailureProviderInterface.php
deleted file mode 100644
index dd4c1242..00000000
--- a/ReCaptcha/Model/Provider/FailureProviderInterface.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\ReCaptcha\Model\Provider;
-
-use Magento\Framework\App\ResponseInterface;
-
-/**
- * Response provider in case of failure
- */
-interface FailureProviderInterface
-{
-    /**
-     * Handle reCaptcha failure
-     * @param ResponseInterface $response
-     * @return void
-     */
-    public function execute(ResponseInterface $response = null): void;
-}
diff --git a/ReCaptcha/Model/Provider/Response/AjaxResponseProvider.php b/ReCaptcha/Model/Provider/Response/AjaxResponseProvider.php
deleted file mode 100644
index 17b15fe1..00000000
--- a/ReCaptcha/Model/Provider/Response/AjaxResponseProvider.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\ReCaptcha\Model\Provider\Response;
-
-use Magento\Framework\App\RequestInterface;
-use Magento\Framework\Serialize\SerializerInterface;
-use Magento\ReCaptcha\Model\Provider\ResponseProviderInterface;
-use Magento\ReCaptcha\Model\ValidateInterface;
-
-/**
- * @inheritDoc
- */
-class AjaxResponseProvider implements ResponseProviderInterface
-{
-    /**
-     * @var RequestInterface
-     */
-    private $request;
-
-    /**
-     * @var SerializerInterface
-     */
-    private $serializer;
-
-    /**
-     * AjaxResponseProvider constructor.
-     * @param RequestInterface $request
-     * @param SerializerInterface $serializer
-     */
-    public function __construct(
-        RequestInterface $request,
-        SerializerInterface $serializer
-    ) {
-        $this->request = $request;
-        $this->serializer = $serializer;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function execute(): string
-    {
-        if ($content = $this->request->getContent()) {
-            try {
-                $jsonParams = $this->serializer->decode($content);
-                if (isset($jsonParams[ValidateInterface::PARAM_RECAPTCHA_RESPONSE])) {
-                    return $jsonParams[ValidateInterface::PARAM_RECAPTCHA_RESPONSE];
-                }
-            } catch (\Exception $e) {
-                return '';
-            }
-        }
-
-        return '';
-    }
-}
diff --git a/ReCaptcha/Model/Provider/Response/DefaultResponseProvider.php b/ReCaptcha/Model/Provider/Response/DefaultResponseProvider.php
deleted file mode 100644
index 01c24431..00000000
--- a/ReCaptcha/Model/Provider/Response/DefaultResponseProvider.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\ReCaptcha\Model\Provider\Response;
-
-use Magento\Framework\App\RequestInterface;
-use Magento\ReCaptcha\Model\Provider\ResponseProviderInterface;
-use Magento\ReCaptcha\Model\ValidateInterface;
-
-/**
- * @inheritDoc
- */
-class DefaultResponseProvider implements ResponseProviderInterface
-{
-    /**
-     * @var RequestInterface
-     */
-    private $request;
-
-    /**
-     * DefaultResponseProvider constructor.
-     * @param RequestInterface $request
-     */
-    public function __construct(RequestInterface $request)
-    {
-        $this->request = $request;
-    }
-
-    /**
-     * @inheritDoc
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     */
-    public function execute(): string
-    {
-        return $this->request->getParam(ValidateInterface::PARAM_RECAPTCHA_RESPONSE);
-    }
-}
diff --git a/ReCaptcha/Model/Provider/ResponseProviderInterface.php b/ReCaptcha/Model/Provider/ResponseProviderInterface.php
deleted file mode 100644
index 09e0e60b..00000000
--- a/ReCaptcha/Model/Provider/ResponseProviderInterface.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\ReCaptcha\Model\Provider;
-
-/**
- * ReCaptcha response provider
- */
-interface ResponseProviderInterface
-{
-    /**
-     * @return string
-     */
-    public function execute(): string;
-}
diff --git a/ReCaptcha/Model/Validate.php b/ReCaptcha/Model/Validate.php
index 48175bb4..51896ac8 100644
--- a/ReCaptcha/Model/Validate.php
+++ b/ReCaptcha/Model/Validate.php
@@ -7,9 +7,6 @@
 
 namespace Magento\ReCaptcha\Model;
 
-use Magento\Framework\App\Area;
-use Magento\Framework\App\ObjectManager;
-use Magento\Framework\App\State;
 use Magento\Framework\Exception\LocalizedException;
 use ReCaptcha\ReCaptcha;
 
@@ -23,31 +20,19 @@ class Validate implements ValidateInterface
      */
     private $config;
 
-    /**
-     * @var State
-     */
-    private $state;
-
     /**
      * @param Config $config
-     * @param State $state
      */
     public function __construct(
-        Config $config,
-        State $state = null
+        Config $config
     ) {
         $this->config = $config;
-        $this->state = $state ?: ObjectManager::getInstance()->get(State::class);
     }
 
     /**
-     * Return true if reCaptcha validation has passed
-     * @param string $reCaptchaResponse
-     * @param string $remoteIp
-     * @return bool
-     * @throws LocalizedException
+     * @inheritdoc
      */
-    public function validate(string $reCaptchaResponse, string $remoteIp): bool
+    public function validate(string $reCaptchaResponse, string $remoteIp, array $options = []): bool
     {
         $secret = $this->config->getPrivateKey();
 
@@ -57,11 +42,9 @@ public function validate(string $reCaptchaResponse, string $remoteIp): bool
             // @codingStandardsIgnoreEmd
 
             if ($this->config->getType() === 'recaptcha_v3') {
-                $threshold = $this->state->getAreaCode() === Area::AREA_ADMINHTML ?
-                    $this->config->getMinBackendScore() :
-                    $this->config->getMinFrontendScore();
-
-                $reCaptcha->setScoreThreshold($threshold);
+                if (isset($options['threshold'])) {
+                    $reCaptcha->setScoreThreshold($options['threshold']);
+                }
             }
             $res = $reCaptcha->verify($reCaptchaResponse, $remoteIp);
 
diff --git a/ReCaptcha/Model/ValidateInterface.php b/ReCaptcha/Model/ValidateInterface.php
index f85d038c..e5941379 100644
--- a/ReCaptcha/Model/ValidateInterface.php
+++ b/ReCaptcha/Model/ValidateInterface.php
@@ -7,8 +7,12 @@
 
 namespace Magento\ReCaptcha\Model;
 
+use Magento\Framework\Exception\LocalizedException;
+
 /**
- * SPI - Interface for recaptcha validation
+ * Interface for recaptcha validation
+ *
+ * @api
  */
 interface ValidateInterface
 {
@@ -21,7 +25,9 @@ interface ValidateInterface
      * Return true if reCaptcha validation has passed
      * @param string $reCaptchaResponse
      * @param string $remoteIp
+     * @param array $options
      * @return bool
+     * @throws LocalizedException
      */
-    public function validate(string $reCaptchaResponse, string $remoteIp): bool;
+    public function validate(string $reCaptchaResponse, string $remoteIp, array $options = []): bool;
 }
diff --git a/ReCaptcha/Observer/Adminhtml/ForgotPasswordObserver.php b/ReCaptcha/Observer/Adminhtml/ForgotPasswordObserver.php
new file mode 100644
index 00000000..e1b38605
--- /dev/null
+++ b/ReCaptcha/Observer/Adminhtml/ForgotPasswordObserver.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ReCaptcha\Observer\Adminhtml;
+
+use Magento\Framework\App\Action\Action;
+use Magento\Framework\App\Area;
+use Magento\Framework\Event\Observer;
+use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\UrlInterface;
+use Magento\ReCaptcha\Model\CaptchaRequestHandlerInterface;
+use Magento\ReCaptcha\Model\Config;
+
+/**
+ * ForgotPasswordObserver
+ */
+class ForgotPasswordObserver implements ObserverInterface
+{
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * @var UrlInterface
+     */
+    private $url;
+
+    /**
+     * @var CaptchaRequestHandlerInterface
+     */
+    private $captchaRequestHandler;
+
+    /**
+     * @param Config $config
+     * @param UrlInterface $url
+     * @param CaptchaRequestHandlerInterface $captchaRequestHandler
+     */
+    public function __construct(
+        Config $config,
+        UrlInterface $url,
+        CaptchaRequestHandlerInterface $captchaRequestHandler
+    ) {
+        $this->config = $config;
+        $this->url = $url;
+        $this->captchaRequestHandler = $captchaRequestHandler;
+    }
+
+    /**
+     * @param Observer $observer
+     * @return void
+     * @throws LocalizedException
+     */
+    public function execute(Observer $observer): void
+    {
+        /** @var Action $controller */
+        $controller = $observer->getControllerAction();
+        $request = $controller->getRequest();
+
+        if ($this->config->isAreaEnabled(Area::AREA_ADMINHTML) && null !== $request->getParam('email')) {
+            $response = $controller->getResponse();
+            $redirectOnFailureUrl = $this->url->getUrl('*/*/forgotpassword', ['_secure' => true]);
+
+            $this->captchaRequestHandler->execute(Area::AREA_ADMINHTML, $request, $response, $redirectOnFailureUrl);
+        }
+    }
+}
diff --git a/ReCaptcha/Observer/Adminhtml/LoginObserver.php b/ReCaptcha/Observer/Adminhtml/LoginObserver.php
new file mode 100644
index 00000000..f8356179
--- /dev/null
+++ b/ReCaptcha/Observer/Adminhtml/LoginObserver.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ReCaptcha\Observer\Adminhtml;
+
+use Magento\Framework\App\Action\Action;
+use Magento\Framework\App\Area;
+use Magento\Framework\Event\Observer;
+use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\Plugin\AuthenticationException;
+use Magento\Framework\HTTP\PhpEnvironment\RemoteAddress;
+use Magento\ReCaptcha\Model\Config;
+use Magento\ReCaptcha\Model\ValidateInterface;
+
+/**
+ * LoginObserver
+ */
+class LoginObserver implements ObserverInterface
+{
+    /**
+     * @var ValidateInterface
+     */
+    private $validate;
+
+    /**
+     * @var RemoteAddress
+     */
+    private $remoteAddress;
+
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * @param ValidateInterface $validate
+     * @param RemoteAddress $remoteAddress
+     * @param Config $config
+     */
+    public function __construct(
+        ValidateInterface $validate,
+        RemoteAddress $remoteAddress,
+        Config $config
+    ) {
+        $this->validate = $validate;
+        $this->remoteAddress = $remoteAddress;
+        $this->config = $config;
+    }
+
+    /**
+     * @param Observer $observer
+     * @return void
+     * @throws AuthenticationException
+     * @throws LocalizedException
+     */
+    public function execute(Observer $observer): void
+    {
+        if ($this->config->isAreaEnabled(Area::AREA_ADMINHTML)) {
+            /** @var Action $controller */
+            $controller = $observer->getControllerAction();
+
+            $reCaptchaResponse = $controller->getRequest()->getParam(ValidateInterface::PARAM_RECAPTCHA_RESPONSE);
+            $remoteIp = $this->remoteAddress->getRemoteAddress();
+            $options['threshold'] = $this->config->getMinBackendScore();
+
+            if (false === $this->validate->validate($reCaptchaResponse, $remoteIp, $options)) {
+                throw new AuthenticationException($this->config->getErrorDescription());
+            }
+        }
+    }
+}
diff --git a/ReCaptcha/Observer/Frontend/AjaxLoginObserver.php b/ReCaptcha/Observer/Frontend/AjaxLoginObserver.php
new file mode 100644
index 00000000..4480292e
--- /dev/null
+++ b/ReCaptcha/Observer/Frontend/AjaxLoginObserver.php
@@ -0,0 +1,110 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ReCaptcha\Observer\Frontend;
+
+use Magento\Framework\App\Action\Action;
+use Magento\Framework\App\ActionFlag;
+use Magento\Framework\App\Area;
+use Magento\Framework\Event\Observer;
+use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\HTTP\PhpEnvironment\RemoteAddress;
+use Magento\Framework\Serialize\SerializerInterface;
+use Magento\ReCaptcha\Model\Config;
+use Magento\ReCaptcha\Model\ValidateInterface;
+
+/**
+ * AjaxLoginObserver
+ */
+class AjaxLoginObserver implements ObserverInterface
+{
+    /**
+     * @var ValidateInterface
+     */
+    private $validate;
+
+    /**
+     * @var RemoteAddress
+     */
+    private $remoteAddress;
+
+    /**
+     * @var ActionFlag
+     */
+    private $actionFlag;
+
+    /**
+     * @var SerializerInterface
+     */
+    private $serializer;
+
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * @param ValidateInterface $validate
+     * @param RemoteAddress $remoteAddress
+     * @param ActionFlag $actionFlag
+     * @param SerializerInterface $serializer
+     * @param Config $config
+     */
+    public function __construct(
+        ValidateInterface $validate,
+        RemoteAddress $remoteAddress,
+        ActionFlag $actionFlag,
+        SerializerInterface $serializer,
+        Config $config
+    ) {
+        $this->validate = $validate;
+        $this->remoteAddress = $remoteAddress;
+        $this->actionFlag = $actionFlag;
+        $this->serializer = $serializer;
+        $this->config = $config;
+    }
+
+    /**
+     * @param Observer $observer
+     * @return void
+     * @throws LocalizedException
+     */
+    public function execute(Observer $observer): void
+    {
+        if ($this->config->isAreaEnabled(Area::AREA_FRONTEND) && $this->config->isEnabledFrontendLogin()) {
+            /** @var Action $controller */
+            $controller = $observer->getControllerAction();
+
+            $reCaptchaResponse = '';
+            if ($content = $controller->getRequest()->getContent()) {
+                try {
+                    $jsonParams = $this->serializer->unserialize($content);
+                    if (isset($jsonParams[ValidateInterface::PARAM_RECAPTCHA_RESPONSE])) {
+                        $reCaptchaResponse = $jsonParams[ValidateInterface::PARAM_RECAPTCHA_RESPONSE];
+                    }
+                } catch (\Exception $e) {
+                    $reCaptchaResponse = '';
+                }
+            }
+
+            $remoteIp = $this->remoteAddress->getRemoteAddress();
+            $options['threshold'] = $this->config->getMinFrontendScore();
+
+            if (!$this->validate->validate($reCaptchaResponse, $remoteIp, $options)) {
+                $this->actionFlag->set('', Action::FLAG_NO_DISPATCH, true);
+
+                $jsonPayload = $this->serializer->serialize([
+                    'errors' => true,
+                    'message' => $this->config->getErrorDescription(),
+                ]);
+
+                $controller->getResponse()->representJson($jsonPayload);
+            }
+        }
+    }
+}
diff --git a/ReCaptcha/Observer/Frontend/ContactFormObserver.php b/ReCaptcha/Observer/Frontend/ContactFormObserver.php
new file mode 100644
index 00000000..d156486e
--- /dev/null
+++ b/ReCaptcha/Observer/Frontend/ContactFormObserver.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ReCaptcha\Observer\Frontend;
+
+use Magento\Framework\App\Action\Action;
+use Magento\Framework\App\Area;
+use Magento\Framework\Event\Observer;
+use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\UrlInterface;
+use Magento\ReCaptcha\Model\CaptchaRequestHandlerInterface;
+use Magento\ReCaptcha\Model\Config;
+
+/**
+ * ContactFormObserver
+ */
+class ContactFormObserver implements ObserverInterface
+{
+    /**
+     * @var UrlInterface
+     */
+    private $url;
+
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * @var CaptchaRequestHandlerInterface
+     */
+    private $captchaRequestHandler;
+
+    /**
+     * @param UrlInterface $url
+     * @param Config $config
+     * @param CaptchaRequestHandlerInterface $captchaRequestHandler
+     */
+    public function __construct(
+        UrlInterface $url,
+        Config $config,
+        CaptchaRequestHandlerInterface $captchaRequestHandler
+    ) {
+        $this->url = $url;
+        $this->config = $config;
+        $this->captchaRequestHandler = $captchaRequestHandler;
+    }
+
+    /**
+     * @param Observer $observer
+     * @return void
+     * @throws LocalizedException
+     */
+    public function execute(Observer $observer): void
+    {
+        if ($this->config->isAreaEnabled(Area::AREA_FRONTEND) && $this->config->isEnabledFrontendContact()) {
+            /** @var Action $controller */
+            $controller = $observer->getControllerAction();
+            $request = $controller->getRequest();
+            $response = $controller->getResponse();
+            $redirectOnFailureUrl = $this->url->getUrl('contact/index/index');
+
+            $this->captchaRequestHandler->execute(Area::AREA_ADMINHTML, $request, $response, $redirectOnFailureUrl);
+        }
+    }
+}
diff --git a/ReCaptcha/Observer/Frontend/CreateUserObserver.php b/ReCaptcha/Observer/Frontend/CreateUserObserver.php
new file mode 100644
index 00000000..f6bfa4c6
--- /dev/null
+++ b/ReCaptcha/Observer/Frontend/CreateUserObserver.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ReCaptcha\Observer\Frontend;
+
+use Magento\Framework\App\Action\Action;
+use Magento\Framework\App\Area;
+use Magento\Framework\Event\Observer;
+use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\UrlInterface;
+use Magento\ReCaptcha\Model\CaptchaRequestHandlerInterface;
+use Magento\ReCaptcha\Model\Config;
+
+/**
+ * CreateUserObserver
+ */
+class CreateUserObserver implements ObserverInterface
+{
+    /**
+     * @var UrlInterface
+     */
+    private $url;
+
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * @var CaptchaRequestHandlerInterface
+     */
+    private $captchaRequestHandler;
+
+    /**
+     * @param UrlInterface $url
+     * @param Config $config
+     * @param CaptchaRequestHandlerInterface $captchaRequestHandler
+     */
+    public function __construct(
+        UrlInterface $url,
+        Config $config,
+        CaptchaRequestHandlerInterface $captchaRequestHandler
+    ) {
+        $this->url = $url;
+        $this->config = $config;
+        $this->captchaRequestHandler = $captchaRequestHandler;
+    }
+
+    /**
+     * @param Observer $observer
+     * @return void
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function execute(Observer $observer): void
+    {
+        if ($this->config->isAreaEnabled(Area::AREA_FRONTEND) && $this->config->isEnabledFrontendCreateUser()) {
+            /** @var Action $controller */
+            $controller = $observer->getControllerAction();
+            $request = $controller->getRequest();
+            $response = $controller->getResponse();
+            $redirectOnFailureUrl = $this->url->getUrl('*/*/create', ['_secure' => true]);
+
+            $this->captchaRequestHandler->execute(Area::AREA_ADMINHTML, $request, $response, $redirectOnFailureUrl);
+        }
+    }
+}
diff --git a/ReCaptcha/Observer/Frontend/ForgotPasswordObserver.php b/ReCaptcha/Observer/Frontend/ForgotPasswordObserver.php
new file mode 100644
index 00000000..a6a78b62
--- /dev/null
+++ b/ReCaptcha/Observer/Frontend/ForgotPasswordObserver.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ReCaptcha\Observer\Frontend;
+
+use Magento\Framework\App\Action\Action;
+use Magento\Framework\App\Area;
+use Magento\Framework\Event\Observer;
+use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\UrlInterface;
+use Magento\ReCaptcha\Model\CaptchaRequestHandlerInterface;
+use Magento\ReCaptcha\Model\Config;
+
+/**
+ * ForgotPasswordObserver
+ */
+class ForgotPasswordObserver implements ObserverInterface
+{
+    /**
+     * @var UrlInterface
+     */
+    private $url;
+
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * @var CaptchaRequestHandlerInterface
+     */
+    private $captchaRequestHandler;
+
+    /**
+     * @param UrlInterface $url
+     * @param Config $config
+     * @param CaptchaRequestHandlerInterface $captchaRequestHandler
+     */
+    public function __construct(
+        UrlInterface $url,
+        Config $config,
+        CaptchaRequestHandlerInterface $captchaRequestHandler
+    ) {
+        $this->url = $url;
+        $this->config = $config;
+        $this->captchaRequestHandler = $captchaRequestHandler;
+    }
+
+    /**
+     * @param Observer $observer
+     * @return void
+     * @throws LocalizedException
+     */
+    public function execute(Observer $observer): void
+    {
+        if ($this->config->isAreaEnabled(Area::AREA_FRONTEND) && $this->config->isEnabledFrontendForgot()) {
+            /** @var Action $controller */
+            $controller = $observer->getControllerAction();
+            $request = $controller->getRequest();
+            $response = $controller->getResponse();
+            $redirectOnFailureUrl = $this->url->getUrl('*/*/forgotpassword', ['_secure' => true]);
+
+            $this->captchaRequestHandler->execute(Area::AREA_ADMINHTML, $request, $response, $redirectOnFailureUrl);
+        }
+    }
+}
diff --git a/ReCaptcha/Observer/Frontend/LoginObserver.php b/ReCaptcha/Observer/Frontend/LoginObserver.php
new file mode 100644
index 00000000..867c9d9a
--- /dev/null
+++ b/ReCaptcha/Observer/Frontend/LoginObserver.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ReCaptcha\Observer\Frontend;
+
+use Magento\Framework\App\Action\Action;
+use Magento\Framework\App\Area;
+use Magento\Framework\Event\Observer;
+use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\ReCaptcha\Model\BeforeAuthUrlProvider;
+use Magento\ReCaptcha\Model\CaptchaRequestHandlerInterface;
+use Magento\ReCaptcha\Model\Config;
+
+/**
+ * LoginObserver
+ */
+class LoginObserver implements ObserverInterface
+{
+    /**
+     * @var BeforeAuthUrlProvider
+     */
+    private $beforeAuthUrlProvider;
+
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * @var CaptchaRequestHandlerInterface
+     */
+    private $captchaRequestHandler;
+
+    /**
+     * @param BeforeAuthUrlProvider $beforeAuthUrlProvider
+     * @param Config $config
+     * @param CaptchaRequestHandlerInterface $captchaRequestHandler
+     */
+    public function __construct(
+        BeforeAuthUrlProvider $beforeAuthUrlProvider,
+        Config $config,
+        CaptchaRequestHandlerInterface $captchaRequestHandler
+    ) {
+        $this->beforeAuthUrlProvider = $beforeAuthUrlProvider;
+        $this->config = $config;
+        $this->captchaRequestHandler = $captchaRequestHandler;
+    }
+
+    /**
+     * @param Observer $observer
+     * @return void
+     * @throws LocalizedException
+     */
+    public function execute(Observer $observer): void
+    {
+        if ($this->config->isAreaEnabled(Area::AREA_FRONTEND) && $this->config->isEnabledFrontendLogin()) {
+            /** @var Action $controller */
+            $controller = $observer->getControllerAction();
+            $request = $controller->getRequest();
+            $response = $controller->getResponse();
+            $redirectOnFailureUrl = $this->beforeAuthUrlProvider->execute();
+
+            $this->captchaRequestHandler->execute(Area::AREA_ADMINHTML, $request, $response, $redirectOnFailureUrl);
+        }
+    }
+}
diff --git a/ReCaptcha/Observer/Frontend/NewsletterObserver.php b/ReCaptcha/Observer/Frontend/NewsletterObserver.php
new file mode 100644
index 00000000..a6099a5e
--- /dev/null
+++ b/ReCaptcha/Observer/Frontend/NewsletterObserver.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ReCaptcha\Observer\Frontend;
+
+use Magento\Framework\App\Action\Action;
+use Magento\Framework\App\Area;
+use Magento\Framework\App\Response\RedirectInterface;
+use Magento\Framework\Event\Observer;
+use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\ReCaptcha\Model\CaptchaRequestHandlerInterface;
+use Magento\ReCaptcha\Model\Config;
+
+/**
+ * NewsletterObserver
+ */
+class NewsletterObserver implements ObserverInterface
+{
+    /**
+     * @var RedirectInterface
+     */
+    private $redirect;
+
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * @var CaptchaRequestHandlerInterface
+     */
+    private $captchaRequestHandler;
+
+    /**
+     * @param RedirectInterface $redirect
+     * @param Config $config
+     * @param CaptchaRequestHandlerInterface $captchaRequestHandler
+     */
+    public function __construct(
+        RedirectInterface $redirect,
+        Config $config,
+        CaptchaRequestHandlerInterface $captchaRequestHandler
+    ) {
+        $this->redirect = $redirect;
+        $this->config = $config;
+        $this->captchaRequestHandler = $captchaRequestHandler;
+    }
+
+    /**
+     * @param Observer $observer
+     * @return void
+     * @throws LocalizedException
+     */
+    public function execute(Observer $observer): void
+    {
+        if ($this->config->isAreaEnabled(Area::AREA_FRONTEND) && $this->config->isEnabledFrontendNewsletter()) {
+            /** @var Action $controller */
+            $controller = $observer->getControllerAction();
+            $request = $controller->getRequest();
+            $response = $controller->getResponse();
+            $redirectOnFailureUrl = $this->redirect->getRefererUrl();
+
+            $this->captchaRequestHandler->execute(Area::AREA_ADMINHTML, $request, $response, $redirectOnFailureUrl);
+        }
+    }
+}
diff --git a/ReCaptcha/Observer/Frontend/ReviewFormObserver.php b/ReCaptcha/Observer/Frontend/ReviewFormObserver.php
new file mode 100644
index 00000000..0ff531ae
--- /dev/null
+++ b/ReCaptcha/Observer/Frontend/ReviewFormObserver.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ReCaptcha\Observer\Frontend;
+
+use Magento\Framework\App\Action\Action;
+use Magento\Framework\App\Area;
+use Magento\Framework\App\Response\RedirectInterface;
+use Magento\Framework\Event\Observer;
+use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\ReCaptcha\Model\CaptchaRequestHandlerInterface;
+use Magento\ReCaptcha\Model\Config;
+
+/**
+ * ReviewFormObserver
+ */
+class ReviewFormObserver implements ObserverInterface
+{
+    /**
+     * @var RedirectInterface
+     */
+    private $redirect;
+
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * @var CaptchaRequestHandlerInterface
+     */
+    private $captchaRequestHandler;
+
+    /**
+     * @param RedirectInterface $redirect
+     * @param Config $config
+     * @param CaptchaRequestHandlerInterface $captchaRequestHandler
+     */
+    public function __construct(
+        RedirectInterface $redirect,
+        Config $config,
+        CaptchaRequestHandlerInterface $captchaRequestHandler
+    ) {
+        $this->redirect = $redirect;
+        $this->config = $config;
+        $this->captchaRequestHandler = $captchaRequestHandler;
+    }
+
+    /**
+     * @param Observer $observer
+     * @return void
+     * @throws LocalizedException
+     */
+    public function execute(Observer $observer): void
+    {
+        if ($this->config->isAreaEnabled(Area::AREA_FRONTEND) && $this->config->isEnabledFrontendReview()) {
+            /** @var Action $controller */
+            $controller = $observer->getControllerAction();
+            $request = $controller->getRequest();
+            $response = $controller->getResponse();
+            $redirectOnFailureUrl = $this->redirect->getRedirectUrl();
+
+            $this->captchaRequestHandler->execute(Area::AREA_ADMINHTML, $request, $response, $redirectOnFailureUrl);
+        }
+    }
+}
diff --git a/ReCaptcha/Observer/ReCaptchaObserver.php b/ReCaptcha/Observer/ReCaptchaObserver.php
deleted file mode 100644
index 5b953efa..00000000
--- a/ReCaptcha/Observer/ReCaptchaObserver.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\ReCaptcha\Observer;
-
-use Magento\Framework\App\Action\Action;
-use Magento\Framework\Event\Observer;
-use Magento\Framework\Event\ObserverInterface;
-use Magento\Framework\HTTP\PhpEnvironment\RemoteAddress;
-use Magento\ReCaptcha\Model\IsCheckRequiredInterface;
-use Magento\ReCaptcha\Model\Provider\FailureProviderInterface;
-use Magento\ReCaptcha\Model\Provider\ResponseProviderInterface;
-use Magento\ReCaptcha\Model\ValidateInterface;
-
-/**
- * DI configurable generic observer for ReCaptcha validation
- */
-class ReCaptchaObserver implements ObserverInterface
-{
-    /**
-     * @var FailureProviderInterface
-     */
-    private $failureProvider;
-
-    /**
-     * @var ValidateInterface
-     */
-    private $validate;
-
-    /**
-     * @var RemoteAddress
-     */
-    private $remoteAddress;
-
-    /**
-     * @var ResponseProviderInterface
-     */
-    private $responseProvider;
-
-    /**
-     * @var IsCheckRequiredInterface
-     */
-    private $isCheckRequired;
-
-    /**
-     * @param ResponseProviderInterface $responseProvider
-     * @param ValidateInterface $validate
-     * @param FailureProviderInterface $failureProvider
-     * @param RemoteAddress $remoteAddress
-     * @param IsCheckRequiredInterface $isCheckRequired
-     */
-    public function __construct(
-        ResponseProviderInterface $responseProvider,
-        ValidateInterface $validate,
-        FailureProviderInterface $failureProvider,
-        RemoteAddress $remoteAddress,
-        IsCheckRequiredInterface $isCheckRequired
-    ) {
-        $this->responseProvider = $responseProvider;
-        $this->validate = $validate;
-        $this->failureProvider = $failureProvider;
-        $this->remoteAddress = $remoteAddress;
-        $this->isCheckRequired = $isCheckRequired;
-    }
-
-    /**
-     * @param Observer $observer
-     * @return void
-     */
-    public function execute(Observer $observer)
-    {
-        if ($this->isCheckRequired->execute()) {
-            $reCaptchaResponse = $this->responseProvider->execute();
-            $remoteIp = $this->remoteAddress->getRemoteAddress();
-
-            /** @var Action $controller */
-            $controller = $observer->getControllerAction();
-
-            if (!$this->validate->validate($reCaptchaResponse, $remoteIp)) {
-                $this->failureProvider->execute($controller ? $controller->getResponse() : null);
-            }
-        }
-    }
-}
diff --git a/ReCaptcha/etc/adminhtml/di.xml b/ReCaptcha/etc/adminhtml/di.xml
deleted file mode 100644
index 13ca2064..00000000
--- a/ReCaptcha/etc/adminhtml/di.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
- -->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <preference for="Magento\ReCaptcha\Api\ValidateInterface" type="Magento\ReCaptcha\Model\Validate"/>
-
-    <!-- Backend Login -->
-    <virtualType name="Magento\ReCaptcha\Model\Provider\IsCheckRequired\Adminhtml\Login"
-                 type="Magento\ReCaptcha\Model\IsCheckRequired">
-        <arguments>
-            <argument name="area" xsi:type="string">adminhtml</argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="Magento\ReCaptcha\Observer\Adminhtml\LoginObserver"
-                 type="Magento\ReCaptcha\Observer\ReCaptchaObserver">
-        <arguments>
-            <argument name="isCheckRequired"
-                      xsi:type="object">Magento\ReCaptcha\Model\Provider\IsCheckRequired\Adminhtml\Login</argument>
-            <argument name="failureProvider"
-                      xsi:type="object">Magento\ReCaptcha\Model\Provider\Failure\AuthenticationExceptionFailure</argument>
-        </arguments>
-    </virtualType>
-
-    <!-- Backend Forgot password -->
-    <virtualType name="Magento\ReCaptcha\Model\Provider\Failure\RedirectUrl\ForgotPassword"
-                 type="Magento\ReCaptcha\Model\Provider\Failure\RedirectUrl\SimpleUrlProvider">
-        <arguments>
-            <argument name="urlPath" xsi:type="string">*/*/forgotpassword</argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="Magento\ReCaptcha\Model\Provider\Failure\ForgotPasswordObserver"
-                 type="Magento\ReCaptcha\Model\Provider\Failure\ObserverRedirectFailure">
-        <arguments>
-            <argument name="redirectUrlProvider"
-                      xsi:type="object">Magento\ReCaptcha\Model\Provider\Failure\RedirectUrl\ForgotPassword</argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="Magento\ReCaptcha\Model\Provider\IsCheckRequired\Adminhtml\ForgotPassword"
-                 type="Magento\ReCaptcha\Model\IsCheckRequired">
-        <arguments>
-            <argument name="area" xsi:type="string">adminhtml</argument>
-            <argument name="requireRequestParam" xsi:type="string">email</argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="Magento\ReCaptcha\Observer\Adminhtml\ForgotPasswordObserver"
-                 type="Magento\ReCaptcha\Observer\ReCaptchaObserver">
-        <arguments>
-            <argument name="isCheckRequired"
-                      xsi:type="object">Magento\ReCaptcha\Model\Provider\IsCheckRequired\Adminhtml\ForgotPassword</argument>
-            <argument name="failureProvider"
-                      xsi:type="object">Magento\ReCaptcha\Model\Provider\Failure\ForgotPasswordObserver</argument>
-        </arguments>
-    </virtualType>
-</config>
diff --git a/ReCaptcha/etc/adminhtml/system.xml b/ReCaptcha/etc/adminhtml/system.xml
index 22f9cde8..93680bae 100644
--- a/ReCaptcha/etc/adminhtml/system.xml
+++ b/ReCaptcha/etc/adminhtml/system.xml
@@ -172,7 +172,7 @@
                         <field id="enabled">1</field>
                     </depends>
                 </field>
-		        <field id="enabled_newsletter" translate="label" type="select" sortOrder="250" showInDefault="1"
+                <field id="enabled_newsletter" translate="label" type="select" sortOrder="250" showInDefault="1"
                        showInWebsite="1" showInStore="0" canRestore="1">
                     <label>Use invisible ReCaptcha in newsletter</label>
                     <comment>Requires an Invisible ReCaptcha v2 or ReCaptcha v3 key. If enabled, a badge will be displayed in every page.</comment>
@@ -181,14 +181,6 @@
                         <field id="enabled">1</field>
                     </depends>
                 </field>
-                <field id="enabled_sendfriend" translate="label" type="select" sortOrder="260" showInDefault="1"
-                       showInWebsite="1" showInStore="0" canRestore="1">
-                    <label>Use in Send To Friend</label>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <depends>
-                        <field id="enabled">1</field>
-                    </depends>
-                </field>
             </group>
         </section>
     </system>
diff --git a/ReCaptcha/etc/config.xml b/ReCaptcha/etc/config.xml
index f9c6d40f..6cf187fd 100644
--- a/ReCaptcha/etc/config.xml
+++ b/ReCaptcha/etc/config.xml
@@ -30,7 +30,6 @@
                 <enabled_create>1</enabled_create>
                 <enabled_review>1</enabled_review>
                 <enabled_newsletter>1</enabled_newsletter>
-                <enabled_sendfriend>1</enabled_sendfriend>
                 <min_score>0.6</min_score>
             </frontend>
         </recaptcha>
diff --git a/ReCaptcha/etc/di.xml b/ReCaptcha/etc/di.xml
index b603ca8a..7de8903c 100644
--- a/ReCaptcha/etc/di.xml
+++ b/ReCaptcha/etc/di.xml
@@ -7,7 +7,10 @@
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <preference for="Magento\ReCaptcha\Model\ConfigInterface" type="Magento\ReCaptcha\Model\Config"/>
     <preference for="Magento\ReCaptcha\Model\ValidateInterface" type="Magento\ReCaptcha\Model\Validate"/>
+    <preference for="Magento\ReCaptcha\Model\CaptchaRequestHandlerInterface"
+                type="Magento\ReCaptcha\Model\CaptchaRequestHandler"/>
 
     <type name="Magento\Framework\Console\CommandListInterface">
         <arguments>
@@ -21,22 +24,6 @@
         <plugin name="exclude-recaptcha-from-minification" type="Magento\ReCaptcha\Plugin\ExcludeFromMinification"/>
     </type>
 
-    <type name="Magento\ReCaptcha\Block\Frontend\ReCaptcha">
-        <arguments>
-            <!-- Deprecated parameter encoder -->
-            <argument name="encoder" xsi:type="null" />
-            <!-- Deprecated parameter decoder -->
-            <argument name="decoder" xsi:type="null" />
-        </arguments>
-    </type>
-
-    <!-- Default HTTP response provider -->
-    <preference for="Magento\ReCaptcha\Model\Provider\ResponseProviderInterface"
-                type="Magento\ReCaptcha\Model\Provider\Response\DefaultResponseProvider"/>
-
-    <preference for="Magento\ReCaptcha\Model\IsCheckRequiredInterface"
-                type="Magento\ReCaptcha\Model\IsCheckRequired"/>
-
     <!-- Set sensitive information -->
     <type name="Magento\Config\Model\Config\TypePool">
         <arguments>
diff --git a/ReCaptcha/etc/frontend/di.xml b/ReCaptcha/etc/frontend/di.xml
index be8bc946..74fd49f6 100644
--- a/ReCaptcha/etc/frontend/di.xml
+++ b/ReCaptcha/etc/frontend/di.xml
@@ -16,231 +16,11 @@
         </arguments>
     </type>
 
-    <!-- User login -->
-    <virtualType name="Magento\ReCaptcha\Model\Provider\Failure\LoginObserver"
-                 type="Magento\ReCaptcha\Model\Provider\Failure\ObserverRedirectFailure">
-        <arguments>
-            <argument name="redirectUrlProvider"
-                      xsi:type="object">Magento\ReCaptcha\Model\Provider\Failure\RedirectUrl\BeforeAuthUrlProvider</argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="Magento\ReCaptcha\Model\Provider\IsCheckRequired\Frontend\Login"
-                 type="Magento\ReCaptcha\Model\IsCheckRequired">
-        <arguments>
-            <argument name="enableConfigFlag"
-                      xsi:type="string">recaptcha/frontend/enabled_login</argument>
-            <argument name="area" xsi:type="string">frontend</argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="Magento\ReCaptcha\Observer\Frontend\LoginObserver"
-                 type="Magento\ReCaptcha\Observer\ReCaptchaObserver">
-        <arguments>
-            <argument name="isCheckRequired"
-                      xsi:type="object">Magento\ReCaptcha\Model\Provider\IsCheckRequired\Frontend\Login</argument>
-            <argument name="failureProvider"
-                      xsi:type="object">Magento\ReCaptcha\Model\Provider\Failure\LoginObserver</argument>
-        </arguments>
-    </virtualType>
-
-    <!-- Forgot password -->
-    <virtualType name="Magento\ReCaptcha\Model\Provider\Failure\RedirectUrl\ForgotPassword"
-                 type="Magento\ReCaptcha\Model\Provider\Failure\RedirectUrl\SimpleUrlProvider">
-        <arguments>
-            <argument name="urlPath" xsi:type="string">*/*/forgotpassword</argument>
-            <argument name="urlParams" xsi:type="array">
-                <item name="_secure" xsi:type="boolean">true</item>
-            </argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="Magento\ReCaptcha\Model\Provider\Failure\ForgotPasswordObserver"
-                 type="Magento\ReCaptcha\Model\Provider\Failure\ObserverRedirectFailure">
-        <arguments>
-            <argument name="redirectUrlProvider"
-                      xsi:type="object">Magento\ReCaptcha\Model\Provider\Failure\RedirectUrl\ForgotPassword</argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="Magento\ReCaptcha\Model\Provider\IsCheckRequired\Frontend\ForgotPassword"
-                 type="Magento\ReCaptcha\Model\IsCheckRequired">
-        <arguments>
-            <argument name="enableConfigFlag"
-                      xsi:type="string">recaptcha/frontend/enabled_forgot</argument>
-            <argument name="area" xsi:type="string">frontend</argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="Magento\ReCaptcha\Observer\Frontend\ForgotPasswordObserver"
-                 type="Magento\ReCaptcha\Observer\ReCaptchaObserver">
-        <arguments>
-            <argument name="isCheckRequired"
-                      xsi:type="object">Magento\ReCaptcha\Model\Provider\IsCheckRequired\Frontend\ForgotPassword</argument>
-            <argument name="failureProvider"
-                      xsi:type="object">Magento\ReCaptcha\Model\Provider\Failure\ForgotPasswordObserver</argument>
-        </arguments>
-    </virtualType>
-
-    <!-- Create User -->
-    <virtualType name="Magento\ReCaptcha\Model\Provider\Failure\RedirectUrl\CreateUser"
-                 type="Magento\ReCaptcha\Model\Provider\Failure\RedirectUrl\SimpleUrlProvider">
-        <arguments>
-            <argument name="urlPath" xsi:type="string">*/*/create</argument>
-            <argument name="urlParams" xsi:type="array">
-                <item name="_secure" xsi:type="boolean">true</item>
-            </argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="Magento\ReCaptcha\Model\Provider\Failure\CreateUserObserver"
-                 type="Magento\ReCaptcha\Model\Provider\Failure\ObserverRedirectFailure">
-        <arguments>
-            <argument name="redirectUrlProvider"
-                      xsi:type="object">Magento\ReCaptcha\Model\Provider\Failure\RedirectUrl\CreateUser</argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="Magento\ReCaptcha\Model\Provider\IsCheckRequired\Frontend\CreateUser"
-                 type="Magento\ReCaptcha\Model\IsCheckRequired">
-        <arguments>
-            <argument name="enableConfigFlag"
-                      xsi:type="string">recaptcha/frontend/enabled_create</argument>
-            <argument name="area" xsi:type="string">frontend</argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="Magento\ReCaptcha\Observer\Frontend\CreateUserObserver"
-                 type="Magento\ReCaptcha\Observer\ReCaptchaObserver">
-        <arguments>
-            <argument name="isCheckRequired"
-                      xsi:type="object">Magento\ReCaptcha\Model\Provider\IsCheckRequired\Frontend\CreateUser</argument>
-            <argument name="failureProvider"
-                      xsi:type="object">Magento\ReCaptcha\Model\Provider\Failure\CreateUserObserver</argument>
-        </arguments>
-    </virtualType>
-
-    <!-- Contact Form -->
-    <virtualType name="Magento\ReCaptcha\Model\Provider\Failure\RedirectUrl\ContactForm"
-                 type="Magento\ReCaptcha\Model\Provider\Failure\RedirectUrl\SimpleUrlProvider">
-        <arguments>
-            <argument name="urlPath" xsi:type="string">contact/index/index</argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="Magento\ReCaptcha\Model\Provider\Failure\ContactFormObserver"
-                 type="Magento\ReCaptcha\Model\Provider\Failure\ObserverRedirectFailure">
-        <arguments>
-            <argument name="redirectUrlProvider"
-                      xsi:type="object">Magento\ReCaptcha\Model\Provider\Failure\RedirectUrl\ContactForm</argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="Magento\ReCaptcha\Model\Provider\IsCheckRequired\Frontend\ContactForm"
-                 type="Magento\ReCaptcha\Model\IsCheckRequired">
-        <arguments>
-            <argument name="enableConfigFlag"
-                      xsi:type="string">recaptcha/frontend/enabled_contact</argument>
-            <argument name="area" xsi:type="string">frontend</argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="Magento\ReCaptcha\Observer\Frontend\ContactFormObserver"
-                 type="Magento\ReCaptcha\Observer\ReCaptchaObserver">
-        <arguments>
-            <argument name="isCheckRequired"
-                      xsi:type="object">Magento\ReCaptcha\Model\Provider\IsCheckRequired\Frontend\ContactForm</argument>
-            <argument name="failureProvider"
-                      xsi:type="object">Magento\ReCaptcha\Model\Provider\Failure\ContactFormObserver</argument>
-        </arguments>
-    </virtualType>
-
     <!-- AjaxLogin Form -->
-    <virtualType name="Magento\ReCaptcha\Observer\Frontend\AjaxLoginObserver"
-                 type="Magento\ReCaptcha\Observer\ReCaptchaObserver">
-        <arguments>
-            <argument name="isCheckRequired"
-                      xsi:type="object">Magento\ReCaptcha\Model\Provider\IsCheckRequired\Frontend\Login</argument>
-            <argument name="responseProvider"
-                      xsi:type="object">Magento\ReCaptcha\Model\Provider\Response\AjaxResponseProvider</argument>
-            <argument name="failureProvider"
-                      xsi:type="object">Magento\ReCaptcha\Model\Provider\Failure\AjaxResponseFailure</argument>
-        </arguments>
-    </virtualType>
 
     <type name="Magento\Customer\Block\Account\AuthenticationPopup">
         <plugin sortOrder="1" name="inject_recaptcha_in_authentication_popup"
                 type="Magento\ReCaptcha\Plugin\Block\Account\InjectRecaptchaInAuthenticationPopup"/>
     </type>
 
-    <!-- Send to Friend Form -->
-    <virtualType name="Magento\ReCaptcha\Observer\Frontend\SendFriendObserver"
-                 type="Magento\ReCaptcha\Observer\ReCaptchaObserver">
-        <arguments>
-            <argument name="isCheckRequired"
-                      xsi:type="object">Magento\ReCaptcha\Model\Provider\IsCheckRequired\Frontend\SendFriendForm</argument>
-            <argument name="responseProvider"
-                      xsi:type="object">Magento\ReCaptcha\Model\Provider\Response\DefaultResponseProvider</argument>
-            <argument name="failureProvider"
-                      xsi:type="object">Magento\ReCaptcha\Model\Provider\Failure\SendFriendObserver</argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="Magento\ReCaptcha\Model\Provider\IsCheckRequired\Frontend\SendFriendForm"
-                 type="Magento\ReCaptcha\Model\IsCheckRequired">
-        <arguments>
-            <argument name="enableConfigFlag"
-                      xsi:type="string">recaptcha/frontend/enabled_sendfriend</argument>
-            <argument name="area" xsi:type="string">frontend</argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="Magento\ReCaptcha\Model\Provider\Failure\SendFriendObserver"
-                 type="Magento\ReCaptcha\Model\Provider\Failure\ObserverRedirectFailure">
-        <arguments>
-            <argument name="redirectUrlProvider"
-                      xsi:type="object">Magento\ReCaptcha\Model\Provider\Failure\RedirectUrl\ReferrerUrlProvider</argument>
-        </arguments>
-    </virtualType>
-
-    <!-- Review Form -->
-    <virtualType name="Magento\ReCaptcha\Model\Provider\Failure\ReviewFormObserver"
-                 type="Magento\ReCaptcha\Model\Provider\Failure\ObserverRedirectFailure">
-        <arguments>
-            <argument name="redirectUrlProvider"
-                      xsi:type="object">Magento\ReCaptcha\Model\Provider\Failure\RedirectUrl\RefererProvider</argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="Magento\ReCaptcha\Model\Provider\IsCheckRequired\Frontend\ReviewForm"
-                 type="Magento\ReCaptcha\Model\IsCheckRequired">
-        <arguments>
-            <argument name="enableConfigFlag"
-                      xsi:type="string">recaptcha/frontend/enabled_review</argument>
-            <argument name="area" xsi:type="string">frontend</argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="Magento\ReCaptcha\Observer\Frontend\ReviewFormObserver"
-                 type="Magento\ReCaptcha\Observer\ReCaptchaObserver">
-        <arguments>
-            <argument name="isCheckRequired"
-                      xsi:type="object">Magento\ReCaptcha\Model\Provider\IsCheckRequired\Frontend\ReviewForm</argument>
-            <argument name="failureProvider"
-                      xsi:type="object">Magento\ReCaptcha\Model\Provider\Failure\ReviewFormObserver</argument>
-        </arguments>
-    </virtualType>
-
-    <!-- Newsletter -->
-    <virtualType name="Magento\ReCaptcha\Model\Provider\IsCheckRequired\Frontend\Newsletter"
-                 type="Magento\ReCaptcha\Model\IsCheckRequired">
-        <arguments>
-            <argument name="enableConfigFlag"
-                      xsi:type="string">recaptcha/frontend/enabled_newsletter</argument>
-            <argument name="area" xsi:type="string">frontend</argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="Magento\ReCaptcha\Model\Provider\Failure\NewsletterObserver"
-                 type="Magento\ReCaptcha\Model\Provider\Failure\ObserverRedirectFailure">
-        <arguments>
-            <argument name="redirectUrlProvider"
-                      xsi:type="object">Magento\ReCaptcha\Model\Provider\Failure\RedirectUrl\ReferrerUrlProvider</argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="Magento\ReCaptcha\Observer\Frontend\NewsletterObserver"
-                 type="Magento\ReCaptcha\Observer\ReCaptchaObserver">
-        <arguments>
-            <argument name="isCheckRequired"
-                      xsi:type="object">Magento\ReCaptcha\Model\Provider\IsCheckRequired\Frontend\Newsletter</argument>
-            <argument name="responseProvider"
-                      xsi:type="object">Magento\ReCaptcha\Model\Provider\Response\DefaultResponseProvider</argument>
-            <argument name="failureProvider"
-                      xsi:type="object">Magento\ReCaptcha\Model\Provider\Failure\NewsletterObserver</argument>
-        </arguments>
-    </virtualType>
 </config>
diff --git a/ReCaptcha/etc/frontend/events.xml b/ReCaptcha/etc/frontend/events.xml
index 7e8a8f63..5da85214 100644
--- a/ReCaptcha/etc/frontend/events.xml
+++ b/ReCaptcha/etc/frontend/events.xml
@@ -29,7 +29,4 @@
     <event name="controller_action_predispatch_newsletter_subscriber_new">
         <observer name="recaptcha_on_newsletter" instance="Magento\ReCaptcha\Observer\Frontend\NewsletterObserver" />
     </event>
-    <event name="controller_action_predispatch_sendfriend_product_sendmail">
-        <observer name="recaptcha_on_send_to_a_friend" instance="Magento\ReCaptcha\Observer\Frontend\SendFriendObserver" />
-    </event>
 </config>
diff --git a/ReCaptcha/view/frontend/web/css/source/_module.less b/ReCaptcha/view/frontend/web/css/source/_module.less
index 39633d03..cbfd43e7 100644
--- a/ReCaptcha/view/frontend/web/css/source/_module.less
+++ b/ReCaptcha/view/frontend/web/css/source/_module.less
@@ -9,7 +9,7 @@
 }
 
 .required-captcha.checkbox{
-	position: absolute;
+    position: absolute;
     display: block;
     visibility: visible;
     overflow: hidden;
@@ -23,7 +23,3 @@
         margin-bottom: 10px;
     }
 }
-
-.form.send.friend .g-recaptcha {
-    margin-top: 40px;
-}
diff --git a/ReCaptchaSendFriend/Model/ConfigEnabled.php b/ReCaptchaSendFriend/Model/ConfigEnabled.php
new file mode 100644
index 00000000..648306dc
--- /dev/null
+++ b/ReCaptchaSendFriend/Model/ConfigEnabled.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ReCaptchaSendFriend\Model;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\ReCaptcha\Model\ConfigEnabledInterface;
+use Magento\ReCaptcha\Model\ConfigInterface;
+use Magento\Store\Model\ScopeInterface;
+
+/**
+ * Read configuration from store config
+ */
+class ConfigEnabled implements ConfigEnabledInterface
+{
+    public const XML_PATH_ENABLED_FRONTEND_SENDFRIEND = 'recaptcha/frontend/enabled_sendfriend';
+
+    /**
+     * @var ConfigInterface
+     */
+    private $reCaptchaConfig;
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @param ConfigInterface $reCaptchaConfig
+     * @param ScopeConfigInterface $scopeConfig
+     */
+    public function __construct(
+        ConfigInterface $reCaptchaConfig,
+        ScopeConfigInterface $scopeConfig
+    ) {
+        $this->reCaptchaConfig = $reCaptchaConfig;
+        $this->scopeConfig = $scopeConfig;
+    }
+
+    /**
+     * Return true if enabled on frontend send to friend
+     * @return bool
+     */
+    public function isEnabled(): bool
+    {
+        if (!$this->reCaptchaConfig->isEnabledFrontend()) {
+            return false;
+        }
+
+        return (bool)$this->scopeConfig->getValue(
+            static::XML_PATH_ENABLED_FRONTEND_SENDFRIEND,
+            ScopeInterface::SCOPE_WEBSITE
+        );
+    }
+}
diff --git a/ReCaptchaSendFriend/Observer/SendFriendObserver.php b/ReCaptchaSendFriend/Observer/SendFriendObserver.php
new file mode 100644
index 00000000..396b4f8b
--- /dev/null
+++ b/ReCaptchaSendFriend/Observer/SendFriendObserver.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ReCaptchaSendFriend\Observer;
+
+use Magento\Framework\App\Action\Action;
+use Magento\Framework\App\Area;
+use Magento\Framework\App\Response\RedirectInterface;
+use Magento\Framework\Event\Observer;
+use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\ReCaptcha\Model\CaptchaRequestHandlerInterface;
+use Magento\ReCaptcha\Model\ConfigEnabledInterface;
+
+/**
+ * SendFriendObserver
+ */
+class SendFriendObserver implements ObserverInterface
+{
+    /**
+     * @var RedirectInterface
+     */
+    private $redirect;
+
+    /**
+     * @var ConfigEnabledInterface
+     */
+    private $config;
+
+    /**
+     * @var CaptchaRequestHandlerInterface
+     */
+    private $captchaRequestHandler;
+
+    /**
+     * @param RedirectInterface $redirect
+     * @param ConfigEnabledInterface $config
+     * @param CaptchaRequestHandlerInterface $captchaRequestHandler
+     */
+    public function __construct(
+        RedirectInterface $redirect,
+        ConfigEnabledInterface $config,
+        CaptchaRequestHandlerInterface $captchaRequestHandler
+    ) {
+        $this->redirect = $redirect;
+        $this->config = $config;
+        $this->captchaRequestHandler = $captchaRequestHandler;
+    }
+
+    /**
+     * @param Observer $observer
+     * @return void
+     * @throws LocalizedException
+     */
+    public function execute(Observer $observer): void
+    {
+        if ($this->config->isEnabled()) {
+            /** @var Action $controller */
+            $controller = $observer->getControllerAction();
+            $request = $controller->getRequest();
+            $response = $controller->getResponse();
+            $redirectOnFailureUrl = $this->redirect->getRefererUrl();
+
+            $this->captchaRequestHandler->execute(Area::AREA_ADMINHTML, $request, $response, $redirectOnFailureUrl);
+        }
+    }
+}
diff --git a/ReCaptchaSendFriend/README.md b/ReCaptchaSendFriend/README.md
new file mode 100644
index 00000000..2eb34c63
--- /dev/null
+++ b/ReCaptchaSendFriend/README.md
@@ -0,0 +1 @@
+Please refer to: https://github.com/magento/security-package
\ No newline at end of file
diff --git a/ReCaptchaSendFriend/composer.json b/ReCaptchaSendFriend/composer.json
new file mode 100644
index 00000000..3b9fa29d
--- /dev/null
+++ b/ReCaptchaSendFriend/composer.json
@@ -0,0 +1,26 @@
+{
+    "name": "magento/module-re-captcha-send-friend",
+    "version": "1.0.0",
+    "description": "Google reCaptcha integration for Magento2",
+    "require": {
+        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "magento/framework": "102.0.*",
+        "magento/module-re-captcha": "*"
+    },
+    "authors": [
+        {
+            "name": "Riccardo Tempesta",
+            "email": "riccardo.tempesta@magespecialist.it"
+        }
+    ],
+    "type": "magento2-module",
+    "license": "OSL-3.0",
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\ReCaptchaSendFriend\\": ""
+        }
+    }
+}
diff --git a/ReCaptchaSendFriend/etc/adminhtml/system.xml b/ReCaptchaSendFriend/etc/adminhtml/system.xml
new file mode 100644
index 00000000..f020f641
--- /dev/null
+++ b/ReCaptchaSendFriend/etc/adminhtml/system.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
+    <system>
+        <section id="recaptcha">
+            <group id="frontend">
+                <field id="enabled_sendfriend" translate="label" type="select" sortOrder="260" showInDefault="1"
+                       showInWebsite="1" showInStore="0" canRestore="1">
+                    <label>Use in Send To Friend</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                    <depends>
+                        <field id="enabled">1</field>
+                    </depends>
+                </field>
+            </group>
+        </section>
+    </system>
+</config>
diff --git a/ReCaptchaSendFriend/etc/config.xml b/ReCaptchaSendFriend/etc/config.xml
new file mode 100644
index 00000000..58255293
--- /dev/null
+++ b/ReCaptchaSendFriend/etc/config.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
+    <default>
+        <recaptcha>
+            <frontend>
+                <enabled_sendfriend>1</enabled_sendfriend>
+            </frontend>
+        </recaptcha>
+    </default>
+</config>
diff --git a/ReCaptchaSendFriend/etc/di.xml b/ReCaptchaSendFriend/etc/di.xml
new file mode 100644
index 00000000..52b92e82
--- /dev/null
+++ b/ReCaptchaSendFriend/etc/di.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\ReCaptchaSendFriend\Observer\SendFriendObserver">
+        <arguments>
+            <argument name="config" xsi:type="object">Magento\ReCaptchaSendFriend\Model\ConfigEnabled</argument>
+        </arguments>
+    </type>
+
+    <type name="Magento\ReCaptcha\Model\LayoutSettings">
+        <arguments>
+            <argument name="configEnabledProviders" xsi:type="array">
+                <item name="sendfriend" xsi:type="object">Magento\ReCaptchaSendFriend\Model\ConfigEnabled</item>
+            </argument>
+        </arguments>
+    </type>
+</config>
diff --git a/ReCaptchaSendFriend/etc/frontend/events.xml b/ReCaptchaSendFriend/etc/frontend/events.xml
new file mode 100644
index 00000000..d28d8ba7
--- /dev/null
+++ b/ReCaptchaSendFriend/etc/frontend/events.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
+    <event name="controller_action_predispatch_sendfriend_product_sendmail">
+        <observer name="recaptcha_on_send_to_a_friend" instance="Magento\ReCaptchaSendFriend\Observer\SendFriendObserver"/>
+    </event>
+</config>
diff --git a/ReCaptchaSendFriend/etc/module.xml b/ReCaptchaSendFriend/etc/module.xml
new file mode 100644
index 00000000..9a3e3a08
--- /dev/null
+++ b/ReCaptchaSendFriend/etc/module.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_ReCaptchaSendFriend"/>
+</config>
diff --git a/ReCaptchaSendFriend/registration.php b/ReCaptchaSendFriend/registration.php
new file mode 100644
index 00000000..9f72af49
--- /dev/null
+++ b/ReCaptchaSendFriend/registration.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+\Magento\Framework\Component\ComponentRegistrar::register(
+    \Magento\Framework\Component\ComponentRegistrar::MODULE,
+    'Magento_ReCaptchaSendFriend',
+    __DIR__
+);
diff --git a/ReCaptcha/view/frontend/layout/sendfriend_product_send.xml b/ReCaptchaSendFriend/view/frontend/layout/sendfriend_product_send.xml
similarity index 99%
rename from ReCaptcha/view/frontend/layout/sendfriend_product_send.xml
rename to ReCaptchaSendFriend/view/frontend/layout/sendfriend_product_send.xml
index 9fc2373c..7e3355e9 100644
--- a/ReCaptcha/view/frontend/layout/sendfriend_product_send.xml
+++ b/ReCaptchaSendFriend/view/frontend/layout/sendfriend_product_send.xml
@@ -7,12 +7,10 @@
  -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-
     <body>
         <referenceContainer name="form.additional.info">
             <block class="Magento\ReCaptcha\Block\Frontend\ReCaptcha" name="recaptcha" after="-"
                    template="Magento_ReCaptcha::recaptcha.phtml">
-
                 <arguments>
                     <argument name="jsLayout" xsi:type="array">
                         <item name="components" xsi:type="array">
diff --git a/ReCaptchaSendFriend/view/frontend/web/css/source/_module.less b/ReCaptchaSendFriend/view/frontend/web/css/source/_module.less
new file mode 100644
index 00000000..495f4b46
--- /dev/null
+++ b/ReCaptchaSendFriend/view/frontend/web/css/source/_module.less
@@ -0,0 +1,7 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+.form.send.friend .g-recaptcha {
+    margin-top: 40px;
+}