diff --git a/app/Http/Controllers/SetupWizardController.php b/app/Http/Controllers/SetupWizardController.php
index 66cdf90..ec35e22 100644
--- a/app/Http/Controllers/SetupWizardController.php
+++ b/app/Http/Controllers/SetupWizardController.php
@@ -46,6 +46,7 @@ class SetupWizardController extends Controller
             'hasSettings' => Setting::exists(),
             'hasMaster' => AssetStatus::exists() && AssetClass::exists() && AssetCategory::exists(),
             'hasAsset' => Asset::exists(),
+            'settings' => Setting::orderBy('group')->orderBy('key')->get(),
         ]);
     }
 
@@ -74,20 +75,25 @@ class SetupWizardController extends Controller
         }
 
         if ($step === 2) {
-            $data = $request->validate([
-                'company_name' => ['required', 'string', 'max:255'],
-                'timezone' => ['required', 'string', 'max:100'],
-            ]);
-            Setting::updateOrCreate(['key' => 'system.company_name'], [
-                'value' => $data['company_name'],
-                'type' => 'string',
-                'group' => 'system',
-            ]);
-            Setting::updateOrCreate(['key' => 'system.timezone'], [
-                'value' => $data['timezone'],
-                'type' => 'string',
-                'group' => 'system',
-            ]);
+            $settings = Setting::all();
+            $input = $request->input('settings', []);
+
+            foreach ($settings as $setting) {
+                $key = $setting->key;
+                $raw = $input[$key] ?? null;
+                $value = $raw;
+
+                if ($setting->type === 'boolean') {
+                    $value = filter_var($raw, FILTER_VALIDATE_BOOL);
+                } elseif ($setting->type === 'integer') {
+                    $value = is_null($raw) ? null : (int) $raw;
+                } else {
+                    $value = is_null($raw) ? null : (string) $raw;
+                }
+
+                $setting->update(['value' => $value]);
+            }
+
             return redirect()->route('setup.index', ['step' => 3])->with('success', 'Setting dasar disimpan.');
         }
 
diff --git a/resources/views/setup/wizard.blade.php b/resources/views/setup/wizard.blade.php
index 288c7c4..965b30c 100644
--- a/resources/views/setup/wizard.blade.php
+++ b/resources/views/setup/wizard.blade.php
@@ -63,14 +63,35 @@ $bodyClass = 'bg-white';
                         <form method="POST" action="{{ route('setup.store') }}">
                             @csrf
                             <input type="hidden" name="step" value="2">
-                            <div class="mb-3">
-                                <label class="form-label">Nama Perusahaan</label>
-                                <input type="text" name="company_name" class="form-control" required>
-                            </div>
-                            <div class="mb-3">
-                                <label class="form-label">Timezone</label>
-                                <input type="text" name="timezone" class="form-control" value="Asia/Jakarta" required>
-                            </div>
+                            <p class="text-muted">Sesuaikan konfigurasi awal. Nilai diambil dari seeder dan dapat diubah.</p>
+                            @foreach($settings->groupBy('group') as $group => $items)
+                                <div class="border rounded p-3 mb-3">
+                                    <h6 class="fw-semibold text-uppercase text-muted mb-2">{{ $group }}</h6>
+                                    <div class="row g-3">
+                                        @foreach($items as $setting)
+                                            <div class="col-md-6">
+                                                <label class="form-label">{{ str_replace(['.', '_'], ' ', $setting->key) }}</label>
+                                                @if($setting->type === 'boolean')
+                                                    <div class="form-check">
+                                                        <input class="form-check-input" type="checkbox" name="settings[{{ $setting->key }}]" value="1" id="setting_{{ $setting->id }}" {{ $setting->value ? 'checked' : '' }}>
+                                                        <label class="form-check-label" for="setting_{{ $setting->id }}">Aktif</label>
+                                                    </div>
+                                                @else
+                                                    <input
+                                                        type="{{ $setting->type === 'integer' ? 'number' : 'text' }}"
+                                                        name="settings[{{ $setting->key }}]"
+                                                        class="form-control"
+                                                        value="{{ old('settings.'.$setting->key, $setting->value) }}"
+                                                    >
+                                                @endif
+                                                @if(!empty($setting->description))
+                                                    <small class="text-muted d-block">{{ $setting->description }}</small>
+                                                @endif
+                                            </div>
+                                        @endforeach
+                                    </div>
+                                </div>
+                            @endforeach
                             <div class="d-flex justify-content-between">
                                 <a href="{{ route('setup.index', ['step' => 1]) }}" class="btn btn-outline-secondary">Kembali</a>
                                 <button class="btn btn-primary">Lanjut</button>