diff --git a/application/component/oeusercomponent.php b/application/component/oeusercomponent.php
index 473caa7..bd005b0 100644
--- a/application/component/oeusercomponent.php
+++ b/application/component/oeusercomponent.php
@@ -36,13 +36,4 @@ 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/application/views/blocks/captcha_form_user_billing_wave.tpl b/application/views/blocks/captcha_form_user_billing_wave.tpl
index 71e8bd3..93381d7 100644
--- a/application/views/blocks/captcha_form_user_billing_wave.tpl
+++ b/application/views/blocks/captcha_form_user_billing_wave.tpl
@@ -1,3 +1,5 @@
 [{$smarty.block.parent}]
 
-[{include file="oecaptcha_wave.tpl" labelCssClass="col-lg-3" inputCssClass="col-lg-5"}]
+[{if !$oxcmp_user}]
+    [{include file="oecaptcha_wave.tpl" labelCssClass="col-lg-3" inputCssClass="col-lg-5"}]
+[{/if}]