diff --git a/application/views/qso/index.php b/application/views/qso/index.php
index c6ecb5fff..6af81771e 100755
--- a/application/views/qso/index.php
+++ b/application/views/qso/index.php
@@ -353,7 +353,7 @@
 
             <div class="mb-3" id="location_us_county">
                 <label for="stationCntyInput"><?php echo lang('gen_hamradio_county_reference'); ?></label>
-                <input disabled="disabled" class="form-control" id="stationCntyInput" type="text" name="county" value="" />
+                <input class="form-control" id="stationCntyInput" type="text" name="county" value="" />
             </div>
 
             <div class="mb-3">
diff --git a/application/views/station_profile/create.php b/application/views/station_profile/create.php
index b3a28b44f..a2f96c42b 100644
--- a/application/views/station_profile/create.php
+++ b/application/views/station_profile/create.php
@@ -78,7 +78,7 @@
 		<!-- US County -->
 		<div class="mb-3" id="location_us_county">
 			<label for="stationCntyInput"><?php echo lang("station_location_county"); ?></label>
-			<input disabled="disabled" type="text" class="form-control" name="station_cnty" id="stationCntyInput" aria-describedby="stationCntyInputHelp">
+			<input type="text" class="form-control" name="station_cnty" id="stationCntyInputEdit" aria-describedby="stationCntyInputHelp">
 			<small id="stationCntyInputHelp" class="form-text text-muted"><?php echo lang("station_location_county_hint"); ?></small>
 		</div>
 
diff --git a/application/views/station_profile/edit.php b/application/views/station_profile/edit.php
index 8a325c3c4..0efef6671 100644
--- a/application/views/station_profile/edit.php
+++ b/application/views/station_profile/edit.php
@@ -108,7 +108,7 @@
 					<!-- US County -->
 					<div class="mb-3" id="location_us_county">
 						<label for="stationCntyInput"><?php echo lang("station_location_county"); ?></label>
-						<input disabled="disabled" type="text" class="form-control" name="station_cnty" id="stationCntyInput" aria-describedby="stationCntyInputHelp" value="<?php if(set_value('station_cnty') != "") { echo set_value('station_cnty'); } else { echo $my_station_profile->station_cnty; } ?>">
+						<input type="text" class="form-control" name="station_cnty" id="stationCntyInputEdit" aria-describedby="stationCntyInputHelp" value="<?php if(set_value('station_cnty') != "") { echo set_value('station_cnty'); } else { echo $my_station_profile->station_cnty; } ?>">
 						<small id="stationCntyInputHelp" class="form-text text-muted"><?php echo lang("station_location_county_hint"); ?></small>
 					</div>
 				</div>
diff --git a/assets/js/sections/qso.js b/assets/js/sections/qso.js
index 6b335c616..872795523 100644
--- a/assets/js/sections/qso.js
+++ b/assets/js/sections/qso.js
@@ -2,6 +2,10 @@ $( document ).ready(function() {
 	clearTimeout();
 	set_timers();
 	updateStateDropdown();
+	$("#dxcc_id").change(function () {
+		updateStateDropdown();
+	});
+
 
 	function set_timers() {
 		setTimeout(function() {
diff --git a/assets/js/sections/station_locations.js b/assets/js/sections/station_locations.js
index a51682abf..c8b4d023d 100644
--- a/assets/js/sections/station_locations.js
+++ b/assets/js/sections/station_locations.js
@@ -7,6 +7,7 @@ $(document).ready(function () {
 	});
 
 	if (window.location.pathname.indexOf("/station/edit") !== -1 || window.location.pathname.indexOf("/station/create") !== -1) {
+		selectize_usa_county();
 		updateStateDropdown();
 		$("#dxcc_select").change(function () {
 			updateStateDropdown();