diff --git a/app/Http/Controllers/Admin/BasicSettings/PaymentConfigController.php b/app/Http/Controllers/Admin/BasicSettings/PaymentConfigController.php
index 8295302..080dab4 100644
--- a/app/Http/Controllers/Admin/BasicSettings/PaymentConfigController.php
+++ b/app/Http/Controllers/Admin/BasicSettings/PaymentConfigController.php
@@ -49,7 +49,7 @@ class PaymentConfigController extends AdminController
     {
         $request->validate([
             'name' => 'required|string|max:255',
-            'company_id' => 'required|exists:companies,id',
+            'company_id' => 'nullable|exists:companies,id',
             'settings' => 'required|array',
         ]);
 
@@ -81,7 +81,7 @@ class PaymentConfigController extends AdminController
     {
         $request->validate([
             'name' => 'required|string|max:255',
-            'company_id' => 'required|exists:companies,id',
+            'company_id' => 'nullable|exists:companies,id',
             'settings' => 'required|array',
         ]);
 
diff --git a/database/migrations/2026_05_15_171154_make_company_id_nullable_in_payment_configs_table.php b/database/migrations/2026_05_15_171154_make_company_id_nullable_in_payment_configs_table.php
new file mode 100644
index 0000000..81c6aa9
--- /dev/null
+++ b/database/migrations/2026_05_15_171154_make_company_id_nullable_in_payment_configs_table.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('payment_configs', function (Blueprint $table) {
+            $table->foreignId('company_id')->nullable()->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('payment_configs', function (Blueprint $table) {
+            $table->foreignId('company_id')->nullable(false)->change();
+        });
+    }
+};
diff --git a/resources/views/admin/basic-settings/payment-configs/create.blade.php b/resources/views/admin/basic-settings/payment-configs/create.blade.php
index b876672..61d680b 100644
--- a/resources/views/admin/basic-settings/payment-configs/create.blade.php
+++ b/resources/views/admin/basic-settings/payment-configs/create.blade.php
@@ -30,12 +30,6 @@
                     }));
                     return;
                 }
-                if (!this.$el.company_id.value.trim()) {
-                    window.dispatchEvent(new CustomEvent('toast', { 
-                        detail: { message: '{{ __("Please select a company") }}', type: 'error' } 
-                    }));
-                    return;
-                }
                 this.$el.submit();
             }
         }"
@@ -72,10 +66,9 @@
                             <input type="text" name="name" required class="luxury-input w-full" placeholder="{{ __('e.g., Company Standard Pay') }}">
                         </div>
                         <div>
-                            <label class="block text-[11px] font-black text-slate-400 uppercase tracking-[0.2em] mb-2">{{ __('Belongs To Company') }} <span class="text-rose-500">*</span></label>
+                            <label class="block text-[11px] font-black text-slate-400 uppercase tracking-[0.2em] mb-2">{{ __('Belongs To Company') }}</label>
                             <x-searchable-select 
                                 name="company_id" 
-                                required 
                                 :selected="old('company_id')"
                                 :placeholder="__('Select Company')"
                             >
diff --git a/resources/views/admin/basic-settings/payment-configs/edit.blade.php b/resources/views/admin/basic-settings/payment-configs/edit.blade.php
index 903aa13..af5dc3e 100644
--- a/resources/views/admin/basic-settings/payment-configs/edit.blade.php
+++ b/resources/views/admin/basic-settings/payment-configs/edit.blade.php
@@ -30,12 +30,6 @@
                     }));
                     return;
                 }
-                if (!this.$el.company_id.value.trim()) {
-                    window.dispatchEvent(new CustomEvent('toast', { 
-                        detail: { message: '{{ __("Please select a company") }}', type: 'error' } 
-                    }));
-                    return;
-                }
                 this.$el.submit();
             }
         }"
@@ -73,10 +67,9 @@
                             <input type="text" name="name" value="{{ $paymentConfig->name }}" required class="luxury-input w-full" placeholder="{{ __('e.g., Company Standard Pay') }}">
                         </div>
                         <div>
-                            <label class="block text-[11px] font-black text-slate-400 uppercase tracking-[0.2em] mb-2">{{ __('Belongs To Company') }} <span class="text-rose-500">*</span></label>
+                            <label class="block text-[11px] font-black text-slate-400 uppercase tracking-[0.2em] mb-2">{{ __('Belongs To Company') }}</label>
                             <x-searchable-select 
                                 name="company_id" 
-                                required 
                                 :selected="old('company_id', $paymentConfig->company_id)"
                                 :placeholder="__('Select Company')"
                             >
diff --git a/resources/views/admin/basic-settings/payment-configs/index.blade.php b/resources/views/admin/basic-settings/payment-configs/index.blade.php
index 7825ee0..574a5ed 100644
--- a/resources/views/admin/basic-settings/payment-configs/index.blade.php
+++ b/resources/views/admin/basic-settings/payment-configs/index.blade.php
@@ -140,7 +140,7 @@
                         </td>
                         <td class="px-6 py-6">
                              <span class="px-2.5 py-1 rounded-lg text-xs font-bold border border-sky-100 dark:border-sky-900/30 bg-sky-50 dark:bg-sky-900/20 text-sky-600 dark:text-sky-400 tracking-widest">
-                                {{ $config->company->name ?? __('None') }}
+                                {{ $config->company->name ?? __('System') }}
                             </span>
                         </td>
                         <td class="px-6 py-6">