diff --git a/CTFd/themes/core/templates/challenge.html b/CTFd/themes/core/templates/challenge.html
index f5059eea..dd8de142 100644
--- a/CTFd/themes/core/templates/challenge.html
+++ b/CTFd/themes/core/templates/challenge.html
@@ -96,13 +96,13 @@
 						<div class="row submit-row">
 							<div class="col-md-9 form-group">
 								{% block input %}
-									<input id="challenge-id" type="hidden" value="{{ challenge.id }}">
-									<input class="form-control" type="text" name="answer" id="submission-input" placeholder="Flag"/>
+									<input id="challenge-id" class="challenge-id" type="hidden" value="{{ challenge.id }}">
+									<input id="challenge-input" class="challenge-input" type="text" name="answer" placeholder="Flag"/>
 								{% endblock %}
 							</div>
 							<div class="col-md-3 form-group key-submit">
 								{% block submit %}
-								<button type="submit" id="submit-key" class="btn btn-md btn-outline-secondary float-right">
+								<button id="challenge-submit" class="challenge-submit" type="submit">
 									Submit
 								</button>
 								{% endblock %}
@@ -141,4 +141,4 @@
 			</div>
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>