diff --git a/app/Http/Requests/User/StoreUserRequest.php b/app/Http/Requests/User/StoreUserRequest.php
index 9b47bfe17476..abe486a05a16 100644
--- a/app/Http/Requests/User/StoreUserRequest.php
+++ b/app/Http/Requests/User/StoreUserRequest.php
@@ -17,6 +17,7 @@ use App\Http\Requests\Request;
 use App\Http\ValidationRules\ValidUserForCompany;
 use App\Libraries\MultiDB;
 use App\Models\User;
+use Illuminate\Validation\Rule;
 
 class StoreUserRequest extends Request
 {
@@ -37,9 +38,11 @@ class StoreUserRequest extends Request
         $rules['first_name'] = 'required|string|max:100';
         $rules['last_name'] = 'required|string|max:100';
 
-        if (config('ninja.db.multi_db_enabled')) {
-            $rules['email'] = new ValidUserForCompany();
-        }
+        if (config('ninja.db.multi_db_enabled')) 
+            $rules['email'] = [new ValidUserForCompany(), Rule::unique('users')];
+        else
+            $rules['email'] = Rule::unique('users');
+
 
         if (auth()->user()->company()->account->isFreeHostedClient()) {
             $rules['hosted_users'] = new CanAddUserRule(auth()->user()->company()->account);
diff --git a/app/Models/CompanyGateway.php b/app/Models/CompanyGateway.php
index a8082e93b931..d5ee8ca346b2 100644
--- a/app/Models/CompanyGateway.php
+++ b/app/Models/CompanyGateway.php
@@ -11,6 +11,7 @@
 
 namespace App\Models;
 
+use App\Models\GatewayType;
 use App\PaymentDrivers\BasePaymentDriver;
 use App\Utils\Number;
 use Illuminate\Database\Eloquent\SoftDeletes;
@@ -235,6 +236,9 @@ class CompanyGateway extends BaseModel
             return false;
         }
 
+        if($gateway_type_id == GatewayType::CUSTOM)
+            $gateway_type_id = GatewayType::CREDIT_CARD;
+
         return $this->fees_and_limits->{$gateway_type_id};
     }
 
diff --git a/database/seeders/PaymentLibrariesSeeder.php b/database/seeders/PaymentLibrariesSeeder.php
index a9f672bfe9e5..294efd6ff031 100644
--- a/database/seeders/PaymentLibrariesSeeder.php
+++ b/database/seeders/PaymentLibrariesSeeder.php
@@ -95,7 +95,7 @@ class PaymentLibrariesSeeder extends Seeder
 
         Gateway::query()->update(['visible' => 0]);
 
-        Gateway::whereIn('id', [1,15,20,39])->update(['visible' => 1]);
+        Gateway::whereIn('id', [1,15,20,39,55])->update(['visible' => 1]);
 
         Gateway::all()->each(function ($gateway) {
             $gateway->site_url = $gateway->getHelp();