diff --git a/app/Http/Controllers/CinetpayController.php b/app/Http/Controllers/CinetpayController.php
index f43afa5..8f6686c 100644
--- a/app/Http/Controllers/CinetpayController.php
+++ b/app/Http/Controllers/CinetpayController.php
@@ -190,6 +190,10 @@ class CinetpayController extends Controller
 
         try{
 
+            $customer_surname = $request->input('customer_surname');
+            $customer_name = $request->input('customer_name') ?? $customer_surname;
+            $customer_email = $request->input('customer_email');
+
             $country_code = $request->input('customer_country');
             $phoneNumber = str_replace(' ','',$request->input('customer_phone_number'));
 
@@ -223,7 +227,7 @@ class CinetpayController extends Controller
             $responseData = json_decode($loginResponse->getBody()->getContents());
             $token = $responseData->data->token;
             $responseCode = $loginResponse->getStatusCode();
-            if (!empty($token)) {
+            if ( $responseCode == 200 && !empty($token)) {
 
                 // Add Contact
                 $contactResponse = $client->post('transfer/contact', [
@@ -236,9 +240,9 @@ class CinetpayController extends Controller
                                 [
                                     'prefix' => $phonePrefix,
                                     'phone' => $nationalPhone,
-                                    'name' => $request->input('customer_name'),
-                                    'surname' => $request->input('customer_surname'),
-                                    'email' => $request->input('customer_email')
+                                    'name' => $customer_name,
+                                    'surname' => $customer_surname,
+                                    'email' => $customer_email
                                 ]
                             ]
                         ),
@@ -248,8 +252,7 @@ class CinetpayController extends Controller
                 ]);
 
                 $responseCode = $contactResponse->getStatusCode();
-
-
+                $responseData = json_decode($contactResponse->getBody()->getContents());
                 if ($responseCode == 200) {
 
                     $transactionId = $this->getTransactionID();
@@ -262,9 +265,9 @@ class CinetpayController extends Controller
                         'status' => PaymentTransactionStatus::INITIATED,
                         "reason" => $request->input('reason'),
                         "customer_id" => $request->input('customer_id'),
-                        "customer_name" => $request->input('customer_name'),
-                        "customer_surname" => $request->input('customer_surname'),
-                        "customer_email" => $request->input('customer_email'),
+                        "customer_name" => $customer_name,
+                        "customer_surname" => $customer_surname,
+                        "customer_email" => $customer_email,
                         "customer_phone_number" => $phoneNumber,
                         "customer_address" => $request->input('customer_address'),
                         "customer_city" => $request->input('customer_city'),
@@ -314,7 +317,7 @@ class CinetpayController extends Controller
                     }
                 }
             }
-            
+
             $errorMessage = $responseData?->description ??  $responseData?->message;
 
         }catch (Throwable $e){