diff --git a/system/templates/forum.new_post.html.twig b/system/templates/forum.new_post.html.twig
index d267b7db..af2a4c1a 100644
--- a/system/templates/forum.new_post.html.twig
+++ b/system/templates/forum.new_post.html.twig
@@ -1,7 +1,7 @@
 <form action="?" method="post">
 	{{ csrf() }}
 	<input type="hidden" name="action" value="new_post" />
-	<input type="hidden" name="thread_id" value=" {{ thread_id }}" />
+	<input type="hidden" name="thread_id" value="{{ thread_id }}" />
 	<input type="hidden" name="subtopic" value="forum" />
 	<input type="hidden" name="save" value="save" />
 	<table width="100%">
@@ -43,7 +43,8 @@
 		</tr>
 	</table>
 	<div style="text-align:center">
-		<input type="submit" value="Post Reply" />
+		{% set button_name = 'Post Reply' %}
+		{{ include('buttons.base.html.twig') }}
 	</div>
 </form>
 
diff --git a/system/templates/forum.new_thread.html.twig b/system/templates/forum.new_thread.html.twig
index e37bda08..bb9e0129 100644
--- a/system/templates/forum.new_thread.html.twig
+++ b/system/templates/forum.new_thread.html.twig
@@ -44,6 +44,7 @@
 		</tr>
 	</table>
 	<div style="text-align:center">
-		<input type="submit" value="Post Thread" />
+		{% set button_name = 'Post Thread' %}
+		{{ include('buttons.base.html.twig') }}
 	</div>
 </form>