diff --git a/src/Model/Behavior/SocialBehavior.php b/src/Model/Behavior/SocialBehavior.php
index 09ee6373..7ad6258a 100644
--- a/src/Model/Behavior/SocialBehavior.php
+++ b/src/Model/Behavior/SocialBehavior.php
@@ -205,14 +205,14 @@ protected function _populateUser($data, $existingUser, $useEmail, $validateEmail
                     $email = explode('@', $dataEmail);
                     $userData['username'] = Hash::get($email, 0);
                 } else {
-                    $firstName = $userData['first_name'] ?? null;
+                    $firstName = $userData['first_name'];
                     $lastName = $userData['last_name'];
                     $userData['username'] = strtolower($firstName . $lastName);
                     $userData['username'] = preg_replace('/[^A-Za-z0-9]/i', '', $userData['username']);
                 }
             }
 
-            $userData['username'] = $this->generateUniqueUsername($userData['username'] ?? null);
+            $userData['username'] = $this->generateUniqueUsername($userData['username']);
             if ($useEmail) {
                 $userData['email'] = $data['email'] ?? null;
                 if (empty($dataValidated)) {
diff --git a/tests/TestCase/Controller/Traits/ReCaptchaTraitTest.php b/tests/TestCase/Controller/Traits/ReCaptchaTraitTest.php
index c8bc12fc..d93eeb71 100644
--- a/tests/TestCase/Controller/Traits/ReCaptchaTraitTest.php
+++ b/tests/TestCase/Controller/Traits/ReCaptchaTraitTest.php
@@ -15,6 +15,7 @@
 
 use Cake\Core\Configure;
 use Cake\TestSuite\TestCase;
+use ReCaptcha\Response;
 use ReflectionMethod;
 
 class ReCaptchaTraitTest extends TestCase
@@ -58,13 +59,7 @@ public function testValidateValidReCaptcha()
                 ->onlyMethods(['verify'])
                 ->disableOriginalConstructor()
                 ->getMock();
-        $Response = $this->getMockBuilder('ReCaptcha\Response')
-                ->onlyMethods(['isSuccess'])
-                ->disableOriginalConstructor()
-                ->getMock();
-        $Response->expects($this->once())
-            ->method('isSuccess')
-            ->will($this->returnValue(true));
+        $Response = new Response(true);
         $ReCaptcha->expects($this->once())
             ->method('verify')
             ->with('value')
@@ -87,13 +82,7 @@ public function testValidateInvalidReCaptcha()
                 ->onlyMethods(['verify'])
                 ->disableOriginalConstructor()
                 ->getMock();
-        $Response = $this->getMockBuilder('ReCaptcha\Response')
-                ->onlyMethods(['isSuccess'])
-                ->disableOriginalConstructor()
-                ->getMock();
-        $Response->expects($this->once())
-            ->method('isSuccess')
-            ->will($this->returnValue(false));
+        $Response = new Response(false);
         $ReCaptcha->expects($this->once())
             ->method('verify')
             ->with('invalid')
@@ -130,13 +119,7 @@ public function testValidateReCaptchaFalse()
             ->onlyMethods(['verify'])
             ->disableOriginalConstructor()
             ->getMock();
-        $Response = $this->getMockBuilder('ReCaptcha\Response')
-            ->onlyMethods(['isSuccess'])
-            ->disableOriginalConstructor()
-            ->getMock();
-        $Response->expects($this->once())
-            ->method('isSuccess')
-            ->will($this->returnValue(false));
+        $Response = new Response(false);
         $ReCaptcha->expects($this->once())
             ->method('verify')
             ->with('value')