diff --git a/app/Http/Controllers/LocationController.php b/app/Http/Controllers/LocationController.php
index ac46b3e..dfb608a 100644
--- a/app/Http/Controllers/LocationController.php
+++ b/app/Http/Controllers/LocationController.php
@@ -8,12 +8,14 @@ use Illuminate\Http\JsonResponse;
 
 class LocationController extends Controller
 {
-    public function getCities($provinceId): JsonResponse
+    public function getCities(int $provinceId): JsonResponse
     {
-        $cities = City::where('province_id', $provinceId)
-            ->orderBy('name')
+        $cities = City::query()
+            ->where('province_id', $provinceId)
+            ->orderBy('name', 'asc')
             ->get(['id', 'name']);
 
+
         return response()->json($cities);
     }
 }
diff --git a/app/Http/Requests/Auth/RegisterPostRequest.php b/app/Http/Requests/Auth/RegisterPostRequest.php
index 0a2e96e..4fcb3ee 100644
--- a/app/Http/Requests/Auth/RegisterPostRequest.php
+++ b/app/Http/Requests/Auth/RegisterPostRequest.php
@@ -97,12 +97,12 @@ class RegisterPostRequest extends FormRequest
                 'alpha_num',
                 'confirmed'
             ],
-            'user_province' => [
+            'province_id' => [
                 'nullable',
                 'integer',
                 'exists:provinces,id'
             ],
-            'user_city' => [
+            'city_id' => [
                 'nullable',
                 'integer',
                 'exists:cities,id'
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
index 64068e7..e9bb30f 100644
--- a/resources/views/auth/register.blade.php
+++ b/resources/views/auth/register.blade.php
@@ -271,37 +271,68 @@
         </div>
 
     </main>
+    @push('scripts')
+        <script>
+            $(document).ready(function () {
+                const provinceSelect = $('#province_id');
+                const citySelect = $('#city_id');
 
-    <script>
-        $(document).ready(function () {
-            $('#province_id').on('change', function () {
-                let provinceId = $(this).val();
-                let citySelect = $('#city_id');
 
-                citySelect.prop('disabled', true);
+                const oldProvinceId = "{{ old('province_id') }}";
+                const oldCityId = "{{ old('city_id') }}";
 
-                if (!provinceId) {
-                    citySelect.html('<option value="">ابتدا استان را انتخاب کنید</option>');
-                    return;
+                function loadCities(provinceId, selectedCityId = null) {
+                    if (!provinceId) {
+                        citySelect.html('<option value="">ابتدا استان را انتخاب کنید</option>');
+                        citySelect.prop('disabled', true);
+                        return;
+                    }
+
+                    citySelect.html('<option value="">در حال بارگذاری شهرها...</option>');
+                    citySelect.prop('disabled', true);
+
+                    let url = "{{ route('locations.cities', ':provinceId') }}".replace(':provinceId', provinceId);
+
+                    $.ajax({
+                        url: url,
+                        type: 'GET',
+                        dataType: 'json',
+                        success: function (cities) {
+                            citySelect.empty();
+                            citySelect.append('<option value="">انتخاب شهر</option>');
+
+                            $.each(cities, function (index, city) {
+                                let isSelected = (selectedCityId && selectedCityId == city.id) ? 'selected' : '';
+                                citySelect.append(
+                                    `<option value="${city.id}" ${isSelected}>${city.name}</option>`
+                                );
+                            });
+
+                            citySelect.prop('disabled', false);
+                        },
+                        error: function (xhr) {
+                            console.error('Error:', xhr.responseText);
+                            citySelect.html('<option value="">خطا در دریافت لیست شهرها</option>');
+                        }
+                    });
                 }
 
-                citySelect.html('<option value="">در حال بارگذاری...</option>');
 
-                $.get('/get-cities/' + provinceId, function (data) {
-                    citySelect.html('<option value="">انتخاب شهر</option>');
-
-                    $.each(data, function (key, city) {
-                        citySelect.append(
-                            '<option value="' + city.id + '">' + city.name + '</option>'
-                        );
-                    });
-
-                    citySelect.prop('disabled', false);
-                }).fail(function () {
-                    citySelect.html('<option value="">خطا در دریافت شهرها</option>');
+                provinceSelect.on('change', function () {
+                    let provinceId = $(this).val();
+                    loadCities(provinceId);
                 });
+
+
+                if (oldProvinceId) {
+                    loadCities(oldProvinceId, oldCityId);
+                }
             });
-        });
-    </script>
+        </script>
+    @endpush
+
+
+
+
 
 @endsection
diff --git a/routes/auth.php b/routes/auth.php
index cea1aa3..8ebe834 100644
--- a/routes/auth.php
+++ b/routes/auth.php
@@ -3,11 +3,14 @@
 use App\Http\Controllers\Auth\LoginController;
 use App\Http\Controllers\Auth\LogoutController;
 use App\Http\Controllers\Auth\RegisterController;
+use App\Http\Controllers\LocationController;
 use Illuminate\Support\Facades\Route;
 
-Route::prefix('locations')->name('locations.')->controller(\App\Http\Controllers\LocationController::class)->group(function () {
-    Route::get('/cities/{provinceId}', 'getCities')->name('cities');
-});
+Route::prefix('locations')->name('locations.')
+    ->controller(LocationController::class)
+    ->group(function () {
+        Route::get('/cities/{provinceId}', 'getCities')->name('cities');
+    });
 
 Route::prefix('auth')->name('auth.')->group(function () {
     Route::middleware('guest:web')->group(function () {