diff --git a/application/views/station_profile/create.php b/application/views/station_profile/create.php
index 945c9481c..b3a28b44f 100644
--- a/application/views/station_profile/create.php
+++ b/application/views/station_profile/create.php
@@ -66,122 +66,51 @@
 		    <small id="stationCityInputHelp" class="form-text text-muted"><?php echo lang("station_location_city_hint"); ?></small>
 		  </div>
 
-        <div class="row">
-            <div class="mb-3 col-sm-6" id="us_state">
-		    <label for="stateInput"><?php echo lang("station_location_state"); ?></label>
-		    <select class="form-select" name="station_state" id="StateHelp" aria-describedby="stationCntyInputHelp">
-		    	<option value="" selected></option>
-				<option value="AK">Alaska</option>
-				<option value="AL">Alabama</option>
-				<option value="AR">Arkansas</option>
-				<option value="AZ">Arizona</option>
-				<option value="CA">California</option>
-				<option value="CO">Colorado</option>
-				<option value="CT">Connecticut</option>
-				<option value="DE">Delaware</option>
-				<option value="FL">Florida</option>
-				<option value="GA">Georgia</option>
-				<option value="HI">Hawaii</option>
-				<option value="IA">Iowa</option>
-				<option value="ID">Idaho</option>
-				<option value="IL">Illinois</option>
-				<option value="IN">Indiana</option>
-				<option value="KS">Kansas</option>
-				<option value="KY">Kentucky</option>
-				<option value="LA">Louisiana</option>
-				<option value="MA">Massachusetts</option>
-				<option value="MD">Maryland</option>
-				<option value="ME">Maine</option>
-				<option value="MI">Michigan</option>
-				<option value="MN">Minnesota</option>
-				<option value="MO">Missouri</option>
-				<option value="MS">Mississippi</option>
-				<option value="MT">Montana</option>
-				<option value="NC">North Carolina</option>
-				<option value="ND">North Dakota</option>
-				<option value="NE">Nebraska</option>
-				<option value="NH">New Hampshire</option>
-				<option value="NJ">New Jersey</option>
-				<option value="NM">New Mexico</option>
-				<option value="NV">Nevada</option>
-				<option value="NY">New York</option>
-				<option value="OH">Ohio</option>
-				<option value="OK">Oklahoma</option>
-				<option value="OR">Oregon</option>
-				<option value="PA">Pennsylvania</option>
-				<option value="RI">Rhode Island</option>
-				<option value="SC">South Carolina</option>
-				<option value="SD">South Dakota</option>
-				<option value="TN">Tennessee</option>
-				<option value="TX">Texas</option>
-				<option value="UT">Utah</option>
-				<option value="VA">Virginia</option>
-				<option value="VT">Vermont</option>
-				<option value="WA">Washington</option>
-				<option value="WI">Wisconsin</option>
-				<option value="WV">West Virginia</option>
-				<option value="WY">Wyoming</option>
+        <!-- State -->
+		<div class="mb-3" id="location_state">
+			<label for="stateInput" id="stateInputLabel"></label>
+			<select class="form-select" name="station_state" id="stateDropdown">
+				<option value=""></option>
 			</select>
-		    <small id="StateHelp" class="form-text text-muted"><?php echo lang("station_location_state_hint"); ?></small>
-		  </div>
+			<small id="StateHelp" class="form-text text-muted"><?php echo lang("station_location_state_hint"); ?></small>
+		</div>
 
-		  <div class="mb-3 col-sm-6" id="canada_state">
-		    <label for="stateInput"><?php echo lang("station_location_state"); ?></label>
-		    <select class="form-select" name="station_ca_state" id="StateHelp" aria-describedby="stationCntyInputHelp">
-		    	<option value="" selected></option>
-				<option value="AB">Alberta</option>
-				<option value="BC">British Columbia</option>
-				<option value="MB">Manitoba</option>
-				<option value="NB">New Brunswick</option>
-				<option value="NL">Newfoundland & Labrador</option>
-				<option value="NS">Nova Scotia</option>
-				<option value="NT">Northwest Territories</option>
-				<option value="NU">Nunavut</option>
-				<option value="ON">Ontario</option>
-				<option value="PE">Prince Edward Island</option>
-				<option value="QC">Quebec</option>
-				<option value="SK">Saskatchewan</option>
-				<option value="YT">Yukon</option>
-			</select>
-		    <small id="StateHelp" class="form-text text-muted"><?php echo lang("station_location_state_hint"); ?></small>
-		  </div>
+		<!-- 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">
+			<small id="stationCntyInputHelp" class="form-text text-muted"><?php echo lang("station_location_county_hint"); ?></small>
+		</div>
 
-		  <div class="mb-3 col-sm-6">
-		    <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">
-		    <small id="stationCntyInputHelp" class="form-text text-muted"><?php echo lang("station_location_county_hint"); ?></small>
-		  </div>
-        </div>
+		<div class="row">
+			<div class="mb-3 col-sm-6">
+				<label for="stationCQZoneInput"><?php echo lang("gen_hamradio_cq_zone"); ?></label>
+				<select class="form-select" id="stationCQZoneInput" name="station_cq" required>
+					<?php
+					for ($i = 1; $i<=40; $i++) {
+						echo '<option value='. $i;
 
-            <div class="row">
-                <div class="mb-3 col-sm-6">
-                    <label for="stationCQZoneInput"><?php echo lang("gen_hamradio_cq_zone"); ?></label>
-                    <select class="form-select" id="stationCQZoneInput" name="station_cq" required>
-                        <?php
-                        for ($i = 1; $i<=40; $i++) {
-                            echo '<option value='. $i;
+						echo '>'. $i .'</option>';
+					}
+					?>
+				</select>
+				<small id="stationCQInputHelp" class="form-text text-muted"><?php echo lang("gen_find_zone_cq_part1")." <a href='https://zone-check.eu/?m=cq' target='_blank'>".lang("gen_find_zone_part2")."</a> ".lang("gen_find_zone_part3"); ?></small>
+			</div>
 
-                            echo '>'. $i .'</option>';
-                        }
-                        ?>
-                    </select>
-                    <small id="stationCQInputHelp" class="form-text text-muted"><?php echo lang("gen_find_zone_cq_part1")." <a href='https://zone-check.eu/?m=cq' target='_blank'>".lang("gen_find_zone_part2")."</a> ".lang("gen_find_zone_part3"); ?></small>
-                </div>
+			<div class="mb-3 col-sm-6">
+				<label for="stationITUZoneInput"><?php echo lang("gen_hamradio_itu_zone"); ?></label>
+				<select class="form-select" id="stationITUZoneInput" name="station_itu" required>
+					<?php
+					for ($i = 1; $i<=90; $i++) {
+						echo '<option value='. $i;
 
-                <div class="mb-3 col-sm-6">
-                    <label for="stationITUZoneInput"><?php echo lang("gen_hamradio_itu_zone"); ?></label>
-                    <select class="form-select" id="stationITUZoneInput" name="station_itu" required>
-                        <?php
-                        for ($i = 1; $i<=90; $i++) {
-                            echo '<option value='. $i;
-
-                            echo '>'. $i .'</option>';
-                        }
-                        ?>
-                    </select>
-                    <small id="stationITUInputHelp" class="form-text text-muted"><?php echo lang("gen_find_zone_itu_part1")." <a href='https://zone-check.eu/?m=itu' target='_blank'>".lang("gen_find_zone_part2")."</a> ".lang("gen_find_zone_part3"); ?></small>
-                </div>
-            </div>
+						echo '>'. $i .'</option>';
+					}
+					?>
+				</select>
+				<small id="stationITUInputHelp" class="form-text text-muted"><?php echo lang("gen_find_zone_itu_part1")." <a href='https://zone-check.eu/?m=itu' target='_blank'>".lang("gen_find_zone_part2")."</a> ".lang("gen_find_zone_part3"); ?></small>
+			</div>
+		</div>
 
 		  <div class="mb-3">
 		    <label for="stationGridsquareInput"><?php echo lang("station_location_gridsquare"); ?></label>
diff --git a/assets/js/sections/common.js b/assets/js/sections/common.js
index 7773e69e9..475c6e2cf 100644
--- a/assets/js/sections/common.js
+++ b/assets/js/sections/common.js
@@ -638,11 +638,12 @@ function getDataTablesLanguageUrl() {
     return "../assets/json/datatables_languages/" + lang_datatables_language + ".json";
 }
 
+var set_state;
 function statesDropdown(states, set_state = null) {
     var dropdown = $('#stateDropdown');
     dropdown.empty();
     dropdown.append($('<option>', {
-        value: '',
+        value: ''
     }));
     if (states.status == 'ok') {
         dropdown.prop('disabled', false);
@@ -658,7 +659,7 @@ function statesDropdown(states, set_state = null) {
         dropdown.empty();
         var option = $('<option>', {
             value: '',
-            text: 'No states for this DXCC in database'
+            text: 'No states for this DXCC available'
         });
         dropdown.append(option);
         dropdown.prop('disabled', true);
diff --git a/assets/js/sections/station_locations.js b/assets/js/sections/station_locations.js
index 93742444a..a51682abf 100644
--- a/assets/js/sections/station_locations.js
+++ b/assets/js/sections/station_locations.js
@@ -6,7 +6,7 @@ $(document).ready(function () {
 		},
 	});
 
-	if (window.location.pathname.indexOf("/station/edit") !== -1) {
+	if (window.location.pathname.indexOf("/station/edit") !== -1 || window.location.pathname.indexOf("/station/create") !== -1) {
 		updateStateDropdown();
 		$("#dxcc_select").change(function () {
 			updateStateDropdown();
@@ -28,6 +28,7 @@ function updateStateDropdown() {
                     $('#stateInputLabel').html(response.subdivision_name);
 				} else {
                     statesDropdown(response);
+					$('#stateInputLabel').html('State');
                 }
 			},
 			error: function () {