diff --git a/VERSION.txt b/VERSION.txt
index ad7756863525..df99ee43ee30 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-5.8.48
\ No newline at end of file
+5.8.49
\ No newline at end of file
diff --git a/app/Http/Requests/Setup/StoreSetupRequest.php b/app/Http/Requests/Setup/StoreSetupRequest.php
index 1608c3cbc44d..7228e9b4994a 100644
--- a/app/Http/Requests/Setup/StoreSetupRequest.php
+++ b/app/Http/Requests/Setup/StoreSetupRequest.php
@@ -31,14 +31,6 @@ class StoreSetupRequest extends Request
             /*System*/
             'url'              => 'required',
             /*Mail driver*/
-            'mail_driver'      => 'required',
-            'encryption'       => 'required_unless:mail_driver,log',
-            'mail_host'        => 'required_unless:mail_driver,log',
-            'mail_username'    => 'required_unless:mail_driver,log',
-            'mail_name'        => 'required_unless:mail_driver,log',
-            'mail_address'     => 'required_unless:mail_driver,log',
-            'mail_password'    => 'required_unless:mail_driver,log',
-            /*user registration*/
             'privacy_policy'   => 'required',
             'terms_of_service' => 'required',
             'first_name'       => 'required',
diff --git a/app/PaymentDrivers/PayPalRestPaymentDriver.php b/app/PaymentDrivers/PayPalRestPaymentDriver.php
index 5e553dd526df..cdad6a880ea6 100644
--- a/app/PaymentDrivers/PayPalRestPaymentDriver.php
+++ b/app/PaymentDrivers/PayPalRestPaymentDriver.php
@@ -167,9 +167,9 @@ class PayPalRestPaymentDriver extends BaseDriver
         $data['currency'] = $this->client->currency()->code;
 
 
-return render('gateways.paypal.ppcp.card', $data);
+// return render('gateways.paypal.ppcp.card', $data);
 
-// return render('gateways.paypal.pay', $data);
+return render('gateways.paypal.pay', $data);
 
     }
 
diff --git a/config/ninja.php b/config/ninja.php
index 3b4cd01e68f7..2bcd182fbda0 100644
--- a/config/ninja.php
+++ b/config/ninja.php
@@ -17,8 +17,8 @@ return [
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/'),
     'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
-    'app_version' => env('APP_VERSION', '5.8.48'),
-    'app_tag' => env('APP_TAG', '5.8.48'),
+    'app_version' => env('APP_VERSION', '5.8.49'),
+    'app_tag' => env('APP_TAG', '5.8.49'),
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', false),