diff --git a/html/template/rmo/nuisance.html b/html/template/rmo/nuisance.html
index 481064dd..bb7a1012 100644
--- a/html/template/rmo/nuisance.html
+++ b/html/template/rmo/nuisance.html
@@ -246,9 +246,9 @@
 			</div>
 			<input type="hidden" id="map-zoom" name="map-zoom" />
 			<input type="hidden" id="address-country" name="address-country" />
+			<input type="hidden" id="address-locality" name="address-locality" />
 			<input type="hidden" id="address-number" name="address-number" />
 			<input type="hidden" id="address-postalcode" name="address-postalcode" />
-			<input type="hidden" id="address-locality" name="address-locality" />
 			<input type="hidden" id="address-region" name="address-region" />
 			<input type="hidden" id="address-street" name="address-street" />
 			<input type="hidden" id="latitude" name="latitude" />
diff --git a/html/template/rmo/water.html b/html/template/rmo/water.html
index 2784538e..453091e0 100644
--- a/html/template/rmo/water.html
+++ b/html/template/rmo/water.html
@@ -51,6 +51,7 @@
 			if (response !== undefined && response.features.length > 0) {
 				const addressInput = document.querySelector("address-input");
 				addressInput.SetValue(response.features[0]);
+				setLocationInputs(response.features[0]);
 			}
 		}
 		function setLocationInputs(location) {
@@ -267,11 +268,6 @@
 					<div class="row mb-3">
 						<!-- Hidden fields for location data -->
 						<input type="hidden" id="address-country" name="address-country" />
-						<input
-							type="hidden"
-							id="address-postcode"
-							name="address-postcode"
-						/>
 						<input
 							type="hidden"
 							id="address-locality"