diff --git a/rmo/root.go b/rmo/root.go
index a878e6ce..daae08da 100644
--- a/rmo/root.go
+++ b/rmo/root.go
@@ -25,6 +25,7 @@ type ContentRoot struct {
 }
 type ContentURL struct {
 	Nuisance               string
+	NuisanceSubmit         string
 	NuisanceSubmitComplete string
 	Status                 string
 	Tegola                 string
@@ -83,11 +84,11 @@ func getTerms(w http.ResponseWriter, r *http.Request) {
 
 func makeContentURL() ContentURL {
 	return ContentURL{
-		Nuisance:               makeURL("nuisance"),
-		NuisanceSubmitComplete: makeURL("nuisance-submit-complete"),
-		Status:                 makeURL("status"),
-		Tegola:                 config.MakeURLTegola("/"),
-		Water:                  makeURL("water"),
+		Nuisance:       makeURL("nuisance"),
+		NuisanceSubmit: makeURL("nuisance"),
+		Status:         makeURL("status"),
+		Tegola:         config.MakeURLTegola("/"),
+		Water:          makeURL("water"),
 	}
 }
 
diff --git a/rmo/routes.go b/rmo/routes.go
index 41662d7e..a7cc3e0a 100644
--- a/rmo/routes.go
+++ b/rmo/routes.go
@@ -9,6 +9,7 @@ func Router() chi.Router {
 	r := chi.NewRouter()
 	r.Get("/", getRoot)
 	r.Get("/nuisance", getNuisance)
+	r.Post("/nuisance", postNuisance)
 	//r.Get("/district/{slug}", renderMock(mockDistrictRootT))
 	//r.Get("/district/{slug}/nuisance", renderMock(mockNuisanceT))
 	//r.Get("/district/{slug}/nuisance-submit-complete", renderMock(mockNuisanceSubmitCompleteT))
@@ -20,7 +21,6 @@ func Router() chi.Router {
 	r.Get("/email", getEmailByCode)
 	r.Get("/image/{uuid}", getImageByUUID)
 	r.Route("/mock", addMockRoutes)
-	r.Post("/nuisance-submit", postNuisance)
 	r.Get("/nuisance-submit-complete", getNuisanceSubmitComplete)
 	r.Get("/pool", getPool)
 	r.Post("/pool-submit", postPool)
diff --git a/rmo/template/nuisance.html b/rmo/template/nuisance.html
index 2ba9f6e2..71352038 100644
--- a/rmo/template/nuisance.html
+++ b/rmo/template/nuisance.html
@@ -165,7 +165,7 @@ document.addEventListener('DOMContentLoaded', function() {
 	</div>
 
 	<!-- Report Form -->
-	<form id="mosquitoNuisanceForm" action="/nuisance-submit" method="POST">
+	<form id="mosquitoNuisanceForm" action="{{ .URL.NuisanceSubmit }}" method="POST">
 		<!-- Location & Contact Section -->
 		<div class="form-section">
 			<div class="section-heading">
@@ -395,9 +395,9 @@ document.addEventListener('DOMContentLoaded', function() {
 					<p class="mb-0 small text-muted">After submission, you'll receive a confirmation with a report ID and further information.</p>
 				</div>
 				<div class="col-md-4 text-md-end mt-3 mt-md-0">
-					<a class="btn btn-primary btn-lg" href="{{.URL.NuisanceSubmitComplete}}">
+					<button type="submit" class="btn btn-primary btn-lg">
 						Submit Report
-					</a>
+					</button>
 				</div>
 			</div>
 		</div>