diff --git a/backend/app/Admin/Controllers/ExpertManagementController.php b/backend/app/Admin/Controllers/ExpertManagementController.php
index a3e0c989..f0edad53 100755
--- a/backend/app/Admin/Controllers/ExpertManagementController.php
+++ b/backend/app/Admin/Controllers/ExpertManagementController.php
@@ -4,7 +4,6 @@ namespace App\Admin\Controllers;
 
 use App\Admin\Requests\ExpertManagement\StoreRequest;
 use App\Admin\Requests\ExpertManagement\UpdateRequest;
-use App\Admin\Resources\ExpertManagementResource;
 use App\Facades\DataTable\DataTableFacade;
 use App\Http\Controllers\Controller;
 use App\Models\City;
diff --git a/backend/app/Admin/Controllers/ProfileController.php b/backend/app/Admin/Controllers/ProfileController.php
index 5b825966..23a80f7e 100755
--- a/backend/app/Admin/Controllers/ProfileController.php
+++ b/backend/app/Admin/Controllers/ProfileController.php
@@ -3,6 +3,7 @@
 namespace App\Admin\Controllers;
 
 use App\Admin\Requests\Profile\ChangePasswordRequest;
+use App\Admin\Requests\Profile\EditRequest;
 use App\Admin\Resources\ExpertResource;
 use App\Http\Controllers\Controller;
 use App\Traits\ApiResponse;
@@ -19,6 +20,24 @@ class ProfileController extends Controller
         return $this->successResponse(new ExpertResource(Auth::guard('expert')->user()));
     }
 
+    public function edit(EditRequest $request): JsonResponse
+    {
+        $expert = $request->user('expert');
+
+        $expert->update([
+            'username' => $request->username,
+            'first_name' => $request->first_name,
+            'last_name' => $request->last_name,
+            'email' => $expert->email,
+            'national_id' => $request->national_id,
+            'phone_number' => $request->phone_number,
+            'province_id' => $request->province_id,
+            'city_id' => $request->city_id,
+        ]);
+
+        return $this->successResponse();
+    }
+
     public function changePassword(ChangePasswordRequest $request): JsonResponse
     {
         $expert = Auth::guard('expert')->user();
diff --git a/backend/app/Admin/Requests/Profile/EditRequest.php b/backend/app/Admin/Requests/Profile/EditRequest.php
new file mode 100755
index 00000000..6b997c9e
--- /dev/null
+++ b/backend/app/Admin/Requests/Profile/EditRequest.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Admin\Requests\Profile;
+
+use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Rule;
+use Illuminate\Validation\Validator;
+
+class EditRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, ValidationRule|array|string>
+     */
+    public function rules(): array
+    {
+        return [
+            'username' => 'string|max:255',
+            'first_name' => 'required|string',
+            'last_name' => 'required|string',
+            'national_id' => 'required',
+            'email' => 'string|email|max:255',
+            'phone_number' => 'string',
+            'province_id' => 'string',
+            'city_id' => 'string',
+        ];
+    }
+}
diff --git a/backend/app/Enums/BusinessTypeEnum.php b/backend/app/Enums/BusinessTypeEnum.php
index dcd453de..232cc49f 100644
--- a/backend/app/Enums/BusinessTypeEnum.php
+++ b/backend/app/Enums/BusinessTypeEnum.php
@@ -40,4 +40,27 @@ enum BusinessTypeEnum: int
             self::OTHER => 'other',
         };
     }
+
+    public function name($id): string
+    {
+        $mapArray = [
+            1 => 'medical',
+            2 => 'legal',
+            3 => 'engineering',
+            4 => 'education',
+            5 => 'consulting',
+            6 => 'beauty',
+            7 => 'technical_services',
+            8 => 'financial',
+            9 => 'real_estate',
+            10 => 'restaurant',
+            11 => 'shop',
+            12 => 'transportation',
+            13 => 'art',
+            14 => 'sport',
+            15 => 'other',
+        ];
+
+        return $mapArray[$id];
+    }
 }
diff --git a/backend/app/Services/FIB/AuthorizationService.php b/backend/app/Services/FIB/AuthorizationService.php
index 9867133f..8f1e40df 100755
--- a/backend/app/Services/FIB/AuthorizationService.php
+++ b/backend/app/Services/FIB/AuthorizationService.php
@@ -16,7 +16,7 @@ class AuthorizationService
     public function __construct()
     {
         $this->url = config('fib.authorization.url');
-        $this->channelName = '';
+        $this->channelName = 'fib_authorization';
         $this->inputParameters = [
             'client_id' => config('fib.authorization.client_id'),
             'client_secret' => config('fib.authorization.client_secret'),
@@ -51,7 +51,6 @@ class AuthorizationService
     {
         return Http::asForm()
             ->throw()
-            ->withoutVerifying()
             ->post($this->url, $this->inputParameters)
             ->json();
     }
diff --git a/backend/app/User/Controllers/GatewayManagementController.php b/backend/app/User/Controllers/GatewayManagementController.php
new file mode 100644
index 00000000..690d364e
--- /dev/null
+++ b/backend/app/User/Controllers/GatewayManagementController.php
@@ -0,0 +1,97 @@
+<?php
+
+namespace App\User\Controllers;
+
+use App\Enums\BusinessTypeEnum;
+use App\Facades\DataTable\DataTableFacade;
+use App\Facades\File\FileFacade;
+use App\Http\Controllers\Controller;
+use App\Models\UserGateway;
+use App\Traits\ApiResponse;
+use App\User\Requests\Gateway\StoreRequest;
+use App\User\Requests\Gateway\UpdateRequest;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\DB;
+use Throwable;
+
+class GatewayManagementController extends Controller
+{
+    use ApiResponse;
+
+    public function index(Request $request)
+    {
+        return DataTableFacade::run(
+            UserGateway::query()->where('user_id', '=', Auth::guard('web')->id()),
+            $request,
+            allowedFilters: ['*'],
+            allowedSortings: ['*'],
+            allowedSelects: ['id', 'name', 'domain', 'tax_id', 'bank_name', 'account_holder', 'iban', 'business_type_id', 'business_type_name'],
+        );
+    }
+
+    /**
+     * @throws Throwable
+     */
+    public function store(StoreRequest $request): JsonResponse
+    {
+        $user = Auth::guard('web')->user();
+
+        $logo = $request->has('logo') ? FileFacade::save($request->file('logo'), "{$user->id}") : null;
+
+        DB::transaction(function () use ($user, $logo, $request) {
+            UserGateway::query()->create([
+                'user_id' => $user->id,
+                'username' => $user->username,
+                'name' => $request->name,
+                'domain' => $request->domain,
+                'tax_id' => $request->tax_id,
+                'bank_name' => $request->bank_name,
+                'account_holder' => $request->account_holder,
+                'iban' => $request->iban,
+                'business_type_id' => $request->business_type_id,
+                'business_type_name' => BusinessTypeEnum::name($request->business_type_id),
+                'logo' => $logo,
+            ]);
+
+            $user->update(['authority_level' => 1]);
+        });
+
+
+        return $this->successResponse();
+    }
+
+    public function show(UserGateway $gateway): JsonResponse
+    {
+        return $this->successResponse($gateway);
+    }
+
+    public function update(UpdateRequest $request, UserGateway $gateway): JsonResponse
+    {
+        $logo = null;
+        $user = Auth::guard('web')->user();
+
+        if ($request->has('logo'))
+        {
+            FileFacade::delete($gateway->logo, true);
+            $logo = FileFacade::save(request()->file('logo'), "{$user->id}");
+        }
+
+        $gateway->update([
+            'name' => $request->name,
+            'domain' => $request->domain,
+            'business_type_id' => $request->business_type_id,
+            'business_type_name' => BusinessTypeEnum::name($request->business_type_id),
+            'logo' => $logo,
+        ]);
+
+        return $this->successResponse();
+    }
+
+    public function destroy(UserGateway $gateway): JsonResponse
+    {
+        $gateway->delete();
+        return $this->successResponse();
+    }
+}
diff --git a/backend/app/User/Controllers/ProfileController.php b/backend/app/User/Controllers/ProfileController.php
index 78f583c9..f8fb83e2 100755
--- a/backend/app/User/Controllers/ProfileController.php
+++ b/backend/app/User/Controllers/ProfileController.php
@@ -2,14 +2,19 @@
 
 namespace App\User\Controllers;
 
+use App\Facades\File\FileFacade;
 use App\Http\Controllers\Controller;
+use App\Models\City;
+use App\Models\Province;
 use App\Traits\ApiResponse;
 use App\User\Requests\Profile\ChangePasswordRequest;
 use App\User\Requests\Profile\EditRequest;
 use App\User\Resources\UserResource;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Hash;
+use Throwable;
 
 class ProfileController extends Controller
 {
@@ -20,21 +25,40 @@ class ProfileController extends Controller
         return $this->successResponse(new UserResource(Auth::user()));
     }
 
+    /**
+     * @throws Throwable
+     */
     public function edit(EditRequest $request): JsonResponse
     {
         $user = Auth::user();
+        $province = Province::query()->find($request->province_id);
+        $city = City::query()->find($request->city_id);
 
-        $user->update([
-            'first_name' => $request->first_name,
-            'last_name' => $request->last_name,
-            'national_id' => $request->national_id,
-            'address' => $request->address,
-            'postal_code' => $request->postal_code,
-            'phone_number' => $request->phone_number,
-            'province_id' => $request->province_id,
-            'city_id' => $request->city_id,
-            'status' => 1
-        ]);
+        DB::transaction(function () use ($user, $province, $city, $request) {
+            if ($user->kyc_status == 0)
+            {
+                $user->documents()->create([
+                    'title' => 'id_card',
+                    'url' => FileFacade::save($request->file('id_card'), "{$user->id}/"),
+                ]);
+            }
+
+            $user->update([
+                'first_name' => $request->first_name,
+                'last_name' => $request->last_name,
+                'national_id' => $request->national_id,
+                'address' => $request->address,
+                'postal_code' => $request->postal_code,
+                'phone_number' => $request->phone_number,
+                'province_id' => $province->id,
+                'province_name' => $province->name,
+                'city_id' => $city->id,
+                'city_name' => $city->name,
+                'birth_date' => $request->birth_date,
+                'email' => $request->email,
+                'kyc_status' => 1,
+            ]);
+        });
 
         return $this->successResponse();
     }
diff --git a/backend/app/User/Requests/Gateway/StoreRequest.php b/backend/app/User/Requests/Gateway/StoreRequest.php
new file mode 100644
index 00000000..f7562dd8
--- /dev/null
+++ b/backend/app/User/Requests/Gateway/StoreRequest.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace App\User\Requests\Gateway;
+
+use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Facades\Auth;
+
+class StoreRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return Auth::guard('web')->user()->kyc_status;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, ValidationRule|array|string>
+     */
+    public function rules(): array
+    {
+        return [
+            'name' => 'required|string|max:255',
+            'domain' => 'required|string|max:255',
+            'tax_id' => 'required|string',
+            'bank_name' => 'required|string|max:255',
+            'account_holder' => 'required|string',
+            'iban' => 'required|string|max:255',
+            'logo' => 'image|mimes:jpeg,png,jpg,gif,svg|max:2048',
+            'business_type_id' => 'required|string|exists:business_types,id',
+        ];
+    }
+}
diff --git a/backend/app/User/Requests/Gateway/UpdateRequest.php b/backend/app/User/Requests/Gateway/UpdateRequest.php
new file mode 100644
index 00000000..749eb4da
--- /dev/null
+++ b/backend/app/User/Requests/Gateway/UpdateRequest.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\User\Requests\Gateway;
+
+use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Facades\Auth;
+
+class UpdateRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return Auth::guard('web')->user()->kyc_status;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, ValidationRule|array|string>
+     */
+    public function rules(): array
+    {
+        return [
+            'name' => 'required|string|max:255',
+            'domain' => 'required|string|max:255',
+            'business_type_id' => 'required|string|exists:business_types,id',
+            'logo' => 'image|mimes:jpeg,png,jpg,gif,svg|max:2048',
+        ];
+    }
+}
diff --git a/backend/app/User/Requests/Profile/EditRequest.php b/backend/app/User/Requests/Profile/EditRequest.php
index 4eb93a4e..0467ddc2 100755
--- a/backend/app/User/Requests/Profile/EditRequest.php
+++ b/backend/app/User/Requests/Profile/EditRequest.php
@@ -4,6 +4,9 @@ namespace App\User\Requests\Profile;
 
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Validation\Rule;
+use Illuminate\Validation\Validator;
 
 class EditRequest extends FormRequest
 {
@@ -22,15 +25,20 @@ class EditRequest extends FormRequest
      */
     public function rules(): array
     {
+        $user = Auth::guard('web')->user();
+
         return [
-            'first_name' => 'required|string',
-            'last_name' => 'required|string',
-            'national_id' => 'required',
-            'address' => 'required',
-            'postal_code' => 'required',
-            'phone_number' => 'required',
-            'province_id' => 'required',
-            'city_id' => 'required',
+            'first_name' => 'required|string|max:255',
+            'last_name' => 'required|string|max:255',
+            'national_id' => [Rule::prohibitedIf($user->kyc_status == 1), 'string',],
+            'email' => 'required|email|max:255',
+            'address' => 'required|string',
+            'postal_code' => 'required|string',
+            'phone_number' => 'required|string',
+            'province_id' => 'required|exists:provinces,id',
+            'city_id' => 'required|exists:cities,id',
+            'birth_date' => 'required|date',
+            'id_card' => [Rule::prohibitedIf($user->kyc_status == 1), 'image', 'mimes:jpeg,png,jpg,gif,svg', 'max:2048']
         ];
     }
 }
diff --git a/backend/app/User/Resources/UserResource.php b/backend/app/User/Resources/UserResource.php
index 55f98563..d5df7636 100755
--- a/backend/app/User/Resources/UserResource.php
+++ b/backend/app/User/Resources/UserResource.php
@@ -18,6 +18,18 @@ class UserResource extends JsonResource
             'id' => $this->id,
             'username' => $this->username,
             'email' => $this->email,
+            'first_name' => $this->first_name,
+            'last_name' => $this->last_name,
+            'national_id' => $this->national_id,
+            'address' => $this->address,
+            'postal_code' => $this->postal_code,
+            'phone_number' => $this->phone_number,
+            'province_id' => $this->provonce_id,
+            'province_name' => $this->province_name,
+            'city_id' => $this->city_id,
+            'city_name' => $this->city_name,
+            'birth_date' => $this->birth_date,
+            'kyc_status' => $this->kyc_status,
         ];
     }
 }
diff --git a/backend/config/logging.php b/backend/config/logging.php
index b09cb25d..ee09ba9e 100755
--- a/backend/config/logging.php
+++ b/backend/config/logging.php
@@ -127,6 +127,12 @@ return [
             'path' => storage_path('logs/laravel.log'),
         ],
 
+        'fib_authorization' => [
+            'driver' => 'single',
+            'path' => storage_path('logs/fib/authorization.log'),
+            'level' => 'error',
+        ],
+
     ],
 
 ];
diff --git a/backend/database/migrations/0001_01_01_000000_create_users_table.php b/backend/database/migrations/0001_01_01_000000_create_users_table.php
index 0ac11763..124ca19a 100755
--- a/backend/database/migrations/0001_01_01_000000_create_users_table.php
+++ b/backend/database/migrations/0001_01_01_000000_create_users_table.php
@@ -22,7 +22,6 @@ return new class extends Migration
             $table->string('national_id')->nullable();
             $table->string('address')->nullable();
             $table->string('postal_code')->nullable();
-            $table->string('tax_id')->nullable();
             $table->string('phone_number')->nullable();
             $table->date('birth_date')->nullable();
             $table->foreignId('province_id')->nullable()->constrained('provinces');
diff --git a/backend/database/migrations/2026_05_18_095610_create_transactions_table.php b/backend/database/migrations/2026_05_18_095610_create_transactions_table.php
index 7176a51f..208f6f8e 100644
--- a/backend/database/migrations/2026_05_18_095610_create_transactions_table.php
+++ b/backend/database/migrations/2026_05_18_095610_create_transactions_table.php
@@ -21,7 +21,7 @@ return new class extends Migration
             $table->dateTime('expires_in');
             $table->foreignId('payment_id')->constrained('payments');
             $table->string('payment_track_id');
-            $table->foreignId('gateway_id')->constrained('gateways');
+            $table->foreignId('user_gateway_id')->constrained('user_gateways');
             $table->integer('status');
             $table->timestamps();
         });
diff --git a/backend/routes/expert.php b/backend/routes/expert.php
index 50400564..fc7c010a 100755
--- a/backend/routes/expert.php
+++ b/backend/routes/expert.php
@@ -4,6 +4,7 @@ use App\Admin\Controllers\AuthController;
 use App\Admin\Controllers\DocumentationController;
 use App\Admin\Controllers\ExpertManagementController;
 use App\Admin\Controllers\PermissionManagementController;
+use App\Admin\Controllers\ProfileController;
 use App\Admin\Controllers\RoleManagementController;
 use App\Admin\Controllers\UserManagementController;
 
@@ -38,6 +39,7 @@ Route::prefix('user_management')
         Route::post('/{user}', 'update')->name('update');
         Route::delete('/{user}', 'destroy')->name('destroy');
     });
+
 Route::prefix('roles')
     ->name('roles.')
     ->middleware(['auth:expert', 'permission:role-management'])
@@ -49,6 +51,7 @@ Route::prefix('roles')
         Route::post('/{role}', 'update')->name('update');
         Route::delete('/{role}', 'destroy')->name('destroy');
     });
+
 Route::prefix('permissions')
     ->name('permissions.')
     ->middleware(['auth:expert', 'permission:permission-management'])
@@ -60,6 +63,7 @@ Route::prefix('permissions')
         Route::post('/{permission}', 'update')->name('update');
         Route::delete('/{permission}', 'destroy')->name('destroy');
     });
+
 Route::prefix('expert')
     ->name('expert.')
     ->middleware(['auth:expert', 'permission:expert-management'])
@@ -71,3 +75,13 @@ Route::prefix('expert')
         Route::post('/{expert}', 'update')->name('update');
         Route::delete('/{expert}', 'destroy')->name('destroy');
     });
+
+Route::prefix('profile')
+    ->name('profile.')
+    ->middleware('auth')
+    ->controller(ProfileController::class)
+    ->group(function () {
+        Route::get('info', 'info')->name('info');
+        Route::post('edit', 'edit')->name('edit');
+        Route::post('change_password', 'changePassword')->name('changePassword');
+    });
diff --git a/backend/routes/web.php b/backend/routes/web.php
index cac32527..64cea66a 100755
--- a/backend/routes/web.php
+++ b/backend/routes/web.php
@@ -5,6 +5,7 @@ use App\Admin\Controllers\PermissionManagementController;
 use App\Admin\Controllers\RoleManagementController;
 use App\Admin\Controllers\UserManagementController;
 use App\User\Controllers\AuthController;
+use App\User\Controllers\GatewayManagementController;
 use App\User\Controllers\CityController;
 use App\User\Controllers\ProfileController;
 use App\User\Controllers\ProvinceController;
@@ -29,6 +30,18 @@ Route::prefix('profile')
         Route::post('change_password', 'changePassword')->name('changePassword');
     });
 
+Route::prefix('user_gateway')
+    ->name('userGateway.')
+    ->middleware(['auth'])
+    ->controller(GatewayManagementController::class)
+    ->group(function () {
+        Route::get('/', 'index')->name('index');
+        Route::post('/', 'store')->name('store');
+        Route::get('/{gateway}', 'show')->name('show');
+        Route::post('/{gateway}', 'update')->name('update');
+        Route::delete('/{gateway}', 'destroy')->name('destroy');
+    });
+
 Route::prefix('province')
     ->name('province.')
     ->controller(ProvinceController::class)