diff --git a/files/templates/login.html b/files/templates/login.html
index a97ee22f7..442e165f3 100644
--- a/files/templates/login.html
+++ b/files/templates/login.html
@@ -49,7 +49,7 @@
 
 								<small class="d-block my-3"><a href="/forgot">Forgot password?</a></small>
 
-								<button type="button" class="btn btn-primary login w-100 mt-3" id="login_button">Sign In</button>
+								<button type="submit" class="btn btn-primary login w-100 mt-3" id="login_button">Sign In</button>
 
 								<div class="text-center text-muted text-small mt-5 mb-3">
 									Don't have an account? <a href="/signup{{'?redirect='+redirect if redirect else ''}}" class="font-weight-bold toggle-login">Sign up</a>
diff --git a/files/templates/login_2fa.html b/files/templates/login_2fa.html
index 91a754bce..8373093bf 100644
--- a/files/templates/login_2fa.html
+++ b/files/templates/login_2fa.html
@@ -46,7 +46,7 @@
 												<input autocomplete="off" class="form-control" id="2fa_token" name="2fa_token" type="text" placeholder="6-digit code">
 												<small><a href="/lost_2fa">Lost your 2FA device?</a></small>
 
-												<button type="button" class="btn btn-primary login w-100 mt-3" id="login_button">Sign in</button>
+												<button type="submit" class="btn btn-primary login w-100 mt-3" id="login_button">Sign in</button>
 
 										</form>
 
diff --git a/files/templates/post_actions.html b/files/templates/post_actions.html
index bca87bd22..b6a25b51b 100644
--- a/files/templates/post_actions.html
+++ b/files/templates/post_actions.html
@@ -1,7 +1,7 @@
 {% if v and v.id==p.author_id and p.private %}
 	<form action="/publish/{{p.id}}" method="post">
 		<input type="hidden" name="formkey", value="{{v.formkey}}">
-		<button type="button" class="list-inline-item text-small p-0 m-0 mr-3 border-0 nobackground font-weight-bold" type="submit" onclick="disable(this)"><i class="fas fa-globe"></i>Publish</button>
+		<button type="submit" class="list-inline-item text-small p-0 m-0 mr-3 border-0 nobackground font-weight-bold" type="submit" onclick="disable(this)"><i class="fas fa-globe"></i>Publish</button>
 	</form>
 {% endif %}
 
diff --git a/files/templates/post_actions_mobile.html b/files/templates/post_actions_mobile.html
index 14b60e487..d6c9950d7 100644
--- a/files/templates/post_actions_mobile.html
+++ b/files/templates/post_actions_mobile.html
@@ -1,7 +1,7 @@
 {% if v and v.id==p.author_id and p.private %}
 	<form class="btn-block" action="/publish/{{p.id}}" method="post">
 		<input type="hidden" name="formkey", value="{{v.formkey}}">
-		<button type="button" class="nobackground btn btn-link btn-lg text-left text-muted" data-bs-dismiss="modal" type="submit" onclick="disable(this)"><i class="fas fa-globe text-center mr-2"></i>Publish</button>
+		<button type="submit" class="nobackground btn btn-link btn-lg text-left text-muted" data-bs-dismiss="modal" type="submit" onclick="disable(this)"><i class="fas fa-globe text-center mr-2"></i>Publish</button>
 	</form>
 {% endif %}
 
diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html
index 8d2faa76a..42cf2a007 100644
--- a/files/templates/sign_up.html
+++ b/files/templates/sign_up.html
@@ -104,7 +104,7 @@
 							<div class="h-captcha" data-sitekey="{{hcaptcha}}" data-theme="dark"></div>
 						{% endif %}
 
-						<button type="button" class="btn btn-primary login w-100 mt-3" id="register_button">Register</button>
+						<button type="submit" class="btn btn-primary login w-100 mt-3" id="register_button">Register</button>
 
 						<div class="text-center text-muted text-small mt-5 mb-3">
 							Already have an account? <a href="/login{{'?redirect='+redirect if redirect else ''}}" class="font-weight-bold toggle-login">Log in</a>
diff --git a/files/templates/submission.html b/files/templates/submission.html
index dc4a710e3..dccb024d6 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -804,7 +804,7 @@
 						
 										<small class="format d-none"><i class="fas fa-link" aria-hidden="true"></i></small> 
 								</div>
-								<button type="button" form="post-edit-form-{{p.id}}" class="btn btn-primary ml-2 fl-r" onclick="disable(this);remove_dialog()">Save Edit</button>
+								<button type="submit" form="post-edit-form-{{p.id}}" class="btn btn-primary ml-2 fl-r" onclick="disable(this);remove_dialog()">Save Edit</button>
 								<button type="button" onclick="togglePostEdit('{{p.id}}');remove_dialog()" class="btn btn-link text-muted ml-auto cancel-form fl-r">Cancel</button> 
 							</form>
 							<div id="post-edit-{{p.id}}" class="preview mb-3 mt-5"></div>
diff --git a/files/templates/submit.html b/files/templates/submit.html
index 3e9999e7f..e60cf276f 100644
--- a/files/templates/submit.html
+++ b/files/templates/submit.html
@@ -132,7 +132,7 @@
 								</div>
 								<div class="col text-right">
 										{% if error %}<span class="text-danger text-large mr-2">{{error | safe}}</span>{% endif %}
-										<button type="button" class="btn btn-primary" id="create_button" type="submit" onclick="disable(this)" disabled>Post</button>
+										<button type="submit" class="btn btn-primary" id="create_button" type="submit" onclick="disable(this)" disabled>Post</button>
 								</div>
 						</div>
 				</div>