diff --git a/CTFd/plugins/challenges/assets/view.html b/CTFd/plugins/challenges/assets/view.html
index 38b577b2..ff4d2cb7 100644
--- a/CTFd/plugins/challenges/assets/view.html
+++ b/CTFd/plugins/challenges/assets/view.html
@@ -79,7 +79,7 @@
 								<input id="challenge-id" type="hidden" value="{{ id }}">
 							</div>
 							<div class="col-md-3 form-group key-submit">
-								<button type="submit" id="submit-key" tabindex="5"
+								<button type="submit" id="submit-key" tabindex="0"
 										class="btn btn-md btn-outline-secondary float-right">Submit
 								</button>
 							</div>
diff --git a/CTFd/plugins/dynamic_challenges/assets/view.html b/CTFd/plugins/dynamic_challenges/assets/view.html
index 59685de0..b7b2fea1 100644
--- a/CTFd/plugins/dynamic_challenges/assets/view.html
+++ b/CTFd/plugins/dynamic_challenges/assets/view.html
@@ -80,7 +80,7 @@
 								<input id="challenge-id" type="hidden" value="{{ id }}">
 							</div>
 							<div class="col-md-3 form-group key-submit">
-								<button type="submit" id="submit-key" tabindex="5"
+								<button type="submit" id="submit-key" tabindex="0"
 										class="btn btn-md btn-outline-secondary float-right">Submit
 								</button>
 							</div>
diff --git a/CTFd/themes/core/templates/confirm.html b/CTFd/themes/core/templates/confirm.html
index 6a2d31b3..5247c813 100644
--- a/CTFd/themes/core/templates/confirm.html
+++ b/CTFd/themes/core/templates/confirm.html
@@ -48,7 +48,7 @@
 						Need to resend the confirmation email?
 					</h4>
 					<div class="col-md-12 text-center">
-						<button type="submit" id="submit" tabindex="5" class="btn btn-md btn-primary btn-outlined">Resend</button>
+						<button type="submit" tabindex="0" class="btn btn-md btn-primary btn-outlined">Resend</button>
 					</div>
 					<input type="hidden" name="nonce" value="{{ nonce }}">
 				</form>
diff --git a/CTFd/themes/core/templates/login.html b/CTFd/themes/core/templates/login.html
index a31b9733..37a770bc 100644
--- a/CTFd/themes/core/templates/login.html
+++ b/CTFd/themes/core/templates/login.html
@@ -45,7 +45,7 @@
 						</a>
 					</div>
 					<div class="col-md-6">
-						<button type="submit" id="submit" tabindex="5" class="btn btn-md btn-primary btn-outlined float-right">
+						<button type="submit" tabindex="0" class="btn btn-md btn-primary btn-outlined float-right">
 							Submit
 						</button>
 					</div>
diff --git a/CTFd/themes/core/templates/register.html b/CTFd/themes/core/templates/register.html
index 21dc3f2f..81b0de91 100644
--- a/CTFd/themes/core/templates/register.html
+++ b/CTFd/themes/core/templates/register.html
@@ -45,7 +45,7 @@
 				</div>
 				<div class="row pt-3">
 					<div class="col-md-12">
-						<button type="submit" id="submit" tabindex="5" class="btn btn-md btn-primary btn-outlined float-right">Submit</button>
+						<button type="submit" tabindex="0" class="btn btn-md btn-primary btn-outlined float-right">Submit</button>
 					</div>
 				</div>
 				<input type="hidden" name="nonce" value="{{ nonce }}">
diff --git a/CTFd/themes/core/templates/reset_password.html b/CTFd/themes/core/templates/reset_password.html
index 7a8ec0d7..7c64857e 100644
--- a/CTFd/themes/core/templates/reset_password.html
+++ b/CTFd/themes/core/templates/reset_password.html
@@ -39,7 +39,7 @@
 				{% endif %}
 				<div class="row">
 					<div class="col-md-6 offset-md-6">
-						<button type="submit" id="submit" tabindex="5" class="btn btn-md btn-primary float-right">Submit</button>
+						<button type="submit" tabindex="0" class="btn btn-md btn-primary float-right">Submit</button>
 					</div>
 				</div>
 			</form>
diff --git a/CTFd/themes/core/templates/settings.html b/CTFd/themes/core/templates/settings.html
index 6f41de96..724f17f0 100644
--- a/CTFd/themes/core/templates/settings.html
+++ b/CTFd/themes/core/templates/settings.html
@@ -84,7 +84,7 @@
 				</div>
 
 				<div class="form-group">
-					<button type="submit" id="submit" tabindex="5" class="btn btn-md btn-primary btn-outlined float-right">Submit</button>
+					<button type="submit" tabindex="0" class="btn btn-md btn-primary btn-outlined float-right">Submit</button>
 				</div>
 			</form>
 		</div>
diff --git a/CTFd/themes/core/templates/setup.html b/CTFd/themes/core/templates/setup.html
index 7a3f5871..76f8f984 100644
--- a/CTFd/themes/core/templates/setup.html
+++ b/CTFd/themes/core/templates/setup.html
@@ -77,7 +77,7 @@
 				</div>
 				<br/>
 				<div class="submit-row text-center">
-					<button type="submit" id="submit" tabindex="5" class="btn btn-md btn-primary btn-outlined">Submit
+					<button type="submit" tabindex="0" class="btn btn-md btn-primary btn-outlined">Submit
 					</button>
 				</div>
 			</form>
diff --git a/CTFd/themes/core/templates/teams/join_team.html b/CTFd/themes/core/templates/teams/join_team.html
index 31d411e2..2142464e 100644
--- a/CTFd/themes/core/templates/teams/join_team.html
+++ b/CTFd/themes/core/templates/teams/join_team.html
@@ -32,7 +32,7 @@
 					<input type="hidden" name="nonce" value="{{ nonce }}">
 					<div class="row pt-3">
 						<div class="col-md-12">
-							<button type="submit" id="submit" class="btn btn-success float-right">
+							<button type="submit" class="btn btn-success float-right">
 								Join
 							</button>
 						</div>
diff --git a/CTFd/themes/core/templates/teams/new_team.html b/CTFd/themes/core/templates/teams/new_team.html
index 611153b5..4f4941be 100644
--- a/CTFd/themes/core/templates/teams/new_team.html
+++ b/CTFd/themes/core/templates/teams/new_team.html
@@ -33,7 +33,7 @@
 					<div class="row pt-3">
 						<div class="col-md-12">
 							<p>After creating your team, share the team name and password with your teammates so they can join your team.</p>
-							<button type="submit" id="submit" class="btn btn-success float-right">
+							<button type="submit" class="btn btn-success float-right">
 								Create
 							</button>
 						</div>