diff --git a/src/MicroweberPackages/Utils/Captcha/Adapters/MicroweberCaptcha.php b/src/MicroweberPackages/Utils/Captcha/Adapters/MicroweberCaptcha.php
index f6c613122b0..83859209ad0 100644
--- a/src/MicroweberPackages/Utils/Captcha/Adapters/MicroweberCaptcha.php
+++ b/src/MicroweberPackages/Utils/Captcha/Adapters/MicroweberCaptcha.php
@@ -26,16 +26,21 @@ public function validate($key, $captcha_id = null, $unset_if_found = true)
                     unset($old_array[$found_key]);
                 }
                 app()->user_manager->session_set('captcha_recent', $old_array);
+                $this->reset();
                 return true;
             }
         }
 
         $existing = app()->user_manager->session_get('captcha_' . $captcha_id);
          if ($existing == $key) {
+             if ($captcha_id) {
+                 $this->reset($captcha_id);
+             }
             return true;
         } else {
             $existing = app()->user_manager->session_get('captcha');
             if ($existing == $key) {
+                $this->reset();
                 return true;
             }
             return false;
@@ -46,8 +51,8 @@ public function reset($captcha_id = null)
     {
         $old = app()->user_manager->session_set('captcha',[]);
         $old = app()->user_manager->session_set('captcha_recent',[]);
-        if($captcha_id){
-         $old = app()->user_manager->session_set('captcha_' . $captcha_id,[]);
+        if ($captcha_id) {
+            $old = app()->user_manager->session_set('captcha_' . $captcha_id,[]);
         }
     }