diff --git a/src/Model/Behavior/RegisterBehavior.php b/src/Model/Behavior/RegisterBehavior.php
index 3e8b464c..b33383b0 100644
--- a/src/Model/Behavior/RegisterBehavior.php
+++ b/src/Model/Behavior/RegisterBehavior.php
@@ -141,15 +141,17 @@ public function activateUser(EntityInterface $user)
      * @param \Cake\Event\Event $event event
      * @param \Cake\Validation\Validator $validator validator
      * @param string $name name
-     * @return \Cake\Validation\Validator
+     * @return void
      */
     public function buildValidator(\Cake\Event\EventInterface $event, Validator $validator, $name)
     {
         if ($name === 'default') {
-            return $this->_emailValidator($validator, $this->validateEmail);
+            $event->setResult($this->_emailValidator($validator, $this->validateEmail));
+
+            return;
         }
 
-        return $validator;
+        $event->setResult($validator);
     }
 
     /**
@@ -164,7 +166,7 @@ protected function _emailValidator(Validator $validator, $validateEmail)
         $this->validateEmail = (bool)$validateEmail;
         $validator
             ->add('email', 'valid_email', ['rule' => 'email'])
-            ->notBlank('email', __d('cake_d_c/users', 'This field is required'), function ($context) {
+            ->notBlank('email', __d('cake_d_c/users', 'This field is required'), function () {
                 return $this->validateEmail;
             });