diff --git a/application/component/oeusercomponent.php b/application/component/oeusercomponent.php
index bd005b0..473caa7 100644
--- a/application/component/oeusercomponent.php
+++ b/application/component/oeusercomponent.php
@@ -36,4 +36,13 @@ class oeUserComponent extends oeUserComponent_parent
 
         return parent::createUser();
     }
+
+    public function changeuser_testvalues()
+    {
+        if (!$this->getCaptcha()->passCaptcha()) {
+            return false;
+        }
+
+        return parent::changeuser_testvalues();
+    }
 }
diff --git a/controllers/oecaptchaaccountuser.php b/controllers/oecaptchaaccountuser.php
new file mode 100644
index 0000000..9ed62b5
--- /dev/null
+++ b/controllers/oecaptchaaccountuser.php
@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * #PHPHEADER_OECAPTCHA_LICENSE_INFORMATION#
+ */
+
+class oecaptchaaccountuser extends oecaptchaaccountuser_parent
+{
+    /**
+     * Class handling CAPTCHA image.
+     *
+     * @var object
+     */
+    protected $captcha = null;
+
+    /**
+     * Template variable getter. Returns object of handling CAPTCHA image
+     *
+     * @return object
+     */
+    public function getCaptcha()
+    {
+        if ( $this->captcha === null ) {
+            $this->captcha = oxNew( 'oeCaptcha' );
+        }
+
+        return $this->captcha;
+    }
+}
diff --git a/metadata.php b/metadata.php
index dc334f8..87b1b65 100755
--- a/metadata.php
+++ b/metadata.php
@@ -17,6 +17,10 @@
 /**
  * Metadata version
  */
+
+use OxidEsales\Eshop\Application\Component\UserComponent;
+use OxidEsales\Eshop\Application\Controller\AccountUserController;
+
 $sMetadataVersion = '1.1';
 
 /**
@@ -45,9 +49,10 @@ $aModule = array(
                            'pricealarm'        => 'oe/captcha/controllers/oecaptchapricealarm',
                            'suggest'           => 'oe/captcha/controllers/oecaptchasuggest',
                            'oxwarticledetails' => 'oe/captcha/application/component/widget/oecaptchawarticledetails',
-                           \OxidEsales\Eshop\Application\Component\UserComponent::class   => 'oe/captcha/application/component/oeusercomponent',
+                           UserComponent::class   => 'oe/captcha/application/component/oeusercomponent',
                            'register' => 'oe/captcha/controllers/oecaptcharegister',
-                           'user' => 'oe/captcha/controllers/oecaptchauser'
+                           'user' => 'oe/captcha/controllers/oecaptchauser',
+                           AccountUserController::class => 'oe/captcha/controllers/oecaptchaaccountuser'
     ),
     'files'       => array(
         'oecaptcha'       => 'oe/captcha/core/oecaptcha.php',
@@ -58,21 +63,63 @@ $aModule = array(
         'oecaptcha_wave.tpl' => 'oe/captcha/application/views/tpl/oecaptcha_wave.tpl',
     ),
     'blocks'      => array(
-        array('template' => 'form/contact.tpl', 'block'=>'captcha_form', 'theme' => 'flow', 'file'=>'/application/views/blocks/captcha_form.tpl'),
-        array('template' => 'form/newsletter.tpl', 'block'=>'captcha_form', 'theme' => 'flow', 'file'=>'/application/views/blocks/captcha_form.tpl'),
-        array('template' => 'form/privatesales/invite.tpl', 'theme' => 'flow', 'block'=>'captcha_form', 'file'=>'/application/views/blocks/captcha_form.tpl'),
-        array('template' => 'form/pricealarm.tpl', 'block'=>'captcha_form', 'theme' => 'flow', 'file'=>'/application/views/blocks/captcha_form.tpl'),
-        array('template' => 'form/suggest.tpl', 'block'=>'captcha_form', 'theme' => 'flow', 'file'=>'/application/views/blocks/captcha_form.tpl'),
-        array('template' => 'form/forgotpwd_email.tpl', 'block'=>'captcha_form', 'theme' => 'flow', 'file'=>'/application/views/blocks/captcha_form_forgotpwd.tpl'),
-        array('template' => 'form/fieldset/user_billing.tpl', 'block'=>'captcha_form',  'theme' => 'flow', 'file'=>'/application/views/blocks/captcha_form.tpl'),
+        array('template' => 'form/contact.tpl',
+              'block'=>'captcha_form',
+              'theme' => 'flow',
+              'file'=>'/application/views/blocks/captcha_form.tpl'),
+        array('template' => 'form/newsletter.tpl',
+              'block'=>'captcha_form',
+              'theme' => 'flow',
+              'file'=>'/application/views/blocks/captcha_form.tpl'),
+        array('template' => 'form/privatesales/invite.tpl',
+              'theme' => 'flow',
+              'block'=>'captcha_form',
+              'file'=>'/application/views/blocks/captcha_form.tpl'),
+        array('template' => 'form/pricealarm.tpl',
+              'block'=>'captcha_form',
+              'theme' => 'flow',
+              'file'=>'/application/views/blocks/captcha_form.tpl'),
+        array('template' => 'form/suggest.tpl',
+              'block'=>'captcha_form',
+              'theme' => 'flow',
+              'file'=>'/application/views/blocks/captcha_form.tpl'),
+        array('template' => 'form/forgotpwd_email.tpl',
+              'block'=>'captcha_form',
+              'theme' => 'flow',
+              'file'=>'/application/views/blocks/captcha_form_forgotpwd.tpl'),
+        array('template' => 'form/fieldset/user_billing.tpl',
+              'block'=>'captcha_form',
+              'theme' => 'flow',
+              'file'=>'/application/views/blocks/captcha_form.tpl'),
 
-        array('template' => 'form/contact.tpl', 'block'=>'captcha_form', 'theme' => 'wave', 'file'=>'/application/views/blocks/captcha_form_contact_wave.tpl'),
-        array('template' => 'form/newsletter.tpl', 'block'=>'captcha_form', 'theme' => 'wave', 'file'=>'/application/views/blocks/captcha_form_newsletter_wave.tpl'),
-        array('template' => 'form/privatesales/invite.tpl', 'theme' => 'wave', 'block'=>'captcha_form', 'file'=>'/application/views/blocks/captcha_form_wave.tpl'),
-        array('template' => 'form/pricealarm.tpl', 'block'=>'captcha_form', 'theme' => 'wave', 'file'=>'/application/views/blocks/captcha_form_wave.tpl'),
-        array('template' => 'form/suggest.tpl', 'block'=>'captcha_form', 'theme' => 'wave', 'file'=>'/application/views/blocks/captcha_form_wave.tpl'),
-        array('template' => 'form/forgotpwd_email.tpl', 'block'=>'captcha_form', 'theme' => 'wave', 'file'=>'/application/views/blocks/captcha_form_forgotpwd_wave.tpl'),
-        array('template' => 'form/fieldset/user_billing.tpl', 'block'=>'captcha_form',  'theme' => 'wave', 'file'=>'/application/views/blocks/captcha_form_user_billing_wave.tpl'),
+        array('template' => 'form/contact.tpl',
+              'block'=>'captcha_form',
+              'theme' => 'wave',
+              'file'=>'/application/views/blocks/captcha_form_contact_wave.tpl'),
+        array('template' => 'form/newsletter.tpl',
+              'block'=>'captcha_form',
+              'theme' => 'wave',
+              'file'=>'/application/views/blocks/captcha_form_newsletter_wave.tpl'),
+        array('template' => 'form/privatesales/invite.tpl',
+              'theme' => 'wave',
+              'block'=>'captcha_form',
+              'file'=>'/application/views/blocks/captcha_form_wave.tpl'),
+        array('template' => 'form/pricealarm.tpl',
+              'block'=>'captcha_form',
+              'theme' => 'wave',
+              'file'=>'/application/views/blocks/captcha_form_wave.tpl'),
+        array('template' => 'form/suggest.tpl',
+              'block'=>'captcha_form',
+              'theme' => 'wave',
+              'file'=>'/application/views/blocks/captcha_form_wave.tpl'),
+        array('template' => 'form/forgotpwd_email.tpl',
+              'block'=>'captcha_form',
+              'theme' => 'wave',
+              'file'=>'/application/views/blocks/captcha_form_forgotpwd_wave.tpl'),
+        array('template' => 'form/fieldset/user_billing.tpl',
+              'block'=>'captcha_form',
+              'theme' => 'wave',
+              'file'=>'/application/views/blocks/captcha_form_user_billing_wave.tpl'),
     ),
     'settings'    => array(
         array('group' => 'main', 'name' => 'oecaptchakey', 'type' => 'str', 'value' => ''),